mirrors/dynarmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

jit_state: Split off CPSR.Q

Browse source
This commit is contained in:
MerryMage 2017-12-02 15:54:48 +00:00
parent 311361b409
commit a3432102b8
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/backend_x64/emit_x64.cpp
View file

@ -325,17 +325,16 @@ void EmitX64::EmitSetVFlag(RegAlloc& reg_alloc, IR::Block&, IR::Inst* inst) {
} }
void EmitX64::EmitOrQFlag(RegAlloc& reg_alloc, IR::Block&, IR::Inst* inst) { void EmitX64::EmitOrQFlag(RegAlloc& reg_alloc, IR::Block&, IR::Inst* inst) {
constexpr size_t flag_bit = 27; using namespace Xbyak::util;
constexpr u32 flag_mask = 1u << flag_bit;
auto args = reg_alloc.GetArgumentInfo(inst); auto args = reg_alloc.GetArgumentInfo(inst);
if (args[0].IsImmediate()) { if (args[0].IsImmediate()) {
if (args[0].GetImmediateU1()) if (args[0].GetImmediateU1())
code->or_(MJitStateCpsr_other(), flag_mask); code->mov(dword[r15 + offsetof(JitState, CPSR_q)], 1);
} else { } else {
Xbyak::Reg32 to_store = reg_alloc.UseScratchGpr(args[0]).cvt32(); Xbyak::Reg8 to_store = reg_alloc.UseGpr(args[0]).cvt8();
code->shl(to_store, flag_bit); code->or_(code->byte[r15 + offsetof(JitState, CPSR_q)], to_store);
code->or_(MJitStateCpsr_other(), to_store);
} }
} }

6
src/backend_x64/jitstate.cpp
View file

@ -47,6 +47,8 @@ namespace BackendX64 {
u32 JitState::Cpsr() const { u32 JitState::Cpsr() const {
u32 cpsr = 0; u32 cpsr = 0;
// Q flag
cpsr |= CPSR_q ? 1 << 27 : 0;
// GE flags // GE flags
cpsr |= Common::Bit<31>(CPSR_ge) ? 1 << 19 : 0; cpsr |= Common::Bit<31>(CPSR_ge) ? 1 << 19 : 0;
cpsr |= Common::Bit<23>(CPSR_ge) ? 1 << 18 : 0; cpsr |= Common::Bit<23>(CPSR_ge) ? 1 << 18 : 0;
@ -62,6 +64,8 @@ u32 JitState::Cpsr() const {
} }
void JitState::SetCpsr(u32 cpsr) { void JitState::SetCpsr(u32 cpsr) {
// Q flag
CPSR_q = Common::Bit<27>(cpsr) ? 1 : 0;
// GE flags // GE flags
CPSR_ge = 0; CPSR_ge = 0;
CPSR_ge |= Common::Bit<19>(cpsr) ? 0xFF000000 : 0; CPSR_ge |= Common::Bit<19>(cpsr) ? 0xFF000000 : 0;
@ -73,7 +77,7 @@ void JitState::SetCpsr(u32 cpsr) {
CPSR_et |= Common::Bit<9>(cpsr) ? 2 : 0; CPSR_et |= Common::Bit<9>(cpsr) ? 2 : 0;
CPSR_et |= Common::Bit<5>(cpsr) ? 1 : 0; CPSR_et |= Common::Bit<5>(cpsr) ? 1 : 0;
// Other flags // Other flags
CPSR_other = cpsr & 0xFFF0FDDF; CPSR_other = cpsr & 0xF7F0FDDF;
} }
void JitState::ResetRSB() { void JitState::ResetRSB() {

1
src/backend_x64/jitstate.h
View file

@ -31,6 +31,7 @@ struct JitState {
u32 CPSR_other = 0; u32 CPSR_other = 0;
u32 CPSR_ge = 0; u32 CPSR_ge = 0;
u32 CPSR_et = 0; u32 CPSR_et = 0;
u32 CPSR_q = 0;
u32 Cpsr() const; u32 Cpsr() const;
void SetCpsr(u32 cpsr); void SetCpsr(u32 cpsr);