Flatten out the directory structure in the priv/ side, by pulling all

files into priv/ and giving them unique names.  This makes it easier
to use automake to build all this stuff in Valgrind.  It also tidies
up a directory structure which had become a bit pointlessly complex.

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

diff --git a/VEX/LICENSE.README b/VEX/LICENSE.README
index 5dba399af1d05ebeaa886975f12a38712d064947..4c62b6c0b15d2aefad8ec6509ac181718f496e3c 100644 (file)
--- a/VEX/LICENSE.README
+++ b/VEX/LICENSE.README
@@ -2,7 +2,7 @@
 This directory and its children contain LibVEX, a library for dynamic
 binary instrumentation and translation.
 
-Copyright (C) 2004-2007 OpenWorks LLP.  All rights reserved.
+Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
 This library is made available under a dual licensing scheme.
 

diff --git a/VEX/auxprogs/genoffsets.c b/VEX/auxprogs/genoffsets.c
index f4f95be98c2389bc7cceeaf0815a218511ad1816..4bb16b43eea5f76eb78e9f8f3e6c345d71408d2d 100644 (file)
--- a/VEX/auxprogs/genoffsets.c
+++ b/VEX/auxprogs/genoffsets.c
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 

diff --git a/VEX/priv/guest-amd64/gdefs.h b/VEX/priv/guest_amd64_defs.h
similarity index 98%
rename from VEX/priv/guest-amd64/gdefs.h
rename to VEX/priv/guest_amd64_defs.h
index e95531131f4534e969db41f860810f44a0ea417c..6fc52e428d26a83cfac6085efe8f65f7b9c2f53d 100644 (file)
--- a/VEX/priv/guest-amd64/gdefs.h
+++ b/VEX/priv/guest_amd64_defs.h
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (guest-amd64/gdefs.h) is                      ---*/
+/*--- This file (guest_amd64_defs.h) is                       ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -46,8 +46,8 @@
 
 /* Only to be used within the guest-amd64 directory. */
 
-#ifndef __LIBVEX_GUEST_AMD64_DEFS_H
-#define __LIBVEX_GUEST_AMD64_DEFS_H
+#ifndef __VEX_GUEST_AMD64_DEFS_H
+#define __VEX_GUEST_AMD64_DEFS_H
 
 
 /*---------------------------------------------------------*/
@@ -429,8 +429,8 @@ typedef
    }
    AMD64Condcode;
 
-#endif /* ndef __LIBVEX_GUEST_AMD64_DEFS_H */
+#endif /* ndef __VEX_GUEST_AMD64_DEFS_H */
 
 /*---------------------------------------------------------------*/
-/*--- end                                 guest-amd64/gdefs.h ---*/
+/*--- end                                  guest_amd64_defs.h ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/guest-amd64/ghelpers.c b/VEX/priv/guest_amd64_helpers.c
similarity index 99%
rename from VEX/priv/guest-amd64/ghelpers.c
rename to VEX/priv/guest_amd64_helpers.c
index cb4b5fc55ecad08bedd7efbea37cd0e9e06ca409..24c206e90e15ed96036b722cf72de0999ac18ed7 100644 (file)
--- a/VEX/priv/guest-amd64/ghelpers.c
+++ b/VEX/priv/guest_amd64_helpers.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (guest-amd64/ghelpers.c) is                   ---*/
+/*--- This file (guest_amd64_helpers.c) is                    ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -50,10 +50,10 @@
 #include "libvex_ir.h"
 #include "libvex.h"
 
-#include "main/vex_util.h"
-#include "guest-generic/bb_to_IR.h"
-#include "guest-amd64/gdefs.h"
-#include "guest-generic/g_generic_x87.h"
+#include "main_util.h"
+#include "guest_generic_bb_to_IR.h"
+#include "guest_amd64_defs.h"
+#include "guest_generic_x87.h"
 
 
 /* This file contains helper functions for amd64 guest code.
@@ -2497,5 +2497,5 @@ VexGuestLayout
 
 
 /*---------------------------------------------------------------*/
-/*--- end                              guest-amd64/ghelpers.c ---*/
+/*--- end                               guest_amd64_helpers.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/guest-amd64/toIR.c b/VEX/priv/guest_amd64_toIR.c
similarity index 99%
rename from VEX/priv/guest-amd64/toIR.c
rename to VEX/priv/guest_amd64_toIR.c
index 07cac60926c1a3c2a6b142831db342730bcc9545..8da1b1b31a165e5807aec33038ca0a96c1f37b8f 100644 (file)
--- a/VEX/priv/guest-amd64/toIR.c
+++ b/VEX/priv/guest_amd64_toIR.c
@@ -1,7 +1,7 @@
 
 /*--------------------------------------------------------------------*/
 /*---                                                              ---*/
-/*--- This file (guest-amd64/toIR.c) is                            ---*/
+/*--- This file (guest_amd64_toIR.c) is                            ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.           ---*/
 /*---                                                              ---*/
 /*--------------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -174,11 +174,11 @@
 #include "libvex.h"
 #include "libvex_guest_amd64.h"
 
-#include "main/vex_util.h"
-#include "main/vex_globals.h"
-#include "guest-generic/bb_to_IR.h"
-#include "guest-generic/g_generic_x87.h"
-#include "guest-amd64/gdefs.h"
+#include "main_util.h"
+#include "main_globals.h"
+#include "guest_generic_bb_to_IR.h"
+#include "guest_generic_x87.h"
+#include "guest_amd64_defs.h"
 
 
 /*------------------------------------------------------------*/
@@ -16156,5 +16156,5 @@ DisResult disInstr_AMD64 ( IRSB*        irsb_IN,
 
 
 /*--------------------------------------------------------------------*/
-/*--- end                                       guest-amd64/toIR.c ---*/
+/*--- end                                       guest_amd64_toIR.c ---*/
 /*--------------------------------------------------------------------*/

diff --git a/VEX/priv/guest-arm/gdefs.h b/VEX/priv/guest_arm_defs.h
similarity index 96%
rename from VEX/priv/guest-arm/gdefs.h
rename to VEX/priv/guest_arm_defs.h
index f912c2f884277e29beab2442a173ac3a479a5ace..04864a3961a847851299bccdb63dc94c286a0d4f 100644 (file)
--- a/VEX/priv/guest-arm/gdefs.h
+++ b/VEX/priv/guest_arm_defs.h
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (guest-arm/gdefs.h) is                        ---*/
+/*--- This file (guest_arm_defs.h) is                         ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -46,8 +46,8 @@
 
 /* Only to be used within the guest-arm directory. */
 
-#ifndef __LIBVEX_GUEST_ARM_DEFS_H
-#define __LIBVEX_GUEST_ARM_DEFS_H
+#ifndef __VEX_GUEST_ARM_DEFS_H
+#define __VEX_GUEST_ARM_DEFS_H
 
 
 /*---------------------------------------------------------*/
@@ -205,8 +205,8 @@ typedef
    }
    ARMCondcode;
 
-#endif /* ndef __LIBVEX_GUEST_ARM_DEFS_H */
+#endif /* ndef __VEX_GUEST_ARM_DEFS_H */
 
 /*---------------------------------------------------------------*/
-/*--- end                                   guest-arm/gdefs.h ---*/
+/*--- end                                    guest_arm_defs.h ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/guest-arm/ghelpers.c b/VEX/priv/guest_arm_helpers.c
similarity index 98%
rename from VEX/priv/guest-arm/ghelpers.c
rename to VEX/priv/guest_arm_helpers.c
index f5255d99fba7958e940adff756f4d9427347a2b2..3c4a156817e112868b9d00e8a813e9d7a2bfa6bb 100644 (file)
--- a/VEX/priv/guest-arm/ghelpers.c
+++ b/VEX/priv/guest_arm_helpers.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (guest-arm/ghelpers.c) is                     ---*/
+/*--- This file (guest_arm_helpers.c) is                      ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -49,8 +49,8 @@
 #include "libvex_ir.h"
 #include "libvex.h"
 
-#include "main/vex_util.h"
-#include "guest-arm/gdefs.h"
+#include "main_util.h"
+#include "guest_arm_defs.h"
 
 
 /* This file contains helper functions for arm guest code.
@@ -450,5 +450,5 @@ VexGuestLayout
 
 
 /*---------------------------------------------------------------*/
