mirror/pineapple
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

early-access version 2377

Browse source
This commit is contained in:
pineappleEA 2022-01-06 15:06:35 +01:00
parent 9eecae303d
commit 7ba61209fc
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1,7 +1,7 @@
yuzu emulator early access yuzu emulator early access
============= =============
This is the source code for early-access 2376. This is the source code for early-access 2377.
## Legal Notice ## Legal Notice

2
externals/dynarmic/src/dynarmic/backend/x64/constant_pool.cpp vendored
View file

@ -21,7 +21,7 @@ ConstantPool::ConstantPool(BlockOfCode& code, size_t size)
} }
Xbyak::Address ConstantPool::GetConstant(const Xbyak::AddressFrame& frame, u64 lower, u64 upper) { Xbyak::Address ConstantPool::GetConstant(const Xbyak::AddressFrame& frame, u64 lower, u64 upper) {
const auto constant = std::make_tuple(lower, upper); const auto constant = std::make_pair(lower, upper);
auto iter = constant_info.find(constant); auto iter = constant_info.find(constant);
if (iter == constant_info.end()) { if (iter == constant_info.end()) {
ASSERT(static_cast<size_t>(current_pool_ptr - pool_begin) < pool_size); ASSERT(static_cast<size_t>(current_pool_ptr - pool_begin) < pool_size);

13
externals/dynarmic/src/dynarmic/backend/x64/constant_pool.h vendored
View file

@ -5,9 +5,10 @@
#pragma once #pragma once
#include <map> #include <bit>
#include <tuple> #include <utility>
#include <tsl/robin_map.h>
#include <xbyak/xbyak.h> #include <xbyak/xbyak.h>
#include "dynarmic/common/common_types.h" #include "dynarmic/common/common_types.h"
@ -29,7 +30,13 @@ public:
private: private:
static constexpr size_t align_size = 16; // bytes static constexpr size_t align_size = 16; // bytes
std::map<std::tuple<u64, u64>, void*> constant_info; struct ConstantHash {
std::size_t operator()(const std::pair<u64, u64>& constant) const noexcept {
return constant.first ^ std::rotl<u64>(constant.second, 1);
}
};
tsl::robin_map<std::pair<u64, u64>, void*, ConstantHash> constant_info;
BlockOfCode& code; BlockOfCode& code;
size_t pool_size; size_t pool_size;

2
externals/dynarmic/src/dynarmic/frontend/A32/disassembler/disassembler_thumb.cpp vendored
View file

@ -285,7 +285,7 @@ public:
// Sanity note: Here imm8.Bit<0>() is guaranteed to be == 1. (imm8 can never be 0bxxxx0000) // Sanity note: Here imm8.Bit<0>() is guaranteed to be == 1. (imm8 can never be 0bxxxx0000)
return std::make_tuple(imm8.Bit<3>() == firstcond0 ? "t" : "e", imm8.Bit<2>() == firstcond0 ? "t" : "e", imm8.Bit<1>() == firstcond0 ? "t" : "e"); return std::make_tuple(imm8.Bit<3>() == firstcond0 ? "t" : "e", imm8.Bit<2>() == firstcond0 ? "t" : "e", imm8.Bit<1>() == firstcond0 ? "t" : "e");
}(); }();
return fmt::format("it{}{}{} {}", x, y, z, firstcond); return fmt::format("it{}{}{} {}", x, y, z, CondToString(firstcond));
} }
std::string thumb16_SXTH(Reg m, Reg d) { std::string thumb16_SXTH(Reg m, Reg d) {