--- a/kernel/eka/debug/crashMonitor/group/release.txt	Wed Oct 20 13:58:28 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-# Version information for crash monitor data
-#
-
-Version 1.00.002
-=================
-(Made by XXXX XXXX XX/06/2009)
-
-1.	OliverStuart
-	1.	MINOR CHANGE: CR1970: Adding missing S60 distribution files and correcting IDs.
-	2.	MINOR CHANGE: CR1994: Updating incorrect copyright headers.
-
-Version 1.00.001
-=================
-(Made by Vino Jose 09/06/2009)
-
-1.	OliverStuart
-	1.	MINOR CHANGE: CR1970: Setting correct IDs on S60 distribution policy files.
-	2.	MINOR CHANGE: CR1994: Replacing Symbian copyright notices with SF notices.
-
-Version 1.00.000
-=================
-
-(Made by stephenroberts 17/11/2008)
-
-1. stephenroberts
-	MILESTONE: Capari,GT0441,MS3.x,DSx: PREQ1700: Extend core dump server to capture system crash data
-	Initial release of PREQ1700. The System Crash Monitor and Crash Log Walker supports the following data types:
-		TCrashOffsetsHeader version 1
-		TCrashInfoHeader version 1
-		TRawData version 1
-		TThreadData version 1
-		TThreadStack version 1
-		TRegisterValue version 1
-		TRegisterSet version 1
-		TMemoryDump version 1
-		TCodeSegmentSet version 1
-		TCodeSegment version 1
-		TCodeSegment version 1
-		TVariantSpecificData version 1
-		TRomHeaderData version 1
-		TSCMLockData version 1
-		TScmChecksum version 1
\ No newline at end of file

--- a/kernel/eka/debug/crashMonitor/group/scmkern_lib.mmp	Wed Oct 20 13:58:28 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// e32/kernel/scmlib.mmh
-// 
-//
-
-ALWAYS_BUILD_AS_ARM
-
-TARGET		  scmkern_lib.lib
-TARGETTYPE	  klib
-
-#include "scmlib.mmh"
\ No newline at end of file

--- a/kernel/eka/debug/crashMonitor/group/scmlib.mmh	Wed Oct 20 13:58:28 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// e32\kernel\scmlib.mmh
-// 
-//
-
-USERINCLUDE	 ../inc
-USERINCLUDE  ../../../include/nkern
-USERINCLUDE  ../../../include/kernel
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYMBIAN_BASE_SYSTEMINCLUDE(drivers)
-#endif
-
-SOURCEPATH	  ../src
-SOURCE			scmdatatypes.cpp
-SOURCE			scmbytestreamutil.cpp
-SOURCE			crashlogwalker.cpp
-SOURCE			scmconfigitem.cpp
-SOURCE 			scmconfig.cpp
-SOURCE			scmchksum.cpp 
-SOURCE 			scmthreaddata.cpp 
-SOURCE 			scmprocessdata.cpp
-SOURCE			scmlockdata.cpp
-SOURCE			scmvariantdata.cpp
-SOURCE			scmromdata.cpp
-SOURCE			scmmulticrashinfo.cpp

--- a/kernel/eka/debug/crashMonitor/group/scmonitor.mmp	Wed Oct 20 13:58:28 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// e32/kernel/scmonitor.mmp
-// 
-//
-
-#ifdef EPOC32
-
-#define INCLUDE_EKERN_LIB 
-#include "../../../kernel/kern_int.mmh" 
-
-
-targettype			kext
-
-#ifndef SMP
- 
-//userinclude		../../../include/drivers
-//userinclude 		../../../kernel
-//userinclude 		../inc
-
-
-sourcepath 			../src/arm
-source 				cscmdatasave.cpp
-
-sourcepath			../src
-source				scmdatasave.cpp
-source 				scmonitor.cpp	
-
-library 			exmoncommon.lib
-staticlibrary 		scmkern_lib.lib
-
-
-epocallowdlldata
-
-noexportlibrary
-
-linkas				scmonitor.dll
-
-#endif 	//SMP endif
-
-#endif  //EPOC32 endif
-
-
-//#define SCM_COMM_OUTPUT	 // use this define for writing debug data to comm port
-

--- a/kernel/eka/debug/crashMonitor/group/scmusr_lib.mmp	Wed Oct 20 13:58:28 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// e32/kernel/scmlib.mmp
-// 
-//
-
-ALWAYS_BUILD_AS_ARM
-
-TARGET		  scmusr_lib.lib
-TARGETTYPE	  lib
-
-#include "scmlib.mmh"
\ No newline at end of file

--- a/kernel/eka/debug/crashMonitor/inc/crashlogwalker.h	Wed Oct 20 13:58:28 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// some utility classes for writing data to buffer
-// 
-//
-
-/**
- @file
- @internalTechnology
-*/
-#ifndef __CRASH_LOG_WALKER_H_INCLUDED__
-#define __CRASH_LOG_WALKER_H_INCLUDED__
-
-#include <e32cmn.h> 
-
-#include <scmdatatypes.h>
-
-namespace Debug
-	{
-	
-	/**
-	 * This class provides functionality to walk through a crash log in a data buffer
-	 * ensuring it is valid and getting the information we require back
-	 */
-	class TCrashLogWalker
-		{
-	public:
-		TCrashLogWalker(TDesC8& aBuffer);
-		
-		TInt ReadLogHeader(const TInt aStartPoint);		
-		TInt GetCrashSize() const;
-		TInt GetCrashId() const;
-		const TRmdArmExcInfo& GetCrashContext() const;		
-		const TCrashInfoHeader& GetCrashHeader() const;
-		const TCrashOffsetsHeader& GetOffsetsHeader() const;
-		
-#ifndef __KERNEL_MODE__		
-		MByteStreamSerializable*  GetNextDataTypeL(TInt& aPos, SCMStructId& aId, TInt& aBufferSize);
-		TRawData* GetRawDataTypeL(TInt& aPos, TInt& aBufferSize, TDes8& aRawBuf, TInt aStartRawPosition = 0);
-#endif
-		
-		void UpdateBuffer(TDesC8& aBuffer);
-		
-	private:
-		
-		void HelpAssignRegisterToContext(const TRegisterValue& aRegVal);
-		
-	private:
-		TDesC8& iBuffer;					//buffer containing data for the log we are walking - not all of it, just the bit of interest
-		TCrashInfoHeader iCrashHeader;		//Stores the header of the log we are walking
-		TCrashOffsetsHeader iOffsets;		//Stores the offsets header of the log we are walking
-		TRmdArmExcInfo iContext;			//Stores the register context of the log we are walking
-		
-		TByteStreamReader iReader;
-		
-	private:
-		TInt VerifyHeader();
-		
-		};
-	
-	}
-
-#endif // __CRASH_LOG_WALKER_H_INCLUDED__

--- a/kernel/eka/debug/crashMonitor/inc/scmbytestreamutil.h	Wed Oct 20 13:58:28 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// some utility classes for writing data to buffer
-// 
-// WARNING: This file contains some APIs which are internal and are subject
-//          to change without notice. Such APIs should therefore not be used
-//          outside the Kernel and Hardware Services package.
-//
-
-/**
- @file
- @internalTechnology
-*/
-#ifndef __SCMBYTESTREAMUTIL_H_
-#define __SCMBYTESTREAMUTIL_H_
-
-#include <e32cmn.h> 
-#include <e32def.h>
-#include <e32const.h>
-
-
-namespace Debug 
-	{ 
-	/**
-	 * Base class for byte stream write - simply deals with the supplied buffer & position 
-	 */
-	class TByteStreamBase
-		{
-	public:
-		TByteStreamBase(TUint8* aBuffer);
-		virtual void SetPosition(TInt aPosition);
-		virtual TInt CurrentPosition() const;
-	
-	protected:	
-		
-		/**
-		 * Pointer to the buffer we will use to write/read to 
-		 */
-		TUint8* iBuffer;
-		
-		/**
-		 * Current position in buffer
-		 */
-		TInt iPos;	
-		};
-	
-	/**
-	 * Class for reading byte stream
-	 */
-	class TByteStreamReader : public TByteStreamBase		
-		{
-	public:
-		TByteStreamReader(TUint8* aBuffer);
-		inline virtual TUint8 ReadByte();
-		inline TUint16 ReadShort();
-		inline TUint32 ReadInt();
-		inline TUint64 ReadInt64();		
-		};	
-
-	/**
-	 * Class for writing byte stream
-	 */
-	class TByteStreamWriter : public TByteStreamBase		
-		{		
-	public:
-		TByteStreamWriter(TUint8* aBuffer, TBool aPhsEnabled = ETrue);	
-		virtual void WriteByte(TUint8 aValue);
-		inline void WriteShort(TUint16 aValue);
-		inline void WriteInt(TUint32 aValue);
-		inline void WriteInt64(TUint64 aValue);
-		inline virtual void EnablePhysicalWriting();
-		inline virtual void DisablePhysicalWriting();
-		inline virtual TBool PhysicalWritingEnabled() const {return iPhysEnabled;};
-		inline TInt GetBytesWritten() const {return iBytesWritten;};	
-		void ResetBytesWritten();
-		
-	protected:
-		
-		/** 
-		 * This records whether or not physical writing via DoPhysical write from set writer
-		 */
-		TBool iPhysEnabled;
-		
-		/**
-		 * Records the number of bytes we have written to our buffer
-		 */
-		TInt iBytesWritten;
-		};	
-		
-	/**
-	 * This is the interface to write to flash
-	 */
-	class MPhysicalWriterImpl 
-		{
-		public:			
-			virtual void DoPhysicalWrite(TAny* aData,TInt aPos, TInt aLen) = 0;
-		};
-	
-	
-	/**
-	 *Class for writing byte stream via cache 
-	 */
-	class TCachedByteStreamWriter : public TByteStreamWriter		
-		{		
-	public:
-			
-		TCachedByteStreamWriter(TUint8* aCacheBuffer, TInt aCacheSize,  TBool aPhysEnabled = ETrue);
-		virtual TInt CurrentPosition() const;
-		virtual void WriteByte(TUint8 aValue);
-		virtual TInt FlushCache();
-		void SetWriterImpl(MPhysicalWriterImpl* aPhysicalWriter);
-		TInt GetCacheSize() const  {return iCacheSize; };
-		
-	protected:		
-		TInt iCacheSize;
-		TUint8* iCacheBuffer;  			
-		MPhysicalWriterImpl* iPhysicalWriter;
-		};
-	
-	/**
-	 * Serialization implementation interface
-	 */
-	class MByteStreamSerializable
-		{
-	public:
-		virtual TInt Serialize(TByteStreamWriter& aWriter) = 0;
-		virtual TInt Deserialize(TByteStreamReader& aReader) = 0;
- 		virtual TInt GetSize() const = 0;
-		};
-	}
-
-
-#include <scmbytestreamutil.inl>
-
-
-
-#endif /*BYTESTREAMUTIL_H_*/

