diff options
author | Damien George <damien.p.george@gmail.com> | 2014-01-18 14:10:48 +0000 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-01-18 14:10:48 +0000 |
commit | 20006dbba9d2d84ead036fdfab7190e88b2337ce (patch) | |
tree | a83dc966464cbbee17a397bda96360e9d238f8cf /py/objzip.c | |
parent | 8655065f8cec8b978d075adae1f65ffdfa9b51d8 (diff) | |
download | micropython-20006dbba9d2d84ead036fdfab7190e88b2337ce.tar.gz micropython-20006dbba9d2d84ead036fdfab7190e88b2337ce.zip |
Make VM stack grow upwards, and so no reversed args arrays.
Change state layout in VM so the stack starts at state[0] and grows
upwards. Locals are at the top end of the state and number downwards.
This cleans up a lot of the interface connecting the VM to C: now all
functions that take an array of Micro Python objects are in order (ie no
longer in reverse).
Also clean up C API with keyword arguments (call_n and call_n_kw
replaced with single call method that takes keyword arguments). And now
make_new takes keyword arguments.
emitnative.c has not yet been changed to comply with the new order of
stack layout.
Diffstat (limited to 'py/objzip.c')
-rw-r--r-- | py/objzip.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/py/objzip.c b/py/objzip.c index a552ff5881..72db06ac20 100644 --- a/py/objzip.c +++ b/py/objzip.c @@ -12,13 +12,14 @@ typedef struct _mp_obj_zip_t { mp_obj_t iters[]; } mp_obj_zip_t; -static mp_obj_t zip_make_new(mp_obj_t type_in, int n_args, const mp_obj_t *args) { - /* NOTE: args are backwards */ +static mp_obj_t zip_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) { + // TODO check n_kw == 0 + mp_obj_zip_t *o = m_new_obj_var(mp_obj_zip_t, mp_obj_t, n_args); o->base.type = &zip_type; o->n_iters = n_args; for (int i = 0; i < n_args; i++) { - o->iters[i] = rt_getiter(args[n_args-i-1]); + o->iters[i] = rt_getiter(args[i]); } return o; } |