commit 3fd3967db856eb90b2030ebeb42b685d45bc3276
author sewardj <sewardj@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Fri Jan 27 22:05:55 2006 +0000
committer sewardj <sewardj@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Fri Jan 27 22:05:55 2006 +0000
tree 1f2349199949e44c5042e5cae4999e2e3b096f3e
parent 7c5458604bde543a8567e16df74fb2157b79e844

Un-break ppc64 following recent hw-capabilities hackery.  (sigh)


git-svn-id: svn://svn.valgrind.org/vex/trunk@1557 8f6e269a-dfd6-0310-a8e1-e2731360e62c

priv/main/vex_main.c

diff --git a/priv/main/vex_main.c b/priv/main/vex_main.c
index a93a17a..a6713f3 100644
--- a/priv/main/vex_main.c
+++ b/priv/main/vex_main.c
@@ -398,9 +398,10 @@
          offB_TILEN       = offsetof(VexGuestPPC64State,guest_TILEN);
          vassert(are_valid_hwcaps(VexArchPPC64, vta->archinfo_guest.hwcaps));
          vassert(0 == sizeof(VexGuestPPC64State) % 16);
-         vassert(sizeof( ((VexGuestPPC64State*)0)->guest_TISTART ) == 8);
-         vassert(sizeof( ((VexGuestPPC64State*)0)->guest_TILEN   ) == 8);
-         vassert(sizeof( ((VexGuestPPC64State*)0)->guest_NRADDR  ) == 8);
+         vassert(sizeof( ((VexGuestPPC64State*)0)->guest_TISTART    ) == 8);
+         vassert(sizeof( ((VexGuestPPC64State*)0)->guest_TILEN      ) == 8);
+         vassert(sizeof( ((VexGuestPPC64State*)0)->guest_NRADDR     ) == 8);
+         vassert(sizeof( ((VexGuestPPC64State*)0)->guest_NRADDR_GPR2) == 8);
          break;
 
       default:
@@ -757,9 +758,9 @@
 {
    /* Monotonic with complications.  Basically V > baseline(==F),
       but once you have F then you can have FX or GX too. */
-   const UInt V  = VEX_HWCAPS_PPC32_V;
-   const UInt FX = VEX_HWCAPS_PPC32_FX;
-   const UInt GX = VEX_HWCAPS_PPC32_GX;
+   const UInt V  = VEX_HWCAPS_PPC64_V;
+   const UInt FX = VEX_HWCAPS_PPC64_FX;
+   const UInt GX = VEX_HWCAPS_PPC64_GX;
          UInt c  = hwcaps;
    if (c == 0)         return "ppc64-int-flt";
    if (c == FX)        return "ppc64-int-flt-FX";
@@ -782,11 +783,11 @@
 static HChar* show_hwcaps ( VexArch arch, UInt hwcaps )
 {
    switch (arch) {
-      case VexArchX86: return show_hwcaps_x86(hwcaps);
+      case VexArchX86:   return show_hwcaps_x86(hwcaps);
       case VexArchAMD64: return show_hwcaps_amd64(hwcaps);
       case VexArchPPC32: return show_hwcaps_ppc32(hwcaps);
       case VexArchPPC64: return show_hwcaps_ppc64(hwcaps);
-      case VexArchARM: return show_hwcaps_arm(hwcaps);
+      case VexArchARM:   return show_hwcaps_arm(hwcaps);
       default: return NULL;
    }
 }