mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-21 11:10:21 +02:00
8f18b71b7a
* libguile/vm-engine.c: Remove add1 and sub1 instructions. Will replace
with add/immediate and sub/immediate.
* module/language/tree-il/peval.scm (peval): If we reify a new
<primcall>, expand it. Removes 1- and similar primcalls.
* module/language/tree-il/primitives.scm: Don't specialize (+ x 1) to 1+.
(expand-primcall): New export, does a single primcall expansion.
(expand-primitives): Use the new helper.
* module/language/cps/effects-analysis.scm:
* module/language/cps/primitives.scm:
* module/language/cps/types.scm:
* module/system/vm/assembler.scm: Remove support for add1 and sub1 CPS
primitives.
* test-suite/tests/peval.test ("partial evaluation"): Adapt tests that
expect 1+/1- to expect +/-.
131 lines
4.2 KiB
Scheme
131 lines
4.2 KiB
Scheme
;;; Continuation-passing style (CPS) intermediate language (IL)
|
|
|
|
;; Copyright (C) 2013, 2014, 2015 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
|
|
;;;; License as published by the Free Software Foundation; either
|
|
;;;; version 3 of the License, or (at your option) any later version.
|
|
;;;;
|
|
;;;; This library is distributed in the hope that it will be useful,
|
|
;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
;;;; Lesser General Public License for more details.
|
|
;;;;
|
|
;;;; You should have received a copy of the GNU Lesser General Public
|
|
;;;; License along with this library; if not, write to the Free Software
|
|
;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
;;; Commentary:
|
|
;;;
|
|
;;; Information about named primitives, as they appear in $prim and
|
|
;;; $primcall.
|
|
;;;
|
|
;;; Code:
|
|
|
|
(define-module (language cps primitives)
|
|
#:use-module (ice-9 match)
|
|
#:use-module ((srfi srfi-1) #:select (fold))
|
|
#:use-module (srfi srfi-26)
|
|
#:use-module (language bytecode)
|
|
#:export (prim-instruction
|
|
branching-primitive?
|
|
prim-arity
|
|
))
|
|
|
|
(define *instruction-aliases*
|
|
'((+ . add)
|
|
(- . sub)
|
|
(* . mul)
|
|
(/ . div)
|
|
(quotient . quo) (remainder . rem)
|
|
(modulo . mod)
|
|
(variable-ref . box-ref)
|
|
(variable-set! . box-set!)
|
|
(bytevector-length . bv-length)
|
|
(bytevector-u8-ref . bv-u8-ref)
|
|
(bytevector-u16-native-ref . bv-u16-ref)
|
|
(bytevector-u32-native-ref . bv-u32-ref)
|
|
(bytevector-u64-native-ref . bv-u64-ref)
|
|
(bytevector-s8-ref . bv-s8-ref)
|
|
(bytevector-s16-native-ref . bv-s16-ref)
|
|
(bytevector-s32-native-ref . bv-s32-ref)
|
|
(bytevector-s64-native-ref . bv-s64-ref)
|
|
(bytevector-ieee-single-native-ref . bv-f32-ref)
|
|
(bytevector-ieee-double-native-ref . bv-f64-ref)
|
|
(bytevector-u8-set! . bv-u8-set!)
|
|
(bytevector-u16-native-set! . bv-u16-set!)
|
|
(bytevector-u32-native-set! . bv-u32-set!)
|
|
(bytevector-u64-native-set! . bv-u64-set!)
|
|
(bytevector-s8-set! . bv-s8-set!)
|
|
(bytevector-s16-native-set! . bv-s16-set!)
|
|
(bytevector-s32-native-set! . bv-s32-set!)
|
|
(bytevector-s64-native-set! . bv-s64-set!)
|
|
(bytevector-ieee-single-native-set! . bv-f32-set!)
|
|
(bytevector-ieee-double-native-set! . bv-f64-set!)))
|
|
|
|
(define *macro-instruction-arities*
|
|
'((cache-current-module! . (0 . 2))
|
|
(cached-toplevel-box . (1 . 3))
|
|
(cached-module-box . (1 . 4))))
|
|
|
|
(define *branching-primcall-arities*
|
|
'((null? . (1 . 1))
|
|
(nil? . (1 . 1))
|
|
(pair? . (1 . 1))
|
|
(struct? . (1 . 1))
|
|
(string? . (1 . 1))
|
|
(vector? . (1 . 1))
|
|
(symbol? . (1 . 1))
|
|
(keyword? . (1 . 1))
|
|
(variable? . (1 . 1))
|
|
(bitvector? . (1 . 1))
|
|
(bytevector? . (1 . 1))
|
|
(char? . (1 . 1))
|
|
(eq? . (1 . 2))
|
|
(eqv? . (1 . 2))
|
|
(= . (1 . 2))
|
|
(< . (1 . 2))
|
|
(> . (1 . 2))
|
|
(<= . (1 . 2))
|
|
(>= . (1 . 2))
|
|
(u64-= . (1 . 2))
|
|
(u64-< . (1 . 2))
|
|
(u64-> . (1 . 2))
|
|
(u64-<= . (1 . 2))
|
|
(u64->= . (1 . 2))
|
|
(logtest . (1 . 2))))
|
|
|
|
(define (compute-prim-instructions)
|
|
(let ((table (make-hash-table)))
|
|
(for-each
|
|
(match-lambda ((inst . _) (hashq-set! table inst inst)))
|
|
(instruction-list))
|
|
(for-each
|
|
(match-lambda ((prim . inst) (hashq-set! table prim inst)))
|
|
*instruction-aliases*)
|
|
(for-each
|
|
(match-lambda ((inst . arity) (hashq-set! table inst inst)))
|
|
*macro-instruction-arities*)
|
|
table))
|
|
|
|
(define *prim-instructions* (delay (compute-prim-instructions)))
|
|
|
|
;; prim -> instruction | #f
|
|
(define (prim-instruction name)
|
|
(hashq-ref (force *prim-instructions*) name))
|
|
|
|
(define (branching-primitive? name)
|
|
(and (assq name *branching-primcall-arities*) #t))
|
|
|
|
(define *prim-arities* (make-hash-table))
|
|
|
|
(define (prim-arity name)
|
|
(or (hashq-ref *prim-arities* name)
|
|
(let ((arity (cond
|
|
((prim-instruction name) => instruction-arity)
|
|
((assq name *branching-primcall-arities*) => cdr)
|
|
(else
|
|
(error "Primitive of unknown arity" name)))))
|
|
(hashq-set! *prim-arities* name arity)
|
|
arity)))
|