Make header files compilable by itself to get two benefits:

- never have to worry about order of inclusion
- never have to figure out hidden dependencies in order to be
  able to include a file

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

diff --git a/VEX/priv/guest_amd64_defs.h b/VEX/priv/guest_amd64_defs.h
index 6ad81d221b701fc633d2e83089c59a2d4998136a..f44c6f89eab2638c41f491dc87b666502205df6a 100644 (file)
--- a/VEX/priv/guest_amd64_defs.h
+++ b/VEX/priv/guest_amd64_defs.h
@@ -38,6 +38,10 @@
 #ifndef __VEX_GUEST_AMD64_DEFS_H
 #define __VEX_GUEST_AMD64_DEFS_H
 
+#include "libvex_basictypes.h"
+#include "libvex_emnote.h"              // VexEmNote
+#include "libvex_guest_amd64.h"         // VexGuestAMD64State
+#include "guest_generic_bb_to_IR.h"     // DisResult
 
 /*---------------------------------------------------------*/
 /*--- amd64 to IR conversion                            ---*/

diff --git a/VEX/priv/guest_arm_defs.h b/VEX/priv/guest_arm_defs.h
index 14a4cb8b69cdb991bfa55667138496ccf077b0cf..1325991deaf5a76e94139ec59533392d6ae4c753 100644 (file)
--- a/VEX/priv/guest_arm_defs.h
+++ b/VEX/priv/guest_arm_defs.h
@@ -32,6 +32,8 @@
 #ifndef __VEX_GUEST_ARM_DEFS_H
 #define __VEX_GUEST_ARM_DEFS_H
 
+#include "libvex_basictypes.h"
+#include "guest_generic_bb_to_IR.h"     // DisResult
 
 /*---------------------------------------------------------*/
 /*--- arm to IR conversion                              ---*/

diff --git a/VEX/priv/guest_generic_bb_to_IR.h b/VEX/priv/guest_generic_bb_to_IR.h
index 6f865c0e6c39f597e9e1407e641ad0afa7382254..13cac1f2197d40737beebceb1df11f36861627ea 100644 (file)
--- a/VEX/priv/guest_generic_bb_to_IR.h
+++ b/VEX/priv/guest_generic_bb_to_IR.h
@@ -36,6 +36,9 @@
 #ifndef __VEX_GUEST_GENERIC_BB_TO_IR_H
 #define __VEX_GUEST_GENERIC_BB_TO_IR_H
 
+#include "libvex_basictypes.h"
+#include "libvex_ir.h"              // IRJumpKind
+#include "libvex.h"                 // VexArch
 
 /* This defines stuff needed by the guest insn disassemblers.
    It's a bit circular; is imported by

diff --git a/VEX/priv/guest_mips_defs.h b/VEX/priv/guest_mips_defs.h
index afb4f904c697b2232cc33e90a3e5764ebe8522e0..8977f2ecc9b70867211ab184d4e7bd0f6ceb4cb8 100644 (file)
--- a/VEX/priv/guest_mips_defs.h
+++ b/VEX/priv/guest_mips_defs.h
@@ -33,6 +33,9 @@
 #ifndef __VEX_GUEST_MIPS_DEFS_H
 #define __VEX_GUEST_MIPS_DEFS_H
 
+#include "libvex_basictypes.h"
+#include "guest_generic_bb_to_IR.h"     // DisResult
+
 /*---------------------------------------------------------*/
 /*--- mips to IR conversion                             ---*/
 /*---------------------------------------------------------*/

diff --git a/VEX/priv/guest_ppc_defs.h b/VEX/priv/guest_ppc_defs.h
index 7433298ef9160657e5246e46e0fae4e10723bdf1..7ce6cf562b19d360f6812d7a9c554cfe9763b5cc 100644 (file)
--- a/VEX/priv/guest_ppc_defs.h
+++ b/VEX/priv/guest_ppc_defs.h
@@ -39,6 +39,10 @@
 #ifndef __VEX_GUEST_PPC_DEFS_H
 #define __VEX_GUEST_PPC_DEFS_H
 
+#include "libvex_basictypes.h"
+#include "libvex_guest_ppc32.h"         // VexGuestPPC32State
+#include "libvex_guest_ppc64.h"         // VexGuestPPC64State
+#include "guest_generic_bb_to_IR.h"     // DisResult
 
 /*---------------------------------------------------------*/
 /*--- ppc to IR conversion                              ---*/

