X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fwince.c;h=02df7a6b025f2d8b44bad3abcfadbd28b5357dd7;hb=1a6923e0319d4ede81d2d821d8a84bb97113b071;hp=e37866c34a9578391a680eb545339194ceccc020;hpb=9f60d481c28a949dc41179ecee5320ba1905398f;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/wince.c b/gdb/wince.c
index e37866c34a..02df7a6b02 100644
--- a/gdb/wince.c
+++ b/gdb/wince.c
@@ -56,9 +56,9 @@
 #include "wince-stub.h"
 #include <time.h>
 #include "regcache.h"
-
-/* The ui's event loop. */
-extern int (*ui_loop_hook) (int signo);
+#ifdef MIPS
+#include "mips-tdep.h"
+#endif
 
 /* If we're not using the old Cygwin header file set, define the
    following which never should have been in the generic Win32 API
@@ -830,7 +830,7 @@ wince_software_single_step (enum target_signal ignore,
   return;
 }
 #elif SHx
-/* Hitachi SH architecture instruction encoding masks */
+/* Renesas SH architecture instruction encoding masks */
 
 #define COND_BR_MASK   0xff00
 #define UCOND_DBR_MASK 0xe000
@@ -841,7 +841,7 @@ wince_software_single_step (enum target_signal ignore,
 #define UCOND_DISP     0x0fff
 #define UCOND_REG      0x0f00
 
-/* Hitachi SH instruction opcodes */
+/* Renesas SH instruction opcodes */
 
 #define BF_INSTR       0x8b00
 #define BT_INSTR       0x8900
@@ -1139,7 +1139,7 @@ static void
 do_child_store_inferior_registers (int r)
 {
   if (r >= 0)
-    read_register_gen (r, ((char *) &current_thread->context) + mappings[r]);
+    deprecated_read_register_gen (r, ((char *) &current_thread->context) + mappings[r]);
   else
     {
       for (r = 0; r < NUM_REGS; r++)
@@ -1507,8 +1507,8 @@ child_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
       {
 	int detach = 0;
 
-	if (ui_loop_hook != NULL)
-	  detach = ui_loop_hook (0);
+	if (deprecated_ui_loop_hook != NULL)
+	  detach = deprecated_ui_loop_hook (0);
 
 	if (detach)
 	  child_kill_inferior ();
@@ -1524,7 +1524,6 @@ child_files_info (struct target_ops *ignore)
 		     target_pid_to_str (inferior_ptid));
 }
 
-/* ARGSUSED */
 static void
 child_open (char *arg, int from_tty)
 {
@@ -1718,7 +1717,8 @@ wince_initialize (void)
    ALLARGS is a string containing the arguments to the program.
    ENV is the environment vector to pass.  Errors reported with error().  */
 static void
-child_create_inferior (char *exec_file, char *args, char **env)
+child_create_inferior (char *exec_file, char *args, char **env,
+		       int from_tty)
 {
   PROCESS_INFORMATION pi;
   struct target_waitstatus dummy;
@@ -1910,6 +1910,7 @@ init_child_ops (void)
   child_ops.to_terminal_inferior = terminal_inferior;
   child_ops.to_terminal_ours_for_output = terminal_ours_for_output;
   child_ops.to_terminal_ours = terminal_ours;
+  child_ops.to_terminal_save_ours = terminal_save_ours;
   child_ops.to_terminal_info = child_terminal_info;
   child_ops.to_kill = child_kill_inferior;
   child_ops.to_load = child_load;
@@ -1923,8 +1924,6 @@ init_child_ops (void)
   child_ops.to_has_stack = 1;
   child_ops.to_has_registers = 1;
   child_ops.to_has_execution = 1;
-  child_ops.to_sections = 0;
-  child_ops.to_sections_end = 0;
   child_ops.to_magic = OPS_MAGIC;
 }
 
@@ -1965,7 +1964,7 @@ set_upload_type (char *ignore, int from_tty)
 }
 
 void
-_initialize_inftarg (void)
+_initialize_wince (void)
 {
   struct cmd_list_element *set;
   init_child_ops ();
@@ -1996,7 +1995,8 @@ _initialize_inftarg (void)
   add_show_from_set
     (add_set_cmd ((char *) "remoteaddhost", class_support, var_boolean,
 		  (char *) &remote_add_host,
-		  (char *) "Set whether to add this host to remote stub arguments for\n
+		  (char *) "\
+Set whether to add this host to remote stub arguments for\n\
 debugging over a network.", &setlist),
      &showlist);