testpico: adjust for irixxxx's PD, 32x disable

[megadrive.git] / testpico / asmtools.S

diff --git a/testpico/asmtools.S b/testpico/asmtools.S
index af34b41..811f35d 100644 (file)
--- a/testpico/asmtools.S
+++ b/testpico/asmtools.S
@@ -73,6 +73,8 @@ write_and_read1:
 #ifndef PICO
     move.w      d0, (a0)
 #else
+    /* different timing due to extra fetch of offset, */
+    /* less troulesome to emulate */
     movea.l     a0, a1
     subq.l      #1, a1
     move.w      d0, 1(a1)
@@ -99,6 +101,11 @@ move_sr_and_read:
     move.w      (a0), d0
     rts
 
+.global read_sr
+read_sr:
+    move.w      sr, d0
+    rts
+
 .global memcpy_ /* void *dst, const void *src, u16 size */
 memcpy_:
     ldarg       0, 0, a0
@@ -199,7 +206,7 @@ test_hint:
 0:
     move.w      d0, (0xf004).w    /* 12 */
     move.w      (sp)+, d0         /*  8 */
-    rte                           /* 20 114 */
+    rte                           /* 20 114+44 */
 .global test_hint_end
 test_hint_end:
 
@@ -244,12 +251,25 @@ x32x_enable:
 .global x32x_enable_end
 x32x_enable_end:
 
+.global x32x_disable
+x32x_disable:
+    movea.l     #0xa15100, a0
+    move.w      #1, (a0)          /* ADEN (reset sh2) */
+    move.w      #0, (a0)          /* adapter disable, reset sh2 */
+    move.w      #1, d0
+0:
+    dbra        d0, 0b
+    move.w      #2, (a0)          /* nRES - sh2s should see no ADEN and sleep */
+    rts
+.global x32x_disable_end
+x32x_disable_end:
+
 .global test_32x_b_c0
 test_32x_b_c0:
     ldarg       0, 0, a1
     ldargw      1, 0, d0
     jsr         (0xc0).l          /* move.b d0, (a1); RV=0 */
-    bset        #0, (0xa15107).l
+    bset        #0, (0xa15107).l  /* RV=1 */
     rts
 .global test_32x_b_c0_end
 test_32x_b_c0_end: