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

Move x86 common cpu_counter functions into <x86/cpu_counter.h>.

Browse Source
This commit is contained in:
tsutsui 2007-07-07 17:38:26 +00:00
parent 2c9f17f0fc
commit 69dbd2e45e
3 changed files with 74 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/arch/amd64/include/cpu_counter.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu_counter.h,v 1.3 2006/02/16 20:17:13 perry Exp $ */
/* $NetBSD: cpu_counter.h,v 1.4 2007/07/07 17:38:26 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -45,30 +45,13 @@
* Machine-specific support for CPU counter.
*/
#include <machine/cpu.h>
#include <machine/cpufunc.h>
#include <x86/cpu_counter.h>
#define cpu_hascounter() (1)
static __inline uint64_t
cpu_counter(void)
{
return (rdtsc());
}
static __inline uint32_t
cpu_counter32(void)
{
return (rdtsc() & 0xffffffffUL);
}
static __inline uint64_t
cpu_frequency(struct cpu_info *ci)
{
return (ci->ci_tsc_freq);
}
#endif /* _KERNEL */
#endif /* !_AMD64_CPU_COUNTER_H_ */

25
sys/arch/i386/include/cpu_counter.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu_counter.h,v 1.4 2006/02/16 20:17:13 perry Exp $ */
/* $NetBSD: cpu_counter.h,v 1.5 2007/07/07 17:38:27 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -51,6 +51,8 @@
#ifdef _KERNEL
#include <x86/cpu_counter.h>
static __inline int
cpu_hascounter(void)
{
@ -71,27 +73,6 @@ cpu_hascounter(void)
#endif
}
static __inline uint64_t
cpu_counter(void)
{
return (rdtsc());
}
static __inline uint32_t
cpu_counter32(void)
{
return (rdtsc() & 0xffffffffUL);
}
static __inline uint64_t
cpu_frequency(struct cpu_info *ci)
{
return (ci->ci_tsc_freq);
}
#endif /* _KERNEL */
#endif /* !_I386_CPU_COUNTER_H_ */

67
sys/arch/x86/include/cpu_counter.h Normal file
View File

@ -0,0 +1,67 @@
/* $NetBSD: cpu_counter.h,v 1.1 2007/07/07 17:38:27 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Bill Sommerfeld.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the NetBSD
* Foundation, Inc. and its contributors.
* 4. Neither the name of The NetBSD Foundation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _X86_CPU_COUNTER_H_
#define _X86_CPU_COUNTER_H_
/*
* x86 common functions for CPU counter.
*/
static __inline uint64_t
cpu_counter(void)
{
return rdtsc();
}
static __inline uint32_t
cpu_counter32(void)
{
return rdtsc() & 0xffffffffUL;
}
static __inline uint64_t
cpu_frequency(struct cpu_info *ci)
{
return ci->ci_tsc_freq;
}
#endif /* !_X86_CPU_COUNTER_H_ */