summaryrefslogtreecommitdiffstats
path: root/vm/compiler/codegen/arm/Assemble.cpp
diff options
context:
space:
mode:
authorBen Cheng <bccheng@android.com>2011-04-22 10:22:20 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-22 10:22:20 -0700
commitc7432258b3dd420ec7b252ae25aa9a19a66a8e0f (patch)
treec11b0c3b682092ff82b5c65820e23a56e3595ca9 /vm/compiler/codegen/arm/Assemble.cpp
parentf7ab441aa04df6fd49796b078754771bb2fa4683 (diff)
parent9f54185b4186def90351903bb2e97090e06ab559 (diff)
downloadandroid_dalvik-c7432258b3dd420ec7b252ae25aa9a19a66a8e0f.tar.gz
android_dalvik-c7432258b3dd420ec7b252ae25aa9a19a66a8e0f.tar.bz2
android_dalvik-c7432258b3dd420ec7b252ae25aa9a19a66a8e0f.zip
am 9f54185b: Set "needFallThroughBranch" flag during block split.
* commit '9f54185b4186def90351903bb2e97090e06ab559': Set "needFallThroughBranch" flag during block split.
Diffstat (limited to 'vm/compiler/codegen/arm/Assemble.cpp')
-rw-r--r--vm/compiler/codegen/arm/Assemble.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/vm/compiler/codegen/arm/Assemble.cpp b/vm/compiler/codegen/arm/Assemble.cpp
index 16804ba99..a433c31d4 100644
--- a/vm/compiler/codegen/arm/Assemble.cpp
+++ b/vm/compiler/codegen/arm/Assemble.cpp
@@ -881,6 +881,10 @@ ArmEncodingMap EncodingMap[kArmLast] = {
kFmtUnused, -1, -1,
IS_BINARY_OP | REG_DEF0 | REG_USE_PC | IS_LOAD,
"ldr", "r!0d, [r15pc, -#!1d]", 2),
+ ENCODING_MAP(kThumbUndefined, 0xde00,
+ kFmtUnused, -1, -1, kFmtUnused, -1, -1, kFmtUnused, -1, -1,
+ kFmtUnused, -1, -1, NO_OPERAND,
+ "undefined", "", 1),
};
/*