Fri Nov 22 15:55:22 1996 Martin M. Hunt <hunt@pizza.cygnus.com>

	* valops.c (value_at, value_fetch_lazy): Put in D10V call
	to fix up address pointers.
	* values.c (value_from_longest): Removed previous d10v changes.
	* config/d10v/tm-d10v.h (TARGET_PTR_BIT): Change to 4 bytes.

diff --git a/gdb/config/d10v/tm-d10v.h b/gdb/config/d10v/tm-d10v.h
index 1181e4d02a246d8a2cc442f7283a95f47e5e5396..5f248b19ff49efba64ee7d56413ab385a033caab 100644 (file)
--- a/gdb/config/d10v/tm-d10v.h
+++ b/gdb/config/d10v/tm-d10v.h
@@ -296,6 +296,6 @@ CORE_ADDR d10v_read_sp PARAMS ((void));
 
 /* Number of bits in the appropriate type */
 #define TARGET_INT_BIT (2 * TARGET_CHAR_BIT)
-#define TARGET_PTR_BIT (2 * TARGET_CHAR_BIT)
+#define TARGET_PTR_BIT (4 * TARGET_CHAR_BIT)
 #define TARGET_DOUBLE_BIT (4 * TARGET_CHAR_BIT)
 #define TARGET_LONG_DOUBLE_BIT (8 * TARGET_CHAR_BIT)

diff --git a/gdb/values.c b/gdb/values.c
index 404485dacff58e39b86f5b2d3fa057e9e5509473..bfb010837bac2ad5a591911516ec8f3bc1e63b81 100644 (file)
--- a/gdb/values.c
+++ b/gdb/values.c
@@ -1259,17 +1259,9 @@ value_from_longest (type, num)
     case TYPE_CODE_PTR:
       /* This assumes that all pointers of a given length
         have the same form.  */
-
-/* start-sanitize-d10v */
-#ifdef GDB_TARGET_IS_D10V
-      /* D10V function pointers need adjusted */
-      if (TYPE_TARGET_TYPE(type) && TYPE_CODE(TYPE_TARGET_TYPE(type)) == TYPE_CODE_FUNC)
-       num = D10V_MAKE_IADDR (num);
-#endif
-/* end-sanitize-d10v */
       store_address (VALUE_CONTENTS_RAW (val), len, (CORE_ADDR) num);
       break;
-
+      
     default:
       error ("Unexpected type encountered for integer constant.");
     }