Changeset 193

Timestamp:

05/27/06 05:35:40 (2 years ago)

Author:

larsivi

Message:

Compile fixes and Erics additions, get an ArrayBoundsError? in ELBinary(292) though.

Files:

• trunk/ddl/DDLReader.d (modified) (1 diff)
• trunk/ddl/ar/ArchiveLibrary.d (modified) (4 diffs)
• trunk/ddl/ar/ArchiveLoader.d (modified) (3 diffs)
• trunk/ddl/elf/ELFBinary.d (modified) (3 diffs)
• trunk/ddl/elf/ELFObjLoader.d (modified) (2 diffs)
• trunk/utils/ArgParser.d (modified) (1 diff)
• 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/DDLReader.d

@@ -160 +160 @@
-    
-    // override to provide debug support
-
+(REMOVE) 
-        try{
-            return super.decodeArray(x,bytes,width,type);

trunk/ddl/ar/ArchiveLibrary.d

@@ -155 +155 @@
-                // PECOFF lib, otherwise it's an Ar-lib
-                ArchiveHeader tmphdr;
-
+
+
+
-                                    
-                if (Text.trim(tmphdr.ar_name) == "/") {
@@ -172 +174 @@
-                    // instead. larsivi 20060101
-                    int len = ArchiveHeader.sizeof;
-
+//
-                    loadSymbolTable(memberData,fSize);
-                }
@@ -180 +182 @@
-                stringtable.length = fSize;
-                assert (stringtable.length == memberData.length);
-
+.dup
-                break;
-            default: // The rest
@@ -244 +246 @@
-    return (val[0] << 24) | (val[1] << 16) | (val[2] << 8) | val[3];
-} 
+
+debug (UNITTEST) {
+    private import ddl.DefaultRegistry;
+    private import mango.io.Stdout;
+}
+
+unittest {
+    ArchiveLibrary archlib = new ArchiveLibrary(new DefaultRegistry, 
+                                         new FileBuffer("libunittest.a"));
+    assert (archlib.getModules().length == 8);
+    Stdout.println("Correct number of files found");
+    DynamicModule [] mods = archlib.getModules();
+    Stdout.println(mods[0].getName());
+    Stdout.println(mods[1].getName());
+    Stdout.println(mods[2].getName());
+
+    char[] testtable = "thisisaverylongfilename.o/\nyetanotherlongfilename.o/\n";
+    archlib.stringtable = testtable;
+    assert("thisisaverylongfilename.o" == archlib.getModuleName("/0"));
+    assert("yetanotherlongfilename.o" == archlib.getModuleName("/27"));
+    assert("shortername.o" == archlib.getModuleName("shortername.o/foobar"));
+    Stdout.println("getModuleName works");
+
+}
+
+debug (UNITTEST) {
+    void main(){}
+}

trunk/ddl/ar/ArchiveLoader.d

@@ -37 +37 @@
-private import ddl.ar.ArchiveLibrary;
-
+debug private import mango.io.Stdout;
+
-/**
-    An implementation of the abstract class DynamicLibraryLoader for
@@ -54 +56 @@
-        false if it cannot.
-    */
-it
+ool
-        return (cast(ubyte[])file.get(8,false)) == cast(ubyte[])"!<arch>\n";
-    }
@@ -66 +68 @@
-    */
-    public DynamicLibrary load(LoaderRegistry registry,FileBuffer file){
+        debug Stdout.println("Loading the lib");   
-        return new ArchiveLibrary(registry, file);
-    }

trunk/ddl/elf/ELFBinary.d

@@ -44 +44 @@
-private import mango.convert.Integer;
-
+//TODO: the efficency of this parser/class can be *greatly* enhanced by the use of some C programming idioms
+//TODO: read in the entire file into a flat memory buffer, and cast offset fields to pointers to move around
+//TODO: avoid copying the data - just point and use look-aside hashtables for D compatibility
+
-class ELFBinary{
-
@@ -62 +66 @@
-    char[] dynsymnames;
-    char[] symtabnames;
-
-    Elf32_Shdr[char[]] sectionLookup;
-    
-    bit dynamic;
@@ -195 +197 @@
-        reader.get(shnames,sechdrs[elfhdr.e_shstrndx].sh_size);
-        
+        // parse sections
-        for(int i = 0; i < sechdrs.length; i++) {
-            Elf32_Shdr thisSection = sechdrs[i];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        loadSymTable(symtableidx, reader);
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-

trunk/ddl/elf/ELFObjLoader.d

@@ -35 +35 @@
-private import ddl.Utils;
-private import ddl.FileBuffer;
+private import ddl.Utils;
-
-private import ddl.elf.ELFLibrary;
@@ -59 +60 @@
-        magic string, "\x7fELF".
-    */
-
+
+
+
+
-        if((cast(ubyte[])file.get(4,false)) == cast(ubyte[])"\x7fELF"){
+            debug debugLog("ELF header verified");
-            return true;
-        }

trunk/utils/ArgParser.d

@@ -248 +248 @@
-    }
-}
+
+unittest {
+
+    //import mango.text.String;
+
+    ArgParser parser = new ArgParser();
+    bool h = h2 = b = bb = false;
+    bool boolean = false;
+    int n;
+
+    parser.bind("--", "h2", delegate void(){
+        h2 = true;
+    });
+
+    parser.bind("-", "h", delegate void(){
+        h = true;
+    });
+
+    parser.bind("-", "bb", delegate void(){
+        bb = true;
+    });
+
+    parser.bind("-", "b", delegate void(){
+        b = true;
+    });
+
+    parser.bind("-", "n", delegate uint(char[] value){
+        assert(value.length > 2);
+        assert(value[1] == '=');
+        n = toInt(value[2..5]);
+        return 5;
+    });
+
+    parser.bind("-", "bool", delegate uint(char[] value){
+        assert(value.length == 9);
+        assert(value[4] == '=');
+        if (value[5..9] == "true") {
+            boolean = true;
+        }
+        else {
+            assert(false);
+        }
+        return 9;
+    });
+
+    parser.bindDefault(delegate uint(char[] value, uint ordinal){
+        assert (ordinal < 2);
+        ordinalCount = ordinal;
+        if (ordinal == 0) {
+            assert(value == "ordinalTest1");
+        }
+        else if (ordinal == 1) {
+            assert(value == "ordinalTest2");
+        }
+        return value.length;
+    });
+
+    parser.bindDefault("-", delegate uint(char[] value, uint ordinal){
+        assert(ordinal < 2);
+        dashOrdinalCount = ordinal;
+        if (ordinal == 0) {
+            assert(value == "dashTest1");
+        }
+        else if (ordinal == 1) {
+            assert(value == "dashTest1");
+        }
+        return value.length;
+    });
+
+    parser.bindDefault("@", delegate uint(char[] value, uint ordinal){
+        assert (value == "atTest");
+        return value.length;
+    });
+
+    
+
+}

trunk/utils/bless_bn.d

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

trunk/utils/ddlinfo_bn.d

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

trunk/utils/insitu_bn.d

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