Changeset 292

Timestamp:

04/20/08 19:58:46 (9 months ago)

Author:

h3r3tic

Message:

new linking algorithm

Files:

• trunk/ddl/DefaultRegistry.d (modified) (2 diffs)
• trunk/ddl/ExportClass.d (modified) (1 diff)
• trunk/ddl/Linker.d (modified) (12 diffs)
• trunk/ddl/all.d (modified) (1 diff)
• trunk/ddl/host/HostAppModule.d (modified) (4 diffs)
• trunk/ddl/omf/OMFBinary.d (modified) (2 diffs)
• trunk/ddl/omf/OMFLibrary.d (modified) (1 diff)
• trunk/ddl/omf/OMFModule.d (modified) (18 diffs)
• trunk/utils/bless_bn.d (modified) (1 diff)
• trunk/utils/ddlinfo_bn.d (modified) (1 diff)
• trunk/utils/insitu_bn.d (modified) (1 diff)

trunk/ddl/DefaultRegistry.d

@@ -37 +37 @@
-private import ddl.omf.OMFLoader;
-private import ddl.ddl.DDLLoader;
-
+//
-private import ddl.insitu.InSituLoader;
-//private import ddl.coff.COFFLoader;
@@ -62 +62 @@
-            register(new ArchiveLoader());          
-    //      register(new COFFObjLoader());          
-
+//
-        }
-        else{
-            register(new ArchiveLoader());
-
+//
-            register(new DDLLoader());
-    //      register(new InSituLibLoader());            

trunk/ddl/ExportClass.d

@@ -67 +67 @@
-      if (ctor) ctor(obj);
-      else {
-Exp ctorMatch = new RegExp
+ex ctorMatch = new Regex
-               `^_D` ~ name ~ mangleSymbolName!("_ctor")
-               ~ `F` ~ `.*`

trunk/ddl/Linker.d

@@ -36 +36 @@
-private import ddl.LoaderRegistry;
-private import ddl.DDLException;
+import tango.stdc.stdio;
-
-debug private import ddl.Utils;
@@ -99 +100 @@
-*/
-class Linker{
+    public bool autoRunModuleCtors = true;
+    
+    
-    protected LoaderRegistry registry;
-    /** 
@@ -196 +200 @@
-    }
-    
+    
+    private void selfResolveAll() {
+        foreach (lib; this.libraries) {
+            foreach (mod; lib.getModules) {
+                if (mod.isResolved) continue;
+                
+                foreach (ref sym; mod.getSymbols) {
+                    if (SymbolType.Weak == sym.type) {
+                        sym.type = SymbolType.Strong;
+                    }
+                }
+            }
+        }
+    }
+    
+    
+    public void checkResolved(DynamicLibrary lib, void delegate(DynamicModule, ExportSymbolPtr) errHandler = null) {
+        foreach (mod; lib.getModules) {
+            if (mod.isResolved) continue;
+            
+            foreach (ref sym; mod.getSymbols) {
+                if (SymbolType.Strong != sym.type) {
+                    if (errHandler !is null) {
+                        errHandler(mod, &sym);
+                    } else {
+                        char[] ext = sym.isExternal ? "external" : "local";
+                        bool isWeak = sym.type == SymbolType.Weak;
+                        throw new DDLException("cannot resolve symbol: [{0:8X}] {1} {2} {3}" ~ (isWeak ? " the symbol is weak" : "") ~ \n,cast(uint)sym.address, sym.getTypeName(), ext, sym.name);
+                    }
+                }
+            }
+        }
+    }
+    
+    
+    public void runModuleCtors(ModuleSet moduleSet) {
+        foreach(mod, moduleInfo; moduleSet) {
+            debug debugLog("running {0} init at [{1:8X}]", mod, cast(void*)moduleInfo);
+            this.initModule(moduleInfo, 0);
+        }
+    }
+    
+    
-    alias ModuleInfo[char[]] ModuleSet; 
+    
+    public void link(DynamicModule mod, inout ModuleSet moduleSet, bool canSelfResolve){
+        if (mod.isLinking) {
+            return;
+        }
+        mod.isLinking = true;
+        
+        //printf("Linking module %.*s"\n, mod.getName);
+
+        auto modSymbols = mod.getSymbols();
+        symbolIter: foreach (ref sym; modSymbols) {
+            if (SymbolType.Strong == sym.type) {
+                continue;
+            }
+
+            //printf("Examining %.*s symbol %.*s in %.*s"\n, sym.getTypeName, sym.name, mod.getName);
+            
+            foreach (lib; this.libraries) {
+                auto otherMod = lib.getModuleForSymbol(sym.name);
+                if (otherMod is null || otherMod is mod) {
+                    continue;
+                }
+                
+                if (!otherMod.isResolved) {
+                    this.link(otherMod, moduleSet, true);
+                }
+                
+                auto otherSym = otherMod.getSymbol(sym.name);
+                if (SymbolType.Unresolved != otherSym.type) {
+                /+if (
+                    SymbolType.Strong == otherSym.type
+                    || (SymbolType.Weak == otherSym.type && SymbolType.Unresolved == sym.type)
+                ) {+/
+                    sym.address = otherSym.address;
+                    sym.type = SymbolType.Strong;
+                    sym.isExternal = true;
+                    continue symbolIter;
+                }
+            }
+
+            /+if (sym.type == SymbolType.Weak && canSelfResolve) {
+                sym.type = SymbolType.Strong;
+            }+/
+        }
+
+        mod.resolveFixups();
+        //mod.isLinking = false;
+        
+        foreach (ref sym; modSymbols) {
+            version (Stacktrace){
+                if (sym.address !is null) {
+                    //printf("symbol %.*s line: %d\n", symbol.name, symbol.lineNumber);
+                    regist_cb((sym.name ~ \0).ptr, sym.address);
+                    addDebugLineInfo__(cast(uint)sym.address, sym.lineNumber, mod.getName);
+                }
+            }
+
+
+            // symbol must be defined and be local only
+            if (sym.address is null || sym.isExternal) {
+                continue;
+            }
+            
+            char[] suffix = `__ModuleInfoZ`;
+            if (sym.name.length > suffix.length && sym.name[$ - suffix.length .. $] == suffix) {
+                debug debugLog("Found moduleinfo for {0} at [{1:8X}] {2}", mod.getName, sym.address, sym.name);
+                moduleSet[sym.name] = cast(ModuleInfo)(sym.address);
+            }
+        }
+    }
+    
+    
+    private void finishLinking() {
+        foreach (lib; this.libraries) {
+            foreach (mod; lib.getModules) {
+                mod.isLinking = false;
+            }
+        }
+    }
+    
+    
+    /*
+        This implementation has problems with circular dependencies across modules. I've replaced
+        it with one that doesn't do strict checking of SymbolType and isResolved.
+        To account for the change, I had to include a function to check the status of the linking.
+        
+        checkResolved(lib) will by default check if every symbol in the lib is Strong and throw an exception.
+        It can be given a handler to do more fancy unresolved symbol handling.
+        
+        - h3r3tic, 2008-04-21
+    */
+    
-        
-    /**
@@ -209 +348 @@
-        moduleSet a set of modules that need initalization following the link pass.
-    */
-
+/+
-        uint i;
-        
@@ -218 +357 @@
-        mod.isLinking = true;
-        
+        if (canSelfResolve) printf("(Can self-resolve) ");
-        debug debugLog("Linking module: {0}",mod.getName);
+        printf("Linking module %.*s"\n, mod.getName);
-        
-        auto moduleSymbols = mod.getSymbols();
+        printf("Number of symbols: %d"\n, moduleSymbols.length);
+        
-        for(i=0; i<moduleSymbols.length; i++){
-            auto symbol = &(moduleSymbols[i]);
+            printf("Pre-examining %.*s symbol %.*s in %.*s"\n, symbol.getTypeName, symbol.name, mod.getName);
+        }
+
+        for(i=0; i<moduleSymbols.length; i++){
+            auto symbol = &(moduleSymbols[i]);
+            
+            printf("Examining %.*s symbol %.*s in %.*s"\n, symbol.getTypeName, symbol.name, mod.getName);
-            
-            // ensure we're only linking weak and unresolved symbols
@@ -231 +381 @@
-            foreach(lib; this.libraries){
-                auto libMod = lib.getModuleForSymbol(symbol.name);
-=
+is
-                    if(!libMod.isResolved()){
-                        this.link(libMod,moduleSet,true);
@@ -244 +394 @@
-                        goto nextSymbol;
-                    }
-
+
+
+
+
+
-                }
-            }
@@ -254 +408 @@
-                char[] ext = symbol.isExternal ? "external" : "local";
-                char[] self = canSelfResolve ? "can Self Resolve" : "cannot Self Resolve";
-
+
+
-            }
-            
@@ -288 +443 @@
-            }
-        }
-
++/
-    
-    /**
@@ -313 +468 @@
-        ---
-    */
-void
+ModuleSet
-        ModuleSet moduleSet;
-        
@@ -320 +475 @@
-        
-        // link
-
-
-
-
-
+
+
+
+
+
+
+
+
-        foreach(mod,moduleInfo; moduleSet){
-            debug debugLog("running {0} init at [{1:8X}]",mod,cast(void*)moduleInfo);
@@ -330 +488 @@
-        }
-    //  _moduleCtor2(moduleSet.values,0);
+    +/
+    
+        if (autoRunModuleCtors) {
+            runModuleCtors(moduleSet);
+        }
+    
+        return moduleSet;
-    }
-    

