This is the mail archive of the
libc-ports@sources.redhat.com
mailing list for the libc-ports project.
Add 64-bit support to MIPS register-dump.h (bug 14893)
- From: "Joseph S. Myers" <joseph at codesourcery dot com>
- To: <libc-ports at sourceware dot org>
- Date: Thu, 29 Nov 2012 23:04:30 +0000
- Subject: Add 64-bit support to MIPS register-dump.h (bug 14893)
Reviewing compiler warnings for MIPS glibc builds showed that the MIPS
register-dump.h was not adapted for 64-bit multilibs; it always used
struct sigcontext, when actually the definitions in sigcontextinfo.h
mean ucontext_t is the relevant type for 64-bit, so resulting in
warnings about incompatible types being passed, and no doubt accesses
to the wrong structure fields.
I've applied this patch to add 64-bit support to this file, so fixing
the warnings. So that the existing _itoa_word use in register-dump.h
continued to work for dumping the full content of a register, I made
MIPS n32 use 64-bit _itoa_word, like x32.
Note that the output formatting could still do with cleanup for 64-bit
(putting fewer registers on a line of output when each register
occupies 16 characters of output rather than 8).
2012-11-29 Joseph Myers <joseph@codesourcery.com>
[BZ #14893]
* sysdeps/mips/mips64/n32/_itoa.h: New file.
* sysdeps/unix/sysv/linux/mips/register-dump.h: Include
<sgidefs.h>.
(CTX_TYPE): New macro.
(CTX_REG): Likewise.
(CTX_PC): Likewise.
(CTX_MDHI): Likewise.
(CTX_MDLO): Likewise.
(REG_HEX_SIZE): Likewise.
(hexvalue): Take _ITOA_WORD_TYPE argument.
(register_dump): Use these macros instead of hardcoding struct
sigcontext * type and accesses and 8-byte textual output for
registers.
diff --git a/ports/sysdeps/mips/mips64/n32/_itoa.h b/ports/sysdeps/mips/mips64/n32/_itoa.h
new file mode 100644
index 0000000..363cdfe
--- /dev/null
+++ b/ports/sysdeps/mips/mips64/n32/_itoa.h
@@ -0,0 +1,4 @@
+/* MIPS n32 uses 64-bit _itoa_word and _itoa is mapped to _itoa_word. */
+#define _ITOA_NEEDED 0
+#define _ITOA_WORD_TYPE unsigned long long int
+#include_next <_itoa.h>
diff --git a/ports/sysdeps/unix/sysv/linux/mips/register-dump.h b/ports/sysdeps/unix/sysv/linux/mips/register-dump.h
index 1862281..0156910 100644
--- a/ports/sysdeps/unix/sysv/linux/mips/register-dump.h
+++ b/ports/sysdeps/unix/sysv/linux/mips/register-dump.h
@@ -17,9 +17,26 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
+#include <sgidefs.h>
#include <sys/uio.h>
#include <_itoa.h>
+#if _MIPS_SIM == _ABIO32
+# define CTX_TYPE struct sigcontext *
+# define CTX_REG(ctx, i) ((ctx)->sc_regs[(i)])
+# define CTX_PC(ctx) ((ctx)->sc_pc)
+# define CTX_MDHI(ctx) ((ctx)->sc_mdhi)
+# define CTX_MDLO(ctx) ((ctx)->sc_mdlo)
+# define REG_HEX_SIZE 8
+#else
+# define CTX_TYPE ucontext_t *
+# define CTX_REG(ctx, i) ((ctx)->uc_mcontext.gregs[(i)])
+# define CTX_PC(ctx) ((ctx)->uc_mcontext.pc)
+# define CTX_MDHI(ctx) ((ctx)->uc_mcontext.mdhi)
+# define CTX_MDLO(ctx) ((ctx)->uc_mcontext.mdhi)
+# define REG_HEX_SIZE 16
+#endif
+
/* We will print the register dump in this format:
R0 XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX
@@ -32,7 +49,7 @@
*/
static void
-hexvalue (unsigned long int value, char *buf, size_t len)
+hexvalue (_ITOA_WORD_TYPE value, char *buf, size_t len)
{
char *cp = _itoa_word (value, buf + len, 16, 0);
while (cp > buf)
@@ -40,9 +57,9 @@ hexvalue (unsigned long int value, char *buf, size_t len)
}
static void
-register_dump (int fd, struct sigcontext *ctx)
+register_dump (int fd, CTX_TYPE ctx)
{
- char regs[38][8];
+ char regs[38][REG_HEX_SIZE];
struct iovec iov[38 * 2 + 10];
size_t nr = 0;
int i;
@@ -58,40 +75,40 @@ register_dump (int fd, struct sigcontext *ctx)
/* Generate strings of register contents. */
for (i = 0; i < 32; i++)
- hexvalue (ctx->sc_regs[i], regs[i], 8);
- hexvalue (ctx->sc_pc, regs[32], 8);
- hexvalue (ctx->sc_mdhi, regs[33], 8);
- hexvalue (ctx->sc_mdlo, regs[34], 8);
+ hexvalue (CTX_REG (ctx, i), regs[i], REG_HEX_SIZE);
+ hexvalue (CTX_PC (ctx), regs[32], REG_HEX_SIZE);
+ hexvalue (CTX_MDHI (ctx), regs[33], REG_HEX_SIZE);
+ hexvalue (CTX_MDLO (ctx), regs[34], REG_HEX_SIZE);
/* Generate the output. */
ADD_STRING ("Register dump:\n\n R0 ");
for (i = 0; i < 8; i++)
{
- ADD_MEM (regs[i], 8);
+ ADD_MEM (regs[i], REG_HEX_SIZE);
ADD_STRING (" ");
}
ADD_STRING ("\n R8 ");
for (i = 8; i < 16; i++)
{
- ADD_MEM (regs[i], 8);
+ ADD_MEM (regs[i], REG_HEX_SIZE);
ADD_STRING (" ");
}
ADD_STRING ("\n R16 ");
for (i = 16; i < 24; i++)
{
- ADD_MEM (regs[i], 8);
+ ADD_MEM (regs[i], REG_HEX_SIZE);
ADD_STRING (" ");
}
ADD_STRING ("\n R24 ");
for (i = 24; i < 32; i++)
{
- ADD_MEM (regs[i], 8);
+ ADD_MEM (regs[i], REG_HEX_SIZE);
ADD_STRING (" ");
}
ADD_STRING ("\n pc lo hi\n ");
for (i = 32; i < 35; i++)
{
- ADD_MEM (regs[i], 8);
+ ADD_MEM (regs[i], REG_HEX_SIZE);
ADD_STRING (" ");
}
ADD_STRING ("\n");
--
Joseph S. Myers
joseph@codesourcery.com