summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMerryMage <MerryMage@users.noreply.github.com>2018-01-07 23:43:41 +0100
committerbunnei <bunneidev@gmail.com>2018-01-09 01:20:10 +0100
commitf10a304ecdc2457124d6333862bdaaa46577fe1e (patch)
treeed774255f32589fbecbcdc9767c6292aac531488
parentcore_timing: Use 1.020GHz for core clock rate. (diff)
downloadyuzu-f10a304ecdc2457124d6333862bdaaa46577fe1e.tar
yuzu-f10a304ecdc2457124d6333862bdaaa46577fe1e.tar.gz
yuzu-f10a304ecdc2457124d6333862bdaaa46577fe1e.tar.bz2
yuzu-f10a304ecdc2457124d6333862bdaaa46577fe1e.tar.lz
yuzu-f10a304ecdc2457124d6333862bdaaa46577fe1e.tar.xz
yuzu-f10a304ecdc2457124d6333862bdaaa46577fe1e.tar.zst
yuzu-f10a304ecdc2457124d6333862bdaaa46577fe1e.zip
-rw-r--r--CMakeLists.txt4
m---------externals/lz40
-rw-r--r--src/common/assert.h2
-rw-r--r--src/core/memory.cpp8
4 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 945278f88..6fc85bc37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -238,8 +238,8 @@ endif()
if (UNICORN_FOUND)
add_library(unicorn INTERFACE)
- target_link_libraries(unicorn INTERFACE "${UNICORN_LIBRARY}")
- target_include_directories(unicorn INTERFACE "${UNICORN_INCLUDE_DIR}")
+ target_link_libraries(unicorn INTERFACE "${LIBUNICORN_LIBRARY}")
+ target_include_directories(unicorn INTERFACE "${LIBUNICORN_INCLUDE_DIR}")
endif()
if (ENABLE_QT)
diff --git a/externals/lz4 b/externals/lz4
-Subproject c10863b98e1503af90616ae99725ecd120265df
+Subproject 4db65c1d99280a757823914efaa96d2e87f4184
diff --git a/src/common/assert.h b/src/common/assert.h
index 04e80c87a..655446f34 100644
--- a/src/common/assert.h
+++ b/src/common/assert.h
@@ -53,4 +53,4 @@ __declspec(noinline, noreturn)
#endif
#define UNIMPLEMENTED() DEBUG_ASSERT_MSG(false, "Unimplemented code!")
-#define UNIMPLEMENTED_MSG(_a_, ...) ASSERT_MSG(false, _a_, __VA_ARGS__)
+#define UNIMPLEMENTED_MSG(...) ASSERT_MSG(false, __VA_ARGS__)
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 93ffe9938..01ec231f6 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -487,7 +487,7 @@ void ReadBlock(const Kernel::Process& process, const VAddr src_addr, void* dest_
size_t page_offset = src_addr & PAGE_MASK;
while (remaining_size > 0) {
- const size_t copy_amount = std::min(PAGE_SIZE - page_offset, remaining_size);
+ const size_t copy_amount = std::min<size_t>(PAGE_SIZE - page_offset, remaining_size);
const VAddr current_vaddr = static_cast<VAddr>((page_index << PAGE_BITS) + page_offset);
switch (page_table.attributes[page_index]) {
@@ -563,7 +563,7 @@ void WriteBlock(const Kernel::Process& process, const VAddr dest_addr, const voi
size_t page_offset = dest_addr & PAGE_MASK;
while (remaining_size > 0) {
- const size_t copy_amount = std::min(PAGE_SIZE - page_offset, remaining_size);
+ const size_t copy_amount = std::min<size_t>(PAGE_SIZE - page_offset, remaining_size);
const VAddr current_vaddr = static_cast<VAddr>((page_index << PAGE_BITS) + page_offset);
switch (page_table.attributes[page_index]) {
@@ -623,7 +623,7 @@ void ZeroBlock(const VAddr dest_addr, const size_t size) {
static const std::array<u8, PAGE_SIZE> zeros = {};
while (remaining_size > 0) {
- const size_t copy_amount = std::min(PAGE_SIZE - page_offset, remaining_size);
+ const size_t copy_amount = std::min<size_t>(PAGE_SIZE - page_offset, remaining_size);
const VAddr current_vaddr = static_cast<VAddr>((page_index << PAGE_BITS) + page_offset);
switch (current_page_table->attributes[page_index]) {
@@ -674,7 +674,7 @@ void CopyBlock(VAddr dest_addr, VAddr src_addr, const size_t size) {
size_t page_offset = src_addr & PAGE_MASK;
while (remaining_size > 0) {
- const size_t copy_amount = std::min(PAGE_SIZE - page_offset, remaining_size);
+ const size_t copy_amount = std::min<size_t>(PAGE_SIZE - page_offset, remaining_size);
const VAddr current_vaddr = static_cast<VAddr>((page_index << PAGE_BITS) + page_offset);
switch (current_page_table->attributes[page_index]) {