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

backend/rv64: Implement basic Add32

Browse source
This commit is contained in:
Yang Liu 2024-02-19 16:31:05 +08:00 committed by Merry
parent 6142db8647
commit 8a11790363
2 changed files with 56 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/dynarmic/backend/riscv64/emit_riscv64_data_processing.cpp
View file

@ -225,21 +225,21 @@ static void AddImmWithFlags(biscuit::Assembler& as, biscuit::GPR rd, biscuit::GP
imm = static_cast<u32>(imm); imm = static_cast<u32>(imm);
} }
if (mcl::bit::sign_extend<12>(imm) == imm) { if (mcl::bit::sign_extend<12>(imm) == imm) {
as.ADDIW(rd, rs, imm); bitsize == 32 ? as.ADDIW(rd, rs, imm) : as.ADDI(rd, rs, imm);
} else { } else {
as.LI(Xscratch0, imm); as.LI(Xscratch0, imm);
as.ADDW(rd, rs, Xscratch0); bitsize == 32 ? as.ADDW(rd, rs, Xscratch0) : as.ADD(rd, rs, Xscratch0);
} }
// N // N
as.SEQZ(flags, rd); as.SEQZ(flags, rd);
as.SLLI(flags, flags, 30); as.SLLI(flags, flags, 30);
// Z // Z
as.SLTZ(Xscratch1, rd); as.SLTZ(Xscratch1, rd);
as.SLLI(Xscratch1, Xscratch1, 31); as.SLLI(Xscratch1, Xscratch1, 31);
as.OR(flags, flags, Xscratch1); as.OR(flags, flags, Xscratch1);
if constexpr (bitsize == 32) {
// C // C
if (mcl::bit::sign_extend<12>(imm) == imm) { if (mcl::bit::sign_extend<12>(imm) == imm) {
as.ADDI(Xscratch1, rs, imm); as.ADDI(Xscratch1, rs, imm);
@ -250,7 +250,6 @@ static void AddImmWithFlags(biscuit::Assembler& as, biscuit::GPR rd, biscuit::GP
as.LUI(Xscratch0, 0x20000); as.LUI(Xscratch0, 0x20000);
as.AND(Xscratch1, Xscratch1, Xscratch0); as.AND(Xscratch1, Xscratch1, Xscratch0);
as.OR(flags, flags, Xscratch1); as.OR(flags, flags, Xscratch1);
// V // V
as.LI(Xscratch0, imm); as.LI(Xscratch0, imm);
as.ADD(Xscratch1, rs, Xscratch0); as.ADD(Xscratch1, rs, Xscratch0);
@ -261,18 +260,24 @@ static void AddImmWithFlags(biscuit::Assembler& as, biscuit::GPR rd, biscuit::GP
as.SRLIW(Xscratch1, Xscratch1, 31); as.SRLIW(Xscratch1, Xscratch1, 31);
as.SLLI(Xscratch1, Xscratch1, 28); as.SLLI(Xscratch1, Xscratch1, 28);
as.OR(flags, flags, Xscratch1); as.OR(flags, flags, Xscratch1);
} else {
UNIMPLEMENTED();
}
} }
template<size_t bitsize> template<size_t bitsize, bool sub>
static void EmitSub(biscuit::Assembler& as, EmitContext& ctx, IR::Inst* inst) { static void EmitAddSub(biscuit::Assembler& as, EmitContext& ctx, IR::Inst* inst) {
const auto nzcv_inst = inst->GetAssociatedPseudoOperation(IR::Opcode::GetNZCVFromOp); const auto nzcv_inst = inst->GetAssociatedPseudoOperation(IR::Opcode::GetNZCVFromOp);
const auto overflow_inst = inst->GetAssociatedPseudoOperation(IR::Opcode::GetOverflowFromOp);
auto args = ctx.reg_alloc.GetArgumentInfo(inst); auto args = ctx.reg_alloc.GetArgumentInfo(inst);
auto Xresult = ctx.reg_alloc.WriteX(inst); auto Xresult = ctx.reg_alloc.WriteX(inst);
auto Xa = ctx.reg_alloc.ReadX(args[0]); auto Xa = ctx.reg_alloc.ReadX(args[0]);
if (nzcv_inst) { if (overflow_inst) {
UNIMPLEMENTED();
} else if (nzcv_inst) {
if (args[1].IsImmediate()) { if (args[1].IsImmediate()) {
const u64 imm = args[1].GetImmediateU64(); const u64 imm = args[1].GetImmediateU64();
@ -281,9 +286,9 @@ static void EmitSub(biscuit::Assembler& as, EmitContext& ctx, IR::Inst* inst) {
RegAlloc::Realize(Xresult, Xflags, Xa); RegAlloc::Realize(Xresult, Xflags, Xa);
if (args[2].GetImmediateU1()) { if (args[2].GetImmediateU1()) {
AddImmWithFlags<bitsize>(as, *Xresult, *Xa, ~imm, *Xflags); AddImmWithFlags<bitsize>(as, *Xresult, *Xa, sub ? ~imm : imm + 1, *Xflags);
} else { } else {
AddImmWithFlags<bitsize>(as, *Xresult, *Xa, -imm, *Xflags); AddImmWithFlags<bitsize>(as, *Xresult, *Xa, sub ? -imm : imm, *Xflags);
} }
} else { } else {
UNIMPLEMENTED(); UNIMPLEMENTED();
@ -292,13 +297,31 @@ static void EmitSub(biscuit::Assembler& as, EmitContext& ctx, IR::Inst* inst) {
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
} else { } else {
if (args[1].IsImmediate()) {
const u64 imm = args[1].GetImmediateU64();
if (args[2].IsImmediate()) {
UNIMPLEMENTED(); UNIMPLEMENTED();
} else {
auto Xnzcv = ctx.reg_alloc.ReadX(args[2]);
RegAlloc::Realize(Xresult, Xa, Xnzcv);
as.LUI(Xscratch0, 0x20000);
as.AND(Xscratch0, Xnzcv, Xscratch0);
as.SRLI(Xscratch0, Xscratch0, 29);
as.LI(Xscratch1, imm);
as.ADD(Xscratch0, Xscratch0, Xscratch1);
as.ADDW(Xresult, Xa, Xscratch0);
}
} else {
UNIMPLEMENTED();
}
} }
} }
template<> template<>
void EmitIR<IR::Opcode::Add32>(biscuit::Assembler&, EmitContext&, IR::Inst*) { void EmitIR<IR::Opcode::Add32>(biscuit::Assembler& as, EmitContext& ctx, IR::Inst* inst) {
UNIMPLEMENTED(); EmitAddSub<32, false>(as, ctx, inst);
} }
template<> template<>
@ -308,7 +331,7 @@ void EmitIR<IR::Opcode::Add64>(biscuit::Assembler&, EmitContext&, IR::Inst*) {
template<> template<>
void EmitIR<IR::Opcode::Sub32>(biscuit::Assembler& as, EmitContext& ctx, IR::Inst* inst) { void EmitIR<IR::Opcode::Sub32>(biscuit::Assembler& as, EmitContext& ctx, IR::Inst* inst) {
EmitSub<32>(as, ctx, inst); EmitAddSub<32, true>(as, ctx, inst);
} }
template<> template<>

4
src/dynarmic/backend/riscv64/reg_alloc.cpp
View file

@ -197,7 +197,7 @@ u32 RegAlloc::RealizeReadImpl(const IR::Value& value) {
// ASSERT size fits // ASSERT size fits
break; break;
case HostLoc::Kind::Spill: case HostLoc::Kind::Spill:
as.LD(biscuit::GPR{new_location_index}, spill_offset + new_location_index * spill_slot_size, biscuit::sp); as.LD(biscuit::GPR{new_location_index}, spill_offset + current_location->index * spill_slot_size, biscuit::sp);
break; break;
} }
@ -216,7 +216,7 @@ u32 RegAlloc::RealizeReadImpl(const IR::Value& value) {
ASSERT_FALSE("Logic error"); ASSERT_FALSE("Logic error");
break; break;
case HostLoc::Kind::Spill: case HostLoc::Kind::Spill:
as.FLD(biscuit::FPR{new_location_index}, spill_offset + new_location_index * spill_slot_size, biscuit::sp); as.FLD(biscuit::FPR{new_location_index}, spill_offset + current_location->index * spill_slot_size, biscuit::sp);
break; break;
} }