Index: tools/rsym/log2lines.c =================================================================== --- tools/rsym/log2lines.c (revision 44480) +++ tools/rsym/log2lines.c (working copy) @@ -10,9 +10,11 @@ #include "rsym.h" -#define LOG2LINES_VERSION "1.7" +#define LOG2LINES_VERSION "1.8" #define INVALID_BASE 0xFFFFFFFFL +/* Assume if an offset > ABS_TRESHOLD, then it must be absolute: */ +#define ABS_TRESHOLD 0x00400000L #define DEF_OPT_DIR "output-i386" #define SOURCES_ENV "_ROSBE_ROSSOURCEDIR" @@ -366,7 +368,7 @@ static size_t fixup_offset(size_t ImageBase, size_t offset) { - if (offset >= ImageBase) + if (offset > ABS_TRESHOLD) offset -= ImageBase; return offset; } @@ -953,11 +955,6 @@ int res = 0; char *path, *dpath; - /* First get the ImageBase of the File. If its smaller than the given - * Parameter, everything is ok, because it was already added onto the - * adress and can be given directly to process_file. If not, add it and - * give the result to process_file. - */ dpath = path = convert_path(cpath); if (!path) return 1; @@ -985,7 +982,6 @@ if (!res) { - offset = (base < offset) ? offset : base + offset; res = process_file(path, offset, toString); }