- cmucl-cvs - mailman3.common-lisp.net

[cmucl-cvs] [git] CMU Common Lisp branch dynamic-stack-alloc updated. 6cb062ff4035b266b9c430ffc4112385e35dce3c
by Alex Goncharov 08 Oct '11

08 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, dynamic-stack-alloc has been updated via 6cb062ff4035b266b9c430ffc4112385e35dce3c (commit) from df7a92e034bde0593b71878da6ec25b83e67f696 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6cb062ff4035b266b9c430ffc4112385e35dce3c Author: Alex Goncharov <alex-goncharov(a)comcast.net> Date: Sat Oct 8 07:32:40 2011 -0400 Fixing setenv.lisp location diff --git a/tools/create-target.sh b/tools/create-target.sh index a546349..7ec3a84 100755 --- a/tools/create-target.sh +++ b/tools/create-target.sh @@ -107,4 +107,4 @@ echo '#error You need to run genesis (via build-world.sh) before compiling the s solaris) cat $setenv_dir/solaris-features.lisp;; *) sed "s;@@LISP@@;$lisp_variant;" $setenv_dir/unknown.lisp;; esac -) > setenv.lisp || quit "Failed create setenv.lisp" +) > ../setenv.lisp || quit "Failed create setenv.lisp" ----------------------------------------------------------------------- Summary of changes: tools/create-target.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch dynamic-stack-alloc updated. df7a92e034bde0593b71878da6ec25b83e67f696
by Alex Goncharov 08 Oct '11

08 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, dynamic-stack-alloc has been updated via df7a92e034bde0593b71878da6ec25b83e67f696 (commit) from a252d16802013852583ed6741cde6d8268d6ae06 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit df7a92e034bde0593b71878da6ec25b83e67f696 Author: Alex Goncharov <alex-goncharov(a)comcast.net> Date: Sat Oct 8 07:19:39 2011 -0400 Trivial improvements to 'tools/create-target.sh' (to be merged to 'master'). diff --git a/tools/create-target.sh b/tools/create-target.sh index 48481dd..a546349 100755 --- a/tools/create-target.sh +++ b/tools/create-target.sh @@ -1,24 +1,27 @@ #!/bin/sh -quit() { echo "$@" >&2; exit 1; } +diag() { echo "($prgm_name) $@" >&2; } +quit() { diag "not OK: $@"; exit 1; } usage() { - echo "Usage: `basename $0` TARGET-DIR [LISP-VARIANT [MOTIF-VARIANT]]" + echo "Usage: $prgm_name TARGET-DIR [LISP-VARIANT [MOTIF-VARIANT]]" echo "" echo "Creates a directory structure in TARGET-DIR for use in building CMUCL." echo "A simple logic is used to find the optional -VARIANT parameters." echo "" # List possible values for lisp-variant and motif-variant - echo "Possible LISP-VARIANTs (don't trust what you see):" + echo "Possible LISP-VARIANTs:" ( cd src/lisp/ && ls -1 Config.* ) | sed 's;^Config[.];;g' | pr -3at -o 8 || quit "Can't list lisp-variants" - echo "Possible MOTIF-VARIANTs (don't trust what you see):" + echo "Possible MOTIF-VARIANTs:" ( cd src/motif/server/ && ls -1 Config.* ) | sed 's;^Config[.];;g' | pr -3at -o 8 || quit "Can't list lisp-variants" exit 2 } -bld_dir=$1 lisp_variant=$2 motif_variant=$3 +##-- +prgm_name=`basename $0` bld_dir=$1 lisp_variant=$2 motif_variant=$3 exec 2>&1 -case $bld_dir in build-*) :;; *) usage;; esac +[ -n "$bld_dir" ] || usage + uname_s=`uname -s` uname_m=`uname -m 2>/dev/null` [ -n "$lisp_variant" ] || { @@ -74,10 +77,10 @@ case $uname_s in esac # Tell user what's we've configured -echo "bld_dir=$bld_dir lisp_variant=$lisp_variant ${motif_variant:+motif_variant=$motif_variant}" +diag "Settings: bld_dir=$bld_dir lisp_variant=$lisp_variant ${motif_variant:+motif_variant=$motif_variant}" # Create a directory tree that mirrors the source directory tree -[ -e "$bld_dir" ] && quit "delete this: `ls -ld $bld_dir`" +[ -e "$bld_dir" ] && quit "Exists: `ls -ld $bld_dir`" mkdir -p "$bld_dir" (cd src && find . -name .git -prune -o -type d -print) | (cd $bld_dir && xargs mkdir -p) || quit "Can't create target directories" ----------------------------------------------------------------------- Summary of changes: tools/create-target.sh | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch dynamic-stack-alloc updated. a252d16802013852583ed6741cde6d8268d6ae06
by Alex Goncharov 08 Oct '11