--- a/kernel/eka/debug/crashMonitor/inc/scmbytestreamutil.inl	Wed Oct 20 13:58:28 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-// WARNING: This file contains some APIs which are internal and are subject
-//          to change without noticed. Such APIs should therefore not be used
-//          outside the Kernel and Hardware Services package.
-//
-
-#include <e32des8.h>
-
-namespace Debug 
-	{
-	/**
-	 * TByteStreamReader implementation
-	 */
-	
-	/**
-	 * Returns the next byte from the stream
-	 * @return TUint8 byte requested
-	 */
-	inline TUint8 TByteStreamReader::ReadByte()
-		{
-		return iBuffer[iPos++];		
-		}
-	
-	/**
-	 * Returns the next short from the stream
-	 * @return TUint16 short requested
-	 */	
-	inline TUint16 TByteStreamReader::ReadShort()
-		{
-		TUint8 b1 = ReadByte();
-		TUint8 b2 = ReadByte();	
-		return (TUint16)(b1 + (b2 << 8));	
-		}
-		
-	/**
-	 * Returns the next TUInt32 from the stream
-	 * @return TUInt32 TUInt32 requested
-	 */		
-	inline TUint32 TByteStreamReader::ReadInt()
-		{
-		TUint16 s1 = ReadShort();
-		TUint16 s2 = ReadShort();	
-		return s1 + (s2 << 16);		
-		}
-
-	/**
-	 * Returns the next TUInt64 from the stream
-	 * @return TUInt64 TUInt64 requested
-	 */		
-	inline TUint64 TByteStreamReader::ReadInt64()
-		{
-		TUint32 high = ReadInt();
-		TUint32 low = ReadInt();
-		return  MAKE_TUINT64(high, low) ;
-		}
-	
-	/**
-	 * TByteStreamWriter implementation
-	 */	
-
-	/**
-	 * Writes a short to the stream
-	 * @param aValue Value to write to stream
-	 */	
-	inline void TByteStreamWriter::WriteShort(TUint16 aValue)
-		{
-		WriteByte((TUint8) aValue);
-		WriteByte((TUint8) (aValue >> 8));		
-		}
-	
-	/**
-	 * Writes an int to the stream
-	 * @param aValue Value to write to stream
-	 */	
-	inline void TByteStreamWriter::WriteInt(TUint32 aValue)
-		{
-		WriteByte((TUint8)aValue);
-		WriteByte((TUint8) (aValue >> 8));		
-		WriteByte((TUint8) (aValue >> 16));		
-		WriteByte((TUint8) (aValue >> 24));				
-		}
-	
-	/**
-	 * Writes a 64 bit int to the stream
-	 * @param aValue Value to write to stream
-	 */		
-	inline void TByteStreamWriter::WriteInt64(TUint64 aValue)
-		{
-		WriteInt(I64HIGH(aValue));
-		WriteInt(I64LOW(aValue));			
-		}
-	
-	/**
-	 * Enables physical writing such that the physical writers DoPhysicalWrite
-	 * method will be invoked upon a write. This may write to a given media
-	 * as defined by the implementation of this method 
-	 */		
-	inline void TByteStreamWriter::EnablePhysicalWriting()
-		{
-		iPhysEnabled = ETrue;
-		}
-
-	/**
-	 * Disables physical writing such that the physical writers DoPhysicalWrite
-	 * method will not be invoked upon a write. 
-	 */	
-	inline void TByteStreamWriter::DisablePhysicalWriting()
-		{
-		iPhysEnabled = EFalse;
-		}
-	}
-
-
-//eof

--- a/kernel/eka/debug/crashMonitor/inc/scmconfig.h	Wed Oct 20 13:58:28 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-// WARNING: This file contains some APIs which are internal and are subject
-//          to change without notice. Such APIs should therefore not be used
-//          outside the Kernel and Hardware Services package.
-//
-
-/**
- @file
- @internalTechnology
-*/
-#ifndef __SCMCONFIG_H_INCLUDED__
-#define __SCMCONFIG_H_INCLUDED__
-
-
-#include <e32def.h>
-
-#include <scmbytestreamutil.h>
-#include <scmconfigitem.h>
-
-namespace Debug{
-	
-	//Note -- Changing the size of this requires a change in KScmConfigMaxSize
-    _LIT8(KScmConfigHeaderString, "SCMCONFIG");
-
-    /**
-     * This class handles the configuration section of the crash partition.
-     * It is responsible for reading and writing it
-     */
-	class SCMConfiguration : public MByteStreamSerializable
-		{
-		
-		public:
-			
-			//The 9 here refers to the size of KScmConfigHeaderString which is serialised
-			static const TInt KScmConfigMaxSize = TConfigItem::ELast * sizeof(TConfigItem) + 9;
-			
-			SCMConfiguration();		
-			virtual ~SCMConfiguration();
-			
-			// from MByteStreamSerializable
-			virtual TInt Serialize(TByteStreamWriter& aWriter);
-			virtual TInt Deserialize(TByteStreamReader& aReader);
-		 	virtual TInt GetSize() const;
-			
-		 	TConfigItem* GetNextItem();
-			TInt SetDefaultConfig();
-						
-			TInt CreateConfigItem(const TConfigItem::TSCMDataType aDataType, const TUint8 aPriority, const TInt32 aSizeToDump);
-			TInt ModifyConfigItemPriority(const TConfigItem::TSCMDataType aDataType, const TUint8 aPriority);
-			
-			void ResetToHighestPriority();
-			
-		 	TBool operator == (const SCMConfiguration& aOther) const;
-			
-		 	TConfigItem* ConfigList() const;
-			TInt InsertToList(TConfigItem* aItem);
-			void ClearList(); 		
-		 	
-		private:	
-			
-			/**
-			 * This is an ordered linked list of TConfigItems. The first is the highest priority and so on until the lowest priority 
-			 */			
-			TConfigItem* iConfigList;
-			
-			/**
-			 * Everytime GetNextItemToDump is called this moves down along the list 
-			 */
-			TConfigItem* iNextItem;   
-			
-		private:	
-			TInt RemoveFromList(TConfigItem* aItem);
-			
-							
-		};
-	}
-
-#endif /*__SCMCONFIG_H_INCLUDED__*/

--- a/kernel/eka/debug/crashMonitor/inc/scmconfigitem.h	Wed Oct 20 13:58:28 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// some utility classes for writing data to flash buffer
-// 
-// WARNING: This file contains some APIs which are internal and are subject
-//          to change without notice. Such APIs should therefore not be used
-//          outside the Kernel and Hardware Services package.
-//
-
-/**
- @file
- @internalTechnology
-*/
-
-#ifndef __SCMCONFIGITEM_H_INCLUDED__
-#define __SCMCONFIGITEM_H_INCLUDED__
-
-
-#include <e32def.h>
-#ifndef __KERNEL_MODE__
-#include <e32std.h>
-#endif // ! __KERNEL_MODE__
-
-#include <scmbytestreamutil.h>
-
-
-namespace Debug
-	{ 	
-	/**
-	 * This object represents a data type to dump
-	 */
-	class TConfigItem : public MByteStreamSerializable
-		{
-		public:
-			enum TSCMDataType
-				{				
-				EExceptionStacks,			/**< Dumps exception stacks */
-				EVariantSpecificData,		/**< Dumps Variant Specific data */
-				ERomInfo,					/**< Dumps ROM Build Info */
-				ELocks,						/**< Dumps Kernel Lock Info */
-				EKernelHeap,				/**< Dumps the Kernel Heap */
-				ETraceData,					/**< Dumps any trace data we find */
-				EProcessCodeSegs,			/**< Dumps System wide Code Segments for each Process */
-				EThreadsUsrStack,			/**< Dumps System wide User Stacks for each thread */
-				EThreadsSvrStack,			/**< Dumps System wide Supervisor Stacks for each thread */
-				EThreadsUsrRegisters,		/**< Dumps User Registers available for every thread in the System */
-				EThreadsSvrRegisters,		/**< Dumps Supervisor Registers available for every thread in the System */ 
-				EProcessMetaData,			/**< Dumps the Process List */
-				EThreadsMetaData,			/**< Dumps the Thread List */
-				ECrashedProcessCodeSegs,    /**< Dumps the Code Segments for the process that has crashed */
-				ECrashedProcessUsrStacks,	/**< Dumps the User stacks for each thread in the process that has crashed */
-				ECrashedProcessSvrStacks,	/**< Dumps the Supervisor stacks for each thread in the process that has crashed */
-				ECrashedProcessMetaData,	/**< Dumps Info about the process that has crashed */
-				ECrashedThreadMetaData,		/**< Dumps Info about the Thread that has crashed */				
-				ELast						/**< End Marker */
-				};
-			
-			TConfigItem();
-			TConfigItem(TSCMDataType aDataType,  TUint8 aPriority, TInt32 aSizeToDump);
-	
-			TSCMDataType GetDataType() const;
-			TInt GetPriority() const;
-			TInt GetSizeToDump() const;
-			
-			// from MByteStreamSerializable
-			virtual TInt Serialize(TByteStreamWriter& aWriter);
-			virtual TInt Deserialize(TByteStreamReader& aReader);
-		 	virtual TInt GetSize() const;
-		 	
-		 	void SetSpaceRequired(TUint aSpaceReq);
-		 	TUint GetSpaceRequired();
-		 	
-		 	void Print() const;
-		 	TBool operator == (const TConfigItem& aOther) const;
-		 	TConfigItem* Next() const;
-
-#ifndef __KERNEL_MODE__		 	
-		 	 static const TDesC& GetSCMConfigOptionText(TConfigItem::TSCMDataType aType);
-#endif // ! __KERNEL_MODE__
-		 	 
-		private:
-			TSCMDataType iDataType;		/** The type this data represents */
-			TUint iSizeToDump;			/** the size of the data to dump */
-			TUint iSpaceRequiredToDump;	/** If known, this will contain the size of the data we need to dump */
-			TUint8  iPriority;			/** Priority of this data (0 is not required) */
-			TConfigItem* iNext;	 		/** Next config item in list */
-			
-			friend class SCMConfiguration;
-			
-		};			
-	}
-
-
-#endif //  __SCMCONFIGITEM_H_INCLUDED__

