py: Native emitter now supports delete name & global, and end finally.

dpgeorge · dpgeorge · commit e6ce10a3e74d · 2014-09-06T18:38:20.000+01:00
diff --git a/py/emitnative.c b/py/emitnative.c
@@ -531,7 +531,7 @@ STATIC void emit_access_stack(emit_t *emit, int pos, vtype_kind_t *vtype, int re
     }
 }
 
-STATIC void emit_pre_pop_discard(emit_t *emit, vtype_kind_t *vtype) {
+STATIC void emit_pre_pop_discard(emit_t *emit) {
     emit->last_emit_was_return_value = false;
     adjust_stack(emit, -1);
 }
@@ -1040,34 +1040,32 @@ STATIC void emit_native_store_subscr(emit_t *emit) {
     emit_call(emit, MP_F_OBJ_SUBSCR);
 }
 
-STATIC void emit_native_delete_fast(emit_t *emit, qstr qstr, int local_num) {
-    // not implemented
+STATIC void emit_native_delete_fast(emit_t *emit, qstr qst, int local_num) {
+    // TODO implement me!
     // could support for Python types, just set to None (so GC can reclaim it)
-    assert(0);
 }
 
-STATIC void emit_native_delete_deref(emit_t *emit, qstr qstr, int local_num) {
-    // not supported
-    assert(0);
+STATIC void emit_native_delete_deref(emit_t *emit, qstr qst, int local_num) {
+    // TODO implement me!
 }
 
-STATIC void emit_native_delete_name(emit_t *emit, qstr qstr) {
-    // not implemented
-    // use mp_delete_name
-    assert(0);
+STATIC void emit_native_delete_name(emit_t *emit, qstr qst) {
+    emit_native_pre(emit);
+    emit_call_with_imm_arg(emit, MP_F_DELETE_NAME, qst, REG_ARG_1);
+    emit_post(emit);
 }
 
-STATIC void emit_native_delete_global(emit_t *emit, qstr qstr) {
-    // not implemented
-    // use mp_delete_global
-    assert(0);
+STATIC void emit_native_delete_global(emit_t *emit, qstr qst) {
+    emit_native_pre(emit);
+    emit_call_with_imm_arg(emit, MP_F_DELETE_GLOBAL, qst, REG_ARG_1);
+    emit_post(emit);
 }
 
-STATIC void emit_native_delete_attr(emit_t *emit, qstr qstr) {
+STATIC void emit_native_delete_attr(emit_t *emit, qstr qst) {
     vtype_kind_t vtype_base;
     emit_pre_pop_reg(emit, &vtype_base, REG_ARG_1); // arg1 = base
     assert(vtype_base == VTYPE_PYOBJ);
-    emit_call_with_2_imm_args(emit, MP_F_STORE_ATTR, qstr, REG_ARG_2, (mp_uint_t)MP_OBJ_NULL, REG_ARG_3); // arg2 = attribute name, arg3 = value (null for delete)
+    emit_call_with_2_imm_args(emit, MP_F_STORE_ATTR, qst, REG_ARG_2, (mp_uint_t)MP_OBJ_NULL, REG_ARG_3); // arg2 = attribute name, arg3 = value (null for delete)
     emit_post(emit);
 }
 
@@ -1092,8 +1090,7 @@ STATIC void emit_native_dup_top_two(emit_t *emit) {
 }
 
 STATIC void emit_native_pop_top(emit_t *emit) {
-    vtype_kind_t vtype;
-    emit_pre_pop_discard(emit, &vtype);
+    emit_pre_pop_discard(emit);
     emit_post(emit);
 }
 
@@ -1243,11 +1240,12 @@ STATIC void emit_native_setup_except(emit_t *emit, uint label) {
 }
 
 STATIC void emit_native_setup_finally(emit_t *emit, uint label) {
-    assert(0);
+    emit_native_setup_except(emit, label);
 }
 
 STATIC void emit_native_end_finally(emit_t *emit) {
-    //assert(0);
+    emit_pre_pop_discard(emit);
+    emit_post(emit);
 }
 
 STATIC void emit_native_get_iter(emit_t *emit) {
@@ -1608,12 +1606,12 @@ STATIC void emit_native_start_except_handler(emit_t *emit) {
     adjust_stack(emit, 2);
     vtype_kind_t vtype_nlr;
     emit_pre_pop_reg(emit, &vtype_nlr, REG_ARG_1); // get the thrown value
-    emit_pre_pop_discard(emit, &vtype_nlr); // discard the linked-list pointer in the nlr_buf
+    emit_pre_pop_discard(emit); // discard the linked-list pointer in the nlr_buf
     emit_post_push_reg_reg_reg(emit, VTYPE_PYOBJ, REG_ARG_1, VTYPE_PYOBJ, REG_ARG_1, VTYPE_PYOBJ, REG_ARG_1); // push the 3 exception items
 }
 
 STATIC void emit_native_end_except_handler(emit_t *emit) {
-    adjust_stack(emit, -3); // stack adjust (not sure why it's this much...)
+    adjust_stack(emit, -2);
 }
 
 const emit_method_table_t EXPORT_FUN(method_table) = {
diff --git a/py/nativeglue.c b/py/nativeglue.c
@@ -125,6 +125,8 @@ void *const mp_fun_table[MP_F_NUMBER_OF] = {
 #endif
     mp_unpack_sequence,
     mp_unpack_ex,
+    mp_delete_name,
+    mp_delete_global,
 };
 
 /*
diff --git a/py/runtime0.h b/py/runtime0.h
@@ -145,6 +145,8 @@ typedef enum {
 #endif
     MP_F_UNPACK_SEQUENCE,
     MP_F_UNPACK_EX,
+    MP_F_DELETE_NAME,
+    MP_F_DELETE_GLOBAL,
     MP_F_NUMBER_OF,
 } mp_fun_kind_t;
 

Original file line number	Diff line number	Diff line change
`@@ -531,7 +531,7 @@ STATIC void emit_access_stack(emit_t emit, int pos, vtype_kind_t vtype, int re`
`531`	`531`	`}`
`532`	`532`	`}`
`533`	`533`
`534`		`-STATIC void emit_pre_pop_discard(emit_t emit, vtype_kind_t vtype) {`
	`534`	`+STATIC void emit_pre_pop_discard(emit_t *emit) {`
`535`	`535`	`emit->last_emit_was_return_value = false;`
`536`	`536`	`adjust_stack(emit, -1);`
`537`	`537`	`}`
`@@ -1040,34 +1040,32 @@ STATIC void emit_native_store_subscr(emit_t *emit) {`
`1040`	`1040`	`emit_call(emit, MP_F_OBJ_SUBSCR);`
`1041`	`1041`	`}`
`1042`	`1042`
`1043`		`-STATIC void emit_native_delete_fast(emit_t *emit, qstr qstr, int local_num) {`
`1044`		`- // not implemented`
	`1043`	`+STATIC void emit_native_delete_fast(emit_t *emit, qstr qst, int local_num) {`
	`1044`	`+ // TODO implement me!`
`1045`	`1045`	`// could support for Python types, just set to None (so GC can reclaim it)`
`1046`		`- assert(0);`
`1047`	`1046`	`}`
`1048`	`1047`
`1049`		`-STATIC void emit_native_delete_deref(emit_t *emit, qstr qstr, int local_num) {`
`1050`		`- // not supported`
`1051`		`- assert(0);`
	`1048`	`+STATIC void emit_native_delete_deref(emit_t *emit, qstr qst, int local_num) {`
	`1049`	`+ // TODO implement me!`
`1052`	`1050`	`}`
`1053`	`1051`
`1054`		`-STATIC void emit_native_delete_name(emit_t *emit, qstr qstr) {`
`1055`		`- // not implemented`
`1056`		`- // use mp_delete_name`
`1057`		`- assert(0);`
	`1052`	`+STATIC void emit_native_delete_name(emit_t *emit, qstr qst) {`
	`1053`	`+ emit_native_pre(emit);`
	`1054`	`+ emit_call_with_imm_arg(emit, MP_F_DELETE_NAME, qst, REG_ARG_1);`
	`1055`	`+ emit_post(emit);`
`1058`	`1056`	`}`
`1059`	`1057`
`1060`		`-STATIC void emit_native_delete_global(emit_t *emit, qstr qstr) {`
`1061`		`- // not implemented`
`1062`		`- // use mp_delete_global`
`1063`		`- assert(0);`
	`1058`	`+STATIC void emit_native_delete_global(emit_t *emit, qstr qst) {`
	`1059`	`+ emit_native_pre(emit);`
	`1060`	`+ emit_call_with_imm_arg(emit, MP_F_DELETE_GLOBAL, qst, REG_ARG_1);`
	`1061`	`+ emit_post(emit);`
`1064`	`1062`	`}`
`1065`	`1063`
`1066`		`-STATIC void emit_native_delete_attr(emit_t *emit, qstr qstr) {`
	`1064`	`+STATIC void emit_native_delete_attr(emit_t *emit, qstr qst) {`
`1067`	`1065`	`vtype_kind_t vtype_base;`
`1068`	`1066`	`emit_pre_pop_reg(emit, &vtype_base, REG_ARG_1); // arg1 = base`
`1069`	`1067`	`assert(vtype_base == VTYPE_PYOBJ);`
`1070`		`- emit_call_with_2_imm_args(emit, MP_F_STORE_ATTR, qstr, REG_ARG_2, (mp_uint_t)MP_OBJ_NULL, REG_ARG_3); // arg2 = attribute name, arg3 = value (null for delete)`
	`1068`	`+ emit_call_with_2_imm_args(emit, MP_F_STORE_ATTR, qst, REG_ARG_2, (mp_uint_t)MP_OBJ_NULL, REG_ARG_3); // arg2 = attribute name, arg3 = value (null for delete)`
`1071`	`1069`	`emit_post(emit);`
`1072`	`1070`	`}`
`1073`	`1071`
`@@ -1092,8 +1090,7 @@ STATIC void emit_native_dup_top_two(emit_t *emit) {`
`1092`	`1090`	`}`
`1093`	`1091`
`1094`	`1092`	`STATIC void emit_native_pop_top(emit_t *emit) {`
`1095`		`- vtype_kind_t vtype;`
`1096`		`- emit_pre_pop_discard(emit, &vtype);`
	`1093`	`+ emit_pre_pop_discard(emit);`
`1097`	`1094`	`emit_post(emit);`
`1098`	`1095`	`}`
`1099`	`1096`
`@@ -1243,11 +1240,12 @@ STATIC void emit_native_setup_except(emit_t *emit, uint label) {`
`1243`	`1240`	`}`
`1244`	`1241`
`1245`	`1242`	`STATIC void emit_native_setup_finally(emit_t *emit, uint label) {`
`1246`		`- assert(0);`
	`1243`	`+ emit_native_setup_except(emit, label);`
`1247`	`1244`	`}`
`1248`	`1245`
`1249`	`1246`	`STATIC void emit_native_end_finally(emit_t *emit) {`
`1250`		`- //assert(0);`
	`1247`	`+ emit_pre_pop_discard(emit);`
	`1248`	`+ emit_post(emit);`
`1251`	`1249`	`}`
`1252`	`1250`
`1253`	`1251`	`STATIC void emit_native_get_iter(emit_t *emit) {`
`@@ -1608,12 +1606,12 @@ STATIC void emit_native_start_except_handler(emit_t *emit) {`
`1608`	`1606`	`adjust_stack(emit, 2);`
`1609`	`1607`	`vtype_kind_t vtype_nlr;`
`1610`	`1608`	`emit_pre_pop_reg(emit, &vtype_nlr, REG_ARG_1); // get the thrown value`
`1611`		`- emit_pre_pop_discard(emit, &vtype_nlr); // discard the linked-list pointer in the nlr_buf`
	`1609`	`+ emit_pre_pop_discard(emit); // discard the linked-list pointer in the nlr_buf`
`1612`	`1610`	`emit_post_push_reg_reg_reg(emit, VTYPE_PYOBJ, REG_ARG_1, VTYPE_PYOBJ, REG_ARG_1, VTYPE_PYOBJ, REG_ARG_1); // push the 3 exception items`
`1613`	`1611`	`}`
`1614`	`1612`
`1615`	`1613`	`STATIC void emit_native_end_except_handler(emit_t *emit) {`
`1616`		`- adjust_stack(emit, -3); // stack adjust (not sure why it's this much...)`
	`1614`	`+ adjust_stack(emit, -2);`
`1617`	`1615`	`}`
`1618`	`1616`
`1619`	`1617`	`const emit_method_table_t EXPORT_FUN(method_table) = {`