Rename sys directory to kernel

A number of the headers in it were conflicting with macOS system headers.
zerocc2014 · Oct 13, 2017 · f1e63c4 · f1e63c4
1 parent 84bc907
commit f1e63c4
Show file tree

Hide file tree

Showing 47 changed files with 95 additions and 95 deletions.
diff --git a/emu/decode.h b/emu/decode.h
@@ -2,7 +2,7 @@
 #include "emu/cpu.h"
 #include "emu/modrm.h"
 #include "emu/interrupt.h"
-#include "sys/calls.h"
+#include "kernel/calls.h"
 
 #undef DEFAULT_CHANNEL
 #define DEFAULT_CHANNEL instr

diff --git a/emu/memory.c b/emu/memory.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "sys/errno.h"
+#include "kernel/errno.h"
 #include "emu/memory.h"
 
 static void tlb_flush(struct mem *mem);

diff --git a/fs/adhoc.c b/fs/adhoc.c
@@ -1,5 +1,5 @@
 #include <sys/stat.h>
-#include "sys/fs.h"
+#include "kernel/fs.h"
 
 static struct mount adhoc_mount;
 

diff --git a/fs/dev.c b/fs/dev.c
@@ -1,4 +1,4 @@
-#include "sys/errno.h"
+#include "kernel/errno.h"
 #include "fs/dev.h"
 #include "fs/tty.h"
 

diff --git a/fs/dev.h b/fs/dev.h
@@ -3,7 +3,7 @@
 
 #include <sys/types.h>
 #include <sys/sysmacros.h>
-#include "sys/fs.h"
+#include "kernel/fs.h"
 
 // a dev_t is encoded like this in hex, where M is major and m is minor:
 // mmmMMMmm

diff --git a/fs/dir.c b/fs/dir.c
@@ -1,8 +1,8 @@
 #include <string.h>
 
