Adding includes to project. Slow progress on the process init sequence. anywhere
authorSlion
Mon, 26 Apr 2010 23:41:25 +0200
branchanywhere
changeset 93 7c26c0978cbf
parent 92 14c2cc33e762
child 94 f36eb4948686
Adding includes to project. Slow progress on the process init sequence.
kernel/eka/euser/CMakeLists.txt
kernel/eka/euser/epoc/symc/uc_exec.cpp
kernel/eka/euser/epoc/win32/uc_epoc.cpp
--- a/kernel/eka/euser/CMakeLists.txt	Mon Apr 26 18:47:40 2010 +0200
+++ b/kernel/eka/euser/CMakeLists.txt	Mon Apr 26 23:41:25 2010 +0200
@@ -118,6 +118,119 @@
 collate.cpp unicode.cpp unitable.cpp Compare.cpp
 )
 
+
+#Adding headers
+set (sourcepath ../include/)
+add_source(
+byte_pair_compress.h
+collate.h
+cpudefs.h
+d32btrace.h
+d32camerasc.h
+d32comm.h
+d32ethernet.h
+d32fir.h
+d32locd.h
+d32otgdi.h
+d32otgdi_errors.h
+d32public.h
+d32resmanus.h
+d32soundsc.h
+d32usbc.h
+d32usbcsc.h
+d32usbcshared.h
+d32usbdescriptors.h
+d32usbdi.h
+d32usbdi_errors.h
+d32usbdi_hubdriver.h
+d32usbtransfers.h
+d32video.h
+dispchannel.h
+e32atomics.h
+e32base.h
+e32base_private.h
+e32btrace.h
+e32capability.h
+e32cia.h
+e32cmn.h
+e32cmn_private.h
+e32cons.h
+e32const.h
+e32const_private.h
+e32debug.h
+e32def.h
+e32def_private.h
+e32des16.h
+e32des16_private.h
+e32des8.h
+e32des8_private.h
+e32err.h
+e32event.h
+e32event_private.h
+e32hal.h
+e32hashtab.h
+e32huffman.h
+e32keys.h
+e32kpan.h
+e32ktran.h
+e32lang.h
+e32ldr.h
+e32ldr_private.h
+e32lmsg.h
+e32math.h
+e32modes.h
+e32msgqueue.h
+e32notif.h
+e32panic.h
+e32power.h
+e32property.h
+e32reg.h
+e32rom.h
+e32shbuf.h
+e32shbufcmn.h
+e32shbuf_priv.h
+e32std.h
+e32std_private.h
+e32svr.h
+e32test.h
+e32twin.h
+e32uid.h
+e32utf.h
+e32utrace_basic_types.h
+e32ver.h
+e32wins.h
+emulator.h
+exec_enum.h
+exec_user.h
+gcc.h
+k32keys.h
+kernperflogger.h
+nwdl.h
+opensystemtrace.h
+opensystemtrace_types.h
+partitions.h
+pixelformats.h
+rm_debug_api.h
+rpipe.h
+sm_debug_api.h
+twintnotifier.h
+u32exec.h
+u32hal.h
+u32property.h
+u32std.h
+unicode.h
+usb.h
+videodriver.h
+w32disp.h
+win32atx.h
+win32crt.h
+winsdef.h
+ws_std.h
+)
+
+
+
+
 #define our target
 
 ### EMULATOR: used by euser and kernel for emulation
--- a/kernel/eka/euser/epoc/symc/uc_exec.cpp	Mon Apr 26 18:47:40 2010 +0200
+++ b/kernel/eka/euser/epoc/symc/uc_exec.cpp	Mon Apr 26 23:41:25 2010 +0200
@@ -16,7 +16,7 @@
 //
 
 
-#define __GEN_USER_EXEC_CODE__
+//#define __GEN_USER_EXEC_CODE__
 
 #include "../win32/uc_std.h"
 #include <e32svr.h>
@@ -329,6 +329,12 @@
 //
 #ifndef __GEN_USER_EXEC_CODE__
 
+class CProcess : public CBase
+	{
+
+	};
+
+
 
 //RHeap gAllocator;
 
@@ -1248,9 +1254,14 @@
 	SLOW_EXEC1(EExecLibraryAttached);
 	}
 
-__EXECDECL__ TInt E32Loader::StaticCallList(TInt&, TLinAddr*)
+__EXECDECL__ TInt E32Loader::StaticCallList(TInt& aEntryPointCount, TLinAddr* /*aUnused*/)
 	{
 	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;
+	
+	//return KErrNone;
 	}
 
 __EXECDECL__ TInt E32Loader::LibraryDetach(TInt&, TLinAddr*)
--- a/kernel/eka/euser/epoc/win32/uc_epoc.cpp	Mon Apr 26 18:47:40 2010 +0200
+++ b/kernel/eka/euser/epoc/win32/uc_epoc.cpp	Mon Apr 26 23:41:25 2010 +0200
@@ -27,8 +27,10 @@
 GLDEF_C TInt E32Main()
 	{
 	//What do we do then
+	User::InitProcess();
 
-	CBase* base=new(ELeave) CBase();
+	//CBase* base=new(ELeave) CBase();
+	CBase* base=new CBase();
 	delete base;
 
 	return KErrNone;
@@ -37,7 +39,9 @@
 
 TInt main()
 	{
-	BootEpoc(ETrue);
+	//BootEpoc(ETrue);
+	E32Main();
+
 	return 0;
 	}