Changeset 339 for trunk/hal/x86_64/core/hal_kentry.h

Timestamp:

Aug 7, 2017, 3:11:45 PM (7 years ago)

Author:

max@…

Message:

Add support for context switch - not tested yet, due to some other bugs in
the mapper. This cswitch is similar to that of TSAR.

File:

• trunk/hal/x86_64/core/hal_kentry.h (modified) (4 diffs)

trunk/hal/x86_64/core/hal_kentry.h

@@ -45 +45 @@
 #define T_USER  0x100
 
-#define CPUVAR(off)     %gs:CPU_INFO_ ## off
+#define TLSVAR(off)     %gs:TLS_ ## off
 
 /*
@@ -128 +128 @@
 
 /*
- * The x86_64 CPU trap frame.
+ * The x86_64 CPU trap frame. !!WARNING!! The size of this structure must be
+ * exactly TF_SIZE.
  */
 typedef struct hal_trapframe_s {
@@ -168 +169 @@
 typedef struct hal_cpu_context_s {
         uint64_t ctx_rsp0;
-        uint64_t ctx_rsp;
-        uint64_t ctx_rbp;
+        uint64_t ctx_tf;
+        hal_trapframe_t ctx_hidden_tf;
 } hal_cpu_context_t;
 
 #else
 
-/* offsets in the trapframe structure */
+/* Offsets in the trapframe structure */
 #define TF_RAX  0
 #define TF_RBX  8
@@ -195 +196 @@
 #define TF_DS   144
 
+/* Size of the trapframe structure */
+#define TF_SIZE 208
+
+/* Offsets in the context structure */
+#define CTX_RSP0  0
+#define CTX_TF    8
+
 #endif