Binary file memana/analyzetoolclient/commandlineengine/install/addr2line.exe has changed

Binary file memana/analyzetoolclient/commandlineengine/install/atool.exe has changed

Binary file memana/analyzetoolclient/commandlineengine/install/binutils-2.19.1-src.zip has changed

Binary file memana/analyzetoolclient/commandlineengine/install/xerces-c_2_7.dll has changed

--- a/memana/analyzetoolclient/commandlineengine/internal/group/atool.vcproj	Thu Feb 11 15:52:57 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,375 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="atool"
-	ProjectGUID="{2C50DD86-958B-4189-8DA2-DB388C71F65F}"
-	RootNamespace="atool"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				TreatWChar_tAsBuiltInType="false"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderThrough="..\inc\stdafx.h"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\xerces-c_2.lib ..\lib\dbghelp.lib"
-				OutputFile="..\..\install\atool.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/atool.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="0"
-				TreatWChar_tAsBuiltInType="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\xerces-c_2.lib ..\lib\dbghelp.lib"
-				OutputFile="..\..\install\atool.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\src\arguments.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\atool.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\cataddr2line.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\cataddr2lineserver.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\catalloc.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\catallocs.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\CATBase.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\CATDataSaver.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\CATDatParser.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\catdbghelper.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\catfilereader.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\CATMemoryAddress.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\CATMmp.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\CATModule2.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\CATParseTraceFile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\CATParseXML.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\CATProject.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\catromsymbol.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\helps.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\librarychecks.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\stdafx.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\utility.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\version.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\inc\ATCommonDefines.h"
-				>
-			</File>
-			<File
-				RelativePath="..\inc\cataddr2line.h"
-				>
-			</File>
-			<File
-				RelativePath="..\inc\cataddr2lineserver.h"
-				>
-			</File>
-			<File
-				RelativePath="..\inc\catalloc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\inc\catallocs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\inc\CATBase.h"
-				>
-			</File>
-			<File
-				RelativePath="..\inc\CATDataSaver.h"
-				>
-			</File>
-			<File
-				RelativePath="..\inc\CATDatParser.h"
-				>
-			</File>
-			<File
-				RelativePath="..\inc\catdbghelper.h"
-				>
-			</File>
-			<File
-				RelativePath="..\inc\catfilereader.h"
-				>
-			</File>
-			<File
-				RelativePath="..\inc\CATMemoryAddress.h"
-				>
-			</File>
-			<File
-				RelativePath="..\inc\CATMmp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\inc\CATModule2.h"
-				>
-			</File>
-			<File
-				RelativePath="..\inc\CATParseTraceFile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\inc\CATParseXML.h"
-				>
-			</File>
-			<File
-				RelativePath="..\inc\CATProject.h"
-				>
-			</File>
-			<File
-				RelativePath="..\inc\catromsymbol.h"
-				>
-			</File>
-			<File
-				RelativePath="..\inc\iaddresstoline.h"
-				>
-			</File>
-			<File
-				RelativePath="..\inc\stdafx.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<File
-			RelativePath=".\ReadMe.txt"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

