diff options
-rw-r--r-- | libguile/vm-engine.c | 4 | ||||
-rw-r--r-- | module/language/cps/compile-bytecode.scm | 10 | ||||
-rw-r--r-- | module/language/cps/cse.scm | 2 | ||||
-rw-r--r-- | module/language/cps/effects-analysis.scm | 4 | ||||
-rw-r--r-- | module/language/cps/reify-primitives.scm | 2 | ||||
-rw-r--r-- | module/language/cps/slot-allocation.scm | 6 | ||||
-rw-r--r-- | module/language/cps/specialize-primcalls.scm | 3 | ||||
-rw-r--r-- | module/language/cps/types.scm | 11 | ||||
-rw-r--r-- | module/system/vm/assembler.scm | 6 | ||||
-rw-r--r-- | module/system/vm/debug.scm | 2 |
10 files changed, 21 insertions, 29 deletions
diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c index 5f856c488..9cdd2deb7 100644 --- a/libguile/vm-engine.c +++ b/libguile/vm-engine.c @@ -1421,7 +1421,7 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp, NEXT (1); } - VM_DEFINE_OP (45, gc_pointer_ref_immediate, "gc-pointer-ref/immediate", OP1 (X8_S8_S8_C8) | OP_DST) + VM_DEFINE_OP (45, pointer_ref_immediate, "pointer-ref/immediate", OP1 (X8_S8_S8_C8) | OP_DST) { scm_t_uint8 dst, obj, idx; @@ -1432,7 +1432,7 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp, NEXT (1); } - VM_DEFINE_OP (46, gc_pointer_set_immediate, "gc-pointer-set!/immediate", OP1 (X8_S8_C8_S8)) + VM_DEFINE_OP (46, pointer_set_immediate, "pointer-set!/immediate", OP1 (X8_S8_C8_S8)) { scm_t_uint8 obj, idx, val; diff --git a/module/language/cps/compile-bytecode.scm b/module/language/cps/compile-bytecode.scm index 30d6ef644..a1b11ead7 100644 --- a/module/language/cps/compile-bytecode.scm +++ b/module/language/cps/compile-bytecode.scm @@ -170,8 +170,8 @@ (from-sp (slot idx)))) (($ $primcall 'word-ref/immediate (annotation . idx) (obj)) (emit-word-ref/immediate asm (from-sp dst) (from-sp (slot obj)) idx)) - (($ $primcall 'gc-pointer-ref/immediate (annotation . idx) (obj)) - (emit-gc-pointer-ref/immediate asm (from-sp dst) (from-sp (slot obj)) idx)) + (($ $primcall 'pointer-ref/immediate (annotation . idx) (obj)) + (emit-pointer-ref/immediate asm (from-sp dst) (from-sp (slot obj)) idx)) (($ $primcall 'struct-ref/immediate idx (struct)) (emit-struct-ref/immediate asm (from-sp dst) (from-sp (slot struct)) idx)) @@ -347,9 +347,9 @@ (($ $primcall 'word-set!/immediate (annotation . idx) (obj val)) (emit-word-set!/immediate asm (from-sp (slot obj)) idx (from-sp (slot val)))) - (($ $primcall 'gc-pointer-set!/immediate (annotation . idx) (obj val)) - (emit-gc-pointer-set!/immediate asm (from-sp (slot obj)) idx - (from-sp (slot val)))) + (($ $primcall 'pointer-set!/immediate (annotation . idx) (obj val)) + (emit-pointer-set!/immediate asm (from-sp (slot obj)) idx + (from-sp (slot val)))) (($ $primcall 'free-set! idx (closure value)) (emit-free-set! asm (from-sp (slot closure)) (from-sp (slot value)) idx)) diff --git a/module/language/cps/cse.scm b/module/language/cps/cse.scm index 5d97e563b..95d9c07d1 100644 --- a/module/language/cps/cse.scm +++ b/module/language/cps/cse.scm @@ -256,7 +256,7 @@ false. It could be that both true and false proofs are available." ((scm-set!/immediate p s x) (x <- scm-ref/immediate p s)) ((word-set! p s i x) (x <- word-ref p s i)) ((word-set!/immediate p s x) (x <- word-ref/immediate p s)) - ((gc-pointer-set!/immediate p s x) (x <- gc-pointer-ref/immediate p s)) + ((pointer-set!/immediate p s x) (x <- pointer-ref/immediate p s)) ((s <- allocate-struct #f v n) (v <- struct-vtable #f s)) ((s <- allocate-struct/immediate n v) (v <- struct-vtable #f s)) diff --git a/module/language/cps/effects-analysis.scm b/module/language/cps/effects-analysis.scm index 488a8062f..26b5bbaf5 100644 --- a/module/language/cps/effects-analysis.scm +++ b/module/language/cps/effects-analysis.scm @@ -381,11 +381,11 @@ the LABELS that are clobbered by the effects of LABEL." ((ann . idx) (&write-field (annotation->memory-kind ann) idx)))) - ((gc-pointer-ref/immediate obj) (match param + ((pointer-ref/immediate obj) (match param ((ann . idx) (&read-field (annotation->memory-kind ann) idx)))) - ((gc-pointer-set!/immediate obj val) + ((pointer-set!/immediate obj val) (match param ((ann . idx) (&write-field diff --git a/module/language/cps/reify-primitives.scm b/module/language/cps/reify-primitives.scm index 5cf16c1da..98371b6a9 100644 --- a/module/language/cps/reify-primitives.scm +++ b/module/language/cps/reify-primitives.scm @@ -337,7 +337,7 @@ (setk label ($kargs names vars ($continue kop src ($primcall 'load-u64 n ()))))))))) - ;; Assume gc-pointer-ref/immediate is within u8 range. + ;; Assume pointer-ref/immediate is within u8 range. (((or 'word-ref/immediate 'scm-ref/immediate) obj) (match param ((ann . idx) diff --git a/module/language/cps/slot-allocation.scm b/module/language/cps/slot-allocation.scm index 3183f2594..4a39a89fc 100644 --- a/module/language/cps/slot-allocation.scm +++ b/module/language/cps/slot-allocation.scm @@ -768,8 +768,8 @@ are comparable with eqv?. A tmp slot may be used." 's8-ref 's16-ref 's32-ref 's64-ref 'bv-s8-ref 'bv-s16-ref 'bv-s32-ref 'bv-s64-ref)) (intmap-add representations var 's64)) - (($ $primcall (or 'gc-pointer-ref/immediate)) - (intmap-add representations var 'gcptr)) + (($ $primcall (or 'pointer-ref/immediate)) + (intmap-add representations var 'ptr)) (_ (intmap-add representations var 'scm)))) (vars @@ -854,7 +854,7 @@ are comparable with eqv?. A tmp slot may be used." (#f slot-map) (slot (let ((desc (match (intmap-ref representations var) - ((or 'u64 'f64 's64) slot-desc-live-raw) + ((or 'u64 'f64 's64 'ptr) slot-desc-live-raw) ('scm slot-desc-live-scm)))) (logior slot-map (ash desc (* 2 slot))))))) live-vars 0)) diff --git a/module/language/cps/specialize-primcalls.scm b/module/language/cps/specialize-primcalls.scm index e6c9f32da..81692de0d 100644 --- a/module/language/cps/specialize-primcalls.scm +++ b/module/language/cps/specialize-primcalls.scm @@ -127,8 +127,7 @@ (('allocate-words (? uint? n)) (allocate-words/immediate n ())) (('scm-ref o (? uint? i)) (scm-ref/immediate i (o))) (('scm-set! o (? uint? i) x) (scm-set!/immediate i (o x))) - ;; Assume gc-pointer-ref/immediate can always be emitted - ;; directly. + ;; Assume pointer-ref/immediate can always be emitted directly. (('word-ref o (? uint? i)) (word-ref/immediate i (o))) (('word-set! o (? uint? i) x) (word-set!/immediate i (o x))) (('add x (? num? y)) (add/immediate y (x))) diff --git a/module/language/cps/types.scm b/module/language/cps/types.scm index a498c201d..e36bf86f9 100644 --- a/module/language/cps/types.scm +++ b/module/language/cps/types.scm @@ -783,16 +783,9 @@ minimum, and maximum." ((annotation . idx) (restrict! obj (annotation->type annotation) (1+ idx) +inf.0)))) -(define-type-inferrer/param (gc-pointer-ref/immediate param obj result) - (match param - ((annotation . idx) - (restrict! obj (annotation->type annotation) (1+ idx) +inf.0) - (define! result &other-heap-object -inf.0 +inf.0)))) +(define-type-inferrer/param (pointer-ref/immediate param obj result) + (define! result &other-heap-object -inf.0 +inf.0)) -(define-type-inferrer/param (gc-pointer-set!/immediate param obj word) - (match param - ((annotation . idx) - (restrict! obj (annotation->type annotation) (1+ idx) +inf.0)))) diff --git a/module/system/vm/assembler.scm b/module/system/vm/assembler.scm index 0e724d50e..2e2cd6915 100644 --- a/module/system/vm/assembler.scm +++ b/module/system/vm/assembler.scm @@ -155,8 +155,8 @@ emit-word-ref/immediate emit-word-set!/immediate - emit-gc-pointer-ref/immediate - emit-gc-pointer-set!/immediate + emit-pointer-ref/immediate + emit-pointer-set!/immediate emit-u8-ref emit-s8-ref @@ -2152,7 +2152,7 @@ procedure with label @var{rw-init}. @var{rw-init} may be false. If ((f64) 1) ((u64) 2) ((s64) 3) - ((gc-ptr) 4) + ((ptr) 4) (else (error "what!" representation))))) (put-uleb128 names-port (logior (ash slot 3) tag))) (lp definitions)))))) diff --git a/module/system/vm/debug.scm b/module/system/vm/debug.scm index 9818bfab3..c3b27697c 100644 --- a/module/system/vm/debug.scm +++ b/module/system/vm/debug.scm @@ -388,7 +388,7 @@ section of the ELF image. Returns an ELF symbol, or @code{#f}." ((1) 'f64) ((2) 'u64) ((3) 's64) - ((4) 'gcptr) + ((4) 'ptr) (else 'unknown)))) (cons (vector name def-offset slot representation) (lp pos names))))))))))) |