Changeset 7614565 in mainline for arch/sparc64/include

Timestamp:

2005-12-27T21:40:02Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

feb5915

Parents:

1120276

Message:

sparc64 work.
Fix clean_window trap handler so that it clears output registers instead of input registers!
Fix interrupt handlers to save global registers.

Location:

arch/sparc64/include

Files:

• context.h (modified) (2 diffs)
• context_offset.h (modified) (1 diff)
• trap/interrupt.h (modified) (2 diffs)
• trap/regwin.h (modified) (1 diff)
• trap/trap_table.h (modified) (2 diffs)

arch/sparc64/include/context.h

@@ -51 +51 @@
         (c)->pc = ((__address) _pc) - 8;                                                                \
         (c)->sp = ((__address) stack) + ALIGN_UP((size), STACK_ALIGNMENT) - (STACK_BIAS + SP_DELTA);    \
-        (c)->fp = -STACK_BIAS
+        (c)->fp = -STACK_BIAS;                                                                          \
+        (c)->cleanwin = 0
         
 
@@ -78 +79 @@
         __u64 l7;
         ipl_t ipl;
+        __u64 cleanwin;
 };
 

arch/sparc64/include/context_offset.h

@@ -19 +19 @@
 #define OFFSET_L6  0x80
 #define OFFSET_L7  0x88
+#define OFFSET_CLEANWIN  0x98

arch/sparc64/include/trap/interrupt.h

@@ -35 +35 @@
 
 #include <arch/trap/trap_table.h>
+#include <arch/stack.h>
 
 #define TT_INTERRUPT_LEVEL_1                    0x41
@@ -59 +60 @@
 #ifdef __ASM__
 .macro INTERRUPT_LEVEL_N_HANDLER n
-        save %sp, -128, %sp
+        save %sp, -STACK_WINDOW_SAVE_AREA_SIZE, %sp
         mov \n - 1, %o0
-        call exc_dispatch
         mov %fp, %o1
-        restore
-        retry
+        SAVING_HANDLER exc_dispatch
 .endm
 

arch/sparc64/include/trap/regwin.h

@@ -119 +119 @@
         mov %r0, %l6
         mov %r0, %l7
-        mov %r0, %i0
-        mov %r0, %i1
-        mov %r0, %i2
-        mov %r0, %i3
-        mov %r0, %i4
-        mov %r0, %i5
+        mov %r0, %o0
+        mov %r0, %o1
+        mov %r0, %o2
+        mov %r0, %o3
+        mov %r0, %o4
+        mov %r0, %o5
+        mov %r0, %o6
+        mov %r0, %o7
         retry
 .endm

arch/sparc64/include/trap/trap_table.h

@@ -34 +34 @@
 #endif /* __ASM__ */
 
+#include <arch/stack.h>
+
 #define TRAP_TABLE_ENTRY_COUNT  1024
 #define TRAP_TABLE_ENTRY_SIZE   32
@@ -49 +51 @@
 #endif /* !__ASM__ */
 
+#ifdef __ASM__
+.macro SAVE_GLOBALS
+        mov %g1, %l1
+        mov %g2, %l2
+        mov %g3, %l3
+        mov %g4, %l4
+        mov %g5, %l5
+        mov %g6, %l6
+        mov %g7, %l7
+.endm
+
+.macro RESTORE_GLOBALS
+        mov %l1, %g1
+        mov %l2, %g2
+        mov %l3, %g3
+        mov %l4, %g4
+        mov %l5, %g5
+        mov %l6, %g6
+        mov %l7, %g7
+.endm
+
+.macro SAVING_HANDLER f
+        set \f, %l0
+        b saving_handler
+        nop
+.endm
+#endif /* __ASM__ */
+
 #endif