Changeset c832cc0a in mainline for arch/ia32

Timestamp:

2005-08-31T23:57:30Z (21 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

2a0d782

Parents:

3817ed1

Message:

hardcoded_symbol fixed into linker script on amd64/ia32/mips architecture

Location:

arch/ia32

Files:

• _link.ld (modified) (1 diff)
• src/boot/boot.S (modified) (1 diff)
• src/interrupt.c (modified) (9 diffs)

arch/ia32/_link.ld

@@ -32 +32 @@
                 *(.rodata*);            /* string literals */
                 *(COMMON);              /* global variables */
+                hardcoded_load_address = .;
+                LONG(0xffffffff80008000);
+                hardcoded_ktext_size = .;
+                LONG(ktext_end - ktext_start + (unmapped_ktext_end - unmapped_ktext_start));
+                hardcoded_kdata_size = .;
+                LONG(kdata_end - kdata_start + (unmapped_kdata_end - unmapped_kdata_start));
                 *(.bss);                /* uninitialized static variables */
                 *(K_DATA_END);
                 kdata_end = .;
         }
-
-        _hardcoded_ktext_size = ktext_end - ktext_start + (unmapped_ktext_end - unmapped_ktext_start);
-        _hardcoded_kdata_size = kdata_end - kdata_start + (unmapped_kdata_end - unmapped_kdata_start);
-        _hardcoded_load_address = 0x80008000;
-
 }

arch/ia32/src/boot/boot.S

@@ -67 +67 @@
         call map_kernel                 # map kernel and turn paging on
 
-        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
 

arch/ia32/src/interrupt.c

@@ -64 +64 @@
  * CPU is cpu_priority_high().
  */
-void trap_dispatcher(__u8 n, __u32 stack[])
+void trap_dispatcher(__u8 n, __native stack[])
 {
         ASSERT(n < IVT_ITEMS);
@@ -71 +71 @@
 }
 
-void null_interrupt(__u8 n, __u32 stack[])
+void null_interrupt(__u8 n, __native stack[])
 {
         printf("int %d: null_interrupt\n", n);
@@ -78 +78 @@
 }
 
-void gp_fault(__u8 n, __u32 stack[])
+void gp_fault(__u8 n, __native stack[])
 {
         printf("ERROR_WORD=%X, %%eip=%X, %%cs=%X, flags=%X\n", stack[0], stack[1], stack[2], stack[3]);
@@ -87 +87 @@
 }
 
-void ss_fault(__u8 n, __u32 stack[])
+void ss_fault(__u8 n, __native stack[])
 {
         printf("ERROR_WORD=%X, %%eip=%X, %%cs=%X, flags=%X\n", stack[0], stack[1], stack[2], stack[3]);
@@ -96 +96 @@
 
 
-void nm_fault(__u8 n, __u32 stack[])
+void nm_fault(__u8 n, __native stack[])
 {
         reset_TS_flag();
@@ -110 +110 @@
 
 
-void page_fault(__u8 n, __u32 stack[])
+void page_fault(__u8 n, __native stack[])
 {
         printf("page fault address: %X\n", read_cr2());
@@ -119 +119 @@
 }
 
-void syscall(__u8 n, __u32 stack[])
+void syscall(__u8 n, __native stack[])
 {
         printf("cpu%d: syscall\n", CPU->id);
@@ -125 +125 @@
 }
 
-void tlb_shootdown_ipi(__u8 n, __u32 stack[])
+void tlb_shootdown_ipi(__u8 n, __native stack[])
 {
         trap_virtual_eoi();
@@ -131 +131 @@
 }
 
-void wakeup_ipi(__u8 n, __u32 stack[])
+void wakeup_ipi(__u8 n, __native stack[])
 {
         trap_virtual_eoi();