Don't emit symbols seen only in dynamic object, don't read duplicate

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

diff --git a/gdb/remote-st.c b/gdb/remote-st.c
index 6d7ea19f51eff8463a49a3d717e2b915cc0622f3..c2bcf3d00f91822084bef5c5a5daf7f226921d10 100644 (file)
--- a/gdb/remote-st.c
+++ b/gdb/remote-st.c
@@ -599,20 +599,16 @@ static CORE_ADDR breakaddr[MAX_STDEBUG_BREAKPOINTS] =
 {0};
 
 static int
-st2000_insert_breakpoint (CORE_ADDR addr, char *shadow)
+st2000_insert_breakpoint (struct bp_target_info *bp_tgt)
 {
+  CORE_ADDR addr = bp_tgt->placed_address;
   int i;
-  CORE_ADDR bp_addr = addr;
-  int bp_size = 0;
-
-  BREAKPOINT_FROM_PC (&bp_addr, &bp_size);
 
   for (i = 0; i <= MAX_STDEBUG_BREAKPOINTS; i++)
     if (breakaddr[i] == 0)
       {
        breakaddr[i] = addr;
 
-       st2000_read_inferior_memory (bp_addr, shadow, bp_size);
        printf_stdebug ("BR %x H\r", addr);
        expect_prompt (1);
        return 0;
@@ -623,8 +619,9 @@ st2000_insert_breakpoint (CORE_ADDR addr, char *shadow)
 }
 
 static int
-st2000_remove_breakpoint (CORE_ADDR addr, char *shadow)
+st2000_remove_breakpoint (struct bp_target_info *bp_tgt)
 {
+  CORE_ADDR addr = bp_tgt->placed_address;
   int i;
 
   for (i = 0; i < MAX_STDEBUG_BREAKPOINTS; i++)
@@ -704,7 +701,7 @@ connect_command (char *args, int fromtty)
        {
          FD_SET (0, &readfds);
          FD_SET (deprecated_serial_fd (st2000_desc), &readfds);
-         numfds = select (sizeof (readfds) * 8, &readfds, 0, 0, 0);
+         numfds = gdb_select (sizeof (readfds) * 8, &readfds, 0, 0, 0);
        }
       while (numfds == 0);