From: Florian Krohm <florian@eich-krohm.de>
Date: Thu, 8 Jan 2015 20:45:42 +0000 (+0000)
Subject: Clean up a few leftovers from the AIX port which no longer exists.
X-Git-Tag: svn/VALGRIND_3_11_0^2~112
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3c528d564615b1d6efcea6e05197af4e2ea7332;p=thirdparty%2Fvalgrind.git

Clean up a few leftovers from the AIX port which no longer exists.


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

diff --git a/VEX/priv/guest_ppc_helpers.c b/VEX/priv/guest_ppc_helpers.c
index 682aadc589..18a1ac3fa7 100644
--- a/VEX/priv/guest_ppc_helpers.c
+++ b/VEX/priv/guest_ppc_helpers.c
@@ -68,7 +68,7 @@
 /* Reads a complete, consistent 64-bit TB value. */
 ULong ppcg_dirtyhelper_MFTB ( void )
 {
-#  if defined(__powerpc__) || defined(_AIX)
+#  if defined(__powerpc__)
    ULong res;
    UInt  lo, hi1, hi2;
    while (1) {
@@ -93,7 +93,7 @@ ULong ppcg_dirtyhelper_MFTB ( void )
 /* DIRTY HELPER (non-referentially transparent) */
 UInt ppc32g_dirtyhelper_MFSPR_268_269 ( UInt r269 )
 {
-#  if defined(__powerpc__) || defined(_AIX)
+#  if defined(__powerpc__)
    UInt spr;
    if (r269) {
       __asm__ __volatile__("mfspr %0,269" : "=b"(spr));
@@ -111,7 +111,7 @@ UInt ppc32g_dirtyhelper_MFSPR_268_269 ( UInt r269 )
 /* DIRTY HELPER (I'm not really sure what the side effects are) */
 UInt ppc32g_dirtyhelper_MFSPR_287 ( void )
 {
-#  if defined(__powerpc__) || defined(_AIX)
+#  if defined(__powerpc__)
    UInt spr;
    __asm__ __volatile__("mfspr %0,287" : "=b"(spr));
    return spr;
diff --git a/VEX/priv/guest_ppc_toIR.c b/VEX/priv/guest_ppc_toIR.c
index de644083df..9f5e30fe13 100644
--- a/VEX/priv/guest_ppc_toIR.c
+++ b/VEX/priv/guest_ppc_toIR.c
@@ -223,8 +223,7 @@ static Bool mode64 = False;
 // Given a pointer to a function as obtained by "& functionname" in C,
 // produce a pointer to the actual entry point for the function.  For
 // most platforms it's the identity function.  Unfortunately, on
-// ppc64-linux it isn't (sigh) and ditto for ppc32-aix5 and
-// ppc64-aix5.
+// ppc64-linux it isn't (sigh)
 static void* fnptr_to_fnentry( const VexAbiInfo* vbi, void* f )
 {
    if (vbi->host_ppc_calls_use_fndescrs) {
@@ -6202,7 +6201,7 @@ static Bool dis_syslink ( UInt theInstr,
    // sc  (System Call, PPC32 p504)
    DIP("sc\n");
 
-   /* Copy CIA into the IP_AT_SYSCALL pseudo-register, so that on AIX
+   /* Copy CIA into the IP_AT_SYSCALL pseudo-register, so that on Darwin
       Valgrind can back the guest up to this instruction if it needs
       to restart the syscall. */
    putGST( PPC_GST_IP_AT_SYSCALL, getGST( PPC_GST_CIA ) );
diff --git a/VEX/pub/libvex_guest_ppc32.h b/VEX/pub/libvex_guest_ppc32.h
index 5acfcd7307..35dd318dac 100644
--- a/VEX/pub/libvex_guest_ppc32.h
+++ b/VEX/pub/libvex_guest_ppc32.h
@@ -229,7 +229,7 @@ typedef
       /* 1216 */ UInt guest_REDIR_SP;
       /* 1220 */ UInt guest_REDIR_STACK[VEX_GUEST_PPC32_REDIR_STACK_SIZE];
 
-      /* Needed for AIX (but mandated for all guest architectures):
+      /* Needed for Darwin (but mandated for all guest architectures):
          CIA at the last SC insn.  Used when backing up to restart a
          syscall that has been interrupted by a signal. */
       /* 1348 */ UInt guest_IP_AT_SYSCALL;
diff --git a/VEX/pub/libvex_guest_ppc64.h b/VEX/pub/libvex_guest_ppc64.h
index 3903ce745b..9a4caedee2 100644
--- a/VEX/pub/libvex_guest_ppc64.h
+++ b/VEX/pub/libvex_guest_ppc64.h
@@ -271,7 +271,7 @@ typedef
       /* 1376 */ ULong guest_REDIR_SP;
       /* 1384 */ ULong guest_REDIR_STACK[VEX_GUEST_PPC64_REDIR_STACK_SIZE];
 
-      /* Needed for AIX: CIA at the last SC insn.  Used when backing up
+      /* Needed for Darwin: CIA at the last SC insn.  Used when backing up
          to restart a syscall that has been interrupted by a signal. */
       /* 1640 */ ULong guest_IP_AT_SYSCALL;