Changeset 15d0046 in mainline for kernel/arch/amd64/include/arch/istate.h

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/arch/amd64/include/arch/istate.h (modified) (1 diff)

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