diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-07-18 10:50:06 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-07-18 10:50:06 -0700 |
| commit | b9070095218595a5d6a37ef874df2794c1761030 (patch) | |
| tree | cab984d0ac72b8df4915f75277cd7efe0e8c9a3e /runtime/dex_instruction.cc | |
| parent | 08524597899d0bb021c9165218deff51dc88da50 (diff) | |
| parent | df62950e7a32031b82360c407d46a37b94188fbb (diff) | |
| download | art-b9070095218595a5d6a37ef874df2794c1761030.zip art-b9070095218595a5d6a37ef874df2794c1761030.tar.gz art-b9070095218595a5d6a37ef874df2794c1761030.tar.bz2 | |
resolved conflicts for merge of df62950e to dalvik-dev
Change-Id: I78fbcfc7a2dcbeccb7557ca27302928d7d00debd
Diffstat (limited to 'runtime/dex_instruction.cc')
| -rw-r--r-- | runtime/dex_instruction.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/runtime/dex_instruction.cc b/runtime/dex_instruction.cc index 427baf2..6b41511 100644 --- a/runtime/dex_instruction.cc +++ b/runtime/dex_instruction.cc @@ -56,12 +56,11 @@ int const Instruction::kInstructionVerifyFlags[] = { int const Instruction::kInstructionSizeInCodeUnits[] = { #define INSTRUCTION_SIZE(opcode, c, p, format, r, i, a, v) \ - (( opcode == NOP ) ? -1 : \ + ((opcode == NOP) ? -1 : \ ((format >= k10x) && (format <= k10t)) ? 1 : \ ((format >= k20t) && (format <= k22c)) ? 2 : \ ((format >= k32x) && (format <= k3rc)) ? 3 : \ - ( format == k51l ) ? 5 : -1 \ - ), + (format == k51l) ? 5 : -1), #include "dex_instruction_list.h" DEX_INSTRUCTION_LIST(INSTRUCTION_SIZE) #undef DEX_INSTRUCTION_LIST |