summaryrefslogtreecommitdiff
path: root/module
diff options
context:
space:
mode:
Diffstat (limited to 'module')
-rw-r--r--module/language/assembly.scm2
-rw-r--r--module/language/assembly/compile-bytecode.scm14
-rw-r--r--module/language/assembly/decompile-bytecode.scm19
3 files changed, 18 insertions, 17 deletions
diff --git a/module/language/assembly.scm b/module/language/assembly.scm
index 683da6cc1..2b22fd834 100644
--- a/module/language/assembly.scm
+++ b/module/language/assembly.scm
@@ -72,7 +72,7 @@
'(nop)))
(define (align-block addr)
- (code-alignment addr *block-alignment* 0))
+ '())
(define (align-code code addr alignment header-len)
`(,@(code-alignment addr alignment header-len)
diff --git a/module/language/assembly/compile-bytecode.scm b/module/language/assembly/compile-bytecode.scm
index e8bba9e7e..5a8098112 100644
--- a/module/language/assembly/compile-bytecode.scm
+++ b/module/language/assembly/compile-bytecode.scm
@@ -55,6 +55,10 @@
(define (write-uint16-le x)
(write-byte (logand x 255))
(write-byte (logand (ash x -8) 255)))
+ (define (write-uint24-be x)
+ (write-byte (logand (ash x -16) 255))
+ (write-byte (logand (ash x -8) 255))
+ (write-byte (logand x 255)))
(define (write-uint32-be x)
(write-byte (logand (ash x -24) 255))
(write-byte (logand (ash x -16) 255))
@@ -85,12 +89,10 @@
;; Ew!
(for-each write-byte (bytevector->u8-list bv)))
(define (write-break label)
- (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 ((offset (- (assq-ref labels label) (+ (get-addr) 3))))
+ (cond ((>= offset (ash 1 23)) (error "jump too far forward" offset))
+ ((< offset (- (ash 1 23))) (error "jump too far backwards" offset))
+ (else (write-uint24-be offset)))))
(let ((inst (car asm))
(args (cdr asm))
diff --git a/module/language/assembly/decompile-bytecode.scm b/module/language/assembly/decompile-bytecode.scm
index 511c6ccc6..915e101b8 100644
--- a/module/language/assembly/decompile-bytecode.scm
+++ b/module/language/assembly/decompile-bytecode.scm
@@ -43,11 +43,11 @@
(define (br-instruction? x)
(memq x '(br br-if br-if-not br-if-eq br-if-not-eq br-if-null br-if-not-null)))
-(define (bytes->s16 a b)
- (let ((x (+ (ash a 8) b)))
- (if (zero? (logand (ash 1 15) x))
+(define (bytes->s24 a b c)
+ (let ((x (+ (ash a 16) (ash b 8) c)))
+ (if (zero? (logand (ash 1 23) x))
x
- (- x (ash 1 16)))))
+ (- x (ash 1 24)))))
;; FIXME: this is a little-endian disassembly!!!
(define (decode-load-program pop)
@@ -60,9 +60,8 @@
(%unused-pad (begin (pop) (pop) (pop) (pop)))
(labels '())
(i 0))
- (define (ensure-label rel1 rel2)
- (let ((where (+ (logand i (lognot #x7))
- (* (bytes->s16 rel1 rel2) 8))))
+ (define (ensure-label rel1 rel2 rel3)
+ (let ((where (+ i (bytes->s24 rel1 rel2 rel3))))
(or (assv-ref labels where)
(begin
(let ((l (gensym ":L")))
@@ -87,9 +86,9 @@
(else
(let ((exp (decode-bytecode sub-pop)))
(pmatch exp
- ((,br ,rel1 ,rel2) (guard (br-instruction? br))
- (lp (cons `(,br ,(ensure-label rel1 rel2)) out)))
- ((mv-call ,n ,rel1 ,rel2)
+ ((,br ,rel1 ,rel2 ,rel3) (guard (br-instruction? br))
+ (lp (cons `(,br ,(ensure-label rel1 rel2 rel3)) out)))
+ ((mv-call ,n ,rel1 ,rel2 ,rel3)
(lp (cons `(mv-call ,n ,(ensure-label rel1 rel2)) out)))
(else
(lp (cons exp out))))))))))