Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_hotspot
提交
26d668cf
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,发现更多精彩内容 >>
提交
26d668cf
编写于
4月 11, 2008
作者:
S
sgoldman
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
6644928: Internal Error (src/share/vm/code/relocInfo.hpp:1089)
Summary: Cardtable base can be zero, ExternalAddress can't take a NULL.
上级
9f07ac23
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
35 addition
and
6 deletion
+35
-6
src/cpu/x86/vm/assembler_x86_32.cpp
src/cpu/x86/vm/assembler_x86_32.cpp
+9
-3
src/cpu/x86/vm/assembler_x86_64.cpp
src/cpu/x86/vm/assembler_x86_64.cpp
+26
-3
未找到文件。
src/cpu/x86/vm/assembler_x86_32.cpp
浏览文件 @
26d668cf
...
...
@@ -3405,10 +3405,16 @@ void MacroAssembler::store_check_part_2(Register obj) {
assert
(
bs
->
kind
()
==
BarrierSet
::
CardTableModRef
,
"Wrong barrier set kind"
);
CardTableModRefBS
*
ct
=
(
CardTableModRefBS
*
)
bs
;
assert
(
sizeof
(
*
ct
->
byte_map_base
)
==
sizeof
(
jbyte
),
"adjust this code"
);
ExternalAddress
cardtable
((
address
)
ct
->
byte_map_base
);
Address
index
(
noreg
,
obj
,
Address
::
times_1
);
movb
(
as_Address
(
ArrayAddress
(
cardtable
,
index
)),
0
);
// The calculation for byte_map_base is as follows:
// byte_map_base = _byte_map - (uintptr_t(low_bound) >> card_shift);
// So this essentially converts an address to a displacement and
// it will never need to be relocated. On 64bit however the value may be too
// large for a 32bit displacement
intptr_t
disp
=
(
intptr_t
)
ct
->
byte_map_base
;
Address
cardtable
(
noreg
,
obj
,
Address
::
times_1
,
disp
);
movb
(
cardtable
,
0
);
}
...
...
src/cpu/x86/vm/assembler_x86_64.cpp
浏览文件 @
26d668cf
...
...
@@ -4427,9 +4427,32 @@ void MacroAssembler::store_check_part_2(Register obj) {
assert
(
bs
->
kind
()
==
BarrierSet
::
CardTableModRef
,
"Wrong barrier set kind"
);
CardTableModRefBS
*
ct
=
(
CardTableModRefBS
*
)
bs
;
assert
(
sizeof
(
*
ct
->
byte_map_base
)
==
sizeof
(
jbyte
),
"adjust this code"
);
ExternalAddress
cardtable
((
address
)
ct
->
byte_map_base
);
Address
index
(
noreg
,
obj
,
Address
::
times_1
);
movb
(
as_Address
(
ArrayAddress
(
cardtable
,
index
)),
0
);
// The calculation for byte_map_base is as follows:
// byte_map_base = _byte_map - (uintptr_t(low_bound) >> card_shift);
// So this essentially converts an address to a displacement and
// it will never need to be relocated. On 64bit however the value may be too
// large for a 32bit displacement
intptr_t
disp
=
(
intptr_t
)
ct
->
byte_map_base
;
if
(
is_simm32
(
disp
))
{
Address
cardtable
(
noreg
,
obj
,
Address
::
times_1
,
disp
);
movb
(
cardtable
,
0
);
}
else
{
// By doing it as an ExternalAddress disp could be converted to a rip-relative
// displacement and done in a single instruction given favorable mapping and
// a smarter version of as_Address. Worst case it is two instructions which
// is no worse off then loading disp into a register and doing as a simple
// Address() as above.
// We can't do as ExternalAddress as the only style since if disp == 0 we'll
// assert since NULL isn't acceptable in a reloci (see 6644928). In any case
// in some cases we'll get a single instruction version.
ExternalAddress
cardtable
((
address
)
disp
);
Address
index
(
noreg
,
obj
,
Address
::
times_1
);
movb
(
as_Address
(
ArrayAddress
(
cardtable
,
index
)),
0
);
}
}
void
MacroAssembler
::
c2bool
(
Register
x
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录