examples/natmod/deepcraft: Test implementation.

Signed-off-by: NikhitaR-IFX <nikhita.rajasekhar@infineon.com>

Author: NikhitaR-IFX

examples/natmod/deepcraft/Makefile

@@ -14,4 +14,8 @@ ARCH = armv7emsp
 LINK_RUNTIME = 1
 
 # Include to get the rules for compiling and linking the module
-include $(MPY_DIR)/py/dynruntime.mk
+include $(MPY_DIR)/py/dynruntime.mk
+
+# Custom clean target
+clean:
+	rm -rf .mpy_ld_cache/ build/ $(MOD).mpy

examples/natmod/deepcraft/dc_mp_iface.c

@@ -1,46 +1,45 @@
-#define MICROPY_PY_DEEPCRAFT_MPY (1)
-
 #include "py/dynruntime.h"
 
-#if !defined(__linux__)
-void *memcpy(void *dst, const void *src, size_t n) {
-    return mp_fun_table.memmove_(dst, src, n);
-}
-void *memset(void *s, int c, size_t n) {
-    return mp_fun_table.memset_(s, c, n);
-}
-#endif
-
-int native_errno=0;
-#if defined(__linux__)
-int *__errno_location (void)
-#else
-int *__errno (void)
-#endif
-{
-    return &native_errno;
-}
-
-mp_obj_full_type_t dcmodel_type;
 
 #include "examples/natmod/deepcraft/mp_src.c"
 
-mp_map_elem_t dcmodel_locals_dict_table[3];
-static MP_DEFINE_CONST_DICT(dcmodel_locals_dict, dcmodel_locals_dict_table);
+typedef struct _dc_obj_t {
+    mp_obj_base_t base;
+} dc_obj_t;
 
-mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *args) {
-    MP_DYNRUNTIME_INIT_ENTRY
+// Forward declaration of type
+mp_obj_full_type_t dc_type;
 
-    dcmodel_type.base.type = mp_fun_table.type_type;
-    dcmodel_type.name = MP_QSTR_DEEPCRAFT;
-    //MP_OBJ_TYPE_SET_SLOT(&dcmodel_type, make_new, &deflateio_make_new, 0);
-    dcmodel_locals_dict_table[0] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_init), MP_OBJ_FROM_PTR(&init_obj) };
-    dcmodel_locals_dict_table[1] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_enqueue), MP_OBJ_FROM_PTR(&enqueue_obj) };
-    dcmodel_locals_dict_table[2] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_dequeue), MP_OBJ_FROM_PTR(&dequeue_obj) };
-    MP_OBJ_TYPE_SET_SLOT(&dcmodel_type, locals_dict, (void*)&dcmodel_locals_dict, 2);
+mp_map_elem_t dc_locals_dict_table[3];
+static MP_DEFINE_CONST_DICT(dc_locals_dict, dc_locals_dict_table);
 
-    mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_deepcraft));
-    mp_store_global(MP_QSTR_DEEPCRAFT, MP_OBJ_FROM_PTR(&dcmodel_type));
+// Constructor
+static mp_obj_t dc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args_in) {
+    dc_obj_t *self = mp_obj_malloc(dc_obj_t, type);
+    return MP_OBJ_FROM_PTR(self);
+}
 
+// Create type and methods at runtime
+mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *args) {
+    // This must be first, it sets up the globals dict and other things
+    MP_DYNRUNTIME_INIT_ENTRY
+    
+    // Populate type
+    dc_type.base.type = (void*)&mp_type_type;
+    dc_type.flags = MP_TYPE_FLAG_NONE;
+    dc_type.name = MP_QSTR_DEEPCRAFT;
+    MP_OBJ_TYPE_SET_SLOT(&dc_type, make_new, dc_make_new, 0);
+
+    dc_locals_dict_table[0] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_init), MP_OBJ_FROM_PTR(&init_obj) };
+    dc_locals_dict_table[1] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_enqueue), MP_OBJ_FROM_PTR(&enqueue_obj) };
+    dc_locals_dict_table[2] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_dequeue), MP_OBJ_FROM_PTR(&dequeue_obj) };
+ 
+    
+    MP_OBJ_TYPE_SET_SLOT(&dc_type, locals_dict, (void*)&dc_locals_dict, 2);
+
+    // Expose constructor as DEEPCRAFT
+    mp_store_global(MP_QSTR_DEEPCRAFT, MP_OBJ_FROM_PTR(&dc_type));
+    // This must be last, it restores the globals dict
     MP_DYNRUNTIME_INIT_EXIT
+    
 }

examples/natmod/deepcraft/mp_src.c

@@ -2,15 +2,14 @@
 #include "model.h"
 #include <string.h>
 
-static mp_obj_t init(void){
+mp_obj_t init(void){
     //assign();
-    IMAI_init();
+    //IMAI_init();
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_0(init_obj, init);
 
-static mp_obj_t enqueue(const mp_obj_t data_in_obj){
-    float data_in[IMAI_DATA_IN_COUNT];
+mp_obj_t enqueue(const mp_obj_t data_in_obj){
+    /*float data_in[IMAI_DATA_IN_COUNT];
     mp_obj_t *data_in_items;
     size_t len;
     mp_obj_get_array(data_in_obj, &len, &data_in_items);
@@ -21,12 +20,12 @@ static mp_obj_t enqueue(const mp_obj_t data_in_obj){
         data_in[i] = mp_obj_get_float(data_in_items[i]);
     }
     int result = IMAI_enqueue(data_in);
-    return MP_OBJ_NEW_SMALL_INT(result);
+    return MP_OBJ_NEW_SMALL_INT(result);*/
+    return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_1(enqueue_obj, enqueue);
 
-static mp_obj_t dequeue(mp_obj_t data_out_obj) {
-    mp_buffer_info_t buf_info;
+mp_obj_t dequeue(mp_obj_t data_out_obj) {
+    /*mp_buffer_info_t buf_info;
     mp_get_buffer(data_out_obj, &buf_info, MP_BUFFER_WRITE);
     float *data_out = (float *)buf_info.buf;
     int result = IMAI_dequeue(data_out);
@@ -37,6 +36,23 @@ static mp_obj_t dequeue(mp_obj_t data_out_obj) {
     } else if (result == -2) {
         mp_raise_ValueError(MP_ERROR_TEXT("Internal memory allocation error"));
     }
-    return MP_OBJ_NEW_SMALL_INT(result);
+    return MP_OBJ_NEW_SMALL_INT(result);*/
+    return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_1(dequeue_obj, dequeue);
+
+
+static const mp_obj_fun_builtin_fixed_t init_obj = {
+    .base = { &mp_type_fun_builtin_0 },
+    .fun._0 = (mp_fun_0_t)init,
+};
+
+
+static const mp_obj_fun_builtin_fixed_t enqueue_obj = {
+    .base = { &mp_type_fun_builtin_1 },
+    .fun._1 = (mp_fun_1_t)enqueue,
+};
+
+static const mp_obj_fun_builtin_fixed_t dequeue_obj = {
+    .base = { &mp_type_fun_builtin_1 },
+    .fun._1 = (mp_fun_1_t)dequeue,
+};