Final round of FPU emulator bits.

2 files changed, 106 insertions, 102 deletions

diff --git a/include/asm-mips/asmmacro.h b/include/asm-mips/asmmacro.h
index fb3692dd7..7becc9bd1 100644
--- a/include/asm-mips/asmmacro.h
+++ b/include/asm-mips/asmmacro.h
@@ -3,124 +3,122 @@
  *
  * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
  * Copyright (C) 1998 Ralf Baechle
- *
- * $Id: asmmacro.h,v 1.3 1998/03/27 04:47:58 ralf Exp $
  */
-#ifndef __MIPS_ASMMACRO_H
-#define __MIPS_ASMMACRO_H
+#ifndef _ASM_ASMMACRO_H
+#define _ASM_ASMMACRO_H
 
 #include <asm/offset.h>
 
 #define FPU_SAVE_DOUBLE(thread, tmp) \
 	cfc1	tmp,  fcr31;                    \
 	sdc1	$f0,  (THREAD_FPU + 0x000)(thread); \
-	sdc1	$f2,  (THREAD_FPU + 0x008)(thread); \
-	sdc1	$f4,  (THREAD_FPU + 0x010)(thread); \
-	sdc1	$f6,  (THREAD_FPU + 0x018)(thread); \
-	sdc1	$f8,  (THREAD_FPU + 0x020)(thread); \
-	sdc1	$f10, (THREAD_FPU + 0x028)(thread); \
-	sdc1	$f12, (THREAD_FPU + 0x030)(thread); \
-	sdc1	$f14, (THREAD_FPU + 0x038)(thread); \
-	sdc1	$f16, (THREAD_FPU + 0x040)(thread); \
-	sdc1	$f18, (THREAD_FPU + 0x048)(thread); \
-	sdc1	$f20, (THREAD_FPU + 0x050)(thread); \
-	sdc1	$f22, (THREAD_FPU + 0x058)(thread); \
-	sdc1	$f24, (THREAD_FPU + 0x060)(thread); \
-	sdc1	$f26, (THREAD_FPU + 0x068)(thread); \
-	sdc1	$f28, (THREAD_FPU + 0x070)(thread); \
-	sdc1	$f30, (THREAD_FPU + 0x078)(thread); \
-	sw	tmp,  (THREAD_FPU + 0x080)(thread)
+	sdc1	$f2,  (THREAD_FPU + 0x010)(thread); \
+	sdc1	$f4,  (THREAD_FPU + 0x020)(thread); \
+	sdc1	$f6,  (THREAD_FPU + 0x030)(thread); \
+	sdc1	$f8,  (THREAD_FPU + 0x040)(thread); \
+	sdc1	$f10, (THREAD_FPU + 0x050)(thread); \
+	sdc1	$f12, (THREAD_FPU + 0x060)(thread); \
+	sdc1	$f14, (THREAD_FPU + 0x070)(thread); \
+	sdc1	$f16, (THREAD_FPU + 0x080)(thread); \
+	sdc1	$f18, (THREAD_FPU + 0x090)(thread); \
+	sdc1	$f20, (THREAD_FPU + 0x0a0)(thread); \
+	sdc1	$f22, (THREAD_FPU + 0x0b0)(thread); \
+	sdc1	$f24, (THREAD_FPU + 0x0c0)(thread); \
+	sdc1	$f26, (THREAD_FPU + 0x0d0)(thread); \
+	sdc1	$f28, (THREAD_FPU + 0x0e0)(thread); \
+	sdc1	$f30, (THREAD_FPU + 0x0f0)(thread); \
+	sw	tmp,  (THREAD_FPU + 0x100)(thread)
 
 #define FPU_SAVE_SINGLE(thread,tmp)                 \
 	cfc1	tmp,  fcr31;                        \
 	swc1	$f0,  (THREAD_FPU + 0x000)(thread); \
