diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-26 16:53:59 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-26 16:53:59 (GMT) |
| commit | 38de96ca81b0ff5e34b5d653195a2412a66410dc (patch) | |
| tree | 99732543bf9cf5ac064afd46ad757c1104e72435 | |
| parent | c2c02010919d5fc1728515198b3a49624fb48cf2 (diff) | |
| parent | 16fde830643c564edad1860bb44ba4a943fe2873 (diff) | |
| download | tcl-38de96ca81b0ff5e34b5d653195a2412a66410dc.zip tcl-38de96ca81b0ff5e34b5d653195a2412a66410dc.tar.gz tcl-38de96ca81b0ff5e34b5d653195a2412a66410dc.tar.bz2 | |
[Bug 3601804]: platformCPUID segmentation fault on Darwin
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | unix/tclUnixCompat.c | 8 |
2 files changed, 13 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2013-01-26 Jan Nijtmans <nijtmans@users.sf.net> + + * unix/tclUnixCompat.c: [Bug 3601804]: platformCPUID segmentation + fault on Darwin. + 2013-01-23 Donal K. Fellows <dkf@users.sf.net> * library/http/http.tcl (http::geturl): [Bug 2911139]: Do not do vwait diff --git a/unix/tclUnixCompat.c b/unix/tclUnixCompat.c index 905bc10..0fc51b7 100644 --- a/unix/tclUnixCompat.c +++ b/unix/tclUnixCompat.c @@ -987,11 +987,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; |