08 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, dynamic-stack-alloc has been updated via a252d16802013852583ed6741cde6d8268d6ae06 (commit) from 905107407b190f0bf1de0f5c90c3a588bd907dcf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a252d16802013852583ed6741cde6d8268d6ae06 Author: Alex Goncharov <alex-goncharov(a)comcast.net> Date: Fri Oct 7 21:55:27 2011 -0400 1. Add .gitignore. 2. Rewrite tools/create-target.sh (merge from master) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d3e83a9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +contrib/asdf/asdf.*f diff --git a/tools/create-target.sh b/tools/create-target.sh index 3a3d9d3..48481dd 100755 --- a/tools/create-target.sh +++ b/tools/create-target.sh @@ -1,146 +1,107 @@ #!/bin/sh -LISP_VARIANT= -MOTIF_VARIANT= -TARGET_DIR= - +quit() { echo "$@" >&2; exit 1; } usage() { - echo "Usage: `basename $0` target-dir [lisp-variant [motif-variant]]" + echo "Usage: `basename $0` TARGET-DIR [LISP-VARIANT [MOTIF-VARIANT]]" echo "" - echo "Creates a directory structure in TARGET-DIR for use in compiling" - echo "CMUCL. If the lisp-variant is not given, uname is used to select" - echo "a version, if possible. If motif-variant is not given, one is" - echo "determined from the lisp-variant." + echo "Creates a directory structure in TARGET-DIR for use in building CMUCL." + echo "A simple logic is used to find the optional -VARIANT parameters." echo "" # List possible values for lisp-variant and motif-variant - echo "Possible lisp-variants:" - ( cd src/lisp/ ; ls -1 Config.* ) | sed 's;^Config[.];;g' | \ - pr -3at -o 8 - echo "Possible Motif-variants:" - ( cd src/motif/server/ && ls -1 Config.* ) | sed 's;^Config[.];;g' | pr -3at -o 8 - exit 1 + echo "Possible LISP-VARIANTs (don't trust what you see):" + ( cd src/lisp/ && ls -1 Config.* ) | sed 's;^Config[.];;g' | pr -3at -o 8 || quit "Can't list lisp-variants" + echo "Possible MOTIF-VARIANTs (don't trust what you see):" + ( cd src/motif/server/ && ls -1 Config.* ) | sed 's;^Config[.];;g' | pr -3at -o 8 || quit "Can't list lisp-variants" + exit 2 } -TARGET_DIR="$1" -case $TARGET_DIR in build-*) :;; *) usage; exit 2;; esac -[ -d $ "$TARGET_DIR" ] && echo "Error: Directory $1 exists already -- better remove it..." # && exit 2 - -if [ $# = 1 ]; then - # Only target directory given. Try to deduce the lisp-variant - case `uname -s` in - SunOS) - case `uname -m` in - i86pc) LISP_VARIANT=x86_solaris_sunc ;; - sun*) LISP_VARIANT=sparc_gcc ;; - esac - ;; - Linux) LISP_VARIANT=x86_linux ;; - Darwin) case `uname -m` in - ppc) LISP_VARIANT=ppc_darwin ;; - i386) LISP_VARIANT=x86_darwin ;; +bld_dir=$1 lisp_variant=$2 motif_variant=$3 +exec 2>&1 + +case $bld_dir in build-*) :;; *) usage;; esac +uname_s=`uname -s` +uname_m=`uname -m 2>/dev/null` +[ -n "$lisp_variant" ] || { + case $uname_s in + Linux) lisp_variant=x86_linux ;; + FreeBSD) lisp_variant=x86_freebsd ;; + SunOS) + case $uname_m in + i86pc) lisp_variant=x86_solaris_sunc ;; + sun*) lisp_variant=sparc_gcc ;; + esac + ;; + Darwin) + case $uname_m in + ppc) lisp_variant=ppc_darwin ;; + i386) lisp_variant=x86_darwin ;; esac ;; - FreeBSD|freebsd) LISP_VARIANT=x86_freebsd ;; - # Please fill in some other common systems - *) echo "Sorry, please specify the desired Lisp variant." - exit 1 ;; + *) quit "Unsupported OS: $uname_s";; esac -elif [ $# = 2 ]; then - # Target directory and lisp-variant given - LISP_VARIANT="$2" -elif [ $# = 3 ]; then - # Target directory, lisp-variant, and motif variant given - LISP_VARIANT="$2" - MOTIF_VARIANT="$3" -else - usage -fi - - -# Make sure the given variants exist -if [ ! -f src/lisp/Config.$LISP_VARIANT ]; then - echo "No such lisp-variant could be found: Config.$LISP_VARIANT" - exit 1 -fi +} +[ -n "$lisp_variant" ] || quit "Failed to determine lisp_variant" +[ -f src/lisp/Config.$lisp_variant ] || quit "Config.$lisp_variant not found" + +case $lisp_variant in + *linux*) lvshort=linux;; + *freebsd*) lvshort=freebsd;; + *solaris*) lvshort=solaris;; + *) lvshort=unknown;; +esac -# From the given variant, try to derive a motif variant -if [ "$MOTIF_VARIANT" = "" ]; then - case $LISP_VARIANT in - alpha_linux) MOTIF_VARIANT=alpha_linux ;; - alpha_osf1) MOTIF_VARIANT=alpha_osf1 ;; - x86_freebsd|FreeBSD*|freebsd*) MOTIF_VARIANT=FreeBSD ;; - NetBSD*) MOTIF_VARIANT=NetBSD ;; - OpenBSD*) MOTIF_VARIANT=OpenBSD ;; - *_darwin) MOTIF_VARIANT=Darwin ;; - sun4_solaris_gcc|sparc_gcc) MOTIF_VARIANT=solaris ;; - sun4_solaris_sunc|sparc_sunc|x86_solaris_sunc) MOTIF_VARIANT=solaris_sunc ;; - sun4c*) MOTIF_VARIANT=sun4c_411 ;; - hp700*) MOTIF_VARIANT=hpux_cc ;; - pmax_mach) MOTIF_VARIANT=pmax_mach ;; - sgi*) MOTIF_VARIANT=irix ;; - x86_linux|linux*) MOTIF_VARIANT=x86 ;; - esac -elif [ ! -f src/motif/server/Config.$MOTIF_VARIANT ]; then - echo "No such motif-variant could be found: Config.$MOTIF_VARIANT" - exit 1 -fi +# Beats me why we care about Motif today but let it be, other than on FreeBSD, +# where the config file is wrong anyway. (agoncharov, 2011-10-07) +case $uname_s in + FreeBSD) :;; # Free + *) # Enjoy + [ -n "$motif_variant" ] || { + case $lisp_variant in + NetBSD*) motif_variant=NetBSD ;; + OpenBSD*) motif_variant=OpenBSD ;; + *_darwin) motif_variant=Darwin ;; + sun4_solaris_gcc|sparc_gcc) motif_variant=solaris ;; + sun4_solaris_sunc|sparc_sunc|x86_solaris_sunc) motif_variant=solaris_sunc ;; + sun4c*) motif_variant=sun4c_411 ;; + hp700*) motif_variant=hpux_cc ;; + pmax_mach) motif_variant=pmax_mach ;; + sgi*) motif_variant=irix ;; + x86_linux|linux*) motif_variant=x86 ;; + esac + } + [ -f src/motif/server/Config.$motif_variant ] || quit "No such motif-variant could be found: Config.$motif_variant" + ;; +esac # Tell user what's we've configured -echo "Lisp = $LISP_VARIANT" -echo "Motif = $MOTIF_VARIANT" +echo "bld_dir=$bld_dir lisp_variant=$lisp_variant ${motif_variant:+motif_variant=$motif_variant}" # Create a directory tree that mirrors the source directory tree -TARGET="`echo $TARGET_DIR | sed 's:/*$::'`" -echo TARGET_DIR=$TARGET_DIR TARGET=$TARGET -find -L src -type d -print | sed "s:^src:$TARGET:g" | xargs -t mkdir -p +[ -e "$bld_dir" ] && quit "delete this: `ls -ld $bld_dir`" +mkdir -p "$bld_dir" +(cd src && find . -name .git -prune -o -type d -print) | (cd $bld_dir && xargs mkdir -p) || +quit "Can't create target directories" + +top_dir=$PWD +cd $bld_dir/lisp || quit "Can't cd $bld_dir/lisp" # Link Makefile and Config files -(cd $TARGET/lisp && { - ln -s ../../src/lisp/GNUmakefile ../../src/lisp/Config.$LISP_VARIANT ../../src/lisp/Config.*_common . - ln -s Config.$LISP_VARIANT Config - } || { echo "Can't cd $TARGET/lisp"; exit 1; } +ln -s ../../src/lisp/GNUmakefile ../../src/lisp/Config.$lisp_variant ../../src/lisp/Config.*_common . +ln -s Config.$lisp_variant Config +[ -n "$motif_variant" ] && ( + cd motif/server || quit "Can't cd motif/server" # We will still continue in the outer shell + ln -s ../../../src/motif/server/GNUmakefile ./Makefile + ln -s ../../../src/motif/server/Config.$motif_variant ./Config ) -# Create empty initial map file -echo 'Map file for lisp version 0' > $TARGET/lisp/lisp.nm - -# Create dummy internals.h so we get warned to recompile -echo '#error You need to run genesis (via build-world.sh) before compiling the startup code!' > $TARGET/lisp/internals.h - -SETENV=src/tools/setenv-scripts - -# Create sample setenv.lisp file -cat $SETENV/base-features.lisp > $TARGET/setenv.lisp - -# Put in some platform specific items -case $LISP_VARIANT in - *linux*) - gcname=":gencgc" - sed "s;@@gcname@@;$gcname;" $SETENV/linux-features.lisp >> $TARGET/setenv.lisp - ;; - *OpenBSD*) - case $LISP_VARIANT in - *_gencgc*) gcname=":gencgc" ;; - *) gcname=":cgc" ;; - esac - sed "s;@@gcname@@;$gcname;" $SETENV/openbsd-features.lisp >> $TARGET/setenv.lisp - ;; - *FreeBSD*|*freebsd*) - gcname=":gencgc" - sed "s;@@gcname@@;$gcname;" $SETENV/freebsd-features.lisp >> $TARGET/setenv.lisp - ;; - *solaris*) - cat $SETENV/solaris-features.lisp >> $TARGET/setenv.lisp - ;; - *) - sed "s;@@LISP@@;$LISP_VARIANT;" $SETENV/unknown.lisp >> $TARGET/setenv.lisp - ;; -esac - - -# Do Motif setup -if [ "$MOTIF_VARIANT" != "" ] -then - ( cd $TARGET/motif/server ; ln -s ../../../src/motif/server/GNUmakefile ./Makefile ) - ( cd $TARGET/motif/server ; ln -s ../../../src/motif/server/Config.$MOTIF_VARIANT ./Config ) -fi +echo 'Map file for lisp version 0' > lisp.nm # Empty initial map file +echo '#error You need to run genesis (via build-world.sh) before compiling the startup code!' > internals.h +( + setenv_dir=$top_dir/src/tools/setenv-scripts + cat $setenv_dir/base-features.lisp + case $lvshort in + linux|freebsd) gcname=":gencgc"; sed "s;@@gcname@@;$gcname;" $setenv_dir/$lvshort-features.lisp >> setenv.lisp;; + solaris) cat $setenv_dir/solaris-features.lisp;; + *) sed "s;@@LISP@@;$lisp_variant;" $setenv_dir/unknown.lisp;; + esac +) > setenv.lisp || quit "Failed create setenv.lisp" ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 + tools/create-target.sh | 213 ++++++++++++++++++++---------------------------- 2 files changed, 88 insertions(+), 126 deletions(-) create mode 100644 .gitignore hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. 4be42bd6d9718524eab70a3cdc9ba8f457d83b86
by Alex Goncharov 08 Oct '11

