c340596580
By selectively collecting an allocation, we can skip scanning many allocations for pointers because we know up front they won't have them. This helps a ton when large buffers are being used and memory is slow (PSRAM). In one Fruit Jam example GC times drop from 80+ms to ~25ms. The example uses a number of bitmaps that are now no longer scanned.
127 lines
4.8 KiB
C
127 lines
4.8 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2013, 2014 Damien P. George
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include <assert.h>
|
|
|
|
// CIRCUITPY-CHANGE
|
|
#include "py/nlr.h"
|
|
#include "py/objproperty.h"
|
|
#include "py/runtime.h"
|
|
|
|
// CIRCUITPY-CHANGE: changes to reduce property proxy table size
|
|
// when possible
|
|
|
|
#if MICROPY_PY_BUILTINS_PROPERTY
|
|
|
|
static mp_obj_t property_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
|
|
enum { ARG_fget, ARG_fset, ARG_fdel, ARG_doc };
|
|
static const mp_arg_t allowed_args[] = {
|
|
{ MP_QSTR_, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
|
|
{ MP_QSTR_, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
|
|
{ MP_QSTR_, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
|
|
{ MP_QSTR_doc, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
|
|
};
|
|
mp_arg_val_t vals[MP_ARRAY_SIZE(allowed_args)];
|
|
mp_arg_parse_all_kw_array(n_args, n_kw, args, MP_ARRAY_SIZE(allowed_args), allowed_args, vals);
|
|
|
|
mp_obj_property_t *o = mp_obj_malloc(mp_obj_property_t, type);
|
|
o->proxy[0] = vals[ARG_fget].u_obj;
|
|
o->proxy[1] = vals[ARG_fset].u_obj;
|
|
o->proxy[2] = vals[ARG_fdel].u_obj;
|
|
// vals[ARG_doc] is silently discarded
|
|
return MP_OBJ_FROM_PTR(o);
|
|
}
|
|
|
|
static mp_obj_t property_getter(mp_obj_t self_in, mp_obj_t getter) {
|
|
// CIRCUITPY-CHANGE: Use mp_obj_malloc because it is a Python object
|
|
mp_obj_property_t *p2 = mp_obj_malloc(mp_obj_property_t, &mp_type_property);
|
|
*p2 = *(mp_obj_property_t *)MP_OBJ_TO_PTR(self_in);
|
|
p2->proxy[0] = getter;
|
|
return MP_OBJ_FROM_PTR(p2);
|
|
}
|
|
|
|
static MP_DEFINE_CONST_FUN_OBJ_2(property_getter_obj, property_getter);
|
|
|
|
static mp_obj_t property_setter(mp_obj_t self_in, mp_obj_t setter) {
|
|
// CIRCUITPY-CHANGE: Use mp_obj_malloc because it is a Python object
|
|
mp_obj_property_t *p2 = mp_obj_malloc(mp_obj_property_t, &mp_type_property);
|
|
*p2 = *(mp_obj_property_t *)MP_OBJ_TO_PTR(self_in);
|
|
p2->proxy[1] = setter;
|
|
return MP_OBJ_FROM_PTR(p2);
|
|
}
|
|
|
|
static MP_DEFINE_CONST_FUN_OBJ_2(property_setter_obj, property_setter);
|
|
|
|
static mp_obj_t property_deleter(mp_obj_t self_in, mp_obj_t deleter) {
|
|
// CIRCUITPY-CHANGE: Use mp_obj_malloc because it is a Python object
|
|
mp_obj_property_t *p2 = mp_obj_malloc(mp_obj_property_t, &mp_type_property);
|
|
*p2 = *(mp_obj_property_t *)MP_OBJ_TO_PTR(self_in);
|
|
p2->proxy[2] = deleter;
|
|
return MP_OBJ_FROM_PTR(p2);
|
|
}
|
|
|
|
static MP_DEFINE_CONST_FUN_OBJ_2(property_deleter_obj, property_deleter);
|
|
|
|
static const mp_rom_map_elem_t property_locals_dict_table[] = {
|
|
{ MP_ROM_QSTR(MP_QSTR_getter), MP_ROM_PTR(&property_getter_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_setter), MP_ROM_PTR(&property_setter_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_deleter), MP_ROM_PTR(&property_deleter_obj) },
|
|
};
|
|
|
|
static MP_DEFINE_CONST_DICT(property_locals_dict, property_locals_dict_table);
|
|
|
|
MP_DEFINE_CONST_OBJ_TYPE(
|
|
mp_type_property,
|
|
MP_QSTR_property,
|
|
MP_TYPE_FLAG_NONE,
|
|
make_new, property_make_new,
|
|
locals_dict, &property_locals_dict
|
|
);
|
|
|
|
// CIRCUITPY-CHANGE
|
|
#if MICROPY_PY_OPTIMIZE_PROPERTY_FLASH_SIZE
|
|
extern const mp_obj_property_t __property_getter_start, __property_getter_end, __property_getset_start, __property_getset_end;
|
|
#endif
|
|
|
|
const mp_obj_t *PLACE_IN_ITCM(mp_obj_property_get)(mp_obj_t self_in, size_t *n_proxy) {
|
|
mp_check_self(mp_obj_is_type(self_in, &mp_type_property));
|
|
mp_obj_property_t *self = MP_OBJ_TO_PTR(self_in);
|
|
#if MICROPY_PY_OPTIMIZE_PROPERTY_FLASH_SIZE
|
|
if (self >= &__property_getter_start && self < &__property_getter_end) {
|
|
*n_proxy = 1;
|
|
} else if (self >= &__property_getset_start && self < &__property_getset_end) {
|
|
*n_proxy = 2;
|
|
} else {
|
|
*n_proxy = 3;
|
|
}
|
|
#else
|
|
*n_proxy = 3;
|
|
#endif
|
|
return self->proxy;
|
|
}
|
|
|
|
#endif // MICROPY_PY_BUILTINS_PROPERTY
|