Merge remote-tracking branch 'upstream/main'

quic · Oct 29, 2024 · cd83543 · cd83543
2 parents 6ede2fb + 95cfa7c
commit cd83543
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/arch/inst/A/lr.w.yaml b/arch/inst/A/lr.w.yaml
@@ -45,7 +45,8 @@ lr.w:
      Software should not set the _rl_ bit on an LR instruction unless the _aq_ bit is also set.
      LR.rl and SC.aq instructions are not guaranteed to provide any stronger ordering than those
      with both bits clear, but may result in lower performance.
-  definedBy: A
+  definedBy:
+    anyOf: [A, Zalrsc]
   assembly: xd, xs1
   encoding:
     match: 00010--00000-----010-----0101111

diff --git a/arch/inst/A/sc.d.yaml b/arch/inst/A/sc.d.yaml
@@ -96,7 +96,8 @@ sc.d:
     Software should not set the _rl_ bit on an LR instruction unless the _aq_ bit is also set.
     LR.rl and SC.aq instructions are not guaranteed to provide any stronger ordering than those
     with both bits clear, but may result in lower performance.
-  definedBy: A
+  definedBy:
+    anyOf: [A, Zalrsc]
   assembly: xd, xs2, xs1
   encoding:
     match: 00011------------011-----0101111

diff --git a/arch/inst/A/sc.w.yaml b/arch/inst/A/sc.w.yaml
@@ -102,7 +102,8 @@ sc.w:
     Software should not set the _rl_ bit on an LR instruction unless the _aq_ bit is also set.
     LR.rl and SC.aq instructions are not guaranteed to provide any stronger ordering than those
     with both bits clear, but may result in lower performance.
-  definedBy: A
+  definedBy:
+    anyOf: [A, Zalrsc]
   assembly: xd, xs2, xs1
   encoding:
     match: 00011------------010-----0101111

diff --git a/backends/ext_pdf_doc/tasks.rake b/backends/ext_pdf_doc/tasks.rake
@@ -120,7 +120,7 @@ rule %r{#{$root}/gen/ext_pdf_doc/.*/adoc/.*_extension\.adoc} => proc { |tname|
     end
   raise "Can't find extension '#{ext_name}'" if arch_yaml_paths.empty?
 
-  stamp = config_name == "_" ? "#{$root}/.stamps/arch-gen.stamp" : "#{$root}/.stamps/arch-gen-#{config_name}.stamp"
+  stamp = config_name == "_" ? "#{$root}/.stamps/arch-gen-_64.stamp" : "#{$root}/.stamps/arch-gen-#{config_name}.stamp"
 
   [
     stamp,

diff --git a/backends/ext_pdf_doc/templates/ext_pdf.adoc.erb b/backends/ext_pdf_doc/templates/ext_pdf.adoc.erb
@@ -37,7 +37,7 @@
 :preface-title: Licensing and Acknowledgements
 :colophon:
 :appendix-caption: Appendix
-<%- if ext.company["name"] =~ /RISCV/ -%>
+<%- if !ext.company.nil? && (ext.company["name"] =~ /RISCV/) -%>
 :title-logo-image: image:risc-v_logo.png["RISC-V International Logo",pdfwidth=3.25in,align=center]
 :back-cover-image: image:riscv-horizontal-color.svg[opacity=25%]
 <%- end -%>
@@ -208,7 +208,6 @@ The following <%= ext.instructions.size %> instructions are added by this extens
 <%- unless ext.implies.empty? -%>
 === Instructions by sub-extension
 
-[%autowidth]
 |===
 | Mnemonic | `<%= ext.name %>` | <%= ext.implies.map { |e| "`#{e.name}`" }.join(" | ") %>
 
@@ -379,7 +378,6 @@ This CSR may return a value that is different from what is stored in hardware.
 <%- end -%>
 
 <%- unless ext.instructions.empty? -%>
-
 <<<
 [#insns,reftext="Instructions (in alphabetical order)"]
 == Instructions (in alphabetical order)