Synchronize with sys/i386/i386/microtime.s revision 1.33.
This commit is contained in:
parent
421f9ee1ef
commit
28b2e8ef73
|
@ -32,7 +32,7 @@
|
||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* from: Steve McCanne's microtime code
|
* from: Steve McCanne's microtime code
|
||||||
* $Id: microtime.s,v 1.15 1997/09/01 10:42:43 kato Exp $
|
* $Id: microtime.s,v 1.16 1997/09/03 12:41:16 kato Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "opt_cpu.h"
|
#include "opt_cpu.h"
|
||||||
|
@ -48,7 +48,7 @@
|
||||||
#include <i386/isa/timerreg.h>
|
#include <i386/isa/timerreg.h>
|
||||||
|
|
||||||
#ifdef SMP
|
#ifdef SMP
|
||||||
#include <machine/smptests.h> /** USE_CLOCKLOCK */
|
#include <machine/smptests.h> /** USE_CLOCKLOCK, REAL_MCPL */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
ENTRY(microtime)
|
ENTRY(microtime)
|
||||||
|
@ -126,14 +126,14 @@ ENTRY(microtime)
|
||||||
movl _timer0_max_count, %edx /* prepare for 2 uses */
|
movl _timer0_max_count, %edx /* prepare for 2 uses */
|
||||||
|
|
||||||
#ifdef APIC_IO
|
#ifdef APIC_IO
|
||||||
#if defined(REAL_MCPL) /* XXX do we need this??? */
|
#ifdef REAL_MCPL /* XXX do we need this??? */
|
||||||
pushl %ecx /* s_lock destroys %eax, %ecx */
|
pushl %ecx /* s_lock destroys %eax, %ecx */
|
||||||
CPL_LOCK /* MP-safe, INTs disabled above */
|
CPL_LOCK /* MP-safe, INTs disabled above */
|
||||||
popl %ecx /* restore %ecx */
|
popl %ecx /* restore %ecx */
|
||||||
movl _ipending, %eax
|
movl _ipending, %eax
|
||||||
movl $0, _cpl_lock /* s_unlock would destroy %eax */
|
movl $0, _cpl_lock /* s_unlock would destroy %eax */
|
||||||
testl %eax, _mask8254 /* is soft timer interrupt pending? */
|
testl %eax, _mask8254 /* is soft timer interrupt pending? */
|
||||||
#else /* REAL_MCPL */
|
#else
|
||||||
/** XXX FIXME: take our chances with a race, is this OK? */
|
/** XXX FIXME: take our chances with a race, is this OK? */
|
||||||
movl _ipending, %eax
|
movl _ipending, %eax
|
||||||
testl %eax, _mask8254 /* is soft timer interrupt pending? */
|
testl %eax, _mask8254 /* is soft timer interrupt pending? */
|
||||||
|
|
Loading…
Reference in New Issue