[PATCH] Fix byte order assumption in alphanbsd-tdep.c
Jason R Thorpe
thorpej@wasabisystems.com
Tue May 21 21:45:00 GMT 2002
I realized this when I was doing mipsnbsd-tdep.c, and slacked fixing it
in alphanbsd-tdep.c :-)
Committed to trunk.
* alphanbsd-tdep.c (alphanbsd_sigtramp_offset): Don't make
assumptions about the host's byte order.
--
-- Jason R. Thorpe <thorpej@wasabisystems.com>
-------------- next part --------------
Index: alphanbsd-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/alphanbsd-tdep.c,v
retrieving revision 1.7
diff -u -r1.7 alphanbsd-tdep.c
--- alphanbsd-tdep.c 22 May 2002 04:15:36 -0000 1.7
+++ alphanbsd-tdep.c 22 May 2002 04:21:45 -0000
@@ -135,29 +135,29 @@
sequence and can then check whether we really are executing in the
signal trampoline. If not, -1 is returned, otherwise the offset from the
start of the return sequence is returned. */
-static const unsigned int sigtramp_retcode[] =
+static const unsigned char sigtramp_retcode[] =
{
- 0xa61e0000, /* ldq a0, 0(sp) */
- 0x23de0010, /* lda sp, 16(sp) */
- 0x201f0127, /* lda v0, 295(zero) */
- 0x00000083, /* call_pal callsys */
+ 0x00, 0x00, 0x1e, 0xa6, /* ldq a0, 0(sp) */
+ 0x10, 0x00, 0xde, 0x23, /* lda sp, 16(sp) */
+ 0x27, 0x01, 0x1f, 0x20, /* lda v0, 295(zero) */
+ 0x83, 0x00, 0x00, 0x00, /* call_pal callsys */
};
-#define RETCODE_NWORDS \
- (sizeof (sigtramp_retcode) / sizeof (sigtramp_retcode[0]))
+#define RETCODE_NWORDS 4
+#define RETCODE_SIZE (RETCODE_NWORDS * 4)
LONGEST
alphanbsd_sigtramp_offset (CORE_ADDR pc)
{
- unsigned int ret[4], w;
+ unsigned char ret[RETCODE_SIZE], w[4];
LONGEST off;
int i;
- if (read_memory_nobpt (pc, (char *) &w, 4) != 0)
+ if (read_memory_nobpt (pc, (char *) w, 4) != 0)
return -1;
for (i = 0; i < RETCODE_NWORDS; i++)
{
- if (w == sigtramp_retcode[i])
+ if (memcmp (w, sigtramp_retcode + (i * 4), 4) == 0)
break;
}
if (i == RETCODE_NWORDS)
@@ -169,7 +169,7 @@
if (read_memory_nobpt (pc, (char *) ret, sizeof (ret)) != 0)
return -1;
- if (memcmp (ret, sigtramp_retcode, sizeof (sigtramp_retcode)) == 0)
+ if (memcmp (ret, sigtramp_retcode, RETCODE_SIZE) == 0)
return off;
return -1;
More information about the Gdb-patches
mailing list