<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems (2010-12-29)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>sh</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-12-29 Sebastian Huber <sebastian.huber@embedded-brains.de>
* startup/linkcmds.base: Reserve enough space for the exception
minimum prologues.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog.diff?r1=text&tr1=1.57&r2=text&tr2=1.58&diff_format=h">M</a></td><td width='1%'>1.58</td><td width='100%'>c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.base.diff?r1=text&tr1=1.1&r2=text&tr2=1.2&diff_format=h">M</a></td><td width='1%'>1.2</td><td width='100%'>c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.base</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog:1.57 rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog:1.58
--- rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog:1.57 Wed Dec 22 08:21:03 2010
+++ rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog Wed Dec 29 03:43:06 2010
</font><font color='#997700'>@@ -1,3 +1,8 @@
</font><font color='#000088'>+2010-12-29 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ * startup/linkcmds.base: Reserve enough space for the exception
+ minimum prologues.
+
</font> 2010-12-22 Sebastian Huber <sebastian.huber@embedded-brains.de>
* configure.ac: Added I2C options. Fixed eMIOS prescaler. Use
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.base:1.1 rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.base:1.2
--- rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.base:1.1 Wed Apr 7 01:44:41 2010
+++ rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.base Wed Dec 29 03:43:06 2010
</font><font color='#997700'>@@ -98,7 +98,7 @@
</font> /*
* BSP: Reserve space for exception handler
*/
<font color='#880000'>- . = . + 0x180;
</font><font color='#000088'>+ . = . + 0x230;
</font> . = ALIGN (bsp_section_align);
} > REGION_VECTORS
<span style="background-color: #FF0000"> </span>
</pre>
<p> </p>
<a name='cs2'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>sh</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-12-29 Sebastian Huber <sebastian.huber@embedded-brains.de>
* shared/include/cpuIdent.c, shared/include/cpuIdent.h: Added support
for e500v2. Removed IVPR/IVOR/HWIVOR features since they are included
in Book E.
* new-exceptions/bspsupport/vectors.h,
new-exceptions/bspsupport/ppc_exc.S,
new-exceptions/bspsupport/ppc_exc_address.c,
new-exceptions/bspsupport/ppc_exc_categories.c,
new-exceptions/bspsupport/ppc_exc_initialize.c,
new-exceptions/bspsupport/ppc_exc_prologue.c: Added support for
e500v2. Added exception vector defines for Book E types. Removed
e200 exception vector defines. Added e500 exception vector defines.
Unified IVOR calculation for e200 and e500 (e200z1 has hard wired
IVOR values).
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libcpu/powerpc/ChangeLog.diff?r1=text&tr1=1.362&r2=text&tr2=1.363&diff_format=h">M</a></td><td width='1%'>1.363</td><td width='100%'>c/src/lib/libcpu/powerpc/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc.S.diff?r1=text&tr1=1.7&r2=text&tr2=1.8&diff_format=h">M</a></td><td width='1%'>1.8</td><td width='100%'>c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc.S</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_address.c.diff?r1=text&tr1=1.3&r2=text&tr2=1.4&diff_format=h">M</a></td><td width='1%'>1.4</td><td width='100%'>c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_address.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_categories.c.diff?r1=text&tr1=1.3&r2=text&tr2=1.4&diff_format=h">M</a></td><td width='1%'>1.4</td><td width='100%'>c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_categories.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_initialize.c.diff?r1=text&tr1=1.4&r2=text&tr2=1.5&diff_format=h">M</a></td><td width='1%'>1.5</td><td width='100%'>c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_initialize.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_prologue.c.diff?r1=text&tr1=1.2&r2=text&tr2=1.3&diff_format=h">M</a></td><td width='1%'>1.3</td><td width='100%'>c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_prologue.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h.diff?r1=text&tr1=1.5&r2=text&tr2=1.6&diff_format=h">M</a></td><td width='1%'>1.6</td><td width='100%'>c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h.diff?r1=text&tr1=1.26&r2=text&tr2=1.27&diff_format=h">M</a></td><td width='1%'>1.27</td><td width='100%'>c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.c.diff?r1=text&tr1=1.29&r2=text&tr2=1.30&diff_format=h">M</a></td><td width='1%'>1.30</td><td width='100%'>c/src/lib/libcpu/powerpc/shared/include/cpuIdent.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/lib/libcpu/powerpc/ChangeLog:1.362 rtems/c/src/lib/libcpu/powerpc/ChangeLog:1.363
--- rtems/c/src/lib/libcpu/powerpc/ChangeLog:1.362 Thu Dec 23 06:50:55 2010
+++ rtems/c/src/lib/libcpu/powerpc/ChangeLog Wed Dec 29 03:51:17 2010
</font><font color='#997700'>@@ -1,3 +1,19 @@
</font><font color='#000088'>+2010-12-29 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ * shared/include/cpuIdent.c, shared/include/cpuIdent.h: Added support
+ for e500v2. Removed IVPR/IVOR/HWIVOR features since they are included
+ in Book E.
+ * new-exceptions/bspsupport/vectors.h,
+ new-exceptions/bspsupport/ppc_exc.S,
+ new-exceptions/bspsupport/ppc_exc_address.c,
+ new-exceptions/bspsupport/ppc_exc_categories.c,
+ new-exceptions/bspsupport/ppc_exc_initialize.c,
+ new-exceptions/bspsupport/ppc_exc_prologue.c: Added support for
+ e500v2. Added exception vector defines for Book E types. Removed
+ e200 exception vector defines. Added e500 exception vector defines.
+ Unified IVOR calculation for e200 and e500 (e200z1 has hard wired
+ IVOR values).
+
</font> 2010-12-23 Sebastian Huber <sebastian.huber@embedded-brains.de>
* mpc83xx/i2c/mpc83xx_i2cdrv.c: Fixed interrupt flag clearing for
<font color='#006600'>diff -u rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc.S:1.7 rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc.S:1.8
--- rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc.S:1.7 Wed Dec 22 08:13:03 2010
+++ rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc.S Wed Dec 29 03:51:18 2010
</font><font color='#997700'>@@ -71,24 +71,6 @@
</font> .global ppc_exc_tgpr_clr_prolog_size
ppc_exc_tgpr_clr_prolog_size = . - ppc_exc_tgpr_clr_prolog
<font color='#880000'>-/**
- * @brief Use vector offsets with 16 byte boundaries.
- *
- * This prologue is intended for cores with IVPR/IVOR registers. The e200z1
- * core has hard wired values for the IVOR, thus all values are calculated to
- * match its constraints. The link register will point to the next prologue.
- * This is all right for the vector number calculation due the IVOR offset
- * values.
- *
- * @see ppc_exc_min_prolog_auto();
- */
- .global ppc_exc_min_prolog_auto_packed
-ppc_exc_min_prolog_auto_packed:
- stwu r1, -EXCEPTION_FRAME_END(r1)
- stw VECTOR_REGISTER, VECTOR_OFFSET(r1)
- mflr VECTOR_REGISTER
- bla wrap_auto_packed
-
</font> /*
* Automatic vector, asynchronous exception; however,
* automatic vector calculation is less efficient than
<font color='#997700'>@@ -156,14 +138,6 @@
</font> */
b wrap_no_save_frame_register_std
<font color='#880000'>- /* See: wrap_auto */
-wrap_auto_packed:
- stw FRAME_REGISTER, FRAME_OFFSET(r1)
- mflr FRAME_REGISTER
- mtlr VECTOR_REGISTER
- rlwinm VECTOR_REGISTER, FRAME_REGISTER, 28, 26, 31
- b wrap_no_save_frame_register_std
-
</font> wrap_auto_async:
stwu r1, -EXCEPTION_FRAME_END(r1)
stw FRAME_REGISTER, FRAME_OFFSET(r1)
<font color='#006600'>diff -u rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_address.c:1.3 rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_address.c:1.4
--- rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_address.c:1.3 Wed Dec 22 08:13:03 2010
+++ rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_address.c Wed Dec 29 03:51:18 2010
</font><font color='#997700'>@@ -36,6 +36,33 @@
</font>
uint32_t ppc_exc_vector_base = 0;
<font color='#000088'>+/*
+ * XXX: These values are choosen to directly generate the vector offsets for an
+ * e200z1 which has hard wired IVORs (IVOR0=0x00, IVOR1=0x10, IVOR2=0x20, ...).
+ */
+static const uint8_t ivor_values [] = {
+ [ASM_BOOKE_CRIT_VECTOR] = 0,
+ [ASM_MACH_VECTOR] = 1,
+ [ASM_PROT_VECTOR] = 2,
+ [ASM_ISI_VECTOR] = 3,
+ [ASM_EXT_VECTOR] = 4,
+ [ASM_ALIGN_VECTOR] = 5,
+ [ASM_PROG_VECTOR] = 6,
+ [ASM_FLOAT_VECTOR] = 7,
+ [ASM_SYS_VECTOR] = 8,
+ [ASM_BOOKE_APU_VECTOR] = 9,
+ [ASM_BOOKE_DEC_VECTOR] = 10,
+ [ASM_BOOKE_FIT_VECTOR] = 11,
+ [ASM_BOOKE_WDOG_VECTOR] = 12,
+ [ASM_BOOKE_DTLBMISS_VECTOR] = 13,
+ [ASM_BOOKE_ITLBMISS_VECTOR] = 14,
+ [ASM_BOOKE_DEBUG_VECTOR] = 15,
+ [ASM_E500_SPE_UNAVAILABLE_VECTOR] = 32,
+ [ASM_E500_EMB_FP_DATA_VECTOR] = 33,
+ [ASM_E500_EMB_FP_ROUND_VECTOR] = 34,
+ [ASM_E500_PERFMON_VECTOR] = 35
+};
+
</font> void *ppc_exc_vector_address(unsigned vector)
{
uintptr_t vector_base = 0xfff00000;
<font color='#997700'>@@ -65,12 +92,15 @@
</font> }
}
<font color='#880000'>- if (ppc_cpu_has_ivpr_and_ivor()) {
- /*
- * XXX: this directly matches the vector offsets in a e200z1,<span style="background-color: #FF0000"> </span>
- * which has hardwired IVORs (IVOR0=0,IVOR1=0x10,IVOR2=0x20...)<span style="background-color: #FF0000"> </span>
- */
- vector_offset = (vector - 1) << 4;
</font><font color='#000088'>+ if (
+ ppc_cpu_is_bookE() == PPC_BOOKE_STD
+ || ppc_cpu_is_bookE() == PPC_BOOKE_E500
+ ) {
+ if (vector < sizeof(ivor_values) / sizeof(ivor_values [0])) {
+ vector_offset = ((uintptr_t) ivor_values [vector]) << 4;
+ } else {
+ vector_offset = 0;
+ }
</font> }
if (bsp_exceptions_in_RAM) {
<font color='#006600'>diff -u rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_categories.c:1.3 rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_categories.c:1.4
--- rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_categories.c:1.3 Wed Apr 7 01:45:59 2010
+++ rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_categories.c Wed Dec 29 03:51:18 2010
</font><font color='#997700'>@@ -150,29 +150,6 @@
</font> [ASM_8XX_DEVPORT_VECTOR] = PPC_EXC_CLASSIC,
};
<font color='#880000'>-static const ppc_exc_categories e200_category_table = {
- [ASM_MACH_VECTOR] = PPC_EXC_BOOKE_CRITICAL | PPC_EXC_ASYNC,
- [ASM_PROT_VECTOR] = PPC_EXC_CLASSIC,
- [ASM_ISI_VECTOR] = PPC_EXC_CLASSIC,
- [ASM_EXT_VECTOR] = PPC_EXC_CLASSIC | PPC_EXC_ASYNC,
- [ASM_ALIGN_VECTOR] = PPC_EXC_CLASSIC,
- [ASM_PROG_VECTOR] = PPC_EXC_CLASSIC,
- [ASM_FLOAT_VECTOR] = PPC_EXC_CLASSIC,
- [ASM_SYS_VECTOR] = PPC_EXC_CLASSIC,
- [ASM_BOOKE_DEC_VECTOR] = PPC_EXC_CLASSIC | PPC_EXC_ASYNC,
- [ASM_BOOKE_FIT_VECTOR] = PPC_EXC_CLASSIC | PPC_EXC_ASYNC,
- [ASM_BOOKE_WDOG_VECTOR] = PPC_EXC_BOOKE_CRITICAL | PPC_EXC_ASYNC,
- [ASM_BOOKE_ITLBMISS_VECTOR] = PPC_EXC_CLASSIC,
- [ASM_BOOKE_DTLBMISS_VECTOR] = PPC_EXC_CLASSIC,
-
- /* FIXME: Depending on HDI0 [DAPUEN] this is a critical or debug exception */
- [ASM_TRACE_VECTOR] = PPC_EXC_CLASSIC | PPC_EXC_BOOKE_CRITICAL,
-
- [ASM_E200_SPE_UNAVAILABLE_VECTOR] = PPC_EXC_CLASSIC,
- [ASM_E200_SPE_DATA_VECTOR] = PPC_EXC_CLASSIC,
- [ASM_E200_SPE_ROUND_VECTOR] = PPC_EXC_CLASSIC,
-};
-
</font> static const ppc_exc_categories e300_category_table = {
[ASM_RESET_VECTOR] = PPC_EXC_CLASSIC,
[ASM_MACH_VECTOR] = PPC_EXC_CLASSIC,
<font color='#997700'>@@ -195,32 +172,49 @@
</font> [ASM_E300_SYSMGMT_VECTOR] = PPC_EXC_CLASSIC | PPC_EXC_ASYNC,
};
<font color='#880000'>-static const ppc_exc_categories e500_category_table = {
- [ASM_MACH_VECTOR] = PPC_EXC_E500_MACHCHK,
-
</font><font color='#000088'>+static const ppc_exc_categories e200_category_table = {
</font> [ASM_BOOKE_CRIT_VECTOR] = PPC_EXC_BOOKE_CRITICAL | PPC_EXC_ASYNC,
<font color='#880000'>- [ASM_BOOKE_WDOG_VECTOR] = PPC_EXC_BOOKE_CRITICAL | PPC_EXC_ASYNC,
- [ASM_TRACE_VECTOR] = PPC_EXC_BOOKE_CRITICAL,
-
</font><font color='#000088'>+ [ASM_MACH_VECTOR] = PPC_EXC_E500_MACHCHK,
+ [ASM_PROT_VECTOR] = PPC_EXC_CLASSIC,
+ [ASM_ISI_VECTOR] = PPC_EXC_CLASSIC,
</font> [ASM_EXT_VECTOR] = PPC_EXC_CLASSIC | PPC_EXC_ASYNC,
<font color='#000088'>+ [ASM_ALIGN_VECTOR] = PPC_EXC_CLASSIC,
+ [ASM_PROG_VECTOR] = PPC_EXC_CLASSIC,
+ [ASM_FLOAT_VECTOR] = PPC_EXC_CLASSIC,
+ [ASM_SYS_VECTOR] = PPC_EXC_CLASSIC,
</font> [ASM_BOOKE_DEC_VECTOR] = PPC_EXC_CLASSIC | PPC_EXC_ASYNC,
[ASM_BOOKE_FIT_VECTOR] = PPC_EXC_CLASSIC | PPC_EXC_ASYNC,
<font color='#000088'>+ [ASM_BOOKE_WDOG_VECTOR] = PPC_EXC_BOOKE_CRITICAL | PPC_EXC_ASYNC,
+ [ASM_BOOKE_DTLBMISS_VECTOR] = PPC_EXC_CLASSIC,
+ [ASM_BOOKE_ITLBMISS_VECTOR] = PPC_EXC_CLASSIC,
+
+ /* FIXME: Depending on HDI0 [DAPUEN] this is a critical or debug exception */
+ [ASM_BOOKE_DEBUG_VECTOR] = PPC_EXC_BOOKE_CRITICAL,
</font>
<font color='#000088'>+ [ASM_E500_SPE_UNAVAILABLE_VECTOR] = PPC_EXC_CLASSIC,
+ [ASM_E500_EMB_FP_DATA_VECTOR] = PPC_EXC_CLASSIC,
+ [ASM_E500_EMB_FP_ROUND_VECTOR] = PPC_EXC_CLASSIC
+};
+
+static const ppc_exc_categories e500_category_table = {
+ [ASM_MACH_VECTOR] = PPC_EXC_E500_MACHCHK,
</font> [ASM_PROT_VECTOR] = PPC_EXC_CLASSIC,
[ASM_ISI_VECTOR] = PPC_EXC_CLASSIC,
<font color='#000088'>+ [ASM_EXT_VECTOR] = PPC_EXC_CLASSIC | PPC_EXC_ASYNC,
</font> [ASM_ALIGN_VECTOR] = PPC_EXC_CLASSIC,
[ASM_PROG_VECTOR] = PPC_EXC_CLASSIC,
[ASM_FLOAT_VECTOR] = PPC_EXC_CLASSIC,
[ASM_SYS_VECTOR] = PPC_EXC_CLASSIC,
<font color='#880000'>- [ /* APU unavailable */ 0x0b] = PPC_EXC_CLASSIC,
-
- [ASM_60X_DLMISS_VECTOR] = PPC_EXC_CLASSIC,
- [ASM_60X_DSMISS_VECTOR] = PPC_EXC_CLASSIC,
- [ASM_60X_VEC_VECTOR] = PPC_EXC_CLASSIC,
- [ASM_60X_PERFMON_VECTOR] = PPC_EXC_CLASSIC,
-
- [ /* emb FP data */ 0x15] = PPC_EXC_CLASSIC,
- [ /* emb FP round */ 0x16] = PPC_EXC_CLASSIC,
</font><font color='#000088'>+ [ASM_BOOKE_DEC_VECTOR] = PPC_EXC_CLASSIC | PPC_EXC_ASYNC,
+ [ASM_BOOKE_FIT_VECTOR] = PPC_EXC_CLASSIC | PPC_EXC_ASYNC,
+ [ASM_BOOKE_WDOG_VECTOR] = PPC_EXC_BOOKE_CRITICAL | PPC_EXC_ASYNC,
+ [ASM_BOOKE_DTLBMISS_VECTOR] = PPC_EXC_CLASSIC,
+ [ASM_BOOKE_ITLBMISS_VECTOR] = PPC_EXC_CLASSIC,
+ [ASM_BOOKE_DEBUG_VECTOR] = PPC_EXC_BOOKE_CRITICAL,
+ [ASM_E500_SPE_UNAVAILABLE_VECTOR] = PPC_EXC_CLASSIC,
+ [ASM_E500_EMB_FP_DATA_VECTOR] = PPC_EXC_CLASSIC,
+ [ASM_E500_EMB_FP_ROUND_VECTOR] = PPC_EXC_CLASSIC,
+ [ASM_E500_PERFMON_VECTOR] = PPC_EXC_CLASSIC
</font> };
static const ppc_exc_categories psim_category_table = {
<font color='#997700'>@@ -274,6 +268,7 @@
</font> case PPC_PSIM:
return &psim_category_table;
case PPC_8540:
<font color='#000088'>+ case PPC_e500v2:
</font> return &e500_category_table;
case PPC_e200z0:
case PPC_e200z1:
<font color='#006600'>diff -u rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_initialize.c:1.4 rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_initialize.c:1.5
--- rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_initialize.c:1.4 Wed Apr 7 01:45:59 2010
+++ rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_initialize.c Wed Dec 29 03:51:18 2010
</font><font color='#997700'>@@ -33,13 +33,13 @@
</font> #define MTIVPR(prefix) asm volatile ("mtivpr %0" : : "r" (prefix))
#define MTIVOR(x, vec) asm volatile ("mtivor"#x" %0" : : "r" (vec))
<font color='#880000'>-static void ppc_exc_initialize_e500(void)
</font><font color='#000088'>+static void ppc_exc_initialize_booke(void)
</font> {
/* Interupt vector prefix register */
MTIVPR(ppc_exc_vector_base);
<font color='#880000'>- /* Interupt vector offset register */
- MTIVOR(0, ppc_exc_vector_address(ASM_BOOKE_CRIT_VECTOR)); /* Critical input not (yet) supported; use reset vector */
</font><font color='#000088'>+ /* Interupt vector offset registers */
+ MTIVOR(0, ppc_exc_vector_address(ASM_BOOKE_CRIT_VECTOR));
</font> MTIVOR(1, ppc_exc_vector_address(ASM_MACH_VECTOR));
MTIVOR(2, ppc_exc_vector_address(ASM_PROT_VECTOR));
MTIVOR(3, ppc_exc_vector_address(ASM_ISI_VECTOR));
<font color='#997700'>@@ -48,45 +48,20 @@
</font> MTIVOR(6, ppc_exc_vector_address(ASM_PROG_VECTOR));
MTIVOR(7, ppc_exc_vector_address(ASM_FLOAT_VECTOR));
MTIVOR(8, ppc_exc_vector_address(ASM_SYS_VECTOR));
<font color='#880000'>- MTIVOR(9, ppc_exc_vector_address(0x0b));
</font><font color='#000088'>+ MTIVOR(9, ppc_exc_vector_address(ASM_BOOKE_APU_VECTOR));
</font> MTIVOR(10, ppc_exc_vector_address(ASM_BOOKE_DEC_VECTOR));
MTIVOR(11, ppc_exc_vector_address(ASM_BOOKE_FIT_VECTOR));
MTIVOR(12, ppc_exc_vector_address(ASM_BOOKE_WDOG_VECTOR));
<font color='#880000'>- MTIVOR(13, ppc_exc_vector_address(ASM_60X_DSMISS_VECTOR));
- MTIVOR(14, ppc_exc_vector_address(ASM_60X_DLMISS_VECTOR));
- MTIVOR(15, ppc_exc_vector_address(ASM_TRACE_VECTOR));
- MTIVOR(32, ppc_exc_vector_address(ASM_60X_VEC_VECTOR));
- MTIVOR(33, ppc_exc_vector_address(0x16));
- MTIVOR(34, ppc_exc_vector_address(0x15));
- MTIVOR(35, ppc_exc_vector_address(ASM_60X_PERFMON_VECTOR));
-}
-
-static void ppc_exc_initialize_e200(void)
-{
- /* Interupt vector prefix register */
- MTIVPR(ppc_exc_vector_base);
-
- if (ppc_cpu_has_ivor()) {
- /* Interupt vector offset register */
- MTIVOR(0, 0); /* Critical input */
- MTIVOR(1, ppc_exc_vector_address( ASM_MACH_VECTOR));
- MTIVOR(2, ppc_exc_vector_address( ASM_PROT_VECTOR));
- MTIVOR(3, ppc_exc_vector_address( ASM_ISI_VECTOR));
- MTIVOR(4, ppc_exc_vector_address( ASM_EXT_VECTOR));
- MTIVOR(5, ppc_exc_vector_address( ASM_ALIGN_VECTOR));
- MTIVOR(6, ppc_exc_vector_address( ASM_PROG_VECTOR));
- MTIVOR(7, ppc_exc_vector_address( ASM_FLOAT_VECTOR));
- MTIVOR(8, ppc_exc_vector_address( ASM_SYS_VECTOR));
- MTIVOR(9, 0); /* APU unavailable */
- MTIVOR(10, ppc_exc_vector_address( ASM_BOOKE_DEC_VECTOR));
- MTIVOR(11, ppc_exc_vector_address( ASM_BOOKE_FIT_VECTOR));
- MTIVOR(12, ppc_exc_vector_address( ASM_BOOKE_WDOG_VECTOR));
- MTIVOR(13, ppc_exc_vector_address( ASM_BOOKE_ITLBMISS_VECTOR));
- MTIVOR(14, ppc_exc_vector_address( ASM_BOOKE_DTLBMISS_VECTOR));
- MTIVOR(15, ppc_exc_vector_address( ASM_TRACE_VECTOR));
- MTIVOR(32, ppc_exc_vector_address( ASM_E200_SPE_UNAVAILABLE_VECTOR));
- MTIVOR(33, ppc_exc_vector_address( ASM_E200_SPE_DATA_VECTOR));
- MTIVOR(34, ppc_exc_vector_address( ASM_E200_SPE_ROUND_VECTOR));
</font><font color='#000088'>+ MTIVOR(13, ppc_exc_vector_address(ASM_BOOKE_DTLBMISS_VECTOR));
+ MTIVOR(14, ppc_exc_vector_address(ASM_BOOKE_ITLBMISS_VECTOR));
+ MTIVOR(15, ppc_exc_vector_address(ASM_BOOKE_DEBUG_VECTOR));
+ if (ppc_cpu_is_e200() || ppc_cpu_is_e500()) {
+ MTIVOR(32, ppc_exc_vector_address(ASM_E500_SPE_UNAVAILABLE_VECTOR));
+ MTIVOR(33, ppc_exc_vector_address(ASM_E500_EMB_FP_DATA_VECTOR));
+ MTIVOR(34, ppc_exc_vector_address(ASM_E500_EMB_FP_ROUND_VECTOR));
+ }
+ if (ppc_cpu_is_e500()) {
+ MTIVOR(35, ppc_exc_vector_address(ASM_E500_PERFMON_VECTOR));
</font> }
}
<font color='#997700'>@@ -123,7 +98,7 @@
</font> }
/* Ensure proper interrupt stack alignment */
<font color='#880000'>- interrupt_stack_pointer &= ~((uint32_t) CPU_STACK_ALIGNMENT - 1);
</font><font color='#000088'>+ interrupt_stack_pointer &= ~((uintptr_t) CPU_STACK_ALIGNMENT - 1);
</font>
/* Tag interrupt stack bottom */
*(uint32_t *) interrupt_stack_pointer = 0;
<font color='#997700'>@@ -142,11 +117,8 @@
</font> ppc_exc_msr_bits |= MSR_VE;
#endif
<font color='#880000'>- if (ppc_cpu_is(PPC_e200z1) ||<span style="background-color: #FF0000"> </span>
- ppc_cpu_is(PPC_e200z6)) {
- ppc_exc_initialize_e200();
- } else if (ppc_cpu_is_bookE() == PPC_BOOKE_STD || ppc_cpu_is_bookE() == PPC_BOOKE_E500) {
- ppc_exc_initialize_e500();
</font><font color='#000088'>+ if (ppc_cpu_is_bookE() == PPC_BOOKE_STD || ppc_cpu_is_bookE() == PPC_BOOKE_E500) {
+ ppc_exc_initialize_booke();
</font> }
for (vector = 0; vector <= LAST_VALID_EXC; ++vector) {
<font color='#006600'>diff -u rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_prologue.c:1.2 rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_prologue.c:1.3
--- rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_prologue.c:1.2 Sun Nov 29 23:07:54 2009
+++ rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_prologue.c Wed Dec 29 03:51:18 2010
</font><font color='#997700'>@@ -39,8 +39,6 @@
</font> */
extern const uint32_t ppc_exc_min_prolog_auto [];
<font color='#880000'>-extern const uint32_t ppc_exc_min_prolog_auto_packed [];
-
</font> /* Minimal prologue templates */
extern const uint32_t ppc_exc_min_prolog_async_tmpl_std [];
extern const uint32_t ppc_exc_min_prolog_sync_tmpl_std [];
<font color='#997700'>@@ -90,14 +88,10 @@
</font> prologue_template_size = (size_t) ppc_exc_tgpr_clr_prolog_size;
} else if (
category == PPC_EXC_CLASSIC
<font color='#880000'>- && ((vector_address & 0xffU) == 0
- || (ppc_cpu_has_ivpr_and_ivor() && (vector_address & 0xfU) == 0))
</font><font color='#000088'>+ && ppc_cpu_is_bookE() != PPC_BOOKE_STD
+ && ppc_cpu_is_bookE() != PPC_BOOKE_E500
</font> ) {
<font color='#880000'>- if (ppc_cpu_has_ivpr_and_ivor()) {
- prologue_template = ppc_exc_min_prolog_auto_packed;
- } else {
- prologue_template = ppc_exc_min_prolog_auto;
- }
</font><font color='#000088'>+ prologue_template = ppc_exc_min_prolog_auto;
</font> prologue_template_size = (size_t) ppc_exc_min_prolog_size;
} else {
prologue_template = ppc_exc_prologue_templates [category];
<font color='#006600'>diff -u rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h:1.5 rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h:1.6
--- rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h:1.5 Tue Dec 1 19:41:57 2009
+++ rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h Wed Dec 29 03:51:18 2010
</font><font color='#997700'>@@ -59,18 +59,6 @@
</font> #define ASM_SYS_VECTOR 0x0C
#define ASM_TRACE_VECTOR 0x0D
<font color='#880000'>-#define ASM_BOOKE_CRIT_VECTOR 0x01
-/* We could use the std. decrementer vector # on bookE, too,
- * but the bookE decrementer has slightly different semantics
- * so we use a different vector (which happens to be
- * the PIT vector on the 405 which is like the booke decrementer)
- */
-#define ASM_BOOKE_DEC_VECTOR 0x10
-#define ASM_BOOKE_ITLBMISS_VECTOR 0x11
-#define ASM_BOOKE_DTLBMISS_VECTOR 0x12
-#define ASM_BOOKE_FIT_VECTOR 0x13
-#define ASM_BOOKE_WDOG_VECTOR 0x14
-
</font> #define ASM_PPC405_APU_UNAVAIL_VECTOR ASM_60X_VEC_ASSIST_VECTOR
#define ASM_8XX_FLOATASSIST_VECTOR 0x0E
<font color='#997700'>@@ -103,19 +91,35 @@
</font> #define ASM_60X_VEC_ASSIST_VECTOR 0x16
#define ASM_60X_ITM_VECTOR 0x17
<font color='#880000'>-/* e200 */
-#define ASM_E200_SPE_UNAVAILABLE_VECTOR 0x15
-#define ASM_E200_SPE_DATA_VECTOR 0x16
-#define ASM_E200_SPE_ROUND_VECTOR 0x17
</font><font color='#000088'>+/* Book E */
+#define ASM_BOOKE_CRIT_VECTOR 0x01
+/* We could use the std. decrementer vector # on bookE, too,
+ * but the bookE decrementer has slightly different semantics
+ * so we use a different vector (which happens to be
+ * the PIT vector on the 405 which is like the booke decrementer)
+ */
+#define ASM_BOOKE_DEC_VECTOR 0x10
+#define ASM_BOOKE_ITLBMISS_VECTOR 0x11
+#define ASM_BOOKE_DTLBMISS_VECTOR 0x12
+#define ASM_BOOKE_FIT_VECTOR 0x13
+#define ASM_BOOKE_WDOG_VECTOR 0x14
+#define ASM_BOOKE_APU_VECTOR 0x18
+#define ASM_BOOKE_DEBUG_VECTOR ASM_TRACE_VECTOR
+
+/* e200 and e500 */
+#define ASM_E500_SPE_UNAVAILABLE_VECTOR ASM_60X_VEC_VECTOR
+#define ASM_E500_EMB_FP_DATA_VECTOR 0x19
+#define ASM_E500_EMB_FP_ROUND_VECTOR 0x1A
+#define ASM_E500_PERFMON_VECTOR ASM_60X_PERFMON_VECTOR
</font>
/* e300 */
#define ASM_E300_CRIT_VECTOR 0x0A
<font color='#880000'>-#define ASM_E300_PERFMON_VECTOR 0x0F
</font><font color='#000088'>+#define ASM_E300_PERFMON_VECTOR ASM_60X_PERFMON_VECTOR
</font> #define ASM_E300_IMISS_VECTOR ASM_60X_IMISS_VECTOR /* Special case: Shadowed GPRs */
#define ASM_E300_DLMISS_VECTOR ASM_60X_DLMISS_VECTOR /* Special case: Shadowed GPRs */
#define ASM_E300_DSMISS_VECTOR ASM_60X_DSMISS_VECTOR /* Special case: Shadowed GPRs */
<font color='#880000'>-#define ASM_E300_ADDR_VECTOR 0x13
-#define ASM_E300_SYSMGMT_VECTOR 0x14
</font><font color='#000088'>+#define ASM_E300_ADDR_VECTOR ASM_60X_ADDR_VECTOR
+#define ASM_E300_SYSMGMT_VECTOR ASM_60X_SYSMGMT_VECTOR
</font>
/*
* If you change that number make sure to adjust the wrapper code in ppc_exc.S
<font color='#006600'>diff -u rtems/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h:1.26 rtems/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h:1.27
--- rtems/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h:1.26 Wed Apr 7 09:18:53 2010
+++ rtems/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h Wed Dec 29 03:51:18 2010
</font><font color='#997700'>@@ -51,6 +51,7 @@
</font> PPC_8240 = PPC_8260,
PPC_8245 = 0x8081,
PPC_8540 = 0x8020,
<font color='#000088'>+ PPC_e500v2 = 0x8021,
</font> PPC_603le = 0x8082, /* 603le core, in MGT5100 and MPC5200 */
PPC_e300c1 = 0x8083, /* e300c1 core, in MPC83xx*/
PPC_e300c2 = 0x8084, /* e300c2 core */
<font color='#997700'>@@ -82,9 +83,6 @@
</font> unsigned has_8_bats : 1;
unsigned has_epic : 1;
unsigned has_shadowed_gprs : 1;
<font color='#880000'>- unsigned has_ivpr : 1;
- unsigned has_ivor : 1;
- unsigned has_hwivor : 1;
</font> } ppc_feature_t;
extern ppc_feature_t current_ppc_features;
<font color='#997700'>@@ -113,32 +111,34 @@
</font> _PPC_FEAT_DECL(has_8_bats)
_PPC_FEAT_DECL(has_epic)
_PPC_FEAT_DECL(has_shadowed_gprs)
<font color='#880000'>-_PPC_FEAT_DECL(has_ivpr)
-_PPC_FEAT_DECL(has_ivor)
-_PPC_FEAT_DECL(has_hwivor)
</font>
#undef _PPC_FEAT_DECL
<font color='#880000'>-static inline unsigned ppc_cpu_has_ivpr_and_ivor() { \
- return ppc_cpu_has_ivpr()<span style="background-color: #FF0000"> </span>
- && (ppc_cpu_has_ivor() || ppc_cpu_has_hwivor());
-}
-
</font> static inline ppc_cpu_id_t ppc_cpu_current(void)
{
return current_ppc_cpu;
}
<font color='#000088'>+static inline bool ppc_cpu_is_e200()
+{
+ return ppc_cpu_current() == PPC_e200z0
+ || ppc_cpu_current() == PPC_e200z1
+ || ppc_cpu_current() == PPC_e200z6;
+}
+
</font> static inline bool ppc_cpu_is_e300()
{
<font color='#880000'>- if (ppc_cpu_current() == PPC_UNKNOWN) {
- get_ppc_cpu_type();
- }
</font> return ppc_cpu_current() == PPC_e300c1
|| ppc_cpu_current() == PPC_e300c2
|| ppc_cpu_current() == PPC_e300c3;
}
<font color='#000088'>+static inline bool ppc_cpu_is_e500()
+{
+ return ppc_cpu_current() == PPC_8540
+ || ppc_cpu_current() == PPC_e500v2;
+}
+
</font> static inline bool ppc_cpu_is(ppc_cpu_id_t cpu)
{
return ppc_cpu_current() == cpu;
<font color='#006600'>diff -u rtems/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.c:1.29 rtems/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.c:1.30
--- rtems/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.c:1.29 Wed Apr 7 09:18:53 2010
+++ rtems/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.c Wed Dec 29 03:51:18 2010
</font><font color='#997700'>@@ -25,19 +25,7 @@
</font>
ppc_cpu_id_t current_ppc_cpu = PPC_UNKNOWN;
ppc_cpu_revision_t current_ppc_revision = 0xff;
<font color='#880000'>-ppc_feature_t current_ppc_features = {
- .has_altivec = 0,
- .has_fpu = 0,
- .has_hw_ptbl_lkup = 0,
- .is_bookE = 0,
- .has_16byte_clne = 0,
- .is_60x = 0,
- .has_8_bats = 0,
- .has_epic = 0,
- .has_shadowed_gprs = 0,
- .has_ivpr = 0,
- .has_ivor = 0
-};
</font><font color='#000088'>+ppc_feature_t current_ppc_features;
</font>
char *get_ppc_cpu_type_name(ppc_cpu_id_t cpu)
{
<font color='#997700'>@@ -66,6 +54,7 @@
</font> case PPC_e200z0: return "e200z0";
case PPC_e200z1: return "e200z1";
case PPC_e200z6: return "e200z6";
<font color='#000088'>+ case PPC_e500v2: return "e500v2";
</font> default:
printk("Unknown CPU value of 0x%x. Please add it to "
"<libcpu/powerpc/shared/include/cpuIdent.c>\n", cpu );
<font color='#997700'>@@ -134,6 +123,7 @@
</font> case PPC_e300c1:
case PPC_e300c2:
case PPC_e300c3:
<font color='#000088'>+ case PPC_e500v2:
</font> break;
default:
printk("Unknown PVR value of 0x%x. Please add it to "
<font color='#997700'>@@ -189,6 +179,7 @@
</font> case PPC_e200z0:
case PPC_e200z1:
case PPC_e200z6:
<font color='#000088'>+<span style="background-color: #FF0000"> </span> case PPC_e500v2:
</font> current_ppc_features.is_bookE = PPC_BOOKE_E500;
default:
break;
<font color='#997700'>@@ -214,20 +205,6 @@
</font> break;
}
<font color='#880000'>- switch (current_ppc_cpu) {
- case PPC_e200z0:
- case PPC_e200z1:
- current_ppc_features.has_ivpr = 1;
- current_ppc_features.has_hwivor = 1;
- break;
- case PPC_e200z6:
- current_ppc_features.has_ivpr = 1;
- current_ppc_features.has_ivor = 1;
- break;
- default:
- break;
- }
-
</font> return current_ppc_cpu;
}
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>