Changeset 21

Timestamp:

09/13/05 18:13:09 (3 years ago)

Author:

pragma

Message:

bugfixed bless and added the ddlinfo utility. Also bugfixed some bits in the OMF loader.

Files:

• trunk/bless.d (modified) (5 diffs)
• trunk/ddl/dll/DLLLoader.obj (modified) (previous)
• trunk/ddl/omf/OMFBinary.d (modified) (4 diffs)
• trunk/ddl/omf/OMFLoader.d (modified) (1 diff)
• trunk/ddltest.d (modified) (1 diff)
• trunk/test/all.d (modified) (1 diff)
• trunk/test/test5.d (modified) (2 diffs)

trunk/bless.d

@@ -38 +38 @@
-
-char[] helpText = 
-0
+1
-Copyright (C) 2005 Eric Anderton
-Documentation: http://www.dsource.org/projects/ddl
@@ -61 +61 @@
-    if(args.length == 1){
-        writefln("%s",helpText);
-\n
+
-        foreach(char[] ext; getDDLSupportedExtensions()){
-            writef("%s ",ext);  
@@ -96 +96 @@
-            return 1;
-        }
-
-
-
+
-        // get args that are glommed together (eg. -xvnf"Hello world.obj")
-        bit done = false;
@@ -131 +129 @@
-        }
-    }
+
+    // force lower case
+    extension = std.string.tolower(extension);  
-    
-    // validate the extension
@@ -180 +181 @@
-    
-        // (attempt to) load the binary file
-"omf"
+extension
-        ubyte[] binaryData = cast(ubyte[])std.file.read(filename);
-

trunk/ddl/omf/OMFBinary.d

@@ -521 +521 @@
-            if(dataType < 0x51){
-                debug writefln("COMDEF %s: segment #%d",communalName,dataType); 
+                throw new FeatureNotSupportedException(
+                    std.string.format("COMDEF segment number only for %s is not supported",communalName,dataType)
+                );
-            }
-            else if(dataType == 0x61){
@@ -533 +536 @@
-            else{
-                throw new FeatureNotSupportedException(
-",dataTyp
+ for %s",dataType,communalNam
-                );
-            }
@@ -563 +566 @@
-        uint grpIdx = cursor.getIndex(); // thrown out
-        uint segIdx = cursor.getIndex();
-
+
+
+
-        
-        uint nameIdx = cursor.getIndex();
@@ -671 +676 @@
-        // create addresses for all of the public symbols       
-        foreach(inout PublicSymbol pub; this.publics){
+            //printf("name: %.*s segindex: %d offset: %d\n",pub.name,pub.segmentIndex,pub.offset);
+            if(pub.segmentIndex == 0) continue; // workaround for __nullext being located at 0:0
+            
-            pub.address = &this.segments[pub.segmentIndex].data[pub.offset];
-        }

trunk/ddl/omf/OMFLoader.d

@@ -56 +56 @@
-        // load object format
-        OMFModule mod = new OMFModule(stream);
-
+
+
+
-    }
-    

trunk/ddltest.d

@@ -33 +33 @@
-    //test3();
-    //test4();
-
+
+
-}

trunk/test/all.d

@@ -30 +30 @@
-import test.test4;
-import test.test5;
+import test.test6;

trunk/test/test5.d

@@ -1 @@
-*
++
-    Copyright (c) 2005 Eric Anderton
-        
@@ -22 +22 @@
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-    OTHER DEALINGS IN THE SOFTWARE.
-*
++
-module test.test5;
-