Changeset 497

Timestamp:

01/10/11 19:44:10 (14 years ago)

Author:

walter

Message:

new functions to replace varargs ones

Files:

• trunk/src/rt/lifetime.d (modified) (6 diffs)

trunk/src/rt/lifetime.d

@@ -1489 +1489 @@
-    p.length = newlength;
-    return newdata[0 .. newlength];
-
-Loverflow:
-    onOutOfMemoryError();
-    assert(0);
-}
-
-
-/**
-
-
-
-
-
-
+
+
+
+
+
-    auto sizeelem = ti.next.tsize();            // array element size
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-}
-
-
-/**
- *
- */
-size_t newCapacity(size_t newlength, size_t size)
-{
-    version(none)
-    {
@@ -1665 +1583 @@
-            debug(PRINTF) printf("mult: %2.2f, alloc: %2.2f\n",mult/100.0,newext / cast(double)size);
-        }
-        newcap = newext > newcap ? newext : newcap;
-        debug(PRINTF) printf("newcap = %d, newlength = %d, size = %d\n", newcap, newlength, size);
-    }
-    return newcap;
-}
-
-
-/**
-
-
-Array *
+ Obsolete, replaced with _d_arrayappendcTX()
+
+ref byte[] 
-{
-    version(X86)
-    {  
-        byte *argp = cast(byte*)(&ti + 2);
-        return _d_arrayappendT(ti, x, argp[0..1]);
-    }
-    else version(X86_64)
-    {
-        // This code copies the element twice, which is annoying
-        //   #1 is from va_arg copying from the varargs to b
@@ -1703 +1621 @@
-        // 1 * ti.next.tsize bytes.
-        return _d_arrayappendT(ti, x, b[0..1]);
-    }
-    else
-    {
-        static assert(false, "platform not supported");
-    }
-}
-
-
+/**************************************
+ * Extend an array by n elements.
+ * Caller must initialize those elements.
+ */
+extern (C)
+byte[] _d_arrayappendcTX(TypeInfo ti, ref byte[] px, size_t n)
+{
+    // This is a cut&paste job from _d_arrayappendT(). Should be refactored.
+
+    // only optimize array append where ti is not a shared type
+    auto sizeelem = ti.next.tsize();            // array element size
+    auto isshared = ti.classinfo is TypeInfo_Shared.classinfo;
+    auto bic = !isshared ? __getBlkInfo(px.ptr) : null;
+    auto info = bic ? *bic : gc_query(px.ptr);
+    auto length = px.length;
+    auto newlength = length + n;
+    auto newsize = newlength * sizeelem;
+    auto size = length * sizeelem;
+
+    // calculate the extent of the array given the base.
+    size_t offset = px.ptr - __arrayStart(info);
+    if(info.attr & BlkAttr.APPENDABLE)
+    {
+        if(info.size >= PAGESIZE)
+        {
+            // size of array is at the front of the block
+            if(!__setArrayAllocLength(info, newsize + offset, isshared, size + offset))
+            {
+                // check to see if it failed because there is not
+                // enough space
+                auto newcap = newCapacity(newlength, sizeelem);
+                if(*(cast(size_t*)info.base) == size + offset)
+                {
+                    // not enough space, try extending
+                    auto extendoffset = offset + LARGEPAD - info.size;
+                    auto u = gc_extend(px.ptr, newsize + extendoffset, newcap + extendoffset);
+                    if(u)
+                    {
+                        // extend worked, now try setting the length
+                        // again.
+                        info.size = u;
+                        if(__setArrayAllocLength(info, newsize + offset, isshared, size + offset))
+                        {
+                            if(!isshared)
+                                __insertBlkInfoCache(info, bic);
+                            goto L1;
+                        }
+                    }
+                }
+
+                // couldn't do it, reallocate
+                info = gc_qalloc(newcap + LARGEPAD, info.attr);
+                __setArrayAllocLength(info, newsize, isshared);
+                if(!isshared)
+                    __insertBlkInfoCache(info, bic);
+                auto newdata = cast(byte *)info.base + LARGEPREFIX;
+                memcpy(newdata, px.ptr, length * sizeelem);
+            (cast(void **)(&px))[1] = newdata;
+            }
+            else if(!isshared && !bic)
+            {
+                __insertBlkInfoCache(info, null);
+            }
+        }
+        else if(!__setArrayAllocLength(info, newsize + offset, isshared, size + offset))
+        {
+            // could not resize in place
+            auto allocsize = newCapacity(newlength, sizeelem);
+            info = gc_qalloc(allocsize + __arrayPad(allocsize), info.attr);
+            goto L2;
+        }
+        else if(!isshared && !bic)
+        {
+            __insertBlkInfoCache(info, null);
+        }
+    }
+    else
+    {
+        // not appendable or is null
+        auto allocsize = newCapacity(newlength, sizeelem);
+        info = gc_qalloc(allocsize + __arrayPad(allocsize), (info.base ? info.attr : !(ti.next.flags() & 1) ? BlkAttr.NO_SCAN : 0) | BlkAttr.APPENDABLE);
+    L2:
+        __setArrayAllocLength(info, newsize, isshared);
+        if(!isshared)
+            __insertBlkInfoCache(info, bic);
+        auto newdata = cast(byte *)__arrayStart(info);
+        memcpy(newdata, px.ptr, length * sizeelem);
+        (cast(void **)(&px))[1] = newdata;
+    }
+
+  L1:
+    *cast(size_t *)&px = newlength;
+    return px;
+}
+
+
-/**
- * Append dchar to char[]
- */
-char
+byte
-{
-    // c could encode into from 1 to 4 characters
-    char[4] buf = void;
-    byte[] appendthis; // passed to appendT
-    if (c <= 0x7F)
-    {
-        buf.ptr[0] = cast(char)c;
-        appendthis = (cast(byte *)buf.ptr)[0..1];
-    }
-    else if (c <= 0x7FF)
@@ -1745 +1759 @@
-        appendthis = (cast(byte *)buf.ptr)[0..4];
-    }
-    else
-        assert(0);      // invalid utf character - should we throw an exception instead?
-
-    //
-    // TODO: This always assumes the array type is shared, because we do not
-    // get a typeinfo from the compiler.  Assuming shared is the safest option.
-    // Once the compiler is fixed, the proper typeinfo should be forwarded.
-    //
-cast(Array *)&
+
-}
-
-
-/**
- * Append dchar to wchar[]
- */
-wchar
+byte
-{
-    // c could encode into from 1 to 2 w characters
-    wchar[2] buf = void;
-    byte[] appendthis; // passed to appendT
-    if (c <= 0xFFFF)
-    {
-        buf.ptr[0] = cast(wchar) c;
-        // note that although we are passing only 1 byte here, appendT
-        // interprets this as being an array of wchar, making the necessary
-        // casts.
@@ -1778 +1792 @@
-        buf.ptr[1] = cast(wchar) (((c - 0x10000) & 0x3FF) + 0xDC00);
-        // ditto from above.
-        appendthis = (cast(byte *)buf.ptr)[0..2];
-    }
-
-    //
-    // TODO: This always assumes the array type is shared, because we do not
-    // get a typeinfo from the compiler.  Assuming shared is the safest option.
-    // Once the compiler is fixed, the proper typeinfo should be forwarded.
-    //
-cast(Array *)&
+
-}
-
-
-/**
- *
- */
-extern (C) byte[] _d_arraycatT(TypeInfo ti, byte[] x, byte[] y)
-out (result)
-{
-    auto sizeelem = ti.next.tsize();            // array element size
@@ -1916 +1930 @@
-    }
-
-    Array2 result;
-    result.length = length;
-    result.ptr = a;
-    return *cast(byte[]*)&result;
-}
-
-
-/**
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- */
-extern (C) void* _d_arrayliteralT(TypeInfo ti, size_t length, ...)
-{
-    auto sizeelem = ti.next.tsize();            // array element size
-    void* result;
-
-    debug(PRINTF) printf("_d_arrayliteralT(sizeelem = %d, length = %d)\n", sizeelem, length);
-    if (length == 0 || sizeelem == 0)
-        result = null;
-    else