This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 3/6] [C++] s390: Fix enum gdb_syscall conversion
- From: Pedro Alves <palves at redhat dot com>
- To: gdb-patches at sourceware dot org
- Cc: Simon Marchi <simon dot marchi at ericsson dot com>
- Date: Wed, 18 Nov 2015 16:39:59 +0000
- Subject: [PATCH 3/6] [C++] s390: Fix enum gdb_syscall conversion
- Authentication-results: sourceware.org; auth=none
- References: <1447864802-24016-1-git-send-email-palves at redhat dot com>
From: Simon Marchi <simon.marchi@ericsson.com>
Fixes:
src/gdb/s390-linux-tdep.c: In function âgdb_syscall s390_canonicalize_syscall(int, s390_abi_kind)â:
src/gdb/s390-linux-tdep.c:2622:16: error: invalid conversion from âintâ to âgdb_syscallâ [-fpermissive]
return syscall;
^
src/gdb/s390-linux-tdep.c:2722:16: error: invalid conversion from âintâ to âgdb_syscallâ [-fpermissive]
return syscall;
^
src/gdb/s390-linux-tdep.c:2725:24: error: invalid conversion from âintâ to âgdb_syscallâ [-fpermissive]
return syscall + 2;
^
src/gdb/s390-linux-tdep.c:2728:24: error: invalid conversion from âintâ to âgdb_syscallâ [-fpermissive]
return syscall + 5;
^
src/gdb/s390-linux-tdep.c:2731:24: error: invalid conversion from âintâ to âgdb_syscallâ [-fpermissive]
return syscall + 6;
^
src/gdb/s390-linux-tdep.c:2734:24: error: invalid conversion from âintâ to âgdb_syscallâ [-fpermissive]
return syscall + 7;
^
gdb/ChangeLog:
2015-11-18 Simon Marchi <simon.marchi@ericsson.com>
Pedro Alves <palves@redhat.com>
* s390-linux-tdep.c (s390_canonicalize_syscall): Add casts and
intermediate 'int' variable.
---
gdb/s390-linux-tdep.c | 41 ++++++++++++++++++++++++-----------------
1 file changed, 24 insertions(+), 17 deletions(-)
diff --git a/gdb/s390-linux-tdep.c b/gdb/s390-linux-tdep.c
index 3ce6336..0f8a3a8 100644
--- a/gdb/s390-linux-tdep.c
+++ b/gdb/s390-linux-tdep.c
@@ -2619,7 +2619,7 @@ s390_canonicalize_syscall (int syscall, enum s390_abi_kind abi)
case 197: /* fstat64 */
case 221: /* fcntl64 */
if (abi == ABI_LINUX_S390)
- return syscall;
+ return (enum gdb_syscall) syscall;
return gdb_sys_no_syscall;
/* These syscalls don't exist on s390. */
case 17: /* break */
@@ -2717,22 +2717,29 @@ s390_canonicalize_syscall (int syscall, enum s390_abi_kind abi)
return gdb_sys_newfstatat;
/* 313+ not yet supported */
default:
- /* Most "old" syscalls copied from i386. */
- if (syscall <= 221)
- return syscall;
- /* xattr syscalls. */
- if (syscall >= 224 && syscall <= 235)
- return syscall + 2;
- /* timer syscalls. */
- if (syscall >= 254 && syscall <= 262)
- return syscall + 5;
- /* mq_* and kexec_load */
- if (syscall >= 271 && syscall <= 277)
- return syscall + 6;
- /* ioprio_set .. epoll_pwait */
- if (syscall >= 282 && syscall <= 312)
- return syscall + 7;
- return gdb_sys_no_syscall;
+ {
+ int ret;
+
+ /* Most "old" syscalls copied from i386. */
+ if (syscall <= 221)
+ ret = syscall;
+ /* xattr syscalls. */
+ else if (syscall >= 224 && syscall <= 235)
+ ret = syscall + 2;
+ /* timer syscalls. */
+ else if (syscall >= 254 && syscall <= 262)
+ ret = syscall + 5;
+ /* mq_* and kexec_load */
+ else if (syscall >= 271 && syscall <= 277)
+ ret = syscall + 6;
+ /* ioprio_set .. epoll_pwait */
+ else if (syscall >= 282 && syscall <= 312)
+ ret = syscall + 7;
+ else
+ ret = gdb_sys_no_syscall;
+
+ return (enum gdb_syscall) ret;
+ }
}
}
--
1.9.3