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

hexagon: move might_have_jumped to state. (#5403)

Browse source
This commit is contained in:
Rot127 2025-09-22 14:58:44 +00:00 committed by GitHub
parent c61e10c61a
commit 3c9dd73f61
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
librz/arch/isa/hexagon/hexagon.h
View file

@ -269,6 +269,7 @@ typedef struct {
RzConfig *cfg;
RzPVector /*<RzAsmTokenPattern *>*/ *token_patterns; ///< PVector with token patterns. Priority ordered.
bool utf8_enabled; ///< If set, print UTF-8 characters.
bool might_have_jumped; ///< Is set if a previous IL packet was a branch. Indicates the next decoded packet is valid.
} HexState;
/**

9
librz/arch/isa/hexagon/hexagon_il.c
View file

@ -349,7 +349,6 @@ static inline bool pkt_at_addr_is_emu_ready(const HexPkt *pkt, const ut32 addr)
*/
RZ_IPI RZ_OWN RzILOpEffect *hex_get_il_op(const ut32 addr, const bool get_pkt_op, RZ_NONNULL HexState *state) {
rz_return_val_if_fail(state, NULL);
static bool might_has_jumped = false;
HexPkt *p = hex_get_pkt(state, addr);
if (!p) {
RZ_LOG_WARN("Packet was NULL although it should have been disassembled at this point.\n");
@ -362,13 +361,13 @@ RZ_IPI RZ_OWN RzILOpEffect *hex_get_il_op(const ut32 addr, const bool get_pkt_op
if (hic->identifier == HEX_INS_INVALID_DECODE) {
return NULL;
}
if (state->just_init || might_has_jumped) {
if (state->just_init || state->might_have_jumped) {
// Assume that the instruction at the address the VM was initialized is the first instruction.
// Also make it valid if a jump let to this packet.
p->is_valid = true;
hic->pkt_info.first_insn = true;
state->just_init = false;
might_has_jumped = false;
state->might_have_jumped = false;
}
if (!get_pkt_op && !hic->pkt_info.last_insn) {
@ -382,7 +381,7 @@ RZ_IPI RZ_OWN RzILOpEffect *hex_get_il_op(const ut32 addr, const bool get_pkt_op
}
if (!rz_pvector_empty(p->il_ops)) {
check_for_jumps(p, &might_has_jumped);
check_for_jumps(p, &state->might_have_jumped);
return hex_pkt_to_il_seq(p);
}
@ -410,7 +409,7 @@ RZ_IPI RZ_OWN RzILOpEffect *hex_get_il_op(const ut32 addr, const bool get_pkt_op
// Add a jump to the next packet.
rz_pvector_push(p->il_ops, &hex_next_jump_to_next_pkt);
check_for_jumps(p, &might_has_jumped);
check_for_jumps(p, &state->might_have_jumped);
return hex_pkt_to_il_seq(p);
}