![Damien George](/assets/img/avatar_default.png)
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.
115 lines
3.5 KiB
C
115 lines
3.5 KiB
C
#include <stdlib.h>
|
|
#include <stdint.h>
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
|
|
#include "nlr.h"
|
|
#include "misc.h"
|
|
#include "mpconfig.h"
|
|
#include "mpqstr.h"
|
|
#include "obj.h"
|
|
#include "runtime0.h"
|
|
|
|
#if MICROPY_ENABLE_FLOAT
|
|
|
|
typedef struct _mp_obj_float_t {
|
|
mp_obj_base_t base;
|
|
mp_float_t value;
|
|
} mp_obj_float_t;
|
|
|
|
mp_obj_t mp_obj_new_float(mp_float_t value);
|
|
|
|
static void float_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in, mp_print_kind_t kind) {
|
|
mp_obj_float_t *o = o_in;
|
|
print(env, "%.8g", o->value);
|
|
}
|
|
|
|
static mp_obj_t float_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_float(0);
|
|
|
|
case 1:
|
|
// TODO allow string as arg and parse it
|
|
if (MP_OBJ_IS_TYPE(args[0], &float_type)) {
|
|
return args[0];
|
|
} else {
|
|
return mp_obj_new_float(mp_obj_get_float(args[0]));
|
|
}
|
|
|
|
default:
|
|
nlr_jump(mp_obj_new_exception_msg_1_arg(MP_QSTR_TypeError, "float takes at most 1 argument, %d given", (void*)(machine_int_t)n_args));
|
|
}
|
|
}
|
|
|
|
static mp_obj_t float_unary_op(int op, mp_obj_t o_in) {
|
|
mp_obj_float_t *o = o_in;
|
|
switch (op) {
|
|
case RT_UNARY_OP_NOT: if (o->value != 0) { return mp_const_true;} else { return mp_const_false; }
|
|
case RT_UNARY_OP_POSITIVE: return o_in;
|
|
case RT_UNARY_OP_NEGATIVE: return mp_obj_new_float(-o->value);
|
|
default: return NULL; // op not supported
|
|
}
|
|
}
|
|
|
|
static mp_obj_t float_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
|
|
mp_obj_float_t *lhs = lhs_in;
|
|
if (MP_OBJ_IS_TYPE(rhs_in, &complex_type)) {
|
|
return mp_obj_complex_binary_op(op, lhs->value, 0, rhs_in);
|
|
} else {
|
|
return mp_obj_float_binary_op(op, lhs->value, rhs_in);
|
|
}
|
|
}
|
|
|
|
const mp_obj_type_t float_type = {
|
|
{ &mp_const_type },
|
|
"float",
|
|
.print = float_print,
|
|
.make_new = float_make_new,
|
|
.unary_op = float_unary_op,
|
|
.binary_op = float_binary_op,
|
|
};
|
|
|
|
mp_obj_t mp_obj_new_float(mp_float_t value) {
|
|
mp_obj_float_t *o = m_new(mp_obj_float_t, 1);
|
|
o->base.type = &float_type;
|
|
o->value = value;
|
|
return (mp_obj_t)o;
|
|
}
|
|
|
|
mp_float_t mp_obj_float_get(mp_obj_t self_in) {
|
|
assert(MP_OBJ_IS_TYPE(self_in, &float_type));
|
|
mp_obj_float_t *self = self_in;
|
|
return self->value;
|
|
}
|
|
|
|
mp_obj_t mp_obj_float_binary_op(int op, mp_float_t lhs_val, mp_obj_t rhs_in) {
|
|
mp_float_t rhs_val = mp_obj_get_float(rhs_in); // can be any type, this function will convert to float (if possible)
|
|
switch (op) {
|
|
case RT_BINARY_OP_ADD:
|
|
case RT_BINARY_OP_INPLACE_ADD: lhs_val += rhs_val; break;
|
|
case RT_BINARY_OP_SUBTRACT:
|
|
case RT_BINARY_OP_INPLACE_SUBTRACT: lhs_val -= rhs_val; break;
|
|
case RT_BINARY_OP_MULTIPLY:
|
|
case RT_BINARY_OP_INPLACE_MULTIPLY: lhs_val *= rhs_val; break;
|
|
/* TODO floor(?) the value
|
|
case RT_BINARY_OP_FLOOR_DIVIDE:
|
|
case RT_BINARY_OP_INPLACE_FLOOR_DIVIDE: val = lhs_val / rhs_val; break;
|
|
*/
|
|
case RT_BINARY_OP_TRUE_DIVIDE:
|
|
case RT_BINARY_OP_INPLACE_TRUE_DIVIDE: lhs_val /= rhs_val; break;
|
|
|
|
case RT_COMPARE_OP_LESS: return MP_BOOL(lhs_val < rhs_val);
|
|
case RT_COMPARE_OP_MORE: return MP_BOOL(lhs_val > rhs_val);
|
|
case RT_COMPARE_OP_LESS_EQUAL: return MP_BOOL(lhs_val <= rhs_val);
|
|
case RT_COMPARE_OP_MORE_EQUAL: return MP_BOOL(lhs_val >= rhs_val);
|
|
|
|
return NULL; // op not supported
|
|
}
|
|
return mp_obj_new_float(lhs_val);
|
|
}
|
|
|
|
#endif
|