Mercurial > hg > truffle

annotate src/cpu/x86/vm/graalCodeInstaller_x86.cpp @ 18854:b8d3f84740c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
guarded use of 64-bit only code with #ifdefs Contributed-by: Igor Ignatyev <igor.ignatyev@oracle.com>
author Doug Simon <doug.simon@oracle.com>
date Tue, 13 Jan 2015 12:59:48 +0100
parents d611982fb10e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
9934
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
1 /*
15123
7ccd2a1df0fa made SPARC compile again; moved graalCodeInstaller_<arch>.hpp to .cpp files
twisti
parents: 14574
diff changeset
2 * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
9934
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
4 *
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
5 * This code is free software; you can redistribute it and/or modify it
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
6 * under the terms of the GNU General Public License version 2 only, as
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
7 * published by the Free Software Foundation.
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
8 *
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
9 * This code is distributed in the hope that it will be useful, but WITHOUT
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
12 * version 2 for more details (a copy is included in the LICENSE file that
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
13 * accompanied this code).
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
14 *
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
15 * You should have received a copy of the GNU General Public License version
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
16 * 2 along with this work; if not, write to the Free Software Foundation,
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
18 *
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
20 * or visit www.oracle.com if you need additional information or have any
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
21 * questions.
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
22 */
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
23
15155
370cb412d027 add precompiled.hpp to graalCodeInstaller_x86.cpp, fixes Windows build
Christian Wirth <christian.wirth@oracle.com>
parents: 15123
diff changeset
24 #include "precompiled.hpp"
9934
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
25 #include "compiler/disassembler.hpp"
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
26 #include "runtime/javaCalls.hpp"
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
27 #include "graal/graalEnv.hpp"
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
28 #include "graal/graalCodeInstaller.hpp"
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
29 #include "graal/graalJavaAccess.hpp"
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
30 #include "graal/graalCompilerToVM.hpp"
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
31 #include "graal/graalRuntime.hpp"
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
32 #include "asm/register.hpp"
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
33 #include "classfile/vmSymbols.hpp"
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
34 #include "code/vmreg.hpp"
17024
4e2d34d7715b [SPARC/AMD64] Splitting up oopmap generation for Intel XMM and SPARC Floatingpoint registers
Stefan Anzinger <stefan.anzinger@oracle.com>
parents: 15582
diff changeset
35 #include "vmreg_x86.inline.hpp"
9934
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
36
15123
7ccd2a1df0fa made SPARC compile again; moved graalCodeInstaller_<arch>.hpp to .cpp files
twisti
parents: 14574
diff changeset
37 jint CodeInstaller::pd_next_offset(NativeInstruction* inst, jint pc_offset, oop method) {
9934
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
38 if (inst->is_call() || inst->is_jump()) {
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
39 assert(NativeCall::instruction_size == (int)NativeJump::instruction_size, "unexpected size");
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
40 return (pc_offset + NativeCall::instruction_size);
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
41 } else if (inst->is_mov_literal64()) {
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
42 // mov+call instruction pair
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
43 jint offset = pc_offset + NativeMovConstReg::instruction_size;
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
44 u_char* call = (u_char*) (_instructions->start() + offset);
18732
d611982fb10e Fixed decoding of call instruction
Tom Rodriguez <tom.rodriguez@oracle.com>
parents: 18262
diff changeset
45 if (call[0] == Assembler::REX_B) {
d611982fb10e Fixed decoding of call instruction
Tom Rodriguez <tom.rodriguez@oracle.com>
parents: 18262
diff changeset
46 offset += 1; /* prefix byte for extended register R8-R15 */
d611982fb10e Fixed decoding of call instruction
Tom Rodriguez <tom.rodriguez@oracle.com>
parents: 18262
diff changeset
47 call++;
d611982fb10e Fixed decoding of call instruction
Tom Rodriguez <tom.rodriguez@oracle.com>
parents: 18262
diff changeset
48 }
d611982fb10e Fixed decoding of call instruction
Tom Rodriguez <tom.rodriguez@oracle.com>
parents: 18262
diff changeset
49 assert(call[0] == 0xFF, "expected call");
d611982fb10e Fixed decoding of call instruction
Tom Rodriguez <tom.rodriguez@oracle.com>
parents: 18262
diff changeset
50 offset += 2; /* opcode byte + modrm byte */
9934
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
51 return (offset);
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
52 } else if (inst->is_call_reg()) {
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
53 // the inlined vtable stub contains a "call register" instruction
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
54 assert(method != NULL, "only valid for virtual calls");
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
55 return (pc_offset + ((NativeCallReg *) inst)->next_instruction_offset());
11826
2d3d3d36ab3c AMD64HotSpot: use conditional jump for IC_MISS_HANDLER
Bernhard Urban <bernhard.urban@jku.at>
parents: 11799
diff changeset
56 } else if (inst->is_cond_jump()) {
2d3d3d36ab3c AMD64HotSpot: use conditional jump for IC_MISS_HANDLER
Bernhard Urban <bernhard.urban@jku.at>
parents: 11799
diff changeset
57 address pc = (address) (inst);
2d3d3d36ab3c AMD64HotSpot: use conditional jump for IC_MISS_HANDLER
Bernhard Urban <bernhard.urban@jku.at>
parents: 11799
diff changeset
58 return pc_offset + (jint) (Assembler::locate_next_instruction(pc) - pc);
9934
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
59 } else {
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
60 fatal("unsupported type of instruction for call site");
9953
60648c97cdd0 Windows build fix: compiler warning "not all control paths return a value" in CodeInstaller::pd_next_offset.
Andreas Woess <andreas.woess@jku.at>
parents: 9934
diff changeset
61 return 0;
9934
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
62 }
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
63 }
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
64
18176
c2270ad35f57 Better construction of data section and data patches.
Roland Schatz <roland.schatz@oracle.com>
parents: 17024
diff changeset
65 void CodeInstaller::pd_patch_OopConstant(int pc_offset, Handle& constant) {
10810
4e1db4c9d4c5 Support data patches for values larger than long.
Roland Schatz <roland.schatz@oracle.com>
parents: 10684
diff changeset
66 address pc = _instructions->start() + pc_offset;
18262
f7d45e2426d4 converted HotSpotObjectConstant to an interface
Doug Simon <doug.simon@oracle.com>
parents: 18222
diff changeset
67 Handle obj = HotSpotObjectConstantImpl::object(constant);
14561
e14198669e5c Make data patch system use vm specific NarrowOop kind.
Roland Schatz <roland.schatz@oracle.com>
parents: 13726
diff changeset
68 jobject value = JNIHandles::make_local(obj());
18262
f7d45e2426d4 converted HotSpotObjectConstant to an interface
Doug Simon <doug.simon@oracle.com>
parents: 18222
diff changeset
69 if (HotSpotObjectConstantImpl::compressed(constant)) {
18854
b8d3f84740c7 guarded use of 64-bit only code with #ifdefs
Doug Simon <doug.simon@oracle.com>
parents: 18732
diff changeset
70 #ifdef _LP64
14561
e14198669e5c Make data patch system use vm specific NarrowOop kind.
Roland Schatz <roland.schatz@oracle.com>
parents: 13726
diff changeset
71 address operand = Assembler::locate_operand(pc, Assembler::narrow_oop_operand);
e14198669e5c Make data patch system use vm specific NarrowOop kind.
Roland Schatz <roland.schatz@oracle.com>
parents: 13726
diff changeset
72 int oop_index = _oop_recorder->find_index(value);
e14198669e5c Make data patch system use vm specific NarrowOop kind.
Roland Schatz <roland.schatz@oracle.com>
parents: 13726
diff changeset
73 _instructions->relocate(pc, oop_Relocation::spec(oop_index), Assembler::narrow_oop_operand);
e14198669e5c Make data patch system use vm specific NarrowOop kind.
Roland Schatz <roland.schatz@oracle.com>
parents: 13726
diff changeset
74 TRACE_graal_3("relocating (narrow oop constant) at %p/%p", pc, operand);
18854
b8d3f84740c7 guarded use of 64-bit only code with #ifdefs
Doug Simon <doug.simon@oracle.com>
parents: 18732
diff changeset
75 #else
b8d3f84740c7 guarded use of 64-bit only code with #ifdefs
Doug Simon <doug.simon@oracle.com>
parents: 18732
diff changeset
76 fatal("compressed oop on 32bit");
b8d3f84740c7 guarded use of 64-bit only code with #ifdefs
Doug Simon <doug.simon@oracle.com>
parents: 18732
diff changeset
77 #endif
14561
e14198669e5c Make data patch system use vm specific NarrowOop kind.
Roland Schatz <roland.schatz@oracle.com>
parents: 13726
diff changeset
78 } else {
e14198669e5c Make data patch system use vm specific NarrowOop kind.
Roland Schatz <roland.schatz@oracle.com>
parents: 13726
diff changeset
79 address operand = Assembler::locate_operand(pc, Assembler::imm_operand);
e14198669e5c Make data patch system use vm specific NarrowOop kind.
Roland Schatz <roland.schatz@oracle.com>
parents: 13726
diff changeset
80 *((jobject*) operand) = value;
e14198669e5c Make data patch system use vm specific NarrowOop kind.
Roland Schatz <roland.schatz@oracle.com>
parents: 13726
diff changeset
81 _instructions->relocate(pc, oop_Relocation::spec_for_immediate(), Assembler::imm_operand);
e14198669e5c Make data patch system use vm specific NarrowOop kind.
Roland Schatz <roland.schatz@oracle.com>
parents: 13726
diff changeset
82 TRACE_graal_3("relocating (oop constant) at %p/%p", pc, operand);
e14198669e5c Make data patch system use vm specific NarrowOop kind.
Roland Schatz <roland.schatz@oracle.com>
parents: 13726
diff changeset
83 }
e14198669e5c Make data patch system use vm specific NarrowOop kind.
Roland Schatz <roland.schatz@oracle.com>
parents: 13726
diff changeset
84 }
13520
fb7b39f07232 Embed compressed constants when possible and use more efficient patterns for encoding
Tom Rodriguez <tom.rodriguez@oracle.com>
parents: 13515
diff changeset
85
18176
c2270ad35f57 Better construction of data section and data patches.
Roland Schatz <roland.schatz@oracle.com>
parents: 17024
diff changeset
86 void CodeInstaller::pd_patch_DataSectionReference(int pc_offset, int data_offset) {
14561
e14198669e5c Make data patch system use vm specific NarrowOop kind.
Roland Schatz <roland.schatz@oracle.com>
parents: 13726
diff changeset
87 address pc = _instructions->start() + pc_offset;
9934
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
88
14561
e14198669e5c Make data patch system use vm specific NarrowOop kind.
Roland Schatz <roland.schatz@oracle.com>
parents: 13726
diff changeset
89 address operand = Assembler::locate_operand(pc, Assembler::disp32_operand);
e14198669e5c Make data patch system use vm specific NarrowOop kind.
Roland Schatz <roland.schatz@oracle.com>
parents: 13726
diff changeset
90 address next_instruction = Assembler::locate_next_instruction(pc);
18176
c2270ad35f57 Better construction of data section and data patches.
Roland Schatz <roland.schatz@oracle.com>
parents: 17024
diff changeset
91 address dest = _constants->start() + data_offset;
9934
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
92
14561
e14198669e5c Make data patch system use vm specific NarrowOop kind.
Roland Schatz <roland.schatz@oracle.com>
parents: 13726
diff changeset
93 long disp = dest - next_instruction;
e14198669e5c Make data patch system use vm specific NarrowOop kind.
Roland Schatz <roland.schatz@oracle.com>
parents: 13726
diff changeset
94 assert(disp == (jint) disp, "disp doesn't fit in 32 bits");
e14198669e5c Make data patch system use vm specific NarrowOop kind.
Roland Schatz <roland.schatz@oracle.com>
parents: 13726
diff changeset
95 *((jint*) operand) = (jint) disp;
13576
4e679d50ba9a Move data section building code to Java.
Roland Schatz <roland.schatz@oracle.com>
parents: 13561
diff changeset
96
14561
e14198669e5c Make data patch system use vm specific NarrowOop kind.
Roland Schatz <roland.schatz@oracle.com>
parents: 13726
diff changeset
97 _instructions->relocate(pc, section_word_Relocation::spec((address) dest, CodeBuffer::SECT_CONSTS), Assembler::disp32_operand);
18176
c2270ad35f57 Better construction of data section and data patches.
Roland Schatz <roland.schatz@oracle.com>
parents: 17024
diff changeset
98 TRACE_graal_3("relocating at %p/%p with destination at %p (%d)", pc, operand, dest, data_offset);
9934
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
99 }
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
100
15123
7ccd2a1df0fa made SPARC compile again; moved graalCodeInstaller_<arch>.hpp to .cpp files
twisti
parents: 14574
diff changeset
101 void CodeInstaller::pd_relocate_CodeBlob(CodeBlob* cb, NativeInstruction* inst) {
9934
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
102 if (cb->is_nmethod()) {
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
103 nmethod* nm = (nmethod*) cb;
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
104 nativeJump_at((address)inst)->set_jump_destination(nm->verified_entry_point());
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
105 } else {
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
106 nativeJump_at((address)inst)->set_jump_destination(cb->code_begin());
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
107 }
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
108 _instructions->relocate((address)inst, runtime_call_Relocation::spec(), Assembler::call32_operand);
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
109 }
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
110
15123
7ccd2a1df0fa made SPARC compile again; moved graalCodeInstaller_<arch>.hpp to .cpp files
twisti
parents: 14574
diff changeset
111 void CodeInstaller::pd_relocate_ForeignCall(NativeInstruction* inst, jlong foreign_call_destination) {
11827
ff1d8605f354 graal code installer: minor style cleanup
Bernhard Urban <bernhard.urban@jku.at>
parents: 11826
diff changeset
112 address pc = (address) inst;
9934
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
113 if (inst->is_call()) {
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
114 // NOTE: for call without a mov, the offset must fit a 32-bit immediate
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
115 // see also CompilerToVM.getMaxCallTargetOffset()
11827
ff1d8605f354 graal code installer: minor style cleanup
Bernhard Urban <bernhard.urban@jku.at>
parents: 11826
diff changeset
116 NativeCall* call = nativeCall_at(pc);
9934
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
117 call->set_destination((address) foreign_call_destination);
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
118 _instructions->relocate(call->instruction_address(), runtime_call_Relocation::spec(), Assembler::call32_operand);
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
119 } else if (inst->is_mov_literal64()) {
11827
ff1d8605f354 graal code installer: minor style cleanup
Bernhard Urban <bernhard.urban@jku.at>
parents: 11826
diff changeset
120 NativeMovConstReg* mov = nativeMovConstReg_at(pc);
9934
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
121 mov->set_data((intptr_t) foreign_call_destination);
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
122 _instructions->relocate(mov->instruction_address(), runtime_call_Relocation::spec(), Assembler::imm_operand);
11826
2d3d3d36ab3c AMD64HotSpot: use conditional jump for IC_MISS_HANDLER
Bernhard Urban <bernhard.urban@jku.at>
parents: 11799
diff changeset
123 } else if (inst->is_jump()) {
11827
ff1d8605f354 graal code installer: minor style cleanup
Bernhard Urban <bernhard.urban@jku.at>
parents: 11826
diff changeset
124 NativeJump* jump = nativeJump_at(pc);
9934
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
125 jump->set_jump_destination((address) foreign_call_destination);
11826
2d3d3d36ab3c AMD64HotSpot: use conditional jump for IC_MISS_HANDLER
Bernhard Urban <bernhard.urban@jku.at>
parents: 11799
diff changeset
126 _instructions->relocate(jump->instruction_address(), runtime_call_Relocation::spec(), Assembler::call32_operand);
2d3d3d36ab3c AMD64HotSpot: use conditional jump for IC_MISS_HANDLER
Bernhard Urban <bernhard.urban@jku.at>
parents: 11799
diff changeset
127 } else if (inst->is_cond_jump()) {
11827
ff1d8605f354 graal code installer: minor style cleanup
Bernhard Urban <bernhard.urban@jku.at>
parents: 11826
diff changeset
128 address old_dest = nativeGeneralJump_at(pc)->jump_destination();
ff1d8605f354 graal code installer: minor style cleanup
Bernhard Urban <bernhard.urban@jku.at>
parents: 11826
diff changeset
129 address disp = Assembler::locate_operand(pc, Assembler::call32_operand);
11826
2d3d3d36ab3c AMD64HotSpot: use conditional jump for IC_MISS_HANDLER
Bernhard Urban <bernhard.urban@jku.at>
parents: 11799
diff changeset
130 *(jint*) disp += ((address) foreign_call_destination) - old_dest;
11827
ff1d8605f354 graal code installer: minor style cleanup
Bernhard Urban <bernhard.urban@jku.at>
parents: 11826
diff changeset
131 _instructions->relocate(pc, runtime_call_Relocation::spec(), Assembler::call32_operand);
11826
2d3d3d36ab3c AMD64HotSpot: use conditional jump for IC_MISS_HANDLER
Bernhard Urban <bernhard.urban@jku.at>
parents: 11799
diff changeset
132 } else {
2d3d3d36ab3c AMD64HotSpot: use conditional jump for IC_MISS_HANDLER
Bernhard Urban <bernhard.urban@jku.at>
parents: 11799
diff changeset
133 fatal("unsupported relocation for foreign call");
9934
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
134 }
11826
2d3d3d36ab3c AMD64HotSpot: use conditional jump for IC_MISS_HANDLER
Bernhard Urban <bernhard.urban@jku.at>
parents: 11799
diff changeset
135
9934
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
136 TRACE_graal_3("relocating (foreign call) at %p", inst);
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
137 }
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
138
15123
7ccd2a1df0fa made SPARC compile again; moved graalCodeInstaller_<arch>.hpp to .cpp files
twisti
parents: 14574
diff changeset
139 void CodeInstaller::pd_relocate_JavaMethod(oop hotspot_method, jint pc_offset) {
9934
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
140 #ifdef ASSERT
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
141 Method* method = NULL;
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
142 // we need to check, this might also be an unresolved method
18222
a8cff27ca2e1 converted HotSpotResolvedJavaMethod to an interface
Doug Simon <doug.simon@oracle.com>
parents: 18176
diff changeset
143 if (hotspot_method->is_a(HotSpotResolvedJavaMethodImpl::klass())) {
9934
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
144 method = getMethodFromHotSpotMethod(hotspot_method);
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
145 }
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
146 #endif
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
147 switch (_next_call_type) {
14574
6bab029d6e3a removed com/oracle/graal/hotspot/bridge/Marks.java and replaced with enum
twisti
parents: 14561
diff changeset
148 case INLINE_INVOKE:
9934
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
149 break;
14574
6bab029d6e3a removed com/oracle/graal/hotspot/bridge/Marks.java and replaced with enum
twisti
parents: 14561
diff changeset
150 case INVOKEVIRTUAL:
6bab029d6e3a removed com/oracle/graal/hotspot/bridge/Marks.java and replaced with enum
twisti
parents: 14561
diff changeset
151 case INVOKEINTERFACE: {
9934
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
152 assert(method == NULL || !method->is_static(), "cannot call static method with invokeinterface");
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
153
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
154 NativeCall* call = nativeCall_at(_instructions->start() + pc_offset);
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
155 call->set_destination(SharedRuntime::get_resolve_virtual_call_stub());
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
156 _instructions->relocate(call->instruction_address(),
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
157 virtual_call_Relocation::spec(_invoke_mark_pc),
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
158 Assembler::call32_operand);
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
159 break;
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
160 }
14574
6bab029d6e3a removed com/oracle/graal/hotspot/bridge/Marks.java and replaced with enum
twisti
parents: 14561
diff changeset
161 case INVOKESTATIC: {
9934
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
162 assert(method == NULL || method->is_static(), "cannot call non-static method with invokestatic");
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
163
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
164 NativeCall* call = nativeCall_at(_instructions->start() + pc_offset);
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
165 call->set_destination(SharedRuntime::get_resolve_static_call_stub());
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
166 _instructions->relocate(call->instruction_address(),
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
167 relocInfo::static_call_type, Assembler::call32_operand);
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
168 break;
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
169 }
14574
6bab029d6e3a removed com/oracle/graal/hotspot/bridge/Marks.java and replaced with enum
twisti
parents: 14561
diff changeset
170 case INVOKESPECIAL: {
9934
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
171 assert(method == NULL || !method->is_static(), "cannot call static method with invokespecial");
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
172 NativeCall* call = nativeCall_at(_instructions->start() + pc_offset);
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
173 call->set_destination(SharedRuntime::get_resolve_opt_virtual_call_stub());
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
174 _instructions->relocate(call->instruction_address(),
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
175 relocInfo::opt_virtual_call_type, Assembler::call32_operand);
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
176 break;
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
177 }
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
178 default:
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
179 break;
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
180 }
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
181 }
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
182
13485
04a87dc2cfca refactored common code into a separate function
Doug Simon <doug.simon@oracle.com>
parents: 11827
diff changeset
183 static void relocate_poll_near(address pc) {
04a87dc2cfca refactored common code into a separate function
Doug Simon <doug.simon@oracle.com>
parents: 11827
diff changeset
184 NativeInstruction* ni = nativeInstruction_at(pc);
04a87dc2cfca refactored common code into a separate function
Doug Simon <doug.simon@oracle.com>
parents: 11827
diff changeset
185 int32_t* disp = (int32_t*) Assembler::locate_operand(pc, Assembler::disp32_operand);
04a87dc2cfca refactored common code into a separate function
Doug Simon <doug.simon@oracle.com>
parents: 11827
diff changeset
186 int32_t offset = *disp; // The Java code installed the polling page offset into the disp32 operand
04a87dc2cfca refactored common code into a separate function
Doug Simon <doug.simon@oracle.com>
parents: 11827
diff changeset
187 intptr_t new_disp = (intptr_t) (os::get_polling_page() + offset) - (intptr_t) ni;
04a87dc2cfca refactored common code into a separate function
Doug Simon <doug.simon@oracle.com>
parents: 11827
diff changeset
188 *disp = (int32_t)new_disp;
04a87dc2cfca refactored common code into a separate function
Doug Simon <doug.simon@oracle.com>
parents: 11827
diff changeset
189 }
04a87dc2cfca refactored common code into a separate function
Doug Simon <doug.simon@oracle.com>
parents: 11827
diff changeset
190
04a87dc2cfca refactored common code into a separate function
Doug Simon <doug.simon@oracle.com>
parents: 11827
diff changeset
191
15123
7ccd2a1df0fa made SPARC compile again; moved graalCodeInstaller_<arch>.hpp to .cpp files
twisti
parents: 14574
diff changeset
192 void CodeInstaller::pd_relocate_poll(address pc, jint mark) {
11760
ce0b00597980 made safepoint-on-return use specialized HotSpot runtime support for such safepoints (which have no debug info attached)
Doug Simon <doug.simon@oracle.com>
parents: 10810
diff changeset
193 switch (mark) {
14574
6bab029d6e3a removed com/oracle/graal/hotspot/bridge/Marks.java and replaced with enum
twisti
parents: 14561
diff changeset
194 case POLL_NEAR: {
13485
04a87dc2cfca refactored common code into a separate function
Doug Simon <doug.simon@oracle.com>
parents: 11827
diff changeset
195 relocate_poll_near(pc);
13553
d49f00604347 removed poll_Relocation::pollingForm type and associated data field and rely solely on format field of safepoint relocation entries when deciding whether or not to relocate the operand of a safepoint poll instruction
Doug Simon <doug.simon@oracle.com>
parents: 13520
diff changeset
196 _instructions->relocate(pc, relocInfo::poll_type, Assembler::disp32_operand);
13512
8085ce95b6f5 reloc info for safepoint polls includes whether the poison page is far or near
Doug Simon <doug.simon@oracle.com>
parents: 13485
diff changeset
197 break;
11760
ce0b00597980 made safepoint-on-return use specialized HotSpot runtime support for such safepoints (which have no debug info attached)
Doug Simon <doug.simon@oracle.com>
parents: 10810
diff changeset
198 }
14574
6bab029d6e3a removed com/oracle/graal/hotspot/bridge/Marks.java and replaced with enum
twisti
parents: 14561
diff changeset
199 case POLL_FAR:
13561
4fc8c8bb4c32 removed Assembler::no_operand alias
Doug Simon <doug.simon@oracle.com>
parents: 13553
diff changeset
200 // This is a load from a register so there is no relocatable operand.
4fc8c8bb4c32 removed Assembler::no_operand alias
Doug Simon <doug.simon@oracle.com>
parents: 13553
diff changeset
201 // We just have to ensure that the format is not disp32_operand
4fc8c8bb4c32 removed Assembler::no_operand alias
Doug Simon <doug.simon@oracle.com>
parents: 13553
diff changeset
202 // so that poll_Relocation::fix_relocation_after_move does the right
4fc8c8bb4c32 removed Assembler::no_operand alias
Doug Simon <doug.simon@oracle.com>
parents: 13553
diff changeset
203 // thing (i.e. ignores this relocation record)
4fc8c8bb4c32 removed Assembler::no_operand alias
Doug Simon <doug.simon@oracle.com>
parents: 13553
diff changeset
204 _instructions->relocate(pc, relocInfo::poll_type, Assembler::imm_operand);
11760
ce0b00597980 made safepoint-on-return use specialized HotSpot runtime support for such safepoints (which have no debug info attached)
Doug Simon <doug.simon@oracle.com>
parents: 10810
diff changeset
205 break;
14574
6bab029d6e3a removed com/oracle/graal/hotspot/bridge/Marks.java and replaced with enum
twisti
parents: 14561
diff changeset
206 case POLL_RETURN_NEAR: {
13485
04a87dc2cfca refactored common code into a separate function
Doug Simon <doug.simon@oracle.com>
parents: 11827
diff changeset
207 relocate_poll_near(pc);
13553
d49f00604347 removed poll_Relocation::pollingForm type and associated data field and rely solely on format field of safepoint relocation entries when deciding whether or not to relocate the operand of a safepoint poll instruction
Doug Simon <doug.simon@oracle.com>
parents: 13520
diff changeset
208 _instructions->relocate(pc, relocInfo::poll_return_type, Assembler::disp32_operand);
13512
8085ce95b6f5 reloc info for safepoint polls includes whether the poison page is far or near
Doug Simon <doug.simon@oracle.com>
parents: 13485
diff changeset
209 break;
11760
ce0b00597980 made safepoint-on-return use specialized HotSpot runtime support for such safepoints (which have no debug info attached)
Doug Simon <doug.simon@oracle.com>
parents: 10810
diff changeset
210 }
14574
6bab029d6e3a removed com/oracle/graal/hotspot/bridge/Marks.java and replaced with enum
twisti
parents: 14561
diff changeset
211 case POLL_RETURN_FAR:
15123
7ccd2a1df0fa made SPARC compile again; moved graalCodeInstaller_<arch>.hpp to .cpp files
twisti
parents: 14574
diff changeset
212 // see comment above for POLL_FAR
13561
4fc8c8bb4c32 removed Assembler::no_operand alias
Doug Simon <doug.simon@oracle.com>
parents: 13553
diff changeset
213 _instructions->relocate(pc, relocInfo::poll_return_type, Assembler::imm_operand);
11760
ce0b00597980 made safepoint-on-return use specialized HotSpot runtime support for such safepoints (which have no debug info attached)
Doug Simon <doug.simon@oracle.com>
parents: 10810
diff changeset
214 break;
ce0b00597980 made safepoint-on-return use specialized HotSpot runtime support for such safepoints (which have no debug info attached)
Doug Simon <doug.simon@oracle.com>
parents: 10810
diff changeset
215 default:
11799
4c96ccce3772 SPARC: added CodeInstaller::pd_relocate_poll
twisti
parents: 11760
diff changeset
216 fatal("invalid mark value");
11760
ce0b00597980 made safepoint-on-return use specialized HotSpot runtime support for such safepoints (which have no debug info attached)
Doug Simon <doug.simon@oracle.com>
parents: 10810
diff changeset
217 break;
ce0b00597980 made safepoint-on-return use specialized HotSpot runtime support for such safepoints (which have no debug info attached)
Doug Simon <doug.simon@oracle.com>
parents: 10810
diff changeset
218 }
9934
0f7ca53be929 CR-806: Changes to build Graal for SPARC
Morris Meyer <morris.meyer@oracle.com>
parents:
diff changeset
219 }
17024
4e2d34d7715b [SPARC/AMD64] Splitting up oopmap generation for Intel XMM and SPARC Floatingpoint registers
Stefan Anzinger <stefan.anzinger@oracle.com>
parents: 15582
diff changeset
220
4e2d34d7715b [SPARC/AMD64] Splitting up oopmap generation for Intel XMM and SPARC Floatingpoint registers
Stefan Anzinger <stefan.anzinger@oracle.com>
parents: 15582
diff changeset
221 // convert Graal register indices (as used in oop maps) to HotSpot registers
4e2d34d7715b [SPARC/AMD64] Splitting up oopmap generation for Intel XMM and SPARC Floatingpoint registers
Stefan Anzinger <stefan.anzinger@oracle.com>
parents: 15582
diff changeset
222 VMReg CodeInstaller::get_hotspot_reg(jint graal_reg) {
4e2d34d7715b [SPARC/AMD64] Splitting up oopmap generation for Intel XMM and SPARC Floatingpoint registers
Stefan Anzinger <stefan.anzinger@oracle.com>
parents: 15582
diff changeset
223 if (graal_reg < RegisterImpl::number_of_registers) {
4e2d34d7715b [SPARC/AMD64] Splitting up oopmap generation for Intel XMM and SPARC Floatingpoint registers
Stefan Anzinger <stefan.anzinger@oracle.com>
parents: 15582
diff changeset
224 return as_Register(graal_reg)->as_VMReg();
4e2d34d7715b [SPARC/AMD64] Splitting up oopmap generation for Intel XMM and SPARC Floatingpoint registers
Stefan Anzinger <stefan.anzinger@oracle.com>
parents: 15582
diff changeset
225 } else {
4e2d34d7715b [SPARC/AMD64] Splitting up oopmap generation for Intel XMM and SPARC Floatingpoint registers
Stefan Anzinger <stefan.anzinger@oracle.com>
parents: 15582
diff changeset
226 jint floatRegisterNumber = graal_reg - RegisterImpl::number_of_registers;
4e2d34d7715b [SPARC/AMD64] Splitting up oopmap generation for Intel XMM and SPARC Floatingpoint registers
Stefan Anzinger <stefan.anzinger@oracle.com>
parents: 15582
diff changeset
227 if (floatRegisterNumber < XMMRegisterImpl::number_of_registers) {
4e2d34d7715b [SPARC/AMD64] Splitting up oopmap generation for Intel XMM and SPARC Floatingpoint registers
Stefan Anzinger <stefan.anzinger@oracle.com>
parents: 15582
diff changeset
228 return as_XMMRegister(floatRegisterNumber)->as_VMReg();
4e2d34d7715b [SPARC/AMD64] Splitting up oopmap generation for Intel XMM and SPARC Floatingpoint registers
Stefan Anzinger <stefan.anzinger@oracle.com>
parents: 15582
diff changeset
229 }
4e2d34d7715b [SPARC/AMD64] Splitting up oopmap generation for Intel XMM and SPARC Floatingpoint registers
Stefan Anzinger <stefan.anzinger@oracle.com>
parents: 15582
diff changeset
230 ShouldNotReachHere();
4e2d34d7715b [SPARC/AMD64] Splitting up oopmap generation for Intel XMM and SPARC Floatingpoint registers
Stefan Anzinger <stefan.anzinger@oracle.com>
parents: 15582
diff changeset
231 return NULL;
4e2d34d7715b [SPARC/AMD64] Splitting up oopmap generation for Intel XMM and SPARC Floatingpoint registers
Stefan Anzinger <stefan.anzinger@oracle.com>
parents: 15582
diff changeset
232 }
4e2d34d7715b [SPARC/AMD64] Splitting up oopmap generation for Intel XMM and SPARC Floatingpoint registers
Stefan Anzinger <stefan.anzinger@oracle.com>
parents: 15582
diff changeset
233 }
4e2d34d7715b [SPARC/AMD64] Splitting up oopmap generation for Intel XMM and SPARC Floatingpoint registers
Stefan Anzinger <stefan.anzinger@oracle.com>
parents: 15582
diff changeset
234
4e2d34d7715b [SPARC/AMD64] Splitting up oopmap generation for Intel XMM and SPARC Floatingpoint registers
Stefan Anzinger <stefan.anzinger@oracle.com>
parents: 15582
diff changeset
235 bool CodeInstaller::is_general_purpose_reg(VMReg hotspotRegister) {
4e2d34d7715b [SPARC/AMD64] Splitting up oopmap generation for Intel XMM and SPARC Floatingpoint registers
Stefan Anzinger <stefan.anzinger@oracle.com>
parents: 15582
diff changeset
236 return !(hotspotRegister->is_FloatRegister() || hotspotRegister->is_XMMRegister());
4e2d34d7715b [SPARC/AMD64] Splitting up oopmap generation for Intel XMM and SPARC Floatingpoint registers
Stefan Anzinger <stefan.anzinger@oracle.com>
parents: 15582
diff changeset
237 }