oops
Signed-off-by: lizzie <lizzie@eden-emu.dev>
This commit is contained in:
parent
a8fb85badf
commit
0fda930b33
1 changed files with 3 additions and 4 deletions
|
|
@ -799,17 +799,16 @@ std::optional<u64> MatchAndExecuteOneInstruction(Core::Memory::Memory& memory, v
|
||||||
// Store temporal to not break aliasing rules :)
|
// Store temporal to not break aliasing rules :)
|
||||||
u64 tmp_sp = CTX_SP;
|
u64 tmp_sp = CTX_SP;
|
||||||
u64 tmp_pc = CTX_PC;
|
u64 tmp_pc = CTX_PC;
|
||||||
InterpreterVisitor visitor(memory, regs, vregs, tmp_sp, tmp_pc);
|
|
||||||
CTX_SP = tmp_sp;
|
|
||||||
CTX_PC = tmp_pc;
|
|
||||||
|
|
||||||
u32 instruction = memory.Read32(tmp_pc);
|
u32 instruction = memory.Read32(tmp_pc);
|
||||||
bool was_executed = false;
|
bool was_executed = false;
|
||||||
|
InterpreterVisitor visitor(memory, regs, vregs, tmp_sp, tmp_pc);
|
||||||
if (auto decoder = Dynarmic::A64::Decode<VisitorBase>(instruction)) {
|
if (auto decoder = Dynarmic::A64::Decode<VisitorBase>(instruction)) {
|
||||||
was_executed = decoder->get().call(visitor, instruction);
|
was_executed = decoder->get().call(visitor, instruction);
|
||||||
} else {
|
} else {
|
||||||
LOG_ERROR(Core_ARM, "Unallocated encoding: {:#x}", instruction);
|
LOG_ERROR(Core_ARM, "Unallocated encoding: {:#x}", instruction);
|
||||||
}
|
}
|
||||||
|
CTX_SP = tmp_sp;
|
||||||
|
CTX_PC = tmp_pc;
|
||||||
return was_executed ? std::optional<u64>(tmp_pc + 4) : std::nullopt;
|
return was_executed ? std::optional<u64>(tmp_pc + 4) : std::nullopt;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue