hyung-hwan/hak
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added the flags field to the context object

Browse Source
This commit is contained in:
hyung-hwan
2021-02-24 16:57:26 +00:00
parent 61a2c8cd60
commit 5d426f7646
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hcl/lib/exec.c
View File

@ -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]; ((hcl_oop_oop_t)blkctx)->slot[i] = ((hcl_oop_oop_t)rcv_blk)->slot[i];
} }
#else #else
blkctx->flags = HCL_SMOOI_TO_OOP(0);
blkctx->ip = rcv_blk->ip; blkctx->ip = rcv_blk->ip;
blkctx->ntmprs = rcv_blk->ntmprs; blkctx->ntmprs = rcv_blk->ntmprs;
blkctx->nargs = rcv_blk->nargs; 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); hcl_popvolat (hcl);
if (HCL_UNLIKELY(!functx)) return -1; if (HCL_UNLIKELY(!functx)) return -1;
functx->flags = HCL_SMOOI_TO_OOP(0);
functx->ip = HCL_SMOOI_TO_OOP(0); functx->ip = HCL_SMOOI_TO_OOP(0);
functx->ntmprs = rcv_func->ntmprs; functx->ntmprs = rcv_func->ntmprs;
functx->nargs = rcv_func->nargs; 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); rcv = (hcl_oop_block_t)HCL_STACK_GETRCV(hcl, nargs);
HCL_ASSERT (hcl, HCL_IS_BLOCK(hcl, rcv)); 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 */ /* TODO: make this block a try catch block */
x = prepare_new_block(hcl, rcv, 0, 0, &newctx); x = prepare_new_block(hcl, rcv, 0, 0, &newctx);
if (HCL_UNLIKELY(x <= -1)) return -1; 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->ip = initial_ip;
hcl->sp = -1; hcl->sp = -1;
ctx->flags = HCL_SMOOI_TO_OOP(0);
ctx->ip = HCL_SMOOI_TO_OOP(initial_ip); ctx->ip = HCL_SMOOI_TO_OOP(initial_ip);
ctx->nargs = HCL_SMOOI_TO_OOP(0); ctx->nargs = HCL_SMOOI_TO_OOP(0);
ctx->ntmprs = HCL_SMOOI_TO_OOP(0); ctx->ntmprs = HCL_SMOOI_TO_OOP(0);

7
hcl/lib/hcl.h
View File

@ -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_block_t;
typedef struct hcl_block_t* hcl_oop_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_context_t;
typedef struct hcl_context_t* hcl_oop_context_t; typedef struct hcl_context_t* hcl_oop_context_t;
@ -581,14 +581,17 @@ struct hcl_block_t
HCL_OBJ_HEADER; HCL_OBJ_HEADER;
hcl_oop_t ntmprs; /* smooi. number of temporaries. includes arguments as well */ hcl_oop_t ntmprs; /* smooi. number of temporaries. includes arguments as well */
hcl_oop_t nargs; /* smooi. number of arguments */ 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_context_t home; /* home context */
hcl_oop_t ip; /* smooi. instruction pointer where the byte code begins in home->origin */
}; };
struct hcl_context_t struct hcl_context_t
{ {
HCL_OBJ_HEADER; HCL_OBJ_HEADER;
/* SmallInteger, context flags */
hcl_oop_t flags;
/* it points to the active context at the moment when /* it points to the active context at the moment when
* this context object has been activated. a new method context * this context object has been activated. a new method context
* is activated as a result of normal message sending and a block * is activated as a result of normal message sending and a block