-
Notifications
You must be signed in to change notification settings - Fork 15k
Add support for the .base64 directive (fixes #165499) #165549
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
|
Thank you for submitting a Pull Request (PR) to the LLVM Project! This PR will be automatically labeled and the relevant teams will be notified. If you wish to, you can add reviewers by using the "Reviewers" section on this page. If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers. If you have further questions, they may be answered by the LLVM GitHub User Guide. You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums. |
|
@llvm/pr-subscribers-llvm-mc Author: Ben Kallus (kenballus) ChangesStarting in version 15, GCC emits a See this godbolt link for an example. This patch adds support for the .base64 directive to AsmParser.cpp, so tools like This addresses #165499. Full diff: https://github.com/llvm/llvm-project/pull/165549.diff 1 Files Affected:
diff --git a/llvm/lib/MC/MCParser/AsmParser.cpp b/llvm/lib/MC/MCParser/AsmParser.cpp
index dd1bc2be5feb4..54bb1451a5a73 100644
--- a/llvm/lib/MC/MCParser/AsmParser.cpp
+++ b/llvm/lib/MC/MCParser/AsmParser.cpp
@@ -46,6 +46,7 @@
#include "llvm/MC/MCSymbolMachO.h"
#include "llvm/MC/MCTargetOptions.h"
#include "llvm/MC/MCValue.h"
+#include "llvm/Support/Base64.h"
#include "llvm/Support/Casting.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/ErrorHandling.h"
@@ -530,6 +531,7 @@ class AsmParser : public MCAsmParser {
DK_LTO_SET_CONDITIONAL,
DK_CFI_MTE_TAGGED_FRAME,
DK_MEMTAG,
+ DK_BASE64,
DK_END
};
@@ -552,6 +554,7 @@ class AsmParser : public MCAsmParser {
// ".ascii", ".asciz", ".string"
bool parseDirectiveAscii(StringRef IDVal, bool ZeroTerminated);
+ bool parseDirectiveBase64(); // ".base64"
bool parseDirectiveReloc(SMLoc DirectiveLoc); // ".reloc"
bool parseDirectiveValue(StringRef IDVal,
unsigned Size); // ".byte", ".long", ...
@@ -1953,6 +1956,8 @@ bool AsmParser::parseStatement(ParseStatementInfo &Info,
case DK_ASCIZ:
case DK_STRING:
return parseDirectiveAscii(IDVal, true);
+ case DK_BASE64:
+ return parseDirectiveBase64();
case DK_BYTE:
case DK_DC_B:
return parseDirectiveValue(IDVal, 1);
@@ -3076,6 +3081,21 @@ bool AsmParser::parseDirectiveAscii(StringRef IDVal, bool ZeroTerminated) {
return parseMany(parseOp);
}
+/// parseDirectiveBase64:
+// ::= .base64 "string"
+bool AsmParser::parseDirectiveBase64() {
+ std::vector<char> Decoded;
+
+ std::string str;
+
+ if (parseEscapedString(str) || str.empty() || decodeBase64(str, Decoded)) {
+ return true;
+ }
+
+ getStreamer().emitBytes(std::string(Decoded.begin(), Decoded.end()));
+ return false;
+}
+
/// parseDirectiveReloc
/// ::= .reloc expression , identifier [ , expression ]
bool AsmParser::parseDirectiveReloc(SMLoc DirectiveLoc) {
@@ -5345,6 +5365,7 @@ void AsmParser::initializeDirectiveKindMap() {
DirectiveKindMap[".asciz"] = DK_ASCIZ;
DirectiveKindMap[".string"] = DK_STRING;
DirectiveKindMap[".byte"] = DK_BYTE;
+ DirectiveKindMap[".base64"] = DK_BASE64;
DirectiveKindMap[".short"] = DK_SHORT;
DirectiveKindMap[".value"] = DK_VALUE;
DirectiveKindMap[".2byte"] = DK_2BYTE;
|
|
Please add tests. |
|
Tests added. If you'd like anything else tested, please let me know. |
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
0626420 to
4ca5466
Compare
llvm/lib/MC/MCParser/AsmParser.cpp
Outdated
| if (str.empty() || decodeBase64(str, Decoded)) { | ||
| return true; | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please can you test all your error cases?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done. Thanks.
| @@ -0,0 +1,28 @@ | |||
| # RUN: not llvm-mc -triple i386-unknown-unknown %s | FileCheck %s | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggest: ensure there is a RUN line that exits with 0
# RUN: llvm-mc -triple=x86_64 %s | FileCheck %s
# RUN: not llvm-mc -triple=x86_64 -defsym=ERR=1 %s -o /dev/null %s 2>&1 | ...
| # CHECK: TEST0: | ||
| # CHECK: .byte 0 | ||
| TEST0: | ||
| .base64 "AA==" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should have consecutive .base64 lines to ensure that the newline is correctly consumed.
Use CHECK-NEXT: whenever applicable
Starting in version 15, GCC emits a
.base64directive instead of.stringor.asciifor char arrays of length>= 3.See this godbolt link for an example.
This patch adds support for the .base64 directive to AsmParser.cpp, so tools like
llvm-mccan process the output of GCC more effectively.This addresses #165499.