truffle: src/share/vm/graal/graalCodeInstaller.cpp annotate

annotate src/share/vm/graal/graalCodeInstaller.cpp @ 7093:dff79b1f82f1

removed unnecessary and incorrect initialization of ciEnv._dependencies

author	Doug Simon <doug.simon@oracle.com>
date	Thu, 29 Nov 2012 10:18:32 +0100
parents	af30115c9d0e
children	eec7173947a1

rev	line source
2516 a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	1 /*
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	2 * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	4 *
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	5 * This code is free software; you can redistribute it and/or modify it
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	6 * under the terms of the GNU General Public License version 2 only, as
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	7 * published by the Free Software Foundation.
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	8 *
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	9 * This code is distributed in the hope that it will be useful, but WITHOUT
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	12 * version 2 for more details (a copy is included in the LICENSE file that
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	13 * accompanied this code).
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	14 *
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	15 * You should have received a copy of the GNU General Public License version
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	16 * 2 along with this work; if not, write to the Free Software Foundation,
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	18 *
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	20 * or visit www.oracle.com if you need additional information or have any
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	21 * questions.
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	22 */
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	23
2045 9c96c873c42b Fix includes to match new hotspot mechanism. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1942 diff changeset	24 #include "precompiled.hpp"
6559 d5f7e737827f fixed compilation issues on Solaris. When using SunStudio compiler, Solaris build with DONT_USE_PRECOMPILED_HEADER Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6539 diff changeset	25 #include "runtime/javaCalls.hpp"
7089 af30115c9d0e added metering of code installation failure rate to detect excessive failure caused by overly optimistic assumptions Doug Simon <doug.simon@oracle.com> parents: 7084 diff changeset	26 #include "graal/graalEnv.hpp"
2891 75a99b4f1c98 Rebranded C++ part from C1X to Graal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2890 diff changeset	27 #include "graal/graalCompiler.hpp"
75a99b4f1c98 Rebranded C++ part from C1X to Graal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2890 diff changeset	28 #include "graal/graalCodeInstaller.hpp"
75a99b4f1c98 Rebranded C++ part from C1X to Graal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2890 diff changeset	29 #include "graal/graalJavaAccess.hpp"
4221 bcbb918f5ac6 Renaming of VMExits and VMEntries part 2. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4220 diff changeset	30 #include "graal/graalCompilerToVM.hpp"
2891 75a99b4f1c98 Rebranded C++ part from C1X to Graal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2890 diff changeset	31 #include "graal/graalVmIds.hpp"
2045 9c96c873c42b Fix includes to match new hotspot mechanism. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1942 diff changeset	32 #include "c1/c1_Runtime1.hpp"
2048 177398c6147d Added unique concrete subtype assumption. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2046 diff changeset	33 #include "classfile/vmSymbols.hpp"
2045 9c96c873c42b Fix includes to match new hotspot mechanism. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1942 diff changeset	34 #include "vmreg_x86.inline.hpp"
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	35
1434 72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	36
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	37 // TODO this should be handled in a more robust way - not hard coded...
1444 c0e244017dad Corrections of oop map generation. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1441 diff changeset	38 Register CPU_REGS[] = { rax, rcx, rdx, rbx, rsp, rbp, rsi, rdi, r8, r9, r10, r11, r12, r13, r14, r15 };
c0e244017dad Corrections of oop map generation. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1441 diff changeset	39 bool OOP_ALLOWED[] = {true, true, true, true, false, false, true, true, true, true, false, true, true, true, true, true};
1438 a7a0ef3c6858 Added timing printout on VM shutdown. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1435 diff changeset	40 const static int NUM_CPU_REGS = sizeof(CPU_REGS) / sizeof(Register);
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	41 XMMRegister XMM_REGS[] = { xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15 };
1438 a7a0ef3c6858 Added timing printout on VM shutdown. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1435 diff changeset	42 const static int NUM_XMM_REGS = sizeof(XMM_REGS) / sizeof(XMMRegister);
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	43 const static int NUM_REGS = NUM_CPU_REGS + NUM_XMM_REGS;
1468 e4cd5d2de7e1 Changes to sync with CRI changes. Doug Simon <doug.simon@oracle.com> parents: 1465 diff changeset	44 const static jlong NO_REF_MAP = 0x8000000000000000L;
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	45
6948 e522a00b91aa Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works Doug Simon <doug.simon@oracle.com> parents: 6674 diff changeset	46 // convert Graal register indices (as used in oop maps) to HotSpot registers
2891 75a99b4f1c98 Rebranded C++ part from C1X to Graal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2890 diff changeset	47 VMReg get_hotspot_reg(jint graal_reg) {
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	48
2891 75a99b4f1c98 Rebranded C++ part from C1X to Graal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2890 diff changeset	49 assert(graal_reg >= 0 && graal_reg < NUM_REGS, "invalid register number");
75a99b4f1c98 Rebranded C++ part from C1X to Graal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2890 diff changeset	50 if (graal_reg < NUM_CPU_REGS) {
75a99b4f1c98 Rebranded C++ part from C1X to Graal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2890 diff changeset	51 return CPU_REGS[graal_reg]->as_VMReg();
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	52 } else {
2891 75a99b4f1c98 Rebranded C++ part from C1X to Graal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2890 diff changeset	53 return XMM_REGS[graal_reg - NUM_CPU_REGS]->as_VMReg();
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	54 }
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	55 }
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	56
5542 e318468952f5 Remove CiBitMap and replace usages with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5326 diff changeset	57 const int MapWordBits = 64;
e318468952f5 Remove CiBitMap and replace usages with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5326 diff changeset	58
1469 52bb06250d35 Converted CiDebugInfo.registerRefMap field from type long to CiBitMap. Doug Simon <doug.simon@oracle.com> parents: 1468 diff changeset	59 static bool is_bit_set(oop bit_map, int i) {
5542 e318468952f5 Remove CiBitMap and replace usages with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5326 diff changeset	60 jint extra_idx = i / MapWordBits;
e318468952f5 Remove CiBitMap and replace usages with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5326 diff changeset	61 arrayOop extra = (arrayOop) GraalBitMap::words(bit_map);
e318468952f5 Remove CiBitMap and replace usages with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5326 diff changeset	62 assert(extra_idx >= 0 && extra_idx < extra->length(), "unexpected index");
e318468952f5 Remove CiBitMap and replace usages with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5326 diff changeset	63 jlong word = ((jlong*) extra->base(T_LONG))[extra_idx];
e318468952f5 Remove CiBitMap and replace usages with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5326 diff changeset	64 return (word & (1LL << (i % MapWordBits))) != 0;
e318468952f5 Remove CiBitMap and replace usages with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5326 diff changeset	65 }
e318468952f5 Remove CiBitMap and replace usages with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5326 diff changeset	66
e318468952f5 Remove CiBitMap and replace usages with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5326 diff changeset	67 static int bitmap_size(oop bit_map) {
e318468952f5 Remove CiBitMap and replace usages with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5326 diff changeset	68 arrayOop arr = (arrayOop) GraalBitMap::words(bit_map);
e318468952f5 Remove CiBitMap and replace usages with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5326 diff changeset	69 return arr->length() * MapWordBits;
1469 52bb06250d35 Converted CiDebugInfo.registerRefMap field from type long to CiBitMap. Doug Simon <doug.simon@oracle.com> parents: 1468 diff changeset	70 }
52bb06250d35 Converted CiDebugInfo.registerRefMap field from type long to CiBitMap. Doug Simon <doug.simon@oracle.com> parents: 1468 diff changeset	71
6948 e522a00b91aa Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works Doug Simon <doug.simon@oracle.com> parents: 6674 diff changeset	72 // creates a HotSpot oop map out of the byte arrays provided by DebugInfo
4174 79c91d220d73 Use callee save area to model the saved rbp register. Remove various hacks that added the saved area size in native code. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 3717 diff changeset	73 static OopMap* create_oop_map(jint total_frame_size, jint parameter_count, oop debug_info) {
79c91d220d73 Use callee save area to model the saved rbp register. Remove various hacks that added the saved area size in native code. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 3717 diff changeset	74 OopMap* map = new OopMap(total_frame_size, parameter_count);
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	75 oop register_map = (oop) DebugInfo::registerRefMap(debug_info);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	76 oop frame_map = (oop) DebugInfo::frameRefMap(debug_info);
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	77
1469 52bb06250d35 Converted CiDebugInfo.registerRefMap field from type long to CiBitMap. Doug Simon <doug.simon@oracle.com> parents: 1468 diff changeset	78 if (register_map != NULL) {
1465 2c754f3a2722 Inlining of static final field values. Java mirror instead of VmID. Support for PrintMetrics option. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1462 diff changeset	79 for (jint i = 0; i < NUM_CPU_REGS; i++) {
1469 52bb06250d35 Converted CiDebugInfo.registerRefMap field from type long to CiBitMap. Doug Simon <doug.simon@oracle.com> parents: 1468 diff changeset	80 bool is_oop = is_bit_set(register_map, i);
1465 2c754f3a2722 Inlining of static final field values. Java mirror instead of VmID. Support for PrintMetrics option. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1462 diff changeset	81 VMReg reg = get_hotspot_reg(i);
2c754f3a2722 Inlining of static final field values. Java mirror instead of VmID. Support for PrintMetrics option. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1462 diff changeset	82 if (is_oop) {
2c754f3a2722 Inlining of static final field values. Java mirror instead of VmID. Support for PrintMetrics option. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1462 diff changeset	83 assert(OOP_ALLOWED[i], "this register may never be an oop, register map misaligned?");
2c754f3a2722 Inlining of static final field values. Java mirror instead of VmID. Support for PrintMetrics option. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1462 diff changeset	84 map->set_oop(reg);
2c754f3a2722 Inlining of static final field values. Java mirror instead of VmID. Support for PrintMetrics option. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1462 diff changeset	85 } else {
2c754f3a2722 Inlining of static final field values. Java mirror instead of VmID. Support for PrintMetrics option. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1462 diff changeset	86 map->set_value(reg);
2c754f3a2722 Inlining of static final field values. Java mirror instead of VmID. Support for PrintMetrics option. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1462 diff changeset	87 }
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	88 }
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	89 }
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	90
5542 e318468952f5 Remove CiBitMap and replace usages with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5326 diff changeset	91 for (jint i = 0; i < bitmap_size(frame_map); i++) {
4174 79c91d220d73 Use callee save area to model the saved rbp register. Remove various hacks that added the saved area size in native code. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 3717 diff changeset	92 bool is_oop = is_bit_set(frame_map, i);
6948 e522a00b91aa Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works Doug Simon <doug.simon@oracle.com> parents: 6674 diff changeset	93 // HotSpot stack slots are 4 bytes
4174 79c91d220d73 Use callee save area to model the saved rbp register. Remove various hacks that added the saved area size in native code. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 3717 diff changeset	94 VMReg reg = VMRegImpl::stack2reg(i * 2);
79c91d220d73 Use callee save area to model the saved rbp register. Remove various hacks that added the saved area size in native code. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 3717 diff changeset	95 if (is_oop) {
79c91d220d73 Use callee save area to model the saved rbp register. Remove various hacks that added the saved area size in native code. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 3717 diff changeset	96 map->set_oop(reg);
79c91d220d73 Use callee save area to model the saved rbp register. Remove various hacks that added the saved area size in native code. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 3717 diff changeset	97 } else {
79c91d220d73 Use callee save area to model the saved rbp register. Remove various hacks that added the saved area size in native code. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 3717 diff changeset	98 map->set_value(reg);
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	99 }
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	100 }
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	101
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	102 return map;
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	103 }
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	104
7084 9ba90252ce08 HotSpotResolvedJavaType is now the HotSpot implementation of ResolvedJavaType, Gilles Duboscq <duboscq@ssw.jku.at> parents: 7081 diff changeset	105 // Records any Metadata values embedded in a Constant (e.g., the value returned by HotSpotResolvedObjectType.klass()).
6996 eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	106 static void record_metadata_in_constant(oop constant, OopRecorder* oop_recorder) {
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	107 char kind = Kind::typeChar(Constant::kind(constant));
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	108 char wordKind = 'j';
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	109 if (kind == wordKind) {
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	110 oop obj = Constant::object(constant);
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	111 jlong prim = Constant::primitive(constant);
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	112 if (obj != NULL) {
7084 9ba90252ce08 HotSpotResolvedJavaType is now the HotSpot implementation of ResolvedJavaType, Gilles Duboscq <duboscq@ssw.jku.at> parents: 7081 diff changeset	113 if (obj->is_a(HotSpotResolvedObjectType::klass())) {
9ba90252ce08 HotSpotResolvedJavaType is now the HotSpot implementation of ResolvedJavaType, Gilles Duboscq <duboscq@ssw.jku.at> parents: 7081 diff changeset	114 Klass* klass = (Klass*) (address) HotSpotResolvedObjectType::metaspaceKlass(obj);
6996 eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	115 assert((Klass*) prim == klass, err_msg("%s @ %p != %p", klass->name()->as_C_string(), klass, prim));
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	116 int index = oop_recorder->find_index(klass);
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	117 TRACE_graal_3("metadata[%d of %d] = %s", index, oop_recorder->metadata_count(), klass->name()->as_C_string());
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	118 } else {
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	119 assert(java_lang_String::is_instance(obj),
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	120 err_msg("unexpected annotation type (%s) for constant %ld (%p) of kind %c", obj->klass()->name()->as_C_string(), prim, prim, kind));
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	121 }
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	122 }
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	123 }
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	124 }
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	125
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	126 static ScopeValue* get_hotspot_value(oop value, int total_frame_size, GrowableArray<ScopeValue> objects, ScopeValue* &second, OopRecorder* oop_recorder) {
2938 c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	127 second = NULL;
6539 2463eb24b644 Cleanup of Graal API: Rename methods so that it follows the getXxx naming convention and so that they are similar to the names of the java.lang.reflect classes. Remove unused methods. Christian Wimmer <christian.wimmer@oracle.com> parents: 6521 diff changeset	128 if (value == Value::ILLEGAL()) {
1434 72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	129 return new LocationValue(Location::new_stk_loc(Location::invalid, 0));
72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	130 }
72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	131
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	132 BasicType type = GraalCompiler::kindToBasicType(Kind::typeChar(Value::kind(value)));
1449 8cfe3537a0d3 Pointer verification stub. Two loose oop fixes in C1X C++ part. Logging which methods have been compiled. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1444 diff changeset	133 Location::Type locationType = Location::normal;
8cfe3537a0d3 Pointer verification stub. Two loose oop fixes in C1X C++ part. Logging which methods have been compiled. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1444 diff changeset	134 if (type == T_OBJECT \|\| type == T_ARRAY) locationType = Location::oop;
2938 c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	135
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	136 if (value->is_a(RegisterValue::klass())) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	137 jint number = code_Register::number(RegisterValue::reg(value));
1434 72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	138 if (number < 16) {
4232 382523fc390c jsr return addresses are valid in registers Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4229 diff changeset	139 if (type == T_INT \|\| type == T_FLOAT \|\| type == T_SHORT \|\| type == T_CHAR \|\| type == T_BOOLEAN \|\| type == T_BYTE \|\| type == T_ADDRESS) {
2938 c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	140 locationType = Location::int_in_long;
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	141 } else if (type == T_LONG) {
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	142 locationType = Location::lng;
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	143 } else {
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	144 assert(type == T_OBJECT \|\| type == T_ARRAY, "unexpected type in cpu register");
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	145 }
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	146 ScopeValue* value = new LocationValue(Location::new_reg_loc(locationType, as_Register(number)->as_VMReg()));
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	147 if (type == T_LONG) {
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	148 second = value;
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	149 }
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	150 return value;
1434 72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	151 } else {
2938 c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	152 assert(type == T_FLOAT \|\| type == T_DOUBLE, "only float and double expected in xmm register");
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	153 if (type == T_FLOAT) {
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	154 // this seems weird, but the same value is used in c1_LinearScan
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	155 locationType = Location::normal;
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	156 } else {
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	157 locationType = Location::dbl;
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	158 }
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	159 ScopeValue* value = new LocationValue(Location::new_reg_loc(locationType, as_XMMRegister(number - 16)->as_VMReg()));
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	160 if (type == T_DOUBLE) {
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	161 second = value;
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	162 }
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	163 return value;
1434 72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	164 }
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	165 } else if (value->is_a(StackSlot::klass())) {
2938 c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	166 if (type == T_DOUBLE) {
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	167 locationType = Location::dbl;
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	168 } else if (type == T_LONG) {
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	169 locationType = Location::lng;
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	170 }
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	171 jint offset = StackSlot::offset(value);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	172 if (StackSlot::addFrameSize(value)) {
4181 319860ae697a Simplify FrameMap: make offsets of spill slots and outgoing parameters independent so that they can be allocated at the same time, eliminating the separate phases. This makes the separate StackBlock unnecesary. Change CiStackSlot to use byte offsets instead of spill slot index. This makes CiTarget.spillSlotSize unnecessary. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4174 diff changeset	173 offset += total_frame_size;
1434 72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	174 }
4181 319860ae697a Simplify FrameMap: make offsets of spill slots and outgoing parameters independent so that they can be allocated at the same time, eliminating the separate phases. This makes the separate StackBlock unnecesary. Change CiStackSlot to use byte offsets instead of spill slot index. This makes CiTarget.spillSlotSize unnecessary. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4174 diff changeset	175 ScopeValue* value = new LocationValue(Location::new_stk_loc(locationType, offset));
2938 c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	176 if (type == T_DOUBLE \|\| type == T_LONG) {
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	177 second = value;
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	178 }
c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	179 return value;
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	180 } else if (value->is_a(Constant::klass())){
6996 eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	181 record_metadata_in_constant(value, oop_recorder);
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	182 jlong prim = Constant::primitive(value);
1476 1f81c0d18c75 Build also release version of VM. Fix towards making SpecJVM2008 run. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1472 diff changeset	183 if (type == T_INT \|\| type == T_FLOAT \|\| type == T_SHORT \|\| type == T_CHAR \|\| type == T_BOOLEAN \|\| type == T_BYTE) {
1434 72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	184 return new ConstantIntValue((jint)&prim);
72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	185 } else if (type == T_LONG \|\| type == T_DOUBLE) {
2938 c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	186 second = new ConstantIntValue(0);
1434 72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	187 return new ConstantLongValue(prim);
72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	188 } else if (type == T_OBJECT) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	189 oop obj = Constant::object(value);
1434 72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	190 if (obj == NULL) {
72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	191 return new ConstantOopWriteValue(NULL);
72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	192 } else {
3669 53636e2c9d03 No longer use shared ciFactory. Remove make_global usage in code installer. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3668 diff changeset	193 return new ConstantOopWriteValue(JNIHandles::make_local(obj));
1434 72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	194 }
1476 1f81c0d18c75 Build also release version of VM. Fix towards making SpecJVM2008 run. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1472 diff changeset	195 } else if (type == T_ADDRESS) {
1f81c0d18c75 Build also release version of VM. Fix towards making SpecJVM2008 run. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1472 diff changeset	196 return new ConstantLongValue(prim);
1434 72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	197 }
72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	198 tty->print("%i", type);
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	199 } else if (value->is_a(VirtualObject::klass())) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	200 oop type = VirtualObject::type(value);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	201 int id = VirtualObject::id(value);
7084 9ba90252ce08 HotSpotResolvedJavaType is now the HotSpot implementation of ResolvedJavaType, Gilles Duboscq <duboscq@ssw.jku.at> parents: 7081 diff changeset	202 oop javaMirror = HotSpotResolvedObjectType::javaMirror(type);
6948 e522a00b91aa Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works Doug Simon <doug.simon@oracle.com> parents: 6674 diff changeset	203 Klass* klass = java_lang_Class::as_Klass(javaMirror);
5104 9ec2917fd0de Allow ints to be put into a virtual long array. Andreas Woess <andreas.woess@jku.at> parents: 5000 diff changeset	204 bool isLongArray = klass == Universe::longArrayKlassObj();
3090 536528f48708 more escape analysis work: debug info Lukas Stadler <lukas.stadler@jku.at> parents: 3053 diff changeset	205
536528f48708 more escape analysis work: debug info Lukas Stadler <lukas.stadler@jku.at> parents: 3053 diff changeset	206 for (jint i = 0; i < objects->length(); i++) {
536528f48708 more escape analysis work: debug info Lukas Stadler <lukas.stadler@jku.at> parents: 3053 diff changeset	207 ObjectValue* obj = (ObjectValue*) objects->at(i);
536528f48708 more escape analysis work: debug info Lukas Stadler <lukas.stadler@jku.at> parents: 3053 diff changeset	208 if (obj->id() == id) {
536528f48708 more escape analysis work: debug info Lukas Stadler <lukas.stadler@jku.at> parents: 3053 diff changeset	209 return obj;
536528f48708 more escape analysis work: debug info Lukas Stadler <lukas.stadler@jku.at> parents: 3053 diff changeset	210 }
536528f48708 more escape analysis work: debug info Lukas Stadler <lukas.stadler@jku.at> parents: 3053 diff changeset	211 }
536528f48708 more escape analysis work: debug info Lukas Stadler <lukas.stadler@jku.at> parents: 3053 diff changeset	212
6948 e522a00b91aa Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works Doug Simon <doug.simon@oracle.com> parents: 6674 diff changeset	213 ObjectValue* sv = new ObjectValue(id, new ConstantOopWriteValue(JNIHandles::make_local(Thread::current(), javaMirror)));
6351 c5024000ff0f fix for cyclic references in virtual objects Lukas Stadler <lukas.stadler@jku.at> parents: 5839 diff changeset	214 objects->append(sv);
3090 536528f48708 more escape analysis work: debug info Lukas Stadler <lukas.stadler@jku.at> parents: 3053 diff changeset	215
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	216 arrayOop values = (arrayOop) VirtualObject::values(value);
3090 536528f48708 more escape analysis work: debug info Lukas Stadler <lukas.stadler@jku.at> parents: 3053 diff changeset	217 for (jint i = 0; i < values->length(); i++) {
3133 5aeb62416609 Fixed an issue in the C++ code of the escape analysis (wrongly commented out code). Thomas Wuerthinger <thomas@wuerthinger.net> parents: 3091 diff changeset	218 ScopeValue* cur_second = NULL;
6996 eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	219 ScopeValue* value = get_hotspot_value(((oop*) values->base(T_OBJECT))[i], total_frame_size, objects, cur_second, oop_recorder);
3133 5aeb62416609 Fixed an issue in the C++ code of the escape analysis (wrongly commented out code). Thomas Wuerthinger <thomas@wuerthinger.net> parents: 3091 diff changeset	220
5126 43d5ae1051f7 added better debug output when an optimistic deoptimization is disabled Christian Haeubl <christian.haeubl@oracle.com> parents: 5104 diff changeset	221 if (isLongArray && cur_second == NULL) {
43d5ae1051f7 added better debug output when an optimistic deoptimization is disabled Christian Haeubl <christian.haeubl@oracle.com> parents: 5104 diff changeset	222 // we're trying to put ints into a long array... this isn't really valid, but it's used for some optimizations.
43d5ae1051f7 added better debug output when an optimistic deoptimization is disabled Christian Haeubl <christian.haeubl@oracle.com> parents: 5104 diff changeset	223 // add an int 0 constant
5144 f7b2800b1738 Use VM_LITTLE_ENDIAN to determine endianness. Andreas Woess <andreas.woess@jku.at> parents: 5130 diff changeset	224 #ifdef VM_LITTLE_ENDIAN
f7b2800b1738 Use VM_LITTLE_ENDIAN to determine endianness. Andreas Woess <andreas.woess@jku.at> parents: 5130 diff changeset	225 cur_second = new ConstantIntValue(0);
f7b2800b1738 Use VM_LITTLE_ENDIAN to determine endianness. Andreas Woess <andreas.woess@jku.at> parents: 5130 diff changeset	226 #else
5126 43d5ae1051f7 added better debug output when an optimistic deoptimization is disabled Christian Haeubl <christian.haeubl@oracle.com> parents: 5104 diff changeset	227 cur_second = value;
43d5ae1051f7 added better debug output when an optimistic deoptimization is disabled Christian Haeubl <christian.haeubl@oracle.com> parents: 5104 diff changeset	228 value = new ConstantIntValue(0);
43d5ae1051f7 added better debug output when an optimistic deoptimization is disabled Christian Haeubl <christian.haeubl@oracle.com> parents: 5104 diff changeset	229 #endif
5104 9ec2917fd0de Allow ints to be put into a virtual long array. Andreas Woess <andreas.woess@jku.at> parents: 5000 diff changeset	230 }
9ec2917fd0de Allow ints to be put into a virtual long array. Andreas Woess <andreas.woess@jku.at> parents: 5000 diff changeset	231
3133 5aeb62416609 Fixed an issue in the C++ code of the escape analysis (wrongly commented out code). Thomas Wuerthinger <thomas@wuerthinger.net> parents: 3091 diff changeset	232 if (cur_second != NULL) {
5aeb62416609 Fixed an issue in the C++ code of the escape analysis (wrongly commented out code). Thomas Wuerthinger <thomas@wuerthinger.net> parents: 3091 diff changeset	233 sv->field_values()->append(cur_second);
5aeb62416609 Fixed an issue in the C++ code of the escape analysis (wrongly commented out code). Thomas Wuerthinger <thomas@wuerthinger.net> parents: 3091 diff changeset	234 }
3090 536528f48708 more escape analysis work: debug info Lukas Stadler <lukas.stadler@jku.at> parents: 3053 diff changeset	235 sv->field_values()->append(value);
536528f48708 more escape analysis work: debug info Lukas Stadler <lukas.stadler@jku.at> parents: 3053 diff changeset	236 }
536528f48708 more escape analysis work: debug info Lukas Stadler <lukas.stadler@jku.at> parents: 3053 diff changeset	237 return sv;
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	238 } else {
1434 72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	239 value->klass()->print();
1462 1845386f5403 Full GC after bootstrap. Disable IRChecker by default. Disable compiled method logging by default. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1458 diff changeset	240 value->print();
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	241 }
2215 999f8086cc4f More changes to make it compile and work on win64. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 2182 diff changeset	242 ShouldNotReachHere();
999f8086cc4f More changes to make it compile and work on win64. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 2182 diff changeset	243 return NULL;
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	244 }
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	245
6996 eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	246 static MonitorValue* get_monitor_value(oop value, int total_frame_size, GrowableArray<ScopeValue> objects, OopRecorder* oop_recorder) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	247 guarantee(value->is_a(code_MonitorValue::klass()), "Monitors must be of type MonitorValue");
3714 b648304ba4ff Change Graal monitor enter and exit from BasicObjectLock to BasicLock Christian Wimmer <christian.wimmer@oracle.com> parents: 3710 diff changeset	248
b648304ba4ff Change Graal monitor enter and exit from BasicObjectLock to BasicLock Christian Wimmer <christian.wimmer@oracle.com> parents: 3710 diff changeset	249 ScopeValue* second = NULL;
6996 eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	250 ScopeValue* owner_value = get_hotspot_value(code_MonitorValue::owner(value), total_frame_size, objects, second, oop_recorder);
3714 b648304ba4ff Change Graal monitor enter and exit from BasicObjectLock to BasicLock Christian Wimmer <christian.wimmer@oracle.com> parents: 3710 diff changeset	251 assert(second == NULL, "monitor cannot occupy two stack slots");
b648304ba4ff Change Graal monitor enter and exit from BasicObjectLock to BasicLock Christian Wimmer <christian.wimmer@oracle.com> parents: 3710 diff changeset	252
6996 eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	253 ScopeValue* lock_data_value = get_hotspot_value(code_MonitorValue::lockData(value), total_frame_size, objects, second, oop_recorder);
4174 79c91d220d73 Use callee save area to model the saved rbp register. Remove various hacks that added the saved area size in native code. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 3717 diff changeset	254 assert(second == lock_data_value, "monitor is LONG value that occupies two stack slots");
3714 b648304ba4ff Change Graal monitor enter and exit from BasicObjectLock to BasicLock Christian Wimmer <christian.wimmer@oracle.com> parents: 3710 diff changeset	255 assert(lock_data_value->is_location(), "invalid monitor location");
b648304ba4ff Change Graal monitor enter and exit from BasicObjectLock to BasicLock Christian Wimmer <christian.wimmer@oracle.com> parents: 3710 diff changeset	256 Location lock_data_loc = ((LocationValue*)lock_data_value)->location();
b648304ba4ff Change Graal monitor enter and exit from BasicObjectLock to BasicLock Christian Wimmer <christian.wimmer@oracle.com> parents: 3710 diff changeset	257
3717 4177ddd2d1d1 Fix build error for Windows builds Christian Wimmer <christian.wimmer@oracle.com> parents: 3714 diff changeset	258 bool eliminated = false;
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	259 if (code_MonitorValue::eliminated(value)) {
3717 4177ddd2d1d1 Fix build error for Windows builds Christian Wimmer <christian.wimmer@oracle.com> parents: 3714 diff changeset	260 eliminated = true;
4177ddd2d1d1 Fix build error for Windows builds Christian Wimmer <christian.wimmer@oracle.com> parents: 3714 diff changeset	261 }
3714 b648304ba4ff Change Graal monitor enter and exit from BasicObjectLock to BasicLock Christian Wimmer <christian.wimmer@oracle.com> parents: 3710 diff changeset	262
b648304ba4ff Change Graal monitor enter and exit from BasicObjectLock to BasicLock Christian Wimmer <christian.wimmer@oracle.com> parents: 3710 diff changeset	263 return new MonitorValue(owner_value, lock_data_loc, eliminated);
b648304ba4ff Change Graal monitor enter and exit from BasicObjectLock to BasicLock Christian Wimmer <christian.wimmer@oracle.com> parents: 3710 diff changeset	264 }
b648304ba4ff Change Graal monitor enter and exit from BasicObjectLock to BasicLock Christian Wimmer <christian.wimmer@oracle.com> parents: 3710 diff changeset	265
3670 f198b24093f3 put back in thread transitions. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3669 diff changeset	266 void CodeInstaller::initialize_assumptions(oop target_method) {
3664 6e1abd79e7c8 Register assumptions before anything else. Don't free code blob (it is reused). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3663 diff changeset	267 _oop_recorder = new OopRecorder(_env->arena());
6e1abd79e7c8 Register assumptions before anything else. Don't free code blob (it is reused). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3663 diff changeset	268 _env->set_oop_recorder(_oop_recorder);
6e1abd79e7c8 Register assumptions before anything else. Don't free code blob (it is reused). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3663 diff changeset	269 _dependencies = new Dependencies(_env);
6674 fd71ca8c5f88 VM infrstructure for OnStackReplacement Lukas Stadler <lukas.stadler@jku.at> parents: 6559 diff changeset	270 Handle assumptions_handle = CompilationResult::assumptions(HotSpotCompilationResult::comp(target_method));
3664 6e1abd79e7c8 Register assumptions before anything else. Don't free code blob (it is reused). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3663 diff changeset	271 if (!assumptions_handle.is_null()) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	272 objArrayHandle assumptions(Thread::current(), (objArrayOop)Assumptions::list(assumptions_handle()));
3670 f198b24093f3 put back in thread transitions. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3669 diff changeset	273 int length = assumptions->length();
f198b24093f3 put back in thread transitions. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3669 diff changeset	274 for (int i = 0; i < length; ++i) {
3672 5e331d5f760e removed transition to vm in ci interface Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3670 diff changeset	275 Handle assumption = assumptions->obj_at(i);
5e331d5f760e removed transition to vm in ci interface Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3670 diff changeset	276 if (!assumption.is_null()) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	277 if (assumption->klass() == Assumptions_MethodContents::klass()) {
4670 41034914e2ee add MethodContents assumption to fix debbugging issue Lukas Stadler <lukas.stadler@jku.at> parents: 4583 diff changeset	278 assumption_MethodContents(assumption);
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	279 } else if (assumption->klass() == Assumptions_ConcreteSubtype::klass()) {
3672 5e331d5f760e removed transition to vm in ci interface Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3670 diff changeset	280 assumption_ConcreteSubtype(assumption);
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	281 } else if (assumption->klass() == Assumptions_ConcreteMethod::klass()) {
3672 5e331d5f760e removed transition to vm in ci interface Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3670 diff changeset	282 assumption_ConcreteMethod(assumption);
3657 47edfca346ab Fix a safepoint bug in code installer. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	283 } else {
47edfca346ab Fix a safepoint bug in code installer. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	284 assumption->print();
47edfca346ab Fix a safepoint bug in code installer. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	285 fatal("unexpected Assumption subclass");
47edfca346ab Fix a safepoint bug in code installer. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	286 }
47edfca346ab Fix a safepoint bug in code installer. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	287 }
47edfca346ab Fix a safepoint bug in code installer. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	288 }
47edfca346ab Fix a safepoint bug in code installer. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	289 }
3668 46f211fe010c Removed global handle usage in ci interface. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3667 diff changeset	290 }
46f211fe010c Removed global handle usage in ci interface. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3667 diff changeset	291
46f211fe010c Removed global handle usage in ci interface. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3667 diff changeset	292 // constructor used to create a method
7089 af30115c9d0e added metering of code installation failure rate to detect excessive failure caused by overly optimistic assumptions Doug Simon <doug.simon@oracle.com> parents: 7084 diff changeset	293 CodeInstaller::CodeInstaller(Handle& comp_result, methodHandle method, GraalEnv::CodeInstallResult& result, nmethod*& nm, Handle installed_code) {
3668 46f211fe010c Removed global handle usage in ci interface. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3667 diff changeset	294 _env = CURRENT_ENV;
46f211fe010c Removed global handle usage in ci interface. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3667 diff changeset	295 GraalCompiler::initialize_buffer_blob();
46f211fe010c Removed global handle usage in ci interface. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3667 diff changeset	296 CodeBuffer buffer(JavaThread::current()->get_buffer_blob());
5839 58a607307306 renaming in native code for CiTargetMethod -> CompilationResult Doug Simon <doug.simon@oracle.com> parents: 5823 diff changeset	297 jobject comp_result_obj = JNIHandles::make_local(comp_result());
6950 41938af2b3d8 modifications to support non-perm-gen changes in HotSpot Doug Simon <doug.simon@oracle.com> parents: 6948 diff changeset	298 jint entry_bci = HotSpotCompilationResult::entryBCI(comp_result);
5839 58a607307306 renaming in native code for CiTargetMethod -> CompilationResult Doug Simon <doug.simon@oracle.com> parents: 5823 diff changeset	299 initialize_assumptions(JNIHandles::resolve(comp_result_obj));
1465 2c754f3a2722 Inlining of static final field values. Java mirror instead of VmID. Support for PrintMetrics option. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1462 diff changeset	300
3664 6e1abd79e7c8 Register assumptions before anything else. Don't free code blob (it is reused). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3663 diff changeset	301 {
6e1abd79e7c8 Register assumptions before anything else. Don't free code blob (it is reused). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3663 diff changeset	302 No_Safepoint_Verifier no_safepoint;
6948 e522a00b91aa Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works Doug Simon <doug.simon@oracle.com> parents: 6674 diff changeset	303 initialize_fields(JNIHandles::resolve(comp_result_obj), method);
3664 6e1abd79e7c8 Register assumptions before anything else. Don't free code blob (it is reused). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3663 diff changeset	304 initialize_buffer(buffer);
6e1abd79e7c8 Register assumptions before anything else. Don't free code blob (it is reused). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3663 diff changeset	305 process_exception_handlers();
6e1abd79e7c8 Register assumptions before anything else. Don't free code blob (it is reused). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3663 diff changeset	306 }
6e1abd79e7c8 Register assumptions before anything else. Don't free code blob (it is reused). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3663 diff changeset	307
4174 79c91d220d73 Use callee save area to model the saved rbp register. Remove various hacks that added the saved area size in native code. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 3717 diff changeset	308 int stack_slots = _total_frame_size / HeapWordSize; // conversion to words
4319 3c21eee8ab4d Add installMethodCallback() to HotSpotRuntime. Andreas Woess <andreas.woess@jku.at> parents: 4232 diff changeset	309
7089 af30115c9d0e added metering of code installation failure rate to detect excessive failure caused by overly optimistic assumptions Doug Simon <doug.simon@oracle.com> parents: 7084 diff changeset	310 result = GraalEnv::register_method(method, nm, entry_bci, &_offsets, _custom_stack_area_offset, &buffer, stack_slots, _debug_recorder->_oopmaps, &_exception_handler_table,
7000 bf2ea3ed3bce Fixed nmethod not being unloaded after their classloader has been unloaded by initializing _graal_installed_code in an nmethod's constructor Gilles Duboscq <duboscq@ssw.jku.at> parents: 6996 diff changeset	311 &_implicit_exception_table, GraalCompiler::instance(), _debug_recorder, _dependencies, NULL, -1, true, false, installed_code);
4319 3c21eee8ab4d Add installMethodCallback() to HotSpotRuntime. Andreas Woess <andreas.woess@jku.at> parents: 4232 diff changeset	312
3650 0e8a2a629afb Pass-by compilation broker. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	313 method->clear_queued_for_compilation();
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	314 }
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	315
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	316 // constructor used to create a stub
5275 290b3025b66f added support for disassembling code after installation (so that the result of patching and relocation can be seen) Doug Simon <doug.simon@oracle.com> parents: 5259 diff changeset	317 CodeInstaller::CodeInstaller(Handle& target_method, BufferBlob*& blob, jlong& id) {
1465 2c754f3a2722 Inlining of static final field values. Java mirror instead of VmID. Support for PrintMetrics option. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1462 diff changeset	318 No_Safepoint_Verifier no_safepoint;
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	319 _env = CURRENT_ENV;
3664 6e1abd79e7c8 Register assumptions before anything else. Don't free code blob (it is reused). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3663 diff changeset	320
6e1abd79e7c8 Register assumptions before anything else. Don't free code blob (it is reused). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3663 diff changeset	321 _oop_recorder = new OopRecorder(_env->arena());
6e1abd79e7c8 Register assumptions before anything else. Don't free code blob (it is reused). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3663 diff changeset	322 _env->set_oop_recorder(_oop_recorder);
6948 e522a00b91aa Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works Doug Simon <doug.simon@oracle.com> parents: 6674 diff changeset	323 initialize_fields(target_method(), NULL);
e522a00b91aa Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works Doug Simon <doug.simon@oracle.com> parents: 6674 diff changeset	324 assert(_name != NULL, "installMethod needs NON-NULL name");
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	325
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	326 // (very) conservative estimate: each site needs a relocation
3555 22d11b3bc561 Various hacks to be able to install machine code from a Java thread. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 3554 diff changeset	327 GraalCompiler::initialize_buffer_blob();
22d11b3bc561 Various hacks to be able to install machine code from a Java thread. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 3554 diff changeset	328 CodeBuffer buffer(JavaThread::current()->get_buffer_blob());
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	329 initialize_buffer(buffer);
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	330
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	331 const char* cname = java_lang_String::as_utf8_string(_name);
5275 290b3025b66f added support for disassembling code after installation (so that the result of patching and relocation can be seen) Doug Simon <doug.simon@oracle.com> parents: 5259 diff changeset	332 blob = BufferBlob::create(strdup(cname), &buffer); // this is leaking strings... but only a limited number of stubs will be created
2891 75a99b4f1c98 Rebranded C++ part from C1X to Graal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2890 diff changeset	333 IF_TRACE_graal_3 Disassembler::decode((CodeBlob*) blob);
1931 48bbaead8b6c Adjustments after merge with OpenJDK repository. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1484 diff changeset	334 id = VmIds::addStub(blob->code_begin());
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	335 }
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	336
6948 e522a00b91aa Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works Doug Simon <doug.simon@oracle.com> parents: 6674 diff changeset	337 void CodeInstaller::initialize_fields(oop comp_result, methodHandle method) {
5839 58a607307306 renaming in native code for CiTargetMethod -> CompilationResult Doug Simon <doug.simon@oracle.com> parents: 5823 diff changeset	338 _comp_result = HotSpotCompilationResult::comp(comp_result);
6948 e522a00b91aa Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works Doug Simon <doug.simon@oracle.com> parents: 6674 diff changeset	339 if (!method.is_null()) {
5839 58a607307306 renaming in native code for CiTargetMethod -> CompilationResult Doug Simon <doug.simon@oracle.com> parents: 5823 diff changeset	340 _parameter_count = method->size_of_parameters();
58a607307306 renaming in native code for CiTargetMethod -> CompilationResult Doug Simon <doug.simon@oracle.com> parents: 5823 diff changeset	341 TRACE_graal_1("installing code for %s", method->name_and_sig_as_C_string());
3660 c805dfba251d Fixed regression. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3659 diff changeset	342 }
5839 58a607307306 renaming in native code for CiTargetMethod -> CompilationResult Doug Simon <doug.simon@oracle.com> parents: 5823 diff changeset	343 _name = HotSpotCompilationResult::name(comp_result);
58a607307306 renaming in native code for CiTargetMethod -> CompilationResult Doug Simon <doug.simon@oracle.com> parents: 5823 diff changeset	344 _sites = (arrayOop) HotSpotCompilationResult::sites(comp_result);
58a607307306 renaming in native code for CiTargetMethod -> CompilationResult Doug Simon <doug.simon@oracle.com> parents: 5823 diff changeset	345 _exception_handlers = (arrayOop) HotSpotCompilationResult::exceptionHandlers(comp_result);
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	346
6674 fd71ca8c5f88 VM infrstructure for OnStackReplacement Lukas Stadler <lukas.stadler@jku.at> parents: 6559 diff changeset	347 _code = (arrayOop) CompilationResult::targetCode(_comp_result);
fd71ca8c5f88 VM infrstructure for OnStackReplacement Lukas Stadler <lukas.stadler@jku.at> parents: 6559 diff changeset	348 _code_size = CompilationResult::targetCodeSize(_comp_result);
4174 79c91d220d73 Use callee save area to model the saved rbp register. Remove various hacks that added the saved area size in native code. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 3717 diff changeset	349 // The frame size we get from the target method does not include the return address, so add one word for it here.
6674 fd71ca8c5f88 VM infrstructure for OnStackReplacement Lukas Stadler <lukas.stadler@jku.at> parents: 6559 diff changeset	350 _total_frame_size = CompilationResult::frameSize(_comp_result) + HeapWordSize;
fd71ca8c5f88 VM infrstructure for OnStackReplacement Lukas Stadler <lukas.stadler@jku.at> parents: 6559 diff changeset	351 _custom_stack_area_offset = CompilationResult::customStackAreaOffset(_comp_result);
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	352
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	353 // (very) conservative estimate: each site needs a constant section entry
2495 c737ee310b39 Small adjustment to assertion and constants size calculation. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 2494 diff changeset	354 _constants_size = _sites->length() * (BytesPerLong*2);
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	355 _total_size = align_size_up(_code_size, HeapWordSize) + _constants_size;
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	356
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	357 _next_call_type = MARK_INVOKE_INVALID;
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	358 }
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	359
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	360 // perform data and call relocation on the CodeBuffer
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	361 void CodeInstaller::initialize_buffer(CodeBuffer& buffer) {
1931 48bbaead8b6c Adjustments after merge with OpenJDK repository. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1484 diff changeset	362 int locs_buffer_size = _sites->length() * (relocInfo::length_limit + sizeof(relocInfo));
48bbaead8b6c Adjustments after merge with OpenJDK repository. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1484 diff changeset	363 char* locs_buffer = NEW_RESOURCE_ARRAY(char, locs_buffer_size);
48bbaead8b6c Adjustments after merge with OpenJDK repository. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1484 diff changeset	364 buffer.insts()->initialize_shared_locs((relocInfo*)locs_buffer, locs_buffer_size / sizeof(relocInfo));
48bbaead8b6c Adjustments after merge with OpenJDK repository. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1484 diff changeset	365 buffer.initialize_stubs_size(256);
48bbaead8b6c Adjustments after merge with OpenJDK repository. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1484 diff changeset	366 buffer.initialize_consts_size(_constants_size);
48bbaead8b6c Adjustments after merge with OpenJDK repository. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1484 diff changeset	367
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	368 _debug_recorder = new DebugInformationRecorder(_env->oop_recorder());
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	369 _debug_recorder->set_oopmaps(new OopMapSet());
3664 6e1abd79e7c8 Register assumptions before anything else. Don't free code blob (it is reused). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3663 diff changeset	370
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	371 _env->set_debug_info(_debug_recorder);
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	372 buffer.initialize_oop_recorder(_oop_recorder);
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	373
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	374 _instructions = buffer.insts();
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	375 _constants = buffer.consts();
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	376
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	377 // copy the code into the newly created CodeBuffer
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	378 memcpy(_instructions->start(), _code->base(T_BYTE), _code_size);
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	379 _instructions->set_end(_instructions->start() + _code_size);
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	380
1432 b61a43cd1255 sourcecode formatting Lukas Stadler <lukas.stadler@oracle.com> parents: 1429 diff changeset	381 oop* sites = (oop*) _sites->base(T_OBJECT);
b61a43cd1255 sourcecode formatting Lukas Stadler <lukas.stadler@oracle.com> parents: 1429 diff changeset	382 for (int i = 0; i < _sites->length(); i++) {
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	383 oop site = sites[i];
6674 fd71ca8c5f88 VM infrstructure for OnStackReplacement Lukas Stadler <lukas.stadler@jku.at> parents: 6559 diff changeset	384 jint pc_offset = CompilationResult_Site::pcOffset(site);
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	385
6674 fd71ca8c5f88 VM infrstructure for OnStackReplacement Lukas Stadler <lukas.stadler@jku.at> parents: 6559 diff changeset	386 if (site->is_a(CompilationResult_Call::klass())) {
3561 bea018622324 Changes to JavaAccess as a result of CRI changes. Doug Simon <doug.simon@oracle.com> parents: 3560 diff changeset	387 TRACE_graal_4("call at %i", pc_offset);
bea018622324 Changes to JavaAccess as a result of CRI changes. Doug Simon <doug.simon@oracle.com> parents: 3560 diff changeset	388 site_Call(buffer, pc_offset, site);
6674 fd71ca8c5f88 VM infrstructure for OnStackReplacement Lukas Stadler <lukas.stadler@jku.at> parents: 6559 diff changeset	389 } else if (site->is_a(CompilationResult_Safepoint::klass())) {
2891 75a99b4f1c98 Rebranded C++ part from C1X to Graal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2890 diff changeset	390 TRACE_graal_4("safepoint at %i", pc_offset);
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	391 site_Safepoint(buffer, pc_offset, site);
6674 fd71ca8c5f88 VM infrstructure for OnStackReplacement Lukas Stadler <lukas.stadler@jku.at> parents: 6559 diff changeset	392 } else if (site->is_a(CompilationResult_DataPatch::klass())) {
2891 75a99b4f1c98 Rebranded C++ part from C1X to Graal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2890 diff changeset	393 TRACE_graal_4("datapatch at %i", pc_offset);
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	394 site_DataPatch(buffer, pc_offset, site);
6674 fd71ca8c5f88 VM infrstructure for OnStackReplacement Lukas Stadler <lukas.stadler@jku.at> parents: 6559 diff changeset	395 } else if (site->is_a(CompilationResult_Mark::klass())) {
2891 75a99b4f1c98 Rebranded C++ part from C1X to Graal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2890 diff changeset	396 TRACE_graal_4("mark at %i", pc_offset);
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	397 site_Mark(buffer, pc_offset, site);
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	398 } else {
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	399 fatal("unexpected Site subclass");
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	400 }
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	401 }
2048 177398c6147d Added unique concrete subtype assumption. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2046 diff changeset	402 }
177398c6147d Added unique concrete subtype assumption. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2046 diff changeset	403
4670 41034914e2ee add MethodContents assumption to fix debbugging issue Lukas Stadler <lukas.stadler@jku.at> parents: 4583 diff changeset	404 void CodeInstaller::assumption_MethodContents(Handle assumption) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	405 Handle method_handle = Assumptions_MethodContents::method(assumption());
4670 41034914e2ee add MethodContents assumption to fix debbugging issue Lukas Stadler <lukas.stadler@jku.at> parents: 4583 diff changeset	406 methodHandle method = getMethodFromHotSpotMethod(method_handle());
6948 e522a00b91aa Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works Doug Simon <doug.simon@oracle.com> parents: 6674 diff changeset	407 ciMethod* m = (ciMethod*) CURRENT_ENV->get_method(method());
4670 41034914e2ee add MethodContents assumption to fix debbugging issue Lukas Stadler <lukas.stadler@jku.at> parents: 4583 diff changeset	408
41034914e2ee add MethodContents assumption to fix debbugging issue Lukas Stadler <lukas.stadler@jku.at> parents: 4583 diff changeset	409 _dependencies->assert_evol_method(m);
41034914e2ee add MethodContents assumption to fix debbugging issue Lukas Stadler <lukas.stadler@jku.at> parents: 4583 diff changeset	410 }
41034914e2ee add MethodContents assumption to fix debbugging issue Lukas Stadler <lukas.stadler@jku.at> parents: 4583 diff changeset	411
3672 5e331d5f760e removed transition to vm in ci interface Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3670 diff changeset	412 void CodeInstaller::assumption_ConcreteSubtype(Handle assumption) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	413 Handle context_handle = Assumptions_ConcreteSubtype::context(assumption());
7084 9ba90252ce08 HotSpotResolvedJavaType is now the HotSpot implementation of ResolvedJavaType, Gilles Duboscq <duboscq@ssw.jku.at> parents: 7081 diff changeset	414 ciKlass* context = (ciKlass*) CURRENT_ENV->get_klass(java_lang_Class::as_Klass(HotSpotResolvedObjectType::javaMirror(context_handle)));
2048 177398c6147d Added unique concrete subtype assumption. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2046 diff changeset	415
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	416 Handle type_handle = Assumptions_ConcreteSubtype::subtype(assumption());
7084 9ba90252ce08 HotSpotResolvedJavaType is now the HotSpot implementation of ResolvedJavaType, Gilles Duboscq <duboscq@ssw.jku.at> parents: 7081 diff changeset	417 ciKlass* type = (ciKlass*) CURRENT_ENV->get_klass(java_lang_Class::as_Klass(HotSpotResolvedObjectType::javaMirror(type_handle)));
2048 177398c6147d Added unique concrete subtype assumption. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2046 diff changeset	418
2050 b6d2c238e585 Two fixes for leaf type and leaf method assumptions. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2049 diff changeset	419 _dependencies->assert_leaf_type(type);
3672 5e331d5f760e removed transition to vm in ci interface Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3670 diff changeset	420 if (context != type) {
2048 177398c6147d Added unique concrete subtype assumption. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2046 diff changeset	421 assert(context->is_abstract(), "");
177398c6147d Added unique concrete subtype assumption. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2046 diff changeset	422 _dependencies->assert_abstract_with_unique_concrete_subtype(context, type);
177398c6147d Added unique concrete subtype assumption. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2046 diff changeset	423 }
177398c6147d Added unique concrete subtype assumption. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2046 diff changeset	424 }
177398c6147d Added unique concrete subtype assumption. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2046 diff changeset	425
3672 5e331d5f760e removed transition to vm in ci interface Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3670 diff changeset	426 void CodeInstaller::assumption_ConcreteMethod(Handle assumption) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	427 Handle impl_handle = Assumptions_ConcreteMethod::impl(assumption());
3704 342a54994e05 Made C++ changes to reflect changes to CiAssumptions.ConcreteMethod. Doug Simon <doug.simon@oracle.com> parents: 3690 diff changeset	428 methodHandle impl = getMethodFromHotSpotMethod(impl_handle());
6948 e522a00b91aa Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works Doug Simon <doug.simon@oracle.com> parents: 6674 diff changeset	429 ciMethod* m = (ciMethod*) CURRENT_ENV->get_method(impl());
3670 f198b24093f3 put back in thread transitions. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3669 diff changeset	430
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	431 Handle context_handle = Assumptions_ConcreteMethod::context(assumption());
7084 9ba90252ce08 HotSpotResolvedJavaType is now the HotSpot implementation of ResolvedJavaType, Gilles Duboscq <duboscq@ssw.jku.at> parents: 7081 diff changeset	432 ciKlass* context = (ciKlass*) CURRENT_ENV->get_klass(java_lang_Class::as_Klass(HotSpotResolvedObjectType::javaMirror(context_handle)));
3704 342a54994e05 Made C++ changes to reflect changes to CiAssumptions.ConcreteMethod. Doug Simon <doug.simon@oracle.com> parents: 3690 diff changeset	433 _dependencies->assert_unique_concrete_method(context, m);
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	434 }
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	435
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	436 void CodeInstaller::process_exception_handlers() {
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	437 // allocate some arrays for use by the collection code.
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	438 const int num_handlers = 5;
1432 b61a43cd1255 sourcecode formatting Lukas Stadler <lukas.stadler@oracle.com> parents: 1429 diff changeset	439 GrowableArray<intptr_t>* bcis = new GrowableArray<intptr_t> (num_handlers);
b61a43cd1255 sourcecode formatting Lukas Stadler <lukas.stadler@oracle.com> parents: 1429 diff changeset	440 GrowableArray<intptr_t>* scope_depths = new GrowableArray<intptr_t> (num_handlers);
b61a43cd1255 sourcecode formatting Lukas Stadler <lukas.stadler@oracle.com> parents: 1429 diff changeset	441 GrowableArray<intptr_t>* pcos = new GrowableArray<intptr_t> (num_handlers);
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	442
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	443 if (_exception_handlers != NULL) {
1432 b61a43cd1255 sourcecode formatting Lukas Stadler <lukas.stadler@oracle.com> parents: 1429 diff changeset	444 oop* exception_handlers = (oop*) _exception_handlers->base(T_OBJECT);
b61a43cd1255 sourcecode formatting Lukas Stadler <lukas.stadler@oracle.com> parents: 1429 diff changeset	445 for (int i = 0; i < _exception_handlers->length(); i++) {
4693 07bcee8b70a4 Simplify exception debug information and exception handler table creation based on Graal's simplified model of exception handler information (i.e. the dispatch is done in compiled code). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4691 diff changeset	446 oop exc = exception_handlers[i];
6674 fd71ca8c5f88 VM infrstructure for OnStackReplacement Lukas Stadler <lukas.stadler@jku.at> parents: 6559 diff changeset	447 jint pc_offset = CompilationResult_Site::pcOffset(exc);
fd71ca8c5f88 VM infrstructure for OnStackReplacement Lukas Stadler <lukas.stadler@jku.at> parents: 6559 diff changeset	448 jint handler_offset = CompilationResult_ExceptionHandler::handlerPos(exc);
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	449
4693 07bcee8b70a4 Simplify exception debug information and exception handler table creation based on Graal's simplified model of exception handler information (i.e. the dispatch is done in compiled code). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4691 diff changeset	450 // Subtable header
07bcee8b70a4 Simplify exception debug information and exception handler table creation based on Graal's simplified model of exception handler information (i.e. the dispatch is done in compiled code). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4691 diff changeset	451 _exception_handler_table.add_entry(HandlerTableEntry(1, pc_offset, 0));
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	452
4693 07bcee8b70a4 Simplify exception debug information and exception handler table creation based on Graal's simplified model of exception handler information (i.e. the dispatch is done in compiled code). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4691 diff changeset	453 // Subtable entry
07bcee8b70a4 Simplify exception debug information and exception handler table creation based on Graal's simplified model of exception handler information (i.e. the dispatch is done in compiled code). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4691 diff changeset	454 _exception_handler_table.add_entry(HandlerTableEntry(-1, handler_offset, 0));
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	455 }
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	456 }
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	457 }
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	458
5129 51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	459 void CodeInstaller::record_scope(jint pc_offset, oop frame, GrowableArray<ScopeValue> objects) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	460 assert(frame->klass() == BytecodeFrame::klass(), "BytecodeFrame expected");
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	461 oop caller_frame = BytecodePosition::caller(frame);
5129 51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	462 if (caller_frame != NULL) {
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	463 record_scope(pc_offset, caller_frame, objects);
1434 72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	464 }
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	465
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	466 oop hotspot_method = BytecodePosition::method(frame);
6948 e522a00b91aa Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works Doug Simon <doug.simon@oracle.com> parents: 6674 diff changeset	467 Method* method = getMethodFromHotSpotMethod(hotspot_method);
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	468 jint bci = BytecodePosition::bci(frame);
1434 72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	469 bool reexecute;
6388 6b74f44c5059 added Log.printObject() and Log.printlnObject() for more detailed logging of objects Doug Simon <doug.simon@oracle.com> parents: 6351 diff changeset	470 if (bci == -1 \|\| bci == -2){
1434 72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	471 reexecute = false;
72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	472 } else {
2182 9569fdf936ff Made merge compile. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2059 diff changeset	473 Bytecodes::Code code = Bytecodes::java_code_at(method, method->bcp_from(bci));
1434 72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	474 reexecute = Interpreter::bytecode_should_reexecute(code);
4678 a03f3fd16b22 Fix reexecute boolean in HotSpot debug information. Introduce "duringCall" flag in FrameState that indicates that the bci of the frame state denotes an invoke that should not be reexecuted. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4670 diff changeset	475 if (frame != NULL) {
6515 e722fa145b37 Fixed VS2010 warnings in HotSpot. Christian Haeubl <haeubl@ssw.jku.at> parents: 6446 diff changeset	476 reexecute = (BytecodeFrame::duringCall(frame) == JNI_FALSE);
4678 a03f3fd16b22 Fix reexecute boolean in HotSpot debug information. Introduce "duringCall" flag in FrameState that indicates that the bci of the frame state denotes an invoke that should not be reexecuted. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4670 diff changeset	477 }
1434 72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	478 }
72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	479
2901 d577d07cedec Added time measurement for phases. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2891 diff changeset	480 if (TraceGraal >= 2) {
1937 4853c5cad3aa More deoptmization tracing. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1936 diff changeset	481 tty->print_cr("Recording scope pc_offset=%d bci=%d frame=%d", pc_offset, bci, frame);
4853c5cad3aa More deoptmization tracing. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1936 diff changeset	482 }
4853c5cad3aa More deoptmization tracing. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1936 diff changeset	483
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	484 jint local_count = BytecodeFrame::numLocals(frame);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	485 jint expression_count = BytecodeFrame::numStack(frame);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	486 jint monitor_count = BytecodeFrame::numLocks(frame);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	487 arrayOop values = (arrayOop) BytecodeFrame::values(frame);
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	488
5129 51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	489 assert(local_count + expression_count + monitor_count == values->length(), "unexpected values length");
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	490
5129 51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	491 GrowableArray<ScopeValue> locals = new GrowableArray<ScopeValue*> ();
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	492 GrowableArray<ScopeValue> expressions = new GrowableArray<ScopeValue*> ();
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	493 GrowableArray<MonitorValue> monitors = new GrowableArray<MonitorValue*> ();
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	494
5129 51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	495 if (TraceGraal >= 2) {
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	496 tty->print_cr("Scope at bci %d with %d values", bci, values->length());
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	497 tty->print_cr("%d locals %d expressions, %d monitors", local_count, expression_count, monitor_count);
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	498 }
1936 8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1931 diff changeset	499
5129 51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	500 for (jint i = 0; i < values->length(); i++) {
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	501 ScopeValue* second = NULL;
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	502 oop value = ((oop*) values->base(T_OBJECT))[i];
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	503
5129 51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	504 if (i < local_count) {
6996 eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	505 ScopeValue* first = get_hotspot_value(value, _total_frame_size, objects, second, _oop_recorder);
5129 51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	506 if (second != NULL) {
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	507 locals->append(second);
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	508 }
5129 51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	509 locals->append(first);
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	510 } else if (i < local_count + expression_count) {
6996 eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	511 ScopeValue* first = get_hotspot_value(value, _total_frame_size, objects, second, _oop_recorder);
2938 c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	512 if (second != NULL) {
5129 51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	513 expressions->append(second);
2938 c7783b6773ea fixed graph start frame state Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	514 }
5129 51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	515 expressions->append(first);
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	516 } else {
6996 eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	517 monitors->append(get_monitor_value(value, _total_frame_size, objects, _oop_recorder));
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	518 }
5129 51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	519 if (second != NULL) {
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	520 i++;
6539 2463eb24b644 Cleanup of Graal API: Rename methods so that it follows the getXxx naming convention and so that they are similar to the names of the java.lang.reflect classes. Remove unused methods. Christian Wimmer <christian.wimmer@oracle.com> parents: 6521 diff changeset	521 assert(i < values->length(), "double-slot value not followed by Value.ILLEGAL");
2463eb24b644 Cleanup of Graal API: Rename methods so that it follows the getXxx naming convention and so that they are similar to the names of the java.lang.reflect classes. Remove unused methods. Christian Wimmer <christian.wimmer@oracle.com> parents: 6521 diff changeset	522 assert(((oop*) values->base(T_OBJECT))[i] == Value::ILLEGAL(), "double-slot value not followed by Value.ILLEGAL");
5129 51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	523 }
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	524 }
3090 536528f48708 more escape analysis work: debug info Lukas Stadler <lukas.stadler@jku.at> parents: 3053 diff changeset	525
5129 51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	526 _debug_recorder->dump_object_pool(objects);
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	527
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	528 DebugToken* locals_token = _debug_recorder->create_scope_values(locals);
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	529 DebugToken* expressions_token = _debug_recorder->create_scope_values(expressions);
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	530 DebugToken* monitors_token = _debug_recorder->create_monitor_values(monitors);
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	531
7046 b6a8f2d23057 VM support for deferred reads and writes: ScopeDesc, DebugInfo, DebugInfoRecorder Lukas Stadler <lukas.stadler@jku.at> parents: 7018 diff changeset	532 GrowableArray<DeferredWriteValue> deferred_writes = new GrowableArray<DeferredWriteValue*> ();
b6a8f2d23057 VM support for deferred reads and writes: ScopeDesc, DebugInfo, DebugInfoRecorder Lukas Stadler <lukas.stadler@jku.at> parents: 7018 diff changeset	533 // deferred_writes->append(new DeferredWriteValue(new LocationValue(Location::new_reg_loc(Location::lng, rax->as_VMReg())), new ConstantIntValue(0), 0, 100, new ConstantIntValue(123)));
b6a8f2d23057 VM support for deferred reads and writes: ScopeDesc, DebugInfo, DebugInfoRecorder Lukas Stadler <lukas.stadler@jku.at> parents: 7018 diff changeset	534 DebugToken* deferred_writes_token = _debug_recorder->create_deferred_writes(deferred_writes);
b6a8f2d23057 VM support for deferred reads and writes: ScopeDesc, DebugInfo, DebugInfoRecorder Lukas Stadler <lukas.stadler@jku.at> parents: 7018 diff changeset	535
6515 e722fa145b37 Fixed VS2010 warnings in HotSpot. Christian Haeubl <haeubl@ssw.jku.at> parents: 6446 diff changeset	536 bool throw_exception = BytecodeFrame::rethrowException(frame) == JNI_TRUE;
3018 5857923e563c Fixed an issue with frame states in exception dispatch chains (now we are correctly rethrowing the exception immediately at entering the interpreter). Thomas Wuerthinger <thomas@wuerthinger.net> parents: 3011 diff changeset	537
7046 b6a8f2d23057 VM support for deferred reads and writes: ScopeDesc, DebugInfo, DebugInfoRecorder Lukas Stadler <lukas.stadler@jku.at> parents: 7018 diff changeset	538 _debug_recorder->describe_scope(pc_offset, method, NULL, bci, reexecute, throw_exception, false, false, locals_token, expressions_token, monitors_token, deferred_writes_token);
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	539 }
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	540
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	541 void CodeInstaller::site_Safepoint(CodeBuffer& buffer, jint pc_offset, oop site) {
6674 fd71ca8c5f88 VM infrstructure for OnStackReplacement Lukas Stadler <lukas.stadler@jku.at> parents: 6559 diff changeset	542 oop debug_info = CompilationResult_Safepoint::debugInfo(site);
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	543 assert(debug_info != NULL, "debug info expected");
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	544
1432 b61a43cd1255 sourcecode formatting Lukas Stadler <lukas.stadler@oracle.com> parents: 1429 diff changeset	545 // address instruction = _instructions->start() + pc_offset;
b61a43cd1255 sourcecode formatting Lukas Stadler <lukas.stadler@oracle.com> parents: 1429 diff changeset	546 // jint next_pc_offset = Assembler::locate_next_instruction(instruction) - _instructions->start();
5129 51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	547 _debug_recorder->add_safepoint(pc_offset, -1, create_oop_map(_total_frame_size, _parameter_count, debug_info));
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	548
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	549 oop code_pos = DebugInfo::bytecodePosition(debug_info);
3090 536528f48708 more escape analysis work: debug info Lukas Stadler <lukas.stadler@jku.at> parents: 3053 diff changeset	550 record_scope(pc_offset, code_pos, new GrowableArray<ScopeValue*>());
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	551
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	552 _debug_recorder->end_safepoint(pc_offset);
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	553 }
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	554
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	555 void CodeInstaller::site_Call(CodeBuffer& buffer, jint pc_offset, oop site) {
6674 fd71ca8c5f88 VM infrstructure for OnStackReplacement Lukas Stadler <lukas.stadler@jku.at> parents: 6559 diff changeset	556 oop target = CompilationResult_Call::target(site);
6948 e522a00b91aa Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works Doug Simon <doug.simon@oracle.com> parents: 6674 diff changeset	557 InstanceKlass* target_klass = InstanceKlass::cast(target->klass());
3561 bea018622324 Changes to JavaAccess as a result of CRI changes. Doug Simon <doug.simon@oracle.com> parents: 3560 diff changeset	558
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	559 oop hotspot_method = NULL; // JavaMethod
3561 bea018622324 Changes to JavaAccess as a result of CRI changes. Doug Simon <doug.simon@oracle.com> parents: 3560 diff changeset	560 oop global_stub = NULL;
bea018622324 Changes to JavaAccess as a result of CRI changes. Doug Simon <doug.simon@oracle.com> parents: 3560 diff changeset	561
bea018622324 Changes to JavaAccess as a result of CRI changes. Doug Simon <doug.simon@oracle.com> parents: 3560 diff changeset	562 if (target_klass->is_subclass_of(SystemDictionary::Long_klass())) {
bea018622324 Changes to JavaAccess as a result of CRI changes. Doug Simon <doug.simon@oracle.com> parents: 3560 diff changeset	563 global_stub = target;
bea018622324 Changes to JavaAccess as a result of CRI changes. Doug Simon <doug.simon@oracle.com> parents: 3560 diff changeset	564 } else {
bea018622324 Changes to JavaAccess as a result of CRI changes. Doug Simon <doug.simon@oracle.com> parents: 3560 diff changeset	565 hotspot_method = target;
bea018622324 Changes to JavaAccess as a result of CRI changes. Doug Simon <doug.simon@oracle.com> parents: 3560 diff changeset	566 }
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	567
6674 fd71ca8c5f88 VM infrstructure for OnStackReplacement Lukas Stadler <lukas.stadler@jku.at> parents: 6559 diff changeset	568 oop debug_info = CompilationResult_Call::debugInfo(site);
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	569
6521 2a0c9f20baa1 consolidated framework for runtime and stub calls and moved declaration of descriptors for such calls to the source file in which they are used Doug Simon <doug.simon@oracle.com> parents: 6515 diff changeset	570 assert((hotspot_method ? 1 : 0) + (global_stub ? 1 : 0) == 1, "Call site needs exactly one type");
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	571
3563 8780fa370aab Support runtime calls to targets that don't fit in a 32-bit immediate: allow to query the maximum offset of a CiRuntimeCall target to determine the required immediate size and patch call sites with a mov/call instruction pair for indirect calls Peter Hofer <peter.hofer@jku.at> parents: 3561 diff changeset	572 NativeInstruction* inst = nativeInstruction_at(_instructions->start() + pc_offset);
8780fa370aab Support runtime calls to targets that don't fit in a 32-bit immediate: allow to query the maximum offset of a CiRuntimeCall target to determine the required immediate size and patch call sites with a mov/call instruction pair for indirect calls Peter Hofer <peter.hofer@jku.at> parents: 3561 diff changeset	573 jint next_pc_offset = 0x0;
5000 b5dc2403c1e7 add option to inline VTable stubs Lukas Stadler <lukas.stadler@jku.at> parents: 4695 diff changeset	574 bool is_call_reg = false;
3563 8780fa370aab Support runtime calls to targets that don't fit in a 32-bit immediate: allow to query the maximum offset of a CiRuntimeCall target to determine the required immediate size and patch call sites with a mov/call instruction pair for indirect calls Peter Hofer <peter.hofer@jku.at> parents: 3561 diff changeset	575 if (inst->is_call() \|\| inst->is_jump()) {
8780fa370aab Support runtime calls to targets that don't fit in a 32-bit immediate: allow to query the maximum offset of a CiRuntimeCall target to determine the required immediate size and patch call sites with a mov/call instruction pair for indirect calls Peter Hofer <peter.hofer@jku.at> parents: 3561 diff changeset	576 assert(NativeCall::instruction_size == (int)NativeJump::instruction_size, "unexpected size");
8780fa370aab Support runtime calls to targets that don't fit in a 32-bit immediate: allow to query the maximum offset of a CiRuntimeCall target to determine the required immediate size and patch call sites with a mov/call instruction pair for indirect calls Peter Hofer <peter.hofer@jku.at> parents: 3561 diff changeset	577 next_pc_offset = pc_offset + NativeCall::instruction_size;
8780fa370aab Support runtime calls to targets that don't fit in a 32-bit immediate: allow to query the maximum offset of a CiRuntimeCall target to determine the required immediate size and patch call sites with a mov/call instruction pair for indirect calls Peter Hofer <peter.hofer@jku.at> parents: 3561 diff changeset	578 } else if (inst->is_mov_literal64()) {
8780fa370aab Support runtime calls to targets that don't fit in a 32-bit immediate: allow to query the maximum offset of a CiRuntimeCall target to determine the required immediate size and patch call sites with a mov/call instruction pair for indirect calls Peter Hofer <peter.hofer@jku.at> parents: 3561 diff changeset	579 // mov+call instruction pair
8780fa370aab Support runtime calls to targets that don't fit in a 32-bit immediate: allow to query the maximum offset of a CiRuntimeCall target to determine the required immediate size and patch call sites with a mov/call instruction pair for indirect calls Peter Hofer <peter.hofer@jku.at> parents: 3561 diff changeset	580 next_pc_offset = pc_offset + NativeMovConstReg::instruction_size;
8780fa370aab Support runtime calls to targets that don't fit in a 32-bit immediate: allow to query the maximum offset of a CiRuntimeCall target to determine the required immediate size and patch call sites with a mov/call instruction pair for indirect calls Peter Hofer <peter.hofer@jku.at> parents: 3561 diff changeset	581 u_char* call = (u_char*) (_instructions->start() + next_pc_offset);
8780fa370aab Support runtime calls to targets that don't fit in a 32-bit immediate: allow to query the maximum offset of a CiRuntimeCall target to determine the required immediate size and patch call sites with a mov/call instruction pair for indirect calls Peter Hofer <peter.hofer@jku.at> parents: 3561 diff changeset	582 assert((call[0] == 0x40 \|\| call[0] == 0x41) && call[1] == 0xFF, "expected call with rex/rexb prefix byte");
8780fa370aab Support runtime calls to targets that don't fit in a 32-bit immediate: allow to query the maximum offset of a CiRuntimeCall target to determine the required immediate size and patch call sites with a mov/call instruction pair for indirect calls Peter Hofer <peter.hofer@jku.at> parents: 3561 diff changeset	583 next_pc_offset += 3; /* prefix byte + opcode byte + modrm byte */
5000 b5dc2403c1e7 add option to inline VTable stubs Lukas Stadler <lukas.stadler@jku.at> parents: 4695 diff changeset	584 } else if (inst->is_call_reg()) {
5839 58a607307306 renaming in native code for CiTargetMethod -> CompilationResult Doug Simon <doug.simon@oracle.com> parents: 5823 diff changeset	585 // the inlined vtable stub contains a "call register" instruction
5000 b5dc2403c1e7 add option to inline VTable stubs Lukas Stadler <lukas.stadler@jku.at> parents: 4695 diff changeset	586 assert(hotspot_method != NULL, "only valid for virtual calls");
b5dc2403c1e7 add option to inline VTable stubs Lukas Stadler <lukas.stadler@jku.at> parents: 4695 diff changeset	587 is_call_reg = true;
5839 58a607307306 renaming in native code for CiTargetMethod -> CompilationResult Doug Simon <doug.simon@oracle.com> parents: 5823 diff changeset	588 next_pc_offset = pc_offset + ((NativeCallReg *) inst)->next_instruction_offset();
3563 8780fa370aab Support runtime calls to targets that don't fit in a 32-bit immediate: allow to query the maximum offset of a CiRuntimeCall target to determine the required immediate size and patch call sites with a mov/call instruction pair for indirect calls Peter Hofer <peter.hofer@jku.at> parents: 3561 diff changeset	589 } else {
5839 58a607307306 renaming in native code for CiTargetMethod -> CompilationResult Doug Simon <doug.simon@oracle.com> parents: 5823 diff changeset	590 tty->print_cr("at pc_offset %d", pc_offset);
3563 8780fa370aab Support runtime calls to targets that don't fit in a 32-bit immediate: allow to query the maximum offset of a CiRuntimeCall target to determine the required immediate size and patch call sites with a mov/call instruction pair for indirect calls Peter Hofer <peter.hofer@jku.at> parents: 3561 diff changeset	591 fatal("unsupported type of instruction for call site");
8780fa370aab Support runtime calls to targets that don't fit in a 32-bit immediate: allow to query the maximum offset of a CiRuntimeCall target to determine the required immediate size and patch call sites with a mov/call instruction pair for indirect calls Peter Hofer <peter.hofer@jku.at> parents: 3561 diff changeset	592 }
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	593
6948 e522a00b91aa Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works Doug Simon <doug.simon@oracle.com> parents: 6674 diff changeset	594 if (target->is_a(SystemDictionary::HotSpotInstalledCode_klass())) {
3619 5e9645341ec3 support for new RiRuntime features: add code without making it the default for the method, executing Java tasks on the compile thread, communicate nmethod reference to Java code as HotSpotCompiledMethod Lukas Stadler <lukas.stadler@jku.at> parents: 3594 diff changeset	595 assert(inst->is_jump(), "jump expected");
5e9645341ec3 support for new RiRuntime features: add code without making it the default for the method, executing Java tasks on the compile thread, communicate nmethod reference to Java code as HotSpotCompiledMethod Lukas Stadler <lukas.stadler@jku.at> parents: 3594 diff changeset	596
6948 e522a00b91aa Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works Doug Simon <doug.simon@oracle.com> parents: 6674 diff changeset	597 nmethod* nm = (nmethod*) HotSpotInstalledCode::nmethod(target);
3619 5e9645341ec3 support for new RiRuntime features: add code without making it the default for the method, executing Java tasks on the compile thread, communicate nmethod reference to Java code as HotSpotCompiledMethod Lukas Stadler <lukas.stadler@jku.at> parents: 3594 diff changeset	598 nativeJump_at((address)inst)->set_jump_destination(nm->verified_entry_point());
5e9645341ec3 support for new RiRuntime features: add code without making it the default for the method, executing Java tasks on the compile thread, communicate nmethod reference to Java code as HotSpotCompiledMethod Lukas Stadler <lukas.stadler@jku.at> parents: 3594 diff changeset	599 _instructions->relocate((address)inst, runtime_call_Relocation::spec(), Assembler::call32_operand);
5e9645341ec3 support for new RiRuntime features: add code without making it the default for the method, executing Java tasks on the compile thread, communicate nmethod reference to Java code as HotSpotCompiledMethod Lukas Stadler <lukas.stadler@jku.at> parents: 3594 diff changeset	600
5e9645341ec3 support for new RiRuntime features: add code without making it the default for the method, executing Java tasks on the compile thread, communicate nmethod reference to Java code as HotSpotCompiledMethod Lukas Stadler <lukas.stadler@jku.at> parents: 3594 diff changeset	601 return;
5e9645341ec3 support for new RiRuntime features: add code without making it the default for the method, executing Java tasks on the compile thread, communicate nmethod reference to Java code as HotSpotCompiledMethod Lukas Stadler <lukas.stadler@jku.at> parents: 3594 diff changeset	602 }
5e9645341ec3 support for new RiRuntime features: add code without making it the default for the method, executing Java tasks on the compile thread, communicate nmethod reference to Java code as HotSpotCompiledMethod Lukas Stadler <lukas.stadler@jku.at> parents: 3594 diff changeset	603
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	604 if (debug_info != NULL) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	605 oop frame = DebugInfo::bytecodePosition(debug_info);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	606 _debug_recorder->add_safepoint(next_pc_offset, BytecodeFrame::leafGraphId(frame), create_oop_map(_total_frame_size, _parameter_count, debug_info));
5129 51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	607 record_scope(next_pc_offset, frame, new GrowableArray<ScopeValue*>());
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	608 }
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	609
6521 2a0c9f20baa1 consolidated framework for runtime and stub calls and moved declaration of descriptors for such calls to the source file in which they are used Doug Simon <doug.simon@oracle.com> parents: 6515 diff changeset	610 if (global_stub != NULL) {
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	611 assert(java_lang_boxing_object::is_instance(global_stub, T_LONG), "global_stub needs to be of type Long");
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	612
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	613 if (inst->is_call()) {
6521 2a0c9f20baa1 consolidated framework for runtime and stub calls and moved declaration of descriptors for such calls to the source file in which they are used Doug Simon <doug.simon@oracle.com> parents: 6515 diff changeset	614 // NOTE: for call without a mov, the offset must fit a 32-bit immediate
2a0c9f20baa1 consolidated framework for runtime and stub calls and moved declaration of descriptors for such calls to the source file in which they are used Doug Simon <doug.simon@oracle.com> parents: 6515 diff changeset	615 // see also CompilerToVM.getMaxCallTargetOffset()
2a0c9f20baa1 consolidated framework for runtime and stub calls and moved declaration of descriptors for such calls to the source file in which they are used Doug Simon <doug.simon@oracle.com> parents: 6515 diff changeset	616 NativeCall* call = nativeCall_at((address) (inst));
2a0c9f20baa1 consolidated framework for runtime and stub calls and moved declaration of descriptors for such calls to the source file in which they are used Doug Simon <doug.simon@oracle.com> parents: 6515 diff changeset	617 call->set_destination(VmIds::getStub(global_stub));
2a0c9f20baa1 consolidated framework for runtime and stub calls and moved declaration of descriptors for such calls to the source file in which they are used Doug Simon <doug.simon@oracle.com> parents: 6515 diff changeset	618 _instructions->relocate(call->instruction_address(), runtime_call_Relocation::spec(), Assembler::call32_operand);
2a0c9f20baa1 consolidated framework for runtime and stub calls and moved declaration of descriptors for such calls to the source file in which they are used Doug Simon <doug.simon@oracle.com> parents: 6515 diff changeset	619 } else if (inst->is_mov_literal64()) {
2a0c9f20baa1 consolidated framework for runtime and stub calls and moved declaration of descriptors for such calls to the source file in which they are used Doug Simon <doug.simon@oracle.com> parents: 6515 diff changeset	620 NativeMovConstReg* mov = nativeMovConstReg_at((address) (inst));
2a0c9f20baa1 consolidated framework for runtime and stub calls and moved declaration of descriptors for such calls to the source file in which they are used Doug Simon <doug.simon@oracle.com> parents: 6515 diff changeset	621 mov->set_data((intptr_t) VmIds::getStub(global_stub));
2a0c9f20baa1 consolidated framework for runtime and stub calls and moved declaration of descriptors for such calls to the source file in which they are used Doug Simon <doug.simon@oracle.com> parents: 6515 diff changeset	622 _instructions->relocate(mov->instruction_address(), runtime_call_Relocation::spec(), Assembler::imm_operand);
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	623 } else {
6521 2a0c9f20baa1 consolidated framework for runtime and stub calls and moved declaration of descriptors for such calls to the source file in which they are used Doug Simon <doug.simon@oracle.com> parents: 6515 diff changeset	624 NativeJump* jump = nativeJump_at((address) (inst));
2a0c9f20baa1 consolidated framework for runtime and stub calls and moved declaration of descriptors for such calls to the source file in which they are used Doug Simon <doug.simon@oracle.com> parents: 6515 diff changeset	625 jump->set_jump_destination(VmIds::getStub(global_stub));
2a0c9f20baa1 consolidated framework for runtime and stub calls and moved declaration of descriptors for such calls to the source file in which they are used Doug Simon <doug.simon@oracle.com> parents: 6515 diff changeset	626 _instructions->relocate((address)inst, runtime_call_Relocation::spec(), Assembler::call32_operand);
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	627 }
6996 eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	628 TRACE_graal_3("relocating (stub) at %p", inst);
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	629 } else { // method != NULL
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	630 assert(hotspot_method != NULL, "unexpected JavaMethod");
7018 17eeac928874 Put code that is used only in ASSERT mode behind #ifdef ASSERT Gilles Duboscq <duboscq@ssw.jku.at> parents: 7003 diff changeset	631 #ifdef ASSERT
6948 e522a00b91aa Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works Doug Simon <doug.simon@oracle.com> parents: 6674 diff changeset	632 Method* method = NULL;
3011 f00918f35c7f inlining and runtime interface related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2951 diff changeset	633 // we need to check, this might also be an unresolved method
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	634 if (hotspot_method->is_a(HotSpotResolvedJavaMethod::klass())) {
3011 f00918f35c7f inlining and runtime interface related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2951 diff changeset	635 method = getMethodFromHotSpotMethod(hotspot_method);
f00918f35c7f inlining and runtime interface related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2951 diff changeset	636 }
7018 17eeac928874 Put code that is used only in ASSERT mode behind #ifdef ASSERT Gilles Duboscq <duboscq@ssw.jku.at> parents: 7003 diff changeset	637 #endif
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	638 assert(debug_info != NULL, "debug info expected");
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	639
2891 75a99b4f1c98 Rebranded C++ part from C1X to Graal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2890 diff changeset	640 TRACE_graal_3("method call");
1432 b61a43cd1255 sourcecode formatting Lukas Stadler <lukas.stadler@oracle.com> parents: 1429 diff changeset	641 switch (_next_call_type) {
5823 f238fe91dc7f partial (non XIR) support for inlining virtual dispatch at call sites - still needs fixing Doug Simon <doug.simon@oracle.com> parents: 5798 diff changeset	642 case MARK_INLINE_INVOKEVIRTUAL: {
f238fe91dc7f partial (non XIR) support for inlining virtual dispatch at call sites - still needs fixing Doug Simon <doug.simon@oracle.com> parents: 5798 diff changeset	643 break;
f238fe91dc7f partial (non XIR) support for inlining virtual dispatch at call sites - still needs fixing Doug Simon <doug.simon@oracle.com> parents: 5798 diff changeset	644 }
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	645 case MARK_INVOKEVIRTUAL:
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	646 case MARK_INVOKEINTERFACE: {
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	647 assert(method == NULL \|\| !method->is_static(), "cannot call static method with invokeinterface");
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	648
5000 b5dc2403c1e7 add option to inline VTable stubs Lukas Stadler <lukas.stadler@jku.at> parents: 4695 diff changeset	649 NativeCall* call = nativeCall_at(_instructions->start() + pc_offset);
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	650 call->set_destination(SharedRuntime::get_resolve_virtual_call_stub());
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	651 _instructions->relocate(call->instruction_address(), virtual_call_Relocation::spec(_invoke_mark_pc), Assembler::call32_operand);
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	652 break;
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	653 }
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	654 case MARK_INVOKESTATIC: {
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	655 assert(method == NULL \|\| method->is_static(), "cannot call non-static method with invokestatic");
3538 e4616e3d207b support for new CiRuntimeCalls CreateNullPointerException and CreateOutOfBoundsException Lukas Stadler <lukas.stadler@jku.at> parents: 3133 diff changeset	656
5000 b5dc2403c1e7 add option to inline VTable stubs Lukas Stadler <lukas.stadler@jku.at> parents: 4695 diff changeset	657 NativeCall* call = nativeCall_at(_instructions->start() + pc_offset);
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	658 call->set_destination(SharedRuntime::get_resolve_static_call_stub());
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	659 _instructions->relocate(call->instruction_address(), relocInfo::static_call_type, Assembler::call32_operand);
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	660 break;
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	661 }
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	662 case MARK_INVOKESPECIAL: {
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	663 assert(method == NULL \|\| !method->is_static(), "cannot call static method with invokespecial");
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	664
5000 b5dc2403c1e7 add option to inline VTable stubs Lukas Stadler <lukas.stadler@jku.at> parents: 4695 diff changeset	665 NativeCall* call = nativeCall_at(_instructions->start() + pc_offset);
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	666 call->set_destination(SharedRuntime::get_resolve_opt_virtual_call_stub());
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	667 _instructions->relocate(call->instruction_address(), relocInfo::opt_virtual_call_type, Assembler::call32_operand);
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	668 break;
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	669 }
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	670 case MARK_INVOKE_INVALID:
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	671 default:
1931 48bbaead8b6c Adjustments after merge with OpenJDK repository. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1484 diff changeset	672 fatal("invalid _next_call_type value");
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	673 break;
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	674 }
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	675 }
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	676 _next_call_type = MARK_INVOKE_INVALID;
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	677 if (debug_info != NULL) {
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	678 _debug_recorder->end_safepoint(next_pc_offset);
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	679 }
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	680 }
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	681
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	682 void CodeInstaller::site_DataPatch(CodeBuffer& buffer, jint pc_offset, oop site) {
6674 fd71ca8c5f88 VM infrstructure for OnStackReplacement Lukas Stadler <lukas.stadler@jku.at> parents: 6559 diff changeset	683 oop constant = CompilationResult_DataPatch::constant(site);
fd71ca8c5f88 VM infrstructure for OnStackReplacement Lukas Stadler <lukas.stadler@jku.at> parents: 6559 diff changeset	684 int alignment = CompilationResult_DataPatch::alignment(site);
7068 263bc2349f15 removed high-level interpreter code from HotSpot Christian Haeubl <haeubl@ssw.jku.at> parents: 7003 diff changeset	685 bool inlined = CompilationResult_DataPatch::inlined(site) == JNI_TRUE;
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	686 oop kind = Constant::kind(constant);
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	687
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	688 address instruction = _instructions->start() + pc_offset;
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	689
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	690 char typeChar = Kind::typeChar(kind);
2494 e88293edf07c Fixed an issue with alignment of double/long values in the code buffer. Can now run Scimark again. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 2282 diff changeset	691 switch (typeChar) {
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	692 case 'z':
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	693 case 'b':
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	694 case 's':
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	695 case 'c':
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	696 case 'i':
5326 a53162ca8219 introduced HotSpotKlassOop type to convey a klassOop value from the compiler to the C++ code instead of relying on the C++ code automagically converting a HotSpotTypeResolvedImpl value to a klassOop Doug Simon <doug.simon@oracle.com> parents: 5275 diff changeset	697 fatal("int-sized values not expected in DataPatch");
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	698 break;
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	699 case 'f':
3594 af1319bc4fd5 Fixed wrong type char check. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3572 diff changeset	700 case 'j':
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	701 case 'd': {
6996 eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	702 record_metadata_in_constant(constant, _oop_recorder);
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	703 if (inlined) {
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	704 address operand = Assembler::locate_operand(instruction, Assembler::imm_operand);
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	705 ((jlong) operand) = Constant::primitive(constant);
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	706 } else {
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	707 address operand = Assembler::locate_operand(instruction, Assembler::disp32_operand);
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	708 address next_instruction = Assembler::locate_next_instruction(instruction);
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	709 int size = _constants->size();
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	710 if (alignment > 0) {
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	711 guarantee(alignment <= _constants->alignment(), "Alignment inside constants section is restricted by alignment of section begin");
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	712 size = align_size_up(size, alignment);
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	713 }
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	714 // we don't care if this is a long/double/etc., the primitive field contains the right bits
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	715 address dest = _constants->start() + size;
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	716 _constants->set_end(dest + BytesPerLong);
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	717 (jlong) dest = Constant::primitive(constant);
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	718
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	719 long disp = dest - next_instruction;
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	720 assert(disp == (jint) disp, "disp doesn't fit in 32 bits");
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	721 ((jint) operand) = (jint) disp;
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	722
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	723 _instructions->relocate(instruction, section_word_Relocation::spec((address) dest, CodeBuffer::SECT_CONSTS), Assembler::disp32_operand);
eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	724 TRACE_graal_3("relocating (%c) at %p/%p with destination at %p (%d)", typeChar, instruction, operand, dest, size);
3710 4e037604f6ee use alignment for constants specified in DataPatch.alignment Christian Wimmer <christian.wimmer@oracle.com> parents: 3707 diff changeset	725 }
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	726 break;
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	727 }
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	728 case 'a': {
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	729 address operand = Assembler::locate_operand(instruction, Assembler::imm_operand);
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5553 diff changeset	730 Handle obj = Constant::object(constant);
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	731
6948 e522a00b91aa Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works Doug Simon <doug.simon@oracle.com> parents: 6674 diff changeset	732 jobject value = JNIHandles::make_local(obj());
e522a00b91aa Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works Doug Simon <doug.simon@oracle.com> parents: 6674 diff changeset	733 ((jobject) operand) = value;
e522a00b91aa Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works Doug Simon <doug.simon@oracle.com> parents: 6674 diff changeset	734 _instructions->relocate(instruction, oop_Relocation::spec_for_immediate(), Assembler::imm_operand);
6996 eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	735 TRACE_graal_3("relocating (oop constant) at %p/%p", instruction, operand);
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	736 break;
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	737 }
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	738 default:
6996 eec373d34caf added support for annotated Constants and used it to track Klass* values in Graal and register them in the metadata section of a nmethod during code installation Doug Simon <doug.simon@oracle.com> parents: 6950 diff changeset	739 fatal(err_msg("unexpected Kind (%d) in DataPatch", typeChar));
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	740 break;
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	741 }
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	742 }
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	743
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	744 void CodeInstaller::site_Mark(CodeBuffer& buffer, jint pc_offset, oop site) {
6674 fd71ca8c5f88 VM infrstructure for OnStackReplacement Lukas Stadler <lukas.stadler@jku.at> parents: 6559 diff changeset	745 oop id_obj = CompilationResult_Mark::id(site);
fd71ca8c5f88 VM infrstructure for OnStackReplacement Lukas Stadler <lukas.stadler@jku.at> parents: 6559 diff changeset	746 arrayOop references = (arrayOop) CompilationResult_Mark::references(site);
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	747
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	748 if (id_obj != NULL) {
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	749 assert(java_lang_boxing_object::is_instance(id_obj, T_INT), "Integer id expected");
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	750 jint id = id_obj->int_field(java_lang_boxing_object::value_offset_in_bytes(T_INT));
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	751
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	752 address instruction = _instructions->start() + pc_offset;
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	753
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	754 switch (id) {
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	755 case MARK_UNVERIFIED_ENTRY:
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	756 _offsets.set_value(CodeOffsets::Entry, pc_offset);
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	757 break;
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	758 case MARK_VERIFIED_ENTRY:
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	759 _offsets.set_value(CodeOffsets::Verified_Entry, pc_offset);
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	760 break;
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	761 case MARK_OSR_ENTRY:
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	762 _offsets.set_value(CodeOffsets::OSR_Entry, pc_offset);
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	763 break;
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	764 case MARK_EXCEPTION_HANDLER_ENTRY:
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	765 _offsets.set_value(CodeOffsets::Exceptions, pc_offset);
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	766 break;
1936 8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1931 diff changeset	767 case MARK_DEOPT_HANDLER_ENTRY:
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1931 diff changeset	768 _offsets.set_value(CodeOffsets::Deopt, pc_offset);
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1931 diff changeset	769 break;
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	770 case MARK_STATIC_CALL_STUB: {
7003 bb524ee6b8e9 added relocation entry for the Method* operand of the MOV instruction in a static call stub Doug Simon <doug.simon@oracle.com> parents: 7000 diff changeset	771 _instructions->relocate(instruction, metadata_Relocation::spec_for_immediate());
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	772 assert(references->length() == 1, "static call stub needs one reference");
1432 b61a43cd1255 sourcecode formatting Lukas Stadler <lukas.stadler@oracle.com> parents: 1429 diff changeset	773 oop ref = ((oop*) references->base(T_OBJECT))[0];
6674 fd71ca8c5f88 VM infrstructure for OnStackReplacement Lukas Stadler <lukas.stadler@jku.at> parents: 6559 diff changeset	774 address call_pc = _instructions->start() + CompilationResult_Site::pcOffset(ref);
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	775 _instructions->relocate(instruction, static_stub_Relocation::spec(call_pc));
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	776 break;
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	777 }
5798 2585af1e26ac implemented non-XIR lowering of invokes (todo: inline virtual dispatch and null checking of receivers) Doug Simon <doug.simon@oracle.com> parents: 5776 diff changeset	778 case MARK_INVOKEVIRTUAL:
2585af1e26ac implemented non-XIR lowering of invokes (todo: inline virtual dispatch and null checking of receivers) Doug Simon <doug.simon@oracle.com> parents: 5776 diff changeset	779 case MARK_INVOKEINTERFACE: {
6948 e522a00b91aa Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works Doug Simon <doug.simon@oracle.com> parents: 6674 diff changeset	780 // Convert the initial value of the Klass* slot in an inline cache
e522a00b91aa Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works Doug Simon <doug.simon@oracle.com> parents: 6674 diff changeset	781 // from 0L to Universe::non_oop_word().
5798 2585af1e26ac implemented non-XIR lowering of invokes (todo: inline virtual dispatch and null checking of receivers) Doug Simon <doug.simon@oracle.com> parents: 5776 diff changeset	782 NativeMovConstReg* n_copy = nativeMovConstReg_at(instruction);
6948 e522a00b91aa Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works Doug Simon <doug.simon@oracle.com> parents: 6674 diff changeset	783 assert(n_copy->data() == 0, "inline cache Klass* initial value should be 0L");
5798 2585af1e26ac implemented non-XIR lowering of invokes (todo: inline virtual dispatch and null checking of receivers) Doug Simon <doug.simon@oracle.com> parents: 5776 diff changeset	784 n_copy->set_data((intptr_t)Universe::non_oop_word());
2585af1e26ac implemented non-XIR lowering of invokes (todo: inline virtual dispatch and null checking of receivers) Doug Simon <doug.simon@oracle.com> parents: 5776 diff changeset	785 }
5823 f238fe91dc7f partial (non XIR) support for inlining virtual dispatch at call sites - still needs fixing Doug Simon <doug.simon@oracle.com> parents: 5798 diff changeset	786 case MARK_INLINE_INVOKEVIRTUAL:
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	787 case MARK_INVOKE_INVALID:
5798 2585af1e26ac implemented non-XIR lowering of invokes (todo: inline virtual dispatch and null checking of receivers) Doug Simon <doug.simon@oracle.com> parents: 5776 diff changeset	788 case MARK_INVOKESPECIAL:
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	789 case MARK_INVOKESTATIC:
1432 b61a43cd1255 sourcecode formatting Lukas Stadler <lukas.stadler@oracle.com> parents: 1429 diff changeset	790 _next_call_type = (MarkId) id;
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	791 _invoke_mark_pc = instruction;
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	792 break;
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	793 case MARK_IMPLICIT_NULL:
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	794 _implicit_exception_table.append(pc_offset, pc_offset);
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	795 break;
3550 aee1479c0a4b Use 2 different marks for NEAR/FAR polling : fixes wrong polling addresse problem after relocation Gilles Duboscq <gilles.duboscq@oracle.com> parents: 3549 diff changeset	796 case MARK_POLL_NEAR: {
aee1479c0a4b Use 2 different marks for NEAR/FAR polling : fixes wrong polling addresse problem after relocation Gilles Duboscq <gilles.duboscq@oracle.com> parents: 3549 diff changeset	797 NativeInstruction* ni = nativeInstruction_at(instruction);
aee1479c0a4b Use 2 different marks for NEAR/FAR polling : fixes wrong polling addresse problem after relocation Gilles Duboscq <gilles.duboscq@oracle.com> parents: 3549 diff changeset	798 int32_t* disp = (int32_t*) Assembler::locate_operand(instruction, Assembler::disp32_operand);
aee1479c0a4b Use 2 different marks for NEAR/FAR polling : fixes wrong polling addresse problem after relocation Gilles Duboscq <gilles.duboscq@oracle.com> parents: 3549 diff changeset	799 intptr_t new_disp = (intptr_t) (os::get_polling_page() + (SafepointPollOffset % os::vm_page_size())) - (intptr_t) ni;
aee1479c0a4b Use 2 different marks for NEAR/FAR polling : fixes wrong polling addresse problem after relocation Gilles Duboscq <gilles.duboscq@oracle.com> parents: 3549 diff changeset	800 *disp = (int32_t)new_disp;
aee1479c0a4b Use 2 different marks for NEAR/FAR polling : fixes wrong polling addresse problem after relocation Gilles Duboscq <gilles.duboscq@oracle.com> parents: 3549 diff changeset	801 }
aee1479c0a4b Use 2 different marks for NEAR/FAR polling : fixes wrong polling addresse problem after relocation Gilles Duboscq <gilles.duboscq@oracle.com> parents: 3549 diff changeset	802 case MARK_POLL_FAR:
3549 25765a764212 Add support for polling mark in code installer Gilles Duboscq <gilles.duboscq@oracle.com> parents: 3538 diff changeset	803 _instructions->relocate(instruction, relocInfo::poll_type);
25765a764212 Add support for polling mark in code installer Gilles Duboscq <gilles.duboscq@oracle.com> parents: 3538 diff changeset	804 break;
3550 aee1479c0a4b Use 2 different marks for NEAR/FAR polling : fixes wrong polling addresse problem after relocation Gilles Duboscq <gilles.duboscq@oracle.com> parents: 3549 diff changeset	805 case MARK_POLL_RETURN_NEAR: {
aee1479c0a4b Use 2 different marks for NEAR/FAR polling : fixes wrong polling addresse problem after relocation Gilles Duboscq <gilles.duboscq@oracle.com> parents: 3549 diff changeset	806 NativeInstruction* ni = nativeInstruction_at(instruction);
aee1479c0a4b Use 2 different marks for NEAR/FAR polling : fixes wrong polling addresse problem after relocation Gilles Duboscq <gilles.duboscq@oracle.com> parents: 3549 diff changeset	807 int32_t* disp = (int32_t*) Assembler::locate_operand(instruction, Assembler::disp32_operand);
aee1479c0a4b Use 2 different marks for NEAR/FAR polling : fixes wrong polling addresse problem after relocation Gilles Duboscq <gilles.duboscq@oracle.com> parents: 3549 diff changeset	808 intptr_t new_disp = (intptr_t) (os::get_polling_page() + (SafepointPollOffset % os::vm_page_size())) - (intptr_t) ni;
aee1479c0a4b Use 2 different marks for NEAR/FAR polling : fixes wrong polling addresse problem after relocation Gilles Duboscq <gilles.duboscq@oracle.com> parents: 3549 diff changeset	809 *disp = (int32_t)new_disp;
aee1479c0a4b Use 2 different marks for NEAR/FAR polling : fixes wrong polling addresse problem after relocation Gilles Duboscq <gilles.duboscq@oracle.com> parents: 3549 diff changeset	810 }
aee1479c0a4b Use 2 different marks for NEAR/FAR polling : fixes wrong polling addresse problem after relocation Gilles Duboscq <gilles.duboscq@oracle.com> parents: 3549 diff changeset	811 case MARK_POLL_RETURN_FAR:
3549 25765a764212 Add support for polling mark in code installer Gilles Duboscq <gilles.duboscq@oracle.com> parents: 3538 diff changeset	812 _instructions->relocate(instruction, relocInfo::poll_return_type);
25765a764212 Add support for polling mark in code installer Gilles Duboscq <gilles.duboscq@oracle.com> parents: 3538 diff changeset	813 break;
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	814 case MARK_KLASS_PATCHING:
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	815 case MARK_ACCESS_FIELD_PATCHING: {
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	816 unsigned char* byte_count = (unsigned char*) (instruction - 1);
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	817 unsigned char* byte_skip = (unsigned char*) (instruction - 2);
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	818 unsigned char* being_initialized_entry_offset = (unsigned char*) (instruction - 3);
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	819
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	820 assert(*byte_skip == 5, "unexpected byte_skip");
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	821
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	822 assert(references->length() == 2, "MARK_KLASS_PATCHING/MARK_ACCESS_FIELD_PATCHING needs 2 references");
1432 b61a43cd1255 sourcecode formatting Lukas Stadler <lukas.stadler@oracle.com> parents: 1429 diff changeset	823 oop ref1 = ((oop*) references->base(T_OBJECT))[0];
b61a43cd1255 sourcecode formatting Lukas Stadler <lukas.stadler@oracle.com> parents: 1429 diff changeset	824 oop ref2 = ((oop*) references->base(T_OBJECT))[1];
6674 fd71ca8c5f88 VM infrstructure for OnStackReplacement Lukas Stadler <lukas.stadler@jku.at> parents: 6559 diff changeset	825 int i_byte_count = CompilationResult_Site::pcOffset(ref2) - CompilationResult_Site::pcOffset(ref1);
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	826 assert(i_byte_count == (unsigned char)i_byte_count, "invalid offset");
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	827 *byte_count = i_byte_count;
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	828 being_initialized_entry_offset = byte_count + *byte_skip;
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	829
6948 e522a00b91aa Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works Doug Simon <doug.simon@oracle.com> parents: 6674 diff changeset	830 // we need to correct the offset of a field access - it's created with MAX_INT to ensure the correct size, and HotSpot expects 0
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	831 if (id == MARK_ACCESS_FIELD_PATCHING) {
6674 fd71ca8c5f88 VM infrstructure for OnStackReplacement Lukas Stadler <lukas.stadler@jku.at> parents: 6559 diff changeset	832 NativeMovRegMem* inst = nativeMovRegMem_at(_instructions->start() + CompilationResult_Site::pcOffset(ref1));
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	833 assert(inst->offset() == max_jint, "unexpected offset value");
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	834 inst->set_offset(0);
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	835 }
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	836 break;
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	837 }
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	838 case MARK_DUMMY_OOP_RELOCATION: {
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	839 _instructions->relocate(instruction, oop_Relocation::spec_for_immediate(), Assembler::imm_operand);
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	840
1432 b61a43cd1255 sourcecode formatting Lukas Stadler <lukas.stadler@oracle.com> parents: 1429 diff changeset	841 RelocIterator iter(_instructions, (address) instruction, (address) (instruction + 1));
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	842 relocInfo::change_reloc_info_for_address(&iter, (address) instruction, relocInfo::oop_type, relocInfo::none);
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	843 break;
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	844 }
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	845 default:
1931 48bbaead8b6c Adjustments after merge with OpenJDK repository. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1484 diff changeset	846 ShouldNotReachHere();
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	847 break;
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	848 }
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	849 }
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	850 }
695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: diff changeset	851

Mercurial > hg > truffle

annotate src/share/vm/graal/graalCodeInstaller.cpp @ 7093:dff79b1f82f1