mirror of
https://github.com/UpsilonNumworks/Upsilon.git
synced 2026-01-20 09:17:23 +01:00
[python] Upgrade MicroPython to version 1.19.1, Ulab and add unit tests for Ulab (#259)
This commit is contained in:
Yaya-Cout
GitHub
@@ -29,11 +29,20 @@
|
||||
#include <string.h>
|
||||
#include <assert.h>
|
||||
|
||||
#include "py/bc.h"
|
||||
#include "py/objmodule.h"
|
||||
#include "py/runtime.h"
|
||||
#include "py/builtin.h"
|
||||
|
||||
#ifndef NO_QSTR
|
||||
// Only include module definitions when not doing qstr extraction, because the
|
||||
// qstr extraction stage also generates this module definition header file.
|
||||
#include "genhdr/moduledefs.h"
|
||||
#endif
|
||||
|
||||
#if MICROPY_MODULE_BUILTIN_INIT
|
||||
STATIC void mp_module_call_init(mp_obj_t module_name, mp_obj_t module_obj);
|
||||
#endif
|
||||
|
||||
STATIC void module_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
|
||||
(void)kind;
|
||||
@@ -58,6 +67,21 @@ STATIC void module_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kin
|
||||
mp_printf(print, "<module '%s'>", module_name);
|
||||
}
|
||||
|
||||
STATIC void module_attr_try_delegation(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
|
||||
#if MICROPY_MODULE_ATTR_DELEGATION
|
||||
// Delegate lookup to a module's custom attr method (found in last lot of globals dict).
|
||||
mp_obj_module_t *self = MP_OBJ_TO_PTR(self_in);
|
||||
mp_map_t *map = &self->globals->map;
|
||||
if (map->table[map->alloc - 1].key == MP_OBJ_NEW_QSTR(MP_QSTRnull)) {
|
||||
((mp_attr_fun_t)MP_OBJ_TO_PTR(map->table[map->alloc - 1].value))(self_in, attr, dest);
|
||||
}
|
||||
#else
|
||||
(void)self_in;
|
||||
(void)attr;
|
||||
(void)dest;
|
||||
#endif
|
||||
}
|
||||
|
||||
STATIC void module_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
|
||||
mp_obj_module_t *self = MP_OBJ_TO_PTR(self_in);
|
||||
if (dest[0] == MP_OBJ_NULL) {
|
||||
@@ -70,8 +94,12 @@ STATIC void module_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
|
||||
elem = mp_map_lookup(&self->globals->map, MP_OBJ_NEW_QSTR(MP_QSTR___getattr__), MP_MAP_LOOKUP);
|
||||
if (elem != NULL) {
|
||||
dest[0] = mp_call_function_1(elem->value, MP_OBJ_NEW_QSTR(attr));
|
||||
} else {
|
||||
module_attr_try_delegation(self_in, attr, dest);
|
||||
}
|
||||
#endif
|
||||
} else {
|
||||
module_attr_try_delegation(self_in, attr, dest);
|
||||
}
|
||||
} else {
|
||||
// delete/store attribute
|
||||
@@ -87,6 +115,7 @@ STATIC void module_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
|
||||
#endif
|
||||
{
|
||||
// can't delete or store to fixed map
|
||||
module_attr_try_delegation(self_in, attr, dest);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -118,12 +147,12 @@ mp_obj_t mp_obj_new_module(qstr module_name) {
|
||||
}
|
||||
|
||||
// create new module object
|
||||
mp_obj_module_t *o = m_new_obj(mp_obj_module_t);
|
||||
o->base.type = &mp_type_module;
|
||||
o->globals = MP_OBJ_TO_PTR(mp_obj_new_dict(MICROPY_MODULE_DICT_SIZE));
|
||||
mp_module_context_t *o = m_new_obj(mp_module_context_t);
|
||||
o->module.base.type = &mp_type_module;
|
||||
o->module.globals = MP_OBJ_TO_PTR(mp_obj_new_dict(MICROPY_MODULE_DICT_SIZE));
|
||||
|
||||
// store __name__ entry in the module
|
||||
mp_obj_dict_store(MP_OBJ_FROM_PTR(o->globals), MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(module_name));
|
||||
mp_obj_dict_store(MP_OBJ_FROM_PTR(o->module.globals), MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(module_name));
|
||||
|
||||
// store the new module into the slot in the global dict holding all modules
|
||||
el->value = MP_OBJ_FROM_PTR(o);
|
||||
@@ -136,153 +165,62 @@ mp_obj_t mp_obj_new_module(qstr module_name) {
|
||||
// Global module table and related functions
|
||||
|
||||
STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
|
||||
{ MP_ROM_QSTR(MP_QSTR___main__), MP_ROM_PTR(&mp_module___main__) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_builtins), MP_ROM_PTR(&mp_module_builtins) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_micropython), MP_ROM_PTR(&mp_module_micropython) },
|
||||
|
||||
#if MICROPY_PY_IO
|
||||
{ MP_ROM_QSTR(MP_QSTR_uio), MP_ROM_PTR(&mp_module_io) },
|
||||
#endif
|
||||
#if MICROPY_PY_COLLECTIONS
|
||||
{ MP_ROM_QSTR(MP_QSTR_ucollections), MP_ROM_PTR(&mp_module_collections) },
|
||||
#endif
|
||||
#if MICROPY_PY_STRUCT
|
||||
{ MP_ROM_QSTR(MP_QSTR_ustruct), MP_ROM_PTR(&mp_module_ustruct) },
|
||||
#endif
|
||||
|
||||
#if MICROPY_PY_BUILTINS_FLOAT
|
||||
#if MICROPY_PY_MATH
|
||||
{ MP_ROM_QSTR(MP_QSTR_math), MP_ROM_PTR(&mp_module_math) },
|
||||
#endif
|
||||
#if MICROPY_PY_BUILTINS_COMPLEX && MICROPY_PY_CMATH
|
||||
{ MP_ROM_QSTR(MP_QSTR_cmath), MP_ROM_PTR(&mp_module_cmath) },
|
||||
#endif
|
||||
#endif
|
||||
#if MICROPY_PY_SYS
|
||||
{ MP_ROM_QSTR(MP_QSTR_usys), MP_ROM_PTR(&mp_module_sys) },
|
||||
#endif
|
||||
#if MICROPY_PY_GC && MICROPY_ENABLE_GC
|
||||
{ MP_ROM_QSTR(MP_QSTR_gc), MP_ROM_PTR(&mp_module_gc) },
|
||||
#endif
|
||||
#if MICROPY_PY_THREAD
|
||||
{ MP_ROM_QSTR(MP_QSTR__thread), MP_ROM_PTR(&mp_module_thread) },
|
||||
#endif
|
||||
|
||||
// extmod modules
|
||||
|
||||
#if MICROPY_PY_UASYNCIO
|
||||
{ MP_ROM_QSTR(MP_QSTR__uasyncio), MP_ROM_PTR(&mp_module_uasyncio) },
|
||||
#endif
|
||||
#if MICROPY_PY_UERRNO
|
||||
{ MP_ROM_QSTR(MP_QSTR_uerrno), MP_ROM_PTR(&mp_module_uerrno) },
|
||||
#endif
|
||||
#if MICROPY_PY_UCTYPES
|
||||
{ MP_ROM_QSTR(MP_QSTR_uctypes), MP_ROM_PTR(&mp_module_uctypes) },
|
||||
#endif
|
||||
#if MICROPY_PY_UZLIB
|
||||
{ MP_ROM_QSTR(MP_QSTR_uzlib), MP_ROM_PTR(&mp_module_uzlib) },
|
||||
#endif
|
||||
#if MICROPY_PY_UJSON
|
||||
{ MP_ROM_QSTR(MP_QSTR_ujson), MP_ROM_PTR(&mp_module_ujson) },
|
||||
#endif
|
||||
#if MICROPY_PY_URE
|
||||
{ MP_ROM_QSTR(MP_QSTR_ure), MP_ROM_PTR(&mp_module_ure) },
|
||||
#endif
|
||||
#if MICROPY_PY_UHEAPQ
|
||||
{ MP_ROM_QSTR(MP_QSTR_uheapq), MP_ROM_PTR(&mp_module_uheapq) },
|
||||
#endif
|
||||
#if MICROPY_PY_UTIMEQ
|
||||
{ MP_ROM_QSTR(MP_QSTR_utimeq), MP_ROM_PTR(&mp_module_utimeq) },
|
||||
#endif
|
||||
#if MICROPY_PY_UHASHLIB
|
||||
{ MP_ROM_QSTR(MP_QSTR_uhashlib), MP_ROM_PTR(&mp_module_uhashlib) },
|
||||
#endif
|
||||
#if MICROPY_PY_UCRYPTOLIB
|
||||
{ MP_ROM_QSTR(MP_QSTR_ucryptolib), MP_ROM_PTR(&mp_module_ucryptolib) },
|
||||
#endif
|
||||
#if MICROPY_PY_UBINASCII
|
||||
{ MP_ROM_QSTR(MP_QSTR_ubinascii), MP_ROM_PTR(&mp_module_ubinascii) },
|
||||
#endif
|
||||
#if MICROPY_PY_URANDOM
|
||||
{ MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&mp_module_urandom) },
|
||||
#endif
|
||||
#if MICROPY_PY_USELECT
|
||||
{ MP_ROM_QSTR(MP_QSTR_uselect), MP_ROM_PTR(&mp_module_uselect) },
|
||||
#endif
|
||||
#if MICROPY_PY_USSL
|
||||
{ MP_ROM_QSTR(MP_QSTR_ussl), MP_ROM_PTR(&mp_module_ussl) },
|
||||
#endif
|
||||
#if MICROPY_PY_LWIP
|
||||
{ MP_ROM_QSTR(MP_QSTR_lwip), MP_ROM_PTR(&mp_module_lwip) },
|
||||
#endif
|
||||
#if MICROPY_PY_UWEBSOCKET
|
||||
{ MP_ROM_QSTR(MP_QSTR_uwebsocket), MP_ROM_PTR(&mp_module_uwebsocket) },
|
||||
#endif
|
||||
#if MICROPY_PY_WEBREPL
|
||||
{ MP_ROM_QSTR(MP_QSTR__webrepl), MP_ROM_PTR(&mp_module_webrepl) },
|
||||
#endif
|
||||
#if MICROPY_PY_FRAMEBUF
|
||||
{ MP_ROM_QSTR(MP_QSTR_framebuf), MP_ROM_PTR(&mp_module_framebuf) },
|
||||
#endif
|
||||
#if MICROPY_PY_BTREE
|
||||
{ MP_ROM_QSTR(MP_QSTR_btree), MP_ROM_PTR(&mp_module_btree) },
|
||||
#endif
|
||||
#if MICROPY_PY_BLUETOOTH
|
||||
{ MP_ROM_QSTR(MP_QSTR_ubluetooth), MP_ROM_PTR(&mp_module_ubluetooth) },
|
||||
#endif
|
||||
|
||||
// extra builtin modules as defined by a port
|
||||
MICROPY_PORT_BUILTIN_MODULES
|
||||
|
||||
#ifdef MICROPY_REGISTERED_MODULES
|
||||
// builtin modules declared with MP_REGISTER_MODULE()
|
||||
MICROPY_REGISTERED_MODULES
|
||||
#endif
|
||||
};
|
||||
|
||||
MP_DEFINE_CONST_MAP(mp_builtin_module_map, mp_builtin_module_table);
|
||||
|
||||
// returns MP_OBJ_NULL if not found
|
||||
mp_obj_t mp_module_get(qstr module_name) {
|
||||
mp_map_t *mp_loaded_modules_map = &MP_STATE_VM(mp_loaded_modules_dict).map;
|
||||
// lookup module
|
||||
mp_map_elem_t *el = mp_map_lookup(mp_loaded_modules_map, MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP);
|
||||
// Tries to find a loaded module, otherwise attempts to load a builtin, otherwise MP_OBJ_NULL.
|
||||
mp_obj_t mp_module_get_loaded_or_builtin(qstr module_name) {
|
||||
// First try loaded modules.
|
||||
mp_map_elem_t *elem = mp_map_lookup(&MP_STATE_VM(mp_loaded_modules_dict).map, MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP);
|
||||
|
||||
if (el == NULL) {
|
||||
// module not found, look for builtin module names
|
||||
el = mp_map_lookup((mp_map_t *)&mp_builtin_module_map, MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP);
|
||||
if (el == NULL) {
|
||||
if (!elem) {
|
||||
#if MICROPY_MODULE_WEAK_LINKS
|
||||
return mp_module_get_builtin(module_name);
|
||||
#else
|
||||
// Otherwise try builtin.
|
||||
elem = mp_map_lookup((mp_map_t *)&mp_builtin_module_map, MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP);
|
||||
if (!elem) {
|
||||
return MP_OBJ_NULL;
|
||||
}
|
||||
mp_module_call_init(module_name, el->value);
|
||||
|
||||
#if MICROPY_MODULE_BUILTIN_INIT
|
||||
// If found, it's a newly loaded built-in, so init it.
|
||||
mp_module_call_init(MP_OBJ_NEW_QSTR(module_name), elem->value);
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
// module found, return it
|
||||
return el->value;
|
||||
}
|
||||
|
||||
void mp_module_register(qstr qst, mp_obj_t module) {
|
||||
mp_map_t *mp_loaded_modules_map = &MP_STATE_VM(mp_loaded_modules_dict).map;
|
||||
mp_map_lookup(mp_loaded_modules_map, MP_OBJ_NEW_QSTR(qst), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = module;
|
||||
return elem->value;
|
||||
}
|
||||
|
||||
#if MICROPY_MODULE_WEAK_LINKS
|
||||
// Search for u"foo" in built-in modules, return MP_OBJ_NULL if not found
|
||||
mp_obj_t mp_module_search_umodule(const char *module_str) {
|
||||
for (size_t i = 0; i < MP_ARRAY_SIZE(mp_builtin_module_table); ++i) {
|
||||
const mp_map_elem_t *entry = (const mp_map_elem_t *)&mp_builtin_module_table[i];
|
||||
const char *key = qstr_str(MP_OBJ_QSTR_VALUE(entry->key));
|
||||
if (key[0] == 'u' && strcmp(&key[1], module_str) == 0) {
|
||||
return (mp_obj_t)entry->value;
|
||||
}
|
||||
|
||||
// Tries to find a loaded module, otherwise attempts to load a builtin, otherwise MP_OBJ_NULL.
|
||||
mp_obj_t mp_module_get_builtin(qstr module_name) {
|
||||
// Try builtin.
|
||||
mp_map_elem_t *elem = mp_map_lookup((mp_map_t *)&mp_builtin_module_map, MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP);
|
||||
if (!elem) {
|
||||
return MP_OBJ_NULL;
|
||||
}
|
||||
return MP_OBJ_NULL;
|
||||
|
||||
#if MICROPY_MODULE_BUILTIN_INIT
|
||||
// If found, it's a newly loaded built-in, so init it.
|
||||
mp_module_call_init(MP_OBJ_NEW_QSTR(module_name), elem->value);
|
||||
#endif
|
||||
|
||||
return elem->value;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if MICROPY_MODULE_BUILTIN_INIT
|
||||
void mp_module_call_init(qstr module_name, mp_obj_t module_obj) {
|
||||
STATIC void mp_module_register(mp_obj_t module_name, mp_obj_t module) {
|
||||
mp_map_t *mp_loaded_modules_map = &MP_STATE_VM(mp_loaded_modules_dict).map;
|
||||
mp_map_lookup(mp_loaded_modules_map, module_name, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = module;
|
||||
}
|
||||
|
||||
STATIC void mp_module_call_init(mp_obj_t module_name, mp_obj_t module_obj) {
|
||||
// Look for __init__ and call it if it exists
|
||||
mp_obj_t dest[2];
|
||||
mp_load_method_maybe(module_obj, MP_QSTR___init__, dest);
|
||||
@@ -296,3 +234,19 @@ void mp_module_call_init(qstr module_name, mp_obj_t module_obj) {
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
void mp_module_generic_attr(qstr attr, mp_obj_t *dest, const uint16_t *keys, mp_obj_t *values) {
|
||||
for (size_t i = 0; keys[i] != MP_QSTRnull; ++i) {
|
||||
if (attr == keys[i]) {
|
||||
if (dest[0] == MP_OBJ_NULL) {
|
||||
// load attribute (MP_OBJ_NULL returned for deleted items)
|
||||
dest[0] = values[i];
|
||||
} else {
|
||||
// delete or store (delete stores MP_OBJ_NULL)
|
||||
values[i] = dest[1];
|
||||
dest[0] = MP_OBJ_NULL; // indicate success
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user