diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/interp/define.boot | 2 | ||||
| -rw-r--r-- | src/interp/nruncomp.boot | 27 | ||||
| -rw-r--r-- | src/interp/nrunfast.boot | 4 | ||||
| -rw-r--r-- | src/interp/wi2.boot | 2 |
5 files changed, 18 insertions, 22 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e47d57a1..6ce9ff75 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-11-28 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * interp/nruncomp.boot (buildFunctor): Remov reference to $NRTvec. + * interp/nrunfast.boot ($NRTvec): Don't define. + 2008-11-27 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/server.boot (serverLoop): Remove, as unused. diff --git a/src/interp/define.boot b/src/interp/define.boot index 3ffbbee8..e8f9e9e9 100644 --- a/src/interp/define.boot +++ b/src/interp/define.boot @@ -611,7 +611,7 @@ compDefineFunctor1(df is ['DEF,form,signature,$functorSpecialCases,body], $NRTdeltaLength: local := 0 -- =length of block of extra entries in vector $NRTdomainFormList: local := nil -- of form ((gensym . (Repe...)) ... -- the above optimizes the calls to local domains - $template: local:= nil --stored in the lisplib (if $NRTvec = true) + $template: local:= nil --stored in the lisplib $functionLocations: local := nil --locations of defined functions in source -- generate slots for arguments first, then for $NRTaddForm in compAdd for x in argl repeat NRTgetLocalIndex x diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot index 4ecf54e8..cefd53d8 100644 --- a/src/interp/nruncomp.boot +++ b/src/interp/nruncomp.boot @@ -443,9 +443,7 @@ buildFunctor($definition is [name,:args],sig,code,$locals,$e) == domainShell := newShell ($NRTbase + $NRTdeltaLength) for i in 0..4 repeat domainShell.i := $domainShell.i --we will clobber elements; copy since $domainShell may be a cached vector - $template := - $NRTvec = true => newShell ($NRTbase + $NRTdeltaLength) - nil + $template := newShell ($NRTbase + $NRTdeltaLength) $catvecList:= [domainShell,:[emptyVector for u in CADR domainShell.4]] $catNames := ['$] -- for DescendCode -- to be changed below for slot 4 $SetFunctions:= newShell SIZE domainShell @@ -461,21 +459,18 @@ buildFunctor($definition is [name,:args],sig,code,$locals,$e) == makePredicateBitVector [:ASSOCRIGHT $condAlist,:$NRTslot1PredicateList] storeOperationCode:= DescendCode(code,true,nil,first $catNames) - outsideFunctionCode:= NRTaddDeltaCode() + NRTaddDeltaCode() storeOperationCode:= NRTputInLocalReferences storeOperationCode - if $NRTvec = true then - NRTdescendCodeTran(storeOperationCode,nil) --side effects storeOperationCode + NRTdescendCodeTran(storeOperationCode,nil) --side effects storeOperationCode codePart2:= - $NRTvec = true => - argStuffCode := - [[$setelt,'$,i,v] for i in $NRTbase.. for v in $FormalMapVariableList - for arg in rest $definition] - if MEMQ($NRTaddForm,$locals) then - addargname := $FormalMapVariableList.(POSN1($NRTaddForm,$locals)) - argStuffCode := [[$setelt,'$,5,addargname],:argStuffCode] - [['stuffDomainSlots,'$],:argStuffCode, - :predBitVectorCode2,storeOperationCode] - [:outsideFunctionCode,storeOperationCode] + argStuffCode := + [[$setelt,'$,i,v] for i in $NRTbase.. for v in $FormalMapVariableList + for arg in rest $definition] + if MEMQ($NRTaddForm,$locals) then + addargname := $FormalMapVariableList.(POSN1($NRTaddForm,$locals)) + argStuffCode := [[$setelt,'$,5,addargname],:argStuffCode] + [['stuffDomainSlots,'$],:argStuffCode, + :predBitVectorCode2,storeOperationCode] $CheckVectorList := NRTcheckVector domainShell --CODE: part 1 diff --git a/src/interp/nrunfast.boot b/src/interp/nrunfast.boot index b7ee04da..c7af9a80 100644 --- a/src/interp/nrunfast.boot +++ b/src/interp/nrunfast.boot @@ -39,9 +39,6 @@ namespace BOOT $doNotCompressHashTableIfTrue := false ++ -$NRTvec := true - -++ $monitorNewWorld := false ++ @@ -54,7 +51,6 @@ $NRTmonitorIfTrue := false -- Basic Functions --======================================================================= initNewWorld() == - $NRTvec := true $monitorNewWorld := false $spadLibFT := 'NRLIB $NRTmonitorIfTrue := false diff --git a/src/interp/wi2.boot b/src/interp/wi2.boot index df2d1d96..6540c99f 100644 --- a/src/interp/wi2.boot +++ b/src/interp/wi2.boot @@ -125,7 +125,7 @@ compDefineFunctor1(df, m,$e,$prefix,$formalArgList) == $NRTdeltaLength: local := 0 -- =length of block of extra entries in vector $NRTdomainFormList: local := nil -- of form ((gensym . (Repe...)) ... -- the above optimizes the calls to local domains - $template: local:= nil --stored in the lisplib (if $NRTvec = true) + $template: local:= nil --stored in the lisplib $functionLocations: local := nil --locations of defined functions in source -- generate slots for arguments first, then for $NRTaddForm in compAdd for x in argl repeat NRTgetLocalIndex x |