Changeset 15d0046 in mainline for kernel/arch/ia32/src/asm.S

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/ia32/src/asm.S (modified) (2 diffs)

kernel/arch/ia32/src/asm.S

@@ -34 +34 @@
 #include <arch/cpu.h>
 #include <arch/mm/page.h>
+#include <arch/istate_struct.h>
 
 .text
@@ -136 +137 @@
         ret
 
-#define ISTATE_OFFSET_EDX         0
-#define ISTATE_OFFSET_ECX         4
-#define ISTATE_OFFSET_EBX         8
-#define ISTATE_OFFSET_ESI         12
-#define ISTATE_OFFSET_EDI         16 
-#define ISTATE_OFFSET_EBP         20
-#define ISTATE_OFFSET_EAX         24
-#define ISTATE_OFFSET_EBP_FRAME   28
-#define ISTATE_OFFSET_EIP_FRAME   32
-#define ISTATE_OFFSET_GS          36
-#define ISTATE_OFFSET_FS          40
-#define ISTATE_OFFSET_ES          44
-#define ISTATE_OFFSET_DS          48
-#define ISTATE_OFFSET_ERROR_WORD  52
-#define ISTATE_OFFSET_EIP         56
-#define ISTATE_OFFSET_CS          60
-#define ISTATE_OFFSET_EFLAGS      64
-#define ISTATE_OFFSET_ESP         68
-#define ISTATE_OFFSET_SS          72
-
 /*
  * Size of the istate structure without the hardware-saved part
  * and without the error word.
  */
-#define ISTATE_SOFT_SIZE  52
+#define ISTATE_SOFT_SIZE        ISTATE_SIZE - (6 * 4) 
 
 /*