Basic process initialisation and shutdown working. Using small fixed heap for now. Fixing missing global Symbian C++ new operators. Panics on Win32 now display error message. anywhere
authorStephane Lenclud <tortoisehg@lenclud.com>
Tue, 27 Apr 2010 17:12:11 +0200
branchanywhere
changeset 94 f36eb4948686
parent 93 7c26c0978cbf
child 95 f561f9ae805b
Basic process initialisation and shutdown working. Using small fixed heap for now. Fixing missing global Symbian C++ new operators. Panics on Win32 now display error message.
kernel/eka/euser/CMakeLists.txt
kernel/eka/euser/epoc/symc/uc_exec.cpp
kernel/eka/euser/epoc/win32/uc_epoc.cpp
kernel/eka/include/u32exec.h
--- a/kernel/eka/euser/CMakeLists.txt	Mon Apr 26 23:41:25 2010 +0200
+++ b/kernel/eka/euser/CMakeLists.txt	Tue Apr 27 17:12:11 2010 +0200
@@ -239,9 +239,12 @@
 #set_target_properties(emulator PROPERTIES COMPILE_FLAGS "/Zl") #No default library
 #set_target_properties(emulator PROPERTIES LINK_FLAGS "/ENTRY:_Win32DllMain") #Change the entry point
 
+###
+add_library (scppnwdl STATIC ../euser/epoc/win32/scppnwdl.cpp)
+
 ### EUSER: many user library
 add_library (euser SHARED ${source})
-add_dependencies(euser genexec emulator)
+add_dependencies(euser genexec emulator scppnwdl)
 target_link_libraries(euser emulator)
 set_target_properties(euser PROPERTIES COMPILE_DEFINITIONS "__DLL__")
 
