py: Change module globals from mp_map_t* to mp_obj_dict_t*.

Towards addressing issue #424.

Had a small increase to ROM usage (order 60 bytes).

4 files changed, 31 insertions, 22 deletions

diff --git a/stmhal/help.c b/stmhal/help.c
index 66484576bc..25d3fcb57e 100644
--- a/stmhal/help.c
+++ b/stmhal/help.c
@@ -59,7 +59,7 @@ STATIC mp_obj_t pyb_help(uint n_args, const mp_obj_t *args) {
 
         mp_map_t *map = NULL;
         if (MP_OBJ_IS_TYPE(args[0], &mp_type_module)) {
-            map = mp_obj_module_get_globals(args[0]);
+            map = mp_obj_dict_get_map(mp_obj_module_get_globals(args[0]));
         } else {
             mp_obj_type_t *type;
             if (MP_OBJ_IS_TYPE(args[0], &mp_type_type)) {
diff --git a/stmhal/modos.c b/stmhal/modos.c
index 6103b1b4fd..f160627525 100644
--- a/stmhal/modos.c
+++ b/stmhal/modos.c
@@ -162,16 +162,19 @@ STATIC const mp_map_elem_t os_module_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_urandom), (mp_obj_t)&os_urandom_obj },
 };
 
-STATIC const mp_map_t os_module_globals = {
-    .all_keys_are_qstrs = 1,
-    .table_is_fixed_array = 1,
-    .used = sizeof(os_module_globals_table) / sizeof(mp_map_elem_t),
-    .alloc = sizeof(os_module_globals_table) / sizeof(mp_map_elem_t),
-    .table = (mp_map_elem_t*)os_module_globals_table,
+STATIC const mp_obj_dict_t os_module_globals = {
+    .base = {&mp_type_dict},
+    .map = {
+        .all_keys_are_qstrs = 1,
+        .table_is_fixed_array = 1,
+        .used = sizeof(os_module_globals_table) / sizeof(mp_map_elem_t),
+        .alloc = sizeof(os_module_globals_table) / sizeof(mp_map_elem_t),
+        .table = (mp_map_elem_t*)os_module_globals_table,
+    },
 };
 
 const mp_obj_module_t os_module = {
     .base = { &mp_type_module },
     .name = MP_QSTR_os,
-    .globals = (mp_map_t*)&os_module_globals,
+    .globals = (mp_obj_dict_t*)&os_module_globals,
 };
diff --git a/stmhal/modpyb.c b/stmhal/modpyb.c
index 6784081029..a6cb5adb6d 100644
--- a/stmhal/modpyb.c
+++ b/stmhal/modpyb.c
@@ -287,16 +287,19 @@ STATIC const mp_map_elem_t pyb_module_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_Exti), (mp_obj_t)&exti_obj_type },
 };
 
-STATIC const mp_map_t pyb_module_globals = {
-    .all_keys_are_qstrs = 1,
-    .table_is_fixed_array = 1,
-    .used = sizeof(pyb_module_globals_table) / sizeof(mp_map_elem_t),
-    .alloc = sizeof(pyb_module_globals_table) / sizeof(mp_map_elem_t),
-    .table = (mp_map_elem_t*)pyb_module_globals_table,
+STATIC const mp_obj_dict_t pyb_module_globals = {
+    .base = {&mp_type_dict},
+    .map = {
+        .all_keys_are_qstrs = 1,
+        .table_is_fixed_array = 1,
+        .used = sizeof(pyb_module_globals_table) / sizeof(mp_map_elem_t),
+        .alloc = sizeof(pyb_module_globals_table) / sizeof(mp_map_elem_t),
+        .table = (mp_map_elem_t*)pyb_module_globals_table,
+    },
 };
 
 const mp_obj_module_t pyb_module = {
     .base = { &mp_type_module },
     .name = MP_QSTR_pyb,
-    .globals = (mp_map_t*)&pyb_module_globals,
+    .globals = (mp_obj_dict_t*)&pyb_module_globals,
 };
diff --git a/stmhal/modtime.c b/stmhal/modtime.c
index 9756ec3b5a..c20752e21d 100644
--- a/stmhal/modtime.c
+++ b/stmhal/modtime.c
@@ -28,16 +28,19 @@ STATIC const mp_map_elem_t time_module_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_sleep), (mp_obj_t)&time_sleep_obj },
 };
 
-STATIC const mp_map_t time_module_globals = {
-    .all_keys_are_qstrs = 1,
-    .table_is_fixed_array = 1,
-    .used = sizeof(time_module_globals_table) / sizeof(mp_map_elem_t),
-    .alloc = sizeof(time_module_globals_table) / sizeof(mp_map_elem_t),
-    .table = (mp_map_elem_t*)time_module_globals_table,
+STATIC const mp_obj_dict_t time_module_globals = {
+    .base = {&mp_type_dict},
+    .map = {
+        .all_keys_are_qstrs = 1,
+        .table_is_fixed_array = 1,
+        .used = sizeof(time_module_globals_table) / sizeof(mp_map_elem_t),
+        .alloc = sizeof(time_module_globals_table) / sizeof(mp_map_elem_t),
+        .table = (mp_map_elem_t*)time_module_globals_table,
+    },
 };
 
 const mp_obj_module_t time_module = {
     .base = { &mp_type_module },
     .name = MP_QSTR_time,
-    .globals = (mp_map_t*)&time_module_globals,
+    .globals = (mp_obj_dict_t*)&time_module_globals,
 };