lazily add .pdata/.xdata sections

dlang · Oct 20, 2012 · b9a31bf · b9a31bf
1 parent 0fac7d2
commit b9a31bf
Showing 1 changed file with 19 additions and 18 deletions.
diff --git a/src/backend/mscoffobj.c b/src/backend/mscoffobj.c
@@ -91,8 +91,8 @@ static Outbuffer *comdef_symbuf;        // Comdef's are stored here
 
 static segidx_t segidx_drectve;         // contents of ".drectve" section
 static segidx_t segidx_debugs;
-static segidx_t segidx_xdata;
-static segidx_t segidx_pdata;
+static segidx_t segidx_xdata = UNKNOWN;
+static segidx_t segidx_pdata = UNKNOWN;
 
 static int jumpTableSeg;                // segment index for __jump_table
 
@@ -375,6 +375,9 @@ MsCoffObj *MsCoffObj::init(Outbuffer *objbuf, const char *filename, const char *
     seg_tlsseg = UNKNOWN;
     seg_tlsseg_bss = UNKNOWN;
 
+    segidx_pdata = UNKNOWN;
+    segidx_xdata = UNKNOWN;
+
     // Initialize buffers
 
     if (!string_table)
@@ -429,13 +432,6 @@ MsCoffObj *MsCoffObj::init(Outbuffer *objbuf, const char *filename, const char *
                           align |
                           IMAGE_SCN_MEM_EXECUTE |
                           IMAGE_SCN_MEM_READ);              // CODE
-    addScnhdr(".pdata",   IMAGE_SCN_CNT_INITIALIZED_DATA |
-                          IMAGE_SCN_ALIGN_4BYTES |
-                          IMAGE_SCN_MEM_READ);              // PDATA
-    addScnhdr(".xdata",   IMAGE_SCN_CNT_INITIALIZED_DATA |
-                          IMAGE_SCN_ALIGN_4BYTES |
-                          IMAGE_SCN_MEM_READ);
-
     addScnhdr(".bss",     IMAGE_SCN_CNT_UNINITIALIZED_DATA |
                           IMAGE_SCN_ALIGN_4BYTES |
                           IMAGE_SCN_MEM_READ |
@@ -447,27 +443,20 @@ MsCoffObj *MsCoffObj::init(Outbuffer *objbuf, const char *filename, const char *
 #define SHI_DEBUGS      2
 #define SHI_DATA        3
 #define SHI_TEXT        4
-#define SHI_PDATA       5
-#define SHI_XDATA       6
-#define SHI_UDATA       7
+#define SHI_UDATA       5
 
     getsegment2(SHI_TEXT);
     assert(SegData[CODE]->SDseg == CODE);
 
     getsegment2(SHI_DATA);
     assert(SegData[DATA]->SDseg == DATA);
 
-    getsegment2(SHI_PDATA);
-    assert(SegData[CDATA]->SDseg == CDATA);
+    segidx_drectve = getsegment2(SHI_DRECTVE);  // put this here just so UDATA can be seg 4
 
     getsegment2(SHI_UDATA);
     assert(SegData[UDATA]->SDseg == UDATA);
 
-    segidx_drectve = getsegment2(SHI_DRECTVE);
     segidx_debugs  = getsegment2(SHI_DEBUGS);
-    segidx_xdata   = getsegment2(SHI_XDATA);
-    segidx_pdata   = CDATA;                     // kludge for the moment, CDATA should really
-                                                // be separate from PDATA
 
     SegData[segidx_drectve]->SDbuf->setsize(0);
     SegData[segidx_drectve]->SDbuf->write("  ", 2);
@@ -1719,11 +1708,23 @@ seg_data *MsCoffObj::tlsseg_bss()
 
 segidx_t MsCoffObj::seg_pdata()
 {
+    if (segidx_pdata == UNKNOWN)
+    {
+        segidx_pdata = MsCoffObj::getsegment(".pdata", IMAGE_SCN_CNT_INITIALIZED_DATA |
+                                          IMAGE_SCN_ALIGN_4BYTES |
+                                          IMAGE_SCN_MEM_READ);
+    }
     return segidx_pdata;
 }
 
 segidx_t MsCoffObj::seg_xdata()
 {
+    if (segidx_xdata == UNKNOWN)
+    {
+        segidx_xdata = MsCoffObj::getsegment(".xdata", IMAGE_SCN_CNT_INITIALIZED_DATA |
+                                          IMAGE_SCN_ALIGN_4BYTES |
+                                          IMAGE_SCN_MEM_READ);
+    }
     return segidx_xdata;
 }