2002-11-15 David Carlton <carlton@math.stanford.edu>

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

diff --git a/gdb/remote-e7000.c b/gdb/remote-e7000.c
index e13401fe72d942ee45a2b14325397ce5b2144b6b..33e5c00f0f849e93d666a3feb0815592d1cc5536 100644 (file)
--- a/gdb/remote-e7000.c
+++ b/gdb/remote-e7000.c
@@ -630,7 +630,7 @@ e7000_start_remote (void *dummy)
   registers_changed ();
   stop_pc = read_pc ();
   set_current_frame (create_new_frame (read_fp (), stop_pc));
-  select_frame (get_current_frame (), 0);
+  select_frame (get_current_frame ());
   print_stack_frame (selected_frame, -1, 1);
 
   return 1;
@@ -1083,15 +1083,15 @@ write_small (CORE_ADDR memaddr, unsigned char *myaddr, int len)
       if (((memaddr + i) & 3) == 0 && (i + 3 < len))
        {
          /* Can be done with a long word */
-         sprintf (buf, "m %lx %x%02x%02x%02x;l\r",
-                  memaddr + i,
+         sprintf (buf, "m %s %x%02x%02x%02x;l\r",
+                  paddr_nz (memaddr + i),
                   myaddr[i], myaddr[i + 1], myaddr[i + 2], myaddr[i + 3]);
          puts_e7000debug (buf);
          i += 3;
        }
       else
        {
-         sprintf (buf, "m %lx %x\r", memaddr + i, myaddr[i]);
+         sprintf (buf, "m %s %x\r", paddr_nz (memaddr + i), myaddr[i]);
          puts_e7000debug (buf);
        }
     }
@@ -1244,7 +1244,7 @@ e7000_read_inferior_memory (CORE_ADDR memaddr, unsigned char *myaddr, int len)
       return 0;
     }
 
-  sprintf (buf, "m %lx;l\r", memaddr);
+  sprintf (buf, "m %s;l\r", paddr_nz (memaddr));
   puts_e7000debug (buf);
 
   for (count = 0; count < len; count += 4)
@@ -1323,7 +1323,7 @@ e7000_read_inferior_memory_large (CORE_ADDR memaddr, unsigned char *myaddr,
       return 0;
     }
 
-  sprintf (buf, "d %lx %lx\r", memaddr, memaddr + len - 1);
+  sprintf (buf, "d %s %s\r", paddr_nz (memaddr), paddr_nz (memaddr + len - 1));
   puts_e7000debug (buf);
 
   count = 0;
@@ -1705,12 +1705,12 @@ e7000_insert_breakpoint (CORE_ADDR addr, char *shadow)
 #ifdef HARD_BREAKPOINTS
        if (BC_BREAKPOINTS)
          {
-           sprintf (buf, "BC%d A=%lx\r", i + 1, addr);
+           sprintf (buf, "BC%d A=%s\r", i + 1, paddr_nz (addr));
            puts_e7000debug (buf);
          }
        else
          {
-           sprintf (buf, "B %lx\r", addr);
+           sprintf (buf, "B %s\r", paddr_nz (addr));
            puts_e7000debug (buf);
          }
 #else
@@ -1749,12 +1749,12 @@ e7000_remove_breakpoint (CORE_ADDR addr, char *shadow)
          }
        else
          {
-           sprintf (buf, "B - %lx\r", addr);
+           sprintf (buf, "B - %s\r", paddr_nz (addr));
            puts_e7000debug (buf);
          }
        expect_prompt ();
 #else
-       sprintf (buf, "B - %lx\r", addr);
+       sprintf (buf, "B - %s\r", paddr_nz (addr));
        puts_e7000debug (buf);
        expect_prompt ();
 
@@ -1766,8 +1766,8 @@ e7000_remove_breakpoint (CORE_ADDR addr, char *shadow)
 
        return 0;
       }
-
-  warning ("Can't find breakpoint associated with 0x%lx\n", addr);
+ 
+  warning ("Can't find breakpoint associated with 0x%s\n", paddr_nz (addr));
   return 1;
 }
 
@@ -2143,14 +2143,9 @@ target e7000 /dev/ttya 9600\n\
 target e7000 foobar";
   e7000_ops.to_open = e7000_open;
   e7000_ops.to_close = e7000_close;
-  e7000_ops.to_attach = 0;
-  e7000_ops.to_post_attach = NULL;
-  e7000_ops.to_require_attach = NULL;
   e7000_ops.to_detach = e7000_detach;
-  e7000_ops.to_require_detach = NULL;
   e7000_ops.to_resume = e7000_resume;
   e7000_ops.to_wait = e7000_wait;
-  e7000_ops.to_post_wait = NULL;
   e7000_ops.to_fetch_registers = e7000_fetch_register;
   e7000_ops.to_store_registers = e7000_store_register;
   e7000_ops.to_prepare_to_store = e7000_prepare_to_store;
@@ -2158,47 +2153,17 @@ target e7000 foobar";
   e7000_ops.to_files_info = e7000_files_info;
   e7000_ops.to_insert_breakpoint = e7000_insert_breakpoint;
   e7000_ops.to_remove_breakpoint = e7000_remove_breakpoint;
-  e7000_ops.to_terminal_init = 0;
-  e7000_ops.to_terminal_inferior = 0;
-  e7000_ops.to_terminal_ours_for_output = 0;
-  e7000_ops.to_terminal_ours = 0;
-  e7000_ops.to_terminal_info = 0;
   e7000_ops.to_kill = e7000_kill;
   e7000_ops.to_load = e7000_load;
-  e7000_ops.to_lookup_symbol = 0;
   e7000_ops.to_create_inferior = e7000_create_inferior;
-  e7000_ops.to_post_startup_inferior = NULL;
-  e7000_ops.to_acknowledge_created_inferior = NULL;
-  e7000_ops.to_clone_and_follow_inferior = NULL;
-  e7000_ops.to_post_follow_inferior_by_clone = NULL;
-  e7000_ops.to_insert_fork_catchpoint = NULL;
-  e7000_ops.to_remove_fork_catchpoint = NULL;
-  e7000_ops.to_insert_vfork_catchpoint = NULL;
-  e7000_ops.to_remove_vfork_catchpoint = NULL;
-  e7000_ops.to_has_forked = NULL;
-  e7000_ops.to_has_vforked = NULL;
-  e7000_ops.to_can_follow_vfork_prior_to_exec = NULL;
-  e7000_ops.to_post_follow_vfork = NULL;
-  e7000_ops.to_insert_exec_catchpoint = NULL;
-  e7000_ops.to_remove_exec_catchpoint = NULL;
-  e7000_ops.to_has_execd = NULL;
-  e7000_ops.to_reported_exec_events_per_exec_call = NULL;
-  e7000_ops.to_has_exited = NULL;
   e7000_ops.to_mourn_inferior = e7000_mourn_inferior;
-  e7000_ops.to_can_run = 0;
-  e7000_ops.to_notice_signals = 0;
-  e7000_ops.to_thread_alive = 0;
   e7000_ops.to_stop = e7000_stop;
-  e7000_ops.to_pid_to_exec_file = NULL;
   e7000_ops.to_stratum = process_stratum;
-  e7000_ops.DONT_USE = 0;
   e7000_ops.to_has_all_memory = 1;
   e7000_ops.to_has_memory = 1;
   e7000_ops.to_has_stack = 1;
   e7000_ops.to_has_registers = 1;
   e7000_ops.to_has_execution = 1;
-  e7000_ops.to_sections = 0;
-  e7000_ops.to_sections_end = 0;
   e7000_ops.to_magic = OPS_MAGIC;
 };