Remove dependency on emulator state struct layout from kernel

ish-app · Nov 9, 2024 · 9070174 · 9070174
1 parent 6d8a6b7
commit 9070174
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/app/StaticLibLinux.xcconfig b/app/StaticLibLinux.xcconfig
@@ -1,6 +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/include $(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 $(SRCROOT)/deps/linux/arch/ish/emu/ishemu/include $(SRCROOT)
+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/include $(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 $(SRCROOT)
 GCC_PREPROCESSOR_DEFINITIONS = __KERNEL__
 OTHER_CFLAGS = -U__weak -include $(SRCROOT)/deps/linux/include/linux/kconfig.h -include $(SRCROOT)/deps/linux/include/linux/compiler_types.h -Wno-gnu-variable-sized-type-not-at-end -Wno-conditional-uninitialized
 // disable modules because it results in clashes between linux and clang headers

diff --git a/deps/linux b/deps/linux
diff --git a/deps/meson.build b/deps/meson.build
@@ -57,7 +57,6 @@ if get_option('kernel') == 'linux'
         include_directories: [include_directories(
             'linux/arch/ish/include',
             'linux/arch/ish/include/generated',
-            'linux/arch/ish/emu/ishemu/include',
             'linux/include',
             'linux/arch/ish/include/uapi',
             'linux/arch/ish/include/generated/uapi',
+1 −1		arch/ish/emu/ishemu/Makefile
+73 −50		arch/ish/emu/ishemu/exec_user.c
+0 −14		arch/ish/emu/ishemu/include/emu/emu.h
+1 −1		arch/ish/emu/unicorn/Makefile
+0 −18		arch/ish/emu/unicorn/include/emu/emu.h
+6 −0		arch/ish/emu/unicorn/unicorn.h
+49 −50		arch/ish/emu/unicorn/unicorn_user.c
+1 −1		arch/ish/include/asm/mmu.h
+2 −3		arch/ish/include/asm/mmu_context.h
+14 −9		arch/ish/include/asm/page.h
+1 −1		arch/ish/include/asm/processor.h
+16 −4		arch/ish/include/emu/exec.h
+2 −1		arch/ish/include/emu/kernel.h
+11 −4		arch/ish/kernel/process.c