prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work towards interfacing with Dynarmic.

Browse Source
This commit is contained in:
Jarek Syrylak
2018-07-19 17:43:18 +01:00
parent 1046a4d6c3
commit 6662a695e9
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/arm/unicorn/arm_unicorn.cpp
View File

@@ -188,12 +188,18 @@ void ARM_Unicorn::ExecuteInstructions(int num_instructions) {
CHECKED(uc_emu_start(uc, GetPC(), 1ULL << 63, 0, num_instructions));
CoreTiming::AddTicks(num_instructions);
if (GDBStub::IsServerEnabled()) {
//u64 pc = GetPC();
//GDBStub::BreakpointAddress bkpt = GDBStub::GetNextBreakpointFromAddress(pc, GDBStub::BreakpointType::Execute);
//if(bkpt.type != GDBStub::BreakpointType::None && bkpt.address == pc)
//{
// RecordBreak(bkpt);
//}
if (last_bkpt_hit) {
uc_reg_write(uc, UC_ARM64_REG_PC, &last_bkpt.address);
}
Kernel::Thread* thread = Kernel::GetCurrentThread();
SaveContext(thread->context);
if (last_bkpt_hit || (num_instructions == 1)) {
if (last_bkpt_hit || (num_instructions == 1 && GDBStub::GetCpuHaltFlag())) {
last_bkpt_hit = false;
GDBStub::Break();
GDBStub::SendTrap(thread, 5);

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

@@ -174,6 +174,7 @@ struct Breakpoint {
bool active;
PAddr addr;
u64 len;
u8 old[4];
};
static std::map<u64, Breakpoint> breakpoints_execute;
@@ -449,6 +450,7 @@ static void RemoveBreakpoint(BreakpointType type, PAddr addr) {
if (bp != p.end()) {
LOG_DEBUG(Debug_GDBStub, "gdb: removed a breakpoint: {:016X} bytes at {:016X} of type {}",
bp->second.len, bp->second.addr, static_cast<int>(type));
Memory::WriteBlock(bp->second.addr, bp->second.old, 4);
p.erase(static_cast<u64>(addr));
}
}
@@ -983,6 +985,9 @@ static bool CommitBreakpoint(BreakpointType type, PAddr addr, u64 len) {
breakpoint.active = true;
breakpoint.addr = addr;
breakpoint.len = len;
Memory::ReadBlock(addr, breakpoint.old, 4);
static const u8 bkpt0[] = {0xd4, 0x20, 0x00, 0x00};
Memory::WriteBlock(addr, bkpt0, 4);
p.insert({addr, breakpoint});
LOG_DEBUG(Debug_GDBStub, "gdb: added {} breakpoint: {:016X} bytes at {:016X}",