mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-24 03:59:52 +00:00
668f62ec62
When all we do with an Error we receive into a local variable is
propagating to somewhere else, we can just as well receive it there
right away. Convert
if (!foo(..., &err)) {
...
error_propagate(errp, err);
...
return ...
}
to
if (!foo(..., errp)) {
...
...
return ...
}
where nothing else needs @err. Coccinelle script:
@rule1 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
binary operator op;
constant c1, c2;
symbol false;
@@
if (
(
- fun(args, &err, args2)
+ fun(args, errp, args2)
|
- !fun(args, &err, args2)
+ !fun(args, errp, args2)
|
- fun(args, &err, args2) op c1
+ fun(args, errp, args2) op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
)
}
@rule2 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
expression var;
binary operator op;
constant c1, c2;
symbol false;
@@
- var = fun(args, &err, args2);
+ var = fun(args, errp, args2);
... when != err
if (
(
var
|
!var
|
var op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
|
return var;
)
}
@depends on rule1 || rule2@
identifier err;
@@
- Error *err = NULL;
... when != err
Not exactly elegant, I'm afraid.
The "when != lbl:" is necessary to avoid transforming
if (fun(args, &err)) {
goto out
}
...
out:
error_propagate(errp, err);
even though other paths to label out still need the error_propagate().
For an actual example, see sclp_realize().
Without the "when strict", Coccinelle transforms vfio_msix_setup(),
incorrectly. I don't know what exactly "when strict" does, only that
it helps here.
The match of return is narrower than what I want, but I can't figure
out how to express "return where the operand doesn't use @err". For
an example where it's too narrow, see vfio_intx_enable().
Silently fails to convert hw/arm/armsse.c, because Coccinelle gets
confused by ARMSSE being used both as typedef and function-like macro
there. Converted manually.
Line breaks tidied up manually. One nested declaration of @local_err
deleted manually. Preexisting unwanted blank line dropped in
hw/riscv/sifive_e.c.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-35-armbru@redhat.com>
108 lines
2.9 KiB
C
108 lines
2.9 KiB
C
/*
|
|
* QEMU model of the Canon DIGIC SoC.
|
|
*
|
|
* Copyright (C) 2013 Antony Pavlov <antonynpavlov@gmail.com>
|
|
*
|
|
* This model is based on reverse engineering efforts
|
|
* made by CHDK (http://chdk.wikia.com) and
|
|
* Magic Lantern (http://www.magiclantern.fm) projects
|
|
* contributors.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/module.h"
|
|
#include "hw/arm/digic.h"
|
|
#include "hw/qdev-properties.h"
|
|
#include "sysemu/sysemu.h"
|
|
|
|
#define DIGIC4_TIMER_BASE(n) (0xc0210000 + (n) * 0x100)
|
|
|
|
#define DIGIC_UART_BASE 0xc0800000
|
|
|
|
static void digic_init(Object *obj)
|
|
{
|
|
DigicState *s = DIGIC(obj);
|
|
int i;
|
|
|
|
object_initialize_child(obj, "cpu", &s->cpu, ARM_CPU_TYPE_NAME("arm946"));
|
|
|
|
for (i = 0; i < DIGIC4_NB_TIMERS; i++) {
|
|
#define DIGIC_TIMER_NAME_MLEN 11
|
|
char name[DIGIC_TIMER_NAME_MLEN];
|
|
|
|
snprintf(name, DIGIC_TIMER_NAME_MLEN, "timer[%d]", i);
|
|
object_initialize_child(obj, name, &s->timer[i], TYPE_DIGIC_TIMER);
|
|
}
|
|
|
|
object_initialize_child(obj, "uart", &s->uart, TYPE_DIGIC_UART);
|
|
}
|
|
|
|
static void digic_realize(DeviceState *dev, Error **errp)
|
|
{
|
|
DigicState *s = DIGIC(dev);
|
|
SysBusDevice *sbd;
|
|
int i;
|
|
|
|
if (!object_property_set_bool(OBJECT(&s->cpu), "reset-hivecs", true,
|
|
errp)) {
|
|
return;
|
|
}
|
|
|
|
if (!qdev_realize(DEVICE(&s->cpu), NULL, errp)) {
|
|
return;
|
|
}
|
|
|
|
for (i = 0; i < DIGIC4_NB_TIMERS; i++) {
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->timer[i]), errp)) {
|
|
return;
|
|
}
|
|
|
|
sbd = SYS_BUS_DEVICE(&s->timer[i]);
|
|
sysbus_mmio_map(sbd, 0, DIGIC4_TIMER_BASE(i));
|
|
}
|
|
|
|
qdev_prop_set_chr(DEVICE(&s->uart), "chardev", serial_hd(0));
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->uart), errp)) {
|
|
return;
|
|
}
|
|
|
|
sbd = SYS_BUS_DEVICE(&s->uart);
|
|
sysbus_mmio_map(sbd, 0, DIGIC_UART_BASE);
|
|
}
|
|
|
|
static void digic_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
|
|
|
dc->realize = digic_realize;
|
|
/* Reason: Uses serial_hds in the realize function --> not usable twice */
|
|
dc->user_creatable = false;
|
|
}
|
|
|
|
static const TypeInfo digic_type_info = {
|
|
.name = TYPE_DIGIC,
|
|
.parent = TYPE_DEVICE,
|
|
.instance_size = sizeof(DigicState),
|
|
.instance_init = digic_init,
|
|
.class_init = digic_class_init,
|
|
};
|
|
|
|
static void digic_register_types(void)
|
|
{
|
|
type_register_static(&digic_type_info);
|
|
}
|
|
|
|
type_init(digic_register_types)
|