summaryrefslogtreecommitdiff
path: root/libguile
diff options
context:
space:
mode:
Diffstat (limited to 'libguile')
-rw-r--r--libguile/_scm.h2
-rw-r--r--libguile/vm-i-system.c37
-rw-r--r--libguile/vm.c5
3 files changed, 22 insertions, 22 deletions
diff --git a/libguile/_scm.h b/libguile/_scm.h
index 8a9a21161..6aedebe72 100644
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -172,7 +172,7 @@
/* Major and minor versions must be single characters. */
#define SCM_OBJCODE_MAJOR_VERSION 0
-#define SCM_OBJCODE_MINOR_VERSION D
+#define SCM_OBJCODE_MINOR_VERSION E
#define SCM_OBJCODE_MAJOR_VERSION_STRING \
SCM_CPP_STRINGIFY(SCM_OBJCODE_MAJOR_VERSION)
#define SCM_OBJCODE_MINOR_VERSION_STRING \
diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c
index 0662f8188..ac237e5b5 100644
--- a/libguile/vm-i-system.c
+++ b/libguile/vm-i-system.c
@@ -411,61 +411,62 @@ VM_DEFINE_INSTRUCTION (30, long_toplevel_set, "long-toplevel-set", 2, 1, 0)
* branch and jump
*/
-/* offset must be a signed 16 bit int!!! */
+/* offset must be at least 24 bits wide, and signed */
#define FETCH_OFFSET(offset) \
{ \
- int h = FETCH (); \
- int l = FETCH (); \
- offset = (h << 8) + l; \
+ offset = FETCH () << 16; \
+ offset += FETCH () << 8; \
+ offset += FETCH (); \
+ offset -= (offset & (1<<23)) << 1; \
}
#define BR(p) \
{ \
- scm_t_int16 offset; \
+ scm_t_int32 offset; \
FETCH_OFFSET (offset); \
if (p) \
- ip += ((scm_t_ptrdiff)offset) * 8 - (((unsigned long)ip) % 8); \
+ ip += offset; \
NULLSTACK (1); \
DROP (); \
NEXT; \
}
-VM_DEFINE_INSTRUCTION (31, br, "br", 2, 0, 0)
+VM_DEFINE_INSTRUCTION (31, br, "br", 3, 0, 0)
{
- scm_t_int16 offset;
+ scm_t_int32 offset;
FETCH_OFFSET (offset);
- ip += ((scm_t_ptrdiff)offset) * 8 - (((unsigned long)ip) % 8);
+ ip += offset;
NEXT;
}
-VM_DEFINE_INSTRUCTION (32, br_if, "br-if", 2, 0, 0)
+VM_DEFINE_INSTRUCTION (32, br_if, "br-if", 3, 0, 0)
{
BR (!SCM_FALSEP (*sp));
}
-VM_DEFINE_INSTRUCTION (33, br_if_not, "br-if-not", 2, 0, 0)
+VM_DEFINE_INSTRUCTION (33, br_if_not, "br-if-not", 3, 0, 0)
{
BR (SCM_FALSEP (*sp));
}
-VM_DEFINE_INSTRUCTION (34, br_if_eq, "br-if-eq", 2, 0, 0)
+VM_DEFINE_INSTRUCTION (34, br_if_eq, "br-if-eq", 3, 0, 0)
{
sp--; /* underflow? */
BR (SCM_EQ_P (sp[0], sp[1]));
}
-VM_DEFINE_INSTRUCTION (35, br_if_not_eq, "br-if-not-eq", 2, 0, 0)
+VM_DEFINE_INSTRUCTION (35, br_if_not_eq, "br-if-not-eq", 3, 0, 0)
{
sp--; /* underflow? */
BR (!SCM_EQ_P (sp[0], sp[1]));
}
-VM_DEFINE_INSTRUCTION (36, br_if_null, "br-if-null", 2, 0, 0)
+VM_DEFINE_INSTRUCTION (36, br_if_null, "br-if-null", 3, 0, 0)
{
BR (SCM_NULLP (*sp));
}
-VM_DEFINE_INSTRUCTION (37, br_if_not_null, "br-if-not-null", 2, 0, 0)
+VM_DEFINE_INSTRUCTION (37, br_if_not_null, "br-if-not-null", 3, 0, 0)
{
BR (!SCM_NULLP (*sp));
}
@@ -642,15 +643,15 @@ VM_DEFINE_INSTRUCTION (42, call_nargs, "call/nargs", 0, 0, 1)
goto vm_call;
}
-VM_DEFINE_INSTRUCTION (43, mv_call, "mv-call", 3, -1, 1)
+VM_DEFINE_INSTRUCTION (43, mv_call, "mv-call", 4, -1, 1)
{
SCM x;
- scm_t_int16 offset;
+ scm_t_int32 offset;
scm_t_uint8 *mvra;
nargs = FETCH ();
FETCH_OFFSET (offset);
- mvra = ip + ((scm_t_ptrdiff)offset) * 8 - ((unsigned long)ip) % 8;
+ mvra = ip + offset;
x = sp[-nargs];
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;