--- a/kernel/eka/euser/epoc/symc/uc_exec.cpp	Mon Apr 26 23:41:25 2010 +0200
+++ b/kernel/eka/euser/epoc/symc/uc_exec.cpp	Tue Apr 27 17:12:11 2010 +0200
@@ -1,352 +1,404 @@
-// Copyright (c) 1995-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\euser\epoc\win32\uc_exec.cpp
-// 
-//
-
-
-//#define __GEN_USER_EXEC_CODE__
-
-#include "../win32/uc_std.h"
-#include <e32svr.h>
-#include <emulator.h>
-
-typedef TInt (__fastcall *TDispatcher)(TInt, TInt*);
-TInt __fastcall LazyDispatch(TInt aFunction, TInt* aArgs);
-
-#pragma data_seg(".data2")
-#ifdef __VC32__
-#pragma bss_seg(".data2")
-#endif
-static TDispatcher TheDispatcher = &LazyDispatch;
-#pragma data_seg()
-#ifdef __VC32__
-#pragma bss_seg()
-#endif
-
-TInt __fastcall LazyDispatch(TInt aFunction, TInt* aArgs)
-	{
-	//SL:
-	HINSTANCE kernel = GetModuleHandleA("ekern.dll");
-	//HINSTANCE kernel = GetModuleHandleA("ekern.exe");
-	if (kernel)
-		{
-		TDispatcher dispatcher = (TDispatcher)Emulator::GetProcAddress(kernel, (LPCSTR)1);
-		if (dispatcher)
-			{
-			TheDispatcher = dispatcher;
-			return dispatcher(aFunction, aArgs);
-			}
-		}
-	ExitProcess(101);
-	return 0;
-	}
-
-#include <u32exec.h>
-
-/******************************************************************************
- * Slow executive calls with preprocessing or extra arguments
- ******************************************************************************/
-
-__NAKED__ TInt Exec::SessionSend(TInt /*aHandle*/, TInt /*aFunction*/, TAny* /*aPtr*/, TRequestStatus* /*aStatus*/)
-//
-// Send a blind message to the server.
-//
-	{
-	__DISPATCH(EExecSessionSend|EXECUTIVE_SLOW)
-	}
-
-__NAKED__ TInt Exec::SessionSendSync(TInt /*aHandle*/, TInt /*aFunction*/, TAny* /*aPtr*/, TRequestStatus* /*aStatus*/)
-//
-// Send a blind message to the server using thread's dedicated message slot.
-//
-	{
-	__DISPATCH(EExecSessionSendSync|EXECUTIVE_SLOW)
-	}
-
-
-__NAKED__ TInt Exec::MessageIpcCopy(TInt /*aHandle*/, TInt /*aParam*/, SIpcCopyInfo& /*aInfo*/, TInt /*anOffset*/)
-//
-// Perform a descriptor-to-descriptor IPC copy
-//
-	{
-
-	__DISPATCH(EExecMessageIpcCopy|EXECUTIVE_SLOW)
-	}
-
-__NAKED__ TInt Exec::BTraceOut(TUint32 /*a0*/, TUint32 /*a1*/, const BTrace::SExecExtension& /*aExtension*/, TInt /*aDataSize*/)
-	{
-	__DISPATCH(EExecBTraceOut|EXECUTIVE_SLOW)
-	}
-
-__NAKED__ TInt Exec::BTraceOutBig(TUint32 /*a0*/, TUint32 /*a1*/, const BTrace::SExecExtension& /*aExtension*/, TInt /*aDataSize*/)
-	{
-	__DISPATCH(EExecBTraceOutBig|EXECUTIVE_SLOW)
-	}
-
-__NAKED__ TInt Exec::UTraceOut(TUint32 /*a0*/, TUint32 /*a1*/, const BTrace::SExecExtension& /*aExtension*/, TInt /*aDataSize*/)
-	{
-	__DISPATCH(EExecUTraceOut|EXECUTIVE_SLOW)
-	}
-
-EXPORT_C TBool BTrace::Out(TUint32 a0, TUint32 a1, TUint32 a2, TUint32 a3)
-	{
-	BTrace::SExecExtension ext;
-	ext.iA2 = a2;
-	ext.iA3 = a3;
-	ext.iPc = (&a0)[-1]; // return address on X86
-	return Exec::BTraceOut(a0,a1,ext,0);
-	}
-
-EXPORT_C TBool BTrace::OutX(TUint32 a0, TUint32 a1, TUint32 a2, TUint32 a3)
-	{
-	BTrace::SExecExtension ext;
-	ext.iA2 = a2;
-	ext.iA3 = a3;
-	ext.iPc = (&a0)[-1]; // return address on X86
-	return Exec::BTraceOut(a0,a1,ext,0);
-	}
-
-EXPORT_C TBool BTrace::OutN(TUint32 a0, TUint32 a1, TUint32 a2, const TAny* aData, TInt aDataSize)
-	{
-	BTrace::SExecExtension ext;
-	ext.iA2 = a2;
-	ext.iA3 = (TUint32)aData;
-	ext.iPc = (&a0)[-1]; // return address on X86
-	return Exec::BTraceOut(a0,a1,ext,aDataSize);
-	}
-
-EXPORT_C TBool BTrace::OutNX(TUint32 a0, TUint32 a1, TUint32 a2, const TAny* aData, TInt aDataSize)
-	{
-	BTrace::SExecExtension ext;
-	ext.iA2 = a2;
-	ext.iA3 = (TUint32)aData;
-	ext.iPc = (&a0)[-1]; // return address on X86
-	return Exec::BTraceOut(a0,a1,ext,aDataSize);
-	}
-
-EXPORT_C TBool BTrace::OutBig(TUint32 a0, TUint32 a1, const TAny* aData, TInt aDataSize)
-	{
-	BTrace::SExecExtension ext;
-	ext.iA2 = 0;
-	ext.iA3 = (TUint32)aData;
-	ext.iPc = (&a0)[-1]; // return address on X86
-
-	if((TUint)aDataSize>8u)
-		{
-		if((TUint)aDataSize>KMaxBTraceDataArray+4u)
-			return Exec::BTraceOutBig(a0,a1,ext,aDataSize);
-		a0 += 4;
-		aDataSize -= 4;
-		ext.iA2 = *((TUint32*&)aData)++;
-		ext.iA3 = (TUint32)aData;
-		return Exec::BTraceOut(a0,a1,ext,aDataSize);
-		}
-
-	if((TUint)aDataSize>4u)
-		ext.iA3 = ((TUint32*)aData)[1];
-	if(aDataSize)
-		ext.iA2 = ((TUint32*)aData)[0];
-	a0 += aDataSize;
-	aDataSize = 0;
-	return Exec::BTraceOut(a0,a1,ext,aDataSize);
-	}
-
-EXPORT_C TBool BTrace::OutFiltered(TUint32 a0, TUint32 a1, TUint32 a2, TUint32 a3)
-	{
-	BTrace::SExecExtension ext;
-	a0 |= EMissingRecord<<BTrace::EFlagsIndex*8; // overload meaning of this flag to indicate filtered trace
-	ext.iA2 = a2;
-	ext.iA3 = a3;
-	ext.iPc = (&a0)[-1]; // return address on X86
-	return Exec::BTraceOut(a0,a1,ext,0);
-	}
-
-EXPORT_C TBool BTrace::OutFilteredX(TUint32 a0, TUint32 a1, TUint32 a2, TUint32 a3)
-	{
-	BTrace::SExecExtension ext;
-	a0 |= EMissingRecord<<BTrace::EFlagsIndex*8; // overload meaning of this flag to indicate filtered trace
-	ext.iA2 = a2;
-	ext.iA3 = a3;
-	ext.iPc = (&a0)[-1]; // return address on X86
-	return Exec::BTraceOut(a0,a1,ext,0);
-	}
-
-EXPORT_C TBool BTrace::OutFilteredN(TUint32 a0, TUint32 a1, TUint32 a2, const TAny* aData, TInt aDataSize)
-	{
-	BTrace::SExecExtension ext;
-	a0 |= EMissingRecord<<BTrace::EFlagsIndex*8; // overload meaning of this flag to indicate filtered trace
-	ext.iA2 = a2;
-	ext.iA3 = (TUint32)aData;
-	ext.iPc = (&a0)[-1]; // return address on X86
-	return Exec::BTraceOut(a0,a1,ext,aDataSize);
-	}
-
-EXPORT_C TBool BTrace::OutFilteredNX(TUint32 a0, TUint32 a1, TUint32 a2, const TAny* aData, TInt aDataSize)
-	{
-	BTrace::SExecExtension ext;
-	a0 |= EMissingRecord<<BTrace::EFlagsIndex*8; // overload meaning of this flag to indicate filtered trace
-	ext.iA2 = a2;
-	ext.iA3 = (TUint32)aData;
-	ext.iPc = (&a0)[-1]; // return address on X86
-	return Exec::BTraceOut(a0,a1,ext,aDataSize);
-	}
-
-EXPORT_C TBool BTrace::OutFilteredBig(TUint32 a0, TUint32 a1, const TAny* aData, TInt aDataSize)
-	{
-	BTrace::SExecExtension ext;
-	a0 |= EMissingRecord<<BTrace::EFlagsIndex*8; // overload meaning of this flag to indicate filtered trace
-	ext.iA2 = 0;
-	ext.iA3 = (TUint32)aData;
-	ext.iPc = (&a0)[-1]; // return address on X86
-
-	if((TUint)aDataSize>8u)
-		{
-		if((TUint)aDataSize>KMaxBTraceDataArray+4u)
-			return Exec::BTraceOutBig(a0,a1,ext,aDataSize);
-		a0 += 4;
-		aDataSize -= 4;
-		ext.iA2 = *((TUint32*&)aData)++;
-		ext.iA3 = (TUint32)aData;
-		return Exec::BTraceOut(a0,a1,ext,aDataSize);
-		}
-
-	if((TUint)aDataSize>4u)
-		ext.iA3 = ((TUint32*)aData)[1];
-	if(aDataSize)
-		ext.iA2 = ((TUint32*)aData)[0];
-	a0 += aDataSize;
-	aDataSize = 0;
-	return Exec::BTraceOut(a0,a1,ext,aDataSize);
-	}
-
-EXPORT_C TBool BTrace::OutFilteredPcFormatBig(TUint32 aHeader, TUint32 aModuleUid, TUint32 aPc, TUint16 aFormatId, const TAny* aData, TInt aDataSize)
-	{
- 	BTrace::SExecExtension ext;
-	aHeader |= EMissingRecord<<BTrace::EFlagsIndex*8; // overload meaning of this flag to indicate filtered trace
-	ext.iA2 = aFormatId;
-	ext.iA3 = (TUint32)aData;
-	ext.iPc = aPc;
-
-	if((TUint)aDataSize>KMaxBTraceDataArray)
-		return Exec::UTraceOut(aHeader,aModuleUid,ext,aDataSize);
-	aHeader += 4;
-	return Exec::BTraceOut(aHeader,aModuleUid,ext,aDataSize);
-	}
-
-__NAKED__ void ExecRequestComplete(TInt /*aHandle*/, TRequestStatus*& /*aStatus*/, TInt /*aReason*/)
-	{
-	_asm mov ecx, [esp+8]			// ecx = TRequestStatus**
-	_asm xor eax, eax				//
-	_asm lock xchg eax, [ecx]		// eax=TRequestStatus*, zero TRequestStatus*
-	_asm cmp eax, 0					//
-	_asm je ExecRequestComplete_ret
-	_asm mov ecx, [esp+12]			// ecx = aReason
-	_asm mov [eax], ecx				// store aReason in request status
-	__DISPATCH(EExecThreadRequestSignal|EXECUTIVE_SLOW)
-	_asm ExecRequestComplete_ret: ret
-	}
-
-
-
-
-EXPORT_C void RThread::RequestComplete(TRequestStatus*& aStatus, TInt aReason) const
-/**
-Signals this thread that an asynchronous request originating from this thread,
-is complete.
-
-The request is associated with the specified request status object supplied
-by this thread.
-
-Typically, the caller of this function is the service provider responsible
-for satisfying the request made by this thread.
-
-The request is completed with the completion code passed in aReason. This
-value is copied into this thread's request status, *aStatus, before signalling
-this thread's request semaphore.
-
-The meaning of the completion code is a matter of convention to be decided
-between the service provider and this thread.
-
-In a client-server situation, completion of a request takes place in the context
-of the server thread, but the pointer is interpreted in the address space
-of the client.
-
-It is often the case in client-server situations that the client and the server
-are in the same address space (i.e. the same process).
-
-Setting the pointer to the request status to NULL is a convenience, not all
-servers need it.
-
-@param aStatus A reference to a pointer to the request status originally
-               supplied by this thread. This is a pointer into this thread's
-               address space, which may be different to the thread currently
-               executing (this code). On return, the pointer to the request
-               status is set to NULL.
-
-@param aReason The completion code of this request.
-*/
-	{
-	ExecRequestComplete(iHandle,aStatus,aReason);
-	}
-
-
-
-/**
-Signal this threads request semaphore.
-
-This is similar to RThread::RequestComplete() except that no TRequestStatus object
-is modified.
-
-May only be used to signal a thread in the same process as the callers.
-
-@panic KERN-EXEC 46 if the thread is not in the same process as the callers
-*/
-EXPORT_C void RThread::RequestSignal() const
-	{
-	Exec::ThreadRequestSignal(iHandle);
-	}
-
-
-
-void ExitCurrentThread(TExitType aType, TInt aReason, const TDesC8* aCategory)
-	{
-	Exec::ThreadKill(KCurrentThreadHandle, aType, aReason, aCategory);
-	}
-
-
-//
-#ifndef __GEN_USER_EXEC_CODE__
-
-class CProcess : public CBase
-	{
-
-	};
-
-
-
-//RHeap gAllocator;
-
+// Copyright (c) 1995-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\euser\epoc\win32\uc_exec.cpp
+// 
+//
+
+
+//#define __GEN_USER_EXEC_CODE__
+
+#include "../win32/uc_std.h"
+#include <e32svr.h>
+#include <emulator.h>
+
+//
+#include <stdlib.h>
+#include <stdio.h>
+
+/*
+Symbian compatibility executive panics
+*/
+enum TSymcExecPanic
+	{
+	ESymcExecPanicHeapAlreadyExists,
+	ESymcExecPanicCreateHeapFailed
+	};
+
+void Panic(TInt aReason)
+	{
+	_LIT(KCategory,"SYMC-Exec");
+	User::Panic(KCategory,aReason);
+	}
+
+
+
+
+//
+
+
+typedef TInt (__fastcall *TDispatcher)(TInt, TInt*);
+TInt __fastcall LazyDispatch(TInt aFunction, TInt* aArgs);
+
+#pragma data_seg(".data2")
+#ifdef __VC32__
+#pragma bss_seg(".data2")
+#endif
+static TDispatcher TheDispatcher = &LazyDispatch;
+#pragma data_seg()
+#ifdef __VC32__
+#pragma bss_seg()
+#endif
+
+TInt __fastcall LazyDispatch(TInt aFunction, TInt* aArgs)
+	{
+	//SL:
+	HINSTANCE kernel = GetModuleHandleA("ekern.dll");
+	//HINSTANCE kernel = GetModuleHandleA("ekern.exe");
+	if (kernel)
+		{
+		TDispatcher dispatcher = (TDispatcher)Emulator::GetProcAddress(kernel, (LPCSTR)1);
+		if (dispatcher)
+			{
+			TheDispatcher = dispatcher;
+			return dispatcher(aFunction, aArgs);
+			}
+		}
+	ExitProcess(101);
+	return 0;
+	}
+
+#include <u32exec.h>
+
+/******************************************************************************
+ * Slow executive calls with preprocessing or extra arguments
+ ******************************************************************************/
+
+__NAKED__ TInt Exec::SessionSend(TInt /*aHandle*/, TInt /*aFunction*/, TAny* /*aPtr*/, TRequestStatus* /*aStatus*/)
+//
+// Send a blind message to the server.
+//
+	{
+	__DISPATCH(EExecSessionSend|EXECUTIVE_SLOW)
+	}
+
+__NAKED__ TInt Exec::SessionSendSync(TInt /*aHandle*/, TInt /*aFunction*/, TAny* /*aPtr*/, TRequestStatus* /*aStatus*/)
+//
+// Send a blind message to the server using thread's dedicated message slot.
+//
+	{
+	__DISPATCH(EExecSessionSendSync|EXECUTIVE_SLOW)
+	}
+
+
+__NAKED__ TInt Exec::MessageIpcCopy(TInt /*aHandle*/, TInt /*aParam*/, SIpcCopyInfo& /*aInfo*/, TInt /*anOffset*/)
+//
+// Perform a descriptor-to-descriptor IPC copy
+//
+	{
+
+	__DISPATCH(EExecMessageIpcCopy|EXECUTIVE_SLOW)
+	}
+
+__NAKED__ TInt Exec::BTraceOut(TUint32 /*a0*/, TUint32 /*a1*/, const BTrace::SExecExtension& /*aExtension*/, TInt /*aDataSize*/)
+	{
+	__DISPATCH(EExecBTraceOut|EXECUTIVE_SLOW)
+	}
+
+__NAKED__ TInt Exec::BTraceOutBig(TUint32 /*a0*/, TUint32 /*a1*/, const BTrace::SExecExtension& /*aExtension*/, TInt /*aDataSize*/)
+	{
+	__DISPATCH(EExecBTraceOutBig|EXECUTIVE_SLOW)
+	}
+
+__NAKED__ TInt Exec::UTraceOut(TUint32 /*a0*/, TUint32 /*a1*/, const BTrace::SExecExtension& /*aExtension*/, TInt /*aDataSize*/)
+	{
+	__DISPATCH(EExecUTraceOut|EXECUTIVE_SLOW)
+	}
+
+EXPORT_C TBool BTrace::Out(TUint32 a0, TUint32 a1, TUint32 a2, TUint32 a3)
+	{
+	BTrace::SExecExtension ext;
+	ext.iA2 = a2;
+	ext.iA3 = a3;
+	ext.iPc = (&a0)[-1]; // return address on X86
+	return Exec::BTraceOut(a0,a1,ext,0);
+	}
+
+EXPORT_C TBool BTrace::OutX(TUint32 a0, TUint32 a1, TUint32 a2, TUint32 a3)
+	{
+	BTrace::SExecExtension ext;
+	ext.iA2 = a2;
+	ext.iA3 = a3;
+	ext.iPc = (&a0)[-1]; // return address on X86
+	return Exec::BTraceOut(a0,a1,ext,0);
+	}
+
+EXPORT_C TBool BTrace::OutN(TUint32 a0, TUint32 a1, TUint32 a2, const TAny* aData, TInt aDataSize)
+	{
+	BTrace::SExecExtension ext;
+	ext.iA2 = a2;
+	ext.iA3 = (TUint32)aData;
+	ext.iPc = (&a0)[-1]; // return address on X86
+	return Exec::BTraceOut(a0,a1,ext,aDataSize);
+	}
+
+EXPORT_C TBool BTrace::OutNX(TUint32 a0, TUint32 a1, TUint32 a2, const TAny* aData, TInt aDataSize)
+	{
+	BTrace::SExecExtension ext;
+	ext.iA2 = a2;
+	ext.iA3 = (TUint32)aData;
+	ext.iPc = (&a0)[-1]; // return address on X86
+	return Exec::BTraceOut(a0,a1,ext,aDataSize);
+	}
+
+EXPORT_C TBool BTrace::OutBig(TUint32 a0, TUint32 a1, const TAny* aData, TInt aDataSize)
+	{
+	BTrace::SExecExtension ext;
+	ext.iA2 = 0;
+	ext.iA3 = (TUint32)aData;
+	ext.iPc = (&a0)[-1]; // return address on X86
+
+	if((TUint)aDataSize>8u)
+		{
+		if((TUint)aDataSize>KMaxBTraceDataArray+4u)
+			return Exec::BTraceOutBig(a0,a1,ext,aDataSize);
+		a0 += 4;
+		aDataSize -= 4;
+		ext.iA2 = *((TUint32*&)aData)++;
+		ext.iA3 = (TUint32)aData;
+		return Exec::BTraceOut(a0,a1,ext,aDataSize);
+		}
+
+	if((TUint)aDataSize>4u)
+		ext.iA3 = ((TUint32*)aData)[1];
+	if(aDataSize)
+		ext.iA2 = ((TUint32*)aData)[0];
+	a0 += aDataSize;
+	aDataSize = 0;
+	return Exec::BTraceOut(a0,a1,ext,aDataSize);
+	}
+
+EXPORT_C TBool BTrace::OutFiltered(TUint32 a0, TUint32 a1, TUint32 a2, TUint32 a3)
+	{
+	BTrace::SExecExtension ext;
+	a0 |= EMissingRecord<<BTrace::EFlagsIndex*8; // overload meaning of this flag to indicate filtered trace
+	ext.iA2 = a2;
+	ext.iA3 = a3;
+	ext.iPc = (&a0)[-1]; // return address on X86
+	return Exec::BTraceOut(a0,a1,ext,0);
+	}
+
+EXPORT_C TBool BTrace::OutFilteredX(TUint32 a0, TUint32 a1, TUint32 a2, TUint32 a3)
+	{
+	BTrace::SExecExtension ext;
+	a0 |= EMissingRecord<<BTrace::EFlagsIndex*8; // overload meaning of this flag to indicate filtered trace
+	ext.iA2 = a2;
+	ext.iA3 = a3;
+	ext.iPc = (&a0)[-1]; // return address on X86
+	return Exec::BTraceOut(a0,a1,ext,0);
+	}
+
+EXPORT_C TBool BTrace::OutFilteredN(TUint32 a0, TUint32 a1, TUint32 a2, const TAny* aData, TInt aDataSize)
+	{
+	BTrace::SExecExtension ext;
+	a0 |= EMissingRecord<<BTrace::EFlagsIndex*8; // overload meaning of this flag to indicate filtered trace
+	ext.iA2 = a2;
+	ext.iA3 = (TUint32)aData;
+	ext.iPc = (&a0)[-1]; // return address on X86
+	return Exec::BTraceOut(a0,a1,ext,aDataSize);
+	}
+
+EXPORT_C TBool BTrace::OutFilteredNX(TUint32 a0, TUint32 a1, TUint32 a2, const TAny* aData, TInt aDataSize)
+	{
+	BTrace::SExecExtension ext;
+	a0 |= EMissingRecord<<BTrace::EFlagsIndex*8; // overload meaning of this flag to indicate filtered trace
+	ext.iA2 = a2;
+	ext.iA3 = (TUint32)aData;
+	ext.iPc = (&a0)[-1]; // return address on X86
+	return Exec::BTraceOut(a0,a1,ext,aDataSize);
+	}
+
+EXPORT_C TBool BTrace::OutFilteredBig(TUint32 a0, TUint32 a1, const TAny* aData, TInt aDataSize)
+	{
+	BTrace::SExecExtension ext;
+	a0 |= EMissingRecord<<BTrace::EFlagsIndex*8; // overload meaning of this flag to indicate filtered trace
+	ext.iA2 = 0;
+	ext.iA3 = (TUint32)aData;
+	ext.iPc = (&a0)[-1]; // return address on X86
+
+	if((TUint)aDataSize>8u)
+		{
+		if((TUint)aDataSize>KMaxBTraceDataArray+4u)
+			return Exec::BTraceOutBig(a0,a1,ext,aDataSize);
+		a0 += 4;
+		aDataSize -= 4;
+		ext.iA2 = *((TUint32*&)aData)++;
+		ext.iA3 = (TUint32)aData;
+		return Exec::BTraceOut(a0,a1,ext,aDataSize);
+		}
+
+	if((TUint)aDataSize>4u)
+		ext.iA3 = ((TUint32*)aData)[1];
+	if(aDataSize)
+		ext.iA2 = ((TUint32*)aData)[0];
+	a0 += aDataSize;
+	aDataSize = 0;
+	return Exec::BTraceOut(a0,a1,ext,aDataSize);
+	}
+
+EXPORT_C TBool BTrace::OutFilteredPcFormatBig(TUint32 aHeader, TUint32 aModuleUid, TUint32 aPc, TUint16 aFormatId, const TAny* aData, TInt aDataSize)
+	{
+ 	BTrace::SExecExtension ext;
+	aHeader |= EMissingRecord<<BTrace::EFlagsIndex*8; // overload meaning of this flag to indicate filtered trace
+	ext.iA2 = aFormatId;
+	ext.iA3 = (TUint32)aData;
+	ext.iPc = aPc;
+
+	if((TUint)aDataSize>KMaxBTraceDataArray)
+		return Exec::UTraceOut(aHeader,aModuleUid,ext,aDataSize);
+	aHeader += 4;
+	return Exec::BTraceOut(aHeader,aModuleUid,ext,aDataSize);
+	}
+
+__NAKED__ void ExecRequestComplete(TInt /*aHandle*/, TRequestStatus*& /*aStatus*/, TInt /*aReason*/)
+	{
+	_asm mov ecx, [esp+8]			// ecx = TRequestStatus**
+	_asm xor eax, eax				//
+	_asm lock xchg eax, [ecx]		// eax=TRequestStatus*, zero TRequestStatus*
+	_asm cmp eax, 0					//
+	_asm je ExecRequestComplete_ret
+	_asm mov ecx, [esp+12]			// ecx = aReason
+	_asm mov [eax], ecx				// store aReason in request status
+	__DISPATCH(EExecThreadRequestSignal|EXECUTIVE_SLOW)
+	_asm ExecRequestComplete_ret: ret
+	}
+
+
+
+
+EXPORT_C void RThread::RequestComplete(TRequestStatus*& aStatus, TInt aReason) const
+/**
+Signals this thread that an asynchronous request originating from this thread,
+is complete.
+
+The request is associated with the specified request status object supplied
+by this thread.
+
+Typically, the caller of this function is the service provider responsible
+for satisfying the request made by this thread.
+
+The request is completed with the completion code passed in aReason. This
+value is copied into this thread's request status, *aStatus, before signalling
+this thread's request semaphore.
+
+The meaning of the completion code is a matter of convention to be decided
+between the service provider and this thread.
+
+In a client-server situation, completion of a request takes place in the context
+of the server thread, but the pointer is interpreted in the address space
+of the client.
+
+It is often the case in client-server situations that the client and the server
+are in the same address space (i.e. the same process).
+
+Setting the pointer to the request status to NULL is a convenience, not all
+servers need it.
+
+@param aStatus A reference to a pointer to the request status originally
+               supplied by this thread. This is a pointer into this thread's
+               address space, which may be different to the thread currently
+               executing (this code). On return, the pointer to the request
+               status is set to NULL.
+
+@param aReason The completion code of this request.
+*/
+	{
+	ExecRequestComplete(iHandle,aStatus,aReason);
+	}
+
+
+
+/**
+Signal this threads request semaphore.
+
+This is similar to RThread::RequestComplete() except that no TRequestStatus object
+is modified.
+
+May only be used to signal a thread in the same process as the callers.
+
+@panic KERN-EXEC 46 if the thread is not in the same process as the callers
+*/
+EXPORT_C void RThread::RequestSignal() const
+	{
+	Exec::ThreadRequestSignal(iHandle);
+	}
+
+
+
+void ExitCurrentThread(TExitType aType, TInt aReason, const TDesC8* aCategory)
+	{
+	Exec::ThreadKill(KCurrentThreadHandle, aType, aReason, aCategory);
+	}
+
+
+//
+#ifndef __GEN_USER_EXEC_CODE__
+
+/*
+Object used to store process globals for our pseudo kernel.
+*/
+class TProcess
+	{
+public:
+	void CreateHeap();
+	void Free();
+
+public:
+	RHeap* iAllocator;
+	TAny* iBase;
+	};
+
+void TProcess::CreateHeap()
+	{
+	__ASSERT_ALWAYS(iAllocator==NULL && iBase==NULL,Panic(ESymcExecPanicHeapAlreadyExists));	
+	iBase=malloc(1024*10);
+	__ASSERT_ALWAYS(iBase!=NULL,Panic(ESymcExecPanicCreateHeapFailed));	
+	iAllocator=UserHeap::FixedHeap(iBase,1024*10);
+	__ASSERT_ALWAYS(iAllocator!=NULL,Panic(ESymcExecPanicCreateHeapFailed));	
+	}
+
+void TProcess::Free()
+	{
+	free(iBase);
+	}
+
+
+
+TProcess gProcess;
+
+
+
+//RHeap gAllocator;
+
 __EXECDECL__ void Exec::WaitForAnyRequest()
 	{
 	FAST_EXEC0(EFastExecWaitForAnyRequest);
 	}
 
 __EXECDECL__ RAllocator* Exec::Heap()
