admin/zyantific-zasm
1
0
Fork 0
mirror of https://github.com/zyantific/zasm synced 2026-06-08 18:40:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #160 from zyantific/fix-insdetail-2

Browse Source 
Fix getting instruction detail for jump instructions with immediates
This commit is contained in:
Matt
2026-03-08 19:49:45 +02:00
committed by GitHub
parent d09bc880ff 7caa832840
commit 813a1875d1
2 changed files with 50 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/tests/tests.instructionsinfo.x64.cpp
+21
View File
@@ -88,4 +88,25 @@ namespace zasm::tests
ASSERT_EQ(opMem->getDisplacement(), 0x123456789);
}
TEST(InstructionInfoTests, LargeJsAddress)
{
Program program(MachineMode::AMD64);
x86::Assembler assembler(program);
const auto instr = zasm::Instruction() //
.setMnemonic(x86::Mnemonic::Js) //
.addOperand(zasm::Imm(0x18342F417)); //
const auto instrDetail = instr.getDetail(MachineMode::AMD64);
ASSERT_EQ(instrDetail.hasValue(), true);
const auto& instrInfo = instrDetail.value();
const auto op0 = instrInfo.getOperand(0);
auto* opImm = op0.getIf<Imm>();
ASSERT_NE(opImm, nullptr);
ASSERT_EQ(opImm->value<int64_t>(), 0x18342F417);
}
} // namespace zasm::tests
zasm/src/zasm/src/encoder/encoder.cpp
+29 -9
View File
@@ -18,17 +18,11 @@ namespace zasm
struct EncoderState
{
EncoderContext& ctx;
ZydisEncoderRequest req{};
std::size_t operandIndex{};
RelocationType relocKind{};
RelocationData relocData{};
Label::Id relocLabel{ Label::Id::Invalid };
EncoderState(EncoderContext& ctx_) noexcept
: ctx(ctx_)
{
}
};
// NOTE: This value has to be at least larger than 0xFFFF to be used with imm32/rel32 displacement.
@@ -240,12 +234,38 @@ namespace zasm
return ErrorCode::None;
}
static Error buildOperand_(EncoderContext&, ZydisEncoderOperand& dst, EncoderState& state, const Imm& src)
static Error buildOperand_(EncoderContext& ctx, ZydisEncoderOperand& dst, EncoderState& state, const Imm& src)
{
auto desiredBranchType = ZydisBranchType::ZYDIS_BRANCH_TYPE_NONE;
dst.type = ZydisOperandType::ZYDIS_OPERAND_TYPE_IMMEDIATE;
dst.imm.s = src.value<std::int64_t>();
if ((ctx.flags & EncoderFlags::temporary) != EncoderFlags::none)
{
const auto& encodeInfo = getEncodeVariantInfo(state.req.mnemonic);
if (encodeInfo.isControlFlow)
{
if (encodeInfo.canEncodeRel32())
{
dst.imm.s = ctx.va + kTemporaryRel32Value;
}
else if (encodeInfo.canEncodeRel8())
{
dst.imm.s = ctx.va + kTemporaryRel8Value;
}
else
{
dst.imm.s = src.value<std::int64_t>();
}
}
else
{
dst.imm.s = src.value<std::int64_t>();
}
}
else
{
dst.imm.s = src.value<std::int64_t>();
}
return ErrorCode::None;
}
@@ -451,7 +471,7 @@ namespace zasm
res.buffer.length = 0;
EncoderState state{ ctx };
EncoderState state{};
ZydisEncoderRequest& req = state.req;
if (mode == MachineMode::AMD64)