mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-17 01:00:20 +02:00
Code Activity

bv-f{32,64}-{ref,set!} take unboxed u64 index

Browse source 
* module/language/tree-il/compile-cps.scm (convert): bv-f32-ref,
  bv-f32-set!, bv-f64-ref, and bv-f64-set! take the index as an untagged
  u64 value.
* module/language/cps/types.scm (define-bytevector-uaccessors): New
  helper, used while migrating bytevectors to take unboxed indexes.
  Adapt f32/f64 accessors to use this definition helper.
* libguile/vm-engine.c (BV_FLOAT_REF, BV_FLOAT_SET): The index is
  unboxed.
This commit is contained in:
Andy Wingo 2015-11-19 22:13:57 +01:00
parent 8464cc576c
commit 87cc8b0f97
3 changed files with 65 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

24
module/language/cps/types.scm
View file

@ -756,8 +756,28 @@ minimum, and maximum."
&exact-integer 8 #x0000000000000000 #xffffFFFFffffFFFF)
(define-bytevector-accessors bv-s64-ref bv-s64-set!
&exact-integer 8 (- #x8000000000000000) #x7fffFFFFffffFFFF)
(define-bytevector-accessors bv-f32-ref bv-f32-set! &f64 4 -inf.0 +inf.0)
(define-bytevector-accessors bv-f64-ref bv-f64-set! &f64 8 -inf.0 +inf.0)
(define-syntax-rule (define-bytevector-uaccessors ref set type size min max)
(begin
(define-type-checker (ref bv idx)
(and (check-type bv &bytevector 0 +inf.0)
(check-type idx &u64 0 +inf.0)
(< (&max idx) (- (&min bv) size))))
(define-type-inferrer (ref bv idx result)
(restrict! bv &bytevector (+ (&min idx) size) +inf.0)
(restrict! idx &u64 0 (- (&max bv) size))
(define! result type min max))
(define-type-checker (set bv idx val)
(and (check-type bv &bytevector 0 +inf.0)
(check-type idx &u64 0 +inf.0)
(check-type val type min max)
(< (&max idx) (- (&min bv) size))))
(define-type-inferrer (set! bv idx val)
(restrict! bv &bytevector (+ (&min idx) size) +inf.0)
(restrict! idx &exact-integer 0 (- (&max bv) size))
(restrict! val type min max))))
(define-bytevector-uaccessors bv-f32-ref bv-f32-set! &f64 4 -inf.0 +inf.0)
(define-bytevector-uaccessors bv-f64-ref bv-f64-set! &f64 8 -inf.0 +inf.0)

27
module/language/tree-il/compile-cps.scm
View file

@ -585,21 +585,32 @@
kbox))
(else
(adapt-arity cps k src out))))
(define (unbox-arg cps arg have-arg)
(define (unbox-arg cps arg unbox-op have-arg)
(with-cps cps
(letv f64)
(let$ body (have-arg f64))
(letk kunboxed ($kargs ('f64) (f64) ,body))
(letv unboxed)
(let$ body (have-arg unboxed))
(letk kunboxed ($kargs ('unboxed) (unboxed) ,body))
(build-term
($continue kunboxed src ($primcall 'scm->f64 (arg))))))
($continue kunboxed src ($primcall unbox-op (arg))))))
(define (unbox-args cps args have-args)
(case instruction
((bv-f32-ref bv-f64-ref)
(match args
((bv idx)
(unbox-arg
cps idx 'scm->u64
(lambda (cps idx)
(have-args cps (list bv idx)))))))
((bv-f32-set! bv-f64-set!)
(match args
((bv idx val)
(unbox-arg cps val
(lambda (cps val)
(have-args cps (list bv idx val)))))))
(unbox-arg
cps idx 'scm->u64
(lambda (cps idx)
(unbox-arg
cps val 'scm->f64
(lambda (cps val)
(have-args cps (list bv idx val)))))))))
(else (have-args cps args))))
(convert-args cps args
(lambda (cps args)