d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reorder to a more conventional if/then/else/endif structure.

Browse Source
This commit is contained in:
Poul-Henning Kamp 1997-12-26 20:15:03 +00:00
parent 02e6c12b3c
commit 0b0e40da7a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=32003
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/i386/i386/microtime.s
View File

@ -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.34 1997/10/28 15:58:09 bde Exp $ * $Id: microtime.s,v 1.35 1997/12/15 02:18:19 tegge Exp $
*/ */
#include <machine/asmacros.h> #include <machine/asmacros.h>
@ -50,11 +50,20 @@ ENTRY(microtime)
#if (defined(I586_CPU) || defined(I686_CPU)) && !defined(SMP) #if (defined(I586_CPU) || defined(I686_CPU)) && !defined(SMP)
movl _i586_ctr_freq, %ecx movl _i586_ctr_freq, %ecx
testl %ecx, %ecx testl %ecx, %ecx
jne pentium_microtime je i8254_microtime
pushfl
cli
.byte 0x0f, 0x31 /* RDTSC */
subl _i586_ctr_bias, %eax
mull _i586_ctr_multiplier
movl %edx, %eax
jmp common_microtime
#else #else
xorl %ecx, %ecx /* clear ecx */ xorl %ecx, %ecx /* clear ecx */
#endif #endif
ALIGN_TEXT
i8254_microtime:
movb $TIMER_SEL0|TIMER_LATCH, %al /* prepare to latch */ movb $TIMER_SEL0|TIMER_LATCH, %al /* prepare to latch */
pushfl pushfl
@ -221,15 +230,3 @@ common_microtime:
movl %eax, 4(%ecx) /* tvp->tv_usec = usec */ movl %eax, 4(%ecx) /* tvp->tv_usec = usec */
ret ret
#if (defined(I586_CPU) || defined(I686_CPU)) && !defined(SMP)
ALIGN_TEXT
pentium_microtime:
pushfl
cli
.byte 0x0f, 0x31 /* RDTSC */
subl _i586_ctr_bias, %eax
mull _i586_ctr_multiplier
movl %edx, %eax
jmp common_microtime
#endif