--- a/kernel/eka/debug/crashMonitor/inc/scmdatasave.h	Wed Oct 20 13:58:28 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,193 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// e32\include\kernel\scmdatasave.h
-// Kernel System crash data save header file
-// 
-// WARNING: This file contains some APIs which are internal and are subject
-//          to change without notice. Such APIs should therefore not be used
-//          outside the Kernel and Hardware Services package.
-//
-
-#ifndef SCMDATASAVE_H
-#define SCMDATASAVE_H
-
-/**
- @file
- @internalComponent
- */
-
-#include <plat_priv.h>
-#include <kernel/monitor.h>
-#include <e32des8.h>	
-#include <arm.h>
-#include <crashflash.h>
-
-#include <scmdatatypes.h>
-#include <scmbytestreamutil.h>
-#include <scmconfig.h>
-
-using namespace Debug;
-
-IMPORT_C TInt64 CrashTime();
-
-
-_LIT8(KKernelHeapChunkName, "ekern.exe::SvHeap");
-_LIT8(KKernelProcessName, "ekern.exe");
-
-
-/**
- * This class handles gathering of the kernel data and writing it to flash
- * 
- */
-class SCMDataSave : MPhysicalWriterImpl
-	{	
-	public:	
-	    enum TRegisterSetType
-	        {
-	        EUserRegisters = 0,
-	        ESupervisorRegisters = 1,
-	        EFullCPURegisters = 2,
-	        ERegSetNone = 3,
-	        ERegLast
-	        }; 
-	    
-	    enum TStackType
-	    	{
-	    	EUsrStack = 0,
-	    	ESvrStack = 1,
-	    	EStackTypeNone = 2,
-	    	EStackLast
-	    	};
-	    
-	    enum TDumpScope
-	    	{
-	    	EThreadSpecific = 0,
-	    	EProcessSpecific = 1,
-	    	ESystemWide = 2,
-	    	EDumpLast
-	    	};
-	    
-	    /**
-	     * This structure defines the type of data we wish to dump for a given kernel object
-	     */
-	    struct TDataToDump
-	    	{
-	    	TBool iMetaData;   		/**< Dump meta data about object */
-	    	TBool iCodeSegs;   		/**< Dump DProcess code segs (ignored for other objects) */
-	    	TStackType iStk;   		/**< Dump this stack type */
-	    	TRegisterSetType iReg;  /**< Dump this register set */
-	    		    	
-	    	TDataToDump()
-	    		{
-	    		//upon construction, nothing is set to be dumped
-	    		iMetaData = EFalse;
-	    		iCodeSegs = EFalse;
-	    		iStk = EStackTypeNone;
-	    		iReg = ERegSetNone;
-	    		}
-	    	
-	    	};
-	    
-		enum TWriteSelect
-			{ 
-			EWriteFlash = 0, /**< write data to flash */
-			EWriteComm =1,   /**< write data to comm port */
-			ELast
-			};
-    
-	public:
-		
-		IMPORT_C SCMDataSave(Monitor* aMonitor, CrashFlash* aFlash);
-		virtual ~SCMDataSave();
-
-		
-		TInt LogCrashHeader(const TDesC8& aCategory, TInt aReason, TInt aCrashId, TUint& aSizeDumped);
-		TInt LogThreadData(DThread* aThread, TUint& aSizeDumped);
-		TInt LogProcessData(DProcess* aProcess, TUint& aSizeDumped);
-		TInt LogCodeSegments(DProcess* aProcess, TUint& aSizeDumped);
-				
-		TInt LogThreadUserStack(DThread* aThread, TBool aFullStack, TUint& aSizeDumped);
-		TInt LogThreadSupervisorStack(DThread* aThread, TBool aFullStack, TUint& aSizeDumped);		
-						
-		TInt LogRegisters(DThread* aThread, const TRegisterSetType& aRegType, TUint& aSizeDumped);	
-		TInt LogCPURegisters(TUint& aSizeDumped);
-		TInt ReadUserRegisters(DThread* aThread, TArmRegSet& aRegs, TUint32& aAvailableRegs);
-		TInt ReadSystemRegisters(DThread* aThread, TArmRegSet& aRegs, TUint32& aAvailableRegs);
-		void ReadCPURegisters(SFullArmRegSet& aRegs);
-		
-		TInt LogMemory(const TUint8* aStartAddress, TInt aLength, const DThread* aThread, TUint& aSizeDumped);	
-		TInt LogExceptionStacks(TUint& aSizeDumped);	
-		TInt LogTraceBuffer(TInt aSizeToDump, TUint& aSizeDumped);
-		TInt LogLocks(TUint& aSizeDumped);		
-		TInt LogRawData(const TDesC8& aData, TUint& aSizeDumped);
-		TInt LogVariantSpecificData(TUint& aSizeDumped);
-		TInt LogRomInfo(TUint& aSizeDumped);
-		
-		TInt LogKernelHeap(TUint& aSizeDumped);		
-		TInt FindKernelHeap(TInt32& aHeapLocation, TInt32& aHeapSize);
-		
-		TInt LogConfig(SCMConfiguration& aConfig);
-		TInt ReadConfig(SCMConfiguration& aScmConfig);
-		
-		
-		void Write(const TAny* aSomething, TInt aSize);
-		static void WriteUart(const TUint8* aData, TInt aSize);			
-		static void WriteUart(const TDesC8& aDes);
-		virtual void DoPhysicalWrite(TAny* aData, TInt aPos, TInt aLen);
-				
-		void WriteCrashFlash(TInt aPos, TInt& aSize, const TDesC8& aBuffer);
-				
-		TInt GetRegisterType(const TRegisterSetType& aSetType, TInt32& aRegNumber, TUint32& aRegisterType);
-		TInt GetByteCount();
-		void SetByteCount(TInt aByte);
-		
-		
-		TWriteSelect GetWriteSelect();
-		void SetWriteSelect(TWriteSelect aWriteSelect);
-	
-		TUint SpaceRemaining();
-		TUint MaxLogSize();
-		
-		void SetCrashStartingPoint(TUint32 aStart);
-		TUint32 GetCrashStartingPoint() {return iStartingPointForCrash;}
-		
-	public:
-		
-		/** Offsets header to assist parsing */		
-		TCrashOffsetsHeader 	iHdr;		  	
-		
-		/** Basic crash info */
-		TCrashInfoHeader		iCrashInf;   	
-		
-		/** Writer for physical writing */
-		TCachedByteStreamWriter* iWriter;		
-		
-	private:				
-		Monitor* iMonitor; //need to use this to map memory and things like that
-		CrashFlash* iFlash;
-		TTraceDump iTrace;
-		
-		TInt iByteCount;
-		
-		//This is a pointer to memory on the heap we can use that is the same size as iFlash.GetFlashBlockSize()
-		HBuf8* iFlashCache;
-				
-		TWriteSelect iWriteSelect;
-		TBool iPerformChecksum;
-		TScmChecksum iChecksum;	
-
-		TUint32 iStartingPointForCrash;	
-	};
-
-#endif /*SCMDATASAVE_H*/

