[haiku-commits] r39753 - haiku/trunk/src/apps/debugger/dwarf

  • From: anevilyak@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Tue, 7 Dec 2010 00:58:48 +0100 (CET)

Author: anevilyak
Date: 2010-12-07 00:58:48 +0100 (Tue, 07 Dec 2010)
New Revision: 39753
Changeset: http://dev.haiku-os.org/changeset/39753

Modified:
   haiku/trunk/src/apps/debugger/dwarf/DwarfFile.cpp
Log:
Dump CIE offset in hex format so as to be more readily comparable with the 
offsets presented by readelf.



Modified: haiku/trunk/src/apps/debugger/dwarf/DwarfFile.cpp
===================================================================
--- haiku/trunk/src/apps/debugger/dwarf/DwarfFile.cpp   2010-12-06 23:33:07 UTC 
(rev 39752)
+++ haiku/trunk/src/apps/debugger/dwarf/DwarfFile.cpp   2010-12-06 23:58:48 UTC 
(rev 39753)
@@ -635,7 +635,7 @@
                                        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,
                                        initialLocation, addressRange);
 
@@ -1581,8 +1581,8 @@
 
        uint8 version = dataReader.Read<uint8>(0);
        if (version != 1) {
-               TRACE_CFI("  cie: length: %llu, version: %u -- unsupported\n",
-                       length, version);
+               TRACE_CFI("  cie: length: %llu, offset: %#llx, version: %u "
+                       "-- unsupported\n",     length, cieOffset, version);
                return B_UNSUPPORTED;
        }
 
@@ -1593,10 +1593,11 @@
        context.SetDataAlignment(dataReader.ReadSignedLEB128(0));
        context.SetReturnAddressRegister(dataReader.ReadUnsignedLEB128(0));
 
-       TRACE_CFI("  cie: length: %llu, version: %u, augmentation: \"%s\", "
-               "aligment: code: %lu, data: %ld, return address reg: %lu\n", 
length,
-               version, cieAugmentation.String(), context.CodeAlignment(),
-               context.DataAlignment(), context.ReturnAddressRegister());
+       TRACE_CFI("  cie: length: %llu, offset: %#llx, version: %u, 
augmentation: "
+               "\"%s\", aligment: code: %lu, data: %ld, return address reg: 
%lu\n",
+               length, cieOffset, version, cieAugmentation.String(),
+               context.CodeAlignment(), context.DataAlignment(),
+               context.ReturnAddressRegister());
 
        status_t error = cieAugmentation.Read(dataReader);
        if (error != B_OK) {


Other related posts:

  • » [haiku-commits] r39753 - haiku/trunk/src/apps/debugger/dwarf - anevilyak