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

qapi: Shorter visits of optional fields

Browse source 
For less code, reflect the determined boolean value of an optional
visit back to the caller instead of making the caller read the
boolean after the fact.

The resulting generated code has the following diff:

|- visit_optional(v, &has_fdset_id, "fdset-id");
|- if (has_fdset_id) {
|+ if (visit_optional(v, &has_fdset_id, "fdset-id")) {
| visit_type_int(v, &fdset_id, "fdset-id", &err);
| if (err) {
| goto out;
| }
| }

Backports commit 29637a6ee913df8fcdf371426ee48956b945b618 from qemu
This commit is contained in:
Eric Blake 2018-02-19 22:02:43 -05:00 committed by Lioncash
parent f3d2380f6d
commit 994490d197
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
msvc/unicorn/qapi-visit.c
View file

@ -62,8 +62,7 @@ static void visit_type_X86CPUFeatureWordInfo_fields(Visitor *v, X86CPUFeatureWor
if (err) {
goto out;
}
visit_optional(v, &(*obj)->has_cpuid_input_ecx, "cpuid-input-ecx");
if ((*obj)->has_cpuid_input_ecx) {
if (visit_optional(v, &(*obj)->has_cpuid_input_ecx, "cpuid-input-ecx")) {
visit_type_int(v, &(*obj)->cpuid_input_ecx, "cpuid-input-ecx", &err);
if (err) {
goto out;

4
qemu/include/qapi/visitor.h
View file

@ -41,9 +41,9 @@ void visit_end_list(Visitor *v);
* Check if an optional member @name of an object needs visiting.
* For input visitors, set *@present according to whether the
* corresponding visit_type_*() needs calling; for other visitors,
* leave *@present unchanged.
* leave *@present unchanged. Return *@present for convenience.
*/
void visit_optional(Visitor *v, bool *present, const char *name);
bool visit_optional(Visitor *v, bool *present, const char *name);
/**
* Determine the qtype of the item @name in the current object visit.

3
qemu/qapi/qapi-visit-core.c
View file

@ -74,11 +74,12 @@ void visit_end_union(Visitor *v, bool data_present, Error **errp)
}
}
void visit_optional(Visitor *v, bool *present, const char *name)
bool visit_optional(Visitor *v, bool *present, const char *name)
{
if (v->optional) {
v->optional(v, present, name);
}
return *present;
}
void visit_get_next_type(Visitor *v, QType *type, bool promote_int,

3
qemu/scripts/qapi.py
View file

@ -1656,8 +1656,7 @@ def gen_visit_fields(members, prefix='', need_cast=False, skiperr=False):
for memb in members:
if memb.optional:
ret += mcgen('''
visit_optional(v, &%(prefix)shas_%(c_name)s, "%(name)s");
if (%(prefix)shas_%(c_name)s) {
if (visit_optional(v, &%(prefix)shas_%(c_name)s, "%(name)s")) {
''',
prefix=prefix, c_name=c_name(memb.name),
name=memb.name, errp=errparg)