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/objint.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/objint.c')
-rw-r--r-- | py/objint.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/py/objint.c b/py/objint.c index 937bff7ae3..477b8aa52b 100644 --- a/py/objint.c +++ b/py/objint.c @@ -12,7 +12,9 @@ // This dispatcher function is expected to be independent of the implementation // of long int -static mp_obj_t int_make_new(mp_obj_t type_in, int n_args, const mp_obj_t *args) { +static mp_obj_t int_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) { + // TODO check n_kw == 0 + switch (n_args) { case 0: return MP_OBJ_NEW_SMALL_INT(0); @@ -28,7 +30,7 @@ static mp_obj_t int_make_new(mp_obj_t type_in, int n_args, const mp_obj_t *args) case 2: // should be a string, parse it // TODO proper error checking of argument types - return MP_OBJ_NEW_SMALL_INT(strtonum(qstr_str(mp_obj_get_qstr(args[1])), mp_obj_get_int(args[0]))); + return MP_OBJ_NEW_SMALL_INT(strtonum(qstr_str(mp_obj_get_qstr(args[0])), mp_obj_get_int(args[1]))); default: nlr_jump(mp_obj_new_exception_msg_1_arg(MP_QSTR_TypeError, "int takes at most 2 arguments, %d given", (void*)(machine_int_t)n_args)); |