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

Timestamp:

Mar 23, 2012 10:07:47 AM (13 years ago)

Author:

vboxsync

Message:

VBoxTpG: some fixes and more on the subject of locating the VTGPrLc section.

File:

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

trunk/src/bldprogs/VBoxTpG.cpp

@@ -169 +169 @@
 #elif defined(RT_OS_WINDOWS)
 static const char          *g_pszAssembler              = "yasm.exe";
-static const char          *g_pszAssemblerFmtOpt        = "--oformat";
+static const char          *g_pszAssemblerFmtOpt        = "-f";
 static const char           g_szAssemblerFmtVal32[]     = "win32";
 static const char           g_szAssemblerFmtVal64[]     = "win64";
 #else
 static const char          *g_pszAssembler              = "yasm";
-static const char          *g_pszAssemblerFmtOpt        = "--oformat";
+static const char          *g_pszAssemblerFmtOpt        = "-f";
 static const char           g_szAssemblerFmtVal32[]     = "elf32";
 static const char           g_szAssemblerFmtVal64[]     = "elf64";
@@ -458 +458 @@
                     "\n"
                     ";"
-                    "; Put all the data in a dedicated section / segment."
+                    "; We put all the data in a dedicated section / segment.\n"
+                    ";\n"
+                    "; In order to find the probe location specifiers, we do the necessary\n"
+                    "; trickery here, ASSUMING that this object comes in first in the link\n"
+                    "; editing process.\n"
                     ";\n"
                     "%%ifdef ASM_FORMAT_OMF\n"
@@ -467 +471 @@
                     "%%elifdef ASM_FORMAT_PE\n"
                     " [section VTGObj align=4096]\n"
+                    "\n"
                     "%%elifdef ASM_FORMAT_ELF\n"
+                    " [section .VTGPrLc.Start progbits alloc noexec write align=1]\n"
+                    "    dd              42\n"    
+                    "    dd              42\n"    
+                    "    RTCCPTR_DEF     42\n"    
+                    "    RTCCPTR_DEF     42\n"    
+                    "    RTCCPTR_DEF     42\n"    
+                    "GLOBALNAME g_aVTGPrLc\n"
+                    " [section .VTGPrLc progbits alloc noexec write align=1]\n"
+                    " [section .VTGPrLc.End progbits alloc noexec write align=1]\n"
+                    "GLOBALNAME g_aVTGPrLc_End\n"
+                    "    dd              0xdeadbeef\n"    
+                    "    dd              0xdeadbeef\n"    
+                    "    RTCCPTR_DEF     0xdeadbeef\n"    
+                    "    RTCCPTR_DEF     0xdeadbeef\n"    
+                    "    RTCCPTR_DEF     0xdeadbeef\n"    
                     " [section .VTGObj progbits alloc noexec write align=4096]\n"
                     "%%else\n"
@@ -485 +505 @@
                     "    RTCCPTR_DEF g_aVTGArgLists\n"
                     "    RTCCPTR_DEF g_aVTGArgLists_End      - g_aVTGArgLists\n"
+                    "    RTCCPTR_DEF g_aVTGPrLc\n"
+                    "    RTCCPTR_DEF g_aVTGPrLc_End ; cross section/segment size not possible\n"
                     "    RTCCPTR_DEF 0\n"
                     "    RTCCPTR_DEF 0\n"
@@ -848 +870 @@
                     "#  define DECL_DATA_SECT(scope, type, name, sect) scope type __attribute__((section(#sect \",\" #sect))) name\n"
                     "# else\n"
-                    "#  define DECL_DATA_SECT(scope, type, name, sect) scope type __attribute__((section(#sect))) name\n"
+                    "#  define DECL_DATA_SECT(scope, type, name, sect) scope type __attribute__((section(\".\" #sect))) name\n"
                     "# endif\n"
                     "#else\n"
@@ -928 +950 @@
             {
                 ScmStreamPrintf(pStrm,
-                                "        AssertCompile(sizeof(%s) <= sizeof(uintptr_t));\n"
-                                "        AssertCompile(sizeof(%s) <= sizeof(uintptr_t));\n",
+                                "        AssertCompile(sizeof(%s) <= sizeof(uintptr_t)); \\\n"
+                                "        AssertCompile(sizeof(%s) <= sizeof(uintptr_t)); \\\n",
                                 pArg->pszName,
                                 pArg->pszType);