timers implemented for new z80 mode

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

diff --git a/cpu/DrZ80/drz80.s b/cpu/DrZ80/drz80.s
index 53f4c98..283cd8d 100644 (file)
--- a/cpu/DrZ80/drz80.s
+++ b/cpu/DrZ80/drz80.s
@@ -21,14 +21,10 @@
 .endif\r
 \r
 .if DRZ80_FOR_PICODRIVE\r
-.include "port_config.s"\r
-      .extern YM2612Read_\r
-.if EXTERNAL_YM2612\r
-      .extern YM2612Read_940\r
-.endif\r
       .extern PicoRead8\r
       .extern Pico\r
       .extern z80_write\r
+      .extern ym2612_read_local_z80\r
 .endif\r
 \r
 DrZ80Ver: .long 0x0001\r
@@ -110,40 +106,6 @@ DrZ80Ver: .long 0x0001
 \r
 .if DRZ80_FOR_PICODRIVE\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
-    ldrne r2, =YM2612Read_940\r
-    ldreq r2, =YM2612Read_\r
-    mov lr,pc\r
-    bx r2\r
-.else\r
-    bl YM2612Read_\r
-.endif\r
-    ldmfd sp!,{r3,r12,pc}\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
-    ldrne r2, =YM2612Read_940\r
-    ldreq r2, =YM2612Read_\r
-    mov lr,pc\r
-    bx r2\r
-    orr r0,r0,r0,lsl #8\r
-.else\r
-    bl YM2612Read_\r
-    orr r0,r0,r0,lsl #8\r
-.endif\r
-    ldmfd sp!,{r3,r12,pc}\r
-.endm\r
-\r
 pico_z80_read8: @ addr\r
     cmp r0,#0x2000         @ Z80 RAM\r
     ldrlt r1,[cpucontext,#z80sp_base]\r
@@ -162,15 +124,18 @@ pico_z80_read8: @ addr
     eorlt r0,r0,#1         @ our ROM is byteswapped\r
     ldrltb r0,[r1,r0]\r
     bxlt lr\r
-       stmfd sp!,{r3,r12,lr}\r
+    stmfd sp!,{r3,r12,lr}\r
     bl PicoRead8\r
-       ldmfd sp!,{r3,r12,pc}\r
+    ldmfd sp!,{r3,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_ret8\r
+    stmfd sp!,{r3,r12,lr}\r
+    str z80_icount,[cpucontext,#cycles_pointer]\r
+    bl ym2612_read_local_z80\r
+    ldmfd sp!,{r3,r12,pc}\r
 0:\r
     cmp r0,#0x4000\r
     movge r0,#0xff\r
@@ -214,13 +179,17 @@ 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
+    stmfd sp!,{r3,r12,lr}\r
+    str z80_icount,[cpucontext,#cycles_pointer]\r
+    bl ym2612_read_local_z80\r
+    orr r0,r0,r0,lsl #8\r
+    ldmfd sp!,{r3,r12,pc}\r
 0:\r
     cmp r0,#0x4000\r
     movge r0,#0xff\r
@@ -241,6 +210,7 @@ pico_z80_write8: @ data, addr
     bx lr\r
 1:\r
     stmfd sp!,{r3,r12,lr}\r
+    str z80_icount,[cpucontext,#cycles_pointer]\r
     bl z80_write\r
     ldmfd sp!,{r3,r12,pc}\r
 \r
@@ -254,14 +224,15 @@ pico_z80_write16: @ data, addr
     strb r0,[r2,#1]\r
     bx lr\r
 1:\r
-       stmfd sp!,{r3-r5,r12,lr}\r
+    stmfd sp!,{r3-r5,r12,lr}\r
+    str z80_icount,[cpucontext,#cycles_pointer]\r
     mov r4,r0\r
     mov r5,r1\r
-       bl z80_write\r
+    bl z80_write\r
     mov r0,r4,lsr #8\r
     add r1,r5,#1\r
-       bl z80_write\r
-       ldmfd sp!,{r3-r5,r12,pc}\r
+    bl z80_write\r
+    ldmfd sp!,{r3-r5,r12,pc}\r
 \r
     .pool\r
 .endif\r
@@ -1459,7 +1430,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
@@ -6669,11 +6639,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
@@ -8068,8 +8041,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