Changeset 8fc0d455 in mainline for arch/amd64/src/boot/boot.S

Timestamp:

2005-08-30T17:50:07Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

9c0a9b3

Parents:

b45aa23

Message:

Code cleanup.

File:

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

arch/amd64/src/boot/boot.S

@@ -1 +1 @@
 #
-# Copyright (C) 2001-2004 Jakub Jermar
+# Copyright (C) 2001-2004 Ondrej Palkovsky
 # All rights reserved.
 #
@@ -27 +27 @@
 #
 
+#define __ASM__
+
+#include <arch/mm/page.h>       
 #include <arch/mm/ptl.h>
+#include <arch/pm.h>
 
 #define START_STACK     0x7c00  
@@ -52 +56 @@
 #       call memmap_arch_init
         
-        mov $0x80000000, %eax  
+        movl $0x80000000, %eax  
         cpuid
         cmp $0x80000000, %eax   # any function > 80000000h?
         jbe no_long_mode
-        mov $0x80000001, %eax   # Extended function code 80000001
+        movl $0x80000001, %eax  # Extended function code 80000001
         cpuid
         bt $29, %edx            # Test if long mode is supported.
@@ -69 +73 @@
         movl %eax,%cr0                  # switch to protected mode
 
-        jmpl $40, $now_in_prot
+        jmpl $selector(KTEXT32_DES), $now_in_prot
 
 no_long_mode:
@@ -79 +83 @@
 now_in_prot:  
         # Set up stack & data descriptors
-        movw $16, %ax
+        movw $selector(KDATA_DES), %ax
         movw %ax, %ds
         movw %ax, %fs
@@ -107 +111 @@
         
         # At this point we are in compatibility mode
-        jmpl $8, $start64
+        jmpl $selector(KTEXT_DES), $start64
 
 .code64
@@ -150 +154 @@
 .global gdtr_inst                               
 gdtr_inst:
-        .word 7*8  # GDT_ITEMS * 8
-        .long gdt + 0x80000000
+        .word selector(GDT_ITEMS)
+        .long KA2PA(gdt)
 
 .global idtr_inst
 idtr_inst:
         .word 0
-        .long idt + 0x80000000
+        .long KA2PA(idt)