Hi Pedro, According to your idea, I write a patch "target_adjust_pc_with_itself.txt" for it. It's for the main trunk and 20080930 branch. 2008-11-02 Hui Zhu * target.h (target_ops): Add "to_adjust_pc_with_itself". Return true if target adjust pc after break with itself. (target_adjust_pc_with_itself): New macro. Call "to_adjust_pc_with_itself". * target.c (update_current_target): Set "to_adjust_pc_with_itself". * infrun.c (adjust_pc_after_break): If "target_adjust_pc_with_itself" return true, not adjust pc. To make P record support it. I make another patch "record_adjust_pc_with_itself.txt". 2008-11-02 Hui Zhu * record.c (record_adjust_pc_with_itself): New function. Return true. (init_record_ops): Set to_adjust_pc_with_itself point to record_adjust_pc_with_itself. Thanks, Hui