summaryrefslogtreecommitdiffstats
path: root/src/core/arm
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2016-12-15 22:19:30 +0100
committerLioncash <mathew1800@gmail.com>2016-12-15 22:37:22 +0100
commitba20dd9b6125551ecf2016ed7dbd61dc618fc876 (patch)
tree339289e4a87660df3edf1d3263ecb0e22ca2b573 /src/core/arm
parentMerge pull request #2330 from lioncash/pragma (diff)
downloadyuzu-ba20dd9b6125551ecf2016ed7dbd61dc618fc876.tar
yuzu-ba20dd9b6125551ecf2016ed7dbd61dc618fc876.tar.gz
yuzu-ba20dd9b6125551ecf2016ed7dbd61dc618fc876.tar.bz2
yuzu-ba20dd9b6125551ecf2016ed7dbd61dc618fc876.tar.lz
yuzu-ba20dd9b6125551ecf2016ed7dbd61dc618fc876.tar.xz
yuzu-ba20dd9b6125551ecf2016ed7dbd61dc618fc876.tar.zst
yuzu-ba20dd9b6125551ecf2016ed7dbd61dc618fc876.zip
Diffstat (limited to 'src/core/arm')
-rw-r--r--src/core/arm/dyncom/arm_dyncom_interpreter.cpp4
-rw-r--r--src/core/arm/skyeye_common/armstate.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
index 7b8616702..67c45640a 100644
--- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
+++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
@@ -953,7 +953,7 @@ unsigned InterpreterMainLoop(ARMul_State* cpu) {
#define GDB_BP_CHECK \
cpu->Cpsr &= ~(1 << 5); \
cpu->Cpsr |= cpu->TFlag << 5; \
- if (GDBStub::g_server_enabled) { \
+ if (GDBStub::IsServerEnabled()) { \
if (GDBStub::IsMemoryBreak() || (breakpoint_data.type != GDBStub::BreakpointType::None && \
PC == breakpoint_data.address)) { \
GDBStub::Break(); \
@@ -1649,7 +1649,7 @@ DISPATCH : {
}
// Find breakpoint if one exists within the block
- if (GDBStub::g_server_enabled && GDBStub::IsConnected()) {
+ if (GDBStub::IsConnected()) {
breakpoint_data =
GDBStub::GetNextBreakpointFromAddress(cpu->Reg[15], GDBStub::BreakpointType::Execute);
}
diff --git a/src/core/arm/skyeye_common/armstate.cpp b/src/core/arm/skyeye_common/armstate.cpp
index 1465b074e..c36b0208f 100644
--- a/src/core/arm/skyeye_common/armstate.cpp
+++ b/src/core/arm/skyeye_common/armstate.cpp
@@ -182,7 +182,7 @@ void ARMul_State::ResetMPCoreCP15Registers() {
}
static void CheckMemoryBreakpoint(u32 address, GDBStub::BreakpointType type) {
- if (GDBStub::g_server_enabled && GDBStub::CheckBreakpoint(address, type)) {
+ if (GDBStub::IsServerEnabled() && GDBStub::CheckBreakpoint(address, type)) {
LOG_DEBUG(Debug, "Found memory breakpoint @ %08x", address);
GDBStub::Break(true);
}