summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dexdump/DexDump.c2
-rw-r--r--libdex/DexInlines.c2
-rw-r--r--libdex/DexOpcodes.h (renamed from libdex/OpCode.h)11
-rw-r--r--libdex/InstrUtils.h2
-rw-r--r--libdex/OpCodeNames.c2
-rw-r--r--libdex/OpCodeNames.h27
-rwxr-xr-xopcode-gen/opcode-gen2
-rwxr-xr-xopcode-gen/regen-all2
-rw-r--r--vm/Dalvik.h2
-rw-r--r--vm/compiler/Dataflow.c2
-rw-r--r--vm/compiler/Frontend.c2
-rw-r--r--vm/compiler/InlineTransformation.c2
-rw-r--r--vm/compiler/codegen/arm/ArchUtility.c2
-rw-r--r--vm/compiler/codegen/arm/Assemble.c3
-rw-r--r--vm/compiler/codegen/arm/armv5te-vfp/Codegen.c3
-rw-r--r--vm/compiler/codegen/arm/armv5te/Codegen.c3
-rw-r--r--vm/compiler/codegen/arm/armv7-a-neon/Codegen.c3
-rw-r--r--vm/compiler/codegen/arm/armv7-a/Codegen.c3
-rw-r--r--vm/compiler/codegen/x86/ArchUtility.c2
-rw-r--r--vm/compiler/codegen/x86/Assemble.c3
-rw-r--r--vm/compiler/codegen/x86/ia32/Codegen.c3
-rw-r--r--vm/interp/Jit.c2
-rwxr-xr-xvm/mterp/gen-mterp.py4
23 files changed, 30 insertions, 59 deletions
diff --git a/dexdump/DexDump.c b/dexdump/DexDump.c
index 158ac0c0e..780ef5f74 100644
--- a/dexdump/DexDump.c
+++ b/dexdump/DexDump.c
@@ -32,9 +32,9 @@
#include "libdex/DexFile.h"
#include "libdex/DexCatch.h"
#include "libdex/DexClass.h"
+#include "libdex/DexOpcodes.h"
#include "libdex/DexProto.h"
#include "libdex/InstrUtils.h"
-#include "libdex/OpCodeNames.h"
#include "libdex/SysUtil.h"
#include "libdex/CmdUtils.h"
diff --git a/libdex/DexInlines.c b/libdex/DexInlines.c
index 3bb07cca5..f33835fed 100644
--- a/libdex/DexInlines.c
+++ b/libdex/DexInlines.c
@@ -25,8 +25,8 @@
#include "DexCatch.h"
#include "DexClass.h"
#include "DexDataMap.h"
+#include "DexOpcodes.h"
#include "DexProto.h"
#include "InstrUtils.h"
#include "Leb128.h"
-#include "OpCode.h"
#include "ZipArchive.h"
diff --git a/libdex/OpCode.h b/libdex/DexOpcodes.h
index c5c89b8cc..af32ed5c5 100644
--- a/libdex/OpCode.h
+++ b/libdex/DexOpcodes.h
@@ -25,8 +25,8 @@
* opcodes and instruction formats.
*/
-#ifndef _LIBDEX_OPCODE
-#define _LIBDEX_OPCODE
+#ifndef _LIBDEX_DEXOPCODES
+#define _LIBDEX_DEXOPCODES
#include "DexFile.h"
@@ -609,4 +609,9 @@ DEX_INLINE OpCode dexOpCodeFromCodeUnit(u2 codeUnit) {
}
}
-#endif /*_LIBDEX_OPCODE*/
+/*
+ * Return the name of an opcode.
+ */
+const char* dexGetOpcodeName(OpCode op);
+
+#endif /*_LIBDEX_DEXOPCODES*/
diff --git a/libdex/InstrUtils.h b/libdex/InstrUtils.h
index 840e83b7e..5e1024041 100644
--- a/libdex/InstrUtils.h
+++ b/libdex/InstrUtils.h
@@ -21,7 +21,7 @@
#define _LIBDEX_INSTRUTILS
#include "DexFile.h"
-#include "OpCode.h"
+#include "DexOpcodes.h"
/*
* Dalvik-defined instruction formats.
diff --git a/libdex/OpCodeNames.c b/libdex/OpCodeNames.c
index 81e6c88be..696b3f72c 100644
--- a/libdex/OpCodeNames.c
+++ b/libdex/OpCodeNames.c
@@ -22,7 +22,7 @@
* sections will get wiped out the next time the tool is run.
*/
-#include "OpCodeNames.h"
+#include "DexOpcodes.h"
#include <assert.h>
/*
diff --git a/libdex/OpCodeNames.h b/libdex/OpCodeNames.h
deleted file mode 100644
index f81368dbc..000000000
--- a/libdex/OpCodeNames.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * Dalvik opcode names.
- */
-#ifndef _LIBDEX_OPCODENAMES
-#define _LIBDEX_OPCODENAMES
-
-#include "OpCode.h"
-
-const char* dexGetOpcodeName(OpCode op);
-
-#endif /*_LIBDEX_OPCODENAMES*/
diff --git a/opcode-gen/opcode-gen b/opcode-gen/opcode-gen
index 64011ce83..36f266117 100755
--- a/opcode-gen/opcode-gen
+++ b/opcode-gen/opcode-gen
@@ -483,7 +483,7 @@ function flagsToC(f, parts, result, i) {
# Given a packed opcode, returns the raw (unpacked) opcode value.
function unpackOpcode(idx) {
# Note: This must be the inverse of the corresponding code in
- # libdex/OpCode.h.
+ # libdex/DexOpcodes.h.
if (idx <= 0xff) {
return idx;
} else {
diff --git a/opcode-gen/regen-all b/opcode-gen/regen-all
index fbf8359e7..1e77b5d5f 100755
--- a/opcode-gen/regen-all
+++ b/opcode-gen/regen-all
@@ -37,8 +37,8 @@ cd ".."
${progdir}/opcode-gen dx/src/com/android/dx/dex/code/DalvOps.java
${progdir}/opcode-gen dx/src/com/android/dx/dex/code/Dops.java
${progdir}/opcode-gen dx/src/com/android/dx/dex/code/RopToDop.java
+${progdir}/opcode-gen libdex/DexOpcodes.h
${progdir}/opcode-gen libdex/InstrUtils.c
-${progdir}/opcode-gen libdex/OpCode.h
${progdir}/opcode-gen libdex/OpCodeNames.c
# It's a minor shame that these files live in a different top-level project.
diff --git a/vm/Dalvik.h b/vm/Dalvik.h
index 5779b08b7..5d5d5da5b 100644
--- a/vm/Dalvik.h
+++ b/vm/Dalvik.h
@@ -71,7 +71,7 @@
#include "analysis/DexPrepare.h"
#include "analysis/RegisterMap.h"
#include "Init.h"
-#include "libdex/OpCode.h"
+#include "libdex/DexOpcodes.h"
#include "libdex/InstrUtils.h"
#include "AllocTracker.h"
#include "PointerSet.h"
diff --git a/vm/compiler/Dataflow.c b/vm/compiler/Dataflow.c
index 9c31f61f1..03cd1458f 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 ad046764a..092412eec 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 243d16bce..d67b1fb30 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 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"
diff --git a/vm/interp/Jit.c b/vm/interp/Jit.c
index cd5bfbdcd..e79b11525 100644
--- a/vm/interp/Jit.c
+++ b/vm/interp/Jit.c
@@ -23,7 +23,7 @@
#include "Jit.h"
-#include "libdex/OpCodeNames.h"
+#include "libdex/DexOpcodes.h"
#include <unistd.h>
#include <pthread.h>
#include <sys/time.h>
diff --git a/vm/mterp/gen-mterp.py b/vm/mterp/gen-mterp.py
index 0f45eca11..5c641fe0e 100755
--- a/vm/mterp/gen-mterp.py
+++ b/vm/mterp/gen-mterp.py
@@ -22,8 +22,8 @@
import sys, string, re, time
from string import Template
-interp_defs_file = "../../libdex/OpCode.h" # need opcode list
-kNumDalvikInstructions = 256 # TODO: Derive this from OpCode.h.
+interp_defs_file = "../../libdex/DexOpcodes.h" # need opcode list
+kNumDalvikInstructions = 256 # TODO: Derive this from DexOpcodes.h.
verbose = False
handler_size_bits = -1000
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-01 20:13:35 +0000