trunk/ddl/all.d

@@ -41 +41 @@
-public import ddl.PathLibrary;
-public import ddl.Utils;
-
+

trunk/ddl/host/HostAppModule.d

@@ -36 +36 @@
-
-private {
+    extern(C) extern void* _except_list;
+    extern(Windows) extern void _d_throw(void*);
+}
+
+
+private {
-    import ddl.host.HostAppLibrary;
-    
@@ -43 +49 @@
-    import tango.sys.win32.UserGdi;
-    import tango.stdc.stringz;
+    import tango.stdc.stdio;
-
-
@@ -87 +94 @@
-
-        int add_symbol(LPSTR name, ULONG addr, ULONG size, PVOID){
+            //printf("%s"\n, name);
-            ExportSymbol sym;
-            sym.isExternal = false;
@@ -151 +159 @@
-            }
-
-
-
+ 
+ 
-                    base = sym_load_module(proc, HANDLE.init, buffer.ptr, null, 0, 0);
-
+ 
-                        sym_enumerate_symbols(proc, base, &add_symbol, null);
-                    }
-                }
-
+
+
+
+
+
+
+
+
+
-        }
-    }

trunk/ddl/omf/OMFBinary.d

@@ -41 +41 @@
-private import ddl.omf.OMFException;
-private import ddl.omf.OMFReader;
+
+import tango.stdc.stdio;
-
-/**
@@ -101 +103 @@
-void parse(inout WKEXT[] externs,OMFReader reader){
-    while(reader.hasMore()){
-
-
-
+
+
+
+
+
+
-    }
-}

trunk/ddl/omf/OMFLibrary.d

@@ -82 +82 @@
-        debug debugLog("[OMF] looking for {0} in {1}",name,attributes["omf.filename"]);
-        DynamicModule* mod = name in crossReference;
-8
+
-        if(mod) return *mod;
-        return null;

trunk/ddl/omf/OMFModule.d

@@ -36 +36 @@
-
-private import Text = tango.text.Util;
+import tango.stdc.stdio;
-
-version(Windows){
@@ -93 +94 @@
-    protected bool containsAddress(void* addr){
-        foreach(seg; this.segmentImages){
-8X] [%0.8X] [%0.8
+X] [%0.X] [%0.
-            if(addr >= seg.data.ptr && addr <= (seg.data.ptr + seg.data.length)){
-                return true;
@@ -106 +107 @@
-        
-        foreach(idx,fix; fixups) with(fix){
+            /+if (targetSymbol) {
+                printf("targetSymbol: %.*s"\n, targetSymbol.name);
+            }+/
+            
-            uint fixupValue;
-            uint destAddress;
@@ -113 +118 @@
-                if(destSymbol.isExternal){
-                    // discard this fixup - it references a non-local symbol
-8
+
-                    continue;
-                }
-                else{
-8
+
-                    destAddress = cast(uint)destSymbol.address + destSymbolOffset;
-                }
@@ -126 +131 @@
-            
-            if(!containsAddress(cast(void*)destAddress)){
-8
+
-                debug debugLog("dump: {0}",this.toString());
-                assert(false);
@@ -137 +142 @@
-                    // fixup cannot be resolved at this time, so save it for later
-                    remainingFixups ~= fix;
+                    //printf("fixup cannot be resolved at this time, so save it for later"\n);
-                    continue;
-                }
@@ -146 +152 @@
-            
-            debug if(destSymbol){
-8X}] ({3:8X}) = fixupValue [{4:8
+X}] ({3:X}) = fixupValue [{4:
-            }
-            else{
-8X}] ({1:8X}) = fixupValue [{2:8
+X}] ({1:X}) = fixupValue [{2:
-            }
-            
@@ -166 +172 @@
-            }
-            
-8
+
-        }
-        this.fixups = remainingFixups;
@@ -270 +276 @@
-            uint offset = lidata.offset;
-            
-8X .. %0.8
+X .. %0.
-            
-            // reallocate if needed
@@ -277 +283 @@
-            }
-            // copy into the buffer
-8X .. %0.8
+X .. %0.
-            image.data[offset..offset+dataLength] = lidata.data;
-        }
@@ -287 +293 @@
-            uint dataLength = ledata.data.length;
-            uint offset = ledata.offset;
-8X Images: %0.8
+X Images: %0.
-            
-            // reallocate if needed
@@ -293 +299 @@
-                image.data.length = offset + dataLength;
-            }
-8X .. %0.8
+X .. %0.
-            image.data[offset..offset+dataLength] = ledata.data;
-        }
@@ -438 +444 @@
-            if(fix.isExternStyleFixup){
-                newFix.targetSymbol = symbolXref[cast(char[])binary.externNames[fix.targetIndex]];
+                //printf("new fix %.*s"\n, newFix.targetSymbol.name);
-            }
-            else{
@@ -453 +460 @@
-            fixups ~= newFix;
-        }
+        
+        //printf("%.*s"\n, toString);
-    }
-    
@@ -471 +480 @@
-                if(idx == 0) continue;
-                char[] name = binary.names[binary.segments[idx].nameIndex];
-8
+
-            }
-        }
@@ -478 +487 @@
-        foreach(idx,sym; symbols){
-            char[] ext = sym.isExternal ? "external" : "local";
-8
+
-        }
-        
@@ -491 +500 @@
-
-                    if(destSymbol){
-8
+
-                    }
-                    else{
-8
+
-                    }                   
-                        
-                    if(isExternStyleFixup){
-8
+
-                    }
-                    else{
-8
+
-                    }
-                    result ~= "\n";
@@ -514 +523 @@
-            foreach(byteidx,b; cast(ubyte[])(segdef.data)){
-                if(byteidx % 16 == 0){
-8
+
-                     buf2 = "";
-                }

trunk/utils/bless_bn.d

@@ -2 +2 @@
-// This file is automatically maintained by the BUILD utility,
-// Please refrain from manually editing it.
-7
+9

trunk/utils/ddlinfo_bn.d

@@ -2 +2 @@
-// This file is automatically maintained by the BUILD utility,
-// Please refrain from manually editing it.
-7
+9

trunk/utils/insitu_bn.d

@@ -2 +2 @@
-// This file is automatically maintained by the BUILD utility,
-// Please refrain from manually editing it.
-4
+6