mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-03 18:50:19 +02:00
28b119ee3d
* libguile/objcodes.c (OBJCODE_COOKIE): Bump objcode cookie, as we added to struct scm_objcode. * libguile/objcodes.h (struct scm_objcode): Add a uint32 after metalen and before base, so that if the structure has 8-byte alignment, base will have 8-byte alignment too. (Before, base was 12 bytes from the start of the structure, now it's 16 bytes.) * libguile/vm-engine.h (ASSERT_ALIGNED_PROCEDURE): Add a check that can be turned on with VM_ENABLE_PARANOID_ASSERTIONS. (CACHE_PROGRAM): Call ASSERT_ALIGNED_PROCEDURE. * libguile/vm-i-system.c (long-local-ref): Add a missing semicolon. * libguile/vm.c (really_make_boot_program): Rework to operate directly on a malloc'd buffer, so that the program will be 8-byte aligned. * module/language/assembly.scm (*program-header-len*): Add another 4 for the padding. (object->assembly): Fix case in which we would return (make-int8 0) instead of (make-int8:0). This would throw off compile-assembly.scm's use of addr+. * module/language/assembly/compile-bytecode.scm (write-bytecode): Write out the padding int. * module/language/assembly/decompile-bytecode.scm (decode-load-program): And pop off the padding int too. * module/language/glil/compile-assembly.scm (glil->assembly): Don't pack the assembly, assume that assembly.scm has done it for us. If a program has a meta, pad out the program so that meta will be aligned. * test-suite/tests/asm-to-bytecode.test: Adapt to expect programs to have the extra 4-byte padding int.
123 lines
4.7 KiB
Scheme
123 lines
4.7 KiB
Scheme
;;;; test assembly to bytecode compilation -*- scheme -*-
|
||
;;;;
|
||
;;;; 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
|
||
|
||
(define-module (test-suite tests asm-to-bytecode)
|
||
#:use-module (rnrs bytevector)
|
||
#:use-module (test-suite lib)
|
||
#:use-module (system vm instruction)
|
||
#:use-module (language assembly compile-bytecode))
|
||
|
||
(define (->u8-list sym val)
|
||
(let ((entry (assq-ref `((uint16 2 ,bytevector-u16-native-set!)
|
||
(uint32 4 ,bytevector-u32-native-set!))
|
||
sym)))
|
||
(or entry (error "unknown sym" sym))
|
||
(let ((bv (make-bytevector (car entry))))
|
||
((cadr entry) bv 0 val)
|
||
(bytevector->u8-list bv))))
|
||
|
||
(define (munge-bytecode v)
|
||
(let lp ((i 0) (out '()))
|
||
(if (= i (vector-length v))
|
||
(list->u8vector (reverse out))
|
||
(let ((x (vector-ref v i)))
|
||
(cond
|
||
((symbol? x)
|
||
(lp (1+ i) (cons (instruction->opcode x) out)))
|
||
((integer? x)
|
||
(lp (1+ i) (cons x out)))
|
||
((pair? x)
|
||
(lp (1+ i) (append (reverse (apply ->u8-list x)) out)))
|
||
(else (error "bad test bytecode" x)))))))
|
||
|
||
(define (comp-test x y)
|
||
(let* ((y (munge-bytecode y))
|
||
(len (u8vector-length y))
|
||
(v (make-u8vector len))
|
||
(i 0))
|
||
(define (write-byte b) (u8vector-set! v i b) (set! i (1+ i)))
|
||
(define (get-addr) i)
|
||
(run-test `(length ,x) #t
|
||
(lambda ()
|
||
(write-bytecode x write-byte get-addr '())
|
||
(= i len)))
|
||
(run-test `(compile-equal? ,x ,y) #t
|
||
(lambda ()
|
||
(equal? v y)))))
|
||
|
||
|
||
(with-test-prefix "compiler"
|
||
(with-test-prefix "asm-to-bytecode"
|
||
|
||
(comp-test '(make-int8 3)
|
||
#(make-int8 3))
|
||
|
||
(comp-test `(load-integer ,(string (integer->char 0)))
|
||
#(load-integer 0 0 1 0))
|
||
|
||
(comp-test `(load-integer ,(string (integer->char 255)))
|
||
#(load-integer 0 0 1 255))
|
||
|
||
(comp-test `(load-integer ,(string (integer->char 1) (integer->char 0)))
|
||
#(load-integer 0 0 2 1 0))
|
||
|
||
(comp-test '(load-number "3.14")
|
||
(vector 'load-number 0 0 4 (char->integer #\3) (char->integer #\.)
|
||
(char->integer #\1) (char->integer #\4)))
|
||
|
||
(comp-test '(load-string "foo")
|
||
(vector 'load-string 0 0 3 (char->integer #\f) (char->integer #\o)
|
||
(char->integer #\o)))
|
||
|
||
(comp-test '(load-symbol "foo")
|
||
(vector 'load-symbol 0 0 3 (char->integer #\f) (char->integer #\o)
|
||
(char->integer #\o)))
|
||
|
||
(comp-test '(load-keyword "qux")
|
||
(vector 'load-keyword 0 0 3 (char->integer #\q) (char->integer #\u)
|
||
(char->integer #\x)))
|
||
|
||
(comp-test '(load-program 3 2 1 () 3 #f (make-int8 3) (return))
|
||
#(load-program
|
||
3 2 (uint16 1) ;; nargs, nrest, nlocs
|
||
(uint32 3) ;; len
|
||
(uint32 0) ;; metalen
|
||
(uint32 0) ;; padding
|
||
make-int8 3
|
||
return))
|
||
|
||
;; the nops are to pad meta to an 8-byte alignment. not strictly
|
||
;; necessary for this test, but representative of the common case.
|
||
(comp-test '(load-program 3 2 1 () 8
|
||
(load-program 3 2 1 () 3
|
||
#f
|
||
(make-int8 3) (return))
|
||
(make-int8 3) (return)
|
||
(nop) (nop) (nop) (nop) (nop))
|
||
#(load-program
|
||
3 2 (uint16 1) ;; nargs, nrest, nlocs
|
||
(uint32 8) ;; len
|
||
(uint32 19) ;; metalen
|
||
(uint32 0) ;; padding
|
||
make-int8 3
|
||
return
|
||
nop nop nop nop nop
|
||
3 2 (uint16 1) ;; nargs, nrest, nlocs
|
||
(uint32 3) ;; len
|
||
(uint32 0) ;; metalen
|
||
(uint32 0) ;; padding
|
||
make-int8 3
|
||
return))))
|