* vax-tdep.c: Tweak comments. Reorder include files. Don't

include "symtab.h", "opcode/vax.h" and "inferior.h".
(vax_skip_prologue): Replace calls to read_memory_integer by calls
to read_memory_unsigned_integer.
(vax_gdbarch_init): Reorder.
(_initialize_vax_tdep): Spell out prototype.
* Makefile.in (vax-tdep.o): Update dependencies.
This commit is contained in:
Mark Kettenis 2004-05-08 22:52:43 +00:00
parent e6b55ae2e0
commit 0543f3876c
3 changed files with 36 additions and 26 deletions

View File

@ -1,3 +1,13 @@
2004-05-09 Mark Kettenis <kettenis@gnu.org>
* vax-tdep.c: Tweak comments. Reorder include files. Don't
include "symtab.h", "opcode/vax.h" and "inferior.h".
(vax_skip_prologue): Replace calls to read_memory_integer by calls
to read_memory_unsigned_integer.
(vax_gdbarch_init): Reorder.
(_initialize_vax_tdep): Spell out prototype.
* Makefile.in (vax-tdep.o): Update dependencies.
2004-05-08 Andrew Cagney <cagney@redhat.com> 2004-05-08 Andrew Cagney <cagney@redhat.com>
* infrun.c (resume): Delete call to DO_DEFERRED_STORES. * infrun.c (resume): Delete call to DO_DEFERRED_STORES.

View File

@ -2511,10 +2511,10 @@ values.o: values.c $(defs_h) $(gdb_string_h) $(symtab_h) $(gdbtypes_h) \
$(gdb_assert_h) $(regcache_h) $(block_h) $(gdb_assert_h) $(regcache_h) $(block_h)
varobj.o: varobj.c $(defs_h) $(value_h) $(expression_h) $(frame_h) \ varobj.o: varobj.c $(defs_h) $(value_h) $(expression_h) $(frame_h) \
$(language_h) $(wrapper_h) $(gdbcmd_h) $(gdb_string_h) $(varobj_h) $(language_h) $(wrapper_h) $(gdbcmd_h) $(gdb_string_h) $(varobj_h)
vax-tdep.o: vax-tdep.c $(defs_h) $(symtab_h) $(opcode_vax_h) $(gdbcore_h) \ vax-tdep.o: vax-tdep.c $(defs_h) $(arch_utils_h) $(dis_asm_h) $(frame_h) \
$(inferior_h) $(regcache_h) $(frame_h) $(frame_base_h) \ $(frame_base_h) $(frame_unwind_h) $(gdbcore_h) $(osabi_h) \
$(frame_unwind_h) $(value_h) $(arch_utils_h) $(osabi_h) \ $(regcache_h) $(regset_h) $(value_h) $(trad_frame_h) \
$(dis_asm_h) $(regset_h) $(gdb_string_h) $(vax_tdep_h) $(gdb_string_h) $(vax_tdep_h)
vaxbsd-nat.o: vaxbsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) $(vax_tdep_h) vaxbsd-nat.o: vaxbsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) $(vax_tdep_h)
vaxnbsd-tdep.o: vaxnbsd-tdep.c $(defs_h) $(arch_utils_h) $(osabi_h) \ vaxnbsd-tdep.o: vaxnbsd-tdep.c $(defs_h) $(arch_utils_h) $(osabi_h) \
$(vax_tdep_h) $(solib_svr4_h) $(gdb_string_h) $(vax_tdep_h) $(solib_svr4_h) $(gdb_string_h)

View File

