--- a/python/target/armtarget.py	Fri Feb 21 13:35:07 2014 +0100
+++ b/python/target/armtarget.py	Sun Feb 23 16:24:01 2014 +0100
@@ -2,8 +2,7 @@
 from .basetarget import Register, Instruction, Target, Label, LabelRef
 from .basetarget import Imm32, Imm8, Imm7, Imm3
 from .arminstructions import allins, Reg8Op, ArmRegister
-from .arminstructions import Dcd, B
-from .arminstructions import R0, R1, R2, R3, R4, R5, R6, R7, LR, PC, SP
+from .arminstructions import thumb_assembly_rules
 
 from .armframe import ArmFrame
 from .arminstructionselector import ArmInstructionSelector
@@ -15,9 +14,9 @@
 # TODO: make a difference between armv7 and armv5?
 
 
-class ArmTarget(Target):
+class ArmThumbTarget(Target):
     def __init__(self):
-        super().__init__('arm')
+        super().__init__('arm_thumb')
         for i in allins:
             self.addInstruction(i)
             # TODO: fix this nicer?
@@ -25,3 +24,10 @@
         self.check()
         self.ins_sel = ArmInstructionSelector()
         self.FrameClass = ArmFrame
+        self.assembler_rules = thumb_assembly_rules
+
+
+class ArmArmTarget(Target):
+    def __init__(self):
+        super().__init__('arm_arm')
+