summaryrefslogtreecommitdiff
path: root/libguile/vm.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2009-09-17 14:58:31 +0200
committerAndy Wingo <wingo@pobox.com>2009-10-16 15:56:11 +0200
commit97fcf583b7239ea17dbb73eae9438d21136eb2db (patch)
treef92ae6b6b840255fe58289b9ed3824aac3cbd0c5 /libguile/vm.c
parentf95f82f8e183f2744740bdc950dba9c856e09094 (diff)
downloadguile-97fcf583b7239ea17dbb73eae9438d21136eb2db.tar.gz
jumps encoded using 24 bits, not 19; blocks no longer aligned
* libguile/_scm.h (SCM_OBJCODE_MINOR_VERSION): Bump. * libguile/vm-i-system.c (FETCH_OFFSET, BR): Labels are no longer 8-byte aligned; instead, jumps are encoded into 3 bytes instead of 2. (br, br-if, br-if-not, br-if-eq, br-if-not-eq, br-if-null) (br-if-not-null, mv-call): Adapt for new length of br instructions (3 bytes instead of 2). * libguile/vm.c (really_make_boot_program): Adapt hand-coded bytecode for new offset regime. * module/language/assembly.scm (align-block): No alignment necessary. * module/language/assembly/compile-bytecode.scm (write-bytecode): Write out breaks as 24-bit relative jumps. * module/language/assembly/decompile-bytecode.scm (decode-load-program): Decompile break instructions.
Diffstat (limited to 'libguile/vm.c')
-rw-r--r--libguile/vm.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libguile/vm.c b/libguile/vm.c
index d41c8cd41..cd730511f 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -180,9 +180,8 @@ static SCM
really_make_boot_program (long nargs)
{
SCM u8vec;
- scm_t_uint8 text[] = { scm_op_mv_call, 0, 0, 1,
- scm_op_make_int8_1, scm_op_nop, scm_op_nop, scm_op_nop,
- scm_op_halt };
+ scm_t_uint8 text[] = { scm_op_mv_call, 0, 0, 0, 1,
+ scm_op_make_int8_1, scm_op_halt };
struct scm_objcode *bp;
SCM ret;