Changeset 0ddb84b in mainline

Timestamp:

2014-08-28T19:37:25Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2a37b9f

Parents:

3dcc9d8

Message:

Autogenerate sparc64 istate_t and its offsets.

Files:

• kernel/arch/sparc64/Makefile.inc (modified) (1 diff)
• kernel/arch/sparc64/include/arch/istate.h (modified) (1 diff)
• kernel/arch/sparc64/include/arch/istate_struct.ag (added)
• kernel/arch/sparc64/include/arch/trap/trap_table.h (modified) (3 diffs)
• uspace/lib/c/arch/sparc64/include/libarch/istate_struct.h (added)

kernel/arch/sparc64/Makefile.inc

@@ -108 +108 @@
                 arch/$(KARCH)/src/mm/$(USARCH)/tsb.c
 endif
+
+ARCH_AUTOGENS_AG = \
+        arch/$(KARCH)/include/arch/istate_struct.ag
+

kernel/arch/sparc64/include/arch/istate.h

@@ -41 +41 @@
 #ifdef KERNEL
 
+#include <arch/istate_struct.h>
 #include <arch/regdef.h>
 
 #else /* KERNEL */
 
+#include <libarch/istate_struct.h>
 #include <libarch/regdef.h>
 
 #endif /* KERNEL */
-
-typedef struct istate {
-        uint64_t tnpc;
-        uint64_t tpc;
-        uint64_t tstate;
-} istate_t;
 
 NO_TRACE static inline void istate_set_retaddr(istate_t *istate,

kernel/arch/sparc64/include/arch/trap/trap_table.h

@@ -37 +37 @@
 
 #include <arch/stack.h>
+#include <arch/istate_struct.h>
 
 #define TRAP_TABLE_ENTRY_COUNT  1024
@@ -42 +43 @@
 #define TRAP_TABLE_SIZE         (TRAP_TABLE_ENTRY_COUNT * TRAP_TABLE_ENTRY_SIZE)
 
+#define ISTATE_END_OFFSET(o)    ((o) - ISTATE_SIZE)
+
 /*
- * The following needs to be in sync with the definition of the istate
- * structure. The one STACK_ITEM_SIZE is counted for space holding the 7th
+ * The one STACK_ITEM_SIZE is counted for space holding the 7th
  * argument to syscall_handler (i.e. syscall number) and the other
  * STACK_ITEM_SIZE is counted because of the required alignment.
@@ -50 +52 @@
 #define PREEMPTIBLE_HANDLER_STACK_FRAME_SIZE \
     (STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE + \
-    (2 * STACK_ITEM_SIZE) + (12 * 8))
-#define SAVED_TSTATE    -(1 * 8)
-#define SAVED_TPC       -(2 * 8)
-#define SAVED_TNPC      -(3 * 8)        /* <-- istate_t begins here */
-#define SAVED_Y         -(4 * 8)
-#define SAVED_I0        -(5 * 8)
-#define SAVED_I1        -(6 * 8)
-#define SAVED_I2        -(7 * 8)
-#define SAVED_I3        -(8 * 8)
-#define SAVED_I4        -(9 * 8)
-#define SAVED_I5        -(10 * 8)
-#define SAVED_I6        -(11 * 8)
-#define SAVED_I7        -(12 * 8)
+    (2 * STACK_ITEM_SIZE) + (ISTATE_SIZE + 9 * 8))
+/* <-- istate_t ends here */
+#define SAVED_TSTATE    ISTATE_END_OFFSET(ISTATE_OFFSET_TSTATE) 
+#define SAVED_TPC       ISTATE_END_OFFSET(ISTATE_OFFSET_TPC)
+#define SAVED_TNPC      ISTATE_END_OFFSET(ISTATE_OFFSET_TNPC)
+/* <-- istate_t begins here */
+#define SAVED_Y         -(1 * 8 + ISTATE_SIZE)
+#define SAVED_I0        -(2 * 8 + ISTATE_SIZE)
+#define SAVED_I1        -(3 * 8 + ISTATE_SIZE)
+#define SAVED_I2        -(4 * 8 + ISTATE_SIZE)
+#define SAVED_I3        -(5 * 8 + ISTATE_SIZE)
+#define SAVED_I4        -(6 * 8 + ISTATE_SIZE)
+#define SAVED_I5        -(7 * 8 + ISTATE_SIZE)
+#define SAVED_I6        -(8 * 8 + ISTATE_SIZE)
+#define SAVED_I7        -(9 * 8 + ISTATE_SIZE)
 
 #ifndef __ASM__