diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-09-21 15:04:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-21 15:04:49 -0700 |
| commit | baa78bce6683560b4f9dca3b71e33d90d2d0cf29 (patch) | |
| tree | 4172cf0f5f29762d6499f73c63ad0480bec79b4b | |
| parent | 0f117a580d22e6f68a6fb821e6cbc8c67389e8de (diff) | |
| parent | bdfa9937a8fc8230ca109774ccc1eafaa20ba1a7 (diff) | |
| download | android_dalvik-baa78bce6683560b4f9dca3b71e33d90d2d0cf29.tar.gz android_dalvik-baa78bce6683560b4f9dca3b71e33d90d2d0cf29.tar.bz2 android_dalvik-baa78bce6683560b4f9dca3b71e33d90d2d0cf29.zip | |
am bdfa9937: Merge change 25979 into eclair
Merge commit 'bdfa9937a8fc8230ca109774ccc1eafaa20ba1a7' into eclair-plus-aosp
* commit 'bdfa9937a8fc8230ca109774ccc1eafaa20ba1a7':
Allow dalvik pre-optimization to run in ARMv7 emulator.
| -rw-r--r-- | libdex/InstrUtils.c | 4 | ||||
| -rw-r--r-- | vm/analysis/VerifySubs.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libdex/InstrUtils.c b/libdex/InstrUtils.c index 42aa3ec62..93e1f004a 100644 --- a/libdex/InstrUtils.c +++ b/libdex/InstrUtils.c @@ -38,6 +38,10 @@ */ InstructionWidth* dexCreateInstrWidthTable(void) { +#ifdef __ARM_ARCH_7A__ + /* hack to work around mysterious problem on emulator */ + LOGD("creating instr width table\n"); +#endif InstructionWidth* instrWidth; int i; diff --git a/vm/analysis/VerifySubs.c b/vm/analysis/VerifySubs.c index 8dcc6f8dc..39d6dc848 100644 --- a/vm/analysis/VerifySubs.c +++ b/vm/analysis/VerifySubs.c @@ -65,6 +65,8 @@ bool dvmComputeCodeWidths(const Method* meth, InsnFlags* insnFlags, if (width == 0) { LOG_VFY_METH(meth, "VFY: invalid post-opt instruction (0x%x)\n", instr); + LOGI("### instr=%d width=%d table=%d\n", + instr, width, dexGetInstrWidthAbs(gDvm.instrWidth, instr)); goto bail; } if (width < 0 || width > 5) { |