oprom 업데이트

Author: EcmaXp

src/Makefile

@@ -18,7 +18,6 @@ INC += -I.
 INC += -I$(TOP)
 INC += -I$(BUILD)
 
-
 CFLAGS_CORTEX_M = -mthumb -fsingle-precision-constant -Wdouble-promotion
 CFLAGS_MCU_m0 = $(CFLAGS_CORTEX_M) -mtune=cortex-m0 -mcpu=cortex-m0 -mfloat-abi=soft
 
@@ -52,13 +51,16 @@ SRC_C = \
 	mphalport.c \
 	modmachine.c \
 	moducode.c \
+	moducomponents.c \
 	moducomputer.c \
 	moduos.c \
 	modutime.c \
 	modumsgpack.c \
+	moduvalue.c \
 	gccollect.c \
 	openpie_vfs.c \
 	msgpack.c \
+	syscall.c \
 
 SRC_S = \
 	gchelper_m0.s \

src/build.py

@@ -1,4 +1,6 @@
+import io
 import shutil
+import sys
 import traceback
 from pathlib import Path
 from subprocess import check_call, DEVNULL, CalledProcessError
@@ -8,9 +10,14 @@
 from elftools.elf.elffile import ELFFile
 from elftools.elf.sections import SymbolTableSection, Section, Symbol
 
+import re
+
 FOLDER = Path(__file__).parent
-OPMOD_PATH = FOLDER.parent / "opmod"
-TARGET_FOLDER = OPMOD_PATH / "src/main/resources/assets/openpie/firmwares/debug"  # TODO: place version
+BASE_FOLDER = FOLDER.parent
+OPMOD_PATH = BASE_FOLDER / "opmod"
+SOURCE_SYSCALL_TABLE: Path = OPMOD_PATH / "src/main/java/kr/pe/ecmaxp/openpie/arch/consts/OpenPieSystemCallTable.kt"
+TARGET_SYSCALL_TABLE: Path = FOLDER / "syscall_table.h"
+TARGET_FOLDER: Path = OPMOD_PATH / "src/main/resources/assets/openpie/firmwares/debug"  # TODO: place version
 
 
 @dataclass
@@ -140,7 +147,31 @@ def build(folder: Path = FOLDER, target_folder: Path = TARGET_FOLDER):
     print(target_folder / "firmware.bin")
 
 
+def parse_syscall_table(path: Path, file=sys.stdout):
+    print(f"// syscall_table.h : {path.relative_to(BASE_FOLDER).as_posix()}", file=file)
+    for line in SOURCE_SYSCALL_TABLE.read_text().splitlines():
+        if line.startswith("package "):
+            continue
+
+        line, sep, comment = line.partition("//")
+        line = line.strip()
+        if not line:
+            print(file=file)
+            continue
+
+        m = re.match("^const val (.*?) = (.*)$", line)
+        if not m:
+            continue
+
+        print(f"#define {m.group(1)} ({m.group(2).replace('or', '|')})", file=file)
+
+
 def main():
+    fp = io.StringIO()
+    parse_syscall_table(SOURCE_SYSCALL_TABLE, fp)
+    if not TARGET_SYSCALL_TABLE.exists() or TARGET_SYSCALL_TABLE.read_text() != fp.getvalue():
+        TARGET_SYSCALL_TABLE.write_text(fp.getvalue())
+
     try:
         build()
         return 0

src/main.c

@@ -15,8 +15,6 @@
 #include "syscall.h"
 #include <stdarg.h>
 
-#define _debug(s) __syscall2(SYS_DEBUG, (int)s, (int)strlen(s));
-
 void debug_printer(void *self, const char *buf, size_t len) {
     __syscall2(SYS_DEBUG, (int) buf, (int) len);
 }

src/modmachine.c

@@ -13,8 +13,8 @@
 #include <string.h>
 
 mp_obj_t signal_hook_obj = mp_const_none;