--- a/kernel/eka/debug/crashMonitor/inc/scmdatatypes.h	Wed Oct 20 13:58:28 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,804 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Definitions for the data types the SCM stores to flash
-// 
-// WARNING: This file contains some APIs which are internal and are subject
-//          to change without notice. Such APIs should therefore not be used
-//          outside the Kernel and Hardware Services package.
-//
-
-
-#ifndef __SCMDATATYPES_H_INCLUDED__
-#define __SCMDATATYPES_H_INCLUDED__
-
-
-#include <e32rom.h>
-
-#include <scmbytestreamutil.h>
-#include <scmtrace.h>
-
-/**
- @file
- @internalComponent
- */
-
-namespace Debug 
-{
-	/** SCM Data Types Major Number */
-	static const TInt KSCMDataTypesMajorVersion = 1;
-	
-	/** SCM Data Types Minor Number */
-	static const TInt KSCMDataTypesMinorVersion = 0;
-	
-	/** SCM Data Types Build Number */
-	static const TInt KSCMDataTypesBuildNumber = 0;
-
-	/**
-	  Specifies the type of a code segment.
-	  @see TCodeSegListEntry
-	  */
-	enum TCodeSegType
-	    {
-	    EUnknownCodeSegType = 0, /**< Signifies an unknown code segment type. */
-	    EExeCodeSegType = 1,     /**< Signifies a code segment belonging to an executable. */
-	    EDllCodeSegType = 2      /**< Signifies a code segment belonging to a library. */
-	    };
-	
-	
-	/**
-	  Used for storing the contents of a 32 bit register
-	  */
-	typedef TUint32 TRegisterValue32;
-	
-	/**
-	  Structure containing information about the state of the registers when a
-	  hardware exception occurred
-	  */
-	class TRmdArmExcInfo
-	    {
-	public:
-	    /** Enumeration detailing the types of exception which may occur. */
-	    enum TExceptionType
-	        {
-	        /** Enumerator signifying that a prefetch abort error has occurred. */
-	        EPrefetchAbort = 0,
-	        /** Enumerator signifying that a data abort error has occurred. */
-	        EDataAbort = 1,
-	        /** Enumerator signifying that an undefined instruction error has occurred. */
-	        EUndef =2
-	        };
-
-	    /** Value of CPSR. */
-	    TRegisterValue32 iCpsr;
-	    /** Type of exception which has occurred. */
-	    TExceptionType iExcCode;
-	    /** Value of R13 supervisor mode banked register. */
-	    TRegisterValue32 iR13Svc;
-	    /** Value of user mode register R4. */
-	    TRegisterValue32 iR4;
-	    /** Value of user mode register R5. */
-	    TRegisterValue32 iR5;
-	    /** Value of user mode register R6. */
-	    TRegisterValue32 iR6;
-	    /** Value of user mode register R7. */
-	    TRegisterValue32 iR7;
-	    /** Value of user mode register R8. */
-	    TRegisterValue32 iR8;
-	    /** Value of user mode register R9. */
-	    TRegisterValue32 iR9;
-	    /** Value of user mode register R10. */
-	    TRegisterValue32 iR10;
-	    /** Value of user mode register R11. */
-	    TRegisterValue32 iR11;
-	    /** Value of R14 supervisor mode banked register. */
-	    TRegisterValue32 iR14Svc;
-	    /** Address which caused exception (System Control Coprocessor Fault Address Register) */
-	    TRegisterValue32 iFaultAddress;
-	    /** Value of System Control Coprocessor Fault Status Register. */
-	    TRegisterValue32 iFaultStatus;
-	    /** Value of SPSR supervisor mode banked register. */
-	    TRegisterValue32 iSpsrSvc;
-	    /** Value of user mode register R13. */
-	    TRegisterValue32 iR13;
-	    /** Value of user mode register R14. */
-	    TRegisterValue32 iR14;
-	    /** Value of user mode register R0. */
-	    TRegisterValue32 iR0;
-	    /** Value of user mode register R1. */
-	    TRegisterValue32 iR1;
-	    /** Value of user mode register R2. */
-	    TRegisterValue32 iR2;
-	    /** Value of user mode register R3. */
-	    TRegisterValue32 iR3;
-	    /** Value of user mode register R12. */
-	    TRegisterValue32 iR12;
-	    /** Value of user mode register R15, points to instruction which caused exception. */
-	    TRegisterValue32 iR15;
-	    };
-	/**
-	 * This enum defines the type of struct we are dealing with when we
-	 * are serialising/deserialising
-	 */
-	enum SCMStructId
-		{
-		ESCMFirst,		
-		ESCMOffsetsHeader,
-		ESCMTCrashInfo,
-		ESCMProcessData,
-		ESCMThreadData,
-		ESCMThreadStack,
-		ESCMRegisterValue,
-		ESCMRegisterSet,
-		ESCMMemory,
-		ESCMCodeSegSet,
-		ESCMCodeSeg,
-		ESCMRawData,
-		ESCMTraceData,
-		ESCMLocks,
-		ESCMKernelHeap,
-		ESCMVariantData,
-		ESCMRomHeader,
-		ESCMLast
-		};
-
-	/**
-	 * This class represents the header at the start of a crash log
-	 * describing the size of the crash log and minimal location 
-	 * information
-	 */
-	class TCrashOffsetsHeader : public MByteStreamSerializable
-		{
-		public:
-			
-			static const TInt KSCMCrashOffsetsMaxSize = 20 * sizeof(TUint32) + sizeof(TUint16);
-			
-			enum TCrashHeaderVersion 
-				{ 
-				EChVersion1 = 1 
-				};
-			
-			TCrashOffsetsHeader();
-			
-			//From MByteStreamSerializable
-			virtual TInt Serialize(TByteStreamWriter& aWriter);
-			virtual TInt Deserialize(TByteStreamReader& aReader);
-			virtual TInt GetSize() const;
-			
-			TBool operator == (const TCrashOffsetsHeader& aOther) const;
-				
-			SCMStructId iId;
-			TCrashHeaderVersion iVersion;		
-			
-			//These next members are offsets to the crash data in the log
-			TUint32 iCTFullRegOffset; 
-			TUint32 iCTUsrStkOffset;
-			TUint32 iCTSvrStkOffset;
-			TUint32 iCPMetaOffset;
-			TUint32 iCTMetaOffset;		
-			TUint32 iCPCodeSegOffset;
-			TUint32 iSysUsrStkOffset;
-			TUint32 iSysSvrStkOffset;
-			TUint32 iSysUsrRegOffset;
-			TUint32 iSysSvrRegOffset;
-			TUint32 iTLstOffset;
-			TUint32 iPLstOffset;
-			TUint32 iSysCodeSegOffset;
-			TUint32 iExcStkOffset;
-			TUint32 iTraceOffset;
-			TUint32 iScmLocksOffset;
-			TUint32 iKernelHeapOffset;
-			TUint32 iVarSpecInfOffset;
-			TUint32 iRomInfoOffset;
-			
-			TUint32 iSpare1;
-			TUint32 iSpare2;
-			TUint32 iSpare3;
-			TUint32 iSpare4;
-			TUint32 iSpare5;
-			TUint32 iSpare6;				
-			
-		};
-
-	/**
-	 * This class stores meta data for a given crash
-	 */
-	class TCrashInfoHeader : public MByteStreamSerializable
-		{
-		public:				
-			
-			static const TInt KMaxCatSize = 80;
-			static const TInt KSCMCrashInfoMaxSize = 76 + KMaxCatSize;
-			
-			enum TCrashInfoHeaderVersion { ECiVersion1 = 1 };
-			TCrashInfoHeader();
-			
-			// from MByteStreamSerializable
-			virtual TInt Serialize(TByteStreamWriter& aWriter);
-			virtual TInt Deserialize(TByteStreamReader& aReader);
-			virtual TInt GetSize() const;
-			
-			TBool operator == (const TCrashInfoHeader& aOther) const;	
-		
-			
-			SCMStructId iId;
-			TCrashInfoHeaderVersion iVersion;
-			TInt32 iLogSize;	
-			TInt32 iFlashAlign;
-			TInt32 iCachedWriterSize;
-			TUint64 iPid;
-			TUint64 iTid;
-			TInt32 iExitType;
-			TInt32 iExitReason;	
-			TInt32 iExcCode;
-			TInt64 iCrashTime;	
-			TInt32 iCrashId;
-			TInt32 iFlashBlockSize;
-			TInt32 iFlashPartitionSize;			
-			TVersion iSCMDataTypesVersion;
-			TUint32 iCategorySize;
-			TBuf8<KMaxCatSize> iCategory;	
-			
-			TInt32 iSpare1;
-			TInt32 iSpare2;
-		};
-	
-	/**
-	 * This class is used for a raw memory dump. It will always be preceded by a TMemoryDump.
-	 * 
-	 * Note: This class contains a TPtr8 to store the data
-	 * name. Due to us not being able to allocate memory when the system
-	 * is down, we assume that the memory to which this points is owned 
-	 * by someone else. It is constructed to point to NULL. To make use
-	 * of this, before serialising the data, ensure to set it to point to
-	 * the location required. Equally, when derserialising, ensure to allocate
-	 * a descriptor of required bytes (determined from TMemoryDump) and set it to iData, otherwise
-	 * the name will be ignored upon reading. 
-	 */
-	class TRawData : public MByteStreamSerializable
-		{		
-		public:
-			
-			//Note this doesnt include the data, as this number is not determinable
-			static const TInt KSCMRawDataMaxSize = 2 * sizeof(TUint32) + sizeof(TUint16);    
-			
-			enum TTRawDataVersion { ETRawData1 = 1 };
-			TRawData();
-			
-			// from MByteStreamSerializable
-			virtual TInt Serialize(TByteStreamWriter& aWriter);
-			virtual TInt Deserialize(TByteStreamReader& aReader);
-			virtual TInt GetSize() const;
-			
-			TInt Deserialize(TInt aStartPos, TByteStreamReader& aReader);
-		
-			SCMStructId iId;
-			TTRawDataVersion iVersion;
-			
-			TInt32 iLength;
-			TPtr8 iData;
-		
-		};
-		
-	/**
-	 * This class stores meta data for a given process
-	 */
-	class TProcessData : public MByteStreamSerializable
-		{
-		public:
-			
-			static const TInt KSCMProcessDataMaxSize = sizeof(TUint16) + sizeof(TUint64) + 2 * sizeof(TUint32) + KMaxProcessName;
-			
-			enum TProcessDataVersion { EProcData1 = 1 };
-			TProcessData();
-						
-			// from MByteStreamSerializable
-			virtual TInt Serialize(TByteStreamWriter& aWriter);
-			virtual TInt Deserialize(TByteStreamReader& aReader);
-			virtual TInt GetSize() const;
-			
-			SCMStructId iId;
-			TProcessDataVersion iVersion;				
-					
-			TUint64 iPid;			
-			TUint32 iNamesize; //Length of process filename in bytes
-			TInt32 iPriority;
-			
-			TBuf8<KMaxProcessName> iName;
-			
-			TInt32 iSpare1;
-			TInt32 iSpare2;	
-			TInt32 iSpare3;	
-		};
-	
-	/**
-	 * This class stores meta data for a given thread
-	 */
-	class TThreadData : public MByteStreamSerializable
-		{
-		public:
-			
-			static const TInt KMaxThreadName = KMaxProcessName;					
-			static const TInt KSCMThreadDataMaxSize = sizeof(TUint32) + sizeof(TUint16) + 11 * sizeof(TUint32) + 2 * sizeof(TUint64) + KMaxThreadName;
-			
-			enum TThreadDataVersion { EThreadData1 = 1 };
-			TThreadData();
-						
-			// from MByteStreamSerializable
-			virtual TInt Serialize(TByteStreamWriter& aWriter);
-			virtual TInt Deserialize(TByteStreamReader& aReader);
-			virtual TInt GetSize() const;
-			
-			SCMStructId iId;
-			TInt32 iVersion;
-			TInt32 iPriority;
-			TUint64 iTid;
-			TUint64 iOwnerId;
-			TInt32 iSvcSP;
-			TInt32 iSvcStack;
-			TInt32 iSvcStacksize;
-			TInt32 iUsrSP;
-			TInt32 iUsrStack;
-			TInt32 iUsrStacksize;
-			TUint32 iNamesize;
-			TUint32 iLastCpu;
-			TInt32 iSvcHeap;
-			TInt32 iSvcHeapSize;
-			
-			TBuf8<KMaxThreadName> iName;
-			
-			TInt32 iSpare1;
-			TInt32 iSpare2;		
-		};
-	
-	/**
-	 * This class stores the stack for a given thread. The type (user or supervisor) is given
-	 * by iStackType. It will be followed by a TMemoryDump containing the stack
-	 */
-	class TThreadStack : public MByteStreamSerializable	
-		{
-		public:
-						
-			static const TInt KSCMThreadStackMaxSize = sizeof(TUint32) + sizeof(TUint16) + 2 * sizeof(TUint32) + sizeof(TUint64);
-			
-			enum TThreadStackVersion { EStackVersion1 = 1 };
-			
-			enum TThreadStackType
-				{
-				EUsrStack,
-				ESvrStack,
-				EIRQStack,
-				EFIQStack,
-				ELast
-				};
-			
-			TThreadStack();
-						
-			// from MByteStreamSerializable
-			virtual TInt Serialize(TByteStreamWriter& aWriter);
-			virtual TInt Deserialize(TByteStreamReader& aReader);
-			virtual TInt GetSize() const; 
-			
-			SCMStructId iId;
-			TThreadStackVersion iVersion;
-			TThreadStackType iStackType; 
-			TUint64 iThreadId;				
-			TUint32 iStackSize;
-			
-			TInt32 iSpare1;
-			TInt32 iSpare2;
-		};
-	
-	/**
-	 * Stores the value of a given register and tells you its type
-	 */
-	class TRegisterValue : public MByteStreamSerializable 
-		{
-		public:
-			
-			static const TInt KSCMRegisterValueMaxSize = sizeof(TUint32) + sizeof(TUint16) + 2 * sizeof(TUint8) + sizeof(TUint16) + sizeof(TUint32) + 2 * sizeof(TUint64);
-			
-			TRegisterValue();
-			
-			enum TRegisterValueVersion { ERegisterValueVersion1 = 1 };
-			
-			// from MByteStreamSerializable
-			virtual TInt Serialize(TByteStreamWriter& aWriter);
-			virtual TInt Deserialize(TByteStreamReader& aReader);
-			virtual TInt GetSize() const;
-			
-			SCMStructId iId;
-			TRegisterValueVersion iVersion;		
-			TInt64 iOwnId;  
-			
-	        /** 
-	         * Same as Sym32_reginfod::rd_id
-	         *  if rid_class == ESYM_REG_CORE
-	         *  	rd_id is one of rm_debug_api.h::TFunctionalityRegister
-	         *	else
-	         *		rd_id is CoProcessor number, eg 15 for ARM CP15  
-	         */	           	      	     	       
-			TUint32 iType;
-			
-			TUint8 iClass; //Same as Sym32_reginfod::rid_class
-			TUint16	iSubId; //used for coprocessors
-			
-			/** 
-			 * Same as Sym32_reginfod::rd_repre
-			 * 		ESYM_REG_8 == 0, 
-			 * 		ESYM_REG_16 == 1, 
-			 * 		ESYM_REG_32 == 2, 
-			 * 		ESYM_REG_64 == 3 
-			 */				
-			TUint8	iSize; //register size
-			
-			// Register value			   
-			union
-			{
-				// Value of an 8 bit register 
-				TUint8		iValue8;
-	
-				// Value of a 16 bit register  
-				TUint16		iValue16;
-	
-				// Value of a 32 bit register 
-				TUint32		iValue32;
-	
-				// Value of a 64 bit register 
-				TUint64		iValue64;
-			};
-		
-
-		};
-	
-	/**
-	 * This class is a header for our register set. 
-	 */
-	class TRegisterSet : public MByteStreamSerializable	
-		{
-		public:
-			
-			static const TInt KSCMRegisterSetMaxSize = sizeof(TUint32) + sizeof(TUint16) + sizeof(TUint32);
-			
-			TRegisterSet();
-			
-			enum TRegisterSetVersion { ETRegisterSetVersion1 = 1 };
-			
-			// from MByteStreamSerializable
-			virtual TInt Serialize(TByteStreamWriter& aWriter);
-			virtual TInt Deserialize(TByteStreamReader& aReader);
-			virtual TInt GetSize() const;
-			
-			TRegisterSetVersion iVersion;
-			SCMStructId iId;
-			TInt32 iNumRegisters;
-		};
-	
-	/**
-	 * This class describes a memory dump and will be followed by a TRawData 
-	 */
-	class TMemoryDump : public MByteStreamSerializable
-		{
-		public:			
-						
-			static const TInt KSCMMemDumpMaxSize = sizeof(TUint32) + sizeof(TUint16) + 2 * sizeof(TUint32) + sizeof(TUint64);
-			
-			enum TMemDumpVersionVersion {	EMemDumpVersion1 = 1	};
-			
-			TMemoryDump();
-			
-			//From MByteStreamSerializable
-			virtual TInt Serialize(TByteStreamWriter& aWriter);
-			virtual TInt Deserialize(TByteStreamReader& aReader);
-			virtual TInt GetSize() const;
-			
-			SCMStructId iId;	
-			TMemDumpVersionVersion iVersion; 
-			TUint32 iStartAddress;
-			
-			TInt64 iPid;			
-			TInt32 iLength;
-		};
-		
-	/**
-	 * class to represent a set of code segs corrosponding to a given process
-	 */
-	class TCodeSegmentSet : public MByteStreamSerializable
-		{
-		public:
-			
-			static const TInt KSCMCodeSegSetMaxSize = KMaxProcessName;
-			
-			TCodeSegmentSet();
-			
-			enum TCodeSegmentSetVersion { ETCodeSegmentSetVersion1 = 1 };
-			
-			// from MByteStreamSerializable
-			virtual TInt Serialize(TByteStreamWriter& aWriter);
-			virtual TInt Deserialize(TByteStreamReader& aReader);
-			virtual TInt GetSize() const;		
-		
-			TInt GetMaxSize() const;
-			
-			SCMStructId iId;								/**< Id that uniquely identifies this data */
-			TCodeSegmentSetVersion iVersion;		/**< Version of this data */
-			TInt32 iNumSegs;   						/**< The number of code segments following this struct that relate to this process ID */			
-			TInt64 iPid;							/**< Process Id that owns the following code segments */		
-		};
-	
-	/**
-	 * class to represent a code segment in the SCM Log
-	 */
-	class TCodeSegment : public MByteStreamSerializable
-		{
-		public:			
-			
-			static const TInt KMaxSegmentNameSize = KMaxProcessName;
-			
-			//50 is the sum of the size of members that get serialised
-			static const TInt KSCMCodeSegMaxSize = 50 + KMaxSegmentNameSize;
-			
-			TCodeSegment();
-			
-			enum TCodeSegmentVersion { ETCodeSegmentVersion1 = 1 };
-			
-			// from MByteStreamSerializable
-			virtual TInt Serialize(TByteStreamWriter& aWriter);
-			virtual TInt Deserialize(TByteStreamReader& aReader);
-			virtual TInt GetSize() const;	
-			
-			TInt GetMaxSize() const;			
-		
-			SCMStructId iId;								/**< Id that uniquely identifies this data */
-			TCodeSegmentVersion iVersion;			/**< Version of this data */		
-			TCodeSegType iCodeSegType;				/**< @see TCodeSegType */
-			TModuleMemoryInfo iCodeSegMemInfo;      /**< holds the memory info for this code segment (8 TUint32's)*/			
-			TBool  iXip;							/**< If this code segment is XIP */
-			TInt32 iNameLength;						/**< Length of the name of this code segment name */		
-			TBuf8<KMaxSegmentNameSize> iName;				/**< Name of this code segment */
-		
-		};
-	
-	/**
-	 * This class represents a trace dump in the crash log. It will be immediately followed
-	 * in the crash log by a TRawData structure
-	 */
-	class TTraceDump : public MByteStreamSerializable
-		{
-		public:
-					
-			static const TInt KSCMTraceDumpMaxSize = sizeof(TUint32) + sizeof(TUint16) + 2 * sizeof(TUint32);
-			
-			TTraceDump();
-			
-			enum TTraceDumpVersion { ETraceDumpVersion1 = 1 };
-			
-			// from MByteStreamSerializable
-			virtual TInt Serialize(TByteStreamWriter& aWriter);
-			virtual TInt Deserialize(TByteStreamReader& aReader);
-			virtual TInt GetSize() const;
-			
-			SCMStructId iId;						/**< Id that uniquely identifies this data */
-			TTraceDumpVersion iVersion;		/**< Version of this data */	
-			TInt32 iSizeOfMemory;			/**< Size of the trace data that will be dumped in the following Memory Dump */
-			TInt32 iNumberOfParts;			/**< Number of TRawData structs that will follow */
-			
-		};
-
-	/**
-	 * This represents variant specific data in the crash log. It will be followed
-	 * immediately by a TRawData that contains the data
-	 */
-	class TVariantSpecificData : public MByteStreamSerializable
-		{
-		public:
-			
-			//sizeof(TUint32) + sizeof(TUint16) + sizeof(TUint32)
-			static const TInt KSCMVarSpecMaxSize = 10;
-			
-			TVariantSpecificData();
-			
-			enum TVariantSpecificDataVersion { EVariantSpecificDataVersion1 = 1 };
-			
-			// from MByteStreamSerializable
-			virtual TInt Serialize(TByteStreamWriter& aWriter);
-			virtual TInt Deserialize(TByteStreamReader& aReader);
-			virtual TInt GetSize() const;
-			
-			SCMStructId iId;						/**< Id that uniquely identifies this data */
-			TVariantSpecificDataVersion iVersion;		/**< Version of this data */
-			TUint32 iSize;				/**< Size of the raw data (ie the var spec info) that will follow */
-		};
-	
-	/**
-	 * This represents the Rom Header Data in the crash Log
-	 */
-	class TRomHeaderData : public MByteStreamSerializable
-		{
-		public:
-						
-			static const TInt KSCMRomHdrMaxSize = sizeof(TUint32) + sizeof(TUint16) + sizeof(TUint64) + 2 * sizeof(TUint8) +sizeof(TUint16);
-			
-			TRomHeaderData();
-			
-			enum TRomHeaderDataVersion { ERomHeaderDataVersion1 = 1 };
-			
-			// from MByteStreamSerializable
-			virtual TInt Serialize(TByteStreamWriter& aWriter);
-			virtual TInt Deserialize(TByteStreamReader& aReader);
-			virtual TInt GetSize() const;
-			
-			SCMStructId iId;							/**< Id that uniquely identifies this data */
-			TRomHeaderDataVersion iVersion;			/**< Version of this data */
-			TUint8 iMajorVersion;					/**< Major Version of ROM build */
-			TUint8 iMinorVersion;					/**< Minor Version of ROM build */			
-			TUint16 iBuildNumber;					/**< ROM build number */
-			TUint64 iTime;							/**< Build time of ROM in miliseconds */
-		};	
-
-	/**
-	 * This represents the kernel lock info in the crash log
-	 */
-	class TSCMLockData : public MByteStreamSerializable
-		{
-		public:
-			
-			static const TInt KSCMLockDataMaxSize = sizeof(TUint32) + 3 * sizeof(TUint16);
-			
-			TSCMLockData();
-			
-			// from MByteStreamSerializable
-			virtual TInt Serialize(TByteStreamWriter& aWriter);
-			virtual TInt Deserialize(TByteStreamReader& aReader);			
-			virtual TInt GetSize() const;
-						
-			TInt MutexHoldCount() const;
-			void SetMutexHoldCount(TInt aMutexHoldCount);
-			
-			TInt MutexThreadWaitCount() const;			
-			void SetMutexThreadWaitCount(TInt aMutexThreadWaitCount);
-			
-			TInt LockCount() const;
-			void SetLockCount(TInt aLockCount);
-			
-			TBool operator == (const TSCMLockData& aOther) const;
-			TBool operator != (const TSCMLockData& aOther) const;				
-
-		private:		
-			SCMStructId iId;  
-			TInt iMutexHoldCount;			// if mutex is valid number of holds on the mutex from current thread
-			TInt iMutexThreadWaitCount;		// if mutex is valid number of threads waiting on the mutex
-			TInt iLockCount; 	
-			
-		};
-		
-	/**
-	 * TScmChecksum class is used to provide a level of sanity checking for the data it processes
-	 * the check sum produced is not intended to be computationally unique
-	 * This implementation has been chosen as there are restrictions in the data may only be available 
-	 * in small chunks and the entire data may not be unable to be read (ie comm port implementation)
-	 * These restrictions rule out the use of more sophisticated checksums that produce a checksum value for 
-	 * an entire block of data 
-	 */
-	class TScmChecksum : MByteStreamSerializable
-		{
-	public:
-		TScmChecksum();
-		
-		void ChecksumBlock(const TUint8* aData, TUint aLen);
-		void ChecksumBlock(const TDesC8& aDes);		
-		TBool operator == (const TScmChecksum& aOther) const;
-		TBool operator != (const TScmChecksum& aOther) const;
-		void Reset();
-		
-		// from MByteStreamSerializable
-		TInt Serialize(TByteStreamWriter& aWriter);
-		TInt Deserialize(TByteStreamReader& aReader);
-	 	TInt GetSize() const;
-		
-	private:
-		/** Total length of all data in bytes*/
-		TUint32 iLength;	
-		/** Sum of all bytes*/
-		TUint32 iSum;
-		/** Count of Bytes with value 0*/
-		TUint32 iZeroCount;
-		
-		};
-	
-	/** class to describe a flash block */
-	class SCMCrashBlockEntry
-		{
-	public:
-		
-		SCMCrashBlockEntry()
-			: iBlockNumber(0)
-			, iBlockOffset(0)
-			, iBlockSize(0) 
-			, iNext(NULL)
-			{
-		
-			}
-		
-		SCMCrashBlockEntry(TInt aBlockNumber, TInt aBlockOffset, TInt aBlockSize)
-			: iBlockNumber(aBlockNumber)
-			, iBlockOffset(aBlockOffset)
-			, iBlockSize(aBlockSize) 
-			, iNext(NULL)
-			{
-		
-			}
-
-		/** The offset in bytes to this block from start of flash*/
-		TInt iBlockNumber;
-		/** The offset in bytes to this block from start of flash*/
-		TInt iBlockOffset;
-		/** the size of the flash block in bytes */
-		TInt iBlockSize;	
-		/** pointer to next in list*/
-		SCMCrashBlockEntry* iNext;
-		
-		};
-
-	/** Because of limitations in flash memory driver available to the 
-	 *  system crash monitor - this class is used to describe the locations
-	 *  on flash where crashes will be stored
-	 *  we store 1 crash per block of flash ! This eliminates the 
-	 *  need to for the scmonitor to hold memory required for bufering write data to flash
-	 * 	class used to describe locations (typically in flash) 
-	 * 	where
-	 * 	holds a linked list of SCMCrashBlockEntry which describe an area we can write to
-	 */
-	class SCMMultiCrashInfo
-		{
-	public:
-
-		/** constructor */
-		SCMMultiCrashInfo();
-		
-		/** destructor */
-		~SCMMultiCrashInfo();
-		
-		/** add a pointer to a block to the list - takes ownership of block */ 
-		void AddBlock(SCMCrashBlockEntry* aBlockEntry);
-		
-		/** GetNextBlock returns NULL when no more blocks */
-		SCMCrashBlockEntry* GetNextBlock();
-		
-		/** sets current block to first in list */
-		void Reset();
-		
-		/** clear all entries in the list */
-		void ClearList();
-		
-		
-	private:
-		SCMCrashBlockEntry* iFirstBlock; 
-		SCMCrashBlockEntry* iCurrentBlock;
-		TInt iSpare;
-		};
-	
-	/**
-	 * This constant gives us the maximum size of the Core Crash Header which consists of the Crash Info, the Offsets
-	 * Header and the Core Registers
-	 */
-	static const TInt KMaxCoreHeaderSize = TCrashInfoHeader::KSCMCrashInfoMaxSize 					//Crash Info - always there
-										+ TCrashOffsetsHeader::KSCMCrashOffsetsMaxSize				//offsets header - optional
-										+ TRegisterSet::KSCMRegisterSetMaxSize					//The crash context - always there
-										+ TRegisterValue::KSCMRegisterValueMaxSize * 37;			//could be up to 37 register values
-
-	}
-
-#endif		//__SCMDATATYPES_H_INCLUDED__
-
-//eof scmdatatypes.h