-	{
-	
-	FAST_EXEC0(EFastExecHeap);
+	{	
+	//FAST_EXEC0(EFastExecHeap);
+	return gProcess.iAllocator;
 	}
 
 __EXECDECL__ RAllocator* Exec::HeapSwitch(RAllocator*)
@@ -839,9 +891,20 @@
 	SLOW_EXEC1(EExecAddEvent);
 	}
 
-__EXECDECL__ TAny* Exec::DllTls(TInt, TInt)
+__EXECDECL__ TAny* Exec::DllTls(TInt aHandle, TInt aDllUid)
 	{
-	SLOW_EXEC2(EExecDllTls);
+	//SLOW_EXEC2(EExecDllTls);
+	if (aHandle==-1 && aDllUid==-1)
+		{
+		//No TGlobalDestructorFunc ATM
+		return NULL;
+		}
+	else
+		{
+		//No sure what to do here
+		__BREAKPOINT();
+		}
+
 	}
 
 __EXECDECL__ TInt Exec::HalFunction(TInt, TInt, TAny*, TAny*)
@@ -1024,9 +1087,29 @@
 	SLOW_EXEC2(EExecProcessOpenById);
 	}
 
-__EXECDECL__ void Exec::ThreadKill(TInt, TExitType, TInt, const TDesC8*)
+__EXECDECL__ void Exec::ThreadKill(TInt aThreadHandle, TExitType aType, TInt aReason, const TDesC8* aCategory)
 	{
-	SLOW_EXEC4(EExecThreadKill);
+	//SLOW_EXEC4(EExecThreadKill);
+	if (aThreadHandle!=KCurrentThreadHandle)
+		{
+		//Not sure how to do that yet
+		__BREAKPOINT();
+		return;
+		}
+
+	if (aType==EExitPanic)
+		{
+		//Display message
+#ifdef _WINDOWS
+		TBuf8<256> buf;
+		buf.Copy(*aCategory);	
+		char errstr[256]; sprintf(errstr, "Category: %s\nReason: %d",buf.PtrZ(),aReason);
+		MessageBoxA(NULL,errstr, "PANIC", MB_OK | MB_ICONERROR);	
+#endif
+		__BREAKPOINT();
+		}
+	
+	exit(aType);
 	}
 
 __EXECDECL__ void Exec::ThreadLogon(TInt, TRequestStatus*, TBool)
