root/tango-0.99.9.patch

tango/core/rt/compiler/ldc/rt/lifetime.d

@@ -786 +786 @@
-    return *cast(long*)px;
-}
-
++/
-
-/**
- *
@@ -849 +850 @@
-
-
-/**
-
+ Appends a single element to an array.
- */
-ref byte[] x, ...
+void* array, void* element
-{
+    auto x = cast(byte[]*)array;
-    auto sizeelem = ti.next.tsize();            // array element size
-    auto info = gc_query(x.ptr);
-    auto length = x.length;
@@ -879 +881 @@
-        assert(newcap >= newlength * sizeelem);
-        newdata = cast(byte *)gc_malloc(newcap + 1, info.attr);
-        memcpy(newdata, x.ptr, length * sizeelem);
-(&x)
+x
-    }
-  L1:
-(&ti + 2)
+element
-
-&
+
-    x.ptr[length * sizeelem .. newsize] = argp[0 .. sizeelem];
-    assert((cast(size_t)x.ptr & 15) == 0);
-    assert(gc_sizeOf(x.ptr) > x.length * sizeelem);
-
+*
-}
-
-
@@ -1128 +1130 @@
-    return result;
-}
-
+/+
-
-/**
- *

tango/core/rt/compiler/ldc/rt/eh.d

@@ -1 +1 @@
-/**
- * This module contains functions and structures required for
-exception handling.
+dwarf exception handling with llvm
- */
-module rt.eh;
-
-
-
+
-
-// debug = EH_personality;
-
-// current EH implementation works on x86
-// if it has a working unwind runtime
-version(X86) {
-    version(linux) version=X86_UNWIND;
-    version(darwin) version=X86_UNWIND;
-    version(solaris) version=X86_UNWIND;
-    version(freebsd) version=X86_UNWIND;
-}
-version(X86_64) {
-    version(linux) version=X86_UNWIND;
-    version(darwin) version=X86_UNWIND;
-    version(solaris) version=X86_UNWIND;
-    version(freebsd) version=X86_UNWIND;
-}
-
-//version = HP_LIBUNWIND;
-
-private extern(C) void abort();
-private extern(C) int printf(char*, ...);
-
+//
-
-// D runtime functions
-extern(C) {
-
+
+
-}
-
-// libunwind headers
@@ -74 +70 @@
-// interface to HP's libunwind from http://www.nongnu.org/libunwind/
-version(HP_LIBUNWIND)
-{
+    // Haven't checked whether and how it has _Unwind_Get{Text,Data}RelBase
+    pragma (msg, "HP_LIBUNWIND interface is out of date and untested");
+
-    void __libunwind_Unwind_Resume(_Unwind_Exception *);
-    _Unwind_Reason_Code __libunwind_Unwind_RaiseException(_Unwind_Exception *);
-    ptrdiff_t __libunwind_Unwind_GetLanguageSpecificData(_Unwind_Context_Ptr
-            context);
-ptrdiff
+size
-    ptrdiff_t __libunwind_Unwind_SetIP(_Unwind_Context_Ptr context,
-            ptrdiff_t new_value);
-    ptrdiff_t __libunwind_Unwind_SetGR(_Unwind_Context_Ptr context, int index,
-            ptrdiff_t new_value);
-ptrdiff
+size
-
-    alias __libunwind_Unwind_Resume _Unwind_Resume;
-    alias __libunwind_Unwind_RaiseException _Unwind_RaiseException;
@@ -94 +93 @@
-    alias __libunwind_Unwind_SetGR _Unwind_SetGR;
-    alias __libunwind_Unwind_GetRegionStart _Unwind_GetRegionStart;
-}
- 
+
-{
-    void _Unwind_Resume(_Unwind_Exception*);
-    _Unwind_Reason_Code _Unwind_RaiseException(_Unwind_Exception*);
-    ptrdiff_t _Unwind_GetLanguageSpecificData(_Unwind_Context_Ptr context);
-ptrdiff
+size
-    ptrdiff_t _Unwind_SetIP(_Unwind_Context_Ptr context, ptrdiff_t new_value);
-    ptrdiff_t _Unwind_SetGR(_Unwind_Context_Ptr context, int index,
-            ptrdiff_t new_value);
-
+
+
+
+
-}
-else
-{
-    // runtime calls these directly
-    void _Unwind_Resume(_Unwind_Exception*)
-    {
-console
+printf
-    }
-    _Unwind_Reason_Code _Unwind_RaiseException(_Unwind_Exception*)
-    {
-console
+printf
-        return _Unwind_Reason_Code.FATAL_PHASE1_ERROR;
-    }
-}
@@ -122 +124 @@
-}
-
-// error and exit
-[] format
+* format, ...
-{
-
+
+
+
+
+
-  abort();
-}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-private ubyte* get_uleb128(ubyte* addr, ref size_t res)
-{
-  res = 0;
@@ -137 +286 @@
-
-  // read as long as high bit is set
-  while(*addr & 0x80) {
-
+U
-    bitsize += 7;
-    addr += 1;
-    if(bitsize >= size_t.sizeof*8)
@@ -153 +302 @@
-
-private ubyte* get_sleb128(ubyte* addr, ref ptrdiff_t res)
-{
-
+size_t t
-  size_t bitsize = 0;
-
-  // read as long as high bit is set
-  while(*addr & 0x80) {
-res |= (*addr & 0x7f
+tres |= (*addr & 0x7fU
-    bitsize += 7;
-    addr += 1;
-    if(bitsize >= size_t.sizeof*8)
@@ -167 +316 @@
-  // read last
-  if(bitsize != 0 && *addr >= 1 << size_t.sizeof*8 - bitsize)
-    fatalerror("tried to read sleb128 that exceeded size of size_t");
-
+t
-
-  // take care of sign
-(*addr) & 0x40)
-res |= cast(ptrdiff
+*addr & 0x40U) != 0
+tres |= cast(size
-
+  res = cast(ptrdiff_t)tres;
+
-  return addr + 1;
-}
-
@@ -190 +341 @@
-
-// the 8-byte string identifying the type of exception
-// the first 4 are for vendor, the second 4 for language
-
-
+
-
-
-//
@@ -201 +351 @@
-version(X86_UNWIND)
-{
-
+// Various stuff we need
+struct Region
+{
+  ubyte* callsite_table;
+  ubyte* action_table;
+
+  // Note: classinfo_table points past the end of the table
+  ubyte* classinfo_table;
+
+  size_t start;
+  size_t lpStart_base; // landing pad base
+
+  ubyte ttypeEnc;
+  size_t ttype_base; // typeinfo base
+
+  ubyte callSiteEnc;
+}
+
-// the personality routine gets called by the unwind handler and is responsible for
-// reading the EH tables and deciding what to do
-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) printf("Entering personality routine, context=%p\n", context);
-  // check ver: the C++ Itanium ABI only allows ver == 1
-  if(ver != 1)
+  {
+    debug(EH_personality) printf("eh version mismatch\n");
-    return _Unwind_Reason_Code.FATAL_PHASE1_ERROR;
+  }
-
-  // check exceptionClass
-  //TODO: Treat foreign exceptions with more respect
-
+
+
+
+
-    return _Unwind_Reason_Code.FATAL_PHASE1_ERROR;
+  }
-
-  // find call site table, action table and classinfo table
-  // Note: callsite and action tables do not contain static-length
-  // data and will be parsed as needed
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    return _Unwind_Reason_Code.CONTINUE_UNWIND;
+  }
-
+  debug(EH_personality) printf("yay, checking\n");
+  debug(EH_personality) printf("region.start = %p\n", region.start);
+
-  /*
-    find landing pad and action table index belonging to ip by walking
-    the callsite_table
-  */
-
+
+
+
+
-
-  // get the instruction pointer
-  // will be used to find the right entry in the callsite_table
-  // -1 because it will point past the last instruction
-
+
+
+
-
-  // address block_start is relative to
-  ptrdiff_t region_start = _Unwind_GetRegionStart(context);
-
-  // table entries
-
-
+
-  size_t action_offset;
-
-  while(true) {
-    // if we've gone through the list and found nothing...
-
+
+
+
-      return _Unwind_Reason_Code.CONTINUE_UNWIND;
+    }
-
-
-
-
-
-
-
+
-
-
+
+
+
+
-
+    debug(EH_personality) printf("*block start offset = %p\n", block_start);
+    debug(EH_personality) printf(" block size = %p\n", block_size);
+    debug(EH_personality) printf(" landing pad = %p\n", landing_pad);
+    debug(EH_personality) printf(" ip=%p %p %p %p\n", ip, block_start, block_size, landing_pad);
+
-    // since the list is sorted, as soon as we're past the ip
-    // there's no handler to be found
-
+
+
+
-      return _Unwind_Reason_Code.CONTINUE_UNWIND;
+    }
-
+    if(landing_pad)
+      landing_pad += region.lpStart_base;
+
-    // if we've found our block, exit
-_start + block_start_offse
+.start + block_star
-      break;
-  }
-
-and actionOffset %d\n"
+%p and actionOffset %p\n", landing_pad
-
-  // now we need the exception's classinfo to find a handler
-  // the exception_info is actually a member of a larger _d_exception struct
-  // the runtime allocated. get that now
-
+size_t.sizeof); //
-
-  // if there's no action offset and no landing pad, continue unwinding
-  if(!action_offset && !landing_pad)
-    return _Unwind_Reason_Code.CONTINUE_UNWIND;
-
-  // if there's no action offset but a landing pad, this is a cleanup handler
-
-
+
+
+
+
+
-
-  /*
-   walk action table chain, comparing classinfos using _d_isbaseof
-  */
-
+region.
-
-  ptrdiff_t ti_offset, next_action_offset;
-  while(true) {
+    ptrdiff_t ti_offset, next_action_offset;
+
-    action_walker = get_sleb128(action_walker, ti_offset);
-    // it is intentional that we not modify action_walker here
-    // next_action_offset is from current action_walker position
-    get_sleb128(action_walker, next_action_offset);
-
-    // negative are 'filters' which we don't use
-!(ti_offset >= 0)
+ti_offset < 0
-      fatalerror("Filter actions are unsupported");
-
-    // zero means cleanup, which we require to be the last action
-    if(ti_offset == 0) {
-!(next_action_offset == 0)
+next_action_offset != 0
-        fatalerror("Cleanup action must be last in chain");
-
+cast(ptrdiff_t)
-    }
-
-    // get classinfo for action and check if the one in the
-    // exception structure is a base
-
-
-
-
+
+
+
-
+    debug(EH_personality)
+      printf("classinfo at %zx (enc %zx (size %zx) base %zx ptr %zx)\n", typeinfo, region.ttypeEnc, size_of_encoded(region.ttypeEnc), region.ttype_base, region.classinfo_table - filter);
+
+    auto catch_ci = *cast(ClassInfo*)&typeinfo;
+    if(_d_dynamic_cast(exception_struct.exception_object, catch_ci) !is null)
+      return _d_eh_install_catch_context(actions, ti_offset, cast(ptrdiff_t)landing_pad, exception_struct, context);
+
-    // we've walked through all actions and found nothing...
-    if(next_action_offset == 0)
-      return _Unwind_Reason_Code.CONTINUE_UNWIND;
@@ -356 +562 @@
-  }
-
-  fatalerror("reached unreachable");
+
-  return _Unwind_Reason_Code.FATAL_PHASE2_ERROR;
-}
-
@@ -370 +577 @@
-  _Unwind_SetGR(context, eh_exception_regno, cast(ptrdiff_t)exception_struct);
-  _Unwind_SetGR(context, eh_selector_regno, 0);
-  _Unwind_SetIP(context, landing_pad);
+
-  return _Unwind_Reason_Code.INSTALL_CONTEXT;
-}
-
-ref ubyte* callsite, ref ubyte* action, ref ClassInfo* ci
+out Region region
-{
-
+
+
+
-  if (!data)
-  {
-
-
-
-
+
+
-  }
-
-
-
-
+
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-} // end of x86 Linux specific implementation
-
-
-
+
+
+
-{
+    //printf("throwing %p, rtti = %p\n", e, **cast(ClassRTTI***)e);
-    if (e !is null)
-    {
-        _d_exception* exc_struct = new _d_exception;
-        exc_struct.unwind_info.exception_class = *cast(ulong*)_d_exception_class.ptr;
-        exc_struct.exception_object = e;
-        _Unwind_Reason_Code ret = _Unwind_RaiseException(&exc_struct.unwind_info);
-
+
+
-    }
-    abort();
-}
-
-
+
+
+
-{
-_Unwind_Resume(&exception_struct
+  _Unwind_Resume(&(cast(_d_exception*)exception_struct)
-}