Move VMX_Timer_Rate from Skp.Scheduling to Skp.Arch

Generate VMX_Timer_Rate constant in Skp.Arch package instead of
Skp.Scheduling.

Author: Kensan

mugenspec/data/skp-arch.ads

@@ -4,6 +4,7 @@
 package Skp.Arch
 is
 
-   Vmxon_Address : constant := 16#1000#;
+   Vmxon_Address  : constant := 16#1000#;
+   VMX_Timer_Rate : constant := 5;
 
 end Skp.Arch;

mugenspec/data/skp-scheduling.ads

@@ -7,8 +7,6 @@ with SK;
 package Skp.Scheduling
 is
 
-   VMX_Timer_Rate : constant := 5;
-
    Max_Groups_Per_Partition : constant := 64;
 
    type Scheduling_Partition_Range is range 1 .. 3;

mugenspec/src/spec-skp_arch.adb

@@ -16,6 +16,8 @@
 --  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 --
 
+with Ada.Strings.Fixed;
+
 with Interfaces;
 
 with Mulog;
@@ -42,6 +44,12 @@ is
               XPath => "/system/memory/memory[@type='system_vmxon' and "
               & "contains(string(@name),'kernel_0')]",
               Name  => "physicalAddress"));
+      Timer_Rate : constant Natural
+        := Natural'Value
+          (Muxml.Utils.Get_Attribute
+             (Doc   => Policy.Doc,
+              XPath => "/system/hardware/processor",
+              Name  => "vmxTimerRate"));
 
       Tmpl : Mutools.Templates.Template_Type;
    begin
@@ -54,6 +62,12 @@ is
         (Template => Tmpl,
          Pattern  => "__vmxon_addr__",
          Content  => Mutools.Utils.To_Hex (Number => VMXON_Addr));
+      Mutools.Templates.Replace
+        (Template => Tmpl,
+         Pattern  => "__vmx_timer_rate__",
+         Content  => Ada.Strings.Fixed.Trim
+           (Source => Timer_Rate'Img,
+            Side   => Ada.Strings.Left));
       Mutools.Templates.Write
         (Template => Tmpl,
          Filename => Output_Dir & "/" & Filename);

mugenspec/src/spec-skp_scheduling.adb

@@ -108,10 +108,6 @@ is
           (DOM.Core.Elements.Get_Attribute
              (Elem => Processor,
               Name => "speed"));
-      Timer_Rate   : constant Natural
-        := Natural'Value
-          (DOM.Core.Elements.Get_Attribute (Elem => Processor,
-                                            Name => "vmxTimerRate"));
       Timer_Factor : constant Interfaces.Unsigned_64
         := CPU_Speed_Hz / Interfaces.Unsigned_64'Value
           (DOM.Core.Elements.Get_Attribute
@@ -564,12 +560,6 @@ is
       Max_Minor_Count   := Get_Max_Minor_Count (Schedule => Scheduling);
       Max_Barrier_Count := Get_Max_Barrier_Count (Schedule => Scheduling);
 
-      TMPL.Stream (Template => Template);
-      TMPL.Write
-        (Template => Template,
-         Item     => Ada.Strings.Fixed.Trim
-           (Source => Timer_Rate'Img,
-            Side   => Ada.Strings.Left));
       TMPL.Stream (Template => Template);
       TMPL.Write
         (Template => Template,

mugenspec/templates/skp-arch.ads

@@ -4,6 +4,7 @@
 package Skp.Arch
 is
 
-   Vmxon_Address : constant := __vmxon_addr__;
+   Vmxon_Address  : constant := __vmxon_addr__;
+   VMX_Timer_Rate : constant := __vmx_timer_rate__;
 
 end Skp.Arch;

mugenspec/templates/skp-scheduling-x86_64.ads

@@ -7,8 +7,6 @@ with SK;
 package Skp.Scheduling
 is
 
-   VMX_Timer_Rate : constant := __vmx_timer_rate__;
-
    Max_Groups_Per_Partition : constant := __max_groups_per_partition__;
 
    type Scheduling_Partition_Range is range __scheduling_partition_range__;