diff options
author | Andy Wingo <wingo@pobox.com> | 2018-05-14 13:21:16 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2018-05-14 14:04:59 +0200 |
commit | 77e7bea4c25431f39bb8ba7f900e35ef008ea00b (patch) | |
tree | 7130bb7993de87be32f1add75d084e6734bf21fd /module/system | |
parent | 667d808f5841dd99341f220b88f15ab5ed26390a (diff) | |
download | guile-77e7bea4c25431f39bb8ba7f900e35ef008ea00b.tar.gz |
Remove backend support for cached-module-box et al.
* module/language/cps/compile-bytecode.scm (compile-function): Remove
unused assemblers for cached-module-box, cached-toplevel-box, and
cache-current-module!.
* module/language/cps/effects-analysis.scm (&cache): New memory kind.
(cache-current-module!): Set &cache memory, not &box.
(resolve-module, lookup-module, cache-ref, cache-set!): Add effect
annotations.
* module/system/vm/assembler.scm (emit-cache-current-module!)
(emit-cached-toplevel-box, emit-cached-module-box): Remove
assemblers.
* module/system/vm/disassembler.scm (code-annotation, fold-code-range):
Remove special cases for toplevel-box and module-box.
* module/system/xref.scm (program-callee-rev-vars): Add a FIXME for the
future.
Diffstat (limited to 'module/system')
-rw-r--r-- | module/system/vm/assembler.scm | 19 | ||||
-rw-r--r-- | module/system/vm/disassembler.scm | 22 | ||||
-rw-r--r-- | module/system/xref.scm | 6 |
3 files changed, 5 insertions, 42 deletions
diff --git a/module/system/vm/assembler.scm b/module/system/vm/assembler.scm index 4c4eec463..e8e767d91 100644 --- a/module/system/vm/assembler.scm +++ b/module/system/vm/assembler.scm @@ -252,8 +252,6 @@ emit-current-module emit-resolve emit-define! - emit-toplevel-box - emit-module-box emit-prompt emit-current-thread emit-fadd @@ -1495,29 +1493,12 @@ returned instead." (- (asm-start asm) (arity-low-pc arity))))) (set-arity-definitions! arity (cons def (arity-definitions arity))))) -(define-macro-assembler (cache-current-module! asm module scope) - (let ((mod-label (intern-cache-cell asm scope))) - (emit-static-set! asm module mod-label 0))) - (define-macro-assembler (cache-ref asm dst key) (emit-static-ref asm dst (intern-cache-cell asm key))) (define-macro-assembler (cache-set! asm key val) (emit-static-set! asm val (intern-cache-cell asm key) 0)) -(define-macro-assembler (cached-toplevel-box asm dst scope sym bound?) - (let ((sym-label (intern-non-immediate asm sym)) - (mod-label (intern-cache-cell asm scope)) - (cell-label (intern-cache-cell asm (cons scope sym)))) - (emit-toplevel-box asm dst cell-label mod-label sym-label bound?))) - -(define-macro-assembler (cached-module-box asm dst module-name sym public? bound?) - (let* ((sym-label (intern-non-immediate asm sym)) - (key (cons public? module-name)) - (mod-name-label (intern-constant asm key)) - (cell-label (intern-cache-cell asm (acons public? module-name sym)))) - (emit-module-box asm dst cell-label mod-name-label sym-label bound?))) - (define-macro-assembler (slot-map asm proc-slot slot-map) (unless (zero? slot-map) (set-asm-slot-maps! asm (cons diff --git a/module/system/vm/disassembler.scm b/module/system/vm/disassembler.scm index ac4c55cdc..2ab2bf575 100644 --- a/module/system/vm/disassembler.scm +++ b/module/system/vm/disassembler.scm @@ -284,14 +284,6 @@ address of that offset." (list "~@Y" (dereference-scm target))) (('resolve-module dst name public) (list "~a" (if (zero? public) "private" "public"))) - (('toplevel-box _ var-offset mod-offset sym-offset bound?) - (list "`~A'~A" (dereference-scm sym-offset) - (if bound? "" " (maybe unbound)"))) - (('module-box _ var-offset mod-name-offset sym-offset bound?) - (let ((mod-name (reference-scm mod-name-offset))) - (list "`(~A ~A ~A)'~A" (if (car mod-name) '@ '@@) (cdr mod-name) - (dereference-scm sym-offset) - (if bound? "" " (maybe unbound)")))) (('load-typed-array dst type shape target len) (let ((addr (u32-offset->addr (+ offset target) context))) (list "~a bytes from #x~X" len addr))) @@ -426,20 +418,6 @@ address of that offset." `(builtin-ref ,dst ,(builtin-index->name idx))) (((or 'static-ref 'static-set!) dst target) `(,(car code) ,dst ,(dereference-scm target))) - (('toplevel-box dst var-offset mod-offset sym-offset bound?) - `(toplevel-box ,dst - ,(dereference-scm var-offset) - ,(dereference-scm mod-offset) - ,(dereference-scm sym-offset) - ,bound?)) - (('module-box dst var-offset mod-name-offset sym-offset bound?) - (let ((mod-name (reference-scm mod-name-offset))) - `(module-box ,dst - ,(dereference-scm var-offset) - ,(car mod-name) - ,(cdr mod-name) - ,(dereference-scm sym-offset) - ,bound?))) (_ code))) (let lp ((offset start) (seed seed)) (cond diff --git a/module/system/xref.scm b/module/system/xref.scm index 2b943fdd9..e335f9481 100644 --- a/module/system/xref.scm +++ b/module/system/xref.scm @@ -1,4 +1,4 @@ -;;;; Copyright (C) 2009, 2010, 2013 Free Software Foundation, Inc. +;;;; Copyright (C) 2009, 2010, 2013, 2018 Free Software Foundation, Inc. ;;;; ;;;; This library is free software; you can redistribute it and/or ;;;; modify it under the terms of the GNU Lesser General Public @@ -56,6 +56,10 @@ (fold (lambda (prog out) (fold-program-code (lambda (elt out) + ;; FIXME: Update for change to top-level variable + ;; resolution. Need to build a per-program map of + ;; IP->SLOT->CONSTANT to be able to resolve operands to + ;; resolve-module and lookup intrinsic calls. (match elt (('toplevel-box dst var mod sym bound?) (let ((var (or var (and mod (module-variable mod sym))))) |