archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8074718: Merge templateTable_x86 _32 and _64 .hpp files

Browse source 
TemplateTable_x86 32 and 64 bit files have been merged.

Reviewed-by: hseigel, coleenp
This commit is contained in:
Max Ockner 2015-03-30 09:47:52 -04:00
parent a16c45029d
commit f0fa5ca5f0
3 changed files with 6 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hotspot/src/cpu/x86/vm/templateTable_x86_32.hpp → hotspot/src/cpu/x86/vm/templateTable_x86.hpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -22,8 +22,8 @@
* *
*/ */
#ifndef CPU_X86_VM_TEMPLATETABLE_X86_32_HPP #ifndef CPU_X86_VM_TEMPLATETABLE_X86_HPP
#define CPU_X86_VM_TEMPLATETABLE_X86_32_HPP #define CPU_X86_VM_TEMPLATETABLE_X86_HPP
static void prepare_invoke(int byte_no, static void prepare_invoke(int byte_no,
Register method, // linked method (or i-klass) Register method, // linked method (or i-klass)
@ -39,4 +39,4 @@
static void index_check(Register array, Register index); static void index_check(Register array, Register index);
static void index_check_without_pop(Register array, Register index); static void index_check_without_pop(Register array, Register index);
#endif // CPU_X86_VM_TEMPLATETABLE_X86_32_HPP #endif // CPU_X86_VM_TEMPLATETABLE_X86_HPP

42
hotspot/src/cpu/x86/vm/templateTable_x86_64.hpp
View file

@ -1,42 +0,0 @@
/*
* Copyright (c) 2003, 2012, Oracle and/or its affiliates. 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.
*
* 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*
*/
#ifndef CPU_X86_VM_TEMPLATETABLE_X86_64_HPP
#define CPU_X86_VM_TEMPLATETABLE_X86_64_HPP
static void prepare_invoke(int byte_no,
Register method, // linked method (or i-klass)
Register index = noreg, // itable index, MethodType, etc.
Register recv = noreg, // if caller wants to see it
Register flags = noreg // if caller wants to test it
);
static void invokevirtual_helper(Register index, Register recv,
Register flags);
static void volatile_barrier(Assembler::Membar_mask_bits order_constraint);
// Helpers
static void index_check(Register array, Register index);
static void index_check_without_pop(Register array, Register index);
#endif // CPU_X86_VM_TEMPLATETABLE_X86_64_HPP

6
hotspot/src/share/vm/interpreter/templateTable.hpp
View file

@ -351,10 +351,8 @@ class TemplateTable: AllStatic {
// Platform specifics // Platform specifics
#if defined TEMPLATETABLE_MD_HPP #if defined TEMPLATETABLE_MD_HPP
# include TEMPLATETABLE_MD_HPP # include TEMPLATETABLE_MD_HPP
#elif defined TARGET_ARCH_MODEL_x86_32 #elif defined (TARGET_ARCH_MODEL_x86_32) || defined (TARGET_ARCH_MODEL_x86_64)
# include "templateTable_x86_32.hpp" # include "templateTable_x86.hpp"
#elif defined TARGET_ARCH_MODEL_x86_64
# include "templateTable_x86_64.hpp"
#elif defined TARGET_ARCH_MODEL_sparc #elif defined TARGET_ARCH_MODEL_sparc
# include "templateTable_sparc.hpp" # include "templateTable_sparc.hpp"
#elif defined TARGET_ARCH_MODEL_zero #elif defined TARGET_ARCH_MODEL_zero