Mercurial > hg > graal-jvmci-8

annotate graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java @ 16943:f8e60d11c0ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Stefan Anzinger <stefan.anzinger@oracle.com>
date Mon, 25 Aug 2014 21:15:59 -0700
parents f011bf910f34 dd8449afc086
children c2437c80c253
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7740
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
1 /*
9814
e723f9031785 re-architected SPARC assembler to be Fmt class specific, initial arithmetic
Morris Meyer <morris.meyer@oracle.com>
parents: 9621
diff changeset
2 * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
7740
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
4 *
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
5 * This code is free software; you can redistribute it and/or modify it
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
6 * under the terms of the GNU General Public License version 2 only, as
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
7 * published by the Free Software Foundation.
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
8 *
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
9 * This code is distributed in the hope that it will be useful, but WITHOUT
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
12 * version 2 for more details (a copy is included in the LICENSE file that
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
13 * accompanied this code).
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
14 *
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
15 * You should have received a copy of the GNU General Public License version
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
16 * 2 along with this work; if not, write to the Free Software Foundation,
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
18 *
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
20 * or visit www.oracle.com if you need additional information or have any
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
21 * questions.
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
22 */
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
23 package com.oracle.graal.hotspot.sparc;
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
24
14799
01afd501f127 Updated getStartBlock() in AbstractControlFlowGraph.
Josef Eisl <josef.eisl@jku.at>
parents: 14796
diff changeset
25 import static com.oracle.graal.api.code.CallingConvention.Type.*;
01afd501f127 Updated getStartBlock() in AbstractControlFlowGraph.
Josef Eisl <josef.eisl@jku.at>
parents: 14796
diff changeset
26 import static com.oracle.graal.api.code.ValueUtil.*;
15259
d90e5c22ba55 Move GraalOptions to graal.compiler.common.
Josef Eisl <josef.eisl@jku.at>
parents: 15193
diff changeset
27 import static com.oracle.graal.compiler.common.GraalOptions.*;
14799
01afd501f127 Updated getStartBlock() in AbstractControlFlowGraph.
Josef Eisl <josef.eisl@jku.at>
parents: 14796
diff changeset
28 import static com.oracle.graal.sparc.SPARC.*;
16929
5dc533f7565a [SPARC] Adding registers f0...f31 to callee saved; fixing allocator test, removing direct acquisition of Unsafe from SPARCHotspotBackend
Stefan Anzinger <stefan.anzinger@gmail.com>
parents: 16655
diff changeset
29 import static com.oracle.graal.compiler.common.UnsafeAccess.*;
15838
15771ff797b4 Pass the compiled method to LIR factory
Christian Wimmer <christian.wimmer@oracle.com>
parents: 15456
diff changeset
30
10854
e1fcdda22831 SPARC: can compile some stubs now but they don't work yet
twisti
parents: 10792
diff changeset
31 import java.util.*;
e1fcdda22831 SPARC: can compile some stubs now but they don't work yet
twisti
parents: 10792
diff changeset
32
7740
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
33 import com.oracle.graal.api.code.*;
9621
e97dc9bbfedc introduced installedCodeOwner parameter of type ResolvedJavaMethod to GraalCompiler.compileGraph to properly distinguish the source method of a graph from the method under which the code compiled for the graph will be installed
Doug Simon <doug.simon@oracle.com>
parents: 9615
diff changeset
34 import com.oracle.graal.api.meta.*;
10459
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
35 import com.oracle.graal.asm.*;
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
36 import com.oracle.graal.asm.sparc.*;
14799
01afd501f127 Updated getStartBlock() in AbstractControlFlowGraph.
Josef Eisl <josef.eisl@jku.at>
parents: 14796
diff changeset
37 import com.oracle.graal.asm.sparc.SPARCAssembler.Bpne;
01afd501f127 Updated getStartBlock() in AbstractControlFlowGraph.
Josef Eisl <josef.eisl@jku.at>
parents: 14796
diff changeset
38 import com.oracle.graal.asm.sparc.SPARCAssembler.CC;
01afd501f127 Updated getStartBlock() in AbstractControlFlowGraph.
Josef Eisl <josef.eisl@jku.at>
parents: 14796
diff changeset
39 import com.oracle.graal.asm.sparc.SPARCAssembler.Ldx;
01afd501f127 Updated getStartBlock() in AbstractControlFlowGraph.
Josef Eisl <josef.eisl@jku.at>
parents: 14796
diff changeset
40 import com.oracle.graal.asm.sparc.SPARCAssembler.Save;
01afd501f127 Updated getStartBlock() in AbstractControlFlowGraph.
Josef Eisl <josef.eisl@jku.at>
parents: 14796
diff changeset
41 import com.oracle.graal.asm.sparc.SPARCAssembler.Stx;
01afd501f127 Updated getStartBlock() in AbstractControlFlowGraph.
Josef Eisl <josef.eisl@jku.at>
parents: 14796
diff changeset
42 import com.oracle.graal.asm.sparc.SPARCMacroAssembler.Cmp;
01afd501f127 Updated getStartBlock() in AbstractControlFlowGraph.
Josef Eisl <josef.eisl@jku.at>
parents: 14796
diff changeset
43 import com.oracle.graal.asm.sparc.SPARCMacroAssembler.Nop;
01afd501f127 Updated getStartBlock() in AbstractControlFlowGraph.
Josef Eisl <josef.eisl@jku.at>
parents: 14796
diff changeset
44 import com.oracle.graal.asm.sparc.SPARCMacroAssembler.RestoreWindow;
01afd501f127 Updated getStartBlock() in AbstractControlFlowGraph.
Josef Eisl <josef.eisl@jku.at>
parents: 14796
diff changeset
45 import com.oracle.graal.asm.sparc.SPARCMacroAssembler.Setx;
7740
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
46 import com.oracle.graal.hotspot.*;
14991
64dcb92ee75a Truffle: Change signature for Truffle calls from (PackedFrame, Arguments) to (Object[]).
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 14921
diff changeset
47 import com.oracle.graal.hotspot.meta.HotSpotCodeCacheProvider.MarkId;
7740
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
48 import com.oracle.graal.hotspot.meta.*;
14799
01afd501f127 Updated getStartBlock() in AbstractControlFlowGraph.
Josef Eisl <josef.eisl@jku.at>
parents: 14796
diff changeset
49 import com.oracle.graal.hotspot.stubs.*;
7740
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
50 import com.oracle.graal.lir.*;
14799
01afd501f127 Updated getStartBlock() in AbstractControlFlowGraph.
Josef Eisl <josef.eisl@jku.at>
parents: 14796
diff changeset
51 import com.oracle.graal.lir.StandardOp.SaveRegistersOp;
7740
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
52 import com.oracle.graal.lir.asm.*;
15292
a38d791982e1 Move LIRGenerationResult* to graal.lir.
Josef Eisl <josef.eisl@jku.at>
parents: 15259
diff changeset
53 import com.oracle.graal.lir.gen.*;
10854
e1fcdda22831 SPARC: can compile some stubs now but they don't work yet
twisti
parents: 10792
diff changeset
54 import com.oracle.graal.lir.sparc.*;
7740
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
55 import com.oracle.graal.nodes.*;
15337
c4be3c1b2d6d Use NodeLIRBuilderTool instead of NodeLIRBuilder.
Josef Eisl <josef.eisl@jku.at>
parents: 15333
diff changeset
56 import com.oracle.graal.nodes.spi.*;
10459
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
57
7740
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
58 /**
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
59 * HotSpot SPARC specific backend.
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
60 */
12580
7876c59a7a2f refactored all deferred initialization of backends into HotSpotBackend
Doug Simon <doug.simon@oracle.com>
parents: 12431
diff changeset
61 public class SPARCHotSpotBackend extends HotSpotHostBackend {
7740
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
62
12431
7080a96be216 rename: graalRuntime -> runtime, getGraalRuntime -> getRuntime
Doug Simon <doug.simon@oracle.com>
parents: 12429
diff changeset
63 public SPARCHotSpotBackend(HotSpotGraalRuntime runtime, HotSpotProviders providers) {
7080a96be216 rename: graalRuntime -> runtime, getGraalRuntime -> getRuntime
Doug Simon <doug.simon@oracle.com>
parents: 12429
diff changeset
64 super(runtime, providers);
7740
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
65 }
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
66
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
67 @Override
11775
b04b94b71649 Finished PTX assembler and Register -> Variable conversion
Morris Meyer <morris.meyer@oracle.com>
parents: 10956
diff changeset
68 public boolean shouldAllocateRegisters() {
b04b94b71649 Finished PTX assembler and Register -> Variable conversion
Morris Meyer <morris.meyer@oracle.com>
parents: 10956
diff changeset
69 return true;
b04b94b71649 Finished PTX assembler and Register -> Variable conversion
Morris Meyer <morris.meyer@oracle.com>
parents: 10956
diff changeset
70 }
b04b94b71649 Finished PTX assembler and Register -> Variable conversion
Morris Meyer <morris.meyer@oracle.com>
parents: 10956
diff changeset
71
b04b94b71649 Finished PTX assembler and Register -> Variable conversion
Morris Meyer <morris.meyer@oracle.com>
parents: 10956
diff changeset
72 @Override
15011
c8e575742f36 allow compilation with custom RegisterConfig
Lukas Stadler <lukas.stadler@oracle.com>
parents: 14991
diff changeset
73 public FrameMap newFrameMap(RegisterConfig registerConfig) {
c8e575742f36 allow compilation with custom RegisterConfig
Lukas Stadler <lukas.stadler@oracle.com>
parents: 14991
diff changeset
74 return new SPARCFrameMap(getProviders().getCodeCache(), registerConfig);
10956
563c6d1994c0 added architecture specific frame maps
twisti
parents: 10854
diff changeset
75 }
563c6d1994c0 added architecture specific frame maps
twisti
parents: 10854
diff changeset
76
563c6d1994c0 added architecture specific frame maps
twisti
parents: 10854
diff changeset
77 @Override
15333
06ecedffb109 Use LIRGeneratorTool in Backend.
Josef Eisl <josef.eisl@jku.at>
parents: 15311
diff changeset
78 public LIRGeneratorTool newLIRGenerator(CallingConvention cc, LIRGenerationResult lirGenRes) {
14847
c132602c640e Apply LIRGenerator refactoring to SPARC backend.
Josef Eisl <josef.eisl@jku.at>
parents: 14826
diff changeset
79 return new SPARCHotSpotLIRGenerator(getProviders(), getRuntime().getConfig(), cc, lirGenRes);
c132602c640e Apply LIRGenerator refactoring to SPARC backend.
Josef Eisl <josef.eisl@jku.at>
parents: 14826
diff changeset
80 }
c132602c640e Apply LIRGenerator refactoring to SPARC backend.
Josef Eisl <josef.eisl@jku.at>
parents: 14826
diff changeset
81
c132602c640e Apply LIRGenerator refactoring to SPARC backend.
Josef Eisl <josef.eisl@jku.at>
parents: 14826
diff changeset
82 @Override
15838
15771ff797b4 Pass the compiled method to LIR factory
Christian Wimmer <christian.wimmer@oracle.com>
parents: 15456
diff changeset
83 public LIRGenerationResult newLIRGenerationResult(LIR lir, FrameMap frameMap, ResolvedJavaMethod method, Object stub) {
15345
109d6c7c40b5 implement SPARC uncommon trap stub
twisti
parents: 15338
diff changeset
84 return new SPARCHotSpotLIRGenerationResult(lir, frameMap, stub);
109d6c7c40b5 implement SPARC uncommon trap stub
twisti
parents: 15338
diff changeset
85 }
109d6c7c40b5 implement SPARC uncommon trap stub
twisti
parents: 15338
diff changeset
86
109d6c7c40b5 implement SPARC uncommon trap stub
twisti
parents: 15338
diff changeset
87 @Override
15338
5e544920ad9f Rename Backend.newNodeLIRGenerator to Backend.newNodeLIRBuilder.
Josef Eisl <josef.eisl@jku.at>
parents: 15337
diff changeset
88 public NodeLIRBuilderTool newNodeLIRBuilder(StructuredGraph graph, LIRGeneratorTool lirGen) {
14921
88dfaf6448e0 Remove LIRGenerationResult from NodeLIRBuilder.
Josef Eisl <josef.eisl@jku.at>
parents: 14888
diff changeset
89 return new SPARCHotSpotNodeLIRBuilder(graph, lirGen);
7740
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
90 }
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
91
10459
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
92 /**
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
93 * Emits code to do stack overflow checking.
14921
88dfaf6448e0 Remove LIRGenerationResult from NodeLIRBuilder.
Josef Eisl <josef.eisl@jku.at>
parents: 14888
diff changeset
94 *
10459
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
95 * @param afterFrameInit specifies if the stack pointer has already been adjusted to allocate
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
96 * the current frame
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
97 */
13310
733cccc125ed added subqWide to AMD64Assembler
Doug Simon <doug.simon@oracle.com>
parents: 13252
diff changeset
98 protected static void emitStackOverflowCheck(CompilationResultBuilder crb, int pagesToBang, boolean afterFrameInit) {
733cccc125ed added subqWide to AMD64Assembler
Doug Simon <doug.simon@oracle.com>
parents: 13252
diff changeset
99 if (pagesToBang > 0) {
13227
1a66453f73db renamed TargetMethodAssembler to CompilationResultBuilder
Doug Simon <doug.simon@oracle.com>
parents: 12610
diff changeset
100 SPARCMacroAssembler masm = (SPARCMacroAssembler) crb.asm;
1a66453f73db renamed TargetMethodAssembler to CompilationResultBuilder
Doug Simon <doug.simon@oracle.com>
parents: 12610
diff changeset
101 final int frameSize = crb.frameMap.totalFrameSize();
10459
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
102 if (frameSize > 0) {
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
103 int lastFramePage = frameSize / unsafe.pageSize();
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
104 // emit multiple stack bangs for methods with frames larger than a page
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
105 for (int i = 0; i <= lastFramePage; i++) {
13310
733cccc125ed added subqWide to AMD64Assembler
Doug Simon <doug.simon@oracle.com>
parents: 13252
diff changeset
106 int disp = (i + pagesToBang) * unsafe.pageSize();
10694
31266ceb86ef SPARC: Can compile and run two or three methods of a bootstrap.
twisti
parents: 10686
diff changeset
107 if (afterFrameInit) {
31266ceb86ef SPARC: Can compile and run two or three methods of a bootstrap.
twisti
parents: 10686
diff changeset
108 disp -= frameSize;
31266ceb86ef SPARC: Can compile and run two or three methods of a bootstrap.
twisti
parents: 10686
diff changeset
109 }
13227
1a66453f73db renamed TargetMethodAssembler to CompilationResultBuilder
Doug Simon <doug.simon@oracle.com>
parents: 12610
diff changeset
110 crb.blockComment("[stack overflow check]");
10694
31266ceb86ef SPARC: Can compile and run two or three methods of a bootstrap.
twisti
parents: 10686
diff changeset
111 // Use SPARCAddress to get the final displacement including the stack bias.
31266ceb86ef SPARC: Can compile and run two or three methods of a bootstrap.
twisti
parents: 10686
diff changeset
112 SPARCAddress address = new SPARCAddress(sp, -disp);
31266ceb86ef SPARC: Can compile and run two or three methods of a bootstrap.
twisti
parents: 10686
diff changeset
113 if (SPARCAssembler.isSimm13(address.getDisplacement())) {
31266ceb86ef SPARC: Can compile and run two or three methods of a bootstrap.
twisti
parents: 10686
diff changeset
114 new Stx(g0, address).emit(masm);
31266ceb86ef SPARC: Can compile and run two or three methods of a bootstrap.
twisti
parents: 10686
diff changeset
115 } else {
10792
7a8d6ba83a04 SPARC: fixes and more stuff works
twisti
parents: 10694
diff changeset
116 new Setx(address.getDisplacement(), g3).emit(masm);
7a8d6ba83a04 SPARC: fixes and more stuff works
twisti
parents: 10694
diff changeset
117 new Stx(g0, new SPARCAddress(sp, g3)).emit(masm);
10694
31266ceb86ef SPARC: Can compile and run two or three methods of a bootstrap.
twisti
parents: 10686
diff changeset
118 }
10459
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
119 }
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
120 }
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
121 }
9814
e723f9031785 re-architected SPARC assembler to be Fmt class specific, initial arithmetic
Morris Meyer <morris.meyer@oracle.com>
parents: 9621
diff changeset
122 }
e723f9031785 re-architected SPARC assembler to be Fmt class specific, initial arithmetic
Morris Meyer <morris.meyer@oracle.com>
parents: 9621
diff changeset
123
10854
e1fcdda22831 SPARC: can compile some stubs now but they don't work yet
twisti
parents: 10792
diff changeset
124 public class HotSpotFrameContext implements FrameContext {
9814
e723f9031785 re-architected SPARC assembler to be Fmt class specific, initial arithmetic
Morris Meyer <morris.meyer@oracle.com>
parents: 9621
diff changeset
125
e723f9031785 re-architected SPARC assembler to be Fmt class specific, initial arithmetic
Morris Meyer <morris.meyer@oracle.com>
parents: 9621
diff changeset
126 final boolean isStub;
e723f9031785 re-architected SPARC assembler to be Fmt class specific, initial arithmetic
Morris Meyer <morris.meyer@oracle.com>
parents: 9621
diff changeset
127
e723f9031785 re-architected SPARC assembler to be Fmt class specific, initial arithmetic
Morris Meyer <morris.meyer@oracle.com>
parents: 9621
diff changeset
128 HotSpotFrameContext(boolean isStub) {
e723f9031785 re-architected SPARC assembler to be Fmt class specific, initial arithmetic
Morris Meyer <morris.meyer@oracle.com>
parents: 9621
diff changeset
129 this.isStub = isStub;
e723f9031785 re-architected SPARC assembler to be Fmt class specific, initial arithmetic
Morris Meyer <morris.meyer@oracle.com>
parents: 9621
diff changeset
130 }
e723f9031785 re-architected SPARC assembler to be Fmt class specific, initial arithmetic
Morris Meyer <morris.meyer@oracle.com>
parents: 9621
diff changeset
131
13234
7e237378923d made the frameContext of a CompilationResultBuilder always non-null and added FrameContext.hasFrame() to determine if a frame is actually generated
Doug Simon <doug.simon@oracle.com>
parents: 13229
diff changeset
132 public boolean hasFrame() {
7e237378923d made the frameContext of a CompilationResultBuilder always non-null and added FrameContext.hasFrame() to determine if a frame is actually generated
Doug Simon <doug.simon@oracle.com>
parents: 13229
diff changeset
133 return true;
7e237378923d made the frameContext of a CompilationResultBuilder always non-null and added FrameContext.hasFrame() to determine if a frame is actually generated
Doug Simon <doug.simon@oracle.com>
parents: 13229
diff changeset
134 }
7e237378923d made the frameContext of a CompilationResultBuilder always non-null and added FrameContext.hasFrame() to determine if a frame is actually generated
Doug Simon <doug.simon@oracle.com>
parents: 13229
diff changeset
135
9814
e723f9031785 re-architected SPARC assembler to be Fmt class specific, initial arithmetic
Morris Meyer <morris.meyer@oracle.com>
parents: 9621
diff changeset
136 @Override
13227
1a66453f73db renamed TargetMethodAssembler to CompilationResultBuilder
Doug Simon <doug.simon@oracle.com>
parents: 12610
diff changeset
137 public void enter(CompilationResultBuilder crb) {
1a66453f73db renamed TargetMethodAssembler to CompilationResultBuilder
Doug Simon <doug.simon@oracle.com>
parents: 12610
diff changeset
138 final int frameSize = crb.frameMap.totalFrameSize();
16933
f011bf910f34 [SPARC] Fix sign extension, add debug messages to assertions in Assembler, add FSMULD , Entering frame is now possible with > 2k framesize
Stefan Anzinger <stefan.anzinger@gmail.com>
parents: 16929
diff changeset
139 final int stackpoinerChange = -frameSize;
13227
1a66453f73db renamed TargetMethodAssembler to CompilationResultBuilder
Doug Simon <doug.simon@oracle.com>
parents: 12610
diff changeset
140 SPARCMacroAssembler masm = (SPARCMacroAssembler) crb.asm;
13310
733cccc125ed added subqWide to AMD64Assembler
Doug Simon <doug.simon@oracle.com>
parents: 13252
diff changeset
141 if (!isStub && pagesToBang > 0) {
733cccc125ed added subqWide to AMD64Assembler
Doug Simon <doug.simon@oracle.com>
parents: 13252
diff changeset
142 emitStackOverflowCheck(crb, pagesToBang, false);
10459
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
143 }
16933
f011bf910f34 [SPARC] Fix sign extension, add debug messages to assertions in Assembler, add FSMULD , Entering frame is now possible with > 2k framesize
Stefan Anzinger <stefan.anzinger@gmail.com>
parents: 16929
diff changeset
144
f011bf910f34 [SPARC] Fix sign extension, add debug messages to assertions in Assembler, add FSMULD , Entering frame is now possible with > 2k framesize
Stefan Anzinger <stefan.anzinger@gmail.com>
parents: 16929
diff changeset
145 if (SPARCAssembler.isSimm13(stackpoinerChange)) {
f011bf910f34 [SPARC] Fix sign extension, add debug messages to assertions in Assembler, add FSMULD , Entering frame is now possible with > 2k framesize
Stefan Anzinger <stefan.anzinger@gmail.com>
parents: 16929
diff changeset
146 new Save(sp, stackpoinerChange, sp).emit(masm);
f011bf910f34 [SPARC] Fix sign extension, add debug messages to assertions in Assembler, add FSMULD , Entering frame is now possible with > 2k framesize
Stefan Anzinger <stefan.anzinger@gmail.com>
parents: 16929
diff changeset
147 } else {
f011bf910f34 [SPARC] Fix sign extension, add debug messages to assertions in Assembler, add FSMULD , Entering frame is now possible with > 2k framesize
Stefan Anzinger <stefan.anzinger@gmail.com>
parents: 16929
diff changeset
148 new Setx(stackpoinerChange, g3).emit(masm);
f011bf910f34 [SPARC] Fix sign extension, add debug messages to assertions in Assembler, add FSMULD , Entering frame is now possible with > 2k framesize
Stefan Anzinger <stefan.anzinger@gmail.com>
parents: 16929
diff changeset
149 new Save(sp, g3, sp).emit(masm);
f011bf910f34 [SPARC] Fix sign extension, add debug messages to assertions in Assembler, add FSMULD , Entering frame is now possible with > 2k framesize
Stefan Anzinger <stefan.anzinger@gmail.com>
parents: 16929
diff changeset
150 }
10459
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
151
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
152 if (ZapStackOnMethodEntry.getValue()) {
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
153 final int slotSize = 8;
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
154 for (int i = 0; i < frameSize / slotSize; ++i) {
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
155 // 0xC1C1C1C1
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
156 new Stx(g0, new SPARCAddress(sp, i * slotSize)).emit(masm);
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
157 }
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
158 }
9814
e723f9031785 re-architected SPARC assembler to be Fmt class specific, initial arithmetic
Morris Meyer <morris.meyer@oracle.com>
parents: 9621
diff changeset
159 }
e723f9031785 re-architected SPARC assembler to be Fmt class specific, initial arithmetic
Morris Meyer <morris.meyer@oracle.com>
parents: 9621
diff changeset
160
e723f9031785 re-architected SPARC assembler to be Fmt class specific, initial arithmetic
Morris Meyer <morris.meyer@oracle.com>
parents: 9621
diff changeset
161 @Override
13227
1a66453f73db renamed TargetMethodAssembler to CompilationResultBuilder
Doug Simon <doug.simon@oracle.com>
parents: 12610
diff changeset
162 public void leave(CompilationResultBuilder crb) {
1a66453f73db renamed TargetMethodAssembler to CompilationResultBuilder
Doug Simon <doug.simon@oracle.com>
parents: 12610
diff changeset
163 SPARCMacroAssembler masm = (SPARCMacroAssembler) crb.asm;
10459
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
164 new RestoreWindow().emit(masm);
9814
e723f9031785 re-architected SPARC assembler to be Fmt class specific, initial arithmetic
Morris Meyer <morris.meyer@oracle.com>
parents: 9621
diff changeset
165 }
9432
6680389bd36f Make assembler creation in backend more extensible.
Roland Schatz <roland.schatz@oracle.com>
parents: 8281
diff changeset
166 }
6680389bd36f Make assembler creation in backend more extensible.
Roland Schatz <roland.schatz@oracle.com>
parents: 8281
diff changeset
167
6680389bd36f Make assembler creation in backend more extensible.
Roland Schatz <roland.schatz@oracle.com>
parents: 8281
diff changeset
168 @Override
14032
d1c1f103d42c renamed com.oracle.graal.asm.AbstractAssembler to com.oracle.graal.asm.Assembler
twisti
parents: 13839
diff changeset
169 protected Assembler createAssembler(FrameMap frameMap) {
12429
5124eeec1a7b split HotSpotRuntime into separate provider implementations
Doug Simon <doug.simon@oracle.com>
parents: 12363
diff changeset
170 return new SPARCMacroAssembler(getTarget(), frameMap.registerConfig);
10459
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
171 }
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
172
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
173 @Override
14809
73774616a6b3 Decoupled LIRGenerator and LIRGenerationResult.
Josef Eisl <josef.eisl@jku.at>
parents: 14807
diff changeset
174 public CompilationResultBuilder newCompilationResultBuilder(LIRGenerationResult lirGenRes, CompilationResult compilationResult, CompilationResultBuilderFactory factory) {
73774616a6b3 Decoupled LIRGenerator and LIRGenerationResult.
Josef Eisl <josef.eisl@jku.at>
parents: 14807
diff changeset
175 SPARCHotSpotLIRGenerationResult gen = (SPARCHotSpotLIRGenerationResult) lirGenRes;
14796
f5b3292b4ded Restrict access to members of LIRGenerator.
Josef Eisl <josef.eisl@jku.at>
parents: 14142
diff changeset
176 FrameMap frameMap = gen.getFrameMap();
16645
8c70d65ec04a [SPARC] Fix issues when deoptimizing with floats in local scope.
Stefan Anzinger <stefan.anzinger@gmail.com>
parents: 16633
diff changeset
177 LIR lir = gen.getLIR();
16655
6514c67b7efa [SPARC] Fixed assertion for stackslot avalibility when deopt is possible
Stefan Anzinger <stefan.anzinger@gmail.com>
parents: 16645
diff changeset
178 assert gen.getDeoptimizationRescueSlot() == null || frameMap.frameNeedsAllocating() : "method that can deoptimize must have a frame";
9814
e723f9031785 re-architected SPARC assembler to be Fmt class specific, initial arithmetic
Morris Meyer <morris.meyer@oracle.com>
parents: 9621
diff changeset
179
e723f9031785 re-architected SPARC assembler to be Fmt class specific, initial arithmetic
Morris Meyer <morris.meyer@oracle.com>
parents: 9621
diff changeset
180 Stub stub = gen.getStub();
14032
d1c1f103d42c renamed com.oracle.graal.asm.AbstractAssembler to com.oracle.graal.asm.Assembler
twisti
parents: 13839
diff changeset
181 Assembler masm = createAssembler(frameMap);
10459
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
182 // On SPARC we always use stack frames.
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
183 HotSpotFrameContext frameContext = new HotSpotFrameContext(stub != null);
13229
325b4e4efb60 added CompilationResultBuilderFactory to support peep-hole instrumentation of methods as their code is emitted
Doug Simon <doug.simon@oracle.com>
parents: 13227
diff changeset
184 CompilationResultBuilder crb = factory.createBuilder(getProviders().getCodeCache(), getProviders().getForeignCalls(), frameMap, masm, frameContext, compilationResult);
15180
7a9531f50cd8 renamed com.oracle.graal.api.code.CompilationResult.frameSize to totalFrameSize
twisti
parents: 15011
diff changeset
185 crb.setTotalFrameSize(frameMap.totalFrameSize());
14807
c3242028cc44 Introduce specialized LIRGenerationResults for Targets if needed.
Josef Eisl <josef.eisl@jku.at>
parents: 14804
diff changeset
186 StackSlot deoptimizationRescueSlot = gen.getDeoptimizationRescueSlot();
9814
e723f9031785 re-architected SPARC assembler to be Fmt class specific, initial arithmetic
Morris Meyer <morris.meyer@oracle.com>
parents: 9621
diff changeset
187 if (deoptimizationRescueSlot != null && stub == null) {
13227
1a66453f73db renamed TargetMethodAssembler to CompilationResultBuilder
Doug Simon <doug.simon@oracle.com>
parents: 12610
diff changeset
188 crb.compilationResult.setCustomStackAreaOffset(frameMap.offsetForStackSlot(deoptimizationRescueSlot));
9814
e723f9031785 re-architected SPARC assembler to be Fmt class specific, initial arithmetic
Morris Meyer <morris.meyer@oracle.com>
parents: 9621
diff changeset
189 }
e723f9031785 re-architected SPARC assembler to be Fmt class specific, initial arithmetic
Morris Meyer <morris.meyer@oracle.com>
parents: 9621
diff changeset
190
10854
e1fcdda22831 SPARC: can compile some stubs now but they don't work yet
twisti
parents: 10792
diff changeset
191 if (stub != null) {
16645
8c70d65ec04a [SPARC] Fix issues when deoptimizing with floats in local scope.
Stefan Anzinger <stefan.anzinger@gmail.com>
parents: 16633
diff changeset
192 // Even on sparc we need to save floating point registers
8c70d65ec04a [SPARC] Fix issues when deoptimizing with floats in local scope.
Stefan Anzinger <stefan.anzinger@gmail.com>
parents: 16633
diff changeset
193 Set<Register> definedRegisters = gatherDefinedRegisters(lir);
8c70d65ec04a [SPARC] Fix issues when deoptimizing with floats in local scope.
Stefan Anzinger <stefan.anzinger@gmail.com>
parents: 16633
diff changeset
194 Map<LIRFrameState, SaveRegistersOp> calleeSaveInfo = gen.getCalleeSaveInfo();
8c70d65ec04a [SPARC] Fix issues when deoptimizing with floats in local scope.
Stefan Anzinger <stefan.anzinger@gmail.com>
parents: 16633
diff changeset
195 updateStub(stub, definedRegisters, calleeSaveInfo, frameMap);
10854
e1fcdda22831 SPARC: can compile some stubs now but they don't work yet
twisti
parents: 10792
diff changeset
196 }
e1fcdda22831 SPARC: can compile some stubs now but they don't work yet
twisti
parents: 10792
diff changeset
197
13227
1a66453f73db renamed TargetMethodAssembler to CompilationResultBuilder
Doug Simon <doug.simon@oracle.com>
parents: 12610
diff changeset
198 return crb;
7740
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
199 }
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
200
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
201 @Override
14065
5dec26f3d4a4 Use LIR instead of LIRGenerator as parameter in emitCode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 14032
diff changeset
202 public void emitCode(CompilationResultBuilder crb, LIR lir, ResolvedJavaMethod installedCodeOwner) {
13227
1a66453f73db renamed TargetMethodAssembler to CompilationResultBuilder
Doug Simon <doug.simon@oracle.com>
parents: 12610
diff changeset
203 SPARCMacroAssembler masm = (SPARCMacroAssembler) crb.asm;
1a66453f73db renamed TargetMethodAssembler to CompilationResultBuilder
Doug Simon <doug.simon@oracle.com>
parents: 12610
diff changeset
204 FrameMap frameMap = crb.frameMap;
10459
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
205 RegisterConfig regConfig = frameMap.registerConfig;
12431
7080a96be216 rename: graalRuntime -> runtime, getGraalRuntime -> getRuntime
Doug Simon <doug.simon@oracle.com>
parents: 12429
diff changeset
206 HotSpotVMConfig config = getRuntime().getConfig();
15311
820c6d353358 added ModifiersProvider as superinterface for ResolvedJava[Method|Field|Type] and implemented all checks against modifiers as default methods
Doug Simon <doug.simon@oracle.com>
parents: 15292
diff changeset
207 Label unverifiedStub = installedCodeOwner == null || installedCodeOwner.isStatic() ? null : new Label();
10459
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
208
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
209 // Emit the prefix
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
210
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
211 if (unverifiedStub != null) {
14574
6bab029d6e3a removed com/oracle/graal/hotspot/bridge/Marks.java and replaced with enum
twisti
parents: 14142
diff changeset
212 MarkId.recordMark(crb, MarkId.UNVERIFIED_ENTRY);
10854
e1fcdda22831 SPARC: can compile some stubs now but they don't work yet
twisti
parents: 10792
diff changeset
213 // We need to use JavaCall here because we haven't entered the frame yet.
12429
5124eeec1a7b split HotSpotRuntime into separate provider implementations
Doug Simon <doug.simon@oracle.com>
parents: 12363
diff changeset
214 CallingConvention cc = regConfig.getCallingConvention(JavaCall, null, new JavaType[]{getProviders().getMetaAccess().lookupJavaType(Object.class)}, getTarget(), false);
10459
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
215 Register inlineCacheKlass = g5; // see MacroAssembler::ic_call
10854
e1fcdda22831 SPARC: can compile some stubs now but they don't work yet
twisti
parents: 10792
diff changeset
216 Register scratch = g3;
10459
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
217 Register receiver = asRegister(cc.getArgument(0));
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
218 SPARCAddress src = new SPARCAddress(receiver, config.hubOffset);
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
219
10854
e1fcdda22831 SPARC: can compile some stubs now but they don't work yet
twisti
parents: 10792
diff changeset
220 new Ldx(src, scratch).emit(masm);
e1fcdda22831 SPARC: can compile some stubs now but they don't work yet
twisti
parents: 10792
diff changeset
221 new Cmp(scratch, inlineCacheKlass).emit(masm);
10470
53ba9df05fa2 fixed remaining SPARC warnings using ecj
twisti
parents: 10465
diff changeset
222 new Bpne(CC.Xcc, unverifiedStub).emit(masm);
53ba9df05fa2 fixed remaining SPARC warnings using ecj
twisti
parents: 10465
diff changeset
223 new Nop().emit(masm); // delay slot
10459
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
224 }
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
225
10470
53ba9df05fa2 fixed remaining SPARC warnings using ecj
twisti
parents: 10465
diff changeset
226 masm.align(config.codeEntryAlignment);
14574
6bab029d6e3a removed com/oracle/graal/hotspot/bridge/Marks.java and replaced with enum
twisti
parents: 14142
diff changeset
227 MarkId.recordMark(crb, MarkId.OSR_ENTRY);
6bab029d6e3a removed com/oracle/graal/hotspot/bridge/Marks.java and replaced with enum
twisti
parents: 14142
diff changeset
228 MarkId.recordMark(crb, MarkId.VERIFIED_ENTRY);
10459
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
229
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
230 // Emit code for the LIR
14065
5dec26f3d4a4 Use LIR instead of LIRGenerator as parameter in emitCode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 14032
diff changeset
231 crb.emit(lir);
10459
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
232
13227
1a66453f73db renamed TargetMethodAssembler to CompilationResultBuilder
Doug Simon <doug.simon@oracle.com>
parents: 12610
diff changeset
233 HotSpotFrameContext frameContext = (HotSpotFrameContext) crb.frameContext;
12429
5124eeec1a7b split HotSpotRuntime into separate provider implementations
Doug Simon <doug.simon@oracle.com>
parents: 12363
diff changeset
234 HotSpotForeignCallsProvider foreignCalls = getProviders().getForeignCalls();
13234
7e237378923d made the frameContext of a CompilationResultBuilder always non-null and added FrameContext.hasFrame() to determine if a frame is actually generated
Doug Simon <doug.simon@oracle.com>
parents: 13229
diff changeset
235 if (!frameContext.isStub) {
14574
6bab029d6e3a removed com/oracle/graal/hotspot/bridge/Marks.java and replaced with enum
twisti
parents: 14142
diff changeset
236 MarkId.recordMark(crb, MarkId.EXCEPTION_HANDLER_ENTRY);
13227
1a66453f73db renamed TargetMethodAssembler to CompilationResultBuilder
Doug Simon <doug.simon@oracle.com>
parents: 12610
diff changeset
237 SPARCCall.directCall(crb, masm, foreignCalls.lookupForeignCall(EXCEPTION_HANDLER), null, false, null);
14574
6bab029d6e3a removed com/oracle/graal/hotspot/bridge/Marks.java and replaced with enum
twisti
parents: 14142
diff changeset
238 MarkId.recordMark(crb, MarkId.DEOPT_HANDLER_ENTRY);
15456
bb97b75d1d65 AMD64: implemented DeoptimizationStub.deoptimizationHandler
twisti
parents: 15345
diff changeset
239 SPARCCall.directCall(crb, masm, foreignCalls.lookupForeignCall(DEOPTIMIZATION_HANDLER), null, false, null);
10459
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
240 } else {
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
241 // No need to emit the stubs for entries back into the method since
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
242 // it has no calls that can cause such "return" entries
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
243 }
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
244
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
245 if (unverifiedStub != null) {
10470
53ba9df05fa2 fixed remaining SPARC warnings using ecj
twisti
parents: 10465
diff changeset
246 masm.bind(unverifiedStub);
10854
e1fcdda22831 SPARC: can compile some stubs now but they don't work yet
twisti
parents: 10792
diff changeset
247 Register scratch = g3;
13227
1a66453f73db renamed TargetMethodAssembler to CompilationResultBuilder
Doug Simon <doug.simon@oracle.com>
parents: 12610
diff changeset
248 SPARCCall.indirectJmp(crb, masm, scratch, foreignCalls.lookupForeignCall(IC_MISS_HANDLER));
10459
f78079947084 some basic SPARC arithmetic works
twisti
parents: 9864
diff changeset
249 }
7740
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
250 }
13837
ed3a1471e133 Add the Graal Native Function Interface
Matthias Grimmer <grimmer@ssw.jku.at>
parents: 13829
diff changeset
251
7740
5f8101629080 Add projects and skeletons for SPARC port.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
252 }