C89 police (make buildable with gcc-2.96)

git-svn-id: svn://svn.valgrind.org/vex/trunk@688

diff --git a/VEX/priv/guest-arm/ghelpers.c b/VEX/priv/guest-arm/ghelpers.c
index 13bf923b6b9189c62f25c91dda2c6acb8594d5a4..9c5ea4ce562313aa66b99bff644b0a7d770f606c 100644 (file)
--- a/VEX/priv/guest-arm/ghelpers.c
+++ b/VEX/priv/guest-arm/ghelpers.c
@@ -327,13 +327,14 @@ void LibVEX_GuestARM_put_flags ( UInt flags_native,
 /* 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/VEX/priv/host-arm/isel.c b/VEX/priv/host-arm/isel.c
index 092d3f5e6207a39310ca96bedc8f91efcb65e83c..6b239c71e1fb9051c52889faa40c0541184faf10 100644 (file)
--- a/VEX/priv/host-arm/isel.c
+++ b/VEX/priv/host-arm/isel.c
@@ -739,10 +739,11 @@ static void iselStmt ( ISelEnv* env, IRStmt* stmt )
    /* --------- 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);