@ -1,4 +1,4 @@
/* Print VAX instructions for GDB, the GNU debugger. /* Target-dependent code for the VAX.
Copyright 1986, 1989, 1991, 1992, 1995, 1996, 1998, 1999, 2000, Copyright 1986, 1989, 1991, 1992, 1995, 1996, 1998, 1999, 2000,
2002, 2003, 2004 Free Software Foundation, Inc. 2002, 2003, 2004 Free Software Foundation, Inc.
@ -21,20 +21,18 @@
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#include "defs.h" #include "defs.h"
#include "symtab.h" #include "arch-utils.h"
#include "opcode/vax.h" #include "dis-asm.h"
#include "gdbcore.h"
#include "inferior.h"
#include "regcache.h"
#include "frame.h" #include "frame.h"
#include "frame-base.h" #include "frame-base.h"
#include "frame-unwind.h" #include "frame-unwind.h"
#include "gdbcore.h"
#include "gdbtypes.h"
#include "osabi.h"
#include "regcache.h"
#include "regset.h"
#include "trad-frame.h" #include "trad-frame.h"
#include "value.h" #include "value.h"
#include "arch-utils.h"
#include "osabi.h"
#include "dis-asm.h"
#include "regset.h"
#include "gdb_string.h" #include "gdb_string.h"
@ -258,26 +256,28 @@ vax_breakpoint_from_pc (CORE_ADDR *pc, int *len)
static CORE_ADDR static CORE_ADDR
vax_skip_prologue (CORE_ADDR pc) vax_skip_prologue (CORE_ADDR pc)
{ {
int op = (unsigned char) read_memory_integer (pc, 1); unsigned char op = read_memory_unsigned_integer (pc, 1);
if (op == 0x11) if (op == 0x11)
pc += 2; /* skip brb */ pc += 2; /* skip brb */
if (op == 0x31) if (op == 0x31)
pc += 3; /* skip brw */ pc += 3; /* skip brw */
if (op == 0xC2 if (op == 0xC2
&& ((unsigned char) read_memory_integer (pc + 2, 1)) == 0x5E) && (read_memory_unsigned_integer (pc + 2, 1)) == 0x5E)
pc += 3; /* skip subl2 */ pc += 3; /* skip subl2 */
if (op == 0x9E if (op == 0x9E
&& ((unsigned char) read_memory_integer (pc + 1, 1)) == 0xAE && (read_memory_unsigned_integer (pc + 1, 1)) == 0xAE
&& ((unsigned char) read_memory_integer (pc + 3, 1)) == 0x5E) && (read_memory_unsigned_integer (pc + 3, 1)) == 0x5E)
pc += 4; /* skip movab */ pc += 4; /* skip movab */
if (op == 0x9E if (op == 0x9E
&& ((unsigned char) read_memory_integer (pc + 1, 1)) == 0xCE && (read_memory_unsigned_integer (pc + 1, 1)) == 0xCE
&& ((unsigned char) read_memory_integer (pc + 4, 1)) == 0x5E) && (read_memory_unsigned_integer (pc + 4, 1)) == 0x5E)
pc += 5; /* skip movab */ pc += 5; /* skip movab */
if (op == 0x9E if (op == 0x9E
&& ((unsigned char) read_memory_integer (pc + 1, 1)) == 0xEE && (read_memory_unsigned_integer (pc + 1, 1)) == 0xEE
&& ((unsigned char) read_memory_integer (pc + 6, 1)) == 0x5E) && (read_memory_unsigned_integer (pc + 6, 1)) == 0x5E)
pc += 7; /* skip movab */ pc += 7; /* skip movab */
return pc; return pc;
} }
@ -476,7 +476,6 @@ vax_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
/* Frame and stack info */ /* Frame and stack info */
set_gdbarch_skip_prologue (gdbarch, vax_skip_prologue); set_gdbarch_skip_prologue (gdbarch, vax_skip_prologue);
set_gdbarch_frame_num_args (gdbarch, vax_frame_num_args); set_gdbarch_frame_num_args (gdbarch, vax_frame_num_args);
set_gdbarch_frame_args_skip (gdbarch, 4); set_gdbarch_frame_args_skip (gdbarch, 4);
/* Stack grows downward. */ /* Stack grows downward. */
@ -496,6 +495,8 @@ vax_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
set_gdbarch_function_start_offset (gdbarch, 2); set_gdbarch_function_start_offset (gdbarch, 2);
set_gdbarch_believe_pcc_promotion (gdbarch, 1); set_gdbarch_believe_pcc_promotion (gdbarch, 1);
set_gdbarch_print_insn (gdbarch, print_insn_vax);
set_gdbarch_unwind_pc (gdbarch, vax_unwind_pc); set_gdbarch_unwind_pc (gdbarch, vax_unwind_pc);
frame_base_set_default (gdbarch, &vax_frame_base); frame_base_set_default (gdbarch, &vax_frame_base);
@ -505,12 +506,11 @@ vax_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
frame_unwind_append_sniffer (gdbarch, vax_frame_sniffer); frame_unwind_append_sniffer (gdbarch, vax_frame_sniffer);
set_gdbarch_print_insn (gdbarch, print_insn_vax);
return (gdbarch); return (gdbarch);
} }
extern initialize_file_ftype _initialize_vax_tdep; /* -Wmissing-prototypes */ /* Provide a prototype to silence -Wmissing-prototypes. */
void _initialize_vax_tdep (void);
void void
_initialize_vax_tdep (void) _initialize_vax_tdep (void)