mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Templatise rorN and rolN with N in {8, 16, 32, 64}

Browse Source
This commit is contained in:
Tom Lankhorst
2019-01-28 10:55:24 +01:00
committed by Michael Steenbeek
parent fd12b012e6
commit 4c015edaf6
2 changed files with 59 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/openrct2/common.h
View File

@@ -20,10 +20,14 @@
#endif
#include "Diagnostic.h"
#include "core/Numerics.hpp"
#include <cassert>
#include <cstddef>
#include <cstdint>
using namespace Numerics;
using utf8 = char;
using utf8string = utf8*;
using const_utf8string = const utf8*;
@@ -41,14 +45,14 @@ using utf16string = utf16*;
using codepoint_t = uint32_t;
using colour_t = uint8_t;
#define rol8(x, shift) (((uint8_t)(x) << (shift)) | ((uint8_t)(x) >> (8 - (shift))))
#define ror8(x, shift) (((uint8_t)(x) >> (shift)) | ((uint8_t)(x) << (8 - (shift))))
#define rol16(x, shift) (((uint16_t)(x) << (shift)) | ((uint16_t)(x) >> (16 - (shift))))
#define ror16(x, shift) (((uint16_t)(x) >> (shift)) | ((uint16_t)(x) << (16 - (shift))))
#define rol32(x, shift) (((uint32_t)(x) << (shift)) | ((uint32_t)(x) >> (32 - (shift))))
#define ror32(x, shift) (((uint32_t)(x) >> (shift)) | ((uint32_t)(x) << (32 - (shift))))
#define rol64(x, shift) (((uint64_t)(x) << (shift)) | ((uint64_t)(x) >> (64 - (shift))))
#define ror64(x, shift) (((uint64_t)(x) >> (shift)) | ((uint64_t)(x) << (64 - (shift))))
const constexpr auto rol8 = rol<uint8_t>;
const constexpr auto ror8 = ror<uint8_t>;
const constexpr auto rol16 = rol<uint16_t>;
const constexpr auto ror16 = ror<uint16_t>;
const constexpr auto rol32 = rol<uint32_t>;
const constexpr auto ror32 = ror<uint32_t>;
const constexpr auto rol64 = rol<uint64_t>;
const constexpr auto ror64 = ror<uint64_t>;
// Rounds an integer down to the given power of 2. y must be a power of 2.
#define floor2(x, y) ((x) & (~((y)-1)))

47
src/openrct2/core/Numerics.hpp Normal file
View File

@@ -0,0 +1,47 @@
/*****************************************************************************
* Copyright (c) 2014-2019 OpenRCT2 developers
*
* For a complete list of all authors, please refer to contributors.md
* Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2
*
* OpenRCT2 is licensed under the GNU General Public License version 3.
*****************************************************************************/
#pragma once
#include <cstddef>
#include <cstdint>
#include <limits>
#include <type_traits>
namespace Numerics
{
/**
* Bitwise left rotate
* @tparam _UIntType unsigned integral type
* @param x value
* @param shift positions to shift
* @return rotated value
*/
template<typename _UIntType> constexpr _UIntType rol(_UIntType x, size_t shift)
{
static_assert(std::is_unsigned<_UIntType>::value, "result_type must be an unsigned integral type");
using limits = typename std::numeric_limits<_UIntType>;
return (((_UIntType)(x) << shift) | ((_UIntType)(x) >> (limits::digits - shift)));
}
/**
* Bitwise right rotate
* @tparam _UIntType unsigned integral type
* @param x value
* @param shift positions to shift
* @return rotated value
*/
template<typename _UIntType> constexpr _UIntType ror(_UIntType x, size_t shift)
{
static_assert(std::is_unsigned<_UIntType>::value, "result_type must be an unsigned integral type");
using limits = std::numeric_limits<_UIntType>;
return (((_UIntType)(x) >> shift) | ((_UIntType)(x) << (limits::digits - shift)));
}
} // namespace Numerics