diff options
| author | imp <imp@FreeBSD.org> | 2013-04-23 09:38:18 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2013-04-23 09:38:18 +0000 |
| commit | b6d3001ad95f625e28beab8d70ee3dda101fc0c9 (patch) | |
| tree | 7ba7de3b30a8314f3d076118ab43a8f033bf2de4 /sys/mips/include | |
| parent | e04d23c5df0966fb23528fe546616c55361dd54f (diff) | |
| download | FreeBSD-src-b6d3001ad95f625e28beab8d70ee3dda101fc0c9.zip FreeBSD-src-b6d3001ad95f625e28beab8d70ee3dda101fc0c9.tar.gz | |
Update trapframe to be consistent with the changes made to regnum.h. This
should fix the booting problems people have been seeing.
Diffstat (limited to 'sys/mips/include')
| -rw-r--r-- | sys/mips/include/frame.h | 13 | ||||
| -rw-r--r-- | sys/mips/include/regnum.h | 8 |
2 files changed, 17 insertions, 4 deletions
diff --git a/sys/mips/include/frame.h b/sys/mips/include/frame.h index 05ceabd..c04888e 100644 --- a/sys/mips/include/frame.h +++ b/sys/mips/include/frame.h @@ -37,6 +37,8 @@ #ifndef _MACHINE_FRAME_H_ #define _MACHINE_FRAME_H_ +/* Note: This must also match regnum.h and regdef.h */ + struct trapframe { register_t zero; register_t ast; @@ -46,6 +48,16 @@ struct trapframe { register_t a1; register_t a2; register_t a3; +#if defined(__mips_n32) || defined(__mips_n64) + register_t a4; + register_t a5; + register_t a6; + register_t a7; + register_t t0; + register_t t1; + register_t t2; + register_t t3; +#else register_t t0; register_t t1; register_t t2; @@ -54,6 +66,7 @@ struct trapframe { register_t t5; register_t t6; register_t t7; +#endif register_t s0; register_t s1; register_t s2; diff --git a/sys/mips/include/regnum.h b/sys/mips/include/regnum.h index f94ed6c..67538e5 100644 --- a/sys/mips/include/regnum.h +++ b/sys/mips/include/regnum.h @@ -87,10 +87,10 @@ #define T1 9 #define T2 10 #define T3 11 -#define TA0 12 -#define TA1 13 -#define TA2 14 -#define TA3 15 +#define T4 12 +#define T5 13 +#define T6 14 +#define T7 15 #endif #define S0 16 #define S1 17 |
