From: Julian Seward <jseward@acm.org>
Date: Tue, 29 Nov 2005 14:47:04 +0000 (+0000)
Subject: Set mode64 from the given guest subarch.
X-Git-Tag: svn/VALGRIND_3_2_3^2~172
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d71ed5c43c1021a5c4200475b1232989fa88e86c;p=thirdparty%2Fvalgrind.git

Set mode64 from the given guest subarch.


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

diff --git a/VEX/priv/guest-ppc32/toIR.c b/VEX/priv/guest-ppc32/toIR.c
index f84a768a44..700553c05a 100644
--- a/VEX/priv/guest-ppc32/toIR.c
+++ b/VEX/priv/guest-ppc32/toIR.c
@@ -138,8 +138,9 @@ static Addr64 guest_CIA_curr_instr;
 /* The IRBB* into which we're generating code. */
 static IRBB* irbb;
 
-/* Is our guest binary 32 or 64bit? */
-static Bool mode64;
+/* Is our guest binary 32 or 64bit?  Set at each call to
+   disInstr_PPC32 below. */
+static Bool mode64 = False;
 
 
 /*------------------------------------------------------------*/
@@ -8450,8 +8451,26 @@ DisResult disInstr_PPC32 ( IRBB*        irbb_IN,
                            VexArchInfo* archinfo,
                            Bool         host_bigendian_IN )
 {
-   DisResult dres;
-   IRType ty = mode64 ? Ity_I64 : Ity_I32;
+   IRType     ty;
+   DisResult  dres;
+   VexSubArch gsa = archinfo->subarch;
+
+   /* Figure out whether we're being ppc32 or ppc64 today. */
+   switch (gsa) {
+      case VexSubArchPPC32_VFI:
+      case VexSubArchPPC32_FI:
+      case VexSubArchPPC32_I:
+         mode64 = False;
+         break;
+      case VexSubArchPPC64_VFI:
+      case VexSubArchPPC64_FI:
+         mode64 = True;
+         break;
+      default:
+         vpanic("disInstr_PPC32: illegal subarch");
+   }
+
+   ty = mode64 ? Ity_I64 : Ity_I32;
 
    /* Set globals (see top of this file) */
    guest_code           = guest_code_IN;