yuzu-mirror/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-mirror/unicorn.git synced 2026-04-04 22:17:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

qapi: Add parameter to visit_end_*

Browse source 
Rather than making the dealloc visitor track of stack of pointers
remembered during visit_start_* in order to free them during
visit_end_*, it's a lot easier to just make all callers pass the
same pointer to visit_end_*. The generated code has access to the
same pointer, while all other users are doing virtual walks and
can pass NULL. The dealloc visitor is then greatly simplified.

All three visit_end_*() functions intentionally take a void**,
even though the visit_start_*() functions differ between void**,
GenericList**, and GenericAlternate**. This is done for several
reasons: when doing a virtual walk, passing NULL doesn't care
what the type is, but when doing a generated walk, we already
have to cast the caller's specific FOO* to call visit_start,
while using void** lets us use visit_end without a cast. Also,
an upcoming patch will add a clone visitor that wants to use
the same implementation for all three visit_end callbacks,
which is made easier if all three share the same signature.

For visitors with already track per-object state (the QMP visitors
via a stack, and the string visitors which do not allow nesting),
add an assertion that the caller is indeed passing the same
pointer to paired calls.

Backports commit 1158bb2a058fcdd0c8fc3e60dc77f7a57ddbb271 from qemu
This commit is contained in:
Eric Blake 2018-02-25 00:53:31 -05:00 • committed by Lioncash
parent 2ca07642f1
commit 37ae4dfdfd
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
10 changed files with 80 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,7 +47,7 @@ void visit_type_DummyForceArrays(Visitor *v, const char *name, DummyForceArrays
}
visit_check_struct(v, &err);
out_obj:
visit_end_struct(v);
visit_end_struct(v, (void **)obj);
if (err && visit_is_input(v)) {
qapi_free_DummyForceArrays(*obj);
*obj = NULL;
@ -114,7 +114,7 @@ void visit_type_X86CPUFeatureWordInfo(Visitor *v, const char *name, X86CPUFeatur
}
visit_check_struct(v, &err);
out_obj:
visit_end_struct(v);
visit_end_struct(v, (void **)obj);
if (err && visit_is_input(v)) {
qapi_free_X86CPUFeatureWordInfo(*obj);
*obj = NULL;
@ -144,7 +144,7 @@ void visit_type_X86CPUFeatureWordInfoList(Visitor *v, const char *name, X86CPUFe
error_propagate(errp, err);
err = NULL;
visit_end_list(v);
visit_end_list(v, (void **)obj);
if (err && visit_is_input(v)) {
qapi_free_X86CPUFeatureWordInfoList(*obj);
*obj = NULL;
@ -181,7 +181,7 @@ void visit_type_anyList(Visitor *v, const char *name, anyList **obj, Error **err
error_propagate(errp, err);
err = NULL;
visit_end_list(v);
visit_end_list(v, (void **)obj);
if (err && visit_is_input(v)) {
qapi_free_anyList(*obj);
*obj = NULL;
@ -211,7 +211,7 @@ void visit_type_boolList(Visitor *v, const char *name, boolList **obj, Error **e
error_propagate(errp, err);
err = NULL;
visit_end_list(v);
visit_end_list(v, (void **)obj);
if (err && visit_is_input(v)) {
qapi_free_boolList(*obj);
*obj = NULL;
@ -241,7 +241,7 @@ void visit_type_int16List(Visitor *v, const char *name, int16List **obj, Error *
error_propagate(errp, err);
err = NULL;
visit_end_list(v);
visit_end_list(v, (void **)obj);
if (err && visit_is_input(v)) {
qapi_free_int16List(*obj);
*obj = NULL;
@ -271,7 +271,7 @@ void visit_type_int32List(Visitor *v, const char *name, int32List **obj, Error *
error_propagate(errp, err);
err = NULL;
visit_end_list(v);
visit_end_list(v, (void **)obj);
if (err && visit_is_input(v)) {
qapi_free_int32List(*obj);
*obj = NULL;
@ -301,7 +301,7 @@ void visit_type_int64List(Visitor *v, const char *name, int64List **obj, Error *
error_propagate(errp, err);
err = NULL;
visit_end_list(v);
visit_end_list(v, (void **)obj);
if (err && visit_is_input(v)) {
qapi_free_int64List(*obj);
*obj = NULL;
@ -331,7 +331,7 @@ void visit_type_int8List(Visitor *v, const char *name, int8List **obj, Error **e
error_propagate(errp, err);
err = NULL;
visit_end_list(v);
visit_end_list(v, (void **)obj);
if (err && visit_is_input(v)) {
qapi_free_int8List(*obj);
*obj = NULL;
@ -361,7 +361,7 @@ void visit_type_intList(Visitor *v, const char *name, intList **obj, Error **err
error_propagate(errp, err);
err = NULL;
visit_end_list(v);
visit_end_list(v, (void **)obj);
if (err && visit_is_input(v)) {
qapi_free_intList(*obj);
*obj = NULL;
@ -391,7 +391,7 @@ void visit_type_numberList(Visitor *v, const char *name, numberList **obj, Error
error_propagate(errp, err);
err = NULL;
visit_end_list(v);
visit_end_list(v, (void **)obj);
if (err && visit_is_input(v)) {
qapi_free_numberList(*obj);
*obj = NULL;
@ -421,7 +421,7 @@ void visit_type_sizeList(Visitor *v, const char *name, sizeList **obj, Error **e
error_propagate(errp, err);
err = NULL;
visit_end_list(v);
visit_end_list(v, (void **)obj);
if (err && visit_is_input(v)) {
qapi_free_sizeList(*obj);
*obj = NULL;
@ -451,7 +451,7 @@ void visit_type_strList(Visitor *v, const char *name, strList **obj, Error **err
error_propagate(errp, err);
err = NULL;
visit_end_list(v);
visit_end_list(v, (void **)obj);
if (err && visit_is_input(v)) {
qapi_free_strList(*obj);
*obj = NULL;
@ -481,7 +481,7 @@ void visit_type_uint16List(Visitor *v, const char *name, uint16List **obj, Error
error_propagate(errp, err);
err = NULL;
visit_end_list(v);
visit_end_list(v, (void **)obj);
if (err && visit_is_input(v)) {
qapi_free_uint16List(*obj);
*obj = NULL;
@ -511,7 +511,7 @@ void visit_type_uint32List(Visitor *v, const char *name, uint32List **obj, Error
error_propagate(errp, err);
err = NULL;
visit_end_list(v);
visit_end_list(v, (void **)obj);
if (err && visit_is_input(v)) {
qapi_free_uint32List(*obj);
*obj = NULL;
@ -541,7 +541,7 @@ void visit_type_uint64List(Visitor *v, const char *name, uint64List **obj, Error
error_propagate(errp, err);
err = NULL;
visit_end_list(v);
visit_end_list(v, (void **)obj);
if (err && visit_is_input(v)) {
qapi_free_uint64List(*obj);
*obj = NULL;
@ -571,7 +571,7 @@ void visit_type_uint8List(Visitor *v, const char *name, uint8List **obj, Error *
error_propagate(errp, err);
err = NULL;
visit_end_list(v);
visit_end_list(v, (void **)obj);
if (err && visit_is_input(v)) {
qapi_free_uint8List(*obj);
*obj = NULL;