시스템 콜 테이블 업데이트

Author: EcmaXp

src/openpie_vfs.c

@@ -50,18 +50,6 @@ int SVC_CALL_VFS_OUT(int r0, int r1, int r2, int r3, int *v1) {
     return errno;
 }
 
-
-typedef enum vfs_command {
-    VFS_OPEN = 1,
-    VFS_VALID = 2,
-    VFS_REPR = 3,
-    VFS_CLOSE = 4,
-    VFS_READ = 5,
-    VFS_WRITE = 6,
-    VFS_SEEK = 7,
-    VFS_FLUSH = 8,
-} vfs_command;
-
 typedef struct _mp_obj_vfs_openpie_file_t {
     mp_obj_base_t base;
     int fd;
@@ -90,7 +78,7 @@ mp_obj_t mp_vfs_openpie_file_open(const mp_obj_type_t *type, mp_obj_t address_in
     o->base.type = type;
     o->fd = -1;
 
-    int errno = SVC_CALL_VFS_OUT(VFS_OPEN, (int) address, (int) path, (int) mode, &(o->fd));
+    int errno = SVC_CALL_VFS_OUT(SYS_VFS_OPEN, (int) address, (int) path, (int) mode, &(o->fd));
     if (errno != 0) {
         mp_raise_OSError(errno);
     }
@@ -131,7 +119,7 @@ STATIC mp_uint_t vfs_openpie_file_read(mp_obj_t o_in, void *buf, mp_uint_t size,
     check_fd_is_open(o);
 
     int count = 0;
-    int errno = SVC_CALL_VFS_OUT(VFS_READ, o->fd, (int) size, (int) buf, &count);
+    int errno = SVC_CALL_VFS_OUT(SYS_VFS_READ, o->fd, (int) size, (int) buf, &count);
     if (errno != 0) {
         *errcode = errno;
         return MP_STREAM_ERROR;
@@ -149,7 +137,7 @@ STATIC mp_uint_t vfs_openpie_file_write(mp_obj_t o_in, const void *buf, mp_uint_
     }
 #endif
     int written = 0;
-    int errno = SVC_CALL_VFS_OUT(VFS_WRITE, o->fd, (int) buf, (int) size, &written);
+    int errno = SVC_CALL_VFS_OUT(SYS_VFS_WRITE, o->fd, (int) buf, (int) size, &written);
     if (errno != 0) {
         *errcode = errno;
         return MP_STREAM_ERROR;
@@ -163,7 +151,7 @@ STATIC mp_uint_t vfs_openpie_file_ioctl(mp_obj_t o_in, mp_uint_t request, uintpt
     int errno;
     switch (request) {
         case MP_STREAM_FLUSH:
-            errno = SVC_CALL_VFS(VFS_FLUSH, o->fd, 0, 0);
+            errno = SVC_CALL_VFS(SYS_VFS_FLUSH, o->fd, 0, 0);
             if (errno != 0) {
                 *errcode = errno;
                 return MP_STREAM_ERROR;
@@ -172,7 +160,7 @@ STATIC mp_uint_t vfs_openpie_file_ioctl(mp_obj_t o_in, mp_uint_t request, uintpt
         case MP_STREAM_SEEK: {
             struct mp_stream_seek_t *s = (struct mp_stream_seek_t *) arg;
             int offset = 0;
-            errno = SVC_CALL_VFS_OUT(VFS_SEEK, o->fd, s->offset, s->whence, &offset);
+            errno = SVC_CALL_VFS_OUT(SYS_VFS_SEEK, o->fd, s->offset, s->whence, &offset);
             if (errno != 0) {
                 *errcode = errno;
                 return MP_STREAM_ERROR;
@@ -181,7 +169,7 @@ STATIC mp_uint_t vfs_openpie_file_ioctl(mp_obj_t o_in, mp_uint_t request, uintpt
             return 0;
         }
         case MP_STREAM_CLOSE:
-            errno = SVC_CALL_VFS(VFS_CLOSE, o->fd, 0, 0);
+            errno = SVC_CALL_VFS(SYS_VFS_CLOSE, o->fd, 0, 0);
             if (errno != 0) {
                 *errcode = errno;
                 return MP_STREAM_ERROR;

src/syscall.h

@@ -2,36 +2,6 @@
 #define OPENPIE_SYSCALL_H
 
 #include "syscall_arch.h"
-
-typedef enum {
-    SYS_UNKNOWN = 0,
-    SYS_CONTROL = 1,
-    SYS_INVOKE = 2,
-    SYS_REQUEST = 3,
-    SYS_VFS = 4,
-    SYS_DEBUG = 5,
-    SYS_LEGACY = 6,
-} syscall_number;
-
-typedef enum {
-    SYS_CONTROL_SHUTDOWN = 1,
-    SYS_CONTROL_REBOOT = 2,
-    SYS_CONTROL_CRASH = 3,
-    SYS_CONTROL_RETURN = 4,
-} syscall_control_number;
-
-typedef enum {
-    // VERSION?
-    SYS_REQUEST_COMPONENTS = 1,
-    SYS_REQUEST_METHODS = 2,
-    SYS_REQUEST_ANNOTATIONS = 3,
-} syscall_request_number;
-
-// typedef enum {
-// } syscall_vfs_number;
-
-typedef enum {
-    SYS_LEGACY_usystem_get_stdout_str = 1
-} syscall_legacy_number;
+#include "syscall_table.h"
 
 #endif //OPENPIE_SYSCALL_H

src/syscall_table.h

@@ -0,0 +1,29 @@
+#define SYS_DEBUG (1)
+#define SYS_CONTROL (2)
+#define SYS_CONTROL_SHUTDOWN (1)
+#define SYS_CONTROL_REBOOT (2)
+#define SYS_CONTROL_CRASH (3)
+#define SYS_CONTROL_RETURN (4)
+#define SYS_SIGNAL (3)
+#define SYS_SIGNAL_REQUEST (1)
+#define SYS_SIGNAL_PENDING (2)
+#define SYS_INVOKE (4)
+#define SYS_REQUEST (5)
+#define SYS_REQUEST_COMPONENTS (1)
+#define SYS_REQUEST_METHODS (2)
+#define SYS_REQUEST_ANNOTATIONS (3)
+#define SYS_INFO (6)
+#define SYS_INFO_VERSION (1)
+#define SYS_INFO_RAM_SIZE (2)
+#define SYS_TIMER (7)
+#define SYS_TIMER_TICKS_MS (1)
+#define SYS_TIMER_TICKS_US (2)
+#define SYS_VFS (8)
+#define SYS_VFS_OPEN (1)
+#define SYS_VFS_VALID (2)
+#define SYS_VFS_REPR (3)
+#define SYS_VFS_CLOSE (4)
+#define SYS_VFS_READ (5)
+#define SYS_VFS_WRITE (6)
+#define SYS_VFS_SEEK (7)
+#define SYS_VFS_FLUSH (8)