From df4daaf8f41e3dcaa8221f54273338160dd43138 Mon Sep 17 00:00:00 2001 From: Dan Bornstein Date: Wed, 1 Dec 2010 14:23:44 -0800 Subject: 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 --- vm/compiler/codegen/arm/ArchUtility.c | 2 +- vm/compiler/codegen/arm/Assemble.c | 3 +-- vm/compiler/codegen/arm/armv5te-vfp/Codegen.c | 3 +-- vm/compiler/codegen/arm/armv5te/Codegen.c | 3 +-- vm/compiler/codegen/arm/armv7-a-neon/Codegen.c | 3 +-- vm/compiler/codegen/arm/armv7-a/Codegen.c | 3 +-- vm/compiler/codegen/x86/ArchUtility.c | 2 +- vm/compiler/codegen/x86/Assemble.c | 3 +-- vm/compiler/codegen/x86/ia32/Codegen.c | 3 +-- 9 files changed, 9 insertions(+), 16 deletions(-) (limited to 'vm/compiler/codegen') diff --git a/vm/compiler/codegen/arm/ArchUtility.c b/vm/compiler/codegen/arm/ArchUtility.c index 2e6845968..764930092 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 cf5c41fe4..7ce04256f 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 35fc09201..d17965d81 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 aad36ae38..03c1435fe 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 8b0bb9125..f0b772296 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 dab357961..05dda0c4d 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 6d07b6262..171c3b5ef 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 fcc497419..fbf53ca36 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 e86baccdb..4c2a759f5 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" -- cgit v1.2.3