Changeset 219

Timestamp:

07/28/06 20:32:37 (2 years ago)

Author:

pragma

Message:

Mostly working - still needs verification.

Files:

• trunk/ddl/DynamicLibrary.d (modified) (4 diffs)
• trunk/ddl/Linker.d (modified) (7 diffs)
• trunk/ddl/insitu/InSituLibBinary.d (modified) (1 diff)
• trunk/ddl/insitu/InSituMapBinary.d (modified) (4 diffs)
• trunk/ddl/omf/OMFBinary.d (modified) (19 diffs)
• trunk/ddl/omf/OMFLibrary.d (modified) (2 diffs)
• trunk/ddl/omf/OMFModule.d (modified) (13 diffs)
• trunk/test/linktest1.d (modified) (2 diffs)
• trunk/test/testmodule.d (modified) (1 diff)
• trunk/utils/ddlinfo.d (modified) (4 diffs)

trunk/ddl/DynamicLibrary.d

@@ -75 +75 @@
-        forces the implementation to return every and all modules it controls, without exception.  
-        
-Export
+Symbol
-        performance implications, depending on the actual implemenation of DynamicLibrary.  
-        For example, some implementations may decide to intercept D symbols and map the symbol 
@@ -83 +83 @@
-        Returns: the module contianing the export, or null if no module in this library contains
-        the export.  The module is not guaranteed to contain the symbol provided, and can simply be 
-Export
+Symbol
-        any such false-positives.
-        
@@ -105 +105 @@
-    /*
-        Template method that returns a typed export from the library.  The implementation uses
-ExportAddress() internally.  This differs greatly from the use of getExport
+SymbolAddress() internally.  This differs greatly from the use of getSymbol
-        variants in that it allows for a proper D namespace/name instead of a mangled symbol.
-        
@@ -125 +125 @@
-        static if(T.mangleof[0] == 'P'){
-            typeof(T) getDExport() {
-Export
+Symbol
-                }
-        } else {
-            typeof(T) getDExport() {
-Export
+Symbol
-        }
-    }

trunk/ddl/Linker.d

@@ -118 +118 @@
-        if(!m) return;
-        if (m.flags & MIctordone) return;
-
-
+
+
+
+
+
+
+
-        if (m.ctor || m.dtor)
-        {
@@ -129 +134 @@
-            
-            m.flags |= MIctorstart;
+            debug debugLog("running imported modules (%d)...",m.importedModules.length);
-            foreach(ModuleInfo imported; m.importedModules){
-                initModule(imported,0);
@@ -142 +148 @@
-        {
-            m.flags |= MIctordone;
+            debug debugLog("running imported modules (%d)...",m.importedModules.length);
-            foreach(ModuleInfo imported; m.importedModules){
-                initModule(imported,1);
@@ -147 +154 @@
-        }    
-    }
-
+   
-    /**
-        Links a module against the linker's internal cross-reference.
@@ -164 +171 @@
-        mod.isLinking = true;
-        
-
+
+
+
+
+
+
-            if(symbol.type == SymbolType.Strong) continue;
-            // resolve a dependency from out of the registry
@@ -174 +186 @@
-                    }
-                    auto otherSymbol = libMod.getSymbol(symbol.name);
-
-
-
-
-
+
+
+
+
+
+
+
-                }
-            }
@@ -200 +214 @@
-            throw new LinkModuleException(mod);
-        }
-
+
+
+
-        // dig up the ModuleInfo (if applicable) and initalize it!
-        foreach(sym; mod.getSymbols){
+            if(!sym.address) continue;
-            if(getDemangleType(sym.name) == DemangleType.ModuleInfo){
-                // found it, now get it and run the constructor
-                ModuleInfo moduleInfo = cast(ModuleInfo)(sym.address);
-0.8X"
+s %s %0.8X",sym.name,sym.getTypeName
-                initModule(moduleInfo,0);
+                debug debugLog("init done.");
+                break;
-            }
-        }
-    }
-    
-    /+
-    public void link(DynamicModule mod){
-        //protect against infinite recursion here by returning early
-        //by this, we count on the module being resolved further up the call stack
-        if(mod.isLinking) return;
-        
-        mod.isLinking = true;
-        
-        foreach(char[] dep; mod.getDependencies){
-            ExportSymbol sym = ExportSymbol.init;
-            //TODO: create a cache for namespace matching requests and search that first
-            foreach(DynamicLibrary lib; this.libraries){
-                DynamicModule libMod = lib.getModuleForExport(dep);
-                if(libMod){
-                    //TODO: add to the cache here
-                    sym = libMod.getExport(dep);
-                    if(sym != ExportSymbol.init){
-                        if(!libMod.isResolved()){
-                            this.link(libMod);
-                        }
-                        mod.resolveDependency(sym);
-                        goto nextDep; // why keep looping? get the heck out -- we're done!
-                    }
-                }
-            }
-            nextDep:
-            debug if(sym == ExportSymbol.init){
-                debugLog("[Linker.link]: cannot find %s",dep);
-            }
-        }
-        //TODO: possible mod.resolveInternals() call here.
-        mod.isLinking = false;
-        
-        if(!mod.isResolved()){
-            throw new LinkModuleException(mod);
-        }
-        
-        // dig up the ModuleInfo (if applicable) and initalize it!
-        foreach(ExportSymbol sym; mod.getExports){
-            if(getSymbolType(sym.name) == SymbolType.ModuleInfo){
-                // found it, now get it and run the constructor
-                ModuleInfo moduleInfo = cast(ModuleInfo)(sym.address);
-                debug debugLog("init! %0.8X",sym.address);
-                initModule(moduleInfo,0);
-            }
-        }
-    }+/
-    
-    /**

trunk/ddl/insitu/InSituLibBinary.d

@@ -91 +91 @@
-                        
-            sym.address = cast(void*)address;
+            sym.type = SymbolType.Strong;
-                    
-            allSymbols[sym.name] = sym;

trunk/ddl/insitu/InSituMapBinary.d

@@ -72 +72 @@
-        parsePublicsByName(iter);   
-        // throw away the publics by address
+        
+        version(Windows){
+            //HACK: add in parts to make DMD/OMF linking work correctly
+            //NOTE: blindly pulling in all 'Abs' symbols doesn't work as well as it should
+            ExportSymbol sym;
+            
+            // __nullext - placeholder for the start of static init for modules
+            sym.address = null;
+            sym.name = "__nullext";
+            sym.type = SymbolType.Strong;
+            allSymbols[sym.name] = sym;
+            
+            // __except_list - placeholder for the start of the exception handling list in FS
+            sym.address = null;
+            sym.name = "__except_list";
+            sym.type = SymbolType.Strong;
+            allSymbols[sym.name] = sym;
+        }
-    }
-    
@@ -98 +116 @@
-        line = iter.getNext();  // throw away the first line (header)
-        line = iter.getNext();  // throw away the second line (blank)
-       
+
-        // read until there's a blank line
-        while(true){
-            line = iter.getNext();
-            if(line.length == 0) break;
-
+
+
+
-            // throw away the address (first nine chars) 
-            if(line[14..21] == "  Imp  ") continue; // throw this away! We want the '__imp__' version instead.
@@ -121 +141 @@
-            assert(line.length == 8);
-            pos = 0;
-            uint rva;
-            while(pos < 8){
-                char ch = line[pos];
@@ -143 +162 @@
-            sym.address = cast(void*)rva;
-            sym.name = symbol;
+            sym.type = SymbolType.Strong;
-                        
-            allSymbols[sym.name] = sym;

trunk/ddl/omf/OMFBinary.d

@@ -121 +121 @@
-}
-
-
+inout FixupTarget[] targets,
-    while(reader.hasMore()){
-        EXTDEF extdef;      
-        extdef.parse(reader);
-        externs ~= extdef;
+        
+        FixupTarget target;
+        target.type = FixupTarget.EXTDEF;
+        target.index = externs.length-1;
+        targets ~= target;      
-    }
-}
@@ -149 +154 @@
-}
-
-
+inout FixupTarget[] targets,
-    OMFIndex groupIndex;
-    OMFIndex segmentIndex;
@@ -176 +181 @@
-        
-        publics ~= pub;
+        
+        FixupTarget target;
+        target.type = FixupTarget.PUBDEF;
+        target.index = publics.length-1;
+        targets ~= target;
-    }
-}
@@ -353 +363 @@
-    
-    void parse(OMFReader reader){
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -375 +401 @@
-    FixupThread[4] targetThreads;   
-}
+
-void parse(inout FIXUPP[] fixups,inout FixupData fixupData, OMFReader reader){
-    ubyte type;
@@ -399 +426 @@
-            method = (type & 0b00011100) >> 2;
-            
-rame thread
+ind the frame type
-            if(type & 0b01000000){  
-                fixupThread = &(fixupData.frameThreads[threadNumber]);              
-
-
-
-
-
-
-
-
-
-
-
+
+
-                fixupThread = &(fixupData.targetThreads[threadNumber]);
+            }
+            
+            // get the index
+            if(method < 4){ 
-                reader.get(tmpIndex);
-                fixupThread.index = cast(ushort)tmpIndex;
-            }
-
+
+
+
+
-            fixupThread.method = method;
-        }           
@@ -676 +701 @@
-}
-
-
+inout FixupTarget[] targets,
-    while(reader.hasMore()){
-        CEXTDEF def;
-        def.parse(reader);
-        commonExterns ~= def;
+        
+        FixupTarget target;
+        target.type = FixupTarget.CEXTDEF;
+        target.index = commonExterns.length-1;
+        targets ~= target;
-    }
-}
@@ -735 +765 @@
-}
-
-
+inout FixupTarget[] targets,
-    while(reader.hasMore()){
-        COMDAT data;
@@ -743 +773 @@
-        fixupData.groupIndex = data.groupIndex;
-        fixupData.segmentIndex = data.segmentIndex;
-
+
+
+
+
+
+
+
+
-    }
-}
@@ -851 +888 @@
-    LString libraryName;
-    LString[] names;
+    FixupTarget[] targets;
-    
-    // comment sub data
@@ -894 +932 @@
-        names.length = names.length+1;
-        externs.length = externs.length+1;
+        targets.length = targets.length+1;
-        
-        while(mainReader.hasMore()){
@@ -918 +957 @@
-            
-            case 0x8C: //EXTDEF
-reader); 
+targets,reader);
-                break;
-            
-            case 0x90: //PUBDEF
-
+targets,
-                break;
-            
@@ -958 +997 @@
-                
-            case 0xBC: //CEXTDEF
-
+targets,
-                break;
-                
-            case 0xC2: //COMDAT
-
+targets,
-                break;
-                
@@ -1032 +1071 @@
-        }
-    }
-
+   
-    public char[] toString(){
+        char[] getExternName(uint index){
+            uint workingIndex = index;
+        /*  FixupTarget target = targets[index];
+            
+            switch(target.type){
+            case FixupTarget.CEXTDEF:
+                return cast(char[])names[communalExterns[target.index].nameIndex];
+            case FixupTarget.EXTDEF:
+                return cast(char[])externs[target.index].name;              
+            case FixupTarget.COMDAT:
+                return cast(char[])communalDefinitions[target.index].communalName;  
+            case FixupTarget.PUBDEF:
+                return cast(char[])publics[target.index].name;              
+            }*/
+            
+            if(workingIndex < communalExterns.length){
+                return cast(char[])names[communalExterns[workingIndex].nameIndex];
+            }
+            workingIndex -= communalExterns.length;
+            if(workingIndex < externs.length){
+                return cast(char[])externs[workingIndex].name;              
+            }
+            workingIndex -= externs.length;
+            if(workingIndex < communalDefinitions.length){
+                return cast(char[])communalDefinitions[workingIndex].communalName;
+            }
+        }   
+        
-        char[] result = "";
-        ExtSprintClass sprint = new ExtSprintClass(1024);
@@ -1058 +1125 @@
-            }
-        }
-
+
-        result ~= "WKEXT:\n";
-        foreach(idx,weak; weakExterns){
-            with(weak){
-
-
-
+
+
+
+
+
+
-            }
-        }
@@ -1123 +1193 @@
-                
-                if(isExternStyleFixup){
-
-
-
-
-
-
-
-
-
-
-
+
-                }
-                else{
@@ -1139 +1199 @@
-                }
-                
-s\n",idx,segment,destOffset,rel
+d %s\n",idx,segment,destOffset,rel,targetIndex
-            }
-        }   
@@ -1198 +1258 @@
-                
-                result ~= sprint("  %d: Line %d --> %s%s %0.8X\n",
-
+cast(uint)
-            }
-        }
@@ -1213 +1273 @@
-            }
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return result;
-    }   

