* dcache.c (dcache_write_line): Fix typo.

* memattr.c (delete_mem_region): Replace free() with xfree().
(mem_number): Add explicit type.

* sol-thread.c (sol_thread_xfer_memory): Add attrib argument.
(rw_common): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 16268067284cf165fb385f827790c4088d626e68..8b483209000c2ced43169efaf446b6cc93ef572f 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2001-01-24  J.T. Conklin  <jtc@redback.com>
+
+       * dcache.c (dcache_write_line): Fix typo.
+
+       * memattr.c (delete_mem_region): Replace free() with xfree().
+       (mem_number): Add explicit type.
+
+       * sol-thread.c (sol_thread_xfer_memory): Add attrib argument.
+       (rw_common): Likewise.
+
 2001-01-24  Fernando Nasser  <fnasser@redhat.com>
 
        * infcmd.c (get_inferior_args, set_inferior_args): Accessor functions

diff --git a/gdb/dcache.c b/gdb/dcache.c
index 7973b998ea179a7556db7278786da5bae6dbd692..5fe1c47a81c74b0adc10aa37c543162d438dbe80 100644 (file)
--- a/gdb/dcache.c
+++ b/gdb/dcache.c
@@ -300,7 +300,7 @@ dcache_write_line (DCACHE *dcache, register struct dcache_block *db)
              if (res <= 0)
                return 0;
 
-             memset (db->state[XFORM(memaddr)], ENTRY_OK, res);
+             memset (&db->state[XFORM(memaddr)], ENTRY_OK, res);
              memaddr   += res;
              myaddr    += res;
              dirty_len -= res;

diff --git a/gdb/memattr.c b/gdb/memattr.c
index 5e9e9d5c04ebc27cc76f940b71146d4e4eaea9a3..ba642912926723221f1651499f0eb40e059aa61d 100644 (file)
--- a/gdb/memattr.c
+++ b/gdb/memattr.c
@@ -28,7 +28,7 @@ const struct mem_attrib default_mem_attrib =
 };
 
 static struct mem_region *mem_region_chain = NULL;
-static mem_number = 0;
+static int mem_number = 0;
 
 static struct mem_region *
 create_mem_region (CORE_ADDR lo, CORE_ADDR hi,
@@ -71,7 +71,7 @@ create_mem_region (CORE_ADDR lo, CORE_ADDR hi,
 static void
 delete_mem_region (struct mem_region *m)
 {
-  free (m);
+  xfree (m);
 }
 
 /*

diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c
index be51710ffed912d7d07b74dd7e36cb441c565838..d4325a071f4218d1df5cce588a2989c79f46a27f 100644 (file)
--- a/gdb/sol-thread.c
+++ b/gdb/sol-thread.c
@@ -762,6 +762,7 @@ sol_thread_prepare_to_store (void)
 
 static int
 sol_thread_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int dowrite,
+                       struct mem_attrib *attrib,
                        struct target_ops *target)
 {
   int retval;
@@ -775,10 +776,11 @@ sol_thread_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int dowrite,
   /* Note: don't need to call switch_to_thread; we're just reading memory.  */
 
   if (target_has_execution)
-    retval = procfs_ops.to_xfer_memory (memaddr, myaddr, len, dowrite, target);
+    retval = procfs_ops.to_xfer_memory (memaddr, myaddr, len, 
+                                       dowrite, attrib, target);
   else
     retval = orig_core_ops.to_xfer_memory (memaddr, myaddr, len,
-                                          dowrite, target);
+                                          dowrite, attrib, target);
 
   do_cleanups (old_chain);
 
@@ -1060,10 +1062,13 @@ rw_common (int dowrite, const struct ps_prochandle *ph, gdb_ps_addr_t addr,
     {
       int cc;
 
+      /* FIXME: passing 0 as attrib argument.  */
       if (target_has_execution)
-       cc = procfs_ops.to_xfer_memory (addr, buf, size, dowrite, &procfs_ops);
+       cc = procfs_ops.to_xfer_memory (addr, buf, size, 
+                                       dowrite, 0, &procfs_ops);
       else
-       cc = orig_core_ops.to_xfer_memory (addr, buf, size, dowrite, &core_ops);
+       cc = orig_core_ops.to_xfer_memory (addr, buf, size, 
+                                          dowrite, 0, &core_ops);
 
       if (cc < 0)
        {