yuzu-mirror/oaknut
1
0
Fork 0
mirror of https://github.com/yuzu-mirror/oaknut.git synced 2026-04-21 06:03:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

oaknut: Appease MSVC

Browse source
This commit is contained in:
Merry 2023-10-09 21:19:51 +01:00
parent 0111836704
commit 394a3c8f0a
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
include/oaknut/impl/imm.hpp
View file

@ -60,9 +60,9 @@ public:
constexpr /* implicit */ AddSubImm(std::uint64_t value_)
{
if ((value_ & 0xFFF) == value_) {
m_encoded = value_;
m_encoded = static_cast<std::uint32_t>(value_);
} else if ((value_ & 0xFFF000) == value_) {
m_encoded = (value_ >> 12) | (1 << 12);
m_encoded = static_cast<std::uint32_t>((value_ >> 12) | (1 << 12));
} else {
throw OaknutException{ExceptionType::InvalidAddSubImm};
}
@ -126,18 +126,18 @@ constexpr std::optional<std::uint32_t> encode_bit_imm(std::uint64_t value)
if (value == 0 || (~value) == 0)
return std::nullopt;
const std::size_t rotation = std::countr_zero(value & (value + 1));
const int rotation = std::countr_zero(value & (value + 1));
const std::uint64_t rot_value = std::rotr(value, rotation);
const std::size_t esize = std::countr_zero(rot_value & (rot_value + 1));
const std::size_t ones = std::countr_one(rot_value);
const int esize = std::countr_zero(rot_value & (rot_value + 1));
const int ones = std::countr_one(rot_value);
if (std::rotr(value, esize) != value)
return std::nullopt;
const std::uint32_t S = ((-esize) << 1) | (ones - 1);
const std::uint32_t R = (esize - rotation) & (esize - 1);
const std::uint32_t N = (~S >> 6) & 1;
const int S = ((-esize) << 1) | (ones - 1);
const int R = (esize - rotation) & (esize - 1);
const int N = (~S >> 6) & 1;
return static_cast<std::uint32_t>((S & 0b111111) | (R << 6) | (N << 12));
}

2
include/oaknut/oaknut.hpp
View file

@ -265,7 +265,7 @@ protected:
std::uintptr_t current_address() const
{
return reinterpret_cast<std::uintptr_t>(m_vec.size() * sizeof(std::uint32_t));
return static_cast<std::uintptr_t>(m_vec.size() * sizeof(std::uint32_t));
}
void set_at_address(std::uintptr_t addr, std::uint32_t value, std::uint32_t mask) const