diff --git a/src/backend_x64/hostloc.cpp b/src/backend_x64/hostloc.cpp index 2093623a..6349e4a8 100644 --- a/src/backend_x64/hostloc.cpp +++ b/src/backend_x64/hostloc.cpp @@ -10,12 +10,12 @@ namespace Dynarmic { namespace BackendX64 { Xbyak::Reg64 HostLocToReg64(HostLoc loc) { - DEBUG_ASSERT(HostLocIsGPR(loc)); + ASSERT(HostLocIsGPR(loc)); return Xbyak::Reg64(static_cast(loc)); } Xbyak::Xmm HostLocToXmm(HostLoc loc) { - DEBUG_ASSERT(HostLocIsXMM(loc)); + ASSERT(HostLocIsXMM(loc)); return Xbyak::Xmm(static_cast(loc) - static_cast(HostLoc::XMM0)); } @@ -23,7 +23,7 @@ Xbyak::Address SpillToOpArg(HostLoc loc) { using namespace Xbyak::util; static_assert(std::is_same::value, "Spill must be u64"); - DEBUG_ASSERT(HostLocIsSpill(loc)); + ASSERT(HostLocIsSpill(loc)); size_t i = static_cast(loc) - static_cast(HostLoc::FirstSpill); return qword[r15 + offsetof(JitState, Spill) + i * sizeof(u64)]; diff --git a/src/backend_x64/reg_alloc.cpp b/src/backend_x64/reg_alloc.cpp index 7f256555..3496f6cd 100644 --- a/src/backend_x64/reg_alloc.cpp +++ b/src/backend_x64/reg_alloc.cpp @@ -362,12 +362,12 @@ boost::optional RegAlloc::ValueLocation(const IR::Inst* value) const { } void RegAlloc::DefineValueImpl(IR::Inst* def_inst, HostLoc host_loc) { - DEBUG_ASSERT_MSG(!ValueLocation(def_inst), "def_inst has already been defined"); + ASSERT_MSG(!ValueLocation(def_inst), "def_inst has already been defined"); LocInfo(host_loc).AddValue(def_inst); } void RegAlloc::DefineValueImpl(IR::Inst* def_inst, const IR::Value& use_inst) { - DEBUG_ASSERT_MSG(!ValueLocation(def_inst), "def_inst has already been defined"); + ASSERT_MSG(!ValueLocation(def_inst), "def_inst has already been defined"); if (use_inst.IsImmediate()) { HostLoc location = ScratchImpl(any_gpr); @@ -376,7 +376,7 @@ void RegAlloc::DefineValueImpl(IR::Inst* def_inst, const IR::Value& use_inst) { return; } - DEBUG_ASSERT_MSG(ValueLocation(use_inst.GetInst()), "use_inst must already be defined"); + ASSERT_MSG(ValueLocation(use_inst.GetInst()), "use_inst must already be defined"); HostLoc location = *ValueLocation(use_inst.GetInst()); DefineValueImpl(def_inst, location); } @@ -456,12 +456,12 @@ HostLoc RegAlloc::FindFreeSpill() const { } HostLocInfo& RegAlloc::LocInfo(HostLoc loc) { - DEBUG_ASSERT(loc != HostLoc::RSP && loc != HostLoc::R15); + ASSERT(loc != HostLoc::RSP && loc != HostLoc::R15); return hostloc_info[static_cast(loc)]; } const HostLocInfo& RegAlloc::LocInfo(HostLoc loc) const { - DEBUG_ASSERT(loc != HostLoc::RSP && loc != HostLoc::R15); + ASSERT(loc != HostLoc::RSP && loc != HostLoc::R15); return hostloc_info[static_cast(loc)]; } diff --git a/src/frontend/ir/microinstruction.cpp b/src/frontend/ir/microinstruction.cpp index b5d89188..7ed7dc34 100644 --- a/src/frontend/ir/microinstruction.cpp +++ b/src/frontend/ir/microinstruction.cpp @@ -255,13 +255,13 @@ Inst* Inst::GetAssociatedPseudoOperation(Opcode opcode) { // This is faster than doing a search through the block. switch (opcode) { case IR::Opcode::GetCarryFromOp: - DEBUG_ASSERT(!carry_inst || carry_inst->GetOpcode() == Opcode::GetCarryFromOp); + ASSERT(!carry_inst || carry_inst->GetOpcode() == Opcode::GetCarryFromOp); return carry_inst; case IR::Opcode::GetOverflowFromOp: - DEBUG_ASSERT(!overflow_inst || overflow_inst->GetOpcode() == Opcode::GetOverflowFromOp); + ASSERT(!overflow_inst || overflow_inst->GetOpcode() == Opcode::GetOverflowFromOp); return overflow_inst; case IR::Opcode::GetGEFromOp: - DEBUG_ASSERT(!ge_inst || ge_inst->GetOpcode() == Opcode::GetGEFromOp); + ASSERT(!ge_inst || ge_inst->GetOpcode() == Opcode::GetGEFromOp); return ge_inst; default: break; @@ -278,15 +278,15 @@ Type Inst::GetType() const { } Value Inst::GetArg(size_t index) const { - DEBUG_ASSERT(index < GetNumArgsOf(op)); - DEBUG_ASSERT(!args[index].IsEmpty()); + ASSERT(index < GetNumArgsOf(op)); + ASSERT(!args[index].IsEmpty()); return args[index]; } void Inst::SetArg(size_t index, Value value) { - DEBUG_ASSERT(index < GetNumArgsOf(op)); - DEBUG_ASSERT(AreTypesCompatible(value.GetType(), GetArgTypeOf(op, index))); + ASSERT(index < GetNumArgsOf(op)); + ASSERT(AreTypesCompatible(value.GetType(), GetArgTypeOf(op, index))); if (!args[index].IsImmediate()) { UndoUse(args[index]); @@ -346,15 +346,15 @@ void Inst::UndoUse(const Value& value) { switch (op){ case Opcode::GetCarryFromOp: - DEBUG_ASSERT(value.GetInst()->carry_inst->GetOpcode() == Opcode::GetCarryFromOp); + ASSERT(value.GetInst()->carry_inst->GetOpcode() == Opcode::GetCarryFromOp); value.GetInst()->carry_inst = nullptr; break; case Opcode::GetOverflowFromOp: - DEBUG_ASSERT(value.GetInst()->overflow_inst->GetOpcode() == Opcode::GetOverflowFromOp); + ASSERT(value.GetInst()->overflow_inst->GetOpcode() == Opcode::GetOverflowFromOp); value.GetInst()->overflow_inst = nullptr; break; case Opcode::GetGEFromOp: - DEBUG_ASSERT(value.GetInst()->ge_inst->GetOpcode() == Opcode::GetGEFromOp); + ASSERT(value.GetInst()->ge_inst->GetOpcode() == Opcode::GetGEFromOp); value.GetInst()->ge_inst = nullptr; break; default: diff --git a/src/frontend/ir/value.cpp b/src/frontend/ir/value.cpp index 8ade5af2..50ea6e25 100644 --- a/src/frontend/ir/value.cpp +++ b/src/frontend/ir/value.cpp @@ -69,59 +69,59 @@ Type Value::GetType() const { } Arm::Reg Value::GetRegRef() const { - DEBUG_ASSERT(type == Type::RegRef); + ASSERT(type == Type::RegRef); return inner.imm_regref; } Arm::ExtReg Value::GetExtRegRef() const { - DEBUG_ASSERT(type == Type::ExtRegRef); + ASSERT(type == Type::ExtRegRef); return inner.imm_extregref; } Inst* Value::GetInst() const { - DEBUG_ASSERT(type == Type::Opaque); + ASSERT(type == Type::Opaque); return inner.inst; } bool Value::GetU1() const { if (type == Type::Opaque && inner.inst->GetOpcode() == Opcode::Identity) return inner.inst->GetArg(0).GetU1(); - DEBUG_ASSERT(type == Type::U1); + ASSERT(type == Type::U1); return inner.imm_u1; } u8 Value::GetU8() const { if (type == Type::Opaque && inner.inst->GetOpcode() == Opcode::Identity) return inner.inst->GetArg(0).GetU8(); - DEBUG_ASSERT(type == Type::U8); + ASSERT(type == Type::U8); return inner.imm_u8; } u16 Value::GetU16() const { if (type == Type::Opaque && inner.inst->GetOpcode() == Opcode::Identity) return inner.inst->GetArg(0).GetU16(); - DEBUG_ASSERT(type == Type::U16); + ASSERT(type == Type::U16); return inner.imm_u16; } u32 Value::GetU32() const { if (type == Type::Opaque && inner.inst->GetOpcode() == Opcode::Identity) return inner.inst->GetArg(0).GetU32(); - DEBUG_ASSERT(type == Type::U32); + ASSERT(type == Type::U32); return inner.imm_u32; } u64 Value::GetU64() const { if (type == Type::Opaque && inner.inst->GetOpcode() == Opcode::Identity) return inner.inst->GetArg(0).GetU64(); - DEBUG_ASSERT(type == Type::U64); + ASSERT(type == Type::U64); return inner.imm_u64; } std::array Value::GetCoprocInfo() const { if (type == Type::Opaque && inner.inst->GetOpcode() == Opcode::Identity) return inner.inst->GetArg(0).GetCoprocInfo(); - DEBUG_ASSERT(type == Type::CoprocInfo); + ASSERT(type == Type::CoprocInfo); return inner.imm_coproc; }