diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-12-06 14:23:09 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2010-12-06 14:23:09 -0800 |
| commit | 70624ec99772ce2c6222d066bb7f03a764c45128 (patch) | |
| tree | b6dbb9bcb5221db9cdbf106d3c70d5a49e078198 /vm/compiler/codegen/arm/ArchUtility.c | |
| parent | 91b93ea496e8c86f410f302a94c2adf0fc9d8189 (diff) | |
| parent | 07a9833e6f0700527fa02df302cf91cf431bbca1 (diff) | |
Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master
Diffstat (limited to 'vm/compiler/codegen/arm/ArchUtility.c')
| -rw-r--r-- | vm/compiler/codegen/arm/ArchUtility.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vm/compiler/codegen/arm/ArchUtility.c b/vm/compiler/codegen/arm/ArchUtility.c index 2e6845968..0b76eb58b 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] = { @@ -283,7 +283,7 @@ void dvmDumpLIRInsn(LIR *arg, unsigned char *baseAddr) const bool dumpNop = false; /* Handle pseudo-ops individually, and all regular insns as a group */ - switch(lir->opCode) { + switch(lir->opcode) { case kArmChainingCellBottom: LOGD("-------- end of chaining cells (0x%04x)\n", offset); break; @@ -345,9 +345,9 @@ void dvmDumpLIRInsn(LIR *arg, unsigned char *baseAddr) if (lir->isNop && !dumpNop) { break; } - buildInsnString(EncodingMap[lir->opCode].name, lir, opName, + buildInsnString(EncodingMap[lir->opcode].name, lir, opName, baseAddr, 256); - buildInsnString(EncodingMap[lir->opCode].fmt, lir, buf, baseAddr, + buildInsnString(EncodingMap[lir->opcode].fmt, lir, buf, baseAddr, 256); LOGD("%p (%04x): %-8s%s%s\n", baseAddr + offset, offset, opName, buf, |