-	swc1	$f1,  (THREAD_FPU + 0x004)(thread); \
-	swc1	$f2,  (THREAD_FPU + 0x008)(thread); \
-	swc1	$f3,  (THREAD_FPU + 0x00c)(thread); \
-	swc1	$f4,  (THREAD_FPU + 0x010)(thread); \
-	swc1	$f5,  (THREAD_FPU + 0x014)(thread); \
-	swc1	$f6,  (THREAD_FPU + 0x018)(thread); \
-	swc1	$f7,  (THREAD_FPU + 0x01c)(thread); \
-	swc1	$f8,  (THREAD_FPU + 0x020)(thread); \
-	swc1	$f9,  (THREAD_FPU + 0x024)(thread); \
-	swc1	$f10, (THREAD_FPU + 0x028)(thread); \
-	swc1	$f11, (THREAD_FPU + 0x02c)(thread); \
-	swc1	$f12, (THREAD_FPU + 0x030)(thread); \
-	swc1	$f13, (THREAD_FPU + 0x034)(thread); \
-	swc1	$f14, (THREAD_FPU + 0x038)(thread); \
-	swc1	$f15, (THREAD_FPU + 0x03c)(thread); \
-	swc1	$f16, (THREAD_FPU + 0x040)(thread); \
-	swc1	$f17, (THREAD_FPU + 0x044)(thread); \
-	swc1	$f18, (THREAD_FPU + 0x048)(thread); \
-	swc1	$f19, (THREAD_FPU + 0x04c)(thread); \
-	swc1	$f20, (THREAD_FPU + 0x050)(thread); \
-	swc1	$f21, (THREAD_FPU + 0x054)(thread); \
-	swc1	$f22, (THREAD_FPU + 0x058)(thread); \
-	swc1	$f23, (THREAD_FPU + 0x05c)(thread); \
-	swc1	$f24, (THREAD_FPU + 0x060)(thread); \
-	swc1	$f25, (THREAD_FPU + 0x064)(thread); \
-	swc1	$f26, (THREAD_FPU + 0x068)(thread); \
-	swc1	$f27, (THREAD_FPU + 0x06c)(thread); \
-	swc1	$f28, (THREAD_FPU + 0x070)(thread); \
-	swc1	$f29, (THREAD_FPU + 0x074)(thread); \
-	swc1	$f30, (THREAD_FPU + 0x078)(thread); \
-	swc1	$f31, (THREAD_FPU + 0x07c)(thread); \
-	sw	tmp,  (THREAD_FPU + 0x080)(thread)
+	swc1	$f1,  (THREAD_FPU + 0x008)(thread); \
+	swc1	$f2,  (THREAD_FPU + 0x010)(thread); \
+	swc1	$f3,  (THREAD_FPU + 0x018)(thread); \
+	swc1	$f4,  (THREAD_FPU + 0x020)(thread); \
+	swc1	$f5,  (THREAD_FPU + 0x028)(thread); \
+	swc1	$f6,  (THREAD_FPU + 0x030)(thread); \
+	swc1	$f7,  (THREAD_FPU + 0x038)(thread); \
+	swc1	$f8,  (THREAD_FPU + 0x040)(thread); \
+	swc1	$f9,  (THREAD_FPU + 0x048)(thread); \
+	swc1	$f10, (THREAD_FPU + 0x050)(thread); \
+	swc1	$f11, (THREAD_FPU + 0x058)(thread); \
+	swc1	$f12, (THREAD_FPU + 0x060)(thread); \
+	swc1	$f13, (THREAD_FPU + 0x068)(thread); \
+	swc1	$f14, (THREAD_FPU + 0x070)(thread); \
+	swc1	$f15, (THREAD_FPU + 0x078)(thread); \
+	swc1	$f16, (THREAD_FPU + 0x080)(thread); \
+	swc1	$f17, (THREAD_FPU + 0x088)(thread); \
+	swc1	$f18, (THREAD_FPU + 0x090)(thread); \
+	swc1	$f19, (THREAD_FPU + 0x098)(thread); \
+	swc1	$f20, (THREAD_FPU + 0x0a0)(thread); \
+	swc1	$f21, (THREAD_FPU + 0x0a8)(thread); \
+	swc1	$f22, (THREAD_FPU + 0x0b0)(thread); \
+	swc1	$f23, (THREAD_FPU + 0x0b8)(thread); \
+	swc1	$f24, (THREAD_FPU + 0x0c0)(thread); \
+	swc1	$f25, (THREAD_FPU + 0x0c8)(thread); \
+	swc1	$f26, (THREAD_FPU + 0x0d0)(thread); \
+	swc1	$f27, (THREAD_FPU + 0x0d8)(thread); \
+	swc1	$f28, (THREAD_FPU + 0x0e0)(thread); \
+	swc1	$f29, (THREAD_FPU + 0x0e8)(thread); \
+	swc1	$f30, (THREAD_FPU + 0x0f0)(thread); \
+	swc1	$f31, (THREAD_FPU + 0x0f8)(thread); \
+	sw	tmp,  (THREAD_FPU + 0x100)(thread)
 
 #define FPU_RESTORE_DOUBLE(thread, tmp) \
-	lw	tmp,  (THREAD_FPU + 0x080)(thread); \
+	lw	tmp,  (THREAD_FPU + 0x100)(thread); \
 	ldc1	$f0,  (THREAD_FPU + 0x000)(thread); \
