Changeset fe56609d in mainline

Timestamp:

2005-09-03T09:08:02Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6b0e31d

Parents:

82a80d3

Message:

fix stupid assembler bugs in cpu_priority_* (PPC)

Location:

arch/ppc

Files:

• include/asm.h (modified) (4 diffs)
• src/drivers/ofw.c (modified) (1 diff)

arch/ppc/include/asm.h

@@ -40 +40 @@
 static inline pri_t cpu_priority_low(void) {
         pri_t v;
+        pri_t tmp;
+        
         __asm__ volatile (
                 "mfmsr %0\n"
-                "mfmsr %%r31\n"
-                "ori %%r31, %%r31, 1 << 15\n"
-                "mtmsr %%r31\n"
-                : "=r" (v)
-                :
-                : "%r31"
+                "mfmsr %1\n"
+                "ori %1, %1, 1 << 15\n"
+                "mtmsr %1\n"
+                : "=r" (v), "=r" (tmp)
         );
         return v;
@@ -59 +59 @@
 static inline pri_t cpu_priority_high(void) {
         pri_t v;
+        pri_t tmp;
+        
         __asm__ volatile (
                 "mfmsr %0\n"
-                "mfmsr %%r31\n"
-                "rlwinm %%r31, %%r31, 0, 17, 15\n"
-                "mtmsr %%r31\n"
-                : "=r" (v)
-                :
-                : "%r31"
+                "mfmsr %1\n"
+                "rlwinm %1, %1, 0, 17, 15\n"
+                "mtmsr %1\n"
+                : "=r" (v), "=r" (tmp)
         );
         return v;
@@ -76 +76 @@
  */
 static inline void cpu_priority_restore(pri_t pri) {
+        pri_t tmp;
+        
         __asm__ volatile (
-                "mfmsr %%r31\n"
-                "rlwimi  %0, %%r31, 0, 17, 15\n"
-                "cmpw 0, %0, %%r31\n"
+                "mfmsr %1\n"
+                "rlwimi  %0, %1, 0, 17, 15\n"
+                "cmpw 0, %0, %1\n"
                 "beq 0f\n"
                 "mtmsr %0\n"
                 "0:\n"
-                : "=r" (pri)
+                : "=r" (pri), "=r" (tmp)
                 : "0" (pri)
-                : "%r31"
         );
 }
@@ -117 +118 @@
 }
 
+void cpu_halt(void);
 void cpu_sleep(void);
 void asm_delay_loop(__u32 t);

arch/ppc/src/drivers/ofw.c

@@ -28 +28 @@
 
 #include <arch/drivers/ofw.h>
+#include <arch/asm.h>
 #include <stdarg.h>
 #include <cpu.h>