Commit 3d9c83a8 authored by yoogx's avatar yoogx

Merge branch 'master' of https://github.com/yoogx/ocarina

parents 4d26965d 3df08854
...@@ -186,7 +186,7 @@ if test $# != 0 ; then ...@@ -186,7 +186,7 @@ if test $# != 0 ; then
;; ;;
--lcov|-l) --lcov|-l)
lcov -d . -c -o ocarina.gcov-info -t ocarina lcov -d . -c -o ocarina.gcov-info -t ocarina
genhtml ocarina.gcov-info -o html -s -f genhtml -o html -s -f ocarina.gcov-info
exit 0 exit 0
;; ;;
--clean|-c) --clean|-c)
......
...@@ -73,6 +73,7 @@ property set POK is ...@@ -73,6 +73,7 @@ property set POK is
Available_BSP : type enumeration Available_BSP : type enumeration
( (
x86_qemu, x86_qemu,
x86_qemu_vmm,
prep, prep,
leon3 leon3
); );
...@@ -110,7 +111,7 @@ property set POK is ...@@ -110,7 +111,7 @@ property set POK is
Additional_Features : list of POK::Supported_Additional_Features applies to (virtual processor, processor); Additional_Features : list of POK::Supported_Additional_Features applies to (virtual processor, processor);
Supported_Additional_Features: type enumeration (libmath, libc_stdlib, libc_stdio, libc_string, io, pci, console, libc); Supported_Additional_Features: type enumeration (libmath, libc_stdlib, libc_stdio, libc_string, io, pci, console, libc, x86_vmm);
Des_Key : aadlstring applies to (virtual bus); Des_Key : aadlstring applies to (virtual bus);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2012 ESA & ISAE. -- -- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- -- -- --
-- 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 --
...@@ -1225,6 +1225,32 @@ package body Ocarina.Backends.POK_C.Deployment is ...@@ -1225,6 +1225,32 @@ package body Ocarina.Backends.POK_C.Deployment is
Set_Deployment_Header; Set_Deployment_Header;
end if; end if;
if Get_Name_String
(ATN.Name
(ATN.Identifier (S))) = "x86_vmm"
then
CTU.Pop_Entity;
CTU.Pop_Entity;
Push_Entity (Kernel_Unit);
Set_Deployment_Header;
N := CTU.Make_Define_Statement
(Defining_Identifier =>
RE (RE_Pok_Needs_X86_Vmm),
Value => CTU.Make_Literal
(CV.New_Int_Value (1, 1, 10)));
CTU.Append_Node_To_List
(N, CTN.Declarations (CTU.Current_File));
Pop_Entity;
CTU.Push_Entity (P);
CTU.Push_Entity (U);
Set_Deployment_Header;
end if;
S := ATN.Next_Node (S); S := ATN.Next_Node (S);
end loop; end loop;
end; end;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2012 ESA & ISAE. -- -- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- -- -- --
-- 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 --
...@@ -658,6 +658,8 @@ package body Ocarina.Backends.POK_C.Makefile is ...@@ -658,6 +658,8 @@ package body Ocarina.Backends.POK_C.Makefile is
case BSP is case BSP is
when POK_BSP_x86_qemu => when POK_BSP_x86_qemu =>
Write_Line ("export BSP=x86-qemu"); Write_Line ("export BSP=x86-qemu");
when POK_BSP_x86_qemu_vmm =>
Write_Line ("export BSP=x86-qemu-vmm");
when POK_BSP_Leon => when POK_BSP_Leon =>
Write_Line ("export BSP=leon3"); Write_Line ("export BSP=leon3");
when POK_BSP_prep => when POK_BSP_prep =>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2012 ESA & ISAE. -- -- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- -- -- --
-- 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 --
...@@ -204,6 +204,7 @@ package Ocarina.Backends.POK_C.Runtime is ...@@ -204,6 +204,7 @@ package Ocarina.Backends.POK_C.Runtime is
RE_Pok_Needs_Ports_Virtual, -- POK_NEEDS_PORTS_VIRTUAL RE_Pok_Needs_Ports_Virtual, -- POK_NEEDS_PORTS_VIRTUAL
RE_Pok_Needs_Gettick, -- POK_NEEDS_GETTICK RE_Pok_Needs_Gettick, -- POK_NEEDS_GETTICK
RE_Pok_Needs_Ports_Queueing, -- POK_NEEDS_PORTS_QUEUEING RE_Pok_Needs_Ports_Queueing, -- POK_NEEDS_PORTS_QUEUEING
RE_Pok_Needs_X86_Vmm, -- POK_NEEDS_X86_VMM
RE_Pok_Errno_Empty, -- POK_ERRNO_EMPTY RE_Pok_Errno_Empty, -- POK_ERRNO_EMPTY
RE_Pok_Errno_Ok, -- POK_ERRNO_OK RE_Pok_Errno_Ok, -- POK_ERRNO_OK
RE_Pok_Hw_Addr, -- POK_HW_ADDR RE_Pok_Hw_Addr, -- POK_HW_ADDR
...@@ -712,6 +713,7 @@ package Ocarina.Backends.POK_C.Runtime is ...@@ -712,6 +713,7 @@ package Ocarina.Backends.POK_C.Runtime is
RE_Pok_Needs_Ports_Virtual => RH_Deployment, RE_Pok_Needs_Ports_Virtual => RH_Deployment,
RE_Pok_Needs_Gettick => RH_Null, RE_Pok_Needs_Gettick => RH_Null,
RE_Pok_Needs_Ports_Queueing => RH_Deployment, RE_Pok_Needs_Ports_Queueing => RH_Deployment,
RE_Pok_Needs_X86_Vmm => RH_Deployment,
RE_Pok_Errno_Empty => RH_Errno, RE_Pok_Errno_Empty => RH_Errno,
RE_Pok_Errno_Ok => RH_Errno, RE_Pok_Errno_Ok => RH_Errno,
RE_Pok_Hw_Addr => RH_Deployment, RE_Pok_Hw_Addr => RH_Deployment,
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2013 ESA & ISAE. -- -- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- -- -- --
-- 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 --
...@@ -366,6 +366,7 @@ package body Ocarina.Backends.Properties is ...@@ -366,6 +366,7 @@ package body Ocarina.Backends.Properties is
POK_Arch_x86_Name : Name_Id; POK_Arch_x86_Name : Name_Id;
POK_BSP_x86_qemu_Name : Name_Id; POK_BSP_x86_qemu_Name : Name_Id;
POK_BSP_x86_qemu_vmm_Name : Name_Id;
POK_Arch_Sparc_Name : Name_Id; POK_Arch_Sparc_Name : Name_Id;
POK_BSP_Leon_Name : Name_Id; POK_BSP_Leon_Name : Name_Id;
POK_Arch_ppc_Name : Name_Id; POK_Arch_ppc_Name : Name_Id;
...@@ -3485,6 +3486,7 @@ package body Ocarina.Backends.Properties is ...@@ -3485,6 +3486,7 @@ package body Ocarina.Backends.Properties is
POK_Arch_x86_Name := Get_String_Name ("x86"); POK_Arch_x86_Name := Get_String_Name ("x86");
POK_BSP_x86_qemu_Name := Get_String_Name ("x86_qemu"); POK_BSP_x86_qemu_Name := Get_String_Name ("x86_qemu");
POK_BSP_x86_qemu_vmm_Name := Get_String_Name ("x86_qemu_vmm");
POK_Arch_Sparc_Name := Get_String_Name ("sparc"); POK_Arch_Sparc_Name := Get_String_Name ("sparc");
POK_BSP_Leon_Name := Get_String_Name ("leon3"); POK_BSP_Leon_Name := Get_String_Name ("leon3");
POK_Arch_ppc_Name := Get_String_Name ("ppc"); POK_Arch_ppc_Name := Get_String_Name ("ppc");
...@@ -3631,6 +3633,8 @@ package body Ocarina.Backends.Properties is ...@@ -3631,6 +3633,8 @@ package body Ocarina.Backends.Properties is
if P_Name = POK_BSP_x86_qemu_Name then if P_Name = POK_BSP_x86_qemu_Name then
return POK_BSP_x86_qemu; return POK_BSP_x86_qemu;
elsif P_Name = POK_BSP_x86_qemu_vmm_Name then
return POK_BSP_x86_qemu_vmm;
elsif P_Name = POK_BSP_prep_Name then elsif P_Name = POK_BSP_prep_Name then
return POK_BSP_prep; return POK_BSP_prep;
elsif P_Name = POK_BSP_Leon_Name then elsif P_Name = POK_BSP_Leon_Name then
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2013 ESA & ISAE. -- -- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- -- -- --
-- 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 --
...@@ -116,6 +116,7 @@ package Ocarina.Backends.Properties is ...@@ -116,6 +116,7 @@ package Ocarina.Backends.Properties is
type Supported_POK_BSP is type Supported_POK_BSP is
(POK_BSP_x86_qemu, (POK_BSP_x86_qemu,
POK_BSP_x86_qemu_vmm,
POK_BSP_Leon, POK_BSP_Leon,
POK_BSP_prep, POK_BSP_prep,
Invalid_BSP); Invalid_BSP);
......
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