diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2011-04-29 18:20:20 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2011-04-29 18:20:20 +0000 |
| commit | c8497b6a2565046b5e6b5f2ea9dedc62b53dd966 (patch) | |
| tree | a39544a1d3dc43ae8454c506e23f649874256540 | |
| parent | 90604ab725da8a2a57cf3ca1541b14b95d619040 (diff) | |
| download | llvm-c8497b6a2565046b5e6b5f2ea9dedc62b53dd966.tar.gz llvm-c8497b6a2565046b5e6b5f2ea9dedc62b53dd966.tar.bz2 llvm-c8497b6a2565046b5e6b5f2ea9dedc62b53dd966.tar.xz | |
MCAsmLayout: Add support for computing the symbol offset of variables. Not
currently used, because variables don't get reported as being "defined".
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@130524 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/MC/MCAssembler.cpp | 27 | ||||
| -rw-r--r-- | test/MC/MachO/variable-errors.s | 8 |
2 files changed, 35 insertions, 0 deletions
diff --git a/lib/MC/MCAssembler.cpp b/lib/MC/MCAssembler.cpp index 3ebe69c5bd..8360fc9f41 100644 --- a/lib/MC/MCAssembler.cpp +++ b/lib/MC/MCAssembler.cpp @@ -102,6 +102,33 @@ uint64_t MCAsmLayout::getFragmentOffset(const MCFragment *F) const { } uint64_t MCAsmLayout::getSymbolOffset(const MCSymbolData *SD) const { + const MCSymbol &S = SD->getSymbol(); + + // If this is a variable, then recursively evaluate now. + if (S.isVariable()) { + MCValue Target; + if (!S.getVariableValue()->EvaluateAsRelocatable(Target, *this)) + report_fatal_error("unable to evaluate offset for variable '" + + S.getName() + "'"); + + // Verify that any used symbols are defined. + if (Target.getSymA() && Target.getSymA()->getSymbol().isUndefined()) + report_fatal_error("unable to evaluate offset to undefined symbol '" + + Target.getSymA()->getSymbol().getName() + "'"); + if (Target.getSymB() && Target.getSymB()->getSymbol().isUndefined()) + report_fatal_error("unable to evaluate offset to undefined symbol '" + + Target.getSymB()->getSymbol().getName() + "'"); + + uint64_t Offset = Target.getConstant(); + if (Target.getSymA()) + Offset += getSymbolOffset(&Assembler.getSymbolData( + Target.getSymA()->getSymbol())); + if (Target.getSymB()) + Offset -= getSymbolOffset(&Assembler.getSymbolData( + Target.getSymB()->getSymbol())); + return Offset; + } + assert(SD->getFragment() && "Invalid getOffset() on undefined symbol!"); return getFragmentOffset(SD->getFragment()) + SD->getOffset(); } diff --git a/test/MC/MachO/variable-errors.s b/test/MC/MachO/variable-errors.s new file mode 100644 index 0000000000..28308c691d --- /dev/null +++ b/test/MC/MachO/variable-errors.s @@ -0,0 +1,8 @@ +// RUN: not llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o %t.o 2> %t.err +// RUN: FileCheck < %t.err %s + + .data +t0_a: +t0_x = t0_a - t0_b +// CHECK: unable to evaluate offset to undefined symbol 't0_b' + .long t0_x |