|
From: <sv...@va...> - 2008-03-04 00:35:07
|
Author: sewardj
Date: 2008-03-04 00:35:05 +0000 (Tue, 04 Mar 2008)
New Revision: 7552
Log:
Merge (from trunk) r7427 ("Don't be quite so paranoid about rejecting
symbols that fall outside the .text segment. [...]")
Modified:
branches/HGDEV/coregrind/m_debuginfo/readelf.c
Modified: branches/HGDEV/coregrind/m_debuginfo/readelf.c
===================================================================
--- branches/HGDEV/coregrind/m_debuginfo/readelf.c 2008-03-03 22:20:51 UTC (rev 7551)
+++ branches/HGDEV/coregrind/m_debuginfo/readelf.c 2008-03-04 00:35:05 UTC (rev 7552)
@@ -458,7 +458,19 @@
if (*is_text_out) {
- if (!in_text) {
+ /* This used to reject any symbol falling outside the text
+ segment ("if (!in_text) ..."). Now it is relaxed slightly,
+ to reject only symbols which fall outside the area mapped
+ r-x. This is in accordance with r7427. See
+ "Comment_Regarding_Text_Range_Checks" in storage.c for
+ background. */
+ Bool in_rx;
+ vg_assert(di->have_rx_map);
+ in_rx = (!(*sym_avma_out + *sym_size_out <= di->rx_map_avma
+ || *sym_avma_out >= di->rx_map_avma + di->rx_map_size));
+ if (in_text)
+ vg_assert(in_rx);
+ if (!in_rx) {
TRACE_SYMTAB(
"ignore -- %p .. %p outside .text svma range %p .. %p\n",
*sym_avma_out, *sym_avma_out + *sym_size_out,
|