From 2a1b42705f281b2c58b2f208bcf71a61b531ef45 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Thu, 2 Apr 2009 13:07:26 +0000 Subject: [PATCH] linux buildfixes... git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2830 8ced0084-cf51-0410-be5f-012b33b47a6e --- .../Src/Debugger/Debugger.cpp | 16 ++++++++-------- .../Plugin_DSP_LLE-testing/Src/disassemble.h | 2 ++ .../Plugins/Plugin_DSP_LLE-testing/Src/main.cpp | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Source/Plugins/Plugin_DSP_LLE-testing/Src/Debugger/Debugger.cpp b/Source/Plugins/Plugin_DSP_LLE-testing/Src/Debugger/Debugger.cpp index 2b628b11a2..b1493c3f60 100644 --- a/Source/Plugins/Plugin_DSP_LLE-testing/Src/Debugger/Debugger.cpp +++ b/Source/Plugins/Plugin_DSP_LLE-testing/Src/Debugger/Debugger.cpp @@ -144,10 +144,10 @@ void DSPDebuggerLLE::RebuildDisAsmListView() CurrentPC |= 0x8000; char Temp[256]; - sprintf_s(Temp, 256, "0x%04x", CurrentPC); + sprintf(Temp, "0x%04x", CurrentPC); char Temp2[256]; - sprintf_s(Temp2, 256, "0x%04x", dsp_imem_read(CurrentPC)); + sprintf(Temp2, "0x%04x", dsp_imem_read(CurrentPC)); char* pOpcode = gd_dis_opcode(&gdg); const char* pParameter = NULL; @@ -180,13 +180,13 @@ void DSPDebuggerLLE::RebuildDisAsmListView() int Item = m_Disasm->InsertItem(gdg.pc, wxEmptyString); m_Disasm->SetItem(Item, COLUMN_BP, wxEmptyString); - m_Disasm->SetItem(Item, COLUMN_FUNCTION, pFunctionName); - m_Disasm->SetItem(Item, COLUMN_ADDRESS, Temp); - m_Disasm->SetItem(Item, COLUMN_MNEMONIC, Temp2); - m_Disasm->SetItem(Item, COLUMN_OPCODE, pOpcode); - m_Disasm->SetItem(Item, COLUMN_EXT, pExtension); + m_Disasm->SetItem(Item, COLUMN_FUNCTION, wxString::FromAscii(pFunctionName)); + m_Disasm->SetItem(Item, COLUMN_ADDRESS, wxString::FromAscii(Temp)); + m_Disasm->SetItem(Item, COLUMN_MNEMONIC, wxString::FromAscii(Temp2)); + m_Disasm->SetItem(Item, COLUMN_OPCODE, wxString::FromAscii(pOpcode)); + m_Disasm->SetItem(Item, COLUMN_EXT, wxString::FromAscii(pExtension)); - if (!_stricmp(pOpcode, "CALL")) + if (!strcasecmp(pOpcode, "CALL")) { u32 FunctionAddress = -1; sscanf(pParameter, "0x%04x", &FunctionAddress); diff --git a/Source/Plugins/Plugin_DSP_LLE-testing/Src/disassemble.h b/Source/Plugins/Plugin_DSP_LLE-testing/Src/disassemble.h index 701ca56f80..f405f0fd16 100644 --- a/Source/Plugins/Plugin_DSP_LLE-testing/Src/disassemble.h +++ b/Source/Plugins/Plugin_DSP_LLE-testing/Src/disassemble.h @@ -25,6 +25,8 @@ #pragma once +#include "Common.h" + typedef struct gd_globals_t { bool print_tabs; diff --git a/Source/Plugins/Plugin_DSP_LLE-testing/Src/main.cpp b/Source/Plugins/Plugin_DSP_LLE-testing/Src/main.cpp index 2ef038d844..31dc509f62 100644 --- a/Source/Plugins/Plugin_DSP_LLE-testing/Src/main.cpp +++ b/Source/Plugins/Plugin_DSP_LLE-testing/Src/main.cpp @@ -202,7 +202,7 @@ THREAD_RETURN dsp_thread_debug(void* lpParameter) } else { - Sleep(100); + SLEEP(100); } } #endif