Skip to content

Commit

Permalink
i#2900: Fix operator error in opnd_compute_address_priv() (#3400)
Browse files Browse the repository at this point in the history
Fixes an error in opnd_compute_address_priv() for ARM
where '||' is accidentally used instead of '|'.

Fixes #2900
  • Loading branch information
umarcor authored and derekbruening committed Feb 28, 2019
1 parent 710a689 commit e523aa8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion core/arch/opnd_shared.c
Original file line number Diff line number Diff line change
Expand Up @@ -1885,7 +1885,7 @@ opnd_compute_address_priv(opnd_t opnd, priv_mcontext_t *mc)
(index_val >> amount) | (index_val << (sizeof(reg_t) * 8 - amount));
break;
case DR_SHIFT_RRX:
scaled_index = (index_val >> 1) ||
scaled_index = (index_val >> 1) |
(TEST(EFLAGS_C, mc->cpsr) ? (1 << (sizeof(reg_t) * 8 - 1)) : 0);
break;
default: scaled_index = index_val;
Expand Down

0 comments on commit e523aa8

Please sign in to comment.