portugalfuturista/seL4
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tools: Support multiple methods with the same id

Browse source 
The check for both label and condition is there to handle cases like:

 enum invocation_label {
    Invalid,
 #if A
    LabelOne,
 #endif
 #if B
    LabelOne,
 #endif
 }

Co-authored-by: Indan Zupancic <Indan.Zupancic@mep-info.com>
Signed-off-by: Corey Lewis <corey.lewis@proofcraft.systems>
This commit is contained in:
Corey Lewis 2022-08-31 15:58:47 +10:00 committed by Indan Zupancic
parent f2ab32d203
commit ae11cf1450
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libsel4/tools/sel4_idl.xsd
View file

@ -40,6 +40,7 @@
<xsd:attribute name="name" type="xsd:string" use="required" /> <xsd:attribute name="name" type="xsd:string" use="required" />
<xsd:attribute name="manual_name" type="xsd:string" use="optional" /> <xsd:attribute name="manual_name" type="xsd:string" use="optional" />
<xsd:attribute name="cap_description" type="xsd:string" use="optional" /> <xsd:attribute name="cap_description" type="xsd:string" use="optional" />
<xsd:attribute name="duplicate" type="xsd:boolean" use="optional" />
</xsd:complexType> </xsd:complexType>

14
tools/invocation_header_gen.py
View file

@ -147,10 +147,18 @@ def parse_xml(xml_file):
sys.exit(-1) sys.exit(-1)
invocation_labels = [] invocation_labels = []
invocation_ids = set()
for method in doc.getElementsByTagName("method"): for method in doc.getElementsByTagName("method"):
invocation_labels.append((str(method.getAttribute("id")), label = str(method.getAttribute("id"))
str(condition_to_cpp(method.getElementsByTagName("condition"))))) condition = str(condition_to_cpp(method.getElementsByTagName("condition")))
uid = label + condition
dup = method.getAttribute("duplicate")
if uid not in invocation_ids:
invocation_ids.add(uid)
invocation_labels.append((label, condition))
elif dup not in ("true", "1"):
print("Error: Implicit duplicate id '%s' in xml file" % label, file=sys.stderr)
sys.exit(-1)
return invocation_labels return invocation_labels

2
tools/invocation_json_gen.py
View file

@ -32,7 +32,7 @@ def xml_to_json_invocations(xml, gen_config, counter, invocations_dict, ):
for method in xml.getElementsByTagName("method"): for method in xml.getElementsByTagName("method"):
label = str(method.getAttribute("id")) label = str(method.getAttribute("id"))
exists = condition_to_bool(method.getElementsByTagName("condition"), gen_config) exists = condition_to_bool(method.getElementsByTagName("condition"), gen_config)
if exists: if exists and label not in invocations_dict:
invocations_dict[label] = counter invocations_dict[label] = counter
counter += 1 counter += 1