github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-08 12:35:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

CPU/Recompiler: Don't back up value to stack in mtc0

Browse Source 
Fixes misaligned stack that could crash in log messages.
This commit is contained in:
Stenzek 2024-12-19 18:15:15 +10:00
parent 568667753d
commit fe1fa765f7
No known key found for this signature in database
4 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/cpu_recompiler_arm32.cpp
View File

@ -31,10 +31,6 @@ LOG_CHANNEL(Recompiler);
#define PTR(x) vixl::aarch32::MemOperand(RSTATE, (((u8*)(x)) - ((u8*)&g_state))) #define PTR(x) vixl::aarch32::MemOperand(RSTATE, (((u8*)(x)) - ((u8*)&g_state)))
#define RMEMBASE vixl::aarch32::r3 #define RMEMBASE vixl::aarch32::r3
static constexpr u32 FUNCTION_CALLEE_SAVED_SPACE_RESERVE = 80; // 8 registers
static constexpr u32 FUNCTION_CALLER_SAVED_SPACE_RESERVE = 144; // 18 registers -> 224 bytes
static constexpr u32 FUNCTION_STACK_SIZE = FUNCTION_CALLEE_SAVED_SPACE_RESERVE + FUNCTION_CALLER_SAVED_SPACE_RESERVE;
#define RRET vixl::aarch32::r0 #define RRET vixl::aarch32::r0
#define RRETHI vixl::aarch32::r1 #define RRETHI vixl::aarch32::r1
#define RARG1 vixl::aarch32::r0 #define RARG1 vixl::aarch32::r0
@ -266,9 +262,6 @@ u32 CPU::CodeCache::EmitASMFunctions(void* code, u32 code_size)
g_enter_recompiler = armAsm->GetCursorAddress<decltype(g_enter_recompiler)>(); g_enter_recompiler = armAsm->GetCursorAddress<decltype(g_enter_recompiler)>();
{ {
// reserve some space for saving caller-saved registers
armAsm->sub(sp, sp, FUNCTION_STACK_SIZE);
// Need the CPU state for basically everything :-) // Need the CPU state for basically everything :-)
armMoveAddressToReg(armAsm, RSTATE, &g_state); armMoveAddressToReg(armAsm, RSTATE, &g_state);
} }
@ -2273,9 +2266,8 @@ void CPU::ARM32Recompiler::Compile_mtc0(CompileFlags cf)
Flush(FLUSH_FOR_C_CALL); Flush(FLUSH_FOR_C_CALL);
SwitchToFarCodeIfBitSet(changed_bits, 16); SwitchToFarCodeIfBitSet(changed_bits, 16);
armAsm->push(RegisterList(RARG1));
EmitCall(reinterpret_cast<const void*>(&CPU::UpdateMemoryPointers)); EmitCall(reinterpret_cast<const void*>(&CPU::UpdateMemoryPointers));
armAsm->pop(RegisterList(RARG1)); armAsm->ldr(RARG1, PTR(ptr)); // reload value for interrupt test below
if (CodeCache::IsUsingFastmem() && m_block->HasFlag(CodeCache::BlockFlags::ContainsLoadStoreInstructions) && if (CodeCache::IsUsingFastmem() && m_block->HasFlag(CodeCache::BlockFlags::ContainsLoadStoreInstructions) &&
IsHostRegAllocated(RMEMBASE.GetCode())) IsHostRegAllocated(RMEMBASE.GetCode()))
{ {

12
src/core/cpu_recompiler_arm64.cpp
View File

@ -28,10 +28,6 @@ LOG_CHANNEL(Recompiler);
#define PTR(x) vixl::aarch64::MemOperand(RSTATE, (((u8*)(x)) - ((u8*)&g_state))) #define PTR(x) vixl::aarch64::MemOperand(RSTATE, (((u8*)(x)) - ((u8*)&g_state)))
static constexpr u64 FUNCTION_CALLEE_SAVED_SPACE_RESERVE = 80; // 8 registers
static constexpr u64 FUNCTION_CALLER_SAVED_SPACE_RESERVE = 144; // 18 registers -> 224 bytes
static constexpr u64 FUNCTION_STACK_SIZE = FUNCTION_CALLEE_SAVED_SPACE_RESERVE + FUNCTION_CALLER_SAVED_SPACE_RESERVE;
#define RWRET vixl::aarch64::w0 #define RWRET vixl::aarch64::w0
#define RXRET vixl::aarch64::x0 #define RXRET vixl::aarch64::x0
#define RWARG1 vixl::aarch64::w0 #define RWARG1 vixl::aarch64::w0
@ -448,9 +444,6 @@ u32 CPU::CodeCache::EmitASMFunctions(void* code, u32 code_size)
g_enter_recompiler = armAsm->GetCursorAddress<decltype(g_enter_recompiler)>(); g_enter_recompiler = armAsm->GetCursorAddress<decltype(g_enter_recompiler)>();
{ {
// reserve some space for saving caller-saved registers
armAsm->sub(sp, sp, FUNCTION_STACK_SIZE);
// Need the CPU state for basically everything :-) // Need the CPU state for basically everything :-)
armMoveAddressToReg(armAsm, RSTATE, &g_state); armMoveAddressToReg(armAsm, RSTATE, &g_state);
@ -2436,11 +2429,8 @@ void CPU::ARM64Recompiler::Compile_mtc0(CompileFlags cf)
Flush(FLUSH_FOR_C_CALL); Flush(FLUSH_FOR_C_CALL);
SwitchToFarCodeIfBitSet(changed_bits, 16); SwitchToFarCodeIfBitSet(changed_bits, 16);
armAsm->sub(sp, sp, 16);
armAsm->str(RWARG1, MemOperand(sp));
EmitCall(reinterpret_cast<const void*>(&CPU::UpdateMemoryPointers)); EmitCall(reinterpret_cast<const void*>(&CPU::UpdateMemoryPointers));
armAsm->ldr(RWARG1, MemOperand(sp)); armAsm->ldr(RWARG1, PTR(ptr)); // reload value for interrupt test below
armAsm->add(sp, sp, 16);
armAsm->ldr(RMEMBASE, PTR(&g_state.fastmem_base)); armAsm->ldr(RMEMBASE, PTR(&g_state.fastmem_base));
SwitchToNearCode(true); SwitchToNearCode(true);

5
src/core/cpu_recompiler_riscv64.cpp
View File

@ -2286,11 +2286,8 @@ void CPU::RISCV64Recompiler::Compile_mtc0(CompileFlags cf)
rvAsm->SRLIW(RSCRATCH, changed_bits, 16); rvAsm->SRLIW(RSCRATCH, changed_bits, 16);
rvAsm->ANDI(RSCRATCH, RSCRATCH, 1); rvAsm->ANDI(RSCRATCH, RSCRATCH, 1);
SwitchToFarCode(true, &Assembler::BEQ, RSCRATCH, zero); SwitchToFarCode(true, &Assembler::BEQ, RSCRATCH, zero);
rvAsm->ADDI(sp, sp, -16);
rvAsm->SW(RARG1, 0, sp);
EmitCall(reinterpret_cast<const void*>(&CPU::UpdateMemoryPointers)); EmitCall(reinterpret_cast<const void*>(&CPU::UpdateMemoryPointers));
rvAsm->LW(RARG1, 0, sp); rvAsm->LW(new_value, PTR(ptr));
rvAsm->ADDI(sp, sp, 16);
rvAsm->LD(RMEMBASE, PTR(&g_state.fastmem_base)); rvAsm->LD(RMEMBASE, PTR(&g_state.fastmem_base));
SwitchToNearCode(true); SwitchToNearCode(true);

7
src/core/cpu_recompiler_x64.cpp
View File

@ -2243,11 +2243,8 @@ void CPU::X64Recompiler::Compile_mtc0(CompileFlags cf)
cg->test(changed_bits, 1u << 16); cg->test(changed_bits, 1u << 16);
SwitchToFarCode(true, &CodeGenerator::jnz); SwitchToFarCode(true, &CodeGenerator::jnz);
cg->mov(cg->dword[cg->rsp], RWARG2);
cg->sub(cg->rsp, STACK_SHADOW_SIZE + 8);
cg->call(&CPU::UpdateMemoryPointers); cg->call(&CPU::UpdateMemoryPointers);
cg->add(cg->rsp, STACK_SHADOW_SIZE + 8); cg->mov(RWARG2, cg->dword[PTR(ptr)]); // reload value for interrupt test below
cg->mov(RWARG2, cg->dword[cg->rsp]);
cg->mov(RMEMBASE, cg->qword[PTR(&g_state.fastmem_base)]); cg->mov(RMEMBASE, cg->qword[PTR(&g_state.fastmem_base)]);
SwitchToNearCode(true); SwitchToNearCode(true);
@ -2475,7 +2472,7 @@ u32 CPU::Recompiler::CompileLoadStoreThunk(void* thunk_code, u32 thunk_space, vo
num_gprs++; num_gprs++;
} }
const u32 stack_size = (((num_gprs + 1) & ~1u) * GPR_SIZE) + STACK_SHADOW_SIZE; const u32 stack_size = (((num_gprs + 1) & ~1u) * GPR_SIZE);
if (stack_size > 0) if (stack_size > 0)
{ {