08 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via 4be42bd6d9718524eab70a3cdc9ba8f457d83b86 (commit) via 7c53c93c934cafc335ef98e48be2d1cd7e141579 (commit) from b4d64266f7e16b51677285a3e6f93b5351fb13c3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4be42bd6d9718524eab70a3cdc9ba8f457d83b86 Merge: 7c53c93 b4d6426 Author: Alex Goncharov <alex-goncharov(a)comcast.net> Date: Fri Oct 7 21:49:36 2011 -0400 Merge branch 'master' of ssh://common-lisp.net/var/git/projects/cmucl/cmucl commit 7c53c93c934cafc335ef98e48be2d1cd7e141579 Author: Alex Goncharov <alex-goncharov(a)comcast.net> Date: Fri Oct 7 21:49:10 2011 -0400 1. Add .gitignore. 2. Rewrite tools/create-target.sh diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d3e83a9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +contrib/asdf/asdf.*f diff --git a/tools/create-target.sh b/tools/create-target.sh index d537171..48481dd 100755 --- a/tools/create-target.sh +++ b/tools/create-target.sh @@ -1,148 +1,107 @@ #!/bin/sh -LISP_VARIANT= -MOTIF_VARIANT= -TARGET_DIR= - +quit() { echo "$@" >&2; exit 1; } usage() { - echo "Usage: `basename $0` target-dir [lisp-variant [motif-variant]]" + echo "Usage: `basename $0` TARGET-DIR [LISP-VARIANT [MOTIF-VARIANT]]" echo "" - echo "Creates a directory structure in TARGET-DIR for use in compiling" - echo "CMUCL. If the lisp-variant is not given, uname is used to select" - echo "a version, if possible. If motif-variant is not given, one is" - echo "determined from the lisp-variant." + echo "Creates a directory structure in TARGET-DIR for use in building CMUCL." + echo "A simple logic is used to find the optional -VARIANT parameters." echo "" # List possible values for lisp-variant and motif-variant - echo "Possible lisp-variants:" - ( cd src/lisp/ ; ls -1 Config.* ) | sed 's;^Config[.];;g' | \ - pr -3at -o 8 - echo "Possible Motif-variants:" - ( cd src/motif/server/ ; ls -1 Config.* ) | sed 's;^Config[.];;g' | \ - pr -3at -o 8 - exit 1 + echo "Possible LISP-VARIANTs (don't trust what you see):" + ( cd src/lisp/ && ls -1 Config.* ) | sed 's;^Config[.];;g' | pr -3at -o 8 || quit "Can't list lisp-variants" + echo "Possible MOTIF-VARIANTs (don't trust what you see):" + ( cd src/motif/server/ && ls -1 Config.* ) | sed 's;^Config[.];;g' | pr -3at -o 8 || quit "Can't list lisp-variants" + exit 2 } -if [ $# = 1 ]; then - # Only target directory given. Try to deduce the lisp-variant - TARGET_DIR="$1" - case `uname -s` in - SunOS) - case `uname -m` in - i86pc) LISP_VARIANT=x86_solaris_sunc ;; - sun*) LISP_VARIANT=sparc_gcc ;; - esac - ;; - Linux) LISP_VARIANT=x86_linux ;; - Darwin) case `uname -m` in - ppc) LISP_VARIANT=ppc_darwin ;; - i386) LISP_VARIANT=x86_darwin ;; +bld_dir=$1 lisp_variant=$2 motif_variant=$3 +exec 2>&1 + +case $bld_dir in build-*) :;; *) usage;; esac +uname_s=`uname -s` +uname_m=`uname -m 2>/dev/null` +[ -n "$lisp_variant" ] || { + case $uname_s in + Linux) lisp_variant=x86_linux ;; + FreeBSD) lisp_variant=x86_freebsd ;; + SunOS) + case $uname_m in + i86pc) lisp_variant=x86_solaris_sunc ;; + sun*) lisp_variant=sparc_gcc ;; + esac + ;; + Darwin) + case $uname_m in + ppc) lisp_variant=ppc_darwin ;; + i386) lisp_variant=x86_darwin ;; esac ;; - FreeBSD|freebsd) LISP_VARIANT=x86_freebsd ;; - # Please fill in some other common systems - *) echo "Sorry, please specify the desired Lisp variant." - exit 1 ;; + *) quit "Unsupported OS: $uname_s";; esac -elif [ $# = 2 ]; then - # Target directory and lisp-variant given - TARGET_DIR="$1" - LISP_VARIANT="$2" -elif [ $# = 3 ]; then - # Target directory, lisp-variant, and motif variant given - TARGET_DIR="$1" - LISP_VARIANT="$2" - MOTIF_VARIANT="$3" -else - usage -fi - -[ -d $1 ] && echo "Error: Directory $1 exists already!" && exit 2 - -TARGET="`echo $TARGET_DIR | sed 's:/*$::'`" - -# Make sure the given variants exist -if [ ! -f src/lisp/Config.$LISP_VARIANT ]; then - echo "No such lisp-variant could be found: Config.$LISP_VARIANT" - exit 1 -fi +} +[ -n "$lisp_variant" ] || quit "Failed to determine lisp_variant" +[ -f src/lisp/Config.$lisp_variant ] || quit "Config.$lisp_variant not found" + +case $lisp_variant in + *linux*) lvshort=linux;; + *freebsd*) lvshort=freebsd;; + *solaris*) lvshort=solaris;; + *) lvshort=unknown;; +esac -# From the given variant, try to derive a motif variant -if [ "$MOTIF_VARIANT" = "" ]; then - case $LISP_VARIANT in - alpha_linux) MOTIF_VARIANT=alpha_linux ;; - alpha_osf1) MOTIF_VARIANT=alpha_osf1 ;; - x86_freebsd|FreeBSD*|freebsd*) MOTIF_VARIANT=FreeBSD ;; - NetBSD*) MOTIF_VARIANT=NetBSD ;; - OpenBSD*) MOTIF_VARIANT=OpenBSD ;; - *_darwin) MOTIF_VARIANT=Darwin ;; - sun4_solaris_gcc|sparc_gcc) MOTIF_VARIANT=solaris ;; - sun4_solaris_sunc|sparc_sunc|x86_solaris_sunc) MOTIF_VARIANT=solaris_sunc ;; - sun4c*) MOTIF_VARIANT=sun4c_411 ;; - hp700*) MOTIF_VARIANT=hpux_cc ;; - pmax_mach) MOTIF_VARIANT=pmax_mach ;; - sgi*) MOTIF_VARIANT=irix ;; - x86_linux|linux*) MOTIF_VARIANT=x86 ;; - esac -elif [ ! -f src/motif/server/Config.$MOTIF_VARIANT ]; then - echo "No such motif-variant could be found: Config.$MOTIF_VARIANT" - exit 1 -fi +# Beats me why we care about Motif today but let it be, other than on FreeBSD, +# where the config file is wrong anyway. (agoncharov, 2011-10-07) +case $uname_s in + FreeBSD) :;; # Free + *) # Enjoy + [ -n "$motif_variant" ] || { + case $lisp_variant in + NetBSD*) motif_variant=NetBSD ;; + OpenBSD*) motif_variant=OpenBSD ;; + *_darwin) motif_variant=Darwin ;; + sun4_solaris_gcc|sparc_gcc) motif_variant=solaris ;; + sun4_solaris_sunc|sparc_sunc|x86_solaris_sunc) motif_variant=solaris_sunc ;; + sun4c*) motif_variant=sun4c_411 ;; + hp700*) motif_variant=hpux_cc ;; + pmax_mach) motif_variant=pmax_mach ;; + sgi*) motif_variant=irix ;; + x86_linux|linux*) motif_variant=x86 ;; + esac + } + [ -f src/motif/server/Config.$motif_variant ] || quit "No such motif-variant could be found: Config.$motif_variant" + ;; +esac # Tell user what's we've configured -echo "Lisp = $LISP_VARIANT" -echo "Motif = $MOTIF_VARIANT" +echo "bld_dir=$bld_dir lisp_variant=$lisp_variant ${motif_variant:+motif_variant=$motif_variant}" # Create a directory tree that mirrors the source directory tree -find src -name 'CVS' -prune -o -type d -print \ - | sed "s:^src:$TARGET:g" | xargs mkdir +[ -e "$bld_dir" ] && quit "delete this: `ls -ld $bld_dir`" +mkdir -p "$bld_dir" +(cd src && find . -name .git -prune -o -type d -print) | (cd $bld_dir && xargs mkdir -p) || +quit "Can't create target directories" + +top_dir=$PWD +cd $bld_dir/lisp || quit "Can't cd $bld_dir/lisp" # Link Makefile and Config files - -(cd $TARGET/lisp - ln -s ../../src/lisp/GNUmakefile ../../src/lisp/Config.$LISP_VARIANT ../../src/lisp/Config.*_common . - ln -s Config.$LISP_VARIANT Config +ln -s ../../src/lisp/GNUmakefile ../../src/lisp/Config.$lisp_variant ../../src/lisp/Config.*_common . +ln -s Config.$lisp_variant Config +[ -n "$motif_variant" ] && ( + cd motif/server || quit "Can't cd motif/server" # We will still continue in the outer shell + ln -s ../../../src/motif/server/GNUmakefile ./Makefile + ln -s ../../../src/motif/server/Config.$motif_variant ./Config ) -# Create empty initial map file -echo 'Map file for lisp version 0' > $TARGET/lisp/lisp.nm - -# Create dummy internals.h so we get warned to recompile -echo '#error You need to run genesis (via build-world.sh) before compiling the startup code!' > $TARGET/lisp/internals.h - -SETENV=src/tools/setenv-scripts - -# Create sample setenv.lisp file -cat $SETENV/base-features.lisp > $TARGET/setenv.lisp - -# Put in some platform specific items -case $LISP_VARIANT in - *linux*) - gcname=":gencgc" - sed "s;@@gcname@@;$gcname;" $SETENV/linux-features.lisp >> $TARGET/setenv.lisp - ;; - *OpenBSD*) - case $LISP_VARIANT in - *_gencgc*) gcname=":gencgc" ;; - *) gcname=":cgc" ;; - esac - sed "s;@@gcname@@;$gcname;" $SETENV/openbsd-features.lisp >> $TARGET/setenv.lisp - ;; - *FreeBSD*|*freebsd*) - gcname=":gencgc" - sed "s;@@gcname@@;$gcname;" $SETENV/freebsd-features.lisp >> $TARGET/setenv.lisp - ;; - *solaris*) - cat $SETENV/solaris-features.lisp >> $TARGET/setenv.lisp - ;; - *) - sed "s;@@LISP@@;$LISP_VARIANT;" $SETENV/unknown.lisp >> $TARGET/setenv.lisp - ;; -esac - - -# Do Motif setup -if [ "$MOTIF_VARIANT" != "" ] -then - ( cd $TARGET/motif/server ; ln -s ../../../src/motif/server/GNUmakefile ./Makefile ) - ( cd $TARGET/motif/server ; ln -s ../../../src/motif/server/Config.$MOTIF_VARIANT ./Config ) -fi +echo 'Map file for lisp version 0' > lisp.nm # Empty initial map file +echo '#error You need to run genesis (via build-world.sh) before compiling the startup code!' > internals.h +( + setenv_dir=$top_dir/src/tools/setenv-scripts + cat $setenv_dir/base-features.lisp + case $lvshort in + linux|freebsd) gcname=":gencgc"; sed "s;@@gcname@@;$gcname;" $setenv_dir/$lvshort-features.lisp >> setenv.lisp;; + solaris) cat $setenv_dir/solaris-features.lisp;; + *) sed "s;@@LISP@@;$lisp_variant;" $setenv_dir/unknown.lisp;; + esac +) > setenv.lisp || quit "Failed create setenv.lisp" ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 + tools/create-target.sh | 215 +++++++++++++++++++---------------------------- 2 files changed, 88 insertions(+), 128 deletions(-) create mode 100644 .gitignore hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch dynamic-stack-alloc updated. 905107407b190f0bf1de0f5c90c3a588bd907dcf
by Alex Goncharov 06 Oct '11

