aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Kingdon <jkingdon@engr.sgi.com>1993-09-03 14:26:29 +0000
committerJim Kingdon <jkingdon@engr.sgi.com>1993-09-03 14:26:29 +0000
commitac7a377f64a19b1bda507a6aecaaab3f81f7ebbb (patch)
treece5247ccd5902c18fb279ee0640da24931dbcf36
parenteba94f7d0d4ba3d9868c2ae9829b61cab96b344e (diff)
downloadgdb-ac7a377f64a19b1bda507a6aecaaab3f81f7ebbb.zip
gdb-ac7a377f64a19b1bda507a6aecaaab3f81f7ebbb.tar.gz
gdb-ac7a377f64a19b1bda507a6aecaaab3f81f7ebbb.tar.bz2
* dcache.c: Cast return value from xmalloc.
* remote.c: Move setting of immediate_quit from remote_open to remote_start_dummy and set it back to zero when done.
-rw-r--r--gdb/ChangeLog7
-rw-r--r--gdb/dcache.c5
-rw-r--r--gdb/remote.c8
3 files changed, 16 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d777772..3f3bf64 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+Fri Sep 3 08:57:10 1993 Jim Kingdon (kingdon@lioth.cygnus.com)
+
+ * dcache.c: Cast return value from xmalloc.
+
+ * remote.c: Move setting of immediate_quit from remote_open to
+ remote_start_dummy and set it back to zero when done.
+
Thu Sep 2 00:07:36 1993 Jim Kingdon (kingdon@lioth.cygnus.com)
* m88k-tdep.c: Remove a bunch of unused #includes.
diff --git a/gdb/dcache.c b/gdb/dcache.c
index 1b477b0..aaa01d0 100644
--- a/gdb/dcache.c
+++ b/gdb/dcache.c
@@ -204,10 +204,11 @@ dcache_init (reading, writing)
register struct dcache_block *db;
DCACHE *dcache;
- dcache = xmalloc(sizeof(*dcache));
+ dcache = (DCACHE *) xmalloc (sizeof (*dcache));
dcache->read_memory = reading;
dcache->write_memory = writing;
- dcache->the_cache = xmalloc(sizeof(*dcache->the_cache) * DCACHE_SIZE);
+ dcache->the_cache = (struct dcache_block *)
+ xmalloc (sizeof (*dcache->the_cache) * DCACHE_SIZE);
dcache->dcache_free.next = dcache->dcache_free.last = &dcache->dcache_free;
dcache->dcache_valid.next = dcache->dcache_valid.last = &dcache->dcache_valid;
diff --git a/gdb/remote.c b/gdb/remote.c
index 6041b44..f9d04f4 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -238,11 +238,14 @@ static int
remote_start_remote (dummy)
char *dummy;
{
+ immediate_quit = 1; /* Allow user to interrupt it */
+
/* Ack any packet which the remote side has already sent. */
/* I'm not sure this \r is needed; we don't use it any other time we
send an ack. */
SERIAL_WRITE (remote_desc, "+\r", 2);
putpkt ("?"); /* initiate a query from remote machine */
+ immediate_quit = 0;
start_remote (); /* Initialize gdb process mechanisms */
return 1;
@@ -295,8 +298,9 @@ device is attached to the remote system (e.g. /dev/ttya).");
}
push_target (&remote_ops); /* Switch to using remote target now */
- /* Start the remote connection; if error (0), discard this target. */
- immediate_quit++; /* Allow user to interrupt it */
+ /* Start the remote connection; if error (0), discard this target.
+ In particular, if the user quits, be sure to discard it
+ (we'd be in an inconsistent state otherwise). */
if (!catch_errors (remote_start_remote, (char *)0,
"Couldn't establish connection to remote target\n", RETURN_MASK_ALL))
pop_target();