palette change to reflect .15 code
[fceu.git] / ncpu.S
diff --git a/ncpu.S b/ncpu.S
index d8eb3bf..8a18b75 100644 (file)
--- a/ncpu.S
+++ b/ncpu.S
@@ -269,10 +269,10 @@ ldmfd sp!,{r0-r3,r12,lr}
 @@@ REG_ADDR¤òÊѹ¹¤¹¤ë¤¬µ¤¤Ë¤¹¤ë¤Ê
 @@@
 .macro READ_WORD
-       READ
+       bl      read_byte
        mov     REG_PC, r0
        add     REG_ADDR, REG_ADDR, #1
-       READ
+       bl      read_byte
        orr     r0, REG_PC, r0, lsl #8
 .endm
 
@@ -3002,7 +3002,11 @@ TriggerNMINSF_a:
 
 
 X6502_AddCycles_a:
+       ldr     r3, =timestamp
        ldr     r2, =nes_registers
+       ldr     r1, [r3]
+       add     r1, r1, r0
+       str     r1, [r3]
        ldrsh   r1, [r2, #0x1e]
        mvn     r3, #47                 @ r3=-48
        mla     r0, r3, r0, r1