head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.8 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.6 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.4 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.2 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.2.0.52 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.50 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.48 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.46 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.44 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.42 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.40 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.38 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.36 pkgsrc-2008Q1:1.2.0.34 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.32 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.30 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.28 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.26 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.24 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.22 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.20 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.18 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.16 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.14 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.12 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.10 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.8 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.6 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.4 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.2 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.1.1.1.0.2 pkgsrc-2003Q4-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2010.02.10.17.42.31; author joerg; state dead; branches; next 1.2; 1.2 date 2004.01.28.17.11.16; author jschauma; state Exp; branches; next 1.1; 1.1 date 2003.07.01.19.02.34; author jlam; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2003.07.01.19.02.34; author jlam; state Exp; branches; next ; desc @@ 1.3 log @Retire jdk, jdk-openjit, sun-jdk14, sun-jdk15, sun-jre14, sun-jre15. @ text @$NetBSD: patch-ab,v 1.2 2004/01/28 17:11:16 jschauma Exp $ --- rt-X86.c.orig 2001-09-06 16:34:36.000000000 -0400 +++ rt-X86.c 2004-01-11 10:44:13.000000000 -0500 @@@@ -127,14 +127,14 @@@@ #define ASM __asm__ volatile #ifdef SYM_UNDERSCORE -__asm__(" -_OpenJIT_f2i = OpenJIT_f2i -_OpenJIT_d2i = OpenJIT_f2i -_OpenJIT_f2l = OpenJIT_f2l -_OpenJIT_d2l = OpenJIT_d2l -_OpenJIT_invokeinterface_quick = OpenJIT_invokeinterface_quick -_throw_internal = throw_internal -"); +__asm__("\n" +"_OpenJIT_f2i = OpenJIT_f2i\n" +"_OpenJIT_d2i = OpenJIT_f2i\n" +"_OpenJIT_f2l = OpenJIT_f2l\n" +"_OpenJIT_d2l = OpenJIT_d2l\n" +"_OpenJIT_invokeinterface_quick = OpenJIT_invokeinterface_quick\n" +"_throw_internal = throw_internal\n" +""); #define ASM_TEXT_LABEL(X) __asm__(".text\n_" #X ":\n"); #else #define ASM_TEXT_LABEL(X) __asm__(".text\n" #X ":\n"); @@@@ -2051,107 +2051,107 @@@@ extern int OpenJIT_d2i(); /* One arg is passed via floating ST(0) */ extern int64_t OpenJIT_f2l(float f); extern int64_t OpenJIT_d2l(double d); -__asm__(" -OpenJIT_d2i = OpenJIT_f2i -.text - .align 4 - .type OpenJIT_f2i,@@function -OpenJIT_f2i: - pushl %ebp - movl %esp,%ebp - subl $8,%esp - ftst - fnstcw -4(%ebp) - movl -4(%ebp),%eax - movb $0xc,%ah - movw %ax,-2(%ebp) - fldcw -2(%ebp) - fistpl -8(%ebp) - fldcw -4(%ebp) - movl -8(%ebp),%eax - cmp $0x80000000,%eax - je IntOverFlow - leave - ret - -IntOverFlow: - fnstsw - sahf - jp IntNaN - movl $0x80000000,%eax - adcl $-1,%eax - leave - ret -IntNaN: - xorl %eax,%eax - leave - ret - -.text - .align 4 - .type OpenJIT_f2l,@@function -OpenJIT_f2l: - pushl %ebp - movl %esp,%ebp - subl $12,%esp - flds 8(%ebp) - ftst - fnstcw -4(%ebp) - movl -4(%ebp),%eax - movb $0xc,%ah - movw %ax,-2(%ebp) - fldcw -2(%ebp) - fistpll -12(%ebp) - fldcw -4(%ebp) - movl -12(%ebp),%eax - movl $0x80000000,%ecx - movl -8(%ebp),%edx - xorl %edx,%ecx - orl %eax,%ecx - je LongOverFlow - leave - ret - - .align 4 - .type OpenJIT_d2l,@@function -OpenJIT_d2l: - pushl %ebp - movl %esp,%ebp - subl $12,%esp - fldl 8(%ebp) - ftst - fnstcw -4(%ebp) - movl -4(%ebp),%eax - movb $0xc,%ah - movw %ax,-2(%ebp) - fldcw -2(%ebp) - fistpll -12(%ebp) - fldcw -4(%ebp) - movl -12(%ebp),%eax - movl $0x80000000,%ecx - movl -8(%ebp),%edx - xorl %edx,%ecx - orl %eax,%ecx - je LongOverFlow - leave - ret - -LongOverFlow: - fnstsw - sahf - jp LongNaN - movl $0,%eax - adcl $-1,%eax - adcl $-1,%edx - leave - ret - -LongNaN: - xorl %eax,%eax - xorl %edx,%edx - leave - ret -"); +__asm__("\n" +"OpenJIT_d2i = OpenJIT_f2i\n" +".text\n" +" .align 4\n" +" .type OpenJIT_f2i,@@function\n" +"OpenJIT_f2i:\n" +" pushl %ebp\n" +" movl %esp,%ebp\n" +" subl $8,%esp\n" +" ftst\n" +" fnstcw -4(%ebp)\n" +" movl -4(%ebp),%eax\n" +" movb $0xc,%ah\n" +" movw %ax,-2(%ebp)\n" +" fldcw -2(%ebp)\n" +" fistpl -8(%ebp)\n" +" fldcw -4(%ebp)\n" +" movl -8(%ebp),%eax\n" +" cmp $0x80000000,%eax\n" +" je IntOverFlow\n" +" leave\n" +" ret\n" +"\n" +"IntOverFlow:\n" +" fnstsw\n" +" sahf\n" +" jp IntNaN\n" +" movl $0x80000000,%eax\n" +" adcl $-1,%eax\n" +" leave\n" +" ret\n" +"IntNaN:\n" +" xorl %eax,%eax\n" +" leave\n" +" ret\n" +"\n" +".text\n" +" .align 4\n" +" .type OpenJIT_f2l,@@function\n" +"OpenJIT_f2l:\n" +" pushl %ebp\n" +" movl %esp,%ebp\n" +" subl $12,%esp\n" +" flds 8(%ebp)\n" +" ftst\n" +" fnstcw -4(%ebp)\n" +" movl -4(%ebp),%eax\n" +" movb $0xc,%ah\n" +" movw %ax,-2(%ebp)\n" +" fldcw -2(%ebp)\n" +" fistpll -12(%ebp)\n" +" fldcw -4(%ebp)\n" +" movl -12(%ebp),%eax\n" +" movl $0x80000000,%ecx\n" +" movl -8(%ebp),%edx\n" +" xorl %edx,%ecx\n" +" orl %eax,%ecx\n" +" je LongOverFlow\n" +" leave\n" +" ret\n" +"\n" +" .align 4\n" +" .type OpenJIT_d2l,@@function\n" +"OpenJIT_d2l:\n" +" pushl %ebp\n" +" movl %esp,%ebp\n" +" subl $12,%esp\n" +" fldl 8(%ebp)\n" +" ftst\n" +" fnstcw -4(%ebp)\n" +" movl -4(%ebp),%eax\n" +" movb $0xc,%ah\n" +" movw %ax,-2(%ebp)\n" +" fldcw -2(%ebp)\n" +" fistpll -12(%ebp)\n" +" fldcw -4(%ebp)\n" +" movl -12(%ebp),%eax\n" +" movl $0x80000000,%ecx\n" +" movl -8(%ebp),%edx\n" +" xorl %edx,%ecx\n" +" orl %eax,%ecx\n" +" je LongOverFlow\n" +" leave\n" +" ret\n" +"\n" +"LongOverFlow:\n" +" fnstsw\n" +" sahf\n" +" jp LongNaN\n" +" movl $0,%eax\n" +" adcl $-1,%eax\n" +" adcl $-1,%edx\n" +" leave\n" +" ret\n" +"\n" +"LongNaN:\n" +" xorl %eax,%eax\n" +" xorl %edx,%edx\n" +" leave\n" +" ret\n" +""); static int64_t OpenJIT_lshr(int64_t ll, unsigned b) @@@@ -2383,16 +2383,16 @@@@ } extern void throw_internal(); -__asm__(" -.text - .align 4 - .type throw_internal,@@function -throw_internal: - pushl %eax - jmp *%edx -.Lfe_throw_internal: - .size throw_internal,.Lfe_throw_internal-throw_internal -"); +__asm__("\n" +".text\n" +" .align 4\n" +" .type throw_internal,@@function\n" +"throw_internal:\n" +" pushl %eax\n" +" jmp *%edx\n" +".Lfe_throw_internal:\n" +" .size throw_internal,.Lfe_throw_internal-throw_internal\n" +""); #if defined(__linux__) static int signal_nest_count = -1; @@@@ -2422,7 +2422,7 @@@@ /* resume from signal */ \ return; \ } while(0); -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__NetBSD__) #define EAX sc_eax #define ECX sc_ecx #define EDX sc_edx @@@@ -2492,7 +2492,7 @@@@ #endif scp = (struct sigcontext *)(ebp + 3); } -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__NetBSD__) scp = (struct sigcontext *)uc; #elif defined(sun) scp = &((ucontext_t *)uc)->uc_mcontext; @@@@ -2553,7 +2553,7 @@@@ SIGRETURN(scp); case SIGSEGV: -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) case SIGBUS: #endif if (*pc == 0xcd) { @ 1.2 log @Make this compile with gcc 3.3. Fixes problems in agc's bulk build. @ text @d1 1 a1 1 $NetBSD: $ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 262 a264 3 --- rt-X86.c.orig Mon Feb 17 17:11:27 2003 +++ rt-X86.c @@@@ -2422,7 +2422,7 @@@@ do { \ d273 1 a273 1 @@@@ -2492,7 +2492,7 @@@@ OpenJIT_SignalHandler(int sig, void *inf d282 1 a282 1 @@@@ -2553,7 +2553,7 @@@@ OpenJIT_SignalHandler(int sig, void *inf @ 1.1.1.1 log @Initial import of lang/jdk-openjit. The OpenJIT project is an ongoing Java[tm] the programming language JIT compiler project as a collaborative effort between Tokyo Institute of Technology and Fujitsu Laboratory, partly sponsored by the Information Promotion Agency of Japan. OpenJIT is a "reflective" JIT compiler in that not only it is almost entirely written in Java, but also that it bootstraps and compiles itself during execution of the user program, and compiler components coexist as first-class objects in user heap space. This was imported from wip/jdk-openjit, provided by Todd Vierling with some minor changes by me. @ text @@