Changeset bd2933a8 in mainline

Timestamp:

2005-10-15T13:47:51Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0bed5d0

Parents:

b07a838

Message:

IA32 has_cpuid() inline
minor indentation fixes

Files:

• arch/ia32/Makefile.inc (modified) (1 diff)
• arch/ia32/include/cpuid.h (modified) (1 diff)
• arch/ia32/src/cpuid.s (deleted)
• contrib/conf/dot.bochsrc (modified) (1 diff)

arch/ia32/Makefile.inc

@@ -41 +41 @@
         src/arch/context.s \
         src/arch/debug/panic.s \
-        src/arch/cpuid.s \
         src/arch/delay.s \
         src/arch/asm.S \

arch/ia32/include/cpuid.h

@@ -39 +39 @@
 } __attribute__ ((packed));
 
-extern int has_cpuid(void);
+static inline __u32 has_cpuid(void)
+{
+        __u32 val, ret;
+        
+        __asm__ volatile (
+                "pushf\n"               /* read flags */
+                "popl %0\n"
+                "movl %0, %1\n"
+                
+                "btcl $21, %1\n"        /* swap the ID bit */
+                
+                "pushl %1\n"            /* propagate the change into flags */
+                "popf\n"
+                "pushf\n"
+                "popl %1\n"
+                
+                "andl $(1 << 21), %0\n" /* interrested only in ID bit */
+                "andl $(1 << 21), %1\n"
+                "xorl %1, %0\n"
+                : "=r" (ret), "=r" (val)
+        );
+        
+        return ret;
+}
 
 static inline void cpuid(__u32 cmd, struct cpu_info *info)
 {
-        __asm__ volatile (
-                "movl %4, %%eax\n"
-                "cpuid\n"
-                "movl %%eax,%0\n"
-                "movl %%ebx,%1\n"
-                "movl %%ecx,%2\n"
-                "movl %%edx,%3\n"
-                : "=m" (info->cpuid_eax), "=m" (info->cpuid_ebx), "=m" (info->cpuid_ecx), "=m" (info->cpuid_edx)
-                : "m" (cmd)
-                : "eax", "ebx", "ecx", "edx"
-        );
+        __asm__ volatile (
+                "movl %4, %%eax\n"
+                "cpuid\n"
+                
+                "movl %%eax, %0\n"
+                "movl %%ebx, %1\n"
+                "movl %%ecx, %2\n"
+                "movl %%edx, %3\n"
+                : "=m" (info->cpuid_eax), "=m" (info->cpuid_ebx), "=m" (info->cpuid_ecx), "=m" (info->cpuid_edx)
+                : "m" (cmd)
+                : "eax", "ebx", "ecx", "edx"
+        );
 }
 

contrib/conf/dot.bochsrc

@@ -131 +131 @@
 # supported on Windows 95 and 98.
 #=======================================================================
-floppya: 1_44=SPARTAN/image.bin, status=inserted
+floppya: 1_44=image.bin, status=inserted
 #floppya: 1_44=/dev/fd0, status=inserted