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

reimplementing try-catch

Browse Source
This commit is contained in:
hyung-hwan 2021-04-11 15:08:27 +00:00
parent 08149767b5
commit 5537e1850a
4 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
lib/comp.c
View File

@ -463,6 +463,8 @@ static int emit_single_param_instruction (hcl_t* hcl, int cmd, hcl_oow_t param_1
case HCL_CODE_JUMP2_BACKWARD_IF_TRUE: case HCL_CODE_JUMP2_BACKWARD_IF_TRUE:
case HCL_CODE_JUMP2_BACKWARD_IF_FALSE: case HCL_CODE_JUMP2_BACKWARD_IF_FALSE:
case HCL_CODE_JUMP2_BACKWARD: case HCL_CODE_JUMP2_BACKWARD:
case HCL_CODE_TRY_ENTER:
case HCL_CODE_TRY_ENTER2:
case HCL_CODE_PUSH_INTLIT: case HCL_CODE_PUSH_INTLIT:
case HCL_CODE_PUSH_NEGINTLIT: case HCL_CODE_PUSH_NEGINTLIT:
case HCL_CODE_PUSH_CHARLIT: case HCL_CODE_PUSH_CHARLIT:
@ -664,7 +666,8 @@ static HCL_INLINE void patch_long_jump (hcl_t* hcl, hcl_ooi_t jip, hcl_ooi_t jum
hcl->code.bc.ptr[jip] == HCL_CODE_JUMP_FORWARD_IF_FALSE || hcl->code.bc.ptr[jip] == HCL_CODE_JUMP_FORWARD_IF_FALSE ||
hcl->code.bc.ptr[jip] == HCL_CODE_JUMP_BACKWARD_X || hcl->code.bc.ptr[jip] == HCL_CODE_JUMP_BACKWARD_X ||
hcl->code.bc.ptr[jip] == HCL_CODE_JUMP_BACKWARD_IF_TRUE || hcl->code.bc.ptr[jip] == HCL_CODE_JUMP_BACKWARD_IF_TRUE ||
hcl->code.bc.ptr[jip] == HCL_CODE_JUMP_BACKWARD_IF_FALSE); hcl->code.bc.ptr[jip] == HCL_CODE_JUMP_BACKWARD_IF_FALSE ||
hcl->code.bc.ptr[jip] == HCL_CODE_TRY_ENTER);
/* JUMP2 instructions are chosen to be greater than its JUMP counterpart by 1 */ /* JUMP2 instructions are chosen to be greater than its JUMP counterpart by 1 */
patch_instruction (hcl, jip, hcl->code.bc.ptr[jip] + 1); patch_instruction (hcl, jip, hcl->code.bc.ptr[jip] + 1);
@ -1040,8 +1043,6 @@ static int compile_or (hcl_t* hcl, hcl_cnode_t* src)
} }
static HCL_INLINE int compile_or_expr (hcl_t* hcl) static HCL_INLINE int compile_or_expr (hcl_t* hcl)
{ {
hcl_cnode_t* obj, * expr; hcl_cnode_t* obj, * expr;
@ -1137,9 +1138,8 @@ static int compile_break (hcl_t* hcl, hcl_cnode_t* src)
} }
else if (hcl->c->cblk.info[i]._type == HCL_CBLK_TYPE_TRY) else if (hcl->c->cblk.info[i]._type == HCL_CBLK_TYPE_TRY)
{ {
//must emit an instruction to exit from the try loop. /*must emit an instruction to exit from the try loop.*/
/* TODO: do something for finally if (emit_byte_instruction(hcl, HCL_CODE_TRY_EXIT, HCL_CNODE_GET_LOC(src)) <= -1) return -1;
if (emit_byte_instruction(hcl, HCL_CODE_EXIT_TRY, HCL_CNODE_GET_LOC(src)) <= -1) return -1;*/
} }
} }
@ -1243,9 +1243,8 @@ static int compile_continue (hcl_t* hcl, hcl_cnode_t* src)
} }
else if (hcl->c->cblk.info[i]._type == HCL_CBLK_TYPE_TRY) else if (hcl->c->cblk.info[i]._type == HCL_CBLK_TYPE_TRY)
{ {
//must emit an instruction to exit from the try loop. /*must emit an instruction to exit from the try loop.*/
/* TODO: do something for finally if (emit_byte_instruction(hcl, HCL_CODE_TRY_EXIT, HCL_CNODE_GET_LOC(src)) <= -1) return -1;
if (emit_byte_instruction(hcl, HCL_CODE_EXIT_TRY, HCL_CNODE_GET_LOC(src)) <= -1) return -1;*/
} }
} }
@ -1886,26 +1885,15 @@ static int compile_try (hcl_t* hcl, hcl_cnode_t* src)
return -1; return -1;
} }
if (push_cblk(hcl, HCL_CNODE_GET_LOC(src), HCL_CBLK_TYPE_TRY) <= -1) return -1;
/* TODO: allow local temporary variables?? */
#if 0
if (hcl->c->fnblk.depth == HCL_TYPE_MAX(hcl_ooi_t))
{
hcl_setsynerrbfmt (hcl, HCL_SYNERR_BLKDEPTH, HCL_CNODE_GET_LOC(src), HCL_NULL, "block depth too deep in %.*js", HCL_CNODE_GET_TOKLEN(cmd), HCL_CNODE_GET_TOKPTR(cmd));
return -1;
}
hcl->c->fnblk.depth++;
if (store_temporary_variable_count_for_block(hcl, hcl->c->tv.wcount, hcl->c->tv.s.len, hcl->code.lit.len) <= -1) return -1;
#else
/*push_cblk ....*/
#endif
/* TODO: HCL_TRAIT_INTERACTIVE??? */ /* TODO: HCL_TRAIT_INTERACTIVE??? */
#if 0
if (emit_double_param_instruction(hcl, HCL_CODE_MAKE_BLOCK, 0, 0, HCL_CNODE_GET_LOC(cmd)) <= -1) return -1; if (emit_double_param_instruction(hcl, HCL_CODE_MAKE_BLOCK, 0, 0, HCL_CNODE_GET_LOC(cmd)) <= -1) return -1;
#endif
jump_inst_pos = hcl->code.bc.len; jump_inst_pos = hcl->code.bc.len;
if (emit_single_param_instruction(hcl, HCL_CODE_JUMP_FORWARD_0, MAX_CODE_JUMP, HCL_CNODE_GET_LOC(cmd)) <= -1) return -1; if (emit_single_param_instruction(hcl, HCL_CODE_TRY_ENTER, MAX_CODE_JUMP, HCL_CNODE_GET_LOC(cmd)) <= -1) return -1;
SWITCH_TOP_CFRAME (hcl, COP_COMPILE_TRY_OBJECT_LIST, obj); /* 1*/ SWITCH_TOP_CFRAME (hcl, COP_COMPILE_TRY_OBJECT_LIST, obj); /* 1*/
PUSH_SUBCFRAME (hcl, COP_POST_TRY, cmd); /* 2 */ PUSH_SUBCFRAME (hcl, COP_POST_TRY, cmd); /* 2 */
@ -1927,7 +1915,6 @@ static HCL_INLINE int patch_nearest_post_try (hcl_t* hcl)
jip = cf->u.post_try_catch.jump_inst_pos; jip = cf->u.post_try_catch.jump_inst_pos;
/* HCL_CODE_LONG_PARAM_SIZE + 1 => size of the long JUMP_FORWARD instruction */ /* HCL_CODE_LONG_PARAM_SIZE + 1 => size of the long JUMP_FORWARD instruction */
block_code_size = hcl->code.bc.len - jip - (HCL_CODE_LONG_PARAM_SIZE + 1); block_code_size = hcl->code.bc.len - jip - (HCL_CODE_LONG_PARAM_SIZE + 1);
@ -1936,18 +1923,21 @@ static HCL_INLINE int patch_nearest_post_try (hcl_t* hcl)
/* no body in try */ /* no body in try */
/* TODO: is this correct??? */ /* TODO: is this correct??? */
if (emit_byte_instruction(hcl, HCL_CODE_PUSH_NIL, HCL_CNODE_GET_LOC(cf->operand)) <= -1) return -1; if (emit_byte_instruction(hcl, HCL_CODE_PUSH_NIL, HCL_CNODE_GET_LOC(cf->operand)) <= -1) return -1;
block_code_size++;
} }
if (emit_byte_instruction(hcl, HCL_CODE_RETURN_FROM_BLOCK, HCL_CNODE_GET_LOC(cf->operand)) <= -1) return -1; /*jump_inst_pos = hcl-.code.bc.len; */
block_code_size++; if (emit_byte_instruction(hcl, HCL_CODE_TRY_EXIT, HCL_CNODE_GET_LOC(cf->operand)) <= -1)
if (emit_single_param_instruction(hcl, HCL_CODE_JUMP_FORWARD_0, MAX_CODE_JUMP, HCL_CNODE_GET_LOC(cmd)) <= -1) return -1;
/* HCL_CODE_LONG_PARAM_SIZE + 1 => size of the long JUMP_FORWARD instruction */
block_code_size = hcl->code.bc.len - jip - (HCL_CODE_LONG_PARAM_SIZE + 1);
if (block_code_size > MAX_CODE_JUMP * 2) if (block_code_size > MAX_CODE_JUMP * 2)
{ {
hcl_setsynerrbfmt (hcl, HCL_SYNERR_BLKFLOOD, HCL_CNODE_GET_LOC(cf->operand), HCL_NULL, "code too big - size %zu", block_code_size); hcl_setsynerrbfmt (hcl, HCL_SYNERR_BLKFLOOD, HCL_CNODE_GET_LOC(cf->operand), HCL_NULL, "code too big - size %zu", block_code_size);
return -1; return -1;
} }
patch_long_jump (hcl, jip, block_code_size); patch_long_jump (hcl, jip, block_code_size); /* patch TRY_ENTER */
#if 0 #if 0
/* beginning of the elif/else block code */ /* beginning of the elif/else block code */

