diff --git a/src/dynarmic/backend/arm64/emit_arm64.cpp b/src/dynarmic/backend/arm64/emit_arm64.cpp index 758a7d4a..c2fb89a6 100644 --- a/src/dynarmic/backend/arm64/emit_arm64.cpp +++ b/src/dynarmic/backend/arm64/emit_arm64.cpp @@ -79,6 +79,10 @@ template<> void EmitIR(oaknut::CodeGenerator& code, EmitContext& ctx, IR::Inst* inst) { auto args = ctx.reg_alloc.GetArgumentInfo(inst); + if (ctx.reg_alloc.IsValueLive(inst)) { + return; + } + auto Wvalue = ctx.reg_alloc.ReadW(args[0]); auto flags = ctx.reg_alloc.WriteFlags(inst); RegAlloc::Realize(Wvalue, flags); diff --git a/src/dynarmic/backend/arm64/emit_arm64_data_processing.cpp b/src/dynarmic/backend/arm64/emit_arm64_data_processing.cpp index ad688764..980a48fd 100644 --- a/src/dynarmic/backend/arm64/emit_arm64_data_processing.cpp +++ b/src/dynarmic/backend/arm64/emit_arm64_data_processing.cpp @@ -641,12 +641,56 @@ void EmitIR(oaknut::CodeGenerator& code, EmitContext& c ASSERT_FALSE("Unimplemented"); } +template +static void MaybeBitImm(oaknut::CodeGenerator& code, u64 imm, EmitFn emit_fn) { + static_assert(bitsize == 32 || bitsize == 64); + if constexpr (bitsize == 32) { + imm = static_cast(imm); + } + if (oaknut::detail::encode_bit_imm(imm)) { + emit_fn(imm); + } else { + code.MOV(Rscratch0(), imm); + emit_fn(Rscratch0()); + } +} + template<> void EmitIR(oaknut::CodeGenerator& code, EmitContext& ctx, IR::Inst* inst) { - (void)code; - (void)ctx; - (void)inst; - ASSERT_FALSE("Unimplemented"); + const auto nz_inst = inst->GetAssociatedPseudoOperation(IR::Opcode::GetNZFromOp); + const auto nzcv_inst = inst->GetAssociatedPseudoOperation(IR::Opcode::GetNZCVFromOp); + ASSERT(!(nz_inst && nzcv_inst)); + const auto flag_inst = nz_inst ? nz_inst : nzcv_inst; + + auto args = ctx.reg_alloc.GetArgumentInfo(inst); + auto Wresult = ctx.reg_alloc.WriteW(inst); + auto Wa = ctx.reg_alloc.ReadW(args[0]); + + if (flag_inst) { + auto Wflags = ctx.reg_alloc.WriteFlags(flag_inst); + + if (args[1].IsImmediate()) { + RegAlloc::Realize(Wresult, Wa, Wflags); + + MaybeBitImm<32>(code, args[1].GetImmediateU64(), [&](const auto& b) { code.ANDS(Wresult, Wa, b); }); + } else { + auto Wb = ctx.reg_alloc.ReadW(args[1]); + RegAlloc::Realize(Wresult, Wa, Wb, Wflags); + + code.ANDS(Wresult, Wb, Wb); + } + } else { + if (args[1].IsImmediate()) { + RegAlloc::Realize(Wresult, Wa); + + MaybeBitImm<32>(code, args[1].GetImmediateU64(), [&](const auto& b) { code.AND(Wresult, Wa, b); }); + } else { + auto Wb = ctx.reg_alloc.ReadW(args[1]); + RegAlloc::Realize(Wresult, Wa, Wb); + + code.AND(Wresult, Wb, Wb); + } + } } template<>