@@ -1256,12 +1339,13 @@
 
 __EXECDECL__ TInt E32Loader::StaticCallList(TInt& aEntryPointCount, TLinAddr* /*aUnused*/)
 	{
-	SLOW_EXEC2(EExecStaticCallList);
+	//SLOW_EXEC2(EExecStaticCallList);
 	//SL: We hijack this function for initializing our process see User::InitProcess
-	//aEntryPointCount=0; //Tell the caller we don't have any DLL entry point
-	//__asm ret;
+	aEntryPointCount=0; //Tell the caller we don't have any DLL entry point
 	
-	//return KErrNone;
+	gProcess.CreateHeap();
+
+	return KErrNone;
 	}
 
 __EXECDECL__ TInt E32Loader::LibraryDetach(TInt&, TLinAddr*)
@@ -1276,7 +1360,9 @@
 
 __EXECDECL__ TInt Exec::LastThreadHandle()
 	{
-	SLOW_EXEC0(EExecLastThreadHandle);
+	//SLOW_EXEC0(EExecLastThreadHandle);
+	//Not sure what to do with that returning 0 seams appropriate for now
+	return 0;
 	}
 
 __EXECDECL__ void Exec::ThreadRendezvous(TInt)
@@ -1664,9 +1750,18 @@
 	SLOW_EXEC1(EExecRegisterTrustedChunk);
 	}
 
