From 2bb2dcab455295cc23dec46f0150b15892ab4933 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Wed, 15 Apr 2015 14:55:04 +0100 Subject: [PATCH] Fix code indentation gdb: 2015-04-15 Yao Qi * arm-linux-tdep.c (arm_linux_copy_svc): Fix indentation. --- gdb/ChangeLog | 4 +++ gdb/arm-linux-tdep.c | 83 ++++++++++++++++++++++---------------------- 2 files changed, 46 insertions(+), 41 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a97e720203d..68eca21ff69 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2015-04-15 Yao Qi + + * arm-linux-tdep.c (arm_linux_copy_svc): Fix indentation. + 2015-04-15 Yao Qi * arm-linux-tdep.c (arm_linux_cleanup_svc): Use diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c index 60266b52f87..16e8f449e05 100644 --- a/gdb/arm-linux-tdep.c +++ b/gdb/arm-linux-tdep.c @@ -980,49 +980,50 @@ arm_linux_copy_svc (struct gdbarch *gdbarch, struct regcache *regs, &return_to, &is_thumb); if (is_sigreturn) { - struct symtab_and_line sal; - - if (debug_displaced) - fprintf_unfiltered (gdb_stdlog, "displaced: found " - "sigreturn/rt_sigreturn SVC call. PC in frame = %lx\n", - (unsigned long) get_frame_pc (frame)); - - if (debug_displaced) - fprintf_unfiltered (gdb_stdlog, "displaced: unwind pc = %lx. " - "Setting momentary breakpoint.\n", (unsigned long) return_to); - - gdb_assert (inferior_thread ()->control.step_resume_breakpoint - == NULL); - - sal = find_pc_line (return_to, 0); - sal.pc = return_to; - sal.section = find_pc_overlay (return_to); - sal.explicit_pc = 1; - - frame = get_prev_frame (frame); - - if (frame) - { - inferior_thread ()->control.step_resume_breakpoint - = set_momentary_breakpoint (gdbarch, sal, get_frame_id (frame), - bp_step_resume); - - /* set_momentary_breakpoint invalidates FRAME. */ - frame = NULL; - - /* We need to make sure we actually insert the momentary - breakpoint set above. */ - insert_breakpoints (); - } - else if (debug_displaced) - fprintf_unfiltered (gdb_stderr, "displaced: couldn't find previous " - "frame to set momentary breakpoint for " - "sigreturn/rt_sigreturn\n"); + struct symtab_and_line sal; + + if (debug_displaced) + fprintf_unfiltered (gdb_stdlog, "displaced: found " + "sigreturn/rt_sigreturn SVC call. PC in " + "frame = %lx\n", + (unsigned long) get_frame_pc (frame)); + + if (debug_displaced) + fprintf_unfiltered (gdb_stdlog, "displaced: unwind pc = %lx. " + "Setting momentary breakpoint.\n", + (unsigned long) return_to); + + gdb_assert (inferior_thread ()->control.step_resume_breakpoint + == NULL); + + sal = find_pc_line (return_to, 0); + sal.pc = return_to; + sal.section = find_pc_overlay (return_to); + sal.explicit_pc = 1; + + frame = get_prev_frame (frame); + + if (frame) + { + inferior_thread ()->control.step_resume_breakpoint + = set_momentary_breakpoint (gdbarch, sal, get_frame_id (frame), + bp_step_resume); + + /* set_momentary_breakpoint invalidates FRAME. */ + frame = NULL; + + /* We need to make sure we actually insert the momentary + breakpoint set above. */ + insert_breakpoints (); } else if (debug_displaced) - fprintf_unfiltered (gdb_stdlog, "displaced: sigreturn/rt_sigreturn " - "SVC call not in signal trampoline frame\n"); - + fprintf_unfiltered (gdb_stderr, "displaced: couldn't find previous " + "frame to set momentary breakpoint for " + "sigreturn/rt_sigreturn\n"); + } + else if (debug_displaced) + fprintf_unfiltered (gdb_stdlog, "displaced: sigreturn/rt_sigreturn " + "SVC call not in signal trampoline frame\n"); /* Preparation: If we detect sigreturn, set momentary breakpoint at resume location, else nothing. -- 2.30.2