[src/trunk]: src/sys/arch Correct 32 and 64 bit byte swap inlines

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

details:   https://anonhg.NetBSD.org/src/rev/bc30478051b8
branches:  trunk
changeset: 333314:bc30478051b8
user:      dennis <dennis%NetBSD.org@localhost>
date:      Wed Oct 29 01:33:39 2014 +0000

description:
Correct 32 and 64 bit byte swap inlines

diffstat:

 sys/arch/aarch64/include/byte_swap.h |  10 +++++-----
 sys/arch/or1k/include/byte_swap.h    |  10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diffs (62 lines):

diff -r 34baf9a1f6ad -r bc30478051b8 sys/arch/aarch64/include/byte_swap.h
--- a/sys/arch/aarch64/include/byte_swap.h      Wed Oct 29 01:17:34 2014 +0000
+++ b/sys/arch/aarch64/include/byte_swap.h      Wed Oct 29 01:33:39 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: byte_swap.h,v 1.2 2014/08/11 04:03:59 matt Exp $ */
+/* $NetBSD: byte_swap.h,v 1.3 2014/10/29 01:33:39 dennis Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -59,9 +59,9 @@
        }
 
        v =   ((v & 0x000000ff) << (56 -  0)) | ((v >> (56 -  0)) & 0x000000ff)
-           | ((v & 0x0000ff00) << (48 -  8)) | ((v << (48 -  8)) & 0x0000ff00) 
-           | ((v & 0x00ff0000) << (40 - 16)) | ((v << (40 - 16)) & 0x00ff0000)
-           | ((v & 0xff000000) << (32 - 24)) | ((v << (32 - 24)) & 0xff000000);
+           | ((v & 0x0000ff00) << (48 -  8)) | ((v >> (48 -  8)) & 0x0000ff00) 
+           | ((v & 0x00ff0000) << (40 - 16)) | ((v >> (40 - 16)) & 0x00ff0000)
+           | ((v & 0xff000000) << (32 - 24)) | ((v >> (32 - 24)) & 0xff000000);
 
        return v;
 }
@@ -76,7 +76,7 @@
        }
 
        v =   ((v & 0x00ff) << (24 - 0)) | ((v >> (24 - 0)) & 0x00ff)
-           | ((v & 0xff00) << (16 - 8)) | ((v << (16 - 8)) & 0xff00);
+           | ((v & 0xff00) << (16 - 8)) | ((v >> (16 - 8)) & 0xff00);
 
        return v;
 }
diff -r 34baf9a1f6ad -r bc30478051b8 sys/arch/or1k/include/byte_swap.h
--- a/sys/arch/or1k/include/byte_swap.h Wed Oct 29 01:17:34 2014 +0000
+++ b/sys/arch/or1k/include/byte_swap.h Wed Oct 29 01:33:39 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: byte_swap.h,v 1.1 2014/09/03 19:34:26 matt Exp $ */
+/* $NetBSD: byte_swap.h,v 1.2 2014/10/29 01:33:39 dennis Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -61,9 +61,9 @@
 __byte_swap_u64_variable(uint64_t v)
 {
        v =   ((v & 0x000000ff) << (56 -  0)) | ((v >> (56 -  0)) & 0x000000ff)
-           | ((v & 0x0000ff00) << (48 -  8)) | ((v << (48 -  8)) & 0x0000ff00) 
-           | ((v & 0x00ff0000) << (40 - 16)) | ((v << (40 - 16)) & 0x00ff0000)
-           | ((v & 0xff000000) << (32 - 24)) | ((v << (32 - 24)) & 0xff000000);
+           | ((v & 0x0000ff00) << (48 -  8)) | ((v >> (48 -  8)) & 0x0000ff00) 
+           | ((v & 0x00ff0000) << (40 - 16)) | ((v >> (40 - 16)) & 0x00ff0000)
+           | ((v & 0xff000000) << (32 - 24)) | ((v >> (32 - 24)) & 0xff000000);
 
        return v;
 }
@@ -73,7 +73,7 @@
 __byte_swap_u32_variable(uint32_t v)
 {
        v =   ((v & 0x00ff) << (24 - 0)) | ((v >> (24 - 0)) & 0x00ff)
-           | ((v & 0xff00) << (16 - 8)) | ((v << (16 - 8)) & 0xff00);
+           | ((v & 0xff00) << (16 - 8)) | ((v >> (16 - 8)) & 0xff00);
 
        return v;
 }