--- a/memana/analyzetoolclient/commandlineengine/internal/inc/ATCommonDefines.h	Thu Feb 11 15:52:57 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,563 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "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:  Common defines for cpp files.
-*
-*/
-
-
-#ifndef __ATCOMMONDEFINES_H__
-#define __ATCOMMONDEFINES_H__
-
-#include "../inc/stdafx.h"
-
-using namespace std;
-
-// CLI return codes.
-// Note! Do not change the values. Used in extension.
-struct AT_RETURN_CODE {
-	enum RETURN_CODE {
-		/* basic */
-		OK = 0,							/* All ok. */
-		INVALID_ARGUMENT_ERROR = 1,		/* Arguments failty. */
-		AT_LIBS_MISSING = 2,			/* Missing at libraries cannot compile hooked apps. */
-		CANNOT_FIND_EPOCROOT = 3,		/* Epocroot not set. */
-		UNHANDLED_EXCEPTION = 4,		/* General return code when unhandled exception occurs. */
-		/* compile errors */
-		MAKEFILE_ERROR = 5,				/* Cannot read/create etc makefiles sbs1/2. */
-		COMPILE_ERROR = 6,				/* Some error related to compilation of code. */
-		UNKNOWN = 7,					/* General compilation error not specific. */
-		NO_SUPPORTED_MODULES_ERROR = 8,	/* Cannot find supported modules from project. */
-		KERNEL_SIDE_MODULE_ERROR = 9,	/* Cannot find supported modules from project because kernel side. */
-		/* Analyze errors */
-		WRONG_DATA_FILE_VERSION = 10,	/* Invalid data file version in internal gathering mode. */
-		INVALID_DATA_FILE = 11,			/* Data file content invalid. */
-		ANALYZE_ERROR = 12,				/* General error in analyze part not specific. */
-		EMPTY_DATA_FILE = 13,			/* Data file is empty. */
-		SYMBOL_FILE_ERROR = 14,			/* Symbol file content invalid or do not exist. */
-		/* building&releasing errors */
-		RELEASABLES_ERROR = 20,			/* Cannot find the binaries of module. */
-		RESTORE_MODULES_ERROR = 21,		/* Error restoring mmp file to original. */
-		CREATING_TEMP_CPP_ERROR = 22,	/* Error creating temporary cpps to store variables to s60 core.*/
-		CLEANING_TEMP_ERROR = 23,		/* Error cleaning atool_temp folder from module. */
-		READ_MAKEFILE_ERROR = 24,		/* Some error when reading makefile of module / project (sbs1/2). */
-		MODIFY_MODULES_ERROR = 25,		/* Error modifying module mmp file. */
-		INVALID_MMP_DEFINED = 27,		/* Specified module does not exist in project. */
-		/* Attribute file related */
-		WRITE_ATTRIBUTES_ERROR = 30,	/* Error writing the cfg file into atool_temp folder (contains arguments).*/
-		READ_ATTRIBUTES_ERROR = 31,		/* Error reading hooking related arguments from cfg file. */
-		/* User issued exit */
-		USER_ISSUED_EXIT = 40,			/* User aborted the run of application. */
-		/* HTI */
-		HTI_NO_CONNECTION = 50,			/* No hti connection defined */
-		HTI_NO_AT_FOLDER = 51,			/* Cannot find analyzetool folder from device. */
-		HTI_NO_FILE_DEFINED = 52		/* No file defined to be fetched. */
-	};
-};
-
-// Debug logging to console
-extern bool g_bDebugConsole;
-// Debug logging to windows api debug
-extern bool g_bDebugDbgView;
-// Debug (low level functions).
-extern bool g_bDebugLowLevel;
-
-// Temporary directory definition's.
-const char AT_TEMP_DIR[] = "atool_temp";
-const char AT_TEMP_LST_DIR[] = "atool_temp\\static_lsts\\";
-
-// makefile dir is used in atool.cpp to check will we use sbs2 (in analyze and clear)
-#define RAPTOR_MAKEFILE_DIR "atool_temp\\build"
-
-// Atool version number and date
-#define ATOOL_VERSION "1.8.0" // NOTE! This version number is written also to temporary cpp file.
-#define ATOOL_DATE "1st December 2009"
-
-// Default/min/max call stack sizes
-const int AT_ALLOC_CALL_STACK_SIZE_DEFAULT = 40;
-const int AT_FREE_CALL_STACK_SIZE_DEFAULT = 0;
-const int AT_CALL_STACK_SIZE_MIN = 0;
-const int AT_CALL_STACK_SIZE_MAX = 256;
-
-// What version of data file contains timestamps in dll's.
-const int AT_DLL_TIMESTAMP_DATA_VERSION = 2;
-
-// Constant compatibility string in temporary cpp.
-// Api version ; current version.
-#define ATOOL_COMPATIBILITY_STRING "1.7.4;1.8.0"
-
-// Datafile version
-#define AT_DATA_FILE_VERSION "DATA_FILE_VERSION 11"
-
-// Build summary constants
-const string AT_BUILD_SUMMARY_HEADER = "\n###  AnalyzeTool  ###\n### Build Summary ###\n\n";
-const string AT_BUILD_SUMMARY_INSTRUMENTED_BUILD_COMPLETE = "Instrumented build complete: ";
-const string AT_BUILD_SUMMARY_TARGET = "\tTarget: ";
-const string AT_BUILD_SUMMARY_FAILED = "Build failed: ";
-const string AT_BUILD_SUMMARY_ERRORS = "\tErrors: ";
-const string AT_BUILD_SUMMARY_DATA_FILE_NAME = "\tInternal data gathering filename: ";
-const string AT_BUILD_SUMMARY_NORMAL_BUILD_COMPLETE = "Normal build complete: ";
-const string AT_BUILD_SUMMARY_STATIC_LIBRARY = "\tModule is static library.";
-const string AT_BUILD_SUMMARY_UNSUPPORTED_TARGET_TYPE = "\tModule has unsupported target type.";
-const string AT_BUILD_SUMMARY_UNSUPPORTED_COMPILE_DEFINITION = "\tModule defined unsupported compile definition.";
-const string AT_BUILD_SUMMARY_BUILD_TYPE = "Build type: ";
-const string AT_BUILD_SUMMARY_BUILD_TARGET = "Build target: ";
-const string AT_BUILD_SUMMARY_BUILD_PLATFORM = "Build platform: ";
-const string AT_BUILD_SUMMARY_BUILD_VARIANT = "Build variant: ";
-const string AT_BUILD_SUMMARY_LOGGING_MODE = "Data gathering mode: ";
-const string AT_BUILD_SUMMARY_ALLOC_CALL_STACK_SIZE = "Allocation call stack size: ";
-const string AT_BUILD_SUMMARY_FREE_CALL_STACK_SIZE = "Free call stack size: ";
-const string AT_BUILD_SUMMARY_S60 = "monitored internal";
-const string AT_BUILD_SUMMARY_XTI = "monitored external";
-const string AT_BUILD_SUMMARY_XTI_FAST = "external";
-
-const string AT_UNSUPPORTED_TARGET_TYPE = "\tModule has unsupported target type.";
-const string AT_UNSUPPORTED_COMPILE_DEFINITION = "\tModule defined unsupported compile definition.";
-
-// List of locations under epocroot where analyzetool.h can be found.
-// Add all possible to this list so core version information can be read
-// from file.
-const string AT_CORE_INCLUDE_FILE_WITH_VERSION_NUMBER[] = {
-	"epoc32\\include\\domain\\osextensions\\analyzetool\\analyzetool.h",
-	"epoc32\\include\\oem\\analyzetool\\analyzetool.h",
-	"epoc32\\include\\platform\\analyzetool\\analyzetool.h"
-};
-const string AT_CORE_VERSION_NUMBER_TAG = "ANALYZETOOL_CORE_VERSION_FOR_CLE";
-
-// Temporary cpp name
-const char AT_TEMP_CPP_LOWER_START[] = "0a1b2c3d_atool_temp_";
-const char AT_TEMP_CPP_LOWER_END[] = ".cpp";
-
-const char TAB_CHAR_VALUE = 9;
-const char SPACE_CHAR_VALUE = 32;
-
-// Bldmake error msg
-#define AT_BLDMAKE_ERROR "AnalyzeTool : bldmake bldfiles error.\n"
-
-// File copy/move/etc... message definitions
-#define AT_MSG "AnalyzeTool : "
-#define AT_MSG_SYSTEM_CALL "AnalyzeTool : System call, "
-#define AT_FILE_TO " to "
-
-// -c messages
-#define AT_CLEANING_DONE "AnalyzeTool : Cleaning done."
-#define AT_CLEANING_NOTHING_FOUND "AnalyzeTool : Nothing found to clean."
-
-// Analyzing data without process start or dll load
-#define AT_ANALYZE_INSUFFICIENT_LOGGING_DATA "Insufficient logging data to locate code lines for memory addresses.\nLogging has been started after process start."
-#define AT_ANALYZE_NO_PROCESS_START "AnalyzeTool : No processes start information found in test run data."
-#define AT_ANALYZE_NO_DLL_LOAD "AnalyzeTool : No dll load information found in test run data."
-#define AT_ANALYZE_CANNOT_PINPOINT "AnalyzeTool : Memory addresses cannot be pinpointed."
-#define AT_ANALYZE_ABNORMAL_EXIT "Abnormal process end"
-
-// Analyzing without map / lst files
-#define AT_ANALYZE_MISSING_LST_MAP_FILES "AnalyzeTool : Missing lst or map files, memory addresses shown only to module level.\n"
-//#define AT_UNINSTRUMENT_FAILED_IN_ANALYZE_MESSAGE "AnalyzeTool: Error creating map/lst files, leaks shown only to module level.\nRun atool -u to try create lst/map files again after binaries build successfully.\n"
-
-// Mmp error msg
-#define INVALID_MMP_ERROR "AnalyzeTool : Error, Specified mmp is invalid.\n"
-
-// Make error msg
-#define MAKE_ERROR "AnalyzeTool : Error, Running make.\n"
-
-#define AT_NOT_BEEN_BUILD_ERROR "AnalyzeTool : Error, project has not been build using AnalyzeTool.\n"
-
-// Makefile errors
-#define LEVEL1_MAKEFILE_ERROR "AnalyzeTool : Error, reading level 1 makefile.\n"
-#define LEVEL2_MAKEFILE_ERROR "AnalyzeTool : Error, reading level 2 makefile.\n"
-#define MAKEFILE_ERROR_TIP "AnalyzeTool : Tip, your environment might require you to use -variant [target] argument.\n";
-
-//Variant messages
-#define INVALID_VARIANT_ERROR "AnalyzeTool : Error,Specified variant is invalid.\n"
-#define USING_DEFAULT_VARIANT_MESSAGE "AnalyzeTool : Note, Using DEFAULT variant.\n"
-#define NO_DEFAULT_VARIANT_ERROR "AnalyzeTool : Error, environment does not specify DEFAULT variant (No variant support?).\n"
-
-// Variant dir is the dir where all variants are defined
-#define VARIANT_DIR "\\epoc32\\tools\\variant\\"
-
-// Variants defined extension name of the variant must equal filename
-#define VARIANT_FILE_EXTENSION ".VAR"
-
-//Max file name length
-const int MAX_FILENAME_LENGTH = 1024;
-
-//Max line length when reading lines from text file.2048 should be enought.
-const int MAX_LINE_LENGTH = 2048*8;
-
-// ATs project file name to store project attributes
-#define AT_PROJECT_ATTRIBUTES_FILE_NAME "project.cfg"
-const string AT_PROJECT_ATTRIBUTES_SEPARATOR( ":$:" );
-
-// ATs level1 makefile name
-#define AT_LEVEL_1_MAKEFILE_NAME "main.at"
-
-// ATs level2 makefiles extension
-#define AT_LEVEL_2_MAKEFILE_EXT "atm"
-
-//Default logging level
-const int DEFAULT_LOGGING_LEVEL = 3;
-
-//Minimun value of logging level 
-const int MIN_LOGGING_LEVEL = 0;
-
-//Maximun value of logging level
-const int MAX_LOGGING_LEVEL = 3;
-
-//Const char represeting dash
-const char DASH = '\\';
-
-/* Table of file extension not to delete
- * from atools temp directory when compiling
- * note define all in lowercase
- */
-const string TEMP_EXTENSION_NO_DELETE[] = {
-	"xml",
-	"dat",
-	"tmp",
-	"cpp",
-	"at",
-	"atm",
-	"cfg"
-};
-
-// Allowed characters/digits, other than these will be filtered out when using CATBase FilterString
-const char CFILTERSTRING[] = "abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_";
-
-/* Table of unsupported target types
- * (i.e. mmp file syntax targettype in makefile)
- * List of target types which will not be hooked:
-*/
-const string UNSUPPORTED_TARGET_TYPES[] = {
-	"CTL",
-	"ECOMIIC",
-	"IMPLIB",
-	"KDLL",
-	"KEXT",
-	"KLIB",
-	"LDD",
-	/* "LIB",  currently have own vector in project.*/
-	"MDA",
-	"MDL",
-	"NONE",
-	"NOTIFIER",
-	"PDD",
-	"RDL",
-	"STDLIB",
-	"VAR"
-};
-
-/**
-* Kernel side target types
-*/
-const string KERNEL_SIDE_TARGET_TYPES[] = {
-	"VAR",
-	"LDD",
-	"PDD",
-	"KEXT"
-};
-
-// Kernel mode compile definition
-const string KERNEL_MODE_COMPILE_DEFINITION = "__KERNEL_MODE__";
-
-/**
-* MMP file changes for AT
-* Note "SOURCE            0a1b2c3d_atool_temp_TARGET.cpp" is added also.
-*/
-const string MMPFILECHANGES[] = {
-	"//*** AnalyzeTool changes start ***",
-	"SOURCEPATH        atool_temp",
-	"LIBRARY           AToolMemoryHook.lib",
-	"STATICLIBRARY     AToolStaticLib.lib",
-	"OPTION ARMCC --interleave",
-	"//*** AnalyzeTool changes end ***"
-};
-
-//MMP file changes for AT
-//For targettype Dll
-const string MMPFILECHANGES_DLL[] = {
-	"//*** AnalyzeTool changes start ***",
-	"OPTION ARMCC --interleave",
-	"//*** AnalyzeTool changes end ***"
-};
-
-// Trace file constants definitions
-#define LABEL_DATA_FILE_VERSION "DATA_FILE_VERSION"
-#define LABEL_PROCESS_START     "PROCESS_START"
-#define LABEL_DLL_LOAD          "DLL_LOAD"
-#define LABEL_DLL_UNLOAD		"DLL_UNLOAD"
-#define LABEL_MEM_LEAK          "MEM_LEAK"
-#define LABEL_PROCESS_END       "PROCESS_END"
-#define LABEL_ERROR_OCCURED     "ERROR_OCCURED"
-#define LABEL_HANDLE_LEAK       "HANDLE_LEAK"
-#define LABEL_TEST_START        "TEST_START"
-#define LABEL_TEST_END          "TEST_END"
-#define LABEL_LOGGING_CANCELLED "LOGGING_CANCELLED"
-
-// AddressToLine related constants
-
-#define LABEL_ABNORMAL "ABNORMAL"
-const int FUNCTIONS_OFFSET_IN_MAP_FILE_ARMV5 = 0x8000;
-const int FUNCTIONS_OFFSET_IN_GCCE = 0x8000;
-const int FUNCTIONS_OFFSET_IN_MAP_FILE_WINSCW = 0x400000;
-#define TEXT_NO_HANDLE_LEAKS "No handle leaks."
-
-// Make file constant labels
-#define MAKEFILE_TARGETTYPE_STRING "# TargetType "
-#define MAKEFILE_BASIC_TARGETTYPE_STRING "# BasicTargetType "
-#define MAKEFILE_TARGET_STRING "# Target "
-#define MAKEFILE_FEATURE_VARIANT_NAME "# FeatureVariantName "
-#define MAKEFILE_FEATURE_VARIANT_UREL_LABEL "# FeatureVariantURELLabel "
-#define MAKEFILE_FEATURE_VARIANT_UDEB_LABEL "# FeatureVariantUDEBLabel "
-#define UDEB_OPTIMIZATION_LEVEL 0
-
-// Listing file contant labels
-#define LST_FILE_SOURCE_FILE_LABEL "Source file:"
-
-/**
-* Struct for saving module info from .dat file and number of leaks in module.
-*
-*/
-struct DLL_LOAD_INFO
-{
-	string sModuleName;
-	unsigned long iStartAddress;
-	unsigned long iEndAddress;
-	int iLeaks;
-	unsigned long iPID;
-	int iSubTestStartOpenHandles;
-	int iSubTestEndOpenHandles;
-	// Load/Unload times, note these are micro seconds from 1970 so size is huge.
-	unsigned long long iLoadTime;
-	unsigned long long iUnloadTime;
-	DLL_LOAD_INFO() {
-		iStartAddress = 0;
-		iEndAddress = 0;
-		iLeaks = 0;
-		iPID = 0;
-		iSubTestStartOpenHandles = 0;
-		iSubTestEndOpenHandles = 0;
-		iLoadTime = 0;
-		iUnloadTime = 0;
-	};
-};
-
-/**
-* Struct for saving symbol information from listing file
-*/
-struct LINE_IN_FILE
-{
-	int iLine;
-	string sFileName;
-	string sFunction;
-	string sMangledName;
-	string sLstName;
-};
-
-/**
-* Struct for saving symbol information from map file
-*/
-struct MAP_FUNC_INFO
-{
-	int iAddress;
-	int iFuncLength;
-	string sMangledName;
-	string sWholeLine;
-	string sFunctionName;
-};
-
-/**
-* State that represents the outcome
-* of locating memory address code line from module
-*/
-enum ADDRESS_TO_LINE_STATE {
-	no_map_data = 0, /* Map data was missing */
-	out_of_function_range, /* Could not locate it to any function */
-	mangled_symbol_name,
-	only_function_name, /* Only got function name not code line */
-	succesfull /* Have line number, function, etc...*/
-};
-
-/**
-* Struct to store detail data and state when
-* locating memory addresses code lines
-*/
-struct ADDRESS_TO_LINE_ITEM {
-	ADDRESS_TO_LINE_STATE eState; /* outcome*/
-	string sFileName; /* Filename of address*/
-	string sFunctionName; /* Function name of address*/
-	string sMangledFunctionName; /* function/Symbol name */
-	int iFunctionLineNumber; /* Functions line number */
-	int iExactLineNumber; /* Exact line number of address */
-};
-
-/**
-* Struct to store  memory leaks
-* call stack entry data
-*/
-struct CALL_STACK_ITEM {
-	string sAddress; /* Address in string */
-	int iAddress; /* Address in number (converted)*/
-	int iLocation; /* Location. i.e. corresponds m_vDllLoadModList's index*/
-	int iCalculatedLeakAddress;
-	bool bBuildUdeb; /* Optimization level */
-	string sModuleName; /* Modules name were leak is*/
-	ADDRESS_TO_LINE_ITEM addressToLine; /* Data from locating code line for memory address */
-};
-
-/**
-* Enumerations used in argument structure.
-*/
-enum MAIN_SWITCH
-{
-	SWITCH_UNKNOWN = 0,
-	SWITCH_ANALYZE = 1,
-	SWITCH_HOOK = 2,
-	SWITCH_UNHOOK = 3,
-	SWITCH_OLD_HOOK = 4,
-	SWITCH_PARSE_TRACE = 5,
-	SWITCH_CLEAN = 6,
-	SWITCH_HTI_GET = 7,
-	SWITCH_HTI_DELETE = 8,
-	SWITCH_VERSION = 9,
-	SWITCH_HELP = 10
-};
-enum HOOK_SWITCH
-{
-	HOOK_UNKNOWN = 0,
-	HOOK_INTERNAL,
-	HOOK_EXTERNAL, 
-	HOOK_EXTERNAL_FAST,
-	HOOK_EXTENSION_INTERNAL,
-	HOOK_EXTENSION_EXTERNAL,
-	HOOK_EXTENSION_EXTERNAL_FAST,
-	HOOK_EXTENSION_UNINSTRUMENT,
-	HOOK_EXTENSION_FAILED,
-	HOOK_OLD_EXTENSION_INSTRUMENT,
-	HOOK_OLD_EXTENSION_UNINSTRUMENT,
-	HOOK_OLD_EXTENSION_FAILED
-};
-
-// Hook.
-struct ARGUMENTS_HOOK
-{
-	bool bNoBuild;
-	bool bDataFileName; //Internal data gathering filename defined.
-	string sDataFileName; //Internal data gathering filename.
-	int iBuildSystem; //1 = sbs, 2 = raptor.
-	int iLoggingMode; //Just for old parameter parsing. 1=xti, 2=s60, 0=?.
-	int iAllocCallStackSize;
-	int iFreeCallStackSize;
-	string sBuildCmd; //Original build command.
-	vector<string> vBuildCmd; //Build command split in vector.
-	string sPlatform; //Platform.
-	string sBuildType; //Build type (udeb/urel).
-	string sFeatureVariant;
-	vector<string> vTargetPrograms;
-	ARGUMENTS_HOOK()
-	{
-		bNoBuild = false;
-		bDataFileName = false;
-		sDataFileName = "";
-		iBuildSystem = 0;
-		iLoggingMode = 0;
-		iAllocCallStackSize = AT_ALLOC_CALL_STACK_SIZE_DEFAULT;
-		iFreeCallStackSize = AT_FREE_CALL_STACK_SIZE_DEFAULT;
-		sBuildCmd = "";
-		sPlatform = "";
-		sBuildType = "";
-		sFeatureVariant = "";
-		vTargetPrograms.clear();
-	};
-};
-// Analyze.
-struct ARGUMENTS_ANALYZE
-{
-	string sDataFile;
-	string sOutputFile;
-	bool bSymbolFile;
-	vector<string> vSymbolFiles;
-	int iLoggingLevel;
-	ARGUMENTS_ANALYZE()
-	{
-		sDataFile = "";
-		sOutputFile = "";
-		bSymbolFile = false;
-		iLoggingLevel = 3;
-	};
-};
-//Parsing trace.
-struct ARGUMENTS_PARSE
-{
-	bool bDataFile;
-	string sDataFile;
-	bool bOutputFile;
-	string sOutputFile;
-	ARGUMENTS_PARSE()
-	{
-		bDataFile = false;
-		sDataFile = "";
-		bOutputFile = false;
-		sOutputFile = "";
-	};
-};
-//Hti get file.
-struct ARGUMENTS_HTI
-{
-	string sFile;
-	ARGUMENTS_HTI()
-	{
-		sFile = "";
-	};
-};
-/**
-* Struct to store parsed arguments from console.
-*/
-struct ARGUMENTS
-{
-	// Base arguments.
-	MAIN_SWITCH eMainSwitch; // main switch
-	HOOK_SWITCH eHookSwitch;
-	bool bHelp; //Show help.
-	bool bDebugConsole; //Debug logging to console.
-	bool bDebugDbgView; //Debug logging to win api.
-	bool bDebugLowLevel; //Debug also low level functions.
-	bool bEnableSbs2; //Use raptor.
-	ARGUMENTS_HOOK HOOK;
-	ARGUMENTS_ANALYZE ANALYZE;
-	ARGUMENTS_PARSE PARSE;
-	ARGUMENTS_HTI HTI;
-	ARGUMENTS()
-	{
-		eMainSwitch = SWITCH_UNKNOWN;
-		eHookSwitch = HOOK_UNKNOWN;
-		bHelp = false;
-		bDebugConsole = false;
-		bDebugDbgView = false;
-		bEnableSbs2 = false;
-	};
-};
-// DEBUG MACROS
-// constant string for all beginning of all debug messages
-const char START_LOG_MESSAGE[] = "*** CLE ";
-// Log normal function entry (AAA = class::function )
-#define LOG_FUNC_ENTRY( AAA ) { if( g_bDebugDbgView) { stringstream strs; strs << START_LOG_MESSAGE << "ENTRY: " << AAA << endl; OutputDebugString( strs.str().c_str() );  } else if ( g_bDebugConsole ) { stringstream strs; strs << START_LOG_MESSAGE << "ENTRY: " << AAA << endl; cout << strs.str();  } }
-// Log normal function exit
-#define LOG_FUNC_EXIT( AAA ){ if( g_bDebugDbgView) { stringstream strs; strs << START_LOG_MESSAGE << "EXIT: " << AAA << endl; OutputDebugString( strs.str().c_str() ); } else if ( g_bDebugConsole ) { stringstream strs; strs << START_LOG_MESSAGE << "EXIT: " << AAA << endl; cout << strs.str(); } }
-// Log low level function entry
-#define LOG_LOW_FUNC_ENTRY( AAA ) { if ( g_bDebugLowLevel ) { if( g_bDebugDbgView) { stringstream strs; strs << START_LOG_MESSAGE << AAA << endl; OutputDebugString( strs.str().c_str() ); } else if ( g_bDebugConsole ) { stringstream strs; strs << START_LOG_MESSAGE << AAA << endl; cout << strs.str(); } } }
-// Log low level function exit
-#define LOG_LOW_FUNC_EXIT( AAA ) {  if ( g_bDebugLowLevel ) { if( g_bDebugDbgView) { stringstream strs; strs << START_LOG_MESSAGE << AAA << endl; OutputDebugString( strs.str().c_str() ); } else if ( g_bDebugConsole ) { stringstream strs; strs << START_LOG_MESSAGE << AAA << endl; cout << strs.str(); } } }
-// Log stringstream (string, int, etc..) i.e. string1 << int1 << "log this"
-#define LOG_STRING( AAA ) { if( g_bDebugDbgView) { stringstream strs; strs << START_LOG_MESSAGE << AAA << endl; OutputDebugString( strs.str().c_str() ); } else if ( g_bDebugConsole ) { stringstream strs; strs << START_LOG_MESSAGE << AAA << endl; cout << strs.str(); } }
-
-#endif
\ No newline at end of file

