cmucl-cvs

cmucl-cvs@common-lisp.net

2904 discussions

[cmucl-cvs] [git] CMU Common Lisp branch master updated. a0559708e0f703f88c7bb731689e85e3c9f0b88c
by Alex Goncharov 10 Oct '11

10 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 a0559708e0f703f88c7bb731689e85e3c9f0b88c (commit) from e04778be14f6bba6a489a8bae37e39dee50bebe8 (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 a0559708e0f703f88c7bb731689e85e3c9f0b88c Author: Alex Goncharov <alex-goncharov(a)comcast.net> Date: Sun Oct 9 19:04:55 2011 -0400 compile-file: add a doc string for the :Load argument. diff --git a/compiler/main.lisp b/compiler/main.lisp index 2a02cf0..eafe6e3 100644 --- a/compiler/main.lisp +++ b/compiler/main.lisp @@ -1806,6 +1806,9 @@ in the user USER-INFO slot of STREAM-SOURCE-LOCATIONs.") input file name. Other options available via keywords: :Output-File The name of the fasl to output, NIL for none, T for the default. + :Load + Load the compiled file; T here requires :Output-File to be T, as well. + The default is NIL. :Error-File The name of the error listing file, NIL for none (the default), T for .err. ----------------------------------------------------------------------- Summary of changes: compiler/main.lisp | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. e04778be14f6bba6a489a8bae37e39dee50bebe8
by Alex Goncharov 10 Oct '11

10 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 e04778be14f6bba6a489a8bae37e39dee50bebe8 (commit) via ef0137913f8e6bcbe6bc7931d25f5c30cbb91857 (commit) from 39ecf08786867b6aa353203a26b51256a541cedf (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 e04778be14f6bba6a489a8bae37e39dee50bebe8 Merge: ef01379 39ecf08 Author: Alex Goncharov <alex-goncharov(a)comcast.net> Date: Sun Oct 9 18:57:29 2011 -0400 Merge branch 'master' of ssh://common-lisp.net/var/git/projects/cmucl/cmucl commit ef0137913f8e6bcbe6bc7931d25f5c30cbb91857 Author: Alex Goncharov <alex-goncharov(a)comcast.net> Date: Sun Oct 9 18:57:10 2011 -0400 Remove .gitignore: no need for it for now diff --git a/.gitignore b/.gitignore deleted file mode 100644 index d3e83a9..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -contrib/asdf/asdf.*f ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) delete mode 100644 .gitignore hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. 39ecf08786867b6aa353203a26b51256a541cedf
by Raymond Toy 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 39ecf08786867b6aa353203a26b51256a541cedf (commit) via e656215ac44b80944c2ead1314d512ddbcb94ac4 (commit) via 803a8bd24679310c298c8e51264f9dbdb2cf30a7 (commit) from 15db498a83e329bfd524a40897a07a3076f390c8 (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 39ecf08786867b6aa353203a26b51256a541cedf Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Oct 8 08:44:22 2011 -0700 Remove reference to CVS. diff --git a/tools/build-all.sh b/tools/build-all.sh index 99bf4c1..c2462b4 100755 --- a/tools/build-all.sh +++ b/tools/build-all.sh @@ -29,7 +29,7 @@ usage () echo " (only applicable for build 1)" echo " -8 x Use specified Lisp to build 8-bit version." echo " (only applicable for build 1)" - echo " -U Update and overwite the CVS translations files." + echo " -U Update and overwite the translations files." echo " -P On the last build, (re)generate cmucl.pot and the" echo " translations" } commit e656215ac44b80944c2ead1314d512ddbcb94ac4 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Oct 8 08:43:38 2011 -0700 o Let build.sh set the default version instead of setting one here. o Add -P option to control whether we update the pot files or not. diff --git a/tools/build-all.sh b/tools/build-all.sh index 6410582..99bf4c1 100755 --- a/tools/build-all.sh +++ b/tools/build-all.sh @@ -6,7 +6,7 @@ usage () { - echo "build-all.sh [bBCvU] [-o old] [-8 old8bit]" + echo "build-all.sh [-bBCvUP] [-o old] [-8 old8bit]" echo "" echo "Build all variants of cmucl for a specific architecture." echo "This means build the unicode and non-unicode variants." @@ -24,22 +24,21 @@ usage () echo ' -C [l m] Create the build directories. The args are what' echo ' you would give to create-target.sh for the lisp' echo ' and motif variant.' - echo ' -v v Use the given string as the version. Default is' - echo " today's date" + echo ' -v v Use the given string as the version.' echo " -o x Use specified Lisp to build unicode version." echo " (only applicable for build 1)" echo " -8 x Use specified Lisp to build 8-bit version." echo " (only applicable for build 1)" echo " -U Update and overwite the CVS translations files." + echo " -P On the last build, (re)generate cmucl.pot and the" + echo " translations" } -VERSION="`date '+%Y-%m-%d %H:%M:%S'`" -GIT_HASH="`(cd src; git describe --dirty 2>/dev/null)`" -VERSION="`date '+%Y-%m-%d %H:%M:%S'` $GIT_HASH" BASE=build CREATE_OPT="" +UPDATE_POT="-P" -while getopts "UB:b:v:C:o:8:?" arg +while getopts "PUB:b:v:C:o:8:?" arg do case $arg in b) BASE="$OPTARG" ;; @@ -49,6 +48,7 @@ do 8) OLD8="$OPTARG" ;; v) VERSION="$OPTARG" ;; U) UPDATE_TRANS="-U" ;; + P) UPDATE_POT="" ;; \?) usage ;; esac done @@ -63,20 +63,21 @@ if [ "$OLDLISP" = "" -a "$OLD8" = "" ]; then exit 1 fi +VERSION=${VERSION:+-v "$VERSION"} buildx86 () { if [ -n "$OLD8" ]; then # Build non-unicode versions set -x - src/tools/build.sh -f x87 -b ${BASE}-8bit $bootfiles -v "$VERSION" -C "${CREATE_OPT}" ${UPDATE_TRANS} -o "$OLD8" - src/tools/build.sh -f sse2 -b ${BASE}-8bit $bootfiles -v "$VERSION" -C "${CREATE_OPT}" ${UPDATE_TRANS} -o "$OLD8" + src/tools/build.sh -f x87 -b ${BASE}-8bit $bootfiles "$VERSION" -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLD8" + src/tools/build.sh -f sse2 -b ${BASE}-8bit $bootfiles "$VERSION" -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLD8" set +x fi # Build the unicode versions if [ -n "$OLDLISP" ]; then set -x - src/tools/build.sh -f x87 -b ${BASE} $bootfiles -v "$VERSION" -C "${CREATE_OPT}" ${UPDATE_TRANS} -o "$OLDLISP" - src/tools/build.sh -f sse2 -b ${BASE} $bootfiles -v "$VERSION" -C "${CREATE_OPT}" ${UPDATE_TRANS} -o "$OLDLISP" + src/tools/build.sh -f x87 -b ${BASE} $bootfiles "$VERSION" -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP" + src/tools/build.sh -f sse2 -b ${BASE} $bootfiles "$VERSION" -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP" set +x fi } @@ -86,13 +87,13 @@ buildsun4 () # Build non-unicode versions if [ -n "$OLD8" ]; then set -x - src/tools/build.sh -b ${BASE}-8bit $bootfiles -v "$VERSION" -C "$CREATE_OPT" ${UPDATE_TRANS} -o "$OLD8" + src/tools/build.sh -b ${BASE}-8bit $bootfiles "$VERSION" -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLD8" set +x fi # Build the unicode version. if [ -n "$OLDLISP" ]; then set -x - src/tools/build.sh -b ${BASE} $bootfiles -v "$VERSION" -C "$CREATE_OPT" ${UPDATE_TRANS} -o "$OLDLISP" + src/tools/build.sh -b ${BASE} $bootfiles "$VERSION" -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP" set +x fi } commit 803a8bd24679310c298c8e51264f9dbdb2cf30a7 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Oct 8 08:42:08 2011 -0700 Use git describe instead of git log to get a version. 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 ----------------------------------------------------------------------- Summary of changes: tools/build-all.sh | 29 +++++++++++++++-------------- tools/build.sh | 2 +- 2 files changed, 16 insertions(+), 15 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. 15db498a83e329bfd524a40897a07a3076f390c8
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 15db498a83e329bfd524a40897a07a3076f390c8 (commit) from 4be42bd6d9718524eab70a3cdc9ba8f457d83b86 (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 15db498a83e329bfd524a40897a07a3076f390c8 Author: Alex Goncharov <alex-goncharov(a)comcast.net> Date: Sat Oct 8 07:49:24 2011 -0400 tools/create-target.sh: merge from dynamic-stack-alloc diff --git a/tools/create-target.sh b/tools/create-target.sh index 48481dd..7c0854c 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" ] || { @@ -40,7 +43,7 @@ uname_m=`uname -m 2>/dev/null` *) quit "Unsupported OS: $uname_s";; esac } -[ -n "$lisp_variant" ] || quit "Failed to determine lisp_variant" +[ -n "$lisp_variant" ] || quit "Can't determine lisp_variant" [ -f src/lisp/Config.$lisp_variant ] || quit "Config.$lisp_variant not found" case $lisp_variant in @@ -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" @@ -104,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 "Can't create setenv.lisp" ----------------------------------------------------------------------- Summary of changes: tools/create-target.sh | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

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

08 Oct '11

1 0

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

08 Oct '11

1 0

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

08 Oct '11

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

cmucl-cvs