Mercurial > hg > truffle
diff src/cpu/x86/vm/bytecodeInterpreter_x86.inline.hpp @ 14726:92aa6797d639
Backed out merge changeset: b51e29501f30
Backed out merge revision to its first parent (8f483e200405)
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 24 Mar 2014 21:30:43 +0100 |
parents | d3f14809b051 |
children |
line wrap: on
line diff
--- a/src/cpu/x86/vm/bytecodeInterpreter_x86.inline.hpp Fri Mar 21 16:36:59 2014 -0700 +++ b/src/cpu/x86/vm/bytecodeInterpreter_x86.inline.hpp Mon Mar 24 21:30:43 2014 +0100 @@ -250,7 +250,7 @@ return op1 - op2; } -inline juint BytecodeInterpreter::VMintUshr(jint op1, jint op2) { +inline jint BytecodeInterpreter::VMintUshr(jint op1, jint op2) { return ((juint) op1) >> (op2 & 0x1f); }