Changeset 1584:f4c56ed32238

Timestamp:

10/20/09 23:46:56 (3 years ago)

Author:

tomas@localhost.localdomain

branch:

default

Message:

Fixed issue in exception runtime with recent LLVM revisions, with this in place EH seems to work properly on x86-64. These fixes need to be merged into tango trunk still!

Files:

• ir/irlandingpad.cpp (modified) (1 diff)
• runtime/internal/eh.d (modified) (8 diffs)

ir/irlandingpad.cpp

@@ -134 +134 @@
-    // if there's a finally, the eh table has to have a 0 action
-    if(hasFinally)
-
+DtoConstSize_t(0));//
-
-    // personality fn

runtime/internal/eh.d

@@ -9 +9 @@
-
-// debug = EH_personality;
+// debug = EH_personality_verbose;
-
-// current EH implementation works on x86
@@ -37 +38 @@
-extern(C)
-{
-
+ : int
-    {
-        NO_REASON = 0,
@@ -50 +51 @@
-    }
-
-
+ : int
-    {
-        SEARCH_PHASE = 1,
@@ -64 +65 @@
-    struct _Unwind_Exception
-    {
-char[8]
+ulong
-        _Unwind_Exception_Cleanup_Fn exception_cleanup;
-        ptrdiff_t private_1;
@@ -208 +209 @@
-extern(C) _Unwind_Reason_Code _d_eh_personality(int ver, _Unwind_Action actions, ulong exception_class, _Unwind_Exception* exception_info, _Unwind_Context_Ptr context)
-{
+  debug(EH_personality_verbose) printf("entering personality function. context: %p\n", context);
-  // check ver: the C++ Itanium ABI only allows ver == 1
-  if(ver != 1)
@@ -225 +227 @@
-  ClassInfo* classinfo_table;
-  _d_getLanguageSpecificTables(context, callsite_table, action_table, classinfo_table);
-
+
+
-
-  /*
@@ -378 +381 @@
-{
-  ubyte* data = cast(ubyte*)_Unwind_GetLanguageSpecificData(context);
+  if (data is null)
+  {
+    //printf("language specific data was null\n");
+    callsite = null;
+    action = null;
+    ci = null;
+    return;
+  }
-
-  //TODO: Do proper DWARF reading here
@@ -406 +417 @@
-    {
-        _d_exception* exc_struct = new _d_exception;
-[] = _d_exception_class
+ = *cast(ulong*)_d_exception_class.ptr
-        exc_struct.exception_object = e;
-        _Unwind_Reason_Code ret = _Unwind_RaiseException(&exc_struct.unwind_info);