Changeset 1998 for trunk/src

Timestamp:

Jun 5, 2005, 6:17:00 PM (21 years ago)

Author:

bird

Message:

Avoid alloc() since we might easily run out of stack for string tables and such like.

File:

• trunk/src/emx/src/ld/ld.c (modified) (20 diffs, 1 prop)

trunk/src/emx/src/ld/ld.c

@@ -63 +63 @@
 
 /* If compiled with GNU C, use the built-in alloca */
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# include "alloca.h"
-#endif
-
+#include "alloca.h"
 #include "getopt.h"
 
@@ -1957 +1952 @@
     {
       read_entry_symbols (desc, entry);
-      entry->strings = (char *) alloca (entry->strs_size);
+      entry->strings = (char *)  (entry->strs_size);
       read_entry_strings (desc, entry);
       enter_file_symbols (entry);
-      entry->strings = 0;
+      free (entry->strings);
+      entry->strings = NULL;
     }
 
@@ -2533 +2529 @@
 {
   read_entry_symbols (desc, subentry);
-  subentry->strings = (char *) alloca (subentry->strs_size);
+  subentry->strings = (char *)  (subentry->strs_size);
   read_entry_strings (desc, subentry);
 
@@ -2550 +2546 @@
         entry->subfiles = subentry;
       *prev_addr = subentry;
-      subentry->strings = 0; /* Since space will dissapear on return */
-    }
+    }
+  free (subentry->strings);
+  subentry->strings = NULL;
 }
 
@@ -3062 +3059 @@
     *end = entry->symbols + entry->syms_size / sizeof (struct nlist);
 
-  entry->strings = (char *) alloca (entry->strs_size);
+  entry->strings = (char *)  (entry->strs_size);
   read_entry_strings (file_open (entry), entry);
 
@@ -3080 +3077 @@
                ((symbol *)p->n_un.n_name)->name, p->n_value);
 
-  entry->strings = 0;           /* All done with them.  */
+  free (entry->strings);
+  entry->strings = NULL;                /* All done with them.  */
 }
 
@@ -3451 +3449 @@
   int number_of_syms = entry->syms_size / sizeof (struct nlist);
   unsigned char *nlist_bitvector
-    = (unsigned char *) alloca ((number_of_syms >> 3) + 1);
+    = (unsigned char *)