Changeset 73097 in vbox for trunk/src/VBox/Debugger

Timestamp:

Jul 12, 2018 9:06:33 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

123672

Message:

*: Made RT_UOFFSETOF, RT_OFFSETOF, RT_UOFFSETOF_ADD and RT_OFFSETOF_ADD work like builtin_offsetof() and require compile time resolvable requests, adding RT_UOFFSETOF_DYN for the dynamic questions that can only be answered at runtime.

Location:

trunk/src/VBox/Debugger

Files:

• DBGCCmdWorkers.cpp (modified) (1 diff)
• DBGCEmulateCodeView.cpp (modified) (1 diff)
• DBGCInternal.h (modified) (1 diff)
• DBGCTcp.cpp (modified) (1 diff)
• DBGPlugInLinux.cpp (modified) (1 diff)
• DBGPlugInWinNt.cpp (modified) (1 diff)

trunk/src/VBox/Debugger/DBGCCmdWorkers.cpp

@@ -63 +63 @@
         pszCmd = RTStrStripL(pszCmd);
     size_t cchCmd = pszCmd ? strlen(pszCmd) : 0;
-    pBp = (PDBGCBP)RTMemAlloc(RT_OFFSETOF(DBGCBP, szCmd[cchCmd + 1]));
+    pBp = (PDBGCBP)RTMemAlloc(RT_UOFFSETOF_DYN(DBGCBP, szCmd[cchCmd + 1]));
     if (!pBp)
         return VERR_NO_MEMORY;

trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp

@@ -5321 +5321 @@
             {
                 RTMemFree(pEvtCfg);
-                *ppEvtCfg = pEvtCfg = (PDBGCEVTCFG)RTMemAlloc(RT_OFFSETOF(DBGCEVTCFG, szCmd[cchCmd + 1]));
+                *ppEvtCfg = pEvtCfg = (PDBGCEVTCFG)RTMemAlloc(RT_UOFFSETOF_DYN(DBGCEVTCFG, szCmd[cchCmd + 1]));
                 if (!pEvtCfg)
                     return VERR_NO_MEMORY;

trunk/src/VBox/Debugger/DBGCInternal.h

@@ -236 +236 @@
 
 /** Converts a Command Helper pointer to a pointer to DBGC instance data. */
-#define DBGC_CMDHLP2DBGC(pCmdHlp)   ( (PDBGC)((uintptr_t)(pCmdHlp) - RT_OFFSETOF(DBGC, CmdHlp)) )
+#define DBGC_CMDHLP2DBGC(pCmdHlp)   ( (PDBGC)((uintptr_t)(pCmdHlp) - RT_UOFFSETOF(DBGC, CmdHlp)) )
 
 

trunk/src/VBox/Debugger/DBGCTcp.cpp

@@ -51 +51 @@
 
 /** Converts a pointer to DBGCTCP::Back to a pointer to DBGCTCP. */
-#define DBGCTCP_BACK2DBGCTCP(pBack) ( (PDBGCTCP)((char *)pBack - RT_OFFSETOF(DBGCTCP, Back)) )
+#define DBGCTCP_BACK2DBGCTCP(pBack) ( (PDBGCTCP)((char *)(pBack) - RT_UOFFSETOF(DBGCTCP, Back)) )
 
 

trunk/src/VBox/Debugger/DBGPlugInLinux.cpp

@@ -2133 +2133 @@
         if (*pszCfgCur == '\"')
         {
-            pCfgItem = (PDBGDIGGERLINUXCFGITEM)RTMemAllocZ(RT_OFFSETOF(DBGDIGGERLINUXCFGITEM, u.aszString[pszCfgCur - pszCfg + 1]));
+            pCfgItem = (PDBGDIGGERLINUXCFGITEM)RTMemAllocZ(RT_UOFFSETOF_DYN(DBGDIGGERLINUXCFGITEM,
+                                                                            u.aszString[pszCfgCur - pszCfg + 1]));
             if (pCfgItem)
             {

trunk/src/VBox/Debugger/DBGPlugInWinNt.cpp

@@ -499 +499 @@
      */
     uint32_t const      cShs = WINNT_UNION(pThis, pHdrs, FileHeader.NumberOfSections);
-    PDBGDIGGERWINNTRDR  pRdr = (PDBGDIGGERWINNTRDR)RTMemAlloc(RT_OFFSETOF(DBGDIGGERWINNTRDR, aMappings[cShs + 2]));
+    PDBGDIGGERWINNTRDR  pRdr = (PDBGDIGGERWINNTRDR)RTMemAlloc(RT_UOFFSETOF_DYN(DBGDIGGERWINNTRDR, aMappings[cShs + 2]));
     if (!pRdr)
         return VERR_NO_MEMORY;