diff options
| author | 2015-10-22 00:19:44 -0400 | |
|---|---|---|
| committer | 2015-10-22 00:19:44 -0400 | |
| commit | 45ed9e7e5e9709ac6e27402a9000b13a30bc80bf (patch) | |
| tree | b83bbf24872e90dbf9de22f1b72c2bf490841a7c /src/core/gdbstub/gdbstub.cpp | |
| parent | Handle changes pointed out in comments on PR (diff) | |
| download | yuzu-45ed9e7e5e9709ac6e27402a9000b13a30bc80bf.tar.gz yuzu-45ed9e7e5e9709ac6e27402a9000b13a30bc80bf.tar.xz yuzu-45ed9e7e5e9709ac6e27402a9000b13a30bc80bf.zip | |
Use CHAR_BIT instead of 8
Diffstat (limited to 'src/core/gdbstub/gdbstub.cpp')
| -rw-r--r-- | src/core/gdbstub/gdbstub.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/core/gdbstub/gdbstub.cpp b/src/core/gdbstub/gdbstub.cpp index 6f9c8fa29..b226b431a 100644 --- a/src/core/gdbstub/gdbstub.cpp +++ b/src/core/gdbstub/gdbstub.cpp | |||
| @@ -476,20 +476,20 @@ static void ReadRegisters() { | |||
| 476 | u8* bufptr = buffer; | 476 | u8* bufptr = buffer; |
| 477 | for (int i = 0, reg = 0; i <= MAX_REGISTERS; i++, reg++) { | 477 | for (int i = 0, reg = 0; i <= MAX_REGISTERS; i++, reg++) { |
| 478 | if (i <= R15_REGISTER) { | 478 | if (i <= R15_REGISTER) { |
| 479 | IntToHex(bufptr + i * 8, Core::g_app_core->GetReg(reg)); | 479 | IntToHex(bufptr + i * CHAR_BIT, Core::g_app_core->GetReg(reg)); |
| 480 | } else if (i == CSPR_REGISTER) { | 480 | } else if (i == CSPR_REGISTER) { |
| 481 | IntToHex(bufptr + i * 8, Core::g_app_core->GetCPSR()); | 481 | IntToHex(bufptr + i * CHAR_BIT, Core::g_app_core->GetCPSR()); |
| 482 | } else if (i < CSPR_REGISTER) { | 482 | } else if (i < CSPR_REGISTER) { |
| 483 | IntToHex(bufptr + i * 8, 0); | 483 | IntToHex(bufptr + i * CHAR_BIT, 0); |
| 484 | IntToHex(bufptr + (i + 1) * 8, 0); | 484 | IntToHex(bufptr + (i + 1) * CHAR_BIT, 0); |
| 485 | i++; // These registers seem to be all 64bit instead of 32bit, so skip two instead of one | 485 | i++; // These registers seem to be all 64bit instead of 32bit, so skip two instead of one |
| 486 | reg++; | 486 | reg++; |
| 487 | } else if (i > CSPR_REGISTER && i < MAX_REGISTERS) { | 487 | } else if (i > CSPR_REGISTER && i < MAX_REGISTERS) { |
| 488 | IntToHex(bufptr + i * 8, Core::g_app_core->GetVFPReg(reg - CSPR_REGISTER - 1)); | 488 | IntToHex(bufptr + i * CHAR_BIT, Core::g_app_core->GetVFPReg(reg - CSPR_REGISTER - 1)); |
| 489 | IntToHex(bufptr + (i + 1) * 8, 0); | 489 | IntToHex(bufptr + (i + 1) * CHAR_BIT, 0); |
| 490 | i++; | 490 | i++; |
| 491 | } else if (i == MAX_REGISTERS) { | 491 | } else if (i == MAX_REGISTERS) { |
| 492 | IntToHex(bufptr + i * 8, Core::g_app_core->GetVFPSystemReg(VFP_FPSCR)); | 492 | IntToHex(bufptr + i * CHAR_BIT, Core::g_app_core->GetVFPSystemReg(VFP_FPSCR)); |
| 493 | } | 493 | } |
| 494 | } | 494 | } |
| 495 | 495 | ||
| @@ -531,17 +531,17 @@ static void WriteRegisters() { | |||
| 531 | 531 | ||
| 532 | for (int i = 0, reg = 0; i <= MAX_REGISTERS; i++, reg++) { | 532 | for (int i = 0, reg = 0; i <= MAX_REGISTERS; i++, reg++) { |
| 533 | if (i <= R15_REGISTER) { | 533 | if (i <= R15_REGISTER) { |
| 534 | Core::g_app_core->SetReg(reg, HexToInt(buffer_ptr + i * 8)); | 534 | Core::g_app_core->SetReg(reg, HexToInt(buffer_ptr + i * CHAR_BIT)); |
| 535 | } else if (i == CSPR_REGISTER) { | 535 | } else if (i == CSPR_REGISTER) { |
| 536 | Core::g_app_core->SetCPSR(HexToInt(buffer_ptr + i * 8)); | 536 | Core::g_app_core->SetCPSR(HexToInt(buffer_ptr + i * CHAR_BIT)); |
| 537 | } else if (i < CSPR_REGISTER) { | 537 | } else if (i < CSPR_REGISTER) { |
| 538 | i++; // These registers seem to be all 64bit instead of 32bit, so skip two instead of one | 538 | i++; // These registers seem to be all 64bit instead of 32bit, so skip two instead of one |
| 539 | reg++; | 539 | reg++; |
| 540 | } else if (i > CSPR_REGISTER && i < MAX_REGISTERS) { | 540 | } else if (i > CSPR_REGISTER && i < MAX_REGISTERS) { |
| 541 | Core::g_app_core->SetVFPReg(reg - CSPR_REGISTER - 1, HexToInt(buffer_ptr + i * 8)); | 541 | Core::g_app_core->SetVFPReg(reg - CSPR_REGISTER - 1, HexToInt(buffer_ptr + i * CHAR_BIT)); |
| 542 | i++; // Skip padding | 542 | i++; // Skip padding |
| 543 | } else if (i == MAX_REGISTERS) { | 543 | } else if (i == MAX_REGISTERS) { |
| 544 | Core::g_app_core->SetVFPSystemReg(VFP_FPSCR, HexToInt(buffer_ptr + i * 8)); | 544 | Core::g_app_core->SetVFPSystemReg(VFP_FPSCR, HexToInt(buffer_ptr + i * CHAR_BIT)); |
| 545 | } | 545 | } |
| 546 | } | 546 | } |
| 547 | 547 | ||