From 2a770cac0fc9f613a45f220f68ff2de6688908bd Mon Sep 17 00:00:00 2001 From: John Gilmore Date: Fri, 29 Jan 1993 05:28:45 +0000 Subject: [PATCH] M88K fixes reported by Carl Greco, : * tm-m88k.h (REGISTER_CONVERT_TO_RAW): Fix typo. * m88k-tdep.c (next_insn): Lint, cleanup. (store_parm_word): Lint. --- gdb/ChangeLog | 5 +++++ gdb/m88k-tdep.c | 12 ++++++------ gdb/tm-m88k.h | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2f38b6ad7a..0e2ba690df 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ Thu Jan 28 19:09:02 1993 John Gilmore (gnu@cygnus.com) + M88K fixes reported by Carl Greco, : + * tm-m88k.h (REGISTER_CONVERT_TO_RAW): Fix typo. + * m88k-tdep.c (next_insn): Lint, cleanup. + (store_parm_word): Lint. + * README: Fix typo (reported by karl@hq.ileaf.com). Wed Jan 27 21:34:21 1993 Fred Fish (fnf@cygnus.com) diff --git a/gdb/m88k-tdep.c b/gdb/m88k-tdep.c index 0648412ac2..bc6785bd6e 100644 --- a/gdb/m88k-tdep.c +++ b/gdb/m88k-tdep.c @@ -45,6 +45,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "setjmp.h" #include "value.h" +/* Size of an instruction */ +#define BYTES_PER_88K_INSN 4 + void frame_find_saved_regs (); @@ -178,11 +181,8 @@ next_insn (memaddr, pword1) { unsigned long buf[1]; - read_memory (memaddr, buf, sizeof (buf)); - *pword1 = buf[0]; - SWAP_TARGET_AND_HOST (pword1, sizeof (long)); - - return memaddr + 4; + *pword1 = read_memory_integer (memaddr, BYTES_PER_88K_INSN); + return memaddr + BYTES_PER_88K_INSN; } /* Read a register from frames called by us (or from the hardware regs). */ @@ -642,7 +642,7 @@ store_parm_word (address, val) CORE_ADDR address; int val; { - write_memory (address, &val, 4); + write_memory (address, (char *)&val, 4); } static int diff --git a/gdb/tm-m88k.h b/gdb/tm-m88k.h index 7ab1ead998..287d74f30e 100644 --- a/gdb/tm-m88k.h +++ b/gdb/tm-m88k.h @@ -279,7 +279,7 @@ extern CORE_ADDR skip_prologue (); /* Convert data from virtual format for register REGNUM to raw format for register REGNUM. */ -#define REGISTER_CONVERT_TO_RAW(REGNUM,FROM,TO) +#define REGISTER_CONVERT_TO_RAW(REGNUM,FROM,TO) \ {bcopy ((FROM), (TO), REGISTER_RAW_SIZE (REGNUM));} /* Return the GDB type object for the "standard" data type