FCL/sf/os/kernelhwsrv: comparison kernel/eka/memmodel/epoc/flexible/mmu/mmu.h

equal deleted inserted replaced

-:41f0cfe18c80
+:c734af59ce98
 */
 #ifndef __MMU_H__
 #define __MMU_H__
-#define _USE_OLDEST_LISTS
 #include "mm.h"
 #include "mmboot.h"
 #include <mmtypes.h>
 #include <kern_priv.h>
 	State for the page when being used to contain demand paged content.
 	*/
 	enum TPagedState
 		{
 		/**
-		Page is not being managed for demand paging purposes, is has been transiently
+		Page is not being managed for demand paging purposes, or has been transiently
 		removed from the demand paging live list.
 		*/
 		EUnpaged 			= 0x0,
 		/**
 		Page has been removed from live list to prevent contents being paged-out.
 		*/
 		// NOTE - This must be the same value as EStatePagedLocked as defined in mmubase.h
 		EPagedPinned 		= 0x4,
-#ifdef _USE_OLDEST_LISTS
 		/**
 		Page is in the live list as one of oldest pages that is clean.
 		*/
 		EPagedOldestClean	= 0x5,
 		/**
 		Page is in the live list as one of oldest pages that is dirty.
 		*/
 		EPagedOldestDirty 	= 0x6
-#endif
 		};
 	/**
 	Additional flags, stored in #iFlags2.
 		return iFlags&EWritable;
 		}
 	/**
 	Flag this page as 'dirty', indicating that its contents may no longer match those saved
-	to a backing store. This sets the flag #EWritable.
+	to a backing store. This sets the flag #EDirty.
 	This is used in the management of demand paged memory.
 	@pre #MmuLock held.
 	*/
 	FORCE_INLINE void SetDirty()
 		{
 		CheckAccess("SetDirty");
+		__NK_ASSERT_DEBUG(IsWritable());
 		iFlags |= EDirty;
 		}
 	/**
 	Flag this page as 'clean', indicating that its contents now match those saved
-	to a backing store. This clears the flag #EWritable.
+	to a backing store. This clears the flag #EDirty.
 	This is used in the management of demand paged memory.
 	@pre #MmuLock held.
 	*/
 	FORCE_INLINE void SetClean()
 		{
 		CheckAccess("SetClean");
+		__NK_ASSERT_DEBUG(!IsWritable());
 		iFlags &= ~EDirty;
 		}
 	/**
 	Return the  #EDirty flag. See #SetDirty and #SetClean.
 		if(UnlockGuardNest)
 			UnlockGuardFail = ETrue;
 #endif
 		}
-private:
+public:
 	/** The lock */
 	static NFastMutex iLock;
 #ifdef _DEBUG
+private:
 	static TUint UnlockGuardNest;
 	static TUint UnlockGuardFail;
 #endif
 	};
 	TUint FreeRamInPages();
 	TUint TotalPhysicalRamPages();
 	TInt AllocRam(	TPhysAddr* aPages, TUint aCount, TRamAllocFlags aFlags, TZonePageType aZonePageType,
 					TUint aBlockZoneId=KRamZoneInvalidId, TBool aBlockRest=EFalse);
+	void MarkPageAllocated(TPhysAddr aPhysAddr, TZonePageType aZonePageType);
 	void FreeRam(TPhysAddr* aPages, TUint aCount, TZonePageType aZonePageType);
 	TInt AllocContiguousRam(TPhysAddr& aPhysAddr, TUint aCount, TUint aAlign, TRamAllocFlags aFlags);
 	void FreeContiguousRam(TPhysAddr aPhysAddr, TUint aCount);
 	const SRamZone* RamZoneConfig(TRamZoneCallback& aCallback) const;

branch	RCL_3
changeset 110	c734af59ce98
parent 87	2f92ad2dc5db
child 117	5b5d147c7838