[PATCH] D13869: instruction 'align' in asm blocks works incorrectly with some cases of parameters
michael zuckerman via llvm-commits
llvm-commits at lists.llvm.org
Wed Oct 21 01:52:42 PDT 2015
m_zuckerman updated this revision to Diff 37971.
http://reviews.llvm.org/D13869
Files:
lib/MC/MCParser/AsmParser.cpp
test/CodeGen/ms-inline-asm.c
Index: test/CodeGen/ms-inline-asm.c
===================================================================
--- test/CodeGen/ms-inline-asm.c
+++ test/CodeGen/ms-inline-asm.c
@@ -291,13 +291,13 @@
void t28() {
// CHECK: t28
__asm align 8
-// CHECK: .align 3
+// CHECK: .align 8
__asm align 16;
-// CHECK: .align 4
+// CHECK: .align 16
__asm align 128;
-// CHECK: .align 7
+// CHECK: .align 128
__asm ALIGN 256;
-// CHECK: .align 8
+// CHECK: .align 256
// CHECK: "~{dirflag},~{fpsr},~{flags}"()
}
Index: lib/MC/MCParser/AsmParser.cpp
===================================================================
--- lib/MC/MCParser/AsmParser.cpp
+++ lib/MC/MCParser/AsmParser.cpp
@@ -4509,8 +4509,7 @@
if (!isPowerOf2_64(IntValue))
return Error(ExprLoc, "literal value not a power of two greater then zero");
- Info.AsmRewrites->push_back(
- AsmRewrite(AOK_Align, IDLoc, 5, Log2_64(IntValue)));
+ Info.AsmRewrites->push_back(AsmRewrite(AOK_Align, IDLoc, 5));
return false;
}
@@ -4676,7 +4675,6 @@
continue;
}
- unsigned AdditionalSkip = 0;
// Rewrite expressions in $N notation.
switch (Kind) {
default:
@@ -4712,12 +4710,7 @@
OS << ".byte";
break;
case AOK_Align: {
- unsigned Val = AR.Val;
- OS << ".align " << Val;
-
- // Skip the original immediate.
- assert(Val < 10 && "Expected alignment less then 2^10.");
- AdditionalSkip = (Val < 4) ? 2 : Val < 7 ? 3 : 4;
+ OS << ".align";
break;
}
case AOK_DotOperator:
@@ -4730,7 +4723,7 @@
}
// Skip the original expression.
- AsmStart = Loc + AR.Len + AdditionalSkip;
+ AsmStart = Loc + AR.Len ;
}
// Emit the remainder of the asm string.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D13869.37971.patch
Type: text/x-patch
Size: 1754 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20151021/9b64f8f1/attachment.bin>
More information about the llvm-commits
mailing list