lifning
/
gpsp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ARM] Add support for ARMv5

This commit is contained in:
David Guillen Fandos 2021-10-23 23:59:51 +02:00
parent d558fb4fc4
commit b65df123f8
2 changed files with 59 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
arm/arm_emit.h
View File

@ -51,7 +51,7 @@ u32 execute_spsr_restore(u32 address);
void execute_swi_arm(u32 pc); void execute_swi_arm(u32 pc);
void execute_swi_thumb(u32 pc); void execute_swi_thumb(u32 pc);
#define STORE_TBL_OFF 0x1DC #define STORE_TBL_OFF 0x118
#define SPSR_RAM_OFF 0x100 #define SPSR_RAM_OFF 0x100
#define write32(value) \ #define write32(value) \
@ -1264,30 +1264,49 @@ u32 execute_store_cpsr_body(u32 _cpsr, u32 store_mask, u32 address)
arm_psr_##transfer_type(op_type, psr_reg); \ arm_psr_##transfer_type(op_type, psr_reg); \
} \ } \
/* TODO: loads will need the PC passed as well for open address, however can /* We use USAT + ROR to map addresses to the handler table. For ARMv5 we use
* eventually be rectified with a hash table on the memory accesses the table -1 entry to map any out of range/unaligned access, and some fun
* (same with the stores) math/logical tricks to avoid using USAT */
*/
#if __ARM_ARCH >= 6
#define mem_calc_region(abits) \
if (abits) { \
ARM_MOV_REG_IMMSHIFT(0, reg_a2, reg_a0, ARMSHIFT_ROR, abits) \
ARM_USAT_ASR(0, reg_a2, 4, reg_a2, 24-abits, ARMCOND_AL); \
} else { \
ARM_USAT_ASR(0, reg_a2, 4, reg_a0, 24, ARMCOND_AL); \
}
#else
#define mem_calc_region(abits) \
if (abits) { \
ARM_ORR_REG_IMMSHIFT(0, reg_a2, reg_a0, reg_a0, ARMSHIFT_LSL, 32-abits);\
ARM_MOV_REG_IMMSHIFT(0, reg_a2, reg_a2, ARMSHIFT_LSR, 24); \
} else { \
ARM_MOV_REG_IMMSHIFT(0, reg_a2, reg_a0, ARMSHIFT_LSR, 24); \
} \
ARM_RSB_REG_IMM(0, ARMREG_LR, reg_a2, 15, 0); \
ARM_ORR_REG_IMMSHIFT(0, reg_a2, reg_a2, ARMREG_LR, ARMSHIFT_ASR, 31);
#endif
#define generate_load_call_byte(tblnum) \ #define generate_load_call_byte(tblnum) \
ARM_USAT_ASR(0, reg_a1, 4, reg_a0, 24, ARMCOND_AL); \ mem_calc_region(0); \
generate_add_imm(reg_a1, (STORE_TBL_OFF + 64*tblnum) >> 2, 0); \ generate_add_imm(reg_a2, (STORE_TBL_OFF + 68*tblnum + 4) >> 2, 0); \
ARM_LDR_REG_REG_SHIFT(0, reg_a1, reg_base, reg_a1, 0, 2); \
ARM_BLX(0, reg_a1); \
#define generate_load_call_mbyte(tblnum, abits) \
ARM_MOV_REG_IMMSHIFT(0, reg_a1, reg_a0, ARMSHIFT_ROR, abits) \
ARM_USAT_ASR(0, reg_a1, 4, reg_a1, 24-abits, ARMCOND_AL); \
generate_add_imm(reg_a1, (STORE_TBL_OFF + 64*tblnum) >> 2, 0); \
ARM_LDR_REG_REG_SHIFT(0, reg_a1, reg_base, reg_a1, 0, 2); \
ARM_BLX(0, reg_a1); \
#define generate_store_call(tblnum) \
ARM_USAT_ASR(0, reg_a2, 4, reg_a0, 24, ARMCOND_AL); \
generate_add_imm(reg_a2, (STORE_TBL_OFF + 64*tblnum) >> 2, 0); \
ARM_LDR_REG_REG_SHIFT(0, reg_a2, reg_base, reg_a2, 0, 2); \ ARM_LDR_REG_REG_SHIFT(0, reg_a2, reg_base, reg_a2, 0, 2); \
ARM_BLX(0, reg_a2); \ ARM_BLX(0, reg_a2); \
#define generate_load_call_mbyte(tblnum, abits) \
mem_calc_region(abits); \
generate_add_imm(reg_a2, (STORE_TBL_OFF + 68*tblnum + 4) >> 2, 0); \
ARM_LDR_REG_REG_SHIFT(0, reg_a2, reg_base, reg_a2, 0, 2); \
ARM_BLX(0, reg_a2); \
#define generate_store_call(tblnum) \
mem_calc_region(0); \
generate_add_imm(reg_a2, (STORE_TBL_OFF + 68*tblnum + 4) >> 2, 0); \
ARM_LDR_REG_REG_SHIFT(0, reg_a2, reg_base, reg_a2, 0, 2); \
ARM_BLX(0, reg_a2); \
#define generate_store_call_u8() generate_store_call(0) #define generate_store_call_u8() generate_store_call(0)
#define generate_store_call_u16() generate_store_call(1) #define generate_store_call_u16() generate_store_call(1)
#define generate_store_call_u32() generate_store_call(2) #define generate_store_call_u32() generate_store_call(2)
@ -1945,8 +1964,8 @@ void execute_swi_hle_divarm_c(void)
generate_indirect_branch_no_cycle_update(type) \ generate_indirect_branch_no_cycle_update(type) \
extern u32 ldst_handler_functions[9][16]; extern u32 ldst_handler_functions[9][17];
extern u32 ldst_lookup_tables[9][16]; extern u32 ldst_lookup_tables[9][17];
void init_emitter(void) { void init_emitter(void) {
memcpy(ldst_lookup_tables, ldst_handler_functions, sizeof(ldst_lookup_tables)); memcpy(ldst_lookup_tables, ldst_handler_functions, sizeof(ldst_lookup_tables));

25
arm/arm_stub.S
View File

@ -71,16 +71,22 @@ _##symbol:
#define VRAM_OFF -0x98000 #define VRAM_OFF -0x98000
#define EWRAM_OFF -0x80000 #define EWRAM_OFF -0x80000
#define SPSR_RAM_OFF 0x100 #define SPSR_RAM_OFF 0x100
#define REGMODE_RAM_OFF 0x118 #define STORE_TBL_OFF 0x118
#define STORE_TBL_OFF 0x1DC #define REGMODE_RAM_OFF 0x400
#define OAM_RAM_OFF 0x500 #define OAM_RAM_OFF 0x500
#define PAL_RAM_OFF 0x900 #define PAL_RAM_OFF 0x900
#define RDMAP_OFF 0xD00 #define RDMAP_OFF 0xD00
#define IOREG_OFF 0x8D00 #define IOREG_OFF 0x8D00
#define extract_u16(rd, rs) \ #if __ARM_ARCH >= 6
#define extract_u16(rd, rs) \
uxth rd, rs uxth rd, rs
#else
#define extract_u16(rd, rs) \
bic rd, rs, #0xff000000; \
bic rd, rd, #0x00ff0000
#endif
@ Will load the register set from memory into the appropriate cached registers. @ Will load the register set from memory into the appropriate cached registers.
@ See arm_emit.h for listing explanation. @ See arm_emit.h for listing explanation.
@ -561,6 +567,7 @@ ext_store_ignore:
add pc, lr, #4 @ return add pc, lr, #4 @ return
#define store_lookup_table(store_type) ;\ #define store_lookup_table(store_type) ;\
.word ext_store_u##store_type /* -1: ignore, for > 0x0F */;\
.word ext_store_ignore /* 0x00: BIOS, ignore */;\ .word ext_store_ignore /* 0x00: BIOS, ignore */;\
.word ext_store_ignore /* 0x01: ignore */;\ .word ext_store_ignore /* 0x01: ignore */;\
.word ext_store_ewram_u##store_type /* 0x02: ewram */;\ .word ext_store_ewram_u##store_type /* 0x02: ewram */;\
@ -777,6 +784,7 @@ ld_slow_##load_type: ;\
#define load_table_gen(load_type) ;\ #define load_table_gen(load_type) ;\
.long ld_slow_##load_type /* -1 (for regions above F) */;\
.long ld_bios_##load_type /* 0 BIOS */;\ .long ld_bios_##load_type /* 0 BIOS */;\
.long ld_slow_##load_type /* 1 Bad region */;\ .long ld_slow_##load_type /* 1 Bad region */;\
.long ld_ewram_##load_type /* 2 EWRAM */;\ .long ld_ewram_##load_type /* 2 EWRAM */;\
@ -829,13 +837,14 @@ defsymbl(reg)
.space 0x100 .space 0x100
defsymbl(spsr) defsymbl(spsr)
.space 24 .space 24
defsymbl(reg_mode)
.space 196
@ Place lookup tables here for easy access via base_reg too @ Place lookup tables here for easy access via base_reg too
defsymbl(ldst_lookup_tables) defsymbl(ldst_lookup_tables)
.space 4*16*4 @ store .space 4*17*4 @ store
.space 5*16*4 @ loads .space 5*17*4 @ loads
.space 228 @ Padding for alignment .space 132 @ Padding for alignment
defsymbl(reg_mode)
.space 196
.space 60 @ More padding!
defsymbl(oam_ram) defsymbl(oam_ram)
.space 0x400 .space 0x400
defsymbl(palette_ram) defsymbl(palette_ram)