From: WANG Xuerui <i.swmail@xen0n.name>
To: Feiyang Chen <chenfeiyang@loongson.cn>,
liuzhensong@loongson.cn, xuchenghua@loongson.cn
Cc: chris.chenfeiyang@gmail.com, chenhuacai@loongson.cn,
binutils@sourceware.org
Subject: Re: [PATCH] LoongArch: Add fcsr register names support
Date: Tue, 13 Jun 2023 17:49:38 +0800 [thread overview]
Message-ID: <4d7d191c-def8-2073-7926-6db37a2c7f64@xen0n.name> (raw)
In-Reply-To: <20230612083649.907511-1-chenfeiyang@loongson.cn>
On 2023/6/12 16:36, Feiyang Chen wrote:
> Add fcsr register names support for fcsr move instructions.
"Support referring to FCSRs as $fcsrX" sounds clearer. Also you may
mention a bit more about the justification e.g. LLVM IAS compatibility
and/or correction of previous oversight (FCSRs aren't GPRs after all).
>
> gas/ChangeLog:
>
> * config/tc-loongarch.c:
> (loongarch_fc_normal_name): New definition.
> (loongarch_single_float_opcodes): Modify `movgr2fcsr` and
> `movfcsr2gr`.
>
> include/ChangeLog:
>
> * opcode/loongarch.h (loongarch_fc_normal_name): New extern.
>
> opcodes/ChangeLog:
>
> * opcodes/loongarch-dis.c (loongarch_after_parse_args): Add
> fcsr register names support.
> * opcodes/loongarch-opc.c (loongarch_args_parser_can_match_arg_helper):
> Likewise.
>
> Signed-off-by: Feiyang Chen <chenfeiyang@loongson.cn>
> ---
> gas/config/tc-loongarch.c | 22 +++++++++++++++++++++-
> include/opcode/loongarch.h | 1 +
> opcodes/loongarch-dis.c | 16 +++++++++++++++-
> opcodes/loongarch-opc.c | 9 +++++++--
> 4 files changed, 44 insertions(+), 4 deletions(-)
We may have to add/tweak test cases for this.
>
> diff --git a/gas/config/tc-loongarch.c b/gas/config/tc-loongarch.c
> index c55d4ee234a..97971d76a57 100644
> --- a/gas/config/tc-loongarch.c
> +++ b/gas/config/tc-loongarch.c
> @@ -223,6 +223,7 @@ md_parse_option (int c, const char *arg)
>
> static struct htab *r_htab = NULL;
> static struct htab *f_htab = NULL;
> +static struct htab *fc_htab = NULL;
> static struct htab *c_htab = NULL;
> static struct htab *cr_htab = NULL;
> static struct htab *v_htab = NULL;
> @@ -286,6 +287,18 @@ loongarch_after_parse_args ()
> str_hash_insert (f_htab, loongarch_f_normal_name[i], (void *) (i + 1),
> 0);
>
> + if (!fc_htab)
> + fc_htab = str_htab_create (), str_hash_insert (fc_htab, "", 0, 0);
> +
> + for (i = 0; i < ARRAY_SIZE (loongarch_fc_normal_name); i++)
> + str_hash_insert (fc_htab, loongarch_fc_normal_name[i], (void *) (i + 1),
> + 0);
> +
> + /* Add general purpose registers for backward compatibility. */
> + for (i = 0; i < ARRAY_SIZE (loongarch_r_normal_name); i++)
> + str_hash_insert (fc_htab, loongarch_r_normal_name[i], (void *) (i + 1),
> + 0);
> +
> if (!c_htab)
> c_htab = str_htab_create (), str_hash_insert (c_htab, "", 0, 0);
>
> @@ -666,7 +679,14 @@ loongarch_args_parser_can_match_arg_helper (char esc_ch1, char esc_ch2,
> ret = imm - 1;
> break;
> case 'f':
> - imm = (intptr_t) str_hash_find (f_htab, arg);
> + switch (esc_ch2)
> + {
> + case 'c':
> + imm = (intptr_t) str_hash_find (fc_htab, arg);
> + break;
> + default:
> + imm = (intptr_t) str_hash_find (f_htab, arg);
> + }
> ip->match_now = 0 < imm;
> ret = imm - 1;
> break;
> diff --git a/include/opcode/loongarch.h b/include/opcode/loongarch.h
> index 004bb6561ef..4ed273182c0 100644
> --- a/include/opcode/loongarch.h
> +++ b/include/opcode/loongarch.h
> @@ -185,6 +185,7 @@ dec2 : [1-9][0-9]?
> extern const char *const loongarch_f_normal_name[32];
> extern const char *const loongarch_f_lp64_name[32];
> extern const char *const loongarch_f_lp64_name1[32];
> + extern const char *const loongarch_fc_normal_name[4];
> extern const char *const loongarch_c_normal_name[8];
> extern const char *const loongarch_cr_normal_name[4];
> extern const char *const loongarch_v_normal_name[32];
> diff --git a/opcodes/loongarch-dis.c b/opcodes/loongarch-dis.c
> index d064d30d553..0e7d9a88c25 100644
> --- a/opcodes/loongarch-dis.c
> +++ b/opcodes/loongarch-dis.c
> @@ -61,6 +61,7 @@ get_loongarch_opcode_by_binfmt (insn_t insn)
>
> static const char *const *loongarch_r_disname = NULL;
> static const char *const *loongarch_f_disname = NULL;
> +static const char *const *loongarch_fc_disname = NULL;
> static const char *const *loongarch_c_disname = NULL;
> static const char *const *loongarch_cr_disname = NULL;
> static const char *const *loongarch_v_disname = NULL;
> @@ -78,6 +79,7 @@ set_default_loongarch_dis_options (void)
>
> loongarch_r_disname = loongarch_r_lp64_name;
> loongarch_f_disname = loongarch_f_lp64_name;
> + loongarch_fc_disname = loongarch_fc_normal_name;
> loongarch_c_disname = loongarch_c_normal_name;
> loongarch_cr_disname = loongarch_cr_normal_name;
> loongarch_v_disname = loongarch_v_normal_name;
> @@ -142,7 +144,19 @@ dis_one_arg (char esc1, char esc2, const char *bit_field,
> info->fprintf_func (info->stream, "%s", loongarch_r_disname[u_imm]);
> break;
> case 'f':
> - info->fprintf_func (info->stream, "%s", loongarch_f_disname[u_imm]);
> + switch (esc2)
> + {
> + case 'c':
> + if (u_imm < 4)
> + info->fprintf_func (info->stream, "%s", loongarch_fc_disname[u_imm]);
> + else
> + /* For backward compatibility. Display using general purpose
> + register names if out of range. */
> + info->fprintf_func (info->stream, "%s", loongarch_r_normal_name[u_imm]);
I don't think it's proper to call *any* of the FCSRs "GPR" (or actually,
aliases to FCSR0, but that doesn't matter). What concrete scenario are
you trying to keep compatible with? A test case may explain it.
> + break;
> + default:
> + info->fprintf_func (info->stream, "%s", loongarch_f_disname[u_imm]);
> + }
> break;
> case 'c':
> switch (esc2)
> diff --git a/opcodes/loongarch-opc.c b/opcodes/loongarch-opc.c
> index 573b691c1fd..99fbe318fd3 100644
> --- a/opcodes/loongarch-opc.c
> +++ b/opcodes/loongarch-opc.c
> @@ -77,6 +77,11 @@ const char *const loongarch_f_lp64_name1[32] =
> "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "",
> };
>
> +const char *const loongarch_fc_normal_name[4] =
> +{
> + "$fcsr0", "$fcsr1", "$fcsr2", "$fcsr3",
> +};
> +
> const char *const loongarch_c_normal_name[8] =
> {
> "$fcc0", "$fcc1", "$fcc2", "$fcc3", "$fcc4", "$fcc5", "$fcc6", "$fcc7",
> @@ -459,8 +464,8 @@ static struct loongarch_opcode loongarch_single_float_opcodes[] =
> { 0x0114ac00, 0xfffffc00, "movgr2frh.w", "f0:5,r5:5", 0, 0, 0, 0 },
> { 0x0114b400, 0xfffffc00, "movfr2gr.s", "r0:5,f5:5", 0, 0, 0, 0 },
> { 0x0114bc00, 0xfffffc00, "movfrh2gr.s", "r0:5,f5:5", 0, 0, 0, 0 },
> - { 0x0114c000, 0xfffffc00, "movgr2fcsr", "r0:5,r5:5", 0, 0, 0, 0 },
> - { 0x0114c800, 0xfffffc00, "movfcsr2gr", "r0:5,r5:5", 0, 0, 0, 0 },
> + { 0x0114c000, 0xfffffc00, "movgr2fcsr", "fc0:5,r5:5", 0, 0, 0, 0 },
> + { 0x0114c800, 0xfffffc00, "movfcsr2gr", "r0:5,fc5:5", 0, 0, 0, 0 },
> { 0x0114d000, 0xfffffc18, "movfr2cf", "c0:3,f5:5", 0, 0, 0, 0 },
> { 0x0114d400, 0xffffff00, "movcf2fr", "f0:5,c5:3", 0, 0, 0, 0 },
> { 0x0114d800, 0xfffffc18, "movgr2cf", "c0:3,r5:5", 0, 0, 0, 0 },
next prev parent reply other threads:[~2023-06-13 9:49 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-12 8:36 Feiyang Chen
2023-06-13 1:05 ` Chenghua Xu
2023-06-13 9:49 ` WANG Xuerui [this message]
2023-06-14 4:27 ` Feiyang Chen
2023-06-16 9:20 ` WANG Xuerui
2023-06-16 9:30 ` Xi Ruoyao
2023-06-14 3:33 ` mengqinggang
2023-06-14 4:14 ` Feiyang Chen
2023-06-14 7:07 ` mengqinggang
2023-06-14 7:28 ` Feiyang Chen
2023-06-14 8:39 ` mengqinggang
2023-06-14 9:27 ` Feiyang Chen
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=4d7d191c-def8-2073-7926-6db37a2c7f64@xen0n.name \
--to=i.swmail@xen0n.name \
--cc=binutils@sourceware.org \
--cc=chenfeiyang@loongson.cn \
--cc=chenhuacai@loongson.cn \
--cc=chris.chenfeiyang@gmail.com \
--cc=liuzhensong@loongson.cn \
--cc=xuchenghua@loongson.cn \
/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).