summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-10-01 14:31:24 +0000
committerUlrich Drepper <drepper@redhat.com>1998-10-01 14:31:24 +0000
commit8c93cd99f54c6971594aa76f6e4304d0c1fe4ae0 (patch)
tree71d35e9901ce81bfd0aad04f1c24087463ddc03c
parent7782d0bf55c294b7ed872e2590fcf4a683be5e05 (diff)
Update
1998-10-01 Philip Blundell <pb@nexus.co.uk> * sysdeps/arm/machine-gmon.h: Correct args to mcount(). Patch from Scott Bambrough. * sysdeps/unix/sysv/linux/arm/register-dump.h: New file. * libio/libioP.h (FILEBUF_LITERAL) [! _IO_MTSAFE_IO]: Don't include the lock member. 1998-09-03 Philip Blundell <pb@nexus.co.uk> * sysdeps/arm/fpu/__longjmp.S: Cope with fussy assembler.
-rw-r--r--ChangeLog14
-rw-r--r--libio/libioP.h2
-rw-r--r--sysdeps/arm/fpu/__longjmp.S2
-rw-r--r--sysdeps/arm/machine-gmon.h22
-rw-r--r--sysdeps/unix/sysv/linux/arm/register-dump.h132
5 files changed, 160 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 6cf365abd6..2bc762c7ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+1998-10-01 Philip Blundell <pb@nexus.co.uk>
+
+ * sysdeps/arm/machine-gmon.h: Correct args to mcount(). Patch
+ from Scott Bambrough.
+
+ * sysdeps/unix/sysv/linux/arm/register-dump.h: New file.
+
+ * libio/libioP.h (FILEBUF_LITERAL) [! _IO_MTSAFE_IO]: Don't
+ include the lock member.
+
+1998-09-03 Philip Blundell <pb@nexus.co.uk>
+
+ * sysdeps/arm/fpu/__longjmp.S: Cope with fussy assembler.
+
1998-10-01 Ulrich Drepper <drepper@cygnus.com>
* timezone/zic.c: Update from tzcode1998h.
diff --git a/libio/libioP.h b/libio/libioP.h
index bf5638fb19..43fdb4047c 100644
--- a/libio/libioP.h
+++ b/libio/libioP.h
@@ -588,7 +588,7 @@ extern int _IO_vscanf __P ((const char *, _IO_va_list));
# define FILEBUF_LITERAL(CHAIN, FLAGS, FD) \
{ _IO_MAGIC+_IO_LINKED+_IO_IS_FILEBUF+FLAGS, \
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, CHAIN, FD, \
- 0, _IO_pos_BAD, 0, 0, { 0 }, &_IO_stdfile_##FD##_lock, _IO_pos_BAD }
+ 0, _IO_pos_BAD, 0, 0, { 0 }, 0, _IO_pos_BAD }
# endif
#endif
diff --git a/sysdeps/arm/fpu/__longjmp.S b/sysdeps/arm/fpu/__longjmp.S
index 25ba6b39fa..2972ff6f5c 100644
--- a/sysdeps/arm/fpu/__longjmp.S
+++ b/sysdeps/arm/fpu/__longjmp.S
@@ -30,7 +30,7 @@ ENTRY (__longjmp)
movs r0, r1 /* get the return value in place */
moveq r0, #1 /* can't let setjmp() return zero! */
- lfmia f4, 4, [ip] ! /* load the floating point regs */
+ lfmfd f4, 4, [ip] ! /* load the floating point regs */
LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc})
END (__longjmp)
diff --git a/sysdeps/arm/machine-gmon.h b/sysdeps/arm/machine-gmon.h
index 96b4c13c72..3909b5e0c3 100644
--- a/sysdeps/arm/machine-gmon.h
+++ b/sysdeps/arm/machine-gmon.h
@@ -41,25 +41,27 @@ static void mcount_internal (u_long frompc, u_long selfpc)
blind calls to _mount(), ignoring the fact that _mcount may
clobber registers; therefore, _mcount may NOT clobber registers */
/* if (this_fp!=0) {
- r0 = this_lr
- r1 = this_fp
- r1 = [r1-4] which is caller's fp
+ r0 = this_fp
+ r1 = this_lr
+ r1 = [r1-4] which is caller's lr
if (r1!=0)
r1 = caller's lr
call mcount_internal(this_lr, caller's_lr)
}
-*/
+*/
+
#define MCOUNT \
void _mcount (void) \
{ \
__asm__("stmdb sp!, {r0, r1, r2, r3};" \
"movs fp, fp;" \
- "moveq r0, #0;" \
- "ldrne r0, [fp, $-4];" \
- "ldrne r1, [fp, $-12];" \
- "movnes r1, r1;" \
- "ldrne r1, [r1, $-4];" \
- "movs r1, r1;" \
+ "moveq r1, #0;" \
+ "ldrne r1, [fp, $-4];" \
+ "ldrne r0, [fp, $-12];" \
+ "movnes r0, r0;" \
+ "ldrne r0, [r0, $-4];" \
+ "movs r0, r0;" \
"blne mcount_internal;" \
"ldmia sp!, {r0, r1, r2, r3}"); \
}
+
diff --git a/sysdeps/unix/sysv/linux/arm/register-dump.h b/sysdeps/unix/sysv/linux/arm/register-dump.h
new file mode 100644
index 0000000000..1b948ab5ff
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/arm/register-dump.h
@@ -0,0 +1,132 @@
+/* Dump registers.
+ Copyright (C) 1998 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Philip Blundell <pb@nexus.co.uk>, 1998.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <sys/uio.h>
+#include <stdio-common/_itoa.h>
+
+/* We will print the register dump in this format:
+
+ R0: XXXXXXXX R1: XXXXXXXX R2: XXXXXXXX R3: XXXXXXXX
+ R4: XXXXXXXX R5: XXXXXXXX R6: XXXXXXXX R7: XXXXXXXX
+ R8: XXXXXXXX R9: XXXXXXXX SL: XXXXXXXX FP: XXXXXXXX
+ IP: XXXXXXXX SP: XXXXXXXX LR: XXXXXXXX PC: XXXXXXXX
+
+ CPSR: XXXXXXXX
+
+ Trap: XXXXXXXX Error: XXXXXXXX OldMask: XXXXXXXX
+
+ */
+
+static void
+hexvalue (unsigned long int value, char *buf, size_t len)
+{
+ char *cp = _itoa_word (value, buf + len, 16, 0);
+ while (cp > buf)
+ *--cp = '0';
+}
+
+static void
+register_dump (int fd, struct sigcontext *ctx)
+{
+ char regs[20][8];
+ struct iovec iov[97];
+ size_t nr = 0;
+
+#define ADD_STRING(str) \
+ iov[nr].iov_base = (char *) str; \
+ iov[nr].iov_len = strlen (str); \
+ ++nr
+#define ADD_MEM(str, len) \
+ iov[nr].iov_base = str; \
+ iov[nr].iov_len = len; \
+ ++nr
+
+ /* Generate strings of register contents. */
+ hexvalue (ctx->arm_r0, regs[0], 8);
+ hexvalue (ctx->arm_r1, regs[1], 8);
+ hexvalue (ctx->arm_r2, regs[2], 8);
+ hexvalue (ctx->arm_r3, regs[3], 8);
+ hexvalue (ctx->arm_r4, regs[4], 8);
+ hexvalue (ctx->arm_r5, regs[5], 8);
+ hexvalue (ctx->arm_r6, regs[6], 8);
+ hexvalue (ctx->arm_r7, regs[7], 8);
+ hexvalue (ctx->arm_r8, regs[8], 8);
+ hexvalue (ctx->arm_r9, regs[9], 8);
+ hexvalue (ctx->arm_r10, regs[10], 4);
+ hexvalue (ctx->arm_fp, regs[11], 4);
+ hexvalue (ctx->arm_ip, regs[12], 4);
+ hexvalue (ctx->arm_sp, regs[13], 4);
+ hexvalue (ctx->arm_lr, regs[14], 4);
+ hexvalue (ctx->arm_pc, regs[15], 4);
+ hexvalue (ctx->arm_cpsr, regs[16], 8);
+ hexvalue (ctx->trap_no, regs[17], 8);
+ hexvalue (ctx->error_code, regs[18], 8);
+ hexvalue (ctx->old_mask, regs[19], 8);
+
+ /* Generate the output. */
+ ADD_STRING ("Register dump:\n\n R0: ");
+ ADD_MEM (regs[0], 8);
+ ADD_STRING (" R1: ");
+ ADD_MEM (regs[1], 8);
+ ADD_STRING (" R2: ");
+ ADD_MEM (regs[2], 8);
+ ADD_STRING (" R3: ");
+ ADD_MEM (regs[3], 8);
+ ADD_STRING ("\n R4: ");
+ ADD_MEM (regs[4], 8);
+ ADD_STRING (" R5: ");
+ ADD_MEM (regs[5], 8);
+ ADD_STRING (" R6: ");
+ ADD_MEM (regs[6], 8);
+ ADD_STRING (" R7: ");
+ ADD_MEM (regs[7], 8);
+ ADD_STRING ("\n R8: ");
+ ADD_MEM (regs[8], 8);
+ ADD_STRING (" R9: ");
+ ADD_MEM (regs[9], 8);
+ ADD_STRING (" SL: ");
+ ADD_MEM (regs[10], 8);
+ ADD_STRING (" FP: ");
+ ADD_MEM (regs[11], 8);
+ ADD_STRING ("\n IP: ");
+ ADD_MEM (regs[12], 8);
+ ADD_STRING (" SP: ");
+ ADD_MEM (regs[13], 8);
+ ADD_STRING (" LR: ");
+ ADD_MEM (regs[14], 8);
+ ADD_STRING (" PC: ");
+ ADD_MEM (regs[15], 8);
+ ADD_STRING ("\n\n CPSR: ");
+ ADD_MEM (regs[16], 8);
+ ADD_STRING ("\n\n Trap: ");
+ ADD_MEM (regs[17], 8);
+ ADD_STRING (" Error: ");
+ ADD_MEM (regs[18], 8);
+ ADD_STRING (" OldMask: ");
+ ADD_MEM (regs[19], 8);
+
+ ADD_STRING ("\n");
+
+ /* Write the stuff out. */
+ writev (fd, iov, nr);
+}
+
+
+#define REGISTER_DUMP register_dump (fd, &ctx)