|
From: <sv...@va...> - 2008-05-03 05:25:05
|
Author: sewardj
Date: 2008-05-03 06:24:57 +0100 (Sat, 03 May 2008)
New Revision: 7995
Log:
Remove a bit of unused code.
Modified:
trunk/memcheck/mc_main.c
Modified: trunk/memcheck/mc_main.c
===================================================================
--- trunk/memcheck/mc_main.c 2008-05-02 22:27:07 UTC (rev 7994)
+++ trunk/memcheck/mc_main.c 2008-05-03 05:24:57 UTC (rev 7995)
@@ -3828,11 +3828,10 @@
sm_off = SM_OFF(a);
vabits8 = sm->vabits8[sm_off];
-//---------------------------------------------------------------------------
-#if 1
// Cleverness: sometimes we don't have to write the shadow memory at
// all, if we can tell that what we want to write is the same as what is
- // already there.
+ // already there. The 64/16/8 bit cases also have cleverness at this
+ // point, but it works a little differently to the code below.
if (V_BITS32_DEFINED == vbits32) {
if (vabits8 == (UInt)VA_BITS8_DEFINED) {
return;
@@ -3858,32 +3857,7 @@
PROF_EVENT(234, "mc_STOREV32-slow4");
mc_STOREVn_slow( a, 32, (ULong)vbits32, isBigEndian );
}
-//---------------------------------------------------------------------------
-#else
- if (LIKELY( !is_distinguished_sm(sm) &&
- (VA_BITS8_DEFINED == vabits8 ||
- VA_BITS8_UNDEFINED == vabits8) ))
- {
- /* Handle common case quickly: a is suitably aligned, */
- /* is mapped, and is addressible. */
- // Convert full V-bits in register to compact 2-bit form.
- if (V_BITS32_DEFINED == vbits32) {
- sm->vabits8[sm_off] = VA_BITS8_DEFINED;
- } else if (V_BITS32_UNDEFINED == vbits32) {
- sm->vabits8[sm_off] = VA_BITS8_UNDEFINED;
- } else {
- /* Slow but general case -- writing partially defined bytes. */
- PROF_EVENT(232, "mc_STOREV32-slow2");
- mc_STOREVn_slow( a, 32, (ULong)vbits32, isBigEndian );
- }
- } else {
- /* Slow but general case. */
- PROF_EVENT(233, "mc_STOREV32-slow3");
- mc_STOREVn_slow( a, 32, (ULong)vbits32, isBigEndian );
- }
#endif
-//---------------------------------------------------------------------------
-#endif
}
VG_REGPARM(2) void MC_(helperc_STOREV32be) ( Addr a, UWord vbits32 )
|