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

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

 /*
  * Mac OS X ABI Mach-O File Format 
  *
  *  Copyright (C) 2007 Henryk Richter, built upon xdf objfmt (C) 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
@@ skipping 73 matching lines @@
        [extern bar]
        section .data
         dq bar-foo
 
        Will currently produce an error though the necessary means are provided
        by the Mach-O specification.
 
 */
 
 #include <util.h>
-/*@unused@*/ RCSID("$Id: macho-objfmt.c 2166 2009-01-02 08:33:21Z peter $");
+/*@unused@*/ RCSID("$Id: macho-objfmt.c 2345 2010-08-01 01:27:40Z peter $");
 
 #include <libyasm.h>
 
 /* MACH-O DEFINES */
 /* Mach-O in-file header structure sizes (32 BIT, see below for 64 bit defs) */
 #define MACHO_HEADER_SIZE       28
 #define MACHO_SEGCMD_SIZE       56
 #define MACHO_SECTCMD_SIZE      68
 #define MACHO_SYMCMD_SIZE       24
 #define MACHO_NLIST_SIZE        12
@@ skipping 420 matching lines @@
             reloc->type = X86_64_RELOC_UNSIGNED;
         }
 
         /* It seems that x86-64 objects need to have all extern relocs? */
         if (info->is_64)
             reloc->ext = 1;
 
         if ((vis & YASM_SYM_EXTERN) || (vis & YASM_SYM_COMMON)) {
             reloc->ext = 1;
             info->msd->extreloc = 1;    /* section has external relocations */
-        } else if (!value->curpos_rel && !info->is_64) {
+        } else if (!info->is_64) {
             /*@dependent@*/ /*@null@*/ yasm_bytecode *sym_precbc;
 
             /* Local symbols need valued to their actual address */
             if (yasm_symrec_get_label(value->rel, &sym_precbc)) {
                 yasm_section *sym_sect = yasm_bc_get_section(sym_precbc);
                 /*@null@*/ macho_section_data *msd;
                 msd = yasm_section_get_data(sym_sect, &macho_section_data_cb);
                 assert(msd != NULL);
                 intn_plus += msd->vmoff + yasm_bc_next_offset(sym_precbc);
             }
@@ skipping 448 matching lines @@
     /* accumulate size in memory */
     msd->vmoff = info->vmsize;
     info->vmsize += msd->size;
 
     /* align both start and end of section */
     align = yasm_section_get_align(sect);
     if (align != 0) {
         unsigned long delta = msd->vmoff % align;
         if (delta > 0) {
             msd->vmoff += align - delta;
-            info->vmsize += delta;
+            info->vmsize += align - delta;
         }
     }
 
     return 0;
 }
 
 /* write object */
 static void
 macho_objfmt_output(yasm_object *object, FILE *f, int all_syms,
                     yasm_errwarns *errwarns)
@@ skipping 166 matching lines @@
     YASM_WRITE_32_L(localbuf, VM_PROT_DEFAULT); /* VM protection, initial */
     /* number of sections */
     YASM_WRITE_32_L(localbuf, objfmt_macho->parse_scnum);
     YASM_WRITE_32_L(localbuf, 0);       /* no flags */
 
     /* write MACH-O header and segment command to outfile */
     fwrite(info.buf, (size_t) (localbuf - info.buf), 1, f);
 
     /* next: section headers */
     /* offset to relocs for first section */
-    info.rel_base = align32((long)fileoffset + (long)info.filesize);
+    info.rel_base = align32((long)fileoff_sections);
     info.s_reloff = 0;          /* offset for relocs of following sections */
     yasm_object_sections_traverse(object, &info, macho_objfmt_output_secthead);
 
     localbuf = info.buf;
     /* write out symbol command */
     YASM_WRITE_32_L(localbuf, LC_SYMTAB);       /* cmd == LC_SYMTAB */
     YASM_WRITE_32_L(localbuf, MACHO_SYMCMD_SIZE);
     /* symbol table offset */
     YASM_WRITE_32_L(localbuf, info.rel_base + info.s_reloff);
     YASM_WRITE_32_L(localbuf, symtab_count);    /* number of symbols */
 
     YASM_WRITE_32_L(localbuf, macho_nlistsize * symtab_count + info.rel_base +
                     info.s_reloff);     /* string table offset */
     YASM_WRITE_32_L(localbuf, info.strlength);  /* string table size */
     /* write symbol command */
     fwrite(info.buf, (size_t)(localbuf - info.buf), 1, f);
 
     /*printf("num symbols %d, vmsize %d, filesize %d\n",symtab_count,
       info.vmsize, info.filesize ); */
 
     /* get back to end of raw section data */
     if (fseek(f, (long)fileoff_sections, SEEK_SET) < 0) {
         yasm__fatal(N_("could not seek on output file"));
         /*@notreached@*/
         return;
     }
 
     /* padding to long boundary */
