optimizations, fixes, hacks, psp, ...

[picodrive.git] / cpu / DrZ80 / drz80.s

diff --git a/cpu/DrZ80/drz80.s b/cpu/DrZ80/drz80.s
index 4760650..ee14013 100644 (file)
--- a/cpu/DrZ80/drz80.s
+++ b/cpu/DrZ80/drz80.s
@@ -11,21 +11,20 @@
       .global DrZ80Run\r
       .global DrZ80Ver\r
 \r
-         .equiv INTERRUPT_MODE,                0               ;@0 = Use internal int handler, 1 = Use Mames int handler\r
-         .equiv FAST_Z80SP,                    1               ;@0 = Use mem functions for stack pointer, 1 = Use direct mem pointer\r
-         .equiv UPDATE_CONTEXT,            0\r
-         .equiv DRZ80_FOR_PICODRIVE,   1\r
+      .equiv INTERRUPT_MODE,        0  ;@0 = Use internal int handler, 1 = Use Mames int handler\r
+      .equiv FAST_Z80SP,            1  ;@0 = Use mem functions for stack pointer, 1 = Use direct mem pointer\r
+      .equiv UPDATE_CONTEXT,        0\r
+      .equiv DRZ80_FOR_PICODRIVE,   1\r
 \r
 .if INTERRUPT_MODE\r
-         .extern Interrupt\r
+      .extern Interrupt\r
 .endif\r
 \r
 .if DRZ80_FOR_PICODRIVE\r
-         .extern YM2612Read_\r
-         .extern YM2612Read_940\r
       .extern PicoRead8\r
       .extern Pico\r
       .extern z80_write\r
+      .extern ym2612_st\r
 .endif\r
 \r
 DrZ80Ver: .long 0x0001\r
@@ -106,43 +105,20 @@ DrZ80Ver: .long 0x0001
 .text\r
 \r
 .if DRZ80_FOR_PICODRIVE\r
-.include "port_config.s"\r
 \r
 .macro YM2612Read_and_ret8\r
-       stmfd sp!,{r3,r12,lr}\r
-.if EXTERNAL_YM2612\r
-    ldr r1,=PicoOpt\r
-    ldr r1,[r1]\r
-    tst r1,#0x200\r
-    bne 10f\r
-    bl YM2612Read_\r
-       ldmfd sp!,{r3,r12,pc}\r
-10:\r
-    bl YM2612Read_940\r
-.else\r
-    bl YM2612Read_\r
-.endif\r
-       ldmfd sp!,{r3,r12,pc}\r
+    ldr r0, =ym2612_st\r
+    ldr r0, [r0]\r
+    ldrb r0, [r0, #0x11]   ;@ ym2612_st->status\r
+    bx lr\r
 .endm\r
 \r
 .macro YM2612Read_and_ret16\r
-       stmfd sp!,{r3,r12,lr}\r
-.if EXTERNAL_YM2612\r
-    ldr r0,=PicoOpt\r
-    ldr r0,[r0]\r
-    tst r0,#0x200\r
-    bne 10f\r
-    bl YM2612Read_\r
-    orr r0,r0,r0,lsl #8\r
-       ldmfd sp!,{r3,r12,pc}\r
-10:\r
-    bl YM2612Read_940\r
-    orr r0,r0,r0,lsl #8\r
-.else\r
-    bl YM2612Read_\r
+    ldr r0, =ym2612_st\r
+    ldr r0, [r0]\r
+    ldrb r0, [r0, #0x11]   ;@ ym2612_st->status\r
     orr r0,r0,r0,lsl #8\r
-.endif\r
-       ldmfd sp!,{r3,r12,pc}\r
+    bx lr\r
 .endm\r
 \r
 pico_z80_read8: @ addr\r
@@ -171,7 +147,7 @@ pico_z80_read8: @ addr
     cmp r1,#2              @ YM2612 (0x4000-0x5fff)\r
     bne 0f\r
     and r0,r0,#3\r
-       YM2612Read_and_ret8\r
+    YM2612Read_and_ret8\r
 0:\r
     cmp r0,#0x4000\r
     movge r0,#0xff\r
@@ -215,13 +191,13 @@ pico_z80_read16: @ addr
     add r0,r4,#1\r
     bl PicoRead8\r
     orr r0,r5,r0,lsl #8\r
-       ldmfd sp!,{r3-r5,r12,pc}\r
+    ldmfd sp!,{r3-r5,r12,pc}\r
 1:\r
     mov r1,r0,lsr #13\r
     cmp r1,#2              @ YM2612 (0x4000-0x5fff)\r
     bne 0f\r
     and r0,r0,#3\r
-       YM2612Read_and_ret16\r
+    YM2612Read_and_ret16\r
 0:\r
     cmp r0,#0x4000\r
     movge r0,#0xff\r
@@ -1460,7 +1436,6 @@ DoInterrupt:
     bne DoInterrupt_mode1\r
     tst r1,#2\r
     bne DoInterrupt_mode2\r
-    b   DoInterrupt_mode0\r
 \r
 DoInterrupt_mode0:\r
        ;@ get 3 byte vector\r
@@ -6670,11 +6645,14 @@ opcode_DD_NF:
 ;@     mov r0,#0xFD00\r
 ;@     orr r0,r0,r1\r
 ;@     b end_loop\r
+\r
 opcode_DD_NF2:\r
-       mov r0,#0xDD0000\r
-       orr r0,r0,#0xCB00\r
-       orr r0,r0,r1\r
-       b end_loop\r
+       fetch 15\r
+;@ notaz: we don't want to deadlock here\r
+;@     mov r0,#0xDD0000\r
+;@     orr r0,r0,#0xCB00\r
+;@     orr r0,r0,r1\r
+;@     b end_loop\r
 \r
 ;@ADD IX,BC\r
 opcode_DD_09:\r
@@ -8069,8 +8047,8 @@ opcode_ED_BB:
 ;@from the DD location but the address of the IY reg is passed instead\r
 ;@of IX\r
 \r
-end_loop:\r
-     b end_loop\r
+;@end_loop:\r
+;@     b end_loop\r
 \r
 \r
 \r