--- a/memana/analyzetoolclient/commandlineengine/internal/inc/CATBase.h	Thu Feb 11 15:52:57 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,384 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "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 base class CATBase.
-*
-*/
-
-#ifndef __CATBASE_H__
-#define __CATBASE_H__
-
-#include "../inc/ATCommonDefines.h"
-
-/**
-* The base class.
-* This class implements lot of utility type of functions used all around atool project.
-*/
-class CATBase
-{
-public:
-	
-	/**
-	* Constructor
-	*/
-	CATBase();
-
-	/**
-	* Destructor
-	*/
-	virtual ~CATBase(void);
-
-public:
-	
-	/**
-	* FilterExtraSpaces
-	* Filters/replaces multiple continuous spaces with single. Won't leave
-	* spaces in start or end of string.
-	* @param sString to filter.
-	* @return void.
-	*/
-	static void FilterExtraSpaces( string& sString );
-
-	/**
-	* Convert hex value in string to decimal.
-	* @param sHex
-	* @param ulDec
-	* @return true if successful
-	*/
-	static bool hexToDec( string& sHex, int& iDec );
-	static bool hexToDec( string& sHex, unsigned int& iDec );
-	static bool hexToDec( string& sHex, unsigned long& ulDec );
-	static bool hexToDec( string& sHex, unsigned long long& ullDec );
-
-	/**
-	* Convert hex value to integer
-	* @param value
-	* @return unsigned long
-	*/
-	static unsigned long _httoi(const TCHAR *value);
-
-	/**
-	* Convert integer to hex string.
-	* @param i
-	* @return hex string
-	*/
-	static string NumberToHexString( unsigned int i );
-
-	/**
-	* Convert long to hex string.
-	* @param i
-	* @return hex string
-	*/
-	static string NumberToHexString( unsigned long i );
-
-	/**
-	* Helper function checks is given character hex.
-	* @param value value to check.
-	* @return true if value is hex char.
-	*/
-	static bool IsHexCharacter(const TCHAR *value);
-
-	/**
-	* Remove spaces and tabulatures from beginning and
-	* end of given string.
-	* @param sInput String to trim.
-	*/
-	static void TrimString( string& sInput );
-
-	/**
-	*/
-	static string GetFileNameUsingExt( const char* pPathAndExt );
-
-	/**
-	* Changes all BackSlash characters to Slash character from string.
-	* @param sInput String including backslashes.
-	* @return String without backslashes.
-	*/
-	static string ChangeSlashToBackSlash( string sInput );
-
-	/**
-	* Changes given string to uppercase
-	* @param sInput
-	*/
-	static void ChangeToUpper( string& sInput );
-
-	/**
-	* Converts any uppercase letter to lowercase.
-	*
-	* @param sInput Reference to string.
-	*/
-	static void ChangeToLower( string& sInput );
-
-	/**
-	* Filter string out of unwanted characters. The list of allowed
-	* characters is defined in CFILTERSTRING.
-	* @param sString string to filter.
-	* @return filtered string.
-	*/
-	static string FilterString( const string& sString );
-
-	/**
-	* Removes path and extension from given filename string
-	* @param sFileName
-	* @param bReverseFindExt if true extension will be looked starting from end
-	* @return string
-	*/
-	static string RemovePathAndExt( string sFileName, bool bReverseFindExt = false );
-
-	/**
-	* Check if given file exists.
-	* @param pFilename Pointer to file name.
-	* @return False If file does not exists.
-	*/
-	static bool FileExists( const char* pFilename );
-
-	/**
-	* Check if given file is flagged read only.
-	* @param pFilename Pointer to file name.
-	* @return true if read only flag set.
-	*/
-	static bool IsFileReadOnly( const char* pFileName );
-
-	/**
-	* Set file read only.
-	* @param pFilename Pointer to file name.
-	* @return true if successful.
-	*/
-	static bool SetFileReadOnly( const char* pFileName );
-
-	/**
-	* Set file writable (remove read only flag).
-	*
-	* @param pFilename Pointer to file name.
-	* @return true if successful.
-	*/
-	static bool SetFileWritable( const char* pFileName );
-
-	/**
-	* Copy file to given path
-	* @param sFile
-	* @param sToPath
-	* @return true if successful
-	*/
-	static bool FileCopyToPath(const string& sFile, const string& sToPath);
-
-	/**
-	* Move file to given path
-	* @param sFile File to be moved
-	* @param sToPath path where to move file
-	* @return true if successful
-	*/
-	static bool FileMoveToPath(const string& sFile, const string& sToPath);
-
-	/**
-	* Delete file
-	* Note! if file does not exists no error message is displayed
-	* but function returns false
-	* @param sFile File to be deleted
-	* @param bPrint display messages or not, default true
-	* @return true if successful
-	*/
-	static bool FileDelete(const string& sFile, bool bPrint = true );
-    
-	/**
-	* Delete dir
-	* Note! if dir does not exists no error message is displayed
-	* but function returns false.
-	* This function wont delete directory if string does not contain
-	* AT_TEMP...
-	* @param sDir Directory to be deleted
-	* @param bPrint display message or not, default true
-	* @return true if successful
-	*/
-	static bool DirDelete(const string& sDir, bool bPrint = true );
-
-	/**
-	* Create dir
-	* Note! if dir cannot be created no error message is displayed
-	* but function returns false.
-	* @param sDir Directory to be deleted
-	* @param bPrint display message or not, default true
-	* @return true if successful
-	*/
-	static bool DirCreate(const string& sDir, bool pPrint = true );
-
-	/**
-	* Create temp path string for given
-	* mmpfile (full path+mmpname)
-	* @param sMmpFileWithPath
-	* @return string containing full path to
-	* AnalyzeTool temporary directory
-	*/
-	static string CreateTempPath(const string& sMmpFileWithPath);
-
-	/**
-	* Search files with extensions from given path.
-	* @param sPathAndExt
-	* @param bPrintErrors
-	* @param sErrorLog
-	* @return true if found.
-	*/
-	static bool SearchFileWithExtension( const char* pPathAndExt, bool bPrintErrors, string& sErrorLog );
-
-	/**
-	* Helper function to parse filename or path from given string
-	* @param bFileName if true returns filename otherwise the path
-	* @param sInput string where to get path or filename
-	* @return string filename or path
-	*/
-	static string GetPathOrFileName( bool bFileName, string sInput );
-
-	/**
-	* Function returns string from begin of given string until next space,
-	* characters until next space are removed from sInput string.
-	*
-	* @param sInput Line where data is separated with spaces.
-	* @param bEraseFromInput If true characters before space will be removed.
-	* @return string String until next space.
-	*/
-	static string GetStringUntilNextSpace( string& sInput, bool bEraseFromInput = true );
-
-	/**
-	* Convert unix path to windows
-	* @param sPath
-	*/
-	static void ConvertUnixPathToWin( string& sPath );
-
-	/**
-	* Create Temporary AT Cpp file
-	* @param sId unique id to add in file name
-	* @param sPath where to create
-	* @param sS60FileName of the logging file
-	* @param iLogOption logging mode
-	* @param iIsDebug build type
-	* @param iAllocCallStackSize.
-	* @param iFreeCallStackSize.
-	* @return true if successful
-	*/
-	static bool CreateTemporaryCpp( const string& sId
-								 ,const string& sPath
-								 ,const string& sS60FileName
-								 ,int iLogOption
-								 ,int iIsDebug
-								 ,int iAllocCallStackSize
-								 ,int iFreeCallStackSize );
-	/**
-	* Acquire a list of files in given directory
-	* @param sDirectory can end to \ or x but not to *
-	* @param bListDirs if true directories will be listed as well, default false
-	* @param bAddPathToFile if true given sDirectory path is added to file string, default false
-	* @return vector<string> list of files in folder
-	*/
-	static vector<string> DirList(const string& sDirectory, bool bListDirs = false, bool bAddPathToFile = false);
-
-	/**
-	* Get extension from given "file" string
-	* returns string after last . if any otherwise returns same
-	* what was given
-	* @param sString 
-	* @return string string after last '.' if no '.' returns given string
-	*/
-	static string GetExtension(const string& sString);
-
-	/**
-	* Convert TCHAR pointer to string
-	* @param charArray to convert
-	* @return string
-	*/
-	static string ConvertTCHARtoString(TCHAR* charArray);
-
-	/**
-	* if given string contains two dots '.' this will remove
-	* all characters after first '.'
-	*/
-	static void RemoveAllAfterDotIfTwoDots(string& sString);
-
-	/**
-	* checks given file is it data file
-	* @param sFile
-	* @return true if it is datafile
-	*/
-	static bool IsDataFile( string sFile );
-
-	/**
-	* Parses a path string containing ".." to a valid
-	* path without relations. If given string does
-	* not contain relations it will not be changed
-	* @param sPathString
-	* @return void
-	*/
-	static void ParseRelativePathString(string& sPathString);
-
-	/**
-	* Remove relative path ".." from string
-	* @param sString string to remove from
-	* @param iDots index of ".."
-	* @return void
-	*/
-	static void RemoveRelativePath(string& sString, size_t iDots);
-
-	/**
-	* Check if given directory exists.
-	*
-	* @param pDirname Pointer to directory name.
-	* @return False If directory does not exists.
-	*/	
-	static bool DirectoryExists( const char* pDirname );
-
-	/**
-	* Checks from constant array is this targettype
-	* unsupported by AT
-	* @param sTargetType type to check
-	* @return true if it is supported by atool
-	*/
-	static bool IsTargetTypeSupported(string sTargetType);
-
-	/**
-	* Checks from constant array is this targettype
-	* kernel side.
-	* @param sTargetType type to check
-	* @return true if it is kernel type
-	*/
-	static bool IsTargetTypeKernelSide(string sTargetType);
-
-	/**
-	* Check is given variant defined in environment.(SBS v.1)
-	* @param sEpocRoot
-	* @param sVariantName
-	* @return true if it is.
-	*/
-	static bool CheckVariant( const string& sEpocroot, const string& sVariantName );
-
-	/**
-	* Check has the environment defined "DEFAULT" variant
-	* @param sEpocRoot
-	* @return true if it is
-	*/
-	static  bool IsDefaultVariant( const string& sEpocRoot );
-
-	/**
-	* Check is all character ascii
-	* @param pInput, pointer to characters
-	* @param iLength, length of the string
-	* @return true if all character are ascii
-	*/
-	static bool IsAscii( const char* pInput, const unsigned int iLength );
-
-	/**
-	* Get current environments epocroot.
-	* @param sEpocRoot value is stored in this if successful.
-	* @return true if successful.
-	*/
-	static bool GetEpocRoot( string& sEpocRoot );
-};
-#endif

