X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc%2B%2B.so_src%2Fexception_handling.cc;h=81d460524443a3b42a66a670513a438b02beba0b;hb=0bdeb975f85bc9d75c5d1c887c8863e59874ec6a;hp=d5a221954937614daf69b5935fec2bcbef9a29f9;hpb=2cd79a3fd753af70c822c72a4a1c64b5ba510779;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc++.so_src/exception_handling.cc b/Usermode/Libraries/libc++.so_src/exception_handling.cc
index d5a22195..81d46052 100644
--- a/Usermode/Libraries/libc++.so_src/exception_handling.cc
+++ b/Usermode/Libraries/libc++.so_src/exception_handling.cc
@@ -1,4 +1,17 @@
 /*
+ * Acess2 C++ Support Library
+ * - By John Hodge (thePowersGang)
+ *
+ * exception_handling.cc
+ * - Exception handling code (defined by C++ ABI)
+ *
+ * References:
+ * - LLVM Exception handling
+ *  > http://llvm.org/docs/ExceptionHandling.html
+ * - Itanium C++ ABI
+ *  >http://mentorembedded.github.io/cxx-abi/abi-eh.html
+ * - HP's "aC++" Document, Ch 7 "Exception Handling Tables"
+ *  > http://mentorembedded.github.io/cxx-abi/exceptions.pdf
  */
 #include <typeinfo>
 #include <cstdint>
@@ -6,10 +19,18 @@
 #include <cstdlib>
 #include <cstring>
 #include <exception>
-#include "exception_handling.h"
+#include "exception_handling_cxxabi.h"
 
 #include <acess/sys.h>
 
+#define DEBUG_ENABLED	1
+
+#if DEBUG_ENABLED
+# define	DEBUG(v...)	::_SysDebug(v)
+#else
+# define	DEBUG(v...)	do{}while(0)
+#endif
+
 /*__thread*/ struct __cxa_eh_globals {
 	__cxa_exception	*caughtExceptions;
 	unsigned  int	uncaughtExceptions;
@@ -45,7 +66,7 @@ extern "C" void __cxa_call_unexpected(void *)
 
 extern "C" void *__cxa_allocate_exception(size_t thrown_size)
 {
-	::_SysDebug("__cxa_allocate_exception(%i)", thrown_size);
+	DEBUG("__cxa_allocate_exception(%i)", thrown_size);
 	__cxa_exception	*ret = static_cast<__cxa_exception*>( malloc( sizeof(__cxa_exception) + thrown_size ) );
 	if( !ret ) {
 		if( thrown_size <= sizeof(emergency_exception.buf) && TEST_AND_SET(emergency_exception_used) )
@@ -57,13 +78,13 @@ extern "C" void *__cxa_allocate_exception(size_t thrown_size)
 		_SysDebug("__cxa_allocate_exception - No free space");
 		::std::terminate();
 	}
-	::_SysDebug("__cxa_allocate_exception: return %p", ret+1);
+	DEBUG("__cxa_allocate_exception: return %p", ret+1);
 	return ret + 1;
 }
 
 extern "C" void __cxa_free_exception(void *thrown_exception)
 {
-	::_SysDebug("__cxa_free_exception(%p)", thrown_exception);
+	DEBUG("__cxa_free_exception(%p)", thrown_exception);
 	if(thrown_exception == &emergency_exception.buf) {
 		//assert(emergency_exception_used);
 		emergency_exception_used = false;
@@ -76,13 +97,15 @@ extern "C" void __cxa_free_exception(void *thrown_exception)
 
 extern "C" void __cxa_throw(void *thrown_exception, std::type_info *tinfo, void (*dest)(void*))
 {
-	::_SysDebug("__cxa_throw(%p,%p,%p) '%s'", thrown_exception, tinfo, dest, tinfo->name());
-	::_SysDebug("- by %p", __builtin_return_address(0));
+	#if DEBUG_ENABLED
+	DEBUG("__cxa_throw(%p,%p,%p) '%s' by %p",
+		thrown_exception, tinfo, dest, tinfo->name(), __builtin_return_address(0)
+		);
 	{
 		const ::std::exception* e = reinterpret_cast<const ::std::exception*>(thrown_exception);
-		::_SysDebug("- e.what() = '%s'", e->what());
+		DEBUG("- e.what() = '%s'", e->what());
 	}
-	::_SysDebug("- typeid(*tinfo) = %p", &typeid(*tinfo));
+	#endif
 
 	__cxa_exception	*except = static_cast<__cxa_exception*>( thrown_exception ) - 1;
 	
@@ -90,19 +113,19 @@ extern "C" void __cxa_throw(void *thrown_exception, std::type_info *tinfo, void
 	except->terminateHandler = 0;
 	except->exceptionType = tinfo;
 	except->exceptionDestructor = dest;
-	memcpy(&except->unwindHeader.exception_class, "Ac20C++\0", 8);
+	memcpy(&except->unwindHeader.exception_class, EXCEPTION_CLASS_ACESS, 8);
 	__cxa_get_globals()->uncaughtExceptions ++;
 	
-	int rv = _Unwind_RaiseException(thrown_exception);
+	int rv = _Unwind_RaiseException( &except->unwindHeader );
 	
 	::_SysDebug("__cxa_throw(%p,%s) :: UNCAUGHT %i", thrown_exception, tinfo->name(), rv);
 	::std::terminate();
 }
 
-extern "C" void *__cxa_begin_catch(void *exceptionObject)
+extern "C" void *__cxa_begin_catch(_Unwind_Exception *exceptionObject)
 {
-	::_SysDebug("__cxa_begin_catch(%p)", exceptionObject);
-	__cxa_exception	*except = static_cast<__cxa_exception*>( exceptionObject ) - 1;
+	__cxa_exception	*except = reinterpret_cast<__cxa_exception*>( exceptionObject+1 )-1;
+	DEBUG("__cxa_begin_catch(%p) - except=%p", exceptionObject, except);
 	
 	except->handlerCount ++;
 	
@@ -111,13 +134,13 @@ extern "C" void *__cxa_begin_catch(void *exceptionObject)
 	
 	__cxa_get_globals_fast()->uncaughtExceptions --;
 	
-	return except;
+	return except+1;
 }
 
 extern "C" void __cxa_end_catch()
 {
 	struct __cxa_exception	*except = __cxa_get_globals()->caughtExceptions;
-	::_SysDebug("__cxa_end_catch - %p", except);
+	DEBUG("__cxa_end_catch - %p", except);
 	except->handlerCount --;
 	__cxa_get_globals()->caughtExceptions = except->nextException;
 	
@@ -126,3 +149,4 @@ extern "C" void __cxa_end_catch()
 	}
 }
 
+