diff options
Diffstat (limited to 'module/language/assembly/decompile-bytecode.scm')
| -rw-r--r-- | module/language/assembly/decompile-bytecode.scm | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/module/language/assembly/decompile-bytecode.scm b/module/language/assembly/decompile-bytecode.scm index 0e34ab4a2..a05db537d 100644 --- a/module/language/assembly/decompile-bytecode.scm +++ b/module/language/assembly/decompile-bytecode.scm @@ -24,6 +24,7 @@ #:use-module (srfi srfi-4) #:use-module (rnrs bytevector) #:use-module (language assembly) + #:use-module ((system vm objcode) #:select (byte-order)) #:export (decompile-bytecode)) (define (decompile-bytecode x env opts) @@ -95,13 +96,26 @@ (lp (cons exp out)))))))))) (define (decode-bytecode pop) + (define (get1 bytes-per-char) + (if (= bytes-per-char 1) + (pop) + (let* ((a (pop)) + (b (pop)) + (c (pop)) + (d (pop))) + (if (= byte-order 1234) + (+ (ash d 24) (ash c 16) (ash b 8) a) + (+ (ash a 24) (ash b 16) (ash c 8) d))))) (and=> (pop) (lambda (opcode) (let ((inst (opcode->instruction opcode))) (cond ((eq? inst 'load-program) (decode-load-program pop)) + ((< (instruction-length inst) 0) + ;; the negative length indicates a variable length + ;; instruction (let* ((make-sequence (if (eq? inst 'load-array) make-bytevector @@ -111,15 +125,21 @@ bytevector-u8-set! (lambda (str pos value) (string-set! str pos (integer->char value))))) - (len (let* ((a (pop)) (b (pop)) (c (pop))) (+ (ash a 16) (ash b 8) c))) + (bytes-per-count + (if (or (eq? inst 'load-string) + (eq? inst 'load-symbol) + (eq? inst 'load-keyword) + (eq? inst 'define)) + (pop) + 1)) (seq (make-sequence len))) (let lp ((i 0)) (if (= i len) `(,inst ,seq) (begin - (sequence-set! seq i (pop)) + (sequence-set! seq i (get1 bytes-per-count)) (lp (1+ i))))))) (else ;; fixed length |