diff options
Diffstat (limited to 'module/language/assembly/compile-bytecode.scm')
-rw-r--r-- | module/language/assembly/compile-bytecode.scm | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/module/language/assembly/compile-bytecode.scm b/module/language/assembly/compile-bytecode.scm index bed0fb2dc..840c73b3a 100644 --- a/module/language/assembly/compile-bytecode.scm +++ b/module/language/assembly/compile-bytecode.scm @@ -65,6 +65,12 @@ (write-byte (logand (ash x -8) 255)) (write-byte (logand (ash x -16) 255)) (write-byte (logand (ash x -24) 255))) + (define (write-uint32 x) (case byte-order + ((1234) (write-uint32-le x)) + ((4321) (write-uint32-be x)) + (else (error "unknown endianness" byte-order)))) + (define (write-wide-string s) + (string-for-each (lambda (c) (write-uint32 (char->integer c))) s)) (define (write-loader-len len) (write-byte (ash len -16)) (write-byte (logand (ash len -8) 255)) @@ -72,6 +78,14 @@ (define (write-loader str) (write-loader-len (string-length str)) (write-string str)) + (define (write-sized-loader str) + (let ((len (string-length str)) + (wid (string-width str))) + (write-loader-len len) + (write-byte wid) + (if (= wid 4) + (write-wide-string str) + (write-string str)))) (define (write-bytevector bv) (write-loader-len (bytevector-length bv)) ;; Ew! @@ -89,10 +103,6 @@ (write-uint16 (case byte-order ((1234) write-uint16-le) ((4321) write-uint16-be) - (else (error "unknown endianness" byte-order)))) - (write-uint32 (case byte-order - ((1234) write-uint32-le) - ((4321) write-uint32-be) (else (error "unknown endianness" byte-order))))) (let ((opcode (instruction->opcode inst)) (len (instruction-length inst))) @@ -126,11 +136,11 @@ ((load-unsigned-integer ,str) (write-loader str)) ((load-integer ,str) (write-loader str)) ((load-number ,str) (write-loader str)) - ((load-string ,str) (write-loader str)) - ((load-symbol ,str) (write-loader str)) - ((load-keyword ,str) (write-loader str)) + ((load-string ,str) (write-sized-loader str)) + ((load-symbol ,str) (write-sized-loader str)) + ((load-keyword ,str) (write-sized-loader str)) ((load-array ,bv) (write-bytevector bv)) - ((define ,str) (write-loader str)) + ((define ,str) (write-sized-loader str)) ((br ,l) (write-break l)) ((br-if ,l) (write-break l)) ((br-if-not ,l) (write-break l)) |