Update Yasm to 1.2.0 (Yasm Part 1/3)

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

 /*
  * Bytecode utility functions
  *
  *  Copyright (C) 2001-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: bytecode.c 2233 2009-10-31 21:45:55Z peter $");
 
 #include "libyasm-stdint.h"
 #include "coretype.h"
 
 #include "errwarn.h"
 #include "intnum.h"
 #include "expr.h"
 #include "value.h"
 #include "symrec.h"
 
@@ skipping 27 matching lines @@
 int
 yasm_bc_expand_common(yasm_bytecode *bc, int span, long old_val, long new_val,
                       /*@out@*/ long *neg_thres, /*@out@*/ long *pos_thres)
 {
     yasm_internal_error(N_("bytecode does not have any dependent spans"));
     /*@unreached@*/
     return 0;
 }
 
 int
-yasm_bc_tobytes_common(yasm_bytecode *bc, unsigned char **bufp, void *d,
+yasm_bc_tobytes_common(yasm_bytecode *bc, unsigned char **buf,
+                       unsigned char *bufstart, void *d,
                        yasm_output_value_func output_value,
                        /*@null@*/ yasm_output_reloc_func output_reloc)
 {
     yasm_internal_error(N_("bytecode cannot be converted to bytes"));
     /*@unreached@*/
     return 0;
 }
 
 void
 yasm_bc_transform(yasm_bytecode *bc, const yasm_bytecode_callback *callback,
@@ skipping 211 matching lines @@
 }
 
 /*@null@*/ /*@only@*/ unsigned char *
 yasm_bc_tobytes(yasm_bytecode *bc, unsigned char *buf, unsigned long *bufsize,
                 /*@out@*/ int *gap, void *d,
                 yasm_output_value_func output_value,
                 /*@null@*/ yasm_output_reloc_func output_reloc)
     /*@sets *buf@*/
 {
     /*@only@*/ /*@null@*/ unsigned char *mybuf = NULL;
+    unsigned char *bufstart;
     unsigned char *origbuf, *destbuf;
     long i;
     int error = 0;
 
     long mult;
     if (yasm_bc_get_multiple(bc, &mult, 1) || mult == 0) {
         *bufsize = 0;
         return NULL;
     }
     bc->mult_int = mult;
 
     /* special case for reserve bytecodes */
     if (bc->callback->special == YASM_BC_SPECIAL_RESERVE) {
         *bufsize = bc->len*bc->mult_int;
         *gap = 1;
         return NULL;    /* we didn't allocate a buffer */
     }
     *gap = 0;
 
     if (*bufsize < bc->len*bc->mult_int) {
         mybuf = yasm_xmalloc(bc->len*bc->mult_int);
         destbuf = mybuf;
     } else
         destbuf = buf;
+    bufstart = destbuf;
 
     *bufsize = bc->len*bc->mult_int;
 
     if (!bc->callback)
         yasm_internal_error(N_("got empty bytecode in bc_tobytes"));
     else for (i=0; i<bc->mult_int; i++) {
         origbuf = destbuf;
-        error = bc->callback->tobytes(bc, &destbuf, d, output_value,
+        error = bc->callback->tobytes(bc, &destbuf, bufstart, d, output_value,
                                       output_reloc);
 
         if (!error && ((unsigned long)(destbuf - origbuf) != bc->len))
             yasm_internal_error(
                 N_("written length does not match optimized length"));
     }
 
     return mybuf;
 }
 
@@ skipping 25 matching lines @@
     return bc->multiple;
 }
 
 yasm_insn *
 yasm_bc_get_insn(yasm_bytecode *bc)
 {
     if (bc->callback->special != YASM_BC_SPECIAL_INSN)
         return NULL;
     return (yasm_insn *)bc->contents;
 }