Changeset 32219 in vbox for trunk/src

Timestamp:

Sep 2, 2010 6:26:21 PM (14 years ago)

Author:

vboxsync

Message:

VMM/DBGFCoreWrite: bits.

Location:

trunk/src/VBox

Files:

• Runtime/include/internal/ldrELFCommon.h (modified) (1 diff)
• VMM/DBGFCoreWrite.cpp (modified) (9 diffs)

trunk/src/VBox/Runtime/include/internal/ldrELFCommon.h

@@ -307 +307 @@
 #endif
 
+/* VirtualBox specific NOTE sections (added by Ramshankar */
+#ifdef VBOX
+#define NT_VBOXCPU  0xace
+#endif
+
 /* Symbol Binding - ELFNN_ST_BIND - st_info */
 #define STB_LOCAL       0       /* Local symbol */

trunk/src/VBox/VMM/DBGFCoreWrite.cpp

@@ -15 +15 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
-
-
-/*******************************************************************************
-*   Header Files                                                               *
-*******************************************************************************/
-#define LOG_GROUP LOG_GROUP_DBGF
-#include <iprt/param.h>
-#include <iprt/file.h>
-#include <VBox/dbgf.h>
-#include "DBGFInternal.h"
-#include <VBox/vm.h>
-#include <VBox/pgm.h>
-#include <VBox/err.h>
-#include <VBox/log.h>
-#include <VBox/mm.h>
-
-#include "../Runtime/include/internal/ldrELF64.h"
-
-/*******************************************************************************
-*   Defined Constants And Macros                                               *
-*******************************************************************************/
-#ifdef DEBUG_ramshankar
-# undef Log
-# define Log LogRel
-#endif
-#define DBGFLOG_NAME           "DGBFCoreWrite"
-
-/**
- * DBGFCOREDATA: Core data.
- */
-typedef struct
-{
-    const char *pszDumpPath;    /* File path to dump the core into. */
-} DBGFCOREDATA, *PDBGFCOREDATA;
-
 
 /*
@@ -75 +40 @@
  */
 
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
+#define LOG_GROUP LOG_GROUP_DBGF
+#include <iprt/param.h>
+#include <iprt/file.h>
+
+#include "DBGFInternal.h"
+
+#include <VBox/cpum.h>
+#include "CPUMInternal.h"
+#include <VBox/dbgf.h>
+#include <VBox/vm.h>
+#include <VBox/pgm.h>
+#include <VBox/err.h>
+#include <VBox/log.h>
+#include <VBox/mm.h>
+
+#include "../Runtime/include/internal/ldrELF64.h"
+
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
+#ifdef DEBUG_ramshankar
+# undef Log
+# define Log LogRel
+#endif
+#define DBGFLOG_NAME           "DGBFCoreWrite"
+
+static const int s_NoteAlign = 4;
+
+/**
+ * DBGFCOREDATA: Core data.
+ */
+typedef struct
+{
+    const char *pszDumpPath;    /* File path to dump the core into. */
+} DBGFCOREDATA, *PDBGFCOREDATA;
+
+typedef struct
+{
+    Elf64_Nhdr  Hdr;            /* 64-bit NOTE Header */
+    char        achName[8];    /* Name of NOTE section */
+} ELFNOTEHDR;
+
+
 /**
  * ELF function to write 64-bit ELF header.
@@ -88 +99 @@
 static int Elf64WriteElfHdr(RTFILE hFile, uint16_t cProgHdrs, uint16_t cSecHdrs, uint64_t *pcbElfHdr)
 {
-AssertCompile(sizeof(uint32_t) == 4);
-
     Elf64_Ehdr ElfHdr;
     RT_ZERO(ElfHdr);
@@ -155 +164 @@
 
 /**
+ * Returns the size of the NOTE section given the size of the data.
+ *
+ * @param cb                Size of the data part of the NOTE.
+ *
+ * @return The size of the NOTE section as rounded to the file alignment.
+ */
+static inline int Elf64NoteSectionSize(uint64_t cb)
+{
+    return sizeof(ELFNOTEHDR) + RT_ALIGN_64(cb, s_NoteAlign);
+}
+
+
+/**
  * Elf function to write 64-bit note header.
  *
  * @param hFile             The file to write to.
  * @param Type              Type of this section.
- * @param pszName           Name of this section, will be limited to 8 bytes.
+ * @param pszName           Name of this section, will be limited to 16 bytes.
  * @param pcv               Opaque pointer to the data, if NULL only computes size.
  * @param cb                Size of the data.
@@ -167 +189 @@
  * @return IPRT status code.
  */
