Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rdtsc and rdpmc inlines, and fixup rnd.h to do the right thing.

This commit is contained in:
fvdl 2002-06-04 17:52:46 +00:00
parent 9c71037485
commit e4eac0d964
2 changed files with 14 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/arch/x86_64/include/cpufunc.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpufunc.h,v 1.2 2002/05/28 23:06:28 fvdl Exp $ */
/* $NetBSD: cpufunc.h,v 1.3 2002/06/04 17:52:46 fvdl Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -201,19 +201,19 @@ wbinvd(void)
static __inline u_int64_t
rdtsc(void)
{
u_int64_t rv;
uint32_t hi, lo;
__asm __volatile("rdtsc" : "=A" (rv));
return (rv);
__asm __volatile("rdtsc" : "=d" (hi), "=a" (lo));
return (((uint64_t)hi << 32) | (uint64_t) lo);
}
static __inline u_int64_t
rdpmc(u_int pmc)
{
u_int64_t rv;
uint32_t hi, lo;
__asm __volatile("rdpmc" : "=A" (rv) : "c" (pmc));
return (rv);
__asm __volatile("rdpmc" : "=d" (hi), "=a" (lo) : "c" (pmc));
return (((uint64_t)hi << 32) | (uint64_t) lo);
}
/* Break into DDB/KGDB. */

32
sys/arch/x86_64/include/rnd.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: rnd.h,v 1.1 2001/06/19 00:20:12 fvdl Exp $ */
/* $NetBSD: rnd.h,v 1.2 2002/06/04 17:52:46 fvdl Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -36,36 +36,18 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _I386_RND_H_
#define _I386_RND_H_
#ifndef _X86_64_RND_H_
#define _X86_64_RND_H_
#ifdef _KERNEL
/*
* Machine-specific support for rnd(4)
*/
#include <machine/cpufunc.h>
#include <machine/specialreg.h>
#include "opt_cputype.h"
#ifdef _KERNEL
static __inline int
cpu_hascounter(void)
{
#if I586_CPU || I686_CPU
/*
* Note that:
* 1) Intel documentation is very specific that code *must* test
* the CPU feature flag, even if you "know" that a particular
* rev of the hardware supports it.
* 2) We know that the TSC is busted on some Cyrix CPU's..
*/
return (cpu_feature & CPUID_TSC) != 0;
#else
return 0;
#endif
}
#define cpu_hascounter() (1)
static __inline u_int64_t
cpu_counter(void)
@ -75,4 +57,4 @@ cpu_counter(void)
#endif /* _KERNEL */
#endif /* !_I386_RND_H_ */
#endif /* !_X86_64_RND_H_ */