-__EXECDECL__ TBool Exec::UserThreadExiting(TInt)
+/*
+Notify the kernel a thread is exiting.
+
+@param Exit reason
+@return ETrue if this is the last thread in the process, EFalse otherwise.
+*/
+__EXECDECL__ TBool Exec::UserThreadExiting(TInt aReason)
 	{
-	SLOW_EXEC1(EExecUserThreadExiting);
+	//SLOW_EXEC1(EExecUserThreadExiting);
+	gProcess.Free();
+
+	return ETrue; //No thread support ATM so we are always the last thread
 	}
 
 __EXECDECL__ TBool Exec::ChunkIsPaged(TInt)
@@ -1733,9 +1828,9 @@
 	{
 	SLOW_EXEC2(EExecShBufBaseAndSize);
 	}
-
-
-
-#endif
-
-
+
+
+
+#endif
+
+
--- a/kernel/eka/euser/epoc/win32/uc_epoc.cpp	Mon Apr 26 23:41:25 2010 +0200
+++ b/kernel/eka/euser/epoc/win32/uc_epoc.cpp	Tue Apr 27 17:12:11 2010 +0200
@@ -19,6 +19,9 @@
 #include <e32std_private.h>
 #include <e32wins.h>
 
+//#include <e32cmn.h>
+#include <nwdl.h>
+
 #if defined __SYMC__
 
 //SL: Empty on FCL ?
@@ -27,21 +30,29 @@
 GLDEF_C TInt E32Main()
 	{
 	//What do we do then
-	User::InitProcess();
+	
+	__UHEAP_MARK;
 
 	//CBase* base=new(ELeave) CBase();
 	CBase* base=new CBase();
 	delete base;
 
+	TUint8* test=new TUint8[1024*9];
+	delete[] test;
+
+	__UHEAP_MARKEND;
+
 	return KErrNone;
 	}
 
 
 TInt main()
 	{
+	User::InitProcess();
 	//BootEpoc(ETrue);
 	E32Main();
 
+	User::Exit(0);
 	return 0;
 	}
 
--- a/kernel/eka/include/u32exec.h	Mon Apr 26 23:41:25 2010 +0200
+++ b/kernel/eka/include/u32exec.h	Tue Apr 27 17:12:11 2010 +0200
@@ -36,7 +36,11 @@
 #define	EXEC_TIME		TInt64
 #endif
 
+#ifdef __SYMC__
+#define __EXECDECL__
+#else
 #define __EXECDECL__	__NAKED__
+#endif
 
 #if defined(__WINS__)