aboutsummaryrefslogtreecommitdiff
path: root/gdb/config
diff options
context:
space:
mode:
Diffstat (limited to 'gdb/config')
-rw-r--r--gdb/config/.Sanitize14
-rw-r--r--gdb/config/mips/.Sanitize41
-rw-r--r--gdb/config/mips/magic.mt3
-rw-r--r--gdb/config/mips/mipsm3.mh2
-rw-r--r--gdb/config/mips/mipsv4.mh2
-rw-r--r--gdb/config/mips/nm-m3.h22
-rw-r--r--gdb/config/mips/nm-mips.h2
-rw-r--r--gdb/config/mips/nm-sysv4.h22
-rw-r--r--gdb/config/mips/tm-idt.h36
-rw-r--r--gdb/config/mips/tm-irix5.h6
-rw-r--r--gdb/config/mips/tm-magic.h53
-rw-r--r--gdb/config/mips/tm-mips.h2
-rw-r--r--gdb/config/tm-magic.h40
13 files changed, 127 insertions, 118 deletions
diff --git a/gdb/config/.Sanitize b/gdb/config/.Sanitize
index 1825126..f54894d 100644
--- a/gdb/config/.Sanitize
+++ b/gdb/config/.Sanitize
@@ -21,6 +21,20 @@ else
lose_these_too="arc ${lose_these_too}"
fi
+gm_files="tm-magic.h"
+
+if ( echo $* | grep keep\-gm > /dev/null ) ; then
+ keep_these_too="${gm_files} ${keep_these_too}"
+ if [ -n "${verbose}" ] ; then
+ echo Keeping ${gm_files}
+ fi
+else
+ lose_these_too="${gm_files} ${lose_these_too}"
+ if [ -n "${verbose}" ] ; then
+ echo Deleting ${gm_files}
+ fi
+fi
+
# All files listed between the "Things-to-keep:" line and the
# "Files-to-sed:" line will be kept. All other files will be removed.
# Directories listed in this section will have their own Sanitize
diff --git a/gdb/config/mips/.Sanitize b/gdb/config/mips/.Sanitize
index 67b41b8..c4c5bd2 100644
--- a/gdb/config/mips/.Sanitize
+++ b/gdb/config/mips/.Sanitize
@@ -15,20 +15,6 @@
Do-first:
-gm_files="magic.mt tm-magic.h"
-
-if ( echo $* | grep keep\-gm > /dev/null ) ; then
- keep_these_too="${gm_files} ${keep_these_too}"
- if [ -n "${verbose}" ] ; then
- echo Keeping ${gm_files}
- fi
-else
- lose_these_too="${gm_files} ${lose_these_too}"
- if [ -n "${verbose}" ] ; then
- echo Deleting ${gm_files}
- fi
-fi
-
# All files listed between the "Things-to-keep:" line and the
# "Files-to-sed:" line will be kept. All other files will be removed.
# Directories listed in this section will have their own Sanitize
@@ -97,4 +83,31 @@ Things-to-lose:
Do-last:
+if ( echo $* | grep keep\-gm > /dev/null ) ; then
+ for i in * ; do
+ if test ! -d $i && (grep sanitize-gm $i > /dev/null) ; then
+ if [ -n "${verbose}" ] ; then
+ echo Keeping gm stuff in $i
+ fi
+ fi
+ done
+else
+ for i in * ; do
+ if test ! -d $i && (grep sanitize-gm $i > /dev/null) ; then
+ if [ -n "${verbose}" ] ; then
+ echo Removing traces of \"gm\" from $i...
+ fi
+ cp $i new
+ sed '/start\-sanitize\-gm/,/end-\sanitize\-gm/d' < $i > new
+ if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+ if [ -n "${verbose}" ] ; then
+ echo Caching $i in .Recover...
+ fi
+ mv $i .Recover
+ fi
+ mv new $i
+ fi
+ done
+fi
+
# End of file.
diff --git a/gdb/config/mips/magic.mt b/gdb/config/mips/magic.mt
deleted file mode 100644
index 8327a2b..0000000
--- a/gdb/config/mips/magic.mt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Target: Big-endian IDT board running MagiCAP
-TDEPFILES= mips-tdep.o remote-mips.o magic.o
-TM_FILE= tm-magic.h
diff --git a/gdb/config/mips/mipsm3.mh b/gdb/config/mips/mipsm3.mh
index 08c8392..fe7cbad 100644
--- a/gdb/config/mips/mipsm3.mh
+++ b/gdb/config/mips/mipsm3.mh
@@ -4,7 +4,7 @@
XDEPFILES= coredep.o
NATDEPFILES= mipsm3-nat.o m3-nat.o
XM_FILE= xm-mipsm3.h
-NAT_FILE= nm-m3.h
+NAT_FILE= ../nm-m3.h
# Don't use the mmalloc library in Mach 3.
MMALLOC =
diff --git a/gdb/config/mips/mipsv4.mh b/gdb/config/mips/mipsv4.mh
index c01bfcb..d6b328b 100644
--- a/gdb/config/mips/mipsv4.mh
+++ b/gdb/config/mips/mipsv4.mh
@@ -1,4 +1,4 @@
# Host: Mips running SVR4
XM_FILE= xm-mipsv4.h
-NAT_FILE= nm-sysv4.h
+NAT_FILE= ../nm-sysv4.h
NATDEPFILES= fork-child.o procfs.o mipsv4-nat.o corelow.o core-svr4.o solib.o
diff --git a/gdb/config/mips/nm-m3.h b/gdb/config/mips/nm-m3.h
deleted file mode 100644
index 0fe7cf2..0000000
--- a/gdb/config/mips/nm-m3.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Native-dependent definitions for mips running Mach 3.
- Copyright 1994 Free Software Foundation, Inc.
-
-This file is part of GDB.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
-/* Include the generic Mach 3 definitions. */
-
-#include "nm-m3.h"
diff --git a/gdb/config/mips/nm-mips.h b/gdb/config/mips/nm-mips.h
index ac77782..0f49e34 100644
--- a/gdb/config/mips/nm-mips.h
+++ b/gdb/config/mips/nm-mips.h
@@ -1,4 +1,4 @@
-/* Definitions for GDB on mips.
+/* Native definitions for GDB on DECstations, Sony News. and MIPS Riscos systems
Copyright (C) 1986, 1987, 1989, 1992 Free Software Foundation, Inc.
Contributed by Per Bothner(bothner@cs.wisc.edu) at U.Wisconsin
and by Alessandro Forin(af@cs.cmu.edu) at CMU
diff --git a/gdb/config/mips/nm-sysv4.h b/gdb/config/mips/nm-sysv4.h
deleted file mode 100644
index a1c6bc6..0000000
--- a/gdb/config/mips/nm-sysv4.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Native-dependent definitions for mips running SVR4.
- Copyright 1994 Free Software Foundation, Inc.
-
-This file is part of GDB.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
-/* Include the generic SVR4 definitions. */
-
-#include "nm-sysv4.h"
diff --git a/gdb/config/mips/tm-idt.h b/gdb/config/mips/tm-idt.h
index 47bcfb5..f3d2cc8 100644
--- a/gdb/config/mips/tm-idt.h
+++ b/gdb/config/mips/tm-idt.h
@@ -22,3 +22,39 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#undef DEFAULT_MIPS_TYPE
#define DEFAULT_MIPS_TYPE "r3051"
+
+/* start-sanitize-gm */
+#ifdef GENERAL_MAGIC
+
+#include "tm-magic.h" /* Include generic stuff */
+
+/* For some reason GM can't hack this... */
+
+#undef GET_LONGJMP_TARGET
+
+/* Watchpoint support */
+
+#define TARGET_HAS_HARDWARE_WATCHPOINTS
+
+#define TARGET_CAN_USE_HARDWARE_WATCHPOINT(type, cnt, ot) \
+ (1 == 1) /* We allow all types of hardware watchpoints */
+
+/* Use these macros for watchpoint insertion/deletion. */
+/* type can be 0: write watch, 1: read watch, 2: access watch (read/write) */
+
+#define target_insert_watchpoint(addr, len, type) \
+ remote_mips_set_watchpoint (addr, len, type)
+
+#define target_remove_watchpoint(addr, len, type) \
+ remote_mips_remove_watchpoint (addr, len, type)
+
+/* We need to remove watchpoints when stepping, else we hit them again! */
+
+#define HAVE_NONSTEPPABLE_WATCHPOINT
+
+#define STOPPED_BY_WATCHPOINT(w) remote_mips_stopped_by_watchpoint ()
+
+#define FLUSH_CACHED_MEMORY() flush_cached_memory()
+
+#endif /* GENERAL_MAGIC */
+/* end-sanitize-gm */
diff --git a/gdb/config/mips/tm-irix5.h b/gdb/config/mips/tm-irix5.h
index faf6d45..3cda7b7 100644
--- a/gdb/config/mips/tm-irix5.h
+++ b/gdb/config/mips/tm-irix5.h
@@ -44,3 +44,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#undef SIGFRAME_FPREGSAVE_OFF
#define SIGFRAME_FPREGSAVE_OFF (SIGFRAME_BASE + 2 * 4 + 8 + 32 * 8 + 4)
#define SIGFRAME_REG_SIZE 8
+
+/* start-sanitize-gm */
+#ifdef GENERAL_MAGIC
+#include "tm-magic.h"
+#endif /* GENERAL_MAGIC */
+/* end-sanitize-gm */
diff --git a/gdb/config/mips/tm-magic.h b/gdb/config/mips/tm-magic.h
deleted file mode 100644
index c333f73..0000000
--- a/gdb/config/mips/tm-magic.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Definitions for General Magic MIPS target.
- Copyright (C) 1995 Free Software Foundation, Inc.
-
-This file is part of GDB.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
-#include "mips/tm-idt.h"
-
-/* For some reason GM can't hack this... */
-
-#undef GET_LONGJMP_TARGET
-
-#define GENERAL_MAGIC_HACKS
-
-#define SEND_BREAK_ON_QUIT
-
-
-/* Watchpoint support */
-
-#define TARGET_HAS_HARDWARE_WATCHPOINTS
-
-#define TARGET_CAN_USE_HARDWARE_WATCHPOINT(type, cnt, ot) \
- (1 == 1) /* We allow all types of hardware watchpoints */
-
-/* Use these macros for watchpoint insertion/deletion. */
-/* type can be 0: write watch, 1: read watch, 2: access watch (read/write) */
-
-#define target_insert_watchpoint(addr, len, type) \
- remote_mips_set_watchpoint (addr, len, type)
-
-#define target_remove_watchpoint(addr, len, type) \
- remote_mips_remove_watchpoint (addr, len, type)
-
-/* We need to remove watchpoints when stepping, else we hit them again! */
-
-#define HAVE_NONSTEPPABLE_WATCHPOINT
-
-#define STOPPED_BY_WATCHPOINT(w) remote_mips_stopped_by_watchpoint ()
-
-#define FLUSH_CACHED_MEMORY() flush_cached_memory()
diff --git a/gdb/config/mips/tm-mips.h b/gdb/config/mips/tm-mips.h
index afbb2e0..d8b2bd1 100644
--- a/gdb/config/mips/tm-mips.h
+++ b/gdb/config/mips/tm-mips.h
@@ -33,7 +33,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#endif
#if !defined (TARGET_MONITOR_PROMPT)
-#define TARGET_MONITOR_PROMPT { '<', 'I', 'D', 'T', '>' }
+#define TARGET_MONITOR_PROMPT "<IDT>"
#endif
/* Floating point is IEEE compliant */
diff --git a/gdb/config/tm-magic.h b/gdb/config/tm-magic.h
new file mode 100644
index 0000000..0436036
--- /dev/null
+++ b/gdb/config/tm-magic.h
@@ -0,0 +1,40 @@
+/* Definitions for General Magic target.
+ Copyright (C) 1995 Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "magic.h"
+
+#define TARGET_SYMFILE_POSTREAD(OBJFILE) init_magic ()
+
+#define TARGET_CREATE_INFERIOR_HOOK(PID) magic_create_inferior_hook ()
+
+/* Magic Cap method stepping support.
+ We use the shared library trampoline support to implement stepping over
+ the method dispatcher. We consider the entire dispatcher to be one big
+ trampoline, and use SKIP_TRAMPOLINE_CODE() to skip from a dispatcher
+ entry point to the dispatcher exit site, or from the exit site to the
+ first instruction of the dispatched-to method. */
+
+#define SKIP_TRAMPOLINE_CODE(pc) \
+ magic_skip_dispatcher(pc)
+
+#define IN_SOLIB_CALL_TRAMPOLINE(pc, name) \
+ magic_in_dispatcher(pc, name)
+
+#define IN_SOLIB_RETURN_TRAMPOLINE(pc, name) \
+ magic_in_dispatcher(pc, name)