Use GCC intrinsics if available

Ravenslofty · Ravenslofty · commit 4c051fbbf152 · 2013-03-03T19:09:54.000Z
diff --git a/Firenzina/utility.c b/Firenzina/utility.c
@@ -439,25 +439,33 @@ void GetSysInfo()
 
 void SetPOPCNT()
 	{
+#ifndef WINDOWS
+	POPCNT= &__builtin_popcountll;
+
+	Send("Using GCC builtin POPCNT\n");
+
+#else
   	int CPUInfo[4] = {-1};
   	__cpuid(CPUInfo, 0x00000001);
   	HasPopcnt = (CPUInfo[2] >> 23) & 1;
   	if(HasPopcnt)
   		{
     	POPCNT = &PopcntHard;
-    	Send("Hardware POPCNT supported\n\n");
+
+    	Send("Hardware POPCNT supported\n");
 
 #ifdef Log
 		if (WriteLog)
 			{
 			log_file = fopen(log_filename, "a");
-			fprintf(log_file, "Hardware POPCNT supported\n\n");
+			fprintf(log_file, "Hardware POPCNT supported\n");
 			close_log();
 			}
 #endif
   		}
   	else
 		POPCNT = &PopcntEmul;
+#endif
 	}
 
 #ifdef Log

Original file line number	Diff line number	Diff line change
`@@ -439,25 +439,33 @@ void GetSysInfo()`
`439`	`439`
`440`	`440`	`void SetPOPCNT()`
`441`	`441`	`{`
	`442`	`+#ifndef WINDOWS`
	`443`	`+ POPCNT= &__builtin_popcountll;`
	`444`	`+`
	`445`	`+ Send("Using GCC builtin POPCNT\n");`
	`446`	`+`
	`447`	`+#else`
`442`	`448`	`int CPUInfo[4] = {-1};`
`443`	`449`	`__cpuid(CPUInfo, 0x00000001);`
`444`	`450`	`HasPopcnt = (CPUInfo[2] >> 23) & 1;`
`445`	`451`	`if(HasPopcnt)`
`446`	`452`	`{`
`447`	`453`	`POPCNT = &PopcntHard;`
`448`		`- Send("Hardware POPCNT supported\n\n");`
	`454`	`+`
	`455`	`+ Send("Hardware POPCNT supported\n");`
`449`	`456`
`450`	`457`	`#ifdef Log`
`451`	`458`	`if (WriteLog)`
`452`	`459`	`{`
`453`	`460`	`log_file = fopen(log_filename, "a");`
`454`		`- fprintf(log_file, "Hardware POPCNT supported\n\n");`
	`461`	`+ fprintf(log_file, "Hardware POPCNT supported\n");`
`455`	`462`	`close_log();`
`456`	`463`	`}`
`457`	`464`	`#endif`
`458`	`465`	`}`
`459`	`466`	`else`
`460`	`467`	`POPCNT = &PopcntEmul;`
	`468`	`+#endif`
`461`	`469`	`}`
`462`	`470`
`463`	`471`	`#ifdef Log`