Commit 2880181f authored by jochen@chromium.org's avatar jochen@chromium.org

Partial revert of r21901

Only disable runtime check for sse2 if __SSE2__ is not defined. This
is required for the x87 port

BUG=none
LOG=n
R=jkummerow@chromium.org

Review URL: https://codereview.chromium.org/350693005

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@21927 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 064885b6
...@@ -42,6 +42,7 @@ namespace base { ...@@ -42,6 +42,7 @@ namespace base {
// default values should hopefully be pretty safe. // default values should hopefully be pretty safe.
struct AtomicOps_x86CPUFeatureStruct AtomicOps_Internalx86CPUFeatures = { struct AtomicOps_x86CPUFeatureStruct AtomicOps_Internalx86CPUFeatures = {
false, // bug can't exist before process spawns multiple threads false, // bug can't exist before process spawns multiple threads
false, // no SSE2
}; };
} } // namespace v8::base } } // namespace v8::base
...@@ -87,6 +88,11 @@ void AtomicOps_Internalx86CPUFeaturesInit() { ...@@ -87,6 +88,11 @@ void AtomicOps_Internalx86CPUFeaturesInit() {
} else { } else {
AtomicOps_Internalx86CPUFeatures.has_amd_lock_mb_bug = false; AtomicOps_Internalx86CPUFeatures.has_amd_lock_mb_bug = false;
} }
#if !defined(__SSE2__)
// edx bit 26 is SSE2 which we use to tell use whether we can use mfence
AtomicOps_Internalx86CPUFeatures.has_sse2 = ((edx >> 26) & 1);
#endif
} }
class AtomicOpsx86Initializer { class AtomicOpsx86Initializer {
......
...@@ -17,6 +17,9 @@ namespace base { ...@@ -17,6 +17,9 @@ namespace base {
struct AtomicOps_x86CPUFeatureStruct { struct AtomicOps_x86CPUFeatureStruct {
bool has_amd_lock_mb_bug; // Processor has AMD memory-barrier bug; do lfence bool has_amd_lock_mb_bug; // Processor has AMD memory-barrier bug; do lfence
// after acquire compare-and-swap. // after acquire compare-and-swap.
#if !defined(__SSE2__)
bool has_sse2; // Processor has SSE2.
#endif
}; };
extern struct AtomicOps_x86CPUFeatureStruct AtomicOps_Internalx86CPUFeatures; extern struct AtomicOps_x86CPUFeatureStruct AtomicOps_Internalx86CPUFeatures;
...@@ -91,7 +94,10 @@ inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) { ...@@ -91,7 +94,10 @@ inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) {
*ptr = value; *ptr = value;
} }
// We require SSE2, so mfence is guaranteed to exist. #if defined(__x86_64__) || defined(__SSE2__)
// 64-bit implementations of memory barrier can be simpler, because it
// "mfence" is guaranteed to exist.
inline void MemoryBarrier() { inline void MemoryBarrier() {
__asm__ __volatile__("mfence" : : : "memory"); __asm__ __volatile__("mfence" : : : "memory");
} }
...@@ -101,6 +107,28 @@ inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) { ...@@ -101,6 +107,28 @@ inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) {
MemoryBarrier(); MemoryBarrier();
} }
#else
inline void MemoryBarrier() {
if (AtomicOps_Internalx86CPUFeatures.has_sse2) {
__asm__ __volatile__("mfence" : : : "memory");
} else { // mfence is faster but not present on PIII
Atomic32 x = 0;
NoBarrier_AtomicExchange(&x, 0); // acts as a barrier on PIII
}
}
inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) {
if (AtomicOps_Internalx86CPUFeatures.has_sse2) {
*ptr = value;
__asm__ __volatile__("mfence" : : : "memory");
} else {
NoBarrier_AtomicExchange(ptr, value);
// acts as a barrier on PIII
}
}
#endif
inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) { inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) {
ATOMICOPS_COMPILER_BARRIER(); ATOMICOPS_COMPILER_BARRIER();
*ptr = value; // An x86 store acts as a release barrier. *ptr = value; // An x86 store acts as a release barrier.
......
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