fix: fix minor typos for source code

Signed-off-by: Yiyang Wu <[email protected]>
SJTU-IPADS · Dec 12, 2024 · 1b9a52c · 1b9a52c
1 parent b78cbbf
commit 1b9a52c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/Lab4/kernel/ipc/connection.c b/Lab4/kernel/ipc/connection.c
@@ -59,9 +59,6 @@
 #include <object/memory.h>
 #include <sched/context.h>
 #include <common/util.h>
-#ifdef CHCORE_OPENTRUSTEE
-#include <uapi/opentrustee/ipc.h>
-#endif /* CHCORE_OPENTRUSTEE */
 
 /*
  * Overall, a server thread that declares a serivce with this interface
@@ -412,14 +409,9 @@ static void ipc_thread_migrate_to_server(struct ipc_connection *conn,
         // arch_set_thread_arg0(target, xxx);
         // arch_set_thread_arg1(target, xxx);
         // arch_set_thread_arg2(target, xxx);
-        /* LAB 4 TODO END (exercise 7) */
-#ifdef CHCORE_OPENTRUSTEE
-        /* pid == badge if CHCORE_OPENTRUSTEE */
-        // This is left empty for current lab.
-        // arch_set_thread_arg3(target, xxx);
-#else /* CHCORE_OPENTRUSTEE */
         // arch_set_thread_arg3(target, xxx);
-#endif /* CHCORE_OPENTRUSTEE */
+
+        /* LAB 4 TODO END (exercise 7) */
         set_thread_arch_spec_state_ipc(target);
 
         /* Switch to the target thread */

diff --git a/Lab4/user/chcore-libc/libchcore/porting/overrides/src/chcore-port/stdio.c b/Lab4/user/chcore-libc/libchcore/porting/overrides/src/chcore-port/stdio.c
@@ -130,9 +130,7 @@ static int get_one_char(void)
 
 static void put(char buffer[], unsigned size)
 {
-        /* LAB 3 TODO BEGIN */
-
-        /* LAB 3 TODO END */
+        chcore_syscall2(CHCORE_SYS_putstr, (vaddr_t)buffer, size);
 }
 
 #define MAX_LINE_SIZE 4095
@@ -344,4 +342,4 @@ struct fd_ops stderr_ops = {
         .poll = NULL,
         .ioctl = chcore_stdio_ioctl,
         .fcntl = chcore_stdio_fcntl,
-};
+};
diff --git a/Lab5/user/chcore-libc/libchcore/porting/overrides/src/chcore-port/stdio.c b/Lab5/user/chcore-libc/libchcore/porting/overrides/src/chcore-port/stdio.c
@@ -130,9 +130,7 @@ static int get_one_char(void)
 
 static void put(char buffer[], unsigned size)
 {
-        /* LAB 3 TODO BEGIN */
-
-        /* LAB 3 TODO END */
+        chcore_syscall2(CHCORE_SYS_putstr, (vaddr_t)buffer, size);
 }
 
 #define MAX_LINE_SIZE 4095
@@ -344,4 +342,4 @@ struct fd_ops stderr_ops = {
         .poll = NULL,
         .ioctl = chcore_stdio_ioctl,
         .fcntl = chcore_stdio_fcntl,
-};
+};