Commit 04696050 authored by julien.delange's avatar julien.delange

* fix everything of the case-study rasta that broke the code

   generation



git-svn-id: https://tecsw.estec.esa.int/svn/taste/trunk/ocarina@507 129961e7-ef38-4bb5-a8f7-c9a525a55882
parent 174ab517
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2008-2009, GET-Telecom Paris. -- -- Copyright (C) 2008-2010, GET-Telecom Paris. --
-- -- -- --
-- Ocarina is free software; you can redistribute it and/or modify -- -- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the -- -- it under terms of the GNU General Public License as published by the --
...@@ -154,12 +154,20 @@ package body Ocarina.Backends.C_Common.Subprograms is ...@@ -154,12 +154,20 @@ package body Ocarina.Backends.C_Common.Subprograms is
--------------------------- ---------------------------
procedure Visit_Device_Instance (E : Node_Id) is procedure Visit_Device_Instance (E : Node_Id) is
U : constant Node_Id := CTN.Distributed_Application_Unit U : Node_Id;
(CTN.Naming_Node (Backend_Node (Identifier (E)))); P : Node_Id;
P : constant Node_Id := CTN.Entity (U);
Implementation : Node_Id; Implementation : Node_Id;
S : Node_Id; S : Node_Id;
begin begin
if Get_Current_Backend_Kind /= PolyORB_Kernel_C then
return;
end if;
U := CTN.Distributed_Application_Unit
(CTN.Naming_Node (Backend_Node (Identifier (E))));
P := CTN.Entity (U);
Push_Entity (P); Push_Entity (P);
Push_Entity (U); Push_Entity (U);
...@@ -805,12 +813,21 @@ package body Ocarina.Backends.C_Common.Subprograms is ...@@ -805,12 +813,21 @@ package body Ocarina.Backends.C_Common.Subprograms is
--------------------------- ---------------------------
procedure Visit_Device_Instance (E : Node_Id) is procedure Visit_Device_Instance (E : Node_Id) is
U : constant Node_Id := CTN.Distributed_Application_Unit U : Node_Id;
(CTN.Naming_Node (Backend_Node (Identifier (E)))); P : Node_Id;
P : constant Node_Id := CTN.Entity (U);
Implementation : Node_Id; Implementation : Node_Id;
S : Node_Id; S : Node_Id;
begin begin
if Get_Current_Backend_Kind /= PolyORB_Kernel_C then
return;
end if;
U := CTN.Distributed_Application_Unit
(CTN.Naming_Node (Backend_Node (Identifier (E))));
P := CTN.Entity (U);
Push_Entity (P); Push_Entity (P);
Push_Entity (U); Push_Entity (U);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2008-2009, GET-Telecom Paris. -- -- Copyright (C) 2008-2010, GET-Telecom Paris. --
-- -- -- --
-- Ocarina is free software; you can redistribute it and/or modify -- -- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the -- -- it under terms of the GNU General Public License as published by the --
...@@ -207,12 +207,20 @@ package body Ocarina.Backends.C_Common.Types is ...@@ -207,12 +207,20 @@ package body Ocarina.Backends.C_Common.Types is
--------------------------- ---------------------------
procedure Visit_Device_Instance (E : Node_Id) is procedure Visit_Device_Instance (E : Node_Id) is
U : constant Node_Id := CTN.Distributed_Application_Unit U : Node_Id;
(CTN.Naming_Node (Backend_Node (Identifier (E)))); P : Node_Id;
P : constant Node_Id := CTN.Entity (U);
Implementation : Node_Id; Implementation : Node_Id;
S : Node_Id; S : Node_Id;
begin begin
if Get_Current_Backend_Kind /= PolyORB_Kernel_C then
return;
end if;
U := CTN.Distributed_Application_Unit
(CTN.Naming_Node (Backend_Node (Identifier (E))));
P := CTN.Entity (U);
Push_Entity (P); Push_Entity (P);
Push_Entity (U); Push_Entity (U);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2008-2009, GET-Telecom Paris. -- -- Copyright (C) 2008-2010, GET-Telecom Paris. --
-- -- -- --
-- Ocarina is free software; you can redistribute it and/or modify -- -- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the -- -- it under terms of the GNU General Public License as published by the --
...@@ -424,7 +424,7 @@ package body Ocarina.Backends.PO_HI_C.Naming is ...@@ -424,7 +424,7 @@ package body Ocarina.Backends.PO_HI_C.Naming is
-- connections. -- connections.
if Transport_API /= Transport_None and then if Transport_API /= Transport_None and then
Transport_API /= Get_Transport_API (B) Transport_API /= Get_Transport_API (B, E)
then then
Display_Located_Error Display_Located_Error
(Loc (Parent_Subcomponent (E)), (Loc (Parent_Subcomponent (E)),
...@@ -434,7 +434,7 @@ package body Ocarina.Backends.PO_HI_C.Naming is ...@@ -434,7 +434,7 @@ package body Ocarina.Backends.PO_HI_C.Naming is
& " for now.", & " for now.",
Fatal => True); Fatal => True);
else else
Transport_API := Get_Transport_API (B); Transport_API := Get_Transport_API (B, E);
-- If we have a bus for which no -- If we have a bus for which no
-- transport layer has been specified, -- transport layer has been specified,
......
...@@ -2418,7 +2418,7 @@ package body Ocarina.Backends.Properties is ...@@ -2418,7 +2418,7 @@ package body Ocarina.Backends.Properties is
return Transport_None; return Transport_None;
end if; end if;
pragma Assert (Is_Bus (B)); pragma Assert (Is_Bus (B) or else Is_Virtual_Bus (B));
if Present (E) then if Present (E) then
Root_Sys := Parent_Component (Parent_Subcomponent (E)); Root_Sys := Parent_Component (Parent_Subcomponent (E));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment