Make compilation work again after renaming files.

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

diff --git a/VEX/Makefile b/VEX/Makefile
index 5eb31405be61813705f985ea77ef4789dde9f72e..a099fd1b3c580a6feb0167f494cca231df8e94fb 100644 (file)
--- a/VEX/Makefile
+++ b/VEX/Makefile
@@ -3,29 +3,29 @@ PUB_HEADERS =         pub/libvex_basictypes.h                 \
                pub/libvex_ir.h                         \
                pub/libvex.h
 
-PRIV_HEADERS =         priv/host-x86/hdefs.h           \
-               priv/host-generic/host_regs.h           \
+PRIV_HEADERS =         priv/host-x86/hdefs.h                   \
+               priv/host-generic/h_generic_regs.h      \
                priv/main/vex_globals.h                 \
                priv/main/vex_util.h                    \
-               priv/guest-x86/x86guest_defs.h
+               priv/guest-x86/gdefs.h
 
-LIB_OBJS =     priv/ir/ir_defs.o                       \
+LIB_OBJS =     priv/ir/irdefs.o                        \
                priv/main/vex_main.o                    \
                priv/main/vex_globals.o                 \
                priv/main/vex_util.o                    \
-               priv/host-x86/hdefs.o           \
-               priv/host-x86/isel.o            \
-               priv/host-generic/host_regs.o           \
+               priv/host-x86/hdefs.o                   \
+               priv/host-x86/isel.o                    \
+               priv/host-generic/h_generic_regs.o      \
                priv/host-generic/reg_alloc.o           \
-               priv/guest-x86/x86helpers.o             \
-               priv/guest-x86/x86toIR.o
+               priv/guest-x86/ghelpers.o               \
+               priv/guest-x86/toIR.o
 
 PUB_INCLUDES = -Ipub
 
-PRIV_INCLUDES = -Ipriv/ir -Ipriv/main -Ipriv/host-generic \
-               -Ipriv/host-x86 -Ipriv/guest-x86
-
-APP_OBJS =     test_main.o
+# Do not add any priv/host-ARCH or priv/guest-ARCH directories to this
+# list, as they contain duplicate file names (each host has a hdefs.h,
+# for example).
+PRIV_INCLUDES = -Ipriv
 
 
 CC = gcc341
@@ -48,15 +48,15 @@ all: libvex.a
        rm -f hacked104/valgrind.so
        (cd hacked104 && make install)
 
-#all: libvex.a $(APP_OBJS)
-#      $(CC) $(CCFLAGS) -o vex $(APP_OBJS) libvex.a
+vex: libvex.a test_main.o
+       $(CC) $(CCFLAGS) -o vex libvex.a test_main.o
 
 libvex.a: $(LIB_OBJS)
        rm -f libvex.a
        ar clq libvex.a $(LIB_OBJS)
 
 clean:
-       rm -f $(APP_OBJS) $(LIB_OBJS) libvex.a vex
+       rm -f $(LIB_OBJS) libvex.a vex test_main.o
        (cd hacked104 && make clean)
 
 
@@ -68,9 +68,9 @@ test_main.o: $(PUB_HEADERS) test_main.c
        $(CC) $(CCFLAGS) $(PUB_INCLUDES) -o test_main.o \
                                         -c test_main.c
 
-priv/ir/ir_defs.o: $(ALL_HEADERS) priv/ir/ir_defs.c
-       $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/ir/ir_defs.o \
-                                        -c priv/ir/ir_defs.c
+priv/ir/irdefs.o: $(ALL_HEADERS) priv/ir/irdefs.c
+       $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/ir/irdefs.o \
+                                        -c priv/ir/irdefs.c
 
 priv/main/vex_main.o: $(ALL_HEADERS) priv/main/vex_main.c
        $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/main/vex_main.o \
@@ -92,18 +92,18 @@ priv/host-x86/isel.o: $(ALL_HEADERS) priv/host-x86/isel.c
        $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-x86/isel.o \
                                         -c priv/host-x86/isel.c
 