diff --git a/VEX/priv/guest_ppc_toIR.c b/VEX/priv/guest_ppc_toIR.c
index 2a768013cffae111558b08f783b847061376a929..f7d8d0f7a73231bd72b32eb19697c559d53ad95e 100644 (file)
--- a/VEX/priv/guest_ppc_toIR.c
+++ b/VEX/priv/guest_ppc_toIR.c
@@ -128,6 +128,7 @@
 #include "libvex_basictypes.h"
 #include "libvex_ir.h"
 #include "libvex.h"
+#include "libvex_emnote.h"
 #include "libvex_guest_ppc32.h"
 #include "libvex_guest_ppc64.h"
 

diff --git a/VEX/priv/guest_s390_defs.h b/VEX/priv/guest_s390_defs.h
index cc13eb74b70a434e6f41a4cd416a8933c16f3edd..de59f95746e43d477b0611d342d8174339a6774c 100644 (file)
--- a/VEX/priv/guest_s390_defs.h
+++ b/VEX/priv/guest_s390_defs.h
@@ -34,8 +34,6 @@
 #define __VEX_GUEST_S390_DEFS_H
 
 #include "libvex_basictypes.h"        // offsetof
-#include "libvex_ir.h"                // IRSB  (needed by bb_to_IR.h)
-#include "libvex.h"                   // VexArch  (needed by bb_to_IR.h)
 #include "guest_generic_bb_to_IR.h"   // DisResult
 #include "libvex_guest_s390x.h"       // VexGuestS390XState
 

diff --git a/VEX/priv/guest_s390_toIR.c b/VEX/priv/guest_s390_toIR.c
index 4ea8bb8bc8b2d6323104947c2787251b19aba7f9..09b09b3f5e9e8d6a61a13e0bf19403dd72699ea4 100644 (file)
--- a/VEX/priv/guest_s390_toIR.c
+++ b/VEX/priv/guest_s390_toIR.c
@@ -34,7 +34,7 @@
 
 #include "libvex_basictypes.h"
 #include "libvex_ir.h"
-#include "libvex.h"                  /* needed for bb_to_IR.h */
+#include "libvex_emnote.h"
 #include "libvex_s390x_common.h"
 #include "main_util.h"               /* vassert */
 #include "main_globals.h"            /* vex_traceflags */

diff --git a/VEX/priv/guest_x86_defs.h b/VEX/priv/guest_x86_defs.h
index 54c2a0f11a6cbaa6cdfa4e62b583006222b20e6a..d982612e27fe6f9aae192bfa500eff7771283c33 100644 (file)
--- a/VEX/priv/guest_x86_defs.h
+++ b/VEX/priv/guest_x86_defs.h
@@ -38,6 +38,10 @@
 #ifndef __VEX_GUEST_X86_DEFS_H
 #define __VEX_GUEST_X86_DEFS_H
 
+#include "libvex_basictypes.h"
+#include "libvex_guest_x86.h"           // VexGuestX86State
+#include "libvex_emnote.h"              // VexEmNote
+#include "guest_generic_bb_to_IR.h"     // DisResult
 
 /*---------------------------------------------------------*/
 /*--- x86 to IR conversion                              ---*/

diff --git a/VEX/priv/host_amd64_defs.h b/VEX/priv/host_amd64_defs.h
index ad13cfad0b736e6f67c037825fb7f114d03f22fb..0b7cacc166c6c6a8ecb5423260a6c8298048c9e0 100644 (file)
--- a/VEX/priv/host_amd64_defs.h
+++ b/VEX/priv/host_amd64_defs.h
@@ -36,6 +36,9 @@
 #ifndef __VEX_HOST_AMD64_DEFS_H
 #define __VEX_HOST_AMD64_DEFS_H
 
+#include "libvex_basictypes.h"
+#include "libvex.h"                      // VexArch
+#include "host_generic_regs.h"           // HReg
 
 /* --------- Registers. --------- */
 

diff --git a/VEX/priv/host_arm_defs.h b/VEX/priv/host_arm_defs.h
index 91a6757c596fdd2ba6457fd3042afcc43071581b..bcd6aca42f92ee3d7fa471256fe03f13234c66d0 100644 (file)
--- a/VEX/priv/host_arm_defs.h
+++ b/VEX/priv/host_arm_defs.h
@@ -30,6 +30,10 @@
 #ifndef __VEX_HOST_ARM_DEFS_H
 #define __VEX_HOST_ARM_DEFS_H
 
