From: Jeff Baker <jbaker@qnx.com>
To: jbaker@qnx.com
Cc: binutils@sourceware.org
Subject: Re: [PATCH] Handle mtsprg and mfsprg properly for BookE
Date: Mon, 28 Feb 2005 21:11:00 -0000 [thread overview]
Message-ID: <422373AB.7060709@qnx.com> (raw)
In-Reply-To: <42235F14.6090602@qnx.com>
The following patch may also be correct. I've seen conflicting
information about whether PPC405 also needs the sprn5 bit cleared on
mfsprg for registers 4 through 7.
2005-02-28 Jeff Baker <jbaker@qnx.com>
* ppc-opc.c (SPRG_MASK): Allow 3 bits for register.
(powerpc_operands): Likewise.
(insert_sprg): New Function.
Index: ppc-opc.c
===================================================================
RCS file: /cvs/src/src/opcodes/ppc-opc.c,v
retrieving revision 1.78
diff -w -u -p -r1.78 ppc-opc.c
--- ppc-opc.c 20 Jan 2005 06:54:48 -0000 1.78
+++ ppc-opc.c 28 Feb 2005 19:35:21 -0000
@@ -84,6 +84,7 @@ static unsigned long insert_sh6 (unsigne
static long extract_sh6 (unsigned long, int, int *);
static unsigned long insert_spr (unsigned long, long, int, const char **);
static long extract_spr (unsigned long, int, int *);
+static unsigned long insert_sprg (unsigned long, long, int, const char **);
static unsigned long insert_tbr (unsigned long, long, int, const char **);
static long extract_tbr (unsigned long, int, int *);
static unsigned long insert_ev2 (unsigned long, long, int, const char **);
@@ -465,8 +466,8 @@ const struct powerpc_operand powerpc_ope
/* The SPRG register number in an XFX form m[ft]sprg instruction. */
#define SPRG SPRBAT + 1
-#define SPRG_MASK (0x3 << 16)
- { 2, 16, NULL, NULL, 0 },
+#define SPRG_MASK (0x7 << 16)
+ { 3, 16, insert_sprg, NULL, 0 },
/* The SR field in an X form instruction. */
#define SR SPRG + 1
@@ -1397,6 +1398,36 @@ extract_spr (unsigned long insn,
return ((insn >> 16) & 0x1f) | ((insn >> 6) & 0x3e0);
}
+/* Some dialects (BookE, 405) have 8 SPRG registers instead of
+ the normal 4. In addition, mfsprg instructions must
+ have sprn5 cleared when using registers 4 through 7. */
+
+static unsigned long
+insert_sprg (unsigned long insn,
+ long value,
+ int dialect,
+ const char **errmsg)
+{
+ /* This check uses PPC_OPCODE_403 because PPC405 is later defined
+ as a synonym. If ever a 405 specific dialect is added this
+ check should use that instead. */
+ if ((dialect & PPC_OPCODE_BOOKE) || (dialect & PPC_OPCODE_403))
+ {
+ if (value > 7)
+ *errmsg = _("Invalid operand. Must be between 0 and 7.");
+ if (value > 3)
+ return (insn | ((value & 0x07) << 16))
+ & (((insn >> 8) & 0x01) ? ~0 : ( ~( 1 << 20 )));
+ return insn | ((value & 0x07) << 16);
+ }
+ else
+ {
+ if (value > 3)
+ *errmsg = _("Invalid operand. Must be between 0 and 3.");
+ return insn | ((value & 0x03) << 16);
+ }
+}
+
/* The TBR field in an XFX instruction. This is just like SPR, but it
is optional. When TBR is omitted, it must be inserted as 268 (the
magic number of the TB register). These functions treat 0
Jeff Baker wrote:
> Below is an updated (and I believe more correct) version of this patch.
>
>
> 2005-02-28 Jeff Baker <jbaker@qnx.com>
>
> * ppc-opc.c (SPRG_MASK): Allow 3 bits for register.
> (powerpc_operands): Likewise.
> (insert_sprg): New Function.
> (powerpc_opcodes): reorder mtsprg/mfsprg opcodes
> to allow disassembler to locate the correct one.
>
>
> Index: ppc-opc.c
> ===================================================================
> RCS file: /cvs/src/src/opcodes/ppc-opc.c,v
> retrieving revision 1.78
> diff -w -u -p -r1.78 ppc-opc.c
> --- ppc-opc.c 20 Jan 2005 06:54:48 -0000 1.78
> +++ ppc-opc.c 28 Feb 2005 18:02:08 -0000
> @@ -84,6 +84,7 @@ static unsigned long insert_sh6 (unsigne
> static long extract_sh6 (unsigned long, int, int *);
> static unsigned long insert_spr (unsigned long, long, int, const char
> **);
> static long extract_spr (unsigned long, int, int *);
> +static unsigned long insert_sprg (unsigned long, long, int, const char
> **);
> static unsigned long insert_tbr (unsigned long, long, int, const char
> **);
> static long extract_tbr (unsigned long, int, int *);
> static unsigned long insert_ev2 (unsigned long, long, int, const char
> **);
> @@ -465,8 +466,8 @@ const struct powerpc_operand powerpc_ope
>
> /* The SPRG register number in an XFX form m[ft]sprg instruction.
> */
> #define SPRG SPRBAT + 1
> -#define SPRG_MASK (0x3 << 16)
> - { 2, 16, NULL, NULL, 0 },
> +#define SPRG_MASK (0x7 << 16)
> + { 3, 16, insert_sprg, NULL, 0 },
>
> /* The SR field in an X form instruction. */
> #define SR SPRG + 1
> @@ -1397,6 +1398,36 @@ extract_spr (unsigned long insn,
> return ((insn >> 16) & 0x1f) | ((insn >> 6) & 0x3e0);
> }
>
> +/* Some dialects (BookE, 405) have 8 SPRG registers instead of
> + the normal 4. In addition, BookE mfsprg instructions must
> + have sprn5 cleared when using registers 4 through 7. */
> +
> +static unsigned long
> +insert_sprg (unsigned long insn,
> + long value,
> + int dialect,
> + const char **errmsg)
> +{
> + /* This check uses PPC_OPCODE_403 because PPC405 is later defined
> + as a synonym. If ever a 405 specific dialect is added this
> + check should use that instead. */
> + if ((dialect & PPC_OPCODE_BOOKE) || (dialect & PPC_OPCODE_403))
> + {
> + if (value > 7)
> + *errmsg = _("Invalid operand. Must be between 0 and 7.");
> + if ((value > 3) && (dialect & PPC_OPCODE_BOOKE))
> + return (insn | ((value & 0x07) << 16))
> + & (((insn >> 8) & 0x01) ? ~0 : ( ~( 1 << 20 )));
> + return insn | ((value & 0x07) << 16);
> + }
> + else
> + {
> + if (value > 3)
> + *errmsg = _("Invalid operand. Must be between 0 and 3.");
> + return insn | ((value & 0x03) << 16);
> + }
> +}
> +
> /* The TBR field in an XFX instruction. This is just like SPR, but it
> is optional. When TBR is omitted, it must be inserted as 268 (the
> magic number of the TB register). These functions treat 0
> @@ -3677,13 +3708,9 @@ const struct powerpc_opcode powerpc_opco
> { "mfbar", XSPR(31,339,159), XSPR_MASK, PPC860, { RT } },
> { "mfvrsave", XSPR(31,339,256), XSPR_MASK, PPCVEC, { RT } },
> { "mfusprg0", XSPR(31,339,256), XSPR_MASK, BOOKE, { RT } },
> -{ "mfsprg4", XSPR(31,339,260), XSPR_MASK, PPC405, { RT } },
> { "mfsprg4", XSPR(31,339,260), XSPR_MASK, BOOKE, { RT } },
> -{ "mfsprg5", XSPR(31,339,261), XSPR_MASK, PPC405, { RT } },
> { "mfsprg5", XSPR(31,339,261), XSPR_MASK, BOOKE, { RT } },
> -{ "mfsprg6", XSPR(31,339,262), XSPR_MASK, PPC405, { RT } },
> { "mfsprg6", XSPR(31,339,262), XSPR_MASK, BOOKE, { RT } },
> -{ "mfsprg7", XSPR(31,339,263), XSPR_MASK, PPC405, { RT } },
> { "mfsprg7", XSPR(31,339,263), XSPR_MASK, BOOKE, { RT } },
> { "mftb", X(31,371), X_MASK, CLASSIC, { RT, TBR } },
> { "mftb", XSPR(31,339,268), XSPR_MASK, BOOKE, { RT } },
> @@ -3696,6 +3723,10 @@ const struct powerpc_opcode powerpc_opco
> { "mfsprg1", XSPR(31,339,273), XSPR_MASK, PPC, { RT } },
> { "mfsprg2", XSPR(31,339,274), XSPR_MASK, PPC, { RT } },
> { "mfsprg3", XSPR(31,339,275), XSPR_MASK, PPC, { RT } },
> +{ "mfsprg4", XSPR(31,339,276), XSPR_MASK, PPC405, { RT } },
> +{ "mfsprg5", XSPR(31,339,277), XSPR_MASK, PPC405, { RT } },
> +{ "mfsprg6", XSPR(31,339,278), XSPR_MASK, PPC405, { RT } },
> +{ "mfsprg7", XSPR(31,339,279), XSPR_MASK, PPC405, { RT } },
> { "mfasr", XSPR(31,339,280), XSPR_MASK, PPC64, { RT } },
> { "mfear", XSPR(31,339,282), XSPR_MASK, PPC, { RT } },
> { "mfpir", XSPR(31,339,286), XSPR_MASK, BOOKE, { RT } },
next prev parent reply other threads:[~2005-02-28 19:38 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-02-28 20:20 Jeff Baker
2005-02-28 21:11 ` Jeff Baker [this message]
2005-02-28 21:26 ` Kumar Gala
2005-02-28 22:52 ` Jeff Baker
2005-02-28 23:09 ` Jeff Baker
2005-03-07 15:22 ` Jeff Baker
2005-03-08 11:20 ` Alan Modra
2005-03-08 16:30 ` Jeff Baker
2005-03-08 23:51 ` Alan Modra
2005-03-09 1:18 ` Jeff Baker
2005-03-09 2:11 ` Alan Modra
2005-03-09 16:39 ` Jeff Baker
2005-03-10 12:42 ` Alan Modra
2005-03-09 22:30 ` Kumar Gala
2005-03-10 3:58 ` Alan Modra
[not found] ` <ad80a57d7a545e4541f6fbaa2178ad4c@leftfield.org>
2005-03-14 4:14 ` Alan Modra
2005-03-16 16:39 ` Jeff Baker
2005-03-17 15:36 ` Alan Modra
-- strict thread matches above, loose matches on Subject: below --
2005-02-24 0:32 Jeff Baker
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=422373AB.7060709@qnx.com \
--to=jbaker@qnx.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).