diff --git a/Source/Core/Common/Src/LinearDiskCache.cpp b/Source/Core/Common/Src/LinearDiskCache.cpp index 7345892b14..2a2a9959a3 100644 --- a/Source/Core/Common/Src/LinearDiskCache.cpp +++ b/Source/Core/Common/Src/LinearDiskCache.cpp @@ -79,8 +79,8 @@ int LinearDiskCache::OpenAndRead(const char *filename, LinearDiskCacheReader *re // We're past the header already thanks to ValidateHeader. while (!feof(file_)) { int key_size, value_size; - int key_size_size = fread(&key_size, 1, sizeof(key_size), file_); - int value_size_size = fread(&value_size, 1, sizeof(value_size), file_); + size_t key_size_size = fread(&key_size, 1, sizeof(key_size), file_); + size_t value_size_size = fread(&value_size, 1, sizeof(value_size), file_); if (key_size_size == 0 && value_size_size == 0) { // I guess feof isn't doing it's job - we're at the end. break; diff --git a/Source/Core/Core/Src/Debugger/PPCDebugInterface.h b/Source/Core/Core/Src/Debugger/PPCDebugInterface.h index 9783f60706..e849ecd185 100644 --- a/Source/Core/Core/Src/Debugger/PPCDebugInterface.h +++ b/Source/Core/Core/Src/Debugger/PPCDebugInterface.h @@ -13,7 +13,7 @@ public: PPCDebugInterface(){} virtual void disasm(unsigned int address, char *dest, int max_size); virtual void getRawMemoryString(int memory, unsigned int address, char *dest, int max_size); - virtual int getInstructionSize(int instruction) {return 4;} + virtual int getInstructionSize(int inst_size = 4) {return inst_size;} virtual bool isAlive(); virtual bool isBreakpoint(unsigned int address); virtual void setBreakpoint(unsigned int address); diff --git a/Source/Core/Core/Src/HW/ProcessorInterface.cpp b/Source/Core/Core/Src/HW/ProcessorInterface.cpp index e333e55d82..58c05f7baf 100644 --- a/Source/Core/Core/Src/HW/ProcessorInterface.cpp +++ b/Source/Core/Core/Src/HW/ProcessorInterface.cpp @@ -39,7 +39,7 @@ enum PI_FIFO_RESET = 0x18, // ??? - GXAbortFrame writes to it PI_RESET_CODE = 0x24, PI_FLIPPER_REV = 0x2C, - PI_UNKNOWN = 0x30 // ??? - BS1 writes to it + PI_UNKNOWN = 0x30 // BS1 writes 0x0245248A to it - prolly some bootstrap thing }; diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h index 6cd1f9f9f6..4353e92bb8 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h @@ -34,22 +34,33 @@ public: m_Active(false) {} - virtual ~IWII_IPC_HLE_Device() - {} + virtual ~IWII_IPC_HLE_Device() { } - virtual void DoState(PointerWrap &p) - {} + virtual void DoState(PointerWrap&) { } - const std::string& GetDeviceName() const { return m_Name; } - u32 GetDeviceID() const { return m_DeviceID; } + const std::string& GetDeviceName() const { return m_Name; } + u32 GetDeviceID() const { return m_DeviceID; } - virtual bool Open(u32 _CommandAddress, u32 _Mode) { _dbg_assert_msg_(WII_IPC_HLE, 0, "%s does not support Open()", m_Name.c_str()); m_Active = true; return true; } - virtual bool Close(u32 _CommandAddress, bool _bForce = false) { _dbg_assert_msg_(WII_IPC_HLE, 0, "%s does not support Close()", m_Name.c_str()); m_Active = false; return true; } - virtual bool Seek(u32 _CommandAddress) { _dbg_assert_msg_(WII_IPC_HLE, 0, "%s does not support Seek()", m_Name.c_str()); return true; } - virtual bool Read(u32 _CommandAddress) { _dbg_assert_msg_(WII_IPC_HLE, 0, "%s does not support Read()", m_Name.c_str()); return true; } - virtual bool Write(u32 _CommandAddress) { _dbg_assert_msg_(WII_IPC_HLE, 0, "%s does not support Write()", m_Name.c_str()); return true; } - virtual bool IOCtl(u32 _CommandAddress) { _dbg_assert_msg_(WII_IPC_HLE, 0, "%s does not support IOCtl()", m_Name.c_str()); return true; } - virtual bool IOCtlV(u32 _CommandAddress) { _dbg_assert_msg_(WII_IPC_HLE, 0, "%s does not support IOCtlV()", m_Name.c_str()); return true; } + virtual bool Open(u32 _CommandAddress, u32 _Mode) { + (void)_CommandAddress; (void)_Mode; + _dbg_assert_msg_(WII_IPC_HLE, 0, "%s does not support Open()", m_Name.c_str()); + m_Active = true; + return true; + } + virtual bool Close(u32 _CommandAddress, bool _bForce = false) { + (void)_CommandAddress; (void)_bForce; + _dbg_assert_msg_(WII_IPC_HLE, 0, "%s does not support Close()", m_Name.c_str()); + m_Active = false; + return true; + } + +#define UNIMPLEMENTED_CMD(cmd) _dbg_assert_msg_(WII_IPC_HLE, 0, "%s does not support "##cmd##"()", m_Name.c_str()); return true; + virtual bool Seek (u32) { UNIMPLEMENTED_CMD("Seek") } + virtual bool Read (u32) { UNIMPLEMENTED_CMD("Read") } + virtual bool Write (u32) { UNIMPLEMENTED_CMD("Write") } + virtual bool IOCtl (u32) { UNIMPLEMENTED_CMD("IOCtl") } + virtual bool IOCtlV (u32) { UNIMPLEMENTED_CMD("IOCtlV") } +#undef UNIMPLEMENTED_CMD virtual u32 Update() { return 0; } @@ -152,8 +163,8 @@ protected: } - void DumpAsync(u32 BufferVector, u32 _CommandAddress, u32 NumberInBuffer, u32 NumberOutBuffer - ,LogTypes::LOG_TYPE LogType = LogTypes::WII_IPC_HLE, + void DumpAsync(u32 BufferVector, u32 NumberInBuffer, u32 NumberOutBuffer, + LogTypes::LOG_TYPE LogType = LogTypes::WII_IPC_HLE, LogTypes::LOG_LEVELS Verbosity = LogTypes::LDEBUG) { GENERIC_LOG(LogType, Verbosity, "======= DumpAsync ======"); diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp index f7e94ec13f..0986b0192d 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp @@ -225,7 +225,7 @@ bool CWII_IPC_HLE_Device_sdio_slot0::IOCtlV(u32 _CommandAddress) break; } - //DumpAsync(CommandBuffer.BufferVector, _CommandAddress, CommandBuffer.NumberInBuffer, CommandBuffer.NumberPayloadBuffer, LogTypes::WII_IPC_SD); + //DumpAsync(CommandBuffer.BufferVector, CommandBuffer.NumberInBuffer, CommandBuffer.NumberPayloadBuffer, LogTypes::WII_IPC_SD); Memory::Write_U32(ReturnValue, _CommandAddress + 0x4); diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp index 049fd23819..23be26eb23 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp @@ -233,7 +233,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::IOCtlV(u32 _CommandAddress) m_ACLSetup = CommandBuffer.m_Address; #if defined(_DEBUG) || defined(DEBUGFAST) - DumpAsync(CommandBuffer.BufferVector, _CommandAddress, CommandBuffer.NumberInBuffer, CommandBuffer.NumberPayloadBuffer); + DumpAsync(CommandBuffer.BufferVector, CommandBuffer.NumberInBuffer, CommandBuffer.NumberPayloadBuffer); #endif CtrlBuffer BulkBuffer(_CommandAddress); @@ -308,7 +308,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::IOCtlV(u32 _CommandAddress) DEBUG_LOG(WII_IPC_WIIMOTE, " PayloadAddr: 0x%08x", CommandBuffer.PayloadBuffer[0].m_Address); DEBUG_LOG(WII_IPC_WIIMOTE, " PayloadSize: 0x%08x", CommandBuffer.PayloadBuffer[0].m_Size); #if defined(_DEBUG) || defined(DEBUGFAST) - DumpAsync(CommandBuffer.BufferVector, _CommandAddress, CommandBuffer.NumberInBuffer, CommandBuffer.NumberPayloadBuffer); + DumpAsync(CommandBuffer.BufferVector, CommandBuffer.NumberInBuffer, CommandBuffer.NumberPayloadBuffer); #endif } break;