oprom 업데이트

Author: EcmaXp

src/Makefile

@@ -54,6 +54,7 @@ SRC_C = \
 	moducomponents.c \
 	moducomputer.c \
 	moduos.c \
+	moduimp.c \
 	modutime.c \
 	modumsgpack.c \
 	moduvalue.c \

src/main.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <stdarg.h>
 
 #include "py/obj.h"
 #include "py/compile.h"
@@ -13,7 +14,6 @@
 #include "gccollect.h"
 #include "machine.h"
 #include "syscall.h"
-#include <stdarg.h>
 
 void debug_printer(void *self, const char *buf, size_t len) {
     __syscall2(SYS_DEBUG, (int) buf, (int) len);

src/modmachine.c

@@ -1,16 +1,8 @@
-#include <stdio.h>
-
 #include "py/obj.h"
-#include "py/objstr.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "syscall.h"
-#include "machine.h"
 #include "extmod/machine_mem.h"
-#include "lib/mpack/mpack.h"
-
-#include <stdio.h>
-#include <string.h>
+#include "syscall.h"
 
 mp_obj_t signal_hook_obj = mp_const_none;
 mp_obj_t stdout_hook_obj = mp_const_none;

src/moducode.c

@@ -1,26 +1,13 @@
-#include <stdio.h>
-
+#include "py/obj.h"
+#include "py/mphal.h"
+#include "py/runtime.h"
 #include "py/lexer.h"
 #include "py/compile.h"
 #include "py/parse.h"
 #include "py/repl.h"
 #include "lib/utils/pyexec.h"
 #include "lib/mp-readline/readline.h"
 
-#include "py/obj.h"
-#include "py/objstr.h"
-#include "py/runtime.h"
-#include "openpie_vfs.h"
-#include "syscall.h"
-#include "msgpack.h"
-#include "py/mphal.h"
-#include "machine.h"
-#include "extmod/machine_mem.h"
-#include "lib/mpack/mpack.h"
-
-#include <stdio.h>
-#include <string.h>
-
 
 #define EXEC_FLAG_PRINT_EOF (1)
 #define EXEC_FLAG_ALLOW_DEBUGGING (2)

src/moducomponents.c

@@ -1,17 +1,6 @@
-#include <stdio.h>
-
 #include "py/obj.h"
-#include "py/objstr.h"
-#include "py/runtime.h"
-#include "py/mphal.h"
-#include "syscall.h"
 #include "msgpack.h"
-#include "machine.h"
-#include "lib/mpack/mpack.h"
-
-#include <stdio.h>
-#include <string.h>
-
+#include "syscall.h"
 
 mp_obj_t wrap_result(int code);
 

src/moducomputer.c

@@ -1,40 +1,29 @@
-#include <stdio.h>
-
 #include "py/obj.h"
-#include "py/objstr.h"
-#include "py/runtime.h"
-#include "py/mphal.h"
-#include "syscall.h"
-#include "msgpack.h"
 #include "machine.h"
-#include "lib/mpack/mpack.h"
-
-#include <stdio.h>
-#include <string.h>
-
+#include "msgpack.h"
+#include "syscall.h"
 
 mp_obj_t wrap_result(int code);
 
-mp_obj_t ucomputer_debug(mp_obj_t);
 
 
-mp_obj_t ucomputer_shutdown() {
+STATIC mp_obj_t ucomputer_shutdown() {
     __syscall0(SYS_CONTROL_SHUTDOWN);
     __fatal_error("shutdown failure");
 }
 
 MP_DEFINE_CONST_FUN_OBJ_0(ucomputer_shutdown_obj, ucomputer_shutdown);
 
 
-mp_obj_t ucomputer_reboot() {
+STATIC mp_obj_t ucomputer_reboot() {
     __syscall0(SYS_CONTROL_REBOOT);
     __fatal_error("reboot failure");
 }
 
 MP_DEFINE_CONST_FUN_OBJ_0(ucomputer_reboot_obj, ucomputer_reboot);
 
 
-mp_obj_t ucomputer_crash(mp_obj_t message_obj) {
+STATIC mp_obj_t ucomputer_crash(mp_obj_t message_obj) {
     size_t len = 0;
     const char *message = mp_obj_str_get_data(message_obj, &len);
     __syscall2(SYS_CONTROL_CRASH, (int) message, (int) len);

src/moduimp.c

@@ -0,0 +1,21 @@
+#include "py/obj.h"
+
+
+STATIC mp_obj_t uimp_new_module(mp_obj_t name_obj) {
+    return mp_obj_new_module(name_obj);
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(uimp_new_module_obj, uimp_new_module);
+
+
+STATIC const mp_rom_map_elem_t uimp_module_globals_table[] = {
+        {MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uimp)},
+
+        {MP_ROM_QSTR(MP_QSTR_new_module),      MP_ROM_PTR(&uimp_new_module_obj)},
+};
+STATIC MP_DEFINE_CONST_DICT(uimp_module_globals, uimp_module_globals_table);
+
+const mp_obj_module_t mp_module_uimp = {
+        .base = {&mp_type_module},
+        .globals = (mp_obj_dict_t *) &ucode_module_globals,
+};

src/modumsgpack.c

@@ -1,11 +1,6 @@
-#include <stdio.h>
-#include <string.h>
-
 #include "py/obj.h"
-#include "py/objstr.h"
 #include "py/runtime.h"
 #include "msgpack.h"
-#include "lib/mpack/mpack.h"
 
 mp_obj_t umsgpack_dumps(mp_obj_t obj) {
     msgpack_result_t result = msgpack_dumps(obj);

src/modutime.c

@@ -1,11 +1,6 @@
-#include <stdio.h>
-#include <string.h>
-
-#include "py/nlr.h"
-#include "py/smallint.h"
 #include "py/obj.h"
-#include "lib/timeutils/timeutils.h"
 #include "extmod/utime_mphal.h"
+#include "lib/timeutils/timeutils.h"
 #include "syscall.h"
 
 mp_obj_t wrap_result(int code);

src/moduvalue.c

@@ -1,18 +1,10 @@
-#include <stdio.h>
-
 #include "py/obj.h"
-#include "py/objstr.h"
 #include "py/runtime.h"
-#include "py/mphal.h"
 #include "syscall.h"
 #include "msgpack.h"
 #include "machine.h"
-#include "lib/mpack/mpack.h"
 #include "uvalue.h"
 
-#include <stdio.h>
-#include <string.h>
-
 mp_obj_t wrap_result(int code);