Update our yasm copy to yasm 1.1.0 (Part 1: yasm side)...

third_party/yasm/patched-yasm/modules/objfmts/dbg/dbg-objfmt.c

 /*
  * Debugging object format (used to debug object format module interface)
  *
  *  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: dbg-objfmt.c 2166 2009-01-02 08:33:21Z peter $");
+/*@unused@*/ RCSID("$Id: dbg-objfmt.c 2310 2010-03-28 19:28:54Z peter $");
 
 #include <libyasm.h>
 
 
 typedef struct yasm_objfmt_dbg {
     yasm_objfmt_base objfmt;        /* base structure */
 
     FILE *dbgfile;
 } yasm_objfmt_dbg;
 
@@ skipping 43 matching lines @@
 }
 
 static void
 dbg_objfmt_destroy(yasm_objfmt *objfmt)
 {
     yasm_objfmt_dbg *objfmt_dbg = (yasm_objfmt_dbg *)objfmt;
     fprintf(objfmt_dbg->dbgfile, "destroy()\n");
     yasm_xfree(objfmt);
 }
 
+static void
+dbg_objfmt_init_new_section(yasm_section *sect, unsigned long line)
+{
+    yasm_object *object = yasm_section_get_object(sect);
+    yasm_objfmt_dbg *objfmt_dbg = (yasm_objfmt_dbg *)object->objfmt;
+    fprintf(objfmt_dbg->dbgfile, "init_new_section(\"%s\", %lu)\n",
+            yasm_section_get_name(sect), line);
+    yasm_symtab_define_label(object->symtab, ".text",
+        yasm_section_bcs_first(sect), 1, 0);
+}
+
 static yasm_section *
 dbg_objfmt_add_default_section(yasm_object *object)
 {
     yasm_objfmt_dbg *objfmt_dbg = (yasm_objfmt_dbg *)object->objfmt;
     yasm_section *retval;
     int isnew;
 
+    fprintf(objfmt_dbg->dbgfile, "add_default_section()\n");
     retval = yasm_object_get_general(object, ".text", 0, 0, 0, &isnew, 0);
     if (isnew) {
-        fprintf(objfmt_dbg->dbgfile, "(new) ");
-        yasm_symtab_define_label(object->symtab, ".text",
-            yasm_section_bcs_first(retval), 1, 0);
         yasm_section_set_default(retval, 1);
     }
     return retval;
 }
 
 static /*@observer@*/ /*@null@*/ yasm_section *
 dbg_objfmt_section_switch(yasm_object *object, yasm_valparamhead *valparams,
                           /*@unused@*/ /*@null@*/
                           yasm_valparamhead *objext_valparams,
                           unsigned long line)
@@ skipping 11 matching lines @@
 
     vp = yasm_vps_first(valparams);
     if (!yasm_vp_string(vp)) {
         fprintf(objfmt_dbg->dbgfile, "NULL\n");
         return NULL;
     }
     retval = yasm_object_get_general(object, yasm_vp_string(vp), 0, 0, 0,
                                      &isnew, line);
     if (isnew) {
         fprintf(objfmt_dbg->dbgfile, "(new) ");
-        yasm_symtab_define_label(object->symtab, vp->val,
-                                 yasm_section_bcs_first(retval), 1, line);
     }
     yasm_section_set_default(retval, 0);
     fprintf(objfmt_dbg->dbgfile, "\"%s\" section\n", vp->val);
     return retval;
 }
 
 static /*@observer@*/ /*@null@*/ yasm_symrec *
 dbg_objfmt_get_special_sym(yasm_object *object, const char *name,
                            const char *parser)
 {
@@ skipping 17 matching lines @@
     32,
     0,
     dbg_objfmt_dbgfmt_keywords,
     "null",
     NULL,       /* no directives */
     NULL,       /* no standard macros */
     dbg_objfmt_create,
     dbg_objfmt_output,
     dbg_objfmt_destroy,
     dbg_objfmt_add_default_section,
+    dbg_objfmt_init_new_section,
     dbg_objfmt_section_switch,
     dbg_objfmt_get_special_sym
 };