From 624e84fa090a9b18a2244bfe9d7ba1c20daacf32 Mon Sep 17 00:00:00 2001 From: MerryMage Date: Mon, 15 Aug 2016 14:08:06 +0100 Subject: [PATCH] Optimization: Tweak RSB --- src/backend_x64/emit_x64.cpp | 4 ++-- src/backend_x64/jitstate.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend_x64/emit_x64.cpp b/src/backend_x64/emit_x64.cpp index d2067380..45a44e16 100644 --- a/src/backend_x64/emit_x64.cpp +++ b/src/backend_x64/emit_x64.cpp @@ -1732,7 +1732,7 @@ void EmitX64::EmitTerminalLinkBlockFast(IR::Term::LinkBlockFast terminal, Arm::L void EmitX64::EmitTerminalPopRSBHint(IR::Term::PopRSBHint, Arm::LocationDescriptor initial_location) { // This calculation has to match up with IREmitter::PushRSB code->MOV(32, R(RBX), MJitStateCpsr()); - code->MOV(32, R(RCX), MJitStateReg(Arm::Reg::PC)); + code->MOVZX(64, 32, RCX, MJitStateReg(Arm::Reg::PC)); code->AND(32, R(RBX), Imm32((1 << 5) | (1 << 9))); code->SHR(32, R(RBX), Imm8(2)); code->OR(32, R(RBX), MDisp(R15, offsetof(JitState, guest_FPSCR_mode))); @@ -1744,7 +1744,7 @@ void EmitX64::EmitTerminalPopRSBHint(IR::Term::PopRSBHint, Arm::LocationDescript code->CMP(64, R(RBX), MDisp(R15, int(offsetof(JitState, rsb_location_descriptors) + i * sizeof(u64)))); code->CMOVcc(64, RAX, MDisp(R15, int(offsetof(JitState, rsb_codeptrs) + i * sizeof(u64))), CC_E); } - code->SUB(32, MDisp(R15, offsetof(JitState, rsb_ptr)), Imm32(1)); + code->JMPptr(R(RAX)); } diff --git a/src/backend_x64/jitstate.h b/src/backend_x64/jitstate.h index f110a40b..b50e5751 100644 --- a/src/backend_x64/jitstate.h +++ b/src/backend_x64/jitstate.h @@ -38,7 +38,7 @@ struct JitState { u32 exclusive_state = 0; u32 exclusive_address = 0; - static constexpr size_t RSBSize = 4; // MUST be a power of 2. + static constexpr size_t RSBSize = 8; // MUST be a power of 2.ss u32 rsb_ptr = 0; std::array rsb_location_descriptors; std::array rsb_codeptrs;