From: Cerion Armour-Brown Date: Fri, 23 Dec 2005 11:43:01 +0000 (+0000) Subject: renamed VEX dirs guest-ppc32/ -> guest-ppc/, host-ppc32/ -> host-ppc/ X-Git-Tag: svn/VALGRIND_3_2_3^2~147 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da1e420602ac775305d07bd8cfbfe464493cf06e;p=thirdparty%2Fvalgrind.git renamed VEX dirs guest-ppc32/ -> guest-ppc/, host-ppc32/ -> host-ppc/ and adjusted all references to them git-svn-id: svn://svn.valgrind.org/vex/trunk@1507 --- diff --git a/VEX/Makefile b/VEX/Makefile index d47403a153..dd7d82715b 100644 --- a/VEX/Makefile +++ b/VEX/Makefile @@ -8,12 +8,13 @@ PUB_HEADERS = pub/libvex_basictypes.h \ pub/libvex_guest_amd64.h \ pub/libvex_guest_arm.h \ pub/libvex_guest_ppc32.h \ + pub/libvex_guest_ppc64.h \ pub/libvex_guest_offsets.h PRIV_HEADERS = priv/host-x86/hdefs.h \ priv/host-amd64/hdefs.h \ priv/host-arm/hdefs.h \ - priv/host-ppc32/hdefs.h \ + priv/host-ppc/hdefs.h \ priv/host-generic/h_generic_regs.h \ priv/host-generic/h_generic_simd64.h \ priv/main/vex_globals.h \ @@ -23,7 +24,7 @@ PRIV_HEADERS = priv/host-x86/hdefs.h \ priv/guest-x86/gdefs.h \ priv/guest-amd64/gdefs.h \ priv/guest-arm/gdefs.h \ - priv/guest-ppc32/gdefs.h \ + priv/guest-ppc/gdefs.h \ priv/ir/irmatch.h \ priv/ir/iropt.h @@ -36,11 +37,11 @@ LIB_OBJS = priv/ir/irdefs.o \ priv/host-x86/hdefs.o \ priv/host-amd64/hdefs.o \ priv/host-arm/hdefs.o \ - priv/host-ppc32/hdefs.o \ + priv/host-ppc/hdefs.o \ priv/host-x86/isel.o \ priv/host-amd64/isel.o \ priv/host-arm/isel.o \ - priv/host-ppc32/isel.o \ + priv/host-ppc/isel.o \ priv/host-generic/h_generic_regs.o \ priv/host-generic/h_generic_simd64.o \ priv/host-generic/reg_alloc2.o \ @@ -49,11 +50,11 @@ LIB_OBJS = priv/ir/irdefs.o \ priv/guest-x86/ghelpers.o \ priv/guest-amd64/ghelpers.o \ priv/guest-arm/ghelpers.o \ - priv/guest-ppc32/ghelpers.o \ + priv/guest-ppc/ghelpers.o \ priv/guest-x86/toIR.o \ priv/guest-amd64/toIR.o \ priv/guest-arm/toIR.o \ - priv/guest-ppc32/toIR.o + priv/guest-ppc/toIR.o PUB_INCLUDES = -Ipub @@ -213,9 +214,9 @@ priv/host-arm/hdefs.o: $(ALL_HEADERS) priv/host-arm/hdefs.c $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-arm/hdefs.o \ -c priv/host-arm/hdefs.c -priv/host-ppc32/hdefs.o: $(ALL_HEADERS) priv/host-ppc32/hdefs.c - $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-ppc32/hdefs.o \ - -c priv/host-ppc32/hdefs.c +priv/host-ppc/hdefs.o: $(ALL_HEADERS) priv/host-ppc/hdefs.c + $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-ppc/hdefs.o \ + -c priv/host-ppc/hdefs.c priv/host-x86/isel.o: $(ALL_HEADERS) priv/host-x86/isel.c $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-x86/isel.o \ @@ -229,9 +230,9 @@ priv/host-arm/isel.o: $(ALL_HEADERS) priv/host-arm/isel.c $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-arm/isel.o \ -c priv/host-arm/isel.c -priv/host-ppc32/isel.o: $(ALL_HEADERS) priv/host-ppc32/isel.c - $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-ppc32/isel.o \ - -c priv/host-ppc32/isel.c +priv/host-ppc/isel.o: $(ALL_HEADERS) priv/host-ppc/isel.c + $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-ppc/isel.o \ + -c priv/host-ppc/isel.c priv/host-generic/h_generic_regs.o: $(ALL_HEADERS) priv/host-generic/h_generic_regs.c $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-generic/h_generic_regs.o \ @@ -277,10 +278,10 @@ priv/guest-arm/toIR.o: $(ALL_HEADERS) priv/guest-arm/toIR.c $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/guest-arm/toIR.o \ -c priv/guest-arm/toIR.c -priv/guest-ppc32/ghelpers.o: $(ALL_HEADERS) priv/guest-ppc32/ghelpers.c - $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/guest-ppc32/ghelpers.o \ - -c priv/guest-ppc32/ghelpers.c +priv/guest-ppc/ghelpers.o: $(ALL_HEADERS) priv/guest-ppc/ghelpers.c + $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/guest-ppc/ghelpers.o \ + -c priv/guest-ppc/ghelpers.c -priv/guest-ppc32/toIR.o: $(ALL_HEADERS) priv/guest-ppc32/toIR.c - $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/guest-ppc32/toIR.o \ - -c priv/guest-ppc32/toIR.c +priv/guest-ppc/toIR.o: $(ALL_HEADERS) priv/guest-ppc/toIR.c + $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/guest-ppc/toIR.o \ + -c priv/guest-ppc/toIR.c diff --git a/VEX/Makefile-icc b/VEX/Makefile-icc index 77ee730d29..723c850d47 100644 --- a/VEX/Makefile-icc +++ b/VEX/Makefile-icc @@ -8,12 +8,13 @@ PUB_HEADERS = pub/libvex_basictypes.h \ pub/libvex_guest_amd64.h \ pub/libvex_guest_arm.h \ pub/libvex_guest_ppc32.h \ + pub/libvex_guest_ppc64.h \ pub/libvex_guest_offsets.h PRIV_HEADERS = priv/host-x86/hdefs.h \ priv/host-amd64/hdefs.h \ priv/host-arm/hdefs.h \ - priv/host-ppc32/hdefs.h \ + priv/host-ppc/hdefs.h \ priv/host-generic/h_generic_regs.h \ priv/host-generic/h_generic_simd64.h \ priv/main/vex_globals.h \ @@ -23,7 +24,7 @@ PRIV_HEADERS = priv/host-x86/hdefs.h \ priv/guest-x86/gdefs.h \ priv/guest-amd64/gdefs.h \ priv/guest-arm/gdefs.h \ - priv/guest-ppc32/gdefs.h \ + priv/guest-ppc/gdefs.h \ priv/ir/irmatch.h \ priv/ir/iropt.h @@ -36,11 +37,11 @@ LIB_OBJS = priv/ir/irdefs.o \ priv/host-x86/hdefs.o \ priv/host-amd64/hdefs.o \ priv/host-arm/hdefs.o \ - priv/host-ppc32/hdefs.o \ + priv/host-ppc/hdefs.o \ priv/host-x86/isel.o \ priv/host-amd64/isel.o \ priv/host-arm/isel.o \ - priv/host-ppc32/isel.o \ + priv/host-ppc/isel.o \ priv/host-generic/h_generic_regs.o \ priv/host-generic/h_generic_simd64.o \ priv/host-generic/reg_alloc2.o \ @@ -49,11 +50,11 @@ LIB_OBJS = priv/ir/irdefs.o \ priv/guest-x86/ghelpers.o \ priv/guest-amd64/ghelpers.o \ priv/guest-arm/ghelpers.o \ - priv/guest-ppc32/ghelpers.o \ + priv/guest-ppc/ghelpers.o \ priv/guest-x86/toIR.o \ priv/guest-amd64/toIR.o \ priv/guest-arm/toIR.o \ - priv/guest-ppc32/toIR.o + priv/guest-ppc/toIR.o PUB_INCLUDES = -Ipub @@ -165,9 +166,9 @@ priv/host-arm/hdefs.o: $(ALL_HEADERS) priv/host-arm/hdefs.c $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-arm/hdefs.o \ -c priv/host-arm/hdefs.c -priv/host-ppc32/hdefs.o: $(ALL_HEADERS) priv/host-ppc32/hdefs.c - $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-ppc32/hdefs.o \ - -c priv/host-ppc32/hdefs.c +priv/host-ppc/hdefs.o: $(ALL_HEADERS) priv/host-ppc/hdefs.c + $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-ppc/hdefs.o \ + -c priv/host-ppc/hdefs.c priv/host-x86/isel.o: $(ALL_HEADERS) priv/host-x86/isel.c $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-x86/isel.o \ @@ -181,9 +182,9 @@ priv/host-arm/isel.o: $(ALL_HEADERS) priv/host-arm/isel.c $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-arm/isel.o \ -c priv/host-arm/isel.c -priv/host-ppc32/isel.o: $(ALL_HEADERS) priv/host-ppc32/isel.c - $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-ppc32/isel.o \ - -c priv/host-ppc32/isel.c +priv/host-ppc/isel.o: $(ALL_HEADERS) priv/host-ppc/isel.c + $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-ppc/isel.o \ + -c priv/host-ppc/isel.c priv/host-generic/h_generic_regs.o: $(ALL_HEADERS) priv/host-generic/h_generic_regs.c $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-generic/h_generic_regs.o \ @@ -229,10 +230,10 @@ priv/guest-arm/toIR.o: $(ALL_HEADERS) priv/guest-arm/toIR.c $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/guest-arm/toIR.o \ -c priv/guest-arm/toIR.c -priv/guest-ppc32/ghelpers.o: $(ALL_HEADERS) priv/guest-ppc32/ghelpers.c - $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/guest-ppc32/ghelpers.o \ - -c priv/guest-ppc32/ghelpers.c +priv/guest-ppc/ghelpers.o: $(ALL_HEADERS) priv/guest-ppc/ghelpers.c + $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/guest-ppc/ghelpers.o \ + -c priv/guest-ppc/ghelpers.c -priv/guest-ppc32/toIR.o: $(ALL_HEADERS) priv/guest-ppc32/toIR.c - $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/guest-ppc32/toIR.o \ - -c priv/guest-ppc32/toIR.c +priv/guest-ppc/toIR.o: $(ALL_HEADERS) priv/guest-ppc/toIR.c + $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/guest-ppc/toIR.o \ + -c priv/guest-ppc/toIR.c diff --git a/VEX/priv/guest-ppc32/gdefs.h b/VEX/priv/guest-ppc/gdefs.h similarity index 96% rename from VEX/priv/guest-ppc32/gdefs.h rename to VEX/priv/guest-ppc/gdefs.h index aa5dde4fc5..c77dccde72 100644 --- a/VEX/priv/guest-ppc32/gdefs.h +++ b/VEX/priv/guest-ppc/gdefs.h @@ -1,7 +1,7 @@ /*---------------------------------------------------------------*/ /*--- ---*/ -/*--- This file (guest-ppc32/gdefs.h) is ---*/ +/*--- This file (guest-ppc/gdefs.h) is ---*/ /*--- Copyright (C) OpenWorks LLP. All rights reserved. ---*/ /*--- ---*/ /*---------------------------------------------------------------*/ @@ -44,7 +44,7 @@ without prior written permission. */ -/* Only to be used within the guest-ppc32 directory. */ +/* Only to be used within the guest-ppc directory. */ #ifndef __LIBVEX_GUEST_PPC_DEFS_H @@ -156,5 +156,5 @@ extern void ppc64g_dirtyhelper_LVS ( VexGuestPPC64State* gst, #endif /* ndef __LIBVEX_GUEST_PPC_DEFS_H */ /*---------------------------------------------------------------*/ -/*--- end guest-ppc32/gdefs.h ---*/ +/*--- end guest-ppc/gdefs.h ---*/ /*---------------------------------------------------------------*/ diff --git a/VEX/priv/guest-ppc32/ghelpers.c b/VEX/priv/guest-ppc/ghelpers.c similarity index 98% rename from VEX/priv/guest-ppc32/ghelpers.c rename to VEX/priv/guest-ppc/ghelpers.c index 3e3653b988..0aa26dd34c 100644 --- a/VEX/priv/guest-ppc32/ghelpers.c +++ b/VEX/priv/guest-ppc/ghelpers.c @@ -1,7 +1,7 @@ /*---------------------------------------------------------------*/ /*--- ---*/ -/*--- This file (guest-ppc32/ghelpers.c) is ---*/ +/*--- This file (guest-ppc/ghelpers.c) is ---*/ /*--- Copyright (C) OpenWorks LLP. All rights reserved. ---*/ /*--- ---*/ /*---------------------------------------------------------------*/ @@ -53,7 +53,7 @@ #include "main/vex_util.h" #include "guest-generic/bb_to_IR.h" -#include "guest-ppc32/gdefs.h" +#include "guest-ppc/gdefs.h" /* This file contains helper functions for ppc32 and ppc64 guest code. @@ -64,7 +64,7 @@ Only change the signatures of these helper functions very carefully. If you change the signature here, you'll have to change the parameters passed to it in the IR calls constructed by - guest-ppc32/toIR.c. + guest-ppc/toIR.c. */ @@ -74,7 +74,7 @@ /* CALLED FROM GENERATED CODE */ /* DIRTY HELPER (non-referentially-transparent) */ -/* Horrible hack. On non-ppc32 platforms, return 1. */ +/* Horrible hack. On non-ppc platforms, return 1. */ /* Reads a complete, consistent 64-bit TB value. */ ULong ppcg_dirtyhelper_MFTB ( void ) { @@ -748,5 +748,5 @@ VexGuestLayout }; /*---------------------------------------------------------------*/ -/*--- end guest-ppc32/ghelpers.c ---*/ +/*--- end guest-ppc/ghelpers.c ---*/ /*---------------------------------------------------------------*/ diff --git a/VEX/priv/guest-ppc32/toIR.c b/VEX/priv/guest-ppc/toIR.c similarity index 99% rename from VEX/priv/guest-ppc32/toIR.c rename to VEX/priv/guest-ppc/toIR.c index d85b54912f..6328d6ed31 100644 --- a/VEX/priv/guest-ppc32/toIR.c +++ b/VEX/priv/guest-ppc/toIR.c @@ -1,7 +1,7 @@ /*--------------------------------------------------------------------*/ /*--- ---*/ -/*--- This file (guest-ppc32/toIR.c) is ---*/ +/*--- This file (guest-ppc/toIR.c) is ---*/ /*--- Copyright (C) OpenWorks LLP. All rights reserved. ---*/ /*--- ---*/ /*--------------------------------------------------------------------*/ @@ -116,7 +116,7 @@ #include "main/vex_util.h" #include "main/vex_globals.h" #include "guest-generic/bb_to_IR.h" -#include "guest-ppc32/gdefs.h" +#include "guest-ppc/gdefs.h" /*------------------------------------------------------------*/ @@ -9089,5 +9089,5 @@ DisResult disInstr_PPC ( IRBB* irbb_IN, //} /*--------------------------------------------------------------------*/ -/*--- end guest-ppc32/toIR.c ---*/ +/*--- end guest-ppc/toIR.c ---*/ /*--------------------------------------------------------------------*/ diff --git a/VEX/priv/host-ppc32/hdefs.c b/VEX/priv/host-ppc/hdefs.c similarity index 99% rename from VEX/priv/host-ppc32/hdefs.c rename to VEX/priv/host-ppc/hdefs.c index 45aa96fcea..c0da8c6f68 100644 --- a/VEX/priv/host-ppc32/hdefs.c +++ b/VEX/priv/host-ppc/hdefs.c @@ -1,7 +1,7 @@ /*---------------------------------------------------------------*/ /*--- ---*/ -/*--- This file (host-ppc32/hdefs.c) is ---*/ +/*--- This file (host-ppc/hdefs.c) is ---*/ /*--- Copyright (C) OpenWorks LLP. All rights reserved. ---*/ /*--- ---*/ /*---------------------------------------------------------------*/ @@ -50,7 +50,7 @@ #include "main/vex_util.h" #include "host-generic/h_generic_regs.h" -#include "host-ppc32/hdefs.h" +#include "host-ppc/hdefs.h" /* --------- Registers. --------- */ @@ -3717,5 +3717,5 @@ Int emit_PPCInstr ( UChar* buf, Int nbuf, PPCInstr* i, } /*---------------------------------------------------------------*/ -/*--- end host-ppc32/hdefs.c ---*/ +/*--- end host-ppc/hdefs.c ---*/ /*---------------------------------------------------------------*/ diff --git a/VEX/priv/host-ppc32/hdefs.h b/VEX/priv/host-ppc/hdefs.h similarity index 99% rename from VEX/priv/host-ppc32/hdefs.h rename to VEX/priv/host-ppc/hdefs.h index 169e5c20d9..e4a00133fd 100644 --- a/VEX/priv/host-ppc32/hdefs.h +++ b/VEX/priv/host-ppc/hdefs.h @@ -1,7 +1,7 @@ /*---------------------------------------------------------------*/ /*--- ---*/ -/*--- This file (host-ppc32/hdefs.h) is ---*/ +/*--- This file (host-ppc/hdefs.h) is ---*/ /*--- Copyright (C) OpenWorks LLP. All rights reserved. ---*/ /*--- ---*/ /*---------------------------------------------------------------*/ @@ -835,5 +835,5 @@ extern HInstrArray* iselBB_PPC ( IRBB*, VexArchInfo* ); #endif /* ndef __LIBVEX_HOST_PPC_HDEFS_H */ /*---------------------------------------------------------------*/ -/*--- end host-ppc32/hdefs.h ---*/ +/*--- end host-ppc/hdefs.h ---*/ /*---------------------------------------------------------------*/ diff --git a/VEX/priv/host-ppc32/isel.c b/VEX/priv/host-ppc/isel.c similarity index 99% rename from VEX/priv/host-ppc32/isel.c rename to VEX/priv/host-ppc/isel.c index dd3f38521a..90775d77d8 100644 --- a/VEX/priv/host-ppc32/isel.c +++ b/VEX/priv/host-ppc/isel.c @@ -1,7 +1,7 @@ /*---------------------------------------------------------------*/ /*--- ---*/ -/*--- This file (host-ppc32/isel.c) is ---*/ +/*--- This file (host-ppc/isel.c) is ---*/ /*--- Copyright (C) OpenWorks LLP. All rights reserved. ---*/ /*--- ---*/ /*---------------------------------------------------------------*/ @@ -52,7 +52,7 @@ #include "main/vex_util.h" #include "main/vex_globals.h" #include "host-generic/h_generic_regs.h" -#include "host-ppc32/hdefs.h" +#include "host-ppc/hdefs.h" /* Is our guest binary 32 or 64bit? Set at each call to iselBB_PPC below. */ @@ -133,7 +133,7 @@ static Bool mode64 = False; /*--- misc helpers ---*/ /*---------------------------------------------------------*/ -/* These are duplicated in guest-ppc32/toIR.c */ +/* These are duplicated in guest-ppc/toIR.c */ static IRExpr* unop ( IROp op, IRExpr* a ) { return IRExpr_Unop(op, a); @@ -4473,5 +4473,5 @@ HInstrArray* iselBB_PPC ( IRBB* bb, VexArchInfo* archinfo_host ) /*---------------------------------------------------------------*/ -/*--- end host-ppc32/isel.c ---*/ +/*--- end host-ppc/isel.c ---*/ /*---------------------------------------------------------------*/ diff --git a/VEX/priv/main/vex_main.c b/VEX/priv/main/vex_main.c index 8f5bc8efa5..b649bb04db 100644 --- a/VEX/priv/main/vex_main.c +++ b/VEX/priv/main/vex_main.c @@ -59,13 +59,13 @@ #include "host-x86/hdefs.h" #include "host-amd64/hdefs.h" -#include "host-ppc32/hdefs.h" +#include "host-ppc/hdefs.h" #include "guest-generic/bb_to_IR.h" #include "guest-x86/gdefs.h" #include "guest-amd64/gdefs.h" #include "guest-arm/gdefs.h" -#include "guest-ppc32/gdefs.h" +#include "guest-ppc/gdefs.h" /* This file contains the top level interface to the library. */