#1588 closed defect (fixed)

Header conflict in powerpc registers and MPC55XX registers

Reported by: dufault Owned by: Joel Sherrill
Priority: normal Milestone: 4.11
Component: score Version: 4.10
Severity: normal Keywords:
Cc: Blocked By:
Blocking:

Description

cpukit/score/cpu/powerpc/rtems/powerpc/registers.h has this:

/* Segment Registers */
#define SR0 0
#define SR1 1
...
#define SR15 15

and c/src/lib/libcpu/powerpc/mpc55xx/include/regs.h has this:

uint32_t SR15:1; /* Channel 15 Pending Service Status */
uint32_t SR14:1; /* Channel 14 Pending Service Status */

...

Resulting in:

In file included from bla.c:2:
/opt/rtems-4.10/powerpc-rtems4.10/phycore_mpc5554/lib/include/mpc55xx/regs.h:1813: error: expected identifier or '(' before numeric constant

I'd probably change the #define to have a prefix such as PPCREG_SR0.

Attachments (1)

regrename.diff (1.8 KB) - added by dufault on Jun 24, 2010 at 1:56:47 PM.
Change PowerPC segment register names

Download all attachments as: .zip

Change History (3)

Changed on Jun 24, 2010 at 1:56:47 PM by dufault

Attachment: regrename.diff added

Change PowerPC segment register names

comment:1 Changed on Jun 24, 2010 at 2:25:27 PM by Joel Sherrill

Owner: changed from Joel Sherrill to Sebastian Huber

comment:2 Changed on Jun 30, 2010 at 6:45:16 AM by Sebastian Huber

Component: bspscpukit
Owner: changed from Sebastian Huber to Joel Sherrill
Resolution: fixed
Status: newclosed

I changed the prefix from PPCREG to PPC since this is the more or less the standard PowerPC prefix.

Applied to CVS head.

Note: See TracTickets for help on using tickets.