Merge pull request #1453 from WalterBright/add-dwarfeh-d

add src/rt/dwarfeh.d
dlang · Dec 28, 2015 · 4ed3b72 · 4ed3b72
2 parents 700aad6 + 3b034f7
commit 4ed3b72
Show file tree

Hide file tree

Showing 4 changed files with 757 additions and 5 deletions.
diff --git a/mak/MANIFEST b/mak/MANIFEST
@@ -386,6 +386,7 @@ MANIFEST=\
 	src\rt\deh_win32.d \
 	src\rt\deh_win64_posix.d \
 	src\rt\dmain2.d \
+	src\rt\dwarfeh.d \
 	src\rt\dylib_fixes.c \
 	src\rt\invariant.d \
 	src\rt\lifetime.d \

diff --git a/mak/SRCS b/mak/SRCS
@@ -267,6 +267,7 @@ SRCS=\
 	src\rt\deh_win32.d \
 	src\rt\deh_win64_posix.d \
 	src\rt\dmain2.d \
+	src\rt\dwarfeh.d \
 	src\rt\invariant.d \
 	src\rt\lifetime.d \
 	src\rt\llmath.d \

diff --git a/src/core/sys/unwind.d b/src/core/sys/unwind.d
@@ -21,7 +21,7 @@ alias uintptr_t _Unwind_Internal_Ptr;
 alias ulong _Unwind_Exception_Class;
 
 alias uintptr_t _uleb128_t;
-alias intptr_t sleb128_t;
+alias intptr_t _sleb128_t;
 
 alias int _Unwind_Reason_Code;
 enum
@@ -50,7 +50,7 @@ alias _Unwind_Exception_Cleanup_Fn = void function(
 
 struct _Unwind_Exception
 {
-    _Unwind_Exception_Class exception_class;
+    align(8) _Unwind_Exception_Class exception_class;
     _Unwind_Exception_Cleanup_Fn exception_cleanup;
     _Unwind_Word private_1;
     _Unwind_Word private_2;
@@ -100,9 +100,7 @@ version (X68_64)
 
     _Unwind_Ptr _Unwind_GetTextRelBase(_Unwind_Context* context)
     {
-        import core.stdc.stdlib;
-        abort();
-        return 0;
+        assert(0);
     }
 }
 else