Changeset 299

Timestamp:

04/22/08 19:43:11 (9 months ago)

Author:

h3r3tic

Message:

memory usage reductions

Files:

• trunk/ddl/Linker.d (modified) (2 diffs)
• trunk/ddl/PathLibrary.d (modified) (3 diffs)
• trunk/ddl/omf/OMFBinary.d (modified) (2 diffs)
• trunk/ddl/omf/OMFLibrary.d (modified) (5 diffs)
• trunk/ddl/omf/OMFModule.d (modified) (4 diffs)

trunk/ddl/Linker.d

@@ -238 +238 @@
-                    } else {
-                        char[] ext = sym.isExternal ? "external" : "local";
-
-
+
-                    }
-                }
@@ -287 +286 @@
-                }
-                
-
+lib.getSymbol(sym.name);//
-                
-                //if (SymbolType.Unresolved != otherSym.type) {

trunk/ddl/PathLibrary.d

@@ -235 +235 @@
-   }   
-   
-
+/+
-      DynamicModule mod = this.getModuleForSymbol(name);
-      if(mod) return mod.getSymbol(name);
-      return null;
-
++/
-         
-   public override DynamicModule[] getModules(){
@@ -257 +257 @@
-   public override char[][char[]] getAttributes(){
-      return this.attributes;
+   }
+
+   public override ExportSymbolPtr getSymbol(char[] name){
+      if(name.length > 2 && name[0..2] == "_D"){
+         for (char[] namespace = parseNamespace(name); namespace !is null; namespace = getParentNamespace(namespace)) {
+            // try a namespace lookup first
+            DynamicLibrary* xrefLib = namespace in namespaceXref;
+            if(xrefLib){
+                return (*xrefLib).getSymbol(name);
+            }                    
+             
+            // dig through the root libs   
+            foreach(DynamicLibrary lib; getRootLibraries()){
+               ExportSymbolPtr sym = lib.getSymbol(name);
+               namespaceXref[namespace] = lib;
+               if (sym !is &ExportSymbol.NONE) return sym;
+            }
+                        
+            foreach (xlat; namespaceTranslators) {
+                char[] path = FilePath.join(this.root.toString(), xlat(namespace.dup));
+                if(isFullyLoaded){
+                    //don't bother with path matching because we're already loaded
+                    foreach(libPath,lib; pathXref){
+                        if(libPath == path){
+                           ExportSymbolPtr sym = lib.getSymbol(name);
+                           namespaceXref[namespace] = lib;
+                           if (sym !is &ExportSymbol.NONE) return sym;
+                        }
+                    }
+                }
+                else{
+                   // look for a path match
+                   if(path != ""){
+                       auto test = new FilePath(path);
+                      if (test.exists && !test.isFolder){
+                         DynamicLibrary lib = loaderRegistry.load(path);
+                         if(lib) {
+                            cachedLibraries ~= lib;
+                            namespaceXref[namespace] = lib;
+                            return lib.getSymbol(name);
+                         }
+                      }
+                      
+                      //find first loadable library file that matches <root-path><path>/* and contains 'name'
+                      ExportSymbolPtr sym;
+                      (new FilePath(path)).toList(delegate bool(FilePath path_, bool isDirectory){
+                         DynamicLibrary lib = loaderRegistry.load(path_.toString);
+                         if (lib) {
+                            cachedLibraries ~= lib;
+                            namespaceXref[namespace] = lib;
+                            sym = lib.getSymbol(name);
+                            return 0;
+                         }
+                         return 1;
+                      });
+                      return sym;
+                   }
+               }
+            }
+         }
+      }
+      // match a non-D symbol
+      else{
+         // dig through the root libs
+            foreach(DynamicLibrary lib; getRootLibraries()){
+               auto sym = lib.getSymbol(name);
+               if (sym !is &ExportSymbol.NONE) return sym;
+            } 
+      }
+      //failed to find the module
+      debug debugLog("PathLibrary.getSymbol - failed to find: {0}",name);
+      return null;
-   }
-
@@ -331 +403 @@
-   }
-
+
-   // expects resource in file-path format
-   public override ubyte[] getResource(char[] name){

trunk/ddl/omf/OMFBinary.d

@@ -567 +567 @@
-    
-    // use the repeat count repeat rawData 
-
+
+
+
-    for(uint i=0; i<repeatCount; i++){
-        tempData ~= result;
-
+
+
-    // use rawData to store the result of the repeat
-    return result;
@@ -941 +944 @@
-            thisRecord.parse(mainReader);
-                        
-
+scope 
-            
-            debug debugLog("record: {0:X} ({1:X}) data: {2} {3} length: {4}",thisRecord.recordType,thisRecord.type,thisRecord.data,recordNameLookup[thisRecord.recordType], thisRecord.length);

trunk/ddl/omf/OMFLibrary.d

@@ -40 +40 @@
-class OMFLibrary : DynamicLibrary{
-    DynamicModule[] modules;
-
-
+
+
+
+
+
+
+
-    Attributes attributes;
-
@@ -70 +75 @@
-    
-    public ExportSymbolPtr getSymbol(char[] name){
-ExportSymbolPtr* sym = name in dictionary
-(sym) return *
+auto sym = name in crossReference
+ (sym) return sym.
-        else return &ExportSymbol.NONE;
-    }
@@ -81 +86 @@
-    public DynamicModule getModuleForSymbol(char[] name){
-        debug debugLog("[OMF] looking for {0} in {1}",name,attributes["omf.filename"]);
-DynamicModule*
+auto
-        debug debugLog("[OMF] Result: {0:X}",mod);
-(mod) return *
+ (mod) return mod.
-        return null;
-    }
@@ -96 +101 @@
-        for(uint i=0; i<symbols.length; i++){
-            ExportSymbolPtr exp = &(symbols[i]);
-(
+ (auto found = 
-                switch(exp.type){
-                case SymbolType.Weak: // replace extern only
-(dictionary[exp.name]
-crossReference[exp.name]
-dictionary[exp.name]
+ (found.sym
+found.mod
+found.sym
-                    }
-                    break;
-                case SymbolType.Strong: // always overwrite
-
-
+
+
+
-                    break;
-                default:
@@ -113 +119 @@
-            }
-            else{
-
-
+
+
+
-            }
-        }

trunk/ddl/omf/OMFModule.d

@@ -36 +36 @@
-
-private import Text = tango.text.Util;
-
+//
-
-version(Windows){
@@ -65 +65 @@
-    SegmentImage[] segmentImages;
-    ExportSymbol[] symbols;
-    ExportSymbolPtr[char[]] symbolXref;
-    char[] moduleName;
-    bool resolved;
@@ -88 +87 @@
-    
-    public ExportSymbol* getSymbol(char[] name){
-
-
+
+
+
+
+
+
+
+
+
-    }
-    
@@ -189 +195 @@
-        
-    protected void loadBinary(DDLReader reader){
+        ExportSymbolPtr[char[]] symbolXref;
+
-        debug{} else{
-            OMFBinary binary;