-	ldc1	$f2,  (THREAD_FPU + 0x008)(thread); \
-	ldc1	$f4,  (THREAD_FPU + 0x010)(thread); \
-	ldc1	$f6,  (THREAD_FPU + 0x018)(thread); \
-	ldc1	$f8,  (THREAD_FPU + 0x020)(thread); \
-	ldc1	$f10, (THREAD_FPU + 0x028)(thread); \
-	ldc1	$f12, (THREAD_FPU + 0x030)(thread); \
-	ldc1	$f14, (THREAD_FPU + 0x038)(thread); \
-	ldc1	$f16, (THREAD_FPU + 0x040)(thread); \
-	ldc1	$f18, (THREAD_FPU + 0x048)(thread); \
-	ldc1	$f20, (THREAD_FPU + 0x050)(thread); \
-	ldc1	$f22, (THREAD_FPU + 0x058)(thread); \
-	ldc1	$f24, (THREAD_FPU + 0x060)(thread); \
-	ldc1	$f26, (THREAD_FPU + 0x068)(thread); \
-	ldc1	$f28, (THREAD_FPU + 0x070)(thread); \
-	ldc1	$f30, (THREAD_FPU + 0x078)(thread); \
+	ldc1	$f2,  (THREAD_FPU + 0x010)(thread); \
+	ldc1	$f4,  (THREAD_FPU + 0x020)(thread); \
+	ldc1	$f6,  (THREAD_FPU + 0x030)(thread); \
+	ldc1	$f8,  (THREAD_FPU + 0x040)(thread); \
+	ldc1	$f10, (THREAD_FPU + 0x050)(thread); \
+	ldc1	$f12, (THREAD_FPU + 0x060)(thread); \
+	ldc1	$f14, (THREAD_FPU + 0x070)(thread); \
+	ldc1	$f16, (THREAD_FPU + 0x080)(thread); \
+	ldc1	$f18, (THREAD_FPU + 0x090)(thread); \
+	ldc1	$f20, (THREAD_FPU + 0x0a0)(thread); \
+	ldc1	$f22, (THREAD_FPU + 0x0b0)(thread); \
+	ldc1	$f24, (THREAD_FPU + 0x0c0)(thread); \
+	ldc1	$f26, (THREAD_FPU + 0x0d0)(thread); \
+	ldc1	$f28, (THREAD_FPU + 0x0e0)(thread); \
+	ldc1	$f30, (THREAD_FPU + 0x0f0)(thread); \
 	ctc1	tmp,  fcr31
 
 #define FPU_RESTORE_SINGLE(thread,tmp)              \
-	lw	tmp,  (THREAD_FPU + 0x080)(thread); \
+	lw	tmp,  (THREAD_FPU + 0x100)(thread); \
 	lwc1	$f0,  (THREAD_FPU + 0x000)(thread); \
