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

Timestamp:

2010-05-21T23:02:10Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ecbd287d

Parents:

3500f75 (diff), 0242621 (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 initial support for sparc64 kernel stack tracing.

File:

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

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

@@ -42 +42 @@
 #define TRAP_TABLE_SIZE         (TRAP_TABLE_ENTRY_COUNT * TRAP_TABLE_ENTRY_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
+ * 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) + (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)
+
 #ifndef __ASM__
 
@@ -77 +99 @@
 .endm
 
-/*
- * 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
- * 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) + (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)
-
 .macro PREEMPTIBLE_HANDLER f
         sethi %hi(\f), %g1
-        b preemptible_handler
+        ba %xcc, preemptible_handler
         or %g1, %lo(\f), %g1
 .endm