mirror of
https://github.com/yuzu-emu/yuzu-android.git
synced 2024-11-23 02:45:39 +01:00
GDBStub improvements:
- Add FPU support - Fix access to TLS Fix clang-format.
This commit is contained in:
parent
65bd03d74c
commit
af42320021
@ -377,7 +377,7 @@ if (CLANG_FORMAT)
|
|||||||
set(CCOMMENT "Running clang format against all the .h and .cpp files in src/")
|
set(CCOMMENT "Running clang format against all the .h and .cpp files in src/")
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
add_custom_target(clang-format
|
add_custom_target(clang-format
|
||||||
COMMAND powershell.exe -Command "${CLANG_FORMAT} -i @(Get-ChildItem -Recurse ${SRCS}/* -Include \'*.h\', \'*.cpp\')"
|
COMMAND powershell.exe -Command "Get-ChildItem ${SRCS}/* -Include *.cpp,*.h -Recurse | Foreach {${CLANG_FORMAT} -i $_.fullname}"
|
||||||
COMMENT ${CCOMMENT})
|
COMMENT ${CCOMMENT})
|
||||||
elseif(MINGW)
|
elseif(MINGW)
|
||||||
add_custom_target(clang-format
|
add_custom_target(clang-format
|
||||||
|
@ -71,10 +71,6 @@ constexpr u32 PSTATE_REGISTER = 33;
|
|||||||
constexpr u32 UC_ARM64_REG_Q0 = 34;
|
constexpr u32 UC_ARM64_REG_Q0 = 34;
|
||||||
constexpr u32 FPCR_REGISTER = 66;
|
constexpr u32 FPCR_REGISTER = 66;
|
||||||
|
|
||||||
// TODO/WiP - Used while working on support for FPU
|
|
||||||
constexpr u32 TODO_DUMMY_REG_997 = 997;
|
|
||||||
constexpr u32 TODO_DUMMY_REG_998 = 998;
|
|
||||||
|
|
||||||
// For sample XML files see the GDB source /gdb/features
|
// For sample XML files see the GDB source /gdb/features
|
||||||
// GDB also wants the l character at the start
|
// GDB also wants the l character at the start
|
||||||
// This XML defines what the registers are for this specific ARM device
|
// This XML defines what the registers are for this specific ARM device
|
||||||
@ -260,6 +256,36 @@ static void RegWrite(std::size_t id, u64 val, Kernel::Thread* thread = nullptr)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static u128 FpuRead(std::size_t id, Kernel::Thread* thread = nullptr) {
|
||||||
|
if (!thread) {
|
||||||
|
return u128{0};
|
||||||
|
}
|
||||||
|
|
||||||
|
auto& thread_context = thread->GetContext();
|
||||||
|
|
||||||
|
if (id >= UC_ARM64_REG_Q0 && id < FPCR_REGISTER) {
|
||||||
|
return thread_context.vector_registers[id - UC_ARM64_REG_Q0];
|
||||||
|
} else if (id == FPCR_REGISTER) {
|
||||||
|
return u128{thread_context.fpcr, 0};
|
||||||
|
} else {
|
||||||
|
return u128{0};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void FpuWrite(std::size_t id, u128 val, Kernel::Thread* thread = nullptr) {
|
||||||
|
if (!thread) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto& thread_context = thread->GetContext();
|
||||||
|
|
||||||
|
if (id >= UC_ARM64_REG_Q0 && id < FPCR_REGISTER) {
|
||||||
|
thread_context.vector_registers[id - UC_ARM64_REG_Q0] = val;
|
||||||
|
} else if (id == FPCR_REGISTER) {
|
||||||
|
thread_context.fpcr = val[0];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Turns hex string character into the equivalent byte.
|
* Turns hex string character into the equivalent byte.
|
||||||
*
|
*
|
||||||
@ -409,6 +435,27 @@ static u64 GdbHexToLong(const u8* src) {
|
|||||||
return output;
|
return output;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Convert a gdb-formatted hex string into a u128.
|
||||||
|
*
|
||||||
|
* @param src Pointer to hex string.
|
||||||
|
*/
|
||||||
|
static u128 GdbHexToU128(const u8* src) {
|
||||||
|
u128 output;
|
||||||
|
|
||||||
|
for (int i = 0; i < 16; i += 2) {
|
||||||
|
output[0] = (output[0] << 4) | HexCharToValue(src[15 - i - 1]);
|
||||||
|
output[0] = (output[0] << 4) | HexCharToValue(src[15 - i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = 0; i < 16; i += 2) {
|
||||||
|
output[1] = (output[1] << 4) | HexCharToValue(src[16 + 15 - i - 1]);
|
||||||
|
output[1] = (output[1] << 4) | HexCharToValue(src[16 + 15 - i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
|
||||||
/// Read a byte from the gdb client.
|
/// Read a byte from the gdb client.
|
||||||
static u8 ReadByte() {
|
static u8 ReadByte() {
|
||||||
u8 c;
|
u8 c;
|
||||||
@ -599,8 +646,7 @@ static void HandleQuery() {
|
|||||||
for (u32 core = 0; core < Core::NUM_CPU_CORES; core++) {
|
for (u32 core = 0; core < Core::NUM_CPU_CORES; core++) {
|
||||||
const auto& threads = Core::System::GetInstance().Scheduler(core).GetThreadList();
|
const auto& threads = Core::System::GetInstance().Scheduler(core).GetThreadList();
|
||||||
for (const auto& thread : threads) {
|
for (const auto& thread : threads) {
|
||||||
val += fmt::format("{:x}", thread->GetThreadID());
|
val += fmt::format("{:x},", thread->GetThreadID());
|
||||||
val += ",";
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
val.pop_back();
|
val.pop_back();
|
||||||
@ -791,11 +837,15 @@ static void ReadRegister() {
|
|||||||
} else if (id == PSTATE_REGISTER) {
|
} else if (id == PSTATE_REGISTER) {
|
||||||
IntToGdbHex(reply, static_cast<u32>(RegRead(id, current_thread)));
|
IntToGdbHex(reply, static_cast<u32>(RegRead(id, current_thread)));
|
||||||
} else if (id >= UC_ARM64_REG_Q0 && id < FPCR_REGISTER) {
|
} else if (id >= UC_ARM64_REG_Q0 && id < FPCR_REGISTER) {
|
||||||
LongToGdbHex(reply, RegRead(id, current_thread));
|
u128 r = FpuRead(id, current_thread);
|
||||||
|
LongToGdbHex(reply, r[0]);
|
||||||
|
LongToGdbHex(reply + 16, r[1]);
|
||||||
} else if (id == FPCR_REGISTER) {
|
} else if (id == FPCR_REGISTER) {
|
||||||
LongToGdbHex(reply, RegRead(TODO_DUMMY_REG_998, current_thread));
|
u128 r = FpuRead(id, current_thread);
|
||||||
} else {
|
IntToGdbHex(reply, static_cast<u32>(r[0]));
|
||||||
LongToGdbHex(reply, RegRead(TODO_DUMMY_REG_997, current_thread));
|
} else if (id == FPCR_REGISTER + 1) {
|
||||||
|
u128 r = FpuRead(id, current_thread);
|
||||||
|
IntToGdbHex(reply, static_cast<u32>(r[0] >> 32));
|
||||||
}
|
}
|
||||||
|
|
||||||
SendReply(reinterpret_cast<char*>(reply));
|
SendReply(reinterpret_cast<char*>(reply));
|
||||||
@ -822,13 +872,18 @@ static void ReadRegisters() {
|
|||||||
|
|
||||||
bufptr += 8;
|
bufptr += 8;
|
||||||
|
|
||||||
for (u32 reg = UC_ARM64_REG_Q0; reg <= UC_ARM64_REG_Q0 + 31; reg++) {
|
u128 r;
|
||||||
LongToGdbHex(bufptr + reg * 16, RegRead(reg, current_thread));
|
|
||||||
|
for (u32 reg = UC_ARM64_REG_Q0; reg < FPCR_REGISTER; reg++) {
|
||||||
|
r = FpuRead(reg, current_thread);
|
||||||
|
LongToGdbHex(bufptr + reg * 32, r[0]);
|
||||||
|
LongToGdbHex(bufptr + reg * 32 + 16, r[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
bufptr += 32 * 32;
|
bufptr += 32 * 32;
|
||||||
|
|
||||||
LongToGdbHex(bufptr, RegRead(TODO_DUMMY_REG_998, current_thread));
|
r = FpuRead(FPCR_REGISTER, current_thread);
|
||||||
|
IntToGdbHex(bufptr, static_cast<u32>(r[0]));
|
||||||
|
|
||||||
bufptr += 8;
|
bufptr += 8;
|
||||||
|
|
||||||
@ -853,14 +908,12 @@ static void WriteRegister() {
|
|||||||
} else if (id == PSTATE_REGISTER) {
|
} else if (id == PSTATE_REGISTER) {
|
||||||
RegWrite(id, GdbHexToInt(buffer_ptr), current_thread);
|
RegWrite(id, GdbHexToInt(buffer_ptr), current_thread);
|
||||||
} else if (id >= UC_ARM64_REG_Q0 && id < FPCR_REGISTER) {
|
} else if (id >= UC_ARM64_REG_Q0 && id < FPCR_REGISTER) {
|
||||||
RegWrite(id, GdbHexToLong(buffer_ptr), current_thread);
|
FpuWrite(id, GdbHexToU128(buffer_ptr), current_thread);
|
||||||
} else if (id == FPCR_REGISTER) {
|
} else if (id == FPCR_REGISTER) {
|
||||||
RegWrite(TODO_DUMMY_REG_998, GdbHexToLong(buffer_ptr), current_thread);
|
} else if (id == FPCR_REGISTER + 1) {
|
||||||
} else {
|
|
||||||
RegWrite(TODO_DUMMY_REG_997, GdbHexToLong(buffer_ptr), current_thread);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update Unicorn context skipping scheduler, no running threads at this point
|
// Update ARM context, skipping scheduler - no running threads at this point
|
||||||
Core::System::GetInstance()
|
Core::System::GetInstance()
|
||||||
.ArmInterface(current_core)
|
.ArmInterface(current_core)
|
||||||
.LoadContext(current_thread->GetContext());
|
.LoadContext(current_thread->GetContext());
|
||||||
@ -885,13 +938,13 @@ static void WriteRegisters() {
|
|||||||
} else if (reg >= UC_ARM64_REG_Q0 && reg < FPCR_REGISTER) {
|
} else if (reg >= UC_ARM64_REG_Q0 && reg < FPCR_REGISTER) {
|
||||||
RegWrite(reg, GdbHexToLong(buffer_ptr + i * 16), current_thread);
|
RegWrite(reg, GdbHexToLong(buffer_ptr + i * 16), current_thread);
|
||||||
} else if (reg == FPCR_REGISTER) {
|
} else if (reg == FPCR_REGISTER) {
|
||||||
RegWrite(TODO_DUMMY_REG_998, GdbHexToLong(buffer_ptr + i * 16), current_thread);
|
RegWrite(FPCR_REGISTER, GdbHexToLong(buffer_ptr + i * 16), current_thread);
|
||||||
} else {
|
} else if (reg == FPCR_REGISTER + 1) {
|
||||||
UNIMPLEMENTED();
|
RegWrite(FPCR_REGISTER, GdbHexToLong(buffer_ptr + i * 16), current_thread);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update Unicorn context skipping scheduler, no running threads at this point
|
// Update ARM context, skipping scheduler - no running threads at this point
|
||||||
Core::System::GetInstance()
|
Core::System::GetInstance()
|
||||||
.ArmInterface(current_core)
|
.ArmInterface(current_core)
|
||||||
.LoadContext(current_thread->GetContext());
|
.LoadContext(current_thread->GetContext());
|
||||||
@ -917,12 +970,6 @@ static void ReadMemory() {
|
|||||||
SendReply("E01");
|
SendReply("E01");
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto& vm_manager = Core::CurrentProcess()->VMManager();
|
|
||||||
if (addr < vm_manager.GetCodeRegionBaseAddress() ||
|
|
||||||
addr >= vm_manager.GetMapRegionEndAddress()) {
|
|
||||||
return SendReply("E00");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!Memory::IsValidVirtualAddress(addr)) {
|
if (!Memory::IsValidVirtualAddress(addr)) {
|
||||||
return SendReply("E00");
|
return SendReply("E00");
|
||||||
}
|
}
|
||||||
@ -967,7 +1014,7 @@ void Break(bool is_memory_break) {
|
|||||||
static void Step() {
|
static void Step() {
|
||||||
if (command_length > 1) {
|
if (command_length > 1) {
|
||||||
RegWrite(PC_REGISTER, GdbHexToLong(command_buffer + 1), current_thread);
|
RegWrite(PC_REGISTER, GdbHexToLong(command_buffer + 1), current_thread);
|
||||||
// Update Unicorn context skipping scheduler, no running threads at this point
|
// Update ARM context, skipping scheduler - no running threads at this point
|
||||||
Core::System::GetInstance()
|
Core::System::GetInstance()
|
||||||
.ArmInterface(current_core)
|
.ArmInterface(current_core)
|
||||||
.LoadContext(current_thread->GetContext());
|
.LoadContext(current_thread->GetContext());
|
||||||
@ -1010,7 +1057,7 @@ static bool CommitBreakpoint(BreakpointType type, VAddr addr, u64 len) {
|
|||||||
breakpoint.addr = addr;
|
breakpoint.addr = addr;
|
||||||
breakpoint.len = len;
|
breakpoint.len = len;
|
||||||
Memory::ReadBlock(addr, breakpoint.inst.data(), breakpoint.inst.size());
|
Memory::ReadBlock(addr, breakpoint.inst.data(), breakpoint.inst.size());
|
||||||
static constexpr std::array<u8, 4> btrap{{0x00, 0x7d, 0x20, 0xd4}};
|
static constexpr std::array<u8, 4> btrap{0x00, 0x7d, 0x20, 0xd4};
|
||||||
Memory::WriteBlock(addr, btrap.data(), btrap.size());
|
Memory::WriteBlock(addr, btrap.data(), btrap.size());
|
||||||
Core::System::GetInstance().InvalidateCpuInstructionCaches();
|
Core::System::GetInstance().InvalidateCpuInstructionCaches();
|
||||||
p.insert({addr, breakpoint});
|
p.insert({addr, breakpoint});
|
||||||
@ -1321,7 +1368,10 @@ void SetCpuStepFlag(bool is_step) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void SendTrap(Kernel::Thread* thread, int trap) {
|
void SendTrap(Kernel::Thread* thread, int trap) {
|
||||||
if (send_trap) {
|
if (!send_trap) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (!halt_loop || current_thread == thread) {
|
if (!halt_loop || current_thread == thread) {
|
||||||
current_thread = thread;
|
current_thread = thread;
|
||||||
SendSignal(thread, trap);
|
SendSignal(thread, trap);
|
||||||
@ -1329,5 +1379,4 @@ void SendTrap(Kernel::Thread* thread, int trap) {
|
|||||||
halt_loop = true;
|
halt_loop = true;
|
||||||
send_trap = false;
|
send_trap = false;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}; // namespace GDBStub
|
}; // namespace GDBStub
|
||||||
|
Loading…
Reference in New Issue
Block a user