diff --git a/mps/src/mpm.c b/mps/src/mpm.c index a8921302c8e..471168feaf5 100644 --- a/mps/src/mpm.c +++ b/mps/src/mpm.c @@ -1,6 +1,6 @@ /* impl.c.mpm: GENERAL MPM SUPPORT * - * $HopeName: MMsrc!mpm.c(trunk.26) $ + * $HopeName: MMsrc!mpm.c(trunk.27) $ * Copyright (C) 1996. Harlequin Group plc. All rights reserved. * * .readership: MM developers. @@ -17,7 +17,7 @@ #include -SRCID(mpm, "$HopeName: MMsrc!mpm.c(trunk.26) $"); +SRCID(mpm, "$HopeName: MMsrc!mpm.c(trunk.27) $"); /* MPMCheck -- test MPM assumptions */ @@ -169,26 +169,6 @@ Word (WordAlignDown)(Word word, Align alignment) } -/* Accumulator methods */ - -void AccumulatorReset(Accumulation *a) -{ - AVER(a != NULL); - /* *a may be arbitrary, especially if unitialized */ - - *a = 0; -} - -void Accumulate(Accumulation *augend, unsigned long addend) -{ - AVER(augend != NULL); - AVER(*augend >= 0); - /* addend may be arbitrary */ - - *augend += addend; -} - - /* SizeIsP2 -- test whether a size is a power of two */ Bool SizeIsP2(Size size) diff --git a/mps/src/mpm.h b/mps/src/mpm.h index 5396e923d77..d9812d7c1b3 100644 --- a/mps/src/mpm.h +++ b/mps/src/mpm.h @@ -1,6 +1,6 @@ /* impl.h.mpm: MEMORY POOL MANAGER DEFINITIONS * - * $HopeName: MMsrc!mpm.h(trunk.104) $ + * $HopeName: MMsrc!mpm.h(trunk.105) $ * Copyright (C) 1998. Harlequin Group plc. All rights reserved. */ @@ -119,12 +119,6 @@ extern int (AddrComp)(Addr a, Addr b, Size size); extern Bool ResIsAllocFailure(Res res); -/* Accumulator methods */ - -extern void AccumulatorReset(Accumulation *a); -extern void Accumulate(Accumulation *augend, unsigned long addend); - - /* Logs and Powers * * SizeIsP2 returns TRUE if and only if size is a non-negative integer diff --git a/mps/src/mpmtypes.h b/mps/src/mpmtypes.h index e658d065752..dabb7294098 100644 --- a/mps/src/mpmtypes.h +++ b/mps/src/mpmtypes.h @@ -1,6 +1,6 @@ /* impl.h.mpmtypes: MEMORY POOL MANAGER TYPES * - * $HopeName: MMsrc!mpmtypes.h(trunk.58) $ + * $HopeName: MMsrc!mpmtypes.h(trunk.59) $ * Copyright (C) 1997, 1998 Harlequin Group plc. All rights reserved. * * .readership: MM developers. @@ -35,7 +35,6 @@ typedef Word Size; /* design.mps.type.size */ typedef Word Count; /* design.mps.type.count */ typedef Word Index; /* design.mps.type.index */ typedef Word Align; /* design.mps.type.align */ -typedef double Accumulation; /* design.mps.type.accumulation */ typedef unsigned Shift; /* design.mps.type.shift */ typedef Addr Ref; /* design.mps.type.ref */ typedef void *Pointer; /* design.mps.type.pointer */