Rename libmsl to libsystem

Makefile

@@ -3,7 +3,7 @@ platform ?= amd64
 include make/apps.mk
 include make/kernel.mk
 include make/dist.mk
-include make/libmsl.mk
+include make/libsystem.mk
 include make/liballoc.mk
 include make/libterminal.mk
 include make/libprocess.mk

aux/compiledb.sh

@@ -4,7 +4,7 @@ set -x
 
 make -B all_compiledb_kernel
 make -B all_compiledb_liballoc
-make -B all_compiledb_libmsl
+make -B all_compiledb_libsystem
 make -B all_compiledb_libprocess
 make -B all_compiledb_libterminal
 make -B all_compiledb_libstring

aux/devel.sh

@@ -8,7 +8,7 @@ else
   make -B all_kernel
 fi
 
-make -B all_libmsl
+make -B all_libsystem
 make -B all_liballoc
 make -B all_libprocess
 make -B all_libterminal

aux/docs.sh

@@ -5,7 +5,7 @@ set -x
 ./aux/compiledb.sh
 
 make -B docs_liballoc
-make -B docs_libmsl
+make -B docs_libsystem
 make -B docs_libprocess
 make -B docs_libstring
 make -B docs_libterminal

aux/format.sh

@@ -3,7 +3,7 @@
 set -x
 
 make -B format_kernel
-make -B format_libmsl
+make -B format_libsystem
 make -B format_libterminal
 make -B format_libprocess
 make -B format_liballoc

init/Makefile

@@ -1,7 +1,6 @@
 include ../make/ufuncs.mk
 
 $(eval $(call add_lib,libterminal))
-$(eval $(call add_lib,liballoc))
 $(eval $(call add_lib,libprocess))
 $(eval $(call add_lib,libstring))
 $(eval $(call add_lib,libkb))

liballoc/Makefile

@@ -1,6 +1,6 @@
 include ../make/ufuncs.mk
 
-$(eval $(call add_include,libmsl))
+$(eval $(call add_include,libsystem))
 
 libname := liballoc
 

liballoc/liballoc.c

@@ -2,7 +2,7 @@
 #pragma clang optimize off
 
 #include <liballoc.h>
-#include <m/system.h>
+#include <system.h>
 
 #define LIBALLOC_MUTEX 500
 

libkb/Makefile

@@ -1,6 +1,6 @@
 include ../make/ufuncs.mk
 
-$(eval $(call add_include,libmsl))
+$(eval $(call add_include,libsystem))
 
 libname := libkb
 

libkb/kb.c

@@ -1,6 +1,6 @@
 #include <stdint.h>
 #include <kb.h>
-#include <m/system.h>
+#include <system.h>
 #include <m/kb_device.h>
 #include <m/status.h>
 

libmsl/m/.gitignore

@@ -1 +0,0 @@
-*.o

libmsl/m/src.mk

@@ -1,3 +0,0 @@
-c += m/system.c
-
-o += m/system.o

libprocess/Makefile

@@ -1,6 +1,6 @@
 include ../make/ufuncs.mk
 
-$(eval $(call add_include,libmsl))
+$(eval $(call add_include,libsystem))
 $(eval $(call add_include,liballoc))
 
 libname := libprocess

libprocess/process.c

@@ -1,9 +1,9 @@
 #include <liballoc.h>
 #include <m/status.h>
-#include <m/system.h>
 #include <process.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <system.h>
 
 int process_spawn (process_func_t func, void* argument_ptr) {
   void* stack = malloc (STACK_SIZE);

libprocess/process.h

@@ -1,7 +1,7 @@
 #ifndef _LIBPROCESS_PROCESS_PROCESS_H
 #define _LIBPROCESS_PROCESS_PROCESS_H
 
-#include <m/system.h>
+#include <system.h>
 
 /* Size of process' stack */
 #define STACK_SIZE (256 * PAGE_SIZE)

libstring/Makefile

@@ -1,6 +1,6 @@
 include ../make/ufuncs.mk
 
-$(eval $(call add_include,libmsl))
+$(eval $(call add_include,libsystem))
 
 libname := libstring
 

libsystem/.gitignore

@@ -1,3 +1,4 @@
+*.o
 *.json
 docs/
 .cache/

libsystem/Makefile

@@ -2,6 +2,6 @@ include ../make/ufuncs.mk
 
 $(eval $(call add_include,liballoc))
 
-libname := libmsl
+libname := libsystem
 
 include ../make/lib.mk

libsystem/init/__premain.c

@@ -1,6 +1,6 @@
 #include <liballoc.h>
-#include <m/system.h>
 #include <stdint.h>
+#include <system.h>
 
 extern volatile uint8_t __bss_start[];
 extern volatile uint8_t __bss_end[];

libsystem/src.mk

@@ -1,3 +1,6 @@
 include $(platform)/src.mk
 include init/src.mk
-include m/src.mk
+
+c += system.c
+
+o += system.o

libsystem/system.c

@@ -1,7 +1,7 @@
-#include <m/syscall.h>
-#include <m/system.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <syscall.h>
+#include <system.h>
 
 #define do_syscall1(id, a1, a2, a3, a4, a5, a6, ...)                                               \
   syscall (id, (uintptr_t)a1, (uintptr_t)a2, (uintptr_t)a3, (uintptr_t)a4, (uintptr_t)a5,          \

libterminal/Makefile

@@ -1,6 +1,6 @@
 include ../make/ufuncs.mk
 
-$(eval $(call add_include,libmsl))
+$(eval $(call add_include,libsystem))
 
 libname := libterminal
 

libterminal/terminal.c

@@ -1,5 +1,5 @@
-#include <m/system.h>
 #include <stddef.h>
+#include <system.h>
 #include <terminal.h>
 
 void terminal_print (const char* string, size_t len) {

make/libmsl.mk

@@ -1,16 +0,0 @@
-all_libmsl:
-	make -C libmsl platform=$(platform) all
-
-all_compiledb_libmsl:
-	bear --output libmsl/compile_commands.json -- make -C libmsl platform=$(platform) all
-
-clean_libmsl:
-	make -C libmsl platform=$(platform) clean
-
-format_libmsl:
-	make -C libmsl platform=$(platform) format
-
-docs_libmsl:
-	make -C libmsl platform=$(platform) docs
-
-.PHONY: all_libmsl clean_libmsl format_libmsl docs_libmsl all_compiledb_libmsl

make/libsystem.mk

@@ -0,0 +1,16 @@
+all_libsystem:
+	make -C libsystem platform=$(platform) all
+
+all_compiledb_libsystem:
+	bear --output libsystem/compile_commands.json -- make -C libsystem platform=$(platform) all
+
+clean_libsystem:
+	make -C libsystem platform=$(platform) clean
+
+format_libsystem:
+	make -C libsystem platform=$(platform) format
+
+docs_libsystem:
+	make -C libsystem platform=$(platform) docs
+
+.PHONY: all_libsystem clean_libsystem format_libsystem docs_libsystem all_compiledb_libsystem

make/user.mk

@@ -1,8 +1,8 @@
 cc := clang
 o :=
 c :=
-ldflags += -L ../libmsl/build -l:libmsl.a
+ldflags += -L ../libsystem/build -l:libsystem.a -L ../liballoc/build -l:liballoc.a
-cflags += -isystem ../libmsl
+cflags += -isystem ../libsystem -isystem ../liballoc
 
 include src.mk
 include app.mk