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 ba5190a41b5e39601fabf948293727ac1dda8d13..b71c867289fed50a607aa20c165199979434806d 100644 (file)
--- 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 ec9e1fc33ce685293811c3eb6df89966c57e7cba..f74c15ca089ca627eb1c5dcd4dbdd1a582d28dc6 100644 (file)
--- 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 5bfcf30cf5df87ec6c4dce2eec6e3933a35fba00..7a7c1369e03f1b902966c1ded0566f3bab758ba6 100644 (file)
--- 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.