Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-18 03:34:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RSYM]

Browse source 
* Add a flag (-s) to pass the source folder. This allows it to set the debug file paths relatively to that source folder. Brought to you by Arty.
[CMAKE]
* Leverage the new rsym flag. The rossym file paths are no longer absolute.

svn path=/trunk/; revision=59775
This commit is contained in:
Amine Khaldi 2013-08-18 20:05:32 +00:00
parent d1f2547346
commit f47701b71d
2 changed files with 105 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/cmake/gcc.cmake
View file

@ -143,16 +143,16 @@ else()
get_target_property(RSYM native-rsym IMPORTED_LOCATION_NOCONFIG)
set(CMAKE_C_LINK_EXECUTABLE
"<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>"
"${RSYM} <TARGET> <TARGET>")
"${RSYM} -s ${REACTOS_SOURCE_DIR} <TARGET> <TARGET>")
set(CMAKE_CXX_LINK_EXECUTABLE
"<CMAKE_CXX_COMPILER> ${CMAKE_CXX_FLAGS} <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>"
"${RSYM} <TARGET> <TARGET>")
"${RSYM} -s ${REACTOS_SOURCE_DIR} <TARGET> <TARGET>")
set(CMAKE_C_CREATE_SHARED_LIBRARY
"<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>"
"${RSYM} <TARGET> <TARGET>")
"${RSYM} -s ${REACTOS_SOURCE_DIR} <TARGET> <TARGET>")
set(CMAKE_CXX_CREATE_SHARED_LIBRARY
"<CMAKE_CXX_COMPILER> ${CMAKE_CXX_FLAGS} <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>"
"${RSYM} <TARGET> <TARGET>")
"${RSYM} -s ${REACTOS_SOURCE_DIR} <TARGET> <TARGET>")
set(CMAKE_RC_CREATE_SHARED_LIBRARY
"<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
endif()

108
reactos/tools/rsym/rsym.c
View file

@ -464,6 +464,8 @@ struct DbgHelpStringTab {
ULONG NumberOfSymbols;
void *process;
DWORD module_base;
char *PathChop;
char *SourcePath;
struct DbgHelpLineEntry *lastLineEntry;
};
@ -532,6 +534,21 @@ DbgHelpGetString(struct DbgHelpStringTab *tab, int id)
return tab->Table[bucket][i];
}
/* Remove a prefix of PathChop if it exists and return a copy of the tail. */
static char *
StrDupShortenPath(char *PathChop, char *FilePath)
{
int pclen = strlen(PathChop);
if (!strncmp(FilePath, PathChop, pclen))
{
return strdup(FilePath+pclen);
}
else
{
return strdup(FilePath);
}
}
static BOOL
DbgHelpAddLineNumber(PSRCCODEINFO LineInfo, void *UserContext)
{
@ -542,7 +559,48 @@ DbgHelpAddLineNumber(PSRCCODEINFO LineInfo, void *UserContext)
if (!pSymbol) return FALSE;
memset(pSymbol, 0, FIELD_OFFSET(SYMBOL_INFO, Name[MAX_SYM_NAME]));
fileId = DbgHelpAddStringToTable(tab, strdup(LineInfo->FileName));
/* If any file can be opened by relative path up to a certain level, then
record that path. */
if (!tab->PathChop)
{
int i, endLen;
char *end = strrchr(LineInfo->FileName, '/');
if (!end)
end = strrchr(LineInfo->FileName, '\\');
if (end)
{
for (i = (end - LineInfo->FileName) - 1; i >= 0; i--)
{
if (LineInfo->FileName[i] == '/' || LineInfo->FileName[i] == '\\')
{
char *synthname = malloc(strlen(tab->SourcePath) +
strlen(LineInfo->FileName + i + 1)
+ 2);
strcpy(synthname, tab->SourcePath);
strcat(synthname, "/");
strcat(synthname, LineInfo->FileName + i + 1);
FILE *f = fopen(synthname, "r");
free(synthname);
if (f)
{
fclose(f);
break;
}
}
}
i++; /* Be in the string or past the next slash */
tab->PathChop = malloc(i + 1);
memcpy(tab->PathChop, LineInfo->FileName, i);
tab->PathChop[i] = 0;
}
}
fileId = DbgHelpAddStringToTable(tab,
StrDupShortenPath(tab->PathChop,
LineInfo->FileName));
pSymbol->SizeOfStruct = sizeof(SYMBOL_INFO);
pSymbol->MaxNameLen = MAX_SYM_NAME;
@ -570,7 +628,7 @@ DbgHelpAddLineNumber(PSRCCODEINFO LineInfo, void *UserContext)
}
static int
ConvertDbgHelp(void *process, DWORD module_base,
ConvertDbgHelp(void *process, DWORD module_base, char *SourcePath,
ULONG *SymbolsCount, PROSSYM_ENTRY *SymbolsBase,
ULONG *StringsLength, void **StringsBase)
{
@ -589,6 +647,8 @@ ConvertDbgHelp(void *process, DWORD module_base,
strtab.CurLineEntries = 0;
strtab.LineEntries = 16384;
strtab.LineEntryData = calloc(strtab.LineEntries, sizeof(struct DbgHelpLineEntry));
strtab.PathChop = NULL;
strtab.SourcePath = SourcePath ? SourcePath : "";
SymEnumLines(process, module_base, NULL, NULL, DbgHelpAddLineNumber, &strtab);
@ -636,6 +696,7 @@ ConvertDbgHelp(void *process, DWORD module_base,
}
free(strtab.LineEntryData);
free(strtab.PathChop);
qsort(*SymbolsBase, *SymbolsCount, sizeof(ROSSYM_ENTRY), (int (*)(const void *, const void *))CompareSymEntry);
@ -1123,15 +1184,47 @@ int main(int argc, char* argv[])
void *file;
char elfhdr[4] = { '\177', 'E', 'L', 'F' };
BOOLEAN UseDbgHelp = FALSE;
int arg, argstate = 0;
char *SourcePath = NULL;
if (argc != 3)
for (arg = 1; arg < argc; arg++)
{
fprintf(stderr, "Usage: rsym <exefile> <symfile>\n");
exit(1);
switch (argstate)
{
default:
argstate = -1;
break;
case 0:
if (!strcmp(argv[arg], "-s"))
{
argstate = 1;
}
else
{
argstate = 2;
path1 = convert_path(argv[arg]);
}
break;
case 1:
free(SourcePath);
SourcePath = strdup(argv[arg]);
argstate = 0;
break;
case 2:
path2 = convert_path(argv[arg]);
argstate = 3;
break;
}
}
path1 = convert_path(argv[1]);
path2 = convert_path(argv[2]);
if (argstate != 3)
{
fprintf(stderr, "Usage: rsym [-s <sources>] <input> <output>\n");
exit(1);
}
FileData = load_file(path1, &FileSize);
if (!FileData)
@ -1192,6 +1285,7 @@ int main(int argc, char* argv[])
if (ConvertDbgHelp(FileData,
module_base,
SourcePath,
&StabSymbolsCount,
&StabSymbols,
&StringsLength,