Skip to content
GitLab
Commit 0c46f836 authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Complete support of timer manager for simulation target

parent 0e9e0b81
Hide whitespace changes
Inline Side-by-side
templates/concurrency_view/aadl_4_makefile/block.tmplt
View file @ 0c46f836
...@@ -46,6 +46,11 @@ ...@@ -46,6 +46,11 @@
chmod +x $@ chmod +x $@
echo "./@_Partition_Name_@ & sleep 1 ; ./@_Name_@ ; pkill -INT @_Partition_Name_@" > ../binaries/run_@_Partition_Name_@_partition echo "./@_Partition_Name_@ & sleep 1 ; ./@_Name_@ ; pkill -INT @_Partition_Name_@" > ../binaries/run_@_Partition_Name_@_partition
chmod +x ../binaries/run_@_Partition_Name_@_partition chmod +x ../binaries/run_@_Partition_Name_@_partition
@@ELSIF@@ @_Language_@ = Timer_Manager and @_Target_@ = SIMU
@_LOWER:Name_@:
# Generate Ada code from SDL for the Timer Manager in simulation mode
$(MAKE) -j -C ../@_LOWER:Name_@/Timer_Manager generate-code
touch $@
@@ELSE@@ @@ELSE@@
@_LOWER:Name_@: @_LOWER:Name_@:
touch $@ touch $@
......
templates/concurrency_view/aadl_4_makefile/partition.tmplt
View file @ 0c46f836
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
@@-- If you have no internet access you can also use (with vim) Ctrl-W-f or gf in vim to open the text doc: @@-- If you have no internet access you can also use (with vim) Ctrl-W-f or gf in vim to open the text doc:
@@-- $HOME/tool-inst/share/kazoo/doc/templates_concurrency_view_sub_partition.ascii @@-- $HOME/tool-inst/share/kazoo/doc/templates_concurrency_view_sub_partition.ascii
@@TABLE@@ @@TABLE@@
@@IF@@ @_Block_Languages_@ = SDL @@IF@@ @_Block_Languages_@ = SDL or (@_Block_Languages_@ = Timer_Manager and @_Target_@ = SIMU)
@@SET@@ Has_SDL = TRUE @@SET@@ Has_SDL = TRUE
@@END_IF@@ @@END_IF@@
@@END_TABLE@@ @@END_TABLE@@
...@@ -54,12 +54,15 @@ ...@@ -54,12 +54,15 @@
@@END_IF@@ @@END_IF@@
touch $@ touch $@
@@IF@@ @_Target_@ = SIMU
@@-- For simulation target, add simulation.asn and uPER encoders @@-- For simulation target, add simulation.asn and uPER encoders
@_LOWER:Name_@_simu: @_REPLACE_ALL(,/ ):LOWER:Block_Names_@ @_LOWER:Name_@_simu: @_REPLACE_ALL(,/ ):LOWER:Block_Names_@
@@IF@@ @_Has_SDL_@ @@IF@@ @_Has_SDL_@
@@INLINE( args=$$\(python3 -c "import os, sys; print\(' '.join\({os.path.basename\(f\):f for f in sys.argv[1:]}.values\(\)\)\)" )( )(\); \\\n mkdir -p ..\/dataview\/Ada; asn1scc -Ada -uPER -equal --target allboards -typePrefix asn1Scc -o ..\/dataview\/Ada $$args ; taste-asn1-gser -o ..\/dataview\/Ada\/src --raw $$args)@@ @@INLINE( args=$$\(python3 -c "import os, sys; print\(' '.join\({os.path.basename\(f\):f for f in sys.argv[1:]}.values\(\)\)\)" )( )(\); \\\n mkdir -p ..\/dataview\/Ada; asn1scc -Ada -uPER -equal --target allboards -typePrefix asn1Scc -o ..\/dataview\/Ada $$args ; taste-asn1-gser -o ..\/dataview\/Ada\/src --raw $$args)@@
@@TABLE@@ @@TABLE@@
@@IF@@ @_Block_Languages_@ = SDL @@IF@@ @_Block_Languages_@ = Timer_Manager
../@_LOWER:Block_Names_@/Timer_Manager/code/@_LOWER:Block_Names_@_datamodel.asn
@@ELSIF@@ @_Block_Languages_@ = SDL
@@-- Use wildcard because in the case of the SDL to C backend the _datamodel files are not generated (yet) @@-- Use wildcard because in the case of the SDL to C backend the _datamodel files are not generated (yet)
@@IF@@ @_Block_Instance_Of_@ = "" @@IF@@ @_Block_Instance_Of_@ = ""
${wildcard ../@_LOWER:Block_Names_@/SDL/code/@_LOWER:Block_Names_@_datamodel.asn} ${wildcard ../@_LOWER:Block_Names_@/SDL/code/@_LOWER:Block_Names_@_datamodel.asn}
...@@ -75,6 +78,7 @@ ...@@ -75,6 +78,7 @@
@@END_INLINE@@ @@END_INLINE@@
@@END_IF@@ @@END_IF@@
touch $@ touch $@
@@END_IF@@ @@-- simu target
@@IF@@ @_CPU_Platform_@ = PLATFORM_LEON_RTEMS_POSIX or @_CPU_Platform_@ = PLATFORM_AIR or @_CPU_Platform_@ = PLATFORM_RPI @@IF@@ @_CPU_Platform_@ = PLATFORM_LEON_RTEMS_POSIX or @_CPU_Platform_@ = PLATFORM_AIR or @_CPU_Platform_@ = PLATFORM_RPI
# Build of partition @_Name_@ with the additional generation of adainit symbol # Build of partition @_Name_@ with the additional generation of adainit symbol
......
templates/concurrency_view/simulation_dataview/system.tmplt
View file @ 0c46f836
...@@ -12,7 +12,7 @@ BEGIN ...@@ -12,7 +12,7 @@ BEGIN
-- Import the SDL function states needed for the global system state -- Import the SDL function states needed for the global system state
@@INLINE( )(\n )()@@ @@INLINE( )(\n )()@@
@@TABLE'ALIGN_ON(" ")@@ @@TABLE'ALIGN_ON(" ")@@
@@IF@@ @_Block_Languages_@ = SDL @@IF@@ @_Block_Languages_@ = SDL or @_Block_Languages_@ = Timer_Manager
@@IF@@ @_Block_Instance_Of_@ /= "" @@IF@@ @_Block_Instance_Of_@ /= ""
@_CAPITALIZE:REPLACE_ALL(_/-):Block_Instance_Of_@-Context FROM @_CAPITALIZE:REPLACE_ALL(_/-):Block_Instance_Of_@-Datamodel @_CAPITALIZE:REPLACE_ALL(_/-):Block_Instance_Of_@-Context FROM @_CAPITALIZE:REPLACE_ALL(_/-):Block_Instance_Of_@-Datamodel
@@ELSE@@ @@ELSE@@
...@@ -82,7 +82,7 @@ BEGIN ...@@ -82,7 +82,7 @@ BEGIN
@@END_INLINE@@ @@END_INLINE@@
@@INLINE( )(,\n )()@@ @@INLINE( )(,\n )()@@
@@TABLE'ALIGN_ON(" ")@@ @@TABLE'ALIGN_ON(" ")@@
@@IF@@ @_Block_Languages_@ = SDL @@IF@@ @_Block_Languages_@ = SDL or @_Block_Languages_@ = Timer_Manager
@@IF@@ @_Block_Instance_Of_@ /= "" @@IF@@ @_Block_Instance_Of_@ /= ""
@_LOWER:REPLACE_ALL(_/-):Block_Names_@ @_CAPITALIZE:REPLACE_ALL(_/-):Block_Instance_Of_@-Context @_LOWER:REPLACE_ALL(_/-):Block_Names_@ @_CAPITALIZE:REPLACE_ALL(_/-):Block_Instance_Of_@-Context
@@ELSE@@ @@ELSE@@
......
templates/concurrency_view/simulation_gpr/partition.tmplt
View file @ 0c46f836
...@@ -42,6 +42,9 @@ library project @_CAPITALIZE:Name_@_Simulator is ...@@ -42,6 +42,9 @@ library project @_CAPITALIZE:Name_@_Simulator is
@@IF@@ @_Block_Languages_@ = SDL @@IF@@ @_Block_Languages_@ = SDL
"../../@_LOWER:Block_Names_@/SDL/code", "../../@_LOWER:Block_Names_@/SDL/code",
"../../@_LOWER:Block_Names_@/SDL/wrappers", "../../@_LOWER:Block_Names_@/SDL/wrappers",
@@ELSIF@@ @_Block_Languages_@ = Timer_Manager
"../../@_LOWER:Block_Names_@/Timer_Manager/code",
"../../@_LOWER:Block_Names_@/Timer_Manager/wrappers",
@@ELSE@@ @@ELSE@@
@@IF@@ @_Block_Languages_@ /= GUI @@IF@@ @_Block_Languages_@ /= GUI
@@-- Don't compile the GUI C source code, not used in simulation mode @@-- Don't compile the GUI C source code, not used in simulation mode
......
templates/glue/language_wrappers/ri_adb/trigger.tmplt
View file @ 0c46f836
...@@ -3,6 +3,6 @@ ...@@ -3,6 +3,6 @@
@@-- If you are using vim, go over the URL and pres gx in to follow the link @@-- If you are using vim, go over the URL and pres gx in to follow the link
@@-- If you have no internet access you can also use (with vim) Ctrl-W-f or gf in vim to open the text doc: @@-- If you have no internet access you can also use (with vim) Ctrl-W-f or gf in vim to open the text doc:
@@-- $HOME/tool-inst/share/kazoo/doc/templates_skeletons_sub_trigger.ascii @@-- $HOME/tool-inst/share/kazoo/doc/templates_skeletons_sub_trigger.ascii
@@IF@@ (@_EXIST:List_Of_RIs_@ or @_EXIST:Timers_@) and not @_Is_Type_@ and (@_Language_@ = Ada or @_Language_@ = SDL or (@_Language_@ = GUI and @_Target_@ = SIMU)) @@IF@@ (@_EXIST:List_Of_RIs_@ or @_EXIST:Timers_@) and not @_Is_Type_@ and (@_Language_@ = Ada or @_Language_@ = SDL or ((@_Language_@ = GUI or @_Language_@ = Timer_Manager) and @_Target_@ = SIMU))
TRUE TRUE
@@END_IF@@ @@END_IF@@
templates/glue/language_wrappers/simu_pi_adb/interface.tmplt
View file @ 0c46f836
...@@ -17,7 +17,7 @@ procedure @_CAPITALIZE:Name_@ ...@@ -17,7 +17,7 @@ procedure @_CAPITALIZE:Name_@
@@END_TABLE@@ @@END_TABLE@@
@@END_INLINE@@ @@END_INLINE@@
@@IF@@ @_Language_@ /= GUI @@IF@@ @_Language_@ /= GUI
@@IF@@ @_Language_@ = SDL @@IF@@ @_Language_@ = SDL or @_Language_@ = Timer_Manager
-- Set the current context (provided by the simulation API) -- Set the current context (provided by the simulation API)
@@IF@@ @_Parent_Instance_Of_@ = "" @@IF@@ @_Parent_Instance_Of_@ = ""
@_CAPITALIZE:Parent_Function_@.Ctxt := Global_State.@_CAPITALIZE:Parent_Function_@; @_CAPITALIZE:Parent_Function_@.Ctxt := Global_State.@_CAPITALIZE:Parent_Function_@;
...@@ -25,13 +25,17 @@ procedure @_CAPITALIZE:Name_@ ...@@ -25,13 +25,17 @@ procedure @_CAPITALIZE:Name_@
@_CAPITALIZE:Parent_Function_@.@_CAPITALIZE:Parent_Function_@_Instance.Ctxt := Global_State.@_CAPITALIZE:Parent_Function_@; @_CAPITALIZE:Parent_Function_@.@_CAPITALIZE:Parent_Function_@_Instance.Ctxt := Global_State.@_CAPITALIZE:Parent_Function_@;
@@END_IF@@ @@END_IF@@
@@END_IF@@ @@END_IF@@
@@IF@@ @_Language_@ = Ada or @_Language_@ = SDL or @_Language_@ = Timer_Manager
@_CAPITALIZE:Parent_Function_@.@_CAPITALIZE:Name_@ @_CAPITALIZE:Parent_Function_@.@_CAPITALIZE:Name_@
@@ELSE@@
C_@_CAPITALIZE:Name_@
@@END_IF@@
@@INLINE( \()(,\n )(\);)@@ @@INLINE( \()(,\n )(\);)@@
@@TABLE'ALIGN_ON("=>")@@ @@TABLE'ALIGN_ON("=>")@@
@_CAPITALIZE:Param_Names_@ => @_CAPITALIZE:Param_Names_@ @_CAPITALIZE:Param_Names_@ => @_CAPITALIZE:Param_Names_@
@@END_TABLE@@ @@END_TABLE@@
@@END_INLINE@@ @@END_INLINE@@
@@IF@@ @_Language_@ = SDL @@IF@@ @_Language_@ = SDL or @_Language_@ = Timer_Manager
-- Update the global state -- Update the global state
@@IF@@ @_Parent_Instance_Of_@ = "" @@IF@@ @_Parent_Instance_Of_@ = ""
Global_State.@_CAPITALIZE:Parent_Function_@ := @_CAPITALIZE:Parent_Function_@.Ctxt; Global_State.@_CAPITALIZE:Parent_Function_@ := @_CAPITALIZE:Parent_Function_@.Ctxt;
...@@ -47,7 +51,7 @@ procedure @_CAPITALIZE:Name_@ ...@@ -47,7 +51,7 @@ procedure @_CAPITALIZE:Name_@
procedure @_CAPITALIZE:Name_@ (Global_State : in out asn1SccSystem_State) is procedure @_CAPITALIZE:Name_@ (Global_State : in out asn1SccSystem_State) is
begin begin
@@IF@@ @_Language_@ /= GUI @@IF@@ @_Language_@ /= GUI
@@IF@@ @_Language_@ = SDL @@IF@@ @_Language_@ = SDL or @_Language_@ = Timer_Manager
-- Set the current context (provided by the simulation API) -- Set the current context (provided by the simulation API)
@@IF@@ @_Parent_Instance_Of_@ = "" @@IF@@ @_Parent_Instance_Of_@ = ""
@_CAPITALIZE:Parent_Function_@.Ctxt := Global_State.@_CAPITALIZE:Parent_Function_@; @_CAPITALIZE:Parent_Function_@.Ctxt := Global_State.@_CAPITALIZE:Parent_Function_@;
...@@ -55,8 +59,12 @@ begin ...@@ -55,8 +59,12 @@ begin
@_CAPITALIZE:Parent_Function_@.@_CAPITALIZE:Parent_Function_@_Instance.Ctxt := Global_State.@_CAPITALIZE:Parent_Function_@; @_CAPITALIZE:Parent_Function_@.@_CAPITALIZE:Parent_Function_@_Instance.Ctxt := Global_State.@_CAPITALIZE:Parent_Function_@;
@@END_IF@@ @@END_IF@@
@@END_IF@@ @@END_IF@@
@@IF@@ @_Language_@ = Ada or @_Language_@ = SDL or @_Language_@ = Timer_Manager
@_CAPITALIZE:Parent_Function_@.@_CAPITALIZE:Name_@; @_CAPITALIZE:Parent_Function_@.@_CAPITALIZE:Name_@;
@@IF@@ @_Language_@ = SDL @@ELSE@@
C_@_CAPITALIZE:Name_@;
@@END_IF@@
@@IF@@ @_Language_@ = SDL or @_Language_@ = Timer_Manager
-- Update the global state -- Update the global state
@@IF@@ @_Parent_Instance_Of_@ = "" @@IF@@ @_Parent_Instance_Of_@ = ""
Global_State.@_CAPITALIZE:Parent_Function_@ := @_CAPITALIZE:Parent_Function_@.Ctxt; Global_State.@_CAPITALIZE:Parent_Function_@ := @_CAPITALIZE:Parent_Function_@.Ctxt;
......
templates/glue/language_wrappers/simu_pi_ads/function.tmplt
View file @ 0c46f836
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
with @_CAPITALIZE:ASN1_Modules_@; use @_CAPITALIZE:ASN1_Modules_@; with @_CAPITALIZE:ASN1_Modules_@; use @_CAPITALIZE:ASN1_Modules_@;
@@END_TABLE@@ @@END_TABLE@@
with Simulation_Dataview; use Simulation_Dataview; with Simulation_Dataview; use Simulation_Dataview;
@@IF@@ @_Language_@ = Ada or @_Language_@ = SDL @@IF@@ @_Language_@ = Ada or @_Language_@ = SDL or @_Language_@ = Timer_Manager
with @_CAPITALIZE:Name_@; with @_CAPITALIZE:Name_@;
@@END_IF@@ @@END_IF@@
...@@ -16,9 +16,9 @@ package @_CAPITALIZE:Name_@_PI is ...@@ -16,9 +16,9 @@ package @_CAPITALIZE:Name_@_PI is
-- Interface to the simulation API -- Interface to the simulation API
procedure Startup (Global_State : in out asn1SccSystem_State); procedure Startup (Global_State : in out asn1SccSystem_State);
@@IF@@ @_EXIST:Provided_Interfaces_@ and @_Language_@ /= "Blackbox_C" @@IF@@ @_EXIST:Provided_Interfaces_@ and @_Language_@ /= "Blackbox_C"
-- Provided interfaces -- Provided interfaces
@_Provided_Interfaces'Indent_@ @_Provided_Interfaces'Indent_@
@@END_IF@@ @@END_IF@@
end @_CAPITALIZE:Name_@_PI; end @_CAPITALIZE:Name_@_PI;
templates/glue/language_wrappers/simu_pi_ads/interface.tmplt
View file @ 0c46f836
...@@ -16,7 +16,26 @@ procedure @_CAPITALIZE:Name_@ ...@@ -16,7 +16,26 @@ procedure @_CAPITALIZE:Name_@
@@END_IF@@ @@END_IF@@
@@END_TABLE@@ @@END_TABLE@@
@@END_INLINE@@ @@END_INLINE@@
@@ELSE@@ @@IF@@ @_Language_@ /= Ada and @_Language_@ /= SDL and @_Language_@ /= Timer_Manager
@@-- for non-Ada functions we must import the C symbol of the PI
-- Interface to the C implementation of the interface
procedure C_@_CAPITALIZE:Name_@
@@INLINE( \()(;\n )(\)\n)@@
@@TABLE'ALIGN_ON(":")@@
@@IF@@ @_Param_Directions_@ = "PARAM_IN"
@_CAPITALIZE:Param_Names_@ : in out asn1Scc@_CAPITALIZE:REPLACE_ALL(-/_):Param_Types_@
@@ELSE@@
@_CAPITALIZE:Param_Names_@ : out asn1Scc@_CAPITALIZE:REPLACE_ALL(-/_):Param_Types_@
@@END_IF@@
@@END_TABLE@@
@@END_INLINE@@
with Import, Convention => C, Link_Name => "@_LOWER:Parent_Function_@_PI_@_Name_@";
@@END_IF@@ @@-- non-Ada/SDL
@@ELSE@@ @@-- no params
procedure @_CAPITALIZE:Name_@ (Global_State : in out asn1SccSystem_State); procedure @_CAPITALIZE:Name_@ (Global_State : in out asn1SccSystem_State);
@@IF@@ @_Language_@ /= Ada and @_Language_@ /= SDL and @_Language_@ /= Timer_Manager
procedure C_@_CAPITALIZE:Name_@
with Import, Convention => C, Link_Name => "@_LOWER:Parent_Function_@_PI_@_Name_@";
@@END_IF@@
@@END_IF@@ @@END_IF@@
@@END_IF@@ @@END_IF@@
templates/skeletons/ada-ri-source/function-filename.tmplt
View file @ 0c46f836
@@-- OpenGEODE's generate code goes into the "code" folder @@-- OpenGEODE's generate code goes into the "code" folder
@@IF@@ @_Language_@ = SDL @@IF@@ @_Language_@ = SDL or @_Language_@ = Timer_Manager
../code/@_LOWER:Name_@_ri.ads ../code/@_LOWER:Name_@_ri.ads
@@ELSE@@ @@ELSE@@
@_LOWER:Name_@_ri.ads @_LOWER:Name_@_ri.ads
templates/skeletons/ada-ri-source/function.tmplt
View file @ 0c46f836
...@@ -14,6 +14,7 @@ package @_CAPITALIZE:Name_@_RI is ...@@ -14,6 +14,7 @@ package @_CAPITALIZE:Name_@_RI is
@_Required_Interfaces'Indent_@ @_Required_Interfaces'Indent_@
@@IF@@ @_Language_@ /= Timer_Manager
@@TABLE@@ @@TABLE@@
-- Timer @_Timers_@ Set and Reset functions -- Timer @_Timers_@ Set and Reset functions
procedure Set_@_CAPITALIZE:Timers_@ (Val : in out asn1SccT_UInt32); procedure Set_@_CAPITALIZE:Timers_@ (Val : in out asn1SccT_UInt32);
...@@ -21,6 +22,7 @@ package @_CAPITALIZE:Name_@_RI is ...@@ -21,6 +22,7 @@ package @_CAPITALIZE:Name_@_RI is
procedure Reset_@_CAPITALIZE:Timers_@; procedure Reset_@_CAPITALIZE:Timers_@;
@@END_TABLE@@ @@END_TABLE@@
@@END_IF@@
procedure Check_Queue (Res : out adaasn1rtl.Asn1Boolean) procedure Check_Queue (Res : out adaasn1rtl.Asn1Boolean)
with Import, Convention => C, Link_Name => "@_LOWER:Name_@_check_queue"; with Import, Convention => C, Link_Name => "@_LOWER:Name_@_check_queue";
end @_CAPITALIZE:Name_@_RI; end @_CAPITALIZE:Name_@_RI;
templates/skeletons/ada-ri-source/trigger.tmplt
View file @ 0c46f836
@@IF@@ (@_Language_@ = Ada or @_Language_@ = SDL) and not @_Is_Type_@ @@IF@@ (@_Language_@ = Ada or @_Language_@ = SDL or (@_Language_@ = Timer_Manager and @_Target_@ = SIMU)) and not @_Is_Type_@
TRUE TRUE
@@END_IF@@ @@END_IF@@
Supports Markdown
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