/hg/openjdk6-mips: 2 new changesets
liuqi at icedtea.classpath.org
liuqi at icedtea.classpath.org
Sun Dec 12 17:47:47 PST 2010
changeset 7d01189d02d7 in /hg/openjdk6-mips
details: http://icedtea.classpath.org/hg/openjdk6-mips?cmd=changeset;node=7d01189d02d7
author: Ao Qi <aoqi at loongson.cn>
date: Mon Dec 13 08:40:39 2010 +0800
Chinese font display support on Debian.
changeset 76218a369227 in /hg/openjdk6-mips
details: http://icedtea.classpath.org/hg/openjdk6-mips?cmd=changeset;node=76218a369227
author: Ao Qi <aoqi at loongson.cn>
date: Tue Nov 30 10:23:02 2010 +0800
Disable output in JVM_handle_linux_signal with the product version.
diffstat:
3 files changed, 238 insertions(+), 1 deletion(-)
hotspot/src/os_cpu/linux_mips/vm/os_linux_mips.cpp | 50 ++
jdk/make/sun/awt/Makefile | 1
jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Debian.properties | 188 ++++++++++
diffs (420 lines):
diff -r 4bd942efa7de -r 76218a369227 hotspot/src/os_cpu/linux_mips/vm/os_linux_mips.cpp
--- a/hotspot/src/os_cpu/linux_mips/vm/os_linux_mips.cpp Mon Dec 06 13:25:11 2010 +0800
+++ b/hotspot/src/os_cpu/linux_mips/vm/os_linux_mips.cpp Tue Nov 30 10:23:02 2010 +0800
@@ -184,6 +184,7 @@ JVM_handle_linux_signal(int sig,
siginfo_t* info,
void* ucVoid,
int abort_if_unrecognized) {
+#ifndef PRODUCT
tty->print_cr("signal infomation:\n\
signo = %x, \n\
sicode = %x, \n\
@@ -193,6 +194,7 @@ JVM_handle_linux_signal(int sig,
info->si_code,
info->si_errno,
info->si_addr);
+#endif
ucontext_t* uc = (ucontext_t*) ucVoid;
@@ -225,11 +227,15 @@ JVM_handle_linux_signal(int sig,
if (os::Linux::signal_handlers_are_installed) {
if (t != NULL ){
if(t->is_Java_thread()) {
+#ifndef PRODUCT
tty->print_cr("this thread is a java thread\n");
+#endif
thread = (JavaThread*)t;
}
else if(t->is_VM_thread()){
+#ifndef PRODUCT
tty->print_cr("this thread is a VM thread\n");
+#endif
vmthread = (VMThread *)t;
}
}
@@ -240,7 +246,9 @@ JVM_handle_linux_signal(int sig,
address pc = NULL;
pc = (address) os::Linux::ucontext_get_pc(uc);
+#ifndef PRODUCT
tty->print_cr("pc=%x", pc);
+#endif
//%note os_trap_1
if (info != NULL && uc != NULL && thread != NULL) {
pc = (address) os::Linux::ucontext_get_pc(uc);
@@ -248,41 +256,57 @@ JVM_handle_linux_signal(int sig,
if (sig == SIGSEGV) {
address addr = (address) info->si_addr;
// check if fault address is within thread stack
+#ifndef PRODUCT
printf("handle all stack overflow variations\n");
printf("addr = %x, stack base = %x, stack top = %x\n",
addr,
thread->stack_base(),
thread->stack_base() - thread->stack_size());
+#endif
if (addr < thread->stack_base() &&
addr >= thread->stack_base() - thread->stack_size()) {
// stack overflow
+#ifndef PRODUCT
printf("stack exception check \n");
+#endif
if (thread->in_stack_yellow_zone(addr)) {
+#ifndef PRODUCT
printf("exception addr is in yellow zone\n");
+#endif
thread->disable_stack_yellow_zone();
if (thread->thread_state() == _thread_in_Java) {
// Throw a stack overflow exception. Guard pages will be reenabled
// while unwinding the stack.
+#ifndef PRODUCT
printf("this thread is in java\n");
+#endif
stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::STACK_OVERFLOW);
} else {
// Thread was in the vm or native code. Return and try to finish.
+#ifndef PRODUCT
printf("this thread is in vm or native codes and return\n");
+#endif
return 1;
}
} else if (thread->in_stack_red_zone(addr)) {
// Fatal red zone violation. Disable the guard pages and fall through
// to handle_unexpected_exception way down below.
+#ifndef PRODUCT
printf("exception addr is in red zone\n");
+#endif
thread->disable_stack_red_zone();
+#ifndef PRODUCT
tty->print_raw_cr("An irrecoverable stack overflow has occurred.");
+#endif
} else {
// Accessing stack address below sp may cause SEGV if current
// thread has MAP_GROWSDOWN stack. This should only happen when
// current thread was created by user code with MAP_GROWSDOWN flag
// and then attached to VM. See notes in os_linux.cpp.
+#ifndef PRODUCT
printf("exception addr is neither in yellow zone nor in the red one\n");
+#endif
if (thread->osthread()->expanding_stack() == 0) {
thread->osthread()->set_expanding_stack();
if (os::Linux::manually_expand_stack(thread, addr)) {
@@ -300,8 +324,10 @@ JVM_handle_linux_signal(int sig,
if (thread->thread_state() == _thread_in_Java) {
// Java thread running in Java code => find exception handler if any
// a fault inside compiled code, the interpreter, or a stub
+#ifndef PRODUCT
tty->print("java thread running in java code\n");
tty->print_cr("polling address = %x", os::get_polling_page());
+#endif
if (sig == SIGSEGV && os::is_poll_address((address)info->si_addr)) {
stub = SharedRuntime::get_poll_stub(pc);
@@ -311,7 +337,9 @@ JVM_handle_linux_signal(int sig,
// Do not crash the VM in such a case.
CodeBlob* cb = CodeCache::find_blob_unsafe(pc);
nmethod* nm = cb->is_nmethod() ? (nmethod*)cb : NULL;
+#ifndef PRODUCT
printf("cb = %x, nm = %x\n", cb, nm);
+#endif
if (nm != NULL && nm->has_unsafe_access()) {
stub = StubRoutines::handler_for_unsafe_access();
}
@@ -339,25 +367,33 @@ JVM_handle_linux_signal(int sig,
else if (sig == SIGSEGV &&
!MacroAssembler::needs_explicit_null_check((intptr_t)info->si_addr)) {
// Determination of interpreter/vtable stub/compiled code null exception
+#ifndef PRODUCT
printf("continuation for implicit exception\n");
+#endif
stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL);
}
} else if (thread->thread_state() == _thread_in_vm &&
sig == SIGBUS && /* info->si_code == BUS_OBJERR && */
thread->doing_unsafe_access()) {
+#ifndef PRODUCT
tty->print_cr("SIGBUS in vm thread \n");
+#endif
stub = StubRoutines::handler_for_unsafe_access();
}
// jni_fast_Get<Primitive>Field can trap at certain pc's if a GC kicks in
// and the heap gets shrunk before the field access.
if ((sig == SIGSEGV) || (sig == SIGBUS)) {
+#ifndef PRODUCT
printf("jni fast get trap\n");
+#endif
address addr = JNI_FastGetField::find_slowcase_pc(pc);
if (addr != (address)-1) {
stub = addr;
}
+#ifndef PRODUCT
tty->print_cr("addr = %d, stub = %d\n", addr, stub);
+#endif
}
// Check to see if we caught the safepoint code in the
@@ -367,7 +403,9 @@ JVM_handle_linux_signal(int sig,
if ((sig == SIGSEGV) &&
os::is_memory_serialize_page(thread, (address) info->si_addr)) {
// Block current thread until the memory serialize page permission restored.
+#ifndef PRODUCT
printf("write protecting the memory serialiazation page\n");
+#endif
os::block_on_serialize_page_trap();
return true;
}
@@ -394,7 +432,9 @@ JVM_handle_linux_signal(int sig,
//(uc->uc_mcontext.cause == 2 || uc->uc_mcontext.cause == 3)) {
(uc->uc_mcontext.hi1 == 2 || uc->uc_mcontext.hi1 == 3)) {
//aoqi: copy from jdk1.5, dont understand the struct mcontext_t.
+#ifndef PRODUCT
tty->print_cr("execution protection violation\n");
+#endif
int page_size = os::vm_page_size();
address addr = (address) info->si_addr;
@@ -462,7 +502,9 @@ JVM_handle_linux_signal(int sig,
}
if (stub != NULL) {
+#ifndef PRODUCT
tty->print_cr("resolved stub=%d\n",stub);
+#endif
// save all thread context in case we need to restore it
if (thread != NULL) thread->set_saved_exception_pc(pc);
@@ -472,13 +514,17 @@ JVM_handle_linux_signal(int sig,
// signal-chaining
if (os::Linux::chained_handler(sig, info, ucVoid)) {
+#ifndef PRODUCT
tty->print_cr("signal chaining\n");
+#endif
return true;
}
if (!abort_if_unrecognized) {
// caller wants another chance, so give it to him
+#ifndef PRODUCT
tty->print_cr("abort becauce of unrecognized\n");
+#endif
return false;
}
@@ -491,7 +537,9 @@ JVM_handle_linux_signal(int sig,
sigemptyset(&newset);
sigaddset(&newset, sig);
sigprocmask(SIG_UNBLOCK, &newset, NULL);
- tty->print_cr("VMError in signal handler\n");
+#ifndef PRODUCT
+ tty->print_cr("VMError in signal handler\n");
+#endif
VMError err(t, sig, pc, info, ucVoid);
err.report_and_die();
diff -r 4bd942efa7de -r 76218a369227 jdk/make/sun/awt/Makefile
--- a/jdk/make/sun/awt/Makefile Mon Dec 06 13:25:11 2010 +0800
+++ b/jdk/make/sun/awt/Makefile Tue Nov 30 10:23:02 2010 +0800
@@ -387,6 +387,7 @@ _FONTCONFIGS = \
fontconfig.properties \
fontconfig.SuSE.properties \
fontconfig.Ubuntu.properties \
+ fontconfig.Debian.properties \
fontconfig.Fedora.properties
else
diff -r 4bd942efa7de -r 76218a369227 jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Debian.properties
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Debian.properties Tue Nov 30 10:23:02 2010 +0800
@@ -0,0 +1,188 @@
+#
+# Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
+# Version
+
+# Uses Fedora Core 6 fonts and file paths.
+version=1
+
+# Component Font Mappings
+
+dialog.plain.latin-1=DejaVu LGC Sans
+dialog.plain.japanese-x0208=Sazanami Gothic
+dialog.plain.korean=Baekmuk Gulim
+dialog.plain.chinese-big5=AR PL ShanHeiSun Uni
+dialog.plain.chinese-gb18030=AR PL ShanHeiSun Uni
+
+dialog.bold.latin-1=DejaVu LGC Sans Bold
+dialog.bold.japanese-x0208=Sazanami Gothic
+dialog.bold.korean=Baekmuk Gulim
+dialog.bold.chinese-big5=AR PL ShanHeiSun Uni
+dialog.bold.chinese-gb18030=AR PL ShanHeiSun Uni
+
+dialog.italic.latin-1=DejaVu LGC Sans Oblique
+dialog.italic.japanese-x0208=Sazanami Gothic
+dialog.italic.korean=Baekmuk Gulim
+dialog.italic.chinese-big5=AR PL ShanHeiSun Uni
+dialog.italic.chinese-gb18030=AR PL ShanHeiSun Uni
+
+dialog.bolditalic.latin-1=DejaVu LGC Sans Bold Oblique
+dialog.bolditalic.japanese-x0208=Sazanami Gothic
+dialog.bolditalic.korean=Baekmuk Gulim
+dialog.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
+dialog.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+
+
+sansserif.plain.latin-1=DejaVu LGC Sans
+sansserif.plain.japanese-x0208=Sazanami Gothic
+sansserif.plain.korean=Baekmuk Gulim
+sansserif.plain.chinese-big5=AR PL ShanHeiSun Uni
+sansserif.plain.chinese-gb18030=AR PL ShanHeiSun Uni
+
+sansserif.bold.latin-1=DejaVu LGC Sans Bold
+sansserif.bold.japanese-x0208=Sazanami Gothic
+sansserif.bold.korean=Baekmuk Gulim
+sansserif.bold.chinese-big5=AR PL ShanHeiSun Uni
+sansserif.bold.chinese-gb18030=AR PL ShanHeiSun Uni
+
+sansserif.italic.latin-1=DejaVu LGC Sans Oblique
+sansserif.italic.japanese-x0208=Sazanami Gothic
+sansserif.italic.korean=Baekmuk Gulim
+sansserif.italic.chinese-big5=AR PL ShanHeiSun Uni
+sansserif.italic.chinese-gb18030=AR PL ShanHeiSun Uni
+
+sansserif.bolditalic.latin-1=DejaVu LGC Sans Bold Oblique
+sansserif.bolditalic.japanese-x0208=Sazanami Gothic
+sansserif.bolditalic.korean=Baekmuk Gulim
+sansserif.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
+sansserif.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+
+
+serif.plain.latin-1=DejaVu LGC Serif
+serif.plain.japanese-x0208=Sazanami Mincho
+serif.plain.korean=Baekmuk Batang
+serif.plain.chinese-big5=AR PL ZenKai Uni
+serif.plain.chinese-gb18030=AR PL ZenKai Uni
+
+serif.bold.latin-1=DejaVu LGC Serif Bold
+serif.bold.japanese-x0208=Sazanami Mincho
+serif.bold.korean=Baekmuk Batang
+serif.bold.chinese-big5=AR PL ZenKai Uni
+serif.bold.chinese-gb18030=AR PL ZenKai Uni
+
+serif.italic.latin-1=DejaVu LGC Serif Oblique
+serif.italic.japanese-x0208=Sazanami Mincho
+serif.italic.korean=Baekmuk Batang
+serif.italic.chinese-big5=AR PL ZenKai Uni
+serif.italic.chinese-gb18030=AR PL ZenKai Uni
+
+serif.bolditalic.latin-1=DejaVu LGC Serif Bold Oblique
+serif.bolditalic.japanese-x0208=Sazanami Mincho
+serif.bolditalic.korean=Baekmuk Batang
+serif.bolditalic.chinese-big5=AR PL ZenKai Uni
+serif.bolditalic.chinese-gb18030=AR PL ZenKai Uni
+
+
+monospaced.plain.latin-1=DejaVu LGC Sans Mono
+monospaced.plain.japanese-x0208=Sazanami Gothic
+monospaced.plain.korean=Baekmuk Gulim
+monospaced.plain.chinese-big5=AR PL ShanHeiSun Uni
+monospaced.plain.chinese-gb18030=AR PL ShanHeiSun Uni
+
+monospaced.bold.latin-1=DejaVu LGC Sans Mono Bold
+monospaced.bold.japanese-x0208=Sazanami Gothic
+monospaced.bold.korean=Baekmuk Gulim
+monospaced.bold.chinese-big5=AR PL ShanHeiSun Uni
+monospaced.bold.chinese-gb18030=AR PL ShanHeiSun Uni
+
+monospaced.italic.latin-1=DejaVu LGC Sans Mono Oblique
+monospaced.italic.japanese-x0208=Sazanami Gothic
+monospaced.italic.korean=Baekmuk Gulim
+monospaced.italic.chinese-big5=AR PL ShanHeiSun Uni
+monospaced.italic.chinese-gb18030=AR PL ShanHeiSun Uni
+
+monospaced.bolditalic.latin-1=DejaVu LGC Sans Mono Bold Oblique
+monospaced.bolditalic.japanese-x0208=Sazanami Gothic
+monospaced.bolditalic.korean=Baekmuk Gulim
+monospaced.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
+monospaced.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+
+
+dialoginput.plain.latin-1=DejaVu LGC Sans Mono
+dialoginput.plain.japanese-x0208=Sazanami Gothic
+dialoginput.plain.korean=Baekmuk Gulim
+dialoginput.plain.chinese-big5=AR PL ShanHeiSun Uni
+dialoginput.plain.chinese-gb18030=AR PL ShanHeiSun Uni
+
+dialoginput.bold.latin-1=DejaVu LGC Sans Mono Bold
+dialoginput.bold.japanese-x0208=Sazanami Gothic
+dialoginput.bold.korean=Baekmuk Gulim
+dialoginput.bold.chinese-big5=AR PL ShanHeiSun Uni
+dialoginput.bold.chinese-gb18030=AR PL ShanHeiSun Uni
+
+dialoginput.italic.latin-1=DejaVu LGC Sans Mono Oblique
+dialoginput.italic.japanese-x0208=Sazanami Gothic
+dialoginput.italic.korean=Baekmuk Gulim
+dialoginput.italic.chinese-big5=AR PL ShanHeiSun Uni
+dialoginput.italic.chinese-gb18030=AR PL ShanHeiSun Uni
+
+dialoginput.bolditalic.latin-1=DejaVu LGC Sans Mono Bold Oblique
+dialoginput.bolditalic.japanese-x0208=Sazanami Gothic
+dialoginput.bolditalic.korean=Baekmuk Gulim
+dialoginput.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
+dialoginput.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+
+# Search Sequences
+
+sequence.allfonts=latin-1
+sequence.allfonts.Big5=chinese-big5,latin-1
+sequence.allfonts.x-euc-jp-linux=japanese-x0208,latin-1
+sequence.allfonts.EUC-KR=korean,latin-1
+sequence.allfonts.GB18030=chinese-gb18030,latin-1
+sequence.fallback=chinese-big5,chinese-gb18030,japanese-x0208,korean
+
+# Font File Names
+
+filename.DejaVu_LGC_Sans=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans.ttf
+filename.DejaVu_LGC_Sans_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Bold.ttf
+filename.DejaVu_LGC_Sans_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Oblique.ttf
+filename.DejaVu_LGC_Sans_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-BoldOblique.ttf
+
+filename.DejaVu_LGC_Sans_Mono=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono.ttf
+filename.DejaVu_LGC_Sans_Mono_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-Bold.ttf
+filename.DejaVu_LGC_Sans_Mono_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-Oblique.ttf
+filename.DejaVu_LGC_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-BoldOblique.ttf
+
+filename.DejaVu_LGC_Serif=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif.ttf
+filename.DejaVu_LGC_Serif_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-Bold.ttf
+filename.DejaVu_LGC_Serif_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-Oblique.ttf
+filename.DejaVu_LGC_Serif_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-BoldOblique.ttf
+
+filename.Sazanami_Gothic=/usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf
+filename.Sazanami_Mincho=/usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf
+filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttc
+filename.AR_PL_ZenKai_Uni=/usr/share/fonts/truetype/arphic/ukai.ttc
+filename.Baekmuk_Gulim=/usr/share/fonts/korean/TrueType/gulim.ttf
+filename.Baekmuk_Batang=/usr/share/fonts/korean/TrueType/batang.ttf
More information about the distro-pkg-dev
mailing list