X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cpu%2FDrZ80%2Fdrz80.s;h=edb29dfd06e3f5208632915b471d2753e6323cbc;hb=19886062f1a36f70b1f01d58f3fa1b79162defac;hp=5445ffd08cab973552e071cfdbddd40487006c8e;hpb=ee05564fc7644a035ceeedba61975e46ce84af48;p=picodrive.git

diff --git a/cpu/DrZ80/drz80.s b/cpu/DrZ80/drz80.s
index 5445ffd..edb29df 100644
--- a/cpu/DrZ80/drz80.s
+++ b/cpu/DrZ80/drz80.s
@@ -14,7 +14,6 @@
       .equiv INTERRUPT_MODE,         0	;@0 = Use internal int handler, 1 = Use Mames int handler
       .equiv FAST_Z80SP,             1	;@0 = Use mem functions for stack pointer, 1 = Use direct mem pointer
       .equiv UPDATE_CONTEXT,         0
-      .equiv DRZ80_FOR_PICODRIVE,    1
       .equiv DRZ80_XMAP,             1
       .equiv DRZ80_XMAP_MORE_INLINE, 1
 
@@ -144,7 +143,7 @@ z80_xmap_write8_handler: @ data, addr, func
 z80_xmap_read16: @ addr
     @ check if we cross bank boundary
     add r1,r0,#1
-    eor r1,r0,r0
+    eor r1,r1,r0
     tst r1,#1<<Z80_MEM_SHIFT
     bne 0f
 
@@ -160,22 +159,22 @@ z80_xmap_read16: @ addr
 
 0:
     @ z80_xmap_read8 will save r3 and r12 for us
-    stmfd sp!,{r4,r5,lr}
-    mov r4,r0
+    stmfd sp!,{r8,r9,lr}
+    mov r8,r0
     bl z80_xmap_read8
-    mov r5,r0
-    add r0,r4,#1
+    mov r9,r0
+    add r0,r8,#1
     bl z80_xmap_read8
-    orr r0,r5,r0,lsl #8
-    ldmfd sp!,{r4,r5,pc}
+    orr r0,r9,r0,lsl #8
+    ldmfd sp!,{r8,r9,pc}
 
 z80_xmap_write16: @ data, addr
     add r2,r1,#1
-    eor r2,r1,r1
+    eor r2,r2,r1
     tst r2,#1<<Z80_MEM_SHIFT
     bne 0f
 