-priv/host-generic/host_regs.o: $(ALL_HEADERS) priv/host-generic/host_regs.c
-       $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-generic/host_regs.o \
-                                        -c priv/host-generic/host_regs.c
+priv/host-generic/h_generic_regs.o: $(ALL_HEADERS) priv/host-generic/h_generic_regs.c
+       $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-generic/h_generic_regs.o \
+                                        -c priv/host-generic/h_generic_regs.c
 
 priv/host-generic/reg_alloc.o: $(ALL_HEADERS) priv/host-generic/reg_alloc.c
        $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-generic/reg_alloc.o \
                                         -c priv/host-generic/reg_alloc.c
 
-priv/guest-x86/x86toIR.o: $(ALL_HEADERS) priv/guest-x86/x86toIR.c
-       $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/guest-x86/x86toIR.o \
-                                        -c priv/guest-x86/x86toIR.c
+priv/guest-x86/toIR.o: $(ALL_HEADERS) priv/guest-x86/toIR.c
+       $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/guest-x86/toIR.o \
+                                        -c priv/guest-x86/toIR.c
 
-priv/guest-x86/x86helpers.o: $(ALL_HEADERS) priv/guest-x86/x86helpers.c
-       $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/guest-x86/x86helpers.o \
-                                        -c priv/guest-x86/x86helpers.c
+priv/guest-x86/ghelpers.o: $(ALL_HEADERS) priv/guest-x86/ghelpers.c
+       $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/guest-x86/ghelpers.o \
+                                        -c priv/guest-x86/ghelpers.c

diff --git a/VEX/priv/guest-x86/ghelpers.c b/VEX/priv/guest-x86/ghelpers.c
index f37ae8a7f20283f2901a496822cf939980c9c57e..043397e2503eadcebebeea3ad2ac67cf4d4f7871 100644 (file)
--- a/VEX/priv/guest-x86/ghelpers.c
+++ b/VEX/priv/guest-x86/ghelpers.c
@@ -1,15 +1,16 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (x86helpers.c) is                             ---*/
+/*--- This file (guest-x86/ghelpers.c) is                     ---*/
 /*--- Copyright (c) 2004 OpenWorks LLP.  All rights reserved. ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
 
 #include "libvex_basictypes.h"
 #include "libvex_ir.h"
-#include "vex_util.h"
-#include "x86guest_defs.h"
+
+#include "main/vex_util.h"
+#include "guest-x86/gdefs.h"
 
 /* This file contains helper functions for x86 guest code.
    Calls to these functions are generated by the back end.
@@ -246,5 +247,5 @@ Addr64 x86guest_findhelper ( Char* function_name )
 
 
 /*---------------------------------------------------------------*/
-/*--- end                                        x86helpers.c ---*/
+/*--- end                                guest-x86/ghelpers.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/guest-x86/toIR.c b/VEX/priv/guest-x86/toIR.c
index d7e226871990086d9ea7fc25936c23c4e8bad40b..4e68910287fed48471847dee5db36ca19b21ea97 100644 (file)
--- a/VEX/priv/guest-x86/toIR.c
+++ b/VEX/priv/guest-x86/toIR.c
@@ -1,7 +1,7 @@
 
 /*--------------------------------------------------------------------*/
 /*---                                                              ---*/
-/*--- This file (x86toIR.c) is                                     ---*/
+/*--- This file (guest-x86/toIR.c) is                              ---*/
 /*--- Copyright (c) 2004 OpenWorks LLP.  All rights reserved.      ---*/
 /*---                                                              ---*/
 /*--------------------------------------------------------------------*/
@@ -18,9 +18,10 @@
 #include "libvex_basictypes.h"
 #include "libvex_ir.h"
 #include "libvex.h"
-#include "vex_util.h"
-#include "vex_globals.h"
-#include "x86guest_defs.h"
+
+#include "main/vex_util.h"
+#include "main/vex_globals.h"
+#include "guest-x86/gdefs.h"
 
 
 /*------------------------------------------------------------*/
