diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/amd64fbsd-tdep.c | 4 | ||||
| -rw-r--r-- | gdb/i386fbsd-tdep.c | 64 |
3 files changed, 44 insertions, 31 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 122ac57..ed21f3f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2015-03-13 John Baldwin <jhb@FreeBSD.org> + + * amd64fbsd-tdep.c (amd64fbsd_sigtramp_p): Style fixes. + * i386fbsd-tdep.c: Fix style in various gdb_static_assert + expressions. + (i386fbsd_sigtramp_p): Likewise. + 2015-03-12 John Baldwin <jhb@FreeBSD.org> * MAINTAINERS (Write After Approval): Add John Baldwin. diff --git a/gdb/amd64fbsd-tdep.c b/gdb/amd64fbsd-tdep.c index e11b0f3..62dcb83 100644 --- a/gdb/amd64fbsd-tdep.c +++ b/gdb/amd64fbsd-tdep.c @@ -51,8 +51,8 @@ amd64fbsd_sigtramp_p (struct frame_info *this_frame) if (!safe_frame_unwind_memory (this_frame, pc, buf, sizeof buf)) return 0; - if (memcmp (buf, amd64fbsd_sigtramp_code, sizeof amd64fbsd_sigtramp_code) != - 0) + if (memcmp (buf, amd64fbsd_sigtramp_code, sizeof amd64fbsd_sigtramp_code) + != 0) return 0; return 1; diff --git a/gdb/i386fbsd-tdep.c b/gdb/i386fbsd-tdep.c index d4516ee..ed41706 100644 --- a/gdb/i386fbsd-tdep.c +++ b/gdb/i386fbsd-tdep.c @@ -105,24 +105,24 @@ static const gdb_byte i386fbsd_osigtramp_end[] = }; /* The three different trampolines are all the same size. */ -gdb_static_assert (sizeof i386fbsd_sigtramp_start == - sizeof i386fbsd_freebsd4_sigtramp_start); -gdb_static_assert (sizeof i386fbsd_sigtramp_start == - sizeof i386fbsd_osigtramp_start); -gdb_static_assert (sizeof i386fbsd_sigtramp_middle == - sizeof i386fbsd_freebsd4_sigtramp_middle); -gdb_static_assert (sizeof i386fbsd_sigtramp_middle == - sizeof i386fbsd_osigtramp_middle); -gdb_static_assert (sizeof i386fbsd_sigtramp_end == - sizeof i386fbsd_freebsd4_sigtramp_end); -gdb_static_assert (sizeof i386fbsd_sigtramp_end == - sizeof i386fbsd_osigtramp_end); +gdb_static_assert (sizeof i386fbsd_sigtramp_start + == sizeof i386fbsd_freebsd4_sigtramp_start); +gdb_static_assert (sizeof i386fbsd_sigtramp_start + == sizeof i386fbsd_osigtramp_start); +gdb_static_assert (sizeof i386fbsd_sigtramp_middle + == sizeof i386fbsd_freebsd4_sigtramp_middle); +gdb_static_assert (sizeof i386fbsd_sigtramp_middle + == sizeof i386fbsd_osigtramp_middle); +gdb_static_assert (sizeof i386fbsd_sigtramp_end + == sizeof i386fbsd_freebsd4_sigtramp_end); +gdb_static_assert (sizeof i386fbsd_sigtramp_end + == sizeof i386fbsd_osigtramp_end); /* We assume that the middle is the largest chunk below. */ -gdb_static_assert (sizeof i386fbsd_sigtramp_middle > - sizeof i386fbsd_sigtramp_start); -gdb_static_assert (sizeof i386fbsd_sigtramp_middle > - sizeof i386fbsd_sigtramp_end); +gdb_static_assert (sizeof i386fbsd_sigtramp_middle + > sizeof i386fbsd_sigtramp_start); +gdb_static_assert (sizeof i386fbsd_sigtramp_middle + > sizeof i386fbsd_sigtramp_end); static int i386fbsd_sigtramp_p (struct frame_info *this_frame) @@ -135,19 +135,25 @@ i386fbsd_sigtramp_p (struct frame_info *this_frame) if (!safe_frame_unwind_memory (this_frame, pc, buf, sizeof i386fbsd_sigtramp_start)) return 0; - if (memcmp (buf, i386fbsd_sigtramp_start, sizeof i386fbsd_sigtramp_start) == - 0) { - middle = i386fbsd_sigtramp_middle; - end = i386fbsd_sigtramp_end; - } else if (memcmp (buf, i386fbsd_freebsd4_sigtramp_start, - sizeof i386fbsd_freebsd4_sigtramp_start) == 0) { - middle = i386fbsd_freebsd4_sigtramp_middle; - end = i386fbsd_freebsd4_sigtramp_end; - } else if (memcmp (buf, i386fbsd_osigtramp_start, - sizeof i386fbsd_osigtramp_start) == 0) { - middle = i386fbsd_osigtramp_middle; - end = i386fbsd_osigtramp_end; - } else + if (memcmp (buf, i386fbsd_sigtramp_start, sizeof i386fbsd_sigtramp_start) + == 0) + { + middle = i386fbsd_sigtramp_middle; + end = i386fbsd_sigtramp_end; + } + else if (memcmp (buf, i386fbsd_freebsd4_sigtramp_start, + sizeof i386fbsd_freebsd4_sigtramp_start) == 0) + { + middle = i386fbsd_freebsd4_sigtramp_middle; + end = i386fbsd_freebsd4_sigtramp_end; + } + else if (memcmp (buf, i386fbsd_osigtramp_start, + sizeof i386fbsd_osigtramp_start) == 0) + { + middle = i386fbsd_osigtramp_middle; + end = i386fbsd_osigtramp_end; + } + else return 0; /* Since the end is shorter than the middle, check for a matching end |