Ticket #1882: dylib.patch

build/script/bob.rb

@@ -104 +104 @@
-end
-
-class FileFilter
-1
+2
-    @@builders = {}
-    
-    def initialize (args)
@@ -201 +201 @@
-    end
-    
-    def makeLib
-
-
+
+
+
+
+
+
+
+
+
+
-    
-    def exec (cmd)
-        exec2(cmd, nil, nil)
@@ -248 +256 @@
-        libs("-c -n -p256\n" + @args.lib)
-        
-        exclude("tango/core/rt/compiler/dmd/posix")
+        exclude("tango/core/rt/compiler/dmd/darwin")
-        
-        scan(".d") do |file|
-            compile(dmd, file)
@@ -275 +284 @@
-    def initialize (args, os, dmd, ldc, gdc)
-        super(args)
-        include("tango/sys/" + os)
+                
-        FileFilter.register(os, "dmd", :dmd, self)
-        FileFilter.register(os, "ldc", :ldc, self)
-        FileFilter.register(os, "gdc", :gdc, self)
@@ -284 +294 @@
-        @dmd = dmd
-        @ldc = ldc
-        @gdc = gdc
+        @os = os
-    end
-    
-    def compile (file, cmd)
@@ -296 +307 @@
-        return temp
-    end
-    
-
+
+
-        exclude("tango/core/rt/compiler/dmd/windows")
-        
-        scan(".d") do |file|
@@ -370 +382 @@
-end
-
-Args = Struct.new(:verbose, :inhibit, :include, :target, :compiler, 
-
+
+
-                    
-    def initialize
-        self.verbose = false
@@ -388 +401 @@
-        self.filter = false
-        self.quick = false
-        self.objs = File.expand_path("objs")
+        self.dynamic = false
-        
-        self.os = ""
-        self.os = "darwin" if DARWIN
@@ -434 +448 @@
-            options.compiler = opt
-        end
-        
+        opts.on("-d", "--dynamic", "Build Tango as a dynamic/shared library") do |opt|
+            if DARWIN
+                options.dynamic = true
+            else
+                die "Building Tango as a dynamic/shared library is currently not supported on this platform."
+            end
+        end
+        
-        opts.on("-o", "--options OPTIONS", "Specify D compiler options") do |opt|
-            options.flags = opt
-        end
-        
-        opts.on("-l", "--library NAME", "Specify library name (sans .ext)") do |opt|
- + libext
+
-        end
-        
-        opts.on(nil, "--objs PATH", "Specify the path where to place temporary object files (defaults to ./objs)") do |opt|
@@ -476 +498 @@
-                die "No package filter given" unless options.filter
-            end
-            
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-            
-            options.root = File.expand_path(args[0])
-        end

build/src/bob.d

@@ -71 +71 @@
-                libs ("-c -n -p256\n"~args.lib~"\n");
-
-                exclude ("tango/core/rt/compiler/dmd/posix");
+                exclude ("tango/core/rt/compiler/dmd/darwin");
-                foreach (file; scan(".d"))
-                         compile (dmd, file);
-
@@ -161 +162 @@
-        {
-                auto dmd = "dmd -c -I"~args.root~"/tango/core -I"~args.root~" -I"~args.root~"/tango/core/vendor "~args.flags~" -of";
-                exclude ("tango/core/rt/compiler/dmd/windows");
+                exclude ("tango/core/rt/compiler/dmd/darwin");
-                foreach (file; scan(".d")) {
-                         auto obj = compile (file, dmd);
-                         addToLib(obj);
@@ -246 +248 @@
-                register ("osx", "dmd", &dmd);
-                register ("osx", "ldc", &ldc);
-                register ("osx", "gdc", &gdc);
+                include ("tango/core/rt/util/darwin");
-        }
-
-        private char[] compile (FilePath file, char[] cmd)
@@ -362 +365 @@
-        int dmd ()
-        {
-                auto dmd = "dmd -version=freebsd -c -I"~args.root~"/tango/core -I"~args.root~" -I"~args.root~"/tango/core/vendor "~args.flags~" -of";
-
+
+
-                foreach (file; scan(".d")) {
-                         auto obj = compile (file, dmd);
-                         addToLib(obj);
@@ -462 +466 @@
-                auto dmd = "dmd -version=solaris -c -I"~args.root~"/tango/core -I"~args.root~" 
--I"~args.root~"/tango/core/vendor "~args.flags~" -of";
-                exclude ("tango/core/rt/compiler/dmd/windows"); 
+                exclude ("tango/core/rt/compiler/dmd/darwin");
-                foreach (file; scan(".d")) {
-                         auto obj = compile (file, dmd);
-                         addToLib(obj);
@@ -712 +717 @@
-                if (libs.readable > 2)
-                   {
-                   auto files = cast(char[]) libs.slice [0..$-1];
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-                   if (args.quick is false)
-                       // TODO: remove the list of filenames in 'files' 
@@ -772 +791 @@
-                user,
-                quick,
-                inhibit,
-
+
+
-
-        char[]  os,
-                lib,
@@ -787 +807 @@
-                        "\t[-q]\t\t\tquick execution\n"
-                        "\t[-i]\t\t\tinhibit execution\n"
-                        "\t[-u]\t\t\tinclude user modules\n"
+                        "\t[-d]\t\t\tbuild Tango as a dynamic/shared library\n"
-                        "\t[-r=dmd|gdc|ldc]\tinclude a runtime target\n"
-
+                        
-                        "\t[-o=\"options\"]\t\tspecify D compiler options\n"
-                        "\t[-l=libname]\t\tspecify lib name (sans .ext)\n"
-                        "\t[-p=sysname]\t\tdetermines package filtering (windows|linux|osx|freebsd|solaris)\n";
@@ -807 +828 @@
-                auto r = args('r').smush.params(1).defaults("dmd").restrict("dmd", "gdc", "ldc");
-                auto n = args(null).params(1).required.title("tango-path");
-                auto h = args("help").aliased('h').aliased('?').halt;
+                auto d = args('d');
-
-                version (Windows)
-                         p.defaults("windows");
@@ -843 +865 @@
-                   quick = q.set;
-                   inhibit = i.set;
-                   verbose = v.set;
+                   dynamic = d.set;
-                   os = p.assigned[0];
-                   root = n.assigned[0];
-                   flags = o.assigned[0];
-                   target = r.assigned[0];
-                   compiler = c.assigned[0];
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                   return true;
-                   }
-

tango/core/rt/compiler/dmd/darwin/getsect.d

@@ +1 @@
+/**
+ * Copyright: Copyright (c) 2010 Jacob Carlborg. All rights reserved.
+ * Authors: Jacob Carlborg
+ * Version: Initial created: Mar 16, 2010
+ * License: BSD style: $(LICENSE)
+ */
+module rt.compiler.dmd.darwin.getsect;
+
+version (darwin):
+
+import rt.compiler.dmd.darwin.loader;
+
+extern (C):
+
+section* getsectbynamefromheader (in mach_header* mhp, in char* segname, in char* sectname);
+section_64* getsectbynamefromheader_64 (mach_header_64* mhp, in char* segname, in char* sectname);

tango/core/rt/compiler/dmd/darwin/Image.d

@@ +1 @@
+/**
+ * Copyright: Copyright (c) 2010 Jacob Carlborg. All rights reserved.
+ * Authors: Jacob Carlborg
+ * Version: Initial created: Feb 23, 2010
+ * License: BSD style: $(LICENSE)
+ */
+module rt.compiler.dmd.darwin.Image;
+
+version (darwin):
+
+import rt.compiler.dmd.darwin.dyld;
+import rt.compiler.dmd.darwin.loader;
+import rt.compiler.dmd.darwin.getsect;
+
+struct Image
+{
+    private mach_header* header_;
+    private uint index_;
+    
+    static Image opCall (uint index)
+    {
+        Image image;
+        image.header_ = _dyld_get_image_header(index);
+        image.index_ = index;
+        
+        return image;
+    }
+    
+    static uint numberOfImages ()
+    {
+        return _dyld_image_count;
+    }
+    
+    static int opApply (int delegate(ref Image) dg)
+    {
+        int result;
+        
+        for (size_t i = 0; i < numberOfImages; i++)
+        {
+            result = dg(Image(i));
+            
+            if (result)
+                break;
+        }
+        
+        return result;
+    }
+    
+    static int opApplyReverse (int delegate(ref Image) dg)
+    {
+        int result;
+        
+        for (int i = numberOfImages - 1; i >= 0; i--)
+        {
+            result = dg(Image(i));
+            
+            if (result)
+                break;
+        }
+        
+        return result;
+    }
+    
+    mach_header* header ()
+    {
+        return header_;
+    }
+    
+    mach_header_64* header64 ()
+    {
+        return cast(mach_header_64*) header_;
+    }
+    
+    CPU cpu ()
+    {
+        return CPU(header_);
+    }
+}
+
+struct CPU
+{
+    private mach_header* header;
+    
+    static CPU opCall (mach_header* header)
+    {
+        CPU cpu;
+        cpu.header = header;
+        
+        return cpu;
+    }
+    
+    bool is32bit ()
+    {       
+        return (header.magic & MH_MAGIC) != 0;
+    }
+
+    bool is64bit ()
+    {
+        return (header.magic & MH_MAGIC_64) != 0;
+    }
+}
+
+T[] getSectionData (T, char[] segmentName, char[] sectionName) ()
+{
+    T[] array;
+    
+    const c_segmentName = segmentName.ptr;
+    const c_sectionName = sectionName.ptr;    
+    
+    void* start;
+    void* end;
+    
+    foreach_reverse (image ; Image)
+    {            
+        if (image.cpu.is32bit)
+        {
+            auto header = image.header;
+            section* sect = getsectbynamefromheader(header, c_segmentName, c_sectionName);
+            
+            if (sect is null || sect.size == 0)
+                continue;
+
+            start = cast(void*) (cast(byte*) header + sect.offset);
+            end = cast(void*) (cast(byte*) start + sect.size);
+        }
+        
+        else
+        {
+            auto header = image.header64;
+            section_64* sect = getsectbynamefromheader_64(header, c_segmentName, c_sectionName);
+            
+            if (sect is null || sect.size == 0)
+                continue;
+
+            start = cast(void*) (cast(byte*) header + sect.offset);
+            end = cast(void*) (cast(byte*) start + sect.size);
+        }
+        
+        size_t len = cast(T*)end - cast(T*)start;
+        array ~= (cast(T*)start)[0 .. len];
+    }
+    
+    return array;
+}

tango/core/rt/compiler/dmd/darwin/loader.d

@@ +1 @@
+/**
+ * Copyright: Copyright (c) 2010 Jacob Carlborg. All rights reserved.
+ * Authors: Jacob Carlborg
+ * Version: Initial created: Feb 20, 2010
+ * License: BSD style: $(LICENSE)
+ */
+module rt.compiler.dmd.darwin.loader;
+
+version (darwin):
+
+struct mach_header
+{
+    uint magic;
+    int cputype;
+    int cpusubtype;
+    uint filetype;
+    uint ncmds;
+    uint sizeofcmds;
+    uint flags;
+}
+
+struct mach_header_64
+{
+    uint magic;
+    int cputype;
+    int cpusubtype;
+    uint filetype;
+    uint ncmds;
+    uint sizeofcmds;
+    uint flags;
+    uint reserved;
+}
+
+enum : uint
+{
+    MH_MAGIC = 0xfeedface,
+    MH_CIGAM = 0xcefaedfe,
+    MH_MAGIC_64 = 0xfeedfacf,
+    MH_CIGAM_64 = 0xcffaedfe,
+}
+
+struct section
+{
+    char[16] sectname;
+    char[16] segname;
+    uint addr;
+    uint size;
+    uint offset;
+    uint align_;
+    uint reloff;
+    uint nreloc;
+    uint flags;
+    uint reserved1;
+    uint reserved2;
+}
+
+struct section_64
+{
+    char[16] sectname;
+    char[16] segname;
+    long addr;
+    long size;
+    uint offset;
+    uint align_;
+    uint reloff;
+    uint nreloc;
+    uint flags;
+    uint reserved1;
+    uint reserved2;
+    uint reserved3;
+}

tango/core/rt/compiler/dmd/darwin/dynamic_lib_fixes.c

@@ +1 @@
+#ifdef __APPLE__
+    void* _Dmain __attribute__ ((weak));
+    char rt_init ();
+    char rt_term ();
+    
+    __attribute__((constructor)) static void initializer ()
+    {
+        rt_init();
+    }
+    
+    __attribute__((destructor)) static void finalizer ()
+    {
+        rt_term();
+    }
+#endif

tango/core/rt/compiler/dmd/darwin/dyld.d

@@ +1 @@
+/**
+ * Copyright: Copyright (c) 2010 Jacob Carlborg. All rights reserved.
+ * Authors: Jacob Carlborg
+ * Version: Initial created: Feb 20, 2010
+ * License: BSD style: $(LICENSE)
+ */
+module rt.compiler.dmd.darwin.dyld;
+
+version (darwin):
+
+import rt.compiler.dmd.darwin.loader;
+
+extern (C):
+
+uint _dyld_image_count ();
+mach_header* _dyld_get_image_header (uint image_index);

tango/core/rt/compiler/dmd/rt/dmain2.d

@@ -89 +89 @@
-
-void _d_criticalInit()
-{
+    static bool hasBeenCalled;
+    
+    if (hasBeenCalled)
+        return;
+        
+    hasBeenCalled = true;
+    
-    version (Posix)
-    {
-        _STI_monitor_staticctor();
@@ -100 +107 @@
-
-extern (C) bool rt_init( ExceptionHandler dg = null )
-{
+    static bool result;
+    
+    if (result)
+        return result;
+    
-    _d_criticalInit();
-
-    try
@@ -108 +120 @@
-        version (Win32)
-            _minit();
-        _moduleCtor();
-
+result = 
-    }
-    catch( Exception e )
-    {
@@ -120 +132 @@
-
-    }
-    _d_criticalTerm();
-
+result = 
-}
-
-void _d_criticalTerm()
-{
+    static bool hasBeenCalled;
+    
+    if (hasBeenCalled)
+        return;
+        
+    hasBeenCalled = true;
+    
-    version (Posix)
-    {
-        _STD_critical_term();
@@ -134 +153 @@
-
-extern (C) bool rt_term( ExceptionHandler dg = null )
-{
+    static bool result;
+    
+    if (result)
+        return result;
+    
-    try
-    {
-        thread_joinAll();
-        _d_isHalting = true;
+        thread_joinAll();        
-        _moduleDtor();
-        gc_term();
-
+result = 
-    }
-    catch( Exception e )
-    {
@@ -155 +179 @@
-    {
-        _d_criticalTerm();
-    }
-
+result = 
-}
-
-version (OSX)
@@ -215 +239 @@
-     */
-    __libc_stack_end = cast(void*)&argv;
-    }
+    
-    version (Posix)
-
-
-
-
+
-
-    version (Win32)
-    {
@@ -305 +327 @@
-
-    void runAll()
-    {
-
-
-
-
+
-        if (runModuleUnitTests())
-            tryExec(&runMain);
-
-
-
-
+
-    }
-
-    tryExec(&runAll);
-
-    version (Posix)
-
-
-
-
+
+
-    return result;
-}

tango/core/rt/compiler/dmd/object_.d

@@ -48 +48 @@
-    import rt.compiler.dmd.rt.aaA;
-    debug(PRINTF) import tango.stdc.stdio: printf;
-    extern (C) Object _d_newclass(ClassInfo ci);
+    
+    version (darwin)
+        import rt.compiler.dmd.darwin.Image;
-}
-
-// NOTE: For some reason, this declaration method doesn't work
@@ -1220 +1223 @@
-    extern (C) ModuleReference *_Dmodule_ref;   // start of linked list 
-}
-
-version( OSX )
-{
-    extern (C)
-    {
-    extern void* _minfo_beg;
-    extern void* _minfo_end;
-    }
-}
-
-ModuleInfo[] _moduleinfo_dtors;
-uint         _moduleinfo_dtors_i;
-
@@ -1280 +1274 @@
-     * and __minfo_end. The variables _minfo_beg and _minfo_end
-     * are of zero size and are in the two bracketing segments,
-     * respectively.
+     * 
+     * The __minfo_beg and __minfo_end sections are not put into
+     * dynamic libraries therefore we cannot use them or the
+     * _minfo_beg and _minfo_end variables. Instead we loop through
+     * all the loaded images (executables and dynamic libraries) and
+     * collect all the ModuleInfo references.
-     */
-
-
+
-        debug(PRINTF) printf("moduleinfo: ptr = %p, length = %d\n", _moduleinfo_array.ptr, _moduleinfo_array.length);
-
-        debug(PRINTF) foreach (m; _moduleinfo_array)

tango/core/rt/compiler/dmd/posix/deh.d

@@ -29 +29 @@
-import tango.stdc.stdio : printf;
-import tango.stdc.stdlib : exit;
-
+version (darwin)
+    import rt.compiler.dmd.darwin.Image;
+
-extern (C)
-{
-
-
+
+
+
+
+
+
+
-
-    int _d_isbaseof(ClassInfo oc, ClassInfo c);
-}
@@ -99 +107 @@
-
-DHandlerTable *__eh_finddata(void *address)
-{
-
-
-
-
-
-
-
+
-    {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
-        {
-
-
+
+
+
+
+
+
+
+
+
-        }
+    //    debug printf("\tnot found\n");
+        return null;
-    }
-//    debug printf("\tnot found\n");
-    return null;
-}
-
-