--- a/memana/analyzetoolclient/commandlineengine/internal/inc/CATDatParser.h	Thu Feb 11 15:52:57 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,282 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "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:  Class responsible to parse data files
-*
-*/
-
-
-#ifndef __CATDatParser_H__
-#define __CATDatParser_H__
-
-// Includes.
-#include "ATCommonDefines.h"
-#include "CATBase.h"
-#include "CATDataSaver.h"
-
-// Forward declarations.
-class CATModule2;
-class CATMemoryAddress;
-class CATRomSymbol;
-
-/**
-* CATDatParser creates analysis report from AnalyzeTool data file.
-* This class is used from CATProject/CATFindSourceline classes.
-* Uses either CATFindSourceLine/CATModule2's to locate memory addresses to codelines.
-* Uses CATDataSaver to store report data to basic and xml output.
-*/
-class CATDatParser : public CATBase
-{
-
-public:
-	// enumeration representing the "mode" depending on build system
-	enum ANALYZE_MODE
-	{
-		SBS_1 = 0,
-		SBS_2 = 1
-	};
-	// Representing current process state
-	enum PROCESS_STATE
-	{
-		not_started = 0,
-		ongoing = 1,
-		stopped = 2
-	};
-
-	/**
-	* Constructor.
-	*/
-	CATDatParser();
-
-#ifndef MODULE_TEST
-private:
-#endif
-	/**
-	* Real constructor.
-	*/
-	void Construct();
-	
-	/**
-	* Prevent copy
-	*/
-	CATDatParser& operator =( const CATDatParser& /*other*/ ) { }
-	CATDatParser( const CATDatParser& /*other*/ ) { }
-	
-public:
-	/**
-	* Constructor for SBS2
-	* @param pModules pointer to vector containing project modules
-	*/
-	CATDatParser( vector<CATModule2*>* pModules );
-
-	/**
-	* Destructor
-	*/
-	~CATDatParser();
-
-	/**
-	* Set offset to be used with mapfiles
-	* @param iOffSet
-	*/
-	void SetOffSet( int iOffSet );
-
-	/**
-	* Get offset value
-	* @return int
-	*/
-	int GetOffSet( ) const;
-	
-	/**
-	* Analyze data file set
-	* This method includes try/catch in parsing
-	* @return int error codes specified in CATProject (0=OK)
-	*/
-	int Analyze();
-
-	/**
-	* Set log level
-	* @param iLogLevel
-	*/
-	void SetLogLevel(int iLogLevel);
-	/**
-	* Get Log level
-	* @return int
-	*/
-	int GetLogLevel() const ;
-
-	/**
-	* Set data file to be analyzed
-	* @param sInputFile
-	*/
-	void SetInputFile(const string& sInputFile);
-
-	/**
-	* Set output file
-	* @param sOutputFile
-	*/
-	void SetOutputFile(const string& sOutputFile);
-
-	/**
-	* Set rom symbol file(s).
-	* @param sRomSymbolFile
-	*/
-	void SetRomSymbolFiles(const vector<string>& vRomSymbolFile);
-
-	/**
-	* Set print flag
-	* @param pPringFlag
-	*/
-	void SetPringFlag( bool bPrintFlag );
-
-	/**
-	* Set addr2line.exe pinpoint state
-	* @param bInput
-	*/
-	void SetAddr2lineExeState( bool bInput );
-
-	/**
-	* Set project platform.
-	* @param sPlatform platform.
-	*/
-	void SetProjectPlatform( const string& sPlatform );
-
-	/**
-	* Set projects build type. Use enumeration defined in CATProject.
-	* @param eBuildType.
-	*/
-	void SetProjectBuildType( int eBuildType );
-
-	//Define this class as a friend class for test class.
-	friend class CATTester;
-#ifndef MODULE_TEST
-private:
-#endif
-
-	/**
-	* Start parsing datafile
-	* @return error codes defined in CATProject
-	*/
-	int Parse();
-	
-	/**
-	* Helper functio to print header of report
-	*/
-	void Header();
-
-	/**
-	* Helper functio to print footer of report
-	*/
-	void Footer();
-
-	/**
-	* Helper function reseting/clearing all
-	* member variables related to parsing
-	*/
-	void ClearParsingVariables();
-
-	// Helpers for data file tags
-	bool ParseProcessStart( string& sLine );
-	bool ParseDllLoad( string& sLine );
-	bool ParseDllUnload( string& sLine );
-	bool ParseMemLeak( string& sLine );
-	bool ParseProcessEnd( string& sLine );
-	bool ParseHandleLeak( string& sLine );
-	bool ParseTestStart( string& sLine );
-	bool ParseTestEnd( string& sLine );
-	bool ParseLoggingCancelled( string& sLine );
-	bool ParseErrorOccured( string& sLine );
-
-	void PrintMemLeak(const string& sTime,
-					   const string& sLeakSize,
-					   const string& sLeakAddr,
-					   const string& sModuleName);
-
-	// Utilities
-	string ConvertTimeToLocalTime( string sInputTime );
-
-	/**
-	* Create a winscw module into pModules vector.
-	* Used when we have dll load of module not in project to create them
-	* after this they are used in locating code lines.
-	* @param sBinaryName name of the binary with extension.
-	* @return true if successful.
-	*/
-	bool CreateWinscwModule( const string& sBinaryName );
-
-#ifndef MODULE_TEST
-private:
-#endif
-	vector<string> ParseStringToVector( const string& sInput, char separator );
-	void CleanMemoryAddresses();
-
-	// Members
-	unsigned int m_iDataVersion; // Version of data file.
-	int m_eProcess_state; // is process started, etc..
-	bool m_bProcessStartFound;
-	bool m_bDllLoadFound;
-	int m_iLogLevel; // specified logging level
-	string m_sInputFile; // input file
-	vector<string> m_vRomSymbolFiles; // Rom symbol file.
-	string m_sOutputFile; // output file
-	string m_sInputFileTemp; // temporary input file (parsed from trace)
-	ifstream m_In; // Handle to input file
-	// Datasaver
-	CATDataSaver m_DataSaver;
-
-	// Modules to be used in pinpointing
-	vector<CATModule2*>* m_pModules;
-
-	// Rom symbol file.
-	CATRomSymbol* m_pRomSymbol;
-
-	// Build type from dat.
-	int m_eBuildType;
-	// Build type from project.
-	int m_eProjectBuildType;
-	// Offset of map file.
-	int m_iOffSet;
-	// Platform of project.
-	string m_sProjectPlatform;
-
-	// Process related
-	unsigned long m_iCurrentProcessId;
-	string m_sCurrentProcessName;
-	int m_iTotalRuns;
-	int m_iSuccesfullRuns;
-	
-	// Leak counting related
-	int m_iTotalNumberOfLeaks;
-	bool m_bSubtestOnGoing;
-	int m_iPinPointedLeaks;
-	int m_iPinPointedSubTestLeaks;
-	int m_iLeakNumber;
-	
-	// Handle count related
-	int m_iSubtestStartHandleCount;
-	vector<string> m_vHandleLeaks;
-
-	// Module related
-	vector<DLL_LOAD_INFO> m_vDllLoadModList;
-	vector<DLL_LOAD_INFO> m_vDllLoadModListSubTest;
-	
-	// Sbs 1 support functions
-	int FindModuleUsingAddress( unsigned long iAddress ) const;
-	//int FindModuleUsingPID( unsigned long iPID ) const;
-	int FindModuleUsingName( const char* pModName );
-
-	// Memory addresses
-	vector<CATMemoryAddress*> m_vMemoryAddress;
-
-};
-#endif
-//EOF