--- a/kernel/eka/debug/crashMonitor/inc/scmonitor.h	Wed Oct 20 13:58:28 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// e32\include\kernel\scmonitor.h
-// Kernel System crash monitor header file
-// 
-// WARNING: This file contains some APIs which are internal and are subject
-//          to change without notice. Such APIs should therefore not be used
-//          outside the Kernel and Hardware Services package.
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#ifndef __SCMONITOR_H__
-#define __SCMONITOR_H__
-
-#include <plat_priv.h>
-#include <kernel/monitor.h>
-#include <e32des8.h>	
-#include <arm.h>
-#include <variant_norflash_layout.h>
-
-#include <scmdatatypes.h>
-#include <scmbytestreamutil.h>
-#include <scmconfig.h>
-#include <scmdatasave.h>
-
-using namespace Debug;
-
-class CrashFlash;
-
-const TInt KFlashAlignment = sizeof(TInt32);
-
-const TInt KFlashEraseAttempts = 10;
-/**
- * System crash monitor responsible for writing crash data to flash in 
- * the event of a crash
- */
-class SCMonitor: public Monitor
-	{
-	public:
-		SCMonitor();	
-		~SCMonitor();
-		
-		virtual void Print(const TDesC8& aDes);				
-		virtual TInt Init2(TAny* aCategory, TInt aReason);
-	
-		void VariantInit();
-		TInt InitFlash();
-		
-		void StableConstruction(); 		
-		
-	public:		
-		CrashFlash* iFlash;		
-			
-	protected:	
-		void DumpVariantSpecific();
-	
-		enum TSysCrashLogState
-			{
-			EUndefined = 0
-			};
-		
-		
-	private:	
-		TInt ProcessCrash(const SCMCrashBlockEntry& aBlockEntry, const TUint aCrashId, TBool aCommit);
-		TInt LogProcessMetaData(SCMDataSave::TDumpScope aDumpScope, TUint& aSizeDumped) const;
-		TInt LogThreadMetaData(SCMDataSave::TDumpScope aDumpScope, TUint& aSizeDumped) const;
-		TInt LogObjectContainers(TObjectType aObjectType, SCMDataSave::TDumpScope aDumpScope, const SCMDataSave::TDataToDump& aDataToDump, TUint& aSizeDumped) const;
-		TInt GetNextCrashStartPoint(SCMCrashBlockEntry& aBlockEntry);
-		void DoCrash(TAny* aCategory, TInt aReason);
-		
-	private:
-		TInt HelpDumpStacks(DObject* aObject, TObjectType aObjectType, TUint& aSizeDumped, SCMDataSave::TStackType aStkType) const;
-		TInt HelpDumpMetaData(DObject* aObject, TObjectType aObjectType, TUint& aSizeDumped) const;
-		TInt EraseFlashBlock(const SCMCrashBlockEntry& aBlock);
-		TInt EraseEntireFlashPartition();
-		
-	private:		
-		SCMDataSave* iDataSave;
-		Debug::SCMConfiguration* iScmConfig;
-		SCMMultiCrashInfo* iMultiCrashInfo;
-	};
-
-
-	
-#endif //__SCMONITOR_H__
-//EOF scmonitor.h

