2 files changed, 18 insertions, 1 deletions
diff --git a/src/sys/arch/amd64/cpu/cpu_mp.c b/src/sys/arch/amd64/cpu/cpu_mp.c
index ae7b367..7b691e3 100644
--- a/src/sys/arch/amd64/cpu/cpu_mp.c
+++ b/src/sys/arch/amd64/cpu/cpu_mp.c
@@ -56,10 +56,19 @@ static volatile struct limine_smp_request g_smp_req = {
     .revision = 0
 };
 
+static void
+cpu_idle(void *)
+{
+    for (;;) {
+        __ASMV("pause");
+    }
+}
+
 __dead static void
 ap_entry(struct limine_smp_info *)
 {
     struct pcore *pcore;
+    struct proc *curidle;
 
     spinlock_acquire(&lock);
     pcore = kalloc(sizeof(*pcore));
@@ -76,9 +85,10 @@ ap_entry(struct limine_smp_info *)
 
     corelist[ncores_up - 1] = pcore;
     atomic_inc_64(&ncores_up);
+    proc_ktd(&curidle, cpu_idle);
     spinlock_release(&lock);
 
-    md_proc_yield();
+    md_proc_idle();
     __builtin_unreachable();
     for (;;);
 }
@@ -106,6 +116,7 @@ bsp_ap_startup(void)
     struct limine_smp_response *resp = g_smp_req.response;
     struct limine_smp_info **cpus;
     struct mdcore *mdcore;
+    struct proc *curidle;
     uint32_t ncores, tmp;
 
     /* Sanity check */
@@ -139,6 +150,7 @@ bsp_ap_startup(void)
     printf("mp: bringing APs online...\n");
     mdcore = &g_bsp.md;
 
+    proc_ktd(&curidle, cpu_idle);
     for (int i = 0; i < ncores; ++i) {
         if (mdcore->apic_id == cpus[i]->lapic_id) {
             continue;
diff --git a/src/sys/arch/amd64/cpu/trap.c b/src/sys/arch/amd64/cpu/trap.c
index 921a036..ae3a0cc 100644
--- a/src/sys/arch/amd64/cpu/trap.c
+++ b/src/sys/arch/amd64/cpu/trap.c
@@ -39,6 +39,7 @@
 #include <sys/syslog.h>
 #include <sys/syscall.h>
 #include <machine/trap.h>
+#include <string.h>
 
 /*
  * Trap type to type string conversion table
@@ -154,6 +155,7 @@ trap_syscall(struct trapframe *tf)
     struct syscall_domain *scdp;
     struct syscall_win *scwp;
     struct proc *self;
+    struct md_pcb *pcbp;
     struct syscall_args scargs = {
         .arg[0] = tf->rdi,
         .arg[1] = tf->rsi,
@@ -179,6 +181,9 @@ trap_syscall(struct trapframe *tf)
         return;
     }
 
+    pcbp = &self->pcb;
+    memcpy(&pcbp->tf, tf, sizeof(pcbp->tf));
+
     if (tf->rax < scwp->nimpl && tf->rax > 0) {
         tf->rax = scwp->sctab[tf->rax](&scargs);
     }