Changeset 40826 in vbox

Timestamp:

Apr 8, 2012 6:41:46 PM (12 years ago)

Author:

vboxsync

Message:

VBoxTpG.cpp: Microsoft Visual C++ support.

Location:

trunk

Files:

• include/VBox/VBoxTpG.h (modified) (2 diffs)
• include/iprt/asmdefs.mac (modified) (1 diff)
• include/iprt/path.h (modified) (2 diffs)
• src/bldprogs/VBoxTpG.cpp (modified) (11 diffs)

trunk/include/VBox/VBoxTpG.h

@@ -37 +37 @@
     const char *pszFile;
     uint8_t    *pbProbe;
+#if ARCH_BITS == 32 /* Make the structure a multiple of 8. */
+    uint32_t    u32Padding;
+#endif
 } VTGPROBELOC;
 /** Pointer to a probe location. */
@@ -51 +54 @@
  * indicated by VTG_LOC_SECT.  */
 #if defined(RT_OS_WINDOWS)
-# define VTG_OBJ_SECT       ".VTGObj"
-# define VTG_LOC_SECT       ".VTGPrLc"
+# define VTG_OBJ_SECT       "VTGObj"
+# define VTG_LOC_SECT       "VTGPrLc.Data"
 # ifdef _MSC_VER
 #  define VTG_DECL_VTGPROBELOC(a_VarName) \

trunk/include/iprt/asmdefs.mac

@@ -122 +122 @@
 %ifdef ASM_FORMAT_PE
  %ifdef RT_ARCH_AMD64
-  %define IMP(name)       qword [IMPNAME(name) wrt rip]
- %else
-  %define IMP(name)       dword [IMPNAME(name)]
- %endif
-%else
- %define IMP(name)       IMPNAME(name)
+  %define IMP(name)     qword [IMPNAME(name) wrt rip]
+ %else
+  %define IMP(name)     dword [IMPNAME(name)]
+ %endif
+%else
+ %define IMP(name)      IMPNAME(name)
+%endif
+
+;;
+; Gets the pointer to an imported object, version 2.
+%ifdef ASM_FORMAT_PE
+ %ifdef RT_ARCH_AMD64
+  %define IMP2(name)    qword [IMPNAME(name) wrt rip]
+ %else
+  %define IMP2(name)    dword [IMPNAME(name)]
+ %endif
+%else
+ %ifdef RT_ARCH_AMD64
+  %define IMP2(name)    IMPNAME(name) wrt rip
+ %else
+  %define IMP2(name)    IMPNAME(name)
+ %endif
 %endif
 

trunk/include/iprt/path.h

@@ -558 +558 @@
  * Callback for RTPathTraverseList that's called for each element.
  *
- * @returns IPRT style status code. Return VINF_TRY_AGAIN to continue, any other
+ * @returns IPRT style status code. Return VERR_TRY_AGAIN to continue, any other
  *          value will abort the traversing and be returned to the caller.
  *
@@ -576 +576 @@
  *
  * @returns IPRT style status code from the callback or VERR_END_OF_STRING if
- *          the callback returned VINF_TRY_AGAIN for all paths in the string.
+ *          the callback returned VERR_TRY_AGAIN for all paths in the string.
  *
  * @param   pszPathList     The string to traverse.

trunk/src/bldprogs/VBoxTpG.cpp

@@ -272 +272 @@
     int rc = RTProcCreate(apszArgs[0], apszArgs, RTENV_DEFAULT, RTPROC_FLAGS_SEARCH_PATH, &hProc);
     if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to start '%s' (assmebler): %Rrc", apszArgs[0], rc);
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to start '%s' (assembler): %Rrc", apszArgs[0], rc);
 
     RTPROCSTATUS Status;
@@ -394 +394 @@
 
     pVtgStr->offStrTab = g_offStrTab;
