|
From: <sv...@va...> - 2006-10-13 11:02:04
|
Author: sewardj
Date: 2006-10-13 12:01:59 +0100 (Fri, 13 Oct 2006)
New Revision: 6218
Log:
Fix stupid bug in the new OSet-based auxmap code which was shown up by
sh-mem-random on ppc64-linux.
Modified:
branches/AIX5/memcheck/mc_main.c
Modified: branches/AIX5/memcheck/mc_main.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/memcheck/mc_main.c 2006-10-13 11:00:05 UTC (rev 6217)
+++ branches/AIX5/memcheck/mc_main.c 2006-10-13 11:01:59 UTC (rev 6218)
@@ -482,6 +482,7 @@
static void insert_into_auxmap_L1_at ( Word rank, AuxMapEnt* ent )
{
Word i;
+ tl_assert(ent);
tl_assert(rank >=3D 0 && rank < N_AUXMAP_L1);
for (i =3D N_AUXMAP_L1-1; i > rank; i--)
auxmap_L1[i] =3D auxmap_L1[i-1];
@@ -567,7 +568,7 @@
nyu->base =3D a;
nyu->sm =3D &sm_distinguished[SM_DIST_NOACCESS];
VG_(OSet_Insert)( auxmap_L2, nyu );
- insert_into_auxmap_L1_at( AUXMAP_L1_INSERT_IX, res );
+ insert_into_auxmap_L1_at( AUXMAP_L1_INSERT_IX, nyu );
n_auxmap_L2_nodes++;
return nyu;
}
|