Changeset 8c2214e in mainline for kernel/arch/sparc64/include/trap

Timestamp:

2010-02-20T20:29:27Z (16 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

f516bc2

Parents:

e0cb57b

Message:

Cleanup and merge of the TSB code.

Location:

kernel/arch/sparc64/include/trap

Files:

• exception.h (modified) (2 diffs)
• sun4v/mmu.h (modified) (2 diffs)
• trap_table.h (modified) (1 diff)

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

@@ -38 +38 @@
 
 #define TT_INSTRUCTION_ACCESS_EXCEPTION         0x08
+#define TT_INSTRUCTION_ACCESS_MMU_MISS          0x09
 #define TT_INSTRUCTION_ACCESS_ERROR             0x0a
+#define TT_IAE_UNAUTH_ACCESS                    0x0b
+#define TT_IAE_NFO_PAGE                         0x0c
 #define TT_ILLEGAL_INSTRUCTION                  0x10
 #define TT_PRIVILEGED_OPCODE                    0x11
 #define TT_UNIMPLEMENTED_LDD                    0x12
 #define TT_UNIMPLEMENTED_STD                    0x13
+#define TT_DAE_INVALID_ASI                      0x14
+#define TT_DAE_PRIVILEGE_VIOLATION              0x15
+#define TT_DAE_NC_PAGE                          0x16
+#define TT_DAE_NFO_PAGE                         0x17
 #define TT_FP_DISABLED                          0x20
 #define TT_FP_EXCEPTION_IEEE_754                0x21
@@ -49 +56 @@
 #define TT_DIVISION_BY_ZERO                     0x28
 #define TT_DATA_ACCESS_EXCEPTION                0x30
+#define TT_DATA_ACCESS_MMU_MISS                 0x31
 #define TT_DATA_ACCESS_ERROR                    0x32
 #define TT_MEM_ADDRESS_NOT_ALIGNED              0x34

kernel/arch/sparc64/include/trap/sun4v/mmu.h

@@ -36 +36 @@
  */
 
-#ifndef KERN_sparc64_SUN4V_MMU_TRAP_H_
-#define KERN_sparc64_SUN4V_MMU_TRAP_H_
+#ifndef KERN_sparc64_sun4v_MMU_TRAP_H_
+#define KERN_sparc64_sun4v_MMU_TRAP_H_
 
 #include <arch/stack.h>
@@ -121 +121 @@
          * but this time its handler accesse memory which IS mapped.
          */
-0:
-.if (\tl > 0)
-        wrpr %g0, 1, %tl
-.endif
+        .if (\tl > 0)
+                wrpr %g0, 1, %tl
+        .endif
 
         /*

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

@@ -101 +101 @@
 .macro PREEMPTIBLE_HANDLER f
         sethi %hi(\f), %g1
-        ba %xcc, preemptible_handler
+        b preemptible_handler
         or %g1, %lo(\f), %g1
 .endm