diff options
| author | Marvin Borner | 2020-08-15 13:45:41 +0200 |
|---|---|---|
| committer | Marvin Borner | 2020-08-15 13:45:41 +0200 |
| commit | 162c84cfe6b4652bae213776944b910390553d41 (patch) | |
| tree | 737645fb79228393a9ef463ba5e01b92659ea43e | |
| parent | cb47a048d233e1f2433c815a06d53d8087e19dad (diff) | |
Reverted PIE binaries and fixed userspace lib
| -rw-r--r-- | apps/Makefile | 11 | ||||
| -rw-r--r-- | kernel/features/load.c | 8 | ||||
| -rw-r--r-- | kernel/features/proc.c | 2 | ||||
| -rw-r--r-- | lib/Makefile | 2 |
4 files changed, 15 insertions, 8 deletions
diff --git a/apps/Makefile b/apps/Makefile index 5a6ec67..7678a0b 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -3,15 +3,22 @@ COBJS = a.o b.o init.o CC = ../cross/opt/bin/i686-elf-gcc LD = ../cross/opt/bin/i686-elf-ld +OC = ../cross/opt/bin/i686-elf-objcopy # Flags to make the binary smaller TODO: Remove after indirect pointer support! CSFLAGS = -mpreferred-stack-boundary=2 -fno-asynchronous-unwind-tables -Os -CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -fno-builtin -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Wl,-emain -I../lib/inc/ -Duserspace +CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -ffunction-sections -fno-builtin -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Wl,-emain -I../lib/inc/ -Wl,-emain -fPIE -Duserspace all: $(COBJS) %.o: %.c @mkdir -p ../build/apps/ @$(CC) -c $(CFLAGS) $< -o $@ - @$(CC) -r $(CFLAGS) -o ../build/apps/$(@:.o=) -L../build $< -lc + @$(LD) -o $(@:.o=.elf) -Tlink.ld -L../build/ $@ -lc + @$(OC) -O binary $(@:.o=.elf) ../build/apps/$(@:.o=) + +# %.o: %.c +# @mkdir -p ../build/apps/ +# @$(CC) -c $(CFLAGS) $< -o $@ +# @$(CC) -r $(CFLAGS) -o ../build/apps/$(@:.o=) -L../build $< -lc diff --git a/kernel/features/load.c b/kernel/features/load.c index 4468778..5ef7def 100644 --- a/kernel/features/load.c +++ b/kernel/features/load.c @@ -28,30 +28,30 @@ int elf_verify(struct elf_header *h) h->machine == ELF_386 && (h->type == ET_REL || h->type == ET_EXEC); } +// TODO: Fix elf loading void elf_load(char *path, struct proc *proc) { char *data = read_file(path); struct elf_header *h = (struct elf_header *)data; - if (!elf_verify(h)) + if (!elf_verify(h)) { + printf("File is not elf"); return; + } if (h->type != ET_REL) return; struct elf_program_header *phdrs = (struct elf_program_header *)((u32 *)h + h->phoff); - printf("%d", h->phnum); for (int i = 0; i < h->phnum; i++) { struct elf_program_header *phdr = &phdrs[i]; - printf("%d\n", phdr->type); if (phdr->type != PT_LOAD) continue; memcpy((void *)phdr->vaddr, h + phdr->offset, phdr->filesz); memset((void *)(phdr->vaddr + phdr->filesz), phdr->memsz - phdr->filesz, 0); } - loop(); u32 stack = (u32)malloc(0x1000) + 0x1000; proc->regs.ebp = (u32)stack; proc->regs.esp = (u32)stack; diff --git a/kernel/features/proc.c b/kernel/features/proc.c index 7e6c95a..64a4ac1 100644 --- a/kernel/features/proc.c +++ b/kernel/features/proc.c @@ -94,7 +94,7 @@ void proc_init() irq_install_handler(0, scheduler); root = proc_make(); - elf_load("/init", root); + bin_load("/init", root); proc_print(); _eip = root->regs.eip; diff --git a/lib/Makefile b/lib/Makefile index c324891..f4286ae 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -22,7 +22,7 @@ CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -fno-builti %.o: %.c @$(CC) -c $(CFLAGS) $< -o $@ -libc: CFLAGS += -Duserspace +libc: CFLAGS += -Duserspace -fPIE libc: $(COBJS) @mkdir -p ../build/ @$(AR) qc ../build/libc.a $+ |