* s390-tdep.c (s390_return_value): Remove unnecessary casts.

	(s390_breakpoint_from_pc): Change type of return value and
	'breakpoint' to const gdb_byte *.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0e4df169013eef874f15f143dd83b0cd805e4d3f..a52bac2f09d138dcbf6075733fea5dce1389c178 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-16  Ulrich Weigand  <uweigand@de.ibm.com>
+
+       * s390-tdep.c (s390_return_value): Remove unnecessary casts.
+       (s390_breakpoint_from_pc): Change type of return value and
+       'breakpoint' to const gdb_byte *.
+
 2005-05-16  Ulrich Weigand  <uweigand@de.ibm.com>
 
        * s390-tdep.c (s390_pseudo_register_read, s390_pseudo_register_write):

diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c
index cbb5b8c90bf37fbbcab0184b3ab8850235cc6ae4..18f7ea409191ad59e6cdc6e27907bed4ffd93b47 100644 (file)
--- a/gdb/s390-tdep.c
+++ b/gdb/s390-tdep.c
@@ -2726,8 +2726,7 @@ s390_return_value (struct gdbarch *gdbarch, struct type *type,
          else if (length == 2*word_size)
            {
              regcache_cooked_write (regcache, S390_R2_REGNUM, in);
-             regcache_cooked_write (regcache, S390_R3_REGNUM,
-                                    (const char *)in + word_size);
+             regcache_cooked_write (regcache, S390_R3_REGNUM, in + word_size);
            }
          else
            internal_error (__FILE__, __LINE__, _("invalid return type"));
@@ -2759,8 +2758,7 @@ s390_return_value (struct gdbarch *gdbarch, struct type *type,
          else if (length == 2*word_size)
            {
              regcache_cooked_read (regcache, S390_R2_REGNUM, out);
-             regcache_cooked_read (regcache, S390_R3_REGNUM,
-                                   (char *)out + word_size);
+             regcache_cooked_read (regcache, S390_R3_REGNUM, out + word_size);
            }
          else
            internal_error (__FILE__, __LINE__, _("invalid return type"));
@@ -2778,10 +2776,10 @@ s390_return_value (struct gdbarch *gdbarch, struct type *type,
 
 /* Breakpoints.  */
 
-static const unsigned char *
+static const gdb_byte *
 s390_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr)
 {
-  static unsigned char breakpoint[] = { 0x0, 0x1 };
+  static const gdb_byte breakpoint[] = { 0x0, 0x1 };
 
   *lenptr = sizeof (breakpoint);
   return breakpoint;