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

Get dynarec working again for PSP

Browse source
This commit is contained in:
bmaupin 2019-10-03 13:24:32 -04:00
parent 89e55e9902
commit a60de42f3a
5 changed files with 34 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -220,6 +220,8 @@ else ifeq ($(platform), psp1)
CFLAGS += -fomit-frame-pointer -ffast-math
CFLAGS += -falign-functions=32 -falign-loops -falign-labels -falign-jumps
STATIC_LINKING = 1
HAVE_DYNAREC = 1
CPU_ARCH := mips
# Vita
else ifeq ($(platform), vita)

3
Makefile.common
View file

@ -29,6 +29,9 @@ endif
ifeq ($(CPU_ARCH), arm)
SOURCES_ASM += $(CORE_DIR)/arm/arm_stub.S
endif
ifeq ($(CPU_ARCH), mips)
SOURCES_ASM += $(CORE_DIR)/psp/mips_stub.S
endif
endif
ifeq ($(CPU_ARCH), arm)

6
cpu_threaded.c
View file

@ -227,7 +227,7 @@ extern u8 bit_count[256];
u32 offset = opcode & 0x07FF \
#ifdef PSP_BUILD
#ifdef PSP
#include "psp/mips_emit.h"
@ -257,8 +257,10 @@ static INLINE void RW_END(void)
/* Cache invalidation */
#if defined(PSP_BUILD)
#if defined(PSP)
#define translate_invalidate_dcache() sceKernelDcacheWritebackAll()
#define invalidate_icache_region(addr, size) (void)0
#elif defined(VITA)
#define translate_invalidate_dcache_one(which) \
if (which##_translation_ptr > last_##which##_translation_ptr) \

17
psp/mips_emit.h
View file

@ -1553,9 +1553,13 @@ typedef enum
#define arm_generate_op_imm(name, load_op) \
arm_decode_data_proc_imm(opcode); \
ror(imm, imm, imm_ror); \
arm_op_check_##load_op(); \
generate_op_##name##_imm(arm_to_mips_reg[rd], arm_to_mips_reg[rn]) \
#define arm_generate_op_imm_flags(name, load_op) \
arm_generate_op_imm(name, load_op) \
#define arm_data_proc(name, type, flags_op) \
{ \
arm_generate_op_##type(name, yes); \
@ -2137,10 +2141,16 @@ u32 execute_store_cpsr_body(u32 _cpsr, u32 store_mask, u32 address)
mips_emit_addiu(arm_to_mips_reg[_rd], reg_r13, (imm * 4)); \
} \
#define thumb_adjust_sp(value) \
#define thumb_adjust_sp_up() \
mips_emit_addiu(reg_r13, reg_r13, (imm * 4)); \
#define thumb_adjust_sp_down() \
mips_emit_addiu(reg_r13, reg_r13, -(imm * 4)); \
#define thumb_adjust_sp(direction) \
{ \
thumb_decode_add_sp(); \
mips_emit_addiu(reg_r13, reg_r13, (value)); \
thumb_adjust_sp_##direction(); \
} \
// Decode types: shift, alu_op
@ -2203,6 +2213,9 @@ u32 execute_store_cpsr_body(u32 _cpsr, u32 store_mask, u32 address)
#define thumb_access_memory_generate_address_reg_imm(offset, reg_rb, reg_ro) \
mips_emit_addiu(reg_a0, arm_to_mips_reg[reg_rb], (offset)) \
#define thumb_access_memory_generate_address_reg_imm_sp(offset, reg_rb, reg_ro) \
mips_emit_addiu(reg_a0, arm_to_mips_reg[reg_rb], (offset * 4)) \
#define thumb_access_memory_generate_address_reg_reg(offset, reg_rb, reg_ro) \
mips_emit_addu(reg_a0, arm_to_mips_reg[reg_rb], arm_to_mips_reg[reg_ro]) \

14
psp/mips_stub.S
View file

@ -3343,8 +3343,13 @@ ror_zero_shift:
execute_arm_translate:
addu $17, $4, $0 # load cycle counter register
lui $16, %hi(reg) # load base register
addiu $16, %lo(reg)
lui $4, %hi(arm_reg) # load arm_reg address into $4
addiu $4, %lo(arm_reg)
jal move_reg # update reg to point to arm_reg
addu $16, $4, $0 # copy address of arm_reg into $16
extract_flags # load flag variables
and $1, $1, 0x20 # see if Thumb bit is set in flags
@ -3405,9 +3410,10 @@ iac_loop:
memory_map_read:
.space 0x8000
reg:
# This must be between memory_map_read and memory_map_write because it's used
# to calculate their addresses elsewhere in this file.
arm_reg:
.space 0x100
memory_map_write:
.space 0x8000