Rename OpCode.h -> DexOpcodes.h.
Also incorporate the former contents of OpCodeNames.h. This is a small
attempt to increase naming consistency in libdex. There will be a bit
more to come, in a follow-up.
Change-Id: Ia7ab06042dde2e19eda02ef1fee72fb4260e899d
diff --git a/vm/compiler/Dataflow.c b/vm/compiler/Dataflow.c
index 9c31f61..03cd145 100644
--- a/vm/compiler/Dataflow.c
+++ b/vm/compiler/Dataflow.c
@@ -17,7 +17,7 @@
#include "Dalvik.h"
#include "Dataflow.h"
#include "Loop.h"
-#include "libdex/OpCodeNames.h"
+#include "libdex/DexOpcodes.h"
/*
* Main table containing data flow attributes for each bytecode. The
diff --git a/vm/compiler/Frontend.c b/vm/compiler/Frontend.c
index ad04676..092412e 100644
--- a/vm/compiler/Frontend.c
+++ b/vm/compiler/Frontend.c
@@ -15,7 +15,7 @@
*/
#include "Dalvik.h"
-#include "libdex/OpCode.h"
+#include "libdex/DexOpcodes.h"
#include "interp/Jit.h"
#include "CompilerInternals.h"
#include "Dataflow.h"
diff --git a/vm/compiler/InlineTransformation.c b/vm/compiler/InlineTransformation.c
index 243d16b..d67b1fb 100644
--- a/vm/compiler/InlineTransformation.c
+++ b/vm/compiler/InlineTransformation.c
@@ -16,7 +16,7 @@
#include "Dalvik.h"
#include "Dataflow.h"
-#include "libdex/OpCodeNames.h"
+#include "libdex/DexOpcodes.h"
/* Convert the reg id from the callee to the original id passed by the caller */
static inline u4 convertRegId(const DecodedInstruction *invoke,
diff --git a/vm/compiler/codegen/arm/ArchUtility.c b/vm/compiler/codegen/arm/ArchUtility.c
index 2e68459..7649300 100644
--- a/vm/compiler/codegen/arm/ArchUtility.c
+++ b/vm/compiler/codegen/arm/ArchUtility.c
@@ -15,7 +15,7 @@
*/
#include "../../CompilerInternals.h"
-#include "libdex/OpCodeNames.h"
+#include "libdex/DexOpcodes.h"
#include "ArmLIR.h"
static char *shiftNames[4] = {
diff --git a/vm/compiler/codegen/arm/Assemble.c b/vm/compiler/codegen/arm/Assemble.c
index cf5c41f..7ce0425 100644
--- a/vm/compiler/codegen/arm/Assemble.c
+++ b/vm/compiler/codegen/arm/Assemble.c
@@ -15,8 +15,7 @@
*/
#include "Dalvik.h"
-#include "libdex/OpCode.h"
-#include "libdex/OpCodeNames.h"
+#include "libdex/DexOpcodes.h"
#include "../../CompilerInternals.h"
#include "ArmLIR.h"
diff --git a/vm/compiler/codegen/arm/armv5te-vfp/Codegen.c b/vm/compiler/codegen/arm/armv5te-vfp/Codegen.c
index 35fc092..d17965d 100644
--- a/vm/compiler/codegen/arm/armv5te-vfp/Codegen.c
+++ b/vm/compiler/codegen/arm/armv5te-vfp/Codegen.c
@@ -19,8 +19,7 @@
#include "Dalvik.h"
#include "interp/InterpDefs.h"
-#include "libdex/OpCode.h"
-#include "libdex/OpCodeNames.h"
+#include "libdex/DexOpcodes.h"
#include "compiler/CompilerInternals.h"
#include "compiler/codegen/arm/ArmLIR.h"
#include "mterp/common/FindInterface.h"
diff --git a/vm/compiler/codegen/arm/armv5te/Codegen.c b/vm/compiler/codegen/arm/armv5te/Codegen.c
index aad36ae..03c1435 100644
--- a/vm/compiler/codegen/arm/armv5te/Codegen.c
+++ b/vm/compiler/codegen/arm/armv5te/Codegen.c
@@ -19,8 +19,7 @@
#include "Dalvik.h"
#include "interp/InterpDefs.h"
-#include "libdex/OpCode.h"
-#include "libdex/OpCodeNames.h"
+#include "libdex/DexOpcodes.h"
#include "compiler/CompilerInternals.h"
#include "compiler/codegen/arm/ArmLIR.h"
#include "mterp/common/FindInterface.h"
diff --git a/vm/compiler/codegen/arm/armv7-a-neon/Codegen.c b/vm/compiler/codegen/arm/armv7-a-neon/Codegen.c
index 8b0bb91..f0b7722 100644
--- a/vm/compiler/codegen/arm/armv7-a-neon/Codegen.c
+++ b/vm/compiler/codegen/arm/armv7-a-neon/Codegen.c
@@ -19,8 +19,7 @@
#include "Dalvik.h"
#include "interp/InterpDefs.h"
-#include "libdex/OpCode.h"
-#include "libdex/OpCodeNames.h"
+#include "libdex/DexOpcodes.h"
#include "compiler/CompilerInternals.h"
#include "compiler/codegen/arm/ArmLIR.h"
#include "mterp/common/FindInterface.h"
diff --git a/vm/compiler/codegen/arm/armv7-a/Codegen.c b/vm/compiler/codegen/arm/armv7-a/Codegen.c
index dab3579..05dda0c 100644
--- a/vm/compiler/codegen/arm/armv7-a/Codegen.c
+++ b/vm/compiler/codegen/arm/armv7-a/Codegen.c
@@ -19,8 +19,7 @@
#include "Dalvik.h"
#include "interp/InterpDefs.h"
-#include "libdex/OpCode.h"
-#include "libdex/OpCodeNames.h"
+#include "libdex/DexOpcodes.h"
#include "compiler/CompilerInternals.h"
#include "compiler/codegen/arm/ArmLIR.h"
#include "mterp/common/FindInterface.h"
diff --git a/vm/compiler/codegen/x86/ArchUtility.c b/vm/compiler/codegen/x86/ArchUtility.c
index 6d07b62..171c3b5 100644
--- a/vm/compiler/codegen/x86/ArchUtility.c
+++ b/vm/compiler/codegen/x86/ArchUtility.c
@@ -15,7 +15,7 @@
*/
#include "../../CompilerInternals.h"
-#include "libdex/OpCodeNames.h"
+#include "libdex/DexOpcodes.h"
#include "X86LIR.h"
/* Dump instructions and constant pool contents */
diff --git a/vm/compiler/codegen/x86/Assemble.c b/vm/compiler/codegen/x86/Assemble.c
index fcc4974..fbf53ca 100644
--- a/vm/compiler/codegen/x86/Assemble.c
+++ b/vm/compiler/codegen/x86/Assemble.c
@@ -15,8 +15,7 @@
*/
#include "Dalvik.h"
-#include "libdex/OpCode.h"
-#include "libdex/OpCodeNames.h"
+#include "libdex/DexOpcodes.h"
#include "../../CompilerInternals.h"
#include "X86LIR.h"
diff --git a/vm/compiler/codegen/x86/ia32/Codegen.c b/vm/compiler/codegen/x86/ia32/Codegen.c
index e86bacc..4c2a759 100644
--- a/vm/compiler/codegen/x86/ia32/Codegen.c
+++ b/vm/compiler/codegen/x86/ia32/Codegen.c
@@ -18,8 +18,7 @@
#include "Dalvik.h"
#include "interp/InterpDefs.h"
-#include "libdex/OpCode.h"
-#include "libdex/OpCodeNames.h"
+#include "libdex/DexOpcodes.h"
#include "compiler/CompilerInternals.h"
#include "compiler/codegen/x86/X86LIR.h"
#include "mterp/common/FindInterface.h"