replace uninitialized initflag with initialized raw_image

7 files changed, 17 insertions, 20 deletions

diff --git a/gcl/o/alloc.c b/gcl/o/alloc.c
index 88d65a41..9a9d6045 100644
--- a/gcl/o/alloc.c
+++ b/gcl/o/alloc.c
@@ -1550,10 +1550,7 @@ malloc(size_t size) {
     return baby_malloc(size);
 #else	
 
-#ifdef __CYGWIN__
-    recreate_heap1();
-#endif
-    if (!initflag)
+    if (raw_image)
       gcl_init_alloc();
 #ifdef RECREATE_HEAP
     else RECREATE_HEAP
@@ -1576,7 +1573,7 @@ malloc(size_t size) {
      startup.  In saved images, monstartup memory is only
      allocated with gprof-start. 20040804 CM*/
 #ifdef GCL_GPROF
-  if (!initflag && size>(textend-textstart) && !initial_monstartup_pointer) 
+  if (raw_image && size>(textend-textstart) && !initial_monstartup_pointer) 
     initial_monstartup_pointer=malloc_list->c.c_car->st.st_self;
   if (gprof_array==Cnil && capture_gprof_array && size>(textend-textstart)) {
     gprof_array=malloc_list->c.c_car;
diff --git a/gcl/o/assignment.c b/gcl/o/assignment.c
index 5660c9bf..b737978a 100755
--- a/gcl/o/assignment.c
+++ b/gcl/o/assignment.c
@@ -171,7 +171,7 @@ DEFUN("FSET",object,fSfset,SI,2,2,NONE,OO,OO,OO,OO,(object sym,object function),
 	      1, sym);
   }
   if (sym->s.s_hpack == lisp_package &&
-      sym->s.s_gfdef != OBJNULL && initflag && sLwarn->s.s_gfdef)
+      sym->s.s_gfdef != OBJNULL && !raw_image && sLwarn->s.s_gfdef)
     ifuncall2(sLwarn,make_simple_string("~S is being redefined."),
 	      sym);
   sym = clear_compiler_properties(sym,function);
@@ -255,7 +255,7 @@ DEFUN("FMAKUNBOUND",object,fLfmakunbound,LISP,1,1,NONE,OO,OO,OO,OO,(object sym),
   remf(&(rsym->s.s_plist),sStraced);
   clear_compiler_properties(rsym,Cnil);
   if (rsym->s.s_hpack == lisp_package &&
-      rsym->s.s_gfdef != OBJNULL && initflag) {
+      rsym->s.s_gfdef != OBJNULL && !raw_image) {
     ifuncall2(sLwarn, make_simple_string("~S is being redefined."), rsym);
   }
 
diff --git a/gcl/o/error.c b/gcl/o/error.c
index 2d04a389..82f0cfc3 100755
--- a/gcl/o/error.c
+++ b/gcl/o/error.c
@@ -37,7 +37,7 @@ object sSterminal_interrupt;
 void
 assert_error(const char *a,unsigned l,const char *f,const char *n) {
 
-  if (initflag)
+  if (!raw_image)
     FEerror("The assertion ~a on line ~a of ~a in function ~a failed",4,
 	    make_simple_string(a),make_fixnum(l),
 	    make_simple_string(f),make_simple_string(n));
diff --git a/gcl/o/macros.c b/gcl/o/macros.c
index 03dab30f..cb4f0cab 100755
--- a/gcl/o/macros.c
+++ b/gcl/o/macros.c
@@ -45,7 +45,7 @@ FFN(siLdefine_macro)(void)
 	}
 	clear_compiler_properties(vs_base[0],MMcaddr(vs_base[1]));
 	if (vs_base[0]->s.s_hpack == lisp_package &&
-	    vs_base[0]->s.s_gfdef != OBJNULL && initflag) {
+	    vs_base[0]->s.s_gfdef != OBJNULL && !raw_image) {
 		vs_push(make_simple_string(
 			"~S is being redefined."));
 		ifuncall2(sLwarn, vs_head, vs_base[0]);
@@ -115,7 +115,7 @@ FFN(Fdefmacro)(object form)
 	
 	clear_compiler_properties(name,top[0]);
 	if (name->s.s_hpack == lisp_package &&
-	    name->s.s_gfdef != OBJNULL && initflag) {
+	    name->s.s_gfdef != OBJNULL && !raw_image) {
 		vs_push(make_simple_string(
 			"~S is being redefined."));
 		ifuncall2(sLwarn, vs_head, name);
diff --git a/gcl/o/main.c b/gcl/o/main.c
index dce267f1..cb90cf54 100755
--- a/gcl/o/main.c
+++ b/gcl/o/main.c
@@ -74,8 +74,8 @@ char stdin_buf[BUFSIZ + EXTRA_BUFSIZE];
 char stdout_buf[BUFSIZ + EXTRA_BUFSIZE];
 
 int debug;			/* debug switch */
-int initflag = FALSE;		/* initialized flag */
-int raw_image = FALSE;		/* raw or saved image */
+/* int initflag = FALSE;		/\* initialized flag *\/ */
+int raw_image = TRUE;		/* raw or saved image */
 
 long real_maxpage;
 object sSAlisp_maxpagesA;
@@ -373,7 +373,7 @@ main(int argc, char **argv, char **envp) {
 #ifdef UNIX
     ENVP = envp;
 
-    if ( !initflag ) {
+    if (raw_image) {
         /* An uninitialised system eg raw_gcl */
 
       bzero(system_directory,sizeof(system_directory));
@@ -402,7 +402,7 @@ main(int argc, char **argv, char **envp) {
       }
     }
 #else  /* UNIX */
-    if (!initflag && argc > 1) {
+    if (raw_image && argc > 1) {
         error("can't get the system directory");
         strncpy(system_directory, argv[1] ,sizeof(system_directory));
     }
@@ -512,7 +512,7 @@ main(int argc, char **argv, char **envp) {
 	  error("Cannot setup gprof_cleanup on exit");
 #endif
 
-	if (initflag) {
+	if (!raw_image) {
 
 #ifdef _WIN32
 	  detect_wine();
@@ -535,7 +535,7 @@ main(int argc, char **argv, char **envp) {
 	    alloc_page(-(holepage + nrbpage));
 	  }
 	  
-	  initflag = FALSE;
+	  /* initflag = FALSE; */
 	  GBC_enable = TRUE;
 	  vs_base = vs_top;
 	  ihs_push(Cnil);
@@ -548,7 +548,7 @@ main(int argc, char **argv, char **envp) {
 	  install_default_signals();
 	  
 	  sSAlisp_maxpagesA->s.s_dbind = make_fixnum(real_maxpage);
-	  initflag = TRUE;
+	  /* initflag = TRUE; */
 #ifdef KCLOVM
 	  ovm_user_context_change = change_contexts;
 	  ovm_user_context_initialize = initialize_process;
@@ -607,7 +607,7 @@ main(int argc, char **argv, char **envp) {
 
 	lex_new();
 	vs_base = vs_top;
-	initflag = TRUE;
+	/* initflag = TRUE; */
 
 	interrupt_enable = TRUE;
 
diff --git a/gcl/o/symbol.d b/gcl/o/symbol.d
index fb469a9b..89e01408 100755
--- a/gcl/o/symbol.d
+++ b/gcl/o/symbol.d
@@ -58,7 +58,7 @@ object st;
 	x->s.s_stype = (short)stp_ordinary;
 	x->s.s_mflag = FALSE;
 	vs_push(x);
-	if (initflag==0 && st->st.st_self < heap_end)
+	if (raw_image && st->st.st_self < heap_end)
 		x->s.s_self = st->st.st_self;		
 	else {
 		x->s.s_self = alloc_relblock(x->s.s_fillp);
diff --git a/gcl/o/toplevel.c b/gcl/o/toplevel.c
index 3546a337..06073618 100755
--- a/gcl/o/toplevel.c
+++ b/gcl/o/toplevel.c
@@ -62,7 +62,7 @@ FFN(Fdefun)(object args)
 	    FEerror("~S, a special form, cannot be redefined.", 1, name);
 	}
 	if (name->s.s_hpack == lisp_package &&
-	    name->s.s_gfdef != OBJNULL && initflag && sLwarn->s.s_gfdef) {
+	    name->s.s_gfdef != OBJNULL && !raw_image && sLwarn->s.s_gfdef) {
 	  vs_push(make_simple_string("~S is being redefined."));
 	  ifuncall2(sLwarn, vs_head, name);
 	  vs_popp;