libretro/Play-
1
0
Fork 0
mirror of https://github.com/libretro/Play-.git synced 2025-03-03 16:57:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #534 from Thunder07/debugger

Browse Source 
CMake Debugger build
This commit is contained in:
jpd002 2017-04-16 17:02:00 -07:00 committed by GitHub
commit f9b84b8912
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/ee/PS2OS.cpp
View File

@ -2,6 +2,7 @@
#include <stdlib.h>
#include <exception>
#include <boost/filesystem/path.hpp>
#include "string_format.h"
#include "PS2OS.h"
#include "StdStream.h"
#ifdef __ANDROID__
@ -3185,7 +3186,7 @@ BiosDebugThreadInfoArray CPS2OS::GetThreadsDebugInfo() const
threadInfo.stateDescription = "Sleeping";
break;
case THREAD_WAITING:
threadInfo.stateDescription = "Waiting (Semaphore: " + boost::lexical_cast<std::string>(thread->semaWait) + ")";
threadInfo.stateDescription = string_format("Waiting (Semaphore: %d)", thread->semaWait);
break;
case THREAD_SUSPENDED:
threadInfo.stateDescription = "Suspended";
@ -3194,7 +3195,7 @@ BiosDebugThreadInfoArray CPS2OS::GetThreadsDebugInfo() const
threadInfo.stateDescription = "Suspended+Sleeping";
break;
case THREAD_SUSPENDED_WAITING:
threadInfo.stateDescription = "Suspended+Waiting (Semaphore: " + boost::lexical_cast<std::string>(thread->semaWait) + ")";
threadInfo.stateDescription = string_format("Suspended+Waiting (Semaphore: %d)", thread->semaWait);
break;
case THREAD_ZOMBIE:
threadInfo.stateDescription = "Zombie";

9
build_cmake/CMakeLists.txt
View File

@ -58,6 +58,10 @@ endif()
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
if (DEBUGGER_INCLUDED)
add_definitions(-DDEBUGGER_INCLUDED)
endif()
add_definitions(-D_IOP_EMULATE_MODULES)
add_definitions(-DGLEW_STATIC)
@ -384,6 +388,7 @@ set(COMMON_SRC_FILES
../Source/MIPSAssembler.cpp
../Source/MIPSCoprocessor.cpp
../Source/MipsExecutor.cpp
../Source/MipsFunctionPatternDb.cpp
../Source/MIPSInstructionFactory.cpp
../Source/MipsJitter.cpp
../Source/MIPSReflection.cpp
@ -733,13 +738,15 @@ if (WIN32)
../Source/ui_win32/
../Source/gs/GSH_OpenGL
)
if (CMAKE_BUILD_TYPE MATCHES DEBUG)
if (DEBUGGER_INCLUDED)
set(DEBUG_SRC
../Source/ui_win32/CallStackWnd.cpp
../Source/ui_win32/Debugger.cpp
../Source/ui_win32/DebugView.cpp
../Source/ui_win32/FunctionsView.cpp
../Source/ui_win32/ThreadsViewWnd.cpp
../Source/ui_win32/ElfViewRes.rc
)
endif()
if(ARCH STREQUAL "x86")