Skip to content

Commit 92959f7

Browse files
Change the order where register aliases fetch their numeric value to prioritize r_reg_get over r_flag_get
1 parent 93c9460 commit 92959f7

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

libr/core/numvars.inc.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,21 +1007,21 @@ static ut64 num_callback(RNum *userptr, const char *str, bool *ok) {
10071007
...
10081008
}
10091009
#endif
1010-
if ((flag = r_flag_get (core->flags, str))) {
1011-
ret = flag->addr;
1010+
// check for reg alias
1011+
RRegItem *r = r_reg_get (core->dbg->reg, str, -1);
1012+
if (r) {
10121013
if (ok) {
10131014
*ok = true;
10141015
}
1016+
ret = r_reg_get_value (core->dbg->reg, r);
10151017
return ret;
10161018
}
1017-
1018-
// check for reg alias
1019-
RRegItem *r = r_reg_get (core->dbg->reg, str, -1);
1020-
if (r) {
1019+
1020+
if ((flag = r_flag_get (core->flags, str))) {
1021+
ret = flag->addr;
10211022
if (ok) {
10221023
*ok = true;
10231024
}
1024-
ret = r_reg_get_value (core->dbg->reg, r);
10251025
return ret;
10261026
}
10271027
}

0 commit comments

Comments
 (0)