* readelf.c (dynamic_info): Correct size of array.
[deliverable/binutils-gdb.git] / gdb / solib-irix.c
index 49bd200543b55abec803472fd9a3a429f82b51bb..13a3e3d40f2aefc7d050a7485242e290546c16b0 100644 (file)
@@ -1,6 +1,6 @@
 /* Shared library support for IRIX.
    Copyright (C) 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2004,
-   2007, 2008 Free Software Foundation, Inc.
+   2007, 2008, 2009 Free Software Foundation, Inc.
 
    This file was created using portions of irix5-nat.c originally
    contributed to GDB by Ian Lance Taylor.
@@ -130,18 +130,19 @@ union irix_obj_info
    appropriate type.  Calling extract_signed_integer seems simpler.  */
 
 static CORE_ADDR
-extract_mips_address (void *addr, int len)
+extract_mips_address (void *addr, int len, enum bfd_endian byte_order)
 {
-  return extract_signed_integer (addr, len);
+  return extract_signed_integer (addr, len, byte_order);
 }
 
 /* Fetch and return the link map data associated with ADDR.  Note that
    this routine automatically determines which (of three) link map
    formats is in use by the target.  */
 
-struct lm_info
+static struct lm_info
 fetch_lm_info (CORE_ADDR addr)
 {
+  enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);
   struct lm_info li;
   union irix_obj_info buf;
 
@@ -154,24 +155,27 @@ fetch_lm_info (CORE_ADDR addr)
      being at the end of a page or the like.)  */
   read_memory (addr, (char *) &buf, sizeof (buf.ol32));
 
-  if (extract_unsigned_integer (buf.magic.b, sizeof (buf.magic)) != 0xffffffff)
+  if (extract_unsigned_integer (buf.magic.b, sizeof (buf.magic), byte_order)
+      != 0xffffffff)
     {
       /* Use buf.ol32... */
       char obj_buf[432];
       CORE_ADDR obj_addr = extract_mips_address (&buf.ol32.data,
-                                                sizeof (buf.ol32.data));
-      li.next = extract_mips_address (&buf.ol32.next, sizeof (buf.ol32.next));
+                                                sizeof (buf.ol32.data),
+                                                byte_order);
+      li.next = extract_mips_address (&buf.ol32.next,
+                                     sizeof (buf.ol32.next), byte_order);
 
       read_memory (obj_addr, obj_buf, sizeof (obj_buf));
 
-      li.pathname_addr = extract_mips_address (&obj_buf[236], 4);
+      li.pathname_addr = extract_mips_address (&obj_buf[236], 4, byte_order);
       li.pathname_len = 0;     /* unknown */