-mp_obj_t print_hook_obj = mp_const_none;
-mp_obj_t input_hook_obj = mp_const_none;
+mp_obj_t stdout_hook_obj = mp_const_none;
+mp_obj_t stdin_hook_obj = mp_const_none;
 
 
 mp_obj_t machine_debug(mp_obj_t obj) {
@@ -36,20 +36,20 @@ STATIC mp_obj_t machine_hook_signal(mp_obj_t hook_obj) {
 MP_DEFINE_CONST_FUN_OBJ_1(machine_hook_signal_obj, machine_hook_signal);
 
 
-STATIC mp_obj_t machine_hook_print(mp_obj_t hook_obj) {
-    print_hook_obj = hook_obj;
+STATIC mp_obj_t machine_hook_stdout(mp_obj_t hook_obj) {
+    stdout_hook_obj = hook_obj;
     return hook_obj;
 }
 
-MP_DEFINE_CONST_FUN_OBJ_1(machine_hook_print_obj, machine_hook_print);
+MP_DEFINE_CONST_FUN_OBJ_1(machine_hook_stdout_obj, machine_hook_stdout);
 
-STATIC mp_obj_t machine_hook_input(mp_obj_t hook_obj) {
-    input_hook_obj = hook_obj;
+
+STATIC mp_obj_t machine_hook_stdin(mp_obj_t hook_obj) {
+    stdin_hook_obj = hook_obj;
     return hook_obj;
 }
 
-MP_DEFINE_CONST_FUN_OBJ_1(machine_hook_input_obj, machine_hook_input);
-
+MP_DEFINE_CONST_FUN_OBJ_1(machine_hook_stdin_obj, machine_hook_stdin);
 
 
 STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
@@ -59,9 +59,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
         {MP_ROM_QSTR(MP_QSTR_debug),                MP_ROM_PTR(&machine_debug_obj)},
 
         // hook
-        {MP_ROM_QSTR(MP_QSTR_hook_input),           MP_ROM_PTR(&machine_hook_input_obj)},
-        {MP_ROM_QSTR(MP_QSTR_hook_print),           MP_ROM_PTR(&machine_hook_print_obj)},
         {MP_ROM_QSTR(MP_QSTR_hook_signal),          MP_ROM_PTR(&machine_hook_signal_obj)},
+        {MP_ROM_QSTR(MP_QSTR_hook_stdout),          MP_ROM_PTR(&machine_hook_stdout_obj)},
+        {MP_ROM_QSTR(MP_QSTR_hook_stdin),           MP_ROM_PTR(&machine_hook_stdin_obj)},
 };
 
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);

src/moducomponents.c

@@ -0,0 +1,127 @@
+#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>
+
+
+mp_obj_t wrap_result(int retcode);
+
+
+STATIC mp_obj_t ucomponents_components(size_t n_args, const mp_obj_t *args) {
+    if (n_args == 0) {
+        return wrap_result(__syscall2(SYS_COMPONENTS_LIST, 0, 0));
+    } else {
+        size_t len = 0;
+        const char *buf = mp_obj_str_get_data(args[0], &len);
+        return wrap_result(__syscall2(SYS_COMPONENTS_LIST, (int) buf, (int) len));
+    }
+}
+
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ucomponents_components_obj, 0, 1, ucomponents_components);
+
+
+STATIC mp_obj_t ucomponents_component_count() {
+    return wrap_result(__syscall0(SYS_COMPONENTS_COUNT));
+}
+
+MP_DEFINE_CONST_FUN_OBJ_0(ucomponents_component_count_obj, ucomponents_component_count);
+
+
+STATIC mp_obj_t ucomponents_max_components() {
+    return wrap_result(__syscall0(SYS_COMPONENTS_MAX));
+}
+
+MP_DEFINE_CONST_FUN_OBJ_0(ucomponents_max_components_obj, ucomponents_max_components);
+
+
+STATIC mp_obj_t ucomponents_methods(mp_obj_t address_obj) {
+    byte *data = NULL;
+    size_t size = 0;
+
+    mpack_writer_t *writer = msgpack_dump_new(&data, &size);
+    mpack_start_array(writer, 1);
+        msgpack_dump(writer, address_obj);
+    mpack_finish_array(writer);
+    msgpack_dump_close(writer);
+
+    return wrap_result(__syscall2(SYS_COMPONENTS_METHODS, (int) data, (int) size));
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(ucomponents_methods_obj, ucomponents_methods);
+
+
+STATIC mp_obj_t ucomponents_annotations(mp_obj_t address_obj, mp_obj_t method_obj) {
+    byte *data = NULL;
+    size_t size = 0;
+
+    mpack_writer_t *writer = msgpack_dump_new(&data, &size);
+    mpack_start_array(writer, 2);
+        msgpack_dump(writer, address_obj);
+        msgpack_dump(writer, method_obj);
+    mpack_finish_array(writer);
+    msgpack_dump_close(writer);
+
+    return wrap_result(__syscall2(SYS_COMPONENTS_ANNOTATIONS, (int) data, (int) size));
+}
+
+MP_DEFINE_CONST_FUN_OBJ_2(ucomponents_annotations_obj, ucomponents_annotations);
+
+
+STATIC mp_obj_t ucomponents_invoke(size_t n_args, const mp_obj_t *args) {
+    byte *data = NULL;
+    size_t size = 0;
+
+    mpack_writer_t *writer = msgpack_dump_new(&data, &size);
+    mpack_start_array(writer, n_args);
+    for (int i = 0; i < n_args; i++)
+        msgpack_dump(writer, args[i]);
+    mpack_finish_array(writer);
+    msgpack_dump_close(writer);
+
+    mp_obj_t values = wrap_result(__syscall2(SYS_COMPONENTS_INVOKE, (int) data, (int) size));
+    if (values == mp_const_none)
+        return mp_const_none;
+
+    size_t count = 0;
+    mp_obj_t *items = NULL;
+    mp_obj_get_array(values, &count, &items);
+    if (count == 0)
+        return mp_const_none;
+    else if (count == 1)
+        return items[0];
+    else
+        return values;
+}
+
+MP_DEFINE_CONST_FUN_OBJ_VAR(ucomponents_invoke_obj, 2, ucomponents_invoke);
+
+
+STATIC const mp_rom_map_elem_t ucomponents_module_globals_table[] = {
+        {MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ucomponents)},
+
+        // components
+        {MP_ROM_QSTR(MP_QSTR_components),           MP_ROM_PTR(&ucomponents_components_obj)},
+        {MP_ROM_QSTR(MP_QSTR_component_count),      MP_ROM_PTR(&ucomponents_component_count_obj)},
+        {MP_ROM_QSTR(MP_QSTR_max_components),       MP_ROM_PTR(&ucomponents_max_components_obj)},
+        {MP_ROM_QSTR(MP_QSTR_methods),              MP_ROM_PTR(&ucomponents_methods_obj)},
+        {MP_ROM_QSTR(MP_QSTR_annotations),          MP_ROM_PTR(&ucomponents_annotations_obj)},
+
+        // invoke
+        {MP_ROM_QSTR(MP_QSTR_invoke),               MP_ROM_PTR(&ucomponents_invoke_obj)},
+};
+
+STATIC MP_DEFINE_CONST_DICT(ucomponents_module_globals, ucomponents_module_globals_table);
+
+const mp_obj_module_t mp_module_ucomponents = {
+        .base = {&mp_type_module},
+        .globals = (mp_obj_dict_t *) &ucomponents_module_globals,
+};