06 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, dynamic-stack-alloc has been updated via 905107407b190f0bf1de0f5c90c3a588bd907dcf (commit) from 808706413ed9702874c33a45c9e95a53a4bd7683 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 905107407b190f0bf1de0f5c90c3a588bd907dcf Author: Alex Goncharov <alex-goncharov(a)comcast.net> Date: Wed Oct 5 23:48:37 2011 -0400 Try git; cleanup changes; not sure if all of them will live long. diff --git a/lisp/FreeBSD-os.c b/lisp/FreeBSD-os.c index d3549d5..28017eb 100644 --- a/lisp/FreeBSD-os.c +++ b/lisp/FreeBSD-os.c @@ -208,7 +208,8 @@ os_protect(os_vm_address_t address, os_vm_size_t length, os_vm_prot_t prot) static boolean -in_range_p(os_vm_address_t a, lispobj sbeg, size_t slen) +/* in_range_p(os_vm_address_t a, lispobj sbeg, size_t slen) */ +in_range_p(os_vm_address_t a, os_vm_address_t sbeg, size_t slen) { char *beg = (char *) sbeg; char *end = (char *) sbeg + slen; @@ -220,20 +221,14 @@ in_range_p(os_vm_address_t a, lispobj sbeg, size_t slen) boolean valid_addr(os_vm_address_t addr) { - os_vm_address_t newaddr; - - newaddr = os_trunc_to_page(addr); - - if (in_range_p(addr, READ_ONLY_SPACE_START, read_only_space_size) - || in_range_p(addr, STATIC_SPACE_START, static_space_size) - || in_range_p(addr, DYNAMIC_0_SPACE_START, dynamic_space_size) + return (in_range_p(addr, READ_ONLY_SPACE_START, read_only_space_size) || + in_range_p(addr, STATIC_SPACE_START, static_space_size) || + in_range_p(addr, DYNAMIC_0_SPACE_START, dynamic_space_size) || #ifndef GENCGC - || in_range_p(addr, DYNAMIC_1_SPACE_START, dynamic_space_size) + in_range_p(addr, DYNAMIC_1_SPACE_START, dynamic_space_size) || #endif - || in_range_p(addr, control_stack, control_stack_size) - || in_range_p(addr, binding_stack, binding_stack_size)) - return TRUE; - return FALSE; + in_range_p(addr, (os_vm_address_t) control_stack, control_stack_size) || + in_range_p(addr, (os_vm_address_t) binding_stack, binding_stack_size)); } diff --git a/lisp/FreeBSD-os.h b/lisp/FreeBSD-os.h index 7150316..f85bd57 100644 --- a/lisp/FreeBSD-os.h +++ b/lisp/FreeBSD-os.h @@ -10,13 +10,13 @@ #ifndef _FREEBSD_OS_H_ #define _FREEBSD_OS_H_ +#include <sys/types.h> #include <sys/mman.h> - #include <osreldate.h> #include <signal.h> #include <ucontext.h> -typedef void *os_vm_address_t; +typedef caddr_t os_vm_address_t; typedef size_t os_vm_size_t; typedef off_t os_vm_offset_t; typedef int os_vm_prot_t; diff --git a/lisp/coreparse.c b/lisp/coreparse.c index cf1ee43..9fe2a55 100644 --- a/lisp/coreparse.c +++ b/lisp/coreparse.c @@ -63,16 +63,16 @@ process_directory(int fd, long *ptr, int count) case STATIC_SPACE_ID: static_space = (lispobj *) addr; if (len >= static_space_size) { - fprintf(stderr, "Error: Static space size (%d) exceeds allocated space (%d)!\n", - len, static_space_size); + fprintf(stderr, "Error: Static space size (%ld) exceeds allocated space (%lu)!\n", + (long) len, (unsigned long) static_space_size); exit(1); } break; case READ_ONLY_SPACE_ID: /* Don't care about read only space */ if (len >= read_only_space_size) { - fprintf(stderr, "Error: Read only space size (%d) exceeds allocated space (%d)!\n", - len, read_only_space_size); + fprintf(stderr, "Error: Read only space size (%ld) exceeds allocated space (%lu)!\n", + (long) len, (unsigned long) read_only_space_size); exit(1); } break; diff --git a/lisp/gencgc.c b/lisp/gencgc.c index c21385e..ce02d6a 100644 --- a/lisp/gencgc.c +++ b/lisp/gencgc.c @@ -1979,9 +1979,8 @@ new_space_p(lispobj obj) static inline boolean dynamic_space_p(lispobj obj) { - lispobj end = DYNAMIC_0_SPACE_START + DYNAMIC_SPACE_SIZE; - - return (obj >= DYNAMIC_0_SPACE_START) && (obj < end); + lispobj end = (lispobj) DYNAMIC_0_SPACE_START + DYNAMIC_SPACE_SIZE; + return (obj >= (lispobj) DYNAMIC_0_SPACE_START) && (obj < end); } static inline boolean @@ -1989,7 +1988,7 @@ static_space_p(lispobj obj) { lispobj end = SymbolValue(STATIC_SPACE_FREE_POINTER); - return (obj >= STATIC_SPACE_START) && (obj < end); + return (obj >= (lispobj) STATIC_SPACE_START) && (obj < end); } static inline boolean @@ -1997,23 +1996,25 @@ read_only_space_p(lispobj obj) { lispobj end = SymbolValue(READ_ONLY_SPACE_FREE_POINTER); - return (obj >= READ_ONLY_SPACE_START) && (obj < end); + return (obj >= (lispobj) READ_ONLY_SPACE_START) && (obj < end); } static inline boolean control_stack_space_p(lispobj obj) { - lispobj end = (char*) control_stack + control_stack_size; + lispobj *ptr = (lispobj *) obj; + char *end = (char*) control_stack + control_stack_size; - return (obj >= control_stack) && (obj < end); + return (ptr >= control_stack) && (ptr < (lispobj *) end); } static inline boolean binding_stack_space_p(lispobj obj) { - lispobj end = (char*) binding_stack + binding_stack_size; + lispobj *ptr = (lispobj *) obj; + char *end = (char*) binding_stack + binding_stack_size; - return (obj >= binding_stack) && (obj < end); + return (ptr >= binding_stack) && (ptr < (lispobj *) end); } static inline boolean @@ -6867,9 +6868,8 @@ void verify_space(lispobj * start, size_t words) { int dynamic_space = (find_page_index((void *) start) != -1); - unsigned long readonly_space = - (READ_ONLY_SPACE_START <= (unsigned long) start - && (unsigned long) start < SymbolValue(READ_ONLY_SPACE_FREE_POINTER)); + unsigned long readonly_space = ((unsigned long) READ_ONLY_SPACE_START <= (unsigned long) start && + (unsigned long) start < (unsigned long) SymbolValue(READ_ONLY_SPACE_FREE_POINTER)); while (words > 0) { size_t count = 1; @@ -6877,10 +6877,8 @@ verify_space(lispobj * start, size_t words) if (Pointerp(thing)) { int page_index = find_page_index((void *) thing); - int to_readonly_space = (READ_ONLY_SPACE_START <= thing && - thing < - - SymbolValue(READ_ONLY_SPACE_FREE_POINTER)); + int to_readonly_space = ((unsigned long) READ_ONLY_SPACE_START <= thing && + (unsigned long) thing < (unsigned long) SymbolValue(READ_ONLY_SPACE_FREE_POINTER)); unsigned long to_static_space = ((unsigned long) static_space <= thing @@ -7924,7 +7922,7 @@ void gencgc_pickup_dynamic(void) { int page = 0; - unsigned long addr = DYNAMIC_0_SPACE_START; + unsigned long addr = (unsigned long) DYNAMIC_0_SPACE_START; unsigned long alloc_ptr = (unsigned long) get_alloc_pointer(); /* Initialise the first region. */ diff --git a/lisp/globals.h b/lisp/globals.h index bfd8c6d..b18dd57 100644 --- a/lisp/globals.h +++ b/lisp/globals.h @@ -30,7 +30,7 @@ extern lispobj *binding_stack; extern unsigned long read_only_space_size; extern unsigned long binding_stack_size; extern unsigned long static_space_size; -extern unsigned long control_stack_size; +extern unsigned long control_stack_size; /* in characters */ #if (defined(i386) || defined(__x86_64)) extern lispobj *control_stack_end; diff --git a/lisp/lisp.h b/lisp/lisp.h index 9b48af7..f802594 100644 --- a/lisp/lisp.h +++ b/lisp/lisp.h @@ -39,14 +39,11 @@ typedef u32 lispobj; #define FALSE 0 #endif -#define SymbolValue(sym) \ - (((struct symbol *)((sym)-type_OtherPointer))->value) -#define SetSymbolValue(sym,val) \ - (((struct symbol *)((sym)-type_OtherPointer))->value = (val)) +#define SymbolValue(sym) (((struct symbol *)((sym)-type_OtherPointer))->value) +#define SetSymbolValue(sym,val) (((struct symbol *)((sym)-type_OtherPointer))->value = (val)) /* This only words for static symbols. */ -#define SymbolFunction(sym) \ - (((struct fdefn *)(SymbolValue(sym)-type_OtherPointer))->function) +#define SymbolFunction(sym) (((struct fdefn *)(SymbolValue(sym)-type_OtherPointer))->function) typedef enum {AUTO, X87, SSE2} fpu_mode_t; diff --git a/lisp/x86-arch.c b/lisp/x86-arch.c index 474fb87..c0d3e75 100644 --- a/lisp/x86-arch.c +++ b/lisp/x86-arch.c @@ -520,7 +520,11 @@ arch_make_lazy_linkage(long linkage_entry) long arch_linkage_entry(unsigned long retaddr) { +#if defined __FreeBSD__ + return (((os_vm_address_t) retaddr - 5) - FOREIGN_LINKAGE_SPACE_START) / LinkageEntrySize; +#else return ((retaddr - 5) - FOREIGN_LINKAGE_SPACE_START) / LinkageEntrySize; +#endif } #endif /* LINKAGE_TABLE */ diff --git a/lisp/x86-validate.h b/lisp/x86-validate.h index 4eb56b0..f086d01 100644 --- a/lisp/x86-validate.h +++ b/lisp/x86-validate.h @@ -21,8 +21,6 @@ * 0x10000000->0x20000000 256M Read-Only Space. * 0x20000000->0x28000000 128M Reserved for shared libraries. * 0x28000000->0x38000000 256M Static Space. - * 0x38000000->0x40000000 128M Binding stack growing up. - * 0x40000000->0x48000000 128M Control stack growing down. * 0x48000000->0xB0000000 1664M Dynamic Space. * 0xB0000000->0xB1000000 Foreign Linkage Table * 0xE0000000-> 256M C stack - Alien stack. @@ -68,27 +66,25 @@ */ #ifdef __FreeBSD__ -#define READ_ONLY_SPACE_START (0x10000000) -#define READ_ONLY_SPACE_SIZE (0x0ffff000) /* 256MB - 1 page */ +#define READ_ONLY_SPACE_START ((os_vm_address_t) 0x10000000) +#define READ_ONLY_SPACE_SIZE ((os_vm_size_t) 0x0ffff000) /* 256MB - 1 page */ -#define STATIC_SPACE_START (0x28f00000) -#define STATIC_SPACE_SIZE (0x0f0ff000) /* 241MB - 1 page */ +#define STATIC_SPACE_START ((os_vm_address_t) 0x28f00000) +#define STATIC_SPACE_SIZE ((os_vm_size_t) 0x0f0ff000) /* 241MB - 1 page */ -#define BINDING_STACK_SIZE (0x07fff000) /* 128MB - 1 page */ -#define CONTROL_STACK_SIZE 0x07fd8000 /* 128MB - SIGSTKSZ */ -#define SIGNAL_STACK_START 0x47fd8000 -#define SIGNAL_STACK_SIZE SIGSTKSZ +#define BINDING_STACK_SIZE ((os_vm_size_t) 0x07fff000) /* 128MB - 1 page */ +#define CONTROL_STACK_SIZE ((os_vm_size_t) 0x07fd8000) /* 128MB - SIGSTKSZ */ -#define DYNAMIC_0_SPACE_START (0x48000000UL) +#define DYNAMIC_0_SPACE_START ((os_vm_address_t) 0x48000000UL) #ifdef GENCGC -#define DYNAMIC_SPACE_SIZE (0x78000000UL) /* May be up to 1.7 GB */ +#define DYNAMIC_SPACE_SIZE ((os_vm_size_t) 0x78000000UL) /* May be up to 1.7 GB */ #else -#define DYNAMIC_SPACE_SIZE (0x04000000UL) /* 64MB */ +#define DYNAMIC_SPACE_SIZE ((os_vm_size_t) 0x04000000UL) /* 64MB */ #endif -#define DEFAULT_DYNAMIC_SPACE_SIZE (0x20000000UL) /* 512MB */ +#define DEFAULT_DYNAMIC_SPACE_SIZE ((os_vm_size_t) 0x20000000UL) /* 512MB */ #ifdef LINKAGE_TABLE -#define FOREIGN_LINKAGE_SPACE_START ((unsigned long) LinkageSpaceStart) -#define FOREIGN_LINKAGE_SPACE_SIZE (0x100000UL) /* 1MB */ +#define FOREIGN_LINKAGE_SPACE_START ((os_vm_address_t) LinkageSpaceStart) +#define FOREIGN_LINKAGE_SPACE_SIZE ((os_vm_size_t) 0x100000UL) /* 1MB */ #endif #endif /* __FreeBSD__ */ ----------------------------------------------------------------------- Summary of changes: lisp/FreeBSD-os.c | 21 ++++++++------------- lisp/FreeBSD-os.h | 4 ++-- lisp/coreparse.c | 8 ++++---- lisp/gencgc.c | 32 +++++++++++++++----------------- lisp/globals.h | 2 +- lisp/lisp.h | 9 +++------ lisp/x86-arch.c | 4 ++++ lisp/x86-validate.h | 28 ++++++++++++---------------- 8 files changed, 49 insertions(+), 59 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch dynamic-stack-alloc updated. snapshot-2011-10-12-g8087064
by Alex Goncharov 05 Oct '11

05 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, dynamic-stack-alloc has been updated via 808706413ed9702874c33a45c9e95a53a4bd7683 (commit) via 02a93933646d90d9fac2a18270ac20056e6d9b2d (commit) via f5104e51646101b57917b49f5b80ea7bd2d2be57 (commit) from bc39eee9d3a5ed53a519449ab9584f2e36ed26b2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 808706413ed9702874c33a45c9e95a53a4bd7683 Author: Alex Goncharov <agoncharov(a)common-lisp.net> Date: Wed Oct 5 10:16:35 2011 -0400 FreeBSD: pull out BINDING_STACK_START, CONTROL_STACK_START diff --git a/lisp/FreeBSD-os.c b/lisp/FreeBSD-os.c index d3746f0..d3549d5 100644 --- a/lisp/FreeBSD-os.c +++ b/lisp/FreeBSD-os.c @@ -230,7 +230,7 @@ valid_addr(os_vm_address_t addr) #ifndef GENCGC || in_range_p(addr, DYNAMIC_1_SPACE_START, dynamic_space_size) #endif - || in_range_p(addr, CONTROL_STACK_START, control_stack_size) + || in_range_p(addr, control_stack, control_stack_size) || in_range_p(addr, binding_stack, binding_stack_size)) return TRUE; return FALSE; diff --git a/lisp/x86-validate.h b/lisp/x86-validate.h index a751154..4eb56b0 100644 --- a/lisp/x86-validate.h +++ b/lisp/x86-validate.h @@ -74,10 +74,7 @@ #define STATIC_SPACE_START (0x28f00000) #define STATIC_SPACE_SIZE (0x0f0ff000) /* 241MB - 1 page */ -#define BINDING_STACK_START (0x38000000) #define BINDING_STACK_SIZE (0x07fff000) /* 128MB - 1 page */ - -#define CONTROL_STACK_START 0x40000000 #define CONTROL_STACK_SIZE 0x07fd8000 /* 128MB - SIGSTKSZ */ #define SIGNAL_STACK_START 0x47fd8000 #define SIGNAL_STACK_SIZE SIGSTKSZ commit 02a93933646d90d9fac2a18270ac20056e6d9b2d Author: Alex Goncharov <agoncharov(a)common-lisp.net> Date: Wed Oct 5 08:48:36 2011 -0400 FreeBSD-os.c: the changes similar to Linux-os.c diff --git a/lisp/FreeBSD-os.c b/lisp/FreeBSD-os.c index 7a06222..d3746f0 100644 --- a/lisp/FreeBSD-os.c +++ b/lisp/FreeBSD-os.c @@ -231,7 +231,7 @@ valid_addr(os_vm_address_t addr) || in_range_p(addr, DYNAMIC_1_SPACE_START, dynamic_space_size) #endif || in_range_p(addr, CONTROL_STACK_START, control_stack_size) - || in_range_p(addr, BINDING_STACK_START, binding_stack_size)) + || in_range_p(addr, binding_stack, binding_stack_size)) return TRUE; return FALSE; } commit f5104e51646101b57917b49f5b80ea7bd2d2be57 Author: Alex Goncharov <agoncharov(a)common-lisp.net> Date: Wed Oct 5 08:02:43 2011 -0400 tools/create-target.sh: make it more robust, remove a CVS reference diff --git a/tools/create-target.sh b/tools/create-target.sh index d537171..3a3d9d3 100755 --- a/tools/create-target.sh +++ b/tools/create-target.sh @@ -17,14 +17,16 @@ usage() { ( cd src/lisp/ ; ls -1 Config.* ) | sed 's;^Config[.];;g' | \ pr -3at -o 8 echo "Possible Motif-variants:" - ( cd src/motif/server/ ; ls -1 Config.* ) | sed 's;^Config[.];;g' | \ - pr -3at -o 8 + ( cd src/motif/server/ && ls -1 Config.* ) | sed 's;^Config[.];;g' | pr -3at -o 8 exit 1 } +TARGET_DIR="$1" +case $TARGET_DIR in build-*) :;; *) usage; exit 2;; esac +[ -d $ "$TARGET_DIR" ] && echo "Error: Directory $1 exists already -- better remove it..." # && exit 2 + if [ $# = 1 ]; then # Only target directory given. Try to deduce the lisp-variant - TARGET_DIR="$1" case `uname -s` in SunOS) case `uname -m` in @@ -45,20 +47,15 @@ if [ $# = 1 ]; then esac elif [ $# = 2 ]; then # Target directory and lisp-variant given - TARGET_DIR="$1" LISP_VARIANT="$2" elif [ $# = 3 ]; then # Target directory, lisp-variant, and motif variant given - TARGET_DIR="$1" LISP_VARIANT="$2" MOTIF_VARIANT="$3" else usage fi -[ -d $1 ] && echo "Error: Directory $1 exists already!" && exit 2 - -TARGET="`echo $TARGET_DIR | sed 's:/*$::'`" # Make sure the given variants exist if [ ! -f src/lisp/Config.$LISP_VARIANT ]; then @@ -93,14 +90,15 @@ echo "Lisp = $LISP_VARIANT" echo "Motif = $MOTIF_VARIANT" # Create a directory tree that mirrors the source directory tree -find src -name 'CVS' -prune -o -type d -print \ - | sed "s:^src:$TARGET:g" | xargs mkdir +TARGET="`echo $TARGET_DIR | sed 's:/*$::'`" +echo TARGET_DIR=$TARGET_DIR TARGET=$TARGET +find -L src -type d -print | sed "s:^src:$TARGET:g" | xargs -t mkdir -p # Link Makefile and Config files - -(cd $TARGET/lisp - ln -s ../../src/lisp/GNUmakefile ../../src/lisp/Config.$LISP_VARIANT ../../src/lisp/Config.*_common . - ln -s Config.$LISP_VARIANT Config +(cd $TARGET/lisp && { + ln -s ../../src/lisp/GNUmakefile ../../src/lisp/Config.$LISP_VARIANT ../../src/lisp/Config.*_common . + ln -s Config.$LISP_VARIANT Config + } || { echo "Can't cd $TARGET/lisp"; exit 1; } ) # Create empty initial map file ----------------------------------------------------------------------- Summary of changes: lisp/FreeBSD-os.c | 4 ++-- lisp/x86-validate.h | 3 --- tools/create-target.sh | 26 ++++++++++++-------------- 3 files changed, 14 insertions(+), 19 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch dynamic-stack-alloc updated. snapshot-2011-10-9-gbc39eee
by Raymond Toy 05 Oct '11

05 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, dynamic-stack-alloc has been updated via bc39eee9d3a5ed53a519449ab9584f2e36ed26b2 (commit) from 73d642c3e9cb6cc27f1e57ef1dcd5b5bf79e8624 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit bc39eee9d3a5ed53a519449ab9584f2e36ed26b2 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Tue Oct 4 22:55:45 2011 -0700 On sparc, mmap the binding stack anywhere space is available. diff --git a/lisp/solaris-os.c b/lisp/solaris-os.c index ac61280..fe96cd7 100644 --- a/lisp/solaris-os.c +++ b/lisp/solaris-os.c @@ -201,7 +201,7 @@ boolean valid_addr(os_vm_address_t addr) || in_range_p(addr, DYNAMIC_1_SPACE_START, dynamic_space_size) #endif || in_range_p(addr, control_stack, control_stack_size) - || in_range_p(addr, BINDING_STACK_START, binding_stack_size)); + || in_range_p(addr, binding_stack, binding_stack_size)); } /* ---------------------------------------------------------------- */ diff --git a/lisp/sparc-validate.h b/lisp/sparc-validate.h index 98e12c3..492c093 100644 --- a/lisp/sparc-validate.h +++ b/lisp/sparc-validate.h @@ -94,7 +94,9 @@ #define READ_ONLY_SPACE_START (SpaceStart_TargetReadOnly) #define READ_ONLY_SPACE_SIZE ((2*MB_128) - SPARSE_BLOCK_SIZE) /* 256 MB - 32 KB, 256 MB max */ +#if 0 #define BINDING_STACK_START (0x20000000) +#endif #define BINDING_STACK_SIZE (MB_128 - SPARSE_BLOCK_SIZE) /* 128 MB - 32 KB, 128 MB max */ #define STATIC_SPACE_START (SpaceStart_TargetStatic) ----------------------------------------------------------------------- Summary of changes: lisp/solaris-os.c | 2 +- lisp/sparc-validate.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch dynamic-stack-alloc updated. snapshot-2011-10-8-g73d642c
by Raymond Toy 05 Oct '11

05 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, dynamic-stack-alloc has been updated via 73d642c3e9cb6cc27f1e57ef1dcd5b5bf79e8624 (commit) via cc34b6ac2b51d593b3828a47be2805e3ccf19b52 (commit) via 0495d941be1add43433892aaa4b6ecbb3ff13a6d (commit) via 36ab199b205b982866b177ea7ddbe636b69803a4 (commit) via 581895eac2841a04285a40cfae9b25fbdc1ff0fe (commit) from 8b8a38b2bad5a856dea915309be4f3697e2f0312 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 73d642c3e9cb6cc27f1e57ef1dcd5b5bf79e8624 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Tue Oct 4 22:07:33 2011 -0700 Use git describe as part of the version. Include the dirty flag too. diff --git a/tools/load-world.sh b/tools/load-world.sh index 672a357..d381769 100755 --- a/tools/load-world.sh +++ b/tools/load-world.sh @@ -11,8 +11,9 @@ usage() SKIP_PCL= NO_PCL_FEATURE= -# Default version is the date. -VERSION="CVS Head `date '+%Y-%m-%d %H:%M:%S'`" +# Default version is the date and the git hash +GIT_HASH="`(cd src; git describe --dirty 2>/dev/null)`" +VERSION="`date '+%Y-%m-%d %H:%M:%S'`" while getopts "p" arg do @@ -57,6 +58,6 @@ $TARGET/lisp/lisp -core $TARGET/lisp/kernel.core <<EOF $NO_PCL_FEATURE (load "target:tools/worldload") -$2 +$VERSION $GIT_HASH EOF commit cc34b6ac2b51d593b3828a47be2805e3ccf19b52 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Tue Oct 4 21:57:36 2011 -0700 Mmap the binding stack where space is available. Darwin-os.c: Linux-os.c: gencgc.c: save.c: o Use binding_stack instead of BINDING_STACK_START validate.c: o Dynamically allocate the binding stack if BINDING_STACK_START is not defined. x86-validate.c: o Don't define BINDING_STACK_START for Darwin and Linux. diff --git a/lisp/Darwin-os.c b/lisp/Darwin-os.c index db59d3d..cbaf65c 100644 --- a/lisp/Darwin-os.c +++ b/lisp/Darwin-os.c @@ -451,7 +451,7 @@ valid_addr(os_vm_address_t addr) || in_range_p(addr, DYNAMIC_1_SPACE_START, dynamic_space_size) #endif || in_range_p(addr, control_stack, control_stack_size) - || in_range_p(addr, BINDING_STACK_START, binding_stack_size)) + || in_range_p(addr, binding_stack, binding_stack_size)) return TRUE; return FALSE; } diff --git a/lisp/Linux-os.c b/lisp/Linux-os.c index 3217476..ea50ef8 100644 --- a/lisp/Linux-os.c +++ b/lisp/Linux-os.c @@ -378,7 +378,7 @@ valid_addr(os_vm_address_t addr) || in_range_p(addr, DYNAMIC_0_SPACE_START, dynamic_space_size) || in_range_p(addr, DYNAMIC_1_SPACE_START, dynamic_space_size) || in_range_p(addr, control_stack, control_stack_size) - || in_range_p(addr, BINDING_STACK_START, binding_stack_size)) + || in_range_p(addr, binding_stack, binding_stack_size)) return TRUE; return FALSE; } @@ -452,7 +452,7 @@ sigsegv_handler(HANDLER_ARGS) if (addr != NULL && context->sc_regs[reg_ALLOC] & (1 << 63)) { context->sc_regs[reg_ALLOC] -= (1 << 63); interrupt_handle_pending(context); - } else if (addr > CONTROL_STACK_TOP && addr < BINDING_STACK_START) { + } else if (addr > CONTROL_STACK_TOP && addr < binding_stack) { fprintf(stderr, "Possible stack overflow at 0x%08lX!\n", addr); /* try to fix control frame pointer */ while (!(control_stack <= *current_control_frame_pointer && diff --git a/lisp/gencgc.c b/lisp/gencgc.c index 7b6b008..c21385e 100644 --- a/lisp/gencgc.c +++ b/lisp/gencgc.c @@ -2011,9 +2011,9 @@ control_stack_space_p(lispobj obj) static inline boolean binding_stack_space_p(lispobj obj) { - lispobj end = BINDING_STACK_START + binding_stack_size; + lispobj end = (char*) binding_stack + binding_stack_size; - return (obj >= BINDING_STACK_START) && (obj < end); + return (obj >= binding_stack) && (obj < end); } static inline boolean @@ -7116,11 +7116,11 @@ verify_gc(void) int static_space_size = (lispobj *) SymbolValue(STATIC_SPACE_FREE_POINTER) - (lispobj *) static_space; int binding_stack_size = (lispobj *) get_binding_stack_pointer() - - (lispobj *) BINDING_STACK_START; + - (lispobj *) binding_stack; verify_space((lispobj *) READ_ONLY_SPACE_START, read_only_space_size); verify_space((lispobj *) static_space, static_space_size); - verify_space((lispobj *) BINDING_STACK_START, binding_stack_size); + verify_space((lispobj *) binding_stack, binding_stack_size); verify_space((lispobj *) (void *) &scavenger_hooks, 1); } diff --git a/lisp/save.c b/lisp/save.c index f6fb4bd..bebeded 100644 --- a/lisp/save.c +++ b/lisp/save.c @@ -138,7 +138,7 @@ save(char *filename, lispobj init_function, int sse2_mode) } printf("[Undoing binding stack... "); fflush(stdout); - unbind_to_here((lispobj *) BINDING_STACK_START); + unbind_to_here((lispobj *) binding_stack); SetSymbolValue(CURRENT_CATCH_BLOCK, 0); SetSymbolValue(CURRENT_UNWIND_PROTECT_BLOCK, 0); SetSymbolValue(EVAL_STACK_TOP, 0); @@ -277,7 +277,7 @@ save_executable(char *filename, lispobj init_function) printf("[Undoing binding stack... "); fflush(stdout); - unbind_to_here((lispobj *)BINDING_STACK_START); + unbind_to_here((lispobj *) binding_stack); SetSymbolValue(CURRENT_CATCH_BLOCK, 0); SetSymbolValue(CURRENT_UNWIND_PROTECT_BLOCK, 0); SetSymbolValue(EVAL_STACK_TOP, 0); diff --git a/lisp/validate.c b/lisp/validate.c index 3025ffc..bfaa6ac 100644 --- a/lisp/validate.c +++ b/lisp/validate.c @@ -115,8 +115,14 @@ validate(void) #endif /* Binding Stack */ +#if defined(BINDING_STACK_START) binding_stack = (lispobj *) BINDING_STACK_START; ensure_space(binding_stack, binding_stack_size); +#else + binding_stack = (lispobj *) os_allocate(binding_stack_size); + +#endif + #ifdef sparc make_holes(); #endif diff --git a/lisp/x86-validate.h b/lisp/x86-validate.h index a2c9414..a751154 100644 --- a/lisp/x86-validate.h +++ b/lisp/x86-validate.h @@ -128,7 +128,9 @@ #define STATIC_SPACE_START (SpaceStart_TargetStatic) #define STATIC_SPACE_SIZE (0x0ffff000) /* 256MB - 1 page */ +#if !defined(DARWIN) #define BINDING_STACK_START (0x38000000) +#endif #define BINDING_STACK_SIZE (0x07fff000) /* 128MB - 1 page */ #if !defined(DARWIN) @@ -181,7 +183,9 @@ #define STATIC_SPACE_START (SpaceStart_TargetStatic) #define STATIC_SPACE_SIZE (0x0ffff000) /* 256MB - 1 page */ +#if 0 #define BINDING_STACK_START (0x20000000) +#endif #define BINDING_STACK_SIZE (0x07fff000) /* 128MB - 1 page */ #if 0 commit 0495d941be1add43433892aaa4b6ecbb3ff13a6d Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Tue Oct 4 21:53:04 2011 -0700 Regenerated. diff --git a/i18n/locale/cmucl.pot b/i18n/locale/cmucl.pot index 08392c7..abe9a3b 100644 --- a/i18n/locale/cmucl.pot +++ b/i18n/locale/cmucl.pot @@ -4772,6 +4772,10 @@ msgid "" msgstr "" #: src/code/float-trap.lisp +msgid "SIGFPE with no exceptions currently enabled?" +msgstr "" + +#: src/code/float-trap.lisp msgid "" "Execute BODY with the floating point exceptions listed in TRAPS\n" " masked (disabled). TRAPS should be a list of possible exceptions\n" commit 36ab199b205b982866b177ea7ddbe636b69803a4 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Tue Oct 4 21:52:16 2011 -0700 Use describe for the version instead of the tree hash. diff --git a/tools/build.sh b/tools/build.sh index 85e4041..74374dd 100755 --- a/tools/build.sh +++ b/tools/build.sh @@ -43,7 +43,7 @@ version=20b SRCDIR=src TOOLDIR=$SRCDIR/tools VERSION="`date '+%Y-%m-%d %H:%M:%S'`" -GIT_HASH="`(cd src; git log -1 --pretty=format:%t 2>/dev/null)`" +GIT_HASH="`(cd src; git describe --dirty 2>/dev/null)`" # Add the tree hash to the version VERSION="$VERSION $GIT_HASH" BASE=build commit 581895eac2841a04285a40cfae9b25fbdc1ff0fe Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Mon Oct 3 21:22:21 2011 -0700 Allocate the linkage table area before allocating the stacks. Otherwise, we might accidentally allocate the linkage table on top of the stacks which would create a mess. diff --git a/lisp/validate.c b/lisp/validate.c index f5fd135..3025ffc 100644 --- a/lisp/validate.c +++ b/lisp/validate.c @@ -94,6 +94,10 @@ validate(void) */ #endif +#ifdef LINKAGE_TABLE + ensure_space((lispobj *) FOREIGN_LINKAGE_SPACE_START, + FOREIGN_LINKAGE_SPACE_SIZE); +#endif /* Control Stack */ #if defined(CONTROL_STACK_START) @@ -113,10 +117,6 @@ validate(void) /* Binding Stack */ binding_stack = (lispobj *) BINDING_STACK_START; ensure_space(binding_stack, binding_stack_size); -#ifdef LINKAGE_TABLE - ensure_space((lispobj *) FOREIGN_LINKAGE_SPACE_START, - FOREIGN_LINKAGE_SPACE_SIZE); -#endif #ifdef sparc make_holes(); #endif ----------------------------------------------------------------------- Summary of changes: i18n/locale/cmucl.pot | 4 ++++ lisp/Darwin-os.c | 2 +- lisp/Linux-os.c | 4 ++-- lisp/gencgc.c | 8 ++++---- lisp/save.c | 4 ++-- lisp/validate.c | 12 +++++++++--- lisp/x86-validate.h | 4 ++++ tools/build.sh | 2 +- tools/load-world.sh | 7 ++++--- 9 files changed, 31 insertions(+), 16 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch dynamic-stack-alloc updated. snapshot-2011-10-3-g8b8a38b
by Raymond Toy 03 Oct '11

03 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, dynamic-stack-alloc has been updated via 8b8a38b2bad5a856dea915309be4f3697e2f0312 (commit) via b7087fa144452cbe2de103f2885c501404a4e0d1 (commit) from f7345b4a470baf7aa98722dab14cf28651a66457 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8b8a38b2bad5a856dea915309be4f3697e2f0312 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sun Oct 2 21:33:56 2011 -0700 Mmap the control stack anywhere on Linux and use altstack instead of mmap'ing a space for the sigaltstack. Adjust spaces[] accordingly too. diff --git a/lisp/solaris-os.c b/lisp/solaris-os.c index fa1a45e..ac61280 100644 --- a/lisp/solaris-os.c +++ b/lisp/solaris-os.c @@ -200,7 +200,7 @@ boolean valid_addr(os_vm_address_t addr) #ifndef GENCGC || in_range_p(addr, DYNAMIC_1_SPACE_START, dynamic_space_size) #endif - || in_range_p(addr, CONTROL_STACK_START, control_stack_size) + || in_range_p(addr, control_stack, control_stack_size) || in_range_p(addr, BINDING_STACK_START, binding_stack_size)); } @@ -410,9 +410,11 @@ os_vm_address_t round_up_sparse_size(os_vm_address_t addr) * after them. Must not include the dynamic spaces because the size * of the dynamic space can be controlled from the command line. */ -static os_vm_address_t spaces[] = { - READ_ONLY_SPACE_START, STATIC_SPACE_START, - BINDING_STACK_START, CONTROL_STACK_START +static os_vm_address_t *spaces[] = { + (os_vm_address_t*) &read_only_space, + (os_vm_address_t*) &static_space, + (os_vm_address_t*) &binding_stack, + (os_vm_address_t*) &control_stack }; /* @@ -444,7 +446,7 @@ make_holes(void) for (k = 0; k < sizeof(spaces) / sizeof(spaces[0]); ++k) { - hole = spaces[k] + *space_size[k]; + hole = *spaces[k] + *space_size[k]; if (os_validate(hole, HOLE_SIZE) == NULL) { fprintf(stderr, diff --git a/lisp/sparc-validate.h b/lisp/sparc-validate.h index 7ef7af4..98e12c3 100644 --- a/lisp/sparc-validate.h +++ b/lisp/sparc-validate.h @@ -100,9 +100,11 @@ #define STATIC_SPACE_START (SpaceStart_TargetStatic) #define STATIC_SPACE_SIZE ((2*MB_128) - SPARSE_BLOCK_SIZE) /* 256 MB - 32 KB, 256 MB max */ +#if 0 #define CONTROL_STACK_START (0x38000000) +#endif #define CONTROL_STACK_SIZE (MB_128 - SPARSE_BLOCK_SIZE) /* 128 MB - 32 KB, 128 MB max */ -#define CONTROL_STACK_END (CONTROL_STACK_START + control_stack_size) +#define CONTROL_STACK_END ((char*)control_stack + control_stack_size) #define DYNAMIC_0_SPACE_START (SpaceStart_TargetDynamic) commit b7087fa144452cbe2de103f2885c501404a4e0d1 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sun Oct 2 20:42:57 2011 -0700 Mmap the control stack anywhere on Linux and use altstack instead of mmap'ing a space for the sigaltstack. diff --git a/lisp/Linux-os.c b/lisp/Linux-os.c index f4b96ef..3217476 100644 --- a/lisp/Linux-os.c +++ b/lisp/Linux-os.c @@ -377,7 +377,7 @@ valid_addr(os_vm_address_t addr) || in_range_p(addr, STATIC_SPACE_START, static_space_size) || in_range_p(addr, DYNAMIC_0_SPACE_START, dynamic_space_size) || in_range_p(addr, DYNAMIC_1_SPACE_START, dynamic_space_size) - || in_range_p(addr, CONTROL_STACK_START, control_stack_size) + || in_range_p(addr, control_stack, control_stack_size) || in_range_p(addr, BINDING_STACK_START, binding_stack_size)) return TRUE; return FALSE; @@ -445,7 +445,7 @@ sigsegv_handler(HANDLER_ARGS) #ifdef i386 interrupt_handle_now(signal, contextstruct); #else -#define CONTROL_STACK_TOP (((char*) CONTROL_STACK_START) + control_stack_size) +#define CONTROL_STACK_TOP (((char*) control_stack) + control_stack_size) addr = arch_get_bad_addr(signal, code, context); @@ -455,7 +455,7 @@ sigsegv_handler(HANDLER_ARGS) } else if (addr > CONTROL_STACK_TOP && addr < BINDING_STACK_START) { fprintf(stderr, "Possible stack overflow at 0x%08lX!\n", addr); /* try to fix control frame pointer */ - while (!(CONTROL_STACK_START <= *current_control_frame_pointer && + while (!(control_stack <= *current_control_frame_pointer && *current_control_frame_pointer <= CONTROL_STACK_TOP)) ((char *) current_control_frame_pointer) -= sizeof(lispobj); ldb_monitor(); diff --git a/lisp/x86-validate.h b/lisp/x86-validate.h index e3a2319..a2c9414 100644 --- a/lisp/x86-validate.h +++ b/lisp/x86-validate.h @@ -184,10 +184,14 @@ #define BINDING_STACK_START (0x20000000) #define BINDING_STACK_SIZE (0x07fff000) /* 128MB - 1 page */ +#if 0 #define CONTROL_STACK_START 0x38000000 +#endif #define CONTROL_STACK_SIZE (0x07fff000 - 8192) +#if 0 #define SIGNAL_STACK_START CONTROL_STACK_END +#endif #define SIGNAL_STACK_SIZE SIGSTKSZ #define DYNAMIC_0_SPACE_START (SpaceStart_TargetDynamic) ----------------------------------------------------------------------- Summary of changes: lisp/Linux-os.c | 6 +++--- lisp/solaris-os.c | 12 +++++++----- lisp/sparc-validate.h | 4 +++- lisp/x86-validate.h | 4 ++++ 4 files changed, 17 insertions(+), 9 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch dynamic-stack-alloc created. snapshot-2011-10-1-gf7345b4
by Raymond Toy 03 Oct '11

03 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, dynamic-stack-alloc has been created at f7345b4a470baf7aa98722dab14cf28651a66457 (commit) - Log ----------------------------------------------------------------- commit f7345b4a470baf7aa98722dab14cf28651a66457 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sun Oct 2 18:11:26 2011 -0700 Allow mmap to place the control stack anywhere and no longer mmap the signal alt stack; use an array like on other non-x86 architectures. lisp/validate.c: o Mmap the control stack anywhere instead of at a fixed address if CONTROL_STACK_START is not defined. lisp/x86-validate.h: o Don't define CONTROL_STACK_START for DARWIN (Mac OS X) so we don't mmap the control stack at a fixed place. o Don't define SIGNAL_STACK_START so we use a data array instead of a fixed mmap area. lisp/interrupt.c: o If SIGNAL_STACK_START is not defined, use the altstack array (even if on x86). lisp/Darwin-os.c: lisp/backtrace.c: lisp/gencgc.c: lisp/os-common.c: o Use control_stack instead of CONTROL_STACK_START. (control_stack was already a defined C variable.) lisp/x86-assem.S: o Use control_stack if CONTROL_STACK_START is undefined. diff --git a/lisp/Darwin-os.c b/lisp/Darwin-os.c index 1304d10..db59d3d 100644 --- a/lisp/Darwin-os.c +++ b/lisp/Darwin-os.c @@ -450,7 +450,7 @@ valid_addr(os_vm_address_t addr) #ifndef GENCGC || in_range_p(addr, DYNAMIC_1_SPACE_START, dynamic_space_size) #endif - || in_range_p(addr, CONTROL_STACK_START, control_stack_size) + || in_range_p(addr, control_stack, control_stack_size) || in_range_p(addr, BINDING_STACK_START, binding_stack_size)) return TRUE; return FALSE; diff --git a/lisp/backtrace.c b/lisp/backtrace.c index cb9cd8c..1cf1301 100644 --- a/lisp/backtrace.c +++ b/lisp/backtrace.c @@ -253,7 +253,7 @@ backtrace(int nframes) static int stack_pointer_p(unsigned long p) { - return (p < CONTROL_STACK_START + control_stack_size + return (p < (unsigned long) ((char *) control_stack + control_stack_size) && p > (unsigned long) &p && (p & 3) == 0); } diff --git a/lisp/gencgc.c b/lisp/gencgc.c index 423cc9c..7b6b008 100644 --- a/lisp/gencgc.c +++ b/lisp/gencgc.c @@ -168,7 +168,7 @@ check_escaped_stack_object(lispobj * where, lispobj obj) if (Pointerp(obj) && (p = (void *) PTR(obj), - (p >= (void *) CONTROL_STACK_START + (p >= (void *) control_stack && p < (void *) control_stack_end))) { char *space; @@ -197,7 +197,7 @@ check_escaped_stack_object(lispobj * where, lispobj obj) lose("Escaped stack-allocated object 0x%08lx at %p in %s\n", (unsigned long) obj, where, space); #ifndef i386 - else if ((where >= (lispobj *) CONTROL_STACK_START + else if ((where >= (lispobj *) control_stack && where < (lispobj *) (control_stack_end)) || (space == NULL)) { /* Do nothing if it the reference is from the control stack, @@ -2003,9 +2003,9 @@ read_only_space_p(lispobj obj) static inline boolean control_stack_space_p(lispobj obj) { - lispobj end = CONTROL_STACK_START + control_stack_size; + lispobj end = (char*) control_stack + control_stack_size; - return (obj >= CONTROL_STACK_START) && (obj < end); + return (obj >= control_stack) && (obj < end); } static inline boolean diff --git a/lisp/interrupt.c b/lisp/interrupt.c index 39a2d87..5183172 100644 --- a/lisp/interrupt.c +++ b/lisp/interrupt.c @@ -396,7 +396,7 @@ interrupt_maybe_gc(HANDLER_ARGS) * Noise to install handlers. * \****************************************************************/ -#if !(defined(i386) || defined(__x86_64)) +#if !defined(SIGNAL_STACK_START) || !(defined(i386) || defined(__x86_64)) #define SIGNAL_STACK_SIZE SIGSTKSZ static char altstack[SIGNAL_STACK_SIZE]; #endif @@ -422,7 +422,7 @@ interrupt_install_low_level_handler(int signal, void handler(HANDLER_ARGS)) if (signal == PROTECTION_VIOLATION_SIGNAL) { stack_t sigstack; -#if (defined( i386 ) || defined(__x86_64)) +#if defined(SIGNAL_STACK_START) && (defined( i386 ) || defined(__x86_64)) sigstack.ss_sp = (void *) SIGNAL_STACK_START; #else sigstack.ss_sp = (void *) altstack; diff --git a/lisp/os-common.c b/lisp/os-common.c index e6684b2..176cd61 100644 --- a/lisp/os-common.c +++ b/lisp/os-common.c @@ -426,12 +426,12 @@ guard_zones(char **yellow_start, char **red_start) { #if (defined(i386) || defined(__x86_64)) if (os_stack_grows_down()) { - char *end = (char *) CONTROL_STACK_START; + char *end = (char *) control_stack; *red_start = end; *yellow_start = *red_start + RED_ZONE_SIZE; } else { - char *end = (char *) CONTROL_STACK_START + control_stack_size; + char *end = (char *) control_stack + control_stack_size; *red_start = end - RED_ZONE_SIZE; *yellow_start = *red_start - YELLOW_ZONE_SIZE; @@ -443,7 +443,7 @@ guard_zones(char **yellow_start, char **red_start) * control stack area. */ - char *end = (char *) CONTROL_STACK_START + control_stack_size; + char *end = (char *) control_stack + control_stack_size; *red_start = end - RED_ZONE_SIZE; *yellow_start = *red_start - YELLOW_ZONE_SIZE; diff --git a/lisp/validate.c b/lisp/validate.c index efe7273..f5fd135 100644 --- a/lisp/validate.c +++ b/lisp/validate.c @@ -95,12 +95,17 @@ validate(void) #endif /* Control Stack */ + +#if defined(CONTROL_STACK_START) control_stack = (lispobj *) CONTROL_STACK_START; + ensure_space(control_stack, control_stack_size); +#else + control_stack = (lispobj *) os_allocate(control_stack_size); +#endif #if (defined(i386) || defined(__x86_64)) - control_stack_end = (lispobj *) (CONTROL_STACK_START + control_stack_size); + control_stack_end = (lispobj *) ((char*) control_stack + control_stack_size); #endif - ensure_space(control_stack, control_stack_size); - + #ifdef SIGNAL_STACK_START ensure_space((lispobj *) SIGNAL_STACK_START, SIGNAL_STACK_SIZE); #endif diff --git a/lisp/x86-assem.S b/lisp/x86-assem.S index 178e913..211b17c 100644 --- a/lisp/x86-assem.S +++ b/lisp/x86-assem.S @@ -205,7 +205,11 @@ npx_save_done: movl %eax, GNAME(foreign_function_call_active) movl %esp,%ebx # remember current stack +#if defined(CONTROL_STACK_START) cmpl $CONTROL_STACK_START,%esp +#else + cmpl GNAME(control_stack),%esp +#endif jbe ChangeToLispStack cmpl GNAME(control_stack_end), %esp jbe OnLispStack diff --git a/lisp/x86-validate.h b/lisp/x86-validate.h index c49ea50..e3a2319 100644 --- a/lisp/x86-validate.h +++ b/lisp/x86-validate.h @@ -131,7 +131,9 @@ #define BINDING_STACK_START (0x38000000) #define BINDING_STACK_SIZE (0x07fff000) /* 128MB - 1 page */ +#if !defined(DARWIN) #define CONTROL_STACK_START (0x40000000) +#endif #if defined(DARWIN) /* * According to /usr/include/sys/signal.h, MINSIGSTKSZ is 32K and @@ -139,7 +141,9 @@ */ #define CONTROL_STACK_SIZE (0x07fdf000) /* 128MB - SIGSTKSZ - 1 page */ +#if 0 #define SIGNAL_STACK_START (0x47fe0000) /* One page past the end of the control stack */ +#endif #define SIGNAL_STACK_SIZE SIGSTKSZ #else #define CONTROL_STACK_SIZE (0x07fd8000) /* 128MB - SIGSTKSZ */ ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0