Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
qemu
提交
b065927a
Q
qemu
项目概览
openeuler
/
qemu
通知
10
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Q
qemu
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b065927a
编写于
4月 12, 2012
作者:
S
Stefan Weil
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
w64: Fix data types in softmmu*.h
w64 requires uintptr_t. Signed-off-by:
N
Stefan Weil
<
sw@weilnetz.de
>
上级
8efe0ca8
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
15 addition
and
13 deletion
+15
-13
softmmu_header.h
softmmu_header.h
+3
-3
softmmu_template.h
softmmu_template.h
+12
-10
未找到文件。
softmmu_header.h
浏览文件 @
b065927a
...
...
@@ -111,7 +111,7 @@ glue(glue(glue(CPU_PREFIX, ld), USUFFIX), MEMSUFFIX)(ENV_PARAM
mmu_idx
);
}
else
{
uintptr_t
hostaddr
=
addr
+
env
->
tlb_table
[
mmu_idx
][
page_index
].
addend
;
res
=
glue
(
glue
(
ld
,
USUFFIX
),
_raw
)(
(
uint8_t
*
)
hostaddr
);
res
=
glue
(
glue
(
ld
,
USUFFIX
),
_raw
)(
hostaddr
);
}
return
res
;
}
...
...
@@ -134,7 +134,7 @@ glue(glue(glue(CPU_PREFIX, lds), SUFFIX), MEMSUFFIX)(ENV_PARAM
MMUSUFFIX
)(
ENV_VAR
addr
,
mmu_idx
);
}
else
{
uintptr_t
hostaddr
=
addr
+
env
->
tlb_table
[
mmu_idx
][
page_index
].
addend
;
res
=
glue
(
glue
(
lds
,
SUFFIX
),
_raw
)(
(
uint8_t
*
)
hostaddr
);
res
=
glue
(
glue
(
lds
,
SUFFIX
),
_raw
)(
hostaddr
);
}
return
res
;
}
...
...
@@ -161,7 +161,7 @@ glue(glue(glue(CPU_PREFIX, st), SUFFIX), MEMSUFFIX)(ENV_PARAM target_ulong ptr,
mmu_idx
);
}
else
{
uintptr_t
hostaddr
=
addr
+
env
->
tlb_table
[
mmu_idx
][
page_index
].
addend
;
glue
(
glue
(
st
,
SUFFIX
),
_raw
)(
(
uint8_t
*
)
hostaddr
,
v
);
glue
(
glue
(
st
,
SUFFIX
),
_raw
)(
hostaddr
,
v
);
}
}
...
...
softmmu_template.h
浏览文件 @
b065927a
...
...
@@ -112,7 +112,6 @@ glue(glue(glue(HELPER_PREFIX, ld), SUFFIX), MMUSUFFIX)(ENV_PARAM
int
index
;
target_ulong
tlb_addr
;
target_phys_addr_t
ioaddr
;
unsigned
long
addend
;
uintptr_t
retaddr
;
/* test if there is match for unaligned or IO access */
...
...
@@ -139,6 +138,7 @@ glue(glue(glue(HELPER_PREFIX, ld), SUFFIX), MMUSUFFIX)(ENV_PARAM
mmu_idx
,
retaddr
);
}
else
{
/* unaligned/aligned access in the same page */
uintptr_t
addend
;
#ifdef ALIGNED_ONLY
if
((
addr
&
(
DATA_SIZE
-
1
))
!=
0
)
{
retaddr
=
GETPC
();
...
...
@@ -146,7 +146,8 @@ glue(glue(glue(HELPER_PREFIX, ld), SUFFIX), MMUSUFFIX)(ENV_PARAM
}
#endif
addend
=
env
->
tlb_table
[
mmu_idx
][
index
].
addend
;
res
=
glue
(
glue
(
ld
,
USUFFIX
),
_raw
)((
uint8_t
*
)(
long
)(
addr
+
addend
));
res
=
glue
(
glue
(
ld
,
USUFFIX
),
_raw
)((
uint8_t
*
)(
intptr_t
)
(
addr
+
addend
));
}
}
else
{
/* the page is not in the TLB : fill it */
...
...
@@ -171,7 +172,6 @@ glue(glue(slow_ld, SUFFIX), MMUSUFFIX)(ENV_PARAM
DATA_TYPE
res
,
res1
,
res2
;
int
index
,
shift
;
target_phys_addr_t
ioaddr
;
unsigned
long
addend
;
target_ulong
tlb_addr
,
addr1
,
addr2
;
index
=
(
addr
>>
TARGET_PAGE_BITS
)
&
(
CPU_TLB_SIZE
-
1
);
...
...
@@ -202,8 +202,9 @@ glue(glue(slow_ld, SUFFIX), MMUSUFFIX)(ENV_PARAM
res
=
(
DATA_TYPE
)
res
;
}
else
{
/* unaligned/aligned access in the same page */
addend
=
env
->
tlb_table
[
mmu_idx
][
index
].
addend
;
res
=
glue
(
glue
(
ld
,
USUFFIX
),
_raw
)((
uint8_t
*
)(
long
)(
addr
+
addend
));
uintptr_t
addend
=
env
->
tlb_table
[
mmu_idx
][
index
].
addend
;
res
=
glue
(
glue
(
ld
,
USUFFIX
),
_raw
)((
uint8_t
*
)(
intptr_t
)
(
addr
+
addend
));
}
}
else
{
/* the page is not in the TLB : fill it */
...
...
@@ -258,7 +259,6 @@ void glue(glue(glue(HELPER_PREFIX, st), SUFFIX), MMUSUFFIX)(ENV_PARAM
int
mmu_idx
)
{
target_phys_addr_t
ioaddr
;
unsigned
long
addend
;
target_ulong
tlb_addr
;
uintptr_t
retaddr
;
int
index
;
...
...
@@ -284,6 +284,7 @@ void glue(glue(glue(HELPER_PREFIX, st), SUFFIX), MMUSUFFIX)(ENV_PARAM
mmu_idx
,
retaddr
);
}
else
{
/* aligned/unaligned access in the same page */
uintptr_t
addend
;
#ifdef ALIGNED_ONLY
if
((
addr
&
(
DATA_SIZE
-
1
))
!=
0
)
{
retaddr
=
GETPC
();
...
...
@@ -291,7 +292,8 @@ void glue(glue(glue(HELPER_PREFIX, st), SUFFIX), MMUSUFFIX)(ENV_PARAM
}
#endif
addend
=
env
->
tlb_table
[
mmu_idx
][
index
].
addend
;
glue
(
glue
(
st
,
SUFFIX
),
_raw
)((
uint8_t
*
)(
long
)(
addr
+
addend
),
val
);
glue
(
glue
(
st
,
SUFFIX
),
_raw
)((
uint8_t
*
)(
intptr_t
)
(
addr
+
addend
),
val
);
}
}
else
{
/* the page is not in the TLB : fill it */
...
...
@@ -313,7 +315,6 @@ static void glue(glue(slow_st, SUFFIX), MMUSUFFIX)(ENV_PARAM
uintptr_t
retaddr
)
{
target_phys_addr_t
ioaddr
;
unsigned
long
addend
;
target_ulong
tlb_addr
;
int
index
,
i
;
...
...
@@ -345,8 +346,9 @@ static void glue(glue(slow_st, SUFFIX), MMUSUFFIX)(ENV_PARAM
}
}
else
{
/* aligned/unaligned access in the same page */
addend
=
env
->
tlb_table
[
mmu_idx
][
index
].
addend
;
glue
(
glue
(
st
,
SUFFIX
),
_raw
)((
uint8_t
*
)(
long
)(
addr
+
addend
),
val
);
uintptr_t
addend
=
env
->
tlb_table
[
mmu_idx
][
index
].
addend
;
glue
(
glue
(
st
,
SUFFIX
),
_raw
)((
uint8_t
*
)(
intptr_t
)
(
addr
+
addend
),
val
);
}
}
else
{
/* the page is not in the TLB : fill it */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录