Forking disassembler and simulator for Thumb2 support;...

src/SConscript

Index: src/SConscript
===================================================================
--- src/SConscript	(revision 3826)
+++ src/SConscript	(working copy)
@@ -112,8 +112,6 @@
     arm/codegen-arm.cc
     arm/constants-arm.cc
     arm/cpu-arm.cc
-    arm/debug-arm.cc
-    arm/disasm-arm.cc
     arm/fast-codegen-arm.cc
     arm/frames-arm.cc
     arm/full-codegen-arm.cc
@@ -126,9 +124,14 @@
     arm/virtual-frame-arm.cc
     """),
   'armvariant:arm': Split("""
+    arm/debug-arm.cc
+    arm/disasm-arm.cc
     arm/assembler-arm.cc
     """),
   'armvariant:thumb2': Split("""
+    arm/debug-thumb2.cc
+    arm/disasm-thumb2.cc
+    arm/instr-thumb2.cc
     arm/assembler-thumb2.cc
     """),
   'arch:mips': Split("""
@@ -185,7 +188,10 @@
     x64/stub-cache-x64.cc
     x64/virtual-frame-x64.cc
     """),
-  'simulator:arm': ['arm/simulator-arm.cc'],
+  'simulator:arm': {
+    'armvariant:arm': ["arm/simulator-arm.cc"],
+    'armvariant:thumb2': ["arm/simulator-thumb2.cc"],
+  },
   'simulator:mips': ['mips/simulator-mips.cc'],
   'os:freebsd': ['platform-freebsd.cc', 'platform-posix.cc'],
   'os:openbsd': ['platform-openbsd.cc', 'platform-posix.cc'],