Changeset 1968

Timestamp:

03/26/07 16:11:00 (2 years ago)

Author:

sean

Message:

Merged in DMD 1.010 changes. This includes:

• Moved contents of lib/compiler/x/moduleinit into lib/compiler/x/genobj. This was necessary to support the new Object.factory() feature.
  
• Added gc_extend() to extend page or larger sized blocks in place.
  
• Changed lib/compiler/dmd/lifetime to use gc_extend.
  

Changes to GDC will wait until the next GDC release. There should be no gap in functionality aside from the lack of Object.factory(). The rest are just performance improvements.

Files:

• trunk/lib/compiler/dmd/genobj.d (modified) (11 diffs)
• trunk/lib/compiler/dmd/lifetime.d (modified) (36 diffs)
• trunk/lib/compiler/dmd/moduleinit.d (deleted)
• trunk/lib/compiler/dmd/posix.mak (modified) (1 diff)
• trunk/lib/compiler/dmd/win32.mak (modified) (1 diff)
• trunk/lib/compiler/gdc/Makefile.am (modified) (1 diff)
• trunk/lib/compiler/gdc/Makefile.in (modified) (5 diffs)
• trunk/lib/compiler/gdc/genobj.d (modified) (1 diff)
• trunk/lib/compiler/gdc/moduleinit.d (deleted)
• trunk/lib/gc/basic/gc.d (modified) (1 diff)
• trunk/lib/gc/basic/gcx.d (modified) (5 diffs)
• trunk/object.di (modified) (2 diffs)

trunk/lib/compiler/dmd/genobj.d

