Fix bug: emit native didn't clear last_was_return in label_assign.

dpgeorge · dpgeorge · commit 6ba1314265e0 · 2013-11-02T20:34:54.000Z
diff --git a/py/emitnative.c b/py/emitnative.c
@@ -514,13 +514,15 @@ static void emit_native_delete_id(emit_t *emit, qstr qstr) {
 }
 
 static void emit_native_label_assign(emit_t *emit, int l) {
+    emit_pre(emit);
     // need to commit stack because we can jump here from elsewhere
     need_stack_settled(emit);
 #if N_X64
     asm_x64_label_assign(emit->as, l);
 #elif N_THUMB
     asm_thumb_label_assign(emit->as, l);
 #endif
+    emit_post(emit);
 }
 
 static void emit_native_import_name(emit_t *emit, qstr qstr) {
@@ -577,8 +579,10 @@ static void emit_native_load_const_int(emit_t *emit, qstr qstr) {
 }
 
 static void emit_native_load_const_dec(emit_t *emit, qstr qstr) {
-    // not supported for viper (although, could support floats in future)
-    assert(0);
+    // for viper, a float/complex is just a Python object
+    emit_pre(emit);
+    emit_call_with_imm_arg(emit, RT_F_LOAD_CONST_DEC, rt_load_const_dec, qstr, REG_ARG_1);
+    emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);
 }
 
 static void emit_native_load_const_id(emit_t *emit, qstr qstr) {
@@ -903,7 +907,7 @@ static void emit_native_setup_loop(emit_t *emit, int label) {
 }
 
 static void emit_native_break_loop(emit_t *emit, int label) {
-    assert(0);
+    emit_native_jump(emit, label); // TODO properly
 }
 static void emit_native_continue_loop(emit_t *emit, int label) {
     assert(0);
diff --git a/py/runtime.c b/py/runtime.c
@@ -1925,7 +1925,9 @@ py_obj_t rt_iternext(py_obj_t o_in) {
     }
 }
 
+// these must correspond to the respective enum
 void *const rt_fun_table[RT_F_NUMBER_OF] = {
+    rt_load_const_dec,
     rt_load_const_str,
     rt_load_name,
     rt_load_global,
diff --git a/py/runtime.h b/py/runtime.h
@@ -48,7 +48,8 @@ typedef enum {
 } rt_compare_op_t;
 
 typedef enum {
-    RT_F_LOAD_CONST_STR = 0,
+    RT_F_LOAD_CONST_DEC = 0,
+    RT_F_LOAD_CONST_STR,
     RT_F_LOAD_NAME,
     RT_F_LOAD_GLOBAL,
     RT_F_LOAD_BUILD_CLASS,

Original file line number	Diff line number	Diff line change
`@@ -514,13 +514,15 @@ static void emit_native_delete_id(emit_t *emit, qstr qstr) {`
`514`	`514`	`}`
`515`	`515`
`516`	`516`	`static void emit_native_label_assign(emit_t *emit, int l) {`
	`517`	`+ emit_pre(emit);`
`517`	`518`	`// need to commit stack because we can jump here from elsewhere`
`518`	`519`	`need_stack_settled(emit);`
`519`	`520`	`#if N_X64`
`520`	`521`	`asm_x64_label_assign(emit->as, l);`
`521`	`522`	`#elif N_THUMB`
`522`	`523`	`asm_thumb_label_assign(emit->as, l);`
`523`	`524`	`#endif`
	`525`	`+ emit_post(emit);`
`524`	`526`	`}`
`525`	`527`
`526`	`528`	`static void emit_native_import_name(emit_t *emit, qstr qstr) {`
`@@ -577,8 +579,10 @@ static void emit_native_load_const_int(emit_t *emit, qstr qstr) {`
`577`	`579`	`}`
`578`	`580`
`579`	`581`	`static void emit_native_load_const_dec(emit_t *emit, qstr qstr) {`
`580`		`- // not supported for viper (although, could support floats in future)`
`581`		`- assert(0);`
	`582`	`+ // for viper, a float/complex is just a Python object`
	`583`	`+ emit_pre(emit);`
	`584`	`+ emit_call_with_imm_arg(emit, RT_F_LOAD_CONST_DEC, rt_load_const_dec, qstr, REG_ARG_1);`
	`585`	`+ emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);`
`582`	`586`	`}`
`583`	`587`
`584`	`588`	`static void emit_native_load_const_id(emit_t *emit, qstr qstr) {`
`@@ -903,7 +907,7 @@ static void emit_native_setup_loop(emit_t *emit, int label) {`
`903`	`907`	`}`
`904`	`908`
`905`	`909`	`static void emit_native_break_loop(emit_t *emit, int label) {`
`906`		`- assert(0);`
	`910`	`+ emit_native_jump(emit, label); // TODO properly`
`907`	`911`	`}`
`908`	`912`	`static void emit_native_continue_loop(emit_t *emit, int label) {`
`909`	`913`	`assert(0);`
Original file line number	Diff line number	Diff line change
`@@ -1925,7 +1925,9 @@ py_obj_t rt_iternext(py_obj_t o_in) {`
`1925`	`1925`	`}`
`1926`	`1926`	`}`
`1927`	`1927`
	`1928`	`+// these must correspond to the respective enum`
`1928`	`1929`	`void *const rt_fun_table[RT_F_NUMBER_OF] = {`
	`1930`	`+ rt_load_const_dec,`
`1929`	`1931`	`rt_load_const_str,`
`1930`	`1932`	`rt_load_name,`
`1931`	`1933`	`rt_load_global,`