FCL/sf/os/kernelhwsrv: comparison kernel/eka/compsupp/symaehabi/symbian

equal deleted inserted replaced

-:57b9594f5772
+:0008ccd16016
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of the License "ARM EABI LICENCE.txt"
 // which accompanies this distribution, and is available
 // in kernel/eka/compsupp.
 //
 // Contributors:
 //
 // Description:
 // e32/compsupp/symaehabi/symbian_support.cpp
 //
 //
 /* Environment: */
 #include "unwind_env.h"
 /* Language-independent unwinder declarations: */
 namespace NAMES { void default_unexpected_handler(void); }
 EXPORT_C TCppRTExceptionsGlobals::TCppRTExceptionsGlobals()
 	{
 	buffer.inuse = false;
+	buffer.em_buf2_p = NULL;
 	thread_globals.uncaughtExceptions = 0;
 	thread_globals.unexpectedHandler = NAMES::default_unexpected_handler;
 	thread_globals.terminateHandler = __default_terminate_handler;
 	thread_globals.implementation_ever_called_terminate = false;
 	thread_globals.call_hook = NULL;
 	thread_globals.caughtExceptions = NULL;
 	thread_globals.propagatingExceptions = NULL;
 	thread_globals.emergency_buffer = &buffer;
 	Dll::SetTls(this);
 	}
+EXPORT_C void TCppRTExceptionsGlobals::Init2ndEmergencyBuffer()
+	{
+	ASSERT(buffer.em_buf2_p == NULL);
+	TEmergencyBuffer2* p = (TEmergencyBuffer2*) User::Alloc( sizeof(TEmergencyBuffer2) );
+	if (!p)
+		abort();
+	p->Init();
+	buffer.em_buf2_p = p;
+	}
+EXPORT_C void TCppRTExceptionsGlobals::Kill2ndEmergencyBuffer()
+	{
+	ASSERT(buffer.em_buf2_p);
+	User::Free(buffer.em_buf2_p);
+	}
 #if __ARMCC_VERSION < 220000
 extern "C"
 {
 /*
 we have to dummy up the following for 2.1. The names changed in the def file
 since in 2.2 catch handlers should be able to deal with imported RTTI
 	{
 	// reserve a DEF file slot for RTTI
 	}
 }
 #else
 // This is the key function that forces the class impedimenta to be get exported in RVCT 2.2 and later.
 EXPORT_C void XLeaveException::ForceKeyFunction(){}
 #endif
 #if 0
 	if (!aEDp)
 		{
 		// look in extension ROM if there is one
 		TUint main_start = UserSvr::RomHeaderAddress();
 		TUint main_end = main_start + ((TRomHeader*)main_start)->iUncompressedSize;
 		TUint rda = UserSvr::RomRootDirectoryAddress();
 		// Assume rom starts on multiple of 4k
 		if (rda > main_end)
 			{
 			// ASSUMPTIONS HERE
 			// 1. root directory is past the end of the main ROM so there must be an extension ROM
 			// 2. the ROM file system in the extension ROM is at the beginning of the ROM (similar to the
 			//    main ROM)
 			// 3. the extension ROM is mapped starting at a megabyte boundary
 			// Thus the address of the extension ROM header may be obtained by rounding the root directory
 			// address down to the next megabyte boundary.
 			TUint ext_start = rda &~ 0x000fffffu;
 			TRomExceptionSearchTable* extrom_exctab = (TRomExceptionSearchTable*)(((TExtensionRomHeader*)ext_start)->iRomExceptionSearchTable);
 			if (extrom_exctab && addr >= extrom_exctab->iEntries[0] && addr < GET_EST_FENCEPOST(extrom_exctab))
 				aEDp = SearchEST(addr, extrom_exctab);
 			}
 class TestOverflowTruncate8 : public TDes8Overflow
 	{
 public:
 	virtual void Overflow(TDes8& /*aDes*/) {}
 	};
 #endif
 void DebugPrintf(const char * aFmt, ...)
 	{
 #ifdef _DEBUG
 	buf2.Copy(buf);
 	if (buf2[buf2.Length()-1]=='\n') buf2.Append('\r');
 	RDebug::RawPrint(buf2);
 #else
 	(void)aFmt;
 #endif
 	}
 } // extern "C"

changeset 266	0008ccd16016
parent 0	a41df078684a