8
lib/decode.c
View File

@ -351,7 +351,13 @@ int hcl_decode (hcl_t* hcl, hcl_oow_t start, hcl_oow_t end)
/* -------------------------------------------------------- */ /* -------------------------------------------------------- */
case HCL_CODE_TRY_ENTER: case HCL_CODE_TRY_ENTER:
LOG_INST_0 (hcl, "try_enter"); FETCH_PARAM_CODE_TO (hcl, b1);
LOG_INST_1 (hcl, "try_enter %zu", b1);
break;
case HCL_CODE_TRY_ENTER2:
FETCH_PARAM_CODE_TO (hcl, b1);
LOG_INST_1 (hcl, "try_enter2 %zu", b1);
break; break;
case HCL_CODE_TRY_EXIT: case HCL_CODE_TRY_EXIT:

7
lib/exec.c
View File

@ -3120,7 +3120,8 @@ static int execute (hcl_t* hcl)
/* -------------------------------------------------------- */ /* -------------------------------------------------------- */
case HCL_CODE_TRY_ENTER: case HCL_CODE_TRY_ENTER:
LOG_INST_0 (hcl, "try_enter"); FETCH_PARAM_CODE_TO (hcl, b1);
LOG_INST_0 (hcl, "try_enter %zu", b1);
#if 0 #if 0
if (call_try_catch(hcl) <= -1) if (call_try_catch(hcl) <= -1)
{ {
@ -3130,6 +3131,10 @@ static int execute (hcl_t* hcl)
#endif #endif
break; break;
case HCL_CODE_TRY_ENTER2:
FETCH_PARAM_CODE_TO (hcl, b1);
LOG_INST_0 (hcl, "try_enter2 %zu", b1);
case HCL_CODE_TRY_EXIT: case HCL_CODE_TRY_EXIT:
LOG_INST_0 (hcl, "try_exit"); LOG_INST_0 (hcl, "try_exit");
break; break;

7
lib/hcl-prv.h
View File

@ -777,11 +777,12 @@ enum hcl_bcode_t
HCL_CODE_CALL_X = 0xD4, /* 212 */ HCL_CODE_CALL_X = 0xD4, /* 212 */
HCL_CODE_TRY_ENTER = 0xD5, /* 213 ## */ HCL_CODE_TRY_ENTER = 0xD5, /* 213 ## */
HCL_CODE_TRY_EXIT = 0xD6, /* 214 */ HCL_CODE_TRY_ENTER2 = 0xD6, /* 214 */
HCL_CODE_THROW = 0xD7, /* 215 */ HCL_CODE_TRY_EXIT = 0xD7, /* 215 */
HCL_CODE_STORE_INTO_CTXTEMPVAR_X = 0xD8, /* 216 ## */ HCL_CODE_STORE_INTO_CTXTEMPVAR_X = 0xD8, /* 216 ## */
/* UNUSED - 0xD9 - 0xDB */ HCL_CODE_THROW = 0xD9, /* 217 */
/* UNUSED - 0xDA - 0xDB */
HCL_CODE_POP_INTO_CTXTEMPVAR_X = 0xDC, /* 220 ## */ HCL_CODE_POP_INTO_CTXTEMPVAR_X = 0xDC, /* 220 ## */
/* UNUSED - 0xDD - 0xDF */ /* UNUSED - 0xDD - 0xDF */