Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
Ocarina
Commits
3823e343
Commit
3823e343
authored
May 18, 2014
by
Jerome Hugues
Browse files
Merge pull request #14 from phipse/master
New POK BSP x86_qemu_vmm and new additional feature x86_vmm
parents
d295b794
43ea2502
Changes
6
Hide whitespace changes
Inline
Side-by-side
resources/AADLv2/pok_properties.aadl
View file @
3823e343
...
...
@@ -73,6 +73,7 @@ property set POK is
Available_BSP : type enumeration
(
x86_qemu,
x86_qemu_vmm,
prep,
leon3
);
...
...
@@ -110,7 +111,7 @@ property set POK is
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);
...
...
src/backends/ocarina-backends-pok_c-deployment.adb
View file @
3823e343
...
...
@@ -1224,6 +1224,32 @@ package body Ocarina.Backends.POK_C.Deployment is
Set_Deployment_Header
;
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
);
end
loop
;
...
...
src/backends/ocarina-backends-pok_c-makefile.adb
View file @
3823e343
...
...
@@ -658,6 +658,8 @@ package body Ocarina.Backends.POK_C.Makefile is
case
BSP
is
when
POK_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
=>
Write_Line
(
"export BSP=leon3"
);
when
POK_BSP_prep
=>
...
...
src/backends/ocarina-backends-pok_c-runtime.ads
View file @
3823e343
...
...
@@ -204,6 +204,7 @@ package Ocarina.Backends.POK_C.Runtime is
RE_Pok_Needs_Ports_Virtual
,
-- POK_NEEDS_PORTS_VIRTUAL
RE_Pok_Needs_Gettick
,
-- POK_NEEDS_GETTICK
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_Ok
,
-- POK_ERRNO_OK
RE_Pok_Hw_Addr
,
-- POK_HW_ADDR
...
...
@@ -712,6 +713,7 @@ package Ocarina.Backends.POK_C.Runtime is
RE_Pok_Needs_Ports_Virtual
=>
RH_Deployment
,
RE_Pok_Needs_Gettick
=>
RH_Null
,
RE_Pok_Needs_Ports_Queueing
=>
RH_Deployment
,
RE_Pok_Needs_X86_Vmm
=>
RH_Deployment
,
RE_Pok_Errno_Empty
=>
RH_Errno
,
RE_Pok_Errno_Ok
=>
RH_Errno
,
RE_Pok_Hw_Addr
=>
RH_Deployment
,
...
...
src/backends/ocarina-backends-properties.adb
View file @
3823e343
...
...
@@ -366,6 +366,7 @@ package body Ocarina.Backends.Properties is
POK_Arch_x86_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_BSP_Leon_Name
:
Name_Id
;
POK_Arch_ppc_Name
:
Name_Id
;
...
...
@@ -3485,6 +3486,7 @@ package body Ocarina.Backends.Properties is
POK_Arch_x86_Name
:=
Get_String_Name
(
"x86"
);
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_BSP_Leon_Name
:=
Get_String_Name
(
"leon3"
);
POK_Arch_ppc_Name
:=
Get_String_Name
(
"ppc"
);
...
...
@@ -3631,6 +3633,8 @@ package body Ocarina.Backends.Properties is
if
P_Name
=
POK_BSP_x86_qemu_Name
then
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
return
POK_BSP_prep
;
elsif
P_Name
=
POK_BSP_Leon_Name
then
...
...
src/backends/ocarina-backends-properties.ads
View file @
3823e343
...
...
@@ -116,6 +116,7 @@ package Ocarina.Backends.Properties is
type
Supported_POK_BSP
is
(
POK_BSP_x86_qemu
,
POK_BSP_x86_qemu_vmm
,
POK_BSP_Leon
,
POK_BSP_prep
,
Invalid_BSP
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment