diff --git a/changelog b/changelog index a29266e..140dd21 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,5 @@ +20090930 tpd src/axiom-website/patches.html 20090930.02.tpd.patch +20090930 tpd src/interp/nrunfast.lisp cleanup 20090930 tpd src/axiom-website/patches.html 20090930.01.tpd.patch 20090930 tpd src/interp/nrungo.lisp cleanup 20090929 tpd src/axiom-website/patches.html 20090929.02.tpd.patch diff --git a/src/axiom-website/patches.html b/src/axiom-website/patches.html index bb61f4e..27be959 100644 --- a/src/axiom-website/patches.html +++ b/src/axiom-website/patches.html @@ -2065,5 +2065,7 @@ src/interp/nruntime.lisp cleanup
src/interp/nrunopt.lisp cleanup
20090930.01.tpd.patch src/interp/nrungo.lisp cleanup
+20090930.02.tpd.patch +src/interp/nrunfast.lisp cleanup
diff --git a/src/interp/nrunfast.lisp.pamphlet b/src/interp/nrunfast.lisp.pamphlet index cad4903..172f764 100644 --- a/src/interp/nrunfast.lisp.pamphlet +++ b/src/interp/nrunfast.lisp.pamphlet @@ -31,6 +31,10 @@ ; $doNotCompressHashTableIfTrue := true (DEFUN |initNewWorld| () + (declare (special |$NRTflag| |$NRTvec| |$NRTmakeCompactDirect| |$NRTquick| + |$NRTmakeShortDirect| |$newWorld| |$monitorNewWorld| + |$consistencyCheck| |$spadLibFT| |$NRTmonitorIfTrue| + |$updateCatTableIfTrue| |$doNotCompressHashTableIfTrue|)) (PROGN (SPADLET |$NRTflag| 'T) (SPADLET |$NRTvec| 'T) @@ -145,6 +149,7 @@ (PROG (|thisDomain| |op| |thisDomainForm| |bytevec| |numOfArgs| |goGetDomainSlotIndex| |goGetDomain| |index| |sig| |thisSlot| |slot|) + (declare (special |$monitorNewWorld| |$returnNowhereFromGoGet|)) (RETURN (SEQ (PROGN (SPADLET |thisDomain| (CAR |env|)) @@ -343,7 +348,8 @@ |max| |k| |maxIndex| |finish| |numArgs| |numTableArgs| |predIndex| |loc| |i| |subsumptionSig| |slot| |someMatch| |success| |start| |u|) - (DECLARE (SPECIAL |$isDefaultingPackage|)) + (DECLARE (SPECIAL |$isDefaultingPackage| |$monitorNewWorld| + |$lookupDefaults|)) (RETURN (SEQ (PROGN (SPADLET |domain| (CAR G166177)) @@ -521,6 +527,7 @@ ; EQ(op, "%%") (DEFUN |opIsHasCat| (|op|) + (declare (special |$hasCatOpHash|)) (COND ((|hashCode?| |op|) (EQL |op| |$hasCatOpHash|)) ('T (EQ |op| '%%)))) @@ -613,7 +620,8 @@ |predvec| |max| |k| |maxIndex| |finish| |numArgs| |numTableArgs| |predIndex| |exportSig| |loc| |i| |subsumptionSig| |slot| |someMatch| |success| |start| |u|) - (DECLARE (SPECIAL |$isDefaultingPackage|)) + (DECLARE (SPECIAL |$isDefaultingPackage| |$monitorNewWorld| + |$lookupDefaults| |$hashOp0| |$hashOp1|)) (RETURN (SEQ (PROGN (SPADLET |domain| (CAR G166265)) @@ -902,7 +910,8 @@ |varList| |valueList| |nsig| |entry| |cat| |infovec| |opvec| |max| |code| |byteVector| |endPos| |table| |u| |v| |packageForm| |success| |package| |res|) - (DECLARE (SPECIAL |$lookupDefaults|)) + (DECLARE (SPECIAL |$lookupDefaults| |$monitorNewWorld| + |$Slot1DataBase| |$FormalMapVariableList|)) (RETURN (SEQ (PROGN (SPADLET |slot4| (ELT |dom| 4)) @@ -1159,6 +1168,7 @@ (DEFUN |newLookupInAddChain| (|op| |sig| |addFormDomain| |dollar|) (PROG (|addFunction|) + (declare (special |$monitorNewWorld|)) (RETURN (PROGN (COND @@ -1297,7 +1307,8 @@ |varList| |valueList| |nsig| |entry| |cat| |infovec| |opvec| |max| |code| |byteVector| |endPos| |packageForm| |success| |package| |res|) - (DECLARE (SPECIAL |$lookupDefaults|)) + (DECLARE (SPECIAL |$lookupDefaults| |$monitorNewWorld| + |$FormalMapVariableList|)) (RETURN (SEQ (PROGN (SPADLET |slot4| (ELT |dom| 4)) @@ -1581,7 +1592,8 @@ |cat| |infovec| |opvec| |max| |code| |byteVector| |numOfArgs| |table| |u| |v| |packageForm| |success| |package| |res|) - (DECLARE (SPECIAL |$lookupDefaults|)) + (DECLARE (SPECIAL |$lookupDefaults| |$monitorNewWorld| + |$Slot1DataBase| |$FormalMapVariableList|)) (RETURN (SEQ (PROGN (SPADLET |$lookupDefaults| NIL) @@ -1849,6 +1861,7 @@ ; defaultPackage := cacheCategoryPackage(packageVec,catVec,i) (DEFUN |getNewDefaultPackage| (|op| |sig| |infovec| |dom| |dollar|) + (declare (ignore |dom| |dollar|)) (PROG (|opvec| |numvec| |max| |k| |maxIndex| |finish| |numArgs| |numTableArgs| |i| |success| |start| |defaultPackage|) (RETURN @@ -1973,6 +1986,7 @@ (DEFUN |lazyMatchArg2| (|s| |a| |dollar| |domain| |typeFlag|) (PROG (|d| |domainArg| |dhash| |ISTMP#1| |y| |op|) + (declare (special |$isDefaultingPackage|)) (RETURN (PROGN (COND @@ -2387,6 +2401,7 @@ ; newExpandTypeSlot(slot,domain,domain) (DEFUN |newExpandGoGetTypeSlot| (|slot| |dollar| |domain|) + (declare (ignore |dollar|)) (|newExpandTypeSlot| |slot| |domain| |domain|)) ;newExpandTypeSlot(slot, dollar, domain) == @@ -2588,6 +2603,7 @@ ; domain.index (DEFUN |sigDomainVal| (|dollar| |domain| |index|) + (declare (special |dollar|)) (COND ((EQL |index| 0) '$) ((EQL |index| 2) |domain|) @@ -2607,6 +2623,7 @@ (DEFUN |lazyDomainSet| (|lazyForm| |thisDomain| |slot|) (PROG (|form| |slotDomain|) + (declare (special |$monitorNewWorld|)) (RETURN (PROGN (SPADLET |form| |lazyForm|) @@ -2780,6 +2797,7 @@ (DEFUN |newHasTest| (|domform| |catOrAtt|) (PROG (|dom| |op| |isAtom| |fun| |ISTMP#2| |ISTMP#3| |sig1| |ISTMP#1| |sig2| |aCat| |cond| |domain|) + (declare (special |$FormalMapVariableList|)) (RETURN (SEQ (COND ((AND (PAIRP |domform|) @@ -3187,6 +3205,7 @@ (DEFUN |sayLooking| (|prefix| |op| |sig| |dom|) (PROG (|dollar|) + (declare (special |$monitorNewWorld|)) (RETURN (SEQ (PROGN (SPADLET |$monitorNewWorld| NIL) @@ -3224,6 +3243,7 @@ (DEFUN |sayLooking1| (|prefix| |dom|) (PROG (|dollar|) + (declare (special |$monitorNewWorld|)) (RETURN (PROGN (SPADLET |$monitorNewWorld| NIL)