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

Userland: Fix 64-bit portability issues

Browse source
This commit is contained in:
Gunnar Beutner 2021-05-02 00:00:52 +02:00 • committed by Andreas Kling
parent fdbe66a7b4
commit b613817bca
15 changed files with 59 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Userland/Libraries/LibC/inttypes.h
View file

@ -18,23 +18,40 @@ __BEGIN_DECLS
#define PRIi8 "d"
#define PRIi16 "d"
#define PRIi32 "d"
#define PRIi64 "lld"
#ifndef __LP64__
# define PRIi64 "lld"
#else
# define PRIi64 "ld"
#endif
#define PRIu8 "u"
#define PRIo8 "o"
#define PRIo16 "o"
#define PRIo32 "o"
#define PRIo64 "llo"
#ifndef __LP64__
# define PRIo64 "llo"
#else
# define PRIo64 "lo"
#endif
#define PRIu16 "u"
#define PRIu32 "u"
#define PRIu64 "llu"
#ifndef __LP64__
# define PRIu64 "llu"
#else
# define PRIu64 "lu"
#endif
#define PRIx8 "b"
#define PRIX8 "hhX"
#define PRIx16 "w"
#define PRIX16 "hX"
#define PRIx32 "x"
#define PRIX32 "X"
#define PRIx64 "llx"
#define PRIX64 "llX"
#ifndef __LP64__
# define PRIx64 "llx"
# define PRIX64 "llX"
#else
# define PRIx64 "lx"
# define PRIX64 "lX"
#endif
#define __PRI64_PREFIX "ll"
#define __PRIPTR_PREFIX

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

@ -259,7 +259,7 @@ void DebugSession::run(DesiredInitialDebugeeState initial_debugee_state, Callbac
Optional<BreakPoint> current_breakpoint;
if (state == State::FreeRun || state == State::Syscall) {
current_breakpoint = m_breakpoints.get((void*)((u32)regs.eip - 1));
current_breakpoint = m_breakpoints.get((void*)((uintptr_t)regs.eip - 1));
if (current_breakpoint.has_value())
state = State::FreeRun;
} else {