.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
\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
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
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
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
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
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