diff options
author | Lioncash <mathew1800@gmail.com> | 2014-09-28 17:20:06 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2014-10-08 02:35:13 +0200 |
commit | eb5054e6eb0d810f26caff9f09e43dbeee4a69fa (patch) | |
tree | 58a6e4f1e07f3ee8e2ad469bca7c2b43edac20a6 /src/core | |
parent | Merge pull request #118 from lioncash/chunk-file (diff) | |
download | yuzu-eb5054e6eb0d810f26caff9f09e43dbeee4a69fa.tar yuzu-eb5054e6eb0d810f26caff9f09e43dbeee4a69fa.tar.gz yuzu-eb5054e6eb0d810f26caff9f09e43dbeee4a69fa.tar.bz2 yuzu-eb5054e6eb0d810f26caff9f09e43dbeee4a69fa.tar.lz yuzu-eb5054e6eb0d810f26caff9f09e43dbeee4a69fa.tar.xz yuzu-eb5054e6eb0d810f26caff9f09e43dbeee4a69fa.tar.zst yuzu-eb5054e6eb0d810f26caff9f09e43dbeee4a69fa.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hw/gpu.cpp | 4 | ||||
-rw-r--r-- | src/core/hw/gpu.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp index 7afb00d6c..9c7192313 100644 --- a/src/core/hw/gpu.cpp +++ b/src/core/hw/gpu.cpp @@ -27,7 +27,7 @@ u64 g_last_frame_ticks = 0; ///< CPU tick count from last frame template <typename T> inline void Read(T &var, const u32 raw_addr) { u32 addr = raw_addr - 0x1EF00000; - int index = addr / 4; + u32 index = addr / 4; // Reads other than u32 are untested, so I'd rather have them abort than silently fail if (index >= Regs::NumIds() || !std::is_same<T,u32>::value) { @@ -41,7 +41,7 @@ inline void Read(T &var, const u32 raw_addr) { template <typename T> inline void Write(u32 addr, const T data) { addr -= 0x1EF00000; - int index = addr / 4; + u32 index = addr / 4; // Writes other than u32 are untested, so I'd rather have them abort than silently fail if (index >= Regs::NumIds() || !std::is_same<T,u32>::value) { diff --git a/src/core/hw/gpu.h b/src/core/hw/gpu.h index 7186bfa84..c853429a0 100644 --- a/src/core/hw/gpu.h +++ b/src/core/hw/gpu.h @@ -201,7 +201,7 @@ struct Regs { #undef INSERT_PADDING_WORDS_HELPER2 #undef INSERT_PADDING_WORDS - static inline int NumIds() { + static inline size_t NumIds() { return sizeof(Regs) / sizeof(u32); } |