diff options
| -rw-r--r-- | gdb/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/ada-exp.y | 4 | ||||
| -rw-r--r-- | gdb/aix-thread.c | 4 | ||||
| -rw-r--r-- | gdb/alpha-tdep.c | 4 | ||||
| -rw-r--r-- | gdb/arm-tdep.c | 44 |
5 files changed, 38 insertions, 27 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fec154f..81ff781 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2009-10-06 Pierre Muller <muller@ics.u-strasbg.fr> + + ARI fix: OP eol rule. + * ada-exp.y (block_lookup): Avoid operator at end of line. + * aix-thread.c (pd_enable): Idem. + * alpha-tdep.c (alpha_next_pc): Idem. + * arm-tdep.c (arm_skip_prologue, arm_scan_prologue): Idem. + (condition_true, coff_sym_is_thumb): Idem. + 2009-10-06 Joel Brobecker <brobecker@adacore.com> GDB 7.0 released. diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y index 1d3c619..7657cf0 100644 --- a/gdb/ada-exp.y +++ b/gdb/ada-exp.y @@ -1021,8 +1021,8 @@ block_lookup (struct block *context, char *raw_name) name = ada_encode (raw_name); nsyms = ada_lookup_symbol_list (name, context, VAR_DOMAIN, &syms); - if (context == NULL && - (nsyms == 0 || SYMBOL_CLASS (syms[0].sym) != LOC_BLOCK)) + if (context == NULL + && (nsyms == 0 || SYMBOL_CLASS (syms[0].sym) != LOC_BLOCK)) symtab = lookup_symtab (name); else symtab = NULL; diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c index f1b34d5..92693d6 100644 --- a/gdb/aix-thread.c +++ b/gdb/aix-thread.c @@ -893,8 +893,8 @@ pd_enable (void) stub_name = NULL; status = pthdb_session_pthreaded (PD_USER, PTHDB_FLAG_REGS, &pd_callbacks, &stub_name); - if ((status != PTHDB_SUCCESS && - status != PTHDB_NOT_PTHREADED) || !stub_name) + if ((status != PTHDB_SUCCESS + && status != PTHDB_NOT_PTHREADED) || !stub_name) return; /* Set a breakpoint on the returned stub function. */ diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c index 1a188cf..e8b694c 100644 --- a/gdb/alpha-tdep.c +++ b/gdb/alpha-tdep.c @@ -1390,8 +1390,8 @@ alpha_next_pc (struct frame_info *frame, CORE_ADDR pc) { /* Branch format: target PC is: (new PC) + (4 * sext(displacement)) */ - if (op == 0x30 || /* BR */ - op == 0x34) /* BSR */ + if (op == 0x30 /* BR */ + || op == 0x34) /* BSR */ { branch_taken: offset = (insn & 0x001fffff); diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 9cf688c..d59e2aa 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -610,14 +610,14 @@ arm_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc) if ((inst & 0xfffff000) == 0xe24dd000) /* sub sp, sp, #nn */ continue; - if ((inst & 0xffffc000) == 0xe54b0000 || /* strb r(0123),[r11,#-nn] */ - (inst & 0xffffc0f0) == 0xe14b00b0 || /* strh r(0123),[r11,#-nn] */ - (inst & 0xffffc000) == 0xe50b0000) /* str r(0123),[r11,#-nn] */ + if ((inst & 0xffffc000) == 0xe54b0000 /* strb r(0123),[r11,#-nn] */ + || (inst & 0xffffc0f0) == 0xe14b00b0 /* strh r(0123),[r11,#-nn] */ + || (inst & 0xffffc000) == 0xe50b0000) /* str r(0123),[r11,#-nn] */ continue; - if ((inst & 0xffffc000) == 0xe5cd0000 || /* strb r(0123),[sp,#nn] */ - (inst & 0xffffc0f0) == 0xe1cd00b0 || /* strh r(0123),[sp,#nn] */ - (inst & 0xffffc000) == 0xe58d0000) /* str r(0123),[sp,#nn] */ + if ((inst & 0xffffc000) == 0xe5cd0000 /* strb r(0123),[sp,#nn] */ + || (inst & 0xffffc0f0) == 0xe1cd00b0 /* strh r(0123),[sp,#nn] */ + || (inst & 0xffffc000) == 0xe58d0000) /* str r(0123),[sp,#nn] */ continue; /* Un-recognized instruction; stop scanning. */ @@ -917,16 +917,16 @@ arm_scan_prologue (struct frame_info *this_frame, pv_area_store (stack, regs[ARM_SP_REGNUM], 4, regs[regno]); } } - else if ((insn & 0xffffc000) == 0xe54b0000 || /* strb rx,[r11,#-n] */ - (insn & 0xffffc0f0) == 0xe14b00b0 || /* strh rx,[r11,#-n] */ - (insn & 0xffffc000) == 0xe50b0000) /* str rx,[r11,#-n] */ + else if ((insn & 0xffffc000) == 0xe54b0000 /* strb rx,[r11,#-n] */ + || (insn & 0xffffc0f0) == 0xe14b00b0 /* strh rx,[r11,#-n] */ + || (insn & 0xffffc000) == 0xe50b0000) /* str rx,[r11,#-n] */ { /* No need to add this to saved_regs -- it's just an arg reg. */ continue; } - else if ((insn & 0xffffc000) == 0xe5cd0000 || /* strb rx,[sp,#n] */ - (insn & 0xffffc0f0) == 0xe1cd00b0 || /* strh rx,[sp,#n] */ - (insn & 0xffffc000) == 0xe58d0000) /* str rx,[sp,#n] */ + else if ((insn & 0xffffc000) == 0xe5cd0000 /* strb rx,[sp,#n] */ + || (insn & 0xffffc0f0) == 0xe1cd00b0 /* strh rx,[sp,#n] */ + || (insn & 0xffffc000) == 0xe58d0000) /* str rx,[sp,#n] */ { /* No need to add this to saved_regs -- it's just an arg reg. */ continue; @@ -2172,11 +2172,13 @@ condition_true (unsigned long cond, unsigned long status_reg) case INST_LT: return (((status_reg & FLAG_N) == 0) != ((status_reg & FLAG_V) == 0)); case INST_GT: - return (((status_reg & FLAG_Z) == 0) && - (((status_reg & FLAG_N) == 0) == ((status_reg & FLAG_V) == 0))); + return (((status_reg & FLAG_Z) == 0) + && (((status_reg & FLAG_N) == 0) + == ((status_reg & FLAG_V) == 0))); case INST_LE: - return (((status_reg & FLAG_Z) != 0) || - (((status_reg & FLAG_N) == 0) != ((status_reg & FLAG_V) == 0))); + return (((status_reg & FLAG_Z) != 0) + || (((status_reg & FLAG_N) == 0) + != ((status_reg & FLAG_V) == 0))); } return 1; } @@ -5208,11 +5210,11 @@ set_disassembly_style (void) static int coff_sym_is_thumb (int val) { - return (val == C_THUMBEXT || - val == C_THUMBSTAT || - val == C_THUMBEXTFUNC || - val == C_THUMBSTATFUNC || - val == C_THUMBLABEL); + return (val == C_THUMBEXT + || val == C_THUMBSTAT + || val == C_THUMBEXTFUNC + || val == C_THUMBSTATFUNC + || val == C_THUMBLABEL); } /* arm_coff_make_msymbol_special() |