ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some warnings/errors in android build

This commit is contained in:
zilmar 2019-08-21 18:57:50 +09:30
parent 23770d82e6
commit c78260ce54
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Project64-core/MemoryExceptionFilter.cpp
View File

@ -377,7 +377,7 @@ bool CMipsMemoryVM::FilterX86Exception(uint32_t MemAddress, X86_CONTEXT & contex
#endif
#ifdef __arm__
bool CMipsMemoryVM::DumpArmExceptionInfo(uint32_t MemAddress, mcontext_t & context)
void CMipsMemoryVM::DumpArmExceptionInfo(uint32_t MemAddress, mcontext_t & context)
{
ArmThumbOpcode * OpCode = (ArmThumbOpcode *)context.arm_pc;
Arm32Opcode * OpCode32 = (Arm32Opcode *)context.arm_pc;

2
Source/Project64-core/N64System/Mips/MemoryVirtualMem.h
View File

@ -185,7 +185,7 @@ private:
static bool FilterX86Exception(uint32_t MemAddress, X86_CONTEXT & context);
#endif
#ifdef __arm__
static bool DumpArmExceptionInfo(uint32_t MemAddress, mcontext_t & context);
static void DumpArmExceptionInfo(uint32_t MemAddress, mcontext_t & context);
static bool FilterArmException(uint32_t MemAddress, mcontext_t & context);
#endif

10
Source/Project64-core/N64System/N64DiskClass.cpp
View File

@ -478,10 +478,10 @@ bool CN64Disk::LoadDiskRAMImage()
filename[filename.length() - 2] = 'a';
filename[filename.length() - 3] = 'r';
WriteTrace(TraceN64System, TraceDebug, "Trying to open %s", filename);
WriteTrace(TraceN64System, TraceDebug, "Trying to open %s", filename.c_str());
if (!ramfile.Open(filename.c_str(), CFileBase::modeRead))
{
WriteTrace(TraceN64System, TraceError, "Failed to open %s", filename);
WriteTrace(TraceN64System, TraceError, "Failed to open %s", filename.c_str());
return false;
}
@ -783,12 +783,12 @@ Country CN64Disk::GetDiskCountryCode()
switch (*(uint32_t*)&GetDiskAddressSys()[0])
{
case DISK_COUNTRY_JPN:
return Country::Japan;
return Japan;
case DISK_COUNTRY_USA:
return Country::USA;
return USA;
case DISK_COUNTRY_DEV:
default:
return Country::UnknownCountry;
return UnknownCountry;
}
}