-/*--- end                                guest-arm/ghelpers.c ---*/
+/*--- end                                 guest_arm_helpers.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/guest-arm/toIR.c b/VEX/priv/guest_arm_toIR.c
similarity index 99%
rename from VEX/priv/guest-arm/toIR.c
rename to VEX/priv/guest_arm_toIR.c
index cdc0d50b4bf54b156d20d851bb624d282a287406..dd36a00f3693b34bb416c08fca78f744b3913d5d 100644 (file)
--- a/VEX/priv/guest-arm/toIR.c
+++ b/VEX/priv/guest_arm_toIR.c
@@ -1,7 +1,7 @@
 
 /*--------------------------------------------------------------------*/
 /*---                                                              ---*/
-/*--- This file (guest-arm/toIR.c) is                              ---*/
+/*--- This file (guest_arm_toIR.c) is                              ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.           ---*/
 /*---                                                              ---*/
 /*--------------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -51,9 +51,9 @@
 #include "libvex.h"
 #include "libvex_guest_arm.h"
 
-#include "main/vex_util.h"
-#include "main/vex_globals.h"
-#include "guest-arm/gdefs.h"
+#include "main_util.h"
+#include "main_globals.h"
+#include "guest_arm_defs.h"
 
 
 /*------------------------------------------------------------*/
@@ -2188,5 +2188,5 @@ static DisResult disInstr ( /*IN*/  Bool    resteerOK,
 #undef DIS
 
 /*--------------------------------------------------------------------*/
-/*--- end                                         guest-arm/toIR.c ---*/
+/*--- end                                         guest_arm_toIR.c ---*/
 /*--------------------------------------------------------------------*/

diff --git a/VEX/priv/guest-generic/bb_to_IR.c b/VEX/priv/guest_generic_bb_to_IR.c
similarity index 98%
rename from VEX/priv/guest-generic/bb_to_IR.c
rename to VEX/priv/guest_generic_bb_to_IR.c
index 448725d2041ec499bbc887ee4cad1fa25055f9a4..8144b748bb36295e2df1a0e6df5888e8eceb8fb1 100644 (file)
--- a/VEX/priv/guest-generic/bb_to_IR.c
+++ b/VEX/priv/guest_generic_bb_to_IR.c
@@ -1,7 +1,7 @@
 
 /*--------------------------------------------------------------------*/
 /*---                                                              ---*/
-/*--- This file (guest-generic/bb_to_IR.c) is                      ---*/
+/*--- This file (guest_generic_bb_to_IR.c) is                      ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.           ---*/
 /*---                                                              ---*/
 /*--------------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -47,9 +47,9 @@
 #include "libvex_basictypes.h"
 #include "libvex_ir.h"
 #include "libvex.h"
-#include "main/vex_util.h"
-#include "main/vex_globals.h"
-#include "guest-generic/bb_to_IR.h"
+#include "main_util.h"
+#include "main_globals.h"
+#include "guest_generic_bb_to_IR.h"
 
 
 /* Forwards .. */
@@ -451,5 +451,5 @@ static UInt genericg_compute_adler32 ( HWord addr, HWord len )
 
 
 /*--------------------------------------------------------------------*/
-/*--- end                                 guest-generic/bb_to_IR.c ---*/
+/*--- end                                 guest_generic_bb_to_IR.c ---*/
 /*--------------------------------------------------------------------*/

diff --git a/VEX/priv/guest-generic/bb_to_IR.h b/VEX/priv/guest_generic_bb_to_IR.h
similarity index 95%
rename from VEX/priv/guest-generic/bb_to_IR.h
rename to VEX/priv/guest_generic_bb_to_IR.h
index f07d2329b4910e56c5b702614315c6bdb8750ff7..148346a804367934a0a1363563ee487b56951705 100644 (file)
--- a/VEX/priv/guest-generic/bb_to_IR.h
+++ b/VEX/priv/guest_generic_bb_to_IR.h
@@ -1,7 +1,7 @@
 
 /*--------------------------------------------------------------------*/
 /*---                                                              ---*/
-/*--- This file (guest-generic/bb_to_IR.h) is                      ---*/
+/*--- This file (guest_generic_bb_to_IR.h) is                      ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.           ---*/
 /*---                                                              ---*/
 /*--------------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -44,8 +44,8 @@
    without prior written permission.
 */
 
-#ifndef __LIBVEX_GENERIC_BB_TO_IR_H
-#define __LIBVEX_GENERIC_BB_TO_IR_H
+#ifndef __VEX_GUEST_GENERIC_BB_TO_IR_H
+#define __VEX_GUEST_GENERIC_BB_TO_IR_H
 
 
 /* This defines stuff needed by the guest insn disassemblers.
@@ -175,8 +175,8 @@ IRSB* bb_to_IR ( /*OUT*/VexGuestExtents* vge,
                  /*IN*/ Int              offB_TILEN );
 
 
-#endif /* ndef GENERIC_BB_TO_IR_H */
+#endif /* ndef __VEX_GUEST_GENERIC_BB_TO_IR_H */
 
 /*--------------------------------------------------------------------*/
-/*--- end                                 guest-generic/bb_to_IR.h ---*/
+/*--- end                                 guest_generic_bb_to_IR.h ---*/
 /*--------------------------------------------------------------------*/

diff --git a/VEX/priv/guest-generic/g_generic_x87.c b/VEX/priv/guest_generic_x87.c
similarity index 98%
rename from VEX/priv/guest-generic/g_generic_x87.c
rename to VEX/priv/guest_generic_x87.c
index 700939e07b0cbebb9a3f7c3e0f797e19aac926eb..c4223f4c9a28f2d81c81ab073ce3f6844679823e 100644 (file)
--- a/VEX/priv/guest-generic/g_generic_x87.c
+++ b/VEX/priv/guest_generic_x87.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (guest-generic/g_generic_x87.c) is            ---*/
+/*--- This file (guest_generic_x87.c) is                      ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -54,8 +54,8 @@
 
 #include "libvex_basictypes.h"
 
-#include "main/vex_util.h"
-#include "guest-generic/g_generic_x87.h"
+#include "main_util.h"
+#include "guest_generic_x87.h"
 
 
 /* 80 and 64-bit floating point formats:
@@ -547,5 +547,5 @@ ULong x86amd64g_calculate_FXTRACT ( ULong arg, HWord getExp )
 
 
 /*---------------------------------------------------------------*/
-/*--- end                       guest-generic/h_generic_x87.c ---*/
+/*--- end                                 guest_generic_x87.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/guest-generic/g_generic_x87.h b/VEX/priv/guest_generic_x87.h
similarity index 93%
rename from VEX/priv/guest-generic/g_generic_x87.h
rename to VEX/priv/guest_generic_x87.h
index 8c9bf72d834c3afee7e04fa698ff868656599af1..b835c10680aa4728a7763bff6f3d20402d8e2a54 100644 (file)
--- a/VEX/priv/guest-generic/g_generic_x87.h
+++ b/VEX/priv/guest_generic_x87.h
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (guest-generic/g_generic_x87.h) is            ---*/
+/*--- This file (guest_generic_x87.h) is                      ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -52,8 +52,8 @@
    copy thereof.
 */
 
-#ifndef __G_GENERIC_X87_H
-#define __G_GENERIC_X87_H
+#ifndef __VEX_GUEST_GENERIC_X87_H
+#define __VEX_GUEST_GENERIC_X87_H
 
 #include "libvex_basictypes.h"
 
@@ -110,8 +110,8 @@ extern ULong x86amd64g_calculate_FXTRACT ( ULong arg, HWord getExp );
 
 
 
-#endif /* ndef __G_GENERIC_X87_H */
+#endif /* ndef __VEX_GUEST_GENERIC_X87_H */
 
 /*---------------------------------------------------------------*/
