patch-2.1.116 linux/arch/alpha/kernel/fpreg.c

• Lines: 114
• Date: Sun Aug 9 12:09:05 1998
• Orig file: v2.1.115/linux/arch/alpha/kernel/fpreg.c
• Orig date: Tue Feb 17 13:12:44 1998

diff -u --recursive --new-file v2.1.115/linux/arch/alpha/kernel/fpreg.c linux/arch/alpha/kernel/fpreg.c
@@ -4,62 +4,58 @@
  * (C) Copyright 1998 Linus Torvalds
  */
 
+#ifdef __alpha_cix__
+#define STT(reg,val)  asm volatile ("ftoit $f"#reg",%0" : "=r"(val));
+#else
+#define STT(reg,val)  asm volatile ("stt $f"#reg",%0" : "=m"(val));
+#endif
+
 unsigned long
 alpha_read_fp_reg (unsigned long reg)
 {
-	unsigned long r;
+	unsigned long val;
 
 	switch (reg) {
-	      case  0: asm ("stt  $f0,%0" : "m="(r)); break;
-	      case  1: asm ("stt  $f1,%0" : "m="(r)); break;
-	      case  2: asm ("stt  $f2,%0" : "m="(r)); break;
-	      case  3: asm ("stt  $f3,%0" : "m="(r)); break;
-	      case  4: asm ("stt  $f4,%0" : "m="(r)); break;
-	      case  5: asm ("stt  $f5,%0" : "m="(r)); break;
-	      case  6: asm ("stt  $f6,%0" : "m="(r)); break;
-	      case  7: asm ("stt  $f7,%0" : "m="(r)); break;
-	      case  8: asm ("stt  $f8,%0" : "m="(r)); break;
-	      case  9: asm ("stt  $f9,%0" : "m="(r)); break;
-	      case 10: asm ("stt $f10,%0" : "m="(r)); break;
-	      case 11: asm ("stt $f11,%0" : "m="(r)); break;
-	      case 12: asm ("stt $f12,%0" : "m="(r)); break;
-	      case 13: asm ("stt $f13,%0" : "m="(r)); break;
-	      case 14: asm ("stt $f14,%0" : "m="(r)); break;
-	      case 15: asm ("stt $f15,%0" : "m="(r)); break;
-	      case 16: asm ("stt $f16,%0" : "m="(r)); break;
-	      case 17: asm ("stt $f17,%0" : "m="(r)); break;
-	      case 18: asm ("stt $f18,%0" : "m="(r)); break;
-	      case 19: asm ("stt $f19,%0" : "m="(r)); break;
-	      case 20: asm ("stt $f20,%0" : "m="(r)); break;
-	      case 21: asm ("stt $f21,%0" : "m="(r)); break;
-	      case 22: asm ("stt $f22,%0" : "m="(r)); break;
-	      case 23: asm ("stt $f23,%0" : "m="(r)); break;
-	      case 24: asm ("stt $f24,%0" : "m="(r)); break;
-	      case 25: asm ("stt $f25,%0" : "m="(r)); break;
-	      case 26: asm ("stt $f26,%0" : "m="(r)); break;
-	      case 27: asm ("stt $f27,%0" : "m="(r)); break;
-	      case 28: asm ("stt $f28,%0" : "m="(r)); break;
-	      case 29: asm ("stt $f29,%0" : "m="(r)); break;
-	      case 30: asm ("stt $f30,%0" : "m="(r)); break;
-	      case 31: asm ("stt $f31,%0" : "m="(r)); break;
-	      default:
-		break;
+	      case  0: STT( 0, val); break;
+	      case  1: STT( 1, val); break;
+	      case  2: STT( 2, val); break;
+	      case  3: STT( 3, val); break;
+	      case  4: STT( 4, val); break;
+	      case  5: STT( 5, val); break;
+	      case  6: STT( 6, val); break;
+	      case  7: STT( 7, val); break;
+	      case  8: STT( 8, val); break;
+	      case  9: STT( 9, val); break;
+	      case 10: STT(10, val); break;
+	      case 11: STT(11, val); break;
+	      case 12: STT(12, val); break;
+	      case 13: STT(13, val); break;
+	      case 14: STT(14, val); break;
+	      case 15: STT(15, val); break;
+	      case 16: STT(16, val); break;
+	      case 17: STT(17, val); break;
+	      case 18: STT(18, val); break;
+	      case 19: STT(19, val); break;
+	      case 20: STT(20, val); break;
+	      case 21: STT(21, val); break;
+	      case 22: STT(22, val); break;
+	      case 23: STT(23, val); break;
+	      case 24: STT(24, val); break;
+	      case 25: STT(25, val); break;
+	      case 26: STT(26, val); break;
+	      case 27: STT(27, val); break;
+	      case 28: STT(28, val); break;
+	      case 29: STT(29, val); break;
+	      case 30: STT(30, val); break;
+	      case 31: STT(31, val); break;
 	}
-	return r;
+	return val;
 }
 
-#if 1
-/*
- * This is IMHO the better way of implementing LDT().  But it
- * has the disadvantage that gcc 2.7.0 refuses to compile it
- * (invalid operand constraints), so instead, we use the uglier
- * macro below.
- */
-# define LDT(reg,val)	\
-  asm volatile ("ldt $f"#reg",%0" : : "m"(val));
+#ifdef __alpha_cix__
+#define LDT(reg,val)  asm volatile ("itoft %0,$f"#reg : : "r"(val));
 #else
-# define LDT(reg,val)	\
-  asm volatile ("ldt $f"#reg",0(%0)" : : "r"(&val));
+#define LDT(reg,val)  asm volatile ("ldt $f"#reg",%0" : : "m"(val));
 #endif
 
 void
@@ -98,7 +94,5 @@
 	      case 29: LDT(29, val); break;
 	      case 30: LDT(30, val); break;
 	      case 31: LDT(31, val); break;
-	      default:
-		break;
 	}
 }