extern int default_register_sim_regno (int reg_nr);
-/* Default conversion of function pointer address - returns address. */
+/* Identity function on a CORE_ADDR. Just returns its parameter. */
-extern CORE_ADDR default_convert_from_func_ptr_addr (CORE_ADDR addr);
+extern CORE_ADDR core_addr_identity (CORE_ADDR addr);
/* No-op conversion of reg to regnum. */