Concept: druntime getting rid of libc dependency

druntime/mak/COPY

@@ -33,6 +33,9 @@ COPY=\
 	$(IMPDIR)\core\internal\atomic.d \
 	$(IMPDIR)\core\internal\attributes.d \
 	$(IMPDIR)\core\internal\cast_.d \
+	$(IMPDIR)\core\internal\config\memory.d \
+	$(IMPDIR)\core\internal\config\opt.d \
+	$(IMPDIR)\core\internal\config\package.d \
 	$(IMPDIR)\core\internal\convert.d \
 	$(IMPDIR)\core\internal\dassert.d \
 	$(IMPDIR)\core\internal\destruction.d \

druntime/mak/SRCS

@@ -30,6 +30,9 @@ SRCS=\
 	src\core\internal\atomic.d \
 	src\core\internal\attributes.d \
 	src\core\internal\cast_.d \
+	src\core\internal\config\memory.d \
+	src\core\internal\config\opt.d \
+	src\core\internal\config\package.d \
 	src\core\internal\convert.d \
 	src\core\internal\dassert.d \
 	src\core\internal\destruction.d \

druntime/src/core/gc/config.d

@@ -9,12 +9,24 @@ module core.gc.config;
 
 import core.internal.parseoptions;
 import core.stdc.stdio : printf;
+import core.internal.config : Sys;
+import core.internal.config.opt : Opt;
+
+alias Config = Opt.GcConfig;
 
 __gshared Config config;
 
 private __gshared bool _initialized;
 
