Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell11
提交
e4efbabb
D
dragonwell11
项目概览
openanolis
/
dragonwell11
通知
7
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell11
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e4efbabb
编写于
10月 08, 2015
作者:
T
twisti
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8136421: JEP 243: Java-Level JVM Compiler Interface
Reviewed-by: ihse, alanb, roland, coleenp, iveresov, kvn, kbarrett
上级
57bc958d
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
59 addition
and
6 deletion
+59
-6
.hgignore
.hgignore
+2
-0
make/CompileJavaModules.gmk
make/CompileJavaModules.gmk
+14
-1
make/Images.gmk
make/Images.gmk
+2
-1
make/Main.gmk
make/Main.gmk
+8
-1
make/MainSupport.gmk
make/MainSupport.gmk
+3
-2
make/common/Modules.gmk
make/common/Modules.gmk
+1
-0
modules.xml
modules.xml
+14
-0
test/lib/sun/hotspot/WhiteBox.java
test/lib/sun/hotspot/WhiteBox.java
+11
-0
test/lib/sun/hotspot/code/NMethod.java
test/lib/sun/hotspot/code/NMethod.java
+4
-1
未找到文件。
.hgignore
浏览文件 @
e4efbabb
...
...
@@ -5,3 +5,5 @@ nbproject/private/
^.hgtip
^.bridge2
.DS_Store
.metadata/
.recommenders/
make/CompileJavaModules.gmk
浏览文件 @
e4efbabb
...
...
@@ -438,6 +438,18 @@ jdk.jvmstat_COPY := aliasmap
################################################################################
jdk.vm.ci_EXCLUDE_FILES += \
jdk/vm/ci/options/processor/OptionProcessor.java \
jdk/vm/ci/service/processor/ServiceProviderProcessor.java \
#
jdk.vm.ci_EXCLUDES += \
META-INF/jvmci.options \
META-INF/jvmci.providers \
#
################################################################################
jdk.xml.bind_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
jdk.xml.bind_CLEAN := .properties
jdk.xml.bind_COPY := .xsd JAXBContextFactory.java ZeroOneBooleanAdapter.java
...
...
@@ -479,6 +491,7 @@ ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_TYPE))
endif
SHARE_SRC_DIRS += \
$(HOTSPOT_TOPDIR)/src/$1/share/classes \
$(JDK_TOPDIR)/src/$1/share/classes \
$(LANGTOOLS_TOPDIR)/src/$1/share/classes \
$(CORBA_TOPDIR)/src/$1/share/classes \
...
...
@@ -531,7 +544,7 @@ define SetupModuleCompilation
$$(eval $$(call SetupJavaCompilation,$1, \
SETUP := $$(if $$($1_SETUP), $$($1_SETUP), GENERATE_JDKBYTECODE), \
SRC := $$(
wildcard $$(call ALL_SRC_DIRS,$1
)), \
SRC := $$(
if $$($1_SRC), $$($1_SRC), $$(wildcard $$(call ALL_SRC_DIRS,$1)
)), \
INCLUDES := $(JDK_USER_DEFINED_FILTER),\
BIN := $$(if $$($1_BIN), $$($1_BIN), $(JDK_OUTPUTDIR)/modules/$1), \
HEADERS := $(SUPPORT_OUTPUTDIR)/headers/$1, \
...
...
make/Images.gmk
浏览文件 @
e4efbabb
...
...
@@ -39,7 +39,8 @@ $(eval $(call IncludeCustomExtension, , Images-pre.gmk))
MAIN_MODULES += java.se java.smartcardio jdk.httpserver jdk.sctp \
jdk.security.auth jdk.security.jgss jdk.pack200 jdk.xml.dom \
jdk.accessibility jdk.internal.le jdk.scripting.nashorn.shell
jdk.accessibility jdk.internal.le jdk.scripting.nashorn.shell \
jdk.vm.ci
# providers
PROVIDER_MODULES += jdk.charsets jdk.crypto.ec jdk.crypto.pkcs11 jdk.jvmstat jdk.localedata \
...
...
make/Main.gmk
浏览文件 @
e4efbabb
...
...
@@ -107,6 +107,7 @@ $(eval $(call DeclareRecipesForPhase, GENSRC, \
JDK_GENSRC_TARGETS := $(filter %-gensrc-jdk, $(GENSRC_TARGETS))
LANGTOOLS_GENSRC_TARGETS := $(filter %-gensrc-langtools, $(GENSRC_TARGETS))
CORBA_GENSRC_TARGETS := $(filter %-gensrc-corba, $(GENSRC_TARGETS))
HOTSPOT_GENSRC_TARGETS := $(filter %-gensrc-hotspot, $(GENSRC_TARGETS))
ALL_TARGETS += $(GENSRC_TARGETS)
...
...
@@ -128,7 +129,8 @@ $(eval $(call DeclareRecipesForPhase, COPY, \
FILE_PREFIX := Copy, \
MAKE_SUBDIR := copy, \
CHECK_MODULES := $(ALL_MODULES), \
USE_WRAPPER := true))
USE_WRAPPER := true, \
MULTIPLE_MAKEFILES := true))
ALL_TARGETS += $(COPY_TARGETS)
...
...
@@ -352,6 +354,8 @@ else
$(CORBA_GENSRC_TARGETS): interim-langtools
$(HOTSPOT_GENSRC_TARGETS): interim-langtools
$(JDK_GENSRC_TARGETS): interim-langtools buildtools-jdk
$(GENDATA_TARGETS): interim-langtools buildtools-jdk
...
...
@@ -415,6 +419,9 @@ else
# Explicitly add dependencies for special targets
java.base-java: unpack-sec
# The copy target copies files generated by gensrc
java.base-copy-hotspot: java.base-gensrc-hotspot
jdk.jdeps-gendata: java rmic
zip-security: java.base-java java.security.jgss-java java.security.jgss-libs \
...
...
make/MainSupport.gmk
浏览文件 @
e4efbabb
...
...
@@ -108,7 +108,8 @@ endef
################################################################################
MAKE_TOPDIR_LIST := $(JDK_TOPDIR) $(CORBA_TOPDIR) $(LANGTOOLS_TOPDIR)
MAKE_TOPDIR_LIST := $(JDK_TOPDIR) $(CORBA_TOPDIR) $(LANGTOOLS_TOPDIR) \
$(HOTSPOT_TOPDIR)
MAKE_MAKEDIR_LIST := make
# Helper macro for DeclareRecipesForPhase
...
...
@@ -179,7 +180,7 @@ endef
# FILE_PREFIX : File prefix for this build phase
# USE_WRAPPER : Set to true to use ModuleWrapper.gmk
# CHECK_MODULES : List of modules to try
# MULTIPLE_MAKEFILES : Set to true to handle makefil
s for the same module in
# MULTIPLE_MAKEFILES : Set to true to handle makefil
es for the same module and
# phase in multiple repos
# Exported variables:
# $1_MODULES : All modules that had rules generated
...
...
make/common/Modules.gmk
浏览文件 @
e4efbabb
...
...
@@ -33,6 +33,7 @@ include SetupJavaCompilers.gmk
# Module list macros
ALL_TOP_SRC_DIRS := \
$(HOTSPOT_TOPDIR)/src \
$(JDK_TOPDIR)/src \
$(LANGTOOLS_TOPDIR)/src \
$(CORBA_TOPDIR)/src \
...
...
modules.xml
浏览文件 @
e4efbabb
...
...
@@ -237,6 +237,7 @@
<to>
java.instrument
</to>
<to>
jdk.jfr
</to>
<to>
jdk.scripting.nashorn
</to>
<to>
jdk.vm.ci
</to>
</export>
<export>
<name>
jdk.internal.org.objectweb.asm.commons
</name>
...
...
@@ -290,6 +291,7 @@
<to>
jdk.security.auth
</to>
<to>
jdk.security.jgss
</to>
<to>
jdk.snmp
</to>
<to>
jdk.vm.ci
</to>
<to>
java.instrument
</to>
</export>
<export>
...
...
@@ -1871,6 +1873,18 @@
<name>
com.sun.security.jgss
</name>
</export>
</module>
<module>
<name>
jdk.vm.ci
</name>
<depend>
java.base
</depend>
<export>
<name>
jdk.vm.ci.hotspot
</name>
<to>
jdk.jfr
</to>
</export>
<export>
<name>
jdk.vm.ci.hotspot.events
</name>
<to>
jdk.jfr
</to>
</export>
</module>
<module>
<name>
jdk.xml.bind
</name>
<depend>
java.activation
</depend>
...
...
test/lib/sun/hotspot/WhiteBox.java
浏览文件 @
e4efbabb
...
...
@@ -112,6 +112,12 @@ public class WhiteBox {
public
native
void
forceSafepoint
();
private
native
long
getConstantPool0
(
Class
<?>
aClass
);
public
long
getConstantPool
(
Class
<?>
aClass
)
{
Objects
.
requireNonNull
(
aClass
);
return
getConstantPool0
(
aClass
);
}
// JVMTI
private
native
void
addToBootstrapClassLoaderSearch0
(
String
segment
);
public
void
addToBootstrapClassLoaderSearch
(
String
segment
){
...
...
@@ -289,6 +295,11 @@ public class WhiteBox {
public
native
void
forceNMethodSweep
();
public
native
Object
[]
getCodeHeapEntries
(
int
type
);
public
native
int
getCompilationActivityMode
();
private
native
long
getMethodData0
(
Executable
method
);
public
long
getMethodData
(
Executable
method
)
{
Objects
.
requireNonNull
(
method
);
return
getMethodData0
(
method
);
}
public
native
Object
[]
getCodeBlob
(
long
addr
);
// Intered strings
...
...
test/lib/sun/hotspot/code/NMethod.java
浏览文件 @
e4efbabb
...
...
@@ -35,14 +35,16 @@ public class NMethod extends CodeBlob {
}
private
NMethod
(
Object
[]
obj
)
{
super
((
Object
[])
obj
[
0
]);
assert
obj
.
length
==
4
;
assert
obj
.
length
==
5
;
comp_level
=
(
Integer
)
obj
[
1
];
insts
=
(
byte
[])
obj
[
2
];
compile_id
=
(
Integer
)
obj
[
3
];
address
=
(
Long
)
obj
[
4
];
}
public
final
byte
[]
insts
;
public
final
int
comp_level
;
public
final
int
compile_id
;
public
final
long
address
;
@Override
public
String
toString
()
{
...
...
@@ -51,6 +53,7 @@ public class NMethod extends CodeBlob {
+
", insts="
+
insts
+
", comp_level="
+
comp_level
+
", compile_id="
+
compile_id
+
", address="
+
address
+
'}'
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录