i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dump CIE offset in hex format so as to be more readily comparable with the offsets presented by readelf.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39753 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rene Gollent
2010-12-06 23:58:48 +00:00
parent 558028c0e6
commit 5f0c5d527c
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/debugger/dwarf/DwarfFile.cpp
+8 -7
View File
@@ -635,7 +635,7 @@ DwarfFile::UnwindCallFrame(CompilationUnit* unit,
cieID = lengthOffset - cieID; cieID = lengthOffset - cieID;
} }
TRACE_CFI(" found fde: length: %llu (%lld), CIE offset: %llu, " TRACE_CFI(" found fde: length: %llu (%lld), CIE offset: %#llx, "
"location: %#llx, range: %#llx\n", length, remaining, cieID, "location: %#llx, range: %#llx\n", length, remaining, cieID,
initialLocation, addressRange); initialLocation, addressRange);
@@ -1581,8 +1581,8 @@ DwarfFile::_ParseCIE(CompilationUnit* unit, CfaContext& context,
uint8 version = dataReader.Read<uint8>(0); uint8 version = dataReader.Read<uint8>(0);
if (version != 1) { if (version != 1) {
TRACE_CFI(" cie: length: %llu, version: %u -- unsupported\n", TRACE_CFI(" cie: length: %llu, offset: %#llx, version: %u "
length, version); "-- unsupported\n", length, cieOffset, version);
return B_UNSUPPORTED; return B_UNSUPPORTED;
} }
@@ -1593,10 +1593,11 @@ DwarfFile::_ParseCIE(CompilationUnit* unit, CfaContext& context,
context.SetDataAlignment(dataReader.ReadSignedLEB128(0)); context.SetDataAlignment(dataReader.ReadSignedLEB128(0));
context.SetReturnAddressRegister(dataReader.ReadUnsignedLEB128(0)); context.SetReturnAddressRegister(dataReader.ReadUnsignedLEB128(0));
TRACE_CFI(" cie: length: %llu, version: %u, augmentation: \"%s\", " TRACE_CFI(" cie: length: %llu, offset: %#llx, version: %u, augmentation: "
"aligment: code: %lu, data: %ld, return address reg: %lu\n", length, "\"%s\", aligment: code: %lu, data: %ld, return address reg: %lu\n",
version, cieAugmentation.String(), context.CodeAlignment(), length, cieOffset, version, cieAugmentation.String(),
context.DataAlignment(), context.ReturnAddressRegister()); context.CodeAlignment(), context.DataAlignment(),
context.ReturnAddressRegister());
status_t error = cieAugmentation.Read(dataReader); status_t error = cieAugmentation.Read(dataReader);
if (error != B_OK) { if (error != B_OK) {