-static int Elf64WriteNoteHeader(RTFILE hFile, uint16_t Type, const char *pszName, const void *pcv, uint64_t cb, uint64_t *pcbNoteHdr)
+static int Elf64WriteNoteHdr(RTFILE hFile, uint16_t Type, const char *pszName, const void *pcv, uint64_t cb, uint64_t *pcbNoteHdr)
 {
     AssertReturn(pcv, VERR_INVALID_POINTER);
     AssertReturn(cb > 0, VERR_NO_DATA);
 
-    typedef struct
-    {
-        Elf64_Nhdr  Hdr;            /* 64-bit NOTE Header */
-        char        achName[8];     /* Name of NOTE section */
-    } ELFNOTEHDR;
-
     ELFNOTEHDR ElfNoteHdr;
     RT_ZERO(ElfNoteHdr);
-    RTStrCopy(ElfNoteHdr.achName, sizeof(ElfNoteHdr.achName) - 1, pszName);
-    ElfNoteHdr.Hdr.n_namesz = (Elf64_Word)strlen(ElfNoteHdr.achName) + 1;
+    RTStrCopy(ElfNoteHdr.achName, sizeof(ElfNoteHdr.achName), pszName);
+    ElfNoteHdr.Hdr.n_namesz = (Elf64_Word)strlen(ElfNoteHdr.achName);
     ElfNoteHdr.Hdr.n_type   = Type;
-
-    static const char s_achPad[3] = { 0, 0, 0 };
-    uint64_t cbAlign = RT_ALIGN_64(cb, 4);
-    ElfNoteHdr.Hdr.n_descsz = cbAlign;
+    size_t cbNameAlign = RT_ALIGN_Z(ElfNoteHdr.Hdr.n_namesz, 8);
+
+    static const char s_achPad[7] = { 0, 0, 0, 0, 0, 0, 0 };
+    uint64_t cbAlign = RT_ALIGN_64(cb, s_NoteAlign);
+    ElfNoteHdr.Hdr.n_descsz = (Elf64_Word)cbAlign;
 
     /*
@@ -194 +211 @@
     if (RT_SUCCESS(rc))
     {
+        if (cbNameAlign > ElfNoteHdr.Hdr.n_namesz)
+            rc = RTFileWrite(hFile, s_achPad, cbNameAlign - ElfNoteHdr.Hdr.n_namesz, NULL);
+
         rc = RTFileWrite(hFile, pcv, cb, NULL /* full write */);
         if (RT_SUCCESS(rc))
@@ -236 +256 @@
  *
  * @return VBox status code.
- * @remarks The VM must be suspended before calling this function.
  */
 static DECLCALLBACK(VBOXSTRICTRC) dbgfR3CoreWrite(PVM pVM, PVMCPU pVCpu, void *pvData)
@@ -259 +278 @@
      * Compute size of the note section.
      */
-    uint64_t cbNoteSection = pVM->cCpus * sizeof(CPUMCTX);
+    uint64_t cbNoteSection = Elf64NoteSectionSize(pVM->cCpus * sizeof(CPUMCTX));
     uint64_t off = 0;
 
@@ -336 +355 @@
                 if (RT_SUCCESS(rc))
                 {
-                    for (uint32_t iCpu = 0; iCpu < pVM->cCpus; iCpu++)
+                    for (uint32_t i = 0; i < pVM->cCpus; i++)
                     {
-                        /** @todo -XXX- cpus */
+                        PCPUMCTX pCpuCtx = &pVM->aCpus[i].cpum.s.Guest;
+                        rc = Elf64WriteNoteHdr(hFile, NT_VBOXCPU, "VBOXCPU", pCpuCtx, sizeof(CPUMCTX), NULL /* pcbNoteHdr */);
+                        if (RT_FAILURE(rc))
+                        {
+                            LogRel((DBGFLOG_NAME ":Elf64WriteNoteHdr failed for vCPU[%u] rc=%Rrc\n", i, rc));
+                            break;
+                        }
                     }
                 }