mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 11:50:28 +02:00
dff85f6f9f
* libguile/instructions.c (FOR_EACH_INSTRUCTION_WORD_TYPE): Add C8_S24 word type. * libguile/vm-engine.c (UNPACK_8_24): New helper. (atomic-scm-ref/immediate, atomic-scm-set!/immediate) (atomic-swap-scm!/immediate, atomic-scm-compare-and-swap!/immediate): New instructions. (make-atomic-box, atomic-box-ref, atomic-box-set!, atomic-box-swap!) (atomic-box-compare-and-swap!): Disable these ops. * module/language/bytecode.scm (compute-instruction-arity): Add C8_S24 support. * module/system/vm/assembler.scm: Add C8_S24 support. Export assemblers for new opcodes. * module/system/vm/disassembler.scm (disassembler): Support C8_S24. * module/language/cps/compile-bytecode.scm (compile-function): Replace old atomic-box assemblers with the new instructions. * module/language/cps/effects-analysis.scm (annotation->memory-kind): * module/language/cps/types.scm (annotation->type): Add cases for atomic boxes. Mark as all memory kinds because atomic ops serialize memory accesses. * module/language/tree-il/compile-cps.scm (make-atomic-box): (ensure-atomic-box, atomic-box-ref, atomic-box-set!): (atomic-box-swap!, atomic-box-compare-and-swap!): Explode these ops to more basic instructions. * module/system/base/types/internal.scm (%tc7-atomic-box): Add forgotten export.
130 lines
3.9 KiB
Scheme
130 lines
3.9 KiB
Scheme
;;; Bytecode
|
|
|
|
;; Copyright (C) 2013, 2017, 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
|
|
;;;; 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
|
|
|
|
;;; Code:
|
|
|
|
(define-module (language bytecode)
|
|
#:use-module (ice-9 match)
|
|
#:use-module ((srfi srfi-1) #:select (fold))
|
|
#:export (instruction-list
|
|
instruction-arity
|
|
builtin-name->index
|
|
builtin-index->name
|
|
intrinsic-name->index
|
|
intrinsic-index->name))
|
|
|
|
(load-extension (string-append "libguile-" (effective-version))
|
|
"scm_init_instructions")
|
|
(load-extension (string-append "libguile-" (effective-version))
|
|
"scm_init_vm_builtins")
|
|
(load-extension (string-append "libguile-" (effective-version))
|
|
"scm_init_intrinsics")
|
|
|
|
(define (compute-instruction-arity name args)
|
|
(define (first-word-arity word)
|
|
(case word
|
|
((X32) 0)
|
|
((X8_S24) 1)
|
|
((X8_F24) 1)
|
|
((X8_C24) 1)
|
|
((X8_L24) 1)
|
|
((X8_S8_I16) 2)
|
|
((X8_S12_S12) 2)
|
|
((X8_S12_C12) 2)
|
|
((X8_S12_Z12) 2)
|
|
((X8_C12_C12) 2)
|
|
((X8_F12_F12) 2)
|
|
((X8_S8_S8_S8) 3)
|
|
((X8_S8_S8_C8) 3)
|
|
((X8_S8_C8_S8) 3)))
|
|
(define (tail-word-arity word)
|
|
(case word
|
|
((C32) 1)
|
|
((I32) 1)
|
|
((A32 AU32 AS32 AF32) 1)
|
|
((B32 BF32 BS32 BU32) 0)
|
|
((N32) 1)
|
|
((R32) 1)
|
|
((L32) 1)
|
|
((LO32) 1)
|
|
((C8_C24) 2)
|
|
((C8_S24) 2)
|
|
((C16_C16) 2)
|
|
((B1_C7_L24) 3)
|
|
((B1_X7_S24) 2)
|
|
((B1_X7_F24) 2)
|
|
((B1_X7_C24) 2)
|
|
((B1_X7_L24) 2)
|
|
((B1_X31) 1)
|
|
((X8_S24) 1)
|
|
((X8_F24) 1)
|
|
((X8_C24) 1)
|
|
((X8_L24) 1)))
|
|
(match args
|
|
((arg0 . args)
|
|
(fold (lambda (arg arity)
|
|
(+ (tail-word-arity arg) arity))
|
|
(first-word-arity arg0)
|
|
args))))
|
|
|
|
(define *macro-instruction-arities*
|
|
'((cache-current-module! . (0 . 1))
|
|
(cached-toplevel-box . (1 . 0))
|
|
(cached-module-box . (1 . 0))))
|
|
|
|
(define (compute-instruction-arities)
|
|
(let ((table (make-hash-table)))
|
|
(for-each
|
|
(match-lambda
|
|
;; Put special cases here.
|
|
((name op '! . args)
|
|
(hashq-set! table name
|
|
(cons 0 (compute-instruction-arity name args))))
|
|
((name op '<- . args)
|
|
(hashq-set! table name
|
|
(cons 1 (1- (compute-instruction-arity name args))))))
|
|
(instruction-list))
|
|
(for-each (match-lambda
|
|
((name . arity)
|
|
(hashq-set! table name arity)))
|
|
*macro-instruction-arities*)
|
|
table))
|
|
|
|
(define *instruction-arities* (delay (compute-instruction-arities)))
|
|
|
|
(define (instruction-arity name)
|
|
(hashq-ref (force *instruction-arities*) name))
|
|
|
|
(define *intrinsic-codes*
|
|
(delay (let ((tab (make-hash-table)))
|
|
(for-each (lambda (pair)
|
|
(hashv-set! tab (car pair) (cdr pair)))
|
|
(intrinsic-list))
|
|
tab)))
|
|
|
|
(define *intrinsic-names*
|
|
(delay (let ((tab (make-hash-table)))
|
|
(hash-for-each (lambda (k v) (hashq-set! tab v k))
|
|
(force *intrinsic-codes*))
|
|
tab)))
|
|
|
|
(define (intrinsic-name->index name)
|
|
(hashq-ref (force *intrinsic-codes*) name))
|
|
|
|
(define (intrinsic-index->name index)
|
|
(hashv-ref (force *intrinsic-names*) index))
|