Changeset 6b1a85c in mainline for kernel/arch/amd64/include/interrupt.h

Timestamp:

2010-07-13T21:54:38Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4003861

Parents:

5f83634 (diff), c0e9f3f (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 from lp:~jakub/helenos/upa.

File:

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

kernel/arch/amd64/include/interrupt.h

@@ -74 +74 @@
 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 rbp;
-        uint64_t error_word;
+        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 stack[];  /* Additional data on stack */
+        uint64_t rsp;           /* only if istate_t is from uspace */
+        uint64_t ss;            /* only if istate_t is from uspace */
 } istate_t;