Changeset 64382 in vbox for trunk/src/VBox

Timestamp:

Oct 24, 2016 12:56:10 PM (8 years ago)

Author:

vboxsync

Message:

Debugger/Digger/FreeBSD: Alignment fixes for 32bit FreeBSD

File:

• trunk/src/VBox/Debugger/DBGPlugInFreeBsd.cpp (modified) (3 diffs)

trunk/src/VBox/Debugger/DBGPlugInFreeBsd.cpp

@@ -320 +320 @@
      * All checked FreeBSD kernels so far have the following layout in the kernel:
      *     [.interp] - contiains the /red/herring string we used for probing earlier
-     *     [.hash]   - contains the hashes of the symbol names, 8 byte alignent
-     *     [.dynsym] - contains the ELF symbol descriptors, 8 byte alignment
+     *     [.hash]   - contains the hashes of the symbol names, 8 byte alignment on 64bit, 4 byte on 32bit
+     *     [.dynsym] - contains the ELF symbol descriptors, 8 byte alignment, 4 byte on 32bit
      *     [.dynstr] - contains the symbol names as a string table, 1 byte alignmnt
      *     [.text]   - contains the executable code, 16 byte alignment.
@@ -338 +338 @@
     DBGFADDRESS AddrHashStart = pThis->AddrKernelInterp;
     DBGFR3AddrAdd(&AddrHashStart, sizeof(g_abNeedleInterp));
-    AddrHashStart.FlatPtr = RT_ALIGN_GCPT(AddrHashStart.FlatPtr, 8, RTGCUINTPTR);
+    AddrHashStart.FlatPtr = RT_ALIGN_GCPT(AddrHashStart.FlatPtr, pThis->f64Bit ? 8 : 4, RTGCUINTPTR);
     uint32_t au32Counters[2];
     int rc = DBGFR3MemRead(pUVM, 0 /*idCpu*/, &AddrHashStart, &au32Counters[0], sizeof(au32Counters));
@@ -352 +352 @@
 
             DBGFR3AddrAdd(&AddrDynsymStart, cbHash);
-            AddrDynsymStart.FlatPtr = RT_ALIGN_GCPT(AddrDynsymStart.FlatPtr, 8, RTGCUINTPTR);
+            AddrDynsymStart.FlatPtr = RT_ALIGN_GCPT(AddrDynsymStart.FlatPtr, pThis->f64Bit ? 8 : 4, RTGCUINTPTR);
 
             DBGFADDRESS AddrDynstrStart = AddrDynsymStart;