diff options
| author | Marvin Borner | 2020-08-10 16:01:04 +0200 |
|---|---|---|
| committer | Marvin Borner | 2020-08-10 16:01:04 +0200 |
| commit | 54ece9141e9ad8cfb59f2c8315c84b8e247275f7 (patch) | |
| tree | cc578f577c296719bf869e8e6816322367e96004 /apps | |
| parent | f42aa2d995704c748c370d3e7b3684512361bc09 (diff) | |
Started elf parser/loader
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/Makefile | 6 | ||||
| -rw-r--r-- | apps/init.c | 6 | ||||
| -rw-r--r-- | apps/link.ld | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/apps/Makefile b/apps/Makefile index 29136d0..5a6ec67 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -3,17 +3,15 @@ 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 -ffunction-sections -fno-builtin -std=c99 -m32 -pedantic-errors -I../lib/inc/ -fPIE -Duserspace +CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -fno-builtin -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Wl,-emain -I../lib/inc/ -Duserspace all: $(COBJS) %.o: %.c @mkdir -p ../build/apps/ @$(CC) -c $(CFLAGS) $< -o $@ - @$(LD) -o $(@:.o=.elf) -Tlink.ld -L../build/ $@ -lc - @$(OC) -O binary $(@:.o=.elf) ../build/apps/$(@:.o=) + @$(CC) -r $(CFLAGS) -o ../build/apps/$(@:.o=) -L../build $< -lc diff --git a/apps/init.c b/apps/init.c index 813021b..5879c1e 100644 --- a/apps/init.c +++ b/apps/init.c @@ -1,5 +1,6 @@ // MIT License, Copyright (c) 2020 Marvin Borner +#include <conv.h> #include <def.h> #include <mem.h> #include <print.h> @@ -9,7 +10,10 @@ void main() { print("Init loaded.\n"); - printf("%x %d %b\n ABC %s", 42, 42, 42, "BAUM"); + char *buf = malloc(10); + conv_base(42, buf, 8, 0); + printf("\n----\nTEST: %s\n----\n", buf); + /* printf("%x %d %b\n ABC %s", 42, 42, 42, "BAUM"); */ sys0(SYS_LOOP); /* sys1(SYS_EXEC, (int)"/a"); */ while (1) { diff --git a/apps/link.ld b/apps/link.ld index 84b2e2f..7a451ba 100644 --- a/apps/link.ld +++ b/apps/link.ld @@ -4,7 +4,7 @@ ENTRY(main) SECTIONS { - . = 0x00000000; + . = 0x00400000; .text : { *(.text.main) |