From 0b95c95e865de5344367b0de348df84969d2a46f Mon Sep 17 00:00:00 2001 From: rtoy <rtoy> Date: Wed, 20 Oct 2004 11:30:47 +0000 Subject: [PATCH] Move the static space location for ppc/darwin. For some reason, OS X 10.3 was putting some malloc'ed areas in the old (bigger) static space, which causes cmucl not to run. Moving the space to 0x10000000 makes it no longer overlap. I don't understand the reason for this. OS X 10.2 doesn't have this problem. Use boot-2004-10-1-ppc.lisp to cross-compile this change. --- compiler/ppc/parms.lisp | 4 ++-- lisp/Config.ppc_darwin | 2 +- lisp/ppc-validate.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/ppc/parms.lisp b/compiler/ppc/parms.lisp index c5ef85a2f..020e086e7 100644 --- a/compiler/ppc/parms.lisp +++ b/compiler/ppc/parms.lisp @@ -7,7 +7,7 @@ ;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ppc/parms.lisp,v 1.7 2004/07/25 18:15:52 pmai Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ppc/parms.lisp,v 1.8 2004/10/20 11:30:43 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -146,7 +146,7 @@ ;;; Where to put the different spaces. ;;; (defparameter target-read-only-space-start #x01000000) -(defparameter target-static-space-start #x08000000) +(defparameter target-static-space-start #x10000000) (defparameter target-dynamic-space-start #x40000000) (defparameter target-foreign-linkage-space-start #x0fc00000) (defconstant target-foreign-linkage-entry-size 8) ;In bytes. Duh. diff --git a/lisp/Config.ppc_darwin b/lisp/Config.ppc_darwin index f5a70dd4b..a0ebfb6b8 100644 --- a/lisp/Config.ppc_darwin +++ b/lisp/Config.ppc_darwin @@ -20,7 +20,7 @@ OS_SRC = ppc-darwin-dlshim.c os-common.c Darwin-os.c # The seg1addr should be somewhere above our spaces. This is where # the C runtime code goes, I think. -OS_LINK_FLAGS = -g -dynamic -Wl,-sectcreate,CMUCLRO,core,/dev/null -Wl,-segaddr,CMUCLRO,0x01000000 -Wl,-seg1addr,0x10000000 +OS_LINK_FLAGS = -g -dynamic -Wl,-sectcreate,CMUCLRO,core,/dev/null -Wl,-segaddr,CMUCLRO,0x01000000 -Wl,-seg1addr,0x1a000000 OS_LIBS = -lSystem -lc -lm GC_SRC = gc.c all: adjustlisp diff --git a/lisp/ppc-validate.h b/lisp/ppc-validate.h index 7ef4ed174..2e26c1cf8 100644 --- a/lisp/ppc-validate.h +++ b/lisp/ppc-validate.h @@ -1,6 +1,6 @@ /* - $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/ppc-validate.h,v 1.2 2004/10/16 23:45:50 rtoy Exp $ + $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/ppc-validate.h,v 1.3 2004/10/20 11:30:47 rtoy Exp $ This code was written as part of the CMU Common Lisp project at Carnegie Mellon University, and has been placed in the public domain. @@ -16,7 +16,7 @@ #define READ_ONLY_SPACE_START (0x01000000) #define READ_ONLY_SPACE_SIZE (0x07ff8000) /* 128 MB, almost */ -#define STATIC_SPACE_START (0x08000000) +#define STATIC_SPACE_START (0x10000000) #define STATIC_SPACE_SIZE (0x07ff8000) /* 128 MB, almost */ #define CONTROL_STACK_START (0x30000000) -- GitLab