diff --git a/code/alieneval.lisp b/code/alieneval.lisp index 29d792c9809bc481c1d56774c8dcda13d6cf9df7..08cf6ec56ec9d531886ea8bde24b3c897cf62c45 100644 --- a/code/alieneval.lisp +++ b/code/alieneval.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/alieneval.lisp,v 1.52 2002/08/27 22:18:23 moore Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/alieneval.lisp,v 1.53 2003/01/23 21:05:33 toy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -1357,7 +1357,7 @@ (setf (info variable alien-info lisp-name) (make-heap-alien-info :type type :sap-form `(foreign-symbol-address - ',alien-name :flavor :data)))) + ,alien-name :flavor :data)))) ;;; EXTERN-ALIEN -- public. ;;; @@ -1955,7 +1955,7 @@ (error "~S is not an alien function." alien))))) (defmacro def-alien-routine (name result-type &rest args) - "Def-C-Routine Name Result-Type + "Def-Alien-Routine Name Result-Type {(Arg-Name Arg-Type [Style])}* Define a foreign interface function for the routine with the specified Name, diff --git a/code/bignum.lisp b/code/bignum.lisp index 8220c8b995051b846bcf35af65e0bcff498587b8..262cbf7816d7fd175a106b3d6ab530cd337ff6fb 100644 --- a/code/bignum.lisp +++ b/code/bignum.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/bignum.lisp,v 1.30 2002/10/02 17:30:38 toy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/bignum.lisp,v 1.31 2003/01/23 21:05:33 toy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -1610,8 +1610,10 @@ down to individual words.") (declare (type bignum-index len)) (let ((exp (+ exp bias))) (when (> exp max) - (error "Too large to be represented as a ~S:~% ~S" - format x)) + (error 'simple-type-error + :format-control "Too large to be represented as a ~S:~% ~S" + :format-arguments (list format x) + :expected-type format)) exp))) (cond diff --git a/code/defstruct.lisp b/code/defstruct.lisp index 801e46cc453bd2cf384ba266b1b92371f1b3b209..9ce6ffbb9bf9423f4f7ecf45d6ec4d19c3439917 100644 --- a/code/defstruct.lisp +++ b/code/defstruct.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/defstruct.lisp,v 1.78 2003/01/03 18:02:58 toy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/defstruct.lisp,v 1.79 2003/01/23 21:05:33 toy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -1644,7 +1644,7 @@ (unless (accessor-inherited-data aname info) (undefine-function-name aname) (unless (dsd-read-only slot) - (undefine-function-name `(setf ,aname)))))))) + (undefine-function-name `(setf ,aname)))) )))) ;; diff --git a/code/format.lisp b/code/format.lisp index 9ad30be7b5b14744b1ae35fa8a14a9e70ebdcd7c..238f543bb834fade529509f0712341e55ade6540 100644 --- a/code/format.lisp +++ b/code/format.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/format.lisp,v 1.46 2002/10/25 14:36:20 toy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/format.lisp,v 1.47 2003/01/23 21:05:33 toy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -2120,7 +2120,9 @@ (interpret-format-logical-block stream orig-args args prefix per-line-p insides suffix atsignp)) - (let ((count (apply #'+ (mapcar (lambda (x) (count-if #'illegal-inside-justification-p x)) segments)))) + (let ((count (reduce #'+ (mapcar (lambda (x) + (count-if #'illegal-inside-justification-p x)) + segments)))) (when (> count 0) ;; ANSI specifies that "an error is signalled" in this ;; situation. diff --git a/code/macros.lisp b/code/macros.lisp index 8505eb2b28564b5615ddcaf8cd7f71b1da5928cd..64eb8597a57b4039cd7f3d01301db8028f6c7931 100644 --- a/code/macros.lisp +++ b/code/macros.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/macros.lisp,v 1.84 2002/11/22 18:12:03 toy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/macros.lisp,v 1.85 2003/01/23 21:05:34 toy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -159,7 +159,7 @@ ;;; define-symbol-macro -- Public ;;; (defmacro define-symbol-macro (name expansion) - `(eval-when (compile load eval) + `(eval-when (:compile-toplevel :load-toplevel :execute) (%define-symbol-macro ',name ',expansion))) ;;; (defun %define-symbol-macro (name expansion) @@ -187,13 +187,13 @@ (defmacro deftype (name arglist &body body) "Syntax like DEFMACRO, but defines a new type." (unless (symbolp name) - (error "~S -- Type name not a symbol." name)) + (simple-program-error "~S -- Type name not a symbol." name)) (let ((whole (gensym "WHOLE-"))) (multiple-value-bind (body local-decs doc) (parse-defmacro arglist whole body name 'deftype :default-default ''*) - `(eval-when (compile load eval) + `(eval-when (:compile-toplevel :load-toplevel :execute) (%deftype ',name #'(lambda (,whole) ,@local-decs @@ -233,7 +233,7 @@ "Syntax like DEFMACRO, but creates a Setf-Expansion generator. The body must be a form that returns the five magical values." (unless (symbolp access-fn) - (error "~S -- Access-function name not a symbol in DEFINE-SETF-EXPANDER." + (simple-program-error "~S -- Access-function name not a symbol in DEFINE-SETF-EXPANDER." access-fn)) (let ((whole (gensym "WHOLE-")) @@ -242,7 +242,7 @@ (parse-defmacro lambda-list whole body access-fn 'define-setf-expander :environment environment) - `(eval-when (load compile eval) + `(eval-when (:compile-toplevel :load-toplevel :execute) (%define-setf-macro ',access-fn #'(lambda (,whole ,environment) @@ -748,7 +748,7 @@ (do ((a args (cddr a))) ((endp a)) (if (endp (cdr a)) - (error "Odd number of args to PSETF.")) + (simple-program-error "Odd number of args to PSETF.")) (multiple-value-bind (dummies vals newval setter getter) (get-setf-expansion (car a) env) @@ -1223,7 +1223,7 @@ ;;;; CASE, TYPECASE, & Friends. -(eval-when (compile load eval) +(eval-when (:compile-toplevel :load-toplevel :execute) ;;; CASE-BODY returns code for all the standard "case" macros. Name is the ;;; macro name, and keyform is the thing to case on. Multi-p indicates whether @@ -1519,7 +1519,7 @@ (defmacro with-output-to-string ((var &optional string) &body (forms decls)) - "If *string* is specified, it must be a string with a fill pointer; + "If STRING is specified, it must be a string with a fill pointer; the output is incrementally appended to the string (as if by use of VECTOR-PUSH-EXTEND)." (if string @@ -1628,7 +1628,7 @@ ;;;; With-Compilation-Unit: -;;; True if we are within a With-Compilation-Unit form, which normally causes +;;; True if we are within a WITH-COMPILATION-UNIT form, which normally causes ;;; nested uses to be NOOPS. ;;; (defvar *in-compilation-unit* nil) diff --git a/code/ntrace.lisp b/code/ntrace.lisp index 8cfb01dccc44169af1ddde59c196266600dbff19..0c9fc68e1e54c52fc85cc535c3d78ef9691e3aa1 100644 --- a/code/ntrace.lisp +++ b/code/ntrace.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/ntrace.lisp,v 1.17 1997/11/30 13:54:57 pw Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/ntrace.lisp,v 1.18 2003/01/23 21:05:34 toy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -600,7 +600,7 @@ :PRINT Form :PRINT-AFTER Form :PRINT-ALL Form - In addition to the usual prinout, he result of evaluating Form is + In addition to the usual printout, the result of evaluating FORM is printed at the start of the function, at the end of the function, or both, according to the respective option. Multiple print options cause multiple values to be printed. diff --git a/code/profile.lisp b/code/profile.lisp index 0131d50620181b97f0ffb839a4374d468bfb4b64..0566f05ecda8aed635cbb41db6c68ab49900ed80 100644 --- a/code/profile.lisp +++ b/code/profile.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/profile.lisp,v 1.26 2003/01/07 17:19:10 toy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/profile.lisp,v 1.27 2003/01/23 21:05:34 toy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -205,10 +205,10 @@ this, the functions are listed. If NIL, then always list the functions.") (defvar *profile-info* (make-hash-table :test #'equal)) (defstruct profile-info (name nil) - (old-definition (error "Required keyword arg not supplied.") :type function) - (new-definition (error "Required keyword arg not supplied.") :type function) - (read-time (error "Required keyword arg not supplied.") :type function) - (reset-time (error "Required keyword arg not supplied.") :type function)) + (old-definition (required-argument) :type function) + (new-definition (required-argument) :type function) + (read-time (required-argument) :type function) + (reset-time (required-argument) :type function)) ;;; PROFILE-INFO-OR-LOSE -- Internal ;;; @@ -229,7 +229,7 @@ this, the functions are listed. If NIL, then always list the functions.") ;;; for each nested call is added into the appropriate variable. When the ;;; outer function returns, these amounts are subtracted from the total. ;;; -;;; *enclosed-consing-hi* and *enclosed-consing* represent the total +;;; *enclosed-consing-h* and *enclosed-consing-l* represent the total ;;; consing as a pair of fixnum-sized integers to reduce consing and ;;; allow for about 2^58 bytes of total consing. (Assumes positive ;;; fixnums are 29 bits long). diff --git a/code/remote.lisp b/code/remote.lisp index 974325d78b01de0731c89b964d0826432e6113d3..7e8cf273f575da53ba2b92af94be4936d48f754b 100644 --- a/code/remote.lisp +++ b/code/remote.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/remote.lisp,v 1.7 2002/10/07 14:31:05 toy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/remote.lisp,v 1.8 2003/01/23 21:05:34 toy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -47,8 +47,8 @@ ;;; REMOTE -- public ;;; -;;; Execute the body remotly. Subforms are executed locally in the lexical -;;; envionment of the macro call. No values are returned. +;;; Execute the body remotely. Subforms are executed locally in the lexical +;;; environment of the macro call. No values are returned. ;;; (defmacro remote (wire-form &body forms) "Evaluates the given forms remotly. No values are returned, as the remote @@ -71,9 +71,9 @@ evaluation is asyncronus." ;;; return, cause we can kind of guess at what the currect results would be. ;;; (defmacro remote-value-bind (wire-form vars form &rest body) - "Bind vars to the multiple values of form (which is executed remotly). The -forms in body are only executed if the remote function returned as apposed -to aborting due to a throw." + "Bind VARS to the multiple values of FORM (which is executed remotely). The +forms in BODY are only executed if the remote function returned (as apposed +to aborting due to a throw)." (cond ((null vars) `(progn diff --git a/code/seq.lisp b/code/seq.lisp index b163dbebac58f82bd1de494c3fc5bded8c727044..333a836c237211af332465a8f0eabb2f148fedf2 100644 --- a/code/seq.lisp +++ b/code/seq.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/seq.lisp,v 1.45 2002/12/20 17:59:44 toy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/seq.lisp,v 1.46 2003/01/23 21:05:35 toy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -33,7 +33,7 @@ ;;; Spice-Lisp specific stuff and utilities: -(eval-when (compile) +(eval-when (:compile-toplevel) ;;; Seq-Dispatch does an efficient type-dispatch on the given Sequence. @@ -392,7 +392,7 @@ ;;; Replace: -(eval-when (compile eval) +(eval-when (:compile-toplevel :execute) ;;; If we are copying around in the same vector, be careful not to copy the ;;; same elements over repeatedly. We do this by copying backwards. diff --git a/code/wire.lisp b/code/wire.lisp index aa7b503af968a13f5d546ad3df608acad54c76aa..d329116bc07188d1d9d278b0ed33a92901395b03 100644 --- a/code/wire.lisp +++ b/code/wire.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/wire.lisp,v 1.12 2001/01/02 13:01:17 pw Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/wire.lisp,v 1.13 2003/01/23 21:05:35 toy Rel $") ;;; ;;; ********************************************************************** ;;; @@ -109,7 +109,7 @@ (define-condition wire-eof (wire-error) () (:report (lambda (condition stream) - (format stream "Recieved EOF on ~A." + (format stream "Received EOF on ~A." (wire-error-wire condition))))) (define-condition wire-io-error (wire-error) diff --git a/compiler/sparc/array.lisp b/compiler/sparc/array.lisp index 39a3053edf5cf491b913a17174c0003633f74274..5477ccd056290a96aa60e2b23a7b8a50f68a89d9 100644 --- a/compiler/sparc/array.lisp +++ b/compiler/sparc/array.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/array.lisp,v 1.24 2002/09/09 14:08:48 toy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/array.lisp,v 1.25 2003/01/23 21:05:36 toy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -103,7 +103,7 @@ ;;;; Accessors/Setters -;;; Variants built on top of word-index-ref, etc. I.e. those vectors whos +;;; Variants built on top of word-index-ref, etc. I.e. those vectors whose ;;; elements are represented in integer registers and are built out of ;;; 8, 16, or 32 bit elements. diff --git a/compiler/vop.lisp b/compiler/vop.lisp index df6e6aef021e3c2bf431cb9c13da7be5909a07db..a43fab09375b6c8cbffd7883d24614c49d710f35 100644 --- a/compiler/vop.lisp +++ b/compiler/vop.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/vop.lisp,v 1.40 1994/10/31 04:27:28 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/vop.lisp,v 1.41 2003/01/23 21:05:35 toy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -1131,7 +1131,7 @@ ;;; The Global-Conflicts structure represents the conflicts for global TNs. ;;; Each global TN has a list of these structures, one for each block that it -;;; is live in. In addition to repsenting the result of lifetime analysis, the +;;; is live in. In addition to representing the result of lifetime analysis, the ;;; global conflicts structure is used during lifetime analysis to represent ;;; the set of TNs live at the start of the IR2 block. ;;; diff --git a/docs/cmu-user/debug-internals.tex b/docs/cmu-user/debug-internals.tex index bdff769b1895b8bcd7dcc2c4503670c21051c55c..8d21902d34e805c7bc7458df94645c42c1020f1b 100644 --- a/docs/cmu-user/debug-internals.tex +++ b/docs/cmu-user/debug-internals.tex @@ -643,7 +643,7 @@ may not be a place for which the compiler dumped debug information. \begin{defun}{}{code-location-unknown-p}{\args{\var{basic-code-location}}} This function returns whether \var{basic-code-location} is unknown. - It returns \nil when the code-location is known. + It returns \nil{} when the code-location is known. \end{defun} @@ -711,7 +711,7 @@ subform corresponding to the code-location. \begin{defun}{}{debug-source-compiled}{\args{\var{debug-source}}} This function returns the time someone compiled the source. This is - \nil if the source is uncompiled. + \nil{} if the source is uncompiled. \end{defun} @@ -734,10 +734,10 @@ actual source form: \begin{defun}{}{debug-source-start-positions}{\args{\var{debug-source}}} - This function returns the file position of each top-level form a + This function returns the file position of each top-level form as a vector if \var{debug-source} is from a \kwd{file}. If \code{debug-source-from} is \kwd{lisp} or \kwd{stream}, or the file - is byte-compiled, then the result is \false. + is byte-compiled, then the result is \false{}. \end{defun} diff --git a/docs/cmu-user/macros.tex b/docs/cmu-user/macros.tex index cd887081d6073e6e45fe7cd0d7e46323dfdc0068..2cef149ce6de132dd90fa0ee5bc0e623edc49ef6 100644 --- a/docs/cmu-user/macros.tex +++ b/docs/cmu-user/macros.tex @@ -217,7 +217,7 @@ \newcommand{\aliens}{Aliens} \newcommand{\hemlock}{Hemlock} \newcommand{\python}{Python} -\newcommand{\cmucl}{CMUCL} +\newcommand{\cmucl}{\textsc{cmucl}} \newcommand{\clisp}{Common Lisp} \newcommand{\llisp}{Common Lisp} \newcommand{\cltl}{\textit{Common Lisp: The Language}} diff --git a/lisp/lisp.c b/lisp/lisp.c index 8a260363cd60607d8d2fff2baeabba42ad78cb42..b2e2100952f674f6c3535ce78008d183ee5218c9 100644 --- a/lisp/lisp.c +++ b/lisp/lisp.c @@ -1,13 +1,14 @@ /* * main() entry point for a stand alone lisp image. * - * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/lisp.c,v 1.26 2002/08/27 22:18:32 moore Exp $ + * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/lisp.c,v 1.27 2003/01/23 21:05:38 toy Exp $ * */ #include <stdio.h> #include <sys/types.h> #include <stdlib.h> +#include <limits.h> #include <sys/file.h> #include <sys/param.h> #include <sys/stat.h> @@ -92,9 +93,6 @@ int main(int argc, char *argv[], char *envp[]) boolean monitor; lispobj initial_function; -#ifdef MACH - mach_init(); -#endif #if defined(SVR4) || defined(__linux__) tzset(); #endif @@ -155,7 +153,7 @@ int main(int argc, char *argv[], char *envp[]) #ifdef MACH extern char *getenv(char *var); #endif - static char buf[MAXPATHLEN]; + static char buf[_POSIX_PATH_MAX]; char *lib = getenv("CMUCLLIB"); if (lib != NULL) { @@ -271,4 +269,5 @@ int main(int argc, char *argv[], char *envp[]) printf("Initial function returned?\n"); exit(1); } + return 0; /* not reached */ } diff --git a/lisp/monitor.c b/lisp/monitor.c index d41182caf71b95c6a497b6659afaf3d082b7a0e3..3ef7471be76441f94e41ed31ab75594e6c468042 100644 --- a/lisp/monitor.c +++ b/lisp/monitor.c @@ -1,4 +1,4 @@ -/* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/monitor.c,v 1.12 2000/10/27 19:25:55 dtc Exp $ */ +/* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/monitor.c,v 1.13 2003/01/23 21:05:38 toy Exp $ */ #include <stdio.h> #include <sys/types.h> @@ -412,7 +412,7 @@ static void catchers_cmd(char **ptr) printf("0x%08lX:\n\tuwp: 0x%08lX\n\tfp: 0x%08lX\n\tcode: 0x%08lx\n\tentry: 0x%08lx\n\ttag: ", (unsigned long)catch, (unsigned long)(catch->current_uwp), (unsigned long)(catch->current_cont), - component_ptr_from_pc(catch->entry_pc) + type_OtherPointer, + component_ptr_from_pc((lispobj *)catch->entry_pc) + type_OtherPointer, catch->entry_pc); #endif brief_print((lispobj)catch->tag); diff --git a/lisp/purify.c b/lisp/purify.c index 11297900454b9f1cb8b118b4c3605aa43345c5f2..d97c10397f853c79b3cac8446db2eccef679c5b0 100644 --- a/lisp/purify.c +++ b/lisp/purify.c @@ -10,7 +10,7 @@ and x86/GENCGC stack scavenging, by Douglas Crosher, 1996, 1997, 1998. - $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/purify.c,v 1.21 2002/11/08 20:01:41 toy Exp $ + $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/purify.c,v 1.22 2003/01/23 21:05:39 toy Exp $ */ #include <stdio.h> @@ -32,7 +32,7 @@ #undef PRINTNOISE -#if defined(ibmrt) || defined(i386) +#ifdef i386 static lispobj *current_dynamic_space_free_pointer; #endif @@ -1573,7 +1573,7 @@ int purify(lispobj static_roots, lispobj read_only_roots) else cgc_free_heap(); #else -#if defined GENCGC +#ifdef GENCGC gc_free_heap(); #else /* ibmrt using GC */ @@ -1586,7 +1586,7 @@ int purify(lispobj static_roots, lispobj read_only_roots) /* Call the scavenger hook functions */ { struct scavenger_hook *sh; - for (sh = PTR((int)scavenger_hooks); sh != PTR(NIL);) { + for (sh = PTR((int)scavenger_hooks); (lispobj)sh != PTR(NIL);) { struct scavenger_hook *sh_next = PTR((int) sh->next); funcall0(sh->function); sh->next = NULL; diff --git a/tools/worldbuild.lisp b/tools/worldbuild.lisp index 210a952883df36a9ac3b14fbb5059b6f9695ef1f..aaa4b4311a1f4050aab38bae762f22c95fbeec3d 100644 --- a/tools/worldbuild.lisp +++ b/tools/worldbuild.lisp @@ -7,7 +7,7 @@ ;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/worldbuild.lisp,v 1.45 2002/11/05 22:45:53 cracauer Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/worldbuild.lisp,v 1.46 2003/01/23 21:05:39 toy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -177,9 +177,7 @@ '("target:code/multi-proc")) )) -(setf *genesis-core-name* - #+(and mach sparc) "/usr/tmp/kernel.core" - #-(and mach sparc) "target:lisp/kernel.core") +(setf *genesis-core-name* "target:lisp/kernel.core") (setf *genesis-c-header-name* "target:lisp/internals.h") (setf *genesis-symbol-table* "target:lisp/lisp.nm") (setf *genesis-map-name* "target:lisp/lisp.map")