Changeset 193 for trunk

Timestamp:

Jul 13, 2017, 9:28:06 AM (7 years ago)

Author:

max@…

Message:

build the context

Location:

trunk/hal/x86_64/core

Files:

• hal_boot.S (modified) (1 diff)
• hal_boot.h (modified) (1 diff)
• hal_context.c (modified) (1 diff)
• hal_interrupt.c (modified) (3 diffs)
• hal_kentry.h (modified) (4 diffs)

trunk/hal/x86_64/core/hal_boot.S

@@ -26 +26 @@
 #include <hal_multiboot.h>
 #include <hal_register.h>
+#include <hal_kentry.h>
 #include <hal_segmentation.h>
 

trunk/hal/x86_64/core/hal_boot.h

@@ -39 +39 @@
 
 /* -------------------------------------------------------------------------- */
-
-#define PSL_MBO         0x00000002
 
 #define STKPAGES        4

trunk/hal/x86_64/core/hal_context.c

@@ -33 +33 @@
 
 #include <hal_context.h>
+#include <hal_kentry.h>
+#include <hal_internal.h>
+#include <hal_segmentation.h>
 
-#include <hal_internal.h>
+error_t hal_cpu_context_create(struct thread_s *thread)
+{
+        hal_cpu_context_t *context;
+        kmem_req_t req;
 
-error_t hal_cpu_context_create( struct thread_s * thread )
-{
-        x86_panic((char *)__func__);
+        /* allocate memory for cpu_context */
+        req.type  = KMEM_CPU_CTX;
+        req.size  = sizeof(hal_cpu_context_t);
+        req.flags = AF_KERNEL | AF_ZERO;
+
+        context = (hal_cpu_context_t *)kmem_alloc(&req);
+        if (context == NULL)
+                return ENOMEM;
+
+        /* set cpu context pointer in thread */
+        thread->cpu_context = (void*)context;
+
+        /* build the context */
+        /* tf_gs */
+        /* tf_fs */
+        context->tf_es = GDT_FIXED_SEL(GDT_UDATA_SEL, SEL_UPL);
+        context->tf_ds = GDT_FIXED_SEL(GDT_UDATA_SEL, SEL_UPL);
+        context->tf_rip = (uint64_t)thread->entry_func;
+        context->tf_rflags = PSL_USERSET;
+
+        if (thread->type == THREAD_USER) {
+                context->tf_cs = GDT_FIXED_SEL(GDT_UCODE_SEL, SEL_UPL);
+                context->tf_rsp = ((uint64_t)thread->u_stack_base) +
+                    thread->u_stack_size;
+        } else {
+                context->tf_cs = GDT_FIXED_SEL(GDT_KCODE_SEL, SEL_KPL);
+                context->tf_rsp = ((uint64_t)thread->k_stack_base) +
+                    thread->k_stack_size;
+        }
+
         return 0;
 }

trunk/hal/x86_64/core/hal_interrupt.c

@@ -36 +36 @@
  * Timer interrupt
  */
-void hal_timer_intr(struct trapframe *tf)
+void hal_timer_intr(hal_cpu_context_t *tf)
 {
         x86_printf("-> got timer: rip=%Z (th=%Z)\n", tf->tf_rip,
@@ -48 +48 @@
  * Serial Port (COM1) interrupt
  */
-void hal_com1_intr(struct trapframe *tf)
+void hal_com1_intr(hal_cpu_context_t *tf)
 {
         static char prev;
@@ -122 +122 @@
  * Keyboard interrupt (8042 PS/2)
  */
-void hal_keyboard_intr(struct trapframe *tf)
+void hal_keyboard_intr(hal_cpu_context_t *tf)
 {
         uint64_t val;

trunk/hal/x86_64/core/hal_kentry.h

@@ -49 +49 @@
 #define TF_REGSIZE      (19 * 8)
 
+#define PSL_I           0x00000200
+#define PSL_MBO         0x00000002
+#define PSL_USERSET     (PSL_MBO | PSL_I)
+
 #define INTR_SAVE_REGS  \
         subq    $TF_REGSIZE,%rsp        ; \
@@ -98 +102 @@
 
 /*
- * The x86_64 trap frame.
+ * The x86_64 CPU context.
  */
-struct trapframe {
+typedef struct hal_cpu_context_s {
         /* Pushed by INTR_SAVE_REGS */
         uint64_t tf_rax;
@@ -125 +129 @@
         uint64_t tf_trapno;
 
-        /* These are pushed for a trap */
+        /* Pushed by the hardware if trap */
         uint64_t tf_err;
         uint64_t tf_rip;
@@ -131 +135 @@
         uint64_t tf_rflags;
 
-        /* These are always pushed */
+        /* Always pushed by the hardware */
         uint64_t tf_rsp;
         uint64_t tf_ss;
-};
+} hal_cpu_context_t;
 
 /*