C89 police (make buildable with gcc-2.96)
git-svn-id: svn://svn.valgrind.org/vex/trunk@688 8f6e269a-dfd6-0310-a8e1-e2731360e62c
diff --git a/priv/guest-arm/ghelpers.c b/priv/guest-arm/ghelpers.c
index 13bf923..9c5ea4c 100644
--- a/priv/guest-arm/ghelpers.c
+++ b/priv/guest-arm/ghelpers.c
@@ -327,13 +327,14 @@
/* VISIBLE TO LIBVEX CLIENT */
UInt LibVEX_GuestARM_get_flags ( /*IN*/VexGuestARMState* vex_state )
{
+ UInt flags;
vassert(0); // FIXME
- UInt flags = armg_calculate_flags_all(
- vex_state->guest_CC_OP,
- vex_state->guest_CC_DEP1,
- vex_state->guest_CC_DEP2
- );
+ flags = armg_calculate_flags_all(
+ vex_state->guest_CC_OP,
+ vex_state->guest_CC_DEP1,
+ vex_state->guest_CC_DEP2
+ );
return flags;
}
diff --git a/priv/host-arm/isel.c b/priv/host-arm/isel.c
index 092d3f5..6b239c7 100644
--- a/priv/host-arm/isel.c
+++ b/priv/host-arm/isel.c
@@ -739,10 +739,11 @@
/* --------- STORE --------- */
/* little-endian write to memory */
case Ist_STle: {
+ HReg reg;
IRType tya = typeOfIRExpr(env->type_env, stmt->Ist.STle.addr);
IRType tyd = typeOfIRExpr(env->type_env, stmt->Ist.STle.data);
vassert(tya == Ity_I32);
- HReg reg = iselIntExpr_R(env, stmt->Ist.STle.data);
+ reg = iselIntExpr_R(env, stmt->Ist.STle.data);
if (tyd == Ity_I8) {
ARMAMode2* am2 = iselIntExpr_AMode2(env, stmt->Ist.STle.addr);