Reg test: add arm jit little/big endian

2 files changed, 75 insertions, 21 deletions

diff --git a/miasm2/analysis/sandbox.py b/miasm2/analysis/sandbox.py
index 6ee108e4..6df2bde7 100644
--- a/miasm2/analysis/sandbox.py
+++ b/miasm2/analysis/sandbox.py
@@ -4,13 +4,19 @@ 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.os_dep import win_api_x86_32, win_api_x86_32_seh
-
+from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE
 
 class Sandbox(object):
     """
     Parent class for Sandbox abstraction
     """
 
+    @staticmethod
+    def code_sentinelle(jitter):
+        print 'Emulation stop'
+        jitter.run = False
+        return False
+
     @classmethod
     def _classes_(cls):
         """
@@ -219,6 +225,25 @@ class OS_Linux(OS):
         # Library calls handler
         self.jitter.add_lib_handler(libs, custom_methods)
 
+class OS_Linux_str(OS):
+    def __init__(self, custom_methods, *args, **kwargs):
+        super(OS_Linux_str, self).__init__(custom_methods, *args, **kwargs)
+
+        # Import manager
+        libs = libimp()
+        self.libs = libs
+
+        data = open(self.fname).read()
+        self.options.load_base_addr = int(self.options.load_base_addr, 16)
+        self.jitter.vm.add_memory_page(self.options.load_base_addr, PAGE_READ | PAGE_WRITE, data)
+
+        # Library calls handler
+        self.jitter.add_lib_handler(libs, custom_methods)
+
+    @classmethod
+    def update_parser(cls, parser):
+        parser.add_argument("load_base_addr", help="load base address")
+
 
 
 class Arch_x86_32(Arch):
@@ -256,15 +281,20 @@ class Arch_arml(Arch):
         self.jitter.stack_size = self.STACK_SIZE
         self.jitter.init_stack()
 
+class Arch_armb(Arch):
+    _ARCH_ = "armb"
+    STACK_SIZE = 0x100000
 
+    def __init__(self):
+        super(Arch_armb, self).__init__()
 
-class Sandbox_Win_x86_32(Sandbox, Arch_x86_32, OS_Win):
+        # Init stack
+        self.jitter.stack_size = self.STACK_SIZE
+        self.jitter.init_stack()
 
-    @staticmethod
-    def code_sentinelle(jitter):
-        print 'Emulation stop'
-        jitter.run = False
-        return False
+
+
+class Sandbox_Win_x86_32(Sandbox, Arch_x86_32, OS_Win):
 
     def __init__(self, *args, **kwargs):
         Sandbox.__init__(self, *args, **kwargs)
@@ -290,12 +320,6 @@ class Sandbox_Win_x86_32(Sandbox, Arch_x86_32, OS_Win):
 
 class Sandbox_Linux_x86_32(Sandbox, Arch_x86_32, OS_Linux):
 
-    @staticmethod
-    def code_sentinelle(jitter):
-        print 'Emulation stop'
-        jitter.run = False
-        return False
-
     def __init__(self, *args, **kwargs):
         Sandbox.__init__(self, *args, **kwargs)
 
@@ -321,12 +345,6 @@ class Sandbox_Linux_x86_32(Sandbox, Arch_x86_32, OS_Linux):
 
 class Sandbox_Linux_arml(Sandbox, Arch_arml, OS_Linux):
 
-    @staticmethod
-    def code_sentinelle(jitter):
-        print 'Emulation stop'
-        jitter.run = False
-        return False
-
     def __init__(self, *args, **kwargs):
         Sandbox.__init__(self, *args, **kwargs)
 
@@ -340,3 +358,36 @@ class Sandbox_Linux_arml(Sandbox, Arch_arml, OS_Linux):
         if addr is None and self.options.address is not None:
             addr = int(self.options.address, 16)
         super(Sandbox_Linux_arml, self).run(addr)
+
+class Sandbox_Linux_armb_str(Sandbox, Arch_armb, OS_Linux_str):
+
+    def __init__(self, *args, **kwargs):
+        Sandbox.__init__(self, *args, **kwargs)
+
+        self.jitter.cpu.LR = 0x1337beef
+
+        # Set the runtime guard
+        self.jitter.add_breakpoint(0x1337beef, self.__class__.code_sentinelle)
+
+
+    def run(self, addr = None):
+        if addr is None and self.options.address is not None:
+            addr = int(self.options.address, 16)
+        super(Sandbox_Linux_armb_str, self).run(addr)
+
+
+class Sandbox_Linux_arml_str(Sandbox, Arch_arml, OS_Linux_str):
+
+    def __init__(self, *args, **kwargs):
+        Sandbox.__init__(self, *args, **kwargs)
+
+        self.jitter.cpu.LR = 0x1337beef
+
+        # Set the runtime guard
+        self.jitter.add_breakpoint(0x1337beef, self.__class__.code_sentinelle)
+
+
+    def run(self, addr = None):
+        if addr is None and self.options.address is not None:
+            addr = int(self.options.address, 16)
+        super(Sandbox_Linux_arml_str, self).run(addr)
diff --git a/miasm2/arch/arm/jit.py b/miasm2/arch/arm/jit.py
index 29b701df..d089bafb 100644
--- a/miasm2/arch/arm/jit.py
+++ b/miasm2/arch/arm/jit.py
@@ -1,7 +1,7 @@
 from miasm2.jitter.jitload import jitter
 from miasm2.core import asmbloc
 from miasm2.core.utils import *
-from miasm2.arch.arm.sem import ir_arml
+from miasm2.arch.arm.sem import ir_armb, ir_arml
 
 import logging
 
@@ -90,6 +90,9 @@ class jitter_arml(jitter):
         self.cpu.PC = self.pc
 
 class jitter_armb(jitter_arml):
+
     def __init__(self, *args, **kwargs):
-        jitter_arml.__init__(self)
+        sp = asmbloc.asm_symbol_pool()
+        jitter.__init__(self, ir_armb(sp), *args, **kwargs)
         self.vm.set_big_endian()
+        self.ir_arch.jit_pc = self.ir_arch.arch.regs.PC