From ef31c1ea0efc1e66638a426acfe9678f25ebe8c0 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Tue, 6 Jun 2000 06:19:57 +0000 Subject: [PATCH] Delete TARGET_MONITOR_PROMPT. --- gdb/ChangeLog | 14 ++++++++++++++ gdb/config/mips/tm-mips.h | 4 ---- gdb/config/mips/tm-vr4100.h | 3 +-- gdb/config/mips/tm-vr4300.h | 3 +-- gdb/config/mips/tm-vr4300el.h | 3 +-- gdb/config/mips/tm-vr4xxx.h | 3 +-- gdb/config/mips/tm-vr4xxxel.h | 3 +-- gdb/config/mips/tm-vr5000.h | 3 +-- gdb/config/mips/tm-vr5000el.h | 3 +-- gdb/remote-mips.c | 21 +++++++++++++++++++-- 10 files changed, 40 insertions(+), 20 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6b51c40aa6..cf28e52848 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,17 @@ +Tue Jun 6 15:07:08 2000 Andrew Cagney + + * remote-mips.c (mips_open): Select the default monitor prompt + based on the target ISA. + + * config/mips/tm-vr4100.h (TARGET_MONITOR_PROMPT), + config/mips/tm-vr4300el.h (TARGET_MONITOR_PROMPT), + config/mips/tm-vr4300.h (TARGET_MONITOR_PROMPT), + config/mips/tm-vr4xxx.h (TARGET_MONITOR_PROMPT), + config/mips/tm-vr4xxxel.h (TARGET_MONITOR_PROMPT), + config/mips/tm-vr5000el.h (TARGET_MONITOR_PROMPT), + config/mips/tm-vr5000.h (TARGET_MONITOR_PROMPT), + config/mips/tm-mips.h (TARGET_MONITOR_PROMPT): Delete macro. + 2000-06-05 Daniel Berlin * c-exp.y (yylex): template handling fixes. diff --git a/gdb/config/mips/tm-mips.h b/gdb/config/mips/tm-mips.h index 9d07e87de5..30d00aef72 100644 --- a/gdb/config/mips/tm-mips.h +++ b/gdb/config/mips/tm-mips.h @@ -45,10 +45,6 @@ struct value; #define MIPS_EABI 0 #endif -#if !defined (TARGET_MONITOR_PROMPT) -#define TARGET_MONITOR_PROMPT "" -#endif - /* PC should be masked to remove possible MIPS16 flag */ #if !defined (GDB_TARGET_MASK_DISAS_PC) #define GDB_TARGET_MASK_DISAS_PC(addr) UNMAKE_MIPS16_ADDR(addr) diff --git a/gdb/config/mips/tm-vr4100.h b/gdb/config/mips/tm-vr4100.h index c139f9743f..e28e28ed07 100644 --- a/gdb/config/mips/tm-vr4100.h +++ b/gdb/config/mips/tm-vr4100.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1998 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2000 Free Software Foundation, Inc. This file is part of GDB. @@ -20,7 +20,6 @@ #define TARGET_BYTE_ORDER_SELECTABLE_P 1 #define MIPS_EABI 1 #define MIPS_DEFAULT_FPU_TYPE MIPS_FPU_NONE -#define TARGET_MONITOR_PROMPT " " #define TARGET_PTR_BIT 64 #include "mips/tm-bigmips64.h" diff --git a/gdb/config/mips/tm-vr4300.h b/gdb/config/mips/tm-vr4300.h index 273161ecc3..3f85dd0578 100644 --- a/gdb/config/mips/tm-vr4300.h +++ b/gdb/config/mips/tm-vr4300.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1996 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1996, 2000 Free Software Foundation, Inc. This file is part of GDB. @@ -18,6 +18,5 @@ Boston, MA 02111-1307, USA. */ #define TARGET_BYTE_ORDER_SELECTABLE_P 1 -#define TARGET_MONITOR_PROMPT " " #include "mips/tm-bigmips64.h" diff --git a/gdb/config/mips/tm-vr4300el.h b/gdb/config/mips/tm-vr4300el.h index 1a938f3e6e..d45ab84c9b 100644 --- a/gdb/config/mips/tm-vr4300el.h +++ b/gdb/config/mips/tm-vr4300el.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1996 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1996, 2000 Free Software Foundation, Inc. This file is part of GDB. @@ -18,6 +18,5 @@ Boston, MA 02111-1307, USA. */ #define TARGET_BYTE_ORDER_SELECTABLE_P 1 -#define TARGET_MONITOR_PROMPT " " #include "mips/tm-mips64.h" diff --git a/gdb/config/mips/tm-vr4xxx.h b/gdb/config/mips/tm-vr4xxx.h index 1f2a131338..b8f99df813 100644 --- a/gdb/config/mips/tm-vr4xxx.h +++ b/gdb/config/mips/tm-vr4xxx.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1998 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2000 Free Software Foundation, Inc. This file is part of GDB. @@ -20,6 +20,5 @@ #define GDB_MULTI_ARCH 1 #define MIPS_DEFAULT_FPU_TYPE MIPS_FPU_DOUBLE #define TARGET_BYTE_ORDER_SELECTABLE_P 1 -#define TARGET_MONITOR_PROMPT " " #include "mips/tm-bigmips64.h" diff --git a/gdb/config/mips/tm-vr4xxxel.h b/gdb/config/mips/tm-vr4xxxel.h index ae5227b518..aaa2a249a6 100644 --- a/gdb/config/mips/tm-vr4xxxel.h +++ b/gdb/config/mips/tm-vr4xxxel.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1998 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2000 Free Software Foundation, Inc. This file is part of GDB. @@ -20,6 +20,5 @@ #define GDB_MULTI_ARCH 1 #define MIPS_DEFAULT_FPU_TYPE MIPS_FPU_DOUBLE #define TARGET_BYTE_ORDER_SELECTABLE_P 1 -#define TARGET_MONITOR_PROMPT " " #include "mips/tm-mips64.h" diff --git a/gdb/config/mips/tm-vr5000.h b/gdb/config/mips/tm-vr5000.h index e3f66f01e0..a00a6a804c 100644 --- a/gdb/config/mips/tm-vr5000.h +++ b/gdb/config/mips/tm-vr5000.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. +/* Copyright (C) 1996, 2000 Free Software Foundation, Inc. This file is part of GDB. @@ -19,7 +19,6 @@ #define GDB_MULTI_ARCH 1 #define TARGET_BYTE_ORDER_SELECTABLE_P 1 -#define TARGET_MONITOR_PROMPT " " #define MIPS_EABI 1 #include "mips/tm-bigmips64.h" diff --git a/gdb/config/mips/tm-vr5000el.h b/gdb/config/mips/tm-vr5000el.h index 9fa47002c0..78c3d5862b 100644 --- a/gdb/config/mips/tm-vr5000el.h +++ b/gdb/config/mips/tm-vr5000el.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. +/* Copyright (C) 1996, 2000 Free Software Foundation, Inc. This file is part of GDB. @@ -19,7 +19,6 @@ #define GDB_MULTI_ARCH 1 #define TARGET_BYTE_ORDER_SELECTABLE_P 1 -#define TARGET_MONITOR_PROMPT " " #define MIPS_EABI 1 #include "mips/tm-mips64.h" diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c index 883ee9e861..0b75e4cbf7 100644 --- a/gdb/remote-mips.c +++ b/gdb/remote-mips.c @@ -1,5 +1,5 @@ /* Remote debugging interface for MIPS remote debugging protocol. - Copyright 1993-1995, 2000 Free Software Foundation, Inc. + Copyright 1993, 1994, 1995, 2000 Free Software Foundation, Inc. Contributed by Cygnus Support. Written by Ian Lance Taylor . @@ -1654,7 +1654,24 @@ mips_open (name, from_tty) char *name; int from_tty; { - common_open (&mips_ops, name, from_tty, MON_IDT, TARGET_MONITOR_PROMPT); + const char *monitor_prompt = NULL; + if (TARGET_ARCHITECTURE != NULL + && TARGET_ARCHITECTURE->arch == bfd_arch_mips) + { + switch (TARGET_ARCHITECTURE->mach) + { + case bfd_mach_mips4100: + case bfd_mach_mips4300: + case bfd_mach_mips4600: + case bfd_mach_mips4650: + case bfd_mach_mips5000: + monitor_prompt = " "; + break; + } + } + if (monitor_prompt == NULL) + monitor_prompt = ""; + common_open (&mips_ops, name, from_tty, MON_IDT, monitor_prompt); } static void