summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 76bb21b)
raw | patch | inline | side by side (parent: 76bb21b)
author | Chad Rosier <mcrosier@apple.com> | |
Fri, 19 Apr 2013 19:29:50 +0000 (19:29 +0000) | ||
committer | Chad Rosier <mcrosier@apple.com> | |
Fri, 19 Apr 2013 19:29:50 +0000 (19:29 +0000) |
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@179875 91177308-0d34-0410-b5e6-96231b3b80d8
lib/Target/X86/AsmParser/X86AsmParser.cpp | patch | blob | history |
index 0ac55ed29fcc02e4269af095c316598a32bec5d2..395fd97f96aab5813c744daef82618c55c9dc025 100644 (file)
@@ -1341,20 +1341,20 @@ X86Operand *X86AsmParser::ParseIntelBracExpression(unsigned SegReg, SMLoc Start,
int BaseReg = SM.getBaseReg();
int IndexReg = SM.getIndexReg();
int Scale = SM.getScale();
-
- if (isParsingInlineAsm())
- return CreateMemForInlineAsm(SegReg, Disp, BaseReg, IndexReg, Scale, Start,
- End, Size, SM.getSymName());
-
- // handle [-42]
- if (!BaseReg && !IndexReg) {
- if (!SegReg)
- return X86Operand::CreateMem(Disp, Start, End, Size);
- else
- return X86Operand::CreateMem(SegReg, Disp, 0, 0, 1, Start, End, Size);
+ if (!isParsingInlineAsm()) {
+ // handle [-42]
+ if (!BaseReg && !IndexReg) {
+ if (!SegReg)
+ return X86Operand::CreateMem(Disp, Start, End, Size);
+ else
+ return X86Operand::CreateMem(SegReg, Disp, 0, 0, 1, Start, End, Size);
+ }
+ return X86Operand::CreateMem(SegReg, Disp, BaseReg, IndexReg, Scale, Start,
+ End, Size);
}
- return X86Operand::CreateMem(SegReg, Disp, BaseReg, IndexReg, Scale, Start,
- End, Size);
+
+ return CreateMemForInlineAsm(SegReg, Disp, BaseReg, IndexReg, Scale, Start,
+ End, Size, SM.getSymName());
}
// Inline assembly may use variable names with namespace alias qualifiers.