--- a/kernel/eka/debug/crashMonitor/inc/scmtrace.h	Wed Oct 20 13:58:28 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// scmdatatypes.h
-// 
-// WARNING: This file contains some APIs which are internal and are subject
-//          to change without notice. Such APIs should therefore not be used
-//          outside the Kernel and Hardware Services package.
-//
-
-
-#ifndef __SCMTRACE_H_INCLUDED__
-#define __SCMTRACE_H_INCLUDED__
-
-#ifdef _DEBUG	
-	#define __SCMFUNCTIONLOGGING __PRETTY_FUNCTION__ 
-#else
-	#define __SCMFUNCTIONLOGGING ""
-#endif
-
-// logger macro
-#ifdef __KERNEL_MODE__
-
-#include <kernel/kernel.h>
-#include <nk_trace.h>
-
-#define LOG_CONTEXT //__KTRACE_OPT(KALWAYS, Kern::Printf("Context --> <%s>", __SCMFUNCTIONLOGGING));
-#define CLTRACE(s) __KTRACE_OPT(KDEBUGGER, Kern::Printf(s));
-#define CLTRACE1(s, p1) __KTRACE_OPT(KDEBUGGER, Kern::Printf(s, p1));
-#define CLTRACE2(s, p1, p2)  __KTRACE_OPT(KDEBUGGER, Kern::Printf(s, p1, p2));
-#define CLTRACE3(s, p1, p2, p3) __KTRACE_OPT(KDEBUGGER, Kern::Printf(s, p1, p2, p3));
-#define CLTRACE4(s, p1, p2, p3, p4) __KTRACE_OPT(KDEBUGGER, Kern::Printf(s, p1, p2, p3, p4));
-#define CLTRACE5(s, p1, p2, p3, p4, p5) __KTRACE_OPT(KDEBUGGER, Kern::Printf(s, p1, p2, p3, p4, p5));
-
-#else
-
-#include <e32debug.h>
-
-#define LOG_CONTEXT RDebug::Printf("Context --> <%s>", __SCMFUNCTIONLOGGING);
-#define CLTRACE(s)  RDebug::Printf(s) ;
-#define CLTRACE1(s, p1) RDebug::Printf(s, p1) ;
-#define CLTRACE2(s, p1, p2) RDebug::Printf(s, p1, p2) ;
-#define CLTRACE3(s, p1, p2, p3) RDebug::Printf(s, p1, p2, p3);
-#define CLTRACE4(s, p1, p2, p3, p4) RDebug::Printf(s, p1, p2, p3, p4);
-#define CLTRACE5(s, p1, p2, p3, p4, p5) RDebug::Printf(s, p1, p2, p3, p4, p5);
-
-
-#endif
-
-
-#endif /*__SCMTRACE_H_INCLUDED__*/

