Fix ARI warnings in aarch64-tdep.c

This patch fixes some ARI warnings:

 $ bash ./gdb/contrib/ari/gdb_ari.sh -Wall -Werror -Wari gdb/aarch64-tdep.c
 gdb/aarch64-tdep.c:3009: code: Do not use &&, or || at the end of a line
 gdb/aarch64-tdep.c:3010: code: Do not use &&, or || at the end of a line
 gdb/aarch64-tdep.c:3413: code: Do not use &&, or || at the end of a line
 gdb/aarch64-tdep.c:3460: code: Do not use &&, or || at the end of a line

This patch moves && from the end of line to the start of the line.

gdb:

2015-05-27  Yao Qi  <yao.qi@linaro.org>

	* aarch64-tdep.c (aarch64_record_branch_except_sys): Split lines
	before operator &&.
	(aarch64_record_load_store): Likewise.
This commit is contained in:
Yao Qi 2015-05-27 11:29:24 +01:00
parent 82c7be3106
commit 5d98d3cd86
2 changed files with 13 additions and 7 deletions

View File

@ -1,3 +1,9 @@
2015-05-27 Yao Qi <yao.qi@linaro.org>
* aarch64-tdep.c (aarch64_record_branch_except_sys): Split lines
before operator &&.
(aarch64_record_load_store): Likewise.
2015-05-26 Doug Evans <dje@google.com> 2015-05-26 Doug Evans <dje@google.com>
PR c++/18141, c++/18417. PR c++/18141, c++/18417.

View File

@ -3006,9 +3006,9 @@ aarch64_record_branch_except_sys (insn_decode_record *aarch64_insn_r)
/* Exception generation instructions. */ /* Exception generation instructions. */
if (insn_bits24_27 == 0x04) if (insn_bits24_27 == 0x04)
{ {
if (!bits (aarch64_insn_r->aarch64_insn, 2, 4) && if (!bits (aarch64_insn_r->aarch64_insn, 2, 4)
!bits (aarch64_insn_r->aarch64_insn, 21, 23) && && !bits (aarch64_insn_r->aarch64_insn, 21, 23)
bits (aarch64_insn_r->aarch64_insn, 0, 1) == 0x01) && bits (aarch64_insn_r->aarch64_insn, 0, 1) == 0x01)
{ {
ULONGEST svc_number; ULONGEST svc_number;
@ -3410,8 +3410,8 @@ aarch64_record_load_store (insn_decode_record *aarch64_insn_r)
} }
} }
/* Load/store register (register offset) instructions. */ /* Load/store register (register offset) instructions. */
else if ((insn_bits24_27 & 0x0b) == 0x08 && insn_bits28_29 == 0x03 && else if ((insn_bits24_27 & 0x0b) == 0x08 && insn_bits28_29 == 0x03
insn_bits10_11 == 0x02 && insn_bit21) && insn_bits10_11 == 0x02 && insn_bit21)
{ {
if (record_debug) if (record_debug)
{ {
@ -3457,8 +3457,8 @@ aarch64_record_load_store (insn_decode_record *aarch64_insn_r)
} }
} }
/* Load/store register (immediate and unprivileged) instructions. */ /* Load/store register (immediate and unprivileged) instructions. */
else if ((insn_bits24_27 & 0x0b) == 0x08 && insn_bits28_29 == 0x03 && else if ((insn_bits24_27 & 0x0b) == 0x08 && insn_bits28_29 == 0x03
!insn_bit21) && !insn_bit21)
{ {
if (record_debug) if (record_debug)
{ {