forked from mirrors/linux
		
	MIPS: Rewrite <asm/div64.h> to work with gcc 4.4.0.
The inline assembler used on 32-bit kernels was using the "h" constraint which was considered dangerous and removed for gcc 4.4.0. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
		
							parent
							
								
									bb86bf28ae
								
							
						
					
					
						commit
						c21004cd5b
					
				
					 1 changed files with 51 additions and 93 deletions
				
			
		| 
						 | 
					@ -6,105 +6,63 @@
 | 
				
			||||||
 * License.  See the file "COPYING" in the main directory of this archive
 | 
					 * License.  See the file "COPYING" in the main directory of this archive
 | 
				
			||||||
 * for more details.
 | 
					 * for more details.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
#ifndef _ASM_DIV64_H
 | 
					#ifndef __ASM_DIV64_H
 | 
				
			||||||
#define _ASM_DIV64_H
 | 
					#define __ASM_DIV64_H
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <asm-generic/div64.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if BITS_PER_LONG == 64
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <linux/types.h>
 | 
					#include <linux/types.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#if (_MIPS_SZLONG == 32)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#include <asm/compiler.h>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * No traps on overflows for any of these...
 | 
					 * No traps on overflows for any of these...
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define do_div64_32(res, high, low, base) ({ \
 | 
					#define __div64_32(n, base)						\
 | 
				
			||||||
	unsigned long __quot32, __mod32; \
 | 
					({									\
 | 
				
			||||||
	unsigned long __cf, __tmp, __tmp2, __i; \
 | 
						unsigned long __cf, __tmp, __tmp2, __i;				\
 | 
				
			||||||
	\
 | 
						unsigned long __quot32, __mod32;				\
 | 
				
			||||||
	__asm__(".set	push\n\t" \
 | 
						unsigned long __high, __low;					\
 | 
				
			||||||
		".set	noat\n\t" \
 | 
						unsigned long long __n;						\
 | 
				
			||||||
		".set	noreorder\n\t" \
 | 
														\
 | 
				
			||||||
		"move	%2, $0\n\t" \
 | 
						__high = *__n >> 32;						\
 | 
				
			||||||
		"move	%3, $0\n\t" \
 | 
						__low = __n;							\
 | 
				
			||||||
		"b	1f\n\t" \
 | 
						__asm__(							\
 | 
				
			||||||
		" li	%4, 0x21\n" \
 | 
						"	.set	push					\n"	\
 | 
				
			||||||
		"0:\n\t" \
 | 
						"	.set	noat					\n"	\
 | 
				
			||||||
		"sll	$1, %0, 0x1\n\t" \
 | 
						"	.set	noreorder				\n"	\
 | 
				
			||||||
		"srl	%3, %0, 0x1f\n\t" \
 | 
						"	move	%2, $0					\n"	\
 | 
				
			||||||
		"or	%0, $1, %5\n\t" \
 | 
						"	move	%3, $0					\n"	\
 | 
				
			||||||
		"sll	%1, %1, 0x1\n\t" \
 | 
						"	b	1f					\n"	\
 | 
				
			||||||
		"sll	%2, %2, 0x1\n" \
 | 
						"	 li	%4, 0x21				\n"	\
 | 
				
			||||||
		"1:\n\t" \
 | 
						"0:							\n"	\
 | 
				
			||||||
		"bnez	%3, 2f\n\t" \
 | 
						"	sll	$1, %0, 0x1				\n"	\
 | 
				
			||||||
		" sltu	%5, %0, %z6\n\t" \
 | 
						"	srl	%3, %0, 0x1f				\n"	\
 | 
				
			||||||
		"bnez	%5, 3f\n" \
 | 
						"	or	%0, $1, %5				\n"	\
 | 
				
			||||||
		"2:\n\t" \
 | 
						"	sll	%1, %1, 0x1				\n"	\
 | 
				
			||||||
		" addiu	%4, %4, -1\n\t" \
 | 
						"	sll	%2, %2, 0x1				\n"	\
 | 
				
			||||||
		"subu	%0, %0, %z6\n\t" \
 | 
						"1:							\n"	\
 | 
				
			||||||
		"addiu	%2, %2, 1\n" \
 | 
						"	bnez	%3, 2f					\n"	\
 | 
				
			||||||
		"3:\n\t" \
 | 
						"	 sltu	%5, %0, %z6				\n"	\
 | 
				
			||||||
		"bnez	%4, 0b\n\t" \
 | 
						"	bnez	%5, 3f					\n"	\
 | 
				
			||||||
		" srl	%5, %1, 0x1f\n\t" \
 | 
						"2:							\n"	\
 | 
				
			||||||
		".set	pop" \
 | 
						"	 addiu	%4, %4, -1				\n"	\
 | 
				
			||||||
		: "=&r" (__mod32), "=&r" (__tmp), \
 | 
						"	subu	%0, %0, %z6				\n"	\
 | 
				
			||||||
		  "=&r" (__quot32), "=&r" (__cf), \
 | 
						"	addiu	%2, %2, 1				\n"	\
 | 
				
			||||||
		  "=&r" (__i), "=&r" (__tmp2) \
 | 
						"3:							\n"	\
 | 
				
			||||||
		: "Jr" (base), "0" (high), "1" (low)); \
 | 
						"	bnez	%4, 0b\n\t"					\
 | 
				
			||||||
	\
 | 
						"	 srl	%5, %1, 0x1f\n\t"				\
 | 
				
			||||||
	(res) = __quot32; \
 | 
						"	.set	pop"						\
 | 
				
			||||||
	__mod32; })
 | 
						: "=&r" (__mod32), "=&r" (__tmp),				\
 | 
				
			||||||
 | 
						  "=&r" (__quot32), "=&r" (__cf),				\
 | 
				
			||||||
 | 
						  "=&r" (__i), "=&r" (__tmp2)					\
 | 
				
			||||||
 | 
						: "Jr" (base), "0" (__high), "1" (__low));			\
 | 
				
			||||||
 | 
														\
 | 
				
			||||||
 | 
						(__n) = __quot32;						\
 | 
				
			||||||
 | 
						__mod32;							\
 | 
				
			||||||
 | 
					})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define do_div(n, base) ({ \
 | 
					#endif /* BITS_PER_LONG == 64 */
 | 
				
			||||||
	unsigned long long __quot; \
 | 
					 | 
				
			||||||
	unsigned long __mod; \
 | 
					 | 
				
			||||||
	unsigned long long __div; \
 | 
					 | 
				
			||||||
	unsigned long __upper, __low, __high, __base; \
 | 
					 | 
				
			||||||
	\
 | 
					 | 
				
			||||||
	__div = (n); \
 | 
					 | 
				
			||||||
	__base = (base); \
 | 
					 | 
				
			||||||
	\
 | 
					 | 
				
			||||||
	__high = __div >> 32; \
 | 
					 | 
				
			||||||
	__low = __div; \
 | 
					 | 
				
			||||||
	__upper = __high; \
 | 
					 | 
				
			||||||
	\
 | 
					 | 
				
			||||||
	if (__high) \
 | 
					 | 
				
			||||||
		__asm__("divu	$0, %z2, %z3" \
 | 
					 | 
				
			||||||
			: "=h" (__upper), "=l" (__high) \
 | 
					 | 
				
			||||||
			: "Jr" (__high), "Jr" (__base) \
 | 
					 | 
				
			||||||
			: GCC_REG_ACCUM); \
 | 
					 | 
				
			||||||
	\
 | 
					 | 
				
			||||||
	__mod = do_div64_32(__low, __upper, __low, __base); \
 | 
					 | 
				
			||||||
	\
 | 
					 | 
				
			||||||
	__quot = __high; \
 | 
					 | 
				
			||||||
	__quot = __quot << 32 | __low; \
 | 
					 | 
				
			||||||
	(n) = __quot; \
 | 
					 | 
				
			||||||
	__mod; })
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif /* (_MIPS_SZLONG == 32) */
 | 
					#endif /* __ASM_DIV64_H */
 | 
				
			||||||
 | 
					 | 
				
			||||||
#if (_MIPS_SZLONG == 64)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/*
 | 
					 | 
				
			||||||
 * Hey, we're already 64-bit, no
 | 
					 | 
				
			||||||
 * need to play games..
 | 
					 | 
				
			||||||
 */
 | 
					 | 
				
			||||||
#define do_div(n, base) ({ \
 | 
					 | 
				
			||||||
	unsigned long __quot; \
 | 
					 | 
				
			||||||
	unsigned int __mod; \
 | 
					 | 
				
			||||||
	unsigned long __div; \
 | 
					 | 
				
			||||||
	unsigned int __base; \
 | 
					 | 
				
			||||||
	\
 | 
					 | 
				
			||||||
	__div = (n); \
 | 
					 | 
				
			||||||
	__base = (base); \
 | 
					 | 
				
			||||||
	\
 | 
					 | 
				
			||||||
	__mod = __div % __base; \
 | 
					 | 
				
			||||||
	__quot = __div / __base; \
 | 
					 | 
				
			||||||
	\
 | 
					 | 
				
			||||||
	(n) = __quot; \
 | 
					 | 
				
			||||||
	__mod; })
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#endif /* (_MIPS_SZLONG == 64) */
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#endif /* _ASM_DIV64_H */
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue