Changeset cefb126 in mainline for kernel/arch/ia32/include/interrupt.h

Timestamp:

2010-07-02T14:19:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (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/ia32/include/interrupt.h (modified) (3 diffs)

kernel/arch/ia32/include/interrupt.h

@@ -72 +72 @@
 typedef struct istate {
         uint32_t eax;
+        uint32_t ebx;
         uint32_t ecx;
         uint32_t edx;
+        uint32_t edi;
+        uint32_t esi;
         uint32_t ebp;
+        
+        uint32_t ebp_frame;     /* imitation of frame pointer linkage */
+        uint32_t eip_frame;     /* imitation of return address linkage */
 
         uint32_t gs;
@@ -81 +87 @@
         uint32_t ds;
 
-        uint32_t error_word;
+        uint32_t error_word;    /* real or fake error word */
         uint32_t eip;
         uint32_t cs;
         uint32_t eflags;
-        uint32_t stack[];
+        uint32_t esp;           /* only if istate_t is from uspace */
+        uint32_t ss;            /* only if istate_t is from uspace */
 } istate_t;
 
@@ -113 +120 @@
 extern void (* eoi_function)(void);
 
-extern void decode_istate(istate_t *istate);
 extern void interrupt_init(void);
 extern void trap_virtual_enable_irqs(uint16_t irqmask);