vbox的更動 69091 路徑 trunk/src/bldprogs

時間撮記:

2017-10-14 上午02:41:12 (7 年 以前)

作者:

vboxsync

訊息:

gccplugin: va_arg workaround

位置:

trunk/src/bldprogs

檔案:

• VBoxCompilerPlugInsGcc.cpp (修改) (2 筆差異)
• test-gccplugin-2.c (修改) (1 筆差異)

trunk/src/bldprogs/VBoxCompilerPlugInsGcc.cpp

@@ -642 +642 @@
                 tree const hFn = gimple_call_fn(hStmt);
                 dprintf("     hFn    =%p %s(%d); args=%d\n",
-                        hFn, get_tree_code_name(TREE_CODE(hFn)), TREE_CODE(hFn), gimple_call_num_args(hStmt));
+                        hFn, hFn ? get_tree_code_name(TREE_CODE(hFn)) : NULL, hFn ? TREE_CODE(hFn) : - 1,
+                        gimple_call_num_args(hStmt));
 #ifdef DEBUG
-                if (DECL_P(hFn))
+                if (hFn && DECL_P(hFn))
                     dprintf("     hFn is decl: %s %s:%d\n",
                             DECL_NAME(hFn) ? IDENTIFIER_POINTER(DECL_NAME(hFn)) : "<unamed>",
@@ -657 +658 @@
                 tree const hFnType = gimple_call_fntype(hStmt);
                 if (hFnType == NULL_TREE)
-                    error_at(gimple_location(hStmt), "Failed to resolve function type [fn=%s]\n",
-                             get_tree_code_name(TREE_CODE(hFn)));
+                {
+                    if (   hFnDecl == NULL_TREE
+                        && gimple_call_internal_p(hStmt) /* va_arg() kludge */)
+                        continue;
+                    error_at(gimple_location(hStmt), "Failed to resolve function type [fn=%s fndecl=%s]\n",
+                             hFn ? get_tree_code_name(TREE_CODE(hFn)) : "<null>",
+                             hFnDecl ? get_tree_code_name(TREE_CODE(hFnDecl)) : "<null>");
+                }
                 else if (POINTER_TYPE_P(hFnType))
                     error_at(gimple_location(hStmt), "Got a POINTER_TYPE when expecting a function type [fn=%s]\n",

trunk/src/bldprogs/test-gccplugin-2.c

@@ -11 +11 @@
 extern PRTGCPHYS  g_pGCPhys;
 
-void foo(void)
+#include <stdarg.h>
+
+void foo(const char *pszFormat, ...)
 {
     MyIprtPrintf("%s %RX64 %RGp %p %RGp", "foobar", g_ull, g_GCPhys, g_pGCPhys, *g_pGCPhys);
     MyIprtPrintf("%RX32 %d %s\n", 10, 42, "string");
+    MyIprtPrintf("%u %.8Rhxs %d\n", 10, &g_ull, 42);
+    MyIprtPrintf("%u %.8RhxD %d\n", 10, &g_ull, 42);
+    {
+        va_list va;
+        int iValue;
+        va_start(va, pszFormat);
+        iValue = va_arg(va, int);
+        va_end(va);
+        MyIprtPrintf("%u\n", iValue);
+    }
 }