xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

libmach: fix RORREG, right shift with shift count 0 means >>32

Browse source
This commit is contained in:
cinap_lenrek 2016-09-03 16:47:51 +02:00
parent 1b4f432eae
commit 2e120a29db
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sys/src/libmach/5db.c
View file

@ -185,7 +185,7 @@ armclass(long w)
if(w & (1<<4))
op += 32;
else
if((w & (31<<7)) || (w & (1<<5)))
if(w & (31<<7 | 3<<5))
op += 16;
break;
case 1: /* data processing i,r,r */
@ -680,11 +680,11 @@ armshiftval(Map *map, Rgetter rget, Instr *i)
}
return ROR(v, s);
case 7: /* RORREG */
sprint(buf, "R%ld", (s>>1)&0xF);
s = rget(map, buf);
if(s == 0 || (s & 0xF) == 0)
sprint(buf, "R%ld", s >> 1);
s = rget(map, buf) & 0x1F;
if(s == 0)
return v;
return ROR(v, s & 0xF);
return ROR(v, s);
}
}
}
@ -1088,7 +1088,10 @@ format(char *mnemonic, Instr *i, char *f)
break;
case 'm':
bprint(i, "%lud", (i->w>>7) & 0x1f);
n = (i->w>>7) & 0x1f;
if (n == 0 && (i->w & (3<<5)) != 0)
n = 32;
bprint(i, "%d", n);
break;
case 'h':