The-Homebrew-Cloud/Genesis-Plus-GX
2
0
Fork 0
mirror of https://github.com/ekeeke/Genesis-Plus-GX.git synced 2024-12-27 19:51:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update m68k

Browse Source
This commit is contained in:
twinaphex 2017-06-24 23:34:35 +02:00
parent ca06614c74
commit 24acab9e51
3 changed files with 3447 additions and 3447 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/m68k/m68kcpu.c
View File

@ -304,7 +304,7 @@ void m68k_run(unsigned int cycles)
void m68k_init(void) void m68k_init(void)
{ {
#ifdef BUILD_TABLES #ifdef BUILD_TABLES
static uint emulation_initialized = 0; static uint32_t emulation_initialized = 0;
/* The first call to this function initializes the opcode handler jump table */ /* The first call to this function initializes the opcode handler jump table */
if(!emulation_initialized) if(!emulation_initialized)

330
core/m68k/m68kcpu.h
View File

@ -586,7 +586,7 @@ static const uint16 m68ki_shift_16_table[65] =
0xffff, 0xffff 0xffff, 0xffff
}; };
static const uint m68ki_shift_32_table[65] = static const uint32_t m68ki_shift_32_table[65] =
{ {
0x00000000, 0x80000000, 0xc0000000, 0xe0000000, 0xf0000000, 0xf8000000, 0x00000000, 0x80000000, 0xc0000000, 0xe0000000, 0xf0000000, 0xf8000000,
0xfc000000, 0xfe000000, 0xff000000, 0xff800000, 0xffc00000, 0xffe00000, 0xfc000000, 0xfe000000, 0xff000000, 0xff800000, 0xffc00000, 0xffe00000,
@ -681,99 +681,99 @@ static const uint16 m68ki_exception_cycle_table[256] =
}; };
/* Read data immediately after the program counter */ /* Read data immediately after the program counter */
INLINE uint m68ki_read_imm_16(void); INLINE uint32_t m68ki_read_imm_16(void);
INLINE uint m68ki_read_imm_32(void); INLINE uint32_t m68ki_read_imm_32(void);
/* Read data with specific function code */ /* Read data with specific function code */
INLINE uint m68ki_read_8_fc (uint address, uint fc); INLINE uint32_t m68ki_read_8_fc (uint32_t address, uint32_t fc);
INLINE uint m68ki_read_16_fc (uint address, uint fc); INLINE uint32_t m68ki_read_16_fc (uint32_t address, uint32_t fc);
INLINE uint m68ki_read_32_fc (uint address, uint fc); INLINE uint32_t m68ki_read_32_fc (uint32_t address, uint32_t fc);
/* Write data with specific function code */ /* Write data with specific function code */
INLINE void m68ki_write_8_fc (uint address, uint fc, uint value); INLINE void m68ki_write_8_fc (uint32_t address, uint32_t fc, uint32_t value);
INLINE void m68ki_write_16_fc(uint address, uint fc, uint value); INLINE void m68ki_write_16_fc(uint32_t address, uint32_t fc, uint32_t value);
INLINE void m68ki_write_32_fc(uint address, uint fc, uint value); INLINE void m68ki_write_32_fc(uint32_t address, uint32_t fc, uint32_t value);
/* Indexed and PC-relative ea fetching */ /* Indexed and PC-relative ea fetching */
INLINE uint m68ki_get_ea_pcdi(void); INLINE uint32_t m68ki_get_ea_pcdi(void);
INLINE uint m68ki_get_ea_pcix(void); INLINE uint32_t m68ki_get_ea_pcix(void);
INLINE uint m68ki_get_ea_ix(uint An); INLINE uint32_t m68ki_get_ea_ix(uint32_t An);
/* Operand fetching */ /* Operand fetching */
INLINE uint OPER_AY_AI_8(void); INLINE uint32_t OPER_AY_AI_8(void);
INLINE uint OPER_AY_AI_16(void); INLINE uint32_t OPER_AY_AI_16(void);
INLINE uint OPER_AY_AI_32(void); INLINE uint32_t OPER_AY_AI_32(void);
INLINE uint OPER_AY_PI_8(void); INLINE uint32_t OPER_AY_PI_8(void);
INLINE uint OPER_AY_PI_16(void); INLINE uint32_t OPER_AY_PI_16(void);
INLINE uint OPER_AY_PI_32(void); INLINE uint32_t OPER_AY_PI_32(void);
INLINE uint OPER_AY_PD_8(void); INLINE uint32_t OPER_AY_PD_8(void);
INLINE uint OPER_AY_PD_16(void); INLINE uint32_t OPER_AY_PD_16(void);
INLINE uint OPER_AY_PD_32(void); INLINE uint32_t OPER_AY_PD_32(void);
INLINE uint OPER_AY_DI_8(void); INLINE uint32_t OPER_AY_DI_8(void);
INLINE uint OPER_AY_DI_16(void); INLINE uint32_t OPER_AY_DI_16(void);
INLINE uint OPER_AY_DI_32(void); INLINE uint32_t OPER_AY_DI_32(void);
INLINE uint OPER_AY_IX_8(void); INLINE uint32_t OPER_AY_IX_8(void);
INLINE uint OPER_AY_IX_16(void); INLINE uint32_t OPER_AY_IX_16(void);
INLINE uint OPER_AY_IX_32(void); INLINE uint32_t OPER_AY_IX_32(void);
INLINE uint OPER_AX_AI_8(void); INLINE uint32_t OPER_AX_AI_8(void);
INLINE uint OPER_AX_AI_16(void); INLINE uint32_t OPER_AX_AI_16(void);
INLINE uint OPER_AX_AI_32(void); INLINE uint32_t OPER_AX_AI_32(void);
INLINE uint OPER_AX_PI_8(void); INLINE uint32_t OPER_AX_PI_8(void);
INLINE uint OPER_AX_PI_16(void); INLINE uint32_t OPER_AX_PI_16(void);
INLINE uint OPER_AX_PI_32(void); INLINE uint32_t OPER_AX_PI_32(void);
INLINE uint OPER_AX_PD_8(void); INLINE uint32_t OPER_AX_PD_8(void);
INLINE uint OPER_AX_PD_16(void); INLINE uint32_t OPER_AX_PD_16(void);
INLINE uint OPER_AX_PD_32(void); INLINE uint32_t OPER_AX_PD_32(void);
INLINE uint OPER_AX_DI_8(void); INLINE uint32_t OPER_AX_DI_8(void);
INLINE uint OPER_AX_DI_16(void); INLINE uint32_t OPER_AX_DI_16(void);
INLINE uint OPER_AX_DI_32(void); INLINE uint32_t OPER_AX_DI_32(void);
INLINE uint OPER_AX_IX_8(void); INLINE uint32_t OPER_AX_IX_8(void);
INLINE uint OPER_AX_IX_16(void); INLINE uint32_t OPER_AX_IX_16(void);
INLINE uint OPER_AX_IX_32(void); INLINE uint32_t OPER_AX_IX_32(void);
INLINE uint OPER_A7_PI_8(void); INLINE uint32_t OPER_A7_PI_8(void);
INLINE uint OPER_A7_PD_8(void); INLINE uint32_t OPER_A7_PD_8(void);
INLINE uint OPER_AW_8(void); INLINE uint32_t OPER_AW_8(void);
INLINE uint OPER_AW_16(void); INLINE uint32_t OPER_AW_16(void);
INLINE uint OPER_AW_32(void); INLINE uint32_t OPER_AW_32(void);
INLINE uint OPER_AL_8(void); INLINE uint32_t OPER_AL_8(void);
INLINE uint OPER_AL_16(void); INLINE uint32_t OPER_AL_16(void);
INLINE uint OPER_AL_32(void); INLINE uint32_t OPER_AL_32(void);
INLINE uint OPER_PCDI_8(void); INLINE uint32_t OPER_PCDI_8(void);
INLINE uint OPER_PCDI_16(void); INLINE uint32_t OPER_PCDI_16(void);
INLINE uint OPER_PCDI_32(void); INLINE uint32_t OPER_PCDI_32(void);
INLINE uint OPER_PCIX_8(void); INLINE uint32_t OPER_PCIX_8(void);
INLINE uint OPER_PCIX_16(void); INLINE uint32_t OPER_PCIX_16(void);
INLINE uint OPER_PCIX_32(void); INLINE uint32_t OPER_PCIX_32(void);
/* Stack operations */ /* Stack operations */
INLINE void m68ki_push_16(uint value); INLINE void m68ki_push_16(uint32_t value);
INLINE void m68ki_push_32(uint value); INLINE void m68ki_push_32(uint32_t value);
INLINE uint m68ki_pull_16(void); INLINE uint32_t m68ki_pull_16(void);
INLINE uint m68ki_pull_32(void); INLINE uint32_t m68ki_pull_32(void);
/* Program flow operations */ /* Program flow operations */
INLINE void m68ki_jump(uint new_pc); INLINE void m68ki_jump(uint32_t new_pc);
INLINE void m68ki_jump_vector(uint vector); INLINE void m68ki_jump_vector(uint32_t vector);
INLINE void m68ki_branch_8(uint offset); INLINE void m68ki_branch_8(uint32_t offset);
INLINE void m68ki_branch_16(uint offset); INLINE void m68ki_branch_16(uint32_t offset);
INLINE void m68ki_branch_32(uint offset); INLINE void m68ki_branch_32(uint32_t offset);
/* Status register operations. */ /* Status register operations. */
INLINE void m68ki_set_s_flag(uint value); /* Only bit 2 of value should be set (i.e. 4 or 0) */ INLINE void m68ki_set_s_flag(uint32_t value); /* Only bit 2 of value should be set (i.e. 4 or 0) */
INLINE void m68ki_set_ccr(uint value); /* set the condition code register */ INLINE void m68ki_set_ccr(uint32_t value); /* set the condition code register */
INLINE void m68ki_set_sr(uint value); /* set the status register */ INLINE void m68ki_set_sr(uint32_t value); /* set the status register */
/* Exception processing */ /* Exception processing */
INLINE uint m68ki_init_exception(void); /* Initial exception processing */ INLINE uint32_t m68ki_init_exception(void); /* Initial exception processing */
INLINE void m68ki_stack_frame_3word(uint pc, uint sr); /* Stack various frame types */ INLINE void m68ki_stack_frame_3word(uint32_t pc, uint32_t sr); /* Stack various frame types */
#if M68K_EMULATE_ADDRESS_ERROR #if M68K_EMULATE_ADDRESS_ERROR
INLINE void m68ki_stack_frame_buserr(uint sr); INLINE void m68ki_stack_frame_buserr(uint32_t sr);
#endif #endif
INLINE void m68ki_exception_trap(uint vector); INLINE void m68ki_exception_trap(uint32_t vector);
INLINE void m68ki_exception_trapN(uint vector); INLINE void m68ki_exception_trapN(uint32_t vector);
#if M68K_EMULATE_TRACE #if M68K_EMULATE_TRACE
INLINE void m68ki_exception_trace(void); INLINE void m68ki_exception_trace(void);
#endif #endif
@ -784,7 +784,7 @@ INLINE void m68ki_exception_illegal(void);
#if M68K_EMULATE_ADDRESS_ERROR #if M68K_EMULATE_ADDRESS_ERROR
INLINE void m68ki_exception_address_error(void); INLINE void m68ki_exception_address_error(void);
#endif #endif
INLINE void m68ki_exception_interrupt(uint int_level); INLINE void m68ki_exception_interrupt(uint32_t int_level);
INLINE void m68ki_check_interrupts(void); /* ASG: check for interrupts */ INLINE void m68ki_check_interrupts(void); /* ASG: check for interrupts */
/* ======================================================================== */ /* ======================================================================== */
@ -797,7 +797,7 @@ INLINE void m68ki_check_interrupts(void); /* ASG: check for interrupt
/* Handles all immediate reads, does address error check, function code setting, /* Handles all immediate reads, does address error check, function code setting,
* and prefetching if they are enabled in m68kconf.h * and prefetching if they are enabled in m68kconf.h
*/ */
INLINE uint m68ki_read_imm_16(void) INLINE uint32_t m68ki_read_imm_16(void)
{ {
m68ki_set_fc(FLAG_S | FUNCTION_CODE_USER_PROGRAM) /* auto-disable (see m68kcpu.h) */ m68ki_set_fc(FLAG_S | FUNCTION_CODE_USER_PROGRAM) /* auto-disable (see m68kcpu.h) */
#if M68K_CHECK_PC_ADDRESS_ERROR #if M68K_CHECK_PC_ADDRESS_ERROR
@ -812,16 +812,16 @@ INLINE uint m68ki_read_imm_16(void)
REG_PC += 2; REG_PC += 2;
return MASK_OUT_ABOVE_16(CPU_PREF_DATA >> ((2-((REG_PC-2)&2))<<3)); return MASK_OUT_ABOVE_16(CPU_PREF_DATA >> ((2-((REG_PC-2)&2))<<3));
#else #else
uint pc = REG_PC; uint32_t pc = REG_PC;
REG_PC += 2; REG_PC += 2;
return m68k_read_immediate_16(pc); return m68k_read_immediate_16(pc);
#endif /* M68K_EMULATE_PREFETCH */ #endif /* M68K_EMULATE_PREFETCH */
} }
INLINE uint m68ki_read_imm_32(void) INLINE uint32_t m68ki_read_imm_32(void)
{ {
#if M68K_EMULATE_PREFETCH #if M68K_EMULATE_PREFETCH
uint temp_val; uint32_t temp_val;
m68ki_set_fc(FLAG_S | FUNCTION_CODE_USER_PROGRAM) /* auto-disable (see m68kcpu.h) */ m68ki_set_fc(FLAG_S | FUNCTION_CODE_USER_PROGRAM) /* auto-disable (see m68kcpu.h) */
#if M68K_CHECK_PC_ADDRESS_ERROR #if M68K_CHECK_PC_ADDRESS_ERROR
@ -848,7 +848,7 @@ INLINE uint m68ki_read_imm_32(void)
#if M68K_CHECK_PC_ADDRESS_ERROR #if M68K_CHECK_PC_ADDRESS_ERROR
m68ki_check_address_error(REG_PC, MODE_READ, FLAG_S | FUNCTION_CODE_USER_PROGRAM) /* auto-disable (see m68kcpu.h) */ m68ki_check_address_error(REG_PC, MODE_READ, FLAG_S | FUNCTION_CODE_USER_PROGRAM) /* auto-disable (see m68kcpu.h) */
#endif #endif
uint pc = REG_PC; uint32_t pc = REG_PC;
REG_PC += 4; REG_PC += 4;
return m68k_read_immediate_32(pc); return m68k_read_immediate_32(pc);
#endif /* M68K_EMULATE_PREFETCH */ #endif /* M68K_EMULATE_PREFETCH */
@ -864,7 +864,7 @@ INLINE uint m68ki_read_imm_32(void)
* These functions will also check for address error and set the function * These functions will also check for address error and set the function
* code if they are enabled in m68kconf.h. * code if they are enabled in m68kconf.h.
*/ */
INLINE uint m68ki_read_8_fc(uint address, uint fc) INLINE uint32_t m68ki_read_8_fc(uint32_t address, uint32_t fc)
{ {
cpu_memory_map *temp = &m68ki_cpu.memory_map[((address)>>16)&0xff];; cpu_memory_map *temp = &m68ki_cpu.memory_map[((address)>>16)&0xff];;
@ -874,7 +874,7 @@ INLINE uint m68ki_read_8_fc(uint address, uint fc)
else return READ_BYTE(temp->base, (address) & 0xffff); else return READ_BYTE(temp->base, (address) & 0xffff);
} }
INLINE uint m68ki_read_16_fc(uint address, uint fc) INLINE uint32_t m68ki_read_16_fc(uint32_t address, uint32_t fc)
{ {
cpu_memory_map *temp; cpu_memory_map *temp;
@ -886,7 +886,7 @@ INLINE uint m68ki_read_16_fc(uint address, uint fc)
else return *(uint16 *)(temp->base + ((address) & 0xffff)); else return *(uint16 *)(temp->base + ((address) & 0xffff));
} }
INLINE uint m68ki_read_32_fc(uint address, uint fc) INLINE uint32_t m68ki_read_32_fc(uint32_t address, uint32_t fc)
{ {
cpu_memory_map *temp; cpu_memory_map *temp;
@ -898,7 +898,7 @@ INLINE uint m68ki_read_32_fc(uint address, uint fc)
else return m68k_read_immediate_32(address); else return m68k_read_immediate_32(address);
} }
INLINE void m68ki_write_8_fc(uint address, uint fc, uint value) INLINE void m68ki_write_8_fc(uint32_t address, uint32_t fc, uint32_t value)
{ {
cpu_memory_map *temp; cpu_memory_map *temp;
@ -909,7 +909,7 @@ INLINE void m68ki_write_8_fc(uint address, uint fc, uint value)
else WRITE_BYTE(temp->base, (address) & 0xffff, value); else WRITE_BYTE(temp->base, (address) & 0xffff, value);
} }
INLINE void m68ki_write_16_fc(uint address, uint fc, uint value) INLINE void m68ki_write_16_fc(uint32_t address, uint32_t fc, uint32_t value)
{ {
cpu_memory_map *temp; cpu_memory_map *temp;
@ -921,7 +921,7 @@ INLINE void m68ki_write_16_fc(uint address, uint fc, uint value)
else *(uint16 *)(temp->base + ((address) & 0xffff)) = value; else *(uint16 *)(temp->base + ((address) & 0xffff)) = value;
} }
INLINE void m68ki_write_32_fc(uint address, uint fc, uint value) INLINE void m68ki_write_32_fc(uint32_t address, uint32_t fc, uint32_t value)
{ {
cpu_memory_map *temp; cpu_memory_map *temp;
@ -943,15 +943,15 @@ INLINE void m68ki_write_32_fc(uint address, uint fc, uint value)
/* The program counter relative addressing modes cause operands to be /* The program counter relative addressing modes cause operands to be
* retrieved from program space, not data space. * retrieved from program space, not data space.
*/ */
INLINE uint m68ki_get_ea_pcdi(void) INLINE uint32_t m68ki_get_ea_pcdi(void)
{ {
uint old_pc = REG_PC; uint32_t old_pc = REG_PC;
m68ki_use_program_space() /* auto-disable */ m68ki_use_program_space() /* auto-disable */
return old_pc + MAKE_INT_16(m68ki_read_imm_16()); return old_pc + MAKE_INT_16(m68ki_read_imm_16());
} }
INLINE uint m68ki_get_ea_pcix(void) INLINE uint32_t m68ki_get_ea_pcix(void)
{ {
m68ki_use_program_space() /* auto-disable */ m68ki_use_program_space() /* auto-disable */
return m68ki_get_ea_ix(REG_PC); return m68ki_get_ea_ix(REG_PC);
@ -999,12 +999,12 @@ INLINE uint m68ki_get_ea_pcix(void)
* 1 011 mem indir with long outer * 1 011 mem indir with long outer
* 1 100-111 reserved * 1 100-111 reserved
*/ */
INLINE uint m68ki_get_ea_ix(uint An) INLINE uint32_t m68ki_get_ea_ix(uint32_t An)
{ {
/* An = base register */ /* An = base register */
uint extension = m68ki_read_imm_16(); uint32_t extension = m68ki_read_imm_16();
uint Xn = 0; /* Index register */ uint32_t Xn = 0; /* Index register */
/* Calculate index */ /* Calculate index */
Xn = REG_DA[extension>>12]; /* Xn */ Xn = REG_DA[extension>>12]; /* Xn */
@ -1017,53 +1017,53 @@ INLINE uint m68ki_get_ea_ix(uint An)
/* Fetch operands */ /* Fetch operands */
INLINE uint OPER_AY_AI_8(void) {uint ea = EA_AY_AI_8(); return m68ki_read_8(ea); } INLINE uint32_t OPER_AY_AI_8(void) {uint32_t ea = EA_AY_AI_8(); return m68ki_read_8(ea); }
INLINE uint OPER_AY_AI_16(void) {uint ea = EA_AY_AI_16(); return m68ki_read_16(ea);} INLINE uint32_t OPER_AY_AI_16(void) {uint32_t ea = EA_AY_AI_16(); return m68ki_read_16(ea);}
INLINE uint OPER_AY_AI_32(void) {uint ea = EA_AY_AI_32(); return m68ki_read_32(ea);} INLINE uint32_t OPER_AY_AI_32(void) {uint32_t ea = EA_AY_AI_32(); return m68ki_read_32(ea);}
INLINE uint OPER_AY_PI_8(void) {uint ea = EA_AY_PI_8(); return m68ki_read_8(ea); } INLINE uint32_t OPER_AY_PI_8(void) {uint32_t ea = EA_AY_PI_8(); return m68ki_read_8(ea); }
INLINE uint OPER_AY_PI_16(void) {uint ea = EA_AY_PI_16(); return m68ki_read_16(ea);} INLINE uint32_t OPER_AY_PI_16(void) {uint32_t ea = EA_AY_PI_16(); return m68ki_read_16(ea);}
INLINE uint OPER_AY_PI_32(void) {uint ea = EA_AY_PI_32(); return m68ki_read_32(ea);} INLINE uint32_t OPER_AY_PI_32(void) {uint32_t ea = EA_AY_PI_32(); return m68ki_read_32(ea);}
INLINE uint OPER_AY_PD_8(void) {uint ea = EA_AY_PD_8(); return m68ki_read_8(ea); } INLINE uint32_t OPER_AY_PD_8(void) {uint32_t ea = EA_AY_PD_8(); return m68ki_read_8(ea); }
INLINE uint OPER_AY_PD_16(void) {uint ea = EA_AY_PD_16(); return m68ki_read_16(ea);} INLINE uint32_t OPER_AY_PD_16(void) {uint32_t ea = EA_AY_PD_16(); return m68ki_read_16(ea);}
INLINE uint OPER_AY_PD_32(void) {uint ea = EA_AY_PD_32(); return m68ki_read_32(ea);} INLINE uint32_t OPER_AY_PD_32(void) {uint32_t ea = EA_AY_PD_32(); return m68ki_read_32(ea);}
INLINE uint OPER_AY_DI_8(void) {uint ea = EA_AY_DI_8(); return m68ki_read_8(ea); } INLINE uint32_t OPER_AY_DI_8(void) {uint32_t ea = EA_AY_DI_8(); return m68ki_read_8(ea); }
INLINE uint OPER_AY_DI_16(void) {uint ea = EA_AY_DI_16(); return m68ki_read_16(ea);} INLINE uint32_t OPER_AY_DI_16(void) {uint32_t ea = EA_AY_DI_16(); return m68ki_read_16(ea);}
INLINE uint OPER_AY_DI_32(void) {uint ea = EA_AY_DI_32(); return m68ki_read_32(ea);} INLINE uint32_t OPER_AY_DI_32(void) {uint32_t ea = EA_AY_DI_32(); return m68ki_read_32(ea);}
INLINE uint OPER_AY_IX_8(void) {uint ea = EA_AY_IX_8(); return m68ki_read_8(ea); } INLINE uint32_t OPER_AY_IX_8(void) {uint32_t ea = EA_AY_IX_8(); return m68ki_read_8(ea); }
INLINE uint OPER_AY_IX_16(void) {uint ea = EA_AY_IX_16(); return m68ki_read_16(ea);} INLINE uint32_t OPER_AY_IX_16(void) {uint32_t ea = EA_AY_IX_16(); return m68ki_read_16(ea);}
INLINE uint OPER_AY_IX_32(void) {uint ea = EA_AY_IX_32(); return m68ki_read_32(ea);} INLINE uint32_t OPER_AY_IX_32(void) {uint32_t ea = EA_AY_IX_32(); return m68ki_read_32(ea);}
INLINE uint OPER_AX_AI_8(void) {uint ea = EA_AX_AI_8(); return m68ki_read_8(ea); } INLINE uint32_t OPER_AX_AI_8(void) {uint32_t ea = EA_AX_AI_8(); return m68ki_read_8(ea); }
INLINE uint OPER_AX_AI_16(void) {uint ea = EA_AX_AI_16(); return m68ki_read_16(ea);} INLINE uint32_t OPER_AX_AI_16(void) {uint32_t ea = EA_AX_AI_16(); return m68ki_read_16(ea);}
INLINE uint OPER_AX_AI_32(void) {uint ea = EA_AX_AI_32(); return m68ki_read_32(ea);} INLINE uint32_t OPER_AX_AI_32(void) {uint32_t ea = EA_AX_AI_32(); return m68ki_read_32(ea);}
INLINE uint OPER_AX_PI_8(void) {uint ea = EA_AX_PI_8(); return m68ki_read_8(ea); } INLINE uint32_t OPER_AX_PI_8(void) {uint32_t ea = EA_AX_PI_8(); return m68ki_read_8(ea); }
INLINE uint OPER_AX_PI_16(void) {uint ea = EA_AX_PI_16(); return m68ki_read_16(ea);} INLINE uint32_t OPER_AX_PI_16(void) {uint32_t ea = EA_AX_PI_16(); return m68ki_read_16(ea);}
INLINE uint OPER_AX_PI_32(void) {uint ea = EA_AX_PI_32(); return m68ki_read_32(ea);} INLINE uint32_t OPER_AX_PI_32(void) {uint32_t ea = EA_AX_PI_32(); return m68ki_read_32(ea);}
INLINE uint OPER_AX_PD_8(void) {uint ea = EA_AX_PD_8(); return m68ki_read_8(ea); } INLINE uint32_t OPER_AX_PD_8(void) {uint32_t ea = EA_AX_PD_8(); return m68ki_read_8(ea); }
INLINE uint OPER_AX_PD_16(void) {uint ea = EA_AX_PD_16(); return m68ki_read_16(ea);} INLINE uint32_t OPER_AX_PD_16(void) {uint32_t ea = EA_AX_PD_16(); return m68ki_read_16(ea);}
INLINE uint OPER_AX_PD_32(void) {uint ea = EA_AX_PD_32(); return m68ki_read_32(ea);} INLINE uint32_t OPER_AX_PD_32(void) {uint32_t ea = EA_AX_PD_32(); return m68ki_read_32(ea);}
INLINE uint OPER_AX_DI_8(void) {uint ea = EA_AX_DI_8(); return m68ki_read_8(ea); } INLINE uint32_t OPER_AX_DI_8(void) {uint32_t ea = EA_AX_DI_8(); return m68ki_read_8(ea); }
INLINE uint OPER_AX_DI_16(void) {uint ea = EA_AX_DI_16(); return m68ki_read_16(ea);} INLINE uint32_t OPER_AX_DI_16(void) {uint32_t ea = EA_AX_DI_16(); return m68ki_read_16(ea);}
INLINE uint OPER_AX_DI_32(void) {uint ea = EA_AX_DI_32(); return m68ki_read_32(ea);} INLINE uint32_t OPER_AX_DI_32(void) {uint32_t ea = EA_AX_DI_32(); return m68ki_read_32(ea);}
INLINE uint OPER_AX_IX_8(void) {uint ea = EA_AX_IX_8(); return m68ki_read_8(ea); } INLINE uint32_t OPER_AX_IX_8(void) {uint32_t ea = EA_AX_IX_8(); return m68ki_read_8(ea); }
INLINE uint OPER_AX_IX_16(void) {uint ea = EA_AX_IX_16(); return m68ki_read_16(ea);} INLINE uint32_t OPER_AX_IX_16(void) {uint32_t ea = EA_AX_IX_16(); return m68ki_read_16(ea);}
INLINE uint OPER_AX_IX_32(void) {uint ea = EA_AX_IX_32(); return m68ki_read_32(ea);} INLINE uint32_t OPER_AX_IX_32(void) {uint32_t ea = EA_AX_IX_32(); return m68ki_read_32(ea);}
INLINE uint OPER_A7_PI_8(void) {uint ea = EA_A7_PI_8(); return m68ki_read_8(ea); } INLINE uint32_t OPER_A7_PI_8(void) {uint32_t ea = EA_A7_PI_8(); return m68ki_read_8(ea); }
INLINE uint OPER_A7_PD_8(void) {uint ea = EA_A7_PD_8(); return m68ki_read_8(ea); } INLINE uint32_t OPER_A7_PD_8(void) {uint32_t ea = EA_A7_PD_8(); return m68ki_read_8(ea); }
INLINE uint OPER_AW_8(void) {uint ea = EA_AW_8(); return m68ki_read_8(ea); } INLINE uint32_t OPER_AW_8(void) {uint32_t ea = EA_AW_8(); return m68ki_read_8(ea); }
INLINE uint OPER_AW_16(void) {uint ea = EA_AW_16(); return m68ki_read_16(ea);} INLINE uint32_t OPER_AW_16(void) {uint32_t ea = EA_AW_16(); return m68ki_read_16(ea);}
INLINE uint OPER_AW_32(void) {uint ea = EA_AW_32(); return m68ki_read_32(ea);} INLINE uint32_t OPER_AW_32(void) {uint32_t ea = EA_AW_32(); return m68ki_read_32(ea);}
INLINE uint OPER_AL_8(void) {uint ea = EA_AL_8(); return m68ki_read_8(ea); } INLINE uint32_t OPER_AL_8(void) {uint32_t ea = EA_AL_8(); return m68ki_read_8(ea); }
INLINE uint OPER_AL_16(void) {uint ea = EA_AL_16(); return m68ki_read_16(ea);} INLINE uint32_t OPER_AL_16(void) {uint32_t ea = EA_AL_16(); return m68ki_read_16(ea);}
INLINE uint OPER_AL_32(void) {uint ea = EA_AL_32(); return m68ki_read_32(ea);} INLINE uint32_t OPER_AL_32(void) {uint32_t ea = EA_AL_32(); return m68ki_read_32(ea);}
INLINE uint OPER_PCDI_8(void) {uint ea = EA_PCDI_8(); return m68ki_read_pcrel_8(ea); } INLINE uint32_t OPER_PCDI_8(void) {uint32_t ea = EA_PCDI_8(); return m68ki_read_pcrel_8(ea); }
INLINE uint OPER_PCDI_16(void) {uint ea = EA_PCDI_16(); return m68ki_read_pcrel_16(ea);} INLINE uint32_t OPER_PCDI_16(void) {uint32_t ea = EA_PCDI_16(); return m68ki_read_pcrel_16(ea);}
INLINE uint OPER_PCDI_32(void) {uint ea = EA_PCDI_32(); return m68ki_read_pcrel_32(ea);} INLINE uint32_t OPER_PCDI_32(void) {uint32_t ea = EA_PCDI_32(); return m68ki_read_pcrel_32(ea);}
INLINE uint OPER_PCIX_8(void) {uint ea = EA_PCIX_8(); return m68ki_read_pcrel_8(ea); } INLINE uint32_t OPER_PCIX_8(void) {uint32_t ea = EA_PCIX_8(); return m68ki_read_pcrel_8(ea); }
INLINE uint OPER_PCIX_16(void) {uint ea = EA_PCIX_16(); return m68ki_read_pcrel_16(ea);} INLINE uint32_t OPER_PCIX_16(void) {uint32_t ea = EA_PCIX_16(); return m68ki_read_pcrel_16(ea);}
INLINE uint OPER_PCIX_32(void) {uint ea = EA_PCIX_32(); return m68ki_read_pcrel_32(ea);} INLINE uint32_t OPER_PCIX_32(void) {uint32_t ea = EA_PCIX_32(); return m68ki_read_pcrel_32(ea);}
@ -1071,14 +1071,14 @@ INLINE uint OPER_PCIX_32(void) {uint ea = EA_PCIX_32(); return m68ki_read_pcre
/* Push/pull data from the stack */ /* Push/pull data from the stack */
/* Optimized access assuming stack is always located in ROM/RAM [EkeEke] */ /* Optimized access assuming stack is always located in ROM/RAM [EkeEke] */
INLINE void m68ki_push_16(uint value) INLINE void m68ki_push_16(uint32_t value)
{ {
REG_SP = MASK_OUT_ABOVE_32(REG_SP - 2); REG_SP = MASK_OUT_ABOVE_32(REG_SP - 2);
/*m68ki_write_16(REG_SP, value);*/ /*m68ki_write_16(REG_SP, value);*/
*(uint16 *)(m68ki_cpu.memory_map[(REG_SP>>16)&0xff].base + (REG_SP & 0xffff)) = value; *(uint16 *)(m68ki_cpu.memory_map[(REG_SP>>16)&0xff].base + (REG_SP & 0xffff)) = value;
} }
INLINE void m68ki_push_32(uint value) INLINE void m68ki_push_32(uint32_t value)
{ {
REG_SP = MASK_OUT_ABOVE_32(REG_SP - 4); REG_SP = MASK_OUT_ABOVE_32(REG_SP - 4);
/*m68ki_write_32(REG_SP, value);*/ /*m68ki_write_32(REG_SP, value);*/
@ -1086,17 +1086,17 @@ INLINE void m68ki_push_32(uint value)
*(uint16 *)(m68ki_cpu.memory_map[((REG_SP + 2)>>16)&0xff].base + ((REG_SP + 2) & 0xffff)) = value & 0xffff; *(uint16 *)(m68ki_cpu.memory_map[((REG_SP + 2)>>16)&0xff].base + ((REG_SP + 2) & 0xffff)) = value & 0xffff;
} }
INLINE uint m68ki_pull_16(void) INLINE uint32_t m68ki_pull_16(void)
{ {
uint sp = REG_SP; uint32_t sp = REG_SP;
REG_SP = MASK_OUT_ABOVE_32(REG_SP + 2); REG_SP = MASK_OUT_ABOVE_32(REG_SP + 2);
return m68k_read_immediate_16(sp); return m68k_read_immediate_16(sp);
/*return m68ki_read_16(sp);*/ /*return m68ki_read_16(sp);*/
} }
INLINE uint m68ki_pull_32(void) INLINE uint32_t m68ki_pull_32(void)
{ {
uint sp = REG_SP; uint32_t sp = REG_SP;
REG_SP = MASK_OUT_ABOVE_32(REG_SP + 4); REG_SP = MASK_OUT_ABOVE_32(REG_SP + 4);
return m68k_read_immediate_32(sp); return m68k_read_immediate_32(sp);
/*return m68ki_read_32(sp);*/ /*return m68ki_read_32(sp);*/
@ -1110,12 +1110,12 @@ INLINE uint m68ki_pull_32(void)
* These functions will also call the pc_changed callback if it was enabled * These functions will also call the pc_changed callback if it was enabled
* in m68kconf.h. * in m68kconf.h.
*/ */
INLINE void m68ki_jump(uint new_pc) INLINE void m68ki_jump(uint32_t new_pc)
{ {
REG_PC = new_pc; REG_PC = new_pc;
} }
INLINE void m68ki_jump_vector(uint vector) INLINE void m68ki_jump_vector(uint32_t vector)
{ {
REG_PC = m68ki_read_data_32(vector<<2); REG_PC = m68ki_read_data_32(vector<<2);
} }
@ -1126,17 +1126,17 @@ INLINE void m68ki_jump_vector(uint vector)
* So far I've found no problems with not calling pc_changed for 8 or 16 * So far I've found no problems with not calling pc_changed for 8 or 16
* bit branches. * bit branches.
*/ */
INLINE void m68ki_branch_8(uint offset) INLINE void m68ki_branch_8(uint32_t offset)
{ {
REG_PC += MAKE_INT_8(offset); REG_PC += MAKE_INT_8(offset);
} }
INLINE void m68ki_branch_16(uint offset) INLINE void m68ki_branch_16(uint32_t offset)
{ {
REG_PC += MAKE_INT_16(offset); REG_PC += MAKE_INT_16(offset);
} }
INLINE void m68ki_branch_32(uint offset) INLINE void m68ki_branch_32(uint32_t offset)
{ {
REG_PC += offset; REG_PC += offset;
} }
@ -1148,7 +1148,7 @@ INLINE void m68ki_branch_32(uint offset)
/* Set the S flag and change the active stack pointer. /* Set the S flag and change the active stack pointer.
* Note that value MUST be 4 or 0. * Note that value MUST be 4 or 0.
*/ */
INLINE void m68ki_set_s_flag(uint value) INLINE void m68ki_set_s_flag(uint32_t value)
{ {
/* Backup the old stack pointer */ /* Backup the old stack pointer */
REG_SP_BASE[FLAG_S] = REG_SP; REG_SP_BASE[FLAG_S] = REG_SP;
@ -1160,7 +1160,7 @@ INLINE void m68ki_set_s_flag(uint value)
/* Set the condition code register */ /* Set the condition code register */
INLINE void m68ki_set_ccr(uint value) INLINE void m68ki_set_ccr(uint32_t value)
{ {
FLAG_X = BIT_4(value) << 4; FLAG_X = BIT_4(value) << 4;
FLAG_N = BIT_3(value) << 4; FLAG_N = BIT_3(value) << 4;
@ -1171,7 +1171,7 @@ INLINE void m68ki_set_ccr(uint value)
/* Set the status register and check for interrupts */ /* Set the status register and check for interrupts */
INLINE void m68ki_set_sr(uint value) INLINE void m68ki_set_sr(uint32_t value)
{ {
/* Set the status register */ /* Set the status register */
FLAG_T1 = BIT_F(value); FLAG_T1 = BIT_F(value);
@ -1187,10 +1187,10 @@ INLINE void m68ki_set_sr(uint value)
/* ------------------------- Exception Processing ------------------------- */ /* ------------------------- Exception Processing ------------------------- */
/* Initiate exception processing */ /* Initiate exception processing */
INLINE uint m68ki_init_exception(void) INLINE uint32_t m68ki_init_exception(void)
{ {
/* Save the old status register */ /* Save the old status register */
uint sr = m68ki_get_sr(); uint32_t sr = m68ki_get_sr();
/* Turn off trace flag, clear pending traces */ /* Turn off trace flag, clear pending traces */
FLAG_T1 = 0; FLAG_T1 = 0;
@ -1203,7 +1203,7 @@ INLINE uint m68ki_init_exception(void)
} }
/* 3 word stack frame (68000 only) */ /* 3 word stack frame (68000 only) */
INLINE void m68ki_stack_frame_3word(uint pc, uint sr) INLINE void m68ki_stack_frame_3word(uint32_t pc, uint32_t sr)
{ {
m68ki_push_32(pc); m68ki_push_32(pc);
m68ki_push_16(sr); m68ki_push_16(sr);
@ -1212,7 +1212,7 @@ INLINE void m68ki_stack_frame_3word(uint pc, uint sr)
#if M68K_EMULATE_ADDRESS_ERROR #if M68K_EMULATE_ADDRESS_ERROR
/* Bus error stack frame (68000 only). /* Bus error stack frame (68000 only).
*/ */
INLINE void m68ki_stack_frame_buserr(uint sr) INLINE void m68ki_stack_frame_buserr(uint32_t sr)
{ {
m68ki_push_32(REG_PC); m68ki_push_32(REG_PC);
m68ki_push_16(sr); m68ki_push_16(sr);
@ -1229,9 +1229,9 @@ INLINE void m68ki_stack_frame_buserr(uint sr)
/* Used for Group 2 exceptions. /* Used for Group 2 exceptions.
*/ */
INLINE void m68ki_exception_trap(uint vector) INLINE void m68ki_exception_trap(uint32_t vector)
{ {
uint sr = m68ki_init_exception(); uint32_t sr = m68ki_init_exception();
m68ki_stack_frame_3word(REG_PC, sr); m68ki_stack_frame_3word(REG_PC, sr);
@ -1242,9 +1242,9 @@ INLINE void m68ki_exception_trap(uint vector)
} }
/* Trap#n stacks a 0 frame but behaves like group2 otherwise */ /* Trap#n stacks a 0 frame but behaves like group2 otherwise */
INLINE void m68ki_exception_trapN(uint vector) INLINE void m68ki_exception_trapN(uint32_t vector)
{ {
uint sr = m68ki_init_exception(); uint32_t sr = m68ki_init_exception();
m68ki_stack_frame_3word(REG_PC, sr); m68ki_stack_frame_3word(REG_PC, sr);
m68ki_jump_vector(vector); m68ki_jump_vector(vector);
@ -1256,7 +1256,7 @@ INLINE void m68ki_exception_trapN(uint vector)
/* Exception for trace mode */ /* Exception for trace mode */
INLINE void m68ki_exception_trace(void) INLINE void m68ki_exception_trace(void)
{ {
uint sr = m68ki_init_exception(); uint32_t sr = m68ki_init_exception();
#if M68K_EMULATE_ADDRESS_ERROR == OPT_ON #if M68K_EMULATE_ADDRESS_ERROR == OPT_ON
CPU_INSTR_MODE = INSTRUCTION_NO; CPU_INSTR_MODE = INSTRUCTION_NO;
@ -1276,7 +1276,7 @@ INLINE void m68ki_exception_trace(void)
/* Exception for privilege violation */ /* Exception for privilege violation */
static void m68ki_exception_privilege_violation(void) static void m68ki_exception_privilege_violation(void)
{ {
uint sr = m68ki_init_exception(); uint32_t sr = m68ki_init_exception();
#if M68K_EMULATE_ADDRESS_ERROR == OPT_ON #if M68K_EMULATE_ADDRESS_ERROR == OPT_ON
CPU_INSTR_MODE = INSTRUCTION_NO; CPU_INSTR_MODE = INSTRUCTION_NO;
@ -1292,7 +1292,7 @@ static void m68ki_exception_privilege_violation(void)
/* Exception for A-Line instructions */ /* Exception for A-Line instructions */
INLINE void m68ki_exception_1010(void) INLINE void m68ki_exception_1010(void)
{ {
uint sr = m68ki_init_exception(); uint32_t sr = m68ki_init_exception();
m68ki_stack_frame_3word(REG_PC-2, sr); m68ki_stack_frame_3word(REG_PC-2, sr);
m68ki_jump_vector(EXCEPTION_1010); m68ki_jump_vector(EXCEPTION_1010);
@ -1303,7 +1303,7 @@ INLINE void m68ki_exception_1010(void)
/* Exception for F-Line instructions */ /* Exception for F-Line instructions */
INLINE void m68ki_exception_1111(void) INLINE void m68ki_exception_1111(void)
{ {
uint sr = m68ki_init_exception(); uint32_t sr = m68ki_init_exception();
m68ki_stack_frame_3word(REG_PC-2, sr); m68ki_stack_frame_3word(REG_PC-2, sr);
m68ki_jump_vector(EXCEPTION_1111); m68ki_jump_vector(EXCEPTION_1111);
@ -1314,7 +1314,7 @@ INLINE void m68ki_exception_1111(void)
/* Exception for illegal instructions */ /* Exception for illegal instructions */
INLINE void m68ki_exception_illegal(void) INLINE void m68ki_exception_illegal(void)
{ {
uint sr = m68ki_init_exception(); uint32_t sr = m68ki_init_exception();
#if M68K_EMULATE_ADDRESS_ERROR == OPT_ON #if M68K_EMULATE_ADDRESS_ERROR == OPT_ON
CPU_INSTR_MODE = INSTRUCTION_NO; CPU_INSTR_MODE = INSTRUCTION_NO;
@ -1332,7 +1332,7 @@ INLINE void m68ki_exception_illegal(void)
/* Exception for address error */ /* Exception for address error */
INLINE void m68ki_exception_address_error(void) INLINE void m68ki_exception_address_error(void)
{ {
uint sr = m68ki_init_exception(); uint32_t sr = m68ki_init_exception();
/* If we were processing a bus error, address error, or reset, /* If we were processing a bus error, address error, or reset,
* this is a catastrophic failure. * this is a catastrophic failure.
@ -1357,9 +1357,9 @@ INLINE void m68ki_exception_address_error(void)
#endif #endif
/* Service an interrupt request and start exception processing */ /* Service an interrupt request and start exception processing */
INLINE void m68ki_exception_interrupt(uint int_level) INLINE void m68ki_exception_interrupt(uint32_t int_level)
{ {
uint vector, sr, new_pc; uint32_t vector, sr, new_pc;
#if M68K_EMULATE_ADDRESS_ERROR == OPT_ON #if M68K_EMULATE_ADDRESS_ERROR == OPT_ON
CPU_INSTR_MODE = INSTRUCTION_NO; CPU_INSTR_MODE = INSTRUCTION_NO;

6562
core/m68k/m68kops.h
View File

File diff suppressed because it is too large Load Diff