[uClibc-cvs] uClibc/libc/sysdeps/linux/mips __longjmp.c,1.3,1.4

[Erik Andersen]

Update of /var/cvs/uClibc/libc/sysdeps/linux/mips
In directory winder:/tmp/cvs-serv24118

Modified Files:
	__longjmp.c 
Log Message:
Fix a warning


Index: __longjmp.c
===================================================================
RCS file: /var/cvs/uClibc/libc/sysdeps/linux/mips/__longjmp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- __longjmp.c	6 Nov 2002 20:16:26 -0000	1.3
+++ __longjmp.c	9 Feb 2003 08:33:49 -0000	1.4
@@ -27,61 +27,58 @@
   #error This file uses GNU C extensions; you must compile with GCC.
 #endif
 
-void
-__longjmp (env, val_arg)
-     __jmp_buf env;
-     int val_arg;
+void __longjmp (__jmp_buf env, int val_arg)
 {
-  /* gcc 1.39.19 miscompiled the longjmp routine (as it did setjmp before
-     the hack around it); force it to use $a1 for the longjmp value.
-     Without this it saves $a1 in a register which gets clobbered
-     along the way.  */
-  register int val asm ("a1");
+    /* gcc 1.39.19 miscompiled the longjmp routine (as it did setjmp before
+       the hack around it); force it to use $a1 for the longjmp value.
+       Without this it saves $a1 in a register which gets clobbered
+       along the way.  */
+    register int val asm ("a1");
 
-  /* Pull back the floating point callee-saved registers.  */
+    /* Pull back the floating point callee-saved registers.  */
 #if defined __UCLIBC_HAS_FLOATS__ && ! defined __UCLIBC_HAS_SOFT_FLOAT__
-  asm volatile ("l.d $f20, %0" : : "m" (env[0].__fpregs[0]));
-  asm volatile ("l.d $f22, %0" : : "m" (env[0].__fpregs[1]));
-  asm volatile ("l.d $f24, %0" : : "m" (env[0].__fpregs[2]));
-  asm volatile ("l.d $f26, %0" : : "m" (env[0].__fpregs[3]));
-  asm volatile ("l.d $f28, %0" : : "m" (env[0].__fpregs[4]));
-  asm volatile ("l.d $f30, %0" : : "m" (env[0].__fpregs[5]));
+    asm volatile ("l.d $f20, %0" : : "m" (env[0].__fpregs[0]));
+    asm volatile ("l.d $f22, %0" : : "m" (env[0].__fpregs[1]));
+    asm volatile ("l.d $f24, %0" : : "m" (env[0].__fpregs[2]));
+    asm volatile ("l.d $f26, %0" : : "m" (env[0].__fpregs[3]));
+    asm volatile ("l.d $f28, %0" : : "m" (env[0].__fpregs[4]));
+    asm volatile ("l.d $f30, %0" : : "m" (env[0].__fpregs[5]));
 
-  /* Get and reconstruct the floating point csr.  */
-  asm volatile ("lw $2, %0" : : "m" (env[0].__fpc_csr));
-  asm volatile ("ctc1 $2, $31");
+    /* Get and reconstruct the floating point csr.  */
+    asm volatile ("lw $2, %0" : : "m" (env[0].__fpc_csr));
+    asm volatile ("ctc1 $2, $31");
 #endif
 
-  /* Get the GP. */
-  asm volatile ("lw $gp, %0" : : "m" (env[0].__gp));
+    /* Get the GP. */
+    asm volatile ("lw $gp, %0" : : "m" (env[0].__gp));
 
-  /* Get the callee-saved registers.  */
-  asm volatile ("lw $16, %0" : : "m" (env[0].__regs[0]));
-  asm volatile ("lw $17, %0" : : "m" (env[0].__regs[1]));
-  asm volatile ("lw $18, %0" : : "m" (env[0].__regs[2]));
-  asm volatile ("lw $19, %0" : : "m" (env[0].__regs[3]));
-  asm volatile ("lw $20, %0" : : "m" (env[0].__regs[4]));
-  asm volatile ("lw $21, %0" : : "m" (env[0].__regs[5]));
-  asm volatile ("lw $22, %0" : : "m" (env[0].__regs[6]));
-  asm volatile ("lw $23, %0" : : "m" (env[0].__regs[7]));
+    /* Get the callee-saved registers.  */
+    asm volatile ("lw $16, %0" : : "m" (env[0].__regs[0]));
+    asm volatile ("lw $17, %0" : : "m" (env[0].__regs[1]));
+    asm volatile ("lw $18, %0" : : "m" (env[0].__regs[2]));
+    asm volatile ("lw $19, %0" : : "m" (env[0].__regs[3]));
+    asm volatile ("lw $20, %0" : : "m" (env[0].__regs[4]));
+    asm volatile ("lw $21, %0" : : "m" (env[0].__regs[5]));
+    asm volatile ("lw $22, %0" : : "m" (env[0].__regs[6]));
+    asm volatile ("lw $23, %0" : : "m" (env[0].__regs[7]));
 
-  /* Get the PC.  */
-  asm volatile ("lw $25, %0" : : "m" (env[0].__pc));
+    /* Get the PC.  */
+    asm volatile ("lw $25, %0" : : "m" (env[0].__pc));
 
-  /* Restore the stack pointer and the FP.  They have to be restored
-     last and in a single asm as gcc, depending on options used, may
-     use either of them to access env.  */
-  asm volatile ("lw $29, %0\n\t"
-		"lw $30, %1\n\t" : : "m" (env[0].__sp), "m" (env[0].__fp));
+    /* Restore the stack pointer and the FP.  They have to be restored
+       last and in a single asm as gcc, depending on options used, may
+       use either of them to access env.  */
+    asm volatile ("lw $29, %0\n\t"
+	    "lw $30, %1\n\t" : : "m" (env[0].__sp), "m" (env[0].__fp));
 
-/* Give setjmp 1 if given a 0, or what they gave us if non-zero.  */
-  if (val == 0)
-    asm volatile ("li $2, 1");
-  else
-    asm volatile ("move $2, %0" : : "r" (val));
+    /* Give setjmp 1 if given a 0, or what they gave us if non-zero.  */
+    if (val == 0)
+	asm volatile ("li $2, 1");
+    else
+	asm volatile ("move $2, %0" : : "r" (val));
 
-  asm volatile ("jr $25");
+    asm volatile ("jr $25");
 
-  /* Avoid `volatile function does return' warnings.  */
-  for (;;);
+    /* Avoid `volatile function does return' warnings.  */
+    for (;;);
 }