summaryrefslogtreecommitdiff
path: root/sys/lib
diff options
context:
space:
mode:
authormycroft <mycroft@NetBSD.org>1999-01-22 09:17:47 +0000
committermycroft <mycroft@NetBSD.org>1999-01-22 09:17:47 +0000
commit6b11ebb854b2846dac775b1e5ddd0ca8024b3f1b (patch)
tree2b3fda820af2cc06bef6b4a90f2e1b52c031fd8c /sys/lib
parent8bf9a67c76da23c3a5f5ba05db6683412fbbfc8d (diff)
Sync with libc.
Diffstat (limited to 'sys/lib')
-rw-r--r--sys/lib/libkern/arch/arm32/byte_swap_2.S13
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/lib/libkern/arch/arm32/byte_swap_2.S b/sys/lib/libkern/arch/arm32/byte_swap_2.S
index 32446ecb105..4d9c331cce4 100644
--- a/sys/lib/libkern/arch/arm32/byte_swap_2.S
+++ b/sys/lib/libkern/arch/arm32/byte_swap_2.S
@@ -1,11 +1,11 @@
-/* $NetBSD: byte_swap_2.S,v 1.1 1999/01/15 13:31:29 bouyer Exp $ */
+/* $NetBSD: byte_swap_2.S,v 1.2 1999/01/22 09:17:47 mycroft Exp $ */
/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
+ * Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
- * by Neil A. Carson
+ * by Charles M. Hannum.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -43,8 +43,7 @@ _ENTRY(_C_FUNC(bswap16));
_ENTRY(_C_FUNC(ntohs));
_ENTRY(_C_FUNC(htons));
_END_ENTRY
- mov r1, r0, lsl #8
- mov r0, r0, lsr #8
- bic r0, r0, #0xFF00
- orr r0, r0, r1
+ and r1, r0, #0xFF00
+ mov r0, r0, lsl #8
+ orr r0, r0, r1, lsr #8
mov pc, lr