Fennix/Userspace
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Userspace.git synced 2025-05-28 15:34:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update init

Browse Source
This commit is contained in:
Alex 2022-11-07 03:37:56 +02:00
parent 887f67e32d
commit a147ee7e5f
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
3 changed files with 24 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
apps/system/init/Makefile
View File

@ -1,7 +1,9 @@
# Config file # Config file
include ../../../../Makefile.conf include ../../../../Makefile.conf
FILENAME = init.fex FILENAME = init.elf
SYSROOT = --sysroot=../../../out/system/
CC = ../../../../$(COMPILER_PATH)/$(COMPILER_ARCH)gcc CC = ../../../../$(COMPILER_PATH)/$(COMPILER_ARCH)gcc
CPP = ../../../../$(COMPILER_PATH)/$(COMPILER_ARCH)g++ CPP = ../../../../$(COMPILER_PATH)/$(COMPILER_ARCH)g++
@ -25,16 +27,11 @@ S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not
C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i686/*")
CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i686/*")
endif endif
HEADERS = $(sort $(dir $(wildcard ./include/*))) HEADERS = $(sort $(dir $(wildcard ../../../out/system/include/*)))
OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o) OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o)
INCLUDE_DIR = ./include INCLUDE_DIR = ../../../out/system/include
LDFLAGS := \ LDFLAGS := -fPIC -Wl,-Map file.map
-fPIC -fno-pie \
-Wl,-static,--no-dynamic-linker,-ztext \
-nostdlib -nodefaultlibs -nolibc \
-zmax-page-size=0x1000 \
-Wl,-Map file.map -shared
WARNCFLAG = -Wall -Wextra WARNCFLAG = -Wall -Wextra
@ -45,38 +42,27 @@ CFLAGS := \
ifeq ($(OSARCH), amd64) ifeq ($(OSARCH), amd64)
CFLAGS += -fPIC -fno-pie -mno-80387 -mno-mmx -mno-3dnow \ CFLAGS += -fPIC -march=x86-64
-mno-red-zone -mno-sse -mno-sse2 \
-march=x86-64 -pipe -ffunction-sections \
-mcmodel=kernel -msoft-float -fno-builtin
LDFLAGS += -Tarch/amd64/linker.ld LDFLAGS += -Tarch/amd64/linker.ld
else ifeq ($(OSARCH), i686) else ifeq ($(OSARCH), i686)
CFLAGS += -fPIC -fno-pie -mno-80387 -mno-mmx -mno-3dnow \ CFLAGS += -fPIC -march=i686
-mno-red-zone -mno-sse -mno-sse2 -ffunction-sections \
-march=i686 -pipe -msoft-float -fno-builtin
LDFLAGS += -Tarch/i686/linker.ld LDFLAGS += -Tarch/i686/linker.ld
else ifeq ($(OSARCH), aarch64) else ifeq ($(OSARCH), aarch64)
CFLAGS += -pipe -fno-builtin -fPIC CFLAGS += -pipe -fPIC
LDFLAGS += -Tarch/aarch64/linker.ld LDFLAGS += -Tarch/aarch64/linker.ld
endif endif
build: $(FILENAME) build: $(FILENAME)
ifeq ($(OSARCH), amd64) $(OBJDUMP) -d $(FILENAME) > file_dump.map
$(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map
else ifeq ($(OSARCH), i686)
else ifeq ($(OSARCH), aarch64)
endif
mv $(FILENAME) ../../../out/system/$(FILENAME) mv $(FILENAME) ../../../out/system/$(FILENAME)
$(FILENAME): $(OBJ) $(FILENAME): $(OBJ)
$(CC) $(LDFLAGS) $(OBJ) -o $@ $(CC) $(LDFLAGS) $(SYSROOT) $(OBJ) -o $@
%.o: %.c $(HEADERS) %.o: %.c $(HEADERS)
$(info Compiling $<) $(info Compiling $<)

7
apps/system/init/arch/amd64/linker.ld
View File

@ -1,15 +1,10 @@
OUTPUT_FORMAT(binary) OUTPUT_FORMAT(elf64-x86-64)
OUTPUT_ARCH(i386:x86-64) OUTPUT_ARCH(i386:x86-64)
ENTRY(_start) ENTRY(_start)
SECTIONS SECTIONS
{ {
.header :
{
*(.header .header.*)
}
.text : .text :
{ {
*(.text .text.*) *(.text .text.*)

36
apps/system/init/init.cpp
View File

@ -1,29 +1,17 @@
#include "../../../../Kernel/Fex.hpp"
extern "C" int _start(void *Data);
HEAD(FexFormatType_Executable, FexOSType_Fennix, _start);
#define DEFINE_SYSCALL0(function, n) \
static inline long syscall_##function() \
{ \
long a = n; \
__asm__ __volatile__("pushq %%r11\n" \
"pushq %%rcx\n" \
"syscall\n" \
"popq %%rcx\n" \
"popq %%r11\n" \
: "=a"(a) \
: "a"((long)a)); \
return a; \
}
DEFINE_SYSCALL0(exit, 1);
#define UNUSED(x) (void)(x) #define UNUSED(x) (void)(x)
extern "C" int _start(void *Data) extern "C" int main(int argc, char *argv[], char *envp[])
{ {
UNUSED(Data); UNUSED(argc);
syscall_exit(); UNUSED(argv);
UNUSED(envp);
// unsigned long ret;
// asm volatile("syscall"
// : "=a"(ret)
// : "a"(1), "D"(1)
// : "rcx", "r11", "memory");
// syscall_exit();
return 0; return 0;
} }