Changeset 237

Timestamp:

May 26, 2003, 4:50:21 PM (22 years ago)

Author:

zap

Message:

Re-applied Knut's fix related to segment alignment.

File:

• trunk/src/emx/src/emxomf/emxomf.c (modified) (4 diffs, 1 prop)

trunk/src/emx/src/emxomf/emxomf.c

@@ -1387 +1387 @@
     P (bit 0)           USE32 */
 
-static int seg_def (int name_index, int class_index, long size, int stack)
+static int seg_def (int name_index, int class_index, long size, int stack, int is_set)
 {
   byte seg_attr;
 
-  seg_attr = (stack ? 0x75 : 0x69);
+  seg_attr =  (is_set ? (stack ? 0xb5 : 0xa9) : (stack ? 0x75 : 0x69) );
   if (size > 0x10000 || force_big)
     {
@@ -2000 +2000 @@
       set_ptr->seg_index[j] =
         seg_def (set_ptr->seg_name[j], code_class_name,
-                 4 * (j == 1 ? set_ptr->count : set_ptr->def), FALSE);
+                 4 * (j == 1 ? set_ptr->count : set_ptr->def), FALSE, TRUE);
 }
 
@@ -3018 +3018 @@
 
   text_index = seg_def (text_seg_name, code_class_name, text_size,
-                        FALSE);
+                        FALSE, FALSE);
   write_set_segs ();
 
   if (udat_seg_string != NULL)
     udat_index = seg_def (udat_seg_name, data_class_name, data_size,
-                          FALSE);
+                          FALSE, FALSE);
   data_index = seg_def (data_seg_name, data_class_name,
                         (udat_seg_string == NULL ? data_size : 0),
-                        FALSE);
+                        FALSE, FALSE);
   if (udat_seg_string == NULL)
     udat_index = data_index;
 
   bss_index = seg_def (bss_seg_name, bss_class_name, a_out_h->a_bss,
-                       FALSE);
+                       FALSE, FALSE);
 
   if (mod_type == MT_MAIN)
-    stack_index = seg_def (stack_seg_name, stack_class_name, 0x8000, TRUE);
+    stack_index = seg_def (stack_seg_name, stack_class_name, 0x8000, TRUE, FALSE);
 
   if (!strip_symbols)
@@ -3040 +3040 @@
       convert_debug ();         /* After seg_def of text, data & bss */
       symbols_index = seg_def (symbols_seg_name, debsym_class_name,
-                               sst.size, FALSE);
+                               sst.size, FALSE, FALSE);
       types_index = seg_def (types_seg_name, debtyp_class_name,
-                             tt.size, FALSE);
+                             tt.size, FALSE, FALSE);
     }