X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=testpico%2Fsh2_test.sh2;h=d72f0832aa8124d3a0165a66d0f23f454cd44900;hb=refs%2Fremotes%2Fgithub%2Fmaster;hp=692fd92e9a2addc6b42673da394eadc14305d982;hpb=5073ab5adb8157c35014505385575473284788df;p=megadrive.git

diff --git a/testpico/sh2_test.sh2 b/testpico/sh2_test.sh2
index 692fd92..d72f083 100644
--- a/testpico/sh2_test.sh2
+++ b/testpico/sh2_test.sh2
@@ -17,21 +17,22 @@
         .long   master_e11  /* NMI vector */
         .long   master_e12  /* User break vector */
 .rept 19
-        .long   main_err    /* reserved */
+        .long   master_err  /* reserved */
 .endr
 .rept 32
-        .long   main_err    /* TRAPA #32-63 */
+        .long   master_err  /* TRAPA #32-63 */
 .endr
-        .long   main_irq    /* Level 1 IRQ */
-        .long   main_irq    /* Level 2 & 3 IRQ's */
-        .long   main_irq    /* Level 4 & 5 IRQ's */
-        .long   main_irq    /* PWM interupt */
-        .long   main_irq    /* Command interupt */
-        .long   main_irq    /* H Blank interupt */
-        .long   main_irq    /* V Blank interupt */
-        .long   main_irq    /* Reset Button */
+        .long   master_irq0 /* Level 1 IRQ */
+        .long   master_irq1 /* Level 2 & 3 IRQ's */
+        .long   master_irq2 /* Level 4 & 5 IRQ's */
+        .long   master_irq3 /* PWM interupt */
+        .long   master_irq4 /* Command interupt */
+        .long   master_irq5 /* H Blank interupt */
+        .long   master_irq6 /* V Blank interupt */
+!        .long   main_irq_vres
+        .long   master_irq7 /* Reset Button */
 .rept 56
-        .long   main_err    /* peripherals */
+        .long   master_err  /* peripherals */
 .endr
 
 ! Slave Vector Base Table at 0x06000200
@@ -55,14 +56,14 @@
 .rept 32
         .long   slave_err   /* TRAPA #32-63 */
 .endr
-        .long   slave_irq   /* Level 1 IRQ */
-        .long   slave_irq   /* Level 2 & 3 IRQ's */
-        .long   slave_irq   /* Level 4 & 5 IRQ's */
-        .long   slave_irq   /* PWM interupt */
-        .long   slave_irq   /* Command interupt */
-        .long   slave_irq   /* H Blank interupt */
-        .long   slave_irq   /* V Blank interupt */
-        .long   slave_irq   /* Reset Button */
+        .long   slave_irq0  /* Level 1 IRQ */
+        .long   slave_irq1  /* Level 2 & 3 IRQ's */
+        .long   slave_irq2  /* Level 4 & 5 IRQ's */
+        .long   slave_irq3  /* PWM interupt */
+        .long   slave_irq4  /* Command interupt */
+        .long   slave_irq5  /* H Blank interupt */
+        .long   slave_irq6  /* V Blank interupt */
+        .long   slave_irq7  /* Reset Button */
 .rept 56
         .long   slave_err   /* peripherals */
 .endr
@@ -106,11 +107,15 @@ xstart:
         jmp     @r0
         nop
 
-main_irq:
-        mov.l   r0, @-r15
+! r0=vector_number
+do_irq_master:
+        mov.b   r0, @(0x2c, gbr)
         mov.l   r1, @-r15
         mov.l   l_irq_cnt, r1  /* counters in fb (0x2401ff00) */
 
+! According to "32X Technical Information Attachment 1" FTOA pin must be toggled
+! or interrupts may be missed when multiple irqs trigger. We skip that here since
+! we test only 1 irq at a time.
 do_irq_cmn:
         mov.l   r2, @-r15
         mov     #0x80, r0
@@ -139,7 +144,7 @@ do_irq_cmn:
 
 ! not used
 .if 0
-main_irq_vres_:
+main_irq_vres:
         mov.w   r0, @(0x14, gbr)  /* ack */
         mov.b   @(7, gbr), r0     /* RV */
         tst     #1, r0
@@ -158,7 +163,7 @@ main_irq_vres_:
         mov.b   r0, @(5, r1) /* OCRB L */
         mov.b   r0, @(2, r1) /* FRC H */
         mov.b   r0, @(3, r1) /* FRC L */
-        mov.b   @(7, r1), r0
+        mov.b   @(3, r1), r0
 ! sleep - docs say not to use
 !        sleep
 0:
@@ -186,15 +191,16 @@ _read_frt:
 .global _start
 _start:
 
-main_err:
+master_err:
         bra     do_exc_master
         mov     #0xff, r0
 slave_err:
         bra     do_exc_slave
         mov     #0xff, r0
 
-slave_irq:
-        mov.l   r0, @-r15
+! r0=vector_number
+do_irq_slave:
+        mov.b   r0, @(0x2d, gbr)
         mov.l   r1, @-r15
         mov.l   l_irq_cnt, r1  /* counters in fb (0x2401ff00) */
         bra     do_irq_cmn
@@ -225,6 +231,20 @@ slave_e\num:
         mov     #\num, r0
 .endm
 
+.macro irq_master num
+master_irq\num:
+        mov.l   r0, @-r15
+        bra     do_irq_master
+        mov     #\num, r0
+.endm
+
+.macro irq_slave num
+slave_irq\num:
+        mov.l   r0, @-r15
+        bra     do_irq_slave
+        mov     #\num, r0
+.endm
+
 exc_master 4
 exc_master 5
 exc_master 6
@@ -234,6 +254,14 @@ exc_master 9
 exc_master 10
 exc_master 11
 exc_master 12
+irq_master 0
+irq_master 1
+irq_master 2
+irq_master 3
+irq_master 4
+irq_master 5
+irq_master 6
+irq_master 7
 
 exc_slave 4
 exc_slave 5
@@ -244,15 +272,23 @@ exc_slave 9
 exc_slave 10
 exc_slave 11
 exc_slave 12
+irq_slave 0
+irq_slave 1
+irq_slave 2
+irq_slave 3
+irq_slave 4
+irq_slave 5
+irq_slave 6
+irq_slave 7
 
 do_exc_master:
-        mov.w   r0, @(0x2c, gbr)
+        mov.b   r0, @(0x2e, gbr)
 0:
         bra     0b
         nop
 
 do_exc_slave:
-        mov.w   r0, @(0x2e, gbr)
+        mov.b   r0, @(0x2f, gbr)
 0:
         bra     0b
         nop