s/DST/DEST/ to avoid warnings when building RAMDISK kernels, which define

TIMEZONE and DST...

1 files changed, 60 insertions, 60 deletions

diff --git a/sys/lib/libkern/arch/m88k/copy_subr.S b/sys/lib/libkern/arch/m88k/copy_subr.S
index 8673a5c9cb3..ea01b0c95fd 100644
--- a/sys/lib/libkern/arch/m88k/copy_subr.S
+++ b/sys/lib/libkern/arch/m88k/copy_subr.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: copy_subr.S,v 1.2 2010/04/20 20:28:20 miod Exp $	*/
+/*	$OpenBSD: copy_subr.S,v 1.3 2011/01/27 20:42:47 miod Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1993-1992 Carnegie Mellon University
@@ -37,11 +37,11 @@
 
 #if defined(MEMCPY) || defined(MEMMOVE)
 #define	SRC	r3
-#define	DST	r2
+#define	DEST	r2
 #define	SAVE	r5
 #else
 #define	SRC	r2
-#define	DST	r3
+#define	DEST	r3
 #endif
 #define	LEN	r4
 
@@ -59,7 +59,7 @@ ENTRY(ovbcopy)
 #endif
 
 #if defined(MEMCPY) || defined(MEMMOVE)
-	or	SAVE, DST, r0
+	or	SAVE, DEST, r0
 #endif
 
 	bcnd	eq0,LEN,_ASM_LABEL(bcopy_out)	/* nothing to do if == 0 */
@@ -67,7 +67,7 @@ ENTRY(ovbcopy)
 /*
  * check position of source and destination data
  */
-	cmp 	r9,SRC,DST	/* compare source address to destination */
+	cmp 	r9,SRC,DEST	/* compare source address to destination */
 	bb1	eq,r9,_ASM_LABEL(bcopy_out)	/* nothing to do if equal */
 #if defined(MEMMOVE) || defined(OVBCOPY)
 	bb1	lo,r9,_ASM_LABEL(bcopy_reverse)	/* reverse copy if src < dest */
@@ -83,7 +83,7 @@ ENTRY(ovbcopy)
  * determine copy strategy based on alignment of source and destination
  */
 	mask	r6,SRC,3	/* get 2 low order bits of source address */
-	mask	r7,DST,3	/* get 2 low order bits of destination addr */
+	mask	r7,DEST,3	/* get 2 low order bits of destination addr */
 	mak	r6,r6,0<4>	/* convert source bits to table offset */
 	mak	r7,r7,0<2>	/* convert destination bits to table offset */
 	or.u	r12,r0,hi16(_ASM_LABEL(f_strat))
@@ -99,11 +99,11 @@ ASLOCAL(f_3byte_word_copy)
 	ld.bu	r6,SRC,0	/* load byte from source */
 	ld.bu	r7,SRC,1	/* load byte from source */
 	ld.bu	r8,SRC,2	/* load byte from source */
-	st.b	r6,DST,0	/* store byte to destination */
-	st.b	r7,DST,1	/* store byte to destination */
-	st.b	r8,DST,2	/* store byte to destination */
+	st.b	r6,DEST,0	/* store byte to destination */
+	st.b	r7,DEST,1	/* store byte to destination */
+	st.b	r8,DEST,2	/* store byte to destination */
 	addu	SRC,SRC,3	/* increment source pointer */
-	addu	DST,DST,3	/* increment destination pointer */
+	addu	DEST,DEST,3	/* increment destination pointer */
 	br.n	_ASM_LABEL(f_word_copy)	/* copy full words */
 	 subu	LEN,LEN,3	/* decrement length */
 
@@ -112,9 +112,9 @@ ASLOCAL(f_3byte_word_copy)
  */
 ASLOCAL(f_1half_word_copy)
 	ld.hu	r6,SRC,0	/* load half-word from source */
-	st.h	r6,DST,0	/* store half-word to destination */
+	st.h	r6,DEST,0	/* store half-word to destination */
 	addu	SRC,SRC,2	/* increment source pointer */
-	addu	DST,DST,2	/* increment destination pointer */
+	addu	DEST,DEST,2	/* increment destination pointer */
 	br.n	_ASM_LABEL(f_word_copy)	/* copy full words */
 	 subu	LEN,LEN,2	/* decrement remaining length */
 
