* interp/nocompil.lisp: Remove.

	* interp/Makefile.pamphlet: Adjust.

7 files changed, 20 insertions, 98 deletions

diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index 7a37bcb2..7eea5527 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -193,7 +193,6 @@ clean-local: mostlyclean-local
 distclean-local: clean-local
 
 makeint.lisp:	${OBJS} util.$(FASLEXT) \
-                nocompil.$(FASLEXT) \
 		sys-driver.$(FASLEXT) \
 	        ${OUTINTERP} obey.$(FASLEXT) \
 		database.date ${INOBJS} ${ASCOMP} ${ASAUTO} \
@@ -211,7 +210,6 @@ makeint.lisp:	${OBJS} util.$(FASLEXT) \
 	@ echo '(|importModule| "vmlisp")' >> makeint.lisp
 	@ echo '(|importModule| "hash")' >> makeint.lisp
 	@ echo '(gbc t)' >> makeint.lisp
-	@ echo '(|importModule| "nocompil")' >> makeint.lisp
 	@ echo '(|importModule| "util")' >> makeint.lisp
 	@ echo '(in-package "BOOT")' >> makeint.lisp
 	@ touch ${TIMESTAMP}
@@ -713,9 +711,6 @@ compress.$(FASLEXT): compress.boot sys-macros.$(FASLEXT)
 msg.$(FASLEXT): msg.boot sys-macros.$(FASLEXT) astr.$(FASLEXT)
 	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
 
-nocompil.$(FASLEXT): nocompil.lisp boot-pkg.$(FASLEXT)
-	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
-
 util.$(FASLEXT): util.lisp parsing.$(FASLEXT)
 	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
 
diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet
index b8b67c5c..ef951a9e 100644
--- a/src/interp/Makefile.pamphlet
+++ b/src/interp/Makefile.pamphlet
@@ -410,7 +410,6 @@ Doing otherwise causes havoc.
 
 <<savesys>>=
 makeint.lisp:	${OBJS} util.$(FASLEXT) \
-                nocompil.$(FASLEXT) \
 		sys-driver.$(FASLEXT) \
 	        ${OUTINTERP} obey.$(FASLEXT) \
 		database.date ${INOBJS} ${ASCOMP} ${ASAUTO} \
@@ -428,7 +427,6 @@ makeint.lisp:	${OBJS} util.$(FASLEXT) \
 	@ echo '(|importModule| "vmlisp")' >> makeint.lisp
 	@ echo '(|importModule| "hash")' >> makeint.lisp
 	@ echo '(gbc t)' >> makeint.lisp
-	@ echo '(|importModule| "nocompil")' >> makeint.lisp
 	@ echo '(|importModule| "util")' >> makeint.lisp
 	@ echo '(in-package "BOOT")' >> makeint.lisp
 	@ touch ${TIMESTAMP}
@@ -1027,9 +1025,6 @@ compress.$(FASLEXT): compress.boot sys-macros.$(FASLEXT)
 msg.$(FASLEXT): msg.boot sys-macros.$(FASLEXT) astr.$(FASLEXT)
 	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
 
-nocompil.$(FASLEXT): nocompil.lisp boot-pkg.$(FASLEXT)
-	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
-
 util.$(FASLEXT): util.lisp parsing.$(FASLEXT)
 	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
 
diff --git a/src/interp/g-error.boot b/src/interp/g-error.boot
index 2d1fb837..abba7c27 100644
--- a/src/interp/g-error.boot
+++ b/src/interp/g-error.boot
@@ -101,9 +101,6 @@ errorSupervisor1(errorType,errorMsg,$BreakMode) ==
 
 handleLispBreakLoop($BreakMode) ==
   TERPRI()
-  -- The next line is to try to deal with some reported cases of unwanted
-  -- backtraces appearing, MCD.
-  ENABLE_-BACKTRACE(nil)
   $BreakMode = 'break =>
     sayBrightly '" "
     BREAK()
