From 0dee37e56a35109d531abeadc95b486d1570d49c Mon Sep 17 00:00:00 2001 From: "hyunghwan.chung" Date: Mon, 29 Jun 2015 14:10:15 +0000 Subject: [PATCH] fixed the wrong operator used for encoding an instance variable index into the preamble --- stix/lib/comp.c | 2 +- stix/lib/exec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stix/lib/comp.c b/stix/lib/comp.c index 6693e32..15ee912 100644 --- a/stix/lib/comp.c +++ b/stix/lib/comp.c @@ -3446,7 +3446,7 @@ static int add_compiled_method (stix_t* stix) preamble_index = stix->c->mth.code.ptr[1]; for (i = 2; i <= STIX_BCODE_LONG_PARAM_SIZE; i++) { - preamble_index = (preamble_index << 8) || stix->c->mth.code.ptr[i]; + preamble_index = (preamble_index << 8) | stix->c->mth.code.ptr[i]; } } } diff --git a/stix/lib/exec.c b/stix/lib/exec.c index c8da48f..65c3717 100644 --- a/stix/lib/exec.c +++ b/stix/lib/exec.c @@ -1293,7 +1293,7 @@ printf ("RETURN RECEIVER AT PREAMBLE\n"); ACTIVE_STACK_POPS (stix, b1); /* pop arguments only */ -printf ("RETURN INSTVAR AT PREAMBLE\n"); +printf ("RETURN INSTVAR AT PREAMBLE index %d\n", (int)STIX_METHOD_GET_PREAMBLE_INDEX(preamble)); /* replace the receiver by an instance variable of the receiver */ rcv = (stix_oop_oop_t)ACTIVE_STACK_GETTOP(stix); STIX_ASSERT (STIX_OBJ_GET_FLAGS_TYPE(rcv) == STIX_OBJ_TYPE_OOP);