From f22191240903084e01693cb23bbae8c59b6b1ffa Mon Sep 17 00:00:00 2001
From: MerryMage <MerryMage@users.noreply.github.com>
Date: Sun, 21 Jun 2020 16:07:59 +0100
Subject: [PATCH] bit_util: Bits without template arguments
---
src/common/bit_util.h | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/common/bit_util.h b/src/common/bit_util.h
index 77dae176..35ef032b 100644
--- a/src/common/bit_util.h
+++ b/src/common/bit_util.h
@@ -29,11 +29,20 @@ constexpr T Ones(size_t count) {
return ~(static_cast<T>(~static_cast<T>(0)) << count);
}
+/// Extract bits [begin_bit, end_bit] inclusive from value of type T.
+template<typename T>
+constexpr T Bits(const size_t begin_bit, const size_t end_bit, const T value) {
+ ASSERT_MSG(begin_bit <= end_bit, "invalid bit range (position of beginning bit cannot be greater than that of end bit)");
+ ASSERT_MSG(begin_bit < BitSize<T>(), "begin_bit must be smaller than size of T");
+ ASSERT_MSG(end_bit < BitSize<T>(), "end_bit must be smaller than size of T");
+
+ return (value >> begin_bit) & Ones<T>(end_bit - begin_bit + 1);
+}
+
/// Extract bits [begin_bit, end_bit] inclusive from value of type T.
template<size_t begin_bit, size_t end_bit, typename T>
constexpr T Bits(const T value) {
- static_assert(begin_bit <= end_bit,
- "invalid bit range (position of beginning bit cannot be greater than that of end bit)");
+ static_assert(begin_bit <= end_bit, "invalid bit range (position of beginning bit cannot be greater than that of end bit)");
static_assert(begin_bit < BitSize<T>(), "begin_bit must be smaller than size of T");
static_assert(end_bit < BitSize<T>(), "end_bit must be smaller than size of T");
@@ -43,8 +52,7 @@ constexpr T Bits(const T value) {
/// Create a mask of type T for bits [begin_bit, end_bit] inclusive.
template<size_t begin_bit, size_t end_bit, typename T>
constexpr T Mask() {
- static_assert(begin_bit <= end_bit,
- "invalid bit range (position of beginning bit cannot be greater than that of end bit)");
+ static_assert(begin_bit <= end_bit, "invalid bit range (position of beginning bit cannot be greater than that of end bit)");
static_assert(begin_bit < BitSize<T>(), "begin_bit must be smaller than size of T");
static_assert(end_bit < BitSize<T>(), "end_bit must be smaller than size of T");