From: Maxime Ripard <maxime.ripard@bootlin.com>
To: Julia Lawall <julia.lawall@lip6.fr>
Cc: cocci@systeme.lip6.fr
Subject: Re: [Cocci] Substitution of function call to structure parameter
Date: Tue, 12 Mar 2019 12:01:14 +0100 [thread overview]
Message-ID: <20190312110114.i4cdrtaznc4phacn@flea> (raw)
In-Reply-To: <alpine.DEB.2.21.1903120950170.2728@hadrien>
[-- Attachment #1.1: Type: text/plain, Size: 2805 bytes --]
Hi Julia,
Thanks a lot for your answer,
On Tue, Mar 12, 2019 at 10:03:57AM +0100, Julia Lawall wrote:
> > @@
> > expression arg;
> > identifier fb;
> > @@
> > ...
> > struct drm_framebuffer *fb;
> > ...
> > - drm_format_num_planes(arg)
> > + fb->format->num_planes
> >
> > // This one seems to work in some cases, such as
> > // https://elixir.bootlin.com/linux/v5.0/source/drivers/gpu/drm/vc4/vc4_plane.c#L490
> > // But it also matches in cases where fb hasn't been properly assigned before, such as:
> > // https://elixir.bootlin.com/linux/v5.0/source/drivers/gpu/drm/tegra/fb.c#L142
>
> OK, it looks like what you want is:
>
> @@
> struct drm_framebuffer *fb;
> expression e.
> @@
>
> fb = e;
> <...
> - drm_format_num_planes(arg)
> + fb->format->num_planes
> ...>
>
> That is, you find an assignment of fb, and then anywhere after that you
> have a call, you can replace it. This is <... ...> rather than <+...
> ...+> so that it can match several 0 or more occurrences.
It looks however that there's a difference between a variable
declaration and assignment, and only an assignment.
The snippet above doesn't match
https://elixir.bootlin.com/linux/v5.0/source/drivers/gpu/drm/vc4/vc4_plane.c#L490
Whereas using
@@
identifier fb;
expression arg;
expression e;
@@
struct drm_framebuffer *fb = e;
<...
- drm_format_num_planes(arg)
+ fb->format->num_planes
...>
Work for example. Is there a way to match both an assignment and a
declaration + assignment?
The following script covers all cases now:
@@
identifier fn;
identifier dev, cmd;
@@
fn (struct drm_device *dev,
...,
struct drm_mode_fb_cmd2 *cmd,
...)
{
+ const struct drm_format_info *info = drm_get_format_info(dev, cmd);
<+...
- drm_format_num_planes(cmd->pixel_format)
+ info->num_planes
...+>
}
@@
struct drm_framebuffer *fb;
@@
- drm_format_num_planes(fb->format->format)
+ fb->format->num_planes
@@
identifier fb;
expression arg;
expression e;
@@
struct drm_framebuffer *fb = e;
<...
- drm_format_num_planes(arg)
+ fb->format->num_planes
...>
@@
struct drm_format_info *info;
@@
- drm_format_num_planes(info->format)
+ info->num_planes
@@
identifier val;
expression arg;
@@
{
+ const struct drm_format_info *info;
<+...
- val = drm_format_num_planes(arg);
+ info = drm_format_info(arg);
+ val = info->num_planes;
...+>
}
@ rfunc @
identifier f = drm_format_num_planes;
identifier fourcc;
typedef uint32_t;
@@
- int f(uint32_t fourcc)
- {
- ...
- }
@@
identifier rfunc.f;
declarer name EXPORT_SYMBOL;
@@
- EXPORT_SYMBOL(f);
Thanks again!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
[-- Attachment #2: Type: text/plain, Size: 136 bytes --]
_______________________________________________
Cocci mailing list
Cocci@systeme.lip6.fr
https://systeme.lip6.fr/mailman/listinfo/cocci
next prev parent reply other threads:[~2019-03-12 11:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-12 8:31 [Cocci] Substitution of function call to structure parameter Maxime Ripard
2019-03-12 9:03 ` Julia Lawall
2019-03-12 11:01 ` Maxime Ripard [this message]
2019-03-12 11:20 ` Julia Lawall
2019-03-12 13:48 ` Maxime Ripard
2019-03-12 13:54 ` Julia Lawall
2019-03-12 13:52 ` Maxime Ripard
2019-03-12 13:58 ` Julia Lawall
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190312110114.i4cdrtaznc4phacn@flea \
--to=maxime.ripard@bootlin.com \
--cc=cocci@systeme.lip6.fr \
--cc=julia.lawall@lip6.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).