changeset in /hg/icedtea: 2008-01-29 Gary Benson <gbenson at redh...
Gary Benson
gbenson at redhat.com
Tue Jan 29 04:55:49 PST 2008
changeset bafb1c61ffad in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=bafb1c61ffad
description:
2008-01-29 Gary Benson <gbenson at redhat.com>
* patches/icedtea-c1-unimplemented.patch: Removed file.
* Makefile.am (ICEDTEA_PATCHES): Removed the above.
* Makefile.in: Regenerated.
* patches/icedtea-ports.patch: Removed some cruft.
diffstat:
5 files changed, 8 insertions(+), 182 deletions(-)
ChangeLog | 8 +
Makefile.am | 1
Makefile.in | 1
patches/icedtea-c1-unimplemented.patch | 136 --------------------------------
patches/icedtea-ports.patch | 44 ----------
diffs (231 lines):
diff -r 1d3c3b0865e2 -r bafb1c61ffad ChangeLog
--- a/ChangeLog Tue Jan 29 05:14:07 2008 -0500
+++ b/ChangeLog Tue Jan 29 07:55:41 2008 -0500
@@ -1,3 +1,11 @@ 2008-01-29 Gary Benson <gbenson at redhat
+2008-01-29 Gary Benson <gbenson at redhat.com>
+
+ * patches/icedtea-c1-unimplemented.patch: Removed file.
+ * Makefile.am (ICEDTEA_PATCHES): Removed the above.
+ * Makefile.in: Regenerated.
+
+ * patches/icedtea-ports.patch: Removed some cruft.
+
2008-01-29 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp: New file.
diff -r 1d3c3b0865e2 -r bafb1c61ffad Makefile.am
--- a/Makefile.am Tue Jan 29 05:14:07 2008 -0500
+++ b/Makefile.am Tue Jan 29 07:55:41 2008 -0500
@@ -213,7 +213,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-linker-options.patch \
patches/icedtea-ports.patch \
patches/icedtea-lcms-leak.patch \
- patches/icedtea-c1-unimplemented.patch \
patches/icedtea-timerqueue.patch \
patches/icedtea-jnlp-launcher.patch \
patches/icedtea-generated.patch \
diff -r 1d3c3b0865e2 -r bafb1c61ffad Makefile.in
--- a/Makefile.in Tue Jan 29 05:14:07 2008 -0500
+++ b/Makefile.in Tue Jan 29 07:55:41 2008 -0500
@@ -313,7 +313,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-linker-options.patch \
patches/icedtea-ports.patch \
patches/icedtea-lcms-leak.patch \
- patches/icedtea-c1-unimplemented.patch \
patches/icedtea-timerqueue.patch \
patches/icedtea-jnlp-launcher.patch \
patches/icedtea-generated.patch \
diff -r 1d3c3b0865e2 -r bafb1c61ffad patches/icedtea-c1-unimplemented.patch
--- a/patches/icedtea-c1-unimplemented.patch Tue Jan 29 05:14:07 2008 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,136 +0,0 @@
---- openjdk-ecj/hotspot/src/share/vm/c1/c1_LIR.hpp 2007-12-03 09:55:25.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/c1/c1_LIR.hpp 2007-12-03 09:30:13.000000000 +0000
-@@ -656,6 +656,9 @@
- class LIR_OpTypeCheck;
- class LIR_OpCompareAndSwap;
- class LIR_OpProfileCall;
-+#ifdef PPC
-+class LIR_OpUnimplemented;
-+#endif
-
-
- // LIR operation codes
-@@ -764,6 +767,11 @@
- , begin_opMDOProfile
- , lir_profile_call
- , end_opMDOProfile
-+#ifdef PPC
-+ , begin_opUnimplemented
-+ , lir_unimplemented
-+ , end_opUnimplemented
-+#endif
- };
-
-
-@@ -898,6 +906,9 @@
- virtual LIR_OpTypeCheck* as_OpTypeCheck() { return NULL; }
- virtual LIR_OpCompareAndSwap* as_OpCompareAndSwap() { return NULL; }
- virtual LIR_OpProfileCall* as_OpProfileCall() { return NULL; }
-+#ifdef PPC
-+ virtual LIR_OpUnimplemented* as_OpUnimplemented() { return NULL; }
-+#endif
-
- virtual void verify() const {}
- };
-@@ -1579,6 +1590,24 @@
- virtual void print_instr(outputStream* out) const PRODUCT_RETURN;
- };
-
-+#ifdef PPC
-+// LIR_OpUnimplemented
-+class LIR_OpUnimplemented : public LIR_Op {
-+ private:
-+ const char* _file;
-+ const int _line;
-+
-+ public:
-+ LIR_OpUnimplemented(const char* file, int line)
-+ : LIR_Op(lir_unimplemented, LIR_OprFact::illegalOpr, NULL),
-+ _file(file),
-+ _line(line) {}
-+
-+ virtual void emit_code(LIR_Assembler* masm);
-+ virtual LIR_OpUnimplemented* as_OpUnimplemented() { return this; }
-+ virtual void print_instr(outputStream* out) const PRODUCT_RETURN;
-+};
-+#endif
-
- class LIR_InsertionBuffer;
-
-@@ -1837,6 +1866,14 @@
-
- // methodDataOop profiling
- void profile_call(ciMethod* method, int bci, LIR_Opr mdo, LIR_Opr recv, LIR_Opr t1, ciKlass* cha_klass) { append(new LIR_OpProfileCall(lir_profile_call, method, bci, mdo, recv, t1, cha_klass)); }
-+
-+ // stubbing
-+#ifdef PPC
-+ void unimplemented(const char* file, int line)
-+ {
-+ append(new LIR_OpUnimplemented(file, line));
-+ }
-+#endif
- };
-
- void print_LIR(BlockList* blocks);
---- openjdk-ecj/hotspot/src/share/vm/c1/c1_LIR.cpp 2007-12-03 09:55:25.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/c1/c1_LIR.cpp 2007-12-03 09:50:04.000000000 +0000
-@@ -861,6 +861,16 @@
- break;
- }
-
-+#ifdef PPC
-+// LIR_OpUnimplemented:
-+ case lir_unimplemented: {
-+ assert(op->as_OpUnimplemented() != NULL, "must be");
-+ assert(op->_info == NULL, "info not used by this instruction");
-+ assert(op->_result->is_illegal(), "not used");
-+ break;
-+ }
-+#endif
-+
- default:
- ShouldNotReachHere();
- }
-@@ -1003,6 +1013,12 @@
- masm->emit_profile_call(this);
- }
-
-+#ifdef PPC
-+void LIR_OpUnimplemented::emit_code(LIR_Assembler* masm) {
-+ masm->emit_unimplemented(_file, _line);
-+}
-+#endif
-+
-
- // LIR_List
- LIR_List::LIR_List(Compilation* compilation, BlockBegin* block)
-@@ -1617,6 +1633,10 @@
- case lir_cas_int: s = "cas_int"; break;
- // LIR_OpProfileCall
- case lir_profile_call: s = "profile_call"; break;
-+#ifdef PPC
-+ // LIR_OpUnimplemented
-+ case lir_unimplemented: s = "unimplemented"; break;
-+#endif
-
- case lir_none: ShouldNotReachHere();break;
- default: s = "illegal_op"; break;
-@@ -1869,6 +1889,18 @@
- tmp1()->print(out); out->print(" ");
- }
-
-+#ifdef PPC
-+// LIR_OpUnimplemented
-+void LIR_OpUnimplemented::print_instr(outputStream* out) const {
-+ char sep = os::file_separator()[0];
-+ const char *file = strrchr(_file, sep);
-+ if (file)
-+ file++;
-+ else
-+ file = _file;
-+ out->print("[%s:%d]", file, _line);
-+}
-+#endif // PPC
-
- #endif // PRODUCT
-
diff -r 1d3c3b0865e2 -r bafb1c61ffad patches/icedtea-ports.patch
--- a/patches/icedtea-ports.patch Tue Jan 29 05:14:07 2008 -0500
+++ b/patches/icedtea-ports.patch Tue Jan 29 07:55:41 2008 -0500
@@ -299,50 +299,6 @@ diff -ru openjdk.orig/hotspot/src/share/
#define FIX_THIS(code) report_assertion_failure("FIX_THIS",__FILE__, __LINE__, "")
#define define_pd_global(type, name, value) const type pd_##name = value;
---- openjdk.orig/hotspot/src/share/vm/c1/c1_LIR.hpp 2007-10-30 08:46:25.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/c1/c1_LIR.hpp 2007-11-22 16:12:59.000000000 +0000
-@@ -422,9 +422,7 @@
- XMMRegister as_xmm_double_reg() const;
- // for compatibility with RInfo
- int fpu () const { return lo_reg_half(); }
--#endif
--
--#ifdef SPARC
-+#else
- FloatRegister as_float_reg () const;
- FloatRegister as_double_reg () const;
- #endif
-@@ -549,6 +547,9 @@
- static LIR_Opr single_xmm(int reg) { return (LIR_Opr)((reg << LIR_OprDesc::reg1_shift) | LIR_OprDesc::float_type | LIR_OprDesc::fpu_register | LIR_OprDesc::single_size | LIR_OprDesc::is_xmm_mask); }
- static LIR_Opr double_xmm(int reg) { return (LIR_Opr)((reg << LIR_OprDesc::reg1_shift) | (reg << LIR_OprDesc::reg2_shift) | LIR_OprDesc::double_type | LIR_OprDesc::fpu_register | LIR_OprDesc::double_size | LIR_OprDesc::is_xmm_mask); }
- #endif
-+#ifdef PPC
-+ static LIR_Opr double_fpu(int reg) { Unimplemented(); }
-+#endif
-
-
- static LIR_Opr virtual_register(int index, BasicType type) {
---- openjdk.orig/hotspot/src/share/vm/c1/c1_LIR.cpp 2007-10-30 08:46:25.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/c1/c1_LIR.cpp 2007-11-22 16:12:59.000000000 +0000
-@@ -63,6 +63,18 @@
-
- #endif
-
-+#ifdef PPC
-+
-+FloatRegister LIR_OprDesc::as_float_reg() const {
-+ Unimplemented();
-+}
-+
-+FloatRegister LIR_OprDesc::as_double_reg() const {
-+ Unimplemented();
-+}
-+
-+#endif
-+
- LIR_Opr LIR_OprFact::illegalOpr = LIR_OprFact::illegal();
-
- LIR_Opr LIR_OprFact::value_type(ValueType* type) {
diff -ru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk
--- openjdk.orig/jdk/make/common/Defs-linux.gmk 2007-11-08 11:35:35.000000000 +0000
+++ openjdk/jdk/make/common/Defs-linux.gmk 2007-11-08 11:36:15.000000000 +0000
More information about the distro-pkg-dev
mailing list