--- a/kernel/eka/debug/crashMonitor/src/arm/cscmdatasave.cpp	Wed Oct 20 13:58:28 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// e32\kernel\arm\cscmdatasave.cpp
-// SCM - Arm portion
-// 
-//
-
-#define __INCLUDE_REG_OFFSETS__  // for SP_R13U in nk_plat.h
-
-
-#include "arm_mem.h"
-#include "nk_plat.h"
-#include <scmdatatypes.h>
-#include <scmdatasave.h>
-
-
-/**
- * Reads the CPU registers at the time of the crash
- * @param aRegs struct to store the resulting CPU registers
- */
-void SCMDataSave::ReadCPURegisters(SFullArmRegSet& aRegs)
-	{
-	aRegs =*(SFullArmRegSet*)iMonitor->iRegs;
-	}
-
-/**
- * Reads the user registers for a given thread - may not be the current thread
- * @param aThread thread whose registers we want to read
- * @param aRegs registers will be written here if available
- * @return KErrArgument if aThread is the current thread or any of the system wide error codes
- */
-TInt SCMDataSave::ReadUserRegisters(DThread* aThread, TArmRegSet& aRegs, TUint32& aAvailableRegs)
-	{
-	TFileName filename;
-	aThread->TraceAppendFullName(filename, EFalse);	
-	
-	//we retrieve the registers differently for the current thread
-	if(aThread == &Kern::CurrentThread())
-		{
-		return KErrArgument;
-		}
-	
-	TUint32* stackPointer = (TUint32*)aThread->iNThread.iSavedSP; //Still need to check pointer somehow
-	TUint32* stackTop = (TUint32*)((TUint32)aThread->iNThread.iStackBase +(TUint32)aThread->iNThread.iStackSize);
-	TArmReg* out = (TArmReg*)(&aRegs);		
-	
-	//Get a pointer to this threads context table
-	NThread::TUserContextType type = aThread->iNThread.UserContextType();
-	const TArmContextElement* table = aThread->iNThread.UserContextTables()[type];
-	
-	aAvailableRegs = 0;
-	for(TInt i = 0; i<KArmRegisterCount; ++i)
-		{
-		TInt value = table[i].iValue;
-		TInt type = table[i].iType;
-		
-		if(type == TArmContextElement::EOffsetFromSp)
-			{
-			value = stackPointer[value];	
-			aAvailableRegs |= (1<<i);
-			}
-		else if(type == TArmContextElement::EOffsetFromStackTop)
-			{
-			value = stackTop[-value];
-			aAvailableRegs |= (1<<i);
-			}
-		else if(type == TArmContextElement::ESpPlusOffset)
-			{
-			value = (TInt)(stackPointer + value);
-			aAvailableRegs |= (1<<i);
-			}
-		
-		out[i] = value;
-		}
-	
-	return KErrNone;
-	}
-
-/**
- * Reads the system registers for a given thread
- * Can not be used on the current thread
- * @param aThread
- * @param aRegs
- * @param aAvailableRegs
- * @return KErrArgument if aThread is the current thread or any of the system wide error codes
- */
-TInt SCMDataSave::ReadSystemRegisters(DThread* aThread, TArmRegSet& aRegs, TUint32& aAvailableRegs)
-	{	
-	if(aThread == &Kern::CurrentThread())
-		{
-		return KErrArgument;
-		}
-	
-	TFileName filename;
-	aThread->TraceAppendFullName(filename, EFalse);
-	
-	TUint32* stackPointer = (TUint32*)aThread->iNThread.iSavedSP;
-	TUint32* stackTop = (TUint32*)((TUint32)aThread->iNThread.iStackBase +(TUint32)aThread->iNThread.iStackSize);
-	TArmReg* out = (TArmReg*)(&aRegs);		
-	
-	//Get a pointer to this threads context table
-	const TArmContextElement* table = aThread->iNThread.UserContextTables()[NThread::EContextKernel];
-	
-	aAvailableRegs = 0;
-	for(TInt i = 0; i<KArmRegisterCount; ++i)
-		{
-		TInt value = table[i].iValue;
-		TInt type = table[i].iType;
-		
-		if(type == TArmContextElement::EOffsetFromSp)
-			{
-			//ensure we are still on the stack
-			if(stackPointer + value >= stackTop)
-				continue;
-				
-			value = stackPointer[value];	
-			aAvailableRegs |= (1<<i);
-			}
-		else if(type == TArmContextElement::EOffsetFromStackTop)
-			{
-			//ensure we are still on the stack
-			if(stackTop - value < (TUint32*)aThread->iNThread.iStackBase)
-				continue;
-			
-			value = stackTop[-value];
-			aAvailableRegs |= (1<<i);
-			}
-		else if(type == TArmContextElement::ESpPlusOffset)
-			{
-			value = (TInt)(stackPointer + value);
-			aAvailableRegs |= (1<<i);
-			}
-		
-		out[i] = value;
-		}	
-	
-	return KErrNone;
-	}
-
-//EOF
-

