diff options
| author | Adam Fedor <fedor@gnu.org> | 2003-05-30 02:45:21 +0000 |
|---|---|---|
| committer | Adam Fedor <fedor@gnu.org> | 2003-05-30 02:45:21 +0000 |
| commit | 1abf022c0c7537a86527651061f79acc7d43a793 (patch) | |
| tree | f856385b2195c8fbba00b04b519661789acdb94a | |
| parent | 62c25571dba3e5f2595c6b656ac9c166d687e287 (diff) | |
| download | gdb-1abf022c0c7537a86527651061f79acc7d43a793.zip gdb-1abf022c0c7537a86527651061f79acc7d43a793.tar.gz gdb-1abf022c0c7537a86527651061f79acc7d43a793.tar.bz2 | |
* objc-lang.c (CONVERT_FUNCPTR): Remove macro
(find_implementation_from_class): Replace it with the standard
case i.e. do nothing.
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/objc-lang.c | 23 |
2 files changed, 9 insertions, 20 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6181923..e88b435 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2003-05-29 Adam Fedor <fedor@gnu.org> + + * objc-lang.c (CONVERT_FUNCPTR): Remove macro + (find_implementation_from_class): Replace it with the standard + case i.e. do nothing. + 2003-05-29 Richard Henderson <rth@redhat.com> * alpha-linux-tdep.c (alpha_linux_sigtramp_offset_1): New. diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c index c357747..47ef9cd 100644 --- a/gdb/objc-lang.c +++ b/gdb/objc-lang.c @@ -1730,11 +1730,6 @@ static unsigned long FETCH_ARGUMENT (int i) internal_error (__FILE__, __LINE__, "FETCH_ARGUMENT not implemented"); return 0; } -static CORE_ADDR CONVERT_FUNCPTR (CORE_ADDR pc) -{ - internal_error (__FILE__, __LINE__, "CONVERT_FUNCPTR not implemented"); - return pc; -} #else #if defined (__powerpc__) || defined (__ppc__) static unsigned long FETCH_ARGUMENT (int i) @@ -1761,20 +1756,6 @@ static unsigned long FETCH_ARGUMENT (int i) #error unknown architecture #endif -#if defined (__hppa__) || defined (__hppa) -static CORE_ADDR CONVERT_FUNCPTR (CORE_ADDR pc) -{ - if (pc & 0x2) - pc = (CORE_ADDR) read_memory_integer (pc & ~0x3, 4); - - return pc; -} -#else -static CORE_ADDR CONVERT_FUNCPTR (CORE_ADDR pc) -{ - return pc; -} -#endif #endif static void @@ -1865,7 +1846,9 @@ find_implementation_from_class (CORE_ADDR class, CORE_ADDR sel) #endif if (meth_str.name == sel) - return CONVERT_FUNCPTR (meth_str.imp); + /* FIXME: hppa arch was doing a pointer dereference + here. There needs to be a better way to do that. */ + return meth_str.imp; } mlistnum++; } |