|
[Valgrind-developers] vex: r2281: First round of fixes: some cut'n
paste errors. And the guest_IA in
From: <sv...@va...> - 2012-04-13 21:14:31
|
florian 2012-04-13 22:14:24 +0100 (Fri, 13 Apr 2012)
New Revision: 2281
Log:
First round of fixes: some cut'n paste errors. And the guest_IA in
a conditional jump.
Modified files:
branches/TCHAIN/priv/guest_s390_toIR.c
branches/TCHAIN/priv/host_s390_defs.c
Modified: branches/TCHAIN/priv/host_s390_defs.c (+6 -6)
===================================================================
--- branches/TCHAIN/priv/host_s390_defs.c 2012-04-13 12:42:50 +01:00 (rev 2280)
+++ branches/TCHAIN/priv/host_s390_defs.c 2012-04-13 22:14:24 +01:00 (rev 2281)
@@ -4539,12 +4539,12 @@
{
s390_insn *insn = LibVEX_Alloc(sizeof(s390_insn));
- insn->tag = S390_INSN_XASSISTED;
+ insn->tag = S390_INSN_XINDIR;
insn->size = 0; /* does not matter */
- insn->variant.xdirect.cond = cond;
- insn->variant.xdirect.dst = dst;
- insn->variant.xdirect.guest_IA = guest_IA;
+ insn->variant.xindir.cond = cond;
+ insn->variant.xindir.dst = dst;
+ insn->variant.xindir.guest_IA = guest_IA;
return insn;
}
@@ -7408,13 +7408,13 @@
}
/* Update the guest IA with the address in xdirect.dst. */
- const s390_amode *amode = insn->variant.xdirect.guest_IA;
+ const s390_amode *amode = insn->variant.xindir.guest_IA;
vassert(amode->tag == S390_AMODE_B12 || amode->tag == S390_AMODE_BX12);
UInt b = hregNumber(amode->b);
UInt x = hregNumber(amode->x); /* 0 for B12 and B20 */
UInt d = amode->d;
- UInt regno = hregNumber(insn->variant.xdirect.dst);
+ UInt regno = hregNumber(insn->variant.xindir.dst);
buf = s390_emit_STG(buf, regno, x, b, DISP20(d));
Modified: branches/TCHAIN/priv/guest_s390_toIR.c (+1 -1)
===================================================================
--- branches/TCHAIN/priv/guest_s390_toIR.c 2012-04-13 12:42:50 +01:00 (rev 2280)
+++ branches/TCHAIN/priv/guest_s390_toIR.c 2012-04-13 22:14:24 +01:00 (rev 2281)
@@ -331,7 +331,7 @@
stmt(IRStmt_Exit(condition, Ijk_Boring, IRConst_U64(target),
S390X_GUEST_OFFSET(guest_IA)));
- put_IA(mkaddr_expr(target));
+ put_IA(mkaddr_expr(guest_IA_next_instr));
dis_res->whatNext = Dis_StopHere;
dis_res->jk_StopHere = Ijk_Boring;
|