@@ -123,9 +123,9 @@ ASLOCAL(f_1half_word_copy)
  */
 ASLOCAL(f_1byte_word_copy)
 	ld.bu	r6,SRC,0	/* load 1 byte from source */
-	st.b	r6,DST,0	/* store 1 byte to destination */
+	st.b	r6,DEST,0	/* store 1 byte to destination */
 	addu	SRC,SRC,1	/* increment source pointer */
-	addu	DST,DST,1	/* increment destination pointer */
+	addu	DEST,DEST,1	/* increment destination pointer */
 	subu	LEN,LEN,1	/* decrement remaining length */
 	/* FALLTHROUGH */
 /*
@@ -138,20 +138,20 @@ ASLOCAL(f_word_copy)
 	ld	r7,SRC,4	/* load second word */
 	ld	r8,SRC,8	/* load third word */
 	ld	r9,SRC,12	/* load fourth word */
-	st	r6,DST,0	/* store first word */
-	st	r7,DST,4	/* store second word */
-	st 	r8,DST,8	/* store third word */
-	st 	r9,DST,12	/* store fourth word */
+	st	r6,DEST,0	/* store first word */
+	st	r7,DEST,4	/* store second word */
+	st 	r8,DEST,8	/* store third word */
+	st 	r9,DEST,12	/* store fourth word */
 	addu	SRC,SRC,16	/* increment source pointer */
-	addu	DST,DST,16	/* increment destination pointer */
+	addu	DEST,DEST,16	/* increment destination pointer */
 	br.n	_ASM_LABEL(f_word_copy)	/* branch to copy another block */
 	 subu	LEN,LEN,16	/* decrement remaining length */
 
 ASLOCAL(f_1byte_half_copy)
 	ld.bu	r6,SRC,0	/* load 1 byte from source */
-	st.b	r6,DST,0	/* store 1 byte to destination */
+	st.b	r6,DEST,0	/* store 1 byte to destination */
 	addu	SRC,SRC,1	/* increment source pointer */
-	addu	DST,DST,1	/* increment destination pointer */
+	addu	DEST,DEST,1	/* increment destination pointer */
 	subu	LEN,LEN,1	/* decrement remaining length */
 	/* FALLTHROUGH */
 
@@ -166,25 +166,25 @@ ASLOCAL(f_half_copy)
 	ld.hu	r11,SRC,10	/* load sixth half-word */
 	ld.hu	r12,SRC,12	/* load seventh half-word */
 	ld.hu	r13,SRC,14	/* load eighth half-word */
-	st.h	r6,DST,0	/* store first half-word */
-	st.h	r7,DST,2	/* store second half-word */
-	st.h 	r8,DST,4	/* store third half-word */
-	st.h 	r9,DST,6	/* store fourth half-word */
-	st.h	r10,DST,8	/* store fifth half-word */
-	st.h	r11,DST,10	/* store sixth half-word */
-	st.h 	r12,DST,12	/* store seventh half-word */
-	st.h 	r13,DST,14	/* store eighth half-word */
+	st.h	r6,DEST,0	/* store first half-word */
+	st.h	r7,DEST,2	/* store second half-word */
+	st.h 	r8,DEST,4	/* store third half-word */
+	st.h 	r9,DEST,6	/* store fourth half-word */
+	st.h	r10,DEST,8	/* store fifth half-word */
+	st.h	r11,DEST,10	/* store sixth half-word */
+	st.h 	r12,DEST,12	/* store seventh half-word */
+	st.h 	r13,DEST,14	/* store eighth half-word */
 	addu	SRC,SRC,16	/* increment source pointer */
-	addu	DST,DST,16	/* increment destination pointer */
+	addu	DEST,DEST,16	/* increment destination pointer */
 	br.n	_ASM_LABEL(f_half_copy)	/* branch to copy another block */
 	 subu	LEN,LEN,16	/* decrement remaining length */
 
 ASLOCAL(f_byte_copy)
 	bcnd	eq0,LEN,_ASM_LABEL(bcopy_out)	/* branch if nothing left to copy */
 	ld.bu	r6,SRC,0	/* load byte from source */
