From 50148c7eab1b9233760db054107c0247945dd1d8 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Wed, 24 Feb 2021 16:57:26 +0000 Subject: [PATCH] added the flags field to the context object --- lib/exec.c | 5 +++++ lib/hcl.h | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/exec.c b/lib/exec.c index 2c5e0c1..dd68efb 100644 --- a/lib/exec.c +++ b/lib/exec.c @@ -1766,6 +1766,7 @@ static int prepare_new_block (hcl_t* hcl, hcl_oop_block_t rcv_blk, hcl_ooi_t nar ((hcl_oop_oop_t)blkctx)->slot[i] = ((hcl_oop_oop_t)rcv_blk)->slot[i]; } #else + blkctx->flags = HCL_SMOOI_TO_OOP(0); blkctx->ip = rcv_blk->ip; blkctx->ntmprs = rcv_blk->ntmprs; blkctx->nargs = rcv_blk->nargs; @@ -1847,6 +1848,7 @@ static int __activate_function (hcl_t* hcl, hcl_oop_function_t rcv_func, hcl_ooi hcl_popvolat (hcl); if (HCL_UNLIKELY(!functx)) return -1; + functx->flags = HCL_SMOOI_TO_OOP(0); functx->ip = HCL_SMOOI_TO_OOP(0); functx->ntmprs = rcv_func->ntmprs; functx->nargs = rcv_func->nargs; @@ -1920,6 +1922,8 @@ static HCL_INLINE int call_try_catch (hcl_t* hcl) rcv = (hcl_oop_block_t)HCL_STACK_GETRCV(hcl, nargs); HCL_ASSERT (hcl, HCL_IS_BLOCK(hcl, rcv)); + /* this is the catch block HCL_STACK_GETARG(hcl, nargs, 0); + * this is the finally block? HCL_STACK_GETARG(hcl, nargs, 1) */ /* TODO: make this block a try catch block */ x = prepare_new_block(hcl, rcv, 0, 0, &newctx); if (HCL_UNLIKELY(x <= -1)) return -1; @@ -2146,6 +2150,7 @@ static int start_initial_process_and_context (hcl_t* hcl, hcl_ooi_t initial_ip) hcl->ip = initial_ip; hcl->sp = -1; + ctx->flags = HCL_SMOOI_TO_OOP(0); ctx->ip = HCL_SMOOI_TO_OOP(initial_ip); ctx->nargs = HCL_SMOOI_TO_OOP(0); ctx->ntmprs = HCL_SMOOI_TO_OOP(0); diff --git a/lib/hcl.h b/lib/hcl.h index 95eac7e..c105ce8 100644 --- a/lib/hcl.h +++ b/lib/hcl.h @@ -552,7 +552,7 @@ typedef struct hcl_function_t* hcl_oop_function_t; typedef struct hcl_block_t hcl_block_t; typedef struct hcl_block_t* hcl_oop_block_t; -#define HCL_CONTEXT_NAMED_INSTVARS 7 +#define HCL_CONTEXT_NAMED_INSTVARS 8 typedef struct hcl_context_t hcl_context_t; typedef struct hcl_context_t* hcl_oop_context_t; @@ -581,14 +581,17 @@ struct hcl_block_t HCL_OBJ_HEADER; hcl_oop_t ntmprs; /* smooi. number of temporaries. includes arguments as well */ hcl_oop_t nargs; /* smooi. number of arguments */ - hcl_oop_t ip; /* smooi. instruction pointer where the byte code begins in home->origin */ hcl_oop_context_t home; /* home context */ + hcl_oop_t ip; /* smooi. instruction pointer where the byte code begins in home->origin */ }; struct hcl_context_t { HCL_OBJ_HEADER; + /* SmallInteger, context flags */ + hcl_oop_t flags; + /* it points to the active context at the moment when * this context object has been activated. a new method context * is activated as a result of normal message sending and a block