Changeset 441 for EcnlProtoTool/trunk/ntshell/src/syscall.c

Timestamp:

Jul 10, 2020, 9:09:25 PM (4 years ago)

Author:

coas-nagasima

Message:

NTShellタスクを更新

File:

• EcnlProtoTool/trunk/ntshell/src/syscall.c (modified) (12 diffs)

EcnlProtoTool/trunk/ntshell/src/syscall.c

@@ -101 +101 @@
         switch (r->n) {
         case SYS__llseek:
-                return shell_llseek(r->a, (((off_t)r->b) << 32) + (off_t)r->c, (off_t *)r->d, r->e);
+                ret = shell_llseek(r->a, (((off_t)r->b) << 32) + (off_t)r->c, (off_t *)r->d, r->e);
         case SYS__newselect:
                 ret = shell_select(r->a, (fd_set *)r->b, (fd_set *)r->c, (fd_set *)r->d, (struct timeval *)r->e);
@@ -359 +359 @@
                 break;
         case SYS_gettid:
-                no_implement("gettid\n");
+                ret = shell_gettid();
                 break;
         case SYS_gettimeofday:
@@ -439 +439 @@
                 break;
         case SYS_lstat64:
-                ret = shell_lstat((const char *__restrict)r->a, (struct stat *__restrict)r->b);
+                ret = shell_lstat((const char *restrict)r->a, (struct stat *restrict)r->b);
                 break;
         case SYS_madvise:
@@ -472 +472 @@
                 break;
         case SYS_mprotect:
-                return shell_mprotect((void *)r->a, (size_t)r->b, r->c);
+                ret = shell_mprotect((void *)r->a, (size_t)r->b, r->c);
                 break;
         case SYS_mq_getsetattr:
@@ -520 +520 @@
                 break;
         case SYS_nanosleep:
-                no_implement("nanosleep\n");
+                ret = shell_nanosleep((const struct timespec *)r->a, (struct timespec *)r->b);
                 break;
         case SYS_nice:
@@ -538 +538 @@
                 break;
         case SYS_pipe:
-                no_implement("pipe\n");
+                ret = shell_pipe((int *)r->a);
                 break;
         case SYS_pipe2:
@@ -601 +601 @@
                 break;
         case SYS_recv:
-                ret = shell_recv(r->a, (void *)r->b, (size_t)r->c, r->d);
+                ret = shell_recvfrom(r->a, (void *)r->b, (size_t)r->c, r->d, NULL, NULL);
                 break;
         case SYS_recvfrom:
-                if (r->e == 0)
-                        ret = shell_recv(r->a, (void *)r->b, (size_t)r->c, r->d);
-                else
-                        ret = shell_recvfrom(r->a, (void *)r->b, (size_t)r->c, r->d, (struct sockaddr *)r->e, (socklen_t *)r->f);
+                ret = shell_recvfrom(r->a, (void *)r->b, (size_t)r->c, r->d, (struct sockaddr *)r->e, (socklen_t *)r->f);
                 break;
         case SYS_recvmsg:
@@ -634 +631 @@
                 break;
         case SYS_rt_sigaction:
-                ret = shell_sigaction(r->a, (const struct sigaction *)r->b, (struct sigaction *)r->c);
+                ret = shell_sigaction(r->a, (const struct sigaction *)r->b, (struct sigaction *)r->c, (size_t)r->d);
                 break;
         case SYS_rt_sigpending:
@@ -652 +649 @@
                 break;
         case SYS_send:
-                ret = shell_send(r->a, (const void *)r->b, (size_t)r->c, r->d);
+                ret = shell_sendto(r->a, (const void *)r->b, (size_t)r->c, r->d, NULL, 0);
                 break;
         case SYS_sendmsg:
@@ -658 +655 @@
                 break;
         case SYS_sendto:
-                if (r->e == 0)
-                        ret = shell_send(r->a, (const void *)r->b, (size_t)r->c, r->d);
-                else
-                        ret = shell_sendto(r->a, (const void *)r->b, (size_t)r->c, r->d, (const struct sockaddr *)r->e, (socklen_t)r->f);
+                ret = shell_sendto(r->a, (const void *)r->b, (size_t)r->c, r->d, (const struct sockaddr *)r->e, (socklen_t)r->f);
                 break;
         case SYS_setsockopt:
@@ -869 +863 @@
                 break;
         case SYS_tkill:
-                no_implement("tkill\n");
+                ret = shell_tkill((int)r->a, (int)r->b);
                 break;
         case SYS_truncate64:
@@ -918 +912 @@
         case SYS_writev:
                 ret = shell_writev((int)r->a, (const struct iovec *)r->b, (size_t)r->c);
+                break;
+        case SYS_getpeername:
+                ret = shell_getpeername((int)r->a, (struct sockaddr *)r->b, (socklen_t *)r->c);
+                break;
+        case SYS_getsockname:
+                ret = shell_getsockname((int)r->a, (struct sockaddr *)r->b, (socklen_t *)r->c);
+                break;
+        case SYS_sigprocmask:
+                ret = shell_sigprocmask((int)r->a, (const sigset_t *)r->b, (sigset_t *)r->c);
+                break;
+        case SYS_sigaction:
+                ret = shell_sigaction((int)r->a, (const struct k_sigaction *)r->b, (struct k_sigaction *)r->c, (size_t)r->d);
                 break;
         default: