From 5d66b427e22b6db5c73b74a6e9ba057ac5a38893 Mon Sep 17 00:00:00 2001 From: Damien George Date: Fri, 27 Nov 2015 12:41:25 +0000 Subject: [PATCH] py/emit: Change type of arg of load_const_obj from void* to mp_obj_t. --- py/emit.h | 4 ++-- py/emitbc.c | 2 +- py/emitnative.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/py/emit.h b/py/emit.h index 4f60a6fff8..9d09ee2efa 100644 --- a/py/emit.h +++ b/py/emit.h @@ -85,7 +85,7 @@ typedef struct _emit_method_table_t { void (*load_const_tok)(emit_t *emit, mp_token_kind_t tok); void (*load_const_small_int)(emit_t *emit, mp_int_t arg); void (*load_const_str)(emit_t *emit, qstr qst); - void (*load_const_obj)(emit_t *emit, void *obj); + void (*load_const_obj)(emit_t *emit, mp_obj_t obj); void (*load_null)(emit_t *emit); void (*load_attr)(emit_t *emit, qstr qst); void (*load_method)(emit_t *emit, qstr qst); @@ -205,7 +205,7 @@ void mp_emit_bc_import_star(emit_t *emit); void mp_emit_bc_load_const_tok(emit_t *emit, mp_token_kind_t tok); void mp_emit_bc_load_const_small_int(emit_t *emit, mp_int_t arg); void mp_emit_bc_load_const_str(emit_t *emit, qstr qst); -void mp_emit_bc_load_const_obj(emit_t *emit, void *obj); +void mp_emit_bc_load_const_obj(emit_t *emit, mp_obj_t obj); void mp_emit_bc_load_null(emit_t *emit); void mp_emit_bc_load_attr(emit_t *emit, qstr qst); void mp_emit_bc_load_method(emit_t *emit, qstr qst); diff --git a/py/emitbc.c b/py/emitbc.c index 062a7ea233..580ff165c0 100644 --- a/py/emitbc.c +++ b/py/emitbc.c @@ -542,7 +542,7 @@ void mp_emit_bc_load_const_str(emit_t *emit, qstr qst) { emit_write_bytecode_byte_qstr(emit, MP_BC_LOAD_CONST_STRING, qst); } -void mp_emit_bc_load_const_obj(emit_t *emit, void *obj) { +void mp_emit_bc_load_const_obj(emit_t *emit, mp_obj_t obj) { emit_bc_pre(emit, 1); emit_write_bytecode_byte_obj(emit, MP_BC_LOAD_CONST_OBJ, obj); } diff --git a/py/emitnative.c b/py/emitnative.c index 2abc46c936..34e0b928b5 100644 --- a/py/emitnative.c +++ b/py/emitnative.c @@ -1344,7 +1344,7 @@ STATIC void emit_native_load_const_str(emit_t *emit, qstr qst) { } } -STATIC void emit_native_load_const_obj(emit_t *emit, void *obj) { +STATIC void emit_native_load_const_obj(emit_t *emit, mp_obj_t obj) { emit_native_pre(emit); need_reg_single(emit, REG_RET, 0); ASM_MOV_ALIGNED_IMM_TO_REG(emit->as, (mp_uint_t)obj, REG_RET);