-	lwc1	$f1,  (THREAD_FPU + 0x004)(thread); \
-	lwc1	$f2,  (THREAD_FPU + 0x008)(thread); \
-	lwc1	$f3,  (THREAD_FPU + 0x00c)(thread); \
-	lwc1	$f4,  (THREAD_FPU + 0x010)(thread); \
-	lwc1	$f5,  (THREAD_FPU + 0x014)(thread); \
-	lwc1	$f6,  (THREAD_FPU + 0x018)(thread); \
-	lwc1	$f7,  (THREAD_FPU + 0x01c)(thread); \
-	lwc1	$f8,  (THREAD_FPU + 0x020)(thread); \
-	lwc1	$f9,  (THREAD_FPU + 0x024)(thread); \
-	lwc1	$f10, (THREAD_FPU + 0x028)(thread); \
-	lwc1	$f11, (THREAD_FPU + 0x02c)(thread); \
-	lwc1	$f12, (THREAD_FPU + 0x030)(thread); \
-	lwc1	$f13, (THREAD_FPU + 0x034)(thread); \
-	lwc1	$f14, (THREAD_FPU + 0x038)(thread); \
-	lwc1	$f15, (THREAD_FPU + 0x03c)(thread); \
-	lwc1	$f16, (THREAD_FPU + 0x040)(thread); \
-	lwc1	$f17, (THREAD_FPU + 0x044)(thread); \
-	lwc1	$f18, (THREAD_FPU + 0x048)(thread); \
-	lwc1	$f19, (THREAD_FPU + 0x04c)(thread); \
-	lwc1	$f20, (THREAD_FPU + 0x050)(thread); \
-	lwc1	$f21, (THREAD_FPU + 0x054)(thread); \
-	lwc1	$f22, (THREAD_FPU + 0x058)(thread); \
-	lwc1	$f23, (THREAD_FPU + 0x05c)(thread); \
-	lwc1	$f24, (THREAD_FPU + 0x060)(thread); \
-	lwc1	$f25, (THREAD_FPU + 0x064)(thread); \
-	lwc1	$f26, (THREAD_FPU + 0x068)(thread); \
-	lwc1	$f27, (THREAD_FPU + 0x06c)(thread); \
-	lwc1	$f28, (THREAD_FPU + 0x070)(thread); \
-	lwc1	$f29, (THREAD_FPU + 0x074)(thread); \
-	lwc1	$f30, (THREAD_FPU + 0x078)(thread); \
-	lwc1	$f31, (THREAD_FPU + 0x07c)(thread); \
+	lwc1	$f1,  (THREAD_FPU + 0x008)(thread); \
+	lwc1	$f2,  (THREAD_FPU + 0x010)(thread); \
+	lwc1	$f3,  (THREAD_FPU + 0x018)(thread); \
+	lwc1	$f4,  (THREAD_FPU + 0x020)(thread); \
+	lwc1	$f5,  (THREAD_FPU + 0x028)(thread); \
+	lwc1	$f6,  (THREAD_FPU + 0x030)(thread); \
+	lwc1	$f7,  (THREAD_FPU + 0x038)(thread); \
+	lwc1	$f8,  (THREAD_FPU + 0x040)(thread); \
+	lwc1	$f9,  (THREAD_FPU + 0x048)(thread); \
+	lwc1	$f10, (THREAD_FPU + 0x050)(thread); \
+	lwc1	$f11, (THREAD_FPU + 0x058)(thread); \
+	lwc1	$f12, (THREAD_FPU + 0x060)(thread); \
+	lwc1	$f13, (THREAD_FPU + 0x068)(thread); \
+	lwc1	$f14, (THREAD_FPU + 0x070)(thread); \
+	lwc1	$f15, (THREAD_FPU + 0x078)(thread); \
+	lwc1	$f16, (THREAD_FPU + 0x080)(thread); \
+	lwc1	$f17, (THREAD_FPU + 0x088)(thread); \
+	lwc1	$f18, (THREAD_FPU + 0x090)(thread); \
+	lwc1	$f19, (THREAD_FPU + 0x098)(thread); \
+	lwc1	$f20, (THREAD_FPU + 0x0a0)(thread); \
+	lwc1	$f21, (THREAD_FPU + 0x0a8)(thread); \
+	lwc1	$f22, (THREAD_FPU + 0x0b0)(thread); \
+	lwc1	$f23, (THREAD_FPU + 0x0b8)(thread); \
+	lwc1	$f24, (THREAD_FPU + 0x0c0)(thread); \
+	lwc1	$f25, (THREAD_FPU + 0x0c8)(thread); \
+	lwc1	$f26, (THREAD_FPU + 0x0d0)(thread); \
+	lwc1	$f27, (THREAD_FPU + 0x0d8)(thread); \
+	lwc1	$f28, (THREAD_FPU + 0x0e0)(thread); \
+	lwc1	$f29, (THREAD_FPU + 0x0e8)(thread); \
+	lwc1	$f30, (THREAD_FPU + 0x0f0)(thread); \
+	lwc1	$f31, (THREAD_FPU + 0x0f8)(thread); \
 	ctc1	tmp,  fcr31
 
 #define CPU_SAVE_NONSCRATCH(thread) \
@@ -148,4 +146,4 @@
 	lw	fp, THREAD_REG30(thread); \
 	lw	ra, THREAD_REG31(thread)
 
-#endif /* !(__MIPS_ASMMACRO_H) */
+#endif /* _ASM_ASMMACRO_H */
diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h
index deca93a7b..68117be89 100644
--- a/include/asm-mips/system.h
+++ b/include/asm-mips/system.h
@@ -6,6 +6,12 @@
  * Copyright (C) 1994 - 1999 by Ralf Baechle
  * Copyright (C) 1996 by Paul M. Antoine
  * Copyright (C) 1994 - 1999 by Ralf Baechle
+ *
+ * Changed set_except_vector declaration to allow return of previous
+ * vector address value - necessary for "borrowing" vectors. 
+ *
+ * Kevin D. Kissell, kevink@mips.org and Carsten Langgaard, carstenl@mips.com
+ * Copyright (C) 2000 MIPS Technologies, Inc.
  */
 #ifndef _ASM_SYSTEM_H
 #define _ASM_SYSTEM_H
@@ -231,7 +237,7 @@ __xchg(unsigned long x, volatile void * ptr, int size)
 	return x;
 }
 
-extern void set_except_vector(int n, void *addr);
+extern void *set_except_vector(int n, void *addr);
 
 extern void __die(const char *, struct pt_regs *, const char *where,
 	unsigned long line) __attribute__((noreturn));