Update Yasm to 1.2.0 (Yasm Part 1/3)

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

 /*
  * DWARF2 debugging format - info and abbreviation tables
  *
  *  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-info.c 2130 2008-10-07 05:38:11Z peter $");
 
 #include <libyasm.h>
 
 #include "dwarf2-dbgfmt.h"
 
 #define DW_LANG_Mips_Assembler  0x8001
 
 /* Tag encodings */
 typedef enum {
     DW_TAG_padding = 0x00,
@@ skipping 151 matching lines @@
 } dwarf2_abbrev;
 
 /* Bytecode callback function prototypes */
 
 static void dwarf2_abbrev_bc_destroy(void *contents);
 static void dwarf2_abbrev_bc_print(const void *contents, FILE *f,
                                    int indent_level);
 static int dwarf2_abbrev_bc_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int dwarf2_abbrev_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_abbrev_bc_callback = {
     dwarf2_abbrev_bc_destroy,
     dwarf2_abbrev_bc_print,
     yasm_bc_finalize_common,
     NULL,
@@ skipping 119 matching lines @@
     dwarf2_append_str(debug_info, object->src_filename);
 
     /* compile directory (current working directory) */
     abc->len += dwarf2_add_abbrev_attr(abbrev, DW_AT_comp_dir, DW_FORM_string);
     buf = yasm__getcwd();
     dwarf2_append_str(debug_info, buf);
     yasm_xfree(buf);
 
     /* producer - assembler name */
     abc->len += dwarf2_add_abbrev_attr(abbrev, DW_AT_producer, DW_FORM_string);
-    dwarf2_append_str(debug_info, PACKAGE " " VERSION);
+    if (getenv("YASM_TEST_SUITE"))
+        dwarf2_append_str(debug_info, "yasm HEAD");
+    else
+        dwarf2_append_str(debug_info, PACKAGE_STRING);
 
     /* language - no standard code for assembler, use MIPS as a substitute */
     abc->len += dwarf2_add_abbrev_attr(abbrev, DW_AT_language, DW_FORM_data2);
     dwarf2_append_expr(debug_info,
         yasm_expr_create_ident(yasm_expr_int(
             yasm_intnum_create_uint(DW_LANG_Mips_Assembler)), 0), 2, 0);
 
     /* Terminate list of abbreviations */
     abbrev = yasm_xmalloc(sizeof(dwarf2_abbrev));
     abc = yasm_bc_create_common(&dwarf2_abbrev_bc_callback, abbrev, 0);
@@ skipping 36 matching lines @@
 static int
 dwarf2_abbrev_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 aranges head bytecode"));
     /*@notreached@*/
     return 0;
 }
 
 static int
-dwarf2_abbrev_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+dwarf2_abbrev_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)
 {
     dwarf2_abbrev *abbrev = (dwarf2_abbrev *)bc->contents;
     unsigned char *buf = *bufp;
     dwarf2_abbrev_attr *attr;
 
     if (abbrev->id == 0) {
         YASM_WRITE_8(buf, 0);
         *bufp = buf;
         return 0;
     }
 
     buf += yasm_get_uleb128(abbrev->id, buf);
     buf += yasm_get_uleb128(abbrev->tag, buf);
     YASM_WRITE_8(buf, abbrev->has_children);
 
     STAILQ_FOREACH(attr, &abbrev->attrs, link) {
         buf += yasm_get_uleb128(attr->name, buf);
         buf += yasm_get_uleb128(attr->form, buf);
     }
 
     YASM_WRITE_8(buf, 0);
     YASM_WRITE_8(buf, 0);
 
     *bufp = buf;
     return 0;
 }