From f7e5296e0417b7d4bac3e4244e12f3ba342b63a7 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Thu, 20 Nov 2008 13:45:27 +0100 Subject: [PATCH] late-variable-{ref,set} -> toplevel-{ref,set} * benchmark/lib.scm: * libguile/vm-i-system.c (toplevel-ref, toplevel-set): * module/system/vm/assemble.scm (codegen): * module/system/vm/disasm.scm (code-annotation): s/late-variable/toplevel/. It's just a better name. --- benchmark/lib.scm | 2 +- libguile/vm-i-system.c | 4 ++-- module/system/vm/assemble.scm | 8 ++++---- module/system/vm/disasm.scm | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/benchmark/lib.scm b/benchmark/lib.scm index 457fc41be..e6ffc7a55 100644 --- a/benchmark/lib.scm +++ b/benchmark/lib.scm @@ -69,7 +69,7 @@ ;; 5 (br-if-not 0 3) ;; -> 11 ;; 8 (make-int8 0) ;; 0 ;; 10 (return) -;; 11 (late-variable-ref 0) +;; 11 (toplevel-ref 0) ;; 13 (local-ref 0) ;; 15 (make-int8 1) ;; 1 ;; 17 (sub) diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c index 39dcb9d3b..4f24aae6e 100644 --- a/libguile/vm-i-system.c +++ b/libguile/vm-i-system.c @@ -285,7 +285,7 @@ VM_DEFINE_INSTRUCTION (variable_ref, "variable-ref", 0, 0, 1) NEXT; } -VM_DEFINE_INSTRUCTION (late_variable_ref, "late-variable-ref", 1, 0, 1) +VM_DEFINE_INSTRUCTION (toplevel_ref, "toplevel-ref", 1, 0, 1) { unsigned objnum = FETCH (); SCM what; @@ -367,7 +367,7 @@ VM_DEFINE_INSTRUCTION (variable_set, "variable-set", 0, 1, 0) NEXT; } -VM_DEFINE_INSTRUCTION (late_variable_set, "late-variable-set", 1, 1, 0) +VM_DEFINE_INSTRUCTION (toplevel_set, "toplevel-set", 1, 1, 0) { unsigned objnum = FETCH (); SCM what; diff --git a/module/system/vm/assemble.scm b/module/system/vm/assemble.scm index 81cad8063..461d242a2 100644 --- a/module/system/vm/assemble.scm +++ b/module/system/vm/assemble.scm @@ -223,8 +223,8 @@ (set! object-alist (acons var i object-alist)) i))))) (push-code! (case op - ((ref) `(late-variable-ref ,i)) - ((set) `(late-variable-set ,i)))))))) + ((ref) `(toplevel-ref ,i)) + ((set) `(toplevel-set ,i)))))))) ((define) (push-object! (make-vdefine #:name name)) (push-code! '(variable-set))) @@ -249,8 +249,8 @@ (set! object-alist (acons var i object-alist)) i))))) (push-code! (case op - ((ref) `(late-variable-ref ,i)) - ((set) `(late-variable-set ,i)))))))) + ((ref) `(toplevel-ref ,i)) + ((set) `(toplevel-set ,i)))))))) (else (error "unknown module var kind" op key))))) diff --git a/module/system/vm/disasm.scm b/module/system/vm/disasm.scm index 0987354ed..8bd565ba4 100644 --- a/module/system/vm/disasm.scm +++ b/module/system/vm/disasm.scm @@ -154,7 +154,7 @@ (list "`~a'~@[ (arg)~]" (binding:name b) (< (binding:index b) nargs))) (list "(closure variable)")))) - ((late-variable-ref late-variable-set) + ((toplevel-ref toplevel-set) (and objs (let ((v (vector-ref objs (car args)))) (if (and (variable? v) (variable-bound? v)) -- 2.20.1