2 files changed, 56 insertions, 1 deletions
diff --git a/miasm2/analysis/machine.py b/miasm2/analysis/machine.py
index 778c5def..f963628c 100644
--- a/miasm2/analysis/machine.py
+++ b/miasm2/analysis/machine.py
@@ -12,7 +12,8 @@ class Machine(object):
     __gdbserver = None    # GdbServer handler
 
     __available = ["arml", "armb", "armtl", "armtb", "sh4", "x86_16", "x86_32",
-                   "x86_64", "msp430", "mips32b", "mips32l"]
+                   "x86_64", "msp430", "mips32b", "mips32l",
+                   "aarch64l", "aarch64b"]
 
 
     def __init__(self, machine_name):
@@ -43,6 +44,20 @@ class Machine(object):
             jitter = jit.jitter_armb
             from miasm2.arch.arm.ira import ir_a_armb as ira
             from miasm2.arch.arm.sem import ir_armb as ir
+        elif machine_name == "aarch64l":
+            from miasm2.arch.aarch64.disasm import dis_aarch64l as dis_engine
+            from miasm2.arch.aarch64 import arch, jit
+            mn = arch.mn_aarch64
+            jitter = jit.jitter_aarch64l
+            from miasm2.arch.aarch64.ira import ir_a_aarch64l as ira
+            from miasm2.arch.aarch64.sem import ir_aarch64l as ir
+        elif machine_name == "aarch64b":
+            from miasm2.arch.aarch64.disasm import dis_aarch64b as dis_engine
+            from miasm2.arch.aarch64 import arch, jit
+            mn = arch.mn_aarch64
+            jitter = jit.jitter_aarch64b
+            from miasm2.arch.aarch64.ira import ir_a_aarch64b as ira
+            from miasm2.arch.aarch64.sem import ir_aarch64b as ir
         elif machine_name == "armtl":
             from miasm2.arch.arm.disasm import dis_armtl as dis_engine
             from miasm2.arch.arm import arch
diff --git a/miasm2/analysis/sandbox.py b/miasm2/analysis/sandbox.py
index 3bacda5e..7dc5d76e 100644
--- a/miasm2/analysis/sandbox.py
+++ b/miasm2/analysis/sandbox.py
@@ -317,6 +317,29 @@ class Arch_armb(Arch):
         self.jitter.stack_size = self.STACK_SIZE
         self.jitter.init_stack()
 
+class Arch_aarch64l(Arch):
+    _ARCH_ = "aarch64l"
+    STACK_SIZE = 0x100000
+
+    def __init__(self):
+        super(Arch_aarch64l, self).__init__()
+
+        # Init stack
+        self.jitter.stack_size = self.STACK_SIZE
+        self.jitter.init_stack()
+
+
+class Arch_aarch64b(Arch):
+    _ARCH_ = "aarch64b"
+    STACK_SIZE = 0x100000
+
+    def __init__(self):
+        super(Arch_aarch64b, self).__init__()
+
+        # Init stack
+        self.jitter.stack_size = self.STACK_SIZE
+        self.jitter.init_stack()
+
 
 
 class Sandbox_Win_x86_32(Sandbox, Arch_x86_32, OS_Win):
@@ -465,3 +488,20 @@ class Sandbox_Linux_arml_str(Sandbox, Arch_arml, OS_Linux_str):
         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)
+
+
+class Sandbox_Linux_aarch64l(Sandbox, Arch_aarch64l, OS_Linux):
+
+    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_aarch64l, self).run(addr)