Move os_dep out of the jitter module

10 files changed, 8 insertions, 8 deletions

diff --git a/miasm2/analysis/sandbox.py b/miasm2/analysis/sandbox.py
index 2e569e61..f66f5913 100644
--- a/miasm2/analysis/sandbox.py
+++ b/miasm2/analysis/sandbox.py
@@ -3,7 +3,7 @@ from argparse import ArgumentParser
 from miasm2.analysis.machine import Machine
 from miasm2.jitter.jitload import vm_load_pe, preload_pe, libimp
 from miasm2.jitter.jitload import vm_load_elf, libimp, preload_elf
-from miasm2.jitter.os_dep import win_api_x86_32, win_api_x86_32_seh
+from miasm2.os_dep import win_api_x86_32, win_api_x86_32_seh
 
 
 class Sandbox(object):
diff --git a/miasm2/arch/arm/jit.py b/miasm2/arch/arm/jit.py
index b9c3a1b2..466d01a7 100644
--- a/miasm2/arch/arm/jit.py
+++ b/miasm2/arch/arm/jit.py
@@ -58,7 +58,7 @@ class jitter_arm(jitter):
         return arg
 
     def add_lib_handler(self, libs):
-        from miasm2.jitter.os_dep import linux_stdlib
+        from miasm2.os_dep import linux_stdlib
         for offset, fname in libs.fad2cname.iteritems():
             if fname in linux_stdlib.__dict__:
                 self.add_breakpoint(offset, linux_stdlib.__dict__[fname])
diff --git a/miasm2/arch/x86/jit.py b/miasm2/arch/x86/jit.py
index f574a3ee..b1d70f9b 100644
--- a/miasm2/arch/x86/jit.py
+++ b/miasm2/arch/x86/jit.py
@@ -111,7 +111,7 @@ class jitter_x86_32(jitter):
         if user_globals is None:
             user_globals = {}
 
-        from miasm2.jitter.os_dep import win_api_x86_32
+        from miasm2.os_dep import win_api_x86_32
 
         def handle_lib(jitter):
             fname = libs.fad2cname[jitter.pc]
diff --git a/miasm2/jitter/os_dep/__init__.py b/miasm2/os_dep/__init__.py
index e69de29b..e69de29b 100644
--- a/miasm2/jitter/os_dep/__init__.py
+++ b/miasm2/os_dep/__init__.py
diff --git a/miasm2/jitter/os_dep/linux_stdlib.py b/miasm2/os_dep/linux_stdlib.py
index 9dbc6c60..9dbc6c60 100644
--- a/miasm2/jitter/os_dep/linux_stdlib.py
+++ b/miasm2/os_dep/linux_stdlib.py
diff --git a/miasm2/jitter/os_dep/win_api_x86_32.py b/miasm2/os_dep/win_api_x86_32.py
index 923e9fd8..923e9fd8 100644
--- a/miasm2/jitter/os_dep/win_api_x86_32.py
+++ b/miasm2/os_dep/win_api_x86_32.py
diff --git a/miasm2/jitter/os_dep/win_api_x86_32_seh.py b/miasm2/os_dep/win_api_x86_32_seh.py
index 8075a284..8075a284 100644
--- a/miasm2/jitter/os_dep/win_api_x86_32_seh.py
+++ b/miasm2/os_dep/win_api_x86_32_seh.py
diff --git a/setup.py b/setup.py
index 86b2004b..73f98858 100755
--- a/setup.py
+++ b/setup.py
@@ -17,9 +17,9 @@ def buil_all():
               'miasm2/expression',
               'miasm2/ir',
               'miasm2/analysis',
+              'miasm2/os_dep',
               'miasm2/jitter',
               'miasm2/jitter/arch',
-              'miasm2/jitter/os_dep',
               ]
     ext_modules_no_tcc = [
         Extension("miasm2.jitter.arch.JitCore_x86",
diff --git a/test/jitter/os_dep/win_api_x86_32.py b/test/os_dep/win_api_x86_32.py
index d434f88f..62fe2636 100644
--- a/test/jitter/os_dep/win_api_x86_32.py
+++ b/test/os_dep/win_api_x86_32.py
@@ -4,7 +4,7 @@
 import unittest
 import logging
 from miasm2.analysis.machine import Machine
-import miasm2.jitter.os_dep.win_api_x86_32 as winapi
+import miasm2.os_dep.win_api_x86_32 as winapi
 
 machine = Machine("x86_32")
 
diff --git a/test/test_all.py b/test/test_all.py
index 11ea1c3a..9f014e32 100644
--- a/test/test_all.py
+++ b/test/test_all.py
@@ -47,15 +47,15 @@ all_tests = {
             ["ir/ir2C.py"],
             ["ir/symbexec.py"],
         ],
-        "jitter": [
-            ["jitter/os_dep/win_api_x86_32.py"],
+        "os_dep": [
+            ["os_dep/win_api_x86_32.py"],
         ],
         "order": [
             "architecture",
             "core",
             "expression",
             "ir",
-            "jitter",
+            "os_dep",
         ],
     },
     "example": {