|
From: <sv...@va...> - 2011-04-27 07:02:55
|
Author: sewardj
Date: 2011-04-27 08:02:44 +0100 (Wed, 27 Apr 2011)
New Revision: 2129
Log:
Fix up some enum confusion to do with ARMNeonUnOp and ARMNeonUnOpS, as
found by "the IBM checker", and also by clang-2.9. Fixes #271820.
(Florian Krohm, br...@ac...)
Modified:
trunk/priv/host_arm_defs.c
trunk/priv/host_arm_defs.h
Modified: trunk/priv/host_arm_defs.c
===================================================================
--- trunk/priv/host_arm_defs.c 2011-04-26 21:36:09 UTC (rev 2128)
+++ trunk/priv/host_arm_defs.c 2011-04-27 07:02:44 UTC (rev 2129)
@@ -1369,7 +1369,7 @@
return i;
}
-ARMInstr* ARMInstr_NUnaryS ( ARMNeonUnOp op, ARMNRS* dst, ARMNRS* src,
+ARMInstr* ARMInstr_NUnaryS ( ARMNeonUnOpS op, ARMNRS* dst, ARMNRS* src,
UInt size, Bool Q ) {
ARMInstr* i = LibVEX_Alloc(sizeof(ARMInstr));
i->tag = ARMin_NUnaryS;
@@ -1799,8 +1799,8 @@
return;
case ARMin_NUnaryS:
vex_printf("%s%s%s ",
- showARMNeonUnOpS(i->ARMin.NUnary.op),
- showARMNeonUnOpSDataType(i->ARMin.NUnary.op),
+ showARMNeonUnOp(i->ARMin.NUnary.op),
+ showARMNeonUnOpDataType(i->ARMin.NUnary.op),
showARMNeonDataSize(i));
ppARMNRS(i->ARMin.NUnaryS.dst);
vex_printf(", ");
Modified: trunk/priv/host_arm_defs.h
===================================================================
--- trunk/priv/host_arm_defs.h 2011-04-26 21:36:09 UTC (rev 2128)
+++ trunk/priv/host_arm_defs.h 2011-04-27 07:02:44 UTC (rev 2129)
@@ -940,7 +940,7 @@
extern ARMInstr* ARMInstr_NLdStQ ( Bool isLoad, HReg, ARMAModeN* );
extern ARMInstr* ARMInstr_NLdStD ( Bool isLoad, HReg, ARMAModeN* );
extern ARMInstr* ARMInstr_NUnary ( ARMNeonUnOp, HReg, HReg, UInt, Bool );
-extern ARMInstr* ARMInstr_NUnaryS ( ARMNeonUnOp, ARMNRS*, ARMNRS*,
+extern ARMInstr* ARMInstr_NUnaryS ( ARMNeonUnOpS, ARMNRS*, ARMNRS*,
UInt, Bool );
extern ARMInstr* ARMInstr_NDual ( ARMNeonDualOp, HReg, HReg, UInt, Bool );
extern ARMInstr* ARMInstr_NBinary ( ARMNeonBinOp, HReg, HReg, HReg,
|