Changeset f07bba5 in mainline

Timestamp:

2005-04-22T14:11:38Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c9b8c5c

Parents:

25f62cdf

Message:

Code cleanup after arch_init() splitting.
Restore %ds and %es registers before iret.

Files:

• arch/ia32/src/asm.s (modified) (3 diffs)
• arch/ia32/src/ia32.c (modified) (1 diff)
• arch/mips/src/mips.c (modified) (1 diff)
• include/arch.h (modified) (1 diff)
• src/Makefile.config (modified) (1 diff)
• src/main/main.c (modified) (2 diffs)

arch/ia32/src/asm.s

@@ -130 +130 @@
         movl %esp,%ebp
         pusha
+
+        push %ds
+        push %es
     
         # we must fill the data segment registers
@@ -142 +145 @@
         call trap_dispatcher
         addl $8,%esp
+
+        pop %es
+        pop %ds
 
         popa
@@ -315 +321 @@
 utext:
 0:
-        movl $0xdeadbeaf, %eax
+#       movl $0xdeadbeaf, %eax
         int $48
         jmp 0b

arch/ia32/src/ia32.c

@@ -46 +46 @@
 
 
-void arch_init(void)
+void arch_pre_mm_init(void)
 {
         pm_init();

arch/mips/src/mips.c

@@ -31 +31 @@
 #include <arch/exception.h>
 
-void arch_init(void)
+void arch_pre_mm_init(void)
 {
         /*

include/arch.h

@@ -40 +40 @@
 #define TASK            (cpu_private_data[CPU_ID_ARCH].task)
 
-extern void arch_init(void);
+extern void arch_pre_mm_init(void);
 extern void arch_post_mm_init(void);
 extern void calibrate_delay_loop(void);

src/Makefile.config

@@ -6 +6 @@
 
 # Support for symetric multiprocessors
-#SMP=__SMP__
+SMP=__SMP__
 
 # Improved support for hyperthreading

src/main/main.c

@@ -102 +102 @@
         thread_t *t;
 
-        arch_init();
+        arch_pre_mm_init();
 
         heap_init(config.base + hardcoded_ktext_size + hardcoded_kdata_size, CONFIG_HEAP_SIZE);
@@ -171 +171 @@
         config.cpu_active++;
 
-        arch_init();
+        arch_pre_mm_init();
         frame_init();
         page_init();
+        arch_post_mm_init();
 
         cpu_init();