diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-01-04 15:57:35 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-01-04 15:57:35 +0000 |
| commit | eb7bfcb28697f6fb2d4d933bc39233aa15423a20 (patch) | |
| tree | 54b38d50cac986fba791fb0eb00804069c41e9c3 /py/objdict.c | |
| parent | e67ed5d285bb2ae7b83eb8be3ee488ab08fa4db1 (diff) | |
| download | micropython-eb7bfcb28697f6fb2d4d933bc39233aa15423a20.tar.gz micropython-eb7bfcb28697f6fb2d4d933bc39233aa15423a20.zip | |
Split qstr into pools, and put initial pool in ROM.
Qstr's are now split into a linked-list of qstr pools. This has 2
benefits: the first pool can be in ROM (huge benefit, since we no longer
use RAM for the core qstrs), and subsequent pools use m_new for the next
pool instead of m_renew (thus avoiding a huge single table for all the
qstrs).
Still would be better to use a hash table, but this scheme takes us part
of the way (eventually convert the pools to hash tables).
Also fixed bug with import.
Also improved the way the module code is referenced (not magic number 1
anymore).
Diffstat (limited to 'py/objdict.c')
| -rw-r--r-- | py/objdict.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/py/objdict.c b/py/objdict.c index 50ce279040..acf1a9f801 100644 --- a/py/objdict.c +++ b/py/objdict.c @@ -6,6 +6,7 @@ #include "nlr.h" #include "misc.h" #include "mpconfig.h" +#include "mpqstr.h" #include "obj.h" #include "runtime0.h" #include "runtime.h" @@ -42,7 +43,7 @@ mp_obj_t dict_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) { // dict load mp_map_elem_t *elem = mp_map_lookup_helper(&o->map, rhs_in, false); if (elem == NULL) { - nlr_jump(mp_obj_new_exception_msg(rt_q_KeyError, "<value>")); + nlr_jump(mp_obj_new_exception_msg(MP_QSTR_KeyError, "<value>")); } else { return elem->value; } |