WebSVN – HelenOS – Path Comparison – / – /trunk/kernel/arch/amd64/src/ Rev 3879 and /trunk/kernel/arch/amd64/src/ Rev 3880

Ignore whitespace Rev 3879 → Rev 3880

 /trunk/kernel/arch/amd64/src/amd64.c
 ,5 → 226,19
     i8042_release();
 }
+/** 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;
+}
 /** @}
  */

 /trunk/kernel/arch/amd64/src/debugger.c
 ,16 → 204,16
     /* Send IPI */
 #ifdef CONFIG_SMP
-//  ipi_broadcast(VECTOR_DEBUG_IPI);
+//  ipi_broadcast(VECTOR_DEBUG_IPI);
 #endif
     return curidx;
 }
-#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
 static void handle_exception(int slot, istate_t *istate)
 ,7 → 276,7
     int i;
     /* Set RF to restart the instruction  */
-#ifdef amd64
+#ifdef __64_BITS__
     istate->rflags |= RFLAGS_RF;
 #else
     istate->eflags |= EFLAGS_RF;
 ,7 → 348,7
     unsigned int i;
     char *symbol;
-#ifdef __32_BITS__
+#ifdef __32_BITS__
     printf("#  Count Address    In symbol\n");
     printf("-- ----- ---------- ---------\n");
 #endif

 /trunk/kernel/arch/amd64/src/interrupt.c
 ,7 → 142,7
 static void nm_fault(int n, istate_t *istate)
 {
-#ifdef CONFIG_FPU_LAZY
+#ifdef CONFIG_FPU_LAZY
     scheduler_fpu_lazy_request();
 #else
     fault_if_from_uspace(istate, "FPU fault.");