comparison src/share/vm/jvmci/jvmciJavaClasses.hpp @ 22773:9273bb6ba33e

Simplify code installation interface: Use CompiledCode class instead of CompilationResult and DataSection.
author Roland Schatz <roland.schatz@oracle.com>
date Fri, 15 Jan 2016 16:50:19 +0100
parents 1fbfcc0334d3
children b4ff1a18d19c
comparison
equal deleted inserted replaced
22772:f16c1266b0de 22773:9273bb6ba33e
1 /* 1 /*
2 * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
75 int_field(HotSpotInstalledCode, codeSize) \ 75 int_field(HotSpotInstalledCode, codeSize) \
76 end_class \ 76 end_class \
77 start_class(HotSpotNmethod) \ 77 start_class(HotSpotNmethod) \
78 boolean_field(HotSpotNmethod, isDefault) \ 78 boolean_field(HotSpotNmethod, isDefault) \
79 end_class \ 79 end_class \
80 start_class(CompiledCode) \
81 oop_field(CompiledCode, name, "Ljava/lang/String;") \
82 typeArrayOop_field(CompiledCode, targetCode, "[B") \
83 int_field(CompiledCode, targetCodeSize) \
84 objArrayOop_field(CompiledCode, sites, "[Ljdk/vm/ci/code/site/Site;") \
85 objArrayOop_field(CompiledCode, assumptions, "[Ljdk/vm/ci/meta/Assumptions$Assumption;") \
86 objArrayOop_field(CompiledCode, methods, "[Ljdk/vm/ci/meta/ResolvedJavaMethod;") \
87 end_class \
80 start_class(HotSpotCompiledCode) \ 88 start_class(HotSpotCompiledCode) \
81 oop_field(HotSpotCompiledCode, name, "Ljava/lang/String;") \
82 objArrayOop_field(HotSpotCompiledCode, sites, "[Ljdk/vm/ci/code/CompilationResult$Site;") \
83 objArrayOop_field(HotSpotCompiledCode, exceptionHandlers, "[Ljdk/vm/ci/code/CompilationResult$ExceptionHandler;") \
84 objArrayOop_field(HotSpotCompiledCode, comments, "[Ljdk/vm/ci/hotspot/HotSpotCompiledCode$Comment;") \ 89 objArrayOop_field(HotSpotCompiledCode, comments, "[Ljdk/vm/ci/hotspot/HotSpotCompiledCode$Comment;") \
85 objArrayOop_field(HotSpotCompiledCode, assumptions, "[Ljdk/vm/ci/meta/Assumptions$Assumption;") \
86 typeArrayOop_field(HotSpotCompiledCode, targetCode, "[B") \
87 int_field(HotSpotCompiledCode, targetCodeSize) \
88 typeArrayOop_field(HotSpotCompiledCode, dataSection, "[B") \ 90 typeArrayOop_field(HotSpotCompiledCode, dataSection, "[B") \
89 int_field(HotSpotCompiledCode, dataSectionAlignment) \ 91 int_field(HotSpotCompiledCode, dataSectionAlignment) \
90 objArrayOop_field(HotSpotCompiledCode, dataSectionPatches, "[Ljdk/vm/ci/code/CompilationResult$DataPatch;") \ 92 objArrayOop_field(HotSpotCompiledCode, dataSectionPatches, "[Ljdk/vm/ci/code/site/DataPatch;") \
91 int_field(HotSpotCompiledCode, totalFrameSize) \ 93 int_field(HotSpotCompiledCode, totalFrameSize) \
92 int_field(HotSpotCompiledCode, customStackAreaOffset) \ 94 int_field(HotSpotCompiledCode, customStackAreaOffset) \
93 objArrayOop_field(HotSpotCompiledCode, methods, "[Ljdk/vm/ci/meta/ResolvedJavaMethod;") \
94 end_class \ 95 end_class \
95 start_class(HotSpotCompiledCode_Comment) \ 96 start_class(HotSpotCompiledCode_Comment) \
96 oop_field(HotSpotCompiledCode_Comment, text, "Ljava/lang/String;") \ 97 oop_field(HotSpotCompiledCode_Comment, text, "Ljava/lang/String;") \
97 int_field(HotSpotCompiledCode_Comment, pcOffset) \ 98 int_field(HotSpotCompiledCode_Comment, pcOffset) \
98 end_class \ 99 end_class \
128 end_class \ 129 end_class \
129 start_class(Assumptions_CallSiteTargetValue) \ 130 start_class(Assumptions_CallSiteTargetValue) \
130 oop_field(Assumptions_CallSiteTargetValue, callSite, "Ljava/lang/invoke/CallSite;") \ 131 oop_field(Assumptions_CallSiteTargetValue, callSite, "Ljava/lang/invoke/CallSite;") \
131 oop_field(Assumptions_CallSiteTargetValue, methodHandle, "Ljava/lang/invoke/MethodHandle;") \ 132 oop_field(Assumptions_CallSiteTargetValue, methodHandle, "Ljava/lang/invoke/MethodHandle;") \
132 end_class \ 133 end_class \
133 start_class(CompilationResult_Site) \ 134 start_class(site_Site) \
134 int_field(CompilationResult_Site, pcOffset) \ 135 int_field(site_Site, pcOffset) \
135 end_class \ 136 end_class \
136 start_class(CompilationResult_Call) \ 137 start_class(site_Call) \
137 oop_field(CompilationResult_Call, target, "Ljdk/vm/ci/meta/InvokeTarget;") \ 138 oop_field(site_Call, target, "Ljdk/vm/ci/meta/InvokeTarget;") \
138 oop_field(CompilationResult_Call, debugInfo, "Ljdk/vm/ci/code/DebugInfo;") \ 139 oop_field(site_Call, debugInfo, "Ljdk/vm/ci/code/DebugInfo;") \
139 end_class \ 140 end_class \
140 start_class(CompilationResult_DataPatch) \ 141 start_class(site_DataPatch) \
141 oop_field(CompilationResult_DataPatch, reference, "Ljdk/vm/ci/code/CompilationResult$Reference;") \ 142 oop_field(site_DataPatch, reference, "Ljdk/vm/ci/code/site/Reference;") \
142 end_class \ 143 end_class \
143 start_class(CompilationResult_ConstantReference) \ 144 start_class(site_ConstantReference) \
144 oop_field(CompilationResult_ConstantReference, constant, "Ljdk/vm/ci/meta/VMConstant;") \ 145 oop_field(site_ConstantReference, constant, "Ljdk/vm/ci/meta/VMConstant;") \
145 end_class \ 146 end_class \
146 start_class(CompilationResult_DataSectionReference) \ 147 start_class(site_DataSectionReference) \
147 int_field(CompilationResult_DataSectionReference, offset) \ 148 int_field(site_DataSectionReference, offset) \
148 end_class \ 149 end_class \
149 start_class(InfopointReason) \ 150 start_class(site_InfopointReason) \
150 static_oop_field(InfopointReason, SAFEPOINT, "Ljdk/vm/ci/code/InfopointReason;") \ 151 static_oop_field(site_InfopointReason, SAFEPOINT, "Ljdk/vm/ci/code/site/InfopointReason;") \
151 static_oop_field(InfopointReason, CALL, "Ljdk/vm/ci/code/InfopointReason;") \ 152 static_oop_field(site_InfopointReason, CALL, "Ljdk/vm/ci/code/site/InfopointReason;") \
152 static_oop_field(InfopointReason, IMPLICIT_EXCEPTION, "Ljdk/vm/ci/code/InfopointReason;") \ 153 static_oop_field(site_InfopointReason, IMPLICIT_EXCEPTION, "Ljdk/vm/ci/code/site/InfopointReason;") \
153 end_class \ 154 end_class \
154 start_class(CompilationResult_Infopoint) \ 155 start_class(site_Infopoint) \
155 oop_field(CompilationResult_Infopoint, debugInfo, "Ljdk/vm/ci/code/DebugInfo;") \ 156 oop_field(site_Infopoint, debugInfo, "Ljdk/vm/ci/code/DebugInfo;") \
156 oop_field(CompilationResult_Infopoint, reason, "Ljdk/vm/ci/code/InfopointReason;") \ 157 oop_field(site_Infopoint, reason, "Ljdk/vm/ci/code/site/InfopointReason;") \
157 end_class \ 158 end_class \
158 start_class(CompilationResult_ExceptionHandler) \ 159 start_class(site_ExceptionHandler) \
159 int_field(CompilationResult_ExceptionHandler, handlerPos) \ 160 int_field(site_ExceptionHandler, handlerPos) \
160 end_class \ 161 end_class \
161 start_class(CompilationResult_Mark) \ 162 start_class(site_Mark) \
162 oop_field(CompilationResult_Mark, id, "Ljava/lang/Object;") \ 163 oop_field(site_Mark, id, "Ljava/lang/Object;") \
163 end_class \ 164 end_class \
164 start_class(CompilationRequestResult) \ 165 start_class(CompilationRequestResult) \
165 oop_field(CompilationRequestResult, failureMessage, "Ljava/lang/String;") \ 166 oop_field(CompilationRequestResult, failureMessage, "Ljava/lang/String;") \
166 boolean_field(CompilationRequestResult, retry) \ 167 boolean_field(CompilationRequestResult, retry) \
167 int_field(CompilationRequestResult, inlinedBytecodes) \ 168 int_field(CompilationRequestResult, inlinedBytecodes) \