Mirrors/asmjit
1
0
Fork 0
mirror of https://github.com/asmjit/asmjit.git synced 2025-12-18 13:04:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up AArch64 RAPass to not shadow variables in _rewrite() (Fixes #359)

Browse Source
This commit is contained in:
kobalicek
2022-04-01 00:41:54 +02:00
parent 7342f7d78d
commit e41f1c0fd7
1 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/asmjit/arm/a64rapass.cpp
View File

@@ -713,46 +713,48 @@ ASMJIT_FAVOR_SPEED Error ARMRAPass::_rewrite(BaseNode* first, BaseNode* stop) no
mem.clearRegHome(); mem.clearRegHome();
mem.addOffsetLo32(offset); mem.addOffsetLo32(offset);
} }
}
}
// Rewrite `loadAddressOf()` construct. // Rewrite `loadAddressOf()` construct.
if (node->type() == NodeType::kInst) { if (inst->realId() == Inst::kIdAdr && inst->opCount() == 2 && inst->op(1).isMem()) {
InstNode* inst = node->as<InstNode>(); BaseMem mem = inst->op(1).as<BaseMem>();
if (inst->realId() == Inst::kIdAdr && inst->opCount() == 2) { int64_t offset = mem.offset();
int64_t offset = mem.offset();
if (!mem.hasBase()) {
inst->setId(Inst::kIdMov);
inst->setOp(1, Imm(offset));
}
else {
InstId op = offset < 0 ? Inst::kIdSub : Inst::kIdAdd;
uint64_t val = offset < 0 ? Support::neg(uint64_t(offset)) : uint64_t(offset);
GpX base = GpX(mem.baseId()); if (!mem.hasBaseOrIndex()) {
inst->setId(Inst::kIdMov);
inst->setOp(1, Imm(offset));
}
else {
if (mem.hasIndex())
return DebugUtils::errored(kErrorInvalidAddressIndex);
inst->setId(op); GpX dst(inst->op(0).as<Gp>().id());
inst->setOpCount(3); GpX base(mem.baseId());
inst->setOp(1, base);
inst->setOp(2, Imm(val));
if (val > 0xFFFu && (val & ~uint64_t(0xFFF000u)) != 0) { InstId arithInstId = offset < 0 ? Inst::kIdSub : Inst::kIdAdd;
const Operand_& dst = inst->op(0); uint64_t absOffset = offset < 0 ? Support::neg(uint64_t(offset)) : uint64_t(offset);
// Use two operations if the stack address is greater than 4095.
if (val <= 0xFFFFFFu) {
cc()->_setCursor(inst->prev());
cc()->_emitI(op, dst, base, Imm(val & 0xFFFu));
inst->setOp(1, dst); inst->setId(arithInstId);
inst->setOp(2, Imm(val & 0xFFF000u)); inst->setOpCount(3);
} inst->setOp(1, base);
else { inst->setOp(2, Imm(absOffset));
cc()->_setCursor(inst->prev());
cc()->_emitI(Inst::kIdMov, inst->op(0), Imm(val));
inst->setOp(1, base); // Use two operations if the offset cannot be encoded with ADD/SUB.
inst->setOp(2, dst); if (absOffset > 0xFFFu && (absOffset & ~uint64_t(0xFFF000u)) != 0) {
} if (absOffset <= 0xFFFFFFu) {
} cc()->_setCursor(inst->prev());
} ASMJIT_PROPAGATE(cc()->emit(arithInstId, dst, base, Imm(absOffset & 0xFFFu)));
inst->setOp(1, dst);
inst->setOp(2, Imm(absOffset & 0xFFF000u));
}
else {
cc()->_setCursor(inst->prev());
ASMJIT_PROPAGATE(cc()->emit(Inst::kIdMov, inst->op(0), Imm(absOffset)));
inst->setOp(1, base);
inst->setOp(2, dst);
} }
} }
} }