|
From: <sv...@va...> - 2013-01-24 04:58:30
|
florian 2013-01-24 04:58:11 +0000 (Thu, 24 Jan 2013)
New Revision: 2654
Log:
Fix HReg <--> Uint mixup. iregNo returns an integer not a HReg.
Modified files:
trunk/priv/host_arm_defs.c
Modified: trunk/priv/host_arm_defs.c (+5 -5)
===================================================================
--- trunk/priv/host_arm_defs.c 2013-01-23 17:17:22 +00:00 (rev 2653)
+++ trunk/priv/host_arm_defs.c 2013-01-24 04:58:11 +00:00 (rev 2654)
@@ -2984,8 +2984,8 @@
}
case ARMin_Shift: {
UInt instr, subopc;
- HReg rD = iregNo(i->ARMin.Shift.dst);
- HReg rM = iregNo(i->ARMin.Shift.argL);
+ UInt rD = iregNo(i->ARMin.Shift.dst);
+ UInt rM = iregNo(i->ARMin.Shift.argL);
ARMRI5* argR = i->ARMin.Shift.argR;
switch (i->ARMin.Shift.op) {
case ARMsh_SHL: subopc = X0000; break;
@@ -3001,8 +3001,8 @@
}
case ARMin_Unary: {
UInt instr;
- HReg rDst = iregNo(i->ARMin.Unary.dst);
- HReg rSrc = iregNo(i->ARMin.Unary.src);
+ UInt rDst = iregNo(i->ARMin.Unary.dst);
+ UInt rSrc = iregNo(i->ARMin.Unary.src);
switch (i->ARMin.Unary.op) {
case ARMun_CLZ:
instr = XXXXXXXX(X1110,X0001,X0110,X1111,
@@ -3749,7 +3749,7 @@
}
case ARMin_FPSCR: {
Bool toFPSCR = i->ARMin.FPSCR.toFPSCR;
- HReg iReg = iregNo(i->ARMin.FPSCR.iReg);
+ UInt iReg = iregNo(i->ARMin.FPSCR.iReg);
if (toFPSCR) {
/* fmxr fpscr, iReg is EEE1 iReg A10 */
*p++ = 0xEEE10A10 | ((iReg & 0xF) << 12);
|