Mercurial > hg > release > icedtea6-1.3
changeset 749:95bff73fbc01 cacao
2008-03-05 Gary Benson <gbenson@redhat.com>
* ports/hotspot/src/cpu/ppc/vm/jni_ppc.h: Removed.
* ports/hotspot/src/os_cpu/linux_ppc/vm/linux_ppc.s: Likewise.
* ports/hotspot/src/os_cpu/linux_ppc/vm/linux_ppc64.s: Likewise.
author | Gary Benson <gbenson@redhat.com> |
---|---|
date | Wed, 05 Mar 2008 08:33:49 -0500 |
parents | 390f771d9d9b |
children | c4af65fc7574 |
files | ChangeLog ports/hotspot/src/cpu/ppc/vm/jni_ppc.h ports/hotspot/src/os_cpu/linux_ppc/vm/linux_ppc.s ports/hotspot/src/os_cpu/linux_ppc/vm/linux_ppc64.s |
diffstat | 4 files changed, 6 insertions(+), 204 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Mar 05 08:28:23 2008 -0500 +++ b/ChangeLog Wed Mar 05 08:33:49 2008 -0500 @@ -1,3 +1,9 @@ +2008-03-05 Gary Benson <gbenson@redhat.com> + + * ports/hotspot/src/cpu/ppc/vm/jni_ppc.h: Removed. + * ports/hotspot/src/os_cpu/linux_ppc/vm/linux_ppc.s: Likewise. + * ports/hotspot/src/os_cpu/linux_ppc/vm/linux_ppc64.s: Likewise. + 2008-03-05 Gary Benson <gbenson@redhat.com> * ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp: Removed.
--- a/ports/hotspot/src/cpu/ppc/vm/jni_ppc.h Wed Mar 05 08:28:23 2008 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -/* - * Copyright 1997-2004 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. - */ - -#define JNIEXPORT -#define JNIIMPORT -#define JNICALL - -typedef int jint; -typedef long long jlong; -typedef signed char jbyte;
--- a/ports/hotspot/src/os_cpu/linux_ppc/vm/linux_ppc.s Wed Mar 05 08:28:23 2008 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,76 +0,0 @@ -# -# Copyright 2004-2007 Sun Microsystems, Inc. All Rights Reserved. -# Copyright 2007 Red Hat, Inc. -# 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. -# -# 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. -# - - .global SpinPause - .global SafeFetch32 - .global SafeFetchN - - # int SpinPause() -SpinPause: - nop - blr - - # int SafeFetch32(int *adr, int errValue) - # intptr_t SafeFetchN(intptr_t *adr, intptr_t errValue) -SafeFetch32: -SafeFetchN: - mr %r5, %r3 - mr %r3, %r4 - lwz %r3, 0(%r5) - blr - - .global _Copy_conjoint_jints_atomic - - # void _Copy_conjoint_jints_atomic(jint* from, - # jint* to, - # size_t count) - # if (from > to) { - # for (int i = 0; i < count; i++) { - # to[count] = from[count]; - # } - # } else { - # while (count-- >= 0) { - # to[count] = from[count]; - # } - # } -_Copy_conjoint_jints_atomic: - slwi %r5, %r5, 2 - cmpw %r3, %r4 - ble 3f -cla_LeftToRight: - li %r6, 0 - b 2f -1: lwzx %r0, %r3, %r6 - stwx %r0, %r4, %r6 - addi %r6, %r6, 4 -2: cmpw %r6, %r5 - blt 1b - blr -cla_RightToLeft: - subi %r5, %r5, 4 - lwzx %r0, %r3, %r5 - stwx %r0, %r4, %r5 -3: cmpwi %r5, 0 - bgt cla_RightToLeft - blr
--- a/ports/hotspot/src/os_cpu/linux_ppc/vm/linux_ppc64.s Wed Mar 05 08:28:23 2008 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,96 +0,0 @@ -# -# Copyright 2004-2007 Sun Microsystems, Inc. All Rights Reserved. -# Copyright 2007 Red Hat, Inc. -# 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. -# -# 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. -# - - .global SpinPause - .global SafeFetch32 - .global SafeFetchN - - .section ".opd","aw" -SpinPause: .quad .SpinPause, .TOC.@tocbase,0 -SafeFetch32: .quad .SafeFetch32, .TOC.@tocbase,0 -SafeFetchN: .quad .SafeFetchN, .TOC.@tocbase,0 - .previous - .global .SpinPause - .global .SafeFetch32 - .global .SafeFetchN - - # int SpinPause() -.SpinPause: - nop - blr - - # int SafeFetch32(int *adr, int errValue) -.SafeFetch32: - mr %r5, %r3 - mr %r3, %r4 - lwz %r3, 0(%r5) - blr - - # intptr_t SafeFetchN(intptr_t *adr, intptr_t errValue) -.SafeFetchN: - mr %r5, %r3 - mr %r3, %r4 - ld %r3, 0(%r5) - blr - - - .global _Copy_conjoint_jlongs_atomic - .section ".opd","aw" -_Copy_conjoint_jlongs_atomic: - .quad ._Copy_conjoint_jlongs_atomic, .TOC.@tocbase,0 - .previous - .global ._Copy_conjoint_jlongs_atomic - - # void _Copy_conjoint_jlongs_atomic(jlong* from, - # jlong* to, - # size_t count) - # if (from > to) { - # for (int i = 0; i < count; i++) { - # to[count] = from[count]; - # } - # } else { - # while (count-- >= 0) { - # to[count] = from[count]; - # } - # } -._Copy_conjoint_jlongs_atomic: - sldi %r5, %r5, 3 - cmpd %r3, %r4 - ble 3f -cla_LeftToRight: - li %r6, 0 - b 2f -1: ldx %r0, %r3, %r6 - stdx %r0, %r4, %r6 - addi %r6, %r6, 8 -2: cmpd %r6, %r5 - blt 1b - blr -cla_RightToLeft: - subi %r5, %r5, 8 - ldx %r0, %r3, %r5 - stdx %r0, %r4, %r5 -3: cmpdi %r5, 0 - bgt cla_RightToLeft - blr