Changeset 8f2153b in mainline

Timestamp:

2005-09-05T12:41:45Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

1b492b5

Parents:

2c55af3

Message:

Backported AMD64 linker and boot changes back to IA32.

Location:

arch/ia32

Files:

• _link.ld (modified) (1 diff)
• include/mm/page.h (modified) (3 diffs)
• include/pm.h (modified) (3 diffs)
• src/boot/boot.S (modified) (3 diffs)
• src/pm.c (modified) (1 diff)
• src/smp/ap.S (modified) (1 diff)
• src/smp/smp.c (modified) (1 diff)

arch/ia32/_link.ld

@@ -59 +59 @@
         e820table_boot = e820table - _map_address;
         e820counter_boot = e820counter - _map_address;
+        real_bootstrap_gdtr = real_bootstrap_gdtr_boot + 0x80000000;
 }

arch/ia32/include/mm/page.h

@@ -30 +30 @@
 #define __ia32_PAGE_H__
 
-#include <mm/page.h>
-#include <arch/types.h>
-#include <arch/mm/frame.h>
-#include <typedefs.h>
-
 #define PAGE_SIZE       FRAME_SIZE
 
-#define KA2PA(x)        (((__address) (x)) - 0x80000000)
-#define PA2KA(x)        (((__address) (x)) + 0x80000000)
+#ifndef __ASM__
+# define KA2PA(x)       (((__address) (x)) - 0x80000000)
+# define PA2KA(x)       (((__address) (x)) + 0x80000000)
+#else
+# define KA2PA(x)       ((x) - 0x80000000)
+# define PA2KA(x)       ((x) + 0x80000000)
+#endif
 
 /*
@@ -70 +70 @@
 #define SET_PTL3_FLAGS_ARCH(ptl2, i, x)
 #define SET_FRAME_FLAGS_ARCH(ptl3, i, x)        set_pt_flags((pte_t *)(ptl3), (index_t)(i), (x))
+
+#ifndef __ASM__
+
+#include <mm/page.h>
+#include <arch/types.h>
+#include <arch/mm/frame.h>
+#include <typedefs.h>
 
 struct page_specifier {
@@ -112 +119 @@
 extern void page_arch_init(void);
 
+#endif /* __ASM__ */
+
 #endif

arch/ia32/include/pm.h

@@ -30 +30 @@
 #define __PM_H__
 
-#include <arch/types.h>
-#include <typedefs.h>
-#include <arch/context.h>
-
 #define IDT_ITEMS 64
 #define GDT_ITEMS 6
@@ -60 +56 @@
 
 #define IO_MAP_BASE     (104)
+
+#ifndef __ASM__
+
+#include <arch/types.h>
+#include <typedefs.h>
+#include <arch/context.h>
 
 struct ptr_16_32 {
@@ -146 +148 @@
 extern void tss_initialize(struct tss *t);
 
+#endif /* __ASM__ */
+
 #endif

arch/ia32/src/boot/boot.S

@@ -27 +27 @@
 #
 
+#define __ASM__
+        
 #include <arch/boot/boot.h>
 #include <arch/boot/memmapasm.h>
+#include <arch/mm/page.h>
+#include <arch/pm.h>
 
 .section K_TEXT_START
@@ -54 +58 @@
         call memmap_arch_init
         
-        lgdt real_bootstrap_gdtr                                # initialize Global Descriptor Table register
+        lgdt real_bootstrap_gdtr_boot           # initialize Global Descriptor Table register
         
         movl %cr0, %eax
@@ -236 +240 @@
 page_directory:
         .space 4096, 0
+
+.global real_bootstrap_gdtr_boot
+real_bootstrap_gdtr_boot:
+        .word selector(GDT_ITEMS)
+        .long KA2PA(gdt)-BOOT_OFFSET
+        

arch/ia32/src/pm.c

@@ -70 +70 @@
 struct tss *tss_p = NULL;
 
+/* TODO: Does not compile correctly if it does not exist ???? */
+int __attribute__ ((section ("K_DATA_START"))) __fake;
+
 /* gdtr is changed by kmp before next CPU is initialized */
-struct ptr_16_32 real_bootstrap_gdtr __attribute__ ((section ("K_DATA_START"))) = { .limit = sizeof(gdt), .base = KA2PA((__address) gdt - BOOT_OFFSET) };
 struct ptr_16_32 protected_bootstrap_gdtr = { .limit = sizeof(gdt), .base = KA2PA((__address) gdt) };
 struct ptr_16_32 gdtr = { .limit = sizeof(gdt), .base = (__address) gdt };

arch/ia32/src/smp/ap.S

@@ -51 +51 @@
         movw %ax, %ds
 
-        lgdt real_bootstrap_gdtr        # initialize Global Descriptor Table register
+        lgdt real_bootstrap_gdtr_boot   # initialize Global Descriptor Table register
         
         movl %cr0, %eax

arch/ia32/src/smp/smp.c

@@ -144 +144 @@
                 memcpy(gdt_new, gdt, GDT_ITEMS*sizeof(struct descriptor));
                 memsetb((__address)(&gdt_new[TSS_DES]), sizeof(struct descriptor), 0);
-                ((struct ptr_16_32 *) PA2KA((__address) &real_bootstrap_gdtr))->base = KA2PA((__address) gdt_new);
+                real_bootstrap_gdtr.base = KA2PA((__address) gdt_new);
                 gdtr.base = (__address) gdt_new;