-/*--- end                       guest-generic/h_generic_x87.h ---*/
+/*--- end                                 guest_generic_x87.h ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/guest-ppc/gdefs.h b/VEX/priv/guest_ppc_defs.h
similarity index 94%
rename from VEX/priv/guest-ppc/gdefs.h
rename to VEX/priv/guest_ppc_defs.h
index 6359c77197176329f0dbcd089798edc43838c0e8..25fdaed41c7d98c4dcb47d0a6857b8096c09fecd 100644 (file)
--- a/VEX/priv/guest-ppc/gdefs.h
+++ b/VEX/priv/guest_ppc_defs.h
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (guest-ppc/gdefs.h) is                        ---*/
+/*--- This file (guest_ppc_defs.h) is                         ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -47,8 +47,8 @@
 /* Only to be used within the guest-ppc directory. */
 
 
-#ifndef __LIBVEX_GUEST_PPC_DEFS_H
-#define __LIBVEX_GUEST_PPC_DEFS_H
+#ifndef __VEX_GUEST_PPC_DEFS_H
+#define __VEX_GUEST_PPC_DEFS_H
 
 
 /*---------------------------------------------------------*/
@@ -158,8 +158,8 @@ extern void ppc64g_dirtyhelper_LVS ( VexGuestPPC64State* gst,
                                      UInt vD_idx, UInt sh,
                                      UInt shift_right );
 
-#endif /* ndef __LIBVEX_GUEST_PPC_DEFS_H */
+#endif /* ndef __VEX_GUEST_PPC_DEFS_H */
 
 /*---------------------------------------------------------------*/
-/*--- end                                   guest-ppc/gdefs.h ---*/
+/*--- end                                    guest_ppc_defs.h ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/guest-ppc/ghelpers.c b/VEX/priv/guest_ppc_helpers.c
similarity index 98%
rename from VEX/priv/guest-ppc/ghelpers.c
rename to VEX/priv/guest_ppc_helpers.c
index 1e2f27fc8e16e889a0766f0d1059d5f8edf14a72..ea2820c1fffd83985e7cd884d36d269d73558efc 100644 (file)
--- a/VEX/priv/guest-ppc/ghelpers.c
+++ b/VEX/priv/guest_ppc_helpers.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (guest-ppc/ghelpers.c) is                     ---*/
+/*--- This file (guest_ppc_helpers.c) is                      ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -51,9 +51,9 @@
 #include "libvex_ir.h"
 #include "libvex.h"
 
-#include "main/vex_util.h"
-#include "guest-generic/bb_to_IR.h"
-#include "guest-ppc/gdefs.h"
+#include "main_util.h"
+#include "guest_generic_bb_to_IR.h"
+#include "guest_ppc_defs.h"
 
 
 /* This file contains helper functions for ppc32 and ppc64 guest code.
@@ -826,5 +826,5 @@ VexGuestLayout
         };
 
 /*---------------------------------------------------------------*/
-/*--- end                                guest-ppc/ghelpers.c ---*/
+/*--- end                                 guest_ppc_helpers.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/guest-ppc/toIR.c b/VEX/priv/guest_ppc_toIR.c
similarity index 99%
rename from VEX/priv/guest-ppc/toIR.c
rename to VEX/priv/guest_ppc_toIR.c
index 64b9adb0f65f6b17366a12a0e303c359f7f3a06b..25e06bf47661ac75b781c7db18b2ac204011e0a5 100644 (file)
--- a/VEX/priv/guest-ppc/toIR.c
+++ b/VEX/priv/guest_ppc_toIR.c
@@ -1,7 +1,7 @@
 
 /*--------------------------------------------------------------------*/
 /*---                                                              ---*/
-/*--- This file (guest-ppc/toIR.c) is                              ---*/
+/*--- This file (guest_ppc_toIR.c) is                              ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.           ---*/
 /*---                                                              ---*/
 /*--------------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -140,10 +140,10 @@
 #include "libvex_guest_ppc32.h"
 #include "libvex_guest_ppc64.h"
 
-#include "main/vex_util.h"
-#include "main/vex_globals.h"
-#include "guest-generic/bb_to_IR.h"
-#include "guest-ppc/gdefs.h"
+#include "main_util.h"
+#include "main_globals.h"
+#include "guest_generic_bb_to_IR.h"
+#include "guest_ppc_defs.h"
 
 
 /*------------------------------------------------------------*/
@@ -9865,5 +9865,5 @@ DisResult disInstr_PPC ( IRSB*        irsb_IN,
 //}
 
 /*--------------------------------------------------------------------*/
-/*--- end                                         guest-ppc/toIR.c ---*/
+/*--- end                                         guest_ppc_toIR.c ---*/
 /*--------------------------------------------------------------------*/

diff --git a/VEX/priv/guest-x86/gdefs.h b/VEX/priv/guest_x86_defs.h
similarity index 98%
rename from VEX/priv/guest-x86/gdefs.h
rename to VEX/priv/guest_x86_defs.h
index 8ab64d3c57f6f303b39200ad7ec61318beca9aa6..ccee35b02389253023c8137a24d49ea8cb2b0399 100644 (file)
--- a/VEX/priv/guest-x86/gdefs.h
+++ b/VEX/priv/guest_x86_defs.h
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (guest-x86/gdefs.h) is                        ---*/
+/*--- This file (guest_x86_defs.h) is                         ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -46,8 +46,8 @@
 
 /* Only to be used within the guest-x86 directory. */
 
-#ifndef __LIBVEX_GUEST_X86_DEFS_H
-#define __LIBVEX_GUEST_X86_DEFS_H
+#ifndef __VEX_GUEST_X86_DEFS_H
+#define __VEX_GUEST_X86_DEFS_H
 
 
 /*---------------------------------------------------------*/
@@ -410,8 +410,8 @@ typedef
    }
    X86Condcode;
 
-#endif /* ndef __LIBVEX_GUEST_X86_DEFS_H */
+#endif /* ndef __VEX_GUEST_X86_DEFS_H */
 
 /*---------------------------------------------------------------*/
-/*--- end                                   guest-x86/gdefs.h ---*/
+/*--- end                                    guest_x86_defs.h ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/guest-x86/ghelpers.c b/VEX/priv/guest_x86_helpers.c
similarity index 99%
rename from VEX/priv/guest-x86/ghelpers.c
rename to VEX/priv/guest_x86_helpers.c
index 1bef2b0942265b37dddd980c35835055e68484c7..bec1dc3f3f0a07d223338c45225946d53fb812e2 100644 (file)
--- a/VEX/priv/guest-x86/ghelpers.c
+++ b/VEX/priv/guest_x86_helpers.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (guest-x86/ghelpers.c) is                     ---*/
+/*--- This file (guest_x86_helpers.c) is                      ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -50,10 +50,10 @@
 #include "libvex_ir.h"
 #include "libvex.h"
 
-#include "main/vex_util.h"
-#include "guest-generic/bb_to_IR.h"
-#include "guest-x86/gdefs.h"
-#include "guest-generic/g_generic_x87.h"
+#include "main_util.h"
+#include "guest_generic_bb_to_IR.h"
+#include "guest_x86_defs.h"
+#include "guest_generic_x87.h"
 
 
 /* This file contains helper functions for x86 guest code.
@@ -2742,5 +2742,5 @@ VexGuestLayout
 
 
 /*---------------------------------------------------------------*/
-/*--- end                                guest-x86/ghelpers.c ---*/
+/*--- end                                 guest_x86_helpers.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/guest-x86/toIR.c b/VEX/priv/guest_x86_toIR.c
similarity index 99%
rename from VEX/priv/guest-x86/toIR.c
rename to VEX/priv/guest_x86_toIR.c
index 8ba3ae729a0d2eab8d17056f52875c7d8bab3b29..ece3c5409e2e74ca2d6f1bc0419a2dd94e45c328 100644 (file)
--- a/VEX/priv/guest-x86/toIR.c
+++ b/VEX/priv/guest_x86_toIR.c
@@ -1,7 +1,7 @@
 
 /*--------------------------------------------------------------------*/
 /*---                                                              ---*/
-/*--- This file (guest-x86/toIR.c) is                              ---*/
+/*--- This file (guest_x86_toIR.c) is                              ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.           ---*/
 /*---                                                              ---*/
 /*--------------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -182,11 +182,11 @@
 #include "libvex.h"
 #include "libvex_guest_x86.h"
 
-#include "main/vex_util.h"
-#include "main/vex_globals.h"
-#include "guest-generic/bb_to_IR.h"
-#include "guest-generic/g_generic_x87.h"
-#include "guest-x86/gdefs.h"
+#include "main_util.h"
+#include "main_globals.h"
+#include "guest_generic_bb_to_IR.h"
+#include "guest_generic_x87.h"
+#include "guest_x86_defs.h"
 
 
 /*------------------------------------------------------------*/
