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.
diff --git a/py/objcomplex.c b/py/objcomplex.c
index bd103bb..b56f75c 100644
--- a/py/objcomplex.c
+++ b/py/objcomplex.c
@@ -30,8 +30,9 @@
}
}
-// args are reverse in the array
-static mp_obj_t complex_make_new(mp_obj_t type_in, int n_args, const mp_obj_t *args) {
+static mp_obj_t complex_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_complex(0, 0);
@@ -47,19 +48,19 @@
case 2:
{
mp_float_t real, imag;
- if (MP_OBJ_IS_TYPE(args[1], &complex_type)) {
- mp_obj_complex_get(args[1], &real, &imag);
+ if (MP_OBJ_IS_TYPE(args[0], &complex_type)) {
+ mp_obj_complex_get(args[0], &real, &imag);
} else {
- real = mp_obj_get_float(args[1]);
+ real = mp_obj_get_float(args[0]);
imag = 0;
}
- if (MP_OBJ_IS_TYPE(args[0], &complex_type)) {
+ if (MP_OBJ_IS_TYPE(args[1], &complex_type)) {
mp_float_t real2, imag2;
- mp_obj_complex_get(args[0], &real2, &imag2);
+ mp_obj_complex_get(args[1], &real2, &imag2);
real -= imag2;
imag += real2;
} else {
- imag += mp_obj_get_float(args[0]);
+ imag += mp_obj_get_float(args[1]);
}
return mp_obj_new_complex(real, imag);
}