prove rom test

ref #80
Componolit · Aug 27, 2019 · aad2620 · aad2620
1 parent 9f6fa1b
commit aad2620
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/src/rom/client/muen/componolit-gneiss-rom-client.adb b/src/rom/client/muen/componolit-gneiss-rom-client.adb
@@ -18,16 +18,20 @@ is
       Rom_Name : constant Musinfo.Name_Type :=
          (if Name = "" then CIM.String_To_Name ("config") else CIM.String_To_Name (Name));
    begin
-      C.Mem := Musinfo.Instance.Memory_By_Name (Rom_Name);
+      if Musinfo.Instance.Is_Valid then
+         C.Mem := Musinfo.Instance.Memory_By_Name (Rom_Name);
+      end if;
    end Initialize;
 
    procedure Load (C : in out Client_Session)
    is
       use type Standard.Interfaces.Unsigned_64;
       function Max_Index (Size : Standard.Interfaces.Unsigned_64) return Index is
-         (if Standard.Interfaces.Unsigned_64 (Index'Last) > Size then Index (Size) else Index'Last);
+         (if Standard.Interfaces.Unsigned_64 (Index'Last - Index'First) > Size
+          and then Standard.Interfaces.Unsigned_64 (Index'Last) <= Size then Index (Size) else Index'Last);
       I : constant Index := Max_Index (C.Mem.Size / (Element'Size / 8));
       B : Buffer (Index'First .. Index'First + I - 1) with
+         Import,
          Address => System'To_Address (C.Mem.Address);
    begin
       Parse (B);

diff --git a/src/rom/muen/componolit-gneiss-rom.adb b/src/rom/muen/componolit-gneiss-rom.adb
@@ -1,5 +1,6 @@
 
 with Musinfo;
+with Musinfo.Instance;
 
 package body Componolit.Gneiss.Rom with
    SPARK_Mode
@@ -8,6 +9,7 @@ is
    use type Musinfo.Memregion_Type;
 
    function Initialized (C : Client_Session) return Boolean is
-      (C.Mem /= Musinfo.Null_Memregion);
+      (Musinfo.Instance.Is_Valid
+       and then C.Mem /= Musinfo.Null_Memregion);
 
 end Componolit.Gneiss.Rom;
diff --git a/test/rom/component.adb b/test/rom/component.adb
@@ -37,12 +37,19 @@ is
       if not Componolit.Gneiss.Log.Initialized (Log) and then Data'Length > 1 then
          for I in Data'Range loop
             if Data (I) = ASCII.LF then
-               Last := I - 1;
+               if I > Data'First then
+                  Last := I - 1;
+               else
+                  Last := Data'First;
+               end if;
                exit;
             end if;
          end loop;
          Componolit.Gneiss.Log.Client.Initialize (Log, C, Data (Data'First .. Last));
          if Componolit.Gneiss.Log.Initialized (Log) then
+            if Data (Data'First .. Last)'Length > Componolit.Gneiss.Log.Maximum_Message_Length (Log) - 35 then
+               Last := Data'First + (Componolit.Gneiss.Log.Maximum_Message_Length (Log) - 36);
+            end if;
             Componolit.Gneiss.Log.Client.Info (Log, "Log session configured with label: "
                                                         & Data (Data'First .. Last));
          else