Changeset 38428aa3 in mainline for kernel/arch/ia64

Timestamp:

2009-08-27T12:23:46Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

ff211d2

Parents:

c4d11c5

Message:

workaround strict-aliasing rules

Location:

kernel/arch/ia64

Files:

• include/faddr.h (modified) (2 diffs)
• include/types.h (modified) (1 diff)
• src/cpu/cpu.c (modified) (1 diff)

kernel/arch/ia64/include/faddr.h

@@ -27 +27 @@
  */
 
-/** @addtogroup ia64    
+/** @addtogroup ia64
  * @{
  */
@@ -38 +38 @@
 #include <arch/types.h>
 
-/** 
+/**
  *
  * Calculate absolute address of function
  * referenced by fptr pointer.
  *
- * @param f Function pointer.
+ * @param fptr Function pointer.
  *
  */
-#define FADDR(f)         (*((uintptr_t *)(f)));
+#define FADDR(fptr)  (((fncptr_t *) (fptr))->fnc)
 
 #endif

kernel/arch/ia64/include/types.h

@@ -67 +67 @@
         unative_t fnc;
         unative_t gp;
-} fncptr_t;
+} __attribute__((may_alias)) fncptr_t;
 
 #define PRIp "lx"       /**< Format for uintptr_t. */

kernel/arch/ia64/src/cpu/cpu.c

@@ -54 +54 @@
         char vendor[2 * sizeof(uint64_t) + 1];
         
-        *((uint64_t *) &vendor[0 * sizeof(uint64_t)]) = CPU->arch.cpuid0;
-        *((uint64_t *) &vendor[1 * sizeof(uint64_t)]) = CPU->arch.cpuid1;
+        memcpy(vendor, &CPU->arch.cpuid0, 8);
+        memcpy(vendor + 8, &CPU->arch.cpuid1, 8);
         vendor[sizeof(vendor) - 1] = 0;
         
-        switch(m->arch.cpuid3.family) {
+        switch (m->arch.cpuid3.family) {
         case FAMILY_ITANIUM:
                 family_str = "Itanium";