+#include "libvex_basictypes.h"
+#include "libvex.h"                      // VexArch
+#include "host_generic_regs.h"           // HReg
+
 extern UInt arm_hwcaps;
 
 

diff --git a/VEX/priv/host_mips_defs.h b/VEX/priv/host_mips_defs.h
index 1431ff562476ec2cfa3d32bbc7368a79a1943637..9c2278eb62537336760c85a6e5201a579fb6bed2 100644 (file)
--- a/VEX/priv/host_mips_defs.h
+++ b/VEX/priv/host_mips_defs.h
@@ -31,6 +31,10 @@
 #ifndef __VEX_HOST_MIPS_DEFS_H
 #define __VEX_HOST_MIPS_DEFS_H
 
+#include "libvex_basictypes.h"
+#include "libvex.h"                      // VexArch
+#include "host_generic_regs.h"           // HReg
+
 /* Num registers used for function calls */
 #define MIPS_N_REGPARMS 4
 

diff --git a/VEX/priv/host_ppc_defs.h b/VEX/priv/host_ppc_defs.h
index 5be5c353d686a23bb5f4caddf9380d899f57e9d2..58ea3a779cfcd3c96e2504034b886de2b9b218eb 100644 (file)
--- a/VEX/priv/host_ppc_defs.h
+++ b/VEX/priv/host_ppc_defs.h
@@ -36,6 +36,10 @@
 #ifndef __VEX_HOST_PPC_DEFS_H
 #define __VEX_HOST_PPC_DEFS_H
 
+#include "libvex_basictypes.h"
+#include "libvex.h"                      // VexArch
+#include "host_generic_regs.h"           // HReg
+
 /* Num registers used for function calls */
 #define PPC_N_REGPARMS 8
 

diff --git a/VEX/priv/host_s390_defs.h b/VEX/priv/host_s390_defs.h
index 72275dafd27406810bf5a1bc4832ae674a66d195..7ce079375983d74f914233b4ec8888532eba7c57 100644 (file)
--- a/VEX/priv/host_s390_defs.h
+++ b/VEX/priv/host_s390_defs.h
@@ -35,7 +35,6 @@
 
 #include "libvex_basictypes.h"            /* Bool */
 #include "libvex.h"                       /* VexArchInfo */
-#include "main_util.h"                    /* needed for host_generic_regs.h */
 #include "host_generic_regs.h"            /* HReg */
 
 /* --------- Registers --------- */

diff --git a/VEX/priv/host_x86_defs.h b/VEX/priv/host_x86_defs.h
index a5f281cc0c2fdbc236f7b48f26ef4114ba82546b..8194291681a6e4170e9c932b27a7334166e50a1c 100644 (file)
--- a/VEX/priv/host_x86_defs.h
+++ b/VEX/priv/host_x86_defs.h
@@ -36,6 +36,9 @@
 #ifndef __VEX_HOST_X86_DEFS_H
 #define __VEX_HOST_X86_DEFS_H
 
+#include "libvex_basictypes.h"
+#include "libvex.h"                      // VexArch
+#include "host_generic_regs.h"           // HReg
 
 /* --------- Registers. --------- */
 

diff --git a/VEX/pub/libvex_emnote.h b/VEX/pub/libvex_emnote.h
index a817eb7f067c545743faa28e449bbf67df4dbb29..abcedc1a8d47f5445a9d722ef11d356c1f2b45db 100644 (file)
--- a/VEX/pub/libvex_emnote.h
+++ b/VEX/pub/libvex_emnote.h
@@ -36,6 +36,7 @@
 #ifndef __LIBVEX_EMNOTE_H
 #define __LIBVEX_EMNOTE_H
 
+#include "libvex_basictypes.h"
 
 /* VEX can sometimes generate code which returns to the dispatcher
    with the guest state pointer set to VEX_TRC_JMP_EMWARN or 

diff --git a/VEX/pub/libvex_guest_amd64.h b/VEX/pub/libvex_guest_amd64.h
index 9c12e885d276293d008e66635e885f9c9356b768..b8fef94dc15aefd0079b3b97762c9682a29e5735 100644 (file)
--- a/VEX/pub/libvex_guest_amd64.h
+++ b/VEX/pub/libvex_guest_amd64.h
@@ -37,7 +37,6 @@
 #define __LIBVEX_PUB_GUEST_AMD64_H
 
 #include "libvex_basictypes.h"
-#include "libvex_emnote.h"
 
 
 /*---------------------------------------------------------------*/

