Changeset 40892 in vbox for trunk/src/bldprogs/VBoxTpG.cpp

Timestamp:

Apr 12, 2012 12:12:40 PM (13 years ago)

Author:

vboxsync

Message:

64-bit probe arguments (on mac)

File:

• trunk/src/bldprogs/VBoxTpG.cpp (modified) (6 diffs)

trunk/src/bldprogs/VBoxTpG.cpp

@@ -516 +516 @@
                     "                ;0         1         2         3\n"
                     "                ;012345678901234567890123456789012\n"
-                    "    db          'VTG Object Header v1.3', 0, 0\n"
+                    "    db          'VTG Object Header v1.4', 0, 0\n"
                     "    dd          %u\n"
                     "    dd          0\n"
@@ -607 +607 @@
             ScmStreamPrintf(pStrm,
                             "    ; off=%u\n"
-                            "    db   %2u     ; Argument count\n"
-                            "    db   %u      ; fHaveLargeArgs\n"
-                            "    db  0, 0    ; Reserved\n"
+                            "    db        %2u  ; Argument count\n"
+                            "    db         %u  ; fHaveLargeArgs\n"
+                            "    db      0, 0  ; Reserved\n"
                             , off, pProbe->cArgs, (int)pProbe->fHaveLargeArgs);
             off += 4;
@@ -615 +615 @@
             {
                 ScmStreamPrintf(pStrm,
-                                "    dd %6u   ; type '%s' (name '%s')\n"
+                                "    dd  %8u  ; type '%s' (name '%s')\n"
                                 "    dd 0%08xh ; type flags\n",
                                 strtabGetOff(pArg->pszType), pArg->pszType, pArg->pszName,
@@ -679 +679 @@
                             "    dw NAME(g_fVTGProbeEnabled_%s_%s) - NAME(g_afVTGProbeEnabled)\n"
                             "    dw %6u  ; provider index\n"
-                            "    dd 0       ; for the application\n"
+                            "    dd NAME(g_VTGObjHeader) - NAME(g_VTGProbeData_%s_%s) ; offset to the object header\n"
+                            "    dd      0  ; for the application\n"
+                            "    dd      0  ; for the application\n"
                             ,
                             pProvider->pszName, pProbe->pszMangledName, iProbe,
@@ -685 +687 @@
                             pProbe->offArgList,
                             pProvider->pszName, pProbe->pszMangledName,
-                            iProvider);
+                            iProvider,
+                            pProvider->pszName, pProbe->pszMangledName
+                            );
             pProbe->iProbe = iProbe;
             iProbe++;
@@ -974 +978 @@
             RTListForEach(&pProbe->ArgHead, pArg, VTGARG, ListEntry)
             {
-                if (iArg < 5)
-                {
-                    if (pArg->fType & VTG_TYPE_FIXED_SIZED)
-                        ScmStreamPrintf(pStrm,
-                                        "        /*AssertCompile(sizeof(%s) <= sizeof(uint32_t));*/ \\\n"
-                                        "        /*AssertCompile(sizeof(%s) <= sizeof(uint32_t));*/ \\\n",
-                                        pArg->pszName,
-                                        pArg->pszType);
-                    else
-                        ScmStreamPrintf(pStrm,
-                                        "        AssertCompile(sizeof(%s) <= sizeof(uintptr_t)); \\\n"
-                                        "        AssertCompile(sizeof(%s) <= sizeof(uintptr_t)); \\\n",
-                                        pArg->pszName,
-                                        pArg->pszType);
-                }
+                if (pArg->fType & VTG_TYPE_FIXED_SIZED)
+                    ScmStreamPrintf(pStrm,
+                                    "        AssertCompile(sizeof(%s) == %u); \\\n"
+                                    "        AssertCompile(sizeof(%s) <= %u); \\\n",
+                                    pArg->pszType, pArg->fType & VTG_TYPE_SIZE_MASK,
+                                    pArg->pszName, pArg->fType & VTG_TYPE_SIZE_MASK);
+                else if (pArg->fType & (VTG_TYPE_POINTER | VTG_TYPE_HC_ARCH_SIZED))
+                    ScmStreamPrintf(pStrm,
+                                    "        AssertCompile(sizeof(%s) <= sizeof(uintptr_t)); \\\n"
+                                    "        AssertCompile(sizeof(%s) <= sizeof(uintptr_t)); \\\n",
+                                    pArg->pszName,
+                                    pArg->pszType);
                 iArg++;
             }