*** empty log message ***

[deliverable/binutils-gdb.git] / gdb / remote-es.c

diff --git a/gdb/remote-es.c b/gdb/remote-es.c
index ff12e88677a9a7c4ff31b0c123d3e3c85b4a88ec..39e50ff8bc0c96c9f6a861dc57cc7f6d5dbdc011 100644 (file)
--- a/gdb/remote-es.c
+++ b/gdb/remote-es.c
@@ -1,6 +1,7 @@
 /* Memory-access and commands for remote es1800 processes, for GDB.
-   Copyright 1988, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-   Free Software Foundation, Inc.
+
+   Copyright 1988, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,
+   2001, 2002 Free Software Foundation, Inc.
 
    This file is added to GDB to make it possible to do debugging via an
    ES-1800 emulator. The code was originally written by Johan Holmberg
@@ -111,6 +112,7 @@
 #include "gdbcore.h"
 #include "serial.h"
 #include "regcache.h"
+#include "value.h"
 
 /* Prototypes for local functions */
 
@@ -134,9 +136,9 @@ static int es1800_insert_breakpoint (CORE_ADDR, char *);
 
 static void es1800_files_info (struct target_ops *);
 
-static int
-es1800_xfer_inferior_memory (CORE_ADDR, char *, int, int,
-                            struct mem_attrib *, struct target_ops *);
+static int es1800_xfer_inferior_memory (CORE_ADDR, char *, int, int,
+                                       struct mem_attrib *,
+                                       struct target_ops *);
 
 static void es1800_prepare_to_store (void);
 
@@ -621,7 +623,7 @@ es1800_fetch_register (int regno)
            {
              error ("Emulator reply is too short: %s", buf);
            }
-         registers[r++] = (fromhex (p[k * 2 + 1]) * 16) + fromhex (p[k * 2 + 2]);
+         deprecated_registers[r++] = (fromhex (p[k * 2 + 1]) * 16) + fromhex (p[k * 2 + 2]);
        }
     }
   else
@@ -664,7 +666,7 @@ es1800_fetch_registers (void)
            {
              error ("Emulator reply is too short: %s", buf);
            }
-         registers[r++] = (fromhex (p[i + 0]) * 16) + fromhex (p[i + 1]);
+         deprecated_registers[r++] = (fromhex (p[i + 0]) * 16) + fromhex (p[i + 1]);
          i += 2;
        }
     }
@@ -683,7 +685,7 @@ es1800_fetch_registers (void)
            {
              error ("Emulator reply is too short: %s", buf);
            }
-         registers[r++] = (fromhex (p[i + 0])) * 16 + fromhex (p[i + 1]);
+         deprecated_registers[r++] = (fromhex (p[i + 0])) * 16 + fromhex (p[i + 1]);
          i += 2;
        }
     }
@@ -723,7 +725,7 @@ es1800_fetch_registers (void)
            {
              error ("Emulator reply is too short: %s", buf);
            }
-         registers[r++] = fromhex (buf[k * 2 + 1]) * 16 + fromhex (buf[k * 2 + 2]);
+         deprecated_registers[r++] = fromhex (buf[k * 2 + 1]) * 16 + fromhex (buf[k * 2 + 2]);
        }
 
       p = SR_buf;
@@ -733,7 +735,7 @@ es1800_fetch_registers (void)
            {
              error ("Emulator reply is too short: %s", buf);
            }
-         registers[r++] =
+         deprecated_registers[r++] =
            fromhex (SR_buf[k * 2 + 1]) * 16 + fromhex (SR_buf[k * 2 + 2]);
        }
       send_with_reply ("PC", buf, sizeof (buf));
@@ -744,7 +746,7 @@ es1800_fetch_registers (void)
            {
              error ("Emulator reply is too short: %s", buf);
            }
-         registers[r++] = fromhex (buf[k * 2 + 1]) * 16 + fromhex (buf[k * 2 + 2]);
+         deprecated_registers[r++] = fromhex (buf[k * 2 + 1]) * 16 + fromhex (buf[k * 2 + 2]);
        }
     }
   else
