Changeset 6da1013f in mainline for kernel/arch/ia32

Timestamp:

2009-02-12T20:09:19Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

84266669

Parents:

7004747

Message:

simplify configuration
introduce arch_construct_function and inb/outb (sometimes empty) on all platforms
various code cleanup

Location:

kernel/arch/ia32

Files:

• _link.ld.in (modified) (4 diffs)
• include/fpu_context.h (modified) (1 diff)
• src/ia32.c (modified) (1 diff)

kernel/arch/ia32/_link.ld.in

@@ -1 +1 @@
 /** IA-32 linker script
- *  
+ *
  * umapped section:
- *      kernel text
- *      kernel data
+ *  kernel text
+ *  kernel data
  * mapped section:
- *      kernel text
- *      kernel data 
+ *  kernel text
+ *  kernel data
  */
 
@@ -29 +29 @@
                 
                 kdata_start = .;
-                *(.data);                       /* initialized data */
-                *(.rodata*);                    /* string literals */
-                *(COMMON);                      /* global variables */
+                *(.data);               /* initialized data */
+                *(.rodata*);            /* string literals */
+                *(COMMON);              /* global variables */
                 hardcoded_load_address = .;
                 LONG(PA2KA(BOOT_OFFSET));
@@ -43 +43 @@
                 LONG(unmapped_kdata_end - unmapped_kdata_start);
                 symbol_table = .;
-                *(symtab.*);                    /* Symbol table, must be LAST symbol! */
-                *(.bss);                        /* uninitialized static variables */
+                *(symtab.*);            /* Symbol table, must be LAST symbol! */
+                *(.bss);                /* uninitialized static variables */
                 kdata_end = .;
         }
-
+        
         /DISCARD/ : {
-                *(.note.GNU-stack);             
+                *(.note.GNU-stack);
                 *(.comment);
         }
         
-#ifdef CONFIG_SMP       
+#ifdef CONFIG_SMP
         
         _hardcoded_unmapped_size = (unmapped_ktext_end - unmapped_ktext_start) + (unmapped_kdata_end - unmapped_kdata_start);
@@ -59 +59 @@
         ap_gdtr = unmapped_ap_gdtr - BOOT_OFFSET + AP_BOOT_OFFSET;
         protected_ap_gdtr = PA2KA(ap_gdtr);
-
+        
 #endif /* CONFIG_SMP */
-
+        
 }

kernel/arch/ia32/include/fpu_context.h

@@ -38 +38 @@
 #include <arch/types.h>
 
-#define ARCH_HAS_FPU
 #define FPU_CONTEXT_ALIGN 16
 

kernel/arch/ia32/src/ia32.c

@@ -178 +178 @@
 }
 
+/** Construct function pointer
+ *
+ * @param fptr   function pointer structure
+ * @param addr   function address
+ * @param caller calling function address
+ *
+ * @return address of the function pointer
+ *
+ */
+void *arch_construct_function(fncptr_t *fptr, void *addr, void *caller)
+{
+        return addr;
+}
+
 /** @}
  */