Changeset b9e97fb in mainline for arch/amd64/src/boot/boot.S

Timestamp:

2005-08-31T10:53:34Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

8f91729

Parents:

9756131

Message:

Better types for ia32 drivers, so that they can be reused in amd64.
Build script cleanup amd64.
New code / not working yet / in amd64.

File:

• arch/amd64/src/boot/boot.S (modified) (6 diffs)

arch/amd64/src/boot/boot.S

@@ -67 +67 @@
         # Load gdtr, idtr
         lgdt gdtr_inst
+        # Load idtr, but it contains mess - we should not get interrupt
+        # anyway
         lidt idtr_inst
         
@@ -73 +75 @@
         movl %eax,%cr0                  # switch to protected mode
 
-        jmpl $selector(KTEXT32_DES), $now_in_prot
+        jmpl $gdtselector(KTEXT32_DES), $now_in_prot
 
 no_long_mode:
@@ -83 +85 @@
 now_in_prot:  
         # Set up stack & data descriptors
-        movw $selector(KDATA_DES), %ax
+        movw $gdtselector(KDATA_DES), %ax
         movw %ax, %ds
         movw %ax, %fs
@@ -111 +113 @@
         
         # At this point we are in compatibility mode
-        jmpl $selector(KTEXT_DES), $start64
+        jmpl $gdtselector(KTEXT_DES), $start64
 
 .code64
@@ -117 +119 @@
         movq START_STACK_64, %rsp
         
-        lidt idtr_inst
-        
         call main_bsp   # never returns
 1:
         jmp 1b
-                        
-
+                                
 .section K_DATA_START
 .align 4096
+
+# Identical mapping of first 16MB and the same of -2GB -> 0     
 .global ptl_2
 ptl_2:  
@@ -154 +155 @@
 .global gdtr_inst                               
 gdtr_inst:
-        .word selector(GDT_ITEMS)
+        .word gdtselector(GDT_ITEMS)
         .long KA2PA(gdt)
 
 .global idtr_inst
 idtr_inst:
-        .word 0
+        .word idtselector(IDT_ITEMS)
         .long KA2PA(idt)