From: Florian Krohm <florian@eich-krohm.de>
Date: Mon, 24 Dec 2012 00:25:34 +0000 (+0000)
Subject: Fix VEX standalone build with Makefile-gcc. This has been bit-rotting
X-Git-Tag: svn/VALGRIND_3_9_0^2~170
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ccda8999230e905d8f9ab4d999820b0a7193cf1;p=thirdparty%2Fvalgrind.git

Fix VEX standalone build with Makefile-gcc. This has been bit-rotting
for a while.


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

diff --git a/VEX/Makefile-gcc b/VEX/Makefile-gcc
index 88a044c737..e8418de7ed 100644
--- a/VEX/Makefile-gcc
+++ b/VEX/Makefile-gcc
@@ -3,7 +3,7 @@ PUB_HEADERS = 	pub/libvex_basictypes.h 		\
 		pub/libvex_ir.h				\
 		pub/libvex.h				\
 		pub/libvex_trc_values.h			\
-		pub/libvex_emwarn.h			\
+		pub/libvex_emnote.h			\
 		pub/libvex_guest_x86.h			\
 		pub/libvex_guest_amd64.h		\
 		pub/libvex_guest_arm.h			\
@@ -11,7 +11,7 @@ PUB_HEADERS = 	pub/libvex_basictypes.h 		\
 		pub/libvex_guest_ppc64.h		\
 		pub/libvex_guest_s390x.h		\
 		pub/libvex_s390x_common.h		\
-		pub/libvex_guest_mips.h			\
+		pub/libvex_guest_mips32.h		\
 		pub/libvex_guest_offsets.h
 
 PRIV_HEADERS = 	priv/host_x86_defs.h			\
@@ -19,7 +19,6 @@ PRIV_HEADERS = 	priv/host_x86_defs.h			\
 		priv/host_arm_defs.h			\
 		priv/host_ppc_defs.h			\
 		priv/host_s390_defs.h			\
-		priv/host_s390_disasm.h		        \
 		priv/host_mips_defs.h			\
 		priv/host_generic_regs.h	        \
 		priv/host_generic_simd64.h	        \
@@ -33,15 +32,19 @@ PRIV_HEADERS = 	priv/host_x86_defs.h			\
 		priv/guest_arm_defs.h			\
 		priv/guest_ppc_defs.h			\
 		priv/guest_mips_defs.h			\
+		priv/s390_disasm.h		        \
+		priv/s390_defs.h		        \
 		priv/ir_match.h			        \
 		priv/ir_opt.h
 
 LIB_OBJS = 	priv/ir_defs.o                          \
 		priv/ir_match.o			        \
 		priv/ir_opt.o				\
+		priv/ir_inject.o			\
 		priv/main_main.o			\
 		priv/main_globals.o			\
 		priv/main_util.o			\
+		priv/s390_disasm.o			\
 		priv/host_x86_defs.o			\
 		priv/host_amd64_defs.o			\
 		priv/host_arm_defs.o			\
@@ -53,7 +56,6 @@ LIB_OBJS = 	priv/ir_defs.o                          \
 		priv/host_arm_isel.o			\
 		priv/host_ppc_isel.o			\
 		priv/host_s390_isel.o			\
-                priv/host_s390_disasm.o			\
 		priv/host_mips_isel.o			\
 		priv/host_generic_regs.o	        \
 		priv/host_generic_simd64.o	        \
@@ -231,6 +233,10 @@ priv/ir_defs.o: $(ALL_HEADERS) priv/ir_defs.c
 	$(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/ir_defs.o \
 					 -c priv/ir_defs.c
 
+priv/ir_inject.o: $(ALL_HEADERS) priv/ir_inject.c
+	$(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/ir_inject.o \
+					 -c priv/ir_inject.c
+
 priv/ir_match.o: $(ALL_HEADERS) priv/ir_match.c
 	$(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/ir_match.o \
 					 -c priv/ir_match.c
@@ -363,9 +369,9 @@ priv/guest_s390_toIR.o: $(ALL_HEADERS) priv/guest_s390_toIR.c
 	$(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/guest_s390_toIR.o \
 					 -c priv/guest_s390_toIR.c
 
-priv/host_s390_disasm.o: $(ALL_HEADERS) priv/host_s390_disasm.c
-	$(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host_s390_disasm.o \
-					 -c priv/host_s390_disasm.c
+priv/s390_disasm.o: $(ALL_HEADERS) priv/s390_disasm.c
+	$(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/s390_disasm.o \
+					 -c priv/s390_disasm.c
 
 priv/guest_mips_helpers.o: $(ALL_HEADERS) priv/guest_mips_helpers.c
 	$(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/guest_mips_helpers.o \
diff --git a/VEX/test_main.c b/VEX/test_main.c
index 0a583c98ad..38b28448b7 100644
--- a/VEX/test_main.c
+++ b/VEX/test_main.c
@@ -1187,7 +1187,7 @@ void do_shadow_PUTI ( MCEnv* mce,
       IRRegArray* new_descr 
          = mkIRRegArray( descr->base + mce->layout->total_sizeB, 
                       tyS, descr->nElems);
-      stmt( mce->bb, IRStmt_PutI( new_descr, ix, bias, vatom ));
+      stmt( mce->bb, IRStmt_PutI( mkIRPutI( new_descr, ix, bias, vatom ) ));
    }
 }
 
@@ -2641,10 +2641,10 @@ IRSB* mc_instrument ( void* closureV,
 
          case Ist_PutI:
             do_shadow_PUTI( &mce, 
-                            st->Ist.PutI.descr,
-                            st->Ist.PutI.ix,
-                            st->Ist.PutI.bias,
-                            st->Ist.PutI.data );
+                            st->Ist.PutI.details->descr,
+                            st->Ist.PutI.details->ix,
+                            st->Ist.PutI.details->bias,
+                            st->Ist.PutI.details->data );
             break;
 
          case Ist_Store: