From decc2ec39ac3c4ffc7ba25e2c6a52a4d4bad62fa Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Tue, 25 Nov 2008 01:12:15 +0100 Subject: [PATCH] re PR c++/38256 (ICE with "operator auto") PR target/38256 * config/i386/sync.md (memory_barrier_nosse): New insn (memory_barrier): Generate memory_barrier_nosse insn for !TARGET_SSE2. From-SVN: r142177 --- gcc/ChangeLog | 6 ++++++ gcc/config/i386/sync.md | 25 ++++++++++++++++++------- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9dd40f7e973..b90d1f974cb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2008-11-25 Uros Bizjak + + PR target/38256 + * config/i386/sync.md (memory_barrier_nosse): New insn + (memory_barrier): Generate memory_barrier_nosse insn for !TARGET_SSE2. + 2008-11-24 Maxim Kuvyrkov * config/m68k/m68k.md (cmpdi): Use (scratch) instead of pseudo. diff --git a/gcc/config/i386/sync.md b/gcc/config/i386/sync.md index e090ea74da1..8aad0c47217 100644 --- a/gcc/config/i386/sync.md +++ b/gcc/config/i386/sync.md @@ -36,19 +36,30 @@ (unspec:BLK [(match_dup 0)] UNSPEC_MFENCE))] "" { + operands[0] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode)); + MEM_VOLATILE_P (operands[0]) = 1; + if (!TARGET_SSE2) { - /* Emit a locked no-operation when SSE2 is not available. */ - int slot = virtuals_instantiated ? SLOT_TEMP : SLOT_VIRTUAL; - rtx temp = assign_386_stack_local (QImode, slot); - emit_insn (gen_sync_iorqi (temp, CONST0_RTX (QImode))); + emit_insn (gen_memory_barrier_nosse (operands[0])); DONE; } - - operands[0] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode)); - MEM_VOLATILE_P (operands[0]) = 1; }) +(define_insn "memory_barrier_nosse" + [(set (match_operand:BLK 0 "" "") + (unspec:BLK [(match_dup 0)] UNSPEC_MFENCE)) + (clobber (reg:CC FLAGS_REG))] + + "!TARGET_SSE2" +{ + if (TARGET_64BIT) + return "lock{%;| }or{q}\t{$0, (%%rsp)|QWORD PTR [rsp], 0}"; + else + return "lock{%;| }or{l}\t{$0, (%%esp)|DWORD PTR [esp], 0}"; +} + [(set_attr "memory" "unknown")]) + ;; ??? It would be possible to use cmpxchg8b on pentium for DImode ;; changes. It's complicated because the insn uses ecx:ebx as the ;; new value; note that the registers are reversed from the order -- 2.30.2