diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2004-11-10 23:51:57 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2004-11-10 23:51:57 +0000 |
commit | a84392db857e3a7514d46930e61007306cfaf3b2 (patch) | |
tree | 2b58e262607beb68dbb0faca396ed3a7005d5f29 /c/src/lib/libcpu/powerpc/mpc6xx | |
parent | 2004-11-10 Richard Campbell <richard.campbell@oarcorp.com> (diff) | |
download | rtems-a84392db857e3a7514d46930e61007306cfaf3b2.tar.bz2 |
2004-11-10 Richard Campbell <richard.campbell@oarcorp.com>
* configure.ac, mpc6xx/exceptions/raw_exception.c,
mpc6xx/exceptions/raw_exception.h, mpc6xx/mmu/bat.c,
mpc6xx/mmu/bat.h, mpc6xx/mmu/mmuAsm.S, shared/include/cpuIdent.c,
shared/include/cpuIdent.h: Add MPC8240 and MPC8245 support. There was
also a significant amount of spelling and whitespace cleanup.
Diffstat (limited to 'c/src/lib/libcpu/powerpc/mpc6xx')
5 files changed, 34 insertions, 18 deletions
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/raw_exception.c b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/raw_exception.c index 1989a9bfb0..911031de44 100644 --- a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/raw_exception.c +++ b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/raw_exception.c @@ -1,7 +1,7 @@ /* * raw_exception.c - This file contains implementation of C function to - * Instanciate 60x ppc primary exception entries. - * More detailled information can be found on motorola + * Instantiate 60x ppc primary exception entries. + * More detailed information can be found on motorola * site and more precisely in the following book : * * MPC750 @@ -33,6 +33,17 @@ static rtems_raw_except_connect_data default_raw_except_entry; static rtems_raw_except_global_settings* local_settings; void * codemove(void *, const void *, unsigned int, unsigned long); + +void* mpc60x_get_vector_addr(rtems_vector vector) +{ + extern rtems_cpu_table Cpu_table; + + if ( Cpu_table.exceptions_in_RAM ) + return ((void*) (((unsigned) vector) << 8)); + + return ((void*) (((unsigned) vector) << 8) + 0xfff00000); +} + int mpc750_vector_is_valid(rtems_vector vector) { @@ -134,13 +145,17 @@ int mpc60x_vector_is_valid(rtems_vector vector) case PPC_603: case PPC_603e: case PPC_603ev: + case PPC_8260: + /* case PPC_8240: -- same value as 8260 */ + case PPC_8245: if (!mpc603_vector_is_valid(vector)) { return 0; } break; - default: - printk("Please complete libcpu/powerpc/mpc6xx/exceptions/raw_exception.c\n"); - printk("current_ppc_cpu = %x\n", current_ppc_cpu); + default: + printk("Please complete " + "libcpu/powerpc/mpc6xx/exceptions/raw_exception.c\n" + "current_ppc_cpu = %x\n", current_ppc_cpu); return 0; } return 1; @@ -151,6 +166,8 @@ int mpc60x_set_exception (const rtems_raw_except_connect_data* except) unsigned int level; if (!mpc60x_vector_is_valid(except->exceptIndex)) { + printk("mpc60x_set_exception: vector %d is not valid\n", + except->exceptIndex); return 0; } /* @@ -160,7 +177,11 @@ int mpc60x_set_exception (const rtems_raw_except_connect_data* except) * RATIONALE : to always have the same transition by forcing the user * to get the previous handler before accepting to disconnect. */ - if (memcmp(mpc60x_get_vector_addr(except->exceptIndex), (void*)default_raw_except_entry.hdl.raw_hdl,default_raw_except_entry.hdl.raw_hdl_size)) { + + if (memcmp(mpc60x_get_vector_addr(except->exceptIndex), + (void*)default_raw_except_entry.hdl.raw_hdl, + default_raw_except_entry.hdl.raw_hdl_size)) { + printk("mpc60x_set_exception: raw vector not installed\n"); return 0; } diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/raw_exception.h b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/raw_exception.h index 0d1ff7e8a4..7a28820cb1 100644 --- a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/raw_exception.h +++ b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/raw_exception.h @@ -2,8 +2,8 @@ * raw_execption.h * * This file contains implementation of C function to - * Instanciate 60x ppc primary exception entries. - * More detailled information can be found on motorola + * Instantiate 60x ppc primary exception entries. + * More detailed information can be found on motorola * site and more precisely in the following book : * * MPC750 @@ -159,10 +159,6 @@ extern int mpc60x_delete_exception (const rtems_raw_except_connect_data*); */ extern int mpc750_vector_is_valid(rtems_vector vector); -inline static void* mpc60x_get_vector_addr(rtems_vector vector) -{ - return ((void*) (((unsigned) vector) << 8)); -} /* * Exception global init. */ diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/bat.c b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/bat.c index 0058b90970..e706256535 100644 --- a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/bat.c +++ b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/bat.c @@ -2,8 +2,8 @@ * bat.c * * This file contains the implementation of C function to - * Instanciate 60x/7xx ppc Block Address Translation (BAT) registers. - * More detailled information can be found on motorola + * Instantiate 60x/7xx ppc Block Address Translation (BAT) registers. + * More detailed information can be found on motorola * site and more precisely in the following book : * * MPC750 diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/bat.h b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/bat.h index 99d18e56c1..0ea9fc234e 100644 --- a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/bat.h +++ b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/bat.h @@ -2,8 +2,8 @@ * bat.h * * This file contains declaration of C function to - * Instanciate 60x/7xx ppc Block Address Translation (BAT) registers. - * More detailled information can be found on motorola + * Instantiate 60x/7xx ppc Block Address Translation (BAT) registers. + * More detailed information can be found on motorola * site and more precisely in the following book : * * MPC750 diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/mmuAsm.S b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/mmuAsm.S index e97ac653fb..55ebcc8b1e 100644 --- a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/mmuAsm.S +++ b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/mmuAsm.S @@ -38,6 +38,7 @@ #define PPC_860 0x50 #define PPC_821 PPC_860 #define PPC_8260 0x81 +#define PPC_8240 PPC_8260 /* ALTIVEC instructions (not recognized by off-the shelf gcc yet) */ #define DSSALL .long 0x7e00066c /* DSSALL altivec instruction opcode */ @@ -47,8 +48,6 @@ #ifndef MSSCR0 #define MSSCR0 1014 -#else -#warning MSSCR0 seems to be known, update __FILE__ #endif #define DL1HWF (1<<(31-8)) |