Changeset 14609

Timestamp:

Jan 30, 2011, 12:39:44 AM (14 years ago)

Author:

Gary Byers

Message:

mach-o-image.c: earlier victory declaration was ... premature.
Call _exit() on failure.
Rename "READONLY" segment to TEXT; Shark ignores symbols in
other segments.
Remember to add managed_static area.

File:

• trunk/source/lisp-kernel/mach-o-image.c (modified) (7 diffs)

trunk/source/lisp-kernel/mach-o-image.c

@@ -83 +83 @@
     if (n < 0) {
       perror("reading from image");
-      exit(1);
+      _exit(1);
     }
     if (n == 0) {
       fprintf(stderr, "unexpected end of file reading image\n");
-      exit(1);
+      _exit(1);
     }
     total += n;
@@ -108 +108 @@
     if (n < 0) {
       perror("writing to image");
-      exit(1);
+      _exit(1);
     }
     total += n;
@@ -307 +307 @@
     f;
   int tag;
-  natural size_in_bytes;
+  natural size_in_bytes, code_words;
   macho_nlist symbol;
 
@@ -330 +330 @@
 #ifdef X8632
       f = ((LispObj)start)+fulltag_misc;
-      size_in_bytes = (header_element_count(header)<<node_shift)-tag_misc;
+      code_words = (unsigned short)deref(f,1);
+      if (code_words & 0x8000) {
+        code_words = header_element_count(header) - (code_words & 0x7fff);
+      }
+      size_in_bytes = (code_words<<node_shift)-tag_misc;
 #endif
 #ifdef X8664
       f = ((LispObj)start)+fulltag_function;
-      size_in_bytes = (header_element_count(header)<<node_shift)-tag_function;
+      code_words = (int)deref(f,1);
+      size_in_bytes = (code_words<<node_shift)-tag_function;
 #endif
 
@@ -484 +489 @@
 
   seg = add_macho_segment(p, 
-                          "READONLY",
+                          "__TEXT",
                           (natural)(readonly_area->low-4096),
                           4096+align_to_power_of_2(readonly_area->active-readonly_area->low,12),
@@ -492 +497 @@
                           VM_PROT_READ|VM_PROT_EXECUTE,
                           1, 
-                          "purespace");
+                          "text");
   init_macho_section(seg,
                      0,
@@ -827 +832 @@
     managed_static_area = new_area(ms_start,ms_end,AREA_MANAGED_STATIC);
     managed_static_area->active = ms_end;
+    add_area_holding_area_lock(managed_static_area);
     lisp_global(REF_BASE) = (LispObj) ms_start;