diff --git a/src/interp/msg.boot b/src/interp/msg.boot
index 0befa79c..519f2562 100644
--- a/src/interp/msg.boot
+++ b/src/interp/msg.boot
@@ -85,9 +85,6 @@ ncBug (erMsgKey, erArgL,:optAttr) ==
   $newcompErrorCount := $newcompErrorCount + 1
   erMsg := processKeyedError _
         msgCreate('bug,$nopos, erMsgKey, erArgL,$compBugPrefix,optAttr)
-  -- The next line is to try to deal with some reported cases of unwanted
-  -- backtraces appearing, MCD.
-  ENABLE_-BACKTRACE(nil)
   BREAK()
   ncAbort()
  
diff --git a/src/interp/nocompil.lisp b/src/interp/nocompil.lisp
deleted file mode 100644
index 3adc630a..00000000
--- a/src/interp/nocompil.lisp
+++ /dev/null
@@ -1,77 +0,0 @@
-;; Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
-;; All rights reserved.
-;; Copyright (C) 2007, Gabriel Dos Reis.
-;; All rights reserved.
-;;
-;; Redistribution and use in source and binary forms, with or without
-;; modification, are permitted provided that the following conditions are
-;; met:
-;;
-;;     - Redistributions of source code must retain the above copyright
-;;       notice, this list of conditions and the following disclaimer.
-;;
-;;     - Redistributions in binary form must reproduce the above copyright
-;;       notice, this list of conditions and the following disclaimer in
-;;       the documentation and/or other materials provided with the
-;;       distribution.
-;;
-;;     - Neither the name of The Numerical ALgorithms Group Ltd. nor the
-;;       names of its contributors may be used to endorse or promote products
-;;       derived from this software without specific prior written permission.
-;;
-;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-;; IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-;; TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-;; PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-;; OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-;; EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-;; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-;; PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-;; LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-;; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-;; The function {\bf protected-symbol-warn} was added because it is
-;; used in {\bf setvart.boot} but apparently is nowhere defined. It
-;; is probably primitive to {\bf CCL}.
-
-;; The function {\bf protect-symbols} was added because it is
-;; used in {\bf setvart.boot} but apparently is nowhere defined. It
-;; is probably primitive to {\bf CCL}.
-
-;; The output of these functions is just a noisy warning message
-;; and this has been commented out.
-;; \section{GCL cmpnote function}
-;; GCL keeps noting the fact that the compiler is performing tail-recursion.
-;; Bill Schelter added this as a debugging tool for Axiom and it was never
-;; removed. Patching the lisp code in the GCL build fails as the system
-;; is actually built from the pre-compiled C code. Thus, we can only step
-;; on this message after the fact. The cmpnote function is used nowhere
-;; else in GCL so stepping on the function call seems best. We're unhappy
-;; with this hack and will try to convince the GCL crowd to fix this.
-
-
-#+:gcl (defun compiler::cmpnote (&rest x))
-
-(import-module "boot-pkg")
-(in-package "BOOT")
-
-(defun protected-symbol-warn (&rest arg))
-;  (format t "protected-symbol-warn called with ~A~%" arg))
-
-(defun protect-symbols (&rest arg))
-;  (format t "protected-symbol-warn called with ~A~%" arg))
-
-(defun use-fast-links (arg)
-;  (format t "use-fast-links called with ~A~%" arg)
-#+:GCL  (si::use-fast-links arg)
- )
-
-(defun verbos (arg))
-;  (format t "verbos called with ~A~%" arg))
-
-(defun enable-backtrace (&rest arg)
-#+:ccl
-  (format t "protected-symbol-warn called with ~A~%" arg))
-
diff --git a/src/interp/setvars.boot b/src/interp/setvars.boot
index f0f4d933..c32d85d9 100644
--- a/src/interp/setvars.boot
+++ b/src/interp/setvars.boot
@@ -179,6 +179,15 @@ translateTrueFalse2YesNo x ==
 set l ==  set1(l, $setOptions)
 
 
+++ turn on/off GCL optimized function call.
+useFastLinks flag ==
+)if %hasFeature KEYWORD::GCL
+  SI::USE_-FAST_-LINKS flag
+)else
+  flag
+)endif
+
+
 set1(l,setTree) ==
   null l => displaySetVariableSettings(setTree,"")
   $setOptionNames : local := [x.0 for x in setTree]
@@ -239,9 +248,9 @@ set1(l,setTree) ==
         then SET(setData.setVar, translateYesNo2TrueFalse setData.setDef)
         else
           if arg2 = 'nobreak then
-             USE_-FAST_-LINKS 'T
+             useFastLinks true
           if arg2 = 'fastlinks then
-             USE_-FAST_-LINKS 'NIL
+             useFastLinks false
              arg2 := 'break
           SET(setData.setVar, translateYesNo2TrueFalse arg2)
     -- if so set or not a valid choice, then show option information
@@ -896,6 +905,10 @@ protectedSymbolsWarning arg ==
     describeProtectedSymbolsWarning()
   PROTECTED_-SYMBOL_-WARN translateYesNo2TrueFalse first arg
 
+PROTECTED_-SYMBOL_-WARN flag ==
+  -- ??? Nobody seems to know what this function is supposed to do.
+  -- ??? It is rumored to have been builtin to CCL.
+  flag
 
 describeProtectSymbols() ==
  sayBrightly LIST(
@@ -920,6 +933,11 @@ protectSymbols arg ==
   PROTECT_-SYMBOLS translateYesNo2TrueFalse first arg
 
 
+PROTECT_-SYMBOLS flag ==
+  -- ??? nobody seems to know what this function is supposed to do.
+  -- ??? It has been rumored to be native to CCL.
+  flag
+
 -- See the subsection output algebra in setvart.boot
 -- 
 -- --------------------- The algebra Option ----------------------
diff --git a/src/interp/trace.boot b/src/interp/trace.boot
index d6770d54..883717c1 100644
--- a/src/interp/trace.boot
+++ b/src/interp/trace.boot
@@ -824,9 +824,6 @@ stupidIsSpadFunction fn ==
 
 break msg ==
   condition:= MONITOR_,EVALTRAN(_/BREAKCONDITION,nil)
-  -- The next line is to try to deal with some reported cases of unwanted
-  -- backtraces appearing, MCD.
-  ENABLE_-BACKTRACE(nil)
   EVAL condition =>
     sayBrightly msg
     INTERRUPT()