[src/netbsd-1-6]: src Pull up revision 1.2 (requested by bjh21 in ticket #419):

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e6837afd680d
branches:  netbsd-1-6
changeset: 528326:e6837afd680d
user:      lukem <lukem%NetBSD.org@localhost>
date:      Tue Jul 02 06:50:51 2002 +0000

description:
Pull up revision 1.2 (requested by bjh21 in ticket #419):
Avoid leaving junk in the top half of R0 on return.
This fixes port-arm/17440.

diffstat:

 lib/libc/arch/arm/gen/byte_swap_2.S    |  8 ++++----
 sys/lib/libkern/arch/arm/byte_swap_2.S |  8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (44 lines):

diff -r 3165733f11b7 -r e6837afd680d lib/libc/arch/arm/gen/byte_swap_2.S
--- a/lib/libc/arch/arm/gen/byte_swap_2.S       Tue Jul 02 06:46:53 2002 +0000
+++ b/lib/libc/arch/arm/gen/byte_swap_2.S       Tue Jul 02 06:50:51 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: byte_swap_2.S,v 1.1 2000/12/29 20:13:47 bjh21 Exp $    */
+/*     $NetBSD: byte_swap_2.S,v 1.1.4.1 2002/07/02 06:50:51 lukem Exp $        */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -42,9 +42,9 @@
 _ENTRY(_C_LABEL(ntohs))
 _ENTRY(_C_LABEL(htons))
 _PROF_PROLOGUE
-       and             r1, r0, #0xFF00
-       mov             r0, r0, lsl #8
-       orr             r0, r0, r1, lsr #8
+       and             r1, r0, #0xff
+       mov             r0, r0, lsr #8
+       orr             r0, r0, r1, lsl #8
 #ifdef __APCS_26__
        movs            pc, lr
 #else
diff -r 3165733f11b7 -r e6837afd680d sys/lib/libkern/arch/arm/byte_swap_2.S
--- a/sys/lib/libkern/arch/arm/byte_swap_2.S    Tue Jul 02 06:46:53 2002 +0000
+++ b/sys/lib/libkern/arch/arm/byte_swap_2.S    Tue Jul 02 06:50:51 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: byte_swap_2.S,v 1.1 2000/12/29 20:51:57 bjh21 Exp $    */
+/*     $NetBSD: byte_swap_2.S,v 1.1.20.1 2002/07/02 06:50:59 lukem Exp $       */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -42,9 +42,9 @@
 _ENTRY(_C_LABEL(ntohs))
 _ENTRY(_C_LABEL(htons))
 _PROF_PROLOGUE
-       and             r1, r0, #0xFF00
-       mov             r0, r0, lsl #8
-       orr             r0, r0, r1, lsr #8
+       and             r1, r0, #0xff
+       mov             r0, r0, lsr #8
+       orr             r0, r0, r1, lsl #8
 #ifdef __APCS_26__
        movs            pc, lr
 #else