diff options
Diffstat (limited to 'module')
-rw-r--r-- | module/language/assembly.scm | 17 | ||||
-rw-r--r-- | module/language/assembly/compile-bytecode.scm | 10 | ||||
-rw-r--r-- | module/language/assembly/decompile-bytecode.scm | 3 | ||||
-rw-r--r-- | module/language/glil/compile-assembly.scm | 11 |
4 files changed, 26 insertions, 15 deletions
diff --git a/module/language/assembly.scm b/module/language/assembly.scm index 90b2acc03..e7308ac6f 100644 --- a/module/language/assembly.scm +++ b/module/language/assembly.scm @@ -24,7 +24,7 @@ #:use-module (system vm instruction) #:use-module ((srfi srfi-1) #:select (fold)) #:export (byte-length - addr+ align-program align-code + addr+ align-program align-code align-block assembly-pack assembly-unpack object->assembly assembly->object)) @@ -63,17 +63,24 @@ (define *program-alignment* 8) +(define *block-alignment* 8) + (define (addr+ addr code) (fold (lambda (x len) (+ (byte-length x) len)) addr code)) +(define (code-alignment addr alignment header-len) + (make-list (modulo (- alignment + (modulo (+ addr header-len) alignment)) + alignment) + '(nop))) + +(define (align-block addr) + (code-alignment addr *block-alignment* 0)) (define (align-code code addr alignment header-len) - `(,@(make-list (modulo (- alignment - (modulo (+ addr header-len) alignment)) - alignment) - '(nop)) + `(,@(code-alignment addr alignment header-len) ,code)) (define (align-program prog addr) diff --git a/module/language/assembly/compile-bytecode.scm b/module/language/assembly/compile-bytecode.scm index 58afddde0..bf6c5f7b5 100644 --- a/module/language/assembly/compile-bytecode.scm +++ b/module/language/assembly/compile-bytecode.scm @@ -77,10 +77,12 @@ ;; Ew! (for-each write-byte (bytevector->u8-list bv))) (define (write-break label) - (let ((offset (- (assq-ref labels label) (+ (get-addr) 2)))) - (cond ((>= offset (ash 1 15)) (error "jump too big" offset)) - ((< offset (- (ash 1 15))) (error "reverse jump too big" offset)) - (else (write-uint16-be offset))))) + (let ((offset (- (assq-ref labels label) + (logand (+ (get-addr) 2) (lognot #x7))))) + (cond ((not (= 0 (modulo offset 8))) (error "unaligned jump" offset)) + ((>= offset (ash 1 18)) (error "jump too far forward" offset)) + ((< offset (- (ash 1 18))) (error "jump too far backwards" offset)) + (else (write-uint16-be (ash offset -3)))))) (let ((inst (car asm)) (args (cdr asm)) diff --git a/module/language/assembly/decompile-bytecode.scm b/module/language/assembly/decompile-bytecode.scm index 82459fc6f..0e34ab4a2 100644 --- a/module/language/assembly/decompile-bytecode.scm +++ b/module/language/assembly/decompile-bytecode.scm @@ -61,7 +61,8 @@ (labels '()) (i 0)) (define (ensure-label rel1 rel2) - (let ((where (+ i (bytes->s16 rel1 rel2)))) + (let ((where (+ (logand i (lognot #x7)) + (* (bytes->s16 rel1 rel2) 8)))) (or (assv-ref labels where) (begin (let ((l (gensym ":L"))) diff --git a/module/language/glil/compile-assembly.scm b/module/language/glil/compile-assembly.scm index 2e586ec5e..fa5805757 100644 --- a/module/language/glil/compile-assembly.scm +++ b/module/language/glil/compile-assembly.scm @@ -340,11 +340,12 @@ (error "unknown module var kind" op key))))) ((<glil-label> label) - (values '() - bindings - source-alist - (acons label addr label-alist) - object-alist)) + (let ((code (align-block addr))) + (values code + bindings + source-alist + (acons label (addr+ addr code) label-alist) + object-alist))) ((<glil-branch> inst label) (emit-code `((,inst ,label)))) |