From 502bf5ce55532cdb9d679227b79e7dafcb3e1e52 Mon Sep 17 00:00:00 2001 From: Garrett Wollman Date: Sat, 13 Aug 1994 17:45:09 +0000 Subject: [PATCH] Fix conditional-compilation mixup, pointed out by Paul Richards. --- sys/i386/i386/microtime.s | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/i386/i386/microtime.s b/sys/i386/i386/microtime.s index 60083b28276..07bbba62321 100644 --- a/sys/i386/i386/microtime.s +++ b/sys/i386/i386/microtime.s @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: Steve McCanne's microtime code - * $Id: microtime.s,v 1.4 1994/05/02 09:44:20 sos Exp $ + * $Id: microtime.s,v 1.5 1994/08/11 00:28:17 wollman Exp $ */ #include "machine/asmacros.h" @@ -65,7 +65,6 @@ ENTRY(microtime) sti jmp 4f #endif /* Pentium code */ -#if defined(I386_CPU) || defined(I486_CPU) 0: movl (%ebx), %edi # sec = time.tv_sec movl 4(%ebx), %esi # usec = time.tv_usec @@ -137,7 +136,6 @@ ENTRY(microtime) movl $0, %edx # zero extend eax into edx for div movl $1193, %ecx idivl %ecx # convert to usecs: mult by 1000/1193 -#endif /* maybe i386 or i486 */ 4: addl %eax, %esi # add counter usecs to time.tv_usec cmpl $1000000, %esi # carry in timeval?