X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Frs6000-nat.c;h=c930097fef3470a79074718bac312104081005fb;hb=eb3c48e9b415e7a56dda6a160f31fe4994c43e13;hp=65256f447118ee3485077059fd4d01a79d2b917e;hpb=2ee563b53258d390d7446e90a67f465d504ae44c;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/rs6000-nat.c b/gdb/rs6000-nat.c index 65256f4471..c930097fef 100644 --- a/gdb/rs6000-nat.c +++ b/gdb/rs6000-nat.c @@ -1,7 +1,8 @@ /* IBM RS/6000 native-dependent code for GDB, the GNU debugger. - Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997, - 1998, 1999, 2000, 2001, 2002 - Free Software Foundation, Inc. + + Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994, 1995, 1996, + 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software + Foundation, Inc. This file is part of GDB. @@ -27,13 +28,14 @@ #include "xcoffsolib.h" #include "symfile.h" #include "objfiles.h" -#include "libbfd.h" /* For bfd_cache_lookup (FIXME) */ +#include "libbfd.h" /* For bfd_default_set_arch_mach (FIXME) */ #include "bfd.h" +#include "exceptions.h" #include "gdb-stabs.h" #include "regcache.h" #include "arch-utils.h" -#include "language.h" /* for local_hex_string(). */ #include "ppc-tdep.h" +#include "exec.h" #include #include @@ -71,7 +73,7 @@ #ifndef ARCH3264 # define ARCH64() 0 #else -# define ARCH64() (REGISTER_RAW_SIZE (0) == 8) +# define ARCH64() (register_size (current_gdbarch, 0) == 8) #endif /* Union of 32-bit and 64-bit ".reg" core file sections. */ @@ -127,8 +129,6 @@ typedef union { extern struct vmap *map_vmap (bfd * bf, bfd * arch); -extern struct target_ops exec_ops; - static void vmap_exec (void); static void vmap_ldinfo (LdInfo *); @@ -143,8 +143,7 @@ static void fetch_core_registers (char *, unsigned int, int, CORE_ADDR); static void exec_one_dummy_insn (void); -extern void -fixup_breakpoints (CORE_ADDR low, CORE_ADDR high, CORE_ADDR delta); +extern void fixup_breakpoints (CORE_ADDR low, CORE_ADDR high, CORE_ADDR delta); /* Given REGNO, a gdb register number, return the corresponding number suitable for use as a ptrace() parameter. Return -1 if @@ -157,12 +156,15 @@ regmap (int regno, int *isfloat) struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); *isfloat = 0; - if (tdep->ppc_gp0_regnum <= regno && regno <= tdep->ppc_gplast_regnum) + if (tdep->ppc_gp0_regnum <= regno + && regno < tdep->ppc_gp0_regnum + ppc_num_gprs) return regno; - else if (FP0_REGNUM <= regno && regno <= FPLAST_REGNUM) + else if (tdep->ppc_fp0_regnum >= 0 + && tdep->ppc_fp0_regnum <= regno + && regno < tdep->ppc_fp0_regnum + ppc_num_fprs) { *isfloat = 1; - return regno - FP0_REGNUM + FPR0; + return regno - tdep->ppc_fp0_regnum + FPR0; } else if (regno == PC_REGNUM) return IAR; @@ -176,7 +178,8 @@ regmap (int regno, int *isfloat) return CTR; else if (regno == tdep->ppc_xer_regnum) return XER; - else if (regno == tdep->ppc_fpscr_regnum) + else if (tdep->ppc_fpscr_regnum >= 0 + && regno == tdep->ppc_fpscr_regnum) return FPSCR; else if (tdep->ppc_mq_regnum >= 0 && regno == tdep->ppc_mq_regnum) return MQ; @@ -219,7 +222,7 @@ rs6000_ptrace64 (int req, int id, long long addr, int data, int *buf) static void fetch_register (int regno) { - int *addr = alloca (MAX_REGISTER_RAW_SIZE); + int addr[MAX_REGISTER_SIZE]; int nr, isfloat; /* Retrieved values may be -1, so infer errors from errno. */ @@ -252,7 +255,7 @@ fetch_register (int regno) even if the register is really only 32 bits. */ long long buf; rs6000_ptrace64 (PT_READ_GPR, PIDGET (inferior_ptid), nr, 0, (int *)&buf); - if (REGISTER_RAW_SIZE (regno) == 8) + if (register_size (current_gdbarch, regno) == 8) memcpy (addr, &buf, 8); else *addr = buf; @@ -260,7 +263,7 @@ fetch_register (int regno) } if (!errno) - supply_register (regno, (char *) addr); + regcache_raw_supply (current_regcache, regno, (char *) addr); else { #if 0 @@ -276,11 +279,11 @@ fetch_register (int regno) static void store_register (int regno) { - int *addr = alloca (MAX_REGISTER_RAW_SIZE); + int addr[MAX_REGISTER_SIZE]; int nr, isfloat; /* Fetch the register's value from the register cache. */ - regcache_collect (regno, addr); + regcache_raw_collect (current_regcache, regno, addr); /* -1 can be a successful return value, so infer errors from errno. */ errno = 0; @@ -321,7 +324,7 @@ store_register (int regno) /* PT_WRITE_GPR requires the buffer parameter to point to an 8-byte area, even if the register is really only 32 bits. */ long long buf; - if (REGISTER_RAW_SIZE (regno) == 8) + if (register_size (current_gdbarch, regno) == 8) memcpy (&buf, addr, 8); else buf = *addr; @@ -351,15 +354,16 @@ fetch_inferior_registers (int regno) /* Read 32 general purpose registers. */ for (regno = tdep->ppc_gp0_regnum; - regno <= tdep->ppc_gplast_regnum; + regno < tdep->ppc_gp0_regnum + ppc_num_gprs; regno++) { fetch_register (regno); } /* Read general purpose floating point registers. */ - for (regno = FP0_REGNUM; regno <= FPLAST_REGNUM; regno++) - fetch_register (regno); + if (tdep->ppc_fp0_regnum >= 0) + for (regno = 0; regno < ppc_num_fprs; regno++) + fetch_register (tdep->ppc_fp0_regnum + regno); /* Read special registers. */ fetch_register (PC_REGNUM); @@ -368,7 +372,8 @@ fetch_inferior_registers (int regno) fetch_register (tdep->ppc_lr_regnum); fetch_register (tdep->ppc_ctr_regnum); fetch_register (tdep->ppc_xer_regnum); - fetch_register (tdep->ppc_fpscr_regnum); + if (tdep->ppc_fpscr_regnum >= 0) + fetch_register (tdep->ppc_fpscr_regnum); if (tdep->ppc_mq_regnum >= 0) fetch_register (tdep->ppc_mq_regnum); } @@ -390,15 +395,16 @@ store_inferior_registers (int regno) /* Write general purpose registers first. */ for (regno = tdep->ppc_gp0_regnum; - regno <= tdep->ppc_gplast_regnum; + regno < tdep->ppc_gp0_regnum + ppc_num_gprs; regno++) { store_register (regno); } /* Write floating point registers. */ - for (regno = FP0_REGNUM; regno <= FPLAST_REGNUM; regno++) - store_register (regno); + if (tdep->ppc_fp0_regnum >= 0) + for (regno = 0; regno < ppc_num_fprs; regno++) + store_register (tdep->ppc_fp0_regnum + regno); /* Write special registers. */ store_register (PC_REGNUM); @@ -407,7 +413,8 @@ store_inferior_registers (int regno) store_register (tdep->ppc_lr_regnum); store_register (tdep->ppc_ctr_regnum); store_register (tdep->ppc_xer_regnum); - store_register (tdep->ppc_fpscr_regnum); + if (tdep->ppc_fpscr_regnum >= 0) + store_register (tdep->ppc_fpscr_regnum); if (tdep->ppc_mq_regnum >= 0) store_register (tdep->ppc_mq_regnum); } @@ -436,10 +443,10 @@ read_word (CORE_ADDR from, int *to, int arch64) to debugger memory starting at MYADDR. Copy to inferior if WRITE is nonzero. - Returns the length copied, which is either the LEN argument or zero. - This xfer function does not do partial moves, since child_ops - doesn't allow memory operations to cross below us in the target stack - anyway. */ + Returns the length copied, which is either the LEN argument or + zero. This xfer function does not do partial moves, since + deprecated_child_ops doesn't allow memory operations to cross below + us in the target stack anyway. */ int child_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, @@ -486,7 +493,8 @@ child_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, /* Fetch trailing memory needed for alignment. */ if (addr + count * sizeof (int) > memaddr + len) - if (!read_word (addr, buf + count - 1, arch64)) + if (!read_word (addr + (count - 1) * sizeof (int), + buf + count - 1, arch64)) return 0; /* Copy supplied data into memory buffer. */ @@ -578,37 +586,60 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, if (ARCH64 ()) { - for (regi = 0; regi < 32; regi++) - supply_register (regi, (char *) ®s->r64.gpr[regi]); - - for (regi = 0; regi < 32; regi++) - supply_register (FP0_REGNUM + regi, (char *) ®s->r64.fpr[regi]); - - supply_register (PC_REGNUM, (char *) ®s->r64.iar); - supply_register (tdep->ppc_ps_regnum, (char *) ®s->r64.msr); - supply_register (tdep->ppc_cr_regnum, (char *) ®s->r64.cr); - supply_register (tdep->ppc_lr_regnum, (char *) ®s->r64.lr); - supply_register (tdep->ppc_ctr_regnum, (char *) ®s->r64.ctr); - supply_register (tdep->ppc_xer_regnum, (char *) ®s->r64.xer); - supply_register (tdep->ppc_fpscr_regnum, (char *) ®s->r64.fpscr); + for (regi = 0; regi < ppc_num_gprs; regi++) + regcache_raw_supply (current_regcache, tdep->ppc_gp0_regnum + regi, + (char *) ®s->r64.gpr[regi]); + + if (tdep->ppc_fp0_regnum >= 0) + for (regi = 0; regi < ppc_num_fprs; regi++) + regcache_raw_supply (current_regcache, tdep->ppc_fp0_regnum + regi, + (char *) ®s->r64.fpr[regi]); + + regcache_raw_supply (current_regcache, PC_REGNUM, + (char *) ®s->r64.iar); + regcache_raw_supply (current_regcache, tdep->ppc_ps_regnum, + (char *) ®s->r64.msr); + regcache_raw_supply (current_regcache, tdep->ppc_cr_regnum, + (char *) ®s->r64.cr); + regcache_raw_supply (current_regcache, tdep->ppc_lr_regnum, + (char *) ®s->r64.lr); + regcache_raw_supply (current_regcache, tdep->ppc_ctr_regnum, + (char *) ®s->r64.ctr); + regcache_raw_supply (current_regcache, tdep->ppc_xer_regnum, + (char *) ®s->r64.xer); + if (tdep->ppc_fpscr_regnum >= 0) + regcache_raw_supply (current_regcache, tdep->ppc_fpscr_regnum, + (char *) ®s->r64.fpscr); } else { - for (regi = 0; regi < 32; regi++) - supply_register (regi, (char *) ®s->r32.gpr[regi]); - - for (regi = 0; regi < 32; regi++) - supply_register (FP0_REGNUM + regi, (char *) ®s->r32.fpr[regi]); - - supply_register (PC_REGNUM, (char *) ®s->r32.iar); - supply_register (tdep->ppc_ps_regnum, (char *) ®s->r32.msr); - supply_register (tdep->ppc_cr_regnum, (char *) ®s->r32.cr); - supply_register (tdep->ppc_lr_regnum, (char *) ®s->r32.lr); - supply_register (tdep->ppc_ctr_regnum, (char *) ®s->r32.ctr); - supply_register (tdep->ppc_xer_regnum, (char *) ®s->r32.xer); - supply_register (tdep->ppc_fpscr_regnum, (char *) ®s->r32.fpscr); + for (regi = 0; regi < ppc_num_gprs; regi++) + regcache_raw_supply (current_regcache, tdep->ppc_gp0_regnum + regi, + (char *) ®s->r32.gpr[regi]); + + if (tdep->ppc_fp0_regnum >= 0) + for (regi = 0; regi < ppc_num_fprs; regi++) + regcache_raw_supply (current_regcache, tdep->ppc_fp0_regnum + regi, + (char *) ®s->r32.fpr[regi]); + + regcache_raw_supply (current_regcache, PC_REGNUM, + (char *) ®s->r32.iar); + regcache_raw_supply (current_regcache, tdep->ppc_ps_regnum, + (char *) ®s->r32.msr); + regcache_raw_supply (current_regcache, tdep->ppc_cr_regnum, + (char *) ®s->r32.cr); + regcache_raw_supply (current_regcache, tdep->ppc_lr_regnum, + (char *) ®s->r32.lr); + regcache_raw_supply (current_regcache, tdep->ppc_ctr_regnum, + (char *) ®s->r32.ctr); + regcache_raw_supply (current_regcache, tdep->ppc_xer_regnum, + (char *) ®s->r32.xer); + if (tdep->ppc_fpscr_regnum >= 0) + regcache_raw_supply (current_regcache, tdep->ppc_fpscr_regnum, + (char *) ®s->r32.fpscr); if (tdep->ppc_mq_regnum >= 0) - supply_register (tdep->ppc_mq_regnum, (char *) ®s->r32.mq); + regcache_raw_supply (current_regcache, tdep->ppc_mq_regnum, + (char *) ®s->r32.mq); } } @@ -646,7 +677,7 @@ vmap_secs (struct vmap *vp, LdInfo *ldi, int arch64) static void vmap_symtab (struct vmap *vp) { - register struct objfile *objfile; + struct objfile *objfile; struct section_offsets *new_offsets; int i; @@ -664,7 +695,9 @@ vmap_symtab (struct vmap *vp) /* If symbols are not yet loaded, offsets are not yet valid. */ return; - new_offsets = (struct section_offsets *) alloca (SIZEOF_SECTION_OFFSETS); + new_offsets = + (struct section_offsets *) + alloca (SIZEOF_N_SECTION_OFFSETS (objfile->num_sections)); for (i = 0; i < objfile->num_sections; ++i) new_offsets->offsets[i] = ANOFFSET (objfile->section_offsets, i); @@ -685,7 +718,7 @@ objfile_symbol_add (void *arg) { struct objfile *obj = (struct objfile *) arg; - syms_from_objfile (obj, NULL, 0, 0); + syms_from_objfile (obj, NULL, 0, 0, 0, 0); new_symfile_objfile (obj, 0, 0); return 1; } @@ -718,7 +751,7 @@ static struct vmap * add_vmap (LdInfo *ldi) { bfd *abfd, *last; - register char *mem, *objname, *filename; + char *mem, *objname, *filename; struct objfile *obj; struct vmap *vp; int fd; @@ -742,7 +775,7 @@ add_vmap (LdInfo *ldi) abfd = bfd_fdopenr (objname, gnutarget, fd); if (!abfd) { - warning ("Could not open `%s' as an executable file: %s", + warning (_("Could not open `%s' as an executable file: %s"), objname, bfd_errmsg (bfd_get_error ())); return NULL; } @@ -757,19 +790,19 @@ add_vmap (LdInfo *ldi) last = 0; /* FIXME??? am I tossing BFDs? bfd? */ while ((last = bfd_openr_next_archived_file (abfd, last))) - if (STREQ (mem, last->filename)) + if (DEPRECATED_STREQ (mem, last->filename)) break; if (!last) { - warning ("\"%s\": member \"%s\" missing.", objname, mem); + warning (_("\"%s\": member \"%s\" missing."), objname, mem); bfd_close (abfd); return NULL; } if (!bfd_check_format (last, bfd_object)) { - warning ("\"%s\": member \"%s\" not in executable format: %s.", + warning (_("\"%s\": member \"%s\" not in executable format: %s."), objname, mem, bfd_errmsg (bfd_get_error ())); bfd_close (last); bfd_close (abfd); @@ -780,7 +813,7 @@ add_vmap (LdInfo *ldi) } else { - warning ("\"%s\": not in executable format: %s.", + warning (_("\"%s\": not in executable format: %s."), objname, bfd_errmsg (bfd_get_error ())); bfd_close (abfd); return NULL; @@ -801,7 +834,7 @@ static void vmap_ldinfo (LdInfo *ldi) { struct stat ii, vi; - register struct vmap *vp; + struct vmap *vp; int got_one, retried; int got_exec_file = 0; uint next; @@ -824,7 +857,7 @@ vmap_ldinfo (LdInfo *ldi) /* The kernel sets ld_info to -1, if the process is still using the object, and the object is removed. Keep the symbol info for the removed object and issue a warning. */ - warning ("%s (fd=%d) has disappeared, keeping its symbols", + warning (_("%s (fd=%d) has disappeared, keeping its symbols"), name, fd); continue; } @@ -841,8 +874,8 @@ vmap_ldinfo (LdInfo *ldi) /* The filenames are not always sufficient to match on. */ - if ((name[0] == '/' && !STREQ (name, vp->name)) - || (memb[0] && !STREQ (memb, vp->member))) + if ((name[0] == '/' && !DEPRECATED_STREQ (name, vp->name)) + || (memb[0] && !DEPRECATED_STREQ (memb, vp->member))) continue; /* See if we are referring to the same file. @@ -853,7 +886,7 @@ vmap_ldinfo (LdInfo *ldi) || objfile->obfd == NULL || bfd_stat (objfile->obfd, &vi) < 0) { - warning ("Unable to stat %s, keeping its symbols", name); + warning (_("Unable to stat %s, keeping its symbols"), name); continue; } @@ -877,9 +910,9 @@ vmap_ldinfo (LdInfo *ldi) vmap_symtab (vp); /* Announce new object files. Doing this after symbol relocation - makes aix-thread.c's job easier. */ - if (target_new_objfile_hook && vp->objfile) - target_new_objfile_hook (vp->objfile); + makes aix-thread.c's job easier. */ + if (deprecated_target_new_objfile_hook && vp->objfile) + deprecated_target_new_objfile_hook (vp->objfile); /* There may be more, so we don't break out of the loop. */ } @@ -901,11 +934,11 @@ vmap_ldinfo (LdInfo *ldi) running a different copy of the same executable. */ if (symfile_objfile != NULL && !got_exec_file) { - warning ("Symbol file %s\nis not mapped; discarding it.\n\ + warning (_("Symbol file %s\nis not mapped; discarding it.\n\ If in fact that file has symbols which the mapped files listed by\n\ \"info files\" lack, you can load symbols with the \"symbol-file\" or\n\ \"add-symbol-file\" commands (note that you must take care of relocating\n\ -symbols to the proper address).", +symbols to the proper address)."), symfile_objfile->name); free_objfile (symfile_objfile); symfile_objfile = NULL; @@ -935,21 +968,21 @@ vmap_exec (void) execbfd = exec_bfd; if (!vmap || !exec_ops.to_sections) - error ("vmap_exec: vmap or exec_ops.to_sections == 0\n"); + error (_("vmap_exec: vmap or exec_ops.to_sections == 0.")); for (i = 0; &exec_ops.to_sections[i] < exec_ops.to_sections_end; i++) { - if (STREQ (".text", exec_ops.to_sections[i].the_bfd_section->name)) + if (DEPRECATED_STREQ (".text", exec_ops.to_sections[i].the_bfd_section->name)) { exec_ops.to_sections[i].addr += vmap->tstart - vmap->tvma; exec_ops.to_sections[i].endaddr += vmap->tstart - vmap->tvma; } - else if (STREQ (".data", exec_ops.to_sections[i].the_bfd_section->name)) + else if (DEPRECATED_STREQ (".data", exec_ops.to_sections[i].the_bfd_section->name)) { exec_ops.to_sections[i].addr += vmap->dstart - vmap->dvma; exec_ops.to_sections[i].endaddr += vmap->dstart - vmap->dvma; } - else if (STREQ (".bss", exec_ops.to_sections[i].the_bfd_section->name)) + else if (DEPRECATED_STREQ (".bss", exec_ops.to_sections[i].the_bfd_section->name)) { exec_ops.to_sections[i].addr += vmap->dstart - vmap->dvma; exec_ops.to_sections[i].endaddr += vmap->dstart - vmap->dvma; @@ -1000,17 +1033,16 @@ set_host_arch (int pid) gdbarch_info_init (&info); info.bfd_arch_info = bfd_get_arch_info (&abfd); + info.abfd = exec_bfd; if (!gdbarch_update_p (info)) - { - internal_error (__FILE__, __LINE__, - "set_host_arch: failed to select architecture"); - } + internal_error (__FILE__, __LINE__, + _("set_host_arch: failed to select architecture")); } /* xcoff_relocate_symtab - hook for symbol table relocation. - also reads shared libraries.. */ + also reads shared libraries. */ void xcoff_relocate_symtab (unsigned int pid) @@ -1045,7 +1077,7 @@ xcoff_relocate_symtab (unsigned int pid) if (errno == ENOMEM) load_segs *= 2; else - perror_with_name ("ptrace ldinfo"); + perror_with_name (_("ptrace ldinfo")); } else { @@ -1065,7 +1097,7 @@ xcoff_relocate_symtab (unsigned int pid) void xcoff_relocate_core (struct target_ops *target) { - sec_ptr ldinfo_sec; + struct bfd_section *ldinfo_sec; int offset = 0; LdInfo *ldi; struct vmap *vp; @@ -1159,8 +1191,8 @@ xcoff_relocate_core (struct target_ops *target) vmap_symtab (vp); - if (target_new_objfile_hook && vp != vmap && vp->objfile) - target_new_objfile_hook (vp->objfile); + if (deprecated_target_new_objfile_hook && vp != vmap && vp->objfile) + deprecated_target_new_objfile_hook (vp->objfile); } while (LDI_NEXT (ldi, arch64) != 0); vmap_exec (); @@ -1195,7 +1227,7 @@ find_toc_address (CORE_ADDR pc) : vp->objfile); } } - error ("Unable to find TOC entry for pc %s\n", local_hex_string (pc)); + error (_("Unable to find TOC entry for pc %s."), hex_string (pc)); } /* Register that we are able to handle rs6000 core file formats. */ @@ -1212,13 +1244,13 @@ static struct core_fns rs6000_core_fns = void _initialize_core_rs6000 (void) { - /* Initialize hook in rs6000-tdep.c for determining the TOC address when - calling functions in the inferior. */ + /* Initialize hook in rs6000-tdep.c for determining the TOC address + when calling functions in the inferior. */ rs6000_find_toc_address_hook = find_toc_address; - /* Initialize hook in rs6000-tdep.c to set the current architecture when - starting a child process. */ + /* Initialize hook in rs6000-tdep.c to set the current architecture + when starting a child process. */ rs6000_set_host_arch_hook = set_host_arch; - add_core_fns (&rs6000_core_fns); + deprecated_add_core_fns (&rs6000_core_fns); }