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

Tests+Userland: Implement AARCH64 support for some inline assembly blobs

Browse source
This commit is contained in:
Gunnar Beutner 2022-10-12 22:18:24 +02:00 • committed by Linus Groh
parent dadf656dc9
commit 808c43312d
4 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Tests/Kernel/elf-symbolication-kernel-read-exploit.cpp
View file

@ -11,9 +11,17 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#if ARCH(I386) || ARCH(X86_64)
asm("haxcode:\n" asm("haxcode:\n"
"1: jmp 1b\n" "1: jmp 1b\n"
"haxcode_end:\n"); "haxcode_end:\n");
#elif ARCH(AARCH64)
asm("haxcode:\n"
"1: b 1b\n"
"haxcode_end:\n");
#else
# error Unknown architecture
#endif
extern "C" void haxcode(); extern "C" void haxcode();
extern "C" void haxcode_end(); extern "C" void haxcode_end();

5
Userland/DynamicLoader/main.cpp
View file

@ -62,9 +62,14 @@ void _entry(int, char**, char**) __attribute__((used));
NAKED void _start(int, char**, char**) NAKED void _start(int, char**, char**)
{ {
#ifdef AK_ARCH_AARCH64
asm(
"bl _entry\n");
#else
asm( asm(
"push $0\n" "push $0\n"
"jmp _entry@plt\n"); "jmp _entry@plt\n");
#endif
} }
void _entry(int argc, char** argv, char** envp) void _entry(int argc, char** argv, char** envp)

7
Userland/Libraries/LibC/arch/aarch64/setjmp.S
View file

@ -17,3 +17,10 @@ _longjmp:
longjmp: longjmp:
# FIXME: Possibly incomplete. # FIXME: Possibly incomplete.
ret ret
.global _sigsetjmp
.global sigsetjmp
_sigsetjmp:
sigsetjmp:
# FIXME: Possibly incomplete.
ret

5
Userland/Libraries/LibC/crt0.cpp
View file

@ -25,9 +25,14 @@ void _start(int, char**, char**) __attribute__((used));
NAKED void _start(int, char**, char**) NAKED void _start(int, char**, char**)
{ {
# ifdef AK_ARCH_AARCH64
asm(
"bl _entry\n");
# else
asm( asm(
"push $0\n" "push $0\n"
"jmp _entry@plt\n"); "jmp _entry@plt\n");
# endif
} }
int _entry(int argc, char** argv, char** env) int _entry(int argc, char** argv, char** env)