summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-26 16:50:22 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-26 16:50:22 (GMT)
commit16fde830643c564edad1860bb44ba4a943fe2873 (patch)
treecb43554bb60f7d2d6609a482a0838fcd1a437ba9 /unix
parent2ad8238512c29b86039ba28d5e489ffd77069793 (diff)
downloadtcl-16fde830643c564edad1860bb44ba4a943fe2873.zip
tcl-16fde830643c564edad1860bb44ba4a943fe2873.tar.gz
tcl-16fde830643c564edad1860bb44ba4a943fe2873.tar.bz2
[Bug 3601804]: platformCPUID segmentation fault on Darwin
Diffstat (limited to 'unix')
-rw-r--r--unix/tclUnixCompat.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/unix/tclUnixCompat.c b/unix/tclUnixCompat.c
index 5a3ccd4..4ca7da9 100644
--- a/unix/tclUnixCompat.c
+++ b/unix/tclUnixCompat.c
@@ -693,11 +693,19 @@ TclWinCPUID(
/* See: <http://en.wikipedia.org/wiki/CPUID> */
#if defined(HAVE_CPUID)
+#if defined(__x86_64__) || defined(_M_AMD64) || defined (_M_X64)
+ __asm__ __volatile__("movq %%rbx, %%rsi \n\t" /* save %rbx */
+ "cpuid \n\t"
+ "xchgq %%rsi, %%rbx \n\t" /* restore the old %rbx */
+ : "=a"(regsPtr[0]), "=S"(regsPtr[1]), "=c"(regsPtr[2]), "=d"(regsPtr[3])
+ : "a"(index));
+#else
__asm__ __volatile__("mov %%ebx, %%esi \n\t" /* save %ebx */
"cpuid \n\t"
"xchg %%esi, %%ebx \n\t" /* restore the old %ebx */
: "=a"(regsPtr[0]), "=S"(regsPtr[1]), "=c"(regsPtr[2]), "=d"(regsPtr[3])
: "a"(index));
+#endif
status = TCL_OK;
#endif
return status;