-struct Config
+package(core) bool initialize(ref Config cfg) nothrow @nogc
+{
+    if (!_initialized)
+        _initialized = cfg.tryToInitialize();
+
+    return _initialized;
+}
+
+struct ConfigT()
 {
     bool disable;            // start disabled
     bool fork = false;       // optional concurrent behaviour
@@ -37,32 +49,30 @@ struct Config
 
 @nogc nothrow:
 
-    bool initialize()
+    private bool tryToInitialize()
     {
-        if (!_initialized)
-            _initialized = initConfigOptions(this, "gcopt");
-        return _initialized;
+        return initConfigOptions(this, "gcopt");
     }
 
     void help() @nogc nothrow
     {
         import core.gc.registry : registeredGCFactories;
 
-        printf("GC options are specified as white space separated assignments:
+        Sys.printf("GC options are specified as white space separated assignments:
     disable:0|1    - start disabled (%d)
     fork:0|1       - set fork behaviour (%d)
     profile:0|1|2  - enable profiling with summary when terminating program (%d)
-    gc:".ptr, disable, fork, profile);
+    gc:", disable, fork, profile);
         foreach (i, entry; registeredGCFactories)
         {
-            if (i) printf("|");
-            printf("%.*s", cast(int) entry.name.length, entry.name.ptr);
+            if (i) Sys.print("|");
+            Sys.printf("%.*s", cast(int) entry.name.length, entry.name.ptr);
         }
         auto _initReserve = initReserve.bytes2prettyStruct;
         auto _minPoolSize = minPoolSize.bytes2prettyStruct;
         auto _maxPoolSize = maxPoolSize.bytes2prettyStruct;
         auto _incPoolSize = incPoolSize.bytes2prettyStruct;
-        printf(" - select gc implementation (default = conservative)
+        Sys.printf(" - select gc implementation (default = conservative)
 
     initReserve:N  - initial memory to reserve in MB (%lld%c)
     minPoolSize:N  - initial and minimum pool size in MB (%lld%c)
@@ -73,7 +83,7 @@ struct Config
     cleanup:none|collect|finalize - how to treat live objects when terminating (collect)
 
     Memory-related values can use B, K, M or G suffixes.
-".ptr,
+",
                _initReserve.v, _initReserve.u,
                _minPoolSize.v, _minPoolSize.u,
                _maxPoolSize.v, _maxPoolSize.u,

druntime/src/core/gc/registry.d

@@ -60,9 +60,9 @@ alias GCThreadInitFunction = void function(ThreadBase base) nothrow @nogc;
 void registerGCFactory(string name, GCFactory factory,
         GCThreadInitFunction threadInit = null) nothrow @nogc
 {
-    import core.stdc.stdlib : realloc;
+    import core.internal.config.memory : reallocate;
 
-    auto ptr = cast(Entry*)realloc(entries.ptr, (entries.length + 1) * Entry.sizeof);
+    auto ptr = cast(Entry*) reallocate(entries.ptr, (entries.length + 1) * Entry.sizeof);
     entries = ptr[0 .. entries.length + 1];
     entries[$ - 1] = Entry(name, factory, threadInit);
 }
@@ -77,15 +77,15 @@ void registerGCFactory(string name, GCFactory factory,
  */
 GC createGCInstance(string name)
 {
-    import core.stdc.stdlib : free;
+    import core.internal.config.memory : freeMem;
 
     foreach (entry; entries)
     {
         if (entry.name != name)
             continue;
         auto instance = entry.factory();
         // only one GC at a time for now, so free the registry to not leak
-        free(entries.ptr);
+        freeMem(entries.ptr);
         entries = null;
         return instance;
     }

druntime/src/core/internal/array/utils.d

@@ -11,6 +11,7 @@ module core.internal.array.utils;
 
 import core.internal.traits : Parameters;
 import core.memory : GC;
+debug(PRINTF) import core.stdc.stdio : printf;
 
 alias BlkAttr = GC.BlkAttr;
 

druntime/src/core/internal/config/memory.d

@@ -0,0 +1,17 @@
+///
+module core.internal.config.memory;
+
+// libc version
+version (all)
+{
+    import core.stdc.stdlib;
+
+    alias allocateOne = malloc;
+    alias allocateFew = (size_t num, size_t size) nothrow @nogc => allocateOne(num * size);
+    void* allocateOneBlank(size_t size) nothrow @nogc => allocateFewBlank(1, size);
+    alias allocateFewBlank = calloc;
+    alias reallocate = realloc;
+    alias freeMem = core.stdc.stdlib.free;
+
+    alias allocateOnStack = alloca;
+}

druntime/src/core/internal/config/opt.d

@@ -0,0 +1,9 @@
+///
+module core.internal.config.opt;
+
+struct Opt
+{
+    import core.gc.config: ConfigT;
+
+    alias GcConfig = ConfigT!();
+}

druntime/src/core/internal/config/package.d

@@ -0,0 +1,32 @@
+///
+module core.internal.config;
+
+struct Sys
+{
+    static import core.stdc.stdlib;
+    import core.stdc.stdio;
+
+    alias abort = core.stdc.stdlib.abort;
+
+    static void print(scope const char[] str) nothrow @nogc
+    {
+        // This is a silly approach, but it's a simple way to print non-null-terminated strings
+        // TODO: implement using write() or so
+        foreach(c; str)
+        {
+            auto r = fputc(c, stdout);
+            if(r == EOF)
+                Sys.abort();
+        }
+    }
+
+    /// C-formatted print
+    static void printf(T...)(scope const char[] fmt, T vals) nothrow @nogc
+    {
+        static assert(T.length > 0);
+
+        int r = core.stdc.stdio.printf(fmt.ptr, vals);
+        if(r < fmt.length)
+            Sys.abort();
+    }
+}

druntime/src/core/internal/gc/bits.d

@@ -11,7 +11,7 @@ import core.internal.gc.os;
 
 import core.bitop;
 import core.exception : onOutOfMemoryError;
-import core.stdc.stdlib : calloc, free;
+import core.internal.config.memory : allocateOneBlank, freeMem;
 import core.stdc.string : memcpy, memset;
 
 // use version gcbitsSingleBitOperation to disable optimizations that use
@@ -38,7 +38,7 @@ struct GCBits
         if (data)
         {
             if (!AllocSupportsShared || !share)
-                free(data);
+                freeMem(data);
             else static if (AllocSupportsShared)
                 os_mem_unmap_shared(data, nwords * data[0].sizeof);
             else
@@ -51,7 +51,7 @@ struct GCBits
     {
         this.nbits = nbits;
         if (!AllocSupportsShared || !share)
-            data = cast(typeof(data[0])*)calloc(nwords, data[0].sizeof);
+            data = cast(typeof(data[0])*) allocateOneBlank(nwords * data[0].sizeof);
         else static if (AllocSupportsShared)
             data = cast(typeof(data[0])*)os_mem_map_shared(nwords * data[0].sizeof); // Allocate as MAP_SHARED
         else

druntime/src/core/internal/gc/impl/manual/gc.d

@@ -25,7 +25,7 @@ import core.internal.container.array;
 
 import core.thread.threadbase : ThreadBase;
 
-import cstdlib = core.stdc.stdlib : calloc, free, malloc, realloc;
+import core.internal.config.memory;
 static import core.memory;
 
 extern (C) noreturn onOutOfMemoryError(void* pretend_sideffect = null, string file = __FILE__, size_t line = __LINE__) @trusted pure nothrow @nogc; /* dmd @@@BUG11461@@@ */
@@ -46,7 +46,7 @@ private GC initialize()
 {
     import core.lifetime : emplace;
 
-    auto gc = cast(ManualGC) cstdlib.malloc(__traits(classInstanceSize, ManualGC));
+    auto gc = cast(ManualGC) allocateOne(__traits(classInstanceSize, ManualGC));
     if (!gc)
         onOutOfMemoryError();
 
@@ -102,7 +102,7 @@ class ManualGC : GC
 
     void* malloc(size_t size, uint bits, const TypeInfo ti) nothrow
     {
-        void* p = cstdlib.malloc(size);
+        void* p = allocateOne(size);
 
         if (size && p is null)
             onOutOfMemoryError();
@@ -120,7 +120,7 @@ class ManualGC : GC
 
     void* calloc(size_t size, uint bits, const TypeInfo ti) nothrow
     {
-        void* p = cstdlib.calloc(1, size);
+        void* p = allocateOneBlank(size);
 
         if (size && p is null)
             onOutOfMemoryError();
@@ -129,7 +129,7 @@ class ManualGC : GC
 
     void* realloc(void* p, size_t size, uint bits, const TypeInfo ti) nothrow
     {
-        p = cstdlib.realloc(p, size);
+        p = reallocate(p, size);
 
         if (size && p is null)
             onOutOfMemoryError();
@@ -148,7 +148,7 @@ class ManualGC : GC
 
     void free(void* p) nothrow @nogc
     {
-        cstdlib.free(p);
+        freeMem(p);
     }
 
     /**

druntime/src/core/runtime.d

@@ -10,6 +10,8 @@
 
 module core.runtime;
 
+import core.internal.config.memory : allocateOne, freeMem;
+
 version (OSX)
     version = Darwin;
 else version (iOS)
@@ -209,7 +211,6 @@ struct Runtime
      */
     static void* loadLibrary()(const scope char[] name)
     {
-        import core.stdc.stdlib : free, malloc;
         version (Windows)
         {
             import core.sys.windows.winnls : CP_UTF8, MultiByteToWideChar;
@@ -222,9 +223,9 @@ struct Runtime
             if (len == 0)
                 return null;
 
-            auto buf = cast(WCHAR*)malloc((len+1) * WCHAR.sizeof);
+            auto buf = cast(WCHAR*) allocateOne((len+1) * WCHAR.sizeof);
             if (buf is null) return null;
-            scope (exit) free(buf);
+            scope (exit) freeMem(buf);
 
             len = MultiByteToWideChar(
                 CP_UTF8, 0, name.ptr, cast(int)name.length, buf, len);
@@ -240,9 +241,9 @@ struct Runtime
             /* Need a 0-terminated C string for the dll name
              */
             immutable len = name.length;
-            auto buf = cast(char*)malloc(len + 1);
+            auto buf = cast(char*) allocateOne(len + 1);
             if (!buf) return null;
-            scope (exit) free(buf);
+            scope (exit) freeMem(buf);
 
             buf[0 .. len] = name[];
             buf[len] = 0;
@@ -743,8 +744,7 @@ Throwable.TraceInfo defaultTraceHandler( void* ptr = null ) // @nogc
     static T allocate(T, Args...)(auto ref Args args) @nogc
     {
         import core.lifetime : emplace;
-        import core.stdc.stdlib : malloc;
-        auto result = cast(T)malloc(__traits(classInstanceSize, T));
+        auto result = cast(T) allocateOne(__traits(classInstanceSize, T));
         return emplace(result, args);
     }
     version (Windows)
@@ -803,16 +803,14 @@ void defaultTraceDeallocator(Throwable.TraceInfo info) nothrow
         return;
     auto obj = cast(Object)info;
     destroy(obj);
-    import core.stdc.stdlib : free;
-    free(cast(void *)obj);
+    freeMem(cast(void *)obj);
 }
 
 /// Default implementation for most POSIX systems
 version (WASI) {}
 else version (Posix) private class DefaultTraceInfo : Throwable.TraceInfo
 {
     import core.demangle;
-    import core.stdc.stdlib : free;
     import core.stdc.string : strlen, memchr, memmove;
 
     this() @nogc
@@ -879,7 +877,7 @@ else version (Posix) private class DefaultTraceInfo : Throwable.TraceInfo
         static if (hasExecinfo)
         {
             const framelist = backtrace_symbols( callstack.ptr, numframes );
-            scope(exit) free(cast(void*) framelist);
+            scope(exit) freeMem(cast(void*) framelist);
 
             static if (enableDwarf)
             {