-	st.b	r6,DST,0	/* store byte in destination */
+	st.b	r6,DEST,0	/* store byte in destination */
 	addu	SRC,SRC,1	/* increment source pointer */
-	addu	DST,DST,1	/* increment destination pointer */
+	addu	DEST,DEST,1	/* increment destination pointer */
 	br.n	_ASM_LABEL(f_byte_copy)	/* branch for next byte */
 	 subu	LEN,LEN,1	/* decrement remaining length */
 
@@ -197,7 +197,7 @@ ASLOCAL(bcopy_reverse)
  * start copy pointers at end of data
  */
 	addu	SRC,SRC,LEN	/* start source at end of data */
-	addu	DST,DST,LEN	/* start destination at end of data */
+	addu	DEST,DEST,LEN	/* start destination at end of data */
 /*
  * check for short data
  */
@@ -207,7 +207,7 @@ ASLOCAL(bcopy_reverse)
  *	determine copy strategy based on alignment of source and destination
  */
 	mask	r6,SRC,3	/* get 2 low order bits of source address */
-	mask	r7,DST,3	/* get 2 low order bits of destination addr */
+	mask	r7,DEST,3	/* get 2 low order bits of destination addr */
 	mak	r6,r6,0<4>	/* convert source bits to table offset */
 	mak	r7,r7,0<2>	/* convert destination bits to table offset */
 	or.u	r12,r0,hi16(_ASM_LABEL(r_strat))
@@ -221,13 +221,13 @@ ASLOCAL(bcopy_reverse)
  */
 ASLOCAL(r_3byte_word_copy)
 	subu	SRC,SRC,3	/* decrement source pointer */
-	subu	DST,DST,3	/* decrement destination pointer */
+	subu	DEST,DEST,3	/* decrement destination pointer */
 	ld.bu	r6,SRC,0	/* load byte from source */
 	ld.bu	r7,SRC,1	/* load byte from source */
 	ld.bu	r8,SRC,2	/* load byte from source */
-	st.b	r6,DST,0	/* store byte to destination */
-	st.b	r7,DST,1	/* store byte to destination */
-	st.b	r8,DST,2	/* store byte to destination */
+	st.b	r6,DEST,0	/* store byte to destination */
+	st.b	r7,DEST,1	/* store byte to destination */
+	st.b	r8,DEST,2	/* store byte to destination */
 	br.n	_ASM_LABEL(r_word_copy)	/* copy full words */
 	 subu	LEN,LEN,3	/* decrement length */
 
@@ -236,9 +236,9 @@ ASLOCAL(r_3byte_word_copy)
  */
 ASLOCAL(r_1half_word_copy)
 	subu	SRC,SRC,2	/* decrement source pointer */
-	subu	DST,DST,2	/* decrement destination pointer */
+	subu	DEST,DEST,2	/* decrement destination pointer */
 	ld.hu	r6,SRC,0	/* load half-word from source */
-	st.h	r6,DST,0	/* store half-word to destination */
+	st.h	r6,DEST,0	/* store half-word to destination */
 	br.n	_ASM_LABEL(r_word_copy)	/* copy full words */
 	 subu	LEN,LEN,2	/* decrement remaining length */
 
@@ -247,9 +247,9 @@ ASLOCAL(r_1half_word_copy)
  */
 ASLOCAL(r_1byte_word_copy)
 	subu	SRC,SRC,1	/* decrement source pointer */
-	subu	DST,DST,1	/* decrement destination pointer */
+	subu	DEST,DEST,1	/* decrement destination pointer */
 	ld.bu	r6,SRC,0	/* load 1 byte from source */
-	st.b	r6,DST,0	/* store 1 byte to destination */
+	st.b	r6,DEST,0	/* store 1 byte to destination */
 	subu	LEN,LEN,1	/* decrement remaining length */
 	/* FALLTHROUGH */
 /*
@@ -259,23 +259,23 @@ ASLOCAL(r_word_copy)
 	cmp	r10,LEN,16	/* see if we have 16 bytes remaining */
 	bb1	lo,r10,_ASM_LABEL(r_byte_copy)	/* not enough left, copy bytes */
 	subu	SRC,SRC,16	/* decrement source pointer */
