From: Chris Hanson <org/chris-hanson/cph>
Date: Sat, 14 Apr 2007 03:45:38 +0000 (+0000)
Subject: Add error check for case where FASL file and microcode have different
X-Git-Tag: 20090517-FFI~666
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=f437678a1a1477dda28b77025d856358faa78695;p=mit-scheme.git

Add error check for case where FASL file and microcode have different
settings for HEAP_IN_LOW_MEMORY.
---

diff --git a/v7/src/microcode/load.c b/v7/src/microcode/load.c
index 1a5399515..764acc5f0 100644
--- a/v7/src/microcode/load.c
+++ b/v7/src/microcode/load.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: load.c,v 9.45 2007/01/05 21:19:25 cph Exp $
+$Id: load.c,v 9.46 2007/04/14 03:45:38 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -187,6 +187,8 @@ DEFUN (initialize_variables_from_fasl_header, (buffer),
     C_Code_Table_Size = (OBJECT_DATUM (buffer[FASL_Offset_C_Size]));
   }
   dumped_memory_base = ((long) buffer[FASL_Offset_Mem_Base]);
+  if ((dumped_memory_base == 0) ? (memory_base != 0) : (memory_base == 0))
+    return (FASL_FILE_BAD_MACHINE);
 
 #ifndef INHIBIT_FASL_VERSION_CHECK
   /* The error messages here should be handled by the runtime system! */