changeset in /hg/icedtea6: 2008-12-16 Andrew Haley <aph at redhat...

[Andrew Haley]

changeset eb264976c3df in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=eb264976c3df
description:
	2008-12-16  Andrew Haley  <aph at redhat.com>

		* ports/hotspot/src/share/vm/shark/sharkFunction.cpp
		(SharkFunction::CreatePopFrame): Remove _LP64 special-case code.

		* ports/hotspot/src/share/vm/shark/sharkBlock.cpp (SharkBlock::parse):
		Don't call pop() more than once in an arglist.

diffstat:

3 files changed, 24 insertions(+), 12 deletions(-)
ChangeLog                                          |    8 ++++++
ports/hotspot/src/share/vm/shark/sharkBlock.cpp    |   24 +++++++++++++-------
ports/hotspot/src/share/vm/shark/sharkFunction.cpp |    4 ---

diffs (82 lines):

diff -r edaae21dab0b -r eb264976c3df ChangeLog
--- a/ChangeLog	Mon Dec 15 12:31:08 2008 -0500
+++ b/ChangeLog	Tue Dec 16 15:57:47 2008 +0000
@@ -1,3 +1,11 @@ 2008-12-15  Lillian Angel  <langel at redha
+2008-12-16  Andrew Haley  <aph at redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkFunction.cpp
+	(SharkFunction::CreatePopFrame): Remove _LP64 special-case code.
+
+	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp (SharkBlock::parse):
+	Don't call pop() more than once in an arglist.
+
 2008-12-15  Lillian Angel  <langel at redhat.com>
 
 	Fixes #475888
diff -r edaae21dab0b -r eb264976c3df ports/hotspot/src/share/vm/shark/sharkBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Mon Dec 15 12:31:08 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Tue Dec 16 15:57:47 2008 +0000
@@ -838,10 +838,12 @@ void SharkBlock::parse()
       do_if(ICmpInst::ICMP_NE, SharkValue::null(), pop());
       break;
     case Bytecodes::_if_acmpeq:
-      do_if(ICmpInst::ICMP_EQ, pop(), pop());
+      b = pop(); a = pop();
+      do_if(ICmpInst::ICMP_EQ, b, a);
       break;
     case Bytecodes::_if_acmpne:
-      do_if(ICmpInst::ICMP_NE, pop(), pop());
+      b = pop(); a = pop();
+      do_if(ICmpInst::ICMP_NE, b, a);
       break;
     case Bytecodes::_ifeq:
       do_if(ICmpInst::ICMP_EQ, SharkValue::jint_constant(0), pop());
@@ -862,22 +864,28 @@ void SharkBlock::parse()
       do_if(ICmpInst::ICMP_SGE, SharkValue::jint_constant(0), pop());
       break;
     case Bytecodes::_if_icmpeq:
-      do_if(ICmpInst::ICMP_EQ, pop(), pop());
+      b = pop(); a = pop();
+      do_if(ICmpInst::ICMP_EQ, b, a);
       break;
     case Bytecodes::_if_icmpne:
-      do_if(ICmpInst::ICMP_NE, pop(), pop());
+      b = pop(); a = pop();
+      do_if(ICmpInst::ICMP_NE, b, a);
       break;
     case Bytecodes::_if_icmplt:
-      do_if(ICmpInst::ICMP_SLT, pop(), pop());
+      b = pop(); a = pop();
+      do_if(ICmpInst::ICMP_SLT, b, a);
       break;
     case Bytecodes::_if_icmple:
-      do_if(ICmpInst::ICMP_SLE, pop(), pop());
+      b = pop(); a = pop();
+      do_if(ICmpInst::ICMP_SLE, b, a);
       break;
     case Bytecodes::_if_icmpgt:
-      do_if(ICmpInst::ICMP_SGT, pop(), pop());
+      b = pop(); a = pop();
+      do_if(ICmpInst::ICMP_SGT, b, a);
       break;
     case Bytecodes::_if_icmpge:
-      do_if(ICmpInst::ICMP_SGE, pop(), pop());
+      b = pop(); a = pop();
+      do_if(ICmpInst::ICMP_SGE, b, a);
       break;
 
     case Bytecodes::_tableswitch:
diff -r edaae21dab0b -r eb264976c3df ports/hotspot/src/share/vm/shark/sharkFunction.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkFunction.cpp	Mon Dec 15 12:31:08 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkFunction.cpp	Tue Dec 16 15:57:47 2008 +0000
@@ -190,10 +190,6 @@ Value* SharkFunction::CreatePopFrame(int
       builder()->CreateIntToPtr(
         fp, PointerType::getUnqual(SharkType::intptr_type()))));
 
-#ifdef _LP64
-  if (result_slots == 2)
-    return builder()->CreateAdd(sp, LLVMValue::jint_constant(wordSize));
-#endif // _LP64
   return sp;
 }