* configure.in: Move termcap determination a later in the file to catch

[deliverable/binutils-gdb.git] / gdb / h8500-tdep.c

diff --git a/gdb/h8500-tdep.c b/gdb/h8500-tdep.c
index 2ed8e37c061f455b31c021aac6dbfeedef4ad631..49fab2d54e560ef07dc0ed33a485448c7a49f564 100644 (file)
--- a/gdb/h8500-tdep.c
+++ b/gdb/h8500-tdep.c
@@ -15,7 +15,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /*
  Contributed by Steve Chamberlain
@@ -98,6 +98,13 @@ h8500_skip_prologue (start_pc)
   return start_pc;
 }
 
+CORE_ADDR
+h8500_addr_bits_remove (addr)
+     CORE_ADDR addr;
+{
+  return ((addr) & 0xffffff);
+}
+
 /* Given a GDB frame, determine the address of the calling function's frame.
    This will be used to create a new GDB frame struct, and then
    INIT_EXTRA_FRAME_INFO and INIT_FRAME_PC will be called for the new frame.
@@ -395,38 +402,6 @@ saved_pc_after_call ()
   return x;
 }
 
-#if 0  /* never called */
-/* Nonzero if instruction at PC is a return instruction.  */
-
-int
-about_to_return (pc)
-     CORE_ADDR pc;
-{
-  int b1 = read_memory_integer (pc, 1);
-
-  switch (b1)
-    {
-    case 0x14:                 /* rtd #8 */
-    case 0x1c:                 /* rtd #16 */
-    case 0x19:                 /* rts */
-    case 0x1a:                 /* rte */
-      return 1;
-    case 0x11:
-      {
-       int b2 = read_memory_integer (pc + 1, 1);
-       switch (b2)
-         {
-         case 0x18:            /* prts */
-         case 0x14:            /* prtd #8 */
-         case 0x16:            /* prtd #16 */
-           return 1;
-         }
-      }
-    }
-  return 0;
-}
-#endif
-
 void
 h8500_set_pointer_size (newsize)
      int newsize;
@@ -572,14 +547,14 @@ h8500_set_trapped_internalvar (var, newval, bitpos, bitsize, offset)
   struct type *type;
   enum type_code newval_type_code;
 
-  type = VALUE_TYPE (newval);
+  type = check_typedef (VALUE_TYPE (newval));
   newval_type_code = TYPE_CODE (type);
 
   if ((newval_type_code != TYPE_CODE_INT
        && newval_type_code != TYPE_CODE_PTR)
       || TYPE_LENGTH (type) != sizeof (new_regval))
     error ("Illegal type (%s) for assignment to $%s\n",
-          TYPE_NAME (type), var->name);
+          TYPE_NAME (VALUE_TYPE (newval)), var->name);
 
   new_regval = *(long *) VALUE_CONTENTS_RAW (newval);