@@ -14801,5 +14801,5 @@ DisResult disInstr_X86 ( IRSB*        irsb_IN,
 
 
 /*--------------------------------------------------------------------*/
-/*--- end                                         guest-x86/toIR.c ---*/
+/*--- end                                         guest_x86_toIR.c ---*/
 /*--------------------------------------------------------------------*/

diff --git a/VEX/priv/host-amd64/hdefs.c b/VEX/priv/host_amd64_defs.c
similarity index 99%
rename from VEX/priv/host-amd64/hdefs.c
rename to VEX/priv/host_amd64_defs.c
index 788fe43aae6126a653687bad3ec9a91dbb4ec6b6..f231d36b97194d1cc1f489192b287610560a5bdf 100644 (file)
--- a/VEX/priv/host-amd64/hdefs.c
+++ b/VEX/priv/host_amd64_defs.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (host-amd64/hdefs.c) is                       ---*/
+/*--- This file (host_amd64_defs.c) is                        ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -48,9 +48,9 @@
 #include "libvex.h"
 #include "libvex_trc_values.h"
 
-#include "main/vex_util.h"
-#include "host-generic/h_generic_regs.h"
-#include "host-amd64/hdefs.h"
+#include "main_util.h"
+#include "host_generic_regs.h"
+#include "host_amd64_defs.h"
 
 
 /* --------- Registers. --------- */
@@ -3546,5 +3546,5 @@ Int emit_AMD64Instr ( UChar* buf, Int nbuf, AMD64Instr* i,
 }
 
 /*---------------------------------------------------------------*/
-/*--- end                                  host-amd64/hdefs.c ---*/
+/*--- end                                   host_amd64_defs.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/host-amd64/hdefs.h b/VEX/priv/host_amd64_defs.h
similarity index 98%
rename from VEX/priv/host-amd64/hdefs.h
rename to VEX/priv/host_amd64_defs.h
index 2ca7106e87f8dd547e87e1096326387eba93dd23..a6097949fc65a9d82dc2021c6d23491e5123f679 100644 (file)
--- a/VEX/priv/host-amd64/hdefs.h
+++ b/VEX/priv/host_amd64_defs.h
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (host-amd64/hdefs.h) is                       ---*/
+/*--- This file (host_amd64_defs.h) is                        ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -44,8 +44,8 @@
    without prior written permission.
 */
 
-#ifndef __LIBVEX_HOST_AMD64_HDEFS_H
-#define __LIBVEX_HOST_AMD64_HDEFS_H
+#ifndef __VEX_HOST_AMD64_DEFS_H
+#define __VEX_HOST_AMD64_DEFS_H
 
 
 /* --------- Registers. --------- */
@@ -751,8 +751,8 @@ extern HInstrArray* iselSB_AMD64           ( IRSB*, VexArch,
                                                     VexArchInfo*,
                                                     VexAbiInfo* );
 
-#endif /* ndef __LIBVEX_HOST_AMD64_HDEFS_H */
+#endif /* ndef __VEX_HOST_AMD64_DEFS_H */
 
 /*---------------------------------------------------------------*/
-/*--- end                                  host-amd64/hdefs.h ---*/
+/*--- end                                   host_amd64_defs.h ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/host-amd64/isel.c b/VEX/priv/host_amd64_isel.c
similarity index 99%
rename from VEX/priv/host-amd64/isel.c
rename to VEX/priv/host_amd64_isel.c
index a3f01734b40bb8b13ab1714061844250812f66b0..fe11b6b24e86a3b063f6a50c0fc1b4e4e32f3824 100644 (file)
--- a/VEX/priv/host-amd64/isel.c
+++ b/VEX/priv/host_amd64_isel.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (host-amd64/isel.c) is                        ---*/
+/*--- This file (host_amd64_isel.c) is                        ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -48,12 +48,12 @@
 #include "libvex_ir.h"
 #include "libvex.h"
 
-#include "ir/irmatch.h"
-#include "main/vex_util.h"
-#include "main/vex_globals.h"
-#include "host-generic/h_generic_regs.h"
-#include "host-generic/h_generic_simd64.h"
-#include "host-amd64/hdefs.h"
+#include "ir_match.h"
+#include "main_util.h"
+#include "main_globals.h"
+#include "host_generic_regs.h"
+#include "host_generic_simd64.h"
+#include "host_amd64_defs.h"
 
 
 /*---------------------------------------------------------*/
@@ -4029,5 +4029,5 @@ HInstrArray* iselSB_AMD64 ( IRSB* bb, VexArch      arch_host,
 
 
 /*---------------------------------------------------------------*/
-/*--- end                                   host-amd64/isel.c ---*/
+/*--- end                                   host_amd64_isel.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/host-arm/hdefs.c b/VEX/priv/host_arm_defs.c
similarity index 98%
rename from VEX/priv/host-arm/hdefs.c
rename to VEX/priv/host_arm_defs.c
index aa250074cba40d9156214fbfc0d18f83057110e1..2735b2771fa09bba344c57ca26c8f6116a74219e 100644 (file)
--- a/VEX/priv/host-arm/hdefs.c
+++ b/VEX/priv/host_arm_defs.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (host-arm/hdefs.c) is                         ---*/
+/*--- This file (host_arm_defs.c) is                          ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -48,9 +48,9 @@
 #include "libvex.h"
 #include "libvex_trc_values.h"
 
-#include "main/vex_util.h"
-#include "host-generic/h_generic_regs.h"
-#include "host-arm/hdefs.h"
+#include "main_util.h"
+#include "host_generic_regs.h"
+#include "host_arm_defs.h"
 
 
 
@@ -749,5 +749,5 @@ Int emit_ARMInstr ( UChar* buf, Int nbuf, ARMInstr* i ) {
 
 
 /*---------------------------------------------------------------*/
-/*--- end                                    host-x86/hdefs.c ---*/
+/*--- end                                     host_arm_defs.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/host-arm/hdefs.h b/VEX/priv/host_arm_defs.h
similarity index 97%
rename from VEX/priv/host-arm/hdefs.h
rename to VEX/priv/host_arm_defs.h
index 30ba8e8b0177ac5c51ff861d20b3905290f0fe8d..1d22685ec15b7ae67e0c4f887e7b4772e02a2c1c 100644 (file)
--- a/VEX/priv/host-arm/hdefs.h
+++ b/VEX/priv/host_arm_defs.h
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (hdefs.h) is                                  ---*/
+/*--- This file (host_arm_defs.h) is                          ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -44,8 +44,8 @@
    without prior written permission.
 */
 
-#ifndef __LIBVEX_ARMH_DEFS_H
-#define __LIBVEX_ARMH_DEFS_H
+#ifndef __VEX_HOST_ARM_DEFS_H
+#define __VEX_HOST_ARM_DEFS_H
 
 
 /* --------- Registers. --------- */
@@ -453,8 +453,8 @@ extern ARMInstr*    genReload_ARM        ( HReg rreg, Int offset );
 extern void         getAllocableRegs_ARM ( Int*, HReg** );
 extern HInstrArray* iselSB_ARM           ( IRSB* );
 
-#endif /* ndef __LIBVEX_ARMH_DEFS_H */
+#endif /* ndef __VEX_HOST_ARM_DEFS_H */
 
 /*---------------------------------------------------------------*/
-/*--- end                                         arm hdefs.h ---*/
+/*--- end                                     host_arm_defs.h ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/host-arm/isel.c b/VEX/priv/host_arm_isel.c
similarity index 98%
rename from VEX/priv/host-arm/isel.c
rename to VEX/priv/host_arm_isel.c
index 2f369fe7b784d0859fbfe3978e422abba4ab8aaa..302d80f4e1b9dafff58caf7a91917b1db9733ffa 100644 (file)
--- a/VEX/priv/host-arm/isel.c
+++ b/VEX/priv/host_arm_isel.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (host-x86/isel.c) is                          ---*/
+/*--- This file (host_arm_isel.c) is                          ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -48,10 +48,10 @@
 #include "libvex_ir.h"
 #include "libvex.h"
 
-#include "main/vex_util.h"
-#include "main/vex_globals.h"
-#include "host-generic/h_generic_regs.h"
-#include "host-arm/hdefs.h"
+#include "main_util.h"
+#include "main_globals.h"
+#include "host_generic_regs.h"
+#include "host_arm_defs.h"
 
 
 /*---------------------------------------------------------*/
@@ -976,5 +976,5 @@ HInstrArray* iselSB_ARM ( IRSB* bb )
 
 
 /*---------------------------------------------------------------*/
-/*--- end                                     host-x86/isel.c ---*/
+/*--- end                                     host_arm_isel.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/host-generic/reg_alloc2.c b/VEX/priv/host_generic_reg_alloc2.c
similarity index 99%
rename from VEX/priv/host-generic/reg_alloc2.c
rename to VEX/priv/host_generic_reg_alloc2.c
index e57d38c7e2562d2b31074054e0502d9993c00d08..fc420aa1d53e31d898eaa80f2af30e423420eba9 100644 (file)
--- a/VEX/priv/host-generic/reg_alloc2.c
+++ b/VEX/priv/host_generic_reg_alloc2.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (host-generic/reg_alloc2.c) is                ---*/
+/*--- This file (host_reg_alloc2.c) is                        ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -47,8 +47,8 @@
 #include "libvex_basictypes.h"
 #include "libvex.h"
 
-#include "main/vex_util.h"
-#include "host-generic/h_generic_regs.h"
+#include "main_util.h"
+#include "host_generic_regs.h"
 
 /* Set to 1 for lots of debugging output. */
 #define DEBUG_REGALLOC 0
@@ -1530,5 +1530,5 @@ HInstrArray* doRegisterAllocation (
 
 
 /*---------------------------------------------------------------*/
-/*---                               host-generic/reg_alloc2.c ---*/
+/*---                                       host_reg_alloc2.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/host-generic/h_generic_regs.c b/VEX/priv/host_generic_regs.c
similarity index 96%
rename from VEX/priv/host-generic/h_generic_regs.c
rename to VEX/priv/host_generic_regs.c
index ec17c15b40b0f90a43811db71179e166cee2380e..f38746b874f5fe0107e80c9c6c48cc3286c3797f 100644 (file)
--- a/VEX/priv/host-generic/h_generic_regs.c
+++ b/VEX/priv/host_generic_regs.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (host-generic/h_generic_regs.c) is            ---*/
+/*--- This file (host_generic_regs.c) is                      ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -47,8 +47,8 @@
 #include "libvex_basictypes.h"
 #include "libvex.h"
 
-#include "main/vex_util.h"
-#include "host-generic/h_generic_regs.h"
+#include "main_util.h"
+#include "host_generic_regs.h"
 
 
 void ppHRegClass ( HRegClass hrc )
@@ -228,5 +228,5 @@ void addHInstr ( HInstrArray* ha, HInstr* instr )
 
 
 /*---------------------------------------------------------------*/
-/*--- end                       host-generic/h_generic_regs.c ---*/
+/*--- end                                 host_generic_regs.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/host-generic/h_generic_regs.h b/VEX/priv/host_generic_regs.h
similarity index 96%
rename from VEX/priv/host-generic/h_generic_regs.h
rename to VEX/priv/host_generic_regs.h
index aaaaf5610d105ebfd529cd1afc5cfbd2116f698c..845f7f0a4a7b2de340b95e422215ce29d3b3baff 100644 (file)
--- a/VEX/priv/host-generic/h_generic_regs.h
+++ b/VEX/priv/host_generic_regs.h
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (h_generic_regs.h) is                         ---*/
+/*--- This file (host_generic_regs.h) is                      ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -44,8 +44,8 @@
    without prior written permission.
 */
 
-#ifndef __H_GENERIC_REGS_H
-#define __H_GENERIC_REGS_H
+#ifndef __VEX_HOST_GENERIC_REGS_H
+#define __VEX_HOST_GENERIC_REGS_H
 
 #include "libvex_basictypes.h"
 
@@ -281,8 +281,8 @@ HInstrArray* doRegisterAllocation (
 );
 
 
-#endif /* ndef __H_GENERIC_REGS_H */
+#endif /* ndef __VEX_HOST_GENERIC_REGS_H */
 
 /*---------------------------------------------------------------*/
-/*---                                        h_generic_regs.h ---*/
+/*---                                     host_generic_regs.h ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/host-generic/h_generic_simd64.c b/VEX/priv/host_generic_simd64.c
similarity index 99%
rename from VEX/priv/host-generic/h_generic_simd64.c
rename to VEX/priv/host_generic_simd64.c
index 376bf02e0e4ab7c523584df328b47ef25329b577..506c142b3130f8c74c6a38ff0e56c2cde001b130 100644 (file)
--- a/VEX/priv/host-generic/h_generic_simd64.c
+++ b/VEX/priv/host_generic_simd64.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (host-generic/h_generic_simd64.c) is          ---*/
+/*--- This file (host_generic_simd64.c) is                    ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -50,7 +50,7 @@
    from IR. */
 
 #include "libvex_basictypes.h"
-#include "host-generic/h_generic_simd64.h"
+#include "host_generic_simd64.h"
 
 
 
@@ -1043,5 +1043,5 @@ ULong h_generic_calc_Min8Ux8 ( ULong xx, ULong yy )
 
 
 /*---------------------------------------------------------------*/
-/*--- end                     host-generic/h_generic_simd64.c ---*/
+/*--- end                               host_generic_simd64.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/host-generic/h_generic_simd64.h b/VEX/priv/host_generic_simd64.h
similarity index 94%
rename from VEX/priv/host-generic/h_generic_simd64.h
rename to VEX/priv/host_generic_simd64.h
index f55d5f4b0b2fed4580512efd17fdd6d6784e3c2d..7c1ce615c8d6ea66fa33261fb08e9e691673dab3 100644 (file)
--- a/VEX/priv/host-generic/h_generic_simd64.h
+++ b/VEX/priv/host_generic_simd64.h
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (host-generic/h_generic_simd64.h) is          ---*/
+/*--- This file (host_generic_simd64.h) is                    ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -56,8 +56,8 @@
    Each function implements the correspondingly-named IR primop.
 */
 
-#ifndef __H_GENERIC_SIMD64_H
-#define __H_GENERIC_SIMD64_H
+#ifndef __VEX_HOST_GENERIC_SIMD64_H
+#define __VEX_HOST_GENERIC_SIMD64_H
 
 #include "libvex_basictypes.h"
 
@@ -133,8 +133,8 @@ extern ULong h_generic_calc_Min16Sx4 ( ULong, ULong );
 extern ULong h_generic_calc_Min8Ux8  ( ULong, ULong );
 
 
-#endif /* ndef __H_GENERIC_SIMD64_H */
+#endif /* ndef __VEX_HOST_GENERIC_SIMD64_H */
 
 /*---------------------------------------------------------------*/
-/*--- end                     host-generic/h_generic_simd64.h ---*/
+/*--- end                               host_generic_simd64.h ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/host-ppc/hdefs.c b/VEX/priv/host_ppc_defs.c
similarity index 99%
rename from VEX/priv/host-ppc/hdefs.c
rename to VEX/priv/host_ppc_defs.c
index 36e27c9be6047c99b3da2715df66f6cd23c50e13..1b8d10377344842cb23ca22ec775f835308fc604 100644 (file)
--- a/VEX/priv/host-ppc/hdefs.c
+++ b/VEX/priv/host_ppc_defs.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (host-ppc/hdefs.c) is                         ---*/
+/*--- This file (host_ppc_defs.c) is                          ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -48,9 +48,9 @@
 #include "libvex.h"
 #include "libvex_trc_values.h"
 
-#include "main/vex_util.h"
-#include "host-generic/h_generic_regs.h"
-#include "host-ppc/hdefs.h"
+#include "main_util.h"
+#include "host_generic_regs.h"
+#include "host_ppc_defs.h"
 
 
 /* --------- Registers. --------- */
@@ -3846,5 +3846,5 @@ Int emit_PPCInstr ( UChar* buf, Int nbuf, PPCInstr* i,
 }
 
 /*---------------------------------------------------------------*/
-/*--- end                                    host-ppc/hdefs.c ---*/
+/*--- end                                     host_ppc_defs.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/host-ppc/hdefs.h b/VEX/priv/host_ppc_defs.h
similarity index 98%
rename from VEX/priv/host-ppc/hdefs.h
rename to VEX/priv/host_ppc_defs.h
index da66c9c6177496f194f8d3153ed5e1bd8792fabe..7d8f3e18c88085a4f7f557cefdece8897c0e6d9c 100644 (file)
--- a/VEX/priv/host-ppc/hdefs.h
+++ b/VEX/priv/host_ppc_defs.h
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (host-ppc/hdefs.h) is                         ---*/
+/*--- This file (host_ppc_defs.h) is                          ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -44,8 +44,8 @@
    without prior written permission.
 */
 
-#ifndef __LIBVEX_HOST_PPC_HDEFS_H
-#define __LIBVEX_HOST_PPC_HDEFS_H
+#ifndef __VEX_HOST_PPC_DEFS_H
+#define __VEX_HOST_PPC_DEFS_H
 
 /* Num registers used for function calls */
 #define PPC_N_REGPARMS 8
@@ -861,8 +861,8 @@ extern HInstrArray* iselSB_PPC           ( IRSB*, VexArch,
                                                   VexArchInfo*,
                                                   VexAbiInfo* );
 
-#endif /* ndef __LIBVEX_HOST_PPC_HDEFS_H */
+#endif /* ndef __VEX_HOST_PPC_DEFS_H */
 
 /*---------------------------------------------------------------*/
-/*--- end                                    host-ppc/hdefs.h ---*/
+/*--- end                                     host_ppc_defs.h ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/host-ppc/isel.c b/VEX/priv/host_ppc_isel.c
similarity index 99%
rename from VEX/priv/host-ppc/isel.c
rename to VEX/priv/host_ppc_isel.c
index a7492bad494079e0b18b5a8f94c737e623fd11ca..131e8fe824eb8ff61a5d44fd5fabfb8a018a1e92 100644 (file)
--- a/VEX/priv/host-ppc/isel.c
+++ b/VEX/priv/host_ppc_isel.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (host-ppc/isel.c) is                          ---*/
+/*--- This file (host_ppc_isel.c) is                          ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -48,11 +48,11 @@
 #include "libvex_ir.h"
 #include "libvex.h"
 
-#include "ir/irmatch.h"
-#include "main/vex_util.h"
-#include "main/vex_globals.h"
-#include "host-generic/h_generic_regs.h"
-#include "host-ppc/hdefs.h"
+#include "ir_match.h"
+#include "main_util.h"
+#include "main_globals.h"
+#include "host_generic_regs.h"
+#include "host_ppc_defs.h"
 
 /* GPR register class for ppc32/64 */
 #define HRcGPR(__mode64) (__mode64 ? HRcInt64 : HRcInt32)
@@ -4199,5 +4199,5 @@ HInstrArray* iselSB_PPC ( IRSB* bb, VexArch      arch_host,
 
 
 /*---------------------------------------------------------------*/
-/*--- end                                     host-ppc/isel.c ---*/
+/*--- end                                     host_ppc_isel.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/host-x86/hdefs.c b/VEX/priv/host_x86_defs.c
similarity index 99%
rename from VEX/priv/host-x86/hdefs.c
rename to VEX/priv/host_x86_defs.c
index 7c1aa627f2bc0d1de086ceb8ead6e2eb32daf53a..d5f5539a1c3fe5c36ba40fd31235aa0fd3f08c5c 100644 (file)
--- a/VEX/priv/host-x86/hdefs.c
+++ b/VEX/priv/host_x86_defs.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (host-x86/hdefs.c) is                         ---*/
+/*--- This file (host_x86_defs.c) is                          ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -48,9 +48,9 @@
 #include "libvex.h"
 #include "libvex_trc_values.h"
 
-#include "main/vex_util.h"
-#include "host-generic/h_generic_regs.h"
-#include "host-x86/hdefs.h"
+#include "main_util.h"
+#include "host_generic_regs.h"
+#include "host_x86_defs.h"
 
 
 /* --------- Registers. --------- */
@@ -3085,5 +3085,5 @@ Int emit_X86Instr ( UChar* buf, Int nbuf, X86Instr* i,
 }
 
 /*---------------------------------------------------------------*/
-/*--- end                                    host-x86/hdefs.c ---*/
+/*--- end                                     host_x86_defs.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/host-x86/hdefs.h b/VEX/priv/host_x86_defs.h
similarity index 98%
rename from VEX/priv/host-x86/hdefs.h
rename to VEX/priv/host_x86_defs.h
index d77a69572d21e3e9079e1ae0b3191d9563f9faa5..1f4441a9e9b86920707ddb301672b0631fcf9216 100644 (file)
--- a/VEX/priv/host-x86/hdefs.h
+++ b/VEX/priv/host_x86_defs.h
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (host-x86/hdefs.h) is                         ---*/
+/*--- This file (host_x86_defs.h) is                          ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -44,8 +44,8 @@
    without prior written permission.
 */
 
-#ifndef __LIBVEX_HOST_X86_HDEFS_H
-#define __LIBVEX_HOST_X86_HDEFS_H
+#ifndef __VEX_HOST_X86_DEFS_H
+#define __VEX_HOST_X86_DEFS_H
 
 
 /* --------- Registers. --------- */
@@ -694,8 +694,8 @@ extern HInstrArray* iselSB_X86           ( IRSB*, VexArch,
                                                   VexArchInfo*,
                                                   VexAbiInfo* );
 
-#endif /* ndef __LIBVEX_HOST_X86_HDEFS_H */
+#endif /* ndef __VEX_HOST_X86_DEFS_H */
 
 /*---------------------------------------------------------------*/
-/*--- end                                    host-x86/hdefs.h ---*/
+/*--- end                                     host_x86_defs.h ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/host-x86/isel.c b/VEX/priv/host_x86_isel.c
similarity index 99%
rename from VEX/priv/host-x86/isel.c
rename to VEX/priv/host_x86_isel.c
index 38a34d8eaac1c6d14fa317e1385fd6f2328ee7c0..522f074b48f3a2a9ee9fd6ad9899f840d1627b65 100644 (file)
--- a/VEX/priv/host-x86/isel.c
+++ b/VEX/priv/host_x86_isel.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (host-x86/isel.c) is                          ---*/
+/*--- This file (host_x86_isel.c) is                          ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -48,12 +48,12 @@
 #include "libvex_ir.h"
 #include "libvex.h"
 
-#include "ir/irmatch.h"
-#include "main/vex_util.h"
-#include "main/vex_globals.h"
-#include "host-generic/h_generic_regs.h"
-#include "host-generic/h_generic_simd64.h"
-#include "host-x86/hdefs.h"
+#include "ir_match.h"
+#include "main_util.h"
+#include "main_globals.h"
+#include "host_generic_regs.h"
+#include "host_generic_simd64.h"
+#include "host_x86_defs.h"
 
 /* TODO 21 Apr 2005:
 
@@ -4047,5 +4047,5 @@ HInstrArray* iselSB_X86 ( IRSB* bb, VexArch      arch_host,
 
 
 /*---------------------------------------------------------------*/
-/*--- end                                     host-x86/isel.c ---*/
+/*--- end                                     host_x86_isel.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/ir/irdefs.c b/VEX/priv/ir_defs.c
similarity index 99%
rename from VEX/priv/ir/irdefs.c
rename to VEX/priv/ir_defs.c
index 758c17a67245914fd10730c0cd6e58582c3c40d2..6b3a5f562b558ce4a4fee47d015d35956a76baeb 100644 (file)
--- a/VEX/priv/ir/irdefs.c
+++ b/VEX/priv/ir_defs.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (ir/irdefs.c) is                              ---*/
+/*--- This file (ir_defs.c) is                                ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -48,7 +48,7 @@
 #include "libvex_ir.h"
 #include "libvex.h"
 
-#include "main/vex_util.h"
+#include "main_util.h"
 
 
 /*---------------------------------------------------------------*/
@@ -2935,5 +2935,5 @@ Bool eqIRAtom ( IRExpr* a1, IRExpr* a2 )
 }
 
 /*---------------------------------------------------------------*/
-/*--- end                                         ir/irdefs.c ---*/
+/*--- end                                           ir_defs.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/ir/irmatch.c b/VEX/priv/ir_match.c
similarity index 94%
rename from VEX/priv/ir/irmatch.c
rename to VEX/priv/ir_match.c
index c80542952aa82bfb381756b9b2ccab8e19789171..20a9f3cd2481b3cf92107b4d8a0558d7ae59f7d7 100644 (file)
--- a/VEX/priv/ir/irmatch.c
+++ b/VEX/priv/ir_match.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (ir/irmatch.c) is                             ---*/
+/*--- This file (ir_match.c) is                               ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -46,8 +46,8 @@
 
 /* Provides a facility for doing IR tree matching. */
 
-#include "main/vex_util.h"
-#include "ir/irmatch.h"
+#include "main_util.h"
+#include "ir_match.h"
 
 
 /* Assign a value to a binder.  Checks for obvious stupidities. */
@@ -119,5 +119,5 @@ Bool matchIRExpr ( MatchInfo* mi, IRExpr* p/*attern*/, IRExpr* e/*xpr*/ )
 
 
 /*---------------------------------------------------------------*/
-/*--- end                                        ir/irmatch.c ---*/
+/*--- end                                          ir_match.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/ir/irmatch.h b/VEX/priv/ir_match.h
similarity index 92%
rename from VEX/priv/ir/irmatch.h
rename to VEX/priv/ir_match.h
index 14883a796046fdc2215e4e664b606032577336cb..72679689a74839327a6d6fcadb00a70de9d59d82 100644 (file)
--- a/VEX/priv/ir/irmatch.h
+++ b/VEX/priv/ir_match.h
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (ir/irmatch.h) is                             ---*/
+/*--- This file (ir_match.h) is                               ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -46,8 +46,8 @@
 
 /* Provides a facility for doing IR tree matching. */
 
-#ifndef __LIBVEX_IRMATCH_H
-#define __LIBVEX_IRMATCH_H
+#ifndef __VEX_IR_MATCH_H
+#define __VEX_IR_MATCH_H
 
 #include "libvex_basictypes.h"
 #include "libvex_ir.h"
@@ -92,10 +92,10 @@ extern
 Bool matchIRExpr ( MatchInfo* mi, IRExpr* p/*attern*/, IRExpr* e/*xpr*/ );
 
 
-#endif /* ndef __LIBVEX_IRMATCH_H */
+#endif /* ndef __VEX_IR_MATCH_H */
 
 
 
 /*---------------------------------------------------------------*/
-/*--- end                                        ir/irmatch.h ---*/
+/*--- end                                          ir_match.h ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/ir/iropt.c b/VEX/priv/ir_opt.c
similarity index 99%
rename from VEX/priv/ir/iropt.c
rename to VEX/priv/ir_opt.c
index d90852d043dd3a66a08789ac643eeb177be11a7a..840b12dee6a29152beba277786cc25d44939e90c 100644 (file)
--- a/VEX/priv/ir/iropt.c
+++ b/VEX/priv/ir_opt.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (ir/iropt.c) is                               ---*/
+/*--- This file (ir_opt.c) is                                 ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -48,9 +48,9 @@
 #include "libvex_ir.h"
 #include "libvex.h"
 
-#include "main/vex_util.h"
-#include "main/vex_globals.h"
-#include "ir/iropt.h"
+#include "main_util.h"
+#include "main_globals.h"
+#include "ir_opt.h"
 
 
 /* Set to 1 for lots of debugging output. */
@@ -4510,5 +4510,5 @@ IRSB* do_iropt_BB ( IRSB* bb0,
 
 
 /*---------------------------------------------------------------*/
-/*--- end                                          ir/iropt.c ---*/
+/*--- end                                            ir_opt.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/ir/iropt.h b/VEX/priv/ir_opt.h
similarity index 91%
rename from VEX/priv/ir/iropt.h
rename to VEX/priv/ir_opt.h
index e56930b045d37978912689ea35a56cf0452071d4..1b3ca25bcb56ecb3befcf82311924fc2ce45bbf6 100644 (file)
--- a/VEX/priv/ir/iropt.h
+++ b/VEX/priv/ir_opt.h
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (ir/iropt.h) is                               ---*/
+/*--- This file (ir_opt.h) is                                 ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -44,8 +44,8 @@
    without prior written permission.
 */
 
-#ifndef __LIBVEX_IROPT_H
-#define __LIBVEX_IROPT_H
+#ifndef __VEX_IR_OPT_H
+#define __VEX_IR_OPT_H
 
 #include "libvex_basictypes.h"
 #include "libvex_ir.h"
@@ -72,8 +72,8 @@ void do_deadcode_BB ( IRSB* bb );
 extern
 void ado_treebuild_BB ( IRSB* bb );
 
-#endif /* ndef __LIBVEX_IROPT_H */
+#endif /* ndef __VEX_IR_OPT_H */
 
 /*---------------------------------------------------------------*/
-/*--- end                                          ir/iropt.h ---*/
+/*--- end                                            ir_opt.h ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/main/vex_globals.c b/VEX/priv/main_globals.c
similarity index 92%
rename from VEX/priv/main/vex_globals.c
rename to VEX/priv/main_globals.c
index 3868d43b56ed7b71214e7713c1249eb49a735cf2..d0110427b648ab07849eb93cb592db21c82732ed 100644 (file)
--- a/VEX/priv/main/vex_globals.c
+++ b/VEX/priv/main_globals.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (vex_globals.c) is                            ---*/
+/*--- This file (main_globals.c) is                           ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -46,8 +46,8 @@
 
 #include "libvex_basictypes.h"
 
-#include "vex_util.h"
-#include "vex_globals.h"
+#include "main_util.h"
+#include "main_globals.h"
 
 
 /* Global settings for the VEX library.  These are the
@@ -78,6 +78,5 @@ VexControl vex_control = { 0,0,False,0,0,0 };
 
 
 /*---------------------------------------------------------------*/
-/*--- end                                       vex_globals.c ---*/
+/*--- end                                      main_globals.c ---*/
 /*---------------------------------------------------------------*/
-

diff --git a/VEX/priv/main/vex_globals.h b/VEX/priv/main_globals.h
similarity index 92%
rename from VEX/priv/main/vex_globals.h
rename to VEX/priv/main_globals.h
index 01f8b62d2601a6bdb6e81468c52c3ce9f1e9ab80..7e53016d484a4afbcb0b0a7277370156c451c5aa 100644 (file)
--- a/VEX/priv/main/vex_globals.h
+++ b/VEX/priv/main_globals.h
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (vex_globals.h) is                            ---*/
+/*--- This file (main_globals.h) is                           ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -44,8 +44,8 @@
    without prior written permission.
 */
 
-#ifndef __VEX_GLOBALS_H
-#define __VEX_GLOBALS_H
+#ifndef __VEX_MAIN_GLOBALS_H
+#define __VEX_MAIN_GLOBALS_H
 
 #include "libvex_basictypes.h"
 #include "libvex.h"
@@ -88,8 +88,8 @@ extern VexControl vex_control;
 #define VEX_TRACE_ASM    (1 << 0)  /* show final assembly */
 
 
-#endif /* ndef __VEX_GLOBALS_H */
+#endif /* ndef __VEX_MAIN_GLOBALS_H */
 
 /*---------------------------------------------------------------*/
-/*--- end                                       vex_globals.h ---*/
+/*--- end                                      main_globals.h ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/main/vex_main.c b/VEX/priv/main_main.c
similarity index 98%
rename from VEX/priv/main/vex_main.c
rename to VEX/priv/main_main.c
index 5a7835f71f5e982a764d0aa4adaa44d6d1f62336..49cb8ca93ad89021fd2e5540614fad8e2f525d27 100644 (file)
--- a/VEX/priv/main/vex_main.c
+++ b/VEX/priv/main_main.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (main/vex_main.c) is                          ---*/
+/*--- This file (main_main.c) is                              ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -52,20 +52,20 @@
 #include "libvex_guest_ppc32.h"
 #include "libvex_guest_ppc64.h"
 
-#include "main/vex_globals.h"
-#include "main/vex_util.h"
-#include "host-generic/h_generic_regs.h"
-#include "ir/iropt.h"
+#include "main_globals.h"
+#include "main_util.h"
+#include "host_generic_regs.h"
+#include "ir_opt.h"
 
-#include "host-x86/hdefs.h"
-#include "host-amd64/hdefs.h"
-#include "host-ppc/hdefs.h"
+#include "host_x86_defs.h"
+#include "host_amd64_defs.h"
+#include "host_ppc_defs.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-ppc/gdefs.h"
+#include "guest_generic_bb_to_IR.h"
+#include "guest_x86_defs.h"
+#include "guest_amd64_defs.h"
+#include "guest_arm_defs.h"
+#include "guest_ppc_defs.h"
 
 
 /* This file contains the top level interface to the library. */
@@ -828,5 +828,5 @@ static Bool are_valid_hwcaps ( VexArch arch, UInt hwcaps )
 
 
 /*---------------------------------------------------------------*/
-/*--- end                                     main/vex_main.c ---*/
+/*--- end                                         main_main.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/main/vex_util.c b/VEX/priv/main_util.c
similarity index 98%
rename from VEX/priv/main/vex_util.c
rename to VEX/priv/main_util.c
index a0ff4ed3ee4287f10ac5b24704f6438a48ad9674..0bba6d4bbb20e0050019711c09800ba2a1f6686f 100644 (file)
--- a/VEX/priv/main/vex_util.c
+++ b/VEX/priv/main_util.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (vex_util.c) is                               ---*/
+/*--- This file (main_util.c) is                              ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -47,8 +47,8 @@
 #include "libvex_basictypes.h"
 #include "libvex.h"
 
-#include "vex_globals.h"
-#include "vex_util.h"
+#include "main_globals.h"
+#include "main_util.h"
 
 
 /*---------------------------------------------------------*/
@@ -535,5 +535,5 @@ UInt vex_sprintf ( HChar* buf, HChar *format, ... )
 
 
 /*---------------------------------------------------------------*/
-/*--- end                                          vex_util.c ---*/
+/*--- end                                         main_util.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/main/vex_util.h b/VEX/priv/main_util.h
similarity index 93%
rename from VEX/priv/main/vex_util.h
rename to VEX/priv/main_util.h
index d24e1eb2f76e8dfac4a7552269c20032fdc2dbb9..05528283dbfd41ea8dc475647f1c39bf03433ab7 100644 (file)
--- a/VEX/priv/main/vex_util.h
+++ b/VEX/priv/main_util.h
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (vex_util.h) is                               ---*/
+/*--- This file (main_util.h) is                              ---*/
 /*--- Copyright (C) OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 
@@ -44,8 +44,8 @@
    without prior written permission.
 */
 
-#ifndef __VEX_UTIL_H
-#define __VEX_UTIL_H
+#ifndef __VEX_MAIN_UTIL_H
+#define __VEX_MAIN_UTIL_H
 
 #include "libvex_basictypes.h"
 
@@ -105,8 +105,8 @@ extern void         vexAllocSanityCheck ( void );
 
 extern void vexSetAllocModeTEMP_and_clear ( void );
 
-#endif /* ndef __VEX_UTIL_H */
+#endif /* ndef __VEX_MAIN_UTIL_H */
 
 /*---------------------------------------------------------------*/
-/*---                                              vex_util.h ---*/
+/*---                                             main_util.h ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/pub/libvex.h b/VEX/pub/libvex.h
index fd7d752862ead541e6d58abcde68a8979459d173..c84025e35a2c775b4a441ec2c0da4dbe6e6e7151 100644 (file)
--- a/VEX/pub/libvex.h
+++ b/VEX/pub/libvex.h
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 

diff --git a/VEX/pub/libvex_basictypes.h b/VEX/pub/libvex_basictypes.h
index 6212debe8832ec87ffae368bac7898d9a491b881..1848700b2506d112dc6d415315647c897a8c850e 100644 (file)
--- a/VEX/pub/libvex_basictypes.h
+++ b/VEX/pub/libvex_basictypes.h
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 

diff --git a/VEX/pub/libvex_emwarn.h b/VEX/pub/libvex_emwarn.h
index 5e0a30f4ad9f3367f06de965c8d30f8810f27876..eadd6e42aca9ae76183f0e799c87b0582f3e41eb 100644 (file)
--- a/VEX/pub/libvex_emwarn.h
+++ b/VEX/pub/libvex_emwarn.h
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 

diff --git a/VEX/pub/libvex_guest_amd64.h b/VEX/pub/libvex_guest_amd64.h
index 3728118113a622f9047d25ecbc5cd34b5c201c32..74a088715e68a1382a92d7c5270ceaf34aaebadd 100644 (file)
--- a/VEX/pub/libvex_guest_amd64.h
+++ b/VEX/pub/libvex_guest_amd64.h
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 

diff --git a/VEX/pub/libvex_guest_arm.h b/VEX/pub/libvex_guest_arm.h
index ea175377498cd0c13d0eab5adfe30473c89c0fda..885f8be919a95de9dba028be3201e0b3e794fa44 100644 (file)
--- a/VEX/pub/libvex_guest_arm.h
+++ b/VEX/pub/libvex_guest_arm.h
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 

diff --git a/VEX/pub/libvex_guest_ppc32.h b/VEX/pub/libvex_guest_ppc32.h
index 9c7bf1be55f2d74225360569b2e479a03fd78286..485ffdf5f2c3bc5a4211e22b2eb66768b1923ee9 100644 (file)
--- a/VEX/pub/libvex_guest_ppc32.h
+++ b/VEX/pub/libvex_guest_ppc32.h
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 

diff --git a/VEX/pub/libvex_guest_ppc64.h b/VEX/pub/libvex_guest_ppc64.h
index ac079ac1e6d1f25bed22933e960f70661ba1c206..1ae2e150bfcd4bd7e694cb27cf47166eb2e22d87 100644 (file)
--- a/VEX/pub/libvex_guest_ppc64.h
+++ b/VEX/pub/libvex_guest_ppc64.h
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 

diff --git a/VEX/pub/libvex_guest_x86.h b/VEX/pub/libvex_guest_x86.h
index 737b6f3747d3e2c7c0784944aabdb18075821857..2614c83846e12e91a1cf0e4c4f8a29843b962859 100644 (file)
--- a/VEX/pub/libvex_guest_x86.h
+++ b/VEX/pub/libvex_guest_x86.h
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 

diff --git a/VEX/pub/libvex_ir.h b/VEX/pub/libvex_ir.h
index 869ff974cd703350e53a899f7803baf9d6f7609c..9bf0939374ce44c1988803a89626902e92fe96f9 100644 (file)
--- a/VEX/pub/libvex_ir.h
+++ b/VEX/pub/libvex_ir.h
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 

diff --git a/VEX/pub/libvex_trc_values.h b/VEX/pub/libvex_trc_values.h
index 45cfa3c88890fda6f1c1e81e428a0183b4089c65..84303581b8aa4e290432dbc21f35ea35499e1a3a 100644 (file)
--- a/VEX/pub/libvex_trc_values.h
+++ b/VEX/pub/libvex_trc_values.h
@@ -10,7 +10,7 @@
    This file is part of LibVEX, a library for dynamic binary
    instrumentation and translation.
 
-   Copyright (C) 2004-2008 OpenWorks LLP.  All rights reserved.
+   Copyright (C) 2004-2009 OpenWorks LLP.  All rights reserved.
 
    This library is made available under a dual licensing scheme.
 

diff --git a/VEX/test_main.c b/VEX/test_main.c
index 6b9cb72d568739af3e97838383fdf3d97e71c742..16c1973f1144053258c206c7afc42ee83def8f83 100644 (file)
--- a/VEX/test_main.c
+++ b/VEX/test_main.c
@@ -436,7 +436,7 @@ static void MC_helperc_value_check4_fail( void ) { }
    This file is part of MemCheck, a heavyweight Valgrind tool for
    detecting memory errors.
 
-   Copyright (C) 2000-2008 Julian Seward 
+   Copyright (C) 2000-2009 Julian Seward 
       jseward@acm.org
 
    This program is free software; you can redistribute it and/or