Browse Source
mp_module_obj_t can now be put in ROM. Configuration of float type is now similar to longint: can now choose none, float or double as the implementation. math module has basic math functions. For STM port, these are not yet implemented (they are just stub functions).pull/335/head
Damien George
11 years ago
21 changed files with 280 additions and 117 deletions
@ -0,0 +1,81 @@ |
|||
#include <stdint.h> |
|||
#include <math.h> |
|||
|
|||
#include "misc.h" |
|||
#include "mpconfig.h" |
|||
#include "qstr.h" |
|||
#include "obj.h" |
|||
#include "map.h" |
|||
#include "builtin.h" |
|||
|
|||
#if MICROPY_ENABLE_FLOAT |
|||
|
|||
#define MATH_FUN_1(py_name, c_name) \ |
|||
mp_obj_t mp_math_ ## py_name(mp_obj_t x_obj) { return mp_obj_new_float(MICROPY_FLOAT_C_FUN(c_name)(mp_obj_get_float(x_obj))); } \ |
|||
STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_math_## py_name ## _obj, mp_math_ ## py_name); |
|||
|
|||
#define MATH_FUN_2(py_name, c_name) \ |
|||
mp_obj_t mp_math_ ## py_name(mp_obj_t x_obj, mp_obj_t y_obj) { return mp_obj_new_float(MICROPY_FLOAT_C_FUN(c_name)(mp_obj_get_float(x_obj), mp_obj_get_float(y_obj))); } \ |
|||
STATIC MP_DEFINE_CONST_FUN_OBJ_2(mp_math_## py_name ## _obj, mp_math_ ## py_name); |
|||
|
|||
STATIC const mp_obj_float_t mp_math_pi_obj = {{&mp_type_float}, M_PI}; |
|||
|
|||
MATH_FUN_1(sqrt, sqrt) |
|||
MATH_FUN_2(pow, pow) |
|||
MATH_FUN_1(exp, exp) |
|||
MATH_FUN_1(log, log) |
|||
MATH_FUN_1(log2, log2) |
|||
MATH_FUN_1(log10, log10) |
|||
MATH_FUN_1(cosh, cosh) |
|||
MATH_FUN_1(sinh, sinh) |
|||
MATH_FUN_1(tanh, tanh) |
|||
MATH_FUN_1(acosh, acosh) |
|||
MATH_FUN_1(asinh, asinh) |
|||
MATH_FUN_1(atanh, atanh) |
|||
MATH_FUN_1(cos, cos) |
|||
MATH_FUN_1(sin, sin) |
|||
MATH_FUN_1(tan, tan) |
|||
MATH_FUN_1(acos, acos) |
|||
MATH_FUN_1(asin, asin) |
|||
MATH_FUN_1(atan, atan) |
|||
MATH_FUN_2(atan2, atan2) |
|||
|
|||
STATIC const mp_map_elem_t mp_module_math_globals_table[] = { |
|||
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_math) }, |
|||
{ MP_OBJ_NEW_QSTR(MP_QSTR_pi), (mp_obj_t)&mp_math_pi_obj }, |
|||
{ MP_OBJ_NEW_QSTR(MP_QSTR_sqrt), (mp_obj_t)&mp_math_sqrt_obj }, |
|||
{ MP_OBJ_NEW_QSTR(MP_QSTR_pow), (mp_obj_t)&mp_math_pow_obj }, |
|||
{ MP_OBJ_NEW_QSTR(MP_QSTR_exp), (mp_obj_t)&mp_math_exp_obj }, |
|||
{ MP_OBJ_NEW_QSTR(MP_QSTR_log), (mp_obj_t)&mp_math_log_obj }, |
|||
{ MP_OBJ_NEW_QSTR(MP_QSTR_log2), (mp_obj_t)&mp_math_log2_obj }, |
|||
{ MP_OBJ_NEW_QSTR(MP_QSTR_log10), (mp_obj_t)&mp_math_log10_obj }, |
|||
{ MP_OBJ_NEW_QSTR(MP_QSTR_cosh), (mp_obj_t)&mp_math_cosh_obj }, |
|||
{ MP_OBJ_NEW_QSTR(MP_QSTR_sinh), (mp_obj_t)&mp_math_sinh_obj }, |
|||
{ MP_OBJ_NEW_QSTR(MP_QSTR_tanh), (mp_obj_t)&mp_math_tanh_obj }, |
|||
{ MP_OBJ_NEW_QSTR(MP_QSTR_acosh), (mp_obj_t)&mp_math_acosh_obj }, |
|||
{ MP_OBJ_NEW_QSTR(MP_QSTR_asinh), (mp_obj_t)&mp_math_asinh_obj }, |
|||
{ MP_OBJ_NEW_QSTR(MP_QSTR_atanh), (mp_obj_t)&mp_math_atanh_obj }, |
|||
{ MP_OBJ_NEW_QSTR(MP_QSTR_cos), (mp_obj_t)&mp_math_cos_obj }, |
|||
{ MP_OBJ_NEW_QSTR(MP_QSTR_sin), (mp_obj_t)&mp_math_sin_obj }, |
|||
{ MP_OBJ_NEW_QSTR(MP_QSTR_tan), (mp_obj_t)&mp_math_tan_obj }, |
|||
{ MP_OBJ_NEW_QSTR(MP_QSTR_acos), (mp_obj_t)&mp_math_acos_obj }, |
|||
{ MP_OBJ_NEW_QSTR(MP_QSTR_asin), (mp_obj_t)&mp_math_asin_obj }, |
|||
{ MP_OBJ_NEW_QSTR(MP_QSTR_atan), (mp_obj_t)&mp_math_atan_obj }, |
|||
{ MP_OBJ_NEW_QSTR(MP_QSTR_atan2), (mp_obj_t)&mp_math_atan2_obj }, |
|||
}; |
|||
|
|||
STATIC const mp_map_t mp_module_math_globals = { |
|||
.all_keys_are_qstrs = 1, |
|||
.table_is_fixed_array = 1, |
|||
.used = sizeof(mp_module_math_globals_table) / sizeof(mp_map_elem_t), |
|||
.alloc = sizeof(mp_module_math_globals_table) / sizeof(mp_map_elem_t), |
|||
.table = (mp_map_elem_t*)mp_module_math_globals_table, |
|||
}; |
|||
|
|||
const mp_obj_module_t mp_module_math = { |
|||
.base = { &mp_type_module }, |
|||
.name = MP_QSTR_math, |
|||
.globals = (mp_map_t*)&mp_module_math_globals, |
|||
}; |
|||
|
|||
#endif // MICROPY_ENABLE_FLOAT
|
|||
@ -1,45 +1,52 @@ |
|||
#include <stdint.h> |
|||
#include <stdlib.h> |
|||
#include <stdio.h> |
|||
#include <stdarg.h> |
|||
#include <string.h> |
|||
#include <assert.h> |
|||
|
|||
#include "misc.h" |
|||
#include "mpconfig.h" |
|||
#include "qstr.h" |
|||
#include "obj.h" |
|||
#include "runtime.h" |
|||
#include "map.h" |
|||
#include "builtin.h" |
|||
|
|||
// Various builtins specific to MicroPython runtime,
|
|||
// living in micropython module
|
|||
|
|||
#if MICROPY_MEM_STATS |
|||
STATIC mp_obj_t mem_total() { |
|||
STATIC mp_obj_t mp_micropython_mem_total() { |
|||
return MP_OBJ_NEW_SMALL_INT((machine_int_t)m_get_total_bytes_allocated()); |
|||
} |
|||
|
|||
STATIC mp_obj_t mem_current() { |
|||
STATIC mp_obj_t mp_micropython_mem_current() { |
|||
return MP_OBJ_NEW_SMALL_INT((machine_int_t)m_get_current_bytes_allocated()); |
|||
} |
|||
|
|||
STATIC mp_obj_t mem_peak() { |
|||
STATIC mp_obj_t mp_micropython_mem_peak() { |
|||
return MP_OBJ_NEW_SMALL_INT((machine_int_t)m_get_peak_bytes_allocated()); |
|||
} |
|||
|
|||
MP_DEFINE_CONST_FUN_OBJ_0(mp_builtin_mem_total_obj, mem_total); |
|||
MP_DEFINE_CONST_FUN_OBJ_0(mp_builtin_mem_current_obj, mem_current); |
|||
MP_DEFINE_CONST_FUN_OBJ_0(mp_builtin_mem_peak_obj, mem_peak); |
|||
STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_mem_total_obj, mp_micropython_mem_total); |
|||
STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_mem_current_obj, mp_micropython_mem_current); |
|||
STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_mem_peak_obj, mp_micropython_mem_peak); |
|||
#endif |
|||
|
|||
void mp_module_micropython_init(void) { |
|||
mp_obj_t m_mp = mp_obj_new_module(MP_QSTR_micropython); |
|||
rt_store_name(MP_QSTR_micropython, m_mp); |
|||
|
|||
STATIC const mp_map_elem_t mp_module_micropython_globals_table[] = { |
|||
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_micropython) }, |
|||
#if MICROPY_MEM_STATS |
|||
rt_store_attr(m_mp, QSTR_FROM_STR_STATIC("mem_total"), (mp_obj_t)&mp_builtin_mem_total_obj); |
|||
rt_store_attr(m_mp, QSTR_FROM_STR_STATIC("mem_current"), (mp_obj_t)&mp_builtin_mem_current_obj); |
|||
rt_store_attr(m_mp, QSTR_FROM_STR_STATIC("mem_peak"), (mp_obj_t)&mp_builtin_mem_peak_obj); |
|||
{ MP_OBJ_NEW_QSTR(MP_QSTR_mem_total), (mp_obj_t)&mp_micropython_mem_total_obj }, |
|||
{ MP_OBJ_NEW_QSTR(MP_QSTR_mem_current), (mp_obj_t)&mp_micropython_mem_current_obj }, |
|||
{ MP_OBJ_NEW_QSTR(MP_QSTR_mem_peak), (mp_obj_t)&mp_micropython_mem_peak_obj }, |
|||
#endif |
|||
} |
|||
}; |
|||
|
|||
STATIC const mp_map_t mp_module_micropython_globals = { |
|||
.all_keys_are_qstrs = 1, |
|||
.table_is_fixed_array = 1, |
|||
.used = sizeof(mp_module_micropython_globals_table) / sizeof(mp_map_elem_t), |
|||
.alloc = sizeof(mp_module_micropython_globals_table) / sizeof(mp_map_elem_t), |
|||
.table = (mp_map_elem_t*)mp_module_micropython_globals_table, |
|||
}; |
|||
|
|||
const mp_obj_module_t mp_module_micropython = { |
|||
.base = { &mp_type_module }, |
|||
.name = MP_QSTR_micropython, |
|||
.globals = (mp_map_t*)&mp_module_micropython_globals, |
|||
}; |
|||
|
|||
@ -0,0 +1,48 @@ |
|||
#include <math.h> |
|||
|
|||
// these 2 functions seem to actually work... no idea why
|
|||
// replacing with libgcc does not work (probably due to wrong calling conventions)
|
|||
double __aeabi_f2d(float x) { |
|||
// TODO
|
|||
return 0.0; |
|||
} |
|||
|
|||
float __aeabi_d2f(double x) { |
|||
// TODO
|
|||
return 0.0; |
|||
} |
|||
|
|||
/*
|
|||
double sqrt(double x) { |
|||
// TODO
|
|||
return 0.0; |
|||
} |
|||
*/ |
|||
|
|||
float sqrtf(float x) { |
|||
asm volatile ( |
|||
"vsqrt.f32 %[r], %[x]\n" |
|||
: [r] "=t" (x) |
|||
: [x] "t" (x)); |
|||
return x; |
|||
} |
|||
|
|||
// TODO we need import these functions from some library (eg musl or newlib)
|
|||
float powf(float x, float y) { return 0.0; } |
|||
float expf(float x) { return 0.0; } |
|||
float logf(float x) { return 0.0; } |
|||
float log2f(float x) { return 0.0; } |
|||
float log10f(float x) { return 0.0; } |
|||
float coshf(float x) { return 0.0; } |
|||
float sinhf(float x) { return 0.0; } |
|||
float tanhf(float x) { return 0.0; } |
|||
float acoshf(float x) { return 0.0; } |
|||
float asinhf(float x) { return 0.0; } |
|||
float atanhf(float x) { return 0.0; } |
|||
float cosf(float x) { return 0.0; } |
|||
float sinf(float x) { return 0.0; } |
|||
float tanf(float x) { return 0.0; } |
|||
float acosf(float x) { return 0.0; } |
|||
float asinf(float x) { return 0.0; } |
|||
float atanf(float x) { return 0.0; } |
|||
float atan2f(float x, float y) { return 0.0; } |
|||
Loading…
Reference in new issue