/hg/openjdk6-mips: 3 new changesets
liuqi at icedtea.classpath.org
liuqi at icedtea.classpath.org
Mon Nov 22 05:53:09 PST 2010
changeset 1f91cc15cd21 in /hg/openjdk6-mips
details: http://icedtea.classpath.org/hg/openjdk6-mips?cmd=changeset;node=1f91cc15cd21
author: YANG Yongqiang <yangyongqiang at loongson.cn>
date: Wed Nov 17 17:46:08 2010 +0800
A wrong instruction(slt) was used.
changeset 202786aed583 in /hg/openjdk6-mips
details: http://icedtea.classpath.org/hg/openjdk6-mips?cmd=changeset;node=202786aed583
author: YANG Yongqiang <yangyongqiang at loongson.cn>
date: Wed Nov 17 17:52:29 2010 +0800
Remove useless codes.
changeset ab0d284dc313 in /hg/openjdk6-mips
details: http://icedtea.classpath.org/hg/openjdk6-mips?cmd=changeset;node=ab0d284dc313
author: LIN Chuanwen <linchuanwen at loongson.cn>
date: Thu Nov 18 16:19:42 2010 +0800
Fix the bug when the C1 compiler dealing with CAS.
In C1 compiler, the CAS operations(cas_int, cas_long and cas_obj)
use AT as the result register. However, the CAS operation does not
define the result operand.
diffstat:
5 files changed, 60 insertions(+), 12 deletions(-)
hotspot/src/cpu/mips/vm/c1_LIRGenerator_mips.cpp | 10 ++--
hotspot/src/cpu/mips/vm/c1_Runtime1_mips.cpp | 4 -
hotspot/src/cpu/mips/vm/templateInterpreter_mips.cpp | 1
hotspot/src/share/vm/c1/c1_LIR.cpp | 38 +++++++++++++++++-
hotspot/src/share/vm/c1/c1_LIR.hpp | 19 +++++++--
diffs (168 lines):
diff -r 87db8957684e -r ab0d284dc313 hotspot/src/cpu/mips/vm/c1_LIRGenerator_mips.cpp
--- a/hotspot/src/cpu/mips/vm/c1_LIRGenerator_mips.cpp Fri Nov 12 15:27:30 2010 +0800
+++ b/hotspot/src/cpu/mips/vm/c1_LIRGenerator_mips.cpp Thu Nov 18 16:19:42 2010 +0800
@@ -707,7 +707,7 @@ void LIRGenerator::do_AttemptUpdate(Intr
__ add(addr, LIR_OprFact::intConst(value_offset), addr);
LIR_Opr t1 = LIR_OprFact::illegalOpr; // no temp needed
LIR_Opr t2 = LIR_OprFact::illegalOpr; // no temp needed
- __ cas_long(addr, cmp_value.result(), new_value.result(), t1, t2);
+ __ cas_long(addr, cmp_value.result(), new_value.result(), t1, t2, FrameMap::_at_opr);
// generate conditional move of boolean result
LIR_Opr result = rlock_result(x);
@@ -749,17 +749,17 @@ void LIRGenerator::do_CompareAndSwap(Int
} else {
ShouldNotReachHere();
}
- LIR_Opr addr = new_register(T_OBJECT);
+ LIR_Opr addr = new_pointer_register();
__ move(obj.result(), addr);
__ add(addr, offset.result(), addr);
LIR_Opr ill = LIR_OprFact::illegalOpr; // for convenience
if (type == objectType)
- __ cas_obj(addr, cmp.result(), val.result(), ill, ill);
+ __ cas_obj(addr, cmp.result(), val.result(), ill, ill, FrameMap::_at_opr);
else if (type == intType)
- __ cas_int(addr, cmp.result(), val.result(), ill, ill);
+ __ cas_int(addr, cmp.result(), val.result(), ill, ill, FrameMap::_at_opr);
else if (type == longType)
- __ cas_long(addr, cmp.result(), val.result(), ill, ill);
+ __ cas_long(addr, cmp.result(), val.result(), ill, ill, FrameMap::_at_opr);
else {
ShouldNotReachHere();
}
diff -r 87db8957684e -r ab0d284dc313 hotspot/src/cpu/mips/vm/c1_Runtime1_mips.cpp
--- a/hotspot/src/cpu/mips/vm/c1_Runtime1_mips.cpp Fri Nov 12 15:27:30 2010 +0800
+++ b/hotspot/src/cpu/mips/vm/c1_Runtime1_mips.cpp Thu Nov 18 16:19:42 2010 +0800
@@ -916,7 +916,7 @@ OopMapSet* Runtime1::generate_code_for(S
} else {
__ set_info("new_object_array", dont_gc_arguments);
}
-
+
if (UseTLAB && FastTLABRefill) {
Register arr_size = T0;
Register t1 = T1;
@@ -926,7 +926,7 @@ OopMapSet* Runtime1::generate_code_for(S
// check that array length is small enough for fast path
__ move(AT, C1_MacroAssembler::max_array_allocation_length);
- __ slt(AT, AT, length);
+ __ sltu(AT, AT, length);
__ bne(AT, ZERO, slow_path);
__ delayed()->nop();
diff -r 87db8957684e -r ab0d284dc313 hotspot/src/cpu/mips/vm/templateInterpreter_mips.cpp
--- a/hotspot/src/cpu/mips/vm/templateInterpreter_mips.cpp Fri Nov 12 15:27:30 2010 +0800
+++ b/hotspot/src/cpu/mips/vm/templateInterpreter_mips.cpp Thu Nov 18 16:19:42 2010 +0800
@@ -1920,7 +1920,6 @@ int AbstractInterpreter::layout_activati
//set last sp;
intptr_t* esp = (intptr_t*) monbot - tempcount*Interpreter::stackElementWords() -
popframe_extra_args;
- printf("last sp is %x\n", esp);
interpreter_frame->interpreter_frame_set_last_sp(esp);
// All frames but the initial interpreter frame we fill in have a
// value for sender_sp that allows walking the stack but isn't
diff -r 87db8957684e -r ab0d284dc313 hotspot/src/share/vm/c1/c1_LIR.cpp
--- a/hotspot/src/share/vm/c1/c1_LIR.cpp Fri Nov 12 15:27:30 2010 +0800
+++ b/hotspot/src/share/vm/c1/c1_LIR.cpp Thu Nov 18 16:19:42 2010 +0800
@@ -1507,7 +1507,7 @@ void LIR_List::store_check(LIR_Opr objec
0));
}
-
+#ifndef MIPS32
void LIR_List::cas_long(LIR_Opr addr, LIR_Opr cmp_value, LIR_Opr new_value, LIR_Opr t1, LIR_Opr t2) {
// Compare and swap produces condition code "zero" if contents_of(addr) == cmp_value,
// implying successful swap of new_value into addr
@@ -1540,7 +1540,43 @@ void LIR_List::cas_int(LIR_Opr addr, LIR
t1,
t2));
}
+#else
+void LIR_List::cas_long(LIR_Opr addr, LIR_Opr cmp_value, LIR_Opr new_value, LIR_Opr t1, LIR_Opr t2, LIR_Opr result) {
+ // Compare and swap produces condition code "zero" if contents_of(addr) == cmp_value,
+ // implying successful swap of new_value into addr
+ append(new LIR_OpCompareAndSwap(lir_cas_long,
+ addr,
+ cmp_value,
+ new_value,
+ t1,
+ t2,
+ result));
+}
+void LIR_List::cas_obj(LIR_Opr addr, LIR_Opr cmp_value, LIR_Opr new_value, LIR_Opr t1, LIR_Opr t2, LIR_Opr result) {
+ // Compare and swap produces condition code "zero" if contents_of(addr) == cmp_value,
+ // implying successful swap of new_value into addr
+ append(new LIR_OpCompareAndSwap(lir_cas_obj,
+ addr,
+ cmp_value,
+ new_value,
+ t1,
+ t2,
+ result));
+}
+
+void LIR_List::cas_int(LIR_Opr addr, LIR_Opr cmp_value, LIR_Opr new_value, LIR_Opr t1, LIR_Opr t2, LIR_Opr result) {
+ // Compare and swap produces condition code "zero" if contents_of(addr) == cmp_value,
+ // implying successful swap of new_value into addr
+ append(new LIR_OpCompareAndSwap(lir_cas_int,
+ addr,
+ cmp_value,
+ new_value,
+ t1,
+ t2,
+ result));
+}
+#endif
#ifdef PRODUCT
diff -r 87db8957684e -r ab0d284dc313 hotspot/src/share/vm/c1/c1_LIR.hpp
--- a/hotspot/src/share/vm/c1/c1_LIR.hpp Fri Nov 12 15:27:30 2010 +0800
+++ b/hotspot/src/share/vm/c1/c1_LIR.hpp Thu Nov 18 16:19:42 2010 +0800
@@ -1868,6 +1868,7 @@ class LIR_OpCompareAndSwap : public LIR_
LIR_Opr _tmp2;
public:
+#ifndef MIPS32
LIR_OpCompareAndSwap(LIR_Code code, LIR_Opr addr, LIR_Opr cmp_value, LIR_Opr new_value, LIR_Opr t1, LIR_Opr t2)
: LIR_Op(code, LIR_OprFact::illegalOpr, NULL) // no result, no info
, _addr(addr)
@@ -1875,7 +1876,15 @@ class LIR_OpCompareAndSwap : public LIR_
, _new_value(new_value)
, _tmp1(t1)
, _tmp2(t2) { }
-
+#else
+ LIR_OpCompareAndSwap(LIR_Code code, LIR_Opr addr, LIR_Opr cmp_value, LIR_Opr new_value, LIR_Opr t1, LIR_Opr t2, LIR_Opr result)
+ : LIR_Op(code, result, NULL) // no result, no info
+ , _addr(addr)
+ , _cmp_value(cmp_value)
+ , _new_value(new_value)
+ , _tmp1(t1)
+ , _tmp2(t2) { }
+#endif
LIR_Opr addr() const { return _addr; }
LIR_Opr cmp_value() const { return _cmp_value; }
LIR_Opr new_value() const { return _new_value; }
@@ -2105,11 +2114,15 @@ class LIR_List: public CompilationResour
}
#endif
-
+#ifndef MIPS32
void cas_long(LIR_Opr addr, LIR_Opr cmp_value, LIR_Opr new_value, LIR_Opr t1, LIR_Opr t2);
void cas_obj(LIR_Opr addr, LIR_Opr cmp_value, LIR_Opr new_value, LIR_Opr t1, LIR_Opr t2);
void cas_int(LIR_Opr addr, LIR_Opr cmp_value, LIR_Opr new_value, LIR_Opr t1, LIR_Opr t2);
-
+#else
+ void cas_long(LIR_Opr addr, LIR_Opr cmp_value, LIR_Opr new_value, LIR_Opr t1, LIR_Opr t2, LIR_Opr result);
+ void cas_obj(LIR_Opr addr, LIR_Opr cmp_value, LIR_Opr new_value, LIR_Opr t1, LIR_Opr t2, LIR_Opr result);
+ void cas_int(LIR_Opr addr, LIR_Opr cmp_value, LIR_Opr new_value, LIR_Opr t1, LIR_Opr t2, LIR_Opr result);
+#endif
void abs (LIR_Opr from, LIR_Opr to, LIR_Opr tmp) { append(new LIR_Op2(lir_abs , from, tmp, to)); }
void sqrt(LIR_Opr from, LIR_Opr to, LIR_Opr tmp) { append(new LIR_Op2(lir_sqrt, from, tmp, to)); }
void log (LIR_Opr from, LIR_Opr to, LIR_Opr tmp) { append(new LIR_Op2(lir_log, from, tmp, to)); }
More information about the distro-pkg-dev
mailing list