patch-2.4.1 linux/arch/sh/kernel/fpu.c

Next file: linux/arch/sh/kernel/head.S
Previous file: linux/arch/sh/kernel/entry.S
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0/linux/arch/sh/kernel/fpu.c linux/arch/sh/kernel/fpu.c
@@ -21,43 +21,43 @@
 void
 save_fpu(struct task_struct *tsk)
 {
-	asm volatile("sts.l	$fpul, @-%0\n\t"
-		     "sts.l	$fpscr, @-%0\n\t"
-		     "lds	%1, $fpscr\n\t"
+	asm volatile("sts.l	fpul, @-%0\n\t"
+		     "sts.l	fpscr, @-%0\n\t"
+		     "lds	%1, fpscr\n\t"
 		     "frchg\n\t"
-		     "fmov.s	$fr15, @-%0\n\t"
-		     "fmov.s	$fr14, @-%0\n\t"
-		     "fmov.s	$fr13, @-%0\n\t"
-		     "fmov.s	$fr12, @-%0\n\t"
-		     "fmov.s	$fr11, @-%0\n\t"
-		     "fmov.s	$fr10, @-%0\n\t"
-		     "fmov.s	$fr9, @-%0\n\t"
-		     "fmov.s	$fr8, @-%0\n\t"
-		     "fmov.s	$fr7, @-%0\n\t"
-		     "fmov.s	$fr6, @-%0\n\t"
-		     "fmov.s	$fr5, @-%0\n\t"
-		     "fmov.s	$fr4, @-%0\n\t"
-		     "fmov.s	$fr3, @-%0\n\t"
-		     "fmov.s	$fr2, @-%0\n\t"
-		     "fmov.s	$fr1, @-%0\n\t"
-		     "fmov.s	$fr0, @-%0\n\t"
+		     "fmov.s	fr15, @-%0\n\t"
+		     "fmov.s	fr14, @-%0\n\t"
+		     "fmov.s	fr13, @-%0\n\t"
+		     "fmov.s	fr12, @-%0\n\t"
+		     "fmov.s	fr11, @-%0\n\t"
+		     "fmov.s	fr10, @-%0\n\t"
+		     "fmov.s	fr9, @-%0\n\t"
+		     "fmov.s	fr8, @-%0\n\t"
+		     "fmov.s	fr7, @-%0\n\t"
+		     "fmov.s	fr6, @-%0\n\t"
+		     "fmov.s	fr5, @-%0\n\t"
+		     "fmov.s	fr4, @-%0\n\t"
+		     "fmov.s	fr3, @-%0\n\t"
+		     "fmov.s	fr2, @-%0\n\t"
+		     "fmov.s	fr1, @-%0\n\t"
+		     "fmov.s	fr0, @-%0\n\t"
 		     "frchg\n\t"
-		     "fmov.s	$fr15, @-%0\n\t"
-		     "fmov.s	$fr14, @-%0\n\t"
-		     "fmov.s	$fr13, @-%0\n\t"
-		     "fmov.s	$fr12, @-%0\n\t"
-		     "fmov.s	$fr11, @-%0\n\t"
-		     "fmov.s	$fr10, @-%0\n\t"
-		     "fmov.s	$fr9, @-%0\n\t"
-		     "fmov.s	$fr8, @-%0\n\t"
-		     "fmov.s	$fr7, @-%0\n\t"
-		     "fmov.s	$fr6, @-%0\n\t"
-		     "fmov.s	$fr5, @-%0\n\t"
-		     "fmov.s	$fr4, @-%0\n\t"
-		     "fmov.s	$fr3, @-%0\n\t"
-		     "fmov.s	$fr2, @-%0\n\t"
-		     "fmov.s	$fr1, @-%0\n\t"
-		     "fmov.s	$fr0, @-%0"
+		     "fmov.s	fr15, @-%0\n\t"
+		     "fmov.s	fr14, @-%0\n\t"
+		     "fmov.s	fr13, @-%0\n\t"
+		     "fmov.s	fr12, @-%0\n\t"
+		     "fmov.s	fr11, @-%0\n\t"
+		     "fmov.s	fr10, @-%0\n\t"
+		     "fmov.s	fr9, @-%0\n\t"
+		     "fmov.s	fr8, @-%0\n\t"
+		     "fmov.s	fr7, @-%0\n\t"
+		     "fmov.s	fr6, @-%0\n\t"
+		     "fmov.s	fr5, @-%0\n\t"
+		     "fmov.s	fr4, @-%0\n\t"
+		     "fmov.s	fr3, @-%0\n\t"
+		     "fmov.s	fr2, @-%0\n\t"
+		     "fmov.s	fr1, @-%0\n\t"
+		     "fmov.s	fr0, @-%0"
 		     : /* no output */
 		     : "r" ((char *)(&tsk->thread.fpu.hard.status)),
 		       "r" (FPSCR_INIT)
@@ -70,43 +70,43 @@
 static void
 restore_fpu(struct task_struct *tsk)
 {
-	asm volatile("lds	%1, $fpscr\n\t"
-		     "fmov.s	@%0+, $fr0\n\t"
-		     "fmov.s	@%0+, $fr1\n\t"
-		     "fmov.s	@%0+, $fr2\n\t"
-		     "fmov.s	@%0+, $fr3\n\t"
-		     "fmov.s	@%0+, $fr4\n\t"
-		     "fmov.s	@%0+, $fr5\n\t"
-		     "fmov.s	@%0+, $fr6\n\t"
-		     "fmov.s	@%0+, $fr7\n\t"
-		     "fmov.s	@%0+, $fr8\n\t"
-		     "fmov.s	@%0+, $fr9\n\t"
-		     "fmov.s	@%0+, $fr10\n\t"
-		     "fmov.s	@%0+, $fr11\n\t"
-		     "fmov.s	@%0+, $fr12\n\t"
-		     "fmov.s	@%0+, $fr13\n\t"
-		     "fmov.s	@%0+, $fr14\n\t"
-		     "fmov.s	@%0+, $fr15\n\t"
+	asm volatile("lds	%1, fpscr\n\t"
+		     "fmov.s	@%0+, fr0\n\t"
+		     "fmov.s	@%0+, fr1\n\t"
+		     "fmov.s	@%0+, fr2\n\t"
+		     "fmov.s	@%0+, fr3\n\t"
+		     "fmov.s	@%0+, fr4\n\t"
+		     "fmov.s	@%0+, fr5\n\t"
+		     "fmov.s	@%0+, fr6\n\t"
+		     "fmov.s	@%0+, fr7\n\t"
+		     "fmov.s	@%0+, fr8\n\t"
+		     "fmov.s	@%0+, fr9\n\t"
+		     "fmov.s	@%0+, fr10\n\t"
+		     "fmov.s	@%0+, fr11\n\t"
+		     "fmov.s	@%0+, fr12\n\t"
+		     "fmov.s	@%0+, fr13\n\t"
+		     "fmov.s	@%0+, fr14\n\t"
+		     "fmov.s	@%0+, fr15\n\t"
 		     "frchg\n\t"
-		     "fmov.s	@%0+, $fr0\n\t"
-		     "fmov.s	@%0+, $fr1\n\t"
-		     "fmov.s	@%0+, $fr2\n\t"
-		     "fmov.s	@%0+, $fr3\n\t"
-		     "fmov.s	@%0+, $fr4\n\t"
-		     "fmov.s	@%0+, $fr5\n\t"
-		     "fmov.s	@%0+, $fr6\n\t"
-		     "fmov.s	@%0+, $fr7\n\t"
-		     "fmov.s	@%0+, $fr8\n\t"
-		     "fmov.s	@%0+, $fr9\n\t"
-		     "fmov.s	@%0+, $fr10\n\t"
-		     "fmov.s	@%0+, $fr11\n\t"
-		     "fmov.s	@%0+, $fr12\n\t"
-		     "fmov.s	@%0+, $fr13\n\t"
-		     "fmov.s	@%0+, $fr14\n\t"
-		     "fmov.s	@%0+, $fr15\n\t"
+		     "fmov.s	@%0+, fr0\n\t"
+		     "fmov.s	@%0+, fr1\n\t"
+		     "fmov.s	@%0+, fr2\n\t"
+		     "fmov.s	@%0+, fr3\n\t"
+		     "fmov.s	@%0+, fr4\n\t"
+		     "fmov.s	@%0+, fr5\n\t"
+		     "fmov.s	@%0+, fr6\n\t"
+		     "fmov.s	@%0+, fr7\n\t"
+		     "fmov.s	@%0+, fr8\n\t"
+		     "fmov.s	@%0+, fr9\n\t"
+		     "fmov.s	@%0+, fr10\n\t"
+		     "fmov.s	@%0+, fr11\n\t"
+		     "fmov.s	@%0+, fr12\n\t"
+		     "fmov.s	@%0+, fr13\n\t"
+		     "fmov.s	@%0+, fr14\n\t"
+		     "fmov.s	@%0+, fr15\n\t"
 		     "frchg\n\t"
-		     "lds.l	@%0+, $fpscr\n\t"
-		     "lds.l	@%0+, $fpul\n\t"
+		     "lds.l	@%0+, fpscr\n\t"
+		     "lds.l	@%0+, fpul\n\t"
 		     : /* no output */
 		     : "r" (&tsk->thread.fpu), "r" (FPSCR_INIT)
 		     : "memory");
@@ -120,41 +120,41 @@
 
 void fpu_init(void)
 {
-	asm volatile("lds	%0, $fpul\n\t"
-		     "lds	%1, $fpscr\n\t"
-		     "fsts	$fpul, $fr0\n\t"
-		     "fsts	$fpul, $fr1\n\t"
-		     "fsts	$fpul, $fr2\n\t"
-		     "fsts	$fpul, $fr3\n\t"
-		     "fsts	$fpul, $fr4\n\t"
-		     "fsts	$fpul, $fr5\n\t"
-		     "fsts	$fpul, $fr6\n\t"
-		     "fsts	$fpul, $fr7\n\t"
-		     "fsts	$fpul, $fr8\n\t"
-		     "fsts	$fpul, $fr9\n\t"
-		     "fsts	$fpul, $fr10\n\t"
-		     "fsts	$fpul, $fr11\n\t"
-		     "fsts	$fpul, $fr12\n\t"
-		     "fsts	$fpul, $fr13\n\t"
-		     "fsts	$fpul, $fr14\n\t"
-		     "fsts	$fpul, $fr15\n\t"
+	asm volatile("lds	%0, fpul\n\t"
+		     "lds	%1, fpscr\n\t"
+		     "fsts	fpul, fr0\n\t"
+		     "fsts	fpul, fr1\n\t"
+		     "fsts	fpul, fr2\n\t"
+		     "fsts	fpul, fr3\n\t"
+		     "fsts	fpul, fr4\n\t"
+		     "fsts	fpul, fr5\n\t"
+		     "fsts	fpul, fr6\n\t"
+		     "fsts	fpul, fr7\n\t"
+		     "fsts	fpul, fr8\n\t"
+		     "fsts	fpul, fr9\n\t"
+		     "fsts	fpul, fr10\n\t"
+		     "fsts	fpul, fr11\n\t"
+		     "fsts	fpul, fr12\n\t"
+		     "fsts	fpul, fr13\n\t"
+		     "fsts	fpul, fr14\n\t"
+		     "fsts	fpul, fr15\n\t"
 		     "frchg\n\t"
-		     "fsts	$fpul, $fr0\n\t"
-		     "fsts	$fpul, $fr1\n\t"
-		     "fsts	$fpul, $fr2\n\t"
-		     "fsts	$fpul, $fr3\n\t"
-		     "fsts	$fpul, $fr4\n\t"
-		     "fsts	$fpul, $fr5\n\t"
-		     "fsts	$fpul, $fr6\n\t"
-		     "fsts	$fpul, $fr7\n\t"
-		     "fsts	$fpul, $fr8\n\t"
-		     "fsts	$fpul, $fr9\n\t"
-		     "fsts	$fpul, $fr10\n\t"
-		     "fsts	$fpul, $fr11\n\t"
-		     "fsts	$fpul, $fr12\n\t"
-		     "fsts	$fpul, $fr13\n\t"
-		     "fsts	$fpul, $fr14\n\t"
-		     "fsts	$fpul, $fr15\n\t"
+		     "fsts	fpul, fr0\n\t"
+		     "fsts	fpul, fr1\n\t"
+		     "fsts	fpul, fr2\n\t"
+		     "fsts	fpul, fr3\n\t"
+		     "fsts	fpul, fr4\n\t"
+		     "fsts	fpul, fr5\n\t"
+		     "fsts	fpul, fr6\n\t"
+		     "fsts	fpul, fr7\n\t"
+		     "fsts	fpul, fr8\n\t"
+		     "fsts	fpul, fr9\n\t"
+		     "fsts	fpul, fr10\n\t"
+		     "fsts	fpul, fr11\n\t"
+		     "fsts	fpul, fr12\n\t"
+		     "fsts	fpul, fr13\n\t"
+		     "fsts	fpul, fr14\n\t"
+		     "fsts	fpul, fr15\n\t"
 		     "frchg"
 		     : /* no output */
 		     : "r" (0), "r" (FPSCR_INIT));
@@ -192,9 +192,9 @@
 			 *
 			 * There's race condition in __cli:
 			 *
-			 *   (1) $SR --> register
+			 *   (1) SR --> register
 			 *   (2) Set IMASK of register
-			 *   (3) $SR <-- register
+			 *   (3) SR <-- register
 			 *
 			 * Between (1) and (2), or (2) and (3) getting
 			 * interrupt, and interrupt handler (or

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)