Changeset 36

Timestamp:

11/05/05 11:44:51 (3 years ago)

Author:

pragma

Message:

Dirty commit - playing catch-up and backing up source remotely.

Files:

• trunk/ddl/Demangle.d (modified) (1 diff)
• trunk/ddl/dll/DLLLoader.obj (modified) (previous)
• trunk/ddl/insitu/InSituMapBinary.d (modified) (1 diff)
• trunk/ddl/omf/OMFBinary.d (modified) (9 diffs)
• trunk/ddl/omf/OMFModule.d (modified) (1 diff)
• trunk/test.d (modified) (3 diffs)
• trunk/test/testmodule.d (modified) (2 diffs)

trunk/ddl/Demangle.d

@@ -178 +178 @@
-    type = SymbolType.PublicSymbol;
-    return symbol;
+}
+
+public SymbolType getSymbolType(in char[] symbol){
+    SymbolType type;
+    DemangleCursor cursor;
+    cursor.data = symbol;
+    cursor.position = 0;
+    
+    if(cursor.parseToken("_Class")){
+        type = SymbolType.ClassDefinition;
+    }
+    else if(cursor.parseToken("__init_")){
+        type = SymbolType.Initalizer;
+    }
+    else if(cursor.parseToken("__vtbl_")){
+        type = SymbolType.Vtable;
+    }
+    else if(cursor.parseToken("__arguments_")){
+        type = SymbolType.VarArguments;
+    }
+    else if(cursor.parseToken("__d")){
+        type = SymbolType.PlatformHook;
+    }
+    else if(cursor.parseToken("_assert_")){
+        type = SymbolType.DAssert;
+    }
+    else if(cursor.parseToken("_array_")){
+        type = SymbolType.DArray;
+    }   
+    else if(cursor.parseToken("__modctor_")){
+        type = SymbolType.ModuleCtor;
+    }
+    else if(cursor.parseToken("__moddtor_")){
+        type = SymbolType.ModuleDtor;
+    }
+    else if(cursor.parseToken("__ModuleInfo_")){
+        type = SymbolType.ModuleInfo;
+    }
+    else if(cursor.parseToken("__nullext")){
+        type = SymbolType.Nullext;
+    }   
+    else if(cursor.parseToken("_D")){
+        type = SymbolType.PublicSymbol;
+    }
+    else{
+        // no particular type, default the symbol to a 'public'
+        type = SymbolType.PublicSymbol;
+    }
+    return type;
-}
-

trunk/ddl/insitu/InSituMapBinary.d

@@ -74 +74 @@
-            // throw away the address (first nine chars) 
-            if(line[14..21] == "  Imp  ") continue; // throw this away! We want the '__imp__' version instead.
+            if(line[14..21] == "  Abs  ") continue; // this isn't needed either
-                    
-            // parse out the symbol

trunk/ddl/omf/OMFBinary.d

@@ -34 +34 @@
-    uint byteAlignment;
-    ubyte[] data;
+    uint nameIndex;
+    uint nextInGroup;
-    
-    // add blocks according to alignment
-    public void addData(ubyte[] newBlock){
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-}
@@ -155 +173 @@
-        debug writefln("Library Name: %s",name);
-        this.libraryName = name;
+        this.libraryName = std.string.replace(this.libraryName,"/",".");
+        this.libraryName = std.string.replace(this.libraryName,"\\",".");
-    }
-    
@@ -200 +220 @@
-    }
-
+    private import std.stdio;
-    /*
-        Read in public names
@@ -255 +276 @@
-        
-        seg.data.length = cursor.getVWord(); 
-cursor.getIndex(); // throw ou
+seg.nameIndex = cursor.getIndex(); // ge
-        cursor.getIndex(); // throw out class name index
-        cursor.getIndex(); // throw out overlay name index
@@ -290 +311 @@
-        char[] name = this.names[nameIndex];
-        
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        //if(name != "FLAT"){
-        //  throw new FeatureNotSupportedException(
@@ -676 +717 @@
-        // create addresses for all of the public symbols       
-        foreach(inout PublicSymbol pub; this.publics){
-
-
-
-
+
+
+
+
+
+
-        }
-    
@@ -721 +764 @@
-                
-                fixupValue = cast(uint)target.address;
-                
-                debug writefln("fixup: %s ",target.name);
-            }
-            else{
-                Segment* seg = &(this.segments[fix.targetIndex]);
-                        
-                fixupValue = cast(uint)(seg.data.ptr);
-                
-                debug writefln("fixup segment %d",fix.targetIndex);
-            }
@@ -734 +774 @@
-            if(!fix.isSegmentRelative){ // self relative fixup
-                uint* dest = cast(uint*)(this.segments[fix.destSegmentIndex].data.ptr + fix.destOffset);
-                
-                uint value = fixupValue - cast(uint)dest - 4; // relative fixup, offset by width of field
-                
-                debug writefln("[self relative] %d dest %0.8X (at %0.8X) to %0.8X",fix.destSegmentIndex,*dest,dest,value^0xFFFFFFFF);
-                
-                *dest = value;
-            }
-            else{
-                uint* dest = cast(uint*)(this.segments[fix.destSegmentIndex].data.ptr + fix.destOffset);
-                
-                debug writefln("[segment] %d dest %0.8X to %0.8X",fix.destSegmentIndex,*dest,fixupValue);
-                
-                *dest += fixupValue;
-            }
@@ -774 +809 @@
-    public void fixDependency(char[] name,void* address){
-        assert(name in this.dependencies);
-
+
-        this.externs[this.dependencies[name]].address = address;
-    }

trunk/ddl/omf/OMFModule.d

@@ -104 +104 @@
-        }
-    }
+    
+    public char[] toString(){
+        return binary.toString();
+    }
-}

trunk/test.d

@@ -26 +26 @@
-
-private import ddl.all;
+private import ddl.omf.OMFModule;
-
-private import std.stdio;
@@ -38 +39 @@
-char[] testmoduleModuleInfo = "__ModuleInfo_10testmodule";
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    // pull in the in situ module (all the currently compiled-in support)
-DynamicLibrary insitu = loadDDL("this.ddl"
-
-
-//DynamicLibrary phobos = loadDDL("phobos.ddl"
+addLibraryToXRef(loadDDL("test.map")
+   
+ (for modules we don't have included in situ)
+addLibraryToXRef(loadDDL("phobos.lib")
-        
-    // load in the test module
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    // add test
-
-
+//
+//
-    
-    // hello world test
@@ -81 +235 @@
-    
-    // run module destructor
+    ModuleInfo moduleInfo = cast(ModuleInfo)(testModule.getExport(testmoduleModuleInfo).address);
-    if(moduleInfo.dtor){
-        (*moduleInfo.dtor)();

trunk/test/testmodule.d

@@ -25 +25 @@
-module test.testmodule;
-
+private import std.stdio;
+
-class TestClass{
-    uint a;
@@ -35 +37 @@
-    
-    private void test(){
-printf("A = %d\n
+writefln("A = %d
-    }
-    
-    static this(){
-printf("TestClass initalized\n
+writefln("TestClass initalized
-    }
-}