Changeset 39cea6a in mainline for arch/ia32/src/cpu/cpu.c

Timestamp:

2006-04-13T17:38:03Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e185136

Parents:

897ad60

Message:

Cleanup pm.c and pm.h code on ia32 and amd64.
Add before_task_runs() and before_task_runs_arch() for each architecture.
Add ia32 and amd64 code to ensure I/O Permission Bitmap update.

File:

• arch/ia32/src/cpu/cpu.c (modified) (1 diff)

arch/ia32/src/cpu/cpu.c

@@ -88 +88 @@
 }
 
-
-
-
 void cpu_arch_init(void)
 {
-        __u32 help=0;
+        cpuid_feature_info fi;
+        cpuid_extended_feature_info efi;
+        cpu_info_t info;
+        __u32 help = 0;
         
         CPU->arch.tss = tss_p;
-        CPU->fpu_owner=NULL;
+        CPU->arch.tss->iomap_base = &CPU->arch.tss->iomap[0] - ((__u8 *) CPU->arch.tss);
 
-        cpuid_feature_info fi;
-        cpuid_extended_feature_info efi;
+        CPU->fpu_owner = NULL;
 
-        cpu_info_t info;
         cpuid(1, &info);
 
-        fi.word=info.cpuid_edx;
-        efi.word=info.cpuid_ecx;
+        fi.word = info.cpuid_edx;
+        efi.word = info.cpuid_ecx;
         
-        if(fi.bits.fxsr)        fpu_fxsr();
-        else fpu_fsr(); 
+        if (fi.bits.fxsr)
+                fpu_fxsr();
+        else
+                fpu_fsr();      
         
-        if(fi.bits.sse) asm volatile (
-                "mov %%cr4,%0;\n"
-                "or %1,%0;\n"
-                "mov %0,%%cr4;\n"
-                :"+r"(help)
-                :"i"(CR4_OSFXSR_MASK|(1<<10)) 
-        );
-        
+        if (fi.bits.sse) {
+                asm volatile (
+                        "mov %%cr4,%0\n"
+                        "or %1,%0\n"
+                        "mov %0,%%cr4\n"
+                        : "+r" (help)
+                        : "i" (CR4_OSFXSR_MASK|(1<<10)) 
+                );
+        }
 }
-
 
 void cpu_identify(void)