-      li.reloc_offset = extract_mips_address (&obj_buf[196], 4)
-       - extract_mips_address (&obj_buf[248], 4);
+      li.reloc_offset = extract_mips_address (&obj_buf[196], 4, byte_order)
+       - extract_mips_address (&obj_buf[248], 4, byte_order);
 
     }
   else if (extract_unsigned_integer (buf.oi32.oi_size.b,
-                                    sizeof (buf.oi32.oi_size))
+                                    sizeof (buf.oi32.oi_size), byte_order)
           == sizeof (buf.oi32))
     {
       /* Use buf.oi32...  */
@@ -183,19 +187,22 @@ fetch_lm_info (CORE_ADDR addr)
 
       /* Fill in fields using buffer contents.  */
       li.next = extract_mips_address (&buf.oi32.oi_next,
-                                     sizeof (buf.oi32.oi_next));
+                                     sizeof (buf.oi32.oi_next), byte_order);
       li.reloc_offset = extract_mips_address (&buf.oi32.oi_ehdr,
-                                             sizeof (buf.oi32.oi_ehdr))
+                                             sizeof (buf.oi32.oi_ehdr),
+                                             byte_order)
        - extract_mips_address (&buf.oi32.oi_orig_ehdr,
-                               sizeof (buf.oi32.oi_orig_ehdr));
+                               sizeof (buf.oi32.oi_orig_ehdr), byte_order);
       li.pathname_addr = extract_mips_address (&buf.oi32.oi_pathname,
-                                              sizeof (buf.oi32.oi_pathname));
+                                              sizeof (buf.oi32.oi_pathname),
+                                              byte_order);
       li.pathname_len = extract_unsigned_integer (buf.oi32.oi_pathname_len.b,
                                                  sizeof (buf.oi32.
-                                                         oi_pathname_len));
+                                                         oi_pathname_len),
+                                                 byte_order);
     }
   else if (extract_unsigned_integer (buf.oi64.oi_size.b,
-                                    sizeof (buf.oi64.oi_size))
+                                    sizeof (buf.oi64.oi_size), byte_order)
           == sizeof (buf.oi64))
     {
       /* Use buf.oi64...  */
@@ -207,16 +214,19 @@ fetch_lm_info (CORE_ADDR addr)
 
       /* Fill in fields using buffer contents.  */
       li.next = extract_mips_address (&buf.oi64.oi_next,
-                                     sizeof (buf.oi64.oi_next));
+                                     sizeof (buf.oi64.oi_next), byte_order);
       li.reloc_offset = extract_mips_address (&buf.oi64.oi_ehdr,
-                                             sizeof (buf.oi64.oi_ehdr))
+                                             sizeof (buf.oi64.oi_ehdr),
+                                             byte_order)
        - extract_mips_address (&buf.oi64.oi_orig_ehdr,
-                               sizeof (buf.oi64.oi_orig_ehdr));
+                               sizeof (buf.oi64.oi_orig_ehdr), byte_order);
       li.pathname_addr = extract_mips_address (&buf.oi64.oi_pathname,
-                                              sizeof (buf.oi64.oi_pathname));
+                                              sizeof (buf.oi64.oi_pathname),
+                                              byte_order);
       li.pathname_len = extract_unsigned_integer (buf.oi64.oi_pathname_len.b,
                                                  sizeof (buf.oi64.
-                                                         oi_pathname_len));
+                                                         oi_pathname_len),
+                                                 byte_order);
     }
   else
     {
@@ -320,7 +330,7 @@ disable_break (void)
   /* Note that breakpoint address and original contents are in our address
      space, so we just need to write the original contents back. */
 
-  if (deprecated_remove_raw_breakpoint (base_breakpoint) != 0)
+  if (deprecated_remove_raw_breakpoint (target_gdbarch, base_breakpoint) != 0)
     {
       status = 0;
     }
@@ -355,10 +365,15 @@ disable_break (void)
 static int
 enable_break (void)
 {
-  if (symfile_objfile != NULL)
+  if (symfile_objfile != NULL && has_stack_frames ())
     {
+      struct frame_info *frame = get_current_frame ();
+      struct address_space *aspace = get_frame_address_space (frame);
+
       base_breakpoint
-       = deprecated_insert_raw_breakpoint (entry_point_address ());
+       = deprecated_insert_raw_breakpoint (target_gdbarch,
+                                           aspace,
+                                           entry_point_address ());
 
       if (base_breakpoint != NULL)
        return 1;
@@ -493,6 +508,8 @@ irix_solib_create_inferior_hook (void)
 static struct so_list *
 irix_current_sos (void)
 {
+  enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);
+  int addr_size = gdbarch_addr_bit (target_gdbarch) / TARGET_CHAR_BIT;
   CORE_ADDR lma;
   char addr_buf[8];
   struct so_list *head = 0;
@@ -512,12 +529,8 @@ irix_current_sos (void)
        return 0;
     }
 
-  read_memory (debug_base,
-              addr_buf,
-              gdbarch_addr_bit (target_gdbarch) / TARGET_CHAR_BIT);
-  lma = extract_mips_address (addr_buf,
-                             gdbarch_addr_bit (target_gdbarch)
-                               / TARGET_CHAR_BIT);
+  read_memory (debug_base, addr_buf, addr_size);
+  lma = extract_mips_address (addr_buf, addr_size, byte_order);
 
   while (lma)
     {
@@ -602,6 +615,8 @@ irix_current_sos (void)
 static int
 irix_open_symbol_file_object (void *from_ttyp)
 {
+  enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);
+  int addr_size = gdbarch_addr_bit (target_gdbarch) / TARGET_CHAR_BIT;
   CORE_ADDR lma;
   char addr_buf[8];
   struct lm_info lm;
@@ -611,19 +626,15 @@ irix_open_symbol_file_object (void *from_ttyp)
   char *filename;
 
   if (symfile_objfile)
-    if (!query ("Attempt to reload symbols from process? "))
+    if (!query (_("Attempt to reload symbols from process? ")))
       return 0;
 
   if ((debug_base = locate_base ()) == 0)
     return 0;                  /* failed somehow...  */
 
   /* First link map member should be the executable.  */
-  read_memory (debug_base,
-              addr_buf,
-              gdbarch_addr_bit (target_gdbarch) / TARGET_CHAR_BIT);
-  lma = extract_mips_address (addr_buf,
-                             gdbarch_addr_bit (target_gdbarch)
-                               / TARGET_CHAR_BIT);
+  read_memory (debug_base, addr_buf, addr_size);
+  lma = extract_mips_address (addr_buf, addr_size, byte_order);
   if (lma == 0)
     return 0;                  /* failed somehow...  */
 
@@ -687,7 +698,7 @@ irix_special_symbol_handling (void)
 
 static void
 irix_relocate_section_addresses (struct so_list *so,
-                                struct section_table *sec)
+                                struct target_section *sec)
 {
   sec->addr += so->lm_info->reloc_offset;
   sec->endaddr += so->lm_info->reloc_offset;
@@ -719,6 +730,9 @@ irix_in_dynsym_resolve_code (CORE_ADDR pc)
 
 struct target_so_ops irix_so_ops;
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_irix_solib;
+
 void
 _initialize_irix_solib (void)
 {
@@ -730,4 +744,5 @@ _initialize_irix_solib (void)
   irix_so_ops.current_sos = irix_current_sos;
   irix_so_ops.open_symbol_file_object = irix_open_symbol_file_object;
   irix_so_ops.in_dynsym_resolve_code = irix_in_dynsym_resolve_code;
+  irix_so_ops.bfd_open = solib_bfd_open;
 }
This page took 0.028334 seconds and 4 git commands to generate.