Changeset 59

Timestamp:

12/01/05 23:22:51 (3 years ago)

Author:

pragma

Message:

Simple linker and sundry fixes

- Added Dead-simple linker to source tree
- Added Build scripts to assist with building the various tests in the test suite
- Moved test code out of root and into /test
- Added Don's enhancements for compile-time signature generation!!

Files:

• trunk/buildtest.bat (added)
• trunk/buildutils.bat (added)
• trunk/ddl/DynamicLibrary.d (modified) (1 diff)
• trunk/ddl/DynamicModule.d (modified) (1 diff)
• trunk/ddl/Linker.d (modified) (1 diff)
• trunk/ddl/Mangle.d (added)
• trunk/ddl/insitu/InSituModule.d (modified) (1 diff)
• trunk/ddl/omf/OMFModule.d (modified) (1 diff)
• trunk/ddltest.d (deleted)
• trunk/test.d (deleted)
• trunk/test/linktest1.d (added)
• trunk/test/linktest2.d (added)
• trunk/test/mangle.test1.d (added)
• trunk/test/testc.d (added)
• trunk/testc.d (deleted)

trunk/ddl/DynamicLibrary.d

@@ -27 +27 @@
-private import ddl.ExportSymbol;
-private import ddl.DynamicModule;
+private import ddl.Mangle;
-
-interface
+abstract class
-    public ExportSymbol[] getExports();
-    public ExportSymbol getExport(char[] name);
-    public DynamicModule[] getModules();
+    
+    public void* getExportAddress(char[] name){
+        return this.getExport(name).address;
+    }
+    
+    template getField(T, char[] name)
+    {
+        T getField() { return cast(T)getExportAddress("_D" ~ mangleText!(name) ~ mangleType!(T)); }
+    }
+    
+    template getFunction(RetT, char [] name)
+    {
+       RetT function() getFunction() { return cast(RetT function() )getExportAddress("_D" ~ mangleText!(name) ~ "F" ~ "Z" ~ mangleType!(RetT)); }
+    }
+    
+    template getFunction(RetT, char [] name, P1)
+    {
+       RetT function(P1) getFunction() { return cast(RetT function(P1))getExportAddress("_D" ~ mangleText!(name) ~ "F" ~ mangleType!(P1) ~ "Z" ~ mangleType!(RetT));
+       }
+    }
+    
+    template getFunction(RetT, char [] name, P1, P2)
+    {
+       RetT function(P1, P2) getFunction() { return cast(RetT function(P1, P2))getExportAddress("_D" ~
+       mangleText!(name) ~ "F" ~ mangleType!(P1) ~ mangleType!(P2) ~ "Z" ~ mangleType!(RetT));
+       }
+    }   
-}

trunk/ddl/DynamicModule.d

@@ -25 +25 @@
-module ddl.DynamicModule;
-
+/**
+    Authors: Eric Anderton
+    License: BSD Derivative (see source for details)
+    Copyright: 2005 Eric Anderton
+*/
+//TODO: change so that a module yields what modules namespaces it depends on, if possible.
+
-private import ddl.ExportSymbol;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    public char[] getName();
+    
+    /** 
+        The behavior of getDependencies is somewhat obtuse: it will return only what dependencies
+        it presently needs in order to be resolved.  Should the module be completely resolved,
+        getDependencies will return null;
+        
+        Returns: an array of symbols the module depends upon.       
+        
+        See_Also:
+            isResolved
+    */
-    public char[][] getDependencies();
+    
+    /** 
+        Attempts to resolve a single dependency that the module may have.
+        
+        Should the dependency not exist, no effect takes place.  This lazy behavior is done to help
+        ease runtine linking by reducing the number of checks and exceptions involved in the process.
+        
+        Determining the sucess of resolving all of the module's dependencies is determined via isResolved.
+        
+        Params:
+            x = the name of the symbol to resolve
+            address = the address of the external symbol
+    */
-    public void resolveDependency(char[] name,void* address);
+    
+    /** 
+        Attempts to resolve a single dependency that the module may have.
+        
+        Should the dependency not exist, no effect takes place.  This lazy behavior is done to help
+        ease runtine linking by reducing the number of checks and exceptions involved in the process.
+        
+        Determining the sucess of resolving all of the module's dependencies is determined via isResolved.
+        
+        Params:
+            sym = an export to mate with a dependency in this module
+    */
+    public void resolveDependency(ExportSymbol sym){
+        this.resolveDependency(sym.name,sym.address);
+    }
+    
+    /**
+        Resolves a set of dependencies that the module may have.
+        
+        Similar to resolveDependency, this method attempts to resolve a series of symbols provided
+        in the array 'exports'.  This is provided to allow for symmetry between modules so that 
+        resolving dependencies on a module-by-module basis is simple to perform.
+        
+        Examples:
+        ---
+        DynamicModule a,b;
+        a.resolveDependencies(b.getExports); // attempt to satisfy a's dependencies via b's exports
+        ---
+        
+        Params:
+            exports = an array of exports as provided from an external source, such as another DynamicModule
+        See_Also:
+            getExports
+    */
-    public void resolveDependencies(ExportSymbol[] exports);
+    
+    /**
+        Returns the set of all exports for the module.
+    */
-    public ExportSymbol[] getExports();
+    
+    /**
+        Gets a specific export by name.  If the export does not exist, the method returns ExportSymbol.init.
+    */
-    public ExportSymbol getExport(char[] name);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

trunk/ddl/Linker.d

@@ -25 +25 @@
-module ddl.Linker;
-
-
+
+
+
+
+
+
+
-private import ddl.ExportSymbol;
-private import ddl.DynamicLibrary;
-private import ddl.DynamicModule;
-private import ddl.LibrarySearchPath;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    public this(){
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    }
-                }
-            }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-}

trunk/ddl/insitu/InSituModule.d

@@ -61 +61 @@
-    
-    public ExportSymbol getExport(char[] name){
-
+
+
-    }
-    

trunk/ddl/omf/OMFModule.d

@@ -79 +79 @@
-    
-    public ExportSymbol getExport(char[] name){
-
+
+
-    }
-