diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-05-04 20:43:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-05-04 20:43:25 +0000 |
| commit | 6539eed842af755d3ffea581e11b86ca8c5be94d (patch) | |
| tree | 182eb070deb980a824da9272cd9f94c5142daba5 /include/asm-mips | |
| parent | af142756744156e7ffd1e7ac64efb8a895096aec (diff) | |
Mips32 fixes from Carsten.
Diffstat (limited to 'include/asm-mips')
| -rw-r--r-- | include/asm-mips/bootinfo.h | 9 | ||||
| -rw-r--r-- | include/asm-mips/cpu.h | 2 | ||||
| -rw-r--r-- | include/asm-mips/stackframe.h | 26 |
3 files changed, 27 insertions, 10 deletions
diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h index 2bb64bfc5..7c2bb1777 100644 --- a/include/asm-mips/bootinfo.h +++ b/include/asm-mips/bootinfo.h @@ -233,15 +233,18 @@ #define CPU_TX3912 34 #define CPU_TX3922 35 #define CPU_TX3927 36 -#define CPU_AU1000 37 -#define CPU_LAST 37 +#define CPU_AU1000 37 +#define CPU_4KEC 37 +#define CPU_4KSC 38 +#define CPU_LAST 39 #define CPU_NAMES { "unknown", "R2000", "R3000", "R3000A", "R3041", "R3051", \ "R3052", "R3081", "R3081E", "R4000PC", "R4000SC", "R4000MC", \ "R4200", "R4400PC", "R4400SC", "R4400MC", "R4600", "R6000", \ "R6000A", "R8000", "R10000", "R4300", "R4650", "R4700", "R5000", \ "R5000A", "R4640", "Nevada", "RM7000", "R5432", "MIPS 4Kc", \ - "MIPS 5Kc", "R4310", "SiByte SB1", "TX3912", "TX3922", "TX3927", "Au1000" } + "MIPS 5Kc", "R4310", "SiByte SB1", "TX3912", "TX3922", "TX3927", \ + "Au1000", "MIPS 4KEc", "MIPS 4KSc" } #define COMMAND_LINE_SIZE 256 diff --git a/include/asm-mips/cpu.h b/include/asm-mips/cpu.h index 439928ad4..73c4a711d 100644 --- a/include/asm-mips/cpu.h +++ b/include/asm-mips/cpu.h @@ -59,6 +59,8 @@ #define PRID_IMP_NEVADA 0x2800 /* RM5260 ??? */ #define PRID_IMP_4KC 0x8000 #define PRID_IMP_5KC 0x8100 +#define PRID_IMP_4KEC 0x8400 +#define PRID_IMP_4KSC 0x8600 #define PRID_IMP_UNKNOWN 0xff00 diff --git a/include/asm-mips/stackframe.h b/include/asm-mips/stackframe.h index 2da7fbd45..d46cecef9 100644 --- a/include/asm-mips/stackframe.h +++ b/include/asm-mips/stackframe.h @@ -1,12 +1,13 @@ /* - * include/asm-mips/stackframe.h + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. * - * Copyright (C) 1994, 1995, 1996 by Ralf Baechle and Paul M. Antoine. - * - * $Id: stackframe.h,v 1.10 1999/08/13 17:07:27 harald Exp $ + * Copyright (C) 1994, 1995, 1996, 2001 Ralf Baechle + * Copyright (C) 1994, 1995, 1996 Paul M. Antoine. */ -#ifndef __ASM_MIPS_STACKFRAME_H -#define __ASM_MIPS_STACKFRAME_H +#ifndef __ASM_STACKFRAME_H +#define __ASM_STACKFRAME_H #include <asm/addrspace.h> #include <asm/mipsregs.h> @@ -235,6 +236,16 @@ __asm__ ( \ #endif +#define RESTORE_SP \ + lw sp, PT_R29(sp); \ + +#define RESTORE_ALL \ + RESTORE_SOME; \ + RESTORE_AT; \ + RESTORE_TEMP; \ + RESTORE_STATIC; \ + RESTORE_SP + #define RESTORE_ALL_AND_RET \ RESTORE_SOME; \ RESTORE_AT; \ @@ -242,6 +253,7 @@ __asm__ ( \ RESTORE_STATIC; \ RESTORE_SP_AND_RET + /* * Move to kernel mode and disable interrupts. * Set cp0 enable bit as sign that we're running on the kernel stack @@ -275,4 +287,4 @@ __asm__ ( \ xori t0,0x1e; \ mtc0 t0,CP0_STATUS -#endif /* __ASM_MIPS_STACKFRAME_H */ +#endif /* __ASM_STACKFRAME_H */ |