diff options
| author | Marvin Borner | 2020-08-09 21:55:42 +0200 |
|---|---|---|
| committer | Marvin Borner | 2020-08-09 21:55:42 +0200 |
| commit | f163a5d5f6802f63092229f0f9326e5fb44b7908 (patch) | |
| tree | f24ccfe1b9bd340875d534e1aa19ef8676fd4d7b /apps | |
| parent | b6d3d341c19440f8447d8d6c6567b7ff78db3174 (diff) | |
Added malloc/free syscall
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/Makefile | 2 | ||||
| -rw-r--r-- | apps/a.c | 2 | ||||
| -rw-r--r-- | apps/init.c | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/apps/Makefile b/apps/Makefile index 8c5ecac..d6c3789 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -5,7 +5,7 @@ CC = ../cross/opt/bin/i686-elf-gcc LD = ../cross/opt/bin/i686-elf-ld OC = ../cross/opt/bin/i686-elf-objcopy -CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -ffunction-sections -fno-builtin -std=c99 -m32 -pedantic-errors -I../lib/inc/ -fPIE +CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -ffunction-sections -fno-builtin -std=c99 -m32 -pedantic-errors -I../lib/inc/ -fPIE -Duserspace all: $(COBJS) @@ -7,7 +7,7 @@ void main() { print("\nA loaded!\n"); - sys0(SYS_HALT); + sys0(SYS_LOOP); while (1) { print("a"); } diff --git a/apps/init.c b/apps/init.c index 2851e8e..813021b 100644 --- a/apps/init.c +++ b/apps/init.c @@ -1,13 +1,17 @@ // MIT License, Copyright (c) 2020 Marvin Borner #include <def.h> +#include <mem.h> #include <print.h> #include <sys.h> void main() { print("Init loaded.\n"); - sys1(SYS_EXEC, (int)"/a"); + + printf("%x %d %b\n ABC %s", 42, 42, 42, "BAUM"); + sys0(SYS_LOOP); + /* sys1(SYS_EXEC, (int)"/a"); */ while (1) { print("b"); }; |