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

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

 /*
  * Flat-format binary object format
  *
  *  Copyright (C) 2002-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: bin-objfmt.c 2166 2009-01-02 08:33:21Z peter $");
+/*@unused@*/ RCSID("$Id: bin-objfmt.c 2310 2010-03-28 19:28:54Z peter $");
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <libyasm.h>
 
 
 #define REGULAR_OUTBUF_SIZE     1024
 
 typedef struct bin_section_data {
@@ skipping 67 matching lines @@
     yasm_objfmt_bin *objfmt_bin = yasm_xmalloc(sizeof(yasm_objfmt_bin));
     objfmt_bin->objfmt.module = &yasm_bin_LTX_objfmt;
 
     objfmt_bin->map_flags = NO_MAP;
     objfmt_bin->map_filename = NULL;
     objfmt_bin->org = NULL;
 
     return (yasm_objfmt *)objfmt_bin;
 }
 
-typedef TAILQ_HEAD(, bin_group) bin_groups;
+typedef TAILQ_HEAD(bin_group_head, bin_group) bin_groups;
 
 typedef struct bin_group {
     TAILQ_ENTRY(bin_group) link;
     yasm_section *section;
     bin_section_data *bsd;
 
     /* Groups that (in parallel) logically come immediately after this
      * group's section.
      */
     bin_groups follow_groups;
@@ skipping 24 matching lines @@
         if (group->section == section)
             return group;
         /* Recurse to loop through follow groups */
         found = find_group_by_section(&group->follow_groups, section);
         if (found)
             return found;
     }
     return NULL;
 }
 
+#if 0
+/* Debugging function */
 static void
 print_groups(const bin_groups *groups, int indent_level)
 {
     bin_group *group;
     TAILQ_FOREACH(group, groups, link) {
         printf("%*sSection `%s':\n", indent_level, "",
                yasm_section_get_name(group->section));
         bin_section_data_print(group->bsd, stdout, indent_level+1);
         if (!TAILQ_EMPTY(&group->follow_groups)) {
             printf("%*sFollowing groups:\n", indent_level, "");
             print_groups(&group->follow_groups, indent_level+1);
         }
     }
 }
+#endif
 
 static void
 bin_group_destroy(/*@only@*/ bin_group *group)
 {
     bin_group *follow, *group_temp;
     TAILQ_FOREACH_SAFE(follow, &group->follow_groups, link, group_temp)
         bin_group_destroy(follow);
     yasm_xfree(group);
 }
 
@@ skipping 1193 matching lines @@
     strcat(symname, suffix);
 
     bsymd->section = sect;
     bsymd->which = which;
 
     sym = yasm_symtab_declare(symtab, symname, YASM_SYM_EXTERN, line);
     yasm_xfree(symname);
     yasm_symrec_add_data(sym, &bin_symrec_data_cb, bsymd);
 }
 
-static bin_section_data *
-bin_objfmt_init_new_section(yasm_object *object, yasm_section *sect,
-                            const char *sectname, unsigned long line)
+static void
+bin_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_bin *objfmt_bin = (yasm_objfmt_bin *)object->objfmt;*/
     bin_section_data *data;
 
     data = yasm_xmalloc(sizeof(bin_section_data));
     data->bss = 0;
     data->align = NULL;
     data->valign = NULL;
     data->start = NULL;
     data->vstart = NULL;
     data->follows = NULL;
     data->vfollows = NULL;
     data->istart = NULL;
     data->ivstart = NULL;
     data->length = NULL;
     yasm_section_add_data(sect, &bin_section_data_cb, data);
 
     define_section_symbol(object->symtab, sect, sectname, ".start",
                           SSYM_START, line);
     define_section_symbol(object->symtab, sect, sectname, ".vstart",
                           SSYM_VSTART, line);
     define_section_symbol(object->symtab, sect, sectname, ".length",
                           SSYM_LENGTH, line);
