OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Style fixes.

Browse Source 
- Do not leave operators at end-of-line.
- Fix block indentation in if-else chain.

gdb/ChangeLog:

	* amd64fbsd-tdep.c (amd64fbsd_sigtramp_p): Style fixes.
	* i386fbsd-tdep.c: Fix style in various gdb_static_assert
	expressions.
	(i386fbsd_sigtramp_p): Likewise.
This commit is contained in:
John Baldwin 2015-02-27 13:17:43 -05:00
parent 4bf8c6e898
commit 773eacf5b0
3 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -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.

4
gdb/amd64fbsd-tdep.c
View File

@ -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;

64
gdb/i386fbsd-tdep.c
View File

@ -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