Ticket #102: birds-segment-patch-2.diff

yasm-r1818/modules/objfmts/macho/macho-objfmt.c

@@ -1404 +1404 @@
 
     sectname = vp->val;
 
     /* translate .text,.data,.bss to __text,__data,__bss... */
     for (i=0; i<NELEMS(section_name_translation); i++) {
         if (yasm__strcasecmp(sectname, section_name_translation[i].in) == 0)
             break;
     }
 
     if (i == NELEMS(section_name_translation)) {
-        yasm_warn_set(YASM_WARN_GENERAL,
-                      N_("Unknown section type, defaulting to .text"));
-        i = 0;
+        /* XXX could be 16 bytes if the terminator isn't needed , but play safe for now. */
+        if (strlen(sectname) >= 15) {
+            yasm_error_set(YASM_ERROR_VALUE,
+                           N_("The section name `%s' is too long, max 15 chars"), 
+                           sectname);
+            return NULL;
+        }
+        f_segname = "__TEXT";
+        f_sectname = yasm__xstrdup(sectname);
+        flags = S_ATTR_SOME_INSTRUCTIONS;
+        align = 0;
+        i = -1; /* can be used as indicator further down */
+    } else {
+        f_segname = section_name_translation[i].seg;
+        f_sectname = section_name_translation[i].sect;
+        flags = section_name_translation[i].flags;
+        align = section_name_translation[i].align;
     }
 
-    f_segname = section_name_translation[i].seg;
-    f_sectname = section_name_translation[i].sect;
-    flags = section_name_translation[i].flags;
-    align = section_name_translation[i].align;
-
     while ((vp = yasm_vps_next(vp))) {
         if (!vp->val) {
             yasm_warn_set(YASM_WARN_GENERAL,
                           N_("Unrecognized numeric qualifier"));
             continue;
         }
 
         flags_override = 1;
         if (yasm__strcasecmp(vp->val, "align") == 0 && vp->param) {
             /*@dependent@ *//*@null@ */ const yasm_intnum *align_expr;
@@ -1448 +1457 @@
                                vp->val);
                 return NULL;
             }
 
             /* Check to see if alignment is supported size */
             if (align > 16384) {
                 yasm_error_set(YASM_ERROR_VALUE,
                     N_("macho implementation does not support alignments > 16384"));
                 return NULL;
             }
-        } else
-            yasm_warn_set(YASM_WARN_GENERAL,
-                          N_("Unrecognized qualifier `%s'"), vp->val);
+        } else if (yasm__strcasecmp(vp->val, "segname") == 0) {
+            if (vp->param) {
+                yasm_error_set(YASM_ERROR_VALUE,
+                               N_("The `segname' attribute for section `%s' has a parameter. "
+                                  "Try drop any `=' or similar between the `segname' and the name."),
+                               sectname);
+                return NULL;
+            }
+            vp = yasm_vps_next(vp);
+            if (!vp) {
+                yasm_error_set(YASM_ERROR_VALUE,
+                               N_("The `segname' attribute for section `%s' is missing the name"),
+                               sectname);
+                return NULL;
+            }
+            if (strlen(vp->val) > 15) {
+                yasm_error_set(YASM_ERROR_VALUE,
+                               N_("The segment name `%s' for section `%s' is too long, max 15 chars"), 
+                               sectname, vp->val);
+                return NULL;
+            }
+            f_segname = yasm__xstrdup(vp->val);
+        } else {
+            yasm_error_set(YASM_ERROR_VALUE,
+                           N_("Unrecognized qualifier `%s' or missing parameter in the section defintion of `%s'"), 
+                           vp->val, sectname);
+            return NULL;
+        }
     }
 
     retval = yasm_object_get_general(object, sectname, 0, align, 1, resonly,
                                      &isnew, line);
 
     if (isnew)
         msd = macho_objfmt_init_new_section(object, retval, sectname, line);
     else
         msd = yasm_section_get_data(retval, &macho_section_data_cb);