Changeset 4236b18 in mainline

Timestamp:

2014-08-28T09:39:19Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4abe919

Parents:

95fe55ca

Message:

Autogenerate amd64 istate_t and its offsets.

Files:

• kernel/arch/amd64/Makefile.inc (modified) (1 diff)
• kernel/arch/amd64/include/arch/istate.h (modified) (1 diff)
• kernel/arch/amd64/include/arch/istate_struct.ag (added)
• kernel/arch/amd64/src/asm.S (modified) (2 diffs)
• uspace/lib/c/arch/amd64/include/libarch/istate_struct.h (added)

kernel/arch/amd64/Makefile.inc

@@ -86 +86 @@
                 arch/$(KARCH)/src/smp/smp.c
 endif
+
+ARCH_AUTOGENS_AG = \
+        arch/$(KARCH)/include/arch/istate_struct.ag
+

kernel/arch/amd64/include/arch/istate.h

@@ -38 +38 @@
 #include <trace.h>
 
-/** This is passed to interrupt handlers */
-typedef struct istate {
-        uint64_t rax;
-        uint64_t rbx;
-        uint64_t rcx;
-        uint64_t rdx;
-        uint64_t rsi;
-        uint64_t rdi;
-        uint64_t rbp;
-        uint64_t r8;
-        uint64_t r9;
-        uint64_t r10;
-        uint64_t r11;
-        uint64_t r12;
-        uint64_t r13;
-        uint64_t r14;
-        uint64_t r15;
-        uint64_t alignment;   /* align rbp_frame on multiple of 16 */
-        uint64_t rbp_frame;   /* imitation of frame pointer linkage */
-        uint64_t rip_frame;   /* imitation of return address linkage */
-        uint64_t error_word;  /* real or fake error word */
-        uint64_t rip;
-        uint64_t cs;
-        uint64_t rflags;
-        uint64_t rsp;         /* only if istate_t is from uspace */
-        uint64_t ss;          /* only if istate_t is from uspace */
-} istate_t;
+#ifdef KERNEL
+#include <arch/istate_struct.h>
+#else
+#include <libarch/istate_struct.h>
+#endif
 
 #define RPL_USER        3

kernel/arch/amd64/src/asm.S

@@ -29 +29 @@
 #include <arch/pm.h>
 #include <arch/mm/page.h>
+#include <arch/istate_struct.h>
 
 .text
@@ -142 +143 @@
         ret
 
-#define ISTATE_OFFSET_RAX               0
-#define ISTATE_OFFSET_RBX               8
-#define ISTATE_OFFSET_RCX               16
-#define ISTATE_OFFSET_RDX               24
-#define ISTATE_OFFSET_RSI               32
-#define ISTATE_OFFSET_RDI               40
-#define ISTATE_OFFSET_RBP               48
-#define ISTATE_OFFSET_R8                56
-#define ISTATE_OFFSET_R9                64
-#define ISTATE_OFFSET_R10               72
-#define ISTATE_OFFSET_R11               80
-#define ISTATE_OFFSET_R12               88      
-#define ISTATE_OFFSET_R13               96
-#define ISTATE_OFFSET_R14               104
-#define ISTATE_OFFSET_R15               112
-#define ISTATE_OFFSET_ALIGNMENT         120
-#define ISTATE_OFFSET_RBP_FRAME         128
-#define ISTATE_OFFSET_RIP_FRAME         136
-#define ISTATE_OFFSET_ERROR_WORD        144
-#define ISTATE_OFFSET_RIP               152
-#define ISTATE_OFFSET_CS                160
-#define ISTATE_OFFSET_RFLAGS            168
-#define ISTATE_OFFSET_RSP               176
-#define ISTATE_OFFSET_SS                184
-
 /*
  * Size of the istate structure without the hardware-saved part and without the
  * error word.
  */
-#define ISTATE_SOFT_SIZE        144
+#define ISTATE_SOFT_SIZE        ISTATE_SIZE - (6 * 8)
 
 /**