Add experimental/WIP unicorn emulation for linux kernel

ish-app · Nov 8, 2024 · 6d4ffd5 · 6d4ffd5
1 parent 0907642
commit 6d4ffd5
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 20 deletions.
diff --git a/deps/linux b/deps/linux
diff --git a/deps/meson.build b/deps/meson.build
@@ -1,9 +1,20 @@
 if get_option('kernel') == 'linux'
+    kconfig = []
+
+    if get_option('engine') == 'asbestos'
+        kconfig += 'CONFIG_ISH_EMULATOR_ISHEMU=y'
+    elif get_option('engine') == 'unicorn'
+        kconfig += 'CONFIG_ISH_EMULATOR_UNICORN=y'
+    else
+        error('Engine "' + get_option('engine') + '" not supported for linux kernel')
+    endif
+
+    kconfig += get_option('kconfig')
     meson_fragment = configure_file(
         command: [
             find_program('kconfig-fragment.sh'),
             '@OUTPUT@',
-        ] + get_option('kconfig'),
+        ] + kconfig,
         output: 'linux-meson.config',
     )
 

diff --git a/meson.build b/meson.build
@@ -51,22 +51,20 @@ emu_src = [
     'emu/float80.c',
 
 ]
-if get_option('engine') == 'asbestos'
-    gadgets = 'asbestos/gadgets-' + host_machine.cpu_family()
-    emu_src += [
-        'asbestos/asbestos.c',
-        'asbestos/gen.c',
-        'asbestos/helpers.c',
-        gadgets+'/entry.S',
-        gadgets+'/memory.S',
-        gadgets+'/control.S',
-        gadgets+'/math.S',
-        gadgets+'/bits.S',
-        gadgets+'/string.S',
-        gadgets+'/misc.S',
-        offsets,
-    ]
-endif
+gadgets = 'asbestos/gadgets-' + host_machine.cpu_family()
+emu_src += [
+    'asbestos/asbestos.c',
+    'asbestos/gen.c',
+    'asbestos/helpers.c',
+    gadgets+'/entry.S',
+    gadgets+'/memory.S',
+    gadgets+'/control.S',
+    gadgets+'/math.S',
+    gadgets+'/bits.S',
+    gadgets+'/string.S',
+    gadgets+'/misc.S',
+    offsets,
+]
 
 libish_emu = library('ish_emu', emu_src, include_directories: includes)
 
@@ -78,6 +76,10 @@ libfakefs = library('fakefs',
 subdir('deps')
 
 if get_option('kernel') == 'ish'
+    if get_option('engine') != 'asbestos'
+        error('Only asbestos is supported with ish kernel')
+    endif
+
     src = [
         'kernel/init.c',
         'kernel/errno.c',
@@ -168,6 +170,10 @@ elif get_option('kernel') == 'linux'
         'linux/main.c',
         'linux/fakefs.c',
     ], dependencies: [linux_headers, sqlite3])
+    emu_deps = []
+    if get_option('engine') == 'unicorn'
+        emu_deps += cc.find_library('unicorn', dirs: [meson.current_source_dir()+'/deps/unicorn/build'])
+    endif
     executable('ish', [build_linux],
         link_with: [libfakefs],
         dependencies: [
@@ -176,7 +182,7 @@ elif get_option('kernel') == 'linux'
             libdl,
             threads,
             declare_dependency(link_whole: modules),
-        ])
+        ] + emu_deps)
 endif
 
 subdir('tools')

diff --git a/meson_options.txt b/meson_options.txt
@@ -2,7 +2,7 @@ option('log', type: 'string', value: '')
 option('nolog', type: 'string', value: '')
 option('log_handler', type: 'string', value: 'dprintf')
 
-option('engine', type: 'combo', choices: ['asbestos'], value: 'asbestos')
+option('engine', type: 'combo', choices: ['asbestos', 'unicorn'], value: 'asbestos')
 option('kernel', type: 'combo', choices: ['ish', 'linux'], value: 'ish')
 option('kconfig', type: 'array', value: [])
+2 −0		arch/ish/Kconfig
+2 −0		arch/ish/Makefile
+1 −1		arch/ish/emu/ishemu/Makefile
+26 −9		arch/ish/emu/ishemu/exec_user.c
+7 −0		arch/ish/emu/unicorn/Makefile
+18 −0		arch/ish/emu/unicorn/include/emu/emu.h
+5 −0		arch/ish/emu/unicorn/unicorn.c
+11 −0		arch/ish/emu/unicorn/unicorn.h
+263 −0		arch/ish/emu/unicorn/unicorn_user.c
+4 −1		arch/ish/include/asm/mmu_context.h
+3 −8		arch/ish/include/asm/processor.h
+3 −1		arch/ish/include/emu/exec.h
+10 −0		arch/ish/include/emu/kernel.h
+1 −1		arch/ish/kernel/Makefile
+75 −60		arch/ish/kernel/process.c
+13 −4		arch/ish/kernel/uaccess.c
+0 −3		arch/ish/kernel/user_util.c
+1 −2		arch/ish/mm/tlb.c