mailing list of musl libc
 help / color / mirror / code / Atom feed
From: Bobby Bingham <koorogi@koorogi.info>
To: musl@lists.openwall.com
Subject: Deduplicating __NR_* and SYS_* syscall defines
Date: Mon, 9 May 2016 19:26:37 -0500	[thread overview]
Message-ID: <20160510002637.GA21262@dora.lan> (raw)

During the powerpc64 review, Rich mentioned wanting to replace the
arch/*/bits/syscall.h files with .in files that would be preprocessed with
something like:

    sed -e p -e s/__NR_/SYS_/ < $< > $@

This would eliminate a lot of intra-file duplication here.

I took a look, and this won't quite work as-is, because the following
lines in the arm version would end up outputting duplicate definitions:

    #define __ARM_NR_breakpoint	0x0f0001
    #define __ARM_NR_cacheflush	0x0f0002
    #define __ARM_NR_usr26		0x0f0003
    #define __ARM_NR_usr32		0x0f0004
    #define __ARM_NR_set_tls	0x0f0005

Same thing for this line in x32:

    #define __X32_SYSCALL_BIT        0x40000000

I'm thinking something like the following awk script would work:

    {
        print
    }

    $1 ~ /^#(define|undef)$/ && $2 ~ /^__NR_/ {
        sub(/__NR_/, "SYS_", $2)
        print
    }

The handling for #undef is for the x32 file.  It looks like only the
`#undef __NR_getdents' in that file is actually necessary, and even that
could be avoided by just omitting the earlier line:

    #define __NR_getdents (__X32_SYSCALL_BIT + 78)

So maybe we can get rid of the #undefs there, and simplify the awk script
accordingly.

Thoughts on this approach?  If this sounds ok, I'll submit a patch.

--
Bobby


             reply	other threads:[~2016-05-10  0:26 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-10  0:26 Bobby Bingham [this message]
2016-05-10  7:34 ` Alexander Monakov
2016-05-10  8:47   ` Alexander Monakov
2016-05-11 21:53 ` Rich Felker
2016-05-12  0:22   ` Bobby Bingham
2016-05-12  0:57     ` Rich Felker
2016-05-12  3:56       ` Bobby Bingham
2016-05-13 10:15       ` Szabolcs Nagy
2016-05-13 16:02         ` Rich Felker

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=20160510002637.GA21262@dora.lan \
    --to=koorogi@koorogi.info \
    --cc=musl@lists.openwall.com \
    /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.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/musl/

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).