|
From: <sv...@va...> - 2010-08-22 18:24:59
|
Author: sewardj
Date: 2010-08-22 19:24:51 +0100 (Sun, 22 Aug 2010)
New Revision: 2017
Log:
Fix various compiler warnings and remove an unused function.
Modified:
trunk/priv/guest_arm_helpers.c
trunk/priv/guest_arm_toIR.c
trunk/priv/host_arm_isel.c
Modified: trunk/priv/guest_arm_helpers.c
===================================================================
--- trunk/priv/guest_arm_helpers.c 2010-08-22 12:59:02 UTC (rev 2016)
+++ trunk/priv/guest_arm_helpers.c 2010-08-22 18:24:51 UTC (rev 2017)
@@ -205,8 +205,9 @@
}
/* CALLED FROM GENERATED CODE: CLEAN HELPER */
-/* Calculate the QC flag from the thunk components, in the lowest bit
- of the word (bit 0). */
+/* Calculate the QC flag from the arguments, in the lowest bit
+ of the word (bit 0). Urr, having this out of line is bizarre.
+ Push back inline. */
UInt armg_calculate_flag_qc ( UInt resL1, UInt resL2,
UInt resR1, UInt resR2 )
{
@@ -216,20 +217,6 @@
return 0;
}
-UInt armg_calculate_flag_idc ( UInt res1, UInt res2,
- UInt res3, UInt res4 )
-{
- UInt exp1 = (res1 >> 23) & 0xff;
- UInt exp2 = (res2 >> 23) & 0xff;
- UInt exp3 = (res3 >> 23) & 0xff;
- UInt exp4 = (res4 >> 23) & 0xff;
- if ((exp1 == 0) || (exp2 == 0) || (exp3 == 0) || (exp3 == 0))
- return 1;
- else
- return 0;
-}
-
-
/* CALLED FROM GENERATED CODE: CLEAN HELPER */
/* Calculate the specified condition from the thunk components, in the
lowest bit of the word (bit 0). */
Modified: trunk/priv/guest_arm_toIR.c
===================================================================
--- trunk/priv/guest_arm_toIR.c 2010-08-22 12:59:02 UTC (rev 2016)
+++ trunk/priv/guest_arm_toIR.c 2010-08-22 18:24:51 UTC (rev 2017)
@@ -1186,6 +1186,8 @@
return res;
}
+// FIXME: this is named wrongly .. looks like a sticky set of
+// QC, not a write to it.
static void setFlag_QC ( IRExpr* resL, IRExpr* resR, Bool Q,
IRTemp condT )
{
@@ -2570,6 +2572,8 @@
op2 = Iop_GetElem32x2;
index = imm4 >> 3;
size = 32;
+ } else {
+ return False; // can this ever happen?
}
assign(res, unop(op, binop(op2, mkexpr(arg_m), mkU8(index))));
if (Q) {
Modified: trunk/priv/host_arm_isel.c
===================================================================
--- trunk/priv/host_arm_isel.c 2010-08-22 12:59:02 UTC (rev 2016)
+++ trunk/priv/host_arm_isel.c 2010-08-22 18:24:51 UTC (rev 2017)
@@ -182,37 +182,12 @@
return IRExpr_Binop(op, a1, a2);
}
-static IRExpr* triop ( IROp op, IRExpr* a1, IRExpr* a2, IRExpr* a3 )
-{
- return IRExpr_Triop(op, a1, a2, a3);
-}
-
static IRExpr* bind ( Int binder )
{
return IRExpr_Binder(binder);
}
-static IRExpr* mkU64 ( ULong i )
-{
- return IRExpr_Const(IRConst_U64(i));
-}
-static IRExpr* mkU32 ( UInt i )
-{
- return IRExpr_Const(IRConst_U32(i));
-}
-
-static IRExpr* mkU8 ( UInt i )
-{
- vassert(i < 256);
- return IRExpr_Const(IRConst_U8( (UChar)i ));
-}
-
-static IRExpr* mkU128 ( ULong i )
-{
- return binop(Iop_64HLtoV128, mkU64(i), mkU64(i));
-}
-
/*---------------------------------------------------------*/
/*--- ISEL: Forward declarations ---*/
/*---------------------------------------------------------*/
|