Skip to content

Commit d2e0faf

Browse files
author
Derek Hower
committed
Merge remote-tracking branch 'origin/main' into dhower-qc/issue169
2 parents d4e46a9 + a5dce13 commit d2e0faf

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
.yardoc
77
.stamps
88
.venv
9+
.asciidoctor
10+
diag-ditaa-*
11+
arch/manual/isa/**/riscv-isa-manual
912
gen
1013
node_modules
1114
_site

arch/isa/globals.isa

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ enum PmaAttribute {
8989

9090
enum Pbmt {
9191
PMA 0 # Use underlying PMA
92-
NV 1 # Non-cacheable, idempotent, weakly-ordered (RVWMO), main memory
92+
NC 1 # Non-cacheable, idempotent, weakly-ordered (RVWMO), main memory
9393
IO 2 # Non-cacheable, non-idempotent, strongly (channel 0) ordered, I/O
9494
}
9595

backends/profile_doc/tasks.rake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ end
8181

8282
namespace :gen do
8383
desc "Create a specification PDF for +profile_family+"
84-
task :profile_pdf, [:profile_family] => ["gen:arch"] do |_t, args|
84+
task :profile_pdf, [:profile_family] => ["#{$root}/.stamps/arch-gen-_64.stamp"] do |_t, args|
8585
family_name = args[:profile_family]
8686
raise ArgumentError, "Missing required option +profile_family+" if family_name.nil?
8787

@@ -92,7 +92,7 @@ namespace :gen do
9292
end
9393

9494
desc "Create a specification HTML for +profile_family+"
95-
task :profile_html, [:profile_family] => ["gen:arch"] do |_t, args|
95+
task :profile_html, [:profile_family] => ["#{$root}/.stamps/arch-gen-_64.stamp"] do |_t, args|
9696
family_name = args[:profile_family]
9797
raise ArgumentError, "Missing required option +profile_family+" if family_name.nil?
9898

0 commit comments

Comments
 (0)