[Nasm-cvs] BR 2067837: remove double add of VEX instruction length

[H. P. A. <hp...@zy...>]

Date: Sun, 24 Aug 2008 18:09:04 -0700

We added the length of VEX prefixes twice in calcsize(); this resulted
in the wrong symbol addresses when compiling without the optimizer.

Signed-off-by: H. Peter Anvin <hp...@zy...>
---
 assemble.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/assemble.c b/assemble.c
index 73b5a3f..9345fd8 100644
--- a/assemble.c
+++ b/assemble.c
@@ -975,14 +975,12 @@ static int64_t calcsize(int32_t segment, int64_t offset, int bits,
 	case 0261:
 	case 0262:
 	case 0263:
-	    length += 2;
 	    ins->rex |= REX_V;
 	    ins->drexdst = regval(opx);
 	    ins->vex_m = *codes++;
 	    ins->vex_wlp = *codes++;
 	    break;
 	case 0270:
-	    length += 2;
 	    ins->rex |= REX_V;
 	    ins->drexdst = 0;
 	    ins->vex_m = *codes++;
-- 
1.5.5.1