-    g_offStrTab += pVtgStr->Core.cchString + 1;
+    g_offStrTab += (uint32_t)pVtgStr->Core.cchString + 1;
 
     ScmStreamPrintf(pStrm,
@@ -460 +460 @@
                     "  NAME(%%1):\n"
                     " %%endmacro\n"
-                    " [section VTGObj align=4096]\n"
+                    " [section VTGPrLc.Begin data align=64]\n"
+                    /*"   times 24 db 0xcc\n"*/
+                    "VTG_GLOBAL g_aVTGPrLc, data\n"
+                    " [section VTGPrLc.Data  data align=4]\n"
+                    " [section VTGPrLc.End   data align=4]\n"
+                    "VTG_GLOBAL g_aVTGPrLc_End, data\n"
+                    /*"   times 24 db 0xcc\n"*/
+                    " [section VTGObj   data align=32]\n"
                     "\n"
                     "%%elifdef ASM_FORMAT_ELF\n"
@@ -751 +758 @@
                 ScmStreamPrintf(pStrm, g_fProbeFnImported ?
                                 "        mov     edx, [eax + 4]     ; idProbe\n"
-                                "        mov     ecx, IMP(%s)\n"
+                                "        mov     ecx, IMP2(%s)\n"
                                 "        mov     [esp + 4], edx     ; Replace pVTGProbeLoc with idProbe.\n"
                                 "        jmp     ecx\n"
@@ -761 +768 @@
             else if (fWin64)
                 ScmStreamPrintf(pStrm, g_fProbeFnImported ?
-                                "        mov     rax, IMP(%s) wrt RIP\n"
+                                "        mov     rax, IMP2(%s)\n"
                                 "        mov     ecx, [rcx + 4]     ; idProbe replaces pVTGProbeLoc.\n"
                                 "        jmp     rax\n"
@@ -770 +777 @@
             else
                 ScmStreamPrintf(pStrm, g_fProbeFnImported ?
-                                "        lea     rax, [IMP(%s) wrt RIP]\n" //??? macho64?
+                                "        lea     rax, [IMP2(%s)]\n" //??? macho64?
                                 "        mov     edi, [rdi + 4]     ; idProbe replaces pVTGProbeLoc.\n"
                                 "        jmp     rax\n"
@@ -870 +877 @@
                     "\n"
                     "#ifdef VBOX_WITH_DTRACE\n"
+                    "\n"
+                    "# ifdef _MSC_VER\n"
+                    "#  pragma data_seg(VTG_LOC_SECT)\n"
+                    "#  pragma data_seg()\n"
+                    "# endif\n"
                     "\n"
                     ,
@@ -1052 +1064 @@
 
     /* Is it a leading C character. */
-    if (!RT_C_IS_ALPHA(*psz) && !*psz == '_')
+    if (!RT_C_IS_ALPHA(*psz) && *psz == '_')
         return NULL;
 
@@ -1091 +1103 @@
 
     /* Is it a leading C character. */
-    if (!RT_C_IS_ALPHA(*psz) && !*psz == '_')
+    if (!RT_C_IS_ALPHA(*psz) && *psz == '_')
         return NULL;
 
@@ -1120 +1132 @@
 {
     if (cb)
-        ScmStreamSeekRelative(pStrm, -cb);
+        ScmStreamSeekRelative(pStrm, -(ssize_t)cb);
     size_t const off     = ScmStreamTell(pStrm);
     size_t const iLine   = ScmStreamTellLine(pStrm);
@@ -1791 +1803 @@
                 ch = parseGetNextNonSpaceNonCommentChOnPpLine(&Strm);
                 if (ch == ~(unsigned)0)
-                    rcExit != RTEXITCODE_FAILURE;
+                    rcExit = RTEXITCODE_FAILURE;
                 else if (ch == 'p' && ScmStreamCMatchingWordM1(&Strm, RT_STR_TUPLE("pragma")))
                     rcExit = parsePragma(&Strm);