-    if (info.rel_base - (fileoffset + info.filesize)) {
-        fwrite(pad_data, info.rel_base - (fileoffset + info.filesize), 1, f);
+    if ((info.rel_base - fileoff_sections) > 0) {
+        fwrite(pad_data, info.rel_base - fileoff_sections, 1, f);
     }
 
     /* relocation data */
     yasm_object_sections_traverse(object, &info, macho_objfmt_output_relocs);
 
     /* symbol table (NLIST) */
     info.indx = 1;              /* restart symbol table indices */
     yasm_symtab_traverse(object->symtab, &info, macho_objfmt_output_symtable);
 
     /* symbol strings */
     fwrite(pad_data, 1, 1, f);
     yasm_symtab_traverse(object->symtab, &info, macho_objfmt_output_str);
 
     yasm_intnum_destroy(val);
     yasm_xfree(info.buf);
 }
 
 static void
 macho_objfmt_destroy(yasm_objfmt *objfmt)
 {
     yasm_xfree(objfmt);
 }
 
-static macho_section_data *
-macho_objfmt_init_new_section(yasm_object *object, yasm_section *sect,
-                              const char *sectname, unsigned long line)
+static void
+macho_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_macho *objfmt_macho = (yasm_objfmt_macho *)object->objfmt;
     macho_section_data *data;
     yasm_symrec *sym;
 
     data = yasm_xmalloc(sizeof(macho_section_data));
     data->scnum = objfmt_macho->parse_scnum++;
     data->segname = NULL;
     data->sectname = NULL;
     data->flags = S_REGULAR;
     data->size = 0;
     data->offset = 0;
     data->vmoff = 0;
     data->nreloc = 0;
     data->extreloc = 0;
     yasm_section_add_data(sect, &macho_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 *
 macho_objfmt_add_default_section(yasm_object *object)
 {
     yasm_section *retval;
     macho_section_data *msd;
     int isnew;
 
     retval = yasm_object_get_general(object, "LC_SEGMENT.__TEXT.__text", 0, 1,
                                      0, &isnew, 0);
     if (isnew) {
-        msd = macho_objfmt_init_new_section(object, retval, ".text", 0);
+        msd = yasm_section_get_data(retval, &macho_section_data_cb);
         msd->segname = yasm__xstrdup("__TEXT");
         msd->sectname = yasm__xstrdup("__text");
         msd->flags = S_ATTR_PURE_INSTRUCTIONS;
         yasm_section_set_align(retval, 0, 0);
         yasm_section_set_default(retval, 1);
     }
     return retval;
 }
 
 static /*@observer@*/ /*@null@*/ yasm_section *
@@ skipping 172 matching lines @@
     }
 
     /* Build a unique sectname from f_segname and f_sectname. */
     realname = yasm_xmalloc(strlen("LC_SEGMENT") + 1 + strlen(data.f_segname) + 1 +
                             strlen(f_sectname) + 1);
     sprintf(realname, "LC_SEGMENT.%s.%s", data.f_segname, f_sectname);
     retval = yasm_object_get_general(object, realname, align, 1, resonly,
                                      &isnew, line);
     yasm_xfree(realname);
 
-    if (isnew)
-        msd = macho_objfmt_init_new_section(object, retval, sectname, line);
-    else
-        msd = yasm_section_get_data(retval, &macho_section_data_cb);
+    msd = yasm_section_get_data(retval, &macho_section_data_cb);
 
     if (isnew || yasm_section_is_default(retval)) {
         yasm_section_set_default(retval, 0);
         msd->segname = data.f_segname;
         msd->sectname = f_sectname;
         msd->flags = flags;
         yasm_section_set_align(retval, align, line);
     } else if (flags_override)
         yasm_warn_set(YASM_WARN_GENERAL,
                       N_("section flags ignored on section redeclaration"));
@@ skipping 69 matching lines @@
     32,
     0,
     macho_objfmt_dbgfmt_keywords,
     "null",
     NULL,   /* no directives */
     NULL,   /* no standard macros */
     macho_objfmt_create,
     macho_objfmt_output,
     macho_objfmt_destroy,
     macho_objfmt_add_default_section,
+    macho_objfmt_init_new_section,
     macho_objfmt_section_switch,
     macho_objfmt_get_special_sym
 };
 
 yasm_objfmt_module yasm_macho32_LTX_objfmt = {
     "Mac OS X ABI Mach-O File Format (32-bit)",
     "macho32",
     "o",
     32,
     0,
     macho_objfmt_dbgfmt_keywords,
     "null",
     NULL,   /* no directives */
     NULL,   /* no standard macros */
     macho32_objfmt_create,
     macho_objfmt_output,
     macho_objfmt_destroy,
     macho_objfmt_add_default_section,
+    macho_objfmt_init_new_section,
     macho_objfmt_section_switch,
     macho_objfmt_get_special_sym
 };
 
 yasm_objfmt_module yasm_macho64_LTX_objfmt = {
     "Mac OS X ABI Mach-O File Format (64-bit)",
     "macho64",
     "o",
     64,
     0,
     macho_objfmt_dbgfmt_keywords,
     "null",
     NULL,   /* no directives */
     NULL,   /* no standard macros */
     macho64_objfmt_create,
     macho_objfmt_output,
     macho_objfmt_destroy,
     macho_objfmt_add_default_section,
+    macho_objfmt_init_new_section,
     macho_objfmt_section_switch,
     macho_objfmt_get_special_sym
 };