niansa/UEFILinux
1
0
Fork 0
mirror of synced 2025-03-06 20:53:36 +01:00
Code Releases Activity

Implement heap management correctly

Browse source
This commit is contained in:
niansa/tuxifan 2024-04-03 11:10:57 +02:00
parent c3a091cbc2
commit 41b0a5310f
5 changed files with 45 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Makefile
View file

@ -7,37 +7,37 @@ clean:
obj/clibc-user-impl-c.o: src/clibc-user-impl.c obj/clibc-user-impl-c.o: src/clibc-user-impl.c
gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c src/clibc-user-impl.c -o obj/clibc-user-impl-c.o gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -DCLIBC_NO_LL_HEAP -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c src/clibc-user-impl.c -o obj/clibc-user-impl-c.o
obj/linux-uefi-c.o: src/linux-uefi.c obj/linux-uefi-c.o: src/linux-uefi.c
gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c src/linux-uefi.c -o obj/linux-uefi-c.o gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -DCLIBC_NO_LL_HEAP -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c src/linux-uefi.c -o obj/linux-uefi-c.o
obj/main-c.o: src/main.c obj/main-c.o: src/main.c
gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c src/main.c -o obj/main-c.o gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -DCLIBC_NO_LL_HEAP -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c src/main.c -o obj/main-c.o
obj/atof-c.o: crosslibc/atof.c obj/atof-c.o: crosslibc/atof.c
gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c crosslibc/atof.c -o obj/atof-c.o gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -DCLIBC_NO_LL_HEAP -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c crosslibc/atof.c -o obj/atof-c.o
obj/heap-c.o: crosslibc/heap.c obj/heap-c.o: crosslibc/heap.c
gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c crosslibc/heap.c -o obj/heap-c.o gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -DCLIBC_NO_LL_HEAP -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c crosslibc/heap.c -o obj/heap-c.o
obj/math-c.o: crosslibc/math.c obj/math-c.o: crosslibc/math.c
gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c crosslibc/math.c -o obj/math-c.o gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -DCLIBC_NO_LL_HEAP -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c crosslibc/math.c -o obj/math-c.o
obj/stdio-c.o: crosslibc/stdio.c obj/stdio-c.o: crosslibc/stdio.c
gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c crosslibc/stdio.c -o obj/stdio-c.o gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -DCLIBC_NO_LL_HEAP -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c crosslibc/stdio.c -o obj/stdio-c.o
obj/string-c.o: crosslibc/string.c obj/string-c.o: crosslibc/string.c
gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c crosslibc/string.c -o obj/string-c.o gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -DCLIBC_NO_LL_HEAP -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c crosslibc/string.c -o obj/string-c.o
obj/strtod-c.o: crosslibc/strtod.c obj/strtod-c.o: crosslibc/strtod.c
gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c crosslibc/strtod.c -o obj/strtod-c.o gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -DCLIBC_NO_LL_HEAP -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c crosslibc/strtod.c -o obj/strtod-c.o
obj/printf-c.o: crosslibc/printf/printf.c obj/printf-c.o: crosslibc/printf/printf.c
gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c crosslibc/printf/printf.c -o obj/printf-c.o gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -DCLIBC_NO_LL_HEAP -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c crosslibc/printf/printf.c -o obj/printf-c.o
obj/cppbase-cpp.o: crosslibc/cppbase.cpp obj/cppbase-cpp.o: crosslibc/cppbase.cpp
gcc -std=c++17 -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -fno-rtti -nostdinc++ -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c crosslibc/cppbase.cpp -o obj/cppbase-cpp.o gcc -std=c++17 -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -DCLIBC_NO_LL_HEAP -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -fno-rtti -nostdinc++ -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c crosslibc/cppbase.cpp -o obj/cppbase-cpp.o
efi: bin/efitest.efi efi: bin/efitest.efi

2
crosslibc

@ -1 +1 @@
Subproject commit faea33e55eca7346604afe6281244ba651ab2300 Subproject commit 9feaa3b5c1ef2aa056027c465a4f997db9366425

2
prep.sh
View file

@ -9,7 +9,7 @@ INCLUDE_PATHS="include include/compat nolibc crosslibc crosslibc/STL /usr/incl
# Config # Config
ARCH="x86_64" # Warning: Also specified in Makefile_cst ARCH="x86_64" # Warning: Also specified in Makefile_cst
COMPILER="gcc" COMPILER="gcc"
COMPILER_FLAGS="-DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch" COMPILER_FLAGS="-DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -DCLIBC_NO_LL_HEAP -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch"
COMPILER_FLAGS_CXX="-fno-rtti -nostdinc++" COMPILER_FLAGS_CXX="-fno-rtti -nostdinc++"
ASSEMBLER="nasm" ASSEMBLER="nasm"
ASSEMBLER_FLAGS="" ASSEMBLER_FLAGS=""

25
src/clibc-user-impl.c
View file

@ -16,3 +16,28 @@ void _puts(const char *str) {
write(1, str, strlen(str)); write(1, str, strlen(str));
_putchar('\n'); _putchar('\n');
} }
void heap_init() {
// Nothing to do
}
void *heap_alloc(size_t *size) {
return mmap(NULL, *size, PROT_READ | PROT_WRITE, MAP_PRIVATE, -1, 0);
}
void heap_dealloc(void *memptr, size_t size) {
munmap(memptr, size);
}
size_t get_mem_used() {
return 0;
}
size_t get_mem_total() {
return 0;
}
size_t get_mem_free() {
return 0;
}

7
src/main.c
View file

@ -2,6 +2,7 @@
#include <stdio.h> #include <stdio.h>
#include <stddef.h> #include <stddef.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
@ -22,6 +23,12 @@ int main(int argc, char **argv) {
} }
printf("\n"); printf("\n");
puts("Testing malloc()...");
char *mbuf = malloc(16);
strcpy(mbuf, "Hello");
puts("Testing free()...");
free(mbuf);
puts("Testing getline() from stdin..."); puts("Testing getline() from stdin...");
char *input_buf = NULL; char *input_buf = NULL;
size_t input_len; size_t input_len;