Clean up dyn_regs.h usage (#235)

* Add missing usages of 'dyn_regs.h'

This corresponds to cleanups of its usage in Dyninst.

* Use arch-specific register files

* Remove aarch64 subdir

src/instruction/aarch64_cft.C

@@ -34,6 +34,7 @@
 #include "Instruction.h"
 #include "InstructionDecoder.h"
 #include "Register.h"
+#include "registers/aarch64_regs.h"
 
 #include <boost/assign/list_of.hpp>
 #include <boost/iterator/indirect_iterator.hpp>

src/instruction/aarch64_decode.C

@@ -34,7 +34,7 @@
 #include "Instruction.h"
 #include "InstructionDecoder.h"
 #include "Register.h"
-#include "dyn_regs.h"
+#include "registers/aarch64_regs.h"
 #include <boost/assign/list_of.hpp>
 #include <boost/iterator/indirect_iterator.hpp>
 #include <deque>

src/instruction/aarch64_decode_ldst.C

@@ -34,7 +34,7 @@
 #include "Instruction.h"
 #include "InstructionDecoder.h"
 #include "Register.h"
-#include "dyn_regs.h"
+#include "registers/aarch64_regs.h"
 #include <boost/assign/list_of.hpp>
 #include <boost/iterator/indirect_iterator.hpp>
 #include <deque>

src/instruction/aarch64_simd.C

@@ -34,7 +34,7 @@
 #include "Instruction.h"
 #include "InstructionDecoder.h"
 #include "Register.h"
-#include "dyn_regs.h"
+#include "registers/aarch64_regs.h"
 #include <boost/assign/list_of.hpp>
 #include <boost/iterator/indirect_iterator.hpp>
 #include <deque>

src/instruction/fucompp.C

@@ -35,6 +35,9 @@
 #include "InstructionDecoder.h"
 #include <boost/assign/list_of.hpp>
 #include <deque>
+#include "Architecture.h"
+#include "registers/x86_regs.h"
+
 using namespace Dyninst;
 using namespace InstructionAPI;
 using namespace boost;

src/instruction/power_cft.C

@@ -34,7 +34,7 @@
 #include "Instruction.h"
 #include "InstructionDecoder.h"
 #include "Register.h"
-
+#include "registers/ppc32_regs.h"
 #include <boost/assign/list_of.hpp>
 #include <boost/iterator/indirect_iterator.hpp>
 #include <deque>
@@ -160,6 +160,7 @@ test_results_t power_cft_Mutator::executeTest()
   cfts.push_back(cftExpected(true, 0x404, false, false, false, true));
   while(!decodedInsns.empty())
   {
+      logerror("Parsing instruction '%s'\n", decodedInsns.front().format().c_str());
       (void)(decodedInsns.front().getControlFlowTarget());
       for(Instruction::cftConstIter curCFT = decodedInsns.front().cft_begin();
           curCFT != decodedInsns.front().cft_end();

src/instruction/power_decode.C

@@ -34,7 +34,7 @@
 #include "Instruction.h"
 #include "InstructionDecoder.h"
 #include "Register.h"
-#include "dyn_regs.h"
+#include "registers/ppc32_regs.h"
 #include <boost/assign/list_of.hpp>
 #include <boost/iterator/indirect_iterator.hpp>
 #include <deque>

src/instruction/test_instruction_bind_eval.C

@@ -35,10 +35,20 @@
 #include "InstructionDecoder.h"
 #include "Expression.h"
 #include "Result.h"
-
+#include "Architecture.h"
 #include <boost/assign/list_of.hpp>
 #include <boost/iterator/indirect_iterator.hpp>
 
+#if defined(arch_x86_64_test)
+# include "registers/x86_64_regs.h"
+  Dyninst::Architecture curArch = Dyninst::Arch_x86_64;
+  using namespace Dyninst::x86_64;
+#elif defined(arch_x86_test)
+# include "registers/x86_regs.h"
+  Dyninst::Architecture curArch = Dyninst::Arch_x86;
+  using namespace Dyninst::x86;
+#endif
+
 using namespace Dyninst;
 using namespace InstructionAPI;
 using namespace boost::assign;

src/instruction/test_instruction_read_write.C

@@ -35,6 +35,10 @@
 #include "InstructionDecoder.h"
 #include <boost/assign/list_of.hpp>
 #include <deque>
+#include "Architecture.h"
+#include "registers/x86_regs.h"
+#include "registers/x86_64_regs.h"
+
 using namespace Dyninst;
 using namespace InstructionAPI;
 using namespace boost;