diff options
| author |  bunnei | 2016-04-24 02:02:45 -0400 |
|---|---|---|
| committer | bunnei | 2016-04-24 02:02:45 -0400 |
| commit | 0964a3ff530f2eb5b7ecdf9dfbb74deea890352d (patch) | |
| tree | c566efaf69f8d3564d1e678a0a31981a52794a8a /src/core/gdbstub/gdbstub.cpp | |
| parent | Merge pull request #1705 from LittleWhite-tb/compat_gcc49 (diff) | |
| parent | assert: Add _MSG variations for UNREACHABLE and UNIMPLEMENTED (diff) | |
| download | yuzu-0964a3ff530f2eb5b7ecdf9dfbb74deea890352d.tar.gz yuzu-0964a3ff530f2eb5b7ecdf9dfbb74deea890352d.tar.xz yuzu-0964a3ff530f2eb5b7ecdf9dfbb74deea890352d.zip | |
Merge pull request #1576 from smspillaz/fix-build-errors-03272016
Fix various build errors encountered on Clang 3.9 on OS X
Diffstat (limited to 'src/core/gdbstub/gdbstub.cpp')
| -rw-r--r-- | src/core/gdbstub/gdbstub.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/gdbstub/gdbstub.cpp b/src/core/gdbstub/gdbstub.cpp index c1a7ec5bf..ae0c116ef 100644 --- a/src/core/gdbstub/gdbstub.cpp +++ b/src/core/gdbstub/gdbstub.cpp | |||
| @@ -529,7 +529,7 @@ static void ReadRegister() { | |||
| 529 | id |= HexCharToValue(command_buffer[2]); | 529 | id |= HexCharToValue(command_buffer[2]); |
| 530 | } | 530 | } |
| 531 | 531 | ||
| 532 | if (id >= R0_REGISTER && id <= R15_REGISTER) { | 532 | if (id <= R15_REGISTER) { |
| 533 | IntToGdbHex(reply, Core::g_app_core->GetReg(id)); | 533 | IntToGdbHex(reply, Core::g_app_core->GetReg(id)); |
| 534 | } else if (id == CPSR_REGISTER) { | 534 | } else if (id == CPSR_REGISTER) { |
| 535 | IntToGdbHex(reply, Core::g_app_core->GetCPSR()); | 535 | IntToGdbHex(reply, Core::g_app_core->GetCPSR()); |
| @@ -584,7 +584,7 @@ static void WriteRegister() { | |||
| 584 | id |= HexCharToValue(command_buffer[2]); | 584 | id |= HexCharToValue(command_buffer[2]); |
| 585 | } | 585 | } |
| 586 | 586 | ||
| 587 | if (id >= R0_REGISTER && id <= R15_REGISTER) { | 587 | if (id <= R15_REGISTER) { |
| 588 | Core::g_app_core->SetReg(id, GdbHexToInt(buffer_ptr)); | 588 | Core::g_app_core->SetReg(id, GdbHexToInt(buffer_ptr)); |
| 589 | } else if (id == CPSR_REGISTER) { | 589 | } else if (id == CPSR_REGISTER) { |
| 590 | Core::g_app_core->SetCPSR(GdbHexToInt(buffer_ptr)); | 590 | Core::g_app_core->SetCPSR(GdbHexToInt(buffer_ptr)); |