--- a/memana/analyzetoolclient/commandlineengine/internal/inc/CATDataSaver.h	Thu Feb 11 15:52:57 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,187 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "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:  Declarations for the class CATDataSaver.
-*
-*/
-
-
-#ifndef __CATDATASAVER_H__
-#define __CATDATASAVER_H__
-
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/framework/LocalFileFormatTarget.hpp>
-#include "ATCommonDefines.h"
-
-enum element_types
-{
-	RESULT = 0,
-	RUN,
-	LEAK,
-	CALLSTACK,
-	ITEM,
-	RUN_END,
-	ERROR_IN_RUN,
-	MEM_LEAKS,
-	MEM_LEAK_MODULE,
-	HANDLE_LEAKS,
-	HANDLE_LEAK_MODULE,
-	TEST_START,
-	TEST_END,
-	SUBTEST_MEM_LEAKS,
-	SUBTEST_MEM_LEAK_MODULE,
-	LOGGING_CANCELLED,
-	SUBTEST_HANDLE_LEAKS
-};
-
-//#define CARBIDE_DATA 0
-#define XML_DATA     1
-#define TEXT_DATA    2
-
-/**
-* CATDataSaver saves analysis report data same time to basic (console) output and xml.
-*/
-class CATDataSaver
-{
-
-public:
-
-	/**
-	* Constructor.
-	*/
-	CATDataSaver( void );
-
-	/**
-	* Destructor.
-	*/
-	~CATDataSaver(void);
-
-	/**
-	* Save all lines to file with given format.
-	*
-	* @param pFileName Pointer to file name.
-	* @param iDataToSave Format of data.
-	*/
-	void SaveLinesToFile( const char* pFileName, int iDataToSave );
-
-	/**
-	* Prints all saved lines to screen.
-	*/
-	void PrintLinesToScreen( void );
-
-	/**
-	* Adds saved line to first in database.
-	*/
-	void AddLineToFirst( void );
-
-	/**
-	* Adds saved line to last in database.
-	*/
-	void AddLineToLast();
-
-	/**
-	* Adds string to current line.
-	*/
-	void AddString( const char* pData, bool bSaveCarbideData = false );
-
-	/**
-	* Converts integer to string and adds it to current line.
-	*/
-	void AddInteger( int iValue, bool bSaveCarbideData = false );
-
-	/**
-	* Sets logging level.
-	* If value is invalid DEFAULT_LOGGING_LEVEL is used
-	* value must be between MIN_LOGGING_LEVEL and MAX_LOGGING_LEVEL
-	* @param iLoggingLevel Logging level.
-	*/
-	void SetLoggingLevel( int iLoggingLevel );
-
-	/**
-	* Gets logging level.
-	*
-	* @return Logging level.
-	*/
-	int GetLoggingLevel( void );
-
-	/**
-	* Sets print immediately flag.
-	*/
-	void SetPrintFlag( bool bPrintImmediately );
-
-	/**
-	* Sets data header for carbide data.
-	*/
-	void SaveCarbideDataHeader( void );
-
-	/**
-	* Initializes xercer xml parser.
-	*/
-	bool InitXML( void );
-
-	/**
-	* Writes data to xml tree.
-	*/
-	void SaveXML( string sInput, int iElementType );
-
-	/**
-	* Converts char* -> wchar_t*.
-	*/
-	static LPWSTR CharToWChar( const char* str );
-
-	/**
-	* Converts wchar_t* -> char*.
-	*/
-	static void WCharToChar( string& sInput, const WCHAR* Source );
-
-	void SetBuild( bool bUdebBuild );
-
-	void AddCarbideData( const string& sInput );
-
-	static string IntegerToString( int iValueToConvert );
-
-	//Define this class as a friend class for test class.
-	friend class CATTester;
-#ifndef MODULE_TEST
-private:
-#endif
-	vector<string> m_vLines;
-	string m_sLine;
-	string m_sCarbideDataLine;
-
-	string m_sCarbideDataHeader;
-
-	int m_iLoggingLevel;
-	int m_iRunNumber;
-	bool m_bPrintImmediately;
-	bool m_bXMLInitOk;
-	bool m_bUdebBuild;
-
-	xercesc::DOMDocument* m_pDomDoc;
-	xercesc::DOMElement* m_pRootElem;
-	xercesc::DOMElement* m_pCurrentLeakElem;
-	xercesc::DOMWriter* m_Serializer;
-	xercesc::DOMElement* m_pRunElement;
-	xercesc::DOMElement* m_pMemoryLeaks;
-	xercesc::DOMElement* m_pHandleLeaks;
-	xercesc::DOMElement* m_pCurrentSubTestElem;
-	xercesc::DOMElement* m_pSubtestMemoryLeaks;
-
-	/**
-	* Constructor.
-	*/
-	string GetStringUntilNextGivenChar( string& sInput, char cCharacter );
-
-};
-
-#endif

