Changeset 39

Timestamp:

02/12/12 11:05:27 (3 months ago)

Author:

sagitario

Message:

• disabled named enumerator for D basic types to avoid debugger troubles displaying arrays
  
• added command line switch -e to enable using named enumerator for D basic types
  
• added DWARF support
  
• added x64 support
  

Files:

• downloads/cv2pdb_0.23.zip (added)
• downloads/cv2pdb_src_0.23.zip (added)
• trunk/CHANGES (modified) (2 diffs)
• trunk/INSTALL (modified) (1 diff)
• trunk/Makefile (modified) (1 diff)
• trunk/README (modified) (3 diffs)
• trunk/TODO (modified) (1 diff)
• trunk/VERSION (modified) (1 diff)
• trunk/autoexp.expand (modified) (1 diff)
• trunk/autoexp.visualizer (modified) (1 diff)
• trunk/src/PEImage.cpp (modified) (11 diffs)
• trunk/src/PEImage.h (modified) (5 diffs)
• trunk/src/cv2pdb.cpp (modified) (10 diffs)
• trunk/src/cv2pdb.h (modified) (9 diffs)
• trunk/src/cv2pdb.sln (modified) (1 diff)
• trunk/src/cv2pdb.vcproj (modified) (2 diffs)
• trunk/src/cvutil.cpp (modified) (2 diffs)
• trunk/src/cvutil.h (modified) (1 diff)
• trunk/src/dviewhelper/dviewhelper.cpp (modified) (3 diffs)
• trunk/src/dwarf.h (added)
• trunk/src/dwarf2pdb.cpp (added)
• trunk/src/main.cpp (modified) (4 diffs)
• trunk/src/symutil.cpp (modified) (2 diffs)
• trunk/src/symutil.h (modified) (2 diffs)
• trunk/test/cvtest.d (modified) (9 diffs)

trunk/CHANGES

@@ -1 +1 @@
-
-This is the CHANGES file for cv2pdb, a 
-
+/DWARF
-
-0
+2
-
-Version history
@@ -156 +156 @@
-  * added command line switch -s to specify the replacement character for '.' in symbols
-  * fixed another crash where compressed symbols expand to more than 4096 characters
+
+2012-02-12 Version 0.23
+
+  * disabled named enumerator for D basic types to avoid debugger troubles displaying arrays
+  * added command line switch -e to enable using named enumerator for D basic types
+  * added DWARF support
+  * added x64 support

trunk/INSTALL

@@ -1 +1 @@
-
-This is the INSTALL file for cv2pdb, a 
-
+/DWARF
-
-Copyright (c) 2009-2010 by Rainer Schuetze, All Rights Reserved

trunk/Makefile

@@ -22 +22 @@
-      src\demangle.cpp \
-      src\demangle.h \
+      src\dwarf2pdb.cpp \
+      src\dwarf.h \
-      src\LastError.h \
-      src\main.cpp \

trunk/README

@@ -1 +1 @@
-
-This is the README file for cv2pdb, a 
-
+/DWARF
-
-Copyright (c) 2009-2010 by Rainer Schuetze, All Rights Reserved
@@ -15 +15 @@
---------
-* conversion of DMD CodeView information to PDB file
+* conversion of DWARF information to PDB file
-* converted line number info allows setting breakpoints
-* display of variables, fields and objects in watch, local and auto window and in data tooltips
@@ -32 +33 @@
-
-The file mscvpdb.h is taken from the WINE-project (http://www.winehq.org)
+and is distributed under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+See the file header for more details and 
+http://www.gnu.org/licenses/lgpl.html for the full license.
+
+The file dwarf.h is taken from the libdwarf project 
+(http://reality.sgiweb.org/davea/dwarf.html)
-and is distributed under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either

trunk/TODO

@@ -1 +1 @@
-
-This is the TODO file for cv2pdb, a 
-
+/DWARF
-
-Copyright (c) 2009-2010 by Rainer Schuetze, All Rights Reserved

trunk/VERSION

@@ -1 @@
-2
+3

trunk/autoexp.expand

@@ -10 +10 @@
-
-object_viewhelper=$ADDIN(dviewhelper.dll,_DObjectView@28)
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-;; eo section AutoExpand for D variables ;;;;;;;;;;;;;;;;;;;;;;

trunk/autoexp.visualizer

@@ -10 +10 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-}
-

trunk/src/PEImage.cpp

@@ -24 +24 @@
-, dump_total_len(0)
-, dirHeader(0)
+, hdr32(0)
+, hdr64(0)
-, fd(-1)
+, debug_aranges(0)
+, debug_pubnames(0)
+, debug_pubtypes(0)
+, debug_info(0)
+, debug_abbrev(0)
+, debug_line(0)
+, debug_frame(0)
+, debug_str(0)
+, debug_loc(0)
+, debug_ranges(0)
+, codeSegment(0)
-{
-    if(iname)
@@ -62 +75 @@
-    close(fd);
-    fd = -1;
-
+CVPtr(true) || initDWARF
-}
-
@@ -87 +100 @@
-
-///////////////////////////////////////////////////////////////////////
-
+, bool initCV
-{
-    // append new debug directory to data
-
+
+
+
+
+
-    int xdatalen = datalen + sizeof(debugdir);
-
@@ -96 +113 @@
-    int s;
-    DWORD lastVirtualAddress = 0;
-
+
+
-    {
-        if (strcmp ((char*) sec [s].Name, ".debug") == 0)
-        {
-hdr->FileHeader.NumberOf
+cnt
-            {
-                dump_total_len = sec[s].PointerToRawData;
@@ -111 +129 @@
-    }
-
-   int align = hdr->OptionalHeader.FileAlignment
+    int align = IMGHDR(OptionalHeader.FileAlignment)
-    int align_len = xdatalen;
-    int fill = 0;
@@ -125 +143 @@
-
-    int salign_len = xdatalen;
-   align = hdr->OptionalHeader.SectionAlignment
+    align = IMGHDR(OptionalHeader.SectionAlignment)
-    if (align > 0)
-    {
@@ -143 +161 @@
-    sec[s].Characteristics = IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_DISCARDABLE | IMAGE_SCN_CNT_INITIALIZED_DATA;
-
-hdr->FileHeader.NumberOfSections
+IMGHDR(FileHeader.NumberOfSections)
-    // hdr->OptionalHeader.SizeOfImage += salign_len;
-
-
-
+
+
+
+
-
-    // append debug data chunk to existing file image
@@ -154 +173 @@
-    memcpy(newdata + dump_total_len + fill, data, datalen);
-
+    if(!dbgDir)
+    {
+        debugdir.Type = 2;
+    }
-    dbgDir = (IMAGE_DEBUG_DIRECTORY*) (newdata + dump_total_len + fill + datalen);
-    memcpy(dbgDir, &debugdir, sizeof(debugdir));
@@ -170 +193 @@
-    dump_total_len += fill + xdatalen;
-
-init
-
-
-
-
+!initCV || initCV
+
+
+
+CV
-{
-    dos = DPV<IMAGE_DOS_HEADER> (0);
@@ -182 +205 @@
-        return setError("this is not a DOS executable");
-
-
-
+
+
+
-        return setError("no optional header found");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    dbgDir = RVA<IMAGE_DEBUG_DIRECTORY>(off, 0x1c);
-    if (!dbgDir)
@@ -231 +260 @@
-
-///////////////////////////////////////////////////////////////////////
+bool PEImage::initDWARFPtr(bool initDbgDir)
+{
+    dos = DPV<IMAGE_DOS_HEADER> (0);
+    if(!dos)
+        return setError("file too small for DOS header");
+    if(dos->e_magic != IMAGE_DOS_SIGNATURE)
+        return setError("this is not a DOS executable");
+
+    hdr32 = DPV<IMAGE_NT_HEADERS32> (dos->e_lfanew);
+    hdr64 = DPV<IMAGE_NT_HEADERS64> (dos->e_lfanew);
+    if(!hdr32)
+        return setError("no optional header found");
+    if(hdr32->FileHeader.Machine == IMAGE_FILE_MACHINE_AMD64 ||
+       hdr32->FileHeader.Machine == IMAGE_FILE_MACHINE_IA64)
+        hdr32 = 0;
+    else
+        hdr64 = 0;
+
+    if(IMGHDR(Signature) != IMAGE_NT_SIGNATURE)
+        return setError("optional header does not have PE signature");
+    if(IMGHDR(FileHeader.SizeOfOptionalHeader) < sizeof(IMAGE_OPTIONAL_HEADER32))
+        return setError("optional header too small");
+
+    dbgDir = 0;
+    sec = hdr32 ? IMAGE_FIRST_SECTION(hdr32) : IMAGE_FIRST_SECTION(hdr64);
+    int nsec = IMGHDR(FileHeader.NumberOfSections);
+    const char* strtable = DPV<char>(IMGHDR(FileHeader.PointerToSymbolTable) + IMGHDR(FileHeader.NumberOfSymbols * IMAGE_SIZEOF_SYMBOL));
+    for(int s = 0; s < nsec; s++)
+    {
+        const char* name = (const char*) sec[s].Name;
+        if(name[0] == '/')
+        {
+            int off = strtol(name + 1, 0, 10);
+            name = strtable + off;
+        }
+        if(strcmp(name, ".debug_aranges") == 0)
+            debug_aranges = DPV<char>(sec[s].PointerToRawData, sec[s].SizeOfRawData);
+        if(strcmp(name, ".debug_pubnames") == 0)
+            debug_pubnames = DPV<char>(sec[s].PointerToRawData, sec[s].SizeOfRawData);
+        if(strcmp(name, ".debug_pubtypes") == 0)
+            debug_pubtypes = DPV<char>(sec[s].PointerToRawData, sec[s].SizeOfRawData);
+        if(strcmp(name, ".debug_info") == 0)
+            debug_info = DPV<char>(sec[s].PointerToRawData, debug_info_length = sec[s].Misc.VirtualSize);
+        if(strcmp(name, ".debug_abbrev") == 0)
+            debug_abbrev = DPV<char>(sec[s].PointerToRawData, debug_abbrev_length = sec[s].Misc.VirtualSize);
+        if(strcmp(name, ".debug_line") == 0)
+            debug_line = DPV<char>(sec[s].PointerToRawData, debug_line_length = sec[s].Misc.VirtualSize);
+        if(strcmp(name, ".debug_frame") == 0)
+            debug_frame = DPV<char>(sec[s].PointerToRawData, sec[s].SizeOfRawData);
+        if(strcmp(name, ".debug_str") == 0)
+            debug_str = DPV<char>(sec[s].PointerToRawData, sec[s].SizeOfRawData);
+        if(strcmp(name, ".debug_loc") == 0)
+            debug_loc = DPV<char>(sec[s].PointerToRawData, sec[s].SizeOfRawData);
+        if(strcmp(name, ".debug_ranges") == 0)
+            debug_ranges = DPV<char>(sec[s].PointerToRawData, debug_ranges_length = sec[s].Misc.VirtualSize);
+        if(strcmp(name, ".reloc") == 0)
+            reloc = DPV<char>(sec[s].PointerToRawData, reloc_length = sec[s].Misc.VirtualSize);
+        if(strcmp(name, ".text") == 0)
+            codeSegment = s;
+    }
+
+    setError(0);
+
+    return true;
+}
+
+int PEImage::findSection(unsigned int off) const
+{
+    off -= IMGHDR(OptionalHeader.ImageBase);
+    int nsec = IMGHDR(FileHeader.NumberOfSections);
+    for(int s = 0; s < nsec; s++)
+        if(sec[s].VirtualAddress <= off && off < sec[s].VirtualAddress + sec[s].Misc.VirtualSize)
+            return s;
+    return -1;
+}
+
+///////////////////////////////////////////////////////////////////////
-int PEImage::countCVEntries() const
-{

trunk/src/PEImage.h

@@ -14 +14 @@
-struct OMFDirHeader;
-struct OMFDirEntry;
+
+#define IMGHDR(x) (hdr32 ? hdr32->x : hdr64->x)
-
-class PEImage : public LastError
@@ -58 +60 @@
-    bool save(const char* oname);
-
-
-
+
+
+
+
+
+
-
-    int countCVEntries() const;
@@ -70 +76 @@
-    static void free_aligned(void* p);
-
+    int countSections() const { return IMGHDR(FileHeader.NumberOfSections); }
+    int findSection(unsigned int off) const;
+    const IMAGE_SECTION_HEADER& getSection(int s) const { return sec[s]; }
+    unsigned long long getImageBase() const { return IMGHDR(OptionalHeader.ImageBase); }
+
-private:
-    int fd;
@@ -75 +86 @@
-    int dump_total_len;
-
+    // codeview
-    IMAGE_DOS_HEADER *dos;
-
+
+
-    IMAGE_SECTION_HEADER* sec;
-    IMAGE_DEBUG_DIRECTORY* dbgDir;
@@ -82 +95 @@
-    OMFDirEntry* dirEntry;
-    
+public:
+    //dwarf
+    char* debug_aranges;
+    char* debug_pubnames;
+    char* debug_pubtypes;
+    char* debug_info;     unsigned long debug_info_length;
+    char* debug_abbrev;   unsigned long debug_abbrev_length;
+    char* debug_line;     unsigned long debug_line_length;
+    char* debug_frame;
+    char* debug_str;
+    char* debug_loc;
+    char* debug_ranges;   unsigned long debug_ranges_length;
+    char* reloc;          unsigned long reloc_length;
+
+    int codeSegment;
-    int cv_base;
-};

trunk/src/cv2pdb.cpp

@@ -23 +23 @@
-, globalSymbols(0), cbGlobalSymbols(0), staticSymbols(0), cbStaticSymbols(0)
-, udtSymbols(0), cbUdtSymbols(0), allocUdtSymbols(0)
+, dwarfTypes(0), cbDwarfTypes(0), allocDwarfTypes(0)
-, srcLineStart(0), srcLineSections(0)
-, pointerTypes(0)
@@ -28 +29 @@
-, classEnumType(0), ifaceEnumType(0), cppIfaceEnumType(0), structEnumType(0)
-, classBaseType(0), ifaceBaseType(0), cppIfaceBaseType(0), structBaseType(0)
+, emptyFieldListType(0)
-{
-    memset(typedefs, 0, sizeof(typedefs));
-    memset(translatedTypedefs, 0, sizeof(translatedTypedefs));
-    cntTypedefs = 0;
+    nextUserType = 0x1000;
+    nextDwarfType = 0x1000;
-
-    addClassTypeEnum = true;
+    addStringViewHelper = false;
+    useTypedefEnum = false;
-    useGlobalMod = true;
-    thisIsNotRef = true;
@@ -75 +81 @@
-    if (udtSymbols)
-        free(udtSymbols);
+    if (dwarfTypes)
+        free(dwarfTypes);
-    delete [] pointerTypes;
-
@@ -99 +107 @@
-    cbUdtSymbols = 0;
-    allocUdtSymbols = 0;
+    cbDwarfTypes = 0;
+    allocDwarfTypes = 0;
-    modules = 0;
-    globmod = 0;
@@ -787 +797 @@
-    if (cbUserTypes + size >= allocUserTypes)
-    {
-
+size + 
-        userTypes = (BYTE*) realloc(userTypes, allocUserTypes);
-    }
@@ -1397 +1407 @@
-
-    int dstringType = 0;
-
+
+
-    {
-        // nextUserType + 1: field list (size, array)
@@ -1732 +1743 @@
-}
-
+int CV2PDB::appendModifierType(int type, int attr)
+{
+    checkUserTypeAlloc();
+
+    codeview_type* dtype = (codeview_type*) (userTypes + cbUserTypes);
+    dtype->modifier_v2.id = LF_MODIFIER_V2;
+    dtype->modifier_v2.type = translateType(type);
+    dtype->modifier_v2.attribute = attr;
+    int len = sizeof(dtype->modifier_v2);
+    //for (; len & 3; len++)
+    //  userTypes[cbUserTypes + len] = 0xf4 - (len & 3);
+    dtype->modifier_v2.len = len - 2;
+    cbUserTypes += len;
+    
+    nextUserType++;
+    return nextUserType - 1;
+}
+
-int CV2PDB::appendComplex(int cplxtype, int basetype, int elemsize, const char* name)
-{
@@ -1903 +1932 @@
-}
-
-
-
+
+
+
+
+
-    checkUserTypeAlloc();
-
-    int basetype = type;
-    if(type == 0x78)
-        basetype = 0x75; // dchar type not understood by debugger, use uint instead
-
-    codeview_reftype* rdtype = (codeview_reftype*) (userTypes + cbUserTypes);
-    rdtype->fieldlist.id = LF_FIELDLIST_V2;
-    rdtype->fieldlist.len = 2;
-    cbUserTypes += rdtype->fieldlist.len + 2;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -2935 +2984 @@
-}
-
+void CV2PDB::checkUdtSymbolAlloc(int size, int add)
+{
+    if (cbUdtSymbols + size > allocUdtSymbols)
+    {
+        allocUdtSymbols += size + add;
+        udtSymbols = (BYTE*) realloc(udtSymbols, allocUdtSymbols);
+    }
+}
+
-bool CV2PDB::addUdtSymbol(int type, const char* name)
-{
-
-
-
-
-
+
-
-    // no need to convert to udt_v2/udt_v3, the debugger is fine with it.
@@ -3046 +3100 @@
-{
-    int len = sizeof(*rsds) + strlen((char*)(rsds + 1)) + 1;
-
+, true
-        return setError(img.getLastError());
-

trunk/src/cv2pdb.h

@@ -12 +12 @@
-
-#include <windows.h>
+#include <map>
-
-extern "C" {
@@ -18 +19 @@
-
-class PEImage;
+struct DWARF_InfoData;
+struct DWARF_CompilationUnit;
-
-class CV2PDB : public LastError
@@ -68 +71 @@
-    void checkUserTypeAlloc(int size = 1000, int add = 10000);
-    void checkGlobalTypeAlloc(int size, int add = 1000);
+    void checkUdtSymbolAlloc(int size, int add = 10000);
+    void checkDWARFTypeAlloc(int size, int add = 10000);
-    void writeUserTypeLen(codeview_type* type, int len);
-
@@ -76 +81 @@
-
-    int findMemberFunctionType(codeview_symbol* lastGProcSym, int thisPtrType);
+    int createEmptyFieldListType();
-
-    int fixProperty(int type, int prop, int fieldType);
@@ -107 +113 @@
-    int  appendObjectType (int object_derived_type, int enumType, const char* classSymbol);
-    int  appendPointerType(int pointedType, int attr);
-
+
+
-    int  appendComplex(int cplxtype, int basetype, int elemsize, const char* name);
-    void appendTypedefs();
-    int  appendEnumerator(const char* typeName, const char* enumName, int enumValue, int prop);
-    int  appendClassTypeEnum(const codeview_type* fieldlist, int type, const char* name);
-
+
+
+
+
+
+
+
-    bool insertClassTypeEnums();
-    int  insertBaseClass(const codeview_type* fieldlist, int type);
@@ -144 +157 @@
-    mspdb::Mod* globalMod();
-
+    // DWARF
+    bool createDWARFModules();
+    unsigned char* getDWARFAbbrev(int off, int n);
+    bool addDWARFTypes();
+    bool addDWARFLines();
+    bool addDWARFPublics();
+    bool relocateDebugLineInfo();
+    bool writeDWARFImage(const char* opath);
+
+    bool addDWARFSectionContrib(mspdb::Mod* mod, unsigned long pclo, unsigned long pchi);
+    bool addDWARFProc(DWARF_InfoData& id, DWARF_CompilationUnit* cu, unsigned char* &locals, unsigned char* end);
+    int  addDWARFStructure(DWARF_InfoData& id, DWARF_CompilationUnit* cu, unsigned char* &locals, unsigned char* end);
+    int  addDWARFArray(DWARF_InfoData& arrayid, DWARF_CompilationUnit* cu, unsigned char* &locals, unsigned char* end);
+    int  addDWARFBasicType(const char*name, int encoding, int byte_size);
+    bool iterateDWARFDebugInfo(int op);
+    int  getTypeByDWARFOffset(DWARF_CompilationUnit* cu, int off);
+    int  getDWARFTypeSize(DWARF_CompilationUnit* cu, int typeOff);
+    int  getDWARFArrayBounds(DWARF_InfoData& arrayid, DWARF_CompilationUnit* cu, 
+                             unsigned char* &locals, unsigned char* end, int& upperBound);
+    bool readDWARFInfoData(DWARF_InfoData& id, DWARF_CompilationUnit* cu, unsigned char* &p, bool mergeInfo = false);
+
-// private:
-    BYTE* libraries;
@@ -184 +218 @@
-    int allocUdtSymbols;
-
+    unsigned char* dwarfTypes;
+    int cbDwarfTypes;
+    int allocDwarfTypes;
+
-    int nextUserType;
+    int nextDwarfType;
-    int objectType;
-
+
+
-    int classEnumType;
-    int ifaceEnumType;
@@ -203 +243 @@
-
-    bool addClassTypeEnum;
+    bool addStringViewHelper;
-    bool useGlobalMod;
-    bool thisIsNotRef;
@@ -212 +253 @@
-
-    double Dversion;
+
+    // DWARF
+    int codeSegOff;
+    std::map<int, int> mapOffsetToType;
-};
-

trunk/src/cv2pdb.sln

@@ -25 +25 @@
-    EndProjectSection
-EndProject
+Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "test", "..\test\test.visualdproj", "{370E7494-D0CB-450F-B74A-4CEEDB19FBAE}"
+EndProject
+Project("{8BC9CEB9-8B4A-11D0-8D11-00A0C91BC942}") = "test64.exe", "..\bin\Debug GDCWin32\test64.exe", "{022545C9-DE2E-44F0-B87C-74CEAC3202F6}"
+EndProject
-Global
-    GlobalSection(SolutionConfigurationPlatforms) = preSolution
+        Debug GDC|Win32 = Debug GDC|Win32
+        Debug GDC|x64 = Debug GDC|x64
-        Debug|Win32 = Debug|Win32
+        Debug|x64 = Debug|x64
-        Release|Win32 = Release|Win32
+        Release|x64 = Release|x64
-    EndGlobalSection
-    GlobalSection(ProjectConfigurationPlatforms) = postSolution
+        {5E2BD27D-446A-4C99-9829-135F7C000D90}.Debug GDC|Win32.ActiveCfg = Debug|Win32
+        {5E2BD27D-446A-4C99-9829-135F7C000D90}.Debug GDC|Win32.Build.0 = Debug|Win32
+        {5E2BD27D-446A-4C99-9829-135F7C000D90}.Debug GDC|x64.ActiveCfg = Debug|Win32
-        {5E2BD27D-446A-4C99-9829-135F7C000D90}.Debug|Win32.ActiveCfg = Debug|Win32
-        {5E2BD27D-446A-4C99-9829-135F7C000D90}.Debug|Win32.Build.0 = Debug|Win32
+        {5E2BD27D-446A-4C99-9829-135F7C000D90}.Debug|x64.ActiveCfg = Debug|Win32
-        {5E2BD27D-446A-4C99-9829-135F7C000D90}.Release|Win32.ActiveCfg = Release|Win32
-        {5E2BD27D-446A-4C99-9829-135F7C000D90}.Release|Win32.Build.0 = Release|Win32
+        {5E2BD27D-446A-4C99-9829-135F7C000D90}.Release|x64.ActiveCfg = Release|Win32
+        {E4424774-A7A0-4502-8626-2723904D70EA}.Debug GDC|Win32.ActiveCfg = Debug|Win32
+        {E4424774-A7A0-4502-8626-2723904D70EA}.Debug GDC|Win32.Build.0 = Debug|Win32
+        {E4424774-A7A0-4502-8626-2723904D70EA}.Debug GDC|x64.ActiveCfg = Debug|Win32
-        {E4424774-A7A0-4502-8626-2723904D70EA}.Debug|Win32.ActiveCfg = Debug|Win32
-        {E4424774-A7A0-4502-8626-2723904D70EA}.Debug|Win32.Build.0 = Debug|Win32
+        {E4424774-A7A0-4502-8626-2723904D70EA}.Debug|x64.ActiveCfg = Debug|Win32
-        {E4424774-A7A0-4502-8626-2723904D70EA}.Release|Win32.ActiveCfg = Release|Win32
-        {E4424774-A7A0-4502-8626-2723904D70EA}.Release|Win32.Build.0 = Release|Win32
+        {E4424774-A7A0-4502-8626-2723904D70EA}.Release|x64.ActiveCfg = Release|Win32
+        {CCC0643D-7D3F-4D5E-AE0E-C871776E86AF}.Debug GDC|Win32.ActiveCfg = Debug|Win32
+        {CCC0643D-7D3F-4D5E-AE0E-C871776E86AF}.Debug GDC|Win32.Build.0 = Debug|Win32
+        {CCC0643D-7D3F-4D5E-AE0E-C871776E86AF}.Debug GDC|x64.ActiveCfg = Debug|Win32
-        {CCC0643D-7D3F-4D5E-AE0E-C871776E86AF}.Debug|Win32.ActiveCfg = Debug|Win32
-        {CCC0643D-7D3F-4D5E-AE0E-C871776E86AF}.Debug|Win32.Build.0 = Debug|Win32
+        {CCC0643D-7D3F-4D5E-AE0E-C871776E86AF}.Debug|x64.ActiveCfg = Debug|Win32
-        {CCC0643D-7D3F-4D5E-AE0E-C871776E86AF}.Release|Win32.ActiveCfg = Release|Win32
-        {CCC0643D-7D3F-4D5E-AE0E-C871776E86AF}.Release|Win32.Build.0 = Release|Win32
+        {CCC0643D-7D3F-4D5E-AE0E-C871776E86AF}.Release|x64.ActiveCfg = Release|Win32
+        {370E7494-D0CB-450F-B74A-4CEEDB19FBAE}.Debug GDC|Win32.ActiveCfg = Debug GDC|Win32
+        {370E7494-D0CB-450F-B74A-4CEEDB19FBAE}.Debug GDC|Win32.Build.0 = Debug GDC|Win32
+        {370E7494-D0CB-450F-B74A-4CEEDB19FBAE}.Debug GDC|x64.ActiveCfg = Debug GDC|x64
+        {370E7494-D0CB-450F-B74A-4CEEDB19FBAE}.Debug GDC|x64.Build.0 = Debug GDC|x64
+        {370E7494-D0CB-450F-B74A-4CEEDB19FBAE}.Debug|Win32.ActiveCfg = Debug|Win32
+        {370E7494-D0CB-450F-B74A-4CEEDB19FBAE}.Debug|Win32.Build.0 = Debug|Win32
+        {370E7494-D0CB-450F-B74A-4CEEDB19FBAE}.Debug|x64.ActiveCfg = Debug|x64
+        {370E7494-D0CB-450F-B74A-4CEEDB19FBAE}.Debug|x64.Build.0 = Debug|x64
+        {370E7494-D0CB-450F-B74A-4CEEDB19FBAE}.Release|Win32.ActiveCfg = Release|Win32
+        {370E7494-D0CB-450F-B74A-4CEEDB19FBAE}.Release|Win32.Build.0 = Release|Win32
+        {370E7494-D0CB-450F-B74A-4CEEDB19FBAE}.Release|x64.ActiveCfg = Release|x64
+        {370E7494-D0CB-450F-B74A-4CEEDB19FBAE}.Release|x64.Build.0 = Release|x64
+        {022545C9-DE2E-44F0-B87C-74CEAC3202F6}.Debug GDC|Win32.ActiveCfg = Debug
+        {022545C9-DE2E-44F0-B87C-74CEAC3202F6}.Debug GDC|x64.ActiveCfg = Debug
+        {022545C9-DE2E-44F0-B87C-74CEAC3202F6}.Debug|Win32.ActiveCfg = Debug
+        {022545C9-DE2E-44F0-B87C-74CEAC3202F6}.Debug|x64.ActiveCfg = Debug
+        {022545C9-DE2E-44F0-B87C-74CEAC3202F6}.Release|Win32.ActiveCfg = Debug
+        {022545C9-DE2E-44F0-B87C-74CEAC3202F6}.Release|x64.ActiveCfg = Debug
-    EndGlobalSection
-    GlobalSection(SolutionProperties) = preSolution

trunk/src/cv2pdb.vcproj

@@ -185 +185 @@
-            </File>
-            <File
+                RelativePath=".\cv2pdb.h"
+                >
+            </File>
+            <File
-                RelativePath=".\cvutil.cpp"
-                >
@@ -198 +202 @@
-            <File
-                RelativePath=".\demangle.h"
+                >
+            </File>
+            <File
+                RelativePath=".\dwarf2pdb.cpp"
-                >
-            </File>

trunk/src/cvutil.cpp

@@ -111 +111 @@
-{
-    unsigned short int type = *(const unsigned short int*) leaf;
-2
+1
-    int length = 2;
-
@@ -180 +180 @@
-}
-
+int write_numeric_leaf(int value, void* leaf)
+{
+    if(value >= 0 && value < LF_NUMERIC)
+    {
+        *(unsigned short int*) leaf = (unsigned short) value;
+        return 2;
+    }
+    unsigned short int* type = (unsigned short int*) leaf;
+    leaf = type + 1;
+    if (value >= -128 && value <= 127)
+    {
+        *type = LF_CHAR;
+        *(char*) leaf = (char)value;
+        return 3;
+    }
+    if (value >= -32768 && value <= 32767)
+    {
+        *type = LF_SHORT;
+        *(short*) leaf = (short)value;
+        return 4;
+    }
+    if (value >= 0 && value <= 65535)
+    {
+        *type = LF_USHORT;
+        *(unsigned short*) leaf = (unsigned short)value;
+        return 4;
+    }
+    *type = LF_LONG;
+    *(long*) leaf = (long)value;
+    return 6;
+}
+

trunk/src/cvutil.h

@@ -51 +51 @@
-
-int numeric_leaf(int* value, const void* leaf);
+int write_numeric_leaf(int value, void* leaf);
-
-#endif // __CVUTIL_H__

trunk/src/dviewhelper/dviewhelper.cpp

@@ -26 +26 @@
-{
-    DWORD dwVersion;
-BOOL   
+HRESULT
-    // from here only when dwVersion >= 0x20000
-    DWORDLONG (WINAPI *GetRealAddress)(DEBUGHELPER *pThis);
-BOOL   
+HRESULT
-    int       (WINAPI *GetProcessorType)(DEBUGHELPER *pThis);
-};
+
+// possible processor types
+typedef enum _MPT {
+    mptix86 = 0,    // Intel X86
+    mptia64 = 1,   // Intel Merced
+    mptamd64 = 2,   // AMD64
+    mptUnknown = 3   // Unknown
+} MPT;
+
+HRESULT readMem(DEBUGHELPER *pHelper, DWORDLONG qwAddr, DWORD nWant, VOID* pWhere, DWORD *nGot)
+{
+    if(pHelper->dwVersion < 0x20000)
+        return pHelper->ReadDebuggeeMemory(pHelper, (DWORD)qwAddr, nWant, pWhere, nGot);
+    return pHelper->ReadDebuggeeMemoryEx(pHelper, qwAddr, nWant, pWhere, nGot);
+}
-
-struct DString
@@ -44 +59 @@
-                          char *pResult, size_t max, DWORD sizePerChar)
-{
+    DWORDLONG qwAddress = dwAddress; 
+    if(pHelper->dwVersion >= 0x20000)
+        qwAddress = pHelper->GetRealAddress(pHelper);
+
+    int proc = 0;
+    if(pHelper->dwVersion >= 0x20000)
+        proc = pHelper->GetProcessorType(pHelper);
+    int sizeOfPtr = proc == 0 ? 4 : 8;
+
-    // Get the string struct
-   DString dstr
+    char strdata[16]
-    DWORD read;
-pHelper->ReadDebuggeeMemory(pHelper, dwAddress, sizeof(dstr), &dstr
+readMem(pHelper, qwAddress, 2*sizeOfPtr, strdata
-    {
-   
-   
+    
+    
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-        strncpy(pResult,"\"\"", max);
@@ -59 +94 @@
-
-    char* pData = pResult + 1;
-dstr.length < max - 3 ? dstr.
+length < max - 3 ? (DWORD)
-    if (sizePerChar * cnt > max)
-        pData = new char[sizePerChar * cnt];
-
-pHelper->ReadDebuggeeMemory(pHelper, dstr.
+readMem(pHelper, 
-    {
-        strncpy(pResult,"Cannot access data", max);

trunk/src/main.cpp

@@ -82 +82 @@
-    if (argc < 2)
-    {
-
-1
+/DWARF
+2
-        printf("\n");
-        printf("License for redistribution is given by the Artistic License 2.0\n");
@@ -107 +107 @@
-        else if (argv[0][1] == 'n')
-            demangleSymbols = false;
+        else if (argv[0][1] == 'e')
+            useTypedefEnum = true;
-        else if (argv[0][1] == 's' && argv[0][2])
-            dotReplacementChar = argv[0][2];
@@ -115 +117 @@
-    if (!img.load(argv[1]))
-        fatal("%s: %s", argv[1], img.getLastError());
-   if (img.countCVEntries() == 0
+    if (img.countCVEntries() == 0 && !img.hasDWARF()
-        fatal("%s: no codeview debug entries found", argv[1]);
-
-    CV2PDB cv2pdb(img);
+    cv2pdb.Dversion = Dversion;
-    cv2pdb.initLibraries();
-    cv2pdb.Dversion = Dversion;
-
-    char* outname = argv[1];
@@ -145 +147 @@
-        fatal("%s: %s", pdbname, cv2pdb.getLastError());
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    return 0;

trunk/src/symutil.cpp

@@ -16 +16 @@
-char dotReplacementChar = '@';
-bool demangleSymbols = true;
+bool useTypedefEnum = false;
-
-int dsym2c(const BYTE* p, int len, char* cname, int maxclen)
@@ -142 +143 @@
-{
-    return p2c(&p.namelen, idx);
+}
+
+int c2p(const char* c, BYTE* p)
+{
+    BYTE* q = p;
+    int len = strlen(c);
+    if(len > 255)
+    {
+        *p++ = 0xff;
+        *p++ = 0;
+        *p++ = len & 0xff;
+        *p++ = len >> 8;
+    }
+    else
+        *p++ = len;
+    memcpy(p, c, len);
+    return p + len - q;
+}
+
+int c2p(const char* c, p_string& p)
+{
+    return c2p(c, &p.namelen);
-}
-

trunk/src/symutil.h

@@ -20 +20 @@
-char* p2c(const BYTE* p, int idx = 0);
-char* p2c(const p_string& p, int idx = 0);
+int c2p(const char* c, BYTE* p); // return byte len
+int c2p(const char* c, p_string& p);
-int p2ccpy(char* p, const BYTE* s);
-int pstrcpy(BYTE* p, const BYTE* s);
@@ -32 +34 @@
-extern char dotReplacementChar;
-extern bool demangleSymbols;
+extern bool useTypedefEnum;
-
-#endif //__SYMUTIL_H__

trunk/test/cvtest.d

@@ -88 +88 @@
-// LF_ARRAY_V1
-long[4] global_fixed_array;
+__gshared long[4] gshared_fixed_array = [ 1, 2, 3, 4 ];
+__gshared string gshared_bss_string;
-
-// OEM types;
@@ -219 +221 @@
-}
-
-in
+size_
-{
-    int[] iarr;
@@ -229 +231 @@
-    const void[] cvarr;
-    
+    int[7] xarr = [ 1, 2, 3, 4, 5, 6, 7 ];
+    string[7] sarr = [ "a", "b", "c", "d", "e", "f", "g" ];
+    wstring[7] wsarr = [ "a", "b", "c", "d", "e", "f", "g" ];
+    dstring[7] dsarr = [ "a", "b", "c", "d", "e", "f", "g" ];
+
-    return iarr.length;
+}
+
+size_t lexical_scope()
+{
+    int[10] arr1;
+    for(int i = 0; i < 10; i++)
+        arr1[i] = i;
+
+    for(int i = 0; i < 10; i++)
+        arr1[i] += i;
+
+    foreach(i; "hello")
+        if(i == 'e')
+            break;
+
+    return arr1.length;
-}
-
@@ -251 +274 @@
-    class_staticmember inst_staticmember = new class_staticmember;
-    class_outer inst_outer = new class_outer;
-inst_outer.inner; // = new class_outer.class_inner(inst_outer)
+/*inst_outer.inner; // =*/ inst_outer.new class_inner
-    struct_name inst_struct;
-    struct_name* pinst_struct;
@@ -267 +290 @@
-    CUnknown unkn = new CUnknown;
-    IUnknown iunkn = unkn;
-
+//
-    
-    FILE stdfile;
@@ -310 +333 @@
-    voidpointers(null);
-    arrays();
+    lexical_scope();
+
-    outer_func(3);
-    A.outer_func(3);
+
+    global_fixed_array[1] = 3;
+    gshared_fixed_array[0] = 3;
+    gshared_bss_string = "bss";
-
-    main2(argv);
@@ -352 +381 @@
-    (new Test).test();
-
-dmd_quirk
+basictype
-    strings();
-
@@ -366 +395 @@
-class Test
-{
-in
+size_
-    {
-        class_outer clss = new class_outer;
@@ -385 +414 @@
-int strings()
-{
-
+
+
-    wstring ws = "wchar string"w;
-    dstring ds = "dchar string"d;
-
+    immutable(char)[]  ics = cs;
+    immutable(wchar)[] iws = ws;
+    immutable(dchar)[] ids = ds;
+
+    char[]  mcs = cs.dup;
+    wchar[] mws = ws.dup;
+    dchar[] mds = ds.dup;
+
+    const(char)[]  ccs = cs;
+    const(wchar)[] cws = ws;
+    const(dchar)[] cds = ds;
+
+    immutable char[]  i2cs = cs;
+    immutable wchar[] i2ws = ws;
+    immutable dchar[] i2ds = ds;
+
+    const char[]  c2cs = cs;
+    const wchar[] c2ws = ws;
+    const dchar[] c2ds = ds;
+
-    return 0;
-}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    long quirk_long; // written as delegate<void*,int>
-    ulong quirk_ulong; // written as int[]
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+