From: Vineet Gupta <vineetg@rivosinc.com>
To: gcc-patches@gcc.gnu.org
Cc: kito.cheng@gmail.com, jim.wilson.gcc@gmail.com,
"Palmer Dabbelt" <palmer@rivosinc.com>,
"Philipp Tomsich" <philipp.tomsich@vrull.eu>,
"Christoph Müllner" <christoph.muellner@vrull.eu>,
collison@rivosinc.com, gnu-toolchain@rivosinc.com,
"Vineet Gupta" <vineetg@rivosinc.com>
Subject: [PATCH] RISC-V: make USE_LOAD_ADDRESS_MACRO easier to understand
Date: Fri, 2 Sep 2022 16:08:20 -0700 [thread overview]
Message-ID: <20220902230820.381916-1-vineetg@rivosinc.com> (raw)
In-Reply-To: <51ff4d6d-16be-579a-3a84-3f383c8d038e@rivosinc.com>
The current macro has several && and || making it really hard to understand
the first time.
Signed-off-by: Vineet Gupta <vineetg@rivosinc.com>
---
Since we are on this topic, perhaps get this simplification too.
But I'm not sure if the current checking of local symbol can be simplified
a bit. Isn't the first line enough for GET_CODE == const case too ?
---
gcc/config/riscv/riscv.h | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/gcc/config/riscv/riscv.h b/gcc/config/riscv/riscv.h
index eb1284e56d69..3e3f67ef8270 100644
--- a/gcc/config/riscv/riscv.h
+++ b/gcc/config/riscv/riscv.h
@@ -749,18 +749,19 @@ typedef struct {
#define CASE_VECTOR_MODE SImode
#define CASE_VECTOR_PC_RELATIVE (riscv_cmodel != CM_MEDLOW)
+#define LOCAL_SYM(sym) \
+ ((SYMBOL_REF_P (sym) && SYMBOL_REF_LOCAL_P (sym)) \
+ || ((GET_CODE (sym) == CONST) \
+ && SYMBOL_REF_P (XEXP (XEXP (sym, 0),0)) \
+ && SYMBOL_REF_LOCAL_P (XEXP (XEXP (sym, 0),0))))
+
/* The load-address macro is used for PC-relative addressing of symbols
that bind locally. Don't use it for symbols that should be addressed
via the GOT. Also, avoid it for CM_MEDLOW, where LUI addressing
currently results in more opportunities for linker relaxation. */
#define USE_LOAD_ADDRESS_MACRO(sym) \
(!TARGET_EXPLICIT_RELOCS && \
- ((flag_pic \
- && ((SYMBOL_REF_P (sym) && SYMBOL_REF_LOCAL_P (sym)) \
- || ((GET_CODE (sym) == CONST) \
- && SYMBOL_REF_P (XEXP (XEXP (sym, 0),0)) \
- && SYMBOL_REF_LOCAL_P (XEXP (XEXP (sym, 0),0))))) \
- || riscv_cmodel == CM_MEDANY))
+ ((flag_pic && LOCAL_SYM(sym)) || riscv_cmodel == CM_MEDANY))
/* Define this as 1 if `char' should by default be signed; else as 0. */
#define DEFAULT_SIGNED_CHAR 0
--
2.32.0
next prev parent reply other threads:[~2022-09-02 23:08 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-30 17:48 [PATCH 0/2] PIC cleanup Vineet Gupta
2022-08-30 17:48 ` [PATCH 1/2] RISC-V: remove deprecate pic code model macro Vineet Gupta
2022-08-31 14:57 ` Palmer Dabbelt
2022-08-31 15:35 ` Kito Cheng
2022-09-02 20:33 ` [PATCH v2] " Vineet Gupta
2022-09-02 21:03 ` Andreas Schwab
2022-09-02 21:05 ` [PATCH v3] " Vineet Gupta
2022-09-23 18:07 ` Vineet Gupta
2022-10-05 2:24 ` Kito Cheng
2022-10-05 3:33 ` Vineet Gupta
2022-08-31 20:36 ` [PATCH 1/2] " Vineet Gupta
2022-08-30 17:48 ` [PATCH 2/2] RISC-V: remove CM_PIC as it doesn't do much Vineet Gupta
2022-08-31 14:57 ` Palmer Dabbelt
2022-08-31 20:39 ` Vineet Gupta
2022-09-02 20:38 ` Vineet Gupta
2022-09-02 23:08 ` Vineet Gupta [this message]
2022-09-23 16:01 ` [PATCH] RISC-V: make USE_LOAD_ADDRESS_MACRO easier to understand Kito Cheng
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=20220902230820.381916-1-vineetg@rivosinc.com \
--to=vineetg@rivosinc.com \
--cc=christoph.muellner@vrull.eu \
--cc=collison@rivosinc.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=gnu-toolchain@rivosinc.com \
--cc=jim.wilson.gcc@gmail.com \
--cc=kito.cheng@gmail.com \
--cc=palmer@rivosinc.com \
--cc=philipp.tomsich@vrull.eu \
/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).