Rename getShellEntry to shellEntry now that it is a macro accessor that designate a place (usable in SETF).

5 files changed, 6 insertions, 9 deletions

diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot
index f5cd44b4..ab41941f 100644
--- a/src/interp/c-util.boot
+++ b/src/interp/c-util.boot
@@ -1240,7 +1240,7 @@ foldSpadcall form ==
     foldSpadcall x
   form.op isnt 'SPADCALL => form
   fun := lastNode form
-  fun isnt [["getShellEntry","$",slot]] => form
+  fun isnt [['%tref,'$,slot]] => form
   op := getCapsuleDirectoryEntry slot
   op = nil => form
   fun.first := "$"
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot
index 51254152..6b83d268 100644
--- a/src/interp/compiler.boot
+++ b/src/interp/compiler.boot
@@ -2274,7 +2274,7 @@ numberize x ==
 ++ If there is a local reference to mode `m', return it.  
 localReferenceIfThere m ==
   m = "$" => m
-  idx := NRTassocIndex m => ["getShellEntry","$",idx]
+  idx := NRTassocIndex m => ['%tref,'$,idx]
   quoteForm m
 
 massageLoop x == main x where
diff --git a/src/interp/functor.boot b/src/interp/functor.boot
index 213fc733..b3a87b0c 100644
--- a/src/interp/functor.boot
+++ b/src/interp/functor.boot
@@ -456,8 +456,8 @@ DescendCodeAdd1(base,flag,target,formalArgs,formalArgModes) ==
   (for u in code repeat
       if update(u,copyvec,[]) then code:=delete(u,code))
     where update(code,copyvec,sofar) ==
-      atom code =>nil
-      code.op in '(getShellEntry ELT) =>
+      atom code => nil
+      code.op in '(%tref ELT) =>
           copyvec.(third code):=union(copyvec.(third code), sofar)
           true
       code is ['%store,['%tref,name,number],u'] =>
@@ -476,7 +476,7 @@ DescendCodeAdd1(base,flag,target,formalArgs,formalArgModes) ==
                   KEYWORD::START2, i,
                    KEYWORD::END2, j+1],:code]
     copyvec.i =>
-      v:=["getShellEntry",instantiatedBase,i]
+      v:=['%tref,instantiatedBase,i]
       for u in copyvec.i repeat
         [name,:count]:=u
         v:=['%store,['%tref,name,count],v]
diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot
index e70503c8..c12e6689 100644
--- a/src/interp/g-opt.boot
+++ b/src/interp/g-opt.boot
@@ -60,7 +60,7 @@ getDomainTemplate dom ==
 ++ This is usually the case for exported functions.
 emitIndirectCall(fn,args,x) ==
   x.first := "SPADCALL"
-  fn.first := "getShellEntry"
+  fn.first := '%tref
   x.rest := [:args,fn]
   x
 
diff --git a/src/interp/sys-macros.lisp b/src/interp/sys-macros.lisp
index 31aa11b7..4b04434b 100644
--- a/src/interp/sys-macros.lisp
+++ b/src/interp/sys-macros.lisp
@@ -1260,8 +1260,5 @@
 (defmacro |spadConstant| (dollar n)
  `(spadcall (svref ,dollar (the fixnum ,n))))
 
-(defmacro |getShellEntry| (dollar n)
-  `(svref ,dollar ,n))
-
 (defmacro |shellEntry| (dollar n)
   `(svref ,dollar ,n))