From: Florian Krohm <florian@eich-krohm.de>
Date: Fri, 2 Jan 2015 14:40:59 +0000 (+0000)
Subject: The length of a disassemnled insn is always positive.
X-Git-Tag: svn/VALGRIND_3_11_0^2~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2152391653eb1a6410c4ce8da81fd62121c15cc1;p=thirdparty%2Fvalgrind.git

The length of a disassemnled insn is always positive.
Make DisResult::len an UInt.


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

diff --git a/VEX/priv/guest_amd64_toIR.c b/VEX/priv/guest_amd64_toIR.c
index ba5190a41b..b71c867289 100644
--- a/VEX/priv/guest_amd64_toIR.c
+++ b/VEX/priv/guest_amd64_toIR.c
@@ -31763,7 +31763,7 @@ DisResult disInstr_AMD64_WRK (
    }
 
    DIP("\n");
-   dres.len = (Int)toUInt(delta - delta_start);
+   dres.len = toUInt(delta - delta_start);
    return dres;
 }
 
diff --git a/VEX/priv/guest_generic_bb_to_IR.c b/VEX/priv/guest_generic_bb_to_IR.c
index ec9e1fc33c..f74c15ca08 100644
--- a/VEX/priv/guest_generic_bb_to_IR.c
+++ b/VEX/priv/guest_generic_bb_to_IR.c
@@ -386,7 +386,7 @@ IRSB* bb_to_IR (
       vassert(imark);
       vassert(imark->tag == Ist_IMark);
       vassert(imark->Ist.IMark.len == 0);
-      imark->Ist.IMark.len = toUInt(dres.len);
+      imark->Ist.IMark.len = dres.len;
 
       /* Print the resulting IR, if needed. */
       if (vex_traceflags & VEX_TRACE_FE) {
diff --git a/VEX/priv/guest_generic_bb_to_IR.h b/VEX/priv/guest_generic_bb_to_IR.h
index 5bfcf30cf5..7a7c1369e0 100644
--- a/VEX/priv/guest_generic_bb_to_IR.h
+++ b/VEX/priv/guest_generic_bb_to_IR.h
@@ -66,7 +66,7 @@ typedef
 
       /* The disassembled insn has this length.  Must always be
          set. */
-      Int len;
+      UInt len;
 
       /* What happens next?
          Dis_StopHere:  this insn terminates the BB; we must stop.