diff options
| author | Galen Sagarin <gps5307@rit.edu> | 2025-04-29 14:18:40 -0400 |
|---|---|---|
| committer | Galen Sagarin <gps5307@rit.edu> | 2025-04-29 14:18:40 -0400 |
| commit | ae2cdd83ba4a0cae161db0b29031d5591005fa34 (patch) | |
| tree | 82fbdfcbb1fe4e3b5e232db195c8c331d69489fd /user/lib | |
| parent | Started writing fat.c (diff) | |
| parent | fs header changes (diff) | |
| download | comus-ae2cdd83ba4a0cae161db0b29031d5591005fa34.tar.gz comus-ae2cdd83ba4a0cae161db0b29031d5591005fa34.tar.bz2 comus-ae2cdd83ba4a0cae161db0b29031d5591005fa34.zip | |
Merge branch 'main' of https://github.com/kenshineto/kern into fat32
Merging main into here
Diffstat (limited to 'user/lib')
| -rw-r--r-- | user/lib/entry.S | 4 | ||||
| -rw-r--r-- | user/lib/fwrite.c | 1 | ||||
| -rw-r--r-- | user/lib/syscall.S | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/user/lib/entry.S b/user/lib/entry.S index 34390a0..40570b5 100644 --- a/user/lib/entry.S +++ b/user/lib/entry.S @@ -6,10 +6,6 @@ .code64 _start: call main - subq $16, %rsp # ??? pushq %rax call exit - -halt: - jmp halt diff --git a/user/lib/fwrite.c b/user/lib/fwrite.c index aa828e0..515d4ff 100644 --- a/user/lib/fwrite.c +++ b/user/lib/fwrite.c @@ -2,6 +2,7 @@ #include <unistd.h> FILE *stdout = (void *)1; +FILE *stderr = (void *)2; int putchar(int c) { diff --git a/user/lib/syscall.S b/user/lib/syscall.S index fc1ab93..2ba4dc0 100644 --- a/user/lib/syscall.S +++ b/user/lib/syscall.S @@ -24,3 +24,6 @@ SYSCALL kill SYS_kill SYSCALL sleep SYS_sleep SYSCALL brk SYS_brk SYSCALL sbrk SYS_sbrk +SYSCALL poweroff SYS_poweroff +SYSCALL drm SYS_drm +SYSCALL ticks SYS_ticks |