-#include "sys/calls.h"
-#include "sys/errno.h"
-#include "sys/fs.h"
+#include "kernel/calls.h"
+#include "kernel/errno.h"
+#include "kernel/fs.h"
 
 struct linux_dirent64 {
     qword_t inode;

diff --git a/fs/generic.c b/fs/generic.c
@@ -2,9 +2,9 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#include "sys/fs.h"
+#include "kernel/fs.h"
 #include "fs/dev.h"
-#include "sys/process.h"
+#include "kernel/process.h"
 
 struct fd *fd_create() {
     struct fd *fd = malloc(sizeof(struct fd));

diff --git a/fs/path.c b/fs/path.c
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "sys/calls.h"
+#include "kernel/calls.h"
 
 #define __NO_AT (struct fd *) 1
 

diff --git a/fs/poll.c b/fs/poll.c
@@ -1,8 +1,8 @@
 #include <poll.h>
 #include "misc.h"
 #include "util/list.h"
-#include "sys/errno.h"
-#include "sys/fs.h"
+#include "kernel/errno.h"
+#include "kernel/fs.h"
 
 struct poll *poll_create() {
     struct poll *poll = malloc(sizeof(struct poll));

diff --git a/fs/real.c b/fs/real.c
@@ -9,9 +9,9 @@
 #include <sys/xattr.h>
 #include <sys/file.h>
 
-#include "sys/errno.h"
-#include "sys/calls.h"
-#include "sys/fs.h"
+#include "kernel/errno.h"
+#include "kernel/calls.h"
+#include "kernel/fs.h"
 #include "fs/dev.h"
 #include "fs/tty.h"
 

diff --git a/fs/stat.c b/fs/stat.c
@@ -2,9 +2,9 @@
 #include <sys/stat.h>
 #include <limits.h>
 
-#include "sys/calls.h"
-#include "sys/errno.h"
-#include "sys/fs.h"
+#include "kernel/calls.h"
+#include "kernel/errno.h"
+#include "kernel/fs.h"
 
 struct newstat64 stat_convert_newstat64(struct statbuf stat) {
     struct newstat64 newstat;

diff --git a/fs/tty-real.c b/fs/tty-real.c
@@ -6,7 +6,7 @@
 #include <pthread.h>
 #include <signal.h>
 
-#include "sys/calls.h"
+#include "kernel/calls.h"
 #include "fs/tty.h"
 
 static void real_tty_read_thread(struct tty *tty) {

diff --git a/fs/tty.c b/fs/tty.c
@@ -1,7 +1,7 @@
 #define DEFAULT_CHANNEL debug
 #include "debug.h"
 #include <string.h>
-#include "sys/calls.h"
+#include "kernel/calls.h"
 #include "fs/tty.h"
 
 // TODO remove magic number

diff --git a/fs/tty.h b/fs/tty.h
@@ -1,7 +1,7 @@
 #ifndef TTY_H
 #define TTY_H
 
-#include "sys/fs.h"
+#include "kernel/fs.h"
 #include "fs/dev.h"
 
 struct winsize_ {

diff --git a/sys/calls.c → kernel/calls.c b/sys/calls.c → kernel/calls.c
@@ -1,5 +1,5 @@
 #include "debug.h"
-#include "sys/calls.h"
+#include "kernel/calls.h"
 #include "emu/interrupt.h"
 
 #define NUM_SYSCALLS 400

diff --git a/sys/calls.h → kernel/calls.h b/sys/calls.h → kernel/calls.h
@@ -1,13 +1,13 @@
 #ifndef CALLS_H
 #define CALLS_H
 
-#include "sys/process.h"
-#include "sys/errno.h"
-#include "sys/fs.h"
+#include "kernel/process.h"
+#include "kernel/errno.h"
+#include "kernel/fs.h"
 #include "misc.h"
 
-#include "sys/signal.h"
-#include "sys/sock.h"
+#include "kernel/signal.h"
+#include "kernel/sock.h"
 
 void handle_interrupt(struct cpu_state *cpu, int interrupt);
 

diff --git a/sys/elf.h → kernel/elf.h b/sys/elf.h → kernel/elf.h
diff --git a/sys/errno.h → kernel/errno.h b/sys/errno.h → kernel/errno.h
diff --git a/sys/exec.c → kernel/exec.c b/sys/exec.c → kernel/exec.c
@@ -6,9 +6,9 @@
 #include <string.h>
 
 #include "misc.h"
-#include "sys/calls.h"
-#include "sys/errno.h"
-#include "sys/elf.h"
+#include "kernel/calls.h"
+#include "kernel/errno.h"
+#include "kernel/elf.h"
 #include "libvdso.so.h"
 
 #define ERRNO_FAIL(label) { \

diff --git a/sys/exit.c → kernel/exit.c b/sys/exit.c → kernel/exit.c
@@ -1,5 +1,5 @@
 #include <pthread.h>
-#include "sys/calls.h"
+#include "kernel/calls.h"
 
 noreturn void do_exit(int status) {
     if (current->pid == 1) {

diff --git a/sys/fork.c → kernel/fork.c b/sys/fork.c → kernel/fork.c
@@ -1,6 +1,6 @@
 #include "debug.h"
-#include "sys/process.h"
-#include "sys/calls.h"
+#include "kernel/process.h"
+#include "kernel/calls.h"
 
 #define CSIGNAL_ 0x000000ff
 #define CLONE_VM_ 0x00000100

diff --git a/sys/fs.c → kernel/fs.c b/sys/fs.c → kernel/fs.c
@@ -1,10 +1,10 @@
 #include "debug.h"
 #include <string.h>
 #include <sys/stat.h>
-#include "sys/calls.h"
-#include "sys/errno.h"
-#include "sys/process.h"
-#include "sys/fs.h"
+#include "kernel/calls.h"
+#include "kernel/errno.h"
+#include "kernel/process.h"
+#include "kernel/fs.h"
 
 fd_t fd_next() {
     for (fd_t fd = 0; fd < MAX_FD; fd++)

diff --git a/sys/fs.h → kernel/fs.h b/sys/fs.h → kernel/fs.h
diff --git a/sys/getset.c → kernel/getset.c b/sys/getset.c → kernel/getset.c
@@ -1,4 +1,4 @@
-#include "sys/calls.h"
+#include "kernel/calls.h"
 
 dword_t sys_getpid() {
     STRACE("getpid()");

diff --git a/sys/group.c → kernel/group.c b/sys/group.c → kernel/group.c
@@ -1,6 +1,6 @@
 #include "util/list.h"
-#include "sys/calls.h"
-#include "sys/process.h"
+#include "kernel/calls.h"
+#include "kernel/process.h"
 
 dword_t sys_setpgid(dword_t id, dword_t pgid) {
     int err;

diff --git a/sys/mm.c → kernel/mm.c b/sys/mm.c → kernel/mm.c
@@ -1,7 +1,7 @@
 #include <sys/mman.h>
 #include <string.h>
-#include "sys/calls.h"
-#include "sys/errno.h"
+#include "kernel/calls.h"
+#include "kernel/errno.h"
 #include "emu/memory.h"
 
 addr_t sys_brk(addr_t new_brk) {

diff --git a/sys/mmap.c → kernel/mmap.c b/sys/mmap.c → kernel/mmap.c
@@ -1,7 +1,7 @@
 #include "debug.h"
-#include "sys/calls.h"
-#include "sys/errno.h"
-#include "sys/process.h"
+#include "kernel/calls.h"
+#include "kernel/errno.h"
+#include "kernel/process.h"
 #include "emu/memory.h"
 
 addr_t sys_mmap2(addr_t addr, dword_t len, dword_t prot, dword_t flags, fd_t fd_no, dword_t offset) {

diff --git a/sys/poll.c → kernel/poll.c b/sys/poll.c → kernel/poll.c
@@ -1,6 +1,6 @@
 #include "debug.h"
-#include "sys/fs.h"
-#include "sys/calls.h"
+#include "kernel/fs.h"
+#include "kernel/calls.h"
 
 dword_t sys_poll(addr_t fds, dword_t nfds, dword_t timeout) {
     if (nfds != 1)

diff --git a/sys/process.c → kernel/process.c b/sys/process.c → kernel/process.c
@@ -1,8 +1,8 @@
 #include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
-#include "sys/calls.h"
-#include "sys/process.h"
+#include "kernel/calls.h"
+#include "kernel/process.h"
 #include "emu/memory.h"
 
 __thread struct process *current;

diff --git a/sys/process.h → kernel/process.h b/sys/process.h → kernel/process.h
@@ -5,8 +5,8 @@
 #include <stdatomic.h>
 #include "util/list.h"
 #include "emu/cpu.h"
-#include "sys/fs.h"
-#include "sys/signal.h"
+#include "kernel/fs.h"
+#include "kernel/signal.h"
 
 struct process {
     struct cpu_state cpu; // do not access this field except on the current process

diff --git a/sys/signal.c → kernel/signal.c b/sys/signal.c → kernel/signal.c
@@ -1,8 +1,8 @@
 #include "debug.h"
 #include <signal.h>
-#include "sys/calls.h"
-#include "sys/signal.h"
-#include "sys/vdso.h"
+#include "kernel/calls.h"
+#include "kernel/signal.h"
+#include "kernel/vdso.h"
 
 int xsave_extra = 0;
 int fxsave_extra = 0;

diff --git a/sys/signal.h → kernel/signal.h b/sys/signal.h → kernel/signal.h
diff --git a/sys/sock.c → kernel/sock.c b/sys/sock.c → kernel/sock.c
@@ -1,6 +1,6 @@
 #include <sys/socket.h>
-#include "sys/calls.h"
-#include "sys/sock.h"
+#include "kernel/calls.h"
+#include "kernel/sock.h"
 #include "debug.h"
 
 static struct fd_ops socket_fdops;

diff --git a/sys/sock.h → kernel/sock.h b/sys/sock.h → kernel/sock.h
@@ -2,7 +2,7 @@
 #define SYS_SOCK_H
 
 #include <sys/socket.h>
-#include "sys/errno.h"
+#include "kernel/errno.h"
 #include "misc.h"
 #include "debug.h"
 

diff --git a/sys/sockaddr.c → kernel/sockaddr.c b/sys/sockaddr.c → kernel/sockaddr.c
@@ -1,8 +1,8 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <netinet/in.h>
-#include "sys/sock.h"
-#include "sys/fs.h"
+#include "kernel/sock.h"
+#include "kernel/fs.h"
 
 struct sockaddr_un_ {
     uint16_t family;

diff --git a/sys/time.c → kernel/time.c b/sys/time.c → kernel/time.c
@@ -1,8 +1,8 @@
 #include "debug.h"
 #include <time.h>
 #include <signal.h>
-#include "sys/calls.h"
-#include "sys/errno.h"
+#include "kernel/calls.h"
+#include "kernel/errno.h"
 
 dword_t sys_time(addr_t time_out) {
     dword_t now = time(NULL);

diff --git a/sys/tls.c → kernel/tls.c b/sys/tls.c → kernel/tls.c
@@ -1,4 +1,4 @@
-#include "sys/calls.h"
+#include "kernel/calls.h"
 
 struct user_desc {
     dword_t entry_number;

diff --git a/sys/uname.c → kernel/uname.c b/sys/uname.c → kernel/uname.c
@@ -1,7 +1,7 @@
 #include <strings.h>
 #include <string.h>
 #include <sys/sysinfo.h>
-#include "sys/calls.h"
+#include "kernel/calls.h"
 
 int sys_uname(struct uname *uts) {
     bzero(uts, sizeof(struct uname));

diff --git a/sys/user.c → kernel/user.c b/sys/user.c → kernel/user.c
@@ -1,4 +1,4 @@
-#include "sys/calls.h"
+#include "kernel/calls.h"
 
 int user_read_proc(struct process *proc, addr_t addr, void *buf, size_t count) {
     char *cbuf = (char *) buf;

diff --git a/sys/vdso.c → kernel/vdso.c b/sys/vdso.c → kernel/vdso.c
@@ -1,6 +1,6 @@
 #include <string.h>
-#include "sys/elf.h"
-#include "sys/vdso.h"
+#include "kernel/elf.h"
+#include "kernel/vdso.h"
 
 int vdso_symbol(const char *name) {
     struct elf_header *header = (void *) vdso_data;

diff --git a/sys/vdso.h → kernel/vdso.h b/sys/vdso.h → kernel/vdso.h
diff --git a/main.c b/main.c
@@ -1,6 +1,6 @@
 #include <stdlib.h>
-#include "sys/calls.h"
-#include "sys/process.h"
+#include "kernel/calls.h"
+#include "kernel/process.h"
 #include "xX_main_Xx.h"
 
 int main(int argc, char *const argv[]) {