Changeset b32fe793 in rtems

Timestamp:

10/04/02 13:24:06 (21 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

3762222

Parents:

2b30225

Message:

2002-10-04 Jay Monkman <jtm@…>

• rtems/score/cpu.h: Fix u16 and u32 swap routines.

Location:

cpukit/score/cpu/arm

Files:

• ChangeLog (modified) (1 diff)
• rtems/score/cpu.h (modified) (2 diffs)

cpukit/score/cpu/arm/ChangeLog

@@ +1 @@
+2002-10-04      Jay Monkman <jtm@smoothsmoothie.com>
+
+        * rtems/score/cpu.h: Fix u16 and u32 swap routines.
+
 2002-08-05      Joel Sherrill <joel@OARcorp.com>
 

cpukit/score/cpu/arm/rtems/score/cpu.h

@@ -898 +898 @@
 )
 {
-    unsigned32 tmp;
-    asm volatile ("EOR   %1, %0, %0, ROR #16\n"  \
-                  "BIC   %1, %1, #0xff0000\n"    \
-                  "MOV   %0, %0, ROR #8\n"       \
-                  "EOR   %0, %0, %1, LSR #8\n"   \
-                  : "=&r" (value), "=&r" (tmp)     \
-                  : "0" (value));
+    unsigned32 tmp = value; /* make compiler warnings go away */
+    asm volatile ("EOR   %1, %0, %0, ROR #16\n" 
+                  "BIC   %1, %1, #0xff0000\n"   
+                  "MOV   %0, %0, ROR #8\n"      
+                  "EOR   %0, %0, %1, LSR #8\n"  
+                  : "=r" (value), "=r" (tmp)  
+                  : "0" (value), "1" (tmp));
 
     return value;
@@ -911 +911 @@
 static inline unsigned16 CPU_swap_u16(unsigned16 value)
 {
-    unsigned32 tmp = value;   /* make compiler warnings go away */
-    asm volatile ("MOV   %1, %0, LSR #8\n"       \
-                  "BIC   %0, %0, #0xff00\n"      \
-                  "MOV   %0, %0, LSL #8\n"       \
-                  "ORR   %0, %0, %1\n"           \
-                  : "=&r" (value), "=&r" (tmp)     \
-                  : "0" (value));
-    return value;
+    unsigned16 lower;
+    unsigned16 upper;
+
+    value = value & (unsigned16) 0xffff;
+    lower = (value >> 8) ;
+    upper = (value << 8) ;
+
+    return (lower | upper);
 }