From f5c3b1574626aa63faa472e1f982e131483a74d5 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Wed, 15 Mar 2017 19:33:33 +0100 Subject: [PATCH] Buildfix on Windows --- Core/MIPS/MIPSAsm.cpp | 9 +++++---- ext/armips | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Core/MIPS/MIPSAsm.cpp b/Core/MIPS/MIPSAsm.cpp index de816a65b2..50f33e6ddf 100644 --- a/Core/MIPS/MIPSAsm.cpp +++ b/Core/MIPS/MIPSAsm.cpp @@ -52,16 +52,17 @@ public: address += length; return true; } - u64 getVirtualAddress() override { return address; }; - u64 getPhysicalAddress() override { return getVirtualAddress(); }; - bool seekVirtual(u64 virtualAddress) override + int64_t getVirtualAddress() override { return address; }; + int64_t getPhysicalAddress() override { return getVirtualAddress(); }; + int64_t getHeaderSize() override { return 0; } + bool seekVirtual(int64_t virtualAddress) override { if (!Memory::IsValidAddress(virtualAddress)) return false; address = virtualAddress; return true; } - bool seekPhysical(u64 physicalAddress) override { return seekVirtual(physicalAddress); } + bool seekPhysical(int64_t physicalAddress) override { return seekVirtual(physicalAddress); } const std::wstring &getFileName() override { return dummyWFilename_; } private: u64 address; diff --git a/ext/armips b/ext/armips index 11f2681678..770365d44d 160000 --- a/ext/armips +++ b/ext/armips @@ -1 +1 @@ -Subproject commit 11f2681678fa05698c488967aa0f71d0ffad9607 +Subproject commit 770365d44df35d6e675c58bb2a774ca412278ef5