--- a/memana/analyzetoolclient/commandlineengine/internal/inc/CATMemoryAddress.h	Thu Feb 11 15:52:57 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "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:  Class representing a memory address and its details.
-*
-*/
-
-
-#ifndef __CATMEMORYADDRESS_H__
-#define __CATMEMORYADDRESS_H__
-
-#include "../inc/ATCommonDefines.h"
-
-class CATMemoryAddress
-{
-public:
-	// Enumeration representing the state of locating code lines.
-	enum ADDRESS_TO_LINE_STATE
-	{
-		OUT_OF_PROCESS = 0, /* Not located code line.*/
-		OUT_OF_RANGE, /* Outside functions range. */
-		SYMBOL, /* Symbol/ Function located (no codeline) */
-		FUNCTION, /* Function and line number.*/
-		EXACT /* Exact code line located with all information.*/
-	};
-
-	/**
-	* Constructor
-	* @param sAddress
-	* @param iOffSet value used if need to use offset value
-	*/
-	CATMemoryAddress( string& sAddress, unsigned long iOffSet );
-
-	/**
-	* Destructor
-	*/
-	virtual ~CATMemoryAddress();
-
-	/**
-	* Find which binary this address belongs to.
-	* Sets also the offsetfrommodulestart.
-	* @param vDlls container of binarys to find from.
-	* @return true if found
-	*/
-	bool FindSetModuleName(vector<DLL_LOAD_INFO>* vDlls);
-
-	/**
-	* Get vector index to which module we found this address to belong to.
-	* @return -1 if not set.
-	*/
-	int GetDllLoadInfoIndex();
-
-	/**
-	* Note return value includes the set offset.
-	* So this value is not binary start - address.
-	* Instead it is.
-	* memory address - binary start address + offset
-	* @return adress
-	*/
-	unsigned long GetOffSetFromModuleStart();
-
-	/**
-	* Get the binary start address
-	* @return binary start address
-	*/
-	unsigned long GetModuleStartAddress() const;
-	
-
-	/**
-	* Simple get and sets for member variables.
-	*/
-	void SetTime( unsigned long long& ullTime );
-	unsigned long long GetTime();
-	void SetAddress( string& sAddress );
-	string GetAddressString();
-	void SetAddress( unsigned long iAddress );
-	unsigned long GetAddress();
-	void SetModuleName( string& sModuleName );
-	string GetModuleName();
-	void SetAddressToLineState( ADDRESS_TO_LINE_STATE eState );
-	int GetAddressToLineState();
-	void SetFileName(string& sFileName);
-	string GetFileName();
-	void SetFunctionName(string& sFunctionName);
-	string GetFunctionName();
-	void SetFunctionLineNumber(int iFunctionLineNumber);
-	int GetFunctionLineNumber();
-	void SetExactLineNumber(int iExactLineNumber);
-	int GetExactLineNumber();
-	void SetModuleStartAddress(unsigned long iAddress);
-
-#ifndef MODULE_TEST
-private:
-#endif
-	// Used offset to add to addresses
-	unsigned long m_iOffSet;
-	// Address related members
-	string m_sAddress;
-	unsigned long m_iAddress;
-
-	// Time (microseconds from 1970)
-	unsigned long long m_iTime;
-
-	// Module related members(if FindSetModule is successful)
-	string m_sModuleName;
-	unsigned long m_iOffSetFromModuleStart;
-	unsigned long m_iModuleStartAddress;
-
-	// Module to which address belong.
-	int m_iDllLoadinfoIndex;
-
-	// Pin pointing related members
-	int m_ePinPointState;
-	string m_sFileName;
-	string m_sFunctionName;
-
-	int m_iFunctionLineNumber;
-	int m_iExactLineNumber;
-};
-#endif
\ No newline at end of file

