summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorCraig Topper <craig.topper@gmail.com>2015-12-10 06:09:41 +0000
committerCraig Topper <craig.topper@gmail.com>2015-12-10 06:09:41 +0000
commit8e44b9a4d1bb8f36d1ab0165cd5d56ab000cf0a1 (patch)
treea775ff79629f9177ae8acfefd9155e2ac0239f07 /llvm
parent897451d372a8e1fd44f191eee45015d93d5bd0c8 (diff)
downloadbcm5719-llvm-8e44b9a4d1bb8f36d1ab0165cd5d56ab000cf0a1.tar.gz
bcm5719-llvm-8e44b9a4d1bb8f36d1ab0165cd5d56ab000cf0a1.zip
[X86] Fix a couple cases were bitwise and logical operations were being mixed. NFC
llvm-svn: 255224
Diffstat (limited to 'llvm')
-rw-r--r--llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp2
-rw-r--r--llvm/lib/Target/X86/X86FrameLowering.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp b/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp
index 6140c5ac1e7..040143b1558 100644
--- a/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp
+++ b/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp
@@ -361,7 +361,7 @@ static int readPrefixes(struct InternalInstruction* insn) {
* then it should be disassembled as a xacquire/xrelease not repne/rep.
*/
if ((byte == 0xf2 || byte == 0xf3) &&
- ((nextByte == 0xf0) |
+ ((nextByte == 0xf0) ||
((nextByte & 0xfe) == 0x86 || (nextByte & 0xf8) == 0x90)))
insn->xAcquireRelease = true;
/*
diff --git a/llvm/lib/Target/X86/X86FrameLowering.cpp b/llvm/lib/Target/X86/X86FrameLowering.cpp
index 8695a0e2967..7841a84326b 100644
--- a/llvm/lib/Target/X86/X86FrameLowering.cpp
+++ b/llvm/lib/Target/X86/X86FrameLowering.cpp
@@ -1003,7 +1003,7 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF,
else if (IsFunclet)
Establisher = Uses64BitFramePtr ? X86::RDX : X86::EDX;
- if (IsWin64Prologue && IsFunclet & !IsClrFunclet) {
+ if (IsWin64Prologue && IsFunclet && !IsClrFunclet) {
// Immediately spill establisher into the home slot.
// The runtime cares about this.
// MOV64mr %rdx, 16(%rsp)
OpenPOWER on IntegriCloud