diff options
author | Andy Wingo <wingo@pobox.com> | 2013-11-15 17:13:10 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-11-15 17:13:27 +0100 |
commit | f8085163d6c457e79d3f54934723707260ac8dd8 (patch) | |
tree | edc28ec3fd02c183a92894ab4124831f4f36e80b /module/system/vm/assembler.scm | |
parent | 840ec33422e7ccae5ac158584e5587d88ff42d85 (diff) | |
download | guile-f8085163d6c457e79d3f54934723707260ac8dd8.tar.gz |
Remove MVRA from VM frames
* libguile/_scm.h (SCM_OBJCODE_MINOR_VERSION): Bump for frame layout
change.
* libguile/frames.c: Update some static checks.
(scm_frame_num_locals, scm_frame_local_ref, scm_frame_local_set_x):
Update to not skip over uninitialized frames, as that's not a thing
any more.
* libguile/frames.h: Update to remove MVRA. Woo!
* libguile/vm-engine.c (ALLOC_FRAME, RETURN_ONE_VALUE):
(rtl_vm_engine): Update for 3 words per frame instead of 4.
* libguile/vm.c (vm_return_to_continuation): Likewise.
* module/language/cps/slot-allocation.scm (allocate-slots): 3 words per
frame, not 4.
* module/system/vm/assembler.scm (*bytecode-minor-version*): Bump. Also
remove a couple of tc7's that aren't around any more.
Diffstat (limited to 'module/system/vm/assembler.scm')
-rw-r--r-- | module/system/vm/assembler.scm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/module/system/vm/assembler.scm b/module/system/vm/assembler.scm index 3ba25b39f..01fac65aa 100644 --- a/module/system/vm/assembler.scm +++ b/module/system/vm/assembler.scm @@ -701,11 +701,9 @@ returned instead." ;(define-tc7-macro-assembler br-if-fluid 37) ;(define-tc7-macro-assembler br-if-dynamic-state 45) ;(define-tc7-macro-assembler br-if-frame 47) -;(define-tc7-macro-assembler br-if-objcode 53) ;(define-tc7-macro-assembler br-if-vm 55) ;(define-tc7-macro-assembler br-if-vm-cont 71) ;(define-tc7-macro-assembler br-if-rtl-program 69) -;(define-tc7-macro-assembler br-if-program 79) ;(define-tc7-macro-assembler br-if-weak-set 85) ;(define-tc7-macro-assembler br-if-weak-table 87) ;(define-tc7-macro-assembler br-if-array 93) @@ -1202,7 +1200,7 @@ needed." ;; FIXME: Define these somewhere central, shared with C. (define *bytecode-major-version* #x0202) -(define *bytecode-minor-version* 2) +(define *bytecode-minor-version* 3) (define (link-dynamic-section asm text rw rw-init) "Link the dynamic section for an ELF image with RTL text, given the |