--- a/kernel/eka/debug/crashMonitor/src/crashlogwalker.cpp	Wed Oct 20 13:58:28 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,535 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// e32\debug\crashMonitor\src\crashlogwalker.cpp
-// Class to allow us to traverse the crash log generated by System Crash Monitor
-// 
-//
-
-/**
- @file
- @internalTechnology
-*/
-
-#ifndef __KERNEL_MODE__
-#include <e32std.h>
-#include <e32std_private.h> 
-#include <e32base.h>
-#include <e32base_private.h> 
-#endif
-
-#include "scmtrace.h"
-#include "crashlogwalker.h"
-
-namespace Debug
-	{	
-	/**
-	 * Constructor for log walker
-	 * @param aBuffer The buffer containing the crash data
-	 */
-	TCrashLogWalker::TCrashLogWalker(TDesC8& aBuffer) : 
-		iBuffer(aBuffer),
-		iReader(const_cast<TUint8*>(iBuffer.Ptr()))
-		{
-		}
-	
-	/**
-	 * This reads in the crash header from the buffer from the given start point
-	 * @param aStartPoint Point to begin reading in buffer
-	 * @return One of the OS wide codes
-	 */
-	TInt TCrashLogWalker::ReadLogHeader(const TInt aStartPoint)
-		{		
-		iReader.SetPosition(aStartPoint);
-		
-		TInt err = iCrashHeader.Deserialize(iReader);
-		if(err != KErrNone)
-			{
-			CLTRACE("(TCrashLogWalker::ReadLogHeader) - failed to read crash header");
-			return KErrCorrupt;
-			}
-		
-		err = iOffsets.Deserialize(iReader);
-		if(err != KErrNone)
-			{
-			CLTRACE("(TCrashLogWalker::ReadLogHeader) - failed to read offsets");
-			return KErrCorrupt;
-			}
-		
-		TRegisterSet set;
-		err = set.Deserialize(iReader);
-		if(err != KErrNone)
-			{
-			CLTRACE("(TCrashLogWalker::ReadLogHeader) - failed to read register set");
-			return KErrCorrupt;
-			}
-		
-		for(TInt cnt = 0; cnt < set.iNumRegisters; cnt++)
-			{
-			TRegisterValue val;
-			err = val.Deserialize(iReader);
-			if(err != KErrNone)
-				{
-				CLTRACE1("(TCrashLogWalker::ReadLogHeader) - failed to read TRegisterValue cnt = %d", cnt);
-				return KErrCorrupt;
-				}
-						
-			HelpAssignRegisterToContext(val);
-			}
-		
-		return VerifyHeader();
-		}
-	
-	/**
-	 * Getter for the crash context - This is the CPU register set at the time of crash
-	 * @return Crash Context
-	 */
-	const TRmdArmExcInfo& TCrashLogWalker::GetCrashContext() const
-		{
-		return iContext;
-		}
-	
-	/**
-	 * Returns the crash size for the crash that has just been read, provided the
-	 * reading of the header was succesful. 
-	 * @see ReadLogHeader
-	 * @return Crash Log size
-	 */
-	TInt TCrashLogWalker::GetCrashSize() const
-		{
-		return iCrashHeader.iLogSize;
-		}
-	
-	/**
-	 * Returns the crash ID for the crash that has just been read, provided the
-	 * reading of the header was succesful. 
-	 * @see ReadLogHeader
-	 * @return Crash Log ID
-	 */
-	TInt TCrashLogWalker::GetCrashId() const
-		{
-		return iCrashHeader.iCrashId;
-		}
-	
-	/**
-	 * Looks at the member crash log header and checks that it is valid.
-	 * @see ReadLogHeader 
-	 * @return one of the OS wide codes
-	 */
-	TInt TCrashLogWalker::VerifyHeader()
-		{
-		if(iCrashHeader.iId == ESCMTCrashInfo)
-			{			
-			CLTRACE("TCrashLogWalker::VerifyHeader() OK");
-			return KErrNone;
-			}
-		else
-			{
-			CLTRACE("TCrashLogWalker::VerifyHeader() FAILED");
-			return KErrCorrupt;
-			}
-		}
-	
-	/**
-	 * Updates the buffer being used by the crash walker and resets reader to use 
-	 * the beginning of this
-	 * @param aBuffer New buffer
-	 */
-	void TCrashLogWalker::UpdateBuffer(TDesC8& aBuffer)
-		{
-		iBuffer = aBuffer;		
-		
-		//Read from start of this buffer		
-		iReader = TByteStreamReader(const_cast<TUint8*>(aBuffer.Ptr()));
-		}
-	
-#ifndef __KERNEL_MODE__
-	/**
-	 * Gets the next data type from the buffer. If this is NULL it means the buffer was too small.
-	 * Call again with a larger buffer. It assumes the buffer contains valid data and leaves with KErrCorrupt 
-	 * if it isnt. Note for raw data types, the data will be empty. This should be read with GetRawDataTypeL after reseting the reader to the 
-	 * correct position. If you just want to skip a raw data type, move the buffer along the size of (contained in the returned struct)
-	 * 
-	 * @see GetRawDataTypeL
-	 * @see UpdateBuffer
-	 * @param aPos Next position that will be read. If we return NULL, this is the position the next buffer should
-	 * 			begin from
-	 * @param aId ID of the MByteStreamSerializable returned	 
-	 * @param buffer size to be used the next time. Unchanged if the current buffer is ok
-	 * @return MByteStreamSerializable pointer. Ownership is passed to caller. NULL if failed
-	 * @leave KErrCorrupt if the buffer cant be read
-	 */
-	MByteStreamSerializable* TCrashLogWalker::GetNextDataTypeL(TInt& aPos, SCMStructId& aId, TInt& aBufferSize)
-		{
-		MByteStreamSerializable* data = NULL;
-		
-		TInt roomInBuffer = iBuffer.Length() - iReader.CurrentPosition();
-		//make sure we have at LEAST 4 bytes in the buffer
-		if(roomInBuffer < (TInt)(sizeof(TInt)))
-			{
-			aBufferSize = sizeof(TInt);
-			return NULL;
-			}
-		
-		//this stores the required size in which to deserialize a structure - to make sure 
-		//there is room in the buffer
-		TInt maxSize = 0;
-		aPos = iReader.CurrentPosition();
-		aBufferSize = iBuffer.Length();		
-		
-		//all these data types are defined by their first byte
-		aId = (SCMStructId)iBuffer.Ptr()[iReader.CurrentPosition()];		
-		
-		//ensure we have a valid structure found
-		if(aId <= 0 || aId >= ESCMLast)
-			{
-			//oddness is afoot and the mist of corruption reigns thick
-			User::Leave(KErrCorrupt);
-			}					
-		
-		switch(aId)
-			{
-			case ESCMOffsetsHeader:
-				{
-				data = new TCrashOffsetsHeader();	
-				maxSize = TCrashOffsetsHeader::KSCMCrashOffsetsMaxSize;
-				break;
-				}
-			case ESCMTCrashInfo:
-				{
-				data = new TCrashInfoHeader();
-				maxSize = TCrashInfoHeader::KSCMCrashInfoMaxSize;
-				break;
-				}
-			case ESCMProcessData:
-				{
-				data = new TProcessData();
-				maxSize = TProcessData::KSCMProcessDataMaxSize;
-				break;
-				}
-			case ESCMThreadData:
-				{
-				data = new TThreadData();
-				maxSize = TThreadData::KSCMThreadDataMaxSize;
-				break;
-				}
-			case ESCMThreadStack:
-				{
-				data = new TThreadStack();
-				maxSize = TThreadStack::KSCMThreadStackMaxSize;
-				break;
-				}
-			case ESCMRegisterValue:
-				{
-				data = new TRegisterValue();
-				maxSize = TRegisterValue::KSCMRegisterValueMaxSize;
-				break;
-				}
-			case ESCMRegisterSet:
-				{
-				data = new TRegisterSet();
-				maxSize = TRegisterSet::KSCMRegisterSetMaxSize;
-				break;
-				}
-			case ESCMMemory:
-				{
-				data = new TMemoryDump();
-				maxSize = TMemoryDump::KSCMMemDumpMaxSize;
-				break;
-				}
-			case ESCMCodeSegSet:
-				{
-				data = new TCodeSegmentSet();
-				maxSize = TCodeSegmentSet::KSCMCodeSegSetMaxSize;
-				break;
-				}
-			case ESCMCodeSeg:
-				{
-				data = new TCodeSegment();
-				maxSize = TCodeSegment::KMaxSegmentNameSize;
-				break;
-				}	
-			case ESCMLocks:
-				{
-				data = new TSCMLockData();
-				maxSize = TSCMLockData::KSCMLockDataMaxSize;	
-				break;
-				}
-			case ESCMVariantData:
-				{
-				data = new TVariantSpecificData();
-				maxSize = TVariantSpecificData::KSCMVarSpecMaxSize;	
-				break;
-				}				
-			case ESCMRomHeader:
-				{
-				data = new TRomHeaderData();
-				maxSize = TRomHeaderData::KSCMRomHdrMaxSize;	
-				break;
-				}				
-			case ESCMRawData:
-				{
-				data = new TRawData();
-				
-				//This is a special case. The data in here can be any length, so we need to deserialise it
-				//to find this length out. The MAX_SIZE of this class is the max size minus data
-				//which is fine if we dont assign the TPtr8.				
-				if(TRawData::KSCMRawDataMaxSize > roomInBuffer )
-					{					
-					aBufferSize = (maxSize > aBufferSize) ? maxSize : aBufferSize;
-					
-					if(data)
-						delete data;
-					
-					return NULL;
-					}
-				else
-					{
-					data->Deserialize(iReader);
-					maxSize = data->GetSize();
-					
-					aPos = iReader.CurrentPosition();
-					return data;
-					}
-				}
-			case ESCMTraceData:
-				{
-				data = new TTraceDump();
-				maxSize = TTraceDump::KSCMTraceDumpMaxSize;
-				break;
-				}
-			default :
-				{
-				User::Panic(_L("Unexpected Null. Unrecognised Data type from crash log."), KErrGeneral); //Programming error				
-				}							
-			}
-		
-		__ASSERT_ALWAYS((data != NULL), User::Panic(_L("Unexpected Null"), KErrGeneral));
-		
-		if(maxSize > roomInBuffer )
-			{
-			//Not enough room in buffer to read this. Tell caller where in the current buffer
-			//we were via aPos, and what minimum size buffer should be used next time to allow reading
-			aBufferSize = maxSize;
-			if(data)
-				{
-				delete data;
-				}
-			
-			return NULL;
-			}
-		
-		if(!data)
-			{
-			CLTRACE("Unable to create data structure");
-			User::Leave(KErrAbort);
-			}
-		
-		data->Deserialize(iReader);			
-		aPos = iReader.CurrentPosition();
-		
-		return data;
-		}
-	
-	/**
-	 * Assuming the next type in the buffer is a TRawData type, this will return the TRawData
-	 * types data pointer pointing to the buffer passed via aRawBuf.
-	 *  
-	 * The difference between this call and GetNextDataTypeL is that GetNextDataTypeL only lets you move along the buffer
-	 * it doesnt allow you to specify a buffer in which to store the raw data.
-	 * 
-	 * @see GetNextDataTypeL
-	 * @return TRawData* This is the TRawData object that holds the data via the buffer passed in. Ownership is passed to the caller
-	 * @param aPos position in buffer its been found. If we return NULL, this is the position the next buffer should
-	 * 			begin from
-	 * @param aBufferSize Should we return NULL, that means the descriptor passed in was not big enough and should be of at least aBufferSize bytes
-	 * @param aRawBuf The buffer to store the data refered to by the TRawData returned
-	 * @param aStartRawPosition The point in the raw data at which we will start to put it into the buffer
-	 * @leave One of the OS wide codes
-	 */
-	TRawData* TCrashLogWalker::GetRawDataTypeL(TInt& aPos, TInt& aBufferSize, TDes8& aRawBuf, TInt aStartRawPosition)
-		{								
-		//make sure we have at LEAST the size of the struct in the buffer
-		if(iBuffer.Length() < TRawData::KSCMRawDataMaxSize)
-			{
-			aBufferSize = TRawData::KSCMRawDataMaxSize;
-			return NULL;
-			}
-		
-		//this stores the required size in which to deserialize a structure - to make sure 
-		//there is room in the buffer
-		aPos = iReader.CurrentPosition();
-		aBufferSize = iBuffer.Length();
-		
-		//all these data types are defined by their first byte
-		TInt id = (SCMStructId)iBuffer.Ptr()[iReader.CurrentPosition()];
-		if(id != ESCMRawData)
-			{
-			User::Leave(KErrCorrupt);
-			}		
-		
-		//Deserialise once to get the length (this will ignore the data in the absence of a Tptr)
-		TRawData* data = new TRawData();
-		data->Deserialize(iReader);
-		
-		//reset reader to where the raw data starts again
-		iReader.SetPosition(aPos);
-		
-		//now we know we have room, deserialize into this descriptor	
-		aRawBuf.SetMax();	
-		data->iData.Set(aRawBuf.MidTPtr(0));
-		User::LeaveIfError(data->Deserialize(aStartRawPosition, iReader));
-		
-		return data;
-		}
-	
-#endif
-	
-	/**
-	 * This is a helper function to convert between the two formats of register
-	 * @param aRegVal Resulting register values
-	 */
-	void TCrashLogWalker::HelpAssignRegisterToContext(const TRegisterValue& aRegVal)
-		{
-		//only interested in core registers at the moment
-		if(aRegVal.iClass != 0 || aRegVal.iSize != 2)
-			{
-			return;
-			}
-		
-		//Is there a cleverer way to do this with bitmasks and FOFF ?
-		switch(aRegVal.iType)
-			{
-			case 0x0 :
-				{
-				iContext.iR0 = aRegVal.iValue32;
-				break;
-				}
-			case 0x100 :
-				{
-				iContext.iR1 = aRegVal.iValue32;
-				break;
-				}
-			case 0x200 :
-				{
-				iContext.iR2 = aRegVal.iValue32;
-				break;
-				}
-			case 0x300 :
-				{
-				iContext.iR3 = aRegVal.iValue32;
-				break;
-				}
-			case 0x400 :
-				{
-				iContext.iR4 = aRegVal.iValue32;
-				break;
-				}
-			case 0x500 :
-				{
-				iContext.iR5 = aRegVal.iValue32;
-				break;
-				}
-			case 0x600 :
-				{
-				iContext.iR6 = aRegVal.iValue32;
-				break;
-				}
-			case 0x700 :
-				{
-				iContext.iR7 = aRegVal.iValue32;
-				break;
-				}
-			case 0x800 :
-				{
-				iContext.iR8 = aRegVal.iValue32;
-				break;
-				}
-			case 0x900 :
-				{
-				iContext.iR9 = aRegVal.iValue32;
-				break;
-				}
-			case 0xa00 :
-				{
-				iContext.iR10 = aRegVal.iValue32;
-				break;
-				}
-			case 0xb00 :
-				{
-				iContext.iR11 = aRegVal.iValue32;
-				break;
-				}
-			case 0xc00 :
-				{
-				iContext.iR12 = aRegVal.iValue32;
-				break;
-				}
-			case 0xd00 :
-				{
-				iContext.iR13 = aRegVal.iValue32;				
-				break;
-				}
-			case 0xe00 :
-				{
-				iContext.iR14 = aRegVal.iValue32;
-				break;
-				}
-			case 0xf00 :
-				{
-				iContext.iR15 = aRegVal.iValue32;
-				break;
-				}
-			case 0x1000 :
-				{
-				iContext.iCpsr = aRegVal.iValue32;
-				break;
-				}
-			case 0x1100 :
-				{
-				iContext.iR13Svc = aRegVal.iValue32;
-				break;
-				}
-			case 0x1200 :
-				{
-				iContext.iR14Svc = aRegVal.iValue32;
-				break;
-				}
-			default :
-				{
-				return;
-				}				
-			}
-		}
-	
-	/**
-	 * Getter for crash header
-	 * @return header
-	 */
-	const TCrashInfoHeader& TCrashLogWalker::GetCrashHeader() const
-		{
-		return iCrashHeader;
-		}
-	
-	/**
-	 * Getter for crash offsets header
-	 * @return header
-	 */
-	const TCrashOffsetsHeader& TCrashLogWalker::GetOffsetsHeader() const
-		{
-		return iOffsets;
-		}			
-		
-	}
-//eof
-