portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add ins_size field in x86 instruction struct

Browse source
This commit is contained in:
Dhruv Maroo 2023-01-02 07:51:41 +05:30 committed by Anton Kochkov
parent 388404880d
commit 0053fc62a4
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
librz/analysis/arch/x86/x86_il.c
View file

@ -2799,7 +2799,7 @@ IL_LIFTER(call) {
RzILOpEffect *push_stuff = NULL;
if (analysis->bits == 64) {
push_stuff = x86_push_helper(U64(pc), 2);
push_stuff = x86_push_helper(U64(pc + ins->ins_size), 8);
} else {
push_stuff = SEQ4(SETL("_cs", UNSIGNED(analysis->bits, x86_il_get_reg(X86_REG_CS))), x86_push_helper(VARL("_cs"), analysis->bits / BITS_PER_BYTE), SETL("_pc", UN(analysis->bits, pc)), x86_push_helper(VARL("_pc"), analysis->bits / BITS_PER_BYTE));
}
@ -3812,7 +3812,7 @@ static x86_il_ins x86_ins[X86_INS_ENDING] = {
#include <rz_il/rz_il_opbuilder_end.h>
RZ_IPI bool rz_x86_il_opcode(RZ_NONNULL RzAnalysis *analysis, RZ_NONNULL RzAnalysisOp *aop, ut64 pc, RZ_BORROW RZ_NONNULL const X86ILIns *ins) {
rz_return_val_if_fail(analysis && aop && ins, false);
rz_return_val_if_fail(analysis && aop && ins && ins->ins_size > 0, false);
if (ins->mnem >= X86_INS_ENDING) {
RZ_LOG_ERROR("RzIL: x86: Invalid instruction type %d", ins->mnem);
return false;
@ -3821,7 +3821,6 @@ RZ_IPI bool rz_x86_il_opcode(RZ_NONNULL RzAnalysis *analysis, RZ_NONNULL RzAnaly
x86_il_ins lifter = x86_ins[ins->mnem];
RzILOpEffect *lifted;
if (!lifter) {
/* For unimplemented instructions */
lifter = x86_il_unimpl;

5
librz/analysis/arch/x86/x86_il.h
View file

@ -19,8 +19,9 @@ typedef cs_x86 X86Ins;
typedef x86_insn X86InsMnem;
typedef struct x86_il_instruction_t {
const X86Ins *structure;
X86InsMnem mnem;
const X86Ins *structure; ///< Capstone instruction data
X86InsMnem mnem; ///< Instruction mnemonic (enum)
ut8 ins_size; ///< Sie of instruction (in bytes)
} X86ILIns;
RZ_IPI bool rz_x86_il_opcode(RZ_NONNULL RzAnalysis *analysis, RZ_NONNULL RzAnalysisOp *aop, ut64 pc, RZ_BORROW RZ_NONNULL const X86ILIns *ins);

3
librz/analysis/p/analysis_x86_cs.c
View file

@ -3230,7 +3230,8 @@ static int analop(RzAnalysis *a, RzAnalysisOp *op, ut64 addr, const ut8 *buf, in
// x86 RzIL uplifting
X86ILIns x86_il_ins = {
.structure = &ctx->insn->detail->x86,
.mnem = ctx->insn->id
.mnem = ctx->insn->id,
.ins_size = op->size
};
rz_x86_il_opcode(a, op, addr, &x86_il_ins);
}