Changeset 8d427a3 in mainline

Timestamp:

2014-08-27T23:07:42Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f27f3fd

Parents:

b8fac76

Message:

Autogenerate istate_t and its offsets on ia32.

Files:

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

kernel/arch/ia32/Makefile.inc

@@ -105 +105 @@
         arch/$(KARCH)/src/fpu_context.c \
         arch/$(KARCH)/src/syscall.c
+
+ARCH_AUTOGENS_AG = \
+        arch/$(KARCH)/include/arch/istate_struct.ag
+

kernel/arch/ia32/include/arch/istate.h

@@ -38 +38 @@
 #include <trace.h>
 
-typedef struct istate {
-        /*
-         * The strange order of the GPRs is given by the requirement to use the
-         * istate structure for both regular interrupts and exceptions as well
-         * as for syscall handlers which use this order as an optimization.
-         */
-        uint32_t edx;
-        uint32_t ecx;
-        uint32_t ebx;
-        uint32_t esi;
-        uint32_t edi;
-        uint32_t ebp;
-        uint32_t eax;
-        
-        uint32_t ebp_frame;  /* imitation of frame pointer linkage */
-        uint32_t eip_frame;  /* imitation of return address linkage */
-        
-        uint32_t gs;
-        uint32_t fs;
-        uint32_t es;
-        uint32_t ds;
-        
-        uint32_t error_word;  /* real or fake error word */
-        uint32_t eip;
-        uint32_t cs;
-        uint32_t eflags;
-        uint32_t esp;         /* only if istate_t is from uspace */
-        uint32_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 /* KERNEL */
 
 #define RPL_USER        3

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) 
 
 /*