trunk/ddl/omf/OMFLibrary.d

@@ -81 +81 @@
-        
-    public DynamicModule getModuleForSymbol(char[] name){
-
+[OMF] 
-        DynamicModule* mod = name in crossReference;
-
+[OMF] 
-        if(mod) return *mod;
-        return null;
@@ -97 +97 @@
-        for(uint i=0; i<symbols.length; i++){
-            ExportSymbolPtr exp = &(symbols[i]);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    }

trunk/ddl/omf/OMFModule.d

@@ -45 +45 @@
-    alias SegmentImage* SegmentImagePtr;
-
-
-
+
+
+
-    ExportSymbol[] symbols;
-    ExportSymbolPtr[char[]] symbolXref;
@@ -54 +55 @@
-    this(FileBuffer buffer){
-        resolved = false;
-
-
+
-    }
-        
-    this(DDLReader reader){
-        resolved = false;
-
-
+
-    }
-    
@@ -78 +77 @@
-    
-    public void resolveFixups(){
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    
-    public bool isResolved(){
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        //TODO: alter this to zero in on D namespaces and C/asm namespaces
-        this.moduleName = binary.libraryName;
@@ -106 +156 @@
-        //NOTE: extern indicies match their OMF counterparts
-        symbols.length = 
-externs.length + 
-binary.communalExterns.length
+communalExterns.length +            
+(binary.externs.length-1)
-            binary.communalDefinitions.length +
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        // external symbols
-        foreach(idx,ext; binary.externs){
@@ -124 +185 @@
-            symbolIndex++;
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        //1st pass for COMDEF records
-        //build up the memory image of the referenced segments 
@@ -191 +208 @@
-            
-            segZeroAddress += comdef.length;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                
-        //1st pass for COMDAT records
@@ -210 +261 @@
-            void** addr = &(currentAddress[comdat.segmentIndex]);
-            if(*addr == null){
-
+
+
-            }
-            
@@ -216 +268 @@
-            //NOTE: this is done to calculate the offset on this pass
-            if(!comdat.isContinuation){
+                symbolXref[binary.names[comdat.nameIndex]].type = SymbolType.Strong;
-                symbolXref[binary.names[comdat.nameIndex]].address = *addr;
+                
+                debug debugLog("%d %s first bytes: %0.8X\n",idx,cast(char[])binary.names[comdat.nameIndex],*cast(uint*)comdat.data.ptr);
-            }
-            
@@ -223 +278 @@
-                        
-        // public symbols (done here so address offsets are valid)
-
+idx,
-            ExportSymbolPtr sym = &(symbols[symbolIndex]);
-            
@@ -264 +319 @@
-            }
-            done:
-            
-            symbolIndex++;
-        }
@@ -310 +364 @@
-            impSpace += (void*).sizeof;
-        }
+        
+        // process WKEXT records
+        foreach(idx,wkext; binary.weakExterns){
+            ExportSymbolPtr sym = &(symbols[wkext.weakIndex-1]);
+            //if(sym.address){
+                symbols[wkext.weakIndex-1].type = SymbolType.Weak;
+            //}
+        }
+        
+        // keep a copy of the fixups (the original FIXUPP record works well enough)
+        this.fixups = binary.fixups;
-    }
-    
@@ -316 +381 @@
-        ExtSprintClass sprint = new ExtSprintClass(1024);
-        
-
-
-
+
+
+
+
+
-        result ~= "Module: " ~ moduleName ~ "\n\n";
-        
-
-
-
-
-
+
+
+
+
+
+
+
-        }
-        
@@ -333 +402 @@
-        }
-        
+        result ~= sprint("Fixups (%d):\n",fixups.length);
+        if(fixups.length > 0){
+            foreach(idx,fix; fixups){
+                with(fix){
+                    char[] rel = isSegmentRelative ? "segmentRelative" : "selfRelative";
+                    char[] ext = isExternStyleFixup ? "externStyle" : "segmentStyle";
+                    void* targetAddress = &(segmentImages[destSegmentIndex].data[destOffset]);
+                            
+                    result ~= sprint("  %d: %0.8X %s %s",idx,targetAddress,rel,ext);
+    
+                    if(isExternStyleFixup){
+                        result ~= sprint(" | %s\n",symbols[targetIndex-1].name);
+                    }
+                    else{
+                        result ~= sprint(" | segment #%d\n",targetIndex);
+                    }               
+                }
+            }           
+        }
+        
+        result ~= "DATA: \n";
+        foreach(idx,segdef; segmentImages){