X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cpu%2FDrZ80%2Fdrz80.s;h=ff2a6b8b38d858e51027a9a69eb242a28a6d2e53;hb=835122bc0c583a74707847f350349e6050b42bb5;hp=edb29dfd06e3f5208632915b471d2753e6323cbc;hpb=c7074ddb0258ab03b9329bef9930c28ba46ae6da;p=picodrive.git

diff --git a/cpu/DrZ80/drz80.s b/cpu/DrZ80/drz80.s
index edb29df..ff2a6b8 100644
--- a/cpu/DrZ80/drz80.s
+++ b/cpu/DrZ80/drz80.s
@@ -97,6 +97,7 @@ DrZ80Ver: .long 0x0001
 	.equ Z80_IF1, 1<<0
 	.equ Z80_IF2, 1<<1
 	.equ Z80_HALT, 1<<2
+	.equ Z80_NMI, 1<<3
 
 ;@---------------------------------------
 
@@ -1359,9 +1360,11 @@ DrZ80Run:
 
 .if INTERRUPT_MODE == 0
 	;@ check ints
+	tst r0,#(Z80_NMI<<8)
+	blne DoNMI
 	tst r0,#0xff
 	movne r0,r0,lsr #8
-	tstne r0,#1
+	tstne r0,#Z80_IF1
 	blne DoInterrupt
 .endif
 
@@ -1515,6 +1518,36 @@ DoInterrupt_end:
 	ldmfd sp!,{pc} ;@ return
 .endif
 
+DoNMI:
+	stmfd sp!,{lr}
+
+	bic r0,r0,#((Z80_NMI|Z80_HALT|Z80_IF1)<<8)
+	strh r0,[cpucontext,#z80irq] @ 0x4C, irq and IFF bits
+
+	;@ push pc on stack
+	ldr r0,[cpucontext,#z80pc_base]
+	sub r2,z80pc,r0
+	opPUSHareg r2
+
+	;@ read new pc from vector address
+.if UPDATE_CONTEXT
+	str z80pc,[cpucontext,#z80pc_pointer]
+.endif
+	mov r0,#0x66
+.if DRZ80_XMAP
+	rebasepc
+.else
+	stmfd sp!,{r3,r12}
+	mov lr,pc
+	ldr pc,[cpucontext,#z80_rebasePC] ;@ r0=new pc - external function sets z80pc_base and returns new z80pc in r0
+	ldmfd sp!,{r3,r12}
+	mov z80pc,r0	
+.endif
+	ldrh r0,[cpucontext,#z80irq] @ 0x4C, irq and IFF bits
+	eatcycles 11
+	ldmfd sp!,{pc}
+
+
 .data
 .align 4
 
@@ -5615,7 +5648,7 @@ ei_return:
 	;@ check ints
 	tst r0,#0xff
 	movne r0,r0,lsr #8
-	tstne r0,#1
+	tstne r0,#Z80_IF1
 	blne DoInterrupt
 
 	;@ continue