|
From: <sv...@va...> - 2012-09-17 17:48:35
|
sewardj 2012-09-17 18:51:44 +0100 (Mon, 17 Sep 2012)
New Revision: 2534
Log:
Merge from trunk, r2517 and 2518 (Fix a couple of union tag-vs-field
mixups, n-i-bz)
Modified directories:
branches/VEX_3_8_BRANCH/
Modified files:
branches/VEX_3_8_BRANCH/priv/host_s390_defs.c
branches/VEX_3_8_BRANCH/priv/host_s390_isel.c
Modified: branches/VEX_3_8_BRANCH/
Modified: branches/VEX_3_8_BRANCH/priv/host_s390_isel.c (+2 -2)
===================================================================
--- branches/VEX_3_8_BRANCH/priv/host_s390_isel.c 2012-09-17 16:27:58 +01:00 (rev 2533)
+++ branches/VEX_3_8_BRANCH/priv/host_s390_isel.c 2012-09-17 18:51:44 +01:00 (rev 2534)
@@ -1635,7 +1635,7 @@
/* --------- UNARY OP --------- */
case Iex_Unop: {
- IRExpr *left = expr->Iex.Binop.arg1;
+ IRExpr *left = expr->Iex.Unop.arg;
s390_bfp_unop_t bfpop;
s390_round_t rounding_mode;
HReg op_hi, op_lo, op, f12, f13, f14, f15;
@@ -1646,7 +1646,7 @@
f14 = make_fpr(14);
f15 = make_fpr(15);
- switch (expr->Iex.Binop.op) {
+ switch (expr->Iex.Unop.op) {
case Iop_NegF128: bfpop = S390_BFP_NEG; goto float128_opnd;
case Iop_AbsF128: bfpop = S390_BFP_ABS; goto float128_opnd;
case Iop_I32StoF128: bfpop = S390_BFP_I32_TO_F128; goto convert_int;
Property changed: branches/VEX_3_8_BRANCH (+0 -0)
___________________________________________________________________
Name: svn:mergeinfo
- /branches/TCHAIN:2272-2295
/trunk:2469,2475-2480,2499
+ /branches/TCHAIN:2272-2295
/trunk:2469,2475-2480,2499,2517-2518
Modified: branches/VEX_3_8_BRANCH/priv/host_s390_defs.c (+1 -1)
===================================================================
--- branches/VEX_3_8_BRANCH/priv/host_s390_defs.c 2012-09-17 16:27:58 +01:00 (rev 2533)
+++ branches/VEX_3_8_BRANCH/priv/host_s390_defs.c 2012-09-17 18:51:44 +01:00 (rev 2534)
@@ -7372,7 +7372,7 @@
UInt r1 = hregNumber(insn->variant.bfp128_unop.dst_hi);
UInt r2_hi = hregNumber(insn->variant.bfp128_unop.op_hi);
UInt r2_lo = hregNumber(insn->variant.bfp128_unop.op_lo);
- s390_round_t rounding_mode = insn->variant.bfp_binop.rounding_mode;
+ s390_round_t rounding_mode = insn->variant.bfp128_unop.rounding_mode;
/* Paranoia */
vassert(insn->size != 16);
|