move add_array_lens to VHDL

Author: 1138-4EB

VUnit/run.py

@@ -12,21 +12,8 @@
 
 vu.set_generic('tb_cfg_file', '../Data/Boards1.json')
 
-def add_array_lens(obj):
-    if isinstance(obj, list):
-        if isinstance(obj[0], int) and not isinstance(obj[0], bool):
-            obj = [len(obj)] + obj
-        else:
-            for i in range(len(obj)):
-                obj[i] = add_array_lens(obj[i])
-    else:
-        if isinstance(obj, dict):
-            for key, val in obj.items():
-                obj[key] = add_array_lens(val)
-    return obj
-
 import json
 generics = json.loads(open('../Data/Boards0.json', 'r').read())
-vu.set_generic("tb_cfg", json.dumps(add_array_lens(generics), separators=(',', ':')))
+vu.set_generic("tb_cfg", json.dumps(generics, separators=(',', ':')))
 
 vu.main()

vhdl/JSON.pkg.vhdl

@@ -104,6 +104,8 @@ package JSON is
 	function jsonGetBoolean(JSONContext : T_JSON; Path : STRING) return BOOLEAN;
 	function jsonGetString(JSONContext : T_JSON; Path : STRING) return STRING;
 	function jsonGetIntegerArray(JSONContext : T_JSON; Path : string) return integer_vector;
+	function jsonGetIntegerArray(JSONContext : T_JSON; Path : string; Len : positive) return integer_vector;
+--	function jsonGetRealArray(JSONContext : T_JSON; Path : string) return real_vector;
 
 	function jsonIsBoolean(JSONContext : T_JSON; Path : STRING) return BOOLEAN;
 	function jsonIsNull(JSONContext : T_JSON; Path : STRING) return BOOLEAN;
@@ -1486,7 +1488,7 @@ package body JSON is
 				end if;	-- Index = 0
 				for j in 1 to Index loop
 					if (IndexElement.NextIndex = 0) then
-						report "jsonGetElementIndex: Reached last element in chain." severity FAILURE;
+						report "jsonGetElementIndex: Reached last element in chain." severity NOTE; --FAILURE
 						return 0;
 					end if;
 					IndexElement		:= JSONContext.Index(IndexElement.NextIndex);
@@ -1622,15 +1624,24 @@ package body JSON is
 
 	-- function to get a integer_vector from the compressed content extracted from a JSON input
 	function jsonGetIntegerArray(JSONContext : T_JSON; Path : string) return integer_vector is
-	  constant len: positive:=to_natural_dec( jsonGetString(JSONContext, Path & "/0") );
-	  variable return_value : integer_vector(len-1 downto 0);
+	  variable len: natural:=0;
 	begin
-	  for i in 1 to len loop
-	    return_value(i-1) := to_natural_dec(jsonGetString(JSONContext, Path & "/" & to_string(i)));
+	  while jsonIsNumber(JSONContext, Path & "/" & to_string(len)) loop
+	    len := len+1;
 	  end loop;
-	  return return_value;
+	  return jsonGetIntegerArray(JSONContext, Path, len);
 	end;
 
+	-- function to get a integer_vector of a fixed length from the compressed content extracted from a JSON input
+	function jsonGetIntegerArray(JSONContext : T_JSON; Path : string; Len : positive) return integer_vector is
+	  variable return_value : integer_vector(Len-1 downto 0);
+	begin
+	  for i in 0 to Len-1 loop
+	    return_value(i) := to_natural_dec(jsonGetString(JSONContext, Path & "/" & to_string(i)));
+	  end loop;
+	  return return_value;
+	end function;
+
 	function jsonIsBoolean(JSONContext : T_JSON; Path : STRING) return BOOLEAN is
 		constant ElementIndex	: T_UINT16							:= jsonGetElementIndex(JSONContext, Path);
 		constant Element			: T_JSON_INDEX_ELEMENT	:= JSONContext.Index(ElementIndex);