Menu
▾
▴
[Valgrind-developers] Valgrind: r15166 - in /branches/ASPACEM_TWEAKS: ./ coregrind/m_aspacemgr/ coregrind/m_debuginfo/ coregrind/m_syswrap/ docs/ docs/internals/
|
From: <sv...@va...> - 2015-04-30 17:35:30
|
Author: florian
Date: Thu Apr 30 18:35:23 2015
New Revision: 15166
Log:
Merge from trunk.
Added:
branches/ASPACEM_TWEAKS/docs/internals/aarch64-linux-on-qemu-HOWTO.txt
- copied unchanged from r15165, trunk/docs/internals/aarch64-linux-on-qemu-HOWTO.txt
Modified:
branches/ASPACEM_TWEAKS/ (props changed)
branches/ASPACEM_TWEAKS/coregrind/m_aspacemgr/aspacemgr-linux.c
branches/ASPACEM_TWEAKS/coregrind/m_aspacemgr/aspacemgr-segnames.c
branches/ASPACEM_TWEAKS/coregrind/m_aspacemgr/priv_aspacemgr.h
branches/ASPACEM_TWEAKS/coregrind/m_debuginfo/readdwarf.c
branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syscall-arm64-linux.S
branches/ASPACEM_TWEAKS/docs/Makefile.am
Modified: branches/ASPACEM_TWEAKS/coregrind/m_aspacemgr/aspacemgr-linux.c
==============================================================================
--- branches/ASPACEM_TWEAKS/coregrind/m_aspacemgr/aspacemgr-linux.c (original)
+++ branches/ASPACEM_TWEAKS/coregrind/m_aspacemgr/aspacemgr-linux.c Thu Apr 30 18:35:23 2015
@@ -421,7 +421,7 @@
static void show_nsegment_full ( Int logLevel, Int segNo, const NSegment* seg )
{
HChar len_buf[20];
- const HChar* name = VG_(am_get_segname)( seg->fnIdx );
+ const HChar* name = ML_(am_get_segname)( seg->fnIdx );
if (name == NULL)
name = "(none)";
@@ -439,7 +439,7 @@
seg->isCH ? 'H' : '-',
show_ShrinkMode(seg->smode),
seg->dev, seg->ino, seg->offset,
- VG_(am_segname_get_seqnr)(seg->fnIdx), seg->fnIdx,
+ ML_(am_segname_get_seqnr)(seg->fnIdx), seg->fnIdx,
name
);
}
@@ -486,7 +486,7 @@
seg->hasX ? 'x' : '-', seg->hasT ? 'T' : '-',
seg->isCH ? 'H' : '-',
seg->dev, seg->ino, seg->offset,
- VG_(am_segname_get_seqnr)(seg->fnIdx), seg->fnIdx
+ ML_(am_segname_get_seqnr)(seg->fnIdx), seg->fnIdx
);
break;
@@ -520,7 +520,7 @@
VG_(debugLog)(logLevel, "aspacem",
"<<< SHOW_SEGMENTS: %s (%d segments)\n",
who, nsegments_used);
- VG_(am_show_segnames)( logLevel, who);
+ ML_(am_show_segnames)( logLevel, who);
for (i = 0; i < nsegments_used; i++)
show_nsegment( logLevel, i, &nsegments[i] );
VG_(debugLog)(logLevel, "aspacem",
@@ -533,7 +533,7 @@
const HChar* VG_(am_get_filename)( NSegment const * seg )
{
aspacem_assert(seg);
- return VG_(am_get_segname)( seg->fnIdx );
+ return ML_(am_get_segname)( seg->fnIdx );
}
/* Collect up the start addresses of segments whose kind matches one of
@@ -621,7 +621,7 @@
case SkFileC: case SkFileV:
return
s->smode == SmFixed
- && VG_(am_sane_segname)(s->fnIdx)
+ && ML_(am_sane_segname)(s->fnIdx)
&& !s->isCH;
case SkResvn:
@@ -675,7 +675,7 @@
+ ((ULong)s2->start) - ((ULong)s1->start) ) {
s1->end = s2->end;
s1->hasT |= s2->hasT;
- VG_(am_dec_refcount)(s1->fnIdx);
+ ML_(am_dec_refcount)(s1->fnIdx);
return True;
}
break;
@@ -1366,7 +1366,7 @@
nsegments[i+1].offset
+= ((ULong)nsegments[i+1].start) - ((ULong)nsegments[i].start);
- VG_(am_inc_refcount)(nsegments[i].fnIdx);
+ ML_(am_inc_refcount)(nsegments[i].fnIdx);
aspacem_assert(sane_NSegment(&nsegments[i]));
aspacem_assert(sane_NSegment(&nsegments[i+1]));
@@ -1431,7 +1431,7 @@
that decrement the reference counters for the segments names of
the replaced segments. */
for (i = iLo; i <= iHi; ++i)
- VG_(am_dec_refcount)(nsegments[i].fnIdx);
+ ML_(am_dec_refcount)(nsegments[i].fnIdx);
delta = iHi - iLo;
aspacem_assert(delta >= 0);
if (delta > 0) {
@@ -1528,7 +1528,7 @@
# endif // defined(VGP_arm_linux)
if (filename)
- seg.fnIdx = VG_(am_allocate_segname)( filename );
+ seg.fnIdx = ML_(am_allocate_segname)( filename );
if (0) show_nsegment( 2,0, &seg );
add_segment( &seg );
@@ -1588,7 +1588,7 @@
aspacem_assert(sizeof(SSizeT) == sizeof(void*));
/* Initialise the string table for segment names. */
- VG_(am_segnames_init)();
+ ML_(am_segnames_init)();
/* Check that we can store the largest imaginable dev, ino and
offset numbers in an NSegment. */
@@ -2032,7 +2032,7 @@
seg.mode = mode;
}
if (ML_(am_resolve_filename)(fd, buf, VKI_PATH_MAX)) {
- seg.fnIdx = VG_(am_allocate_segname)( buf );
+ seg.fnIdx = ML_(am_allocate_segname)( buf );
}
}
add_segment( &seg );
@@ -2254,9 +2254,9 @@
seg.mode = mode;
}
if (name) {
- seg.fnIdx = VG_(am_allocate_segname)( name );
+ seg.fnIdx = ML_(am_allocate_segname)( name );
} else if (ML_(am_resolve_filename)(fd, buf, VKI_PATH_MAX)) {
- seg.fnIdx = VG_(am_allocate_segname)( buf );
+ seg.fnIdx = ML_(am_allocate_segname)( buf );
}
add_segment( &seg );
@@ -2561,7 +2561,7 @@
seg.mode = mode;
}
if (ML_(am_resolve_filename)(fd, buf, VKI_PATH_MAX)) {
- seg.fnIdx = VG_(am_allocate_segname)( buf );
+ seg.fnIdx = ML_(am_allocate_segname)( buf );
}
add_segment( &seg );
Modified: branches/ASPACEM_TWEAKS/coregrind/m_aspacemgr/aspacemgr-segnames.c
==============================================================================
--- branches/ASPACEM_TWEAKS/coregrind/m_aspacemgr/aspacemgr-segnames.c (original)
+++ branches/ASPACEM_TWEAKS/coregrind/m_aspacemgr/aspacemgr-segnames.c Thu Apr 30 18:35:23 2015
@@ -272,7 +272,7 @@
If none is found, an index is allocated and the name stored.
If running ouf of memory, return -1. */
Int
-VG_(am_allocate_segname)(const HChar *name)
+ML_(am_allocate_segname)(const HChar *name)
{
UInt len, ix, size, next_freeslot;
@@ -349,7 +349,7 @@
/* Debugging output */
void
-VG_(am_show_segnames)(Int logLevel, const HChar *prefix)
+ML_(am_show_segnames)(Int logLevel, const HChar *prefix)
{
UInt size, ix, i;
@@ -378,7 +378,7 @@
Used in aspacemgr debug output to associate a segment with
a segment name. */
Int
-VG_(am_segname_get_seqnr)(Int fnIdx)
+ML_(am_segname_get_seqnr)(Int fnIdx)
{
SizeT ix, size;
Int seqnr = -1;
@@ -399,7 +399,7 @@
/* Initialise the string table for segment names. It contains an empty
string which is not referenced. */
void
-VG_(am_segnames_init)(void)
+ML_(am_segnames_init)(void)
{
aspacem_assert(sizeof segnames >= overhead);
@@ -409,7 +409,7 @@
/* Increase reference count of segment name identified by IX. */
void
-VG_(am_inc_refcount)(Int ix)
+ML_(am_inc_refcount)(Int ix)
{
if (ix != -1)
inc_refcount(ix);
@@ -417,20 +417,20 @@
/* Decrease reference count of segment name identified by IX. */
void
-VG_(am_dec_refcount)(Int ix)
+ML_(am_dec_refcount)(Int ix)
{
if (ix != -1)
dec_refcount(ix);
}
Bool
-VG_(am_sane_segname)(Int ix)
+ML_(am_sane_segname)(Int ix)
{
return ix == -1 || (ix >= overhead && ix < segnames_used);
}
const HChar *
-VG_(am_get_segname)(Int ix)
+ML_(am_get_segname)(Int ix)
{
return (ix == -1) ? NULL : segnames + ix;
}
Modified: branches/ASPACEM_TWEAKS/coregrind/m_aspacemgr/priv_aspacemgr.h
==============================================================================
--- branches/ASPACEM_TWEAKS/coregrind/m_aspacemgr/priv_aspacemgr.h (original)
+++ branches/ASPACEM_TWEAKS/coregrind/m_aspacemgr/priv_aspacemgr.h Thu Apr 30 18:35:23 2015
@@ -132,27 +132,27 @@
/* ------ Implemented in aspacemgr-segnames.c ------ */
-void VG_(am_segnames_init)(void);
-void VG_(am_show_segnames)(Int logLevel, const HChar *prefix);
+void ML_(am_segnames_init)(void);
+void ML_(am_show_segnames)(Int logLevel, const HChar *prefix);
/* Put NAME into the string table of segment names. Return index for
future reference. A return value of -1 indicates that the segment name
could not be stored. Basically an out-of-memory situation. */
-Int VG_(am_allocate_segname)(const HChar *name);
+Int ML_(am_allocate_segname)(const HChar *name);
/* Increment / decrement the reference counter for this segment name. */
-void VG_(am_inc_refcount)(Int);
-void VG_(am_dec_refcount)(Int);
+void ML_(am_inc_refcount)(Int);
+void ML_(am_dec_refcount)(Int);
/* Check whether the segname index is sane. */
-Bool VG_(am_sane_segname)(Int fnIdx);
+Bool ML_(am_sane_segname)(Int fnIdx);
/* Return the segment name for the given index. Maybe return NULL, if the
segment does not have a name. */
-const HChar *VG_(am_get_segname)(Int fnIdx);
+const HChar *ML_(am_get_segname)(Int fnIdx);
/* Return the sequence number of the segment name */
-Int VG_(am_segname_get_seqnr)(Int fnIdx);
+Int ML_(am_segname_get_seqnr)(Int fnIdx);
#endif // __PRIV_ASPACEMGR_H
Modified: branches/ASPACEM_TWEAKS/coregrind/m_debuginfo/readdwarf.c
==============================================================================
--- branches/ASPACEM_TWEAKS/coregrind/m_debuginfo/readdwarf.c (original)
+++ branches/ASPACEM_TWEAKS/coregrind/m_debuginfo/readdwarf.c Thu Apr 30 18:35:23 2015
@@ -3311,7 +3311,7 @@
VG_(printf)(" DW_CFA_def_cfa_expression (");
/* Convert the expression into a dag rooted at ctx->exprs index j,
or fail. */
- j = dwarfexpr_to_dag ( ctx, expr, len, True/*push CFA at start*/,
+ j = dwarfexpr_to_dag ( ctx, expr, len, False/*!push CFA at start*/,
di->ddump_frames);
if (di->ddump_frames)
VG_(printf)(")\n");
Modified: branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syscall-arm64-linux.S
==============================================================================
--- branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syscall-arm64-linux.S (original)
+++ branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syscall-arm64-linux.S Thu Apr 30 18:35:23 2015
@@ -157,6 +157,7 @@
VG_(fixup_guest_state_after_syscall_interrupted) can do the
right thing */
+.align 3
.globl ML_(blksys_setup)
.globl ML_(blksys_restart)
.globl ML_(blksys_complete)
Modified: branches/ASPACEM_TWEAKS/docs/Makefile.am
==============================================================================
--- branches/ASPACEM_TWEAKS/docs/Makefile.am (original)
+++ branches/ASPACEM_TWEAKS/docs/Makefile.am Thu Apr 30 18:35:23 2015
@@ -30,6 +30,7 @@
internals/3_9_BUGSTATUS.txt \
internals/3_10_BUGSTATUS.txt \
internals/MERGE_3_10_1.txt \
+ internals/aarch64-linux-on-qemu-HOWTO.txt
internals/arm_thumb_notes_gdbserver.txt \
internals/avx-notes.txt \
internals/BIG_APP_NOTES.txt \
|
