Changeset 6da1013f in mainline for kernel/arch/amd64/src

Timestamp:

2009-02-12T20:09:19Z (16 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/amd64/src

Files:

• amd64.c (modified) (1 diff)
• debugger.c (modified) (4 diffs)
• interrupt.c (modified) (1 diff)

kernel/arch/amd64/src/amd64.c

@@ -227 +227 @@
 }
 
+/** 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;
+}
+
 /** @}
  */

kernel/arch/amd64/src/debugger.c

@@ -205 +205 @@
         /* Send IPI */
 #ifdef CONFIG_SMP
-//      ipi_broadcast(VECTOR_DEBUG_IPI);        
+//      ipi_broadcast(VECTOR_DEBUG_IPI);
 #endif  
 
@@ -211 +211 @@
 }
 
-#ifdef amd64
-#       define getip(x) ((x)->rip)
+#ifdef __64_BITS__
+        #define getip(x)  ((x)->rip)
 #else
-#       define getip(x) ((x)->eip)
+        #define getip(x)  ((x)->eip)
 #endif
 
@@ -277 +277 @@
         
         /* Set RF to restart the instruction  */
-#ifdef amd64       
+#ifdef __64_BITS__
         istate->rflags |= RFLAGS_RF;
 #else
@@ -349 +349 @@
         char *symbol;
 
-#ifdef __32_BITS__      
+#ifdef __32_BITS__
         printf("#  Count Address    In symbol\n");
         printf("-- ----- ---------- ---------\n");

kernel/arch/amd64/src/interrupt.c

@@ -143 +143 @@
 static void nm_fault(int n, istate_t *istate)
 {
-#ifdef CONFIG_FPU_LAZY     
+#ifdef CONFIG_FPU_LAZY
         scheduler_fpu_lazy_request();
 #else