Changeset 274

Timestamp:

11/15/06 21:15:07 (2 years ago)

Author:

pragma

Message:

Yep, just one file fix those nasty COMDEF issues.

Files:

• trunk/ddl/omf/OMFModule.d (modified) (6 diffs)

trunk/ddl/omf/OMFModule.d

@@ -92 +92 @@
-    }
-    
+    protected bool containsAddress(void* addr){
+        foreach(seg; this.segmentImages){
+            debug debugLog("checking addr: [%0.8X] [%0.8X] [%0.8X]",seg.data.ptr,addr,(seg.data.ptr + seg.data.length));
+            if(addr >= seg.data.ptr && addr <= (seg.data.ptr + seg.data.length)){
+                return true;
+            }
+        }
+        return false;
+    }
+    
-    public void resolveFixups(){
-        Fixup[] remainingFixups;
@@ -108 +118 @@
-                }
-                else{
+                    debug debugLog("Fixup dest symbol: %s [%0.8X] %d",destSymbol.name,destSymbol.address,destSymbolOffset);
-                    destAddress = cast(uint)destSymbol.address + destSymbolOffset;
-                }
@@ -114 +125 @@
-                destAddress = cast(uint)destSegmentAddress;
-            }
+            
+            if(!containsAddress(cast(void*)destAddress)){
+                debug debugLog("Module does not contain the destination address for fixup. [%0.8X]",destAddress);
+                debug debugLog("dump: %s",this.toString());
+                assert(false);
+            }
+            //assert(containsAddress(cast(void*)destAddress),"Module does not contain the destination address for fixup.");
-            
-            // get the fixup value
@@ -127 +145 @@
-                fixupValue = cast(uint)(segmentImages[targetSegmentIndex].data.ptr);
-            }
+            
-            debug if(destSymbol){
-                debugLog("fixup dest %s:%s [%0.8X] (%0.8X) = fixupValue [%0.8X] rel:%d",destSymbol.name,destSymbol.getTypeName(),destAddress,*cast(uint*)destAddress,fixupValue,cast(uint)isSegmentRelative);
@@ -185 +204 @@
-            }
-        }
-
+       
-        //build up symbol table
-        //NOTE: extern indicies match their OMF counterparts
@@ -278 +297 @@
-            image.data[offset..offset+dataLength] = ledata.data;
-        }
-
-
-
-
+
+
-        foreach(idx,comdat; binary.communalData){
-
+
+
+
+
+
+
+
+
+
-            image.data ~= comdat.data;
-
-
-
-
-
-
-
-
+
+
+
-        foreach(idx,comdat; binary.communalData){
-            SegmentImagePtr image = &(segmentImages[comdat.segmentIndex]);
-
-
-
-
-
-
-
-
+
+
-            if(!comdat.isContinuation){
-
-
-
-
-
-
+
+
+
-                        
-        // public symbols (done here so address offsets are valid)