--- a/memana/analyzetoolclient/commandlineengine/internal/inc/CATMmp.h	Thu Feb 11 15:52:57 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "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:  Class responsible of handling mmp files.
-*
-*/
-
-
-#ifndef __CATMMP_H__
-#define __CATMMP_H__
-
-// Includes
-#include "ATCommonDefines.h"
-#include "CATBase.h"
-
-/**
-* CATMmp represents mmp file of module.
-* All mmp file related actions are done using this class.
-* @author
-*/
-class CATMmp : public CATBase
-{
-
-public:
-
-	// Constructor
-	CATMmp();
-	
-	// Destructor
-	~CATMmp();
-	
-	// MMP file.
-	string m_sMmpFile;
-
-	/**
-	* Makes AnalyzeTool changes to given mmp file.
-	* @param sTargetType target type of module i.e. exe / dll
-	* @param sId unique identification string added to source file name
-	* @return true if editing was successful.
-	*/
-	bool EditMmpFile(const string& sTargetType, const string& sId);
-
-	/**
-	* Backups mmp file to atool_temp/file
-	* to path/atool_temp/filename.mmp.tmp.
-	* Calling this function results always to 
-	* none edited mmp & none edited backup.
-	* @return true if successful.
-	*/
-	bool BackupMmpFile();
-
-	/**
-	* Restores backup from temporary directory (replacing current).
-	* @return true if successful.
-	*/
-	bool RestoreMmpFile();
-
-	/**
-	* VerifyAndRecover mmp file.
-	* Wont change mmp if it is not edited
-	* Replaces mmp file using backup if it exists and it is
-	* not edited otherwise removes changes from mmp file.
-	* @return true if successful
-	*/
-	bool VerifyAndRecover();
-
-#ifndef MODULE_TEST
-private:
-#endif
-		/**
-	* Checks if the given mmp file is modified by AT
-	* @param bBackup if true checks backup
-	* @return bool true if it is edited
-	*/
-	bool IsMmpEdited(bool bBackup = false );
-
-	/**
-	* CreateBackupPath creates string containinig
-	* full path to backup mmp file
-	*/
-	string CreateMmpBackupPath();
-
-	/**
-	* Removes AnalyzeTool changes from given file
-	* @param bBackup if true removes changes from backup
-	* @return true if successfully removed changes
-	*/
-	bool RemoveMmpFileChanges(bool bBackup = false);
-
-	/**
-	* Removes write protections from mmp file and its backup if exists.
-	* @return true if successful.
-	*/
-	bool RemoveWriteProtections();
-
-	//Define this class as a friend class for test class.
-	friend class CATTester;
-};
-#endif
\ No newline at end of file

--- a/memana/analyzetoolclient/commandlineengine/internal/inc/CATModule2.h	Thu Feb 11 15:52:57 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,547 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "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:  Class representing a module in project (sbs2).
-*
-*/
-
-
-// Note, module testing methods are not declared as friend.
-#ifndef __CATMODULE2_H__
-#define __CATMODULE2_H__
-
-// Includes.
-#include "ATCommonDefines.h"
-#include "CATBase.h"
-#include "CATMmp.h"
-
-// Forward declarations.
-class CATMemoryAddress;
-class IAddressToLine;
-
-/**
-* CATModule2 represents a module (single binary) in project.
-* This class is used with the SBS v.2.
-* @author
-*/
-class CATModule2 : public CATBase
-{
-
-public:
-	/**
-	* Constructor.
-	*/
-	CATModule2(void);
-	
-	/**
-	* Destructor.
-	*/
-	~CATModule2(void);
-	
-	/**
-	* Read modules attributes from SBS v.1 makefile.
-	* Also copies makefile to temporary directory if successful.
-	*/
-	bool ReadMakeFile();
-
-	/**
-	* Read modules attributes from SBS v.1 makefile.
-	* From make file which is in modules temporary directory.
-	*/
-	bool ReadMakeFileFromTemp();
-
-	/**
-	* Add sources using line where source files separated by spaces.
-	* @param sSourceLine.
-	*/
-	void AddSources(string& sSourceLine);
-
-	/**
-	* Add sources by giving source file and its corresponding listing file.
-	* @param sSourceFile
-	* @param sLstFile
-	*/
-	void AddSource(const string& sSourceFile, const string& sLstFile);
-
-	/**
-	* Create AT temporary cpp file for module.
-	* @param sS60FileName.
-	* @param eLoggingMode.
-	* @param eBuildType.
-	* @param iAllocCallStackSize.
-	* @param iFreeCallStackSize.
-	* @return true if successful.
-	*/
-	bool CreateTempCpp(const string& sS60FileName
-		, int eLoggingMode
-		, int eBuildType
-		, int iAllocCallStackSize
-		, int iFreeCallStackSize );
-
-	/**
-	* Add AT changes to modules mmp file.
-	* @return true if successful.
-	*/
-	bool ModifyMmp();
-
-	/**
-	* Restore any changes made to modules mmp file.
-	* @return true if successful.
-	*/
-	bool RestoreMmp();
-
-	/**
-	* Verify tha mmp does not contain AnalyzeTool made changes.
-	* If it does contain them will remove them manually or using backup.
-	* @return true if successful.
-	*/
-	bool VerifyAndRecoverMmp();
-
-	/**
-	* Copy modules releasables to its temporary dir.
-	* This includes map & lst files.
-	* @return true if successful.
-	*/
-	bool CopyReleasables();
-
-	/**
-	* Copy modules listing files to given directory.
-	* After copy they will be deleted.
-	* @param sDir target directory.
-	* @return true if successful.
-	*/
-	bool CopyLstFilesToDir( const string& sDir );
-
-	/**
-	* Delete modules lst files from their source
-	* directories.
-	* @return true if succesfful.
-	*/
-	bool DeleteLstFilesFromSrc();
-
-	/**
-	* Clean modules temporary directory of files,
-	* not defined in UNDELETE list.
-	* @return true if successful
-	*/
-	bool CleanTemporaryDir();
-
-	/**
-	* Delete modules temporary directory.
-	* @return true if successful.
-	*/
-	bool DeleteTemporaryDir();
-
-	/**
-	* Locate codeline of given memory address.
-	* Given address must be calculated to correspond map file addresses.
-	* @param pMemoryAddress object where to store results.
-	* @return true if successful.
-	*/
-	bool AddressToLine(CATMemoryAddress* pMemoryAddress);
-
-	/**
-	* Check does modules symbol file(s) exist.
-	* @return true if it exists.
-	*/
-	bool SymbolFileExist( void );
-
-	/**
-	* Check does modules map file(s) exists.
-	* @return true if it exists.
-	*/
-	bool MapFileExist( void );
-
-	/**
-	* Check does modules binary file(s) exist.
-	* @return true if it exists.
-	*/
-	bool BinaryFileExist( void );
-
-#ifndef MODULE_TEST
-private:
-#endif
-
-	/**
-	* Read modules attributes from make file.
-	*/
-	bool ReadMakeFilePrivate();
-
-	/**
-	* Locate codeline of given memory address (winscw platform).
-	* Given address must be calculated to correspond map file addresses.
-	* @param pMemoryAddress object where to store results.
-	* @return true if successful.
-	*/
-	bool AddressToLineWinscw(CATMemoryAddress* pMemoryAddress );
-
-	/**
-	* Locate codeline of given memory address (armv5 platform).
-	* Given address must be calculated to correspond map file addresses.
-	* @param pMemoryAddress object where to store results.
-	* @return true if successful.
-	*/
-	bool AddressToLineArmv5(CATMemoryAddress* pMemoryAddress );
-
-	/**
-	* Locate codeline of given memory address.
-	* Given address must be calculated to correspond map file addresses.
-	* @param pMemoryAddress object where to store results.
-	* @return true if successful.
-	*/
-	bool AddressToLineAddr2lineExe( CATMemoryAddress* pMemoryAddress );
-
-	/**
-	* Search map file data (symbols) using given address.
-	* @param iAddress memory address.
-	* @return index of the symbol or -1 if not found.
-	*/
-	int GetSymbolIndexUsingAddress(unsigned long iAddress) const;
-
-	/**
-	* Search listing  files data using the given symbol name.
-	* @param sSymbolName symbols name to find.
-	* @return index of the found lst data or -1 if not found.
-	*/
-	int GetLineInFileIndexUsingSymbolName(const string& sSymbolName) const;
-	
-	/**
-	* Search the exact code line from given file.
-	* @param sFileName listing file to search from.
-	* @param iLine functions line number.
-	* @param iFromFuncAddress how many bytes from functions start.
-	* @return line number or -1 if not found.
-	*/
-	int FindLeakCodeLine( string& sFileName, int iLine, unsigned long iFromFuncAddress ) const;
-
-public:
-
-	/**
-	* Set used build system (CATProject::BUILD_SYSTEM).
-	* @param eBuildSystem.
-	*/
-	void SetBuildSystem( int eBuildSystem );
-
-	/**
-	* Get defined build system.
-	* @return int CATProject::BUILD_SYSTEM
-	*/
-	int GetBuildSystem( void ) const ;
-
-	/**
-	* Set SBS v.1 makefile.
-	* @param sMakeFile
-	*/
-	void SetMakeFile( const string& sMakeFile );
-	
-	/**
-	* Get SBS v.1 makefile.
-	* @return string makefile.
-	*/
-	string GetMakeFile( void ) const;
-
-	/**
-	* Initialize module ready for locating code lines.
-	* with memory addresses (reads map and listing files).
-	* return true if successful.
-	*/
-	bool InitializeAddressToLine();
-	
-	/**
-	* Set modules mmp file.
-	* This also creates temporary dir if it is missing.
-	* @return true if successful.
-	*/
-	bool SetMmpFile(const string& sMmpFile);
-
-	/**
-	* Create modules own temporary directory.
-	* @return true if successful.
-	*/
-	bool CreateTemporaryDirectory();
-
-	/**
-	* Get modules mmp file.
-	* @return mmp file.
-	*/
-	string GetMmpFile() const;
-
-	/**
-	* Get modules atool_temp directory path.
-	* @return atool_temp directory path.
-	*/
-	string GetTempPath() const;
-
-	/**
-	* Get S60 logging file name.
-	* @return s60 logging file name.
-	*/
-	string GetS60FileName() const;
-
-	/**
-	* Set target binary name.
-	* @param sTarget binary file name.
-	*/
-	void SetTarget(const string& sTarget);
-
-	/**
-	* Get target binary name.
-	* @return modules binary file name.
-	*/
-	string GetTarget() const;
-
-	/**
-	* Set binary target type.
-	* @param sTargetType binary target type.
-	*/
-	void SetTargetType(const string& sTargetType);
-
-	/**
-	* Get binary target type.
-	* @return binary target type.
-	*/
-	string GetTargetType() const;
-
-	/**
-	* Set requested binary target file extension.
-	* @param sRequestedTargetExt binary target file extension.
-	*/
-	void SetRequestedTargetExt( const string& sRequestedTargetExt );
-
-	/**
-	* Get requested binary target file extension.
-	* @return binary target file extension.
-	*/
-	string GetRequestedTargetExt() const;
-
-	/**
-	* Get full name of modules binary.
-	* @return modules binary files full name.
-	*/
-	string GetBinaryName() const;
-
-	/**
-	* Set variant platform.
-	* @param sVariantPlatform variant platform.
-	*/
-	void SetVariantPlatform(const string& sVariantPlatform);
-
-	/**
-	* Get variant platform.
-	* @return variant platform.
-	*/
-	string GetVariantPlatform() const;
-
-	/**
-	* Set variant type.
-	* @param sVariantType variant type.
-	*/
-	void SetVariantType(const string& sVariantType);
-
-	/**
-	* Get variant type.
-	* @return variant type.
-	*/
-	string GetVariantType() const;
-
-	/**
-	* Set feature variant.
-	* @param sFeatureVariant feature variant.
-	*/
-	void SetFeatureVariant(const string& sFeatureVariant);
-
-	/**
-	* Get feature variant.
-	* @return feature variant.
-	*/
-	string GetFeatureVariant() const;
-
-	/**
-	* Set feature variant name.
-	* @param sFeatureVariantName feature variant name.
-	*/
-	void SetFeatureVariantName(const string& sFeatureVariantName);
-
-	/**
-	* Get feature variant name.
-	* @return feature variant name.
-	*/
-	string GetFeatureVariantName() const;
-
-	/**
-	* Set release path.
-	* @param sReleasePath release path.
-	*/
-	void SetReleasePath(const string& sReleasePath);
-
-	/**
-	* Get release path.
-	* @return release path.
-	*/
-	string GetReleasePath() const;
-
-	/**
-	* Set full variant path.
-	* @param sFullVariantPath full variant path.
-	*/
-	void SetFullVariantPath(const string& sFullVariantPath);
-
-	/**
-	* Get full variant path.
-	* @return full variant path.
-	*/
-	string GetFullVariantPath() const;
-
-	/**
-	* Set compile definition(s) of the module.
-	* @param sCompileDefinitions
-	*/
-	void SetCompileDefinitions( const string& sCompileDefinitions );
-
-	/**
-	* Get compile definition(s) of the module.
-	* @return compile definition(s).
-	*/
-	string GetCompileDefinitions() const;
-
-	/**
-	* Is modules target type udeb?
-	* @return true if modules target type is udeb.
-	*/
-	bool IsUDEB() const;
-
-	/**
-	* Is module build successfully?
-	* This includes check of listing and map files from temporary directory.
-	* @return true if module build successfully.
-	*/
-	bool IsMakeSuccessfull();
-
-	/**
-	* Get error string. This includes possible erros what are generated when
-	* IsMakeSuccesfull is called.
-	* @return error string.
-	*/
-	string GetErrors() const;
-
-	/**
-	* Create build complete file to modules temporary directory.
-	* @return true if build complete file created successfully.
-	*/
-	bool CreateBuildCompleteFile( void );
-
-	/**
-	* Read map file (armv5 platform).
-	* @return true if map file read successfully.
-	*/
-	bool ReadMapFileArmv5();
-
-	/**
-	* Set compile info text
-	* @param sCompileInfoText
-	*/
-	void SetCompileInfoText( string sCompileInfoText );
-
-	/**
-	* Get compile info text
-	* @return compile info text
-	*/
-	string GetCompileInfoText() const;
-
-#ifndef MODULE_TEST
-private:
-#endif
-
-	/**
-	* Struct for saving source information
-	* sCpp is source file.
-	* sLst sources corresponding lst file.
-	* bStatic true if source information from static library.
-	*/
-	struct SOURCE
-	{
-		bool bStatic;
-		string sCpp;
-		string sLst;
-		SOURCE() : bStatic(false), sCpp(""), sLst("") {}
-	};
-
-	// Build system
-	int m_eBuildSystem;
-	// Sbs v.1 makefile
-	string m_sMakeFile;
-	// Mmp file.
-	CATMmp m_Mmp;
-	// Temporary directory with path.
-	string m_sTempPath;
-	// Target.
-	string m_sTarget;
-	// Target type.
-	string m_sTargetType;
-	// True target extension.
-	string m_sRequestedTargetExt;
-	// Variant platform.
-	string m_sVariantPlatform;
-	// Variant type.
-	string m_sVariantType;
-	// Feature variant.
-	string m_sFeatureVariant;
-	// Feature variant name.
-	string m_sFeatureVariantName;
-	// Release path (releasables).
-	string m_sReleasePath;
-	// Full variant path (path to releasables).
-	string m_sFullVariantPath;
-	// String to store information of compile
-	string m_sCompileInfoText;
-	// String to store possible error messages.
-	string m_sErrors;
-	// Compile definition(s)
-	string m_sCompileDefinitions;
-	// Source files.
-	vector<SOURCE> m_vSources;
-	// Listing data.
-	vector<LINE_IN_FILE> m_vLineInFile;
-	// Modules map data (symbols).
-	vector<MAP_FUNC_INFO> m_vMapFileFuncList;
-	// S60 logging mode filename.
-	string m_sS60FileName;
-	// Is all data loaded for address to code line functions.
-	bool m_bAddressToLineInitialized;
-	// Read listing files (armv5 platform).
-	bool ReadListingFilesArmv5();
-	// Get listing file name of given source file.
-    string GetLstNameOfSource(string sSource) const;
-	// Copy listing files to temporary directory.
-	bool CopyLstFilesToTemp();
-	// Copy map file to temporary directory.
-	bool CopyMapFileToTemp();
-	// Get full map file name.
-	string GetMapFile() const;
-	// Get full symbol file name.
-	string GetSymbolFile() const;
-	// Get full binary file name.
-	string GetBinaryFile() const;
-	// Helper function to check is platform armv5.
-	bool IsPlatformArmv5() const;
-	// Get "unique" id of module
-	string GetUniqueId() const;
-	// Sbs v.1 variant urel label.
-	string m_sFeatureVariantURELLabel;
-	// Sbs v.1 variant udeb label.
-	string m_sFeatureVariantUDEBLabel;
-	// Object used to get codelines of memory addresses.
-	IAddressToLine* m_pAddressToLine;
-};
-#endif
-//EOF

