From: J.T. Conklin <jtc@acorntoolworks.com>
Date: Wed, 24 Jan 2001 21:01:02 +0000 (+0000)
Subject: * dcache.c (dcache_write_line): Fix typo.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f4d650ecb379a6d7d92e60d43d9c9773a192395e;p=binutils-gdb.git

* 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 16268067284..8b483209000 100644
--- 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 7973b998ea1..5fe1c47a81c 100644
--- 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 5e9e9d5c04e..ba642912926 100644
--- 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 be51710ffed..d4325a071f4 100644
--- 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)
 	{