Changeset 502

Timestamp:

06/30/06 21:32:56 (2 years ago)

Author:

sean

Message:

Merged in DMD 162 changes.

Files:

• trunk/src/dmdrt/memory.d (modified) (3 diffs)
• trunk/src/dmdrt/moduleinit.d (modified) (4 diffs)

trunk/src/dmdrt/memory.d

@@ -238 +238 @@
-
-
-//
-// NOTE: This is called by DMD for auto classes.
-//
-extern (C) void _d_callfinalizer(void *p)
-{
@@ -369 +366 @@
-}
-
+/**
+ * For non-zero initializers
+ */
+
+extern (C)
+byte[] _d_arraysetlength2(size_t newlength, size_t sizeelem, Array *p, ...)
+in
+{
+    assert(sizeelem);
+    assert(!p.length || p.data);
+}
+body
+{
+    byte* newdata;
+
+    debug
+    {
+    printf("_d_arraysetlength2(p = %p, sizeelem = %d, newlength = %d)\n", p, sizeelem, newlength);
+    if (p)
+        printf("\tp.data = %p, p.length = %d\n", p.data, p.length);
+    }
+
+    if (newlength)
+    {
+    version (D_InlineAsm_X86)
+    {
+        size_t newsize = void;
+
+        asm
+        {
+        mov EAX,newlength   ;
+        mul EAX,sizeelem    ;
+        mov newsize,EAX ;
+        jc  Loverflow   ;
+        }
+    }
+    else
+    {
+        size_t newsize = sizeelem * newlength;
+
+        if (newsize / newlength != sizeelem)
+        goto Loverflow;
+    }
+    //printf("newsize = %x, newlength = %x\n", newsize, newlength);
+
+    size_t size = p.length * sizeelem;
+
+    if (p.length)
+    {
+        newdata = p.data;
+        if (newlength > p.length)
+        {
+        size_t cap = gc_sizeOf(p.data);
+
+        if (cap <= newsize)
+        {
+            newdata = cast(byte *)gc_malloc(newsize + 1);
+            newdata[0 .. size] = p.data[0 .. size];
+        }
+        newdata[size .. newsize] = 0;
+        }
+    }
+    else
+    {
+        newdata = cast(byte *)gc_malloc(newsize + 1);
+    }
+
+    va_list q;
+    va_start!(Array *)(q, p);   // q is pointer to initializer
+
+    if (newsize > size)
+    {
+        if (sizeelem == 1)
+        newdata[size .. newsize] = *(cast(byte*)q);
+        else
+        {
+        for (size_t u = size; u < newsize; u += sizeelem)
+        {
+            memcpy(newdata + u, q, sizeelem);
+        }
+        }
+    }
+    }
+    else
+    {
+    newdata = null;
+    }
+
+    p.data = newdata;
+    p.length = newlength;
+    return newdata[0 .. newlength];
+
+Loverflow:
+    onOutOfMemoryError();
+}
+
-/***************************
- * Resize bit[] arrays.
- */
-
+version (none)
+{
-extern (C)
-bit[] _d_arraysetlengthb(size_t newlength, Array *p)
@@ -413 +508 @@
-    p.length = newlength;
-    return (cast(bit *)newdata)[0 .. newlength];
+}
-}
-

trunk/src/dmdrt/moduleinit.d

@@ -6 +6 @@
-{   MIctorstart = 1,    // we've started constructing it
-    MIctordone = 2, // finished construction
+    MIstandalone = 4,   // module ctor does not depend on other module
+            // ctors being done first
-}
-
@@ -86 +88 @@
-
-    debug printf("\tmodule[%d] = '%p'\n", i, m);
-
+
+
-    debug printf("\tmodule[%d] = '%.*s'\n", i, m.name);
-    if (m.flags & MIctordone)
@@ -95 +98 @@
-    {
-        if (m.flags & MIctorstart)
-
+ || m.flags & MIstandalone
-            continue;
-            throw new Exception( "Cyclic dependency in module " ~ m.name );
@@ -155 +158 @@
-    ModuleInfo m = _moduleinfo_array[i];
-
+    if (!m)
+        continue;
+
-    debug printf("\tmodule[%d] = '%.*s'\n", i, m.name);
-    if (m.unitTest)