Extend the instruction class with instruction attributes.

Change-Id: I52a4f640bd45d1891050876a7a0c031ec3a58974
diff --git a/src/dex_instruction_visitor.h b/src/dex_instruction_visitor.h
index ff45a4c..2af26e3 100644
--- a/src/dex_instruction_visitor.h
+++ b/src/dex_instruction_visitor.h
@@ -18,7 +18,7 @@
     while (ptr != end) {
       Instruction* inst = Instruction::At(ptr);
       switch (inst->Opcode()) {
-#define INSTRUCTION_CASE(cname, value)             \
+#define INSTRUCTION_CASE(o, cname, p, f, r, i, a)  \
         case Instruction::cname: {                 \
           derived->Do_ ## cname(inst);             \
           break;                                   \
@@ -37,10 +37,10 @@
 
  private:
   // Specific handlers for each instruction.
-#define INSTRUCTION_VISITOR(cname, value) \
-  void Do_ ## cname(Instruction* inst) {  \
-    T* derived = static_cast<T*>(this);   \
-    derived->Do_Default(inst);            \
+#define INSTRUCTION_VISITOR(o, cname, p, f, r, i, a)    \
+  void Do_ ## cname(Instruction* inst) {                \
+    T* derived = static_cast<T*>(this);                 \
+    derived->Do_Default(inst);                          \
   };
 #include "src/dex_instruction_list.h"
   DEX_INSTRUCTION_LIST(INSTRUCTION_VISITOR)