yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

Add a register variable to loops

This commit is contained in:
polaris- 2015-10-21 07:45:35 -04:00
parent d7e346239b
commit d1f73c424f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/gdbstub/gdbstub.cpp
View File

@ -488,17 +488,18 @@ static void ReadRegisters() {
memset(buffer, 0, sizeof(buffer)); memset(buffer, 0, sizeof(buffer));
u8* bufptr = buffer; u8* bufptr = buffer;
for (int i = 0; i <= MAX_REGISTERS; i++) { for (int i = 0, reg = 0; i <= MAX_REGISTERS; i++, reg++) {
if (i <= R15_REGISTER) { if (i <= R15_REGISTER) {
IntToHex(bufptr + i * 8, Core::g_app_core->GetReg(i)); IntToHex(bufptr + i * 8, Core::g_app_core->GetReg(reg));
} else if (i == CSPR_REGISTER) { } else if (i == CSPR_REGISTER) {
IntToHex(bufptr + i * 8, Core::g_app_core->GetCPSR()); IntToHex(bufptr + i * 8, Core::g_app_core->GetCPSR());
} else if (i < CSPR_REGISTER) { } else if (i < CSPR_REGISTER) {
IntToHex(bufptr + i * 8, 0); IntToHex(bufptr + i * 8, 0);
IntToHex(bufptr + (i + 1) * 8, 0); IntToHex(bufptr + (i + 1) * 8, 0);
i++; // These registers seem to be all 64bit instead of 32bit, so skip two instead of one i++; // These registers seem to be all 64bit instead of 32bit, so skip two instead of one
reg++;
} else if (i > CSPR_REGISTER && i < MAX_REGISTERS) { } else if (i > CSPR_REGISTER && i < MAX_REGISTERS) {
IntToHex(bufptr + i * 8, Core::g_app_core->GetVFPReg(i - CSPR_REGISTER - 1)); IntToHex(bufptr + i * 8, Core::g_app_core->GetVFPReg(reg - CSPR_REGISTER - 1));
IntToHex(bufptr + (i + 1) * 8, 0); IntToHex(bufptr + (i + 1) * 8, 0);
i++; i++;
} else if (i == MAX_REGISTERS) { } else if (i == MAX_REGISTERS) {
@ -542,15 +543,17 @@ static void WriteRegisters() {
if (command_buffer[0] != 'G') if (command_buffer[0] != 'G')
return SendReply("E01"); return SendReply("E01");
for (int i = 0; i <= MAX_REGISTERS; i++) { for (int i = 0, reg = 0; i <= MAX_REGISTERS; i++, reg++) {
if (i <= R15_REGISTER) { if (i <= R15_REGISTER) {
Core::g_app_core->SetReg(i, HexToInt(buffer_ptr + i * 8)); Core::g_app_core->SetReg(reg, HexToInt(buffer_ptr + i * 8));
} else if (i == CSPR_REGISTER) { } else if (i == CSPR_REGISTER) {
Core::g_app_core->SetCPSR(HexToInt(buffer_ptr + i * 8)); Core::g_app_core->SetCPSR(HexToInt(buffer_ptr + i * 8));
} else if (i < CSPR_REGISTER) { } else if (i < CSPR_REGISTER) {
i++; // These registers seem to be all 64bit instead of 32bit, so skip two instead of one i++; // These registers seem to be all 64bit instead of 32bit, so skip two instead of one
reg++;
} else if (i > CSPR_REGISTER && i < MAX_REGISTERS) { } else if (i > CSPR_REGISTER && i < MAX_REGISTERS) {
Core::g_app_core->SetVFPReg(i - CSPR_REGISTER - 1, HexToInt(buffer_ptr + i * 8)); Core::g_app_core->SetVFPReg(reg - CSPR_REGISTER - 1, HexToInt(buffer_ptr + i * 8));
i++; // Skip padding
} else if (i == MAX_REGISTERS) { } else if (i == MAX_REGISTERS) {
Core::g_app_core->SetVFPSystemReg(VFP_FPSCR, HexToInt(buffer_ptr + i * 8)); Core::g_app_core->SetVFPSystemReg(VFP_FPSCR, HexToInt(buffer_ptr + i * 8));
} }