Commit 8ee9fac2 by Richard Henderson Committed by Richard Henderson

libitm: Avoid non-portable x86 branch prediction mnemonic.

From-SVN: r181233
parent a5b3d713
2011-11-09 Richard Henderson <rth@redhat.com> 2011-11-09 Richard Henderson <rth@redhat.com>
* config/x86/cacheline.h (gtm_cacheline::store_mask): Use .byte
to emit branch prediction hint.
* config/x86/sjlj.S: Protect elf directives with __ELF__. * config/x86/sjlj.S: Protect elf directives with __ELF__.
Protect .note.GNU-stack with __linux__. Protect .note.GNU-stack with __linux__.
......
...@@ -144,7 +144,7 @@ gtm_cacheline::operator= (const gtm_cacheline & __restrict s) ...@@ -144,7 +144,7 @@ gtm_cacheline::operator= (const gtm_cacheline & __restrict s)
} }
#endif #endif
// ??? Support masked integer stores more efficiently with an unlocked cmpxchg // Support masked integer stores more efficiently with an unlocked cmpxchg
// insn. My reasoning is that while we write to locations that we do not wish // insn. My reasoning is that while we write to locations that we do not wish
// to modify, we do it in an uninterruptable insn, and so we either truely // to modify, we do it in an uninterruptable insn, and so we either truely
// write back the original data or the insn fails -- unlike with a // write back the original data or the insn fails -- unlike with a
...@@ -171,7 +171,8 @@ gtm_cacheline::store_mask (uint32_t *d, uint32_t s, uint8_t m) ...@@ -171,7 +171,8 @@ gtm_cacheline::store_mask (uint32_t *d, uint32_t s, uint8_t m)
"and %[m], %[n]\n\t" "and %[m], %[n]\n\t"
"or %[s], %[n]\n\t" "or %[s], %[n]\n\t"
"cmpxchg %[n], %[d]\n\t" "cmpxchg %[n], %[d]\n\t"
"jnz,pn 0b" ".byte 0x2e\n\t" // predict not-taken, aka jnz,pn
"jnz 0b"
: [d] "+m"(*d), [n] "=&r" (n), [o] "+a"(o) : [d] "+m"(*d), [n] "=&r" (n), [o] "+a"(o)
: [s] "r" (s & bm), [m] "r" (~bm)); : [s] "r" (s & bm), [m] "r" (~bm));
} }
...@@ -198,7 +199,8 @@ gtm_cacheline::store_mask (uint64_t *d, uint64_t s, uint8_t m) ...@@ -198,7 +199,8 @@ gtm_cacheline::store_mask (uint64_t *d, uint64_t s, uint8_t m)
"and %[m], %[n]\n\t" "and %[m], %[n]\n\t"
"or %[s], %[n]\n\t" "or %[s], %[n]\n\t"
"cmpxchg %[n], %[d]\n\t" "cmpxchg %[n], %[d]\n\t"
"jnz,pn 0b" ".byte 0x2e\n\t" // predict not-taken, aka jnz,pn
"jnz 0b"
: [d] "+m"(*d), [n] "=&r" (n), [o] "+a"(o) : [d] "+m"(*d), [n] "=&r" (n), [o] "+a"(o)
: [s] "r" (s & bm), [m] "r" (~bm)); : [s] "r" (s & bm), [m] "r" (~bm));
#else #else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment