diff options
| author | Dan Bornstein <danfuzz@android.com> | 2010-11-09 17:15:10 -0800 |
|---|---|---|
| committer | Dan Bornstein <danfuzz@android.com> | 2010-11-09 17:21:14 -0800 |
| commit | 7b3e9b0886f2b716b004f0377866988ae39a136e (patch) | |
| tree | 1bfcb89a69fa302960f63fe302b6b28178ccc3e7 /dexdump | |
| parent | 654428aed28fe99cfe6b05ba7fd94bdd4bd1084a (diff) | |
| download | android_dalvik-7b3e9b0886f2b716b004f0377866988ae39a136e.tar.gz android_dalvik-7b3e9b0886f2b716b004f0377866988ae39a136e.tar.bz2 android_dalvik-7b3e9b0886f2b716b004f0377866988ae39a136e.zip | |
Reharmonize the implementation with the spec.
In particular, I altered the naming of some instruction format fields
as well as the names of instruction formats themselves, all in an attempt
to make the implementation be a more straightforward match of the spec.
This patch mostly changes comments to reflect the new harmonized
reality. The only "code-like" change is the renaming of kFmt3inline
and kFmt3rinline to kFmt35mi and kFmt3rmi (respectively), which is
what they're called in the spec.
Bonus: Added the new extended opcode instruction formats to
InstrUtils.h, though I left them commented out for now.
Change-Id: I0109f361c1e9b6f0308c45e8cda5320e9ad3060c
Diffstat (limited to 'dexdump')
| -rw-r--r-- | dexdump/DexDump.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/dexdump/DexDump.c b/dexdump/DexDump.c index 506409cc9..ee7bd80d2 100644 --- a/dexdump/DexDump.c +++ b/dexdump/DexDump.c @@ -878,9 +878,8 @@ void dumpInstruction(DexFile* pDexFile, const DexCode* pCode, int insnIdx, case kFmt32x: // op vAAAA, vBBBB printf(" v%d, v%d", pDecInsn->vA, pDecInsn->vB); break; - case kFmt35c: // op vB, {vD, vE, vF, vG, vA}, thing@CCCC + case kFmt35c: // op {vC, vD, vE, vF, vG}, thing@BBBB { - /* NOTE: decoding of 35c doesn't quite match spec */ fputs(" {", stdout); for (i = 0; i < (int) pDecInsn->vA; i++) { if (i == 0) @@ -960,7 +959,7 @@ void dumpInstruction(DexFile* pDexFile, const DexCode* pCode, int insnIdx, printf("}, [%04x] // vtable #%04x", pDecInsn->vB, pDecInsn->vB); } break; - case kFmt3rinline: // [opt] execute-inline/range + case kFmt3rmi: // [opt] execute-inline/range { fputs(" {", stdout); for (i = 0; i < (int) pDecInsn->vA; i++) { @@ -972,7 +971,7 @@ void dumpInstruction(DexFile* pDexFile, const DexCode* pCode, int insnIdx, printf("}, [%04x] // inline #%04x", pDecInsn->vB, pDecInsn->vB); } break; - case kFmt3inline: // [opt] inline invoke + case kFmt35mi: // [opt] inline invoke { #if 0 const InlineOperation* inlineOpsTable = dvmGetInlineOpsTable(); |