Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenXiangShan
NEMU
提交
b473fcf6
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,发现更多精彩内容 >>
提交
b473fcf6
编写于
10月 14, 2019
作者:
Z
Zihao Yu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
monitor: control when to print the log by instr count
* this makes it easy to filter unnecessary log far from the crash point
上级
cbabbe49
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
15 addition
and
17 deletion
+15
-17
include/monitor/log.h
include/monitor/log.h
+2
-1
src/monitor/cpu-exec.c
src/monitor/cpu-exec.c
+13
-16
未找到文件。
include/monitor/log.h
浏览文件 @
b473fcf6
...
@@ -7,7 +7,8 @@
...
@@ -7,7 +7,8 @@
extern
FILE
*
log_fp
;
extern
FILE
*
log_fp
;
# define log_write(...) \
# define log_write(...) \
do { \
do { \
if (log_fp != NULL) { \
extern bool log_enable(); \
if (log_fp != NULL && log_enable()) { \
fprintf(log_fp, __VA_ARGS__); \
fprintf(log_fp, __VA_ARGS__); \
fflush(log_fp); \
fflush(log_fp); \
} \
} \
...
...
src/monitor/cpu-exec.c
浏览文件 @
b473fcf6
#include "nemu.h"
#include "nemu.h"
#include "monitor/monitor.h"
#include "monitor/monitor.h"
#include "monitor/watchpoint.h"
#include "monitor/watchpoint.h"
#include "monitor/diff-test.h"
/* The assembly code of instructions executed is only output to the screen
/* The assembly code of instructions executed is only output to the screen
* when the number of instructions executed is less than this value.
* when the number of instructions executed is less than this value.
...
@@ -9,8 +10,10 @@
...
@@ -9,8 +10,10 @@
*/
*/
#define MAX_INSTR_TO_PRINT 10
#define MAX_INSTR_TO_PRINT 10
/* restrict the size of log file */
// control when the log is printed
#define LOG_MAX (1024 * 1024)
#define LOG_START (0)
// restrict the size of log file
#define LOG_END (1024 * 1024 * 50)
NEMUState
nemu_state
=
{.
state
=
NEMU_STOP
};
NEMUState
nemu_state
=
{.
state
=
NEMU_STOP
};
...
@@ -32,6 +35,10 @@ void monitor_statistic(void) {
...
@@ -32,6 +35,10 @@ void monitor_statistic(void) {
Log
(
"total guest instructions = %ld"
,
g_nr_guest_instr
);
Log
(
"total guest instructions = %ld"
,
g_nr_guest_instr
);
}
}
bool
log_enable
(
void
)
{
return
(
g_nr_guest_instr
>=
LOG_START
)
&&
(
g_nr_guest_instr
<=
LOG_END
);
}
/* Simulate how the CPU works. */
/* Simulate how the CPU works. */
void
cpu_exec
(
uint64_t
n
)
{
void
cpu_exec
(
uint64_t
n
)
{
switch
(
nemu_state
.
state
)
{
switch
(
nemu_state
.
state
)
{
...
@@ -48,19 +55,12 @@ void cpu_exec(uint64_t n) {
...
@@ -48,19 +55,12 @@ void cpu_exec(uint64_t n) {
* instruction decode, and the actual execution. */
* instruction decode, and the actual execution. */
__attribute__
((
unused
))
vaddr_t
seq_pc
=
exec_once
();
__attribute__
((
unused
))
vaddr_t
seq_pc
=
exec_once
();
#if defined(DIFF_TEST)
difftest_step
(
ori_pc
,
cpu
.
pc
);
difftest_step
(
ori_pc
,
cpu
.
pc
);
#endif
g_nr_guest_instr
++
;
#ifdef DEBUG
#ifdef DEBUG
if
(
g_nr_guest_instr
<
LOG_MAX
)
{
asm_print
(
ori_pc
,
seq_pc
-
ori_pc
,
n
<
MAX_INSTR_TO_PRINT
);
asm_print
(
ori_pc
,
seq_pc
-
ori_pc
,
n
<
MAX_INSTR_TO_PRINT
);
}
else
if
(
g_nr_guest_instr
==
LOG_MAX
)
{
log_write
(
"
\n
[Warning] To restrict the size of log file, "
"we do not record more instruction trace beyond this point.
\n
"
"To capture more trace, you can modify the LOG_MAX macro in %s
\n\n
"
,
__FILE__
);
}
/* TODO: check watchpoints here. */
/* TODO: check watchpoints here. */
WP
*
wp
=
scan_watchpoint
();
WP
*
wp
=
scan_watchpoint
();
...
@@ -70,11 +70,8 @@ void cpu_exec(uint64_t n) {
...
@@ -70,11 +70,8 @@ void cpu_exec(uint64_t n) {
wp
->
old_val
=
wp
->
new_val
;
wp
->
old_val
=
wp
->
new_val
;
return
;
return
;
}
}
#endif
#endif
g_nr_guest_instr
++
;
#ifdef HAS_IOE
#ifdef HAS_IOE
extern
void
device_update
();
extern
void
device_update
();
device_update
();
device_update
();
...
@@ -87,7 +84,7 @@ void cpu_exec(uint64_t n) {
...
@@ -87,7 +84,7 @@ void cpu_exec(uint64_t n) {
case
NEMU_RUNNING
:
nemu_state
.
state
=
NEMU_STOP
;
break
;
case
NEMU_RUNNING
:
nemu_state
.
state
=
NEMU_STOP
;
break
;
case
NEMU_END
:
case
NEMU_ABORT
:
case
NEMU_END
:
case
NEMU_ABORT
:
_
Log
(
"nemu: %s
\33
[0m at pc = "
FMT_WORD
"
\n\n
"
,
Log
(
"nemu: %s
\33
[0m at pc = "
FMT_WORD
"
\n\n
"
,
(
nemu_state
.
state
==
NEMU_ABORT
?
"
\33
[1;31mABORT"
:
(
nemu_state
.
state
==
NEMU_ABORT
?
"
\33
[1;31mABORT"
:
(
nemu_state
.
halt_ret
==
0
?
"
\33
[1;32mHIT GOOD TRAP"
:
"
\33
[1;31mHIT BAD TRAP"
)),
(
nemu_state
.
halt_ret
==
0
?
"
\33
[1;32mHIT GOOD TRAP"
:
"
\33
[1;31mHIT BAD TRAP"
)),
nemu_state
.
halt_pc
);
nemu_state
.
halt_pc
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录