OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-25 09:50:15 +00:00
Code Issues Projects Releases Wiki Activity

fixup! JitState: Should be final and should have initial values

Browse Source
This commit is contained in:
MerryMage 2016-04-05 09:41:23 +01:00
parent ecb66ecdec
commit cf24142769
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/arm/jit_x64/common.h
View File

@ -25,7 +25,7 @@ using Cond = ArmDecoder::Cond;
using ShiftType = ArmDecoder::ShiftType; using ShiftType = ArmDecoder::ShiftType;
using SignExtendRotation = ArmDecoder::SignExtendRotation; using SignExtendRotation = ArmDecoder::SignExtendRotation;
struct JitState { struct JitState final {
JitState() : cpu_state(PrivilegeMode::USER32MODE) {} JitState() : cpu_state(PrivilegeMode::USER32MODE) {}
void Reset() { void Reset() {
cpu_state.Reset(); cpu_state.Reset();
@ -33,10 +33,12 @@ struct JitState {
ARMul_State cpu_state; ARMul_State cpu_state;
u64 save_host_RSP; /// This value should always be appropriately aligned for a CALL instruction to be made.
u64 return_RIP; u64 save_host_RSP = 0;
/// Jitted code will JMP to this value when done. Should contain the an address which returns to the dispatcher.
s32 cycles_remaining; u64 return_RIP = 0;
/// If this value becomes <= 0, jitted code will jump to return_RIP.
s32 cycles_remaining = 0;
}; };
constexpr bool IsValidArmReg(ArmReg arm_reg) { constexpr bool IsValidArmReg(ArmReg arm_reg) {