diff --git a/bindings/nodejs/consts/keystone.js b/bindings/nodejs/consts/keystone.js
index df6504d0622404f2e3b6c0b4b588296824e21c52..30927dd5fd61feafd5e0bc54bc9674c9b21d417e 100644
--- a/bindings/nodejs/consts/keystone.js
+++ b/bindings/nodejs/consts/keystone.js
@@ -54,17 +54,18 @@ module.exports.ERR_ASM_VARIANT_INVALID = 137
module.exports.ERR_ASM_EXPR_BRACKET = 138
module.exports.ERR_ASM_SYMBOL_MODIFIER = 139
module.exports.ERR_ASM_SYMBOL_REDEFINED = 140
-module.exports.ERR_ASM_RPAREN = 141
-module.exports.ERR_ASM_STAT_TOKEN = 142
-module.exports.ERR_ASM_UNSUPPORTED = 143
-module.exports.ERR_ASM_MACRO_TOKEN = 144
-module.exports.ERR_ASM_MACRO_PAREN = 145
-module.exports.ERR_ASM_MACRO_EQU = 146
-module.exports.ERR_ASM_MACRO_ARGS = 147
-module.exports.ERR_ASM_MACRO_LEVELS_EXCEED = 148
-module.exports.ERR_ASM_ESC_BACKSLASH = 149
-module.exports.ERR_ASM_ESC_OCTAL = 150
-module.exports.ERR_ASM_ESC_SEQUENCE = 151
+module.exports.ERR_ASM_SYMBOL_NOTFOUND = 141
+module.exports.ERR_ASM_RPAREN = 142
+module.exports.ERR_ASM_STAT_TOKEN = 143
+module.exports.ERR_ASM_UNSUPPORTED = 144
+module.exports.ERR_ASM_MACRO_TOKEN = 145
+module.exports.ERR_ASM_MACRO_PAREN = 146
+module.exports.ERR_ASM_MACRO_EQU = 147
+module.exports.ERR_ASM_MACRO_ARGS = 148
+module.exports.ERR_ASM_MACRO_LEVELS_EXCEED = 149
+module.exports.ERR_ASM_ESC_BACKSLASH = 150
+module.exports.ERR_ASM_ESC_OCTAL = 151
+module.exports.ERR_ASM_ESC_SEQUENCE = 152
module.exports.ERR_ASM_INVALIDOPERAND = 512
module.exports.ERR_ASM_MISSINGFEATURE = 513
module.exports.ERR_ASM_MNEMONICFAIL = 514
diff --git a/bindings/python/keystone/keystone_const.py b/bindings/python/keystone/keystone_const.py
index 96162774621587081e17de1ba3c8b9fe8cd9911c..f0d22ff0845395ae067ed7bdc7cede8a25125316 100644
--- a/bindings/python/keystone/keystone_const.py
+++ b/bindings/python/keystone/keystone_const.py
@@ -54,17 +54,18 @@ KS_ERR_ASM_VARIANT_INVALID = 137
KS_ERR_ASM_EXPR_BRACKET = 138
KS_ERR_ASM_SYMBOL_MODIFIER = 139
KS_ERR_ASM_SYMBOL_REDEFINED = 140
-KS_ERR_ASM_RPAREN = 141
-KS_ERR_ASM_STAT_TOKEN = 142
-KS_ERR_ASM_UNSUPPORTED = 143
-KS_ERR_ASM_MACRO_TOKEN = 144
-KS_ERR_ASM_MACRO_PAREN = 145
-KS_ERR_ASM_MACRO_EQU = 146
-KS_ERR_ASM_MACRO_ARGS = 147
-KS_ERR_ASM_MACRO_LEVELS_EXCEED = 148
-KS_ERR_ASM_ESC_BACKSLASH = 149
-KS_ERR_ASM_ESC_OCTAL = 150
-KS_ERR_ASM_ESC_SEQUENCE = 151
+KS_ERR_ASM_SYMBOL_NOTFOUND = 141
+KS_ERR_ASM_RPAREN = 142
+KS_ERR_ASM_STAT_TOKEN = 143
+KS_ERR_ASM_UNSUPPORTED = 144
+KS_ERR_ASM_MACRO_TOKEN = 145
+KS_ERR_ASM_MACRO_PAREN = 146
+KS_ERR_ASM_MACRO_EQU = 147
+KS_ERR_ASM_MACRO_ARGS = 148
+KS_ERR_ASM_MACRO_LEVELS_EXCEED = 149
+KS_ERR_ASM_ESC_BACKSLASH = 150
+KS_ERR_ASM_ESC_OCTAL = 151
+KS_ERR_ASM_ESC_SEQUENCE = 152
KS_ERR_ASM_INVALIDOPERAND = 512
KS_ERR_ASM_MISSINGFEATURE = 513
KS_ERR_ASM_MNEMONICFAIL = 514
diff --git a/bindings/ruby/keystone_gem/lib/keystone/keystone_const.rb b/bindings/ruby/keystone_gem/lib/keystone/keystone_const.rb
index 81dc47c9dcaf81752c90096de90304d1c50fc682..ce575ed5401dd229f084ec7c701362317d98c386 100644
--- a/bindings/ruby/keystone_gem/lib/keystone/keystone_const.rb
+++ b/bindings/ruby/keystone_gem/lib/keystone/keystone_const.rb
@@ -56,17 +56,18 @@ module Keystone
KS_ERR_ASM_EXPR_BRACKET = 138
KS_ERR_ASM_SYMBOL_MODIFIER = 139
KS_ERR_ASM_SYMBOL_REDEFINED = 140
- KS_ERR_ASM_RPAREN = 141
- KS_ERR_ASM_STAT_TOKEN = 142
- KS_ERR_ASM_UNSUPPORTED = 143
- KS_ERR_ASM_MACRO_TOKEN = 144
- KS_ERR_ASM_MACRO_PAREN = 145
- KS_ERR_ASM_MACRO_EQU = 146
- KS_ERR_ASM_MACRO_ARGS = 147
- KS_ERR_ASM_MACRO_LEVELS_EXCEED = 148
- KS_ERR_ASM_ESC_BACKSLASH = 149
- KS_ERR_ASM_ESC_OCTAL = 150
- KS_ERR_ASM_ESC_SEQUENCE = 151
+ KS_ERR_ASM_SYMBOL_NOTFOUND = 141
+ KS_ERR_ASM_RPAREN = 142
+ KS_ERR_ASM_STAT_TOKEN = 143
+ KS_ERR_ASM_UNSUPPORTED = 144
+ KS_ERR_ASM_MACRO_TOKEN = 145
+ KS_ERR_ASM_MACRO_PAREN = 146
+ KS_ERR_ASM_MACRO_EQU = 147
+ KS_ERR_ASM_MACRO_ARGS = 148
+ KS_ERR_ASM_MACRO_LEVELS_EXCEED = 149
+ KS_ERR_ASM_ESC_BACKSLASH = 150
+ KS_ERR_ASM_ESC_OCTAL = 151
+ KS_ERR_ASM_ESC_SEQUENCE = 152
KS_ERR_ASM_INVALIDOPERAND = 512
KS_ERR_ASM_MISSINGFEATURE = 513
KS_ERR_ASM_MNEMONICFAIL = 514
diff --git a/include/keystone/keystone.h b/include/keystone/keystone.h
index dfd776fee0b5950dc6d87bcef6dc38ff194d2741..1db837ffbe0659364ed3bd03fd5d9f37dcc87028 100644
--- a/include/keystone/keystone.h
+++ b/include/keystone/keystone.h
@@ -110,6 +110,7 @@ typedef enum ks_err {
KS_ERR_ASM_EXPR_BRACKET, // brackets expression not supported on this target
KS_ERR_ASM_SYMBOL_MODIFIER, // unexpected symbol modifier following '@'
KS_ERR_ASM_SYMBOL_REDEFINED, // invalid symbol redefinition
+ KS_ERR_ASM_SYMBOL_NOTFOUND, // cannot find symbol
KS_ERR_ASM_RPAREN, // expected ')' in parentheses expression
KS_ERR_ASM_STAT_TOKEN, // unexpected token at start of statement
KS_ERR_ASM_UNSUPPORTED, // unsupported token yet
diff --git a/llvm/include/llvm/MC/MCAssembler.h b/llvm/include/llvm/MC/MCAssembler.h
index ff069a8273ac6722036e44514d6474c883cae442..1e504fd5133d15e644ad5448c3d20fffb4e097e9 100644
--- a/llvm/include/llvm/MC/MCAssembler.h
+++ b/llvm/include/llvm/MC/MCAssembler.h
@@ -163,7 +163,7 @@ private:
/// relocation.
bool evaluateFixup(const MCAsmLayout &Layout, const MCFixup &Fixup,
const MCFragment *DF, MCValue &Target,
- uint64_t &Value) const;
+ uint64_t &Value, unsigned int &KsError) const;
/// Check whether a fixup can be satisfied, or whether it needs to be relaxed
/// (increased in size, in order to hold its value correctly).
@@ -194,7 +194,7 @@ private:
void finishLayout(MCAsmLayout &Layout);
std::pair<uint64_t, bool> handleFixup(const MCAsmLayout &Layout,
- MCFragment &F, const MCFixup &Fixup);
+ MCFragment &F, const MCFixup &Fixup, unsigned int &KsError);
public:
/// Compute the effective fragment size assuming it is laid out at the given
@@ -265,10 +265,10 @@ public:
/// Finish - Do final processing and write the object to the output stream.
/// \p Writer is used for custom object writer (as the MCJIT does),
/// if not specified it is automatically created from backend.
- void Finish();
+ void Finish(unsigned int &KsError);
// Layout all section and prepare them for emission.
- void layout(MCAsmLayout &Layout);
+ void layout(MCAsmLayout &Layout, unsigned int &KsError);
// FIXME: This does not belong here.
bool getSubsectionsViaSymbols() const { return SubsectionsViaSymbols; }
diff --git a/llvm/include/llvm/MC/MCELFStreamer.h b/llvm/include/llvm/MC/MCELFStreamer.h
index 0500861b404e799e06cc3b8931400a17fb2e855c..ebe439e141669dc91cd6dfd53cfdfcf45f319c5c 100644
--- a/llvm/include/llvm/MC/MCELFStreamer.h
+++ b/llvm/include/llvm/MC/MCELFStreamer.h
@@ -76,7 +76,7 @@ public:
void EmitValueToAlignment(unsigned, int64_t, unsigned, unsigned) override;
- void FinishImpl() override;
+ unsigned int FinishImpl() override;
void EmitBundleAlignMode(unsigned AlignPow2) override;
void EmitBundleLock(bool AlignToEnd) override;
diff --git a/llvm/include/llvm/MC/MCObjectStreamer.h b/llvm/include/llvm/MC/MCObjectStreamer.h
index 9d411a26cea40697dc2e9e80ff167dc43ed685a3..7ecc137748729d01b82b6780fcb69575f54eb8b6 100644
--- a/llvm/include/llvm/MC/MCObjectStreamer.h
+++ b/llvm/include/llvm/MC/MCObjectStreamer.h
@@ -137,7 +137,7 @@ public:
bool EmitRelocDirective(const MCExpr &Offset, StringRef Name,
const MCExpr *Expr, SMLoc Loc) override;
void EmitFill(uint64_t NumBytes, uint8_t FillValue) override;
- void FinishImpl() override;
+ unsigned int FinishImpl() override;
/// Emit the absolute difference between two symbols if possible.
///
diff --git a/llvm/include/llvm/MC/MCStreamer.h b/llvm/include/llvm/MC/MCStreamer.h
index 509f5b49551c0662cc754bf9d1d6bddb6b6a0d76..262c9bada9c2e081de3e551ffa25d22b0bd3fb3b 100644
--- a/llvm/include/llvm/MC/MCStreamer.h
+++ b/llvm/include/llvm/MC/MCStreamer.h
@@ -742,9 +742,9 @@ public:
void EmitRawText(const Twine &String);
/// \brief Streamer specific finalization.
- virtual void FinishImpl();
+ virtual unsigned int FinishImpl();
/// \brief Finish emission of machine code.
- void Finish();
+ unsigned int Finish();
virtual bool mayHaveInstructions(MCSection &Sec) const { return true; }
};
diff --git a/llvm/keystone/ks.cpp b/llvm/keystone/ks.cpp
index fe3f0ba3d557dbd2f851afd9abd9f7c018b52eb0..ccef24ca866f63bae22040d51e42094ef8343747 100644
--- a/llvm/keystone/ks.cpp
+++ b/llvm/keystone/ks.cpp
@@ -94,6 +94,8 @@ const char *ks_strerror(ks_err code)
return "Unexpected symbol modifier following '@' (KS_ERR_ASM_SYMBOL_MODIFIER)";
case KS_ERR_ASM_SYMBOL_REDEFINED:
return "Invalid symbol redefined (KS_ERR_ASM_SYMBOL_REDEFINED)";
+ case KS_ERR_ASM_SYMBOL_NOTFOUND:
+ return "Cannot find a symbol (KS_ERR_ASM_SYMBOL_NOTFOUND)";
case KS_ERR_ASM_RPAREN: // expected ')' in parentheses expression
return "Expected ')' (KS_ERR_ASM_RPAREN)";
case KS_ERR_ASM_STAT_TOKEN: // unexpected token at start of statement
diff --git a/llvm/lib/MC/MCAssembler.cpp b/llvm/lib/MC/MCAssembler.cpp
index 2b4848730c08e9c961feb08f5851912fe3363cd4..ede069180b50fded184cccc5c913ecf0c0ba56b5 100644
--- a/llvm/lib/MC/MCAssembler.cpp
+++ b/llvm/lib/MC/MCAssembler.cpp
@@ -146,8 +146,10 @@ const MCSymbol *MCAssembler::getAtom(const MCSymbol &S) const {
bool MCAssembler::evaluateFixup(const MCAsmLayout &Layout,
const MCFixup &Fixup, const MCFragment *DF,
- MCValue &Target, uint64_t &Value) const
+ MCValue &Target, uint64_t &Value, unsigned int &KsError) const
{
+ KsError = 0;
+
// FIXME: This code has some duplication with recordRelocation. We should
// probably merge the two into a single callback that tries to evaluate a
// fixup and records a relocation if one is needed.
@@ -192,6 +194,10 @@ bool MCAssembler::evaluateFixup(const MCAsmLayout &Layout,
const MCSymbol &Sym = A->getSymbol();
if (Sym.isDefined())
Value += Layout.getSymbolOffset(Sym);
+ else {
+ KsError = KS_ERR_ASM_SYMBOL_NOTFOUND;
+ return false;
+ }
}
if (const MCSymbolRefExpr *B = Target.getSymB()) {
const MCSymbol &Sym = B->getSymbol();
@@ -219,7 +225,6 @@ bool MCAssembler::evaluateFixup(const MCAsmLayout &Layout,
Backend.processFixupValue(*this, Layout, Fixup, DF, Target, Value,
IsResolved);
-
return IsResolved;
}
@@ -573,13 +578,17 @@ void MCAssembler::writeSectionData(const MCSection *Sec,
std::pair<uint64_t, bool> MCAssembler::handleFixup(const MCAsmLayout &Layout,
MCFragment &F,
- const MCFixup &Fixup) {
+ const MCFixup &Fixup, unsigned int &KsError) {
// Evaluate the fixup.
MCValue Target;
uint64_t FixedValue;
bool IsPCRel = Backend.getFixupKindInfo(Fixup.getKind()).Flags &
MCFixupKindInfo::FKF_IsPCRel;
- if (!evaluateFixup(Layout, Fixup, &F, Target, FixedValue)) {
+ if (!evaluateFixup(Layout, Fixup, &F, Target, FixedValue, KsError)) {
+ if (KsError) {
+ // return a dummy value
+ return std::make_pair(0, false);
+ }
// The fixup was unresolved, we need a relocation. Inform the object
// writer of the relocation, and give it an opportunity to adjust the
// fixup value if need be.
@@ -589,7 +598,8 @@ std::pair<uint64_t, bool> MCAssembler::handleFixup(const MCAsmLayout &Layout,
return std::make_pair(FixedValue, IsPCRel);
}
-void MCAssembler::layout(MCAsmLayout &Layout) {
+void MCAssembler::layout(MCAsmLayout &Layout, unsigned int &KsError)
+{
DEBUG_WITH_TYPE("mc-dump", {
llvm::errs() << "assembler backend - pre-layout\n--\n";
dump(); });
@@ -657,7 +667,9 @@ void MCAssembler::layout(MCAsmLayout &Layout) {
for (const MCFixup &Fixup : Fixups) {
uint64_t FixedValue;
bool IsPCRel;
- std::tie(FixedValue, IsPCRel) = handleFixup(Layout, *F, Fixup);
+ std::tie(FixedValue, IsPCRel) = handleFixup(Layout, *F, Fixup, KsError);
+ if (KsError)
+ return;
getBackend().applyFixup(Fixup, Contents.data(),
Contents.size(), FixedValue, IsPCRel);
}
@@ -665,13 +677,14 @@ void MCAssembler::layout(MCAsmLayout &Layout) {
}
}
-void MCAssembler::Finish() {
+void MCAssembler::Finish(unsigned int &KsError) {
// Create the layout object.
MCAsmLayout Layout(*this);
- layout(Layout);
+ layout(Layout, KsError);
// Write the object file.
- getWriter().writeObject(*this, Layout);
+ if (!KsError)
+ getWriter().writeObject(*this, Layout);
}
bool MCAssembler::fixupNeedsRelaxation(const MCFixup &Fixup,
@@ -679,7 +692,8 @@ bool MCAssembler::fixupNeedsRelaxation(const MCFixup &Fixup,
const MCAsmLayout &Layout) const {
MCValue Target;
uint64_t Value;
- bool Resolved = evaluateFixup(Layout, Fixup, DF, Target, Value);
+ unsigned int KsError;
+ bool Resolved = evaluateFixup(Layout, Fixup, DF, Target, Value, KsError);
return getBackend().fixupNeedsRelaxationAdvanced(Fixup, Resolved, Value, DF,
Layout);
}
diff --git a/llvm/lib/MC/MCELFStreamer.cpp b/llvm/lib/MC/MCELFStreamer.cpp
index 540125a56ed620dec13b1002ed1baace2f2635e9..f93129b38c4df75940fc5efe9a791e4e22d6b25c 100644
--- a/llvm/lib/MC/MCELFStreamer.cpp
+++ b/llvm/lib/MC/MCELFStreamer.cpp
@@ -623,14 +623,14 @@ void MCELFStreamer::EmitBundleUnlock() {
Sec.setBundleLockState(MCSection::NotBundleLocked);
}
-void MCELFStreamer::FinishImpl() {
+unsigned int MCELFStreamer::FinishImpl() {
// Ensure the last section gets aligned if necessary.
MCSection *CurSection = getCurrentSectionOnly();
setSectionAlignmentForBundling(getAssembler(), CurSection);
EmitFrames(nullptr);
- this->MCObjectStreamer::FinishImpl();
+ return this->MCObjectStreamer::FinishImpl();
}
MCStreamer *llvm::createELFStreamer(MCContext &Context, MCAsmBackend &MAB,
diff --git a/llvm/lib/MC/MCObjectStreamer.cpp b/llvm/lib/MC/MCObjectStreamer.cpp
index ae2403036e7449e69afe5e3d1a2e4b4bef89e322..4335af9476d30ac85981e5a4845052b831c333bb 100644
--- a/llvm/lib/MC/MCObjectStreamer.cpp
+++ b/llvm/lib/MC/MCObjectStreamer.cpp
@@ -501,7 +501,8 @@ void MCObjectStreamer::EmitFill(uint64_t NumBytes, uint8_t FillValue) {
insert(new MCFillFragment(FillValue, NumBytes));
}
-void MCObjectStreamer::FinishImpl() {
+unsigned int MCObjectStreamer::FinishImpl() {
+ unsigned int KsError = 0;
// If we are generating dwarf for assembly source files dump out the sections.
//if (getContext().getGenDwarfForAssembly())
// MCGenDwarfInfo::Emit(this);
@@ -510,5 +511,7 @@ void MCObjectStreamer::FinishImpl() {
//MCDwarfLineTable::Emit(this, getAssembler().getDWARFLinetableParams());
flushPendingLabels(nullptr);
- getAssembler().Finish();
+ getAssembler().Finish(KsError);
+
+ return KsError;
}
diff --git a/llvm/lib/MC/MCParser/AsmParser.cpp b/llvm/lib/MC/MCParser/AsmParser.cpp
index 8378438f1a5dc150c193e9c28e9c25513ed17086..8166362157719ef3c988f32b978bbc4031da8f46 100644
--- a/llvm/lib/MC/MCParser/AsmParser.cpp
+++ b/llvm/lib/MC/MCParser/AsmParser.cpp
@@ -742,8 +742,8 @@ size_t AsmParser::Run(bool NoInitialTextSection, uint64_t Address, bool NoFinali
// Finalize the output stream if there are no errors and if the client wants
// us to.
- if (!HadError && !NoFinalize)
- Out.Finish();
+ if (!KsError && !HadError && !NoFinalize)
+ KsError = Out.Finish();
//return HadError || getContext().hadError();
return count;
@@ -1393,6 +1393,7 @@ bool AsmParser::parseStatement(ParseStatementInfo &Info,
// Statements always start with an identifier or are a full line comment.
AsmToken ID = getTok();
+ //printf(">>> parseStatement:ID = %s\n", ID.getString().str().c_str());
SMLoc IDLoc = ID.getLoc();
StringRef IDVal;
int64_t LocalLabelVal = -1;
diff --git a/llvm/lib/MC/MCStreamer.cpp b/llvm/lib/MC/MCStreamer.cpp
index 380155cf6c4dc2e14158d48754bd78969f7a64b7..e9e765f72f15eefc7d76c014870e0463a164af4c 100644
--- a/llvm/lib/MC/MCStreamer.cpp
+++ b/llvm/lib/MC/MCStreamer.cpp
@@ -612,7 +612,7 @@ void MCStreamer::EmitRawText(const Twine &T) {
void MCStreamer::EmitWindowsUnwindTables() {
}
-void MCStreamer::Finish() {
+unsigned int MCStreamer::Finish() {
if (!DwarfFrameInfos.empty() && !DwarfFrameInfos.back().End)
report_fatal_error("Unfinished frame!");
@@ -620,7 +620,7 @@ void MCStreamer::Finish() {
if (TS)
TS->finish();
- FinishImpl();
+ return FinishImpl();
}
void MCStreamer::EmitAssignment(MCSymbol *Symbol, const MCExpr *Value) {
@@ -717,7 +717,7 @@ void MCStreamer::EmitCodeAlignment(unsigned ByteAlignment,
void MCStreamer::emitValueToOffset(const MCExpr *Offset, unsigned char Value) {}
void MCStreamer::EmitBundleAlignMode(unsigned AlignPow2) {}
void MCStreamer::EmitBundleLock(bool AlignToEnd) {}
-void MCStreamer::FinishImpl() {}
+unsigned int MCStreamer::FinishImpl() { return 0; }
void MCStreamer::EmitBundleUnlock() {}
void MCStreamer::SwitchSection(MCSection *Section, const MCExpr *Subsection) {