summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorDavid Marcec <dmarcecguzman@gmail.com>2018-12-19 02:52:32 +0100
committerDavid Marcec <dmarcecguzman@gmail.com>2018-12-19 02:52:32 +0100
commitfdd649e2ef56ea473e253511d35fe6c10e0fb241 (patch)
tree82bf8e6a7cd1dd344c9bb0b3a728fc17c38de629 /src/core
parentMerge pull request #1913 from MerryMage/default-fpcr (diff)
downloadyuzu-fdd649e2ef56ea473e253511d35fe6c10e0fb241.tar
yuzu-fdd649e2ef56ea473e253511d35fe6c10e0fb241.tar.gz
yuzu-fdd649e2ef56ea473e253511d35fe6c10e0fb241.tar.bz2
yuzu-fdd649e2ef56ea473e253511d35fe6c10e0fb241.tar.lz
yuzu-fdd649e2ef56ea473e253511d35fe6c10e0fb241.tar.xz
yuzu-fdd649e2ef56ea473e253511d35fe6c10e0fb241.tar.zst
yuzu-fdd649e2ef56ea473e253511d35fe6c10e0fb241.zip
Diffstat (limited to '')
-rw-r--r--src/core/file_sys/savedata_factory.cpp1
-rw-r--r--src/core/hle/kernel/object.cpp1
-rw-r--r--src/core/memory.cpp1
3 files changed, 3 insertions, 0 deletions
diff --git a/src/core/file_sys/savedata_factory.cpp b/src/core/file_sys/savedata_factory.cpp
index bd50fedc7..d63b7f19b 100644
--- a/src/core/file_sys/savedata_factory.cpp
+++ b/src/core/file_sys/savedata_factory.cpp
@@ -128,6 +128,7 @@ std::string SaveDataFactory::GetFullPath(SaveDataSpaceId space, SaveDataType typ
return fmt::format("{}save/cache/{:016X}", out, title_id);
default:
ASSERT_MSG(false, "Unrecognized SaveDataType: {:02X}", static_cast<u8>(type));
+ return fmt::format("{}save/unknown_{:X}/{:016X}", out, static_cast<u8>(type), title_id);
}
}
diff --git a/src/core/hle/kernel/object.cpp b/src/core/hle/kernel/object.cpp
index 0ea851a74..806078638 100644
--- a/src/core/hle/kernel/object.cpp
+++ b/src/core/hle/kernel/object.cpp
@@ -32,6 +32,7 @@ bool Object::IsWaitable() const {
}
UNREACHABLE();
+ return false;
}
} // namespace Kernel
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 643afdee8..e9166dbd9 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -187,6 +187,7 @@ T Read(const VAddr vaddr) {
default:
UNREACHABLE();
}
+ return {};
}
template <typename T>