sim: Fix undefined behavior in the pseudo-inst interface

The order between updating and using arg_num in
PseudoInst::pseudoInst() is currently undefined. This changeset
explicitly updates arg_num after it has been used to extract an
argument.

--HG--
extra : rebase_source : 67c46dc3333d16ce56687ee8aea41ce6c6d133bb
This commit is contained in:
Andreas Sandberg 2013-09-18 17:08:35 +02:00
parent 9aa939891f
commit 4dbf25adc3

View file

@ -98,8 +98,10 @@ pseudoInst(ThreadContext *tc, uint8_t func, uint8_t subfunc)
// used the Argument class, but due to the possible side effects
// from getArgument, it'd most likely break.
int arg_num(0);
for (int i = 0; i < sizeof(args) / sizeof(*args); ++i)
args[arg_num++] = getArgument(tc, arg_num, sizeof(uint64_t), false);
for (int i = 0; i < sizeof(args) / sizeof(*args); ++i) {
args[arg_num] = getArgument(tc, arg_num, sizeof(uint64_t), false);
++arg_num;
}
switch (func) {
case 0x00: // arm_func