aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog7
-rw-r--r--gdb/Makefile.in7
-rw-r--r--gdb/cp-support.h6
-rw-r--r--gdb/cp-valprint.c1
-rw-r--r--gdb/eval.c1
-rw-r--r--gdb/p-valprint.c1
-rw-r--r--gdb/value.h5
7 files changed, 20 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0d49be8..c852430 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@
2005-02-08 Andrew Cagney <cagney@gnu.org>
+ * value.h (METHOD_PTR_IS_VIRTUAL, METHOD_PTR_FROM_VOFFSET)
+ (METHOD_PTR_TO_VOFFSET): Move from here ...
+ * cp-support.h (METHOD_PTR_IS_VIRTUAL, METHOD_PTR_FROM_VOFFSET)
+ (METHOD_PTR_TO_VOFFSET): ... to here.
+ * cp-valprint.c, p-valprint.c, eval.c: Include "cp-support.h".
+ * Makefile.in: Update dependencies.
+
* exceptions.c: Do not include <setjmp.h>.
(SIGJMP_BUF, SIGSETJMP, SIGLONGJMP): Delete macros.
(catch_exception, catch_exceptions_with_msg, catch_errors)
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 7c7c2f0..ce0b106 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1823,7 +1823,7 @@ cpu32bug-rom.o: cpu32bug-rom.c $(defs_h) $(gdbcore_h) $(target_h) \
cp-valprint.o: cp-valprint.c $(defs_h) $(gdb_obstack_h) $(symtab_h) \
$(gdbtypes_h) $(expression_h) $(value_h) $(command_h) $(gdbcmd_h) \
$(demangle_h) $(annotate_h) $(gdb_string_h) $(c_lang_h) $(target_h) \
- $(cp_abi_h) $(valprint_h)
+ $(cp_abi_h) $(valprint_h) $(cp_support_h)
cris-tdep.o: cris-tdep.c $(defs_h) $(frame_h) $(frame_unwind_h) \
$(frame_base_h) $(trad_frame_h) $(dwarf2_frame_h) $(symtab_h) \
$(inferior_h) $(gdbtypes_h) $(gdbcore_h) $(gdbcmd_h) $(target_h) \
@@ -1891,7 +1891,7 @@ environ.o: environ.c $(defs_h) $(environ_h) $(gdb_string_h)
eval.o: eval.c $(defs_h) $(gdb_string_h) $(symtab_h) $(gdbtypes_h) \
$(value_h) $(expression_h) $(target_h) $(frame_h) $(language_h) \
$(f_lang_h) $(cp_abi_h) $(infcall_h) $(objc_lang_h) $(block_h) \
- $(parser_defs_h)
+ $(parser_defs_h) $(cp_support_h)
event-loop.o: event-loop.c $(defs_h) $(event_loop_h) $(event_top_h) \
$(gdb_string_h) $(exceptions_h)
event-top.o: event-top.c $(defs_h) $(top_h) $(inferior_h) $(target_h) \
@@ -2378,7 +2378,8 @@ p-typeprint.o: p-typeprint.c $(defs_h) $(gdb_obstack_h) $(bfd_h) $(symtab_h) \
p-valprint.o: p-valprint.c $(defs_h) $(gdb_obstack_h) $(symtab_h) \
$(gdbtypes_h) $(expression_h) $(value_h) $(command_h) $(gdbcmd_h) \
$(gdbcore_h) $(demangle_h) $(valprint_h) $(typeprint_h) \
- $(language_h) $(target_h) $(annotate_h) $(p_lang_h) $(cp_abi_h)
+ $(language_h) $(target_h) $(annotate_h) $(p_lang_h) $(cp_abi_h) \
+ $(cp_support_h)
regcache.o: regcache.c $(defs_h) $(inferior_h) $(target_h) $(gdbarch_h) \
$(gdbcmd_h) $(regcache_h) $(reggroups_h) $(gdb_assert_h) \
$(gdb_string_h) $(gdbcmd_h) $(observer_h)
diff --git a/gdb/cp-support.h b/gdb/cp-support.h
index 569aeac..f463d59 100644
--- a/gdb/cp-support.h
+++ b/gdb/cp-support.h
@@ -117,4 +117,10 @@ struct type *cp_lookup_transparent_type (const char *name);
extern struct cmd_list_element *maint_cplus_cmd_list;
+/* Pointer to member function. Depends on compiler implementation. */
+
+#define METHOD_PTR_IS_VIRTUAL(ADDR) ((ADDR) & 0x80000000)
+#define METHOD_PTR_FROM_VOFFSET(OFFSET) (0x80000000 + (OFFSET))
+#define METHOD_PTR_TO_VOFFSET(ADDR) (~0x80000000 & (ADDR))
+
#endif /* CP_SUPPORT_H */
diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index d662d31..51c2129 100644
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -35,6 +35,7 @@
#include "target.h"
#include "cp-abi.h"
#include "valprint.h"
+#include "cp-support.h"
int vtblprint; /* Controls printing of vtbl's */
int objectprint; /* Controls looking up an object's derived type
diff --git a/gdb/eval.c b/gdb/eval.c
index 4f1f25a..48bbeba 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -36,6 +36,7 @@
#include "objc-lang.h"
#include "block.h"
#include "parser-defs.h"
+#include "cp-support.h"
/* This is defined in valops.c */
extern int overload_resolution;
diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c
index 5291e4eb..f7a08e3 100644
--- a/gdb/p-valprint.c
+++ b/gdb/p-valprint.c
@@ -37,6 +37,7 @@
#include "annotate.h"
#include "p-lang.h"
#include "cp-abi.h"
+#include "cp-support.h"
diff --git a/gdb/value.h b/gdb/value.h
index 4481242..e66daa0 100644
--- a/gdb/value.h
+++ b/gdb/value.h
@@ -246,11 +246,6 @@ struct internalvar
struct value *value;
};
-/* Pointer to member function. Depends on compiler implementation. */
-
-#define METHOD_PTR_IS_VIRTUAL(ADDR) ((ADDR) & 0x80000000)
-#define METHOD_PTR_FROM_VOFFSET(OFFSET) (0x80000000 + (OFFSET))
-#define METHOD_PTR_TO_VOFFSET(ADDR) (~0x80000000 & (ADDR))
#include "symtab.h"