diff options
| author | Sean Callanan <scallanan@apple.com> | 2011-02-22 02:09:15 +0000 |
|---|---|---|
| committer | Sean Callanan <scallanan@apple.com> | 2011-02-22 02:09:15 +0000 |
| commit | 5b23294799a07f2779b9a7a8fa5bf7f5ea55af18 (patch) | |
| tree | 68e987fc474f1d6b555391d01c35ffa46b6649ce /llvm/tools/llvm-mc/Disassembler.cpp | |
| parent | 7d2f87b9a83697eabf9c22b70018d6872d5604a8 (diff) | |
| download | bcm5719-llvm-5b23294799a07f2779b9a7a8fa5bf7f5ea55af18.tar.gz bcm5719-llvm-5b23294799a07f2779b9a7a8fa5bf7f5ea55af18.zip | |
Fixed llvm-mc in edis mode to use the result of
operand.evaluate as an error code, not as the
contents of the operand.
llvm-svn: 126181
Diffstat (limited to 'llvm/tools/llvm-mc/Disassembler.cpp')
| -rw-r--r-- | llvm/tools/llvm-mc/Disassembler.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/llvm/tools/llvm-mc/Disassembler.cpp b/llvm/tools/llvm-mc/Disassembler.cpp index c29d82a2cb3..d76c36155fe 100644 --- a/llvm/tools/llvm-mc/Disassembler.cpp +++ b/llvm/tools/llvm-mc/Disassembler.cpp @@ -328,7 +328,10 @@ int Disassembler::disassembleEnhanced(const std::string &TS, uint64_t evaluatedResult; void *Arg[] = { disassembler, &Out }; - evaluatedResult = operand->evaluate(evaluatedResult, verboseEvaluator, Arg); + if (operand->evaluate(evaluatedResult, verboseEvaluator, Arg)) { + errs() << "error: Couldn't evaluate an operand\n"; + return -1; + } Out << "=" << evaluatedResult << " "; } |