--- a/memana/analyzetoolclient/commandlineengine/internal/inc/CATParseTraceFile.h	Thu Feb 11 15:52:57 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "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 class CATParseTrace.
-*
-*/
-
-
-#ifndef __CATPARSETRACEFILE_H__
-#define __CATPARSETRACEFILE_H__
-
-#include "../inc/ATCommonDefines.h"
-#include "../inc/CATDataSaver.h"
-#include "../inc/CATBase.h"
-#include "../inc/catallocs.h"
-
-/**
-* Class that parses trace data to data file.
-*/
-class CATParseTraceFile : public CATBase
-{
-public:
-	CATParseTraceFile();
-
-	/**
-	* Main function to start parse.
-	*
-	* @param pFileName A trace file name.
-	* @param pOutputFileName Pointer to output file name.
-	*/
-	bool StartParse( const char* pFileName, const char* pOutputFileName );
-
-	CATDataSaver* GetDataSaver(void);	
-
-#ifndef MODULE_TEST
-private:
-#endif
-	CATDataSaver m_DataSaver;
-};
-
-class CSubTestData : public CATAllocs
-{
-public:
-	bool bRunning;
-	vector<string> vData;
-	string sSubTestName;
-	string sStartTime;
-	string sEndTime;
-	string sSubTestStartHandleCount;
-	string sSubTestEndHandleCount;
-};
-
-class CProcessData : public CATAllocs
-{
-public:
-	bool bProcessOnGoing;
-	int iProcessID;
-	vector<string> vData;
-	vector<string> vHandleLeaks;
-	vector<CSubTestData> vSubTests;
-};
-
-#endif

--- a/memana/analyzetoolclient/commandlineengine/internal/inc/CATParseXML.h	Thu Feb 11 15:52:57 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "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:  Declarations for the class CATParseXML.
-*
-*/
-
-
-#ifndef __CATPARSEXML_H__
-#define __CATPARSEXML_H__
-
-#include "../inc/ATCommonDefines.h"
-
-/**
-* CATParseXML is used to parse xml data.
-* @author
-*/
-class CATParseXML
-{
-public:
-	/**
-	* Constructor
-	*/
-	CATParseXML(void);
-	
-	/**
-    * Destructor
-    */
-	virtual ~CATParseXML(void);
-
-	/**
-	* Find epocroot path in xml file
-	* @param sourcePath Location of the xml file
-	*/
-	string GetEpocRootPathFromXML(const char* sourcePath);
-};
-#endif