Mercurial > hg > truffle
diff src/cpu/sparc/vm/nativeInst_sparc.hpp @ 11173:6b0fd0964b87
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 31 Jul 2013 11:00:54 +0200 |
parents | 46c544b8fbfc |
children | 5a9d68c3a7d7 de6a9e811145 |
line wrap: on
line diff
--- a/src/cpu/sparc/vm/nativeInst_sparc.hpp Tue Jul 30 13:03:28 2013 -0700 +++ b/src/cpu/sparc/vm/nativeInst_sparc.hpp Wed Jul 31 11:00:54 2013 +0200 @@ -70,8 +70,7 @@ bool is_zombie() { int x = long_at(0); return is_op3(x, - VM_Version::v9_instructions_work() ? - Assembler::ldsw_op3 : Assembler::lduw_op3, + Assembler::ldsw_op3, Assembler::ldst_op) && Assembler::inv_rs1(x) == G0 && Assembler::inv_rd(x) == O7;