Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-12-27 21:29:42 +00:00
Code Issues Projects Releases Wiki Activity

Remove unneeded i86 assembly and fix iOS simulator build

Browse Source
This commit is contained in:
Aaron Culliney 2018-01-21 12:41:07 -08:00
parent 807b441ab1
commit e898a85f50
1 changed files with 4 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/x86/cpu.S
View File

@ -923,13 +923,7 @@ ENTRY(op_UNK) /* make undefined opcodes fault */
ENTRY(op_BRK) ENTRY(op_BRK)
incw PC_Reg incw PC_Reg
movw PC_Reg, %ax movw PC_Reg, %ax
#if __PIC__
xchgb %al, %ah
Push(%al)
shrw $8, %ax
#else
Push(%ah) Push(%ah)
#endif
Push(%al) Push(%al)
orb $(B_Flag|X_Flag), F_Reg orb $(B_Flag|X_Flag), F_Reg
xorw %ax, %ax xorw %ax, %ax
@ -1297,13 +1291,7 @@ ENTRY(op_JSR) // 0x20
GetAbs GetAbs
movw PC_Reg, %ax movw PC_Reg, %ax
decw %ax decw %ax
#if __PIC__
xchgb %al, %ah
Push(%al)
shrw $8, %ax
#else
Push(%ah) Push(%ah)
#endif
Push(%al) Push(%al)
movw EffectiveAddr, PC_Reg movw EffectiveAddr, PC_Reg
Continue Continue
@ -1543,12 +1531,7 @@ ENTRY(op_PHX)
---------------------------------- */ ---------------------------------- */
ENTRY(op_PHY) ENTRY(op_PHY)
#if __PIC__
movb Y_Reg, %al
Push(%al)
#else
Push(Y_Reg) Push(Y_Reg)
#endif
Continue Continue
/* ---------------------------------- /* ----------------------------------
@ -1588,12 +1571,7 @@ ENTRY(op_PLX)
---------------------------------- */ ---------------------------------- */
ENTRY(op_PLY) ENTRY(op_PLY)
#if __PIC__
Pop(%al)
movb %al, Y_Reg
#else
Pop(Y_Reg) Pop(Y_Reg)
#endif
orb Y_Reg, Y_Reg orb Y_Reg, Y_Reg
FlagNZ FlagNZ
Continue Continue
@ -1663,21 +1641,10 @@ ENTRY(op_ROR_abs_x) // 0x7e
ENTRY(op_RTI) // 0x40 ENTRY(op_RTI) // 0x40
Pop(%al) Pop(%al)
#if __PIC__
MOVB_IND(CPU65_FLAGS_DECODE,_XAX,%al)
movb %al, F_Reg
#else
MOVB_IND(CPU65_FLAGS_DECODE,_XAX,F_Reg) MOVB_IND(CPU65_FLAGS_DECODE,_XAX,F_Reg)
#endif
orb $(B_Flag|X_Flag), F_Reg orb $(B_Flag|X_Flag), F_Reg
Pop(%al) Pop(%al)
#if __PIC__
shlw $8, %ax
Pop(%al)
xchgb %al, %ah
#else
Pop(%ah) Pop(%ah)
#endif
movw %ax, PC_Reg movw %ax, PC_Reg
Continue Continue
@ -1687,13 +1654,7 @@ ENTRY(op_RTI) // 0x40
ENTRY(op_RTS) // 0x60 ENTRY(op_RTS) // 0x60
Pop(%al) Pop(%al)
#if __PIC__
shlw $8, %ax
Pop(%al)
xchgb %al, %ah
#else
Pop(%ah) Pop(%ah)
#endif
incw %ax incw %ax
movw %ax, PC_Reg movw %ax, PC_Reg
Continue Continue
@ -2202,13 +2163,7 @@ ex_irq: testb $I_Flag, F_Reg // Already interrupt
JumpNextInstruction // Yes (ignored) ... JumpNextInstruction // Yes (ignored) ...
1: TRACE_IRQ // No (handle IRQ) ... 1: TRACE_IRQ // No (handle IRQ) ...
movw PC_Reg, %ax movw PC_Reg, %ax
#if __PIC__
xchgb %al, %ah
Push(%al)
shrw $8, %ax
#else
Push(%ah) Push(%ah)
#endif
Push(%al) Push(%al)
orb $X_Flag, F_Reg orb $X_Flag, F_Reg
xorw %ax, %ax xorw %ax, %ax
@ -2230,15 +2185,15 @@ ex_irq: testb $I_Flag, F_Reg // Already interrupt
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
ENTRY(cpu65_run) ENTRY(cpu65_run)
pushLQ _XBP
pushLQ _XDI
pushLQ _XSI
pushLQ _XBX
#if __LP64__ #if __LP64__
movLQ %rdi, reg_args movLQ %rdi, reg_args
#else #else
movLQ 4(%esp), reg_args movLQ 4(%esp), reg_args
#endif #endif
pushLQ _XBP
pushLQ _XDI
pushLQ _XSI
pushLQ _XBX
// Restore CPU state when being called from C. // Restore CPU state when being called from C.
movzwLQ CPU65_EA(reg_args), EffectiveAddr_X movzwLQ CPU65_EA(reg_args), EffectiveAddr_X