Merge remote-tracking branch 'origin/main' into dhower-qc/issue169

riscv-software-src · Oct 25, 2024 · d2e0faf · d2e0faf
2 parents d4e46a9 + a5dce13
commit d2e0faf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,9 @@
 .yardoc
 .stamps
 .venv
+.asciidoctor
+diag-ditaa-*
+arch/manual/isa/**/riscv-isa-manual
 gen
 node_modules
 _site

diff --git a/arch/isa/globals.isa b/arch/isa/globals.isa
@@ -89,7 +89,7 @@ enum PmaAttribute {
 
 enum Pbmt {
   PMA 0   # Use underlying PMA
-  NV  1   # Non-cacheable, idempotent, weakly-ordered (RVWMO), main memory
+  NC  1   # Non-cacheable, idempotent, weakly-ordered (RVWMO), main memory
   IO  2   # Non-cacheable, non-idempotent, strongly (channel 0) ordered, I/O
 }
 

diff --git a/backends/profile_doc/tasks.rake b/backends/profile_doc/tasks.rake
@@ -81,7 +81,7 @@ end
 
 namespace :gen do
   desc "Create a specification PDF for +profile_family+"
-  task :profile_pdf, [:profile_family] => ["gen:arch"] do |_t, args|
+  task :profile_pdf, [:profile_family] => ["#{$root}/.stamps/arch-gen-_64.stamp"] do |_t, args|
     family_name = args[:profile_family]
     raise ArgumentError, "Missing required option +profile_family+" if family_name.nil?
 
@@ -92,7 +92,7 @@ namespace :gen do
   end
 
   desc "Create a specification HTML for +profile_family+"
-  task :profile_html, [:profile_family] => ["gen:arch"] do |_t, args|
+  task :profile_html, [:profile_family] => ["#{$root}/.stamps/arch-gen-_64.stamp"] do |_t, args|
     family_name = args[:profile_family]
     raise ArgumentError, "Missing required option +profile_family+" if family_name.nil?