-	subu	DST,DST,16	/* decrement destination pointer */
+	subu	DEST,DEST,16	/* decrement destination pointer */
 	ld	r6,SRC,0	/* load first word */
 	ld	r7,SRC,4	/* load second word */
 	ld	r8,SRC,8	/* load third word */
 	ld	r9,SRC,12	/* load fourth word */
-	st	r6,DST,0	/* store first word */
-	st	r7,DST,4	/* store second word */
-	st 	r8,DST,8	/* store third word */
-	st 	r9,DST,12	/* store fourth word */
+	st	r6,DEST,0	/* store first word */
+	st	r7,DEST,4	/* store second word */
+	st 	r8,DEST,8	/* store third word */
+	st 	r9,DEST,12	/* store fourth word */
 	br.n	_ASM_LABEL(r_word_copy)	/* branch to copy another block */
 	 subu	LEN,LEN,16	/* decrement remaining length */
 
 ASLOCAL(r_1byte_half_copy)
 	subu	SRC,SRC,1	/* decrement source pointer */
-	subu	DST,DST,1	/* decrement destination pointer */
+	subu	DEST,DEST,1	/* decrement destination pointer */
 	ld.bu	r6,SRC,0	/* load 1 byte from source */
-	st.b	r6,DST,0	/* store 1 byte to destination */
+	st.b	r6,DEST,0	/* store 1 byte to destination */
 	subu	LEN,LEN,1	/* decrement remaining length */
 	/* FALLTHROUGH */
 
@@ -283,7 +283,7 @@ ASLOCAL(r_half_copy)
 	cmp	r10,LEN,16	/* see if we have 16 bytes remaining */
 	bb1	lo,r10,_ASM_LABEL(r_byte_copy)	/* not enough left, copy bytes */
 	subu	SRC,SRC,16	/* decrement source pointer */
-	subu	DST,DST,16	/* decrement destination pointer */
+	subu	DEST,DEST,16	/* decrement destination pointer */
 	ld.hu	r6,SRC,0	/* load first half-word */
 	ld.hu	r7,SRC,2	/* load second half-word */
 	ld.hu	r8,SRC,4	/* load third half-word */
@@ -292,23 +292,23 @@ ASLOCAL(r_half_copy)
 	ld.hu	r11,SRC,10	/* load sixth half-word */
 	ld.hu	r12,SRC,12	/* load seventh half-word */
 	ld.hu	r13,SRC,14	/* load eighth half-word */
-	st.h	r6,DST,0	/* store first half-word */
-	st.h	r7,DST,2	/* store second half-word */
-	st.h 	r8,DST,4	/* store third half-word */
-	st.h 	r9,DST,6	/* store fourth half-word */
-	st.h	r10,DST,8	/* store fifth half-word */
-	st.h	r11,DST,10	/* store sixth half-word */
-	st.h 	r12,DST,12	/* store seventh half-word */
-	st.h 	r13,DST,14	/* store eighth half-word */
+	st.h	r6,DEST,0	/* store first half-word */
+	st.h	r7,DEST,2	/* store second half-word */
+	st.h 	r8,DEST,4	/* store third half-word */
+	st.h 	r9,DEST,6	/* store fourth half-word */
+	st.h	r10,DEST,8	/* store fifth half-word */
+	st.h	r11,DEST,10	/* store sixth half-word */
+	st.h 	r12,DEST,12	/* store seventh half-word */
+	st.h 	r13,DEST,14	/* store eighth half-word */
 	br.n	_ASM_LABEL(r_half_copy)	/* branch to copy another block */
 	 subu	LEN,LEN,16	/* decrement remaining length */
 
 ASLOCAL(r_byte_copy)
 	bcnd	eq0,LEN,_ASM_LABEL(bcopy_out)	/* branch if nothing left to copy */
 	subu	SRC,SRC,1		/* decrement source pointer */
-	subu	DST,DST,1		/* decrement destination pointer */
+	subu	DEST,DEST,1		/* decrement destination pointer */
 	ld.bu	r6,SRC,0		/* load byte from source */
-	st.b	r6,DST,0		/* store byte in destination */
+	st.b	r6,DEST,0		/* store byte in destination */
 	br.n	_ASM_LABEL(r_byte_copy)	/* branch for next byte */
 	 subu	LEN,LEN,1		/* decrement remaining length */
 #endif	/* MEMMOVE || OVBCOPY */