summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/LastError.h2
-rw-r--r--src/PEImage.cpp74
-rw-r--r--src/PEImage.h26
-rw-r--r--src/cv2pdb.cpp42
-rw-r--r--src/cv2pdb.h2
-rw-r--r--src/demangle.h2
-rw-r--r--src/dviewhelper/dviewhelper.cpp2
-rw-r--r--src/main.cpp4
-rw-r--r--src/mspdb.cpp2
-rw-r--r--src/mspdb.h8
-rw-r--r--src/symutil.cpp2
-rw-r--r--src/symutil.h2
12 files changed, 94 insertions, 74 deletions
diff --git a/src/LastError.h b/src/LastError.h
index b7b6f27..4cbb0b9 100644
--- a/src/LastError.h
+++ b/src/LastError.h
@@ -1,5 +1,5 @@
// Convert DMD CodeView debug information to PDB files
-// Copyright (c) 2009 by Rainer Schuetze, All Rights Reserved
+// Copyright (c) 2009-2010 by Rainer Schuetze, All Rights Reserved
//
// License for redistribution is given by the Artistic License 2.0
// see file LICENSE for further details
diff --git a/src/PEImage.cpp b/src/PEImage.cpp
index d926078..2a3cbc0 100644
--- a/src/PEImage.cpp
+++ b/src/PEImage.cpp
@@ -1,5 +1,5 @@
// Convert DMD CodeView debug information to PDB files
-// Copyright (c) 2009 by Rainer Schuetze, All Rights Reserved
+// Copyright (c) 2009-2010 by Rainer Schuetze, All Rights Reserved
//
// License for redistribution is given by the Artistic License 2.0
// see file LICENSE for further details
@@ -40,48 +40,48 @@ PEImage::~PEImage()
bool PEImage::load(const char* iname)
{
if (fd != -1)
- return setError("file already open");
+ return setError("file already open");
- fd = open(iname, O_RDONLY | O_BINARY);
- if (fd == -1)
- return setError("Can't open file");
-
- struct stat s;
- if (fstat(fd, &s) < 0)
- return setError("Can't get size");
- dump_total_len = s.st_size;
+ fd = open(iname, O_RDONLY | O_BINARY);
+ if (fd == -1)
+ return setError("Can't open file");
+
+ struct stat s;
+ if (fstat(fd, &s) < 0)
+ return setError("Can't get size");
+ dump_total_len = s.st_size;
dump_base = alloc_aligned(dump_total_len, 0x1000);
- if (!dump_base)
- return setError("Out of memory");
- if (read(fd, dump_base, dump_total_len) != dump_total_len)
- return setError("Cannot read file");
-
-
- close(fd);
- fd = -1;
- return initPtr(true);
+ if (!dump_base)
+ return setError("Out of memory");
+ if (read(fd, dump_base, dump_total_len) != dump_total_len)
+ return setError("Cannot read file");
+
+
+ close(fd);
+ fd = -1;
+ return initPtr(true);
}
///////////////////////////////////////////////////////////////////////
bool PEImage::save(const char* oname)
{
if (fd != -1)
- return setError("file already open");
-
+ return setError("file already open");
+
if (!dump_base)
- return setError("no data to dump");
-
- fd = open(oname, O_WRONLY | O_CREAT | O_BINARY | O_TRUNC, S_IREAD | S_IWRITE | S_IEXEC);
- if (fd == -1)
- return setError("Can't create file");
-
- if (write(fd, dump_base, dump_total_len) != dump_total_len)
- return setError("Cannot write file");
-
- close(fd);
- fd = -1;
- return true;
+ return setError("no data to dump");
+
+ fd = open(oname, O_WRONLY | O_CREAT | O_BINARY | O_TRUNC, S_IREAD | S_IWRITE | S_IEXEC);
+ if (fd == -1)
+ return setError("Can't create file");
+
+ if (write(fd, dump_base, dump_total_len) != dump_total_len)
+ return setError("Cannot write file");
+
+ close(fd);
+ fd = -1;
+ return true;
}
///////////////////////////////////////////////////////////////////////
@@ -203,17 +203,17 @@ bool PEImage::initPtr(bool initDbgDir)
OMFSignature* sig = DPV<OMFSignature>(cv_base, dbgDir->SizeOfData);
if (!sig)
return setError("invalid debug data base address and size");
- if (memcmp(sig->Signature, "NB09", 4) != 0 && memcmp(sig->Signature, "NB11", 4) != 0)
- {
+ if (memcmp(sig->Signature, "NB09", 4) != 0 && memcmp(sig->Signature, "NB11", 4) != 0)
+ {
// return setError("can only handle debug info of type NB09 and NB11");
dirHeader = 0;
dirEntry = 0;
return true;
}
- dirHeader = CVP<OMFDirHeader>(sig->filepos);
+ dirHeader = CVP<OMFDirHeader>(sig->filepos);
if (!dirHeader)
return setError("invalid cv dir header data base address");
- dirEntry = CVP<OMFDirEntry>(sig->filepos + dirHeader->cbDirHeader);
+ dirEntry = CVP<OMFDirEntry>(sig->filepos + dirHeader->cbDirHeader);
if (!dirEntry)
return setError("cv debug dir entries invalid");
diff --git a/src/PEImage.h b/src/PEImage.h
index 039d2a1..a43d02b 100644
--- a/src/PEImage.h
+++ b/src/PEImage.h
@@ -1,5 +1,5 @@
// Convert DMD CodeView debug information to PDB files
-// Copyright (c) 2009 by Rainer Schuetze, All Rights Reserved
+// Copyright (c) 2009-2010 by Rainer Schuetze, All Rights Reserved
//
// License for redistribution is given by the Artistic License 2.0
// see file LICENSE for further details
@@ -39,20 +39,20 @@ public:
return DPV<P>(cv_base + off, sizeof(P));
}
- template<class P> P* RVA(unsigned long rva, int len)
- {
+ template<class P> P* RVA(unsigned long rva, int len)
+ {
IMAGE_DOS_HEADER *dos = DPV<IMAGE_DOS_HEADER> (0);
IMAGE_NT_HEADERS32* hdr = DPV<IMAGE_NT_HEADERS32> (dos->e_lfanew);
IMAGE_SECTION_HEADER* sec = IMAGE_FIRST_SECTION(hdr);
-
- for (int i = 0; i < hdr->FileHeader.NumberOfSections; i++)
- {
- if (rva >= sec[i].VirtualAddress &&
- rva + len <= sec[i].VirtualAddress + sec[i].SizeOfRawData)
- return DPV<P>(sec[i].PointerToRawData + rva - sec[i].VirtualAddress, len);
- }
- return 0;
- }
+
+ for (int i = 0; i < hdr->FileHeader.NumberOfSections; i++)
+ {
+ if (rva >= sec[i].VirtualAddress &&
+ rva + len <= sec[i].VirtualAddress + sec[i].SizeOfRawData)
+ return DPV<P>(sec[i].PointerToRawData + rva - sec[i].VirtualAddress, len);
+ }
+ return 0;
+ }
bool load(const char* iname);
bool save(const char* oname);
@@ -71,7 +71,7 @@ public:
private:
int fd;
- void* dump_base;
+ void* dump_base;
int dump_total_len;
IMAGE_DOS_HEADER *dos;
diff --git a/src/cv2pdb.cpp b/src/cv2pdb.cpp
index c56fa75..0a66e8e 100644
--- a/src/cv2pdb.cpp
+++ b/src/cv2pdb.cpp
@@ -1,5 +1,5 @@
// Convert DMD CodeView debug information to PDB files
-// Copyright (c) 2009 by Rainer Schuetze, All Rights Reserved
+// Copyright (c) 2009-2010 by Rainer Schuetze, All Rights Reserved
//
// License for redistribution is given by the Artistic License 2.0
// see file LICENSE for further details
@@ -1211,7 +1211,10 @@ bool CV2PDB::nameOfDynamicArray(int indexType, int elemType, char* name, int max
bool CV2PDB::nameOfAssocArray(int indexType, int elemType, char* name, int maxlen)
{
- strcpy(name, "aa<");
+ if(Dversion >= 2.043)
+ strcpy(name, "aa2<"); // to distinguish tree from list implementation
+ else
+ strcpy(name, "aa<");
int len = strlen(name);
if (!nameOfType(elemType, name + len, maxlen - len))
return false;
@@ -1359,33 +1362,50 @@ const char* CV2PDB::appendAssocArray(int keyType, int elemType)
rdtype = (codeview_reftype*) (userTypes + cbUserTypes);
rdtype->fieldlist.id = LF_FIELDLIST_V2;
+ int len1 = 0;
+ int len2 = 0;
+ int off = 0;
// member aaA* left
- dfieldtype = (codeview_fieldtype*)rdtype->fieldlist.list;
- int len1 = addFieldMember(dfieldtype, 1, 0, aaAPtrType, "left");
-
- dfieldtype = (codeview_fieldtype*)(rdtype->fieldlist.list + len1);
- int len2 = addFieldMember(dfieldtype, 1, 4, aaAPtrType, "right");
+ if(Dversion >= 2.043)
+ {
+ dfieldtype = (codeview_fieldtype*)rdtype->fieldlist.list;
+ len1 = addFieldMember(dfieldtype, 1, off, aaAPtrType, "next");
+ off += 4;
+ }
+ else
+ {
+ dfieldtype = (codeview_fieldtype*)rdtype->fieldlist.list;
+ len1 = addFieldMember(dfieldtype, 1, off, aaAPtrType, "left");
+ off += 4;
+ dfieldtype = (codeview_fieldtype*)(rdtype->fieldlist.list + len1);
+ len2 = addFieldMember(dfieldtype, 1, off, aaAPtrType, "right");
+ off += 4;
+ }
dfieldtype = (codeview_fieldtype*)(rdtype->fieldlist.list + len1 + len2);
- int len3 = addFieldMember(dfieldtype, 1, 8, 0x74, "hash");
+ int len3 = addFieldMember(dfieldtype, 1, off, 0x74, "hash");
+ off += 4;
dfieldtype = (codeview_fieldtype*)(rdtype->fieldlist.list + len1 + len2 + len3);
- int len4 = addFieldMember(dfieldtype, 1, 12, keyType, "key");
+ int len4 = addFieldMember(dfieldtype, 1, off, keyType, "key");
int typeLen = sizeofType(keyType);
typeLen = (typeLen + 3) & ~3; // align to 4 byte
+ off += typeLen;
+
dfieldtype = (codeview_fieldtype*)(rdtype->fieldlist.list + len1 + len2 + len3 + len4);
- int len5 = addFieldMember(dfieldtype, 1, 12 + typeLen, elemType, "value");
+ int len5 = addFieldMember(dfieldtype, 1, off, elemType, "value");
int elemLen = sizeofType(elemType);
elemLen = (elemLen + 3) & ~3; // align to 4 byte
+ off += elemLen;
rdtype->fieldlist.len = len1 + len2 + len3 + len4 + len5 + 2;
cbUserTypes += rdtype->fieldlist.len + 2;
int fieldListType = nextUserType++;
dtype = (codeview_type*) (userTypes + cbUserTypes);
- cbUserTypes += addClass(dtype, 5, fieldListType, 0, 0, 0, 12 + typeLen + elemLen, name);
+ cbUserTypes += addClass(dtype, len2 == 0 ? 4 : 5, fieldListType, 0, 0, 0, off, name);
addUdtSymbol(nextUserType, name);
int completeAAAType = nextUserType++;
diff --git a/src/cv2pdb.h b/src/cv2pdb.h
index 03271d5..48b67d5 100644
--- a/src/cv2pdb.h
+++ b/src/cv2pdb.h
@@ -1,5 +1,5 @@
// Convert DMD CodeView debug information to PDB files
-// Copyright (c) 2009 by Rainer Schuetze, All Rights Reserved
+// Copyright (c) 2009-2010 by Rainer Schuetze, All Rights Reserved
//
// License for redistribution is given by the Artistic License 2.0
// see file LICENSE for further details
diff --git a/src/demangle.h b/src/demangle.h
index 0a63c60..430b41e 100644
--- a/src/demangle.h
+++ b/src/demangle.h
@@ -1,5 +1,5 @@
// Convert DMD CodeView debug information to PDB files
-// Copyright (c) 2009 by Rainer Schuetze, All Rights Reserved
+// Copyright (c) 2009-2010 by Rainer Schuetze, All Rights Reserved
//
// License for redistribution is given by the Artistic License 2.0
// see file LICENSE for further details
diff --git a/src/dviewhelper/dviewhelper.cpp b/src/dviewhelper/dviewhelper.cpp
index 110cc09..3cee363 100644
--- a/src/dviewhelper/dviewhelper.cpp
+++ b/src/dviewhelper/dviewhelper.cpp
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////
//
// DViewHelper - Expression Evaluator for the D string and object class
-// Copyright (c) 2009 by Rainer Schuetze, All Rights Reserved
+// Copyright (c) 2009-2010 by Rainer Schuetze, All Rights Reserved
//
// License for redistribution is given by the Artistic License 2.0
// see file LICENSE for further details
diff --git a/src/main.cpp b/src/main.cpp
index 55bbf8c..644e27d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,5 @@
// Convert DMD CodeView debug information to PDB files
-// Copyright (c) 2009 by Rainer Schuetze, All Rights Reserved
+// Copyright (c) 2009-2010 by Rainer Schuetze, All Rights Reserved
//
// License for redistribution is given by the Artistic License 2.0
// see file LICENSE for further details
@@ -81,7 +81,7 @@ int main(int argc, char** argv)
if (argc < 2)
{
printf("Convert DMD CodeView debug information to PDB files, Version %g\n", VERSION);
- printf("Copyright (c) 2009 by Rainer Schuetze, All Rights Reserved\n");
+ printf("Copyright (c) 2009-2010 by Rainer Schuetze, All Rights Reserved\n");
printf("\n");
printf("License for redistribution is given by the Artistic License 2.0\n");
printf("see file LICENSE for further details\n");
diff --git a/src/mspdb.cpp b/src/mspdb.cpp
index b7a92a4..fe10243 100644
--- a/src/mspdb.cpp
+++ b/src/mspdb.cpp
@@ -1,5 +1,5 @@
// Convert DMD CodeView debug information to PDB files
-// Copyright (c) 2009 by Rainer Schuetze, All Rights Reserved
+// Copyright (c) 2009-2010 by Rainer Schuetze, All Rights Reserved
//
// License for redistribution is given by the Artistic License 2.0
// see file LICENSE for further details
diff --git a/src/mspdb.h b/src/mspdb.h
index c3b92ec..7104fc2 100644
--- a/src/mspdb.h
+++ b/src/mspdb.h
@@ -1,5 +1,5 @@
// Convert DMD CodeView debug information to PDB files
-// Copyright (c) 2009 by Rainer Schuetze, All Rights Reserved
+// Copyright (c) 2009-2010 by Rainer Schuetze, All Rights Reserved
//
// License for redistribution is given by the Artistic License 2.0
// see file LICENSE for further details
@@ -239,8 +239,8 @@ public: virtual bool Src::QueryByNameW(unsigned short *,struct SrcHeaderOut *)co
public: virtual bool Src::AddW(struct SrcHeaderW const *,void const *);
};
-#include "pshpack1.h"
-
+#include "pshpack1.h"
+
struct LineInfoEntry
{
unsigned int offset;
@@ -294,7 +294,7 @@ struct TypeData
// followed by TypeChunks
};
-#include "poppack.h"
+#include "poppack.h"
struct Mod {
public: virtual unsigned long Mod::QueryInterfaceVersion(void);
diff --git a/src/symutil.cpp b/src/symutil.cpp
index 5556f1d..fe8f3e6 100644
--- a/src/symutil.cpp
+++ b/src/symutil.cpp
@@ -1,5 +1,5 @@
// Convert DMD CodeView debug information to PDB files
-// Copyright (c) 2009 by Rainer Schuetze, All Rights Reserved
+// Copyright (c) 2009-2010 by Rainer Schuetze, All Rights Reserved
//
// License for redistribution is given by the Artistic License 2.0
// see file LICENSE for further details
diff --git a/src/symutil.h b/src/symutil.h
index a055a7a..aa69987 100644
--- a/src/symutil.h
+++ b/src/symutil.h
@@ -1,5 +1,5 @@
// Convert DMD CodeView debug information to PDB files
-// Copyright (c) 2009 by Rainer Schuetze, All Rights Reserved
+// Copyright (c) 2009-2010 by Rainer Schuetze, All Rights Reserved
//
// License for redistribution is given by the Artistic License 2.0
// see file LICENSE for further details
generated by cgit v0.12 at 2024-11-19 08:04:58 (GMT)