summaryrefslogtreecommitdiff
path: root/module/system/vm/assembler.scm
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2014-04-15 20:25:16 +0200
committerAndy Wingo <wingo@pobox.com>2014-04-15 20:25:16 +0200
commit67ddb7e264bbc53a9b121bb21dc521651a15b205 (patch)
treed42650e123dd183e724c56deae96660fbbea15a3 /module/system/vm/assembler.scm
parent1a82c2012b2ef77438b96fdd1e03e5f642286043 (diff)
downloadguile-67ddb7e264bbc53a9b121bb21dc521651a15b205.tar.gz
Assembler residualizes local variable definition locations
* module/system/vm/assembler.scm (write-arities): Serialize definition locations after names. (definition): Store definition as a byte offset.
Diffstat (limited to 'module/system/vm/assembler.scm')
-rw-r--r--module/system/vm/assembler.scm15
1 files changed, 13 insertions, 2 deletions
diff --git a/module/system/vm/assembler.scm b/module/system/vm/assembler.scm
index 1dd9666aa..bed2bf77a 100644
--- a/module/system/vm/assembler.scm
+++ b/module/system/vm/assembler.scm
@@ -829,7 +829,9 @@ returned instead."
(define-macro-assembler (definition asm name slot)
(let* ((arity (car (meta-arities (car (asm-meta asm)))))
- (def (vector name slot (- (asm-start asm) (arity-low-pc arity)))))
+ (def (vector name
+ slot
+ (* (- (asm-start asm) (arity-low-pc arity)) 4))))
(set-arity-definitions! arity (cons def (arity-definitions arity)))))
(define-macro-assembler (cache-current-module! asm module scope)
@@ -1510,6 +1512,7 @@ procedure with label @var{rw-init}. @var{rw-init} may be false. If
(length (arity-opt arity))
(length (arity-definitions arity)))
(let ((relocs (write-kw-indices (arity-kw-indices arity) relocs)))
+ ;; Write local names.
(let lp ((definitions (arity-definitions arity)))
(match definitions
(() relocs)
@@ -1518,7 +1521,15 @@ procedure with label @var{rw-init}. @var{rw-init} may be false. If
(string-table-intern! strtab (symbol->string name))
0)))
(put-uleb128 names-port sym)
- (lp definitions)))))))
+ (lp definitions)))))
+ ;; Now write their definitions.
+ (let lp ((definitions (arity-definitions arity)))
+ (match definitions
+ (() relocs)
+ ((#(name slot def) . definitions)
+ (put-uleb128 names-port def)
+ (put-uleb128 names-port slot)
+ (lp definitions))))))
(let lp ((metas metas) (pos arities-prefix-len) (relocs '()))
(match metas
(()