|
From: <sv...@va...> - 2009-05-18 06:23:29
|
Author: njn
Date: 2009-05-18 07:23:25 +0100 (Mon, 18 May 2009)
New Revision: 9898
Log:
Merge r9897 (x86_amd64_features.c simplifcation) from the DARWIN branch.
Modified:
trunk/tests/x86_amd64_features.c
Modified: trunk/tests/x86_amd64_features.c
===================================================================
--- trunk/tests/x86_amd64_features.c 2009-05-18 05:45:42 UTC (rev 9897)
+++ trunk/tests/x86_amd64_features.c 2009-05-18 06:23:25 UTC (rev 9898)
@@ -17,10 +17,8 @@
#define True 1
typedef int Bool;
-//---------------------------------------------------------------------------
-// {x86,amd64}-linux (part 1 of 2)
-//---------------------------------------------------------------------------
-#if defined(VGP_x86_linux) || defined(VGP_amd64_linux)
+
+#if defined(VGA_x86) || defined(VGA_amd64)
static void cpuid ( unsigned int n,
unsigned int* a, unsigned int* b,
unsigned int* c, unsigned int* d )
@@ -31,12 +29,6 @@
: "0" (n) /* input */
);
}
-#endif // VGP_x86_linux || VGP_amd64_linux
-
-//---------------------------------------------------------------------------
-// {x86,amd64}-linux (part 2 of 2)
-//---------------------------------------------------------------------------
-#if defined(VGA_x86) || defined(VGA_amd64)
static Bool go(char* cpu)
{
unsigned int level = 0, cmask = 0, dmask = 0, a, b, c, d;
|