py: Remove mp_load_const_str and replace uses with inlined version.

dpgeorge · dpgeorge · commit ed570e4b2a0a · 2015-06-25T13:58:41.000Z
diff --git a/py/emitnative.c b/py/emitnative.c
@@ -167,7 +167,6 @@
 STATIC byte mp_f_n_args[MP_F_NUMBER_OF] = {
     [MP_F_CONVERT_OBJ_TO_NATIVE] = 2,
     [MP_F_CONVERT_NATIVE_TO_OBJ] = 2,
-    [MP_F_LOAD_CONST_STR] = 1,
     [MP_F_LOAD_CONST_BYTES] = 1,
     [MP_F_LOAD_NAME] = 1,
     [MP_F_LOAD_GLOBAL] = 1,
@@ -1311,10 +1310,10 @@ STATIC void emit_native_load_const_str(emit_t *emit, qstr qst, bool bytes) {
     {
         if (bytes) {
             emit_call_with_imm_arg(emit, MP_F_LOAD_CONST_BYTES, qst, REG_ARG_1);
+            emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);
         } else {
-            emit_call_with_imm_arg(emit, MP_F_LOAD_CONST_STR, qst, REG_ARG_1);
+            emit_post_push_imm(emit, VTYPE_PYOBJ, (mp_uint_t)MP_OBJ_NEW_QSTR(qst));
         }
-        emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);
     }
 }
 
diff --git a/py/nativeglue.c b/py/nativeglue.c
@@ -92,7 +92,6 @@ void mp_native_raise(mp_obj_t o) {
 void *const mp_fun_table[MP_F_NUMBER_OF] = {
     mp_convert_obj_to_native,
     mp_convert_native_to_obj,
-    mp_load_const_str,
     mp_load_const_bytes,
     mp_load_name,
     mp_load_global,
diff --git a/py/runtime.c b/py/runtime.c
@@ -104,11 +104,6 @@ void mp_deinit(void) {
 #endif
 }
 
-mp_obj_t mp_load_const_str(qstr qst) {
-    DEBUG_OP_printf("load '%s'\n", qstr_str(qst));
-    return MP_OBJ_NEW_QSTR(qst);
-}
-
 mp_obj_t mp_load_const_bytes(qstr qst) {
     DEBUG_OP_printf("load b'%s'\n", qstr_str(qst));
     mp_uint_t len;
diff --git a/py/runtime.h b/py/runtime.h
@@ -90,7 +90,6 @@ mp_obj_t mp_binary_op(mp_uint_t op, mp_obj_t lhs, mp_obj_t rhs);
 
 mp_obj_t mp_load_const_int(qstr qst);
 mp_obj_t mp_load_const_dec(qstr qst);
-mp_obj_t mp_load_const_str(qstr qst);
 mp_obj_t mp_load_const_bytes(qstr qst);
 
 mp_obj_t mp_call_function_0(mp_obj_t fun);
diff --git a/py/runtime0.h b/py/runtime0.h
@@ -109,7 +109,6 @@ typedef enum {
 typedef enum {
     MP_F_CONVERT_OBJ_TO_NATIVE = 0,
     MP_F_CONVERT_NATIVE_TO_OBJ,
-    MP_F_LOAD_CONST_STR,
     MP_F_LOAD_CONST_BYTES,
     MP_F_LOAD_NAME,
     MP_F_LOAD_GLOBAL,
diff --git a/py/vm.c b/py/vm.c
@@ -213,7 +213,7 @@ run_code_state: ;
 
                 ENTRY(MP_BC_LOAD_CONST_STRING): {
                     DECODE_QSTR;
-                    PUSH(mp_load_const_str(qst));
+                    PUSH(MP_OBJ_NEW_QSTR(qst));
                     DISPATCH();
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,6 @@`
`167`	`167`	`STATIC byte mp_f_n_args[MP_F_NUMBER_OF] = {`
`168`	`168`	`[MP_F_CONVERT_OBJ_TO_NATIVE] = 2,`
`169`	`169`	`[MP_F_CONVERT_NATIVE_TO_OBJ] = 2,`
`170`		`- [MP_F_LOAD_CONST_STR] = 1,`
`171`	`170`	`[MP_F_LOAD_CONST_BYTES] = 1,`
`172`	`171`	`[MP_F_LOAD_NAME] = 1,`
`173`	`172`	`[MP_F_LOAD_GLOBAL] = 1,`
`@@ -1311,10 +1310,10 @@ STATIC void emit_native_load_const_str(emit_t *emit, qstr qst, bool bytes) {`
`1311`	`1310`	`{`
`1312`	`1311`	`if (bytes) {`
`1313`	`1312`	`emit_call_with_imm_arg(emit, MP_F_LOAD_CONST_BYTES, qst, REG_ARG_1);`
	`1313`	`+ emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);`
`1314`	`1314`	`} else {`
`1315`		`- emit_call_with_imm_arg(emit, MP_F_LOAD_CONST_STR, qst, REG_ARG_1);`
	`1315`	`+ emit_post_push_imm(emit, VTYPE_PYOBJ, (mp_uint_t)MP_OBJ_NEW_QSTR(qst));`
`1316`	`1316`	`}`
`1317`		`- emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);`
`1318`	`1317`	`}`
`1319`	`1318`	`}`
`1320`	`1319`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ run_code_state: ;`
`213`	`213`
`214`	`214`	`ENTRY(MP_BC_LOAD_CONST_STRING): {`
`215`	`215`	`DECODE_QSTR;`
`216`		`- PUSH(mp_load_const_str(qst));`
	`216`	`+ PUSH(MP_OBJ_NEW_QSTR(qst));`
`217`	`217`	`DISPATCH();`
`218`	`218`	`}`
`219`	`219`