Module Name: src
Committed By: dennis
Date: Wed Oct 29 01:33:39 UTC 2014
Modified Files:
src/sys/arch/aarch64/include: byte_swap.h
src/sys/arch/or1k/include: byte_swap.h
Log Message:
Correct 32 and 64 bit byte swap inlines
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/aarch64/include/byte_swap.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/or1k/include/byte_swap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/include/byte_swap.h
diff -u src/sys/arch/aarch64/include/byte_swap.h:1.2 src/sys/arch/aarch64/include/byte_swap.h:1.3
--- src/sys/arch/aarch64/include/byte_swap.h:1.2 Mon Aug 11 04:03:59 2014
+++ src/sys/arch/aarch64/include/byte_swap.h Wed Oct 29 01:33:39 2014
@@ -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 @@ __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;
}
@@ -76,7 +76,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;
}
Index: src/sys/arch/or1k/include/byte_swap.h
diff -u src/sys/arch/or1k/include/byte_swap.h:1.1 src/sys/arch/or1k/include/byte_swap.h:1.2
--- src/sys/arch/or1k/include/byte_swap.h:1.1 Wed Sep 3 19:34:26 2014
+++ src/sys/arch/or1k/include/byte_swap.h Wed Oct 29 01:33:39 2014
@@ -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 @@ static __inline uint64_t
__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 @@ static __inline uint32_t
__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;
}
