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

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

 /*
  * Extended Dynamic Object format
  *
  *  Copyright (C) 2004-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: xdf-objfmt.c 2166 2009-01-02 08:33:21Z peter $");
+/*@unused@*/ RCSID("$Id: xdf-objfmt.c 2310 2010-03-28 19:28:54Z peter $");
 
 #include <libyasm.h>
 
 
 #define REGULAR_OUTBUF_SIZE     1024
 
 #define XDF_MAGIC       0x87654322
 
 #define XDF_SYM_EXTERN  1
 #define XDF_SYM_GLOBAL  2
@@ skipping 558 matching lines @@
 
     yasm_xfree(info.buf);
 }
 
 static void
 xdf_objfmt_destroy(yasm_objfmt *objfmt)
 {
     yasm_xfree(objfmt);
 }
 
-static xdf_section_data *
-xdf_objfmt_init_new_section(yasm_object *object, yasm_section *sect,
-                            const char *sectname, unsigned long line)
+static void
+xdf_objfmt_init_new_section(yasm_section *sect, unsigned long line)
 {
+    yasm_object *object = yasm_section_get_object(sect);
+    const char *sectname = yasm_section_get_name(sect);
     yasm_objfmt_xdf *objfmt_xdf = (yasm_objfmt_xdf *)object->objfmt;
     xdf_section_data *data;
     yasm_symrec *sym;
 
     data = yasm_xmalloc(sizeof(xdf_section_data));
     data->scnum = objfmt_xdf->parse_scnum++;
     data->flags = 0;
     data->addr = NULL;
     data->vaddr = NULL;
     data->scnptr = 0;
     data->size = 0;
     data->relptr = 0;
     data->nreloc = 0;
     yasm_section_add_data(sect, &xdf_section_data_cb, data);
 
     sym = yasm_symtab_define_label(object->symtab, sectname,
                                    yasm_section_bcs_first(sect), 1, line);
     data->sym = sym;
-    return data;
 }
 
 static yasm_section *
 xdf_objfmt_add_default_section(yasm_object *object)
 {
     yasm_section *retval;
-    xdf_section_data *xsd;
     int isnew;
 
     retval = yasm_object_get_general(object, ".text", 0, 1, 0, &isnew, 0);
-    if (isnew) {
-        xsd = xdf_objfmt_init_new_section(object, retval, ".text", 0);
+    if (isnew)
         yasm_section_set_default(retval, 1);
-    }
     return retval;
 }
 
 static int
 xdf_helper_use(void *obj, yasm_valparam *vp, unsigned long line, void *d,
                uintptr_t bits)
 {
     yasm_object *object = (yasm_object *)obj;
     unsigned long *flags = (unsigned long *)d;
     *flags &= ~(XDF_SECT_USE_16|XDF_SECT_USE_32|XDF_SECT_USE_64);
@@ skipping 89 matching lines @@
                 yasm_intnum_destroy(data.vaddr);
             if (data.absaddr)
                 yasm_intnum_destroy(data.absaddr);
             return NULL;
         }
     }
 
     retval = yasm_object_get_general(object, sectname, align, 1, resonly,
                                      &isnew, line);
 
-    if (isnew)
-        xsd = xdf_objfmt_init_new_section(object, retval, sectname, line);
-    else
-        xsd = yasm_section_get_data(retval, &xdf_section_data_cb);
+    xsd = yasm_section_get_data(retval, &xdf_section_data_cb);
 
     if (isnew || yasm_section_is_default(retval)) {
         yasm_section_set_default(retval, 0);
         xsd->flags = data.flags;
         if (data.absaddr) {
             if (xsd->addr)
                 yasm_intnum_destroy(xsd->addr);
             xsd->addr = data.absaddr;
         }
         if (data.vaddr) {
@@ skipping 73 matching lines @@
     32,
     0,
     xdf_objfmt_dbgfmt_keywords,
     "null",
     NULL,       /* no directives */
     NULL,       /* no standard macros */
     xdf_objfmt_create,
     xdf_objfmt_output,
     xdf_objfmt_destroy,
     xdf_objfmt_add_default_section,
+    xdf_objfmt_init_new_section,
     xdf_objfmt_section_switch,
     xdf_objfmt_get_special_sym
 };