public inbox for binutils@sourceware.org
 help / color / mirror / Atom feed
From: Jan Beulich <jbeulich@suse.com>
To: Binutils <binutils@sourceware.org>
Subject: [PATCH 2/6] gas: simplify ignore_input()
Date: Fri, 6 May 2022 08:06:08 +0200	[thread overview]
Message-ID: <9320fd72-5afa-3e64-5008-379812e7c036@suse.com> (raw)
In-Reply-To: <e96f677b-acf7-e5a9-e99e-48ae61a20da8@suse.com>

First of all convert to switch(), in preparation of adding another
directive here which may not be ignored. While doing so drop dead code:
A string the first two characters of which do not match "if" also wont
match "ifdef" or "ifndef".
---
I was tempted to drop the leading 'e' from the strings compared against,
but I then decided against because doing so might not be liked by
everyone.

--- a/gas/cond.c
+++ b/gas/cond.c
@@ -513,17 +513,19 @@ ignore_input (void)
     }
 
   /* We cannot ignore certain pseudo ops.  */
-  if (((s[0] == 'i'
-	|| s[0] == 'I')
-       && (!strncasecmp (s, "if", 2)
-	   || !strncasecmp (s, "ifdef", 5)
-	   || !strncasecmp (s, "ifndef", 6)))
-      || ((s[0] == 'e'
-	   || s[0] == 'E')
-	  && (!strncasecmp (s, "else", 4)
-	      || !strncasecmp (s, "endif", 5)
-	      || !strncasecmp (s, "endc", 4))))
-    return 0;
+  switch (s[0])
+    {
+    case 'i': case  'I':
+      if (s[1] == 'f' || s[1] == 'F')
+	return 0;
+      break;
+    case 'e': case 'E':
+      if (!strncasecmp (s, "else", 4)
+	  || !strncasecmp (s, "endif", 5)
+	  || !strncasecmp (s, "endc", 4))
+	return 0;
+      break;
+    }
 
   return (current_cframe != NULL) && (current_cframe->ignoring);
 }


  parent reply	other threads:[~2022-05-06  6:06 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-06  6:04 [PATCH 0/6] gas: (mostly) further file/line handling adjustments Jan Beulich
2022-05-06  6:05 ` [PATCH 1/6] gas: tweak .irp and alike file/line handling for M68K/MRI Jan Beulich
2022-05-06  6:06 ` Jan Beulich [this message]
2022-05-06  6:06 ` [PATCH 3/6] gas: don't ignore .linefile inside false conditionals Jan Beulich
2022-05-06  6:07 ` [PATCH 4/6] gas: fold do_repeat{,_with_expander}() Jan Beulich
2022-05-06  6:08 ` [PATCH 5/6] gas: avoid bignum related errors when processing .linefile Jan Beulich
2022-05-06  6:08 ` [PATCH 6/6] gas: avoid octal numbers being accepted " Jan Beulich

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=9320fd72-5afa-3e64-5008-379812e7c036@suse.com \
    --to=jbeulich@suse.com \
    --cc=binutils@sourceware.org \
    /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 read-only IMAP folder(s) and NNTP newsgroup(s).