Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-10-04 09:59:01 +00:00
Code Issues Projects Releases Wiki Activity

Correct order for CPU tracing arguments

Browse Source
This commit is contained in:
Aaron Culliney 2015-03-05 21:23:36 -08:00
parent 9cbceac80b
commit e7ad98535a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/arm/cpu.S
View File

@ -139,12 +139,12 @@
AddUint16(PC_Reg, #2) \ AddUint16(PC_Reg, #2) \
ldr r1, [reg_vmem_r, EffectiveAddr, LSL PTR_SHIFT]; \ ldr r1, [reg_vmem_r, EffectiveAddr, LSL PTR_SHIFT]; \
blx r1; \ blx r1; \
TRACE_ARG2 \ TRACE_ARG1 \
mov lo_byte, r0; \ mov lo_byte, r0; \
IncUint16(EffectiveAddr) \ IncUint16(EffectiveAddr) \
ldr r1, [reg_vmem_r, EffectiveAddr, LSL PTR_SHIFT]; \ ldr r1, [reg_vmem_r, EffectiveAddr, LSL PTR_SHIFT]; \
blx r1; \ blx r1; \
TRACE_ARG1; \ TRACE_ARG2; \
mov hi_byte, hi_byte, LSL #8; \ mov hi_byte, hi_byte, LSL #8; \
orr r0, hi_byte, lo_byte; orr r0, hi_byte, lo_byte;
@ -1534,6 +1534,7 @@ ENTRY(op_JMP_ind) // 0x6c
beq jmp_special beq jmp_special
GetFromMem_W(r0) GetFromMem_W(r0)
mov PC_Reg, r0 mov PC_Reg, r0
sub EffectiveAddr, EffectiveAddr, #1
Continue Continue
jmp_special: // see JMP indirect note in _Understanding the Apple IIe_ 4-25 jmp_special: // see JMP indirect note in _Understanding the Apple IIe_ 4-25
mov PC_Reg, r0 mov PC_Reg, r0