Mercurial > hg > release > icedtea6-1.7
changeset 1709:524b551b6a8a
2009-09-15 Gary Benson <gbenson@redhat.com>
* ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp:
Reinstated copyright header and #endif comment.
* ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp:
Removed reinstated comment, moved opening brace back to
previous line, and reinstated #endif comment.
author | Gary Benson <gbenson@redhat.com> |
---|---|
date | Tue, 15 Sep 2009 06:02:32 -0400 |
parents | f07666c3167a |
children | 419024238732 |
files | ChangeLog ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp |
diffstat | 3 files changed, 37 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Sep 15 09:48:53 2009 +0100 +++ b/ChangeLog Tue Sep 15 06:02:32 2009 -0400 @@ -1,3 +1,12 @@ +2009-09-15 Gary Benson <gbenson@redhat.com> + + * ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp: + Reinstated copyright header and #endif comment. + + * ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp: + Removed reinstated comment, moved opening brace back to + previous line, and reinstated #endif comment. + 2009-09-15 Edward Nevill <ed@camswl.com> * asm_helper.cpp: Missed from previous checkin
--- a/ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp Tue Sep 15 09:48:53 2009 +0100 +++ b/ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp Tue Sep 15 06:02:32 2009 -0400 @@ -26,9 +26,7 @@ #include "incls/_precompiled.incl" #include "incls/_bytecodes_zero.cpp.incl" -void Bytecodes::pd_initialize() -{ - // No zero specific initialization +void Bytecodes::pd_initialize() { #ifdef HOTSPOT_ASM def(_iaccess_0, "_iaccess_0", "b_jj", NULL, T_INT, 1, true, _aload_0); def(_iaccess_1, "_iaccess_1", "b_jj", NULL, T_INT, 1, true, _aload_1); @@ -72,5 +70,5 @@ def(_iload_2_iload_N, "iload_2_iload_N", "b_", NULL, T_INT, 2, false, _iload_2); def(_iload_3_iload_N, "iload_3_iload_N", "b_", NULL, T_INT, 2, false, _iload_3); -#endif +#endif // HOTSPOT_ASM }
--- a/ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp Tue Sep 15 09:48:53 2009 +0100 +++ b/ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp Tue Sep 15 06:02:32 2009 -0400 @@ -1,3 +1,28 @@ +/* + * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2009 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. + * + */ + #ifdef HOTSPOT_ASM #define _iaccess_0 ((Bytecodes::Code)0xdb) #define _iaccess_1 ((Bytecodes::Code)0xdc) @@ -36,4 +61,4 @@ _iload_1_iload_N , // 251 _iload_2_iload_N , // 252 _iload_3_iload_N , // 253 -#endif +#endif // HOTSPOT_ASM