Changeset 49b6d32 in mainline

Timestamp:

2005-12-15T19:52:47Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

36e7ee98

Parents:

961b5f0

Message:

sparc64 work.
Register window clean, spill and fill handlers.

Location:

arch/sparc64

Files:

• Makefile.inc (modified) (1 diff)
• include/trap/regwin.h (added)
• include/trap/trap.h (moved) (moved from arch/sparc64/include/trap.h ) (1 diff)
• include/trap/trap_table.h (moved) (moved from arch/sparc64/include/trap_table.h )
• src/mm/tlb.c (modified) (1 diff)
• src/sparc64.c (modified) (1 diff)
• src/trap/trap.c (moved) (moved from arch/sparc64/src/trap.c ) (1 diff)
• src/trap/trap_table.S (moved) (moved from arch/sparc64/src/trap_table.S ) (3 diffs)

arch/sparc64/Makefile.inc

@@ -57 +57 @@
         arch/$(ARCH)/src/sparc64.c \
         arch/$(ARCH)/src/start.S \
-        arch/$(ARCH)/src/trap_table.S \
-        arch/$(ARCH)/src/trap.c
+        arch/$(ARCH)/src/trap/trap_table.S \
+        arch/$(ARCH)/src/trap/trap.c

arch/sparc64/include/trap/trap.h

@@ -30 +30 @@
 #define __sparc64_TRAP_H__
 
-#include <arch/trap_table.h>
+#include <arch/trap/trap_table.h>
 #include <arch/asm.h>
 

arch/sparc64/src/mm/tlb.c

@@ -36 +36 @@
 #include <typedefs.h>
 #include <config.h>
-#include <arch/trap.h>
+#include <arch/trap/trap.h>
 
 /** Initialize ITLB and DTLB.

arch/sparc64/src/sparc64.c

@@ -29 +29 @@
 #include <arch.h>
 #include <print.h>
-#include <arch/trap.h>
-#include <arch/trap_table.h>
+#include <arch/trap/trap.h>
 #include <arch/console.h>
 

arch/sparc64/src/trap/trap.c

@@ -27 +27 @@
  */
 
-#include <arch/trap.h>
-#include <arch/trap_table.h>
+#include <arch/trap/trap.h>
+#include <arch/trap/trap_table.h>
 #include <arch/asm.h>
 #include <memstr.h>

arch/sparc64/src/trap/trap_table.S

@@ -35 +35 @@
 .text
 
-#include <arch/trap_table.h>
+#include <arch/trap/trap_table.h>
+#include <arch/trap/regwin.h>
 
 #define TABLE_SIZE      TRAP_TABLE_SIZE
@@ -56 +57 @@
 trap_table_kernel:
 
-/*
- * Hardware interrupts for TL=0.
- */
-.org trap_table_kernel + 0*ENTRY_SIZE
-tl_0_hardware_traps:
+/* TT = 0x24, TL = 0 *, clean_window handler */
+.org trap_table_kernel + TT_CLEAN_WINDOW*ENTRY_SIZE
+.global clean_window_handler
+clean_window_handler:
+        CLEAN_WINDOW_HANDLER
 
-/*
- * Register window spill/fill/clean traps for TL=0.
- */
-.org trap_table_kernel + 128*ENTRY_SIZE
-tl_0_regwin_traps:
+/* TT = 0x80, TL = 0 *, spill_0_normal handler */
+.org trap_table_kernel + TT_SPILL_0_NORMAL*ENTRY_SIZE
+.global spill_0_normal
+spill_0_normal:
+        SPILL_NORMAL_HANDLER
+
+/* TT = 0xc0, TL = 0 *, fill_0_normal handler */
+.org trap_table_kernel + TT_FILL_0_NORMAL*ENTRY_SIZE
+fill_0_normal:
+        FILL_NORMAL_HANDLER
 
 /*
@@ -85 +91 @@
 
 /*
- * Register window spill/fill/clean traps for TL>0.
+ * Register window spill/fill traps for TL>0.
  */
 .org trap_table_kernel + 640*ENTRY_SIZE