-    ldr r2,[cpucontext,#z80_read8]
+    ldr r2,[cpucontext,#z80_write8]
     add r2,r2,r1,lsr #Z80_MEM_SHIFT-2
     bic r2,r2,#3
     ldr r2,[r2]
@@ -187,15 +186,49 @@ z80_xmap_write16: @ data, addr
     bx lr
 
 0:
-    stmfd sp!,{r4,r5,lr}
-    mov r4,r0
-    mov r5,r1
+    stmfd sp!,{r8,r9,lr}
+    mov r8,r0
+    mov r9,r1
     bl z80_xmap_write8
-    mov r0,r4,lsr #8
-    add r1,r5,#1
+    mov r0,r8,lsr #8
+    add r1,r9,#1
     bl z80_xmap_write8
-    ldmfd sp!,{r4,r5,pc}
-.endif
+    ldmfd sp!,{r8,r9,pc}
+
+z80_xmap_rebase_pc:
+    ldr r1,[cpucontext,#z80_read8]
+    mov r2,r0,lsr #Z80_MEM_SHIFT
+    ldr r1,[r1,r2,lsl #2]
+    movs r1,r1,lsl #1
+    strcc r1,[cpucontext,#z80pc_base]
+    addcc z80pc,r1,r0
+    bxcc lr
+
+z80_bad_jump:
+    stmfd sp!,{r3,r12,lr}
+    mov lr,pc
+    ldr pc,[cpucontext,#z80_rebasePC]
+    mov z80pc,r0
+    ldmfd sp!,{r3,r12,pc}
+
+z80_xmap_rebase_sp:
+    ldr r1,[cpucontext,#z80_read8]
+    sub r2,r0,#1
+    mov r2,r2,lsl #16
+    mov r2,r2,lsr #(Z80_MEM_SHIFT+16)
+    ldr r1,[r1,r2,lsl #2]
+    movs r1,r1,lsl #1
+    strcc r1,[cpucontext,#z80sp_base]
+    addcc z80sp,r1,r0
+    bxcc lr
+
+    stmfd sp!,{r3,r12,lr}
+    mov lr,pc
+    ldr pc,[cpucontext,#z80_rebaseSP]
+    mov z80sp,r0
+    ldmfd sp!,{r3,r12,pc}
+ 
+.endif @ DRZ80_XMAP
 
 
 .macro fetch cycs
@@ -335,10 +368,8 @@ z80_xmap_write16: @ data, addr
 .if UPDATE_CONTEXT
      str z80pc,[cpucontext,#z80pc_pointer]
 .endif
-.if DRZ80_FOR_PICODRIVE
-    ldr r1,[cpucontext,#z80pc_base]
-    bic r0,r0,#0xfe000
-    add z80pc,r1,r0
+.if DRZ80_XMAP
+    bl z80_xmap_rebase_pc
 .else
     stmfd sp!,{r3,r12}
 	mov lr,pc
@@ -352,15 +383,14 @@ z80_xmap_write16: @ data, addr
 .if UPDATE_CONTEXT
      str z80pc,[cpucontext,#z80pc_pointer]
 .endif
-.if DRZ80_FOR_PICODRIVE
-    bic r0,r0,#0xfe000
-    ldr r1,[cpucontext,#z80sp_base]
-    add r0,r1,r0
+.if DRZ80_XMAP
+    bl z80_xmap_rebase_sp
 .else
 	stmfd sp!,{r3,r12}
 	mov lr,pc
 	ldr pc,[cpucontext,#z80_rebaseSP]		;@ external function must rebase sp
 	ldmfd sp!,{r3,r12}
+	mov z80sp,r0
 .endif
 .endm
 ;@----------------------------------------------------------------------------
@@ -722,22 +752,9 @@ z80_xmap_write16: @ data, addr
 
 .macro opPOP
 .if FAST_Z80SP
-.if DRZ80_FOR_PICODRIVE
-    @ notaz: try to protect against stack overflows, which tend to happen in Picodrive because of poor timing
-    ldr r2,[cpucontext,#z80sp_base]
-	ldrb r0,[z80sp],#1
-    add r2,r2,#0x2000
-    cmp z80sp,r2
-@    subge z80sp,z80sp,#0x2000 @ unstable?
-	ldrb r1,[z80sp],#1
-    cmp z80sp,r2
-@    subge z80sp,z80sp,#0x2000
-	orr r0,r0,r1, lsl #8
-.else
 	ldrb r0,[z80sp],#1
 	ldrb r1,[z80sp],#1
 	orr r0,r0,r1, lsl #8
-.endif
 .else
 	mov r0,z80sp
 	readmem16
@@ -752,23 +769,22 @@ z80_xmap_write16: @ data, addr
 .endm
 ;@---------------------------------------
 
+.macro stack_check
+    @ try to protect against stack overflows, lock into current bank
+    ldr r1,[cpucontext,#z80sp_base]
+    sub r1,z80sp,r1
+    cmp r1,#2
+    addlt z80sp,z80sp,#1<<Z80_MEM_SHIFT
+.endm
+
 .macro opPUSHareg reg @ reg > r1
 .if FAST_Z80SP
-.if DRZ80_FOR_PICODRIVE
-    @ notaz: try to protect against stack overflows, which tend to happen in Picodrive because of poor timing
-    ldr r0,[cpucontext,#z80sp_base]
-    cmp z80sp,r0
-    addle z80sp,z80sp,#0x2000
-    mov r1,\reg, lsr #8
-	strb r1,[z80sp,#-1]!
-    cmp z80sp,r0
-    addle z80sp,z80sp,#0x2000
-	strb \reg,[z80sp,#-1]!
-.else
+.if DRZ80_XMAP
+	stack_check
+.endif
 	mov r1,\reg, lsr #8
 	strb r1,[z80sp,#-1]!
 	strb \reg,[z80sp,#-1]!
-.endif
 .else
     mov r0,\reg
 	sub z80sp,z80sp,#2
@@ -779,22 +795,13 @@ z80_xmap_write16: @ data, addr
 
 .macro opPUSHreg reg
 .if FAST_Z80SP
-.if DRZ80_FOR_PICODRIVE
-    ldr r0,[cpucontext,#z80sp_base]
-    cmp z80sp,r0
-    addle z80sp,z80sp,#0x2000
-    mov r1,\reg, lsr #24
-	strb r1,[z80sp,#-1]!
-    cmp z80sp,r0
-    addle z80sp,z80sp,#0x2000
-	mov r1,\reg, lsr #16
-	strb r1,[z80sp,#-1]!
-.else
+.if DRZ80_XMAP
+	stack_check
+.endif
     mov r1,\reg, lsr #24
 	strb r1,[z80sp,#-1]!
 	mov r1,\reg, lsr #16
 	strb r1,[z80sp,#-1]!
-.endif
 .else
 	mov r0,\reg,lsr #16
 	sub z80sp,z80sp,#2
@@ -4500,7 +4507,6 @@ opcode_3_1:
 .if FAST_Z80SP
 	orr r0,r0,r1, lsl #8
 	rebasesp
-	mov z80sp,r0
 .else
 	orr z80sp,r0,r1, lsl #8
 .endif
@@ -5575,7 +5581,6 @@ opcode_F_9:
 .if FAST_Z80SP
 	mov r0,z80hl, lsr #16
 	rebasesp
-	mov z80sp,r0
 .else
 	mov z80sp,z80hl, lsr #16
 .endif
@@ -6721,7 +6726,8 @@ opcode_DD_2E:
 opcode_DD_34:
 	ldrsb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r0,r0,r1, lsr #16
+	add r0,r1,r0, lsl #16
+	mov r0,r0,lsr #16
 	stmfd sp!,{r0}	;@ save addr
 	readmem8
 	opINC8b
@@ -6732,7 +6738,8 @@ opcode_DD_34:
 opcode_DD_35:
 	ldrsb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r0,r0,r1, lsr #16
+	add r0,r1,r0, lsl #16
+	mov r0,r0,lsr #16
 	stmfd sp!,{r0}	;@ save addr
 	readmem8
 	opDEC8b
@@ -6744,7 +6751,8 @@ opcode_DD_36:
 	ldrsb r2,[z80pc],#1
 	ldrb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r1,r2,r1, lsr #16
+	add r1,r1,r2, lsl #16
+	mov r1,r1,lsr #16
 	writemem8
 	fetch 19
 ;@ADD IX,SP
@@ -6775,7 +6783,8 @@ opcode_DD_45:
 opcode_DD_46:
 	ldrsb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r0,r0,r1, lsr #16
+	add r0,r1,r0, lsl #16
+	mov r0,r0,lsr #16
 	readmem8
 	and z80bc,z80bc,#0xFF<<16
 	orr z80bc,z80bc,r0, lsl #24
@@ -6796,7 +6805,8 @@ opcode_DD_4D:
 opcode_DD_4E:
 	ldrsb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r0,r0,r1, lsr #16
+	add r0,r1,r0, lsl #16
+	mov r0,r0,lsr #16
 	readmem8
 	and z80bc,z80bc,#0xFF<<24
 	orr z80bc,z80bc,r0, lsl #16
@@ -6818,7 +6828,8 @@ opcode_DD_55:
 opcode_DD_56:
 	ldrsb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r0,r0,r1, lsr #16
+	add r0,r1,r0, lsl #16
+	mov r0,r0,lsr #16
 	readmem8
 	and z80de,z80de,#0xFF<<16
 	orr z80de,z80de,r0, lsl #24
@@ -6839,7 +6850,8 @@ opcode_DD_5D:
 opcode_DD_5E:
 	ldrsb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r0,r0,r1, lsr #16
+	add r0,r1,r0, lsl #16
+	mov r0,r0,lsr #16
 	readmem8
 	and z80de,z80de,#0xFF<<24
 	orr z80de,z80de,r0, lsl #16
@@ -6876,7 +6888,8 @@ opcode_DD_65:
 opcode_DD_66:
 	ldrsb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r0,r0,r1, lsr #16
+	add r0,r1,r0, lsl #16
+	mov r0,r0,lsr #16
 	readmem8
 	and z80hl,z80hl,#0xFF<<16
 	orr z80hl,z80hl,r0, lsl #24
@@ -6918,7 +6931,8 @@ opcode_DD_6D:
 opcode_DD_6E:
 	ldrsb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r0,r0,r1, lsr #16
+	add r0,r1,r0, lsl #16
+	mov r0,r0,lsr #16
 	readmem8
 	and z80hl,z80hl,#0xFF<<24
 	orr z80hl,z80hl,r0, lsl #16
@@ -6933,7 +6947,8 @@ opcode_DD_6F:
 opcode_DD_70:
 	ldrsb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r1,r0,r1, lsr #16
+	add r1,r1,r0, lsl #16
+	mov r1,r1,lsr #16
 	mov r0,z80bc, lsr #24
 	writemem8
 	fetch 19
@@ -6941,7 +6956,8 @@ opcode_DD_70:
 opcode_DD_71:
 	ldrsb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r1,r0,r1, lsr #16
+	add r1,r1,r0, lsl #16
+	mov r1,r1,lsr #16
 	mov r0,z80bc, lsr #16
 	and r0,r0,#0xFF
 	writemem8
@@ -6950,7 +6966,8 @@ opcode_DD_71:
 opcode_DD_72:
 	ldrsb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r1,r0,r1, lsr #16
+	add r1,r1,r0, lsl #16
+	mov r1,r1,lsr #16
 	mov r0,z80de, lsr #24
 	writemem8
 	fetch 19
@@ -6958,7 +6975,8 @@ opcode_DD_72:
 opcode_DD_73:
 	ldrsb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r1,r0,r1, lsr #16
+	add r1,r1,r0, lsl #16
+	mov r1,r1,lsr #16
 	mov r0,z80de, lsr #16
 	and r0,r0,#0xFF
 	writemem8
@@ -6967,7 +6985,8 @@ opcode_DD_73:
 opcode_DD_74:
 	ldrsb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r1,r0,r1, lsr #16
+	add r1,r1,r0, lsl #16
+	mov r1,r1,lsr #16
 	mov r0,z80hl, lsr #24
 	writemem8
 	fetch 19
@@ -6975,7 +6994,8 @@ opcode_DD_74:
 opcode_DD_75:
 	ldrsb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r1,r0,r1, lsr #16
+	add r1,r1,r0, lsl #16
+	mov r1,r1,lsr #16
 	mov r0,z80hl, lsr #16
 	and r0,r0,#0xFF
 	writemem8
@@ -6984,7 +7004,8 @@ opcode_DD_75:
 opcode_DD_77:
 	ldrsb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r1,r0,r1, lsr #16
+	add r1,r1,r0, lsl #16
+	mov r1,r1,lsr #16
 	mov r0,z80a, lsr #24
 	writemem8
 	fetch 19
@@ -7003,7 +7024,8 @@ opcode_DD_7D:
 opcode_DD_7E:
 	ldrsb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r0,r0,r1, lsr #16
+	add r0,r1,r0, lsl #16
+	mov r0,r0,lsr #16
 	readmem8
 	mov z80a,r0, lsl #24
 	fetch 19
@@ -7022,7 +7044,8 @@ opcode_DD_85:
 opcode_DD_86:
 	ldrsb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r0,r0,r1, lsr #16
+	add r0,r1,r0, lsl #16
+	mov r0,r0,lsr #16
 	readmem8
 	opADDb
 	fetch 19
@@ -7041,7 +7064,8 @@ opcode_DD_8D:
 opcode_DD_8E:
 	ldrsb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r0,r0,r1, lsr #16
+	add r0,r1,r0, lsl #16
+	mov r0,r0,lsr #16
 	readmem8
 	opADCb
 	fetch 19
@@ -7060,7 +7084,8 @@ opcode_DD_95:
 opcode_DD_96:
 	ldrsb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r0,r0,r1, lsr #16
+	add r0,r1,r0, lsl #16
+	mov r0,r0,lsr #16
 	readmem8
 	opSUBb
 	fetch 19
@@ -7079,7 +7104,8 @@ opcode_DD_9D:
 opcode_DD_9E:
 	ldrsb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r0,r0,r1, lsr #16
+	add r0,r1,r0, lsl #16
+	mov r0,r0,lsr #16
 	readmem8
 	opSBCb
 	fetch 19
@@ -7098,7 +7124,8 @@ opcode_DD_A5:
 opcode_DD_A6:
 	ldrsb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r0,r0,r1, lsr #16
+	add r0,r1,r0, lsl #16
+	mov r0,r0,lsr #16
 	readmem8
 	opANDb
 	fetch 19
@@ -7117,7 +7144,8 @@ opcode_DD_AD:
 opcode_DD_AE:
 	ldrsb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r0,r0,r1, lsr #16
+	add r0,r1,r0, lsl #16
+	mov r0,r0,lsr #16
 	readmem8
 	opXORb
 	fetch 19
@@ -7136,7 +7164,8 @@ opcode_DD_B5:
 opcode_DD_B6:
 	ldrsb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r0,r0,r1, lsr #16
+	add r0,r1,r0, lsl #16
+	mov r0,r0,lsr #16
 	readmem8
 	opORb
 	fetch 19
@@ -7155,7 +7184,8 @@ opcode_DD_BD:
 opcode_DD_BE:
 	ldrsb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r0,r0,r1, lsr #16
+	add r0,r1,r0, lsl #16
+	mov r0,r0,lsr #16
 	readmem8
 	opCPb
 	fetch 19
@@ -7167,7 +7197,8 @@ opcode_DD_CB:
 ;@moves the PC to the location of the subroutine
 	ldrsb r0,[z80pc],#1
 	ldr r1,[z80xx]
-	add r0,r0,r1, lsr #16
+	add r0,r1,r0, lsl #16
+	mov r0,r0,lsr #16
 
 	ldrb r1,[z80pc],#1
 	ldr pc,[pc,r1, lsl #2]
@@ -7415,7 +7446,6 @@ opcode_DD_F9:
 .if FAST_Z80SP
 	ldrh r0,[z80xx,#2]
 	rebasesp
-	mov z80sp,r0
 .else
 	ldrh z80sp,[z80xx,#2]
 .endif
@@ -7753,8 +7783,9 @@ opcode_ED_7B:
 	readmem16
 .if FAST_Z80SP
 	rebasesp
-.endif
+.else
 	mov z80sp,r0
+.endif
 	fetch 20
 ;@LDI
 opcode_ED_A0: