diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-02-14 23:05:50 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-02-14 23:05:50 +0000 |
| commit | 7ef098000aafe67decba084798df49a8719695db (patch) | |
| tree | 4834109f435b73b3c9297d4343000c7b0b3798a4 | |
| parent | 25735ba6d3f5a3cf35b3fc814a13d55dcfa29497 (diff) | |
| parent | 910843e86ddd4fb9bb482d6ca2f03700cc5cef9e (diff) | |
| download | micropython-7ef098000aafe67decba084798df49a8719695db.tar.gz micropython-7ef098000aafe67decba084798df49a8719695db.zip | |
Merge pull request #288 from pfalcon/port-builtins
Allow ports to define statically builtin functions.
| -rw-r--r-- | py/mpconfig.h | 4 | ||||
| -rw-r--r-- | py/runtime.c | 3 | ||||
| -rw-r--r-- | unix/file.c | 2 | ||||
| -rw-r--r-- | unix/main.c | 1 | ||||
| -rw-r--r-- | unix/mpconfigport.h | 5 |
5 files changed, 12 insertions, 3 deletions
diff --git a/py/mpconfig.h b/py/mpconfig.h index 1eb2acf538..6ff0692915 100644 --- a/py/mpconfig.h +++ b/py/mpconfig.h @@ -107,6 +107,10 @@ typedef long long mp_longint_impl_t; #define MICROPY_PATH_MAX (512) #endif +// Additional builtin function definitions - see runtime.c:builtin_table for format. +#ifndef MICROPY_EXTRA_BUILTINS +#define MICROPY_EXTRA_BUILTINS +#endif /*****************************************************************************/ /* Miscellaneous settings */ diff --git a/py/runtime.c b/py/runtime.c index d15a38e089..b473a951f3 100644 --- a/py/runtime.c +++ b/py/runtime.c @@ -144,6 +144,9 @@ STATIC const mp_builtin_elem_t builtin_table[] = { { MP_QSTR_str, (mp_obj_t)&mp_builtin_str_obj }, { MP_QSTR_bytearray, (mp_obj_t)&mp_builtin_bytearray_obj }, + // Extra builtins as defined by a port + MICROPY_EXTRA_BUILTINS + { MP_QSTR_, MP_OBJ_NULL }, // end of list sentinel }; diff --git a/unix/file.c b/unix/file.c index 0d11de6332..21dd764748 100644 --- a/unix/file.c +++ b/unix/file.c @@ -136,8 +136,6 @@ mp_obj_t mp_builtin_open(uint n_args, const mp_obj_t *args) { MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_open_obj, 1, 2, mp_builtin_open); void file_init() { - rt_store_name(MP_QSTR_open, (mp_obj_t)&mp_builtin_open_obj); - mp_obj_t m_sys = mp_obj_new_module(MP_QSTR_sys); rt_store_attr(m_sys, MP_QSTR_stdin, fdfile_new(STDIN_FILENO)); rt_store_attr(m_sys, MP_QSTR_stdout, fdfile_new(STDOUT_FILENO)); diff --git a/unix/main.c b/unix/main.c index 192a0e6e8b..716c7b1142 100644 --- a/unix/main.c +++ b/unix/main.c @@ -29,7 +29,6 @@ // Stack top at the start of program void *stack_top; -extern const mp_obj_fun_native_t mp_builtin_open_obj; void file_init(); void microsocket_init(); void time_init(); diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h index dc92970104..5b2503f4da 100644 --- a/unix/mpconfigport.h +++ b/unix/mpconfigport.h @@ -36,3 +36,8 @@ typedef const void *machine_const_ptr_t; // must be of pointer size typedef double machine_float_t; machine_float_t machine_sqrt(machine_float_t x); + +struct _mp_obj_fun_native_t; +extern const struct _mp_obj_fun_native_t mp_builtin_open_obj; +#define MICROPY_EXTRA_BUILTINS \ + { MP_QSTR_open, (mp_obj_t)&mp_builtin_open_obj }, |