diff --git a/VEX/pub/libvex_guest_arm.h b/VEX/pub/libvex_guest_arm.h
index a0d492445cba81ff7a14205f837145762cb0c998..e837666f49e81521a225b1c833883f3757d1ba14 100644 (file)
--- a/VEX/pub/libvex_guest_arm.h
+++ b/VEX/pub/libvex_guest_arm.h
@@ -32,7 +32,6 @@
 #define __LIBVEX_PUB_GUEST_ARM_H
 
 #include "libvex_basictypes.h"
-#include "libvex_emnote.h"
 
 
 /*---------------------------------------------------------------*/

diff --git a/VEX/pub/libvex_guest_mips32.h b/VEX/pub/libvex_guest_mips32.h
index eac46570830a9216d818c3de5ce879b332ee54c3..02c87ea24173560caaa237dc946c332f66c1a383 100644 (file)
--- a/VEX/pub/libvex_guest_mips32.h
+++ b/VEX/pub/libvex_guest_mips32.h
@@ -32,7 +32,6 @@
 #define __LIBVEX_PUB_GUEST_MIPS32_H
 
 #include "libvex_basictypes.h"
-#include "libvex_emnote.h"
 
 
 /*---------------------------------------------------------------*/

diff --git a/VEX/pub/libvex_guest_ppc32.h b/VEX/pub/libvex_guest_ppc32.h
index 3f615fec48988179818f99a79f59d6d4eb318e12..c69101722acfb4ac0e8a868ff2eddde2ad86169a 100644 (file)
--- a/VEX/pub/libvex_guest_ppc32.h
+++ b/VEX/pub/libvex_guest_ppc32.h
@@ -37,7 +37,6 @@
 #define __LIBVEX_PUB_GUEST_PPC32_H
 
 #include "libvex_basictypes.h"
-#include "libvex_emnote.h"
 
 
 /*---------------------------------------------------------------*/

diff --git a/VEX/pub/libvex_guest_ppc64.h b/VEX/pub/libvex_guest_ppc64.h
index 31c4b62a4e8c78dacbbba973966574a19f61e2a1..b05b5b15e231b19477e5370ae8e03fd3cc475dbb 100644 (file)
--- a/VEX/pub/libvex_guest_ppc64.h
+++ b/VEX/pub/libvex_guest_ppc64.h
@@ -37,7 +37,6 @@
 #define __LIBVEX_PUB_GUEST_PPC64_H
 
 #include "libvex_basictypes.h"
-#include "libvex_emnote.h"
 
 /*
     volatile ==  caller-saved (not preserved across function calls)

diff --git a/VEX/pub/libvex_guest_s390x.h b/VEX/pub/libvex_guest_s390x.h
index 5d121e1ef34ce146f59f494af62ebbeaeeffa57e..ae86aa3bbb45ed1f6728048cf8c7124299b35d3a 100644 (file)
--- a/VEX/pub/libvex_guest_s390x.h
+++ b/VEX/pub/libvex_guest_s390x.h
@@ -32,7 +32,6 @@
 #define __LIBVEX_PUB_GUEST_S390X_H
 
 #include "libvex_basictypes.h"
-#include "libvex_emnote.h"
 
 /*------------------------------------------------------------*/
 /*--- Vex's representation of the s390 CPU state.          ---*/

diff --git a/VEX/pub/libvex_guest_x86.h b/VEX/pub/libvex_guest_x86.h
index 3dcbc57e860f80f25dafc5ea9dcd729011fd1a29..d46d67b098263bc0b89717e85754c6923bec4f2e 100644 (file)
--- a/VEX/pub/libvex_guest_x86.h
+++ b/VEX/pub/libvex_guest_x86.h
@@ -37,7 +37,6 @@
 #define __LIBVEX_PUB_GUEST_X86_H
 
 #include "libvex_basictypes.h"
-#include "libvex_emnote.h"
 
 
 /*---------------------------------------------------------------*/