From 35ec2a3e66b5f5e28170d267d36939db8ee27490 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Mon, 28 Sep 2009 23:47:02 +0000 Subject: [PATCH] * ia64-tdep.c (ia64_memory_insert_breakpoint): Check the slotnum and the type of instruction before deciding which slot to save in the breakpoint shadown contents. --- gdb/ChangeLog | 6 ++++++ gdb/ia64-tdep.c | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 06271505dad..61cb155e5a0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2009-09-28 Joel Brobecker + + * ia64-tdep.c (ia64_memory_insert_breakpoint): Check the slotnum + and the type of instruction before deciding which slot to save + in the breakpoint shadown contents. + 2009-09-28 Doug Evans * linux-nat.c (status_to_str): Handle TRAP_IS_SYSCALL. diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c index 674204a9321..bbde5f62054 100644 --- a/gdb/ia64-tdep.c +++ b/gdb/ia64-tdep.c @@ -635,6 +635,12 @@ ia64_memory_insert_breakpoint (struct gdbarch *gdbarch, return val; } + /* Check for L type instruction in slot 1, if present then bump up the slot + number to the slot 2. */ + template = extract_bit_field (bundle, 0, 5); + if (slotnum == 1 && template_encoding_table[template][slotnum] == L) + slotnum = 2; + /* Slot number 2 may skip at most 2 bytes at the beginning. */ bp_tgt->shadow_len = BUNDLE_LEN - 2; @@ -657,12 +663,6 @@ ia64_memory_insert_breakpoint (struct gdbarch *gdbarch, return val; } - /* Check for L type instruction in slot 1, if present then bump up the slot - number to the slot 2. */ - template = extract_bit_field (bundle, 0, 5); - if (slotnum == 1 && template_encoding_table[template][slotnum] == L) - slotnum = 2; - /* Breakpoints already present in the code will get deteacted and not get reinserted by bp_loc_is_permanent. Multiple breakpoints at the same location cannot induce the internal error as they are optimized into -- 2.30.2