#endif /* !COMPILER_HAVE_SHORT_MEM_OPERAND */
/*
- * The __hp() macro casts the void pointer "x" to a pointer to a structure
+ * The __hp() macro casts the void pointer @x to a pointer to a structure
* containing an array of char of the specified size. This allows passing the
* @addr arguments of the following inline functions as "m" and "+m" operands
- * to the assembly.
+ * to the assembly. The @size parameter should be a constant to support
+ * compilers such as clang which do not support VLA. Create typedefs because
+ * C++ does not allow types be defined in casts.
*/
-#define __hp(size, x) ((struct { char v[size]; } *)(x))
+typedef struct { char v[4]; } __hp_4;
+typedef struct { char v[8]; } __hp_8;
+
+#define __hp(size, x) ((__hp_##size *)(x))
/* xchg */
__asm__ __volatile__(
"0: cs %0,%2," MEMOP_REF(%3) "\n"
" brc 4,0b\n"
- : "=&r" (old_val), MEMOP_OUT (__hp(len, addr))
- : "r" (val), MEMOP_IN (__hp(len, addr))
+ : "=&r" (old_val), MEMOP_OUT (__hp(4, addr))
+ : "r" (val), MEMOP_IN (__hp(4, addr))
: "memory", "cc");
return old_val;
}
__asm__ __volatile__(
"0: csg %0,%2," MEMOP_REF(%3) "\n"
" brc 4,0b\n"
- : "=&r" (old_val), MEMOP_OUT (__hp(len, addr))
- : "r" (val), MEMOP_IN (__hp(len, addr))
+ : "=&r" (old_val), MEMOP_OUT (__hp(8, addr))
+ : "r" (val), MEMOP_IN (__hp(8, addr))
: "memory", "cc");
return old_val;
}
__asm__ __volatile__(
" cs %0,%2," MEMOP_REF(%3) "\n"
- : "+r" (old_val), MEMOP_OUT (__hp(len, addr))
- : "r" (_new), MEMOP_IN (__hp(len, addr))
+ : "+r" (old_val), MEMOP_OUT (__hp(4, addr))
+ : "r" (_new), MEMOP_IN (__hp(4, addr))
: "memory", "cc");
return old_val;
}
{
__asm__ __volatile__(
" csg %0,%2," MEMOP_REF(%3) "\n"
- : "+r" (old), MEMOP_OUT (__hp(len, addr))
- : "r" (_new), MEMOP_IN (__hp(len, addr))
+ : "+r" (old), MEMOP_OUT (__hp(8, addr))
+ : "r" (_new), MEMOP_IN (__hp(8, addr))
: "memory", "cc");
return old;
}