Truncate address in amd64_nacl_software_single_step. If breakpoint is set to untruncated address, i…

gdb/nacl-tdep.c

 /* Target-dependent code for NaCl.
 
    Copyright (C) 2001, 2003-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
@@ skipping 114 matching lines @@
 
 static int
 amd64_nacl_software_single_step (struct frame_info *frame)
 {
   struct gdbarch *gdbarch;
   CORE_ADDR pc;
   CORE_ADDR bp_pc;
 
   gdbarch = get_frame_arch (frame);
   pc = get_frame_register_unsigned (frame, gdbarch_pc_regnum (gdbarch));
+  pc = amd64_nacl_addr_bits_remove (gdbarch, pc);
 
   /* Check if next instruction is rsp sandboxing.  If yes, assume current
      instruction is rsp modification.  */
   pc += gdb_insn_length (gdbarch, pc);
   bp_pc = amd64_nacl_skip_rsp_sandboxing (pc);
   if (bp_pc != pc)
     {
       insert_single_step_breakpoint (gdbarch,
                                      get_frame_address_space (frame),
                                      bp_pc);
@@ skipping 46 matching lines @@
 
 void
 _initialize_nacl_tdep (void)
 {
   gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64,
                           GDB_OSABI_NACL, amd64_nacl_init_abi);
 
   gdbarch_register_osabi (bfd_arch_i386, 0,
                           GDB_OSABI_NACL, i386_nacl_init_abi);
 }