@@ -769,7 +771,7 @@ es1800_fetch_registers (void)
            {
              error ("Emulator reply is too short: %s", buf);
            }
-         registers[r++] = fromhex (buf[k * 2 + 1]) * 16 + fromhex (buf[k * 2 + 2]);
+         deprecated_registers[r++] = fromhex (buf[k * 2 + 1]) * 16 + fromhex (buf[k * 2 + 2]);
        }
 
       /* fetch STATUS */
@@ -781,7 +783,7 @@ es1800_fetch_registers (void)
            {
              error ("Emulator reply is too short: %s", buf);
            }
-         registers[r++] =
+         deprecated_registers[r++] =
            fromhex (SR_buf[k * 2 + 1]) * 16 + fromhex (SR_buf[k * 2 + 2]);
        }
 
@@ -795,7 +797,7 @@ es1800_fetch_registers (void)
            {
              error ("Emulator reply is too short: %s", buf);
            }
-         registers[r++] = fromhex (buf[k * 2 + 1]) * 16 + fromhex (buf[k * 2 + 2]);
+         deprecated_registers[r++] = fromhex (buf[k * 2 + 1]) * 16 + fromhex (buf[k * 2 + 2]);
        }
     }
 }
@@ -825,7 +827,7 @@ es1800_store_register (int regno)
   int k;
   unsigned char *r;
 
