|
From: <sv...@va...> - 2011-03-14 11:27:34
|
Author: sewardj
Date: 2011-03-14 11:27:26 +0000 (Mon, 14 Mar 2011)
New Revision: 2107
Log:
Fix standalone vex builds following s390x merge.
Modified:
trunk/Makefile-gcc
trunk/test_main.c
Modified: trunk/Makefile-gcc
===================================================================
--- trunk/Makefile-gcc 2011-03-07 18:34:34 UTC (rev 2106)
+++ trunk/Makefile-gcc 2011-03-14 11:27:26 UTC (rev 2107)
@@ -9,12 +9,16 @@
pub/libvex_guest_arm.h \
pub/libvex_guest_ppc32.h \
pub/libvex_guest_ppc64.h \
+ pub/libvex_guest_s390x.h \
+ pub/libvex_s390x_common.h \
pub/libvex_guest_offsets.h
PRIV_HEADERS = priv/host_x86_defs.h \
priv/host_amd64_defs.h \
priv/host_arm_defs.h \
priv/host_ppc_defs.h \
+ priv/host_s390_defs.h \
+ priv/host_s390_disasm.h \
priv/host_generic_regs.h \
priv/host_generic_simd64.h \
priv/host_generic_simd128.h \
@@ -39,10 +43,13 @@
priv/host_amd64_defs.o \
priv/host_arm_defs.o \
priv/host_ppc_defs.o \
+ priv/host_s390_defs.o \
priv/host_x86_isel.o \
priv/host_amd64_isel.o \
priv/host_arm_isel.o \
priv/host_ppc_isel.o \
+ priv/host_s390_isel.o \
+ priv/host_s390_disasm.o \
priv/host_generic_regs.o \
priv/host_generic_simd64.o \
priv/host_generic_simd128.o \
@@ -53,10 +60,12 @@
priv/guest_amd64_helpers.o \
priv/guest_arm_helpers.o \
priv/guest_ppc_helpers.o \
+ priv/guest_s390_helpers.o \
priv/guest_x86_toIR.o \
priv/guest_amd64_toIR.o \
priv/guest_arm_toIR.o \
- priv/guest_ppc_toIR.o
+ priv/guest_ppc_toIR.o \
+ priv/guest_s390_toIR.o
PUB_INCLUDES = -Ipub
@@ -188,7 +197,9 @@
$(CC) $(CCFLAGS) -O -S -o auxprogs/genoffsets.s \
auxprogs/genoffsets.c
grep xyzzy auxprogs/genoffsets.s | grep define \
- | sed "s/xyzzy\\$$//g" | sed "s/xyzzy//g" \
+ | sed "s/xyzzy\\$$//g" \
+ | sed "s/xyzzy#//g" \
+ | sed "s/xyzzy//g" \
> pub/libvex_guest_offsets.h
rm -f auxprogs/genoffsets.s
@@ -240,6 +251,10 @@
$(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host_ppc_defs.o \
-c priv/host_ppc_defs.c
+priv/host_s390_defs.o: $(ALL_HEADERS) priv/host_s390_defs.c
+ $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host_s390_defs.o \
+ -c priv/host_s390_defs.c
+
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
@@ -256,6 +271,10 @@
$(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host_ppc_isel.o \
-c priv/host_ppc_isel.c
+priv/host_s390_isel.o: $(ALL_HEADERS) priv/host_s390_isel.c
+ $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host_s390_isel.o \
+ -c priv/host_s390_isel.c
+
priv/host_generic_regs.o: $(ALL_HEADERS) priv/host_generic_regs.c
$(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host_generic_regs.o \
-c priv/host_generic_regs.c
@@ -308,6 +327,18 @@
$(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/guest_ppc_helpers.o \
-c priv/guest_ppc_helpers.c
+priv/guest_s390_helpers.o: $(ALL_HEADERS) priv/guest_s390_helpers.c
+ $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/guest_s390_helpers.o \
+ -c priv/guest_s390_helpers.c
+
priv/guest_ppc_toIR.o: $(ALL_HEADERS) priv/guest_ppc_toIR.c
$(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/guest_ppc_toIR.o \
-c priv/guest_ppc_toIR.c
+
+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
Modified: trunk/test_main.c
===================================================================
--- trunk/test_main.c 2011-03-07 18:34:34 UTC (rev 2106)
+++ trunk/test_main.c 2011-03-14 11:27:26 UTC (rev 2107)
@@ -1732,20 +1732,20 @@
/* Scalar floating point */
// case Iop_RoundF64:
- case Iop_F64toI64:
- case Iop_I64toF64:
+ case Iop_F64toI64S:
+ case Iop_I64StoF64:
/* First arg is I32 (rounding mode), second is F64 or I64
(data). */
return mkLazy2(mce, Ity_I64, vatom1, vatom2);
case Iop_PRemC3210F64: case Iop_PRem1C3210F64:
/* Takes two F64 args. */
- case Iop_F64toI32:
+ case Iop_F64toI32S:
case Iop_F64toF32:
/* First arg is I32 (rounding mode), second is F64 (data). */
return mkLazy2(mce, Ity_I32, vatom1, vatom2);
- case Iop_F64toI16:
+ case Iop_F64toI16S:
/* First arg is I32 (rounding mode), second is F64 (data). */
return mkLazy2(mce, Ity_I16, vatom1, vatom2);
@@ -1931,7 +1931,7 @@
return assignNew(mce, Ity_V128, unop(op, vatom));
case Iop_F32toF64:
- case Iop_I32toF64:
+ case Iop_I32StoF64:
case Iop_NegF64:
case Iop_SinF64:
case Iop_CosF64:
|