djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

all: Fix MICROPY_OBJ_REPR_D compilation with msvc.

Browse Source
This commit is contained in:
stijn 2022-01-11 17:25:06 +01:00 committed by Damien George
parent 5f8eef4521
commit a9448c0a86
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mpy-cross/mpconfigport.h
View File

@ -139,7 +139,7 @@ typedef long mp_off_t;
#define MP_NOINLINE __declspec(noinline) #define MP_NOINLINE __declspec(noinline)
#define MP_LIKELY(x) (x) #define MP_LIKELY(x) (x)
#define MP_UNLIKELY(x) (x) #define MP_UNLIKELY(x) (x)
#define MICROPY_PORT_CONSTANTS { "dummy", 0 } #define MICROPY_PORT_CONSTANTS { MP_ROM_QSTR(MP_QSTR_dummy), MP_ROM_PTR(NULL) }
#ifdef _WIN64 #ifdef _WIN64
#define MP_SSIZE_MAX _I64_MAX #define MP_SSIZE_MAX _I64_MAX
#else #else

2
ports/windows/mpconfigport.h
View File

@ -244,7 +244,7 @@ extern const struct _mp_obj_module_t mp_module_time;
#define MP_NOINLINE __declspec(noinline) #define MP_NOINLINE __declspec(noinline)
#define MP_LIKELY(x) (x) #define MP_LIKELY(x) (x)
#define MP_UNLIKELY(x) (x) #define MP_UNLIKELY(x) (x)
#define MICROPY_PORT_CONSTANTS { "dummy", 0 } // can't have zero-sized array #define MICROPY_PORT_CONSTANTS { MP_ROM_QSTR(MP_QSTR_dummy), MP_ROM_PTR(NULL) } // can't have zero-sized array
#ifdef _WIN64 #ifdef _WIN64
#define MP_SSIZE_MAX _I64_MAX #define MP_SSIZE_MAX _I64_MAX
#else #else

10
py/objfun.c
View File

@ -410,7 +410,7 @@ mp_obj_t mp_obj_new_fun_bc(mp_obj_t def_args_in, mp_obj_t def_kw_args, const byt
STATIC mp_obj_t fun_native_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) { STATIC mp_obj_t fun_native_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
MP_STACK_CHECK(); MP_STACK_CHECK();
mp_obj_fun_bc_t *self = self_in; mp_obj_fun_bc_t *self = MP_OBJ_TO_PTR(self_in);
mp_call_fun_t fun = MICROPY_MAKE_POINTER_CALLABLE((void *)self->bytecode); mp_call_fun_t fun = MICROPY_MAKE_POINTER_CALLABLE((void *)self->bytecode);
return fun(self_in, n_args, n_kw, args); return fun(self_in, n_args, n_kw, args);
} }
@ -424,9 +424,9 @@ STATIC const mp_obj_type_t mp_type_fun_native = {
}; };
mp_obj_t mp_obj_new_fun_native(mp_obj_t def_args_in, mp_obj_t def_kw_args, const void *fun_data, const mp_uint_t *const_table) { mp_obj_t mp_obj_new_fun_native(mp_obj_t def_args_in, mp_obj_t def_kw_args, const void *fun_data, const mp_uint_t *const_table) {
mp_obj_fun_bc_t *o = mp_obj_new_fun_bc(def_args_in, def_kw_args, (const byte *)fun_data, const_table); mp_obj_fun_bc_t *o = MP_OBJ_TO_PTR(mp_obj_new_fun_bc(def_args_in, def_kw_args, (const byte *)fun_data, const_table));
o->base.type = &mp_type_fun_native; o->base.type = &mp_type_fun_native;
return o; return MP_OBJ_FROM_PTR(o);
} }
#endif // MICROPY_EMIT_NATIVE #endif // MICROPY_EMIT_NATIVE
@ -494,7 +494,7 @@ STATIC mp_uint_t convert_obj_for_inline_asm(mp_obj_t obj) {
} }
STATIC mp_obj_t fun_asm_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) { STATIC mp_obj_t fun_asm_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
mp_obj_fun_asm_t *self = self_in; mp_obj_fun_asm_t *self = MP_OBJ_TO_PTR(self_in);
mp_arg_check_num(n_args, n_kw, self->n_args, self->n_args, false); mp_arg_check_num(n_args, n_kw, self->n_args, self->n_args, false);
@ -537,7 +537,7 @@ mp_obj_t mp_obj_new_fun_asm(size_t n_args, const void *fun_data, mp_uint_t type_
o->n_args = n_args; o->n_args = n_args;
o->fun_data = fun_data; o->fun_data = fun_data;
o->type_sig = type_sig; o->type_sig = type_sig;
return o; return MP_OBJ_FROM_PTR(o);
} }
#endif // MICROPY_EMIT_INLINE_ASM #endif // MICROPY_EMIT_INLINE_ASM