From b33d98bec4aad7879282d8fedfd04c164ac2da4a Mon Sep 17 00:00:00 2001
From: Laura Gouveia <lasequeiragouveia@gmv.com>
Date: Sun, 9 Feb 2020 13:38:43 +0000
Subject: [PATCH 1/2] Added visibility for TASTE IV Properties on Concurrency
View Block template.
---
src/taste-concurrency_view.adb | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/taste-concurrency_view.adb b/src/taste-concurrency_view.adb
index 1c10ef83..76abec98 100644
--- a/src/taste-concurrency_view.adb
+++ b/src/taste-concurrency_view.adb
@@ -357,6 +357,8 @@ package body TASTE.Concurrency_View is
Unpro_PI_Tag : Unbounded_String;
RI_Tag : Unbounded_String;
Result : Unbounded_String;
+ Property_Names,
+ Property_Values : Vector_Tag;
-- Optionally generate block code in separate files
-- (if fileblock.tmplt present and contains a filename)
@@ -380,6 +382,12 @@ package body TASTE.Concurrency_View is
Block_Instance_Of := Block_Instance_Of
& B.Ref_Function.Instance_Of.Value_Or (US (""));
+ for TASTE_property of B.Ref_Function.User_Properties loop
+ Property_Names := Property_Names & TASTE_property.Name;
+ Property_Values := Property_Values
+ & TASTE_property.Value;
+ end loop;
+
for PI_Assoc of Tmpl.Protected_Provided loop
Document_Template
(Templates_Concurrency_View_Sub_PI,
@@ -412,7 +420,9 @@ package body TASTE.Concurrency_View is
Partition.Deployment_Partition.Name)
& Assoc ("Protected_PIs", Pro_PI_Tag)
& Assoc ("Unprotected_PIs", Unpro_PI_Tag)
- & Assoc ("Required", RI_Tag);
+ & Assoc ("Required", RI_Tag)
+ & Assoc ("Property_Names", Property_Names)
+ & Assoc ("Property_Values", Property_Values);
Result := Parse (Path & "/block.tmplt", Block_Assoc);
Document_Template
--
GitLab
From 390b3e1162cb99f53b20ede6be3bd3454cde800a Mon Sep 17 00:00:00 2001
From: Laura Gouveia <lasequeiragouveia@gmv.com>
Date: Sun, 9 Feb 2020 13:39:18 +0000
Subject: [PATCH 2/2] Added visibility for FPGA Configurations TASTE IV
Property on Concurrency View Partition template.
---
src/taste-concurrency_view.adb | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/taste-concurrency_view.adb b/src/taste-concurrency_view.adb
index 76abec98..12cdfe07 100644
--- a/src/taste-concurrency_view.adb
+++ b/src/taste-concurrency_view.adb
@@ -227,7 +227,8 @@ package body TASTE.Concurrency_View is
Thread_Has_Param : Vector_Tag;
Block_Names,
Block_Languages,
- Block_Instance_Of : Vector_Tag;
+ Block_Instance_Of,
+ Block_FPGAConf : Vector_Tag;
Blocks : Unbounded_String;
Part_Threads : Unbounded_String;
Partition_Assoc : Translate_Set;
@@ -386,8 +387,19 @@ package body TASTE.Concurrency_View is
Property_Names := Property_Names & TASTE_property.Name;
Property_Values := Property_Values
& TASTE_property.Value;
+ if TASTE_property.Name =
+ "TASTE_IV_Properties::FPGA_Configurations"
+ then
+ Block_FPGAConf := Block_FPGAConf &
+ TASTE_property.Value;
+ end if;
end loop;
+ if Size (Block_FPGAConf) /= Size (Block_Names)
+ then
+ Block_FPGAConf := Block_FPGAConf & "";
+ end if;
+
for PI_Assoc of Tmpl.Protected_Provided loop
Document_Template
(Templates_Concurrency_View_Sub_PI,
@@ -461,6 +473,7 @@ package body TASTE.Concurrency_View is
& Assoc ("Block_Names", Block_Names)
& Assoc ("Block_Languages", Block_Languages)
& Assoc ("Block_Instance_Of", Block_Instance_Of)
+ & Assoc ("Block_FPGAConf", Block_FPGAConf)
& Assoc ("In_Port_Names", Input_Port_Names)
& Assoc ("In_Port_Thread_Name", Input_Port_Thread_Name)
& Assoc ("In_Port_Type_Name", Input_Port_Type_Name)
--
GitLab