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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0d49be8c870a61179e01e3cfa25bd409fe53bf27..c85243048e028172c05775f3c1b63043a5f210be 100644 (file)
--- 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 7c7c2f043d3e275fe54ca9db4f5409704d558df0..ce0b106c6b370e2c104d7591180291da73a21d78 100644 (file)
--- 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 569aeacb7d214c87f64ab64385d4ddef918d010c..f463d598c60e9b88d9372596af4c5788d16591aa 100644 (file)
--- 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 d662d31bc1d7df76536d5da43a6591401573b2b0..51c2129091e5ff7d683a4fb90e2a6ff93c9765ad 100644 (file)
--- 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 4f1f25a6374cfd0f064524d8c3fdd51fbf3bbd3b..48bbeba7006d3b61b58301b85636a2715bc40ddd 100644 (file)
--- 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 5291e4eb55d427b590eb520db4b666515823e21c..f7a08e38daf257a3c1428fc1b9f2078207b9b10a 100644 (file)
--- 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"
 \f
 
 

diff --git a/gdb/value.h b/gdb/value.h
index 448124224ce55c88d25959fa341fdbbe417f90d0..e66daa0b27c86791485f19f9ab0568ca8e94cff2 100644 (file)
--- 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))
 \f
 
 #include "symtab.h"