Added priv modes and related specs to CTP by moving it from CRD into templates they can share.

Author: james-ball-qualcomm

backends/proc_cert/templates/priv_modes.adoc.erb

@@ -0,0 +1,12 @@
+=== Privileged Modes
+
+|===
+| M | S | U | VS | VU
+
+| <% if proc_cert_class.mandatory_priv_modes.include?('M') -%> MANDATORY <% else -%> OUT-OF-SCOPE <% end -%>
+| <% if proc_cert_class.mandatory_priv_modes.include?('S') -%> MANDATORY <% else -%> OUT-OF-SCOPE <% end -%>
+| <% if proc_cert_class.mandatory_priv_modes.include?('U') -%> MANDATORY <% else -%> OUT-OF-SCOPE <% end -%>
+| <% if proc_cert_class.mandatory_priv_modes.include?('VS') -%> MANDATORY <% else -%> OUT-OF-SCOPE <% end -%>
+| <% if proc_cert_class.mandatory_priv_modes.include?('VU') -%> MANDATORY <% else -%> OUT-OF-SCOPE <% end -%>
+
+|===

backends/proc_cert/templates/related_specs.adoc.erb

@@ -0,0 +1,12 @@
+=== Related Specifications
+
+[cols="2,2,3,3,3"]
+|===
+| Certificate Model | TSC Profile | Unpriv ISA Manual | Priv ISA Manual | Debug Manual
+
+| <%= proc_cert_model.name %>
+| <%= proc_cert_model.tsc_profile.nil? ? "No profile" : proc_cert_model.tsc_profile.marketing_name %>
+| <%= proc_cert_model.unpriv_isa_manual_revision %>
+| <%= proc_cert_model.priv_isa_manual_revision %>
+| <%= proc_cert_model.debug_manual_revision %>
+|===

backends/proc_crd/tasks.rake

@@ -26,6 +26,9 @@ Dir.glob("#{$root}/arch/proc_cert_model/*.yaml") do |f|
     "#{$root}/backends/portfolio/templates/beginning.adoc.erb",
     "#{$root}/backends/proc_cert/templates/typographic.adoc.erb",
     "#{$root}/backends/proc_cert/templates/rev_history.adoc.erb",
+    "#{$root}/backends/proc_cert/templates/related_specs.adoc.erb",
+    "#{$root}/backends/proc_cert/templates/priv_modes.adoc.erb",
+    "#{$root}/backends/proc_cert/templates/rev_history.adoc.erb",
     "#{PROC_CRD_DOC_DIR}/templates/proc_crd.adoc.erb"
   ] do |t|
     proc_cert_create_adoc("#{PROC_CRD_DOC_DIR}/templates/proc_crd.adoc.erb", t.name, model_name)

backends/proc_crd/templates/proc_crd.adoc.erb

@@ -137,32 +137,8 @@ It is OUT-OF-SCOPE for certification tests to write all possible values of WPRI
 (especially if they are more than just a few bits) and certification tests aren't intended to be comprehensive
 verification test suites anyways.
 
-=== Related Specifications
-
-[cols="2,2,3,3,3"]
-|===
-| Certificate Model | TSC Profile | Unpriv ISA Manual | Priv ISA Manual | Debug Manual
-
-| <%= proc_cert_model.name %>
-| <%= proc_cert_model.tsc_profile.nil? ? "No profile" : proc_cert_model.tsc_profile.marketing_name %>
-| <%= proc_cert_model.unpriv_isa_manual_revision %>
-| <%= proc_cert_model.priv_isa_manual_revision %>
-| <%= proc_cert_model.debug_manual_revision %>
-|===
-
-=== Privileged Modes
-
-|===
-| M | S | U | VS | VU
-
-| <% if proc_cert_class.mandatory_priv_modes.include?('M') -%> MANDATORY <% else -%> OUT-OF-SCOPE <% end -%>
-| <% if proc_cert_class.mandatory_priv_modes.include?('S') -%> MANDATORY <% else -%> OUT-OF-SCOPE <% end -%>
-| <% if proc_cert_class.mandatory_priv_modes.include?('U') -%> MANDATORY <% else -%> OUT-OF-SCOPE <% end -%>
-| <% if proc_cert_class.mandatory_priv_modes.include?('VS') -%> MANDATORY <% else -%> OUT-OF-SCOPE <% end -%>
-| <% if proc_cert_class.mandatory_priv_modes.include?('VU') -%> MANDATORY <% else -%> OUT-OF-SCOPE <% end -%>
-
-|===
-
+<%= proc_cert_design.include_erb("related_specs.adoc.erb") %>
+<%= proc_cert_design.include_erb("priv_modes.adoc.erb") %>
 <<<
 == Extensions
 

backends/proc_ctp/tasks.rake

@@ -31,6 +31,8 @@ Dir.glob("#{$root}/arch/proc_cert_model/*.yaml") do |f|
     "#{$root}/backends/portfolio/templates/test_procedures.adoc.erb",
     "#{$root}/backends/proc_cert/templates/typographic.adoc.erb",
     "#{$root}/backends/proc_cert/templates/rev_history.adoc.erb",
+    "#{$root}/backends/proc_cert/templates/related_specs.adoc.erb",
+    "#{$root}/backends/proc_cert/templates/priv_modes.adoc.erb",
     "#{PROC_CTP_DOC_DIR}/templates/proc_ctp.adoc.erb"
   ] do |t|
     # Ensure that the required submodule repositories are up-to-date.

backends/proc_ctp/templates/proc_ctp.adoc.erb

@@ -82,6 +82,9 @@ The specific rules for updating the version number for a CTP are as follows:
 
 <%= proc_cert_design.include_erb("proc_naming_scheme.adoc.erb") %>
 
+<%= proc_cert_design.include_erb("related_specs.adoc.erb") %>
+<%= proc_cert_design.include_erb("priv_modes.adoc.erb") %>
+
 == Coverage Points
 
 This section contains a view of the coverage point information organized by kind