Changeset 2020

Timestamp:

04/11/07 14:41:13 (2 years ago)

Author:

sean

Message:

Merged in DMD 1.011 changes. These are just some minor bugfixes for existing functionality, so these libraries are compatible with DMD 1.010 as well.

Files:

• trunk/lib/compiler/dmd/lifetime.d (modified) (1 diff)
• trunk/lib/compiler/gdc/lifetime.d (modified) (1 diff)
• trunk/lib/gc/basic/gcx.d (modified) (8 diffs)

trunk/lib/compiler/dmd/lifetime.d

@@ -785 +785 @@
-
-    *cast(size_t *)&x = newlength;
-(cast(byte *)x)
+x.ptr
-    assert((cast(size_t)x.ptr & 15) == 0);
-    assert(gc_sizeOf(x.ptr) > x.length * sizeelem);

trunk/lib/compiler/gdc/lifetime.d

@@ -786 +786 @@
-  L1:
-    *cast(size_t *)&x = newlength;
-(cast(byte *)x)[length * sizeelem .. newsize] = (cast(byte*)argp)
+x.ptr[length * sizeelem .. newsize] = argp
-    assert((cast(size_t)x.ptr & 15) == 0);
-    assert(gc_sizeOf(x.ptr) > x.length * sizeelem);

trunk/lib/gc/basic/gcx.d

@@ -94 +94 @@
-        extern (C) void thread_scanAll( scanFn fn, void* curStackTop = null );
-    }
+
+    extern (C) void onOutOfMemoryError();
-}
-
@@ -148 +150 @@
-                {
-                    data = cast(Log *)tango.stdc.stdlib.malloc(allocdim * Log.sizeof);
+                    if (!data && allocdim)
+                        onOutOfMemoryError();
-                }
-                else
@@ -153 +157 @@
-
-                    newdata = cast(Log *)tango.stdc.stdlib.malloc(allocdim * Log.sizeof);
-
+
+
-                    memcpy(newdata, data, dim * Log.sizeof);
-                    tango.stdc.stdlib.free(data);
-                    data = newdata;
-                }
-                assert(!allocdim || data);
-            }
-        }
@@ -223 +227 @@
-        gcLock = GCLock.classinfo;
-        gcx = cast(Gcx *)tango.stdc.stdlib.calloc(1, Gcx.sizeof);
+        if (!gcx)
+            onOutOfMemoryError();
-        gcx.initialize();
-        setStackBottom(cr_stackBottom());
@@ -1410 +1416 @@
-
-            newroots = cast(void **)tango.stdc.stdlib.malloc(newdim * newroots[0].sizeof);
-
+
+
-            if (roots)
-            {   memcpy(newroots, roots, nroots * newroots[0].sizeof);
@@ -1454 +1461 @@
-
-            newranges = cast(Range *)tango.stdc.stdlib.malloc(newdim * newranges[0].sizeof);
-
+
+
-            if (ranges)
-            {   memcpy(newranges, ranges, nranges * newranges[0].sizeof);
@@ -1707 +1715 @@
-        if (npages < POOLSIZE/PAGESIZE)
-            npages = POOLSIZE/PAGESIZE;
+        else if (npages > POOLSIZE/PAGESIZE)
+        {   // Give us 150% of requested size, so there's room to extend
+            auto n = npages + (npages >> 1);
+            if (n < size_t.max/PAGESIZE)
+                npages = n;
+        }
-
-        // Allocate successively larger pools up to 8 megs
@@ -2458 +2472 @@
-
-        pagetable = cast(ubyte*)tango.stdc.stdlib.malloc(npages);
+        if (!pagetable)
+            onOutOfMemoryError();
-        memset(pagetable, B_UNCOMMITTED, npages);
-