Update Yasm to 1.2.0 (Yasm Part 1/3)

third_party/yasm/patched-yasm/modules/dbgfmts/codeview/cv-symline.c

 /*
  * CodeView debugging format - symbol and line information
  *
  *  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.
@@ skipping 10 matching lines @@
  * 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: cv-symline.c 2258 2010-01-03 01:04:18Z peter $");
 
 #include <libyasm.h>
 
 #include "cv-dbgfmt.h"
 
 enum cv8_symheadtype {
     CV8_DEBUG_SYMS      = 0xF1, /* CV5 symbol information */
     CV8_LINE_NUMS       = 0xF2, /* line numbers for a section */
     CV8_FILE_STRTAB     = 0xF3, /* filename string table */
     CV8_FILE_INFO       = 0xF4  /* source file info */
@@ skipping 114 matching lines @@
     } args[10];
 } cv_sym;
 
 /* Bytecode callback function prototypes */
 static void cv8_symhead_bc_destroy(void *contents);
 static void cv8_symhead_bc_print(const void *contents, FILE *f,
                                  int indent_level);
 static int cv8_symhead_bc_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int cv8_symhead_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);
 
 static void cv8_fileinfo_bc_destroy(void *contents);
 static void cv8_fileinfo_bc_print(const void *contents, FILE *f,
                                   int indent_level);
 static int cv8_fileinfo_bc_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int cv8_fileinfo_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);
 
 static void cv8_lineinfo_bc_destroy(void *contents);
 static void cv8_lineinfo_bc_print(const void *contents, FILE *f,
                                   int indent_level);
 static int cv8_lineinfo_bc_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int cv8_lineinfo_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);
 
 static void cv_sym_bc_destroy(void *contents);
 static void cv_sym_bc_print(const void *contents, FILE *f, int indent_level);
 static int cv_sym_bc_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int cv_sym_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 cv8_symhead_bc_callback = {
     cv8_symhead_bc_destroy,
     cv8_symhead_bc_print,
     yasm_bc_finalize_common,
     NULL,
     cv8_symhead_bc_calc_len,
@@ skipping 425 matching lines @@
         cv8_set_symhead_end(head, yasm_section_bcs_last(info.debug_symline));
     }
 
     /* Already aligned 4 */
 
     /* Output debugging symbols */
     head = cv8_add_symhead(info.debug_symline, CV8_DEBUG_SYMS, 0);
     /* add object and compile flag first */
     cv8_add_sym_objname(info.debug_symline,
                         yasm__abspath(object->obj_filename));
-    cv8_add_sym_compile(object, info.debug_symline,
-                        yasm__xstrdup(PACKAGE_NAME " " PACKAGE_INTVER "."
-                                      PACKAGE_BUILD));
+    if (getenv("YASM_TEST_SUITE"))
+        cv8_add_sym_compile(object, info.debug_symline,
+                            yasm__xstrdup("yasm HEAD"));
+    else
+        cv8_add_sym_compile(object, info.debug_symline,
+                            yasm__xstrdup(PACKAGE_STRING));
     /* then iterate through symbol table */
     yasm_symtab_traverse(object->symtab, &info, cv_generate_sym);
     cv8_set_symhead_end(head, yasm_section_bcs_last(info.debug_symline));
 
     /* Align 4 at end */
     bc = yasm_bc_create_align
         (yasm_expr_create_ident(yasm_expr_int(yasm_intnum_create_uint(4)), 0),
          NULL, NULL, NULL, 0);
     yasm_bc_finalize(bc, yasm_cv__append_bc(info.debug_symline, bc));
     yasm_bc_calc_len(bc, NULL, NULL);
@@ skipping 63 matching lines @@
 static int
 cv8_symhead_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 codeview symhead bytecode"));
     /*@notreached@*/
     return 0;
 }
 
 static int
-cv8_symhead_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+cv8_symhead_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);
     cv8_symhead *head = (cv8_symhead *)bc->contents;
     unsigned char *buf = *bufp;
     yasm_intnum *intn, *cval;
 
     cval = yasm_intnum_create_uint(4);
     /* Output "version" if first */
@@ skipping 52 matching lines @@
 static int
 cv8_fileinfo_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 codeview fileinfo bytecode"));
     /*@notreached@*/
     return 0;
 }
 
 static int
-cv8_fileinfo_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+cv8_fileinfo_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);
     cv8_fileinfo *fi = (cv8_fileinfo *)bc->contents;
     unsigned char *buf = *bufp;
     yasm_intnum *cval;
     int i;
 
     /* Offset in filename string table */
@@ skipping 46 matching lines @@
 static int
 cv8_lineinfo_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 codeview linehead bytecode"));
     /*@notreached@*/
     return 0;
 }
 
 static int
-cv8_lineinfo_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+cv8_lineinfo_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);
     cv8_lineinfo *li = (cv8_lineinfo *)bc->contents;
     unsigned char *buf = *bufp;
     yasm_intnum *cval;
     unsigned long i;
     cv8_lineset *ls;
 
     /* start offset and section */
-    cv_out_sym(li->sectsym, 0, bc, &buf, d, output_value);
+    cv_out_sym(li->sectsym, (unsigned long)(buf - bufstart), bc, &buf,
+               d, output_value);
 
     /* Two bytes of pad/alignment */
     YASM_WRITE_8(buf, 0);
     YASM_WRITE_8(buf, 0);
 
     /* Section length covered by line number info */
     cval = yasm_calc_bc_dist(yasm_section_bcs_first(li->sect),
                              yasm_section_bcs_last(li->sect));
     yasm_arch_intnum_tobytes(object->arch, cval, buf, 4, 32, 0, bc, 0);
     buf += 4;
@@ skipping 122 matching lines @@
 static int
 cv_sym_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 codeview sym bytecode"));
     /*@notreached@*/
     return 0;
 }
 
 static int
-cv_sym_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+cv_sym_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);
     cv_sym *cvs = (cv_sym *)bc->contents;
     unsigned char *buf = *bufp;
     yasm_intnum *cval;
     const char *ch = cvs->format;
     size_t len;
     int arg = 0;
@@ skipping 21 matching lines @@
                 buf += 2;
                 break;
             case 'w':
                 yasm_intnum_set_uint(cval, cvs->args[arg++].i);
                 yasm_arch_intnum_tobytes(object->arch, cval, buf, 4, 32, 0,
                                          bc, 0);
                 buf += 4;
                 break;
             case 'Y':
                 cv_out_sym((yasm_symrec *)cvs->args[arg++].p,
-                           (unsigned long)(buf-(*bufp)), bc, &buf, d,
+                           (unsigned long)(buf-bufstart), bc, &buf, d,
                            output_value);
                 break;
             case 'T':
                 yasm_intnum_set_uint(cval, cvs->args[arg++].i);
                 yasm_arch_intnum_tobytes(object->arch, cval, buf, 4, 32, 0,
                                          bc, 0);
                 buf += 4;       /* XXX: will be 2 in CV4 */
                 break;
             case 'S':
                 len = strlen((char *)cvs->args[arg].p);
@@ skipping 13 matching lines @@
                 yasm_internal_error(N_("unknown leaf format character"));
         }
         ch++;
     }
 
     *bufp = buf;
 
     yasm_intnum_destroy(cval);
     return 0;
 }