-  r = (unsigned char *) registers;
+  r = (unsigned char *) deprecated_registers;
 
   if (regno == -1)             /* write all registers */
     {
@@ -961,9 +963,8 @@ tohex (int nib)
 
 static int
 es1800_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len,
-                            int write, 
-                            struct mem_attrib *attrib ATTRIBUTE_UNUSED,
-                            struct target_ops *target ATTRIBUTE_UNUSED)
+                            int write, struct mem_attrib *attrib,
+                            struct target_ops *target)
 {
   int origlen = len;
   int xfersize;
@@ -1354,20 +1355,20 @@ bfd_copy (bfd *from_bfd, bfd *to_bfd)
 
       for (i = 0; (i + NUMCPYBYTES) < p->_cooked_size; i += NUMCPYBYTES)
        {
-         if (!bfd_get_section_contents (from_bfd, p, (PTR) buf, (file_ptr) i,
+         if (!bfd_get_section_contents (from_bfd, p, buf, (file_ptr) i,
                                         (bfd_size_type) NUMCPYBYTES))
            {
              error ("bfd_get_section_contents\n");
            }
-         if (!bfd_set_section_contents (to_bfd, new, (PTR) buf, (file_ptr) i,
+         if (!bfd_set_section_contents (to_bfd, new, buf, (file_ptr) i,
                                         (bfd_size_type) NUMCPYBYTES))
            {
              error ("bfd_set_section_contents\n");
            }
        }
-      bfd_get_section_contents (from_bfd, p, (PTR) buf, (file_ptr) i,
+      bfd_get_section_contents (from_bfd, p, buf, (file_ptr) i,
                                (bfd_size_type) (p->_cooked_size - i));
-      bfd_set_section_contents (to_bfd, new, (PTR) buf, (file_ptr) i,
+      bfd_set_section_contents (to_bfd, new, buf, (file_ptr) i,
                                (bfd_size_type) (p->_cooked_size - i));
     }
 }
@@ -1615,7 +1616,7 @@ send (char *string)
 {
   if (kiodebug)
     {
-      fprintf (stderr, "Sending: %s\n", string);
+      fprintf_unfiltered (gdb_stderr, "Sending: %s\n", string);
     }
   serial_write (es1800_desc, string, strlen (string));
 }
@@ -1662,7 +1663,7 @@ getmessage (char *buf, int len)
 
   if (kiodebug)
     {
-      fprintf (stderr, "message received :%s\n", buf);
+      fprintf_unfiltered (gdb_stderr, "message received :%s\n", buf);
     }
 }
 
@@ -1980,61 +1981,17 @@ Specify the serial device it is connected to (e.g. /dev/ttya).";
   es1800_ops.to_open = es1800_open;
   es1800_ops.to_close = es1800_close;
   es1800_ops.to_attach = es1800_attach;
-  es1800_ops.to_post_attach = NULL;
-  es1800_ops.to_require_attach = NULL;
   es1800_ops.to_detach = es1800_detach;
-  es1800_ops.to_require_detach = NULL;
   es1800_ops.to_resume = es1800_resume;
-  es1800_ops.to_wait = NULL;
-  es1800_ops.to_post_wait = NULL;
-  es1800_ops.to_fetch_registers = NULL;
-  es1800_ops.to_store_registers = NULL;
   es1800_ops.to_prepare_to_store = es1800_prepare_to_store;
   es1800_ops.to_xfer_memory = es1800_xfer_inferior_memory;
   es1800_ops.to_files_info = es1800_files_info;
   es1800_ops.to_insert_breakpoint = es1800_insert_breakpoint;
   es1800_ops.to_remove_breakpoint = es1800_remove_breakpoint;
-  es1800_ops.to_terminal_init = NULL;
-  es1800_ops.to_terminal_inferior = NULL;
-  es1800_ops.to_terminal_ours_for_output = NULL;
-  es1800_ops.to_terminal_ours = NULL;
-  es1800_ops.to_terminal_info = NULL;
-  es1800_ops.to_kill = NULL;
   es1800_ops.to_load = es1800_load;
-  es1800_ops.to_lookup_symbol = NULL;
   es1800_ops.to_create_inferior = es1800_create_inferior;
-  es1800_ops.to_post_startup_inferior = NULL;
-  es1800_ops.to_acknowledge_created_inferior = NULL;
-  es1800_ops.to_clone_and_follow_inferior = NULL;
-  es1800_ops.to_post_follow_inferior_by_clone = NULL;
-  es1800_ops.to_insert_fork_catchpoint = NULL;
-  es1800_ops.to_remove_fork_catchpoint = NULL;
-  es1800_ops.to_insert_vfork_catchpoint = NULL;
-  es1800_ops.to_remove_vfork_catchpoint = NULL;
-  es1800_ops.to_has_forked = NULL;
-  es1800_ops.to_has_vforked = NULL;
-  es1800_ops.to_can_follow_vfork_prior_to_exec = NULL;
-  es1800_ops.to_post_follow_vfork = NULL;
-  es1800_ops.to_insert_exec_catchpoint = NULL;
-  es1800_ops.to_remove_exec_catchpoint = NULL;
-  es1800_ops.to_has_execd = NULL;
-  es1800_ops.to_reported_exec_events_per_exec_call = NULL;
-  es1800_ops.to_has_exited = NULL;
-  es1800_ops.to_mourn_inferior = NULL;
-  es1800_ops.to_can_run = 0;
-  es1800_ops.to_notice_signals = 0;
-  es1800_ops.to_thread_alive = 0;
-  es1800_ops.to_stop = 0;
-  es1800_ops.to_pid_to_exec_file = NULL;
   es1800_ops.to_stratum = core_stratum;
-  es1800_ops.DONT_USE = 0;
-  es1800_ops.to_has_all_memory = 0;
   es1800_ops.to_has_memory = 1;
-  es1800_ops.to_has_stack = 0;
-  es1800_ops.to_has_registers = 0;
-  es1800_ops.to_has_execution = 0;
-  es1800_ops.to_sections = NULL;
-  es1800_ops.to_sections_end = NULL;
   es1800_ops.to_magic = OPS_MAGIC;
 }
 
@@ -2050,15 +2007,10 @@ init_es1800_child_ops (void)
   es1800_child_ops.to_doc = "Remote debugging on the es1800 emulator via a serial line.\n\
 Specify the serial device it is connected to (e.g. /dev/ttya).";
   es1800_child_ops.to_open = es1800_child_open;
-  es1800_child_ops.to_close = NULL;
   es1800_child_ops.to_attach = es1800_attach;
-  es1800_child_ops.to_post_attach = NULL;
-  es1800_child_ops.to_require_attach = NULL;
   es1800_child_ops.to_detach = es1800_child_detach;
-  es1800_child_ops.to_require_detach = NULL;
   es1800_child_ops.to_resume = es1800_resume;
   es1800_child_ops.to_wait = es1800_wait;
-  es1800_child_ops.to_post_wait = NULL;
   es1800_child_ops.to_fetch_registers = es1800_fetch_register;
   es1800_child_ops.to_store_registers = es1800_store_register;
   es1800_child_ops.to_prepare_to_store = es1800_prepare_to_store;
@@ -2066,47 +2018,16 @@ Specify the serial device it is connected to (e.g. /dev/ttya).";
   es1800_child_ops.to_files_info = es1800_files_info;
   es1800_child_ops.to_insert_breakpoint = es1800_insert_breakpoint;
   es1800_child_ops.to_remove_breakpoint = es1800_remove_breakpoint;
-  es1800_child_ops.to_terminal_init = NULL;
-  es1800_child_ops.to_terminal_inferior = NULL;
-  es1800_child_ops.to_terminal_ours_for_output = NULL;
-  es1800_child_ops.to_terminal_ours = NULL;
-  es1800_child_ops.to_terminal_info = NULL;
   es1800_child_ops.to_kill = es1800_kill;
   es1800_child_ops.to_load = es1800_load;
-  es1800_child_ops.to_lookup_symbol = NULL;
   es1800_child_ops.to_create_inferior = es1800_create_inferior;
-  es1800_child_ops.to_post_startup_inferior = NULL;
-  es1800_child_ops.to_acknowledge_created_inferior = NULL;
-  es1800_child_ops.to_clone_and_follow_inferior = NULL;
-  es1800_child_ops.to_post_follow_inferior_by_clone = NULL;
-  es1800_child_ops.to_insert_fork_catchpoint = NULL;
-  es1800_child_ops.to_remove_fork_catchpoint = NULL;
-  es1800_child_ops.to_insert_vfork_catchpoint = NULL;
-  es1800_child_ops.to_remove_vfork_catchpoint = NULL;
-  es1800_child_ops.to_has_forked = NULL;
-  es1800_child_ops.to_has_vforked = NULL;
-  es1800_child_ops.to_can_follow_vfork_prior_to_exec = NULL;
-  es1800_child_ops.to_post_follow_vfork = NULL;
-  es1800_child_ops.to_insert_exec_catchpoint = NULL;
-  es1800_child_ops.to_remove_exec_catchpoint = NULL;
-  es1800_child_ops.to_has_execd = NULL;
-  es1800_child_ops.to_reported_exec_events_per_exec_call = NULL;
-  es1800_child_ops.to_has_exited = NULL;
   es1800_child_ops.to_mourn_inferior = es1800_mourn_inferior;
-  es1800_child_ops.to_can_run = 0;
-  es1800_child_ops.to_notice_signals = 0;
-  es1800_child_ops.to_thread_alive = 0;
-  es1800_child_ops.to_stop = 0;
-  es1800_child_ops.to_pid_to_exec_file = NULL;
   es1800_child_ops.to_stratum = process_stratum;
-  es1800_child_ops.DONT_USE = 0;
   es1800_child_ops.to_has_all_memory = 1;
   es1800_child_ops.to_has_memory = 1;
   es1800_child_ops.to_has_stack = 1;
   es1800_child_ops.to_has_registers = 1;
   es1800_child_ops.to_has_execution = 1;
-  es1800_child_ops.to_sections = NULL;
-  es1800_child_ops.to_sections_end = NULL;
   es1800_child_ops.to_magic = OPS_MAGIC;
 }