RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 13:07:46 +00:00
Code Issues Activity Actions

Everywhere: Make the codebase more architecture aware

Browse source
This commit is contained in:
Undefine 2022-07-22 20:48:24 +02:00 • committed by Brian Gianforcaro
parent 6c4b5775e1
commit 97cc33ca47
22 changed files with 108 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibDebug/DebugInfo.cpp
View file

@ -169,8 +169,10 @@ NonnullOwnPtrVector<DebugInfo::VariableInfo> DebugInfo::get_variables_in_current
FlatPtr ip;
#if ARCH(I386)
ip = regs.eip;
#else
#elif ARCH(X86_64)
ip = regs.rip;
#else
# error Unknown architecture
#endif
if (ip - m_base_address < scope.address_low || ip - m_base_address >= scope.address_high)
continue;

8
Userland/Libraries/LibDebug/DebugSession.cpp
View file

@ -346,8 +346,10 @@ FlatPtr DebugSession::single_step()
constexpr u32 TRAP_FLAG = 0x100;
#if ARCH(I386)
regs.eflags |= TRAP_FLAG;
#else
#elif ARCH(X86_64)
regs.rflags |= TRAP_FLAG;
#else
# error Unknown architecture
#endif
set_registers(regs);
@ -361,8 +363,10 @@ FlatPtr DebugSession::single_step()
regs = get_registers();
#if ARCH(I386)
regs.eflags &= ~(TRAP_FLAG);
#else
#elif ARCH(X86_64)
regs.rflags &= ~(TRAP_FLAG);
#else
# error Unknown architecture
#endif
set_registers(regs);
return regs.ip();

12
Userland/Libraries/LibDebug/DebugSession.h
View file

@ -186,8 +186,10 @@ void DebugSession::run(DesiredInitialDebugeeState initial_debugee_state, Callbac
#if ARCH(I386)
FlatPtr current_instruction = regs.eip;
#else
#elif ARCH(X86_64)
FlatPtr current_instruction = regs.rip;
#else
# error Unknown architecture
#endif
auto debug_status = peek_debug(DEBUG_STATUS_REGISTER);
@ -207,8 +209,10 @@ void DebugSession::run(DesiredInitialDebugeeState initial_debugee_state, Callbac
#if ARCH(I386)
FlatPtr current_ebp = regs.ebp;
#else
#elif ARCH(X86_64)
FlatPtr current_ebp = regs.rbp;
#else
# error Unknown architecture
#endif
do {
@ -253,8 +257,10 @@ void DebugSession::run(DesiredInitialDebugeeState initial_debugee_state, Callbac
auto breakpoint_addr = bit_cast<FlatPtr>(current_breakpoint.value().address);
#if ARCH(I386)
regs.eip = breakpoint_addr;
#else
#elif ARCH(X86_64)
regs.rip = breakpoint_addr;
#else
# error Unknown architecture
#endif
set_registers(regs);
disable_breakpoint(current_breakpoint.value().address);