diff options
| -rw-r--r-- | src/cxa_default_handlers.cpp | 2 | ||||
| -rw-r--r-- | src/cxa_exception.cpp | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/cxa_default_handlers.cpp b/src/cxa_default_handlers.cpp index 97192bc..573694d 100644 --- a/src/cxa_default_handlers.cpp +++ b/src/cxa_default_handlers.cpp @@ -52,7 +52,7 @@ static void demangling_terminate_handler() name = thrown_type->name(); // If the uncaught exception can be caught with std::exception& const __shim_type_info* catch_type = - static_cast<const __shim_type_info*>(&typeid(std::exception)); + static_cast<const __shim_type_info*>(&typeid(std::exception)); if (catch_type->can_catch(thrown_type, thrown_object)) { // Include the what() message from the exception diff --git a/src/cxa_exception.cpp b/src/cxa_exception.cpp index 54bd1df..ebb05ce 100644 --- a/src/cxa_exception.cpp +++ b/src/cxa_exception.cpp @@ -79,8 +79,8 @@ size_t cxa_exception_size_from_exception_thrown_size(size_t size) { } void __setExceptionClass(_Unwind_Exception* unwind_exception, uint64_t newValue) { - ::memcpy(&unwind_exception->exception_class, &newValue, sizeof(newValue)); - } + ::memcpy(&unwind_exception->exception_class, &newValue, sizeof(newValue)); +} static void setOurExceptionClass(_Unwind_Exception* unwind_exception) { @@ -93,13 +93,13 @@ static void setDependentExceptionClass(_Unwind_Exception* unwind_exception) { // Is it one of ours? uint64_t __getExceptionClass(const _Unwind_Exception* unwind_exception) { -// On x86 and some ARM unwinders, unwind_exception->exception_class is -// a uint64_t. On other ARM unwinders, it is a char[8] -// See: http://infocenter.arm.com/help/topic/com.arm.doc.ihi0038b/IHI0038B_ehabi.pdf -// So we just copy it into a uint64_t to be sure. - uint64_t exClass; - ::memcpy(&exClass, &unwind_exception->exception_class, sizeof(exClass)); - return exClass; + // On x86 and some ARM unwinders, unwind_exception->exception_class is + // a uint64_t. On other ARM unwinders, it is a char[8]. + // See: http://infocenter.arm.com/help/topic/com.arm.doc.ihi0038b/IHI0038B_ehabi.pdf + // So we just copy it into a uint64_t to be sure. + uint64_t exClass; + ::memcpy(&exClass, &unwind_exception->exception_class, sizeof(exClass)); + return exClass; } bool __isOurExceptionClass(const _Unwind_Exception* unwind_exception) { |