From 20006dbba9d2d84ead036fdfab7190e88b2337ce Mon Sep 17 00:00:00 2001 From: Damien George Date: Sat, 18 Jan 2014 14:10:48 +0000 Subject: 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. --- py/objenumerate.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'py/objenumerate.c') diff --git a/py/objenumerate.c b/py/objenumerate.c index 5bfd8a3370..3e25124c49 100644 --- a/py/objenumerate.c +++ b/py/objenumerate.c @@ -20,15 +20,12 @@ static mp_obj_t enumerate_iternext(mp_obj_t self_in); /* TODO: enumerate is one of the ones that can take args or kwargs. Sticking to args for now */ -static mp_obj_t enumerate_make_new(mp_obj_t type_in, int n_args, const mp_obj_t *args) { - /* NOTE: args are backwards */ +static mp_obj_t enumerate_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) { assert(n_args > 0); - args += n_args - 1; mp_obj_enumerate_t *o = m_new_obj(mp_obj_enumerate_t); o->base.type = &enumerate_type; o->iter = rt_getiter(args[0]); - o->cur = n_args > 1 ? mp_obj_get_int(args[-1]) : 0; - + o->cur = n_args > 1 ? mp_obj_get_int(args[1]) : 0; return o; } -- cgit v1.2.3