Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_hotspot
提交
3d1ac97e
D
dragonwell8_hotspot
项目概览
openanolis
/
dragonwell8_hotspot
通知
2
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_hotspot
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3d1ac97e
编写于
6月 18, 2018
作者:
K
kevinw
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8160748: Inconsistent types for ideal_reg
Summary: Made ideal_reg consistently uint. Reviewed-by: kvn, iveresov
上级
4a9ccec2
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
36 addition
and
36 deletion
+36
-36
src/cpu/ppc/vm/ppc.ad
src/cpu/ppc/vm/ppc.ad
+3
-3
src/cpu/sparc/vm/sparc.ad
src/cpu/sparc/vm/sparc.ad
+3
-3
src/cpu/x86/vm/x86.ad
src/cpu/x86/vm/x86.ad
+3
-3
src/share/vm/adlc/output_c.cpp
src/share/vm/adlc/output_c.cpp
+3
-3
src/share/vm/opto/chaitin.cpp
src/share/vm/opto/chaitin.cpp
+3
-3
src/share/vm/opto/matcher.cpp
src/share/vm/opto/matcher.cpp
+2
-2
src/share/vm/opto/matcher.hpp
src/share/vm/opto/matcher.hpp
+5
-5
src/share/vm/opto/reg_split.cpp
src/share/vm/opto/reg_split.cpp
+3
-3
src/share/vm/opto/type.cpp
src/share/vm/opto/type.cpp
+2
-2
src/share/vm/opto/type.hpp
src/share/vm/opto/type.hpp
+9
-9
未找到文件。
src/cpu/ppc/vm/ppc.ad
浏览文件 @
3d1ac97e
//
// Copyright (c) 2011, 201
4
, Oracle and/or its affiliates. All rights reserved.
// Copyright (c) 2011, 201
8
, Oracle and/or its affiliates. All rights reserved.
// Copyright (c) 2012, 2017 SAP SE. All rights reserved.
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
//
...
...
@@ -2174,12 +2174,12 @@ const int Matcher::vector_width_in_bytes(BasicType bt) {
}
// Vector ideal reg.
const int Matcher::vector_ideal_reg(int size) {
const
u
int Matcher::vector_ideal_reg(int size) {
assert(MaxVectorSize == 8 && size == 8, "");
return Op_RegL;
}
const int Matcher::vector_shift_count_ideal_reg(int size) {
const
u
int Matcher::vector_shift_count_ideal_reg(int size) {
fatal("vector shift is not supported");
return Node::NotAMachineReg;
}
...
...
src/cpu/sparc/vm/sparc.ad
浏览文件 @
3d1ac97e
//
// Copyright (c) 1998, 201
3
, Oracle and/or its affiliates. All rights reserved.
// Copyright (c) 1998, 201
8
, Oracle and/or its affiliates. All rights reserved.
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
//
// This code is free software; you can redistribute it and/or modify it
...
...
@@ -1877,12 +1877,12 @@ const int Matcher::vector_width_in_bytes(BasicType bt) {
}
// Vector ideal reg
const int Matcher::vector_ideal_reg(int size) {
const
u
int Matcher::vector_ideal_reg(int size) {
assert(MaxVectorSize == 8, "");
return Op_RegD;
}
const int Matcher::vector_shift_count_ideal_reg(int size) {
const
u
int Matcher::vector_shift_count_ideal_reg(int size) {
fatal("vector shift is not supported");
return Node::NotAMachineReg;
}
...
...
src/cpu/x86/vm/x86.ad
浏览文件 @
3d1ac97e
//
// Copyright (c) 2011, 201
2
, Oracle and/or its affiliates. All rights reserved.
// Copyright (c) 2011, 201
8
, Oracle and/or its affiliates. All rights reserved.
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
//
// This code is free software; you can redistribute it and/or modify it
...
...
@@ -683,7 +683,7 @@ const int Matcher::min_vector_size(const BasicType bt) {
}
// Vector ideal reg corresponding to specidied size in bytes
const int Matcher::vector_ideal_reg(int size) {
const
u
int Matcher::vector_ideal_reg(int size) {
assert(MaxVectorSize >= size, "");
switch(size) {
case 4: return Op_VecS;
...
...
@@ -696,7 +696,7 @@ const int Matcher::vector_ideal_reg(int size) {
}
// Only lowest bits of xmm reg are used for vector shift count.
const int Matcher::vector_shift_count_ideal_reg(int size) {
const
u
int Matcher::vector_shift_count_ideal_reg(int size) {
return Op_VecS;
}
...
...
src/share/vm/adlc/output_c.cpp
浏览文件 @
3d1ac97e
/*
* Copyright (c) 1998, 201
3
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 201
8
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -4177,11 +4177,11 @@ void ArchDesc::buildFrameMethods(FILE *fp_cpp) {
fprintf
(
fp_cpp
,
"%s
\n
"
,
_frame
->
_c_calling_convention
);
fprintf
(
fp_cpp
,
"}
\n\n
"
);
// Java Return Value Location
fprintf
(
fp_cpp
,
"OptoRegPair Matcher::return_value(int ideal_reg, bool is_outgoing) {
\n
"
);
fprintf
(
fp_cpp
,
"OptoRegPair Matcher::return_value(
u
int ideal_reg, bool is_outgoing) {
\n
"
);
fprintf
(
fp_cpp
,
"%s
\n
"
,
_frame
->
_return_value
);
fprintf
(
fp_cpp
,
"}
\n\n
"
);
// Native Return Value Location
fprintf
(
fp_cpp
,
"OptoRegPair Matcher::c_return_value(int ideal_reg, bool is_outgoing) {
\n
"
);
fprintf
(
fp_cpp
,
"OptoRegPair Matcher::c_return_value(
u
int ideal_reg, bool is_outgoing) {
\n
"
);
fprintf
(
fp_cpp
,
"%s
\n
"
,
_frame
->
_c_return_value
);
fprintf
(
fp_cpp
,
"}
\n\n
"
);
...
...
src/share/vm/opto/chaitin.cpp
浏览文件 @
3d1ac97e
/*
* Copyright (c) 2000, 201
5
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 201
8
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -755,7 +755,7 @@ void PhaseChaitin::gather_lrg_masks( bool after_aggressive ) {
const
RegMask
&
rm
=
n
->
out_RegMask
();
lrg
.
AND
(
rm
);
int
ireg
=
n
->
ideal_reg
();
u
int
ireg
=
n
->
ideal_reg
();
assert
(
!
n
->
bottom_type
()
->
isa_oop_ptr
()
||
ireg
==
Op_RegP
,
"oops must be in Op_RegP's"
);
...
...
@@ -961,7 +961,7 @@ void PhaseChaitin::gather_lrg_masks( bool after_aggressive ) {
// Check for bound register masks
const
RegMask
&
lrgmask
=
lrg
.
mask
();
int
kreg
=
n
->
in
(
k
)
->
ideal_reg
();
u
int
kreg
=
n
->
in
(
k
)
->
ideal_reg
();
bool
is_vect
=
RegMask
::
is_vector
(
kreg
);
assert
(
n
->
in
(
k
)
->
bottom_type
()
->
isa_vect
()
==
NULL
||
is_vect
||
kreg
==
Op_RegD
||
kreg
==
Op_RegL
,
...
...
src/share/vm/opto/matcher.cpp
浏览文件 @
3d1ac97e
/*
* Copyright (c) 1997, 201
5
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 201
8
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -193,7 +193,7 @@ void Matcher::match( ) {
const
TypeTuple
*
range
=
C
->
tf
()
->
range
();
if
(
range
->
cnt
()
>
TypeFunc
::
Parms
)
{
// If not a void function
// Get ideal-register return type
int
ireg
=
range
->
field_at
(
TypeFunc
::
Parms
)
->
ideal_reg
();
u
int
ireg
=
range
->
field_at
(
TypeFunc
::
Parms
)
->
ideal_reg
();
// Get machine return register
uint
sop
=
C
->
start
()
->
Opcode
();
OptoRegPair
regs
=
return_value
(
ireg
,
false
);
...
...
src/share/vm/opto/matcher.hpp
浏览文件 @
3d1ac97e
/*
* Copyright (c) 1997, 201
3
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 201
8
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -283,8 +283,8 @@ public:
}
// Vector ideal reg
static
const
int
vector_ideal_reg
(
int
len
);
static
const
int
vector_shift_count_ideal_reg
(
int
len
);
static
const
u
int
vector_ideal_reg
(
int
len
);
static
const
u
int
vector_shift_count_ideal_reg
(
int
len
);
// CPU supports misaligned vectors store/load.
static
const
bool
misaligned_vectors_ok
();
...
...
@@ -326,8 +326,8 @@ public:
virtual
OptoReg
::
Name
return_addr
()
const
;
RegMask
_return_addr_mask
;
// Return value register. On Intel it is EAX. On Sparc i0/o0.
static
OptoRegPair
return_value
(
int
ideal_reg
,
bool
is_outgoing
);
static
OptoRegPair
c_return_value
(
int
ideal_reg
,
bool
is_outgoing
);
static
OptoRegPair
return_value
(
u
int
ideal_reg
,
bool
is_outgoing
);
static
OptoRegPair
c_return_value
(
u
int
ideal_reg
,
bool
is_outgoing
);
RegMask
_return_value_mask
;
// Inline Cache Register
static
OptoReg
::
Name
inline_cache_reg
();
...
...
src/share/vm/opto/reg_split.cpp
浏览文件 @
3d1ac97e
/*
* Copyright (c) 2000, 201
3
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 201
8
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -59,7 +59,7 @@ Node *PhaseChaitin::get_spillcopy_wide( Node *def, Node *use, uint uidx ) {
// If ideal reg doesn't exist we've got a bad schedule happening
// that is forcing us to spill something that isn't spillable.
// Bail rather than abort
int
ireg
=
def
->
ideal_reg
();
u
int
ireg
=
def
->
ideal_reg
();
if
(
ireg
==
0
||
ireg
==
Op_RegFlags
)
{
assert
(
false
,
"attempted to spill a non-spillable item"
);
C
->
record_method_not_compilable
(
"attempted to spill a non-spillable item"
);
...
...
@@ -1163,7 +1163,7 @@ uint PhaseChaitin::Split(uint maxlrg, ResourceArea* split_arena) {
// Grab UP info for DEF
const
RegMask
&
dmask
=
n
->
out_RegMask
();
bool
defup
=
dmask
.
is_UP
();
int
ireg
=
n
->
ideal_reg
();
u
int
ireg
=
n
->
ideal_reg
();
bool
is_vect
=
RegMask
::
is_vector
(
ireg
);
// Only split at Def if this is a HRP block or bound (and spilled once)
if
(
!
n
->
rematerialize
()
&&
...
...
src/share/vm/opto/type.cpp
浏览文件 @
3d1ac97e
/*
* Copyright (c) 1997, 201
6
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 201
7
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -51,7 +51,7 @@ PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
Dict
*
Type
::
_shared_type_dict
=
NULL
;
// Array which maps compiler types to Basic Types
Type
::
TypeInfo
Type
::
_type_info
[
Type
::
lastype
]
=
{
const
Type
::
TypeInfo
Type
::
_type_info
[
Type
::
lastype
]
=
{
{
Bad
,
T_ILLEGAL
,
"bad"
,
false
,
Node
::
NotAMachineReg
,
relocInfo
::
none
},
// Bad
{
Control
,
T_ILLEGAL
,
"control"
,
false
,
0
,
relocInfo
::
none
},
// Control
{
Bottom
,
T_VOID
,
"top"
,
false
,
0
,
relocInfo
::
none
},
// Top
...
...
src/share/vm/opto/type.hpp
浏览文件 @
3d1ac97e
/*
* Copyright (c) 1997, 201
3
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 201
8
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -130,17 +130,17 @@ public:
private:
typedef
struct
{
const
TYPES
dual_type
;
const
BasicType
basic_type
;
const
char
*
msg
;
const
bool
isa_oop
;
const
int
ideal_reg
;
const
relocInfo
::
relocType
reloc
;
TYPES
dual_type
;
BasicType
basic_type
;
const
char
*
msg
;
bool
isa_oop
;
uint
ideal_reg
;
relocInfo
::
relocType
reloc
;
}
TypeInfo
;
// Dictionary of types shared among compilations.
static
Dict
*
_shared_type_dict
;
static
TypeInfo
_type_info
[];
static
const
TypeInfo
_type_info
[];
static
int
uhash
(
const
Type
*
const
t
);
// Structural equality check. Assumes that cmp() has already compared
...
...
@@ -407,7 +407,7 @@ public:
// Mapping from compiler type to VM BasicType
BasicType
basic_type
()
const
{
return
_type_info
[
_base
].
basic_type
;
}
int
ideal_reg
()
const
{
return
_type_info
[
_base
].
ideal_reg
;
}
uint
ideal_reg
()
const
{
return
_type_info
[
_base
].
ideal_reg
;
}
const
char
*
msg
()
const
{
return
_type_info
[
_base
].
msg
;
}
bool
isa_oop_ptr
()
const
{
return
_type_info
[
_base
].
isa_oop
;
}
relocInfo
::
relocType
reloc
()
const
{
return
_type_info
[
_base
].
reloc
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录