From: Florian Krohm <florian@eich-krohm.de>
Date: Thu, 7 Feb 2013 03:28:52 +0000 (+0000)
Subject: s390: Fix debugging output in IR injection.
X-Git-Tag: svn/VALGRIND_3_9_0^2~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87f3a08a1978d23ad3ce21b574ce9eb4a6d0cd72;p=thirdparty%2Fvalgrind.git

s390: Fix debugging output in IR injection.


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

diff --git a/VEX/priv/ir_inject.c b/VEX/priv/ir_inject.c
index 092c82ff87..f3a12eea96 100644
--- a/VEX/priv/ir_inject.c
+++ b/VEX/priv/ir_inject.c
@@ -140,7 +140,7 @@ store_aux(IRSB *irsb, IREndness endian, IRExpr *addr, IRExpr *data)
 
 
 /* Store a value to memory. If a value requires more than 8 bytes a series
-   of 8-byte loads will be generated. */
+   of 8-byte stores will be generated. */
 static void __inline__
 store(IRSB *irsb, IREndness endian, HWord haddr, IRExpr *data)
 {
@@ -251,7 +251,7 @@ vex_inject_ir(IRSB *irsb, IREndness endian)
 
    if (0) {
       vex_printf("BEGIN inject\n");
-      if (sizeofIRType(iricb.t_result) <= 8) {
+      if (iricb.t_result == Ity_I1 || sizeofIRType(iricb.t_result) <= 8) {
          ppIRStmt(irsb->stmts[irsb->stmts_used - 1]);
       } else if (sizeofIRType(iricb.t_result) == 16) {
          ppIRStmt(irsb->stmts[irsb->stmts_used - 2]);