Update Yasm to 1.2.0 (Yasm Part 1/3)

third_party/yasm/patched-yasm/libyasm/value.c

 /*
  * Value handling
  *
  *  Copyright (C) 2006-2007  Peter Johnson
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND OTHER CONTRIBUTORS ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR OTHER CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "util.h"
-/*@unused@*/ RCSID("$Id: value.c 2220 2009-07-24 19:01:35Z peter $");
 
 #include "libyasm-stdint.h"
 #include "coretype.h"
 #include "bitvect.h"
 
 #include "errwarn.h"
 #include "intnum.h"
 #include "floatnum.h"
 #include "expr.h"
 #include "value.h"
@@ skipping 407 matching lines @@
 }
 
 int
 yasm_value_finalize_expr(yasm_value *value, yasm_expr *e,
                          yasm_bytecode *precbc, unsigned int size)
 {
     if (!e) {
         yasm_value_initialize(value, NULL, size);
         return 0;
     }
+    yasm_value_initialize(value, e, size);
+    return yasm_value_finalize(value, precbc);
+}
 
-    yasm_value_initialize(value,
-                          yasm_expr__level_tree(e, 1, 1, 0, 0, NULL, NULL),
-                          size);
+int
+yasm_value_finalize(yasm_value *value, yasm_bytecode *precbc)
+{
+    if (!value->abs)
+        return 0;
+
+    value->abs = yasm_expr__level_tree(value->abs, 1, 1, 0, 0, NULL, NULL);
 
     /* quit early if there was an issue in simplify() */
     if (yasm_error_occurred())
         return 1;
 
     /* Strip top-level AND masking to an all-1s mask the same size
      * of the value size.  This allows forced avoidance of overflow warnings.
      */
     if (value->abs->op == YASM_EXPR_AND) {
         int term;
@@ skipping 72 matching lines @@
     /* Simplify 0 in abs to NULL */
     if (value->abs->op == YASM_EXPR_IDENT
         && value->abs->terms[0].type == YASM_EXPR_INT
         && yasm_intnum_is_zero(value->abs->terms[0].data.intn)) {
         yasm_expr_destroy(value->abs);
         value->abs = NULL;
     }
     return 0;
 }
 
-int
-yasm_value_finalize(yasm_value *value, yasm_bytecode *precbc)
-{
-    unsigned int valsize = value->size;
-    return yasm_value_finalize_expr(value, value->abs, precbc, valsize);
-}
-
 yasm_intnum *
 yasm_value_get_intnum(yasm_value *value, yasm_bytecode *bc, int calc_bc_dist)
 {
     /*@dependent@*/ /*@null@*/ yasm_intnum *intn = NULL;
     /*@only@*/ yasm_intnum *outval;
     int sym_local;
 
     if (value->abs) {
         /* Handle integer expressions, if non-integer or too complex, return
          * NULL.
@@ skipping 194 matching lines @@
         if (value->ip_rel)
             fprintf(f, "%*s(IP-relative)\n", indent_level, "");
         if (value->jump_target)
             fprintf(f, "%*s(Jump target)\n", indent_level, "");
         if (value->section_rel)
             fprintf(f, "%*s(Section-relative)\n", indent_level, "");
         if (value->no_warn)
             fprintf(f, "%*s(Overflow warnings disabled)\n", indent_level, "");
     }
 }