[SCM] archer-jankratochvil-pie: Merge branch 'target_gdbarch_aspace-missing-coreaddrwidth' into archer-jankratochvil-pie

[SCM] archer-jankratochvil-pie: Merge branch 'target_gdbarch_aspace-missing-coreaddrwidth' into archer-jankratochvil-pie

[jkratoch]

The branch, archer-jankratochvil-pie has been updated
       via  d1394c21467ddfdf38ff2a900f0130e513976e1c (commit)
       via  567a26754fc6f584baad635f526acbd0999e405b (commit)
       via  c40d9e431e3fc8fb2649abe53c4f5361aa1a3102 (commit)
      from  b3d51887e872b382f5b1176358e6e66cae1fcd35 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit d1394c21467ddfdf38ff2a900f0130e513976e1c
Merge: b3d51887e872b382f5b1176358e6e66cae1fcd35 567a26754fc6f584baad635f526acbd0999e405b
Author: Jan Kratochvil <jkratoch@host1.dyn.jankratochvil.net>
Date:   Sun Jan 10 20:33:54 2010 +0100

    Merge branch 'target_gdbarch_aspace-missing-coreaddrwidth' into archer-jankratochvil-pie

commit 567a26754fc6f584baad635f526acbd0999e405b
Merge: c40d9e431e3fc8fb2649abe53c4f5361aa1a3102 4389bc5873abd2baabae5c7c1ef4db6445c9e94e
Author: Jan Kratochvil <jkratoch@host1.dyn.jankratochvil.net>
Date:   Sun Jan 10 20:32:33 2010 +0100

    Merge branch 'target_gdbarch_aspace-missing' into target_gdbarch_aspace-coreaddrwidth

commit c40d9e431e3fc8fb2649abe53c4f5361aa1a3102
Author: Jan Kratochvil <jkratoch@host1.dyn.jankratochvil.net>
Date:   Sun Jan 10 20:32:19 2010 +0100

    fixup

-----------------------------------------------------------------------

Summary of changes:
 gdb/breakpoint.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

First 500 lines of diff:
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 75a64d0..2b932e5 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -4715,13 +4715,17 @@ static int
 breakpoint_address_match (struct address_space *aspace1, CORE_ADDR addr1,
 			  struct address_space *aspace2, CORE_ADDR addr2)
 {
-  int addr1_bit = gdbarch_addr_bit (address_space_gdbarch (aspace1));
-  int addr2_bit = gdbarch_addr_bit (address_space_gdbarch (aspace2));
+  int addr1_bit, addr2_bit;
   CORE_ADDR addr1_mask = CORE_ADDR_MAX;
   CORE_ADDR addr2_mask = CORE_ADDR_MAX;
 
+  gdb_assert (aspace1 != NULL);
+  gdb_assert (aspace2 != NULL);
+
+  addr1_bit = gdbarch_addr_bit (address_space_gdbarch (aspace1));
   if (addr1_bit < (sizeof (CORE_ADDR) * HOST_CHAR_BIT))
     addr1_mask = ((CORE_ADDR) 1 << addr1_bit) - 1;
+  addr2_bit = gdbarch_addr_bit (address_space_gdbarch (aspace2));
   if (addr2_bit < (sizeof (CORE_ADDR) * HOST_CHAR_BIT))
     addr2_mask = ((CORE_ADDR) 1 << addr2_bit) - 1;
 


hooks/post-receive
--
Repository for Project Archer.