iris/kaizen
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

figure out this mov addressing thing fast please

Browse Source
This commit is contained in:
irisz64
2025-12-22 18:00:43 +01:00
parent b6426f2c8a
commit 817616ca88
3 changed files with 53 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/backend/core/JIT.cpp
View File

@@ -72,38 +72,40 @@ std::optional<u32> JIT::FetchInstruction(s64 vaddr) {
}
void JIT::SetPC32(const s32 val) {
code.mov(code.SCR1, REG(qword, pc));
code.mov(REG(qword, oldPC), code.SCR1);
code.mov(code.SCR1, val);
code.mov(REG(qword, pc), code.SCR1);
code.mov(code.SCR1, val + 4);
code.mov(REG(qword, nextPC), code.SCR1);
code.mov(code.SCR1, code.ptr[PC_OFFSET()]);
code.mov(code.ptr[OLD_PC_OFFSET()], code.SCR1);
code.mov(code.SCR1.cvt32(), val);
code.movsxd(code.SCR1.cvt64(), code.SCR1.cvt32());
code.mov(code.ptr[PC_OFFSET()], code.SCR1);
code.mov(code.SCR1.cvt32(), val + 4);
code.movsxd(code.SCR1.cvt64(), code.SCR1.cvt32());
code.mov(code.ptr[NEXT_PC_OFFSET()], code.SCR1);
}
void JIT::SetPC64(const s64 val) {
code.mov(code.SCR1, REG(qword, pc));
code.mov(REG(qword, oldPC), code.SCR1);
code.mov(code.SCR1, code.ptr[PC_OFFSET()]);
code.mov(code.ptr[OLD_PC_OFFSET()], code.SCR1);
code.mov(code.SCR1, val);
code.mov(REG(qword, pc), code.SCR1);
code.mov(code.ptr[PC_OFFSET()], code.SCR1);
code.mov(code.SCR1, val + 4);
code.mov(REG(qword, nextPC), code.SCR1);
code.mov(code.ptr[NEXT_PC_OFFSET()], code.SCR1);
}
void JIT::SetPC32(const Xbyak::Reg32& val) {
code.mov(code.SCR1, REG(qword, pc));
code.mov(REG(qword, oldPC), code.SCR1);
code.mov(code.SCR1, code.ptr[PC_OFFSET()]);
code.mov(code.ptr[OLD_PC_OFFSET()], code.SCR1);
code.movsxd(val.cvt64(), val);
code.mov(REG(qword, pc), val);
code.mov(code.ptr[PC_OFFSET()], val);
code.add(val, 4);
code.mov(REG(qword, nextPC), val);
code.mov(code.ptr[NEXT_PC_OFFSET()], val);
}
void JIT::SetPC64(const Xbyak::Reg64& val) {
code.mov(code.SCR1, REG(qword, pc));
code.mov(REG(qword, oldPC), code.SCR1);
code.mov(REG(qword, pc), val);
code.mov(code.SCR1, code.ptr[PC_OFFSET()]);
code.mov(code.ptr[OLD_PC_OFFSET()], code.SCR1);
code.mov(code.ptr[PC_OFFSET()], val);
code.add(val, 4);
code.mov(REG(qword, nextPC), val);
code.mov(code.ptr[NEXT_PC_OFFSET()], val);
}
u32 JIT::Step() {
@@ -192,15 +194,15 @@ u32 JIT::Step() {
if(!branch_taken) {
Xbyak::Label runtime_branch_taken;
code.mov(code.SCR1, JIT_VAR(byte, branch_taken));
code.mov(code.SCR1, code.byte[code.rbp + BRANCH_TAKEN_OFFSET()]);
code.cmp(code.SCR1, 0);
code.jne(runtime_branch_taken);
code.mov(code.SCR1, blockOldPC);
code.mov(REG(qword, oldPC), code.SCR1);
code.mov(code.ptr[OLD_PC_OFFSET()], code.SCR1);
code.mov(code.SCR1, blockPC);
code.mov(REG(qword, pc), code.SCR1);
code.mov(code.ptr[PC_OFFSET()], code.SCR1);
code.mov(code.SCR1, blockNextPC);
code.mov(REG(qword, nextPC), code.SCR1);
code.mov(code.ptr[NEXT_PC_OFFSET()], code.SCR1);
code.L(runtime_branch_taken);
}

24
src/backend/core/JIT.hpp
View File

@@ -16,13 +16,13 @@ static constexpr u32 kUpperSize = kAddressSpaceSize >> kUpperShift; // 0x800000
static constexpr u32 kLowerSize = 0x100; // 0x80
static constexpr u32 kCodeCacheSize = 32_mb;
static constexpr u32 kCodeCacheAllocSize = kCodeCacheSize + 4_kb;
#if 1
#define REG(acc, x) code.acc[reinterpret_cast<uintptr_t>(&regs.x)]
#define JIT_VAR(acc, x) code.acc[reinterpret_cast<uintptr_t>(&x)]
#else
#define REG(acc, x) code.acc[code.rbp + (reinterpret_cast<uintptr_t>(&regs.x) - reinterpret_cast<uintptr_t>(this))]
#define JIT_VAR(acc, x) code.acc[code.rbp + (reinterpret_cast<uintptr_t>(&x) - reinterpret_cast<uintptr_t>(this))]
#endif
#define OLD_PC_OFFSET() (reinterpret_cast<uintptr_t>(&regs.oldPC))
#define PC_OFFSET() (reinterpret_cast<uintptr_t>(&regs.pc))
#define NEXT_PC_OFFSET() (reinterpret_cast<uintptr_t>(&regs.nextPC))
#define GPR_OFFSET(x) (reinterpret_cast<uintptr_t>(&regs.gpr[(x)]))
#define BRANCH_TAKEN_OFFSET() (reinterpret_cast<uintptr_t>(&branch_taken) - reinterpret_cast<uintptr_t>(this))
#define HI_OFFSET() (reinterpret_cast<uintptr_t>(&regs.hi))
#define LO_OFFSET() (reinterpret_cast<uintptr_t>(&regs.lo))
#ifdef __aarch64__
struct JIT : BaseCPU {};
@@ -61,15 +61,15 @@ private:
csh disassemblerMips{}, disassemblerX86{};
template <typename T>
Xbyak::Address GPR(const size_t index) const {
Xbyak::Address GPR(const size_t index) {
if constexpr (sizeof(T) == 1) {
return REG(byte, gpr[index]);
return code.byte[GPR_OFFSET(index)];
} else if constexpr (sizeof(T) == 2) {
return REG(word, gpr[index]);
return code.word[GPR_OFFSET(index)];
} else if constexpr (sizeof(T) == 4) {
return REG(dword, gpr[index]);
return code.dword[GPR_OFFSET(index)];
} else if constexpr (sizeof(T) == 8) {
return REG(qword, gpr[index]);
return code.ptr[GPR_OFFSET(index)];
}
Util::Error::GetInstance().Throw(

34
src/backend/core/jit/instructions.cpp
View File

@@ -159,7 +159,7 @@ void JIT::bfc0(const Instruction instr) {
const s16 imm = instr;
const s64 offset = u64((s64)imm) << 2;
const s64 address = blockPC + offset;
// code.mov(code.al, REG(byte, cop1.fcr31.compare));
// code.mov(code.al, code.byte[code.rbp + REG_OFFSET(cop1.fcr31.compare));
// code.test(code.al, code.al);
// branch(address, z);
}
@@ -168,7 +168,7 @@ void JIT::blfc0(const Instruction instr) {
const s16 imm = instr;
const s64 offset = u64((s64)imm) << 2;
const s64 address = blockPC + offset;
// code.mov(code.al, REG(byte, cop1.fcr31.compare));
// code.mov(code.al, code.byte[code.rbp + REG_OFFSET(cop1.fcr31.compare));
// code.test(code.al, code.al);
// branch_likely(address, z);
}
@@ -177,7 +177,7 @@ void JIT::bfc1(const Instruction instr) {
const s16 imm = instr;
const s64 offset = u64((s64)imm) << 2;
const s64 address = blockPC + offset;
// code.mov(code.al, REG(byte, cop1.fcr31.compare));
// code.mov(code.al, code.byte[code.rbp + REG_OFFSET(cop1.fcr31.compare));
// code.test(code.al, code.al);
// branch(address, nz);
}
@@ -186,7 +186,7 @@ void JIT::blfc1(const Instruction instr) {
const s16 imm = instr;
const s64 offset = u64((s64)imm) << 2;
const s64 address = blockPC + offset;
// code.mov(code.al, REG(byte, cop1.fcr31.compare));
// code.mov(code.al, code.byte[code.rbp + REG_OFFSET(cop1.fcr31.compare));
// code.test(code.al, code.al);
// branch_likely(address, nz);
}
@@ -194,13 +194,13 @@ void JIT::blfc1(const Instruction instr) {
void JIT::BranchNotTaken() {}
void JIT::BranchTaken(const s64 offs) {
code.mov(code.SCR2, REG(qword, pc));
code.mov(code.SCR2, code.qword[PC_OFFSET()]);
code.add(code.SCR2, offs);
SetPC64(code.SCR2);
}
void JIT::BranchTaken(const Xbyak::Reg64 &offs) {
code.mov(code.SCR2, REG(qword, pc));
code.mov(code.SCR2, code.qword[PC_OFFSET()]);
code.add(code.SCR2, offs);
SetPC64(code.SCR2);
}
@@ -245,7 +245,7 @@ void JIT::branch_likely_constant(const bool cond, const s64 offset) {
code.jmp(not_taken); \
code.L(taken); \
BranchTaken(offs); \
code.mov(JIT_VAR(byte, branch_taken), 1); \
code.mov(code.byte[code.rbp + BRANCH_TAKEN_OFFSET()], 1); \
code.L(not_taken); \
} while(0)
@@ -255,7 +255,7 @@ void JIT::branch_likely_constant(const bool cond, const s64 offset) {
code.jmp(not_taken); \
code.L(taken); \
BranchAbsTaken(addr); \
code.mov(JIT_VAR(byte, branch_taken), 1); \
code.mov(code.byte[code.rbp + BRANCH_TAKEN_OFFSET()], 1); \
code.L(not_taken); \
} while(0)
@@ -265,7 +265,7 @@ void JIT::branch_likely_constant(const bool cond, const s64 offset) {
code.jmp(not_taken); \
code.L(taken); \
BranchTaken(offs); \
code.mov(JIT_VAR(byte, branch_taken), 1); \
code.mov(code.byte[code.rbp + BRANCH_TAKEN_OFFSET()], 1); \
code.jmp(end); \
code.L(not_taken); \
SetPC64(blockNextPC); \
@@ -1064,7 +1064,7 @@ void JIT::lhu(const Instruction instr) {
code.mov(code.ARG4, reinterpret_cast<uintptr_t>(&paddr));
emitMemberFunctionCall(&Cop0::MapVAddr, &regs.cop0);
code.mov(code.ARG2, code.qword[code.ARG4]);
code.mov(code.ARG2, code.ptr[code.ARG4]);
emitMemberFunctionCall(&Mem::Read<u16>, &mem);
regs.Write<u16>(instr.rt(), code.rax);
}
@@ -1107,7 +1107,7 @@ void JIT::lw(const Instruction instr) {
code.mov(code.ARG4, reinterpret_cast<uintptr_t>(&paddr));
emitMemberFunctionCall(&Cop0::MapVAddr, &regs.cop0);
code.mov(code.ARG2, code.qword[code.ARG4]);
code.mov(code.ARG2, code.ptr[code.ARG4]);
emitMemberFunctionCall(&Mem::Read<u32>, &mem);
regs.Write<s32>(instr.rt(), code.rax);
}
@@ -1124,7 +1124,7 @@ void JIT::mfhi(const Instruction instr) {
if (regs.GetHIConstant()) {
regs.Write(instr.rd(), regs.hi);
} else {
code.mov(code.SCR1, REG(qword, hi));
code.mov(code.SCR1, code.ptr[HI_OFFSET()]);
regs.Write<s64>(instr.rd(), code.SCR1);
}
}
@@ -1133,7 +1133,7 @@ void JIT::mflo(const Instruction instr) {
if (regs.GetLOConstant()) {
regs.Write(instr.rd(), regs.lo);
} else {
code.mov(code.SCR1, REG(qword, lo));
code.mov(code.SCR1, code.ptr[LO_OFFSET()]);
regs.Write<s64>(instr.rd(), code.SCR1);
}
}
@@ -1172,7 +1172,7 @@ void JIT::mthi(const Instruction instr) {
regs.SetHIConstant();
} else {
regs.Read<s64>(instr.rs(), code.SCR1);
code.mov(REG(qword, hi), code.SCR1);
code.mov(code.ptr[HI_OFFSET()], code.SCR1);
regs.UnsetHIConstant();
}
}
@@ -1183,7 +1183,7 @@ void JIT::mtlo(const Instruction instr) {
regs.SetLOConstant();
} else {
regs.Read<s64>(instr.rs(), code.SCR1);
code.mov(REG(qword, lo), code.SCR1);
code.mov(code.ptr[LO_OFFSET()], code.SCR1);
regs.UnsetLOConstant();
}
}
@@ -1395,7 +1395,7 @@ void JIT::sw(const Instruction instr) {
code.mov(code.ARG4, reinterpret_cast<uintptr_t>(&physical));
emitMemberFunctionCall(&Cop0::MapVAddr, &regs.cop0);
code.mov(code.ARG2, code.qword[code.ARG4]);
code.mov(code.ARG2, code.ptr[code.ARG4]);
regs.Read<s64>(instr.rt(), code.ARG3);
emitMemberFunctionCall(&Mem::WriteJIT<u32>, &mem);
@@ -1411,7 +1411,7 @@ void JIT::sw(const Instruction instr) {
code.mov(code.ARG4, reinterpret_cast<uintptr_t>(&physical));
emitMemberFunctionCall(&Cop0::MapVAddr, &regs.cop0);
code.mov(code.ARG2, code.qword[code.ARG4]);
code.mov(code.ARG2, code.ptr[code.ARG4]);
regs.Read<s64>(instr.rt(), code.ARG3);
emitMemberFunctionCall(&Mem::WriteJIT<u32>, &mem);
}