@@ -8099,5 +8100,5 @@ IRBB* bbToIR_X86Instr ( UChar* x86code,
 #undef DIS
 
 /*--------------------------------------------------------------------*/
-/*--- end                                            vg_to_ucode.c ---*/
+/*--- end                                         guest-x86/toIR.c ---*/
 /*--------------------------------------------------------------------*/

diff --git a/VEX/priv/host-generic/host_gen_regs.c b/VEX/priv/host-generic/h_generic_regs.c
similarity index 96%
rename from VEX/priv/host-generic/host_gen_regs.c
rename to VEX/priv/host-generic/h_generic_regs.c
index ec4ce5df53499ece766d0b4c2faaafdbc5fc6ab9..29a577f8c3a379d7533f3e0241b0267b69d7e0f8 100644 (file)
--- a/VEX/priv/host-generic/host_gen_regs.c
+++ b/VEX/priv/host-generic/h_generic_regs.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (host_regs.c) is                              ---*/
+/*--- This file (host-generic/h_generic_regs.c) is            ---*/
 /*--- Copyright (c) 2004 OpenWorks LLP.  All rights reserved. ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -9,8 +9,8 @@
 #include "libvex_basictypes.h"
 #include "libvex.h"
 
-#include "vex_util.h"
-#include "host_regs.h"
+#include "main/vex_util.h"
+#include "host-generic/h_generic_regs.h"
 
 
 HReg mkHReg ( UInt regno, HRegClass rc, Bool virtual )
@@ -200,5 +200,5 @@ void addHInstr ( HInstrArray* ha, HInstr* instr )
 
 
 /*---------------------------------------------------------------*/
-/*--- end                                         host_regs.c ---*/
+/*--- end                       host-generic/h_generic_regs.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/host-generic/h_gen_regs.h b/VEX/priv/host-generic/h_generic_regs.h
similarity index 100%
rename from VEX/priv/host-generic/h_gen_regs.h
rename to VEX/priv/host-generic/h_generic_regs.h

diff --git a/VEX/priv/host-generic/reg_alloc.c b/VEX/priv/host-generic/reg_alloc.c
index fb4025874f583ad966ed686ef690041671ea0f93..903f876487f8f7e27e55c312aeb3e2ef9e8b70bb 100644 (file)
--- a/VEX/priv/host-generic/reg_alloc.c
+++ b/VEX/priv/host-generic/reg_alloc.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (reg_alloc.c) is                              ---*/
+/*--- This file (host-generic/reg_alloc.c) is                 ---*/
 /*--- Copyright (c) 2004 OpenWorks LLP.  All rights reserved. ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -9,8 +9,8 @@
 #include "libvex_basictypes.h"
 #include "libvex.h"
 
-#include "vex_util.h"
-#include "host_regs.h"
+#include "main/vex_util.h"
+#include "host-generic/h_generic_regs.h"
 
 /* Set to 1 for lots of debugging output. */
 #define DEBUG_REGALLOC 0
@@ -1007,5 +1007,5 @@ HInstrArray* doRegisterAllocation (
 
 
 /*---------------------------------------------------------------*/
-/*---                                             reg_alloc.c ---*/
+/*---                                host-generic/reg_alloc.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/host-x86/hdefs.c b/VEX/priv/host-x86/hdefs.c
index 58adb42cd1ee58976904a8afe4200c869c42a7dd..2d45c32b4159648c5f7a3226380395351ce9fb0c 100644 (file)
--- a/VEX/priv/host-x86/hdefs.c
+++ b/VEX/priv/host-x86/hdefs.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (x86h_defs.c) is                              ---*/
+/*--- This file (host-x86/hdefs.c) is                         ---*/
 /*--- Copyright (c) 2004 OpenWorks LLP.  All rights reserved. ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -9,9 +9,9 @@
 #include "libvex_basictypes.h"
 #include "libvex.h"
 
-#include "vex_util.h"
-#include "host_regs.h"
-#include "x86host_defs.h"
+#include "main/vex_util.h"
+#include "host-generic/h_generic_regs.h"
+#include "host-x86/hdefs.h"
 
 
 /* --------- Registers. --------- */
@@ -1514,5 +1514,5 @@ T( X86Instr_Alu32M(Xalu_SUB, X86RI_Reg(ecx), X86AMode_IR(0x7F,ebp)) );
 
 
 /*---------------------------------------------------------------*/
-/*--- end                                         x86h_defs.c ---*/
+/*--- end                                    host-x86/hdefs.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/host-x86/isel.c b/VEX/priv/host-x86/isel.c
index d10b84dfc9628e2ce5bd0e63de600fd07bdb6c92..4ed5a73e6347850e86b4d4e90a6b409ab648e827 100644 (file)
--- a/VEX/priv/host-x86/isel.c
+++ b/VEX/priv/host-x86/isel.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (isel_x86.c) is                               ---*/
+/*--- This file (host-x86/isel.c) is                          ---*/
 /*--- Copyright (c) 2004 OpenWorks LLP.  All rights reserved. ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,10 +10,10 @@
 #include "libvex_ir.h"
 #include "libvex.h"
 
-#include "vex_util.h"
-#include "vex_globals.h"
-#include "host_regs.h"
-#include "x86host_defs.h"
+#include "main/vex_util.h"
+#include "main/vex_globals.h"
+#include "host-generic/h_generic_regs.h"
+#include "host-x86/hdefs.h"
 
 
 /*---------------------------------------------------------*/
@@ -994,5 +994,5 @@ HInstrArray* iselBB_X86 ( IRBB* bb, Addr64(*find_helper)(Char*) )
 
 
 /*---------------------------------------------------------------*/
-/*--- end                                          isel_x86.c ---*/
+/*--- end                                     host-x86/isel.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/ir/ir_defs.c b/VEX/priv/ir/irdefs.c
similarity index 99%
rename from VEX/priv/ir/ir_defs.c
rename to VEX/priv/ir/irdefs.c
index 4c13ea66006136591695e9dbd592214e11f8aecc..043bfdebbb8abbd13a74b2488f18399e1b0a56f8 100644 (file)
--- a/VEX/priv/ir/ir_defs.c
+++ b/VEX/priv/ir/irdefs.c
@@ -1,7 +1,7 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (ir_defs.c) is                                ---*/
+/*--- This file (ir/irdefs.c) is                              ---*/
 /*--- Copyright (c) 2004 OpenWorks LLP.  All rights reserved. ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
@@ -10,7 +10,8 @@
 #include "libvex_ir.h"
 #include "libvex.h"
 
-#include "vex_util.h"
+#include "main/vex_util.h"
+
 
 /*---------------------------------------------------------------*/
 /*--- Printing the IR                                         ---*/
@@ -851,5 +852,5 @@ void sanityCheckIRBB ( IRBB* bb, IRType guest_word_size )
 
 
 /*---------------------------------------------------------------*/
-/*--- end                                           ir_defs.c ---*/
+/*--- end                                         ir/irdefs.c ---*/
 /*---------------------------------------------------------------*/

diff --git a/VEX/priv/main/vex_main.c b/VEX/priv/main/vex_main.c
index 0fdf404d3546fd9d97bf0bddb93dc7004fb2f7df..657feb9f3602f055a31ae4b0e955b9e094830f52 100644 (file)
--- a/VEX/priv/main/vex_main.c
+++ b/VEX/priv/main/vex_main.c
@@ -1,18 +1,18 @@
 
 /*---------------------------------------------------------------*/
 /*---                                                         ---*/
-/*--- This file (vex_main.c) is                               ---*/
+/*--- This file (main/vex_main.c) is                          ---*/
 /*--- Copyright (c) 2004 OpenWorks LLP.  All rights reserved. ---*/
 /*---                                                         ---*/
 /*---------------------------------------------------------------*/
 
 #include "libvex.h"
 
-#include "vex_globals.h"
-#include "vex_util.h"
-#include "host_regs.h"
-#include "x86host_defs.h"
-#include "x86guest_defs.h"
+#include "main/vex_globals.h"
+#include "main/vex_util.h"
+#include "host-generic/h_generic_regs.h"
+#include "host-x86/hdefs.h"
+#include "guest-x86/gdefs.h"
 
 
 /* This file contains the top level interface to the library. */
@@ -235,5 +235,5 @@ TranslateResult LibVEX_Translate (
 
 
 /*---------------------------------------------------------------*/
-/*--- end                                          vex_main.c ---*/
+/*--- end                                     main/vex_main.c ---*/
 /*---------------------------------------------------------------*/