Update Yasm to 1.2.0 (Yasm Part 1/3)

third_party/yasm/patched-yasm/modules/dbgfmts/dwarf2/dwarf2-dbgfmt.c

 /*
  * DWARF2 debugging format
  *
  *  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: dwarf2-dbgfmt.c 2130 2008-10-07 05:38:11Z peter $");
 
 #include <libyasm.h>
 
 #include "dwarf2-dbgfmt.h"
 
 struct dwarf2_head {
     yasm_bytecode *start_prevbc;
     yasm_bytecode *end_prevbc;
     /*@null@*/ yasm_section *debug_ptr;
     int with_address;
     int with_segment;
 };
 
 /* Bytecode callback function prototypes */
 static void dwarf2_head_bc_destroy(void *contents);
 static void dwarf2_head_bc_print(const void *contents, FILE *f,
                                  int indent_level);
 static int dwarf2_head_bc_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int dwarf2_head_bc_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
 /* Bytecode callback structures */
 static const yasm_bytecode_callback dwarf2_head_bc_callback = {
     dwarf2_head_bc_destroy,
     dwarf2_head_bc_print,
     yasm_bc_finalize_common,
     NULL,
     dwarf2_head_bc_calc_len,
@@ skipping 181 matching lines @@
 static int
 dwarf2_head_bc_calc_len(yasm_bytecode *bc, yasm_bc_add_span_func add_span,
                         void *add_span_data)
 {
     yasm_internal_error(N_("tried to calc_len a dwarf2 head bytecode"));
     /*@notreached@*/
     return 0;
 }
 
 static int
-dwarf2_head_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+dwarf2_head_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                       unsigned char *bufstart, void *d,
                        yasm_output_value_func output_value,
                        yasm_output_reloc_func output_reloc)
 {
     yasm_object *object = yasm_section_get_object(bc->section);
     yasm_dbgfmt_dwarf2 *dbgfmt_dwarf2 = (yasm_dbgfmt_dwarf2 *)object->dbgfmt;
     dwarf2_head *head = (dwarf2_head *)bc->contents;
     unsigned char *buf = *bufp;
     yasm_intnum *intn, *cval;
 
     if (dbgfmt_dwarf2->format == DWARF2_FORMAT_64BIT) {
@@ skipping 19 matching lines @@
     buf += 2;
 
     /* Pointer to another debug section */
     if (head->debug_ptr) {
         yasm_value value;
         yasm_value_init_sym(&value,
             yasm_dwarf2__bc_sym(object->symtab,
                                 yasm_section_bcs_first(head->debug_ptr)),
             dbgfmt_dwarf2->sizeof_offset*8);
         output_value(&value, buf, dbgfmt_dwarf2->sizeof_offset,
-                     (unsigned long)(buf-*bufp), bc, 0, d);
+                     (unsigned long)(buf-bufstart), bc, 0, d);
         buf += dbgfmt_dwarf2->sizeof_offset;
     }
 
     /* Size of the offset portion of the address */
     if (head->with_address)
         YASM_WRITE_8(buf, dbgfmt_dwarf2->sizeof_address);
 
     /* Size of a segment descriptor.  0 = flat address space */
     if (head->with_segment)
         YASM_WRITE_8(buf, 0);
@@ skipping 37 matching lines @@
 
 /* Define dbgfmt structure -- see dbgfmt.h for details */
 yasm_dbgfmt_module yasm_dwarf2_LTX_dbgfmt = {
     "DWARF2 debugging format",
     "dwarf2",
     dwarf2_directives,
     dwarf2_dbgfmt_create,
     dwarf2_dbgfmt_destroy,
     dwarf2_dbgfmt_generate
 };