Mercurial > hg > CbC > CbC_xv6

changeset 371:96655612f48c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
...
author anatofuz
date Sun, 05 Jul 2020 15:18:02 +0900
parents 8e1d4f238dc8
children 6fc38a3f38f9
files src/CMakeLists.txt src/trap.cbc
diffstat 2 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/CMakeLists.txt	Sun Jul 05 15:00:22 2020 +0900
+++ b/src/CMakeLists.txt	Sun Jul 05 15:18:02 2020 +0900
@@ -129,8 +129,7 @@
 	string.c arm.c asm.S bio.c buddy.c console.cbc exec.c file.cbc fs.c log.c main.c memide.c pipe.cbc proc.cbc spinlock.cbc
 	start.c swtch.S syscall.cbc sysfile.cbc sysproc.c trap_asm.S trap.cbc vm.c device/picirq.c device/timer.c device/uart.c
   SingleLinkedStack.cbc entry.S impl/vm_impl.cbc impl/vm_impl_private.cbc
-  impl/fs_impl.cbc impl/fs_impl_private.cbc impl/KernelRetImpl.cbc impl/KernelError.cbc impl/SyscallImpl.cbc
-
+  impl/fs_impl.cbc impl/fs_impl_private.cbc impl/KernelRetImpl.cbc impl/KernelError.cbc impl/SyscallDispatchImpl.cbc
 )
 
 # sys_read_impl.cbc
--- a/src/trap.cbc	Sun Jul 05 15:00:22 2020 +0900
+++ b/src/trap.cbc	Sun Jul 05 15:18:02 2020 +0900
@@ -7,25 +7,25 @@
 
 
 #include "kernel.h"
-#interface "Syscall.h"
+#interface "SyscallDispatch.h"
 #interface "KernelRet.h"
 
 #define __ncode __code
 
 extern __code exit(void);
 
-extern Syscall* createSyscallImpl(struct Context*);
+extern SyscallDispatch* createSyscallDispatchImpl(struct Context*);
 
 __ncode cbc_swi_handler(struct trapframe* r) {
-    struct Context* kernel       = &kernel_context->context;
-    struct Syscall* syscall      = createSyscallImpl(kernel);
+    struct Context*         kernel                = &kernel_context->context;
+    struct SyscallDispatch* syscall_dispatch      = createSyscallDispatchImpl(kernel);
 
     if (proc->killed) {
         struct KernelRet* kernelret = createKernelRetImpl(kernel);
         goto meta(kernel, kernelret->exit);
     }
     proc->tf = r;
-    goto meta(kernel, syscall->dispatch);
+    goto meta(kernel, syscall_dispatch->dispatch);
 }
 
 // trap routine