-
-    return data;
 }
 
 static yasm_section *
 bin_objfmt_add_default_section(yasm_object *object)
 {
     yasm_section *retval;
     int isnew;
 
     retval = yasm_object_get_general(object, ".text", 0, 1, 0, &isnew, 0);
-    if (isnew) {
-        bin_objfmt_init_new_section(object, retval, ".text", 0);
+    if (isnew)
         yasm_section_set_default(retval, 1);
-    }
     return retval;
 }
 
+/* GAS-style flags */
+static int
+bin_helper_gasflags(void *obj, yasm_valparam *vp, unsigned long line, void *d,
+                    /*@unused@*/ uintptr_t arg)
+{
+    /* TODO */
+    return 0;
+}
+
 static /*@observer@*/ /*@null@*/ yasm_section *
 bin_objfmt_section_switch(yasm_object *object, yasm_valparamhead *valparams,
                           /*@unused@*/ /*@null@*/
                           yasm_valparamhead *objext_valparams,
                           unsigned long line)
 {
     yasm_valparam *vp;
     yasm_section *retval;
     int isnew;
     int flags_override = 0;
@@ skipping 28 matching lines @@
           offsetof(struct bin_section_switch_data, bss), 1 },
         { "progbits", 0, yasm_dir_helper_flag_set,
           offsetof(struct bin_section_switch_data, bss), 0 },
         { "code", 0, yasm_dir_helper_flag_set,
           offsetof(struct bin_section_switch_data, code), 1 },
         { "data", 0, yasm_dir_helper_flag_set,
           offsetof(struct bin_section_switch_data, code), 0 },
         { "execute", 0, yasm_dir_helper_flag_set,
           offsetof(struct bin_section_switch_data, code), 1 },
         { "noexecute", 0, yasm_dir_helper_flag_set,
-          offsetof(struct bin_section_switch_data, code), 0 }
+          offsetof(struct bin_section_switch_data, code), 0 },
+        { "gasflags", 1, bin_helper_gasflags, 0, 0 }
     };
 
     vp = yasm_vps_first(valparams);
     sectname = yasm_vp_string(vp);
     if (!sectname)
         return NULL;
     vp = yasm_vps_next(vp);
 
     retval = yasm_object_find_general(object, sectname);
     if (retval) {
@@ skipping 57 matching lines @@
                            N_("argument to `%s' is not a power of two"),
                            "valign");
             return NULL;
         }
     } else
         data.valign = bsd ? bsd->valign : NULL;
 
     retval = yasm_object_get_general(object, sectname, 0, (int)data.code,
                                      (int)data.bss, &isnew, line);
 
-    if (isnew)
-        bsd = bin_objfmt_init_new_section(object, retval, sectname, line);
-    else
-        bsd = yasm_section_get_data(retval, &bin_section_data_cb);
+    bsd = yasm_section_get_data(retval, &bin_section_data_cb);
 
     if (isnew || yasm_section_is_default(retval)) {
         yasm_section_set_default(retval, 0);
     }
 
     /* Update section flags */
     bsd->bss = data.bss;
     bsd->align = data.align;
     bsd->valign = data.valign;
     bsd->start = data.start;
@@ skipping 228 matching lines @@
     16,
     0,
     bin_objfmt_dbgfmt_keywords,
     "null",
     bin_objfmt_directives,
     bin_objfmt_stdmacs,
     bin_objfmt_create,
     bin_objfmt_output,
     bin_objfmt_destroy,
     bin_objfmt_add_default_section,
+    bin_objfmt_init_new_section,
     bin_objfmt_section_switch,
     bin_objfmt_get_special_sym
 };
 
 #define EXE_HEADER_SIZE 0x200
 
 /* DOS .EXE binaries are just raw binaries with a header */
 yasm_objfmt_module yasm_dosexe_LTX_objfmt;
 
 static yasm_objfmt *
@@ skipping 132 matching lines @@
     16,
     0,
     bin_objfmt_dbgfmt_keywords,
     "null",
     bin_objfmt_directives,
     bin_objfmt_stdmacs,
     dosexe_objfmt_create,
     dosexe_objfmt_output,
     bin_objfmt_destroy,
     bin_objfmt_add_default_section,
+    bin_objfmt_init_new_section,
     bin_objfmt_section_switch,
     bin_objfmt_get_special_sym
 };