|
 |
fa2d27 |
--- libitm/config/x86/target.h.jj 2013-06-23 20:43:50.000000000 +0200
|
|
|
fa2d27 |
+++ libitm/config/x86/target.h 2013-08-13 17:14:57.540012109 +0200
|
|
|
fa2d27 |
@@ -64,7 +64,7 @@ cpu_relax (void)
|
|
|
fa2d27 |
|
|
|
fa2d27 |
// Use Intel RTM if supported by the assembler.
|
|
|
fa2d27 |
// See gtm_thread::begin_transaction for how these functions are used.
|
|
|
fa2d27 |
-#ifdef HAVE_AS_RTM
|
|
|
fa2d27 |
+#if 1 /* def HAVE_AS_RTM */
|
|
|
fa2d27 |
#define USE_HTM_FASTPATH
|
|
|
fa2d27 |
#ifdef __x86_64__
|
|
|
fa2d27 |
// Use the custom fastpath in ITM_beginTransaction.
|
|
|
fa2d27 |
@@ -97,7 +97,10 @@ htm_init ()
|
|
|
fa2d27 |
static inline uint32_t
|
|
|
fa2d27 |
htm_begin ()
|
|
|
fa2d27 |
{
|
|
|
fa2d27 |
- return _xbegin();
|
|
|
fa2d27 |
+// return _xbegin();
|
|
|
fa2d27 |
+ uint32_t ret;
|
|
|
fa2d27 |
+ __asm volatile ("movl $-1, %%eax; .byte 0xc7, 0xf8, 0, 0, 0, 0" : "=a" (ret) : : "memory");
|
|
|
fa2d27 |
+ return ret;
|
|
|
fa2d27 |
}
|
|
|
fa2d27 |
|
|
|
fa2d27 |
static inline bool
|
|
|
fa2d27 |
@@ -109,7 +112,8 @@ htm_begin_success (uint32_t begin_ret)
|
|
|
fa2d27 |
static inline void
|
|
|
fa2d27 |
htm_commit ()
|
|
|
fa2d27 |
{
|
|
|
fa2d27 |
- _xend();
|
|
|
fa2d27 |
+// _xend();
|
|
|
fa2d27 |
+ __asm volatile (".byte 0x0f, 0x01, 0xd5" : : : "memory");
|
|
|
fa2d27 |
}
|
|
|
fa2d27 |
|
|
|
fa2d27 |
static inline void
|
|
|
fa2d27 |
@@ -117,7 +121,8 @@ htm_abort ()
|
|
|
fa2d27 |
{
|
|
|
fa2d27 |
// ??? According to a yet unpublished ABI rule, 0xff is reserved and
|
|
|
fa2d27 |
// supposed to signal a busy lock. Source: andi.kleen@intel.com
|
|
|
fa2d27 |
- _xabort(0xff);
|
|
|
fa2d27 |
+// _xabort(0xff);
|
|
|
fa2d27 |
+ __asm volatile (".byte 0xc6, 0xf8, 0xff" : : : "memory");
|
|
|
fa2d27 |
}
|
|
|
fa2d27 |
|
|
|
fa2d27 |
static inline bool
|
|
|
fa2d27 |
@@ -130,7 +135,10 @@ htm_abort_should_retry (uint32_t begin_r
|
|
|
fa2d27 |
static inline bool
|
|
|
fa2d27 |
htm_transaction_active ()
|
|
|
fa2d27 |
{
|
|
|
fa2d27 |
- return _xtest() != 0;
|
|
|
fa2d27 |
+// return _xtest() != 0;
|
|
|
fa2d27 |
+ bool ret;
|
|
|
fa2d27 |
+ __asm volatile (".byte 0x0f, 0x01, 0xd6; setne %%al" : "=a" (ret) : : "memory");
|
|
|
fa2d27 |
+ return ret;
|
|
|
fa2d27 |
}
|
|
|
fa2d27 |
#endif
|
|
|
fa2d27 |
|