Changeset 4f1475d4 in mainline for arch/amd64

Timestamp:

2005-09-04T19:43:15Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

f9e5422

Parents:

ee7e6ace

Message:

Added preprocessed linker script to AMD architecture, so that
the constants are all only in the header files.

Location:

arch/amd64

Files:

• Makefile.inc (modified) (1 diff)
• _link.ld.in (moved) (moved from arch/amd64/_link.ld ) (3 diffs)
• include/mm/page.h (modified) (1 diff)

arch/amd64/Makefile.inc

@@ -23 +23 @@
 CPPFLAGS=$(DEFS) -nostdinc -I../include
 CFLAGS=$(CPPFLAGS) -nostdlib -fno-builtin -fno-unwind-tables -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -march=opteron -m64 -mcmodel=kernel -mno-red-zone
-LFLAGS=-M -T ../arch/amd64/_link.ld
+LFLAGS=-M 
+
+../arch/amd64/_link.ld: ../arch/amd64/_link.ld.in
+        $(CC) $(CFLAGS) -E -x c $< | grep -v "^\#" > $@
 
 arch_sources = arch/dummy.s \

arch/amd64/_link.ld.in

@@ -9 +9 @@
  */
 
+#define __ASM__
+#include <arch/boot/boot.h>
+#include <arch/mm/page.h>
+
 OUTPUT_FORMAT(binary)
 ENTRY(kernel_image_start)
 
 SECTIONS {
-        .unmapped 0x8000: AT (0x8000) {
+        .unmapped BOOTSTRAP_OFFSET: AT (BOOTSTRAP_OFFSET) {
                 unmapped_ktext_start = .;
                 *(K_TEXT_START);
@@ -24 +28 @@
         }
 
-        .mapped (0xffffffff80100000+0x8000+SIZEOF(.unmapped)) : AT (0x8000+SIZEOF(.unmapped)) {
+        .mapped (PA2KA(BOOT_OFFSET+BOOTSTRAP_OFFSET)+SIZEOF(.unmapped)) : AT (BOOTSTRAP_OFFSET+SIZEOF(.unmapped)) {
                 ktext_start = .;
                 *(BOOT_DATA);
@@ -63 +67 @@
 
 
-        e820table_boot = e820table - _map_address;
-        e820counter_boot = e820counter - _map_address;
-        real_bootstrap_gdtr = real_bootstrap_gdtr_boot + _ka2pa_offset;
+        e820table_boot = KA2PA(e820table) - BOOT_OFFSET;
+        e820counter_boot = KA2PA(e820counter) - BOOT_OFFSET;
+        real_bootstrap_gdtr = PA2KA(real_bootstrap_gdtr_boot);
 }

arch/amd64/include/mm/page.h

@@ -39 +39 @@
 
 #ifndef __ASM__
-# define KA2PA(x)      (((__address) (x)) + 0x80000000)
-# define PA2KA(x)      (((__address) (x)) - 0x80000000)
+# define KA2PA(x)      (((__address) (x)) - 0xffffffff80000000)
+# define PA2KA(x)      (((__address) (x)) + 0xffffffff80000000)
 #else
-# define KA2PA(x)      ((x) + 0x80000000)
-# define PA2KA(x)      ((x) - 0x80000000)
+# define KA2PA(x)      ((x) - 0xffffffff80000000)
+# define PA2KA(x)      ((x) + 0xffffffff80000000)
 #endif