Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
MINOTAuR
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
MINOTAuR
MINOTAuR
Commits
43d8bf37
Commit
43d8bf37
authored
6 years ago
by
Florian Zaruba
Browse files
Options
Downloads
Patches
Plain Diff
commit_log: Align compressed encoding to Spike
parent
e312b226
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+1
-0
1 addition, 0 deletions
CHANGELOG.md
include/riscv_pkg.sv
+10
-2
10 additions, 2 deletions
include/riscv_pkg.sv
src/ariane.sv
+1
-1
1 addition, 1 deletion
src/ariane.sv
with
12 additions
and
3 deletions
CHANGELOG.md
+
1
−
0
View file @
43d8bf37
...
...
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Changed
-
Fix compressed instruction decoding in tracer
-
Fix privilege bug in performance counters. The counters have always been accessible in user mode.
-
Re-work interrupt and debug subsystem to associate requests during decode. This improves stability on for non-idempotent loads.
-
Fix RISC-V PK simulation bug caused due to insufficient time to init the
`a0`
and
`a1`
registers via the bootrom
...
...
This diff is collapsed.
Click to expand it.
include/riscv_pkg.sv
+
10
−
2
View file @
43d8bf37
...
...
@@ -599,17 +599,25 @@ package riscv;
// pragma translate_off
function
string
spikeCommitLog
(
logic
[
63
:
0
]
pc
,
priv_lvl_t
priv_lvl
,
logic
[
31
:
0
]
instr
,
logic
[
4
:
0
]
rd
,
logic
[
63
:
0
]
result
,
logic
rd_fpr
);
string
rd_s
;
string
instr_word
;
automatic
string
rf_s
=
rd_fpr
?
"f"
:
"x"
;
if
(
instr
[
1
:
0
]
!=
2'b11
)
begin
instr_word
=
$
sformatf
(
"(0x%h)"
,
instr
[
15
:
0
]);
end
else
begin
instr_word
=
$
sformatf
(
"(0x%h)"
,
instr
);
end
if
(
rd
<
10
)
rd_s
=
$
sformatf
(
"%s %0d"
,
rf_s
,
rd
);
else
rd_s
=
$
sformatf
(
"%s%0d"
,
rf_s
,
rd
);
if
(
rd_fpr
||
rd
!=
0
)
begin
// 0 0x0000000080000118 (0xeecf8f93) x31 0x0000000080004000
return
$
sformatf
(
"%d 0x%h
(0x%h)
%s 0x%h
\n
"
,
priv_lvl
,
pc
,
instr
,
rd_s
,
result
);
return
$
sformatf
(
"%d 0x%h
%s
%s 0x%h
\n
"
,
priv_lvl
,
pc
,
instr
_word
,
rd_s
,
result
);
end
else
begin
// 0 0x000000008000019c (0x0040006f)
return
$
sformatf
(
"%d 0x%h
(0x%h)
\n
"
,
priv_lvl
,
pc
,
instr
);
return
$
sformatf
(
"%d 0x%h
%s
\n
"
,
priv_lvl
,
pc
,
instr
_word
);
end
endfunction
// pragma translate_on
...
...
This diff is collapsed.
Click to expand it.
src/ariane.sv
+
1
−
1
View file @
43d8bf37
...
...
@@ -708,7 +708,7 @@ module ariane #(
assign
tracer_if
.
flush_unissued
=
flush_unissued_instr_ctrl_id
;
assign
tracer_if
.
flush
=
flush_ctrl_ex
;
// fetch
assign
tracer_if
.
instruction
=
id_stage_i
.
compressed_decoder_i
.
instr_o
;
assign
tracer_if
.
instruction
=
id_stage_i
.
instr_realigner_i
.
fetch_entry_o
.
instruction
;
assign
tracer_if
.
fetch_valid
=
id_stage_i
.
instr_realigner_i
.
fetch_entry_valid_o
;
assign
tracer_if
.
fetch_ack
=
id_stage_i
.
instr_realigner_i
.
fetch_ack_i
;
// Issue
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment