Eric Pouech : winedump:
Re-use existing codeview facilities to dump OMF files.
Alexandre Julliard
julliard at wine.codeweavers.com
Sat Jan 6 05:12:51 CST 2007
Module: wine
Branch: master
Commit: 8a68e46953ba13d7e7bac875776b0fef8a8572db
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a68e46953ba13d7e7bac875776b0fef8a8572db
Author: Eric Pouech <eric.pouech at wanadoo.fr>
Date: Fri Jan 5 21:42:53 2007 +0100
winedump: Re-use existing codeview facilities to dump OMF files.
---
include/wine/mscvpdb.h | 12 ------------
tools/winedump/debug.c | 36 +-----------------------------------
2 files changed, 1 insertions(+), 47 deletions(-)
diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h
index 064b5fa..abbd539 100644
--- a/include/wine/mscvpdb.h
+++ b/include/wine/mscvpdb.h
@@ -1650,18 +1650,6 @@ typedef struct OMFSymHash
unsigned long cbHAddr;
} OMFSymHash;
-/* FIXME: to be removed (and using codeview_symbol type above)
- * Symbol table entry */
-typedef struct DATASYM32
-{
- unsigned short reclen;
- unsigned short rectyp;
- unsigned long typind;
- unsigned long off;
- unsigned short seg;
-} DATASYM32;
-typedef DATASYM32 PUBSYM32;
-
/* sstSegMap section */
typedef struct OMFSegMapDesc
diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c
index 37e0b65..3202c25 100644
--- a/tools/winedump/debug.c
+++ b/tools/winedump/debug.c
@@ -135,18 +135,12 @@ static int dump_cv_sst_global_pub(const
long fileoffset;
const OMFSymHash* header;
const BYTE* symbols;
- const BYTE* curpos;
- const PUBSYM32* sym;
- unsigned symlen;
- int recordlen;
- char nametmp[256];
fileoffset = Offset(cv_base) + omfde->lfo;
printf (" GlobalPub section starts at file offset 0x%lx\n", fileoffset);
printf (" Symbol table starts at 0x%lx\n", fileoffset + sizeof (OMFSymHash));
printf ("\n ----- Begin Symbol Table -----\n");
- printf (" (type) (symbol name) (offset) (len) (seg) (ind)\n");
header = PRD(fileoffset, sizeof(OMFSymHash));
if (!header) {printf("Can't get OMF-SymHash, aborting\n");return FALSE;}
@@ -154,35 +148,7 @@ static int dump_cv_sst_global_pub(const
symbols = PRD(fileoffset + sizeof(OMFSymHash), header->cbSymbol);
if (!symbols) {printf("Can't OMF-SymHash details, aborting\n"); return FALSE;}
- /* We don't know how many symbols are in this block of memory...only what
- * the total size of the block is. Because the symbol's name is tacked
- * on to the end of the PUBSYM32 struct, each symbol may take up a different
- * # of bytes. This makes it harder to parse through the symbol table,
- * since we won't know the exact location of the following symbol until we've
- * already parsed the current one.
- */
- for (curpos = symbols; curpos < symbols + header->cbSymbol; curpos += recordlen)
- {
- /* Point to the next PUBSYM32 in the table.
- */
- sym = (const PUBSYM32*)curpos;
-
- if (sym->reclen < sizeof(PUBSYM32)) break;
-
- symlen = sym->reclen - sizeof(PUBSYM32) + 1;
- if (symlen > sizeof(nametmp)) {printf("\nsqueeze%d\n", symlen);symlen = sizeof(nametmp) - 1;}
-
- memcpy(nametmp, curpos + sizeof (PUBSYM32) + 1, symlen);
- nametmp[symlen] = '\0';
-
- printf (" 0x%04x %-30.30s [0x%8lx] [0x%4x] %d %ld\n",
- sym->rectyp, nametmp, sym->off, sym->reclen, sym->seg, sym->typind);
-
- /* The entire record is null-padded to the nearest 4-byte
- * boundary, so we must do a little extra math to keep things straight.
- */
- recordlen = (sym->reclen + 3) & ~3;
- }
+ codeview_dump_symbols(symbols, header->cbSymbol);
return TRUE;
}
More information about the wine-cvs
mailing list