Changeset ad36bd6 in mainline

Timestamp:

2005-04-25T12:37:44Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

85bfdcc8

Parents:

c9b8c5c

Message:

Small improvements.

Files:

• arch/ia32/include/asm.h (modified) (1 diff)
• arch/ia32/src/asm.s (modified) (1 diff)
• arch/ia32/src/ia32.c (modified) (1 diff)
• arch/ia32/src/smp/mp.c (modified) (1 diff)
• include/cpu.h (modified) (1 diff)
• src/cpu/cpu.c (modified) (1 diff)
• src/main/kinit.c (modified) (1 diff)

arch/ia32/include/asm.h

@@ -60 +60 @@
 
 extern void write_dr0(__u32 v);
-extern __u32 read_dr0(void);
+extern inline __u32 read_dr0(void);
 
 #endif

arch/ia32/src/asm.s

@@ -53 +53 @@
 .global memsetw
 .global memcmp
-.global write_dr0
-.global read_dr0
-
-write_dr0:
-        pushl %eax
-        movl 8(%esp),%eax
-        movl %eax,%dr0
-        popl %eax
-        ret
-        
-read_dr0:
-        movl %dr0,%eax
-        ret
 
 #

arch/ia32/src/ia32.c

@@ -45 +45 @@
 #include <arch/interrupt.h>
 
+#include <arch/asm.h>
+
+void write_dr0(__u32 v)
+{
+        __asm__("movl %0,%%dr0" : : "r" (v));
+}
+
+inline __u32 read_dr0(void)
+{
+        __u32 v;
+        
+        __asm__("movl %%dr0,%0\n" : "=r" (v));
+        
+        return v;
+}
 
 void arch_pre_mm_init(void)

arch/ia32/src/smp/mp.c

@@ -495 +495 @@
 
                 if (pr[i].l_apic_id == l_apic_id()) {
-                        printf("%X: bad processor entry #%d, will not send IPI to myself\n", &pr[i], i);
+                        printf("%L: bad processor entry #%d, will not send IPI to myself\n", &pr[i], i);
                         continue;
                 }

include/cpu.h

@@ -60 +60 @@
 
         int id;
+        int active;
 
         __u16 frequency_mhz;

src/cpu/cpu.c

@@ -82 +82 @@
         #endif /* __SMP__ */
         
+        CPU->active = 1;
+        
         cpu_identify();
         cpu_arch_init();

src/main/kinit.c

@@ -87 +87 @@
          */
         for (i = 0; i < config.cpu_count; i++)
-                cpu_print_report(&cpus[i]);
+                if (cpus[i].active)
+                        cpu_print_report(&cpus[i]);
 
 #ifdef __SMP__