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

Timestamp:

Jun 28, 2017, 3:24:02 PM (7 years ago)

Author:

max@…

Message:

enable the timer (not yet calibrated)

File:

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

trunk/hal/x86_64/core/hal_kentry.h

@@ -45 +45 @@
 #define T_USER  0x100
 
+#define TF_REGSIZE      (19 * 8)
+
+#define INTR_SAVE_REGS  \
+        subq    $TF_REGSIZE,%rsp        ; \
+        movq    %rax,TF_RAX(%rsp)       ; \
+        movq    %rbx,TF_RBX(%rsp)       ; \
+        movq    %rcx,TF_RCX(%rsp)       ; \
+        movq    %rdx,TF_RDX(%rsp)       ; \
+        movq    %rbp,TF_RBP(%rsp)       ; \
+        movq    %rdi,TF_RDI(%rsp)       ; \
+        movq    %rsi,TF_RSI(%rsp)       ; \
+        movq    %r8,TF_R8(%rsp)         ; \
+        movq    %r9,TF_R9(%rsp)         ; \
+        movq    %r10,TF_R10(%rsp)       ; \
+        movq    %r11,TF_R11(%rsp)       ; \
+        movq    %r12,TF_R12(%rsp)       ; \
+        movq    %r13,TF_R13(%rsp)       ; \
+        movq    %r14,TF_R14(%rsp)       ; \
+        movq    %r15,TF_R15(%rsp)       ; \
+        movw    %gs,TF_GS(%rsp)         ; \
+        movw    %fs,TF_FS(%rsp)         ; \
+        movw    %es,TF_ES(%rsp)         ; \
+        movw    %ds,TF_DS(%rsp)         ; \
+        cld
+
+#define INTR_RESTORE_REGS       \
+        movq    TF_RAX(%rsp),%rax       ; \
+        movq    TF_RBX(%rsp),%rbx       ; \
+        movq    TF_RCX(%rsp),%rcx       ; \
+        movq    TF_RDX(%rsp),%rdx       ; \
+        movq    TF_RBP(%rsp),%rbp       ; \
+        movq    TF_RDI(%rsp),%rdi       ; \
+        movq    TF_RSI(%rsp),%rsi       ; \
+        movq    TF_R8(%rsp),%r8         ; \
+        movq    TF_R9(%rsp),%r9         ; \
+        movq    TF_R10(%rsp),%r10       ; \
+        movq    TF_R11(%rsp),%r11       ; \
+        movq    TF_R12(%rsp),%r12       ; \
+        movq    TF_R13(%rsp),%r13       ; \
+        movq    TF_R14(%rsp),%r14       ; \
+        movq    TF_R15(%rsp),%r15       ; \
+        movw    TF_GS(%rsp),%gs         ; \
+        movw    TF_FS(%rsp),%fs         ; \
+        movw    TF_ES(%rsp),%es         ; \
+        movw    TF_DS(%rsp),%ds         ; \
+        addq    $TF_REGSIZE,%rsp        ; \
+        cld
+
 #ifndef x86_ASM
 
@@ -51 +99 @@
  */
 struct trapframe {
+        /* Pushed by INTR_SAVE_REGS */
+        uint64_t tf_rax;
+        uint64_t tf_rbx;
+        uint64_t tf_rcx;
+        uint64_t tf_rdx;
         uint64_t tf_rdi;
         uint64_t tf_rsi;
-        uint64_t tf_rdx;
-        uint64_t tf_r10;
+        uint64_t tf_rbp;
         uint64_t tf_r8;
         uint64_t tf_r9;
-
-        uint64_t tf_arg6;
-        uint64_t tf_arg7;
-        uint64_t tf_arg8;
-        uint64_t tf_arg9;
-
-        uint64_t tf_rcx;
+        uint64_t tf_r10;
         uint64_t tf_r11;
         uint64_t tf_r12;
@@ -69 +115 @@
         uint64_t tf_r14;
         uint64_t tf_r15;
-        uint64_t tf_rbp;
-        uint64_t tf_rbx;
-        uint64_t tf_rax;
-
         uint64_t tf_gs;
         uint64_t tf_fs;
@@ -78 +120 @@
         uint64_t tf_ds;
 
+        /* Pushed by the ISR */
         uint64_t tf_trapno;
 
@@ -98 +141 @@
 
         /* These are pushed for a trap */
-        uint64_t tf_err;
+        uint64_t tf_err;        /* in fact, this one may not... */
         uint64_t tf_rip;
         uint64_t tf_cs;
@@ -108 +151 @@
 };
 
+#else
+
+/* offsets in the trapframe structure */
+#define TF_RAX  0
+#define TF_RBX  8
+#define TF_RCX  16
+#define TF_RDX  24
+#define TF_RDI  32
+#define TF_RSI  40
+#define TF_RBP  48
+#define TF_R8   56
+#define TF_R9   64
+#define TF_R10  72
+#define TF_R11  80
+#define TF_R12  88
+#define TF_R13  96
+#define TF_R14  104
+#define TF_R15  112
+#define TF_GS   120
+#define TF_FS   128
+#define TF_ES   136
+#define TF_DS   144
+
 #endif