From 5ed76afa814812edaeaff2ea7b3227c18d5de5a6 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Tue, 4 Aug 2020 12:29:59 +0200 Subject: pkg/compiler: check for unused resources If a resource is never used as an input, it is not useful. It's effectively the same as using an integer. Detect such cases, they are quite confusing. Fix all existing errors in descriptions. This uncovered some interesting bugs as well, e.g. use of a completely unrelated fd subtype after copy-paste (while the resource that was supposed to be used there is completely unused). --- sys/openbsd/dev_pf.txt | 7 ++----- sys/openbsd/dev_speaker.txt | 4 ++-- sys/openbsd/wscons.txt | 6 ++---- 3 files changed, 6 insertions(+), 11 deletions(-) (limited to 'sys/openbsd') diff --git a/sys/openbsd/dev_pf.txt b/sys/openbsd/dev_pf.txt index 93ce99b06..c07e9d95d 100644 --- a/sys/openbsd/dev_pf.txt +++ b/sys/openbsd/dev_pf.txt @@ -10,9 +10,6 @@ include include # The following ioctl commands are restricted in neutralize(), see init.go. -_ = DIOCCLRSTATES -_ = DIOCKILLSTATES +_ = DIOCCLRSTATES, DIOCKILLSTATES -resource fd_pf[fd] - -openat$pf(fd const[AT_FDCWD], file ptr[in, string["/dev/pf"]], flags flags[open_flags], mode const[0]) fd_pf +openat$pf(fd const[AT_FDCWD], file ptr[in, string["/dev/pf"]], flags flags[open_flags], mode const[0]) fd diff --git a/sys/openbsd/dev_speaker.txt b/sys/openbsd/dev_speaker.txt index 9da2c2253..9cffbc745 100644 --- a/sys/openbsd/dev_speaker.txt +++ b/sys/openbsd/dev_speaker.txt @@ -11,8 +11,8 @@ resource fd_speaker[fd] openat$speaker(fd const[AT_FDCWD], file ptr[in, string["/dev/speaker"]], flags flags[open_flags], mode const[0]) fd_speaker -ioctl$SPKRTONE(fd fd_diskmap, cmd const[SPKRTONE], arg ptr[in, tone]) -ioctl$SPKRTUNE(fd fd_diskmap, cmd const[SPKRTUNE], arg ptr[in, tone]) +ioctl$SPKRTONE(fd fd_speaker, cmd const[SPKRTONE], arg ptr[in, tone]) +ioctl$SPKRTUNE(fd fd_speaker, cmd const[SPKRTUNE], arg ptr[in, tone]) tone { frequency int32 diff --git a/sys/openbsd/wscons.txt b/sys/openbsd/wscons.txt index 128db9227..a2cc9784c 100644 --- a/sys/openbsd/wscons.txt +++ b/sys/openbsd/wscons.txt @@ -87,10 +87,8 @@ ioctl$WSMOUSEIO_SETMODE(fd fd_wsmouse, cmd const[WSMOUSEIO_SETMODE], arg ptr[in, ioctl$WSMOUSEIO_SETPARAMS(fd fd_wsmouse, cmd const[WSMOUSEIO_SETPARAMS], arg ptr[in, wsmouse_parameters]) ioctl$WSMOUSEIO_SRES(fd fd_wsmouse, cmd const[WSMOUSEIO_SRES], arg ptr[in, int32]) -resource fd_wsmux[fd] - -openat$wsmuxkbd(fd const[AT_FDCWD], file ptr[in, string["/dev/wskbd"]], flags flags[open_flags], mode const[0]) fd_wsmux -openat$wsmuxmouse(fd const[AT_FDCWD], file ptr[in, string["/dev/wsmouse"]], flags flags[open_flags], mode const[0]) fd_wsmux +openat$wsmuxkbd(fd const[AT_FDCWD], file ptr[in, string["/dev/wskbd"]], flags flags[open_flags], mode const[0]) fd +openat$wsmuxmouse(fd const[AT_FDCWD], file ptr[in, string["/dev/wsmouse"]], flags flags[open_flags], mode const[0]) fd wsmux_device { type flags[wsmux_device_flags, int32] -- cgit mrf-deployment