@@ -10 +10 @@
-
-/*
-6
+7
- *  Written by Walter Bright
- *
@@ -43 +43 @@
-    import tango.stdc.stdlib; // : calloc, realloc, free;
-    import util.string;
-
+(PRINTF)
-
-    extern (C) void onOutOfMemoryError();
+    extern (C) Object _d_newclass(ClassInfo ci);
-}
-
@@ -122 +123 @@
-    int opEquals(Object o)
-    {
-   
+        
-    }
-
@@ -137 +138 @@
-    final void notifyRegister(void delegate(Object) dg)
-    {
-
+(PRINTF)
-        synchronized (this)
-        {
@@ -191 +192 @@
-    }
-+/
+
+    /**
+     * Create instance of class specified by classname.
+     * The class must either have no constructors or have
+     * a default constructor.
+     * Returns:
+     *  null if failed
+     */
+    static Object factory(char[] classname)
+    {
+        auto ci = ClassInfo.find(classname);
+        if (ci)
+        {
+            return ci.create();
+        }
+        return null;
+    }
-}
-
-extern (C) void _d_notify_release(Object o)
-{
-
+(PRINTF)
-    Monitor* m = cast(Monitor*)(cast(void**)o)[1];
-    if (m.delegates.length)
@@ -209 +227 @@
-        {
-            if (dg)
-
+(PRINTF)
-                dg(o);
-            }
@@ -250 +268 @@
-    //  2:                      // has no possible pointers into GC memory
-    //  4:                      // has offTi[] member
+    //  8:                      // has constructors
-    void *deallocator;
-    OffsetTypeInfo[] offTi;
+    void function(Object) defaultConstructor;   // default Constructor
+
+    /**
+     * Search all modules for ClassInfo corresponding to classname.
+     * Returns: null if not found
+     */
+    static ClassInfo find(char[] classname)
+    {
+        foreach (m; ModuleInfo.modules())
+        {
+            //writefln("module %s, %d", m.name, m.localClasses.length);
+            foreach (c; m.localClasses)
+            {
+                //writefln("\tclass %s", c.name);
+                if (c.name == classname)
+                    return c;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Create instance of Object represented by 'this'.
+     */
+    Object create()
+    {
+        if (flags & 8 && !defaultConstructor)
+            return null;
+        Object o = _d_newclass(this);
+        if (flags & 8 && defaultConstructor)
+        {
+            defaultConstructor(o);
+        }
+        return o;
+    }
-}
-
@@ -427 +481 @@
-    {   TypeInfo_Array c;
-
-   
-   
+        
+        
-                ((c = cast(TypeInfo_Array)o) !is null &&
-       
+                
-    }
-
@@ -508 +562 @@
-    {   TypeInfo_StaticArray c;
-
-   
-   
+        
+        
-                ((c = cast(TypeInfo_StaticArray)o) !is null &&
-                 this.len == c.len &&
-       
+                
-    }
-
@@ -808 +862 @@
-        assert(p);
-        if (xtoHash)
-
+(PRINTF)
-            h = (*xtoHash)(p);
-        }
-        else
-        {
-
+(PRINTF)
-            // A sorry hash algorithm.
-            // Should use the one for strings.
@@ -969 +1023 @@
-    }
-}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// ModuleInfo
+////////////////////////////////////////////////////////////////////////////////
+
+
+enum
+{
+    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
+}
+
+
+class ModuleInfo
+{
+    char name[];
+    ModuleInfo importedModules[];
+    ClassInfo localClasses[];
+
+    uint flags;         // initialization state
+
+    void (*ctor)();
+    void (*dtor)();
+    void (*unitTest)();
+
+    static ModuleInfo[] modules()
+    {
+        return _moduleinfo_array;
+    }
+}
+
+
+// Win32: this gets initialized by minit.asm
+// linux: this gets initialized in _moduleCtor()
+extern (C) ModuleInfo[] _moduleinfo_array;
+
+
+version (linux)
+{
+    // This linked list is created by a compiler generated function inserted
+    // into the .ctor list by the compiler.
+    struct ModuleReference
+    {
+        ModuleReference* next;
+        ModuleInfo mod;
+    }
+
+    extern (C) ModuleReference *_Dmodule_ref;   // start of linked list
+}
+
+ModuleInfo[] _moduleinfo_dtors;
+uint _moduleinfo_dtors_i;
+
+// Register termination function pointers
+extern (C) int _fatexit(void *);
+
+/*************************************
+ * Initialize the modules.
+ */
+
+extern (C) void _moduleCtor()
+{
+    debug(PRINTF) printf("_moduleCtor()\n");
+    version (linux)
+    {
+        int len = 0;
+        ModuleReference *mr;
+
+        for (mr = _Dmodule_ref; mr; mr = mr.next)
+            len++;
+        _moduleinfo_array = new ModuleInfo[len];
+        len = 0;
+        for (mr = _Dmodule_ref; mr; mr = mr.next)
+        {   _moduleinfo_array[len] = mr.mod;
+            len++;
+        }
+    }
+
+    version (Win32)
+    {
+        // Ensure module destructors also get called on program termination
+        //_fatexit(&_STD_moduleDtor);
+    }
+
+    _moduleinfo_dtors = new ModuleInfo[_moduleinfo_array.length];
+    debug(PRINTF) printf("_moduleinfo_dtors = x%x\n", cast(void *)_moduleinfo_dtors);
+    _moduleCtor2(_moduleinfo_array, 0);
+}
+
+void _moduleCtor2(ModuleInfo[] mi, int skip)
+{
+    debug(PRINTF) printf("_moduleCtor2(): %d modules\n", mi.length);
+    for (uint i = 0; i < mi.length; i++)
+    {
+        ModuleInfo m = mi[i];
+
+        debug(PRINTF) printf("\tmodule[%d] = '%p'\n", i, m);
+        if (!m)
+            continue;
+        debug(PRINTF) printf("\tmodule[%d] = '%.*s'\n", i, m.name);
+        if (m.flags & MIctordone)
+            continue;
+        debug(PRINTF) printf("\tmodule[%d] = '%.*s', m = x%x\n", i, m.name, m);
+
+        if (m.ctor || m.dtor)
+        {
+            if (m.flags & MIctorstart)
+            {   if (skip || m.flags & MIstandalone)
+                    continue;
+                    throw new Exception( "Cyclic dependency in module " ~ m.name );
+            }
+
+            m.flags |= MIctorstart;
+            _moduleCtor2(m.importedModules, 0);
+            if (m.ctor)
+                (*m.ctor)();
+            m.flags &= ~MIctorstart;
+            m.flags |= MIctordone;
+
+            // Now that construction is done, register the destructor
+            //printf("\tadding module dtor x%x\n", m);
+            assert(_moduleinfo_dtors_i < _moduleinfo_dtors.length);
+            _moduleinfo_dtors[_moduleinfo_dtors_i++] = m;
+        }
+        else
+        {
+            m.flags |= MIctordone;
+            _moduleCtor2(m.importedModules, 1);
+        }
+    }
+}
+
+
+/**********************************
+ * Destruct the modules.
+ */
+
+// Starting the name with "_STD" means under linux a pointer to the
+// function gets put in the .dtors segment.
+
+extern (C) void _moduleDtor()
+{
+    debug(PRINTF) printf("_moduleDtor(): %d modules\n", _moduleinfo_dtors_i);
+    for (uint i = _moduleinfo_dtors_i; i-- != 0;)
+    {
+        ModuleInfo m = _moduleinfo_dtors[i];
+
+        debug(PRINTF) printf("\tmodule[%d] = '%.*s', x%x\n", i, m.name, m);
+        if (m.dtor)
+        {
+            (*m.dtor)();
+        }
+    }
+    debug(PRINTF) printf("_moduleDtor() done\n");
+}
+
+/**********************************
+ * Run unit tests.
+ */
+
+extern (C) void _moduleUnitTests()
+{
+    debug(PRINTF) printf("_moduleUnitTests()\n");
+    for (uint i = 0; i < _moduleinfo_array.length; i++)
+    {
+        ModuleInfo m = _moduleinfo_array[i];
+
+        if (!m)
+            continue;
+
+        debug(PRINTF) printf("\tmodule[%d] = '%.*s'\n", i, m.name);
+        if (m.unitTest)
+        {
+            (*m.unitTest)();
+        }
+    }
+}

trunk/lib/compiler/dmd/lifetime.d

@@ -33 +33 @@
-    import tango.stdc.string;
-    import tango.stdc.stdarg;
-
+(PRINTF)
-}
-
@@ -51 +51 @@
-    extern (C) uint gc_clrAttr( void* p, uint a );
-
-
-
-
+
+
+
+
-
-    extern (C) size_t gc_sizeOf( void* p );
@@ -72 +73 @@
-    void* p;
-
-
+(PRINTF)
-    if (ci.flags & 1) // if COM object
-    {
@@ -83 +84 @@
-        p = gc_malloc(ci.init.length,
-                      BlkAttr.FINALIZE | (ci.flags & 2 ? BlkAttr.NO_SCAN : 0));
-
-
-
-
+(PRINTF)
+
+
+(PRINTF)
-    {
-        printf("p = %p\n", p);
@@ -103 +104 @@
-    (cast(byte*) p)[0 .. ci.init.length] = ci.init[];
-
-
+(PRINTF)
-    return cast(Object) p;
-}
@@ -135 +136 @@
-    if (*p)
-    {
-
+(PRINTF)
-
-        cr_finalize(cast(void*) *p);
@@ -169 +170 @@
-    auto size = ti.next.tsize();                // array element size
-
-
+(PRINTF)
-    if (length == 0 || size == 0)
-        result = 0;
@@ -176 +177 @@
-        size *= length;
-        p = gc_malloc(size + 1, !(ti.next.flags() & 1) ? BlkAttr.NO_SCAN : 0);
-
+(PRINTF)
-        memset(p, 0, size);
-        result = cast(ulong)length + (cast(ulong)cast(uint)p << 32);
@@ -192 +193 @@
-    auto size = ti.next.tsize();                // array element size
-
-
+(PRINTF)
-
-    if (length == 0 || size == 0)
@@ -203 +204 @@
-        size *= length;
-        auto p = gc_malloc(size + 1, !(ti.next.flags() & 1) ? BlkAttr.NO_SCAN : 0);
-
+(PRINTF)
-        if (isize == 1)
-            memset(p, *cast(ubyte*)q, size);
@@ -236 +237 @@
-    ulong result;
-
-
+(PRINTF)
-    if (ndims == 0)
-        result = 0;
@@ -248 +249 @@
-            void[] p;
-
-
+(PRINTF)
-            if (ndims == 1)
-            {
@@ -267 +268 @@
-        size_t* pdim = cast(size_t *)q;
-        result = cast(ulong)foo(ti, pdim, ndims);
-
+(PRINTF)
-
-        version (none)
@@ -289 +290 @@
-    ulong result;
-
-
+(PRINTF)
-    if (ndims == 0)
-        result = 0;
@@ -320 +321 @@
-        size_t* pdim = cast(size_t *)q;
-        result = cast(ulong)foo(ti, pdim, ndims);
-
+(PRINTF)
-
-        version (none)
@@ -390 +391 @@
-extern (C) void cr_finalize(void* p, bool det = true)
-{
-
+(PRINTF)
-
-    if (p) // not necessary if called from gc
@@ -444 +445 @@
-    size_t sizeelem = ti.next.tsize();
-
-
+(PRINTF)
-    {
-        printf("_d_arraysetlengthT(p = %p, sizeelem = %d, newlength = %d)\n", p, sizeelem, newlength);
@@ -473 +474 @@
-        }
-
-
+(PRINTF)
-
-        if (p.data)
@@ -485 +486 @@
-                if (cap <= newsize)
-                {
+                    if (cap >= 4096)
+                    {   // Try to extend in-place
+                        auto u = gc_extend(p.data, (newsize + 1) - cap, (newsize + 1) - cap);
+                        if (u)
+                        {
+                            goto L1;
+                        }
+                    }
-                    newdata = cast(byte *)gc_malloc(newsize + 1, !(ti.next.flags() & 1) ? BlkAttr.NO_SCAN : 0);
-                    newdata[0 .. size] = p.data[0 .. size];
-                }
+             L1:
-                newdata[size .. newsize] = 0;
-            }
@@ -535 +545 @@
-    assert((sizeelem / initsize) * initsize == sizeelem);
-
-
+(PRINTF)
-    {
-        printf("_d_arraysetlengthiT(p = %p, sizeelem = %d, newlength = %d, initsize = %d)\n", p, sizeelem, newlength, initsize);
@@ -563 +573 @@
-                goto Loverflow;
-        }
-
+(PRINTF)
-
-        size_t size = p.length * sizeelem;
@@ -576 +586 @@
-                if (cap <= newsize)
-                {
+                    if (cap >= 4096)
+                    {   // Try to extend in-place
+                        auto u = gc_extend(p.data, (newsize + 1) - cap, (newsize + 1) - cap);
+                        if (u)
+                        {
+                            goto L1;
+                        }
+                    }
-                    newdata = cast(byte *)gc_malloc(newsize + 1);
-                    newdata[0 .. size] = p.data[0 .. size];
+                L1: ;
-                }
-            }
@@ -592 +611 @@
-            if (initsize == 1)
-            {
-
+(PRINTF)
-                newdata[size .. newsize] = *(cast(byte*)q);
-            }
@@ -624 +643 @@
-extern (C) long _d_arrayappendT(TypeInfo ti, Array *px, byte[] y)
-{
-
-
-
-
-
-
+
+
+
+
+
+
+
-    {   byte* newdata;
-
-
-
+
+
+
+
+
+
+
+
+
+
-        px.data = newdata;
-    }
+  L1:
-    px.length = newlength;
-, y.ptr, y.length * size
+elem, y.ptr, y.length * sizeelem
-    return *cast(long*)px;
-}
@@ -659 +688 @@
-         * - Arrays smaller than 4096 bytes are left as-is, so for the most
-         * common cases, memory allocation is 1 to 1. The small overhead added
-effect small array perf. (it's virut
+affect small array perf. (it's virtu
-         * current).
-         * - Larger arrays have some space pre-allocated.
@@ -705 +734 @@
-            newext = cast(size_t)((newcap * mult) / 100);
-            newext -= newext % size;
-
+(PRINTF)
-        }
-        newcap = newext > newcap ? newext : newcap;
-
+(PRINTF)
-    }
-    return newcap;
@@ -719 +748 @@
-extern (C) byte[] _d_arrayappendcT(TypeInfo ti, inout byte[] x, ...)
-{
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    {   byte* newdata;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        newdata = cast(byte *)gc_malloc(cap + 1, !(ti.next.flags() & 1) ? BlkAttr.NO_SCAN : 0);
-
+elem
-        (cast(void**)(&x))[1] = newdata;
-    }
+  L1:
-    byte *argp = cast(byte *)(&ti + 2);
-
-    *cast(size_t *)&x = newlength;
- .. newlength * size] = argp[0 .. size
+elem .. newsize] = argp[0 .. sizeelem
-    assert((cast(size_t)x.ptr & 15) == 0);
-
+elem
-    return x;
-}
@@ -754 +793 @@
-out (result)
-{
- = ti.next.tsize();    
- printf("_d_arraycatT(%d,%p ~ %d,%p size = %d => %d,%p)\n", x.length, x.ptr, y.length, y.ptr, size
+elem = ti.next.tsize();
+(PRINTF) printf("_d_arraycatT(%d,%p ~ %d,%p sizeelem = %d => %d,%p)\n", x.length, x.ptr, y.length, y.ptr, sizeelem
-    assert(result.length == x.length + y.length);
-
+elem
-        assert((cast(byte*)result)[i] == (cast(byte*)x)[i]);
-
-
+elem
+elem
-
-    size_t cap = gc_sizeOf(result.ptr);
-
+elem
-}
-body
@@ -782 +821 @@
-    }
-
-
- = ti.next.tsize();    
- printf("_d_arraycatT(%d,%p ~ %d,%p size = %d)\n", x.length, x.ptr, y.length, y.ptr, size
-
-
+(PRINTF)
+elem = ti.next.tsize();
+(PRINTF) printf("_d_arraycatT(%d,%p ~ %d,%p sizeelem = %d)\n", x.length, x.ptr, y.length, y.ptr, sizeelem
+elem
+elem
-    size_t len  = xlen + ylen;
-
@@ -804 +843 @@
- */
-extern (C) byte[] _d_arraycatnT(TypeInfo ti, uint n, ...)
-byte[]
+void*
-    size_t length;
-    byte[]* p;
-    uint i;
-    byte[] b;
- = ti.next.tsize();
+elem = ti.next.tsize();           
-
-    p = cast(byte[]*)(&n + 1);
@@ -821 +860 @@
-        return null;
-
-
-
-
+
-    p = cast(byte[]*)(&n + 1);
-
@@ -832 +869 @@
-        if (b.length)
-        {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-}
-
@@ -848 +886 @@
-extern (C) void* _d_arrayliteralT(TypeInfo ti, size_t length, ...)
-{
- = ti.next.tsize();
-[]
-
- printf("_d_arrayliteralT(size = %d, length = %d)\n", size
-
+elem = ti.next.tsize();           
+*
+
+(PRINTF) printf("_d_arrayliteralT(sizeelem = %d, length = %d)\n", sizeelem
+elem
-        result = null;
-    else
-    {
-
-
-
-
+
-
-        va_list q;
-        va_start!(size_t)(q, length);
-
-
-
-
-
-.ptr, q, length * size
+elem
+
+elem
+
+, q, length * sizeelem
-        }
-        else
@@ -874 +909 @@
-            for (size_t i = 0; i < length; i++)
-            {
-.ptr + i * size, q, size
+ + i * sizeelem, q, sizeelem
-                q += stacksize;
-
-
+    
+    
-
-        va_end(q);
-    }
-.ptr
+
-}
-
@@ -901 +936 @@
-out (result)
-{
-zelem = ti.next.tsize();
-z
+izeelem = ti.next.tsize();  
+ize
-}
-body
@@ -910 +945 @@
-    if (a.length)
-    {
-zelem = ti.next.tsize();
-z
+izeelem = ti.next.tsize();  
+ize
-        r.ptr = gc_malloc(size, !(ti.next.flags() & 1) ? BlkAttr.NO_SCAN : 0);
-        r.length = a.length;

trunk/lib/compiler/dmd/posix.mak

@@ -87 +87 @@
-    qsort.o \
-    switch.o \
-    moduleinit.o \
-    trace.o
-# NOTE: trace.obj and cover.obj are not necessary for a successful build

trunk/lib/compiler/dmd/win32.mak

@@ -78 +78 @@
-    qsort.obj \
-    switch.obj \
-    moduleinit.obj \
-    trace.obj
-# NOTE: trace.obj and cover.obj are not necessary for a successful build

trunk/lib/compiler/gdc/Makefile.am

@@ -90 +90 @@
-    qsortg.o \
-    rundmain.o \
-
-
+
-
-OBJ_UTIL= \

trunk/lib/compiler/gdc/Makefile.in

@@ -262 +262 @@
-    qsortg.o \
-    rundmain.o \
-
-
+
-
-OBJ_UTIL = \
@@ -277 +276 @@
-
-# This should not be linked into a shared library.
- 
- 
- 
+
+
+
-
-# Removed threadsem for Tango
@@ -285 +284 @@
-
-# std.c.linux.linux, std.loader, gcc.cbridge*
- 
+
-CONFIG_D_FRAGMENTS = config/config-head frag-ac frag-gen frag-math config/config-mid config/config-tail
-CONFIG_UNIX_FRAGMENTS = config/unix-head frag-unix config/unix-mid
@@ -384 +383 @@
-    @rm -f stamp-h1
-    cd $(top_builddir) && $(SHELL) ./config.status config.h
- 
+
-    cd $(top_srcdir) && $(AUTOHEADER)
-    rm -f stamp-h1
@@ -398 +397 @@
-clean-noinstPROGRAMS:
-    -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
- 
+
-    @rm -f minimal$(EXEEXT)
-    $(LINK) $(minimal_LDFLAGS) $(minimal_OBJECTS) $(minimal_LDADD) $(LIBS)

trunk/lib/compiler/gdc/genobj.d

@@ -981 +981 @@
-    }
-}
+
+
+
+enum
+{
+    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
+}
+
+class ModuleInfo
+{
+    char name[];
+    ModuleInfo importedModules[];
+    ClassInfo localClasses[];
+
+    uint flags;         // initialization state
+
+    void (*ctor)();
+    void (*dtor)();
+    void (*unitTest)();
+
+    static ModuleInfo[] modules()
+    {
+        return _moduleinfo_array;
+    }
+}
+
+
+// Win32: this gets initialized by minit.asm
+// linux: this gets initialized in _moduleCtor()
+extern (C) ModuleInfo[] _moduleinfo_array;
+
+version (GNU)
+{
+    version = ModRefStyle;
+}
+version (linux)
+{
+    version = ModRefStyle;
+}
+version (ModRefStyle)
+{
+    // This linked list is created by a compiler generated function inserted
+    // into the .ctor list by the compiler.
+    struct ModuleReference
+    {
+        ModuleReference* next;
+        ModuleInfo mod;
+    }
+
+    extern (C) ModuleReference *_Dmodule_ref;   // start of linked list
+}
+
+ModuleInfo[] _moduleinfo_dtors;
+uint _moduleinfo_dtors_i;
+
+// Register termination function pointers
+extern (C) int _fatexit(void *);
+
+/*************************************
+ * Initialize the modules.
+ */
+
+extern (C) void _moduleCtor()
+{
+    debug printf("_moduleCtor()\n");
+    version (ModRefStyle)
+    {
+        int len = 0;
+        ModuleReference *mr;
+
+        for (mr = _Dmodule_ref; mr; mr = mr.next)
+            len++;
+        _moduleinfo_array = new ModuleInfo[len];
+        len = 0;
+        for (mr = _Dmodule_ref; mr; mr = mr.next)
+        {   _moduleinfo_array[len] = mr.mod;
+            len++;
+        }
+    }
+
+    version (Win32)
+    {
+        // Ensure module destructors also get called on program termination
+        //_fatexit(&_STD_moduleDtor);