Changeset 234e509f in rtems

Timestamp:

Jan 26, 2005, 12:27:14 PM (16 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

771af46f

Parents:

9d7259a7

Message:

2005-01-26 Joel Sherrill <joel@…>

• irq/irq.c, startup/bspstart.c: Now compiles with gcc 4.x.

Location:

c/src/lib/libbsp/powerpc/mvme5500

Files:

• ChangeLog (modified) (1 diff)
• irq/irq.c (modified) (1 diff)
• startup/bspstart.c (modified) (2 diffs)

c/src/lib/libbsp/powerpc/mvme5500/ChangeLog

@@ +1 @@
+2005-01-26      Joel Sherrill <joel@OARcorp.com>
+
+        * irq/irq.c, startup/bspstart.c: Now compiles with gcc 4.x.
+
 2005-01-22      Ralf Corsepius <ralf.corsepius@rtems.org>
 

c/src/lib/libbsp/powerpc/mvme5500/irq/irq.c

@@ -446 +446 @@
   register unsigned msr;
   register unsigned new_msr;
-  register unsigned mainCause[2], selectCause;
+  unsigned mainCause[2];
+  register unsigned selectCause;
   register unsigned oldMask[2]={0,0};
   unsigned i, regNum, irq, bitNum, startIrqNum=0;

c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c

@@ -340 +340 @@
   unsigned l3cr;
 #endif
-  register unsigned char* intrStack;
+  register uint32_t  intrStack;
+  register uint32_t *intrStackPtr;
   unsigned char *work_space_start;
   ppc_cpu_id_t myCpu;
@@ -389 +390 @@
    * some settings below...
    */
-  intrStack = ((unsigned char*) __rtems_end) + INIT_STACK_SIZE + INTR_STACK_SIZE - CPU_MINIMUM_STACK_FRAME_SIZE;
+  intrStack = ((uint32_t) __rtems_end) + 
+          INIT_STACK_SIZE + INTR_STACK_SIZE - CPU_MINIMUM_STACK_FRAME_SIZE;
 
   /* make sure it's properly aligned */
-  (uint32_t)intrStack &= ~(CPU_STACK_ALIGNMENT-1);
+  intrStack &= ~(CPU_STACK_ALIGNMENT-1);
 
   /* tag the bottom (T. Straumann 6/36/2001 <strauman@slac.stanford.edu>) */
-  *((uint32_t *)intrStack) = 0;
-
-  _write_SPRG1((unsigned int)intrStack);
+  intrStackPtr = (uint32_t*) intrStack;
+  *intrStackPtr = 0;
+
+  _write_SPRG1(intrStack);
+
   _write_SPRG0(PPC_BSP_HAS_FIXED_PR288);