Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenXiangShan
NEMU
提交
2b723534
N
NEMU
项目概览
OpenXiangShan
/
NEMU
11 个月 前同步成功
通知
7
Star
171
Fork
67
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
N
NEMU
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2b723534
编写于
1月 18, 2019
作者:
Z
Zihao Yu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
mips32: finish pa3
上级
ebf7354e
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
21 addition
and
12 deletion
+21
-12
src/isa/mips32/exec/system.c
src/isa/mips32/exec/system.c
+6
-10
src/monitor/cpu-exec.c
src/monitor/cpu-exec.c
+11
-0
src/monitor/debug/expr.c
src/monitor/debug/expr.c
+2
-2
src/monitor/diff-test/diff-test.c
src/monitor/diff-test/diff-test.c
+2
-0
未找到文件。
src/isa/mips32/exec/system.c
浏览文件 @
2b723534
...
...
@@ -30,18 +30,16 @@ make_EHelper(mfc0) {
#endif
uint32_t
val
;
char
*
name
;
switch
(
id_dest
->
reg
)
{
case
12
:
val
=
cpu
.
status
;
name
=
"status"
;
break
;
case
13
:
val
=
cpu
.
cause
;
name
=
"cause"
;
break
;
case
14
:
val
=
cpu
.
epc
;
name
=
"epc"
;
break
;
case
12
:
val
=
cpu
.
status
;
print_asm
(
"mfc0 %s, status"
,
id_src2
->
str
)
;
break
;
case
13
:
val
=
cpu
.
cause
;
print_asm
(
"mfc0 %s, cause"
,
id_src2
->
str
)
;
break
;
case
14
:
val
=
cpu
.
epc
;
print_asm
(
"mfc0 %s, epc"
,
id_src2
->
str
)
;
break
;
default:
assert
(
0
);
}
rtl_li
(
&
s0
,
val
);
rtl_sr
(
id_src2
->
reg
,
&
s0
,
4
);
print_asm
(
"mfc0 %s, %s"
,
id_src2
->
str
,
name
);
}
make_EHelper
(
mtc0
)
{
...
...
@@ -49,13 +47,11 @@ make_EHelper(mtc0) {
difftest_skip_ref
();
#endif
char
*
name
;
switch
(
id_dest
->
reg
)
{
case
12
:
cpu
.
status
=
id_src2
->
val
;
name
=
"status"
;
break
;
case
13
:
cpu
.
cause
=
id_src2
->
val
;
name
=
"cause"
;
break
;
case
14
:
cpu
.
epc
=
id_src2
->
val
;
name
=
"epc"
;
break
;
case
12
:
cpu
.
status
=
id_src2
->
val
;
print_asm
(
"mtc0 %s, status"
,
id_src2
->
str
)
;
break
;
case
13
:
cpu
.
cause
=
id_src2
->
val
;
print_asm
(
"mtc0 %s, cause"
,
id_src2
->
str
)
;
break
;
case
14
:
cpu
.
epc
=
id_src2
->
val
;
print_asm
(
"mtc0 %s, epc"
,
id_src2
->
str
)
;
break
;
default:
assert
(
0
);
}
print_asm
(
"mtc0 %s, %s"
,
id_src2
->
str
,
name
);
}
src/monitor/cpu-exec.c
浏览文件 @
2b723534
#include "nemu.h"
#include "monitor/monitor.h"
#include "monitor/watchpoint.h"
/* The assembly code of instructions executed is only output to the screen
* when the number of instructions executed is less than this value.
...
...
@@ -37,6 +38,9 @@ void cpu_exec(uint64_t n) {
bool
print_flag
=
n
<
MAX_INSTR_TO_PRINT
;
for
(;
n
>
0
;
n
--
)
{
#ifdef DEBUG
vaddr_t
temp_pc
=
cpu
.
pc
;
#endif
/* Execute one instruction, including instruction fetch,
* instruction decode, and the actual execution. */
exec_wrapper
(
print_flag
);
...
...
@@ -44,6 +48,13 @@ void cpu_exec(uint64_t n) {
#ifdef DEBUG
/* TODO: check watchpoints here. */
WP
*
wp
=
scan_watchpoint
();
if
(
wp
!=
NULL
)
{
printf
(
"
\n\n
Hint watchpoint %d at address 0x%08x, expr = %s
\n
"
,
wp
->
NO
,
temp_pc
,
wp
->
expr
);
printf
(
"old value = %#08x
\n
new value = %#08x
\n
"
,
wp
->
old_val
,
wp
->
new_val
);
wp
->
old_val
=
wp
->
new_val
;
return
;
}
#endif
...
...
src/monitor/debug/expr.c
浏览文件 @
2b723534
...
...
@@ -87,8 +87,8 @@ static bool make_token(char *e) {
char
*
substr_start
=
e
+
position
;
int
substr_len
=
pmatch
.
rm_eo
;
Log
(
"match rules[%d] =
\"
%s
\"
at position %d with len %d: %.*s"
,
i
,
rules
[
i
].
regex
,
position
,
substr_len
,
substr_len
,
substr_start
);
//
Log("match rules[%d] = \"%s\" at position %d with len %d: %.*s",
//
i, rules[i].regex, position, substr_len, substr_len, substr_start);
position
+=
substr_len
;
...
...
src/monitor/diff-test/diff-test.c
浏览文件 @
2b723534
...
...
@@ -79,6 +79,8 @@ void difftest_step(vaddr_t pc) {
// TODO: Check the registers state with QEMU.
if
(
!
isa_difftest_checkregs
(
&
ref_r
,
pc
))
{
extern
void
isa_reg_display
(
void
);
isa_reg_display
();
nemu_state
.
state
=
NEMU_ABORT
;
nemu_state
.
halt_pc
=
pc
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录