Start the kernel in the app

Sekedo664 · Jul 4, 2021 · ec76fd1 · ec76fd1
1 parent c37a04e
commit ec76fd1
Show file tree

Hide file tree

Showing 8 changed files with 255 additions and 7 deletions.
diff --git a/app/App.xcconfig b/app/App.xcconfig
@@ -8,7 +8,4 @@ INFOPLIST_PREFIX_HEADER = $(BUILT_PRODUCTS_DIR)/infoplisticons.h
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon
 CODE_SIGN_ENTITLEMENTS = app/iSH.entitlements
 
-ENABLE_ON_DEMAND_RESOURCES = NO
-
-HEADER_SEARCH_PATHS = $(inherited) $(SRCROOT) $(SRCROOT)/deps/libarchive/libarchive
-OTHER_LDFLAGS = -ObjC
+OTHER_LDFLAGS = -ObjC $(LINUX_APP_LDFLAGS)
diff --git a/app/AppDelegate.m b/app/AppDelegate.m
@@ -27,6 +27,10 @@
 #include "fs/devices.h"
 #include "fs/path.h"
 
+#if ISH_LINUX
+#import "LinuxInterop.h"
+#endif
+
 @interface AppDelegate ()
 
 @property BOOL exiting;
@@ -183,6 +187,9 @@ - (int)boot {
     if (err < 0)
         return err;
     task_start(current);
+#else
+    // TODO: fix issues with having multiple cpus
+    actuate_kernel("earlyprintk maxcpus=1");
 #endif
 
     return 0;

diff --git a/app/Linux.xcconfig b/app/Linux.xcconfig
@@ -2,3 +2,4 @@ ISH_KERNEL = linux
 NINJA_TARGETS = deps/liblinux.a libfakefs.a libish_emu.a
 LINUX_HOSTCC = env -u SDKROOT -u IPHONEOS_DEPLOYMENT_TARGET xcrun clang
 GCC_PREPROCESSOR_DEFINITIONS = ISH_LINUX=1
+LINUX_APP_LDFLAGS = -sectalign __DATA __percpu_first 1000 -sectalign __DATA __tracepoints 20 -force_load $(BUILT_PRODUCTS_DIR)/liblinux.a
diff --git a/app/LinuxInterop.c b/app/LinuxInterop.c
@@ -0,0 +1,16 @@
+//
+//  LinuxInterop.c
+//  iSH
+//
+//  Created by Theodore Dubois on 7/3/21.
+//
+
+#include <linux/start_kernel.h>
+#include <string.h>
+
+extern void run_kernel(void);
+
+void actuate_kernel(char *cmdline) {
+    strcpy(boot_command_line, cmdline);
+    run_kernel();
+}
diff --git a/app/LinuxInterop.h b/app/LinuxInterop.h
@@ -0,0 +1,13 @@
+//
+//  LinuxInterop.h
+//  iSH
+//
+//  Created by Theodore Dubois on 7/3/21.
+//
+
+#ifndef LinuxInterop_h
+#define LinuxInterop_h
+
+void actuate_kernel(char *cmdline);
+
+#endif /* LinuxInterop_h */
diff --git a/app/StaticLibLinux.xcconfig b/app/StaticLibLinux.xcconfig
@@ -0,0 +1,6 @@
+#include "StaticLib.xcconfig"
+
+HEADER_SEARCH_PATHS = $(SRCROOT)/deps/linux/arch/ish/include $(MESON_BUILD_DIR)/deps/linux/arch/ish/include/generated $(SRCROOT)/deps/linux/include $(MESON_BUILD_DIR)/deps/linux/arch/ish/include/generated $(SRCROOT)/deps/linux/arch/ish/include/uapi $(MESON_BUILD_DIR)/deps/linux/arch/ish/include/generated/uapi $(SRCROOT)/deps/linux/include/uapi $(MESON_BUILD_DIR)/deps/linux/arch/ish/include/generated/uapi
+LINK_WITH_STANDARD_LIBRARIES = NO
+GCC_PREPROCESSOR_DEFINITIONS = __KERNEL__
+OTHER_CFLAGS = -U__weak
diff --git a/iSH.xcodeproj/project.pbxproj b/iSH.xcodeproj/project.pbxproj
diff --git a/linux/main.c b/linux/main.c
@@ -1,6 +1,7 @@
 #include <linux/compiler_attributes.h>
 #include <linux/start_kernel.h>
 #include <linux/string.h>
+#include <user/user.h>
 
 extern void run_kernel(void);
 
@@ -13,5 +14,6 @@ int main(int argc, const char *argv[])
 		strcat(boot_command_line, argv[i]);
 	}
 	run_kernel();
+	for (;;) host_pause();
 	return 0;
 }