Changeset d70ebffe in mainline for kernel/arch/sparc64/include/arch/trap/trap_table.h

Timestamp:

2014-10-27T15:10:14Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

aef669b

Parents:

ec443d5

Message:

Let the fast MMU traps use exc_dispatch() in their slow-path.

In order to get proper exception accounting, the MMU related traps need
to go through the code in exc_dispatch(). To make this possible, we pass
the DTLB Tag Access register in istate_t in order to make way for the
trap type argument, which needs to be passed as the first argument to
exc_dispatch().

As a collateral change, this commit modifies the istate_t structure to
match the SPARC V9 ABI stack frame layout. It gives us a richer istate_t
with more information in it and also simplifies calculation of stack
offsets inside of preemptible_handler.

File:

• kernel/arch/sparc64/include/arch/trap/trap_table.h (modified) (2 diffs)

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

@@ -43 +43 @@
 #define TRAP_TABLE_SIZE         (TRAP_TABLE_ENTRY_COUNT * TRAP_TABLE_ENTRY_SIZE)
 
-#define ISTATE_END_OFFSET(o)    ((o) - ISTATE_SIZE)
-
-/*
- * 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.
- */
-#define PREEMPTIBLE_HANDLER_STACK_FRAME_SIZE \
-    (STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE + \
-    (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__
 
@@ -80 +55 @@
 extern trap_table_entry_t trap_table[TRAP_TABLE_ENTRY_COUNT];
 extern trap_table_entry_t trap_table_save[TRAP_TABLE_ENTRY_COUNT];
+
 #endif /* !__ASM__ */