Changeset d47f0e1 in mainline for arch/ia32/src/boot/boot.S

Timestamp:

2005-06-05T15:18:24Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e3f41b6

Parents:

d1a184f

Message:

SMP recovery patch #1. (SMP still broken)
Move ap_boot() to K_TEXT_START_2 section.
Change ap_boot() to cope with mapping of kernel address space.
Change some addresses in mps.c from kernel to physical.

MIPS.
Move msim dprinter device to 0xB0000000.
This address is from kseg1 (unmapped, uncached) segment.

File:

• arch/ia32/src/boot/boot.S (modified) (2 diffs)

arch/ia32/src/boot/boot.S

@@ -63 +63 @@
         lidt idtr
 
+        call map_kernel
+
+        movl $_hardcoded_ktext_size, hardcoded_ktext_size
+        movl $_hardcoded_kdata_size, hardcoded_kdata_size
+        movl $_hardcoded_load_address, hardcoded_load_address
+
+        call main_bsp                   # never returns
+
+        cli
+        hlt
+
+.global map_kernel
+map_kernel:
         #
         # Here we setup mapping for both the unmapped and mapped sections of the kernel.
@@ -84 +97 @@
         orl $(1<<31), %ebx
         movl %ebx, %cr0
+        ret
 
-        movl $_hardcoded_ktext_size, hardcoded_ktext_size
-        movl $_hardcoded_kdata_size, hardcoded_kdata_size
-        movl $_hardcoded_load_address, hardcoded_load_address
-
-        call main_bsp                   # never returns
-
-        cli
-        hlt
 
 .section K_DATA_START