From 210c10110bca124de4b9fb38d757ffc9b4041023 Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Sun, 1 Nov 2009 10:24:48 +0300 Subject: [PATCH] Revert "BR 2887108: Use overflow_ helper to catch inappropriate imm optimization" This reverts commit 41208028ff52d190044ee7532bf14c5aca0f899a. | | From: "H. Peter Anvin" | | The tests for overflow_signed() are wrong too. Those are relevant for if a | warning should be issued, but not for how the value should be encoded in | the byte stream. | Signed-off-by: Cyrill Gorcunov --- parser.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/parser.c b/parser.c index 411d1717..ea36e86c 100644 --- a/parser.c +++ b/parser.c @@ -840,10 +840,11 @@ is_expression: result->oprs[operand].segment = NO_SEG; /* don't care again */ result->oprs[operand].wrt = NO_SEG; /* still don't care */ - /* Be optimistic */ if(optimizing >= 0 && !(result->oprs[operand].type & STRICT)) + { + /* Be optimistic */ result->oprs[operand].type |= SBYTE16 | SBYTE32 | SBYTE64; - + } } else if (is_reloc(value)) { /* it's immediate */ result->oprs[operand].type |= IMMEDIATE; result->oprs[operand].offset = reloc_value(value); @@ -858,14 +859,12 @@ is_expression: int32_t v32 = (int32_t)v64; int16_t v16 = (int16_t)v32; - if (v64 >= -128 && v64 <= 127) + if (v64 >= -128 && v64 <= 127) result->oprs[operand].type |= SBYTE64; - if (!overflow_signed(v64, sizeof(v32))) - if (v32 >= -128 && v32 <= 127) - result->oprs[operand].type |= SBYTE32; - if (!overflow_signed(v64, sizeof(v16))) - if (v16 >= -128 && v16 <= 127) - result->oprs[operand].type |= SBYTE16; + if (v32 >= -128 && v32 <= 127) + result->oprs[operand].type |= SBYTE32; + if (v16 >= -128 && v16 <= 127) + result->oprs[operand].type |= SBYTE16; } } } else { /* it's a register */