yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-07-06 10:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

qapi: Support downstream enums

Browse source 
Enhance the testsuite to cover a downstream enum type and enum
string. Update the generator to mangle the enum name in the
appropriate places.

Backports commit fce384b8e5193e02421f6b2c2880f3684abcbdc0 from qemu
This commit is contained in:
Eric Blake 2018-02-19 15:01:01 -05:00 committed by Lioncash
parent 2045cd0ada
commit 1a5b6a48d1
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
qemu/scripts/qapi-types.py
View file

@ -58,7 +58,7 @@ typedef struct %(name)sList
struct %(name)sList *next; struct %(name)sList *next;
} %(name)sList; } %(name)sList;
''', ''',
name=name) name=c_name(name))
def generate_struct_fields(members): def generate_struct_fields(members):
ret = '' ret = ''
@ -107,7 +107,7 @@ def generate_enum_lookup(name, values):
ret = mcgen(''' ret = mcgen('''
const char *%(name)s_lookup[] = { const char *%(name)s_lookup[] = {
''', ''',
name=name) name=c_name(name))
i = 0 i = 0
for value in values: for value in values:
ret += mcgen(''' ret += mcgen('''
@ -123,6 +123,7 @@ const char *%(name)s_lookup[] = {
return ret return ret
def generate_enum(name, values): def generate_enum(name, values):
name = c_name(name)
lookup_decl = mcgen(''' lookup_decl = mcgen('''
extern const char *%(name)s_lookup[]; extern const char *%(name)s_lookup[];
''', ''',
@ -238,15 +239,15 @@ extern const int %(name)s_qtypes[];
def generate_type_cleanup_decl(name): def generate_type_cleanup_decl(name):
ret = mcgen(''' ret = mcgen('''
void qapi_free_%(type)s(%(c_type)s obj); void qapi_free_%(name)s(%(c_type)s obj);
''', ''',
c_type=c_type(name),type=name) c_type=c_type(name), name=c_name(name))
return ret return ret
def generate_type_cleanup(name): def generate_type_cleanup(name):
ret = mcgen(''' ret = mcgen('''
void qapi_free_%(type)s(%(c_type)s obj) void qapi_free_%(name)s(%(c_type)s obj)
{ {
QapiDeallocVisitor *md; QapiDeallocVisitor *md;
Visitor *v; Visitor *v;
@ -257,11 +258,11 @@ void qapi_free_%(type)s(%(c_type)s obj)
md = qapi_dealloc_visitor_new(); md = qapi_dealloc_visitor_new();
v = qapi_dealloc_get_visitor(md); v = qapi_dealloc_get_visitor(md);
visit_type_%(type)s(v, &obj, NULL, NULL); visit_type_%(name)s(v, &obj, NULL, NULL);
qapi_dealloc_visitor_cleanup(md); qapi_dealloc_visitor_cleanup(md);
} }
''', ''',
c_type=c_type(name),type=name) c_type=c_type(name), name=c_name(name))
return ret return ret

8
qemu/scripts/qapi-visit.py
View file

@ -174,7 +174,7 @@ out:
error_propagate(errp, err); error_propagate(errp, err);
} }
''', ''',
name=name) name=type_name(name))
def generate_visit_enum(name, members): def generate_visit_enum(name, members):
return mcgen(''' return mcgen('''
@ -184,7 +184,7 @@ void visit_type_%(name)s(Visitor *m, %(name)s *obj, const char *name, Error **er
visit_type_enum(m, (int *)obj, %(name)s_lookup, "%(name)s", name, errp); visit_type_enum(m, (int *)obj, %(name)s_lookup, "%(name)s", name, errp);
} }
''', ''',
name=name) name=c_name(name))
def generate_visit_alternate(name, members): def generate_visit_alternate(name, members):
ret = mcgen(''' ret = mcgen('''
@ -366,7 +366,7 @@ def generate_enum_declaration(name, members):
ret = mcgen(''' ret = mcgen('''
void visit_type_%(name)sList(Visitor *m, %(name)sList **obj, const char *name, Error **errp); void visit_type_%(name)sList(Visitor *m, %(name)sList **obj, const char *name, Error **errp);
''', ''',
name=name) name=c_name(name))
return ret return ret
@ -375,7 +375,7 @@ def generate_decl_enum(name, members):
void visit_type_%(name)s(Visitor *m, %(name)s *obj, const char *name, Error **errp); void visit_type_%(name)s(Visitor *m, %(name)s *obj, const char *name, Error **errp);
''', ''',
name=name) name=c_name(name))
try: try:
opts, args = getopt.gnu_getopt(sys.argv[1:], "chbp:i:o:", opts, args = getopt.gnu_getopt(sys.argv[1:], "chbp:i:o:",