|
From: <sv...@va...> - 2005-07-17 17:12:27
|
Author: njn
Date: 2005-07-17 18:12:24 +0100 (Sun, 17 Jul 2005)
New Revision: 4150
Log:
Rename 'other' as 'other_b' to make the fact it's a block more clear.
Modified:
trunk/coregrind/m_mallocfree.c
Modified: trunk/coregrind/m_mallocfree.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
--- trunk/coregrind/m_mallocfree.c 2005-07-17 16:16:41 UTC (rev 4149)
+++ trunk/coregrind/m_mallocfree.c 2005-07-17 17:12:24 UTC (rev 4150)
@@ -963,7 +963,7 @@
Superblock* sb;
UByte* sb_start;
UByte* sb_end;
- Block* other;
+ Block* other_b;
Block* b;
SizeT b_bszB, b_pszB, other_bszB;
UInt b_listno;
@@ -1000,18 +1000,18 @@
// See if this block can be merged with its successor.
// First test if we're far enough before the superblock's end to poss=
ibly
// have a successor.
- other =3D b + b_bszB;
- if (other+min_useful_bszB(a)-1 <=3D (Block*)sb_end) {
+ other_b =3D b + b_bszB;
+ if (other_b+min_useful_bszB(a)-1 <=3D (Block*)sb_end) {
// Ok, we have a successor, merge if it's not in use.
- other_bszB =3D get_bszB_lo(other);
+ other_bszB =3D get_bszB_lo(other_b);
if (!is_inuse_bszB(other_bszB)) {
// VG_(printf)( "merge-successor\n");
other_bszB =3D mk_plain_bszB(other_bszB);
# ifdef DEBUG_MALLOC
- vg_assert(blockSane(a, other));
+ vg_assert(blockSane(a, other_b));
# endif
unlinkBlock( a, b, b_listno );
- unlinkBlock( a, other, pszB_to_listNo(bszB_to_pszB(a,other_bszB=
)) );
+ unlinkBlock( a, other_b, pszB_to_listNo(bszB_to_pszB(a,other_bs=
zB)) );
b_bszB +=3D other_bszB;
b_listno =3D pszB_to_listNo(bszB_to_pszB(a, b_bszB));
mkFreeBlock( a, b, b_bszB, b_listno );
@@ -1019,7 +1019,7 @@
} else {
// Not enough space for successor: check that b is the last block
// ie. there are no unused bytes at the end of the Superblock.
- vg_assert(other-1 =3D=3D (Block*)sb_end);
+ vg_assert(other_b-1 =3D=3D (Block*)sb_end);
}
=20
// Then see if this block can be merged with its predecessor.
@@ -1027,14 +1027,14 @@
// have a predecessor.
if (b >=3D (Block*)sb_start + min_useful_bszB(a)) {
// Ok, we have a predecessor, merge if it's not in use.
- other =3D get_predecessor_block( b );
- other_bszB =3D get_bszB_lo(other);
+ other_b =3D get_predecessor_block( b );
+ other_bszB =3D get_bszB_lo(other_b);
if (!is_inuse_bszB(other_bszB)) {
// VG_(printf)( "merge-predecessor\n");
other_bszB =3D mk_plain_bszB(other_bszB);
unlinkBlock( a, b, b_listno );
- unlinkBlock( a, other, pszB_to_listNo(bszB_to_pszB(a, other_bsz=
B)) );
- b =3D other;
+ unlinkBlock( a, other_b, pszB_to_listNo(bszB_to_pszB(a, other_b=
szB)) );
+ b =3D other_b;
b_bszB +=3D other_bszB;
b_listno =3D pszB_to_listNo(bszB_to_pszB(a, b_bszB));
mkFreeBlock( a, b, b_bszB, b_listno );
|