diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/config/mips/.Sanitize | 16 | ||||
| -rw-r--r-- | gdb/config/mips/embed.mt | 3 | ||||
| -rw-r--r-- | gdb/config/mips/embed64.mt | 3 | ||||
| -rw-r--r-- | gdb/config/mips/embedl.mt | 3 | ||||
| -rw-r--r-- | gdb/config/mips/embedl64.mt | 3 | ||||
| -rw-r--r-- | gdb/config/mips/idt.mt | 3 | ||||
| -rw-r--r-- | gdb/config/mips/idt64.mt | 3 | ||||
| -rw-r--r-- | gdb/config/mips/idtl.mt | 3 | ||||
| -rw-r--r-- | gdb/config/mips/idtl64.mt | 3 | ||||
| -rw-r--r-- | gdb/config/mips/tm-embed.h (renamed from gdb/config/mips/tm-idt.h) | 0 | ||||
| -rw-r--r-- | gdb/config/mips/tm-embed64.h (renamed from gdb/config/mips/tm-idt64.h) | 0 | ||||
| -rw-r--r-- | gdb/config/mips/tm-embedl.h (renamed from gdb/config/mips/tm-idtl.h) | 0 | ||||
| -rw-r--r-- | gdb/config/mips/tm-embedl64.h (renamed from gdb/config/mips/tm-idtl64.h) | 0 | ||||
| -rwxr-xr-x | gdb/configure | 61 | ||||
| -rw-r--r-- | gdb/configure.in | 19 | ||||
| -rw-r--r-- | gdb/remote-array.c | 32 |
16 files changed, 76 insertions, 76 deletions
diff --git a/gdb/config/mips/.Sanitize b/gdb/config/mips/.Sanitize index c4c5bd2..07216cb 100644 --- a/gdb/config/mips/.Sanitize +++ b/gdb/config/mips/.Sanitize @@ -27,10 +27,10 @@ bigmips.mt bigmips64.mt decstation.mh decstation.mt -idt.mt -idt64.mt -idtl.mt -idtl64.mt +embed.mt +embed64.mt +embedl.mt +embedl64.mt irix3.mh irix3.mt irix4.mh @@ -55,10 +55,10 @@ nm-sysv4.h riscos.mh tm-bigmips.h tm-bigmips64.h -tm-idt.h -tm-idt64.h -tm-idtl.h -tm-idtl64.h +tm-embed.h +tm-embed64.h +tm-embedl.h +tm-embedl64.h tm-irix3.h tm-irix5.h tm-mips.h diff --git a/gdb/config/mips/embed.mt b/gdb/config/mips/embed.mt new file mode 100644 index 0000000..7f57a48 --- /dev/null +++ b/gdb/config/mips/embed.mt @@ -0,0 +1,3 @@ +# Target: Big-endian mips board, typically an IDT. +TDEPFILES= mips-tdep.o remote-mips.o remote-array.o +TM_FILE= tm-embed.h diff --git a/gdb/config/mips/embed64.mt b/gdb/config/mips/embed64.mt new file mode 100644 index 0000000..273d33b --- /dev/null +++ b/gdb/config/mips/embed64.mt @@ -0,0 +1,3 @@ +# Target: Big-endian mips board, typically an IDT. +TDEPFILES= mips-tdep.o remote-mips.o remote-array.o +TM_FILE= tm-embed64.h diff --git a/gdb/config/mips/embedl.mt b/gdb/config/mips/embedl.mt new file mode 100644 index 0000000..867b1fe --- /dev/null +++ b/gdb/config/mips/embedl.mt @@ -0,0 +1,3 @@ +# Target: Big-endian mips board, typically an IDT. +TDEPFILES= mips-tdep.o remote-mips.o remote-array.o +TM_FILE= tm-embedl.h diff --git a/gdb/config/mips/embedl64.mt b/gdb/config/mips/embedl64.mt new file mode 100644 index 0000000..89e3f93 --- /dev/null +++ b/gdb/config/mips/embedl64.mt @@ -0,0 +1,3 @@ +# Target: Big-endian mips board, typically an IDT. +TDEPFILES= mips-tdep.o remote-mips.o remote-array.o +TM_FILE= tm-embedl64.h diff --git a/gdb/config/mips/idt.mt b/gdb/config/mips/idt.mt deleted file mode 100644 index 0f11645..0000000 --- a/gdb/config/mips/idt.mt +++ /dev/null @@ -1,3 +0,0 @@ -# Target: Big-endian IDT board. -TDEPFILES= mips-tdep.o remote-mips.o -TM_FILE= tm-idt.h diff --git a/gdb/config/mips/idt64.mt b/gdb/config/mips/idt64.mt deleted file mode 100644 index b177f07..0000000 --- a/gdb/config/mips/idt64.mt +++ /dev/null @@ -1,3 +0,0 @@ -# Target: Big-endian IDT board. -TDEPFILES= mips-tdep.o remote-mips.o -TM_FILE= tm-idt64.h diff --git a/gdb/config/mips/idtl.mt b/gdb/config/mips/idtl.mt deleted file mode 100644 index 7dc0637..0000000 --- a/gdb/config/mips/idtl.mt +++ /dev/null @@ -1,3 +0,0 @@ -# Target: Big-endian IDT board. -TDEPFILES= mips-tdep.o remote-mips.o -TM_FILE= tm-idtl.h diff --git a/gdb/config/mips/idtl64.mt b/gdb/config/mips/idtl64.mt deleted file mode 100644 index 8391e5d..0000000 --- a/gdb/config/mips/idtl64.mt +++ /dev/null @@ -1,3 +0,0 @@ -# Target: Big-endian IDT board. -TDEPFILES= mips-tdep.o remote-mips.o -TM_FILE= tm-idtl64.h diff --git a/gdb/config/mips/tm-idt.h b/gdb/config/mips/tm-embed.h index f3d2cc8..f3d2cc8 100644 --- a/gdb/config/mips/tm-idt.h +++ b/gdb/config/mips/tm-embed.h diff --git a/gdb/config/mips/tm-idt64.h b/gdb/config/mips/tm-embed64.h index 63296bb..63296bb 100644 --- a/gdb/config/mips/tm-idt64.h +++ b/gdb/config/mips/tm-embed64.h diff --git a/gdb/config/mips/tm-idtl.h b/gdb/config/mips/tm-embedl.h index 361c9f9..361c9f9 100644 --- a/gdb/config/mips/tm-idtl.h +++ b/gdb/config/mips/tm-embedl.h diff --git a/gdb/config/mips/tm-idtl64.h b/gdb/config/mips/tm-embedl64.h index 112ddd4..112ddd4 100644 --- a/gdb/config/mips/tm-idtl64.h +++ b/gdb/config/mips/tm-embedl64.h diff --git a/gdb/configure b/gdb/configure index bab0e24..b9ae38f 100755 --- a/gdb/configure +++ b/gdb/configure @@ -409,7 +409,6 @@ fi -CC=${CC-cc} # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 @@ -498,7 +497,7 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 502 "configure" +#line 501 "configure" #include "confdefs.h" #include <assert.h> Syntax Error @@ -512,7 +511,7 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 516 "configure" +#line 515 "configure" #include "confdefs.h" #include <assert.h> Syntax Error @@ -539,7 +538,7 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for AIX""... $ac_c" 1>&6 cat > conftest.$ac_ext <<EOF -#line 543 "configure" +#line 542 "configure" #include "confdefs.h" #ifdef _AIX yes @@ -566,7 +565,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 570 "configure" +#line 569 "configure" #include "confdefs.h" #include <minix/config.h> EOF @@ -891,7 +890,7 @@ else ac_cv_c_cross=yes else cat > conftest.$ac_ext <<EOF -#line 895 "configure" +#line 894 "configure" #include "confdefs.h" main(){return(0);} EOF @@ -912,7 +911,7 @@ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 916 "configure" +#line 915 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -934,7 +933,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 938 "configure" +#line 937 "configure" #include "confdefs.h" #include <string.h> EOF @@ -952,7 +951,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 956 "configure" +#line 955 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -973,7 +972,7 @@ if test "$cross_compiling" = yes; then ac_cv_header_stdc=no else cat > conftest.$ac_ext <<EOF -#line 977 "configure" +#line 976 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1010,7 +1009,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1014 "configure" +#line 1013 "configure" #include "confdefs.h" #include <$ac_hdr> EOF @@ -1043,7 +1042,7 @@ if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1047 "configure" +#line 1046 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -1101,7 +1100,7 @@ else ac_cv_func_mmap=no else cat > conftest.$ac_ext <<EOF -#line 1105 "configure" +#line 1104 "configure" #include "confdefs.h" /* Thanks to Mike Haertel and Jim Avera for this test. */ @@ -1320,7 +1319,7 @@ test -z "$x_direct_test_library" && x_direct_test_library=Xt test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h cat > conftest.$ac_ext <<EOF -#line 1324 "configure" +#line 1323 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF @@ -1383,7 +1382,7 @@ rm -f conftest* ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 1387 "configure" +#line 1386 "configure" #include "confdefs.h" int main() { return 0; } @@ -1501,7 +1500,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <<EOF -#line 1505 "configure" +#line 1504 "configure" #include "confdefs.h" int main() { return 0; } @@ -1544,7 +1543,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <<EOF -#line 1548 "configure" +#line 1547 "configure" #include "confdefs.h" int main() { return 0; } @@ -1578,7 +1577,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <<EOF -#line 1582 "configure" +#line 1581 "configure" #include "confdefs.h" int main() { return 0; } @@ -1617,7 +1616,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 1621 "configure" +#line 1620 "configure" #include "confdefs.h" int main() { return 0; } @@ -1655,7 +1654,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 1659 "configure" +#line 1658 "configure" #include "confdefs.h" int main() { return 0; } @@ -1712,7 +1711,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1716 "configure" +#line 1715 "configure" #include "confdefs.h" #include <tk.h> EOF @@ -1814,7 +1813,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1818 "configure" +#line 1817 "configure" #include "confdefs.h" #include <tclInt.h> EOF @@ -2234,19 +2233,19 @@ mips64*-big-*) gdb_target=bigmips64 ;; mips*-big-*) gdb_target=bigmips ;; mips*-dec-mach3*) gdb_target=mach3 ;; mips*-dec-*) gdb_target=decstation ;; -mips64*el-*-ecoff*) gdb_target=idtl64 ;; -mips64*-idt-ecoff*) gdb_target=idt64 ;; +mips64*el-*-ecoff*) gdb_target=embedl64 ;; +mips64*-*-ecoff*) gdb_target=embed64 ;; mips64*vr4300*el-*-elf*) gdb_target=vr4300el ;; mips64*vr4300*-*-elf*) gdb_target=vr4300 ;; -mips64*el-*-elf*) gdb_target=idtl64 ;; -mips64*-*-elf*) gdb_target=idt64 ;; -mips*el-*-ecoff*) gdb_target=idtl ;; -mips*-*-ecoff*) gdb_target=idt ;; +mips64*el-*-elf*) gdb_target=embedl64 ;; +mips64*-*-elf*) gdb_target=embed64 ;; +mips*el-*-ecoff*) gdb_target=embedl ;; +mips*-*-ecoff*) gdb_target=embed ;; # start-sanitize-gm -mips*-*-magic*) gdb_target=idt ;; +mips*-*-magic*) gdb_target=embed ;; # end-sanitize-gm -mips*el-*-elf*) gdb_target=idtl ;; -mips*-*-elf*) gdb_target=idt ;; +mips*el-*-elf*) gdb_target=embedl ;; +mips*-*-elf*) gdb_target=embed ;; mips*-little-*) gdb_target=littlemips ;; mips*-sgi-irix5*) gdb_target=irix5 ;; mips*-sgi-*) gdb_target=irix3 ;; diff --git a/gdb/configure.in b/gdb/configure.in index ac4531d..abebf5e 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -2,7 +2,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.3)dnl AC_INIT(main.c) -CC=${CC-cc} AC_PROG_CC AC_AIX AC_MINIX @@ -432,19 +431,19 @@ mips64*-big-*) gdb_target=bigmips64 ;; mips*-big-*) gdb_target=bigmips ;; mips*-dec-mach3*) gdb_target=mach3 ;; mips*-dec-*) gdb_target=decstation ;; -mips64*el-*-ecoff*) gdb_target=idtl64 ;; -mips64*-idt-ecoff*) gdb_target=idt64 ;; +mips64*el-*-ecoff*) gdb_target=embedl64 ;; +mips64*-*-ecoff*) gdb_target=embed64 ;; mips64*vr4300*el-*-elf*) gdb_target=vr4300el ;; mips64*vr4300*-*-elf*) gdb_target=vr4300 ;; -mips64*el-*-elf*) gdb_target=idtl64 ;; -mips64*-*-elf*) gdb_target=idt64 ;; -mips*el-*-ecoff*) gdb_target=idtl ;; -mips*-*-ecoff*) gdb_target=idt ;; +mips64*el-*-elf*) gdb_target=embedl64 ;; +mips64*-*-elf*) gdb_target=embed64 ;; +mips*el-*-ecoff*) gdb_target=embedl ;; +mips*-*-ecoff*) gdb_target=embed ;; # start-sanitize-gm -mips*-*-magic*) gdb_target=idt ;; +mips*-*-magic*) gdb_target=embed ;; # end-sanitize-gm -mips*el-*-elf*) gdb_target=idtl ;; -mips*-*-elf*) gdb_target=idt ;; +mips*el-*-elf*) gdb_target=embedl ;; +mips*-*-elf*) gdb_target=embed ;; mips*-little-*) gdb_target=littlemips ;; mips*-sgi-irix5*) gdb_target=irix5 ;; mips*-sgi-*) gdb_target=irix3 ;; diff --git a/gdb/remote-array.c b/gdb/remote-array.c index 8be758e..6939a30 100644 --- a/gdb/remote-array.c +++ b/gdb/remote-array.c @@ -41,6 +41,8 @@ #include "monitor.h" #include "remote-utils.h" +extern int baud_rate; + static const char hexchars[]="0123456789abcdef"; static char *hex2mem(); @@ -397,7 +399,7 @@ static void expect_prompt(discard) int discard; { - expect (expect_prompt, discard); + expect (">> ", discard); } /* @@ -557,6 +559,7 @@ array_create_inferior (execfile, args, env) * array_open -- open a connection to a remote debugger. * NAME is the filename used for communication. */ +static int baudrate = 9600; static char dev_name[100]; static void @@ -567,8 +570,6 @@ array_open(args, name, from_tty) { char packet[PBUFSIZ]; - baud_rate = 4800; /* this is the only supported baud rate */ - if (args == NULL) error ("Use `target %s DEVICE-NAME' to use a serial port, or \n\ `target %s HOST-NAME:PORT-NUMBER' to use a network connection.", name, name); @@ -610,14 +611,14 @@ array_open(args, name, from_tty) */ debuglogs (3, "Trying to ACK the target's debug stub"); /* unless your are on the new hardware, the old board won't initialize - because the '+' doesn't flush output like it does on the new ROMS. + because the '@' doesn't flush output like it does on the new ROMS. */ - printf_monitor ("+"); /* ask for the last signal */ + printf_monitor ("@"); /* ask for the last signal */ expect_prompt(1); /* See if we get a expect_prompt */ make_gdb_packet (packet, "?"); /* ask for a bogus packet */ if (array_send_packet (packet) == 0) error ("Couldn't transmit packet\n"); - printf_monitor ("+\n"); /* force it to flush stdout */ + printf_monitor ("@\n"); /* force it to flush stdout */ expect_prompt(1); /* See if we get a expect_prompt */ if (from_tty) @@ -718,7 +719,7 @@ array_wait (pid, status) timeout = 0; /* Don't time out -- user program is running. */ - expect_prompt(0); /* Wait for expect_prompt, outputting extraneous text */ + expect_prompt(0); /* Wait for expect_prompt, outputting extraneous text */ debuglogs (4, "array_wait(), got the expect_prompt."); status->kind = TARGET_WAITKIND_STOPPED; @@ -842,7 +843,7 @@ static void array_files_info () { printf ("\tAttached to %s at %d baud.\n", - dev_name, baud_rate); + dev_name, baudrate); } /* @@ -1024,8 +1025,8 @@ array_insert_breakpoint (addr, shadow) if (sr_get_debug() > 4) printf ("Breakpoint at %x\n", addr); array_read_inferior_memory(addr, shadow, memory_breakpoint_size); - printf_monitor("brk 0x%x\n", addr); - expect_prompt(1); + printf_monitor("b 0x%x\n", addr); + expect_prompt(1); return 0; } } @@ -1050,8 +1051,8 @@ array_remove_breakpoint (addr, shadow) if (breakaddr[i] == addr) { breakaddr[i] = 0; /* some monitors remove breakpoints based on the address */ - printf_monitor("unbrk %x\n", i); - expect_prompt(1); + printf_monitor("bd %x\n", i); + expect_prompt(1); return 0; } } @@ -1195,12 +1196,12 @@ array_send_packet (packet) return 1; case SERIAL_TIMEOUT: debuglogs (3, "Timed out reading serial port\n"); - printf_monitor("+"); /* resync with the monitor */ + printf_monitor("@"); /* resync with the monitor */ expect_prompt(1); /* See if we get a expect_prompt */ break; /* Retransmit buffer */ case '-': debuglogs (3, "Got NAK\n"); - printf_monitor("+"); /* resync with the monitor */ + printf_monitor("@"); /* resync with the monitor */ expect_prompt(1); /* See if we get a expect_prompt */ break; case '$': @@ -1279,7 +1280,7 @@ array_get_packet (packet) debuglogs (3, "\nGDB packet checksum zero, must be a bogus packet\n"); if (csum == pktcsum) { debuglogs (3, "\nGDB packet checksum correct, packet data is \"%s\",\n", packet); - printf_monitor ("+"); + printf_monitor ("@"); expect_prompt (1); return 1; } @@ -1418,5 +1419,6 @@ void _initialize_array () { add_target (&array_ops); + baud_rate = 4800; /* this is the only supported baud rate */ } |