diff options
| author | Vladimir Marko <vmarko@google.com> | 2013-12-19 13:31:15 +0000 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2013-12-20 16:03:15 +0000 |
| commit | 58af1f9385742f70aca4fcb5e13aba53b8be2ef4 (patch) | |
| tree | ced2ca058dfc110700716357ac296c3741598cc6 /compiler/dex/compiler_enums.h | |
| parent | 93055a258c3a81d1b3b8eb44c9c71cf73ceeb8f0 (diff) | |
| download | android_art-58af1f9385742f70aca4fcb5e13aba53b8be2ef4.tar.gz android_art-58af1f9385742f70aca4fcb5e13aba53b8be2ef4.tar.bz2 android_art-58af1f9385742f70aca4fcb5e13aba53b8be2ef4.zip | |
Clean up usage of carry flag condition codes.
On X86, kCondUlt and kCondUge are bound to CS and CC,
respectively, while on ARM it's the other way around. The
explicit binding in ConditionCode was wrong and misleading
and could lead to subtle bugs. Therefore, we detach those
constants and clean up usage. The CS and CC conditions are
now effectively unused but we keep them around as they may
eventually be useful.
And some minor cleanup and comments.
Change-Id: Ic5ed81d86b6c7f9392dd8fe9474b3ff718fee595
Diffstat (limited to 'compiler/dex/compiler_enums.h')
| -rw-r--r-- | compiler/dex/compiler_enums.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/dex/compiler_enums.h b/compiler/dex/compiler_enums.h index 35d04ae137..eb9ae06a3c 100644 --- a/compiler/dex/compiler_enums.h +++ b/compiler/dex/compiler_enums.h @@ -203,10 +203,10 @@ std::ostream& operator<<(std::ostream& os, const OpKind& kind); enum ConditionCode { kCondEq, // equal kCondNe, // not equal - kCondCs, // carry set (unsigned less than) - kCondUlt = kCondCs, - kCondCc, // carry clear (unsigned greater than or same) - kCondUge = kCondCc, + kCondCs, // carry set + kCondCc, // carry clear + kCondUlt, // unsigned less than + kCondUge, // unsigned greater than or same kCondMi, // minus kCondPl, // plus, positive or zero kCondVs, // overflow |