summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-11-05 19:13:15 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-11-05 19:13:15 +0000
commit211d45e059935a7874a1ec89846f03d35ffba29f (patch)
tree546ea7ed2bdc9159a42bbbb33268ef0129147140
parent970a25ca627fe13ab381bc4c639868179a3c8f1f (diff)
parent5f70c79c81f171ff0aa126d58bfbe98772ab7e33 (diff)
downloadart-211d45e059935a7874a1ec89846f03d35ffba29f.zip
art-211d45e059935a7874a1ec89846f03d35ffba29f.tar.gz
art-211d45e059935a7874a1ec89846f03d35ffba29f.tar.bz2
Merge "X86 QBE: Mark kX86StartOfMethod as defining reg 0"
-rw-r--r--compiler/dex/quick/x86/assemble_x86.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/dex/quick/x86/assemble_x86.cc b/compiler/dex/quick/x86/assemble_x86.cc
index 85a3b32..ef55054 100644
--- a/compiler/dex/quick/x86/assemble_x86.cc
+++ b/compiler/dex/quick/x86/assemble_x86.cc
@@ -541,7 +541,7 @@ ENCODING_MAP(Cmp, IS_LOAD, 0, 0,
{ kX86CallI, kCall, IS_UNARY_OP | IS_BRANCH, { 0, 0, 0xE8, 0, 0, 0, 0, 4, false }, "CallI", "!0d" },
{ kX86Ret, kNullary, NO_OPERAND | IS_BRANCH, { 0, 0, 0xC3, 0, 0, 0, 0, 0, false }, "Ret", "" },
- { kX86StartOfMethod, kMacro, IS_UNARY_OP | SETS_CCODES, { 0, 0, 0, 0, 0, 0, 0, 0, false }, "StartOfMethod", "!0r" },
+ { kX86StartOfMethod, kMacro, IS_UNARY_OP | REG_DEF0 | SETS_CCODES, { 0, 0, 0, 0, 0, 0, 0, 0, false }, "StartOfMethod", "!0r" },
{ kX86PcRelLoadRA, kPcRel, IS_LOAD | IS_QUIN_OP | REG_DEF0_USE12, { 0, 0, 0x8B, 0, 0, 0, 0, 0, false }, "PcRelLoadRA", "!0r,[!1r+!2r<<!3d+!4p]" },
{ kX86PcRelAdr, kPcRel, IS_LOAD | IS_BINARY_OP | REG_DEF0, { 0, 0, 0xB8, 0, 0, 0, 0, 4, false }, "PcRelAdr", "!0r,!1p" },
{ kX86RepneScasw, kNullary, NO_OPERAND | REG_USEA | REG_USEC | SETS_CCODES, { 0x66, 0xF2, 0xAF, 0, 0, 0, 0, 0, false }, "RepNE ScasW", "" },