sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up Mac OS X support of inteltool

Browse Source 
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Peter Stuge <peter@stuge.se>

Some minor modifications to allow 64bit/32bit compilation on Darwin



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4621 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer
2009-09-01 09:52:14 +00:00
committed by Stefan Reinauer
parent b2aedb1a3f
commit f7f2f258d8
4 changed files with 32 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
util/inteltool/cpu.c
View File

@ -30,30 +30,23 @@ int fd_msr;
unsigned int cpuid(unsigned int op)
{
unsigned int ret;
unsigned int dummy2, dummy3, dummy4;
#if DARWIN
asm volatile (
"pushl %%ebx \n"
"cpuid \n"
"movl %%ebx, %1 \n"
"popl %%ebx \n"
: "=a" (ret), "=r" (dummy2), "=c" (dummy3), "=d" (dummy4)
: "a" (op)
: "cc"
);
uint32_t ret;
#if defined(__DARWIN__) && !defined(__LP64__)
asm volatile (
"pushl %%ebx \n"
"cpuid \n"
"popl %%ebx \n"
: "=a" (ret) : "a" (op) : "%ecx", "%edx"
);
#else
asm volatile (
"cpuid"
: "=a" (ret), "=b" (dummy2), "=c" (dummy3), "=d" (dummy4)
: "a" (op)
: "cc"
);
asm ("cpuid" : "=a" (ret) : "a" (op) : "%ebx", "%ecx", "%edx");
#endif
return ret;
}
#ifndef DARWIN
#ifndef __DARWIN__
int msr_readerror = 0;
msr_t rdmsr(int addr)
@ -288,7 +281,7 @@ int print_intel_core_msrs(void)
return -1;
}
#ifndef DARWIN
#ifndef __DARWIN__
fd_msr = open("/dev/cpu/0/msr", O_RDWR);
if (fd_msr < 0) {
perror("Error while opening /dev/cpu/0/msr");
@ -309,7 +302,7 @@ int print_intel_core_msrs(void)
close(fd_msr);
for (core = 0; core < 8; core++) {
#ifndef DARWIN
#ifndef __DARWIN__
char msrfilename[64];
memset(msrfilename, 0, 64);
sprintf(msrfilename, "/dev/cpu/%d/msr", core);
@ -330,12 +323,12 @@ int print_intel_core_msrs(void)
cpu->per_core_msrs[i].number, msr.hi, msr.lo,
cpu->per_core_msrs[i].name);
}
#ifndef DARWIN
#ifndef __DARWIN__
close(fd_msr);
#endif
}
#ifndef DARWIN
#ifndef __DARWIN__
if (msr_readerror)
printf("\n(*) Some MSRs could not be read. The marked values are unreliable.\n");
#endif