RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

Simplify .org processing and make it a bit more powerful.

Browse Source 
We now always create the fragment, which lets us handle things like .org after
a .align.

llvm-svn: 252101
This commit is contained in:
Rafael Espindola 2015-11-04 23:50:29 +00:00
parent 3c4afd7651
commit b32d97ac38
4 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/MC/MCAssembler.cpp
View File

@ -533,12 +533,19 @@ uint64_t MCAssembler::computeFragmentSize(const MCAsmLayout &Layout,
case MCFragment::FT_Org: { case MCFragment::FT_Org: {
const MCOrgFragment &OF = cast<MCOrgFragment>(F); const MCOrgFragment &OF = cast<MCOrgFragment>(F);
int64_t TargetLocation; MCValue Value;
if (!OF.getOffset().evaluateAsAbsolute(TargetLocation, Layout)) if (!OF.getOffset().evaluateAsValue(Value, Layout))
report_fatal_error("expected assembly-time absolute expression"); report_fatal_error("expected assembly-time absolute expression");
// FIXME: We need a way to communicate this error. // FIXME: We need a way to communicate this error.
uint64_t FragmentOffset = Layout.getFragmentOffset(&OF); uint64_t FragmentOffset = Layout.getFragmentOffset(&OF);
int64_t TargetLocation = Value.getConstant();
if (const MCSymbolRefExpr *A = Value.getSymA()) {
uint64_t Val;
if (!Layout.getSymbolOffset(A->getSymbol(), Val))
report_fatal_error("expected absolute expression");
TargetLocation += Val;
}
int64_t Size = TargetLocation - FragmentOffset; int64_t Size = TargetLocation - FragmentOffset;
if (Size < 0 || Size >= 0x40000000) if (Size < 0 || Size >= 0x40000000)
report_fatal_error("invalid .org offset '" + Twine(TargetLocation) + report_fatal_error("invalid .org offset '" + Twine(TargetLocation) +

18
lib/MC/MCObjectStreamer.cpp
View File

@ -393,23 +393,7 @@ void MCObjectStreamer::EmitCodeAlignment(unsigned ByteAlignment,
bool MCObjectStreamer::EmitValueToOffset(const MCExpr *Offset, bool MCObjectStreamer::EmitValueToOffset(const MCExpr *Offset,
unsigned char Value) { unsigned char Value) {
int64_t Res; insert(new MCOrgFragment(*Offset, Value));
if (Offset->evaluateAsAbsolute(Res, getAssembler())) {
insert(new MCOrgFragment(*Offset, Value));
return false;
}
MCSymbol *CurrentPos = getContext().createTempSymbol();
EmitLabel(CurrentPos);
MCSymbolRefExpr::VariantKind Variant = MCSymbolRefExpr::VK_None;
const MCExpr *Ref =
MCSymbolRefExpr::create(CurrentPos, Variant, getContext());
const MCExpr *Delta =
MCBinaryExpr::create(MCBinaryExpr::Sub, Offset, Ref, getContext());
if (!Delta->evaluateAsAbsolute(Res, getAssembler()))
return true;
EmitFill(Res, Value);
return false; return false;
} }

2
test/MC/AsmParser/dot-symbol-non-absolute.s
View File

@ -4,6 +4,6 @@
.extern foo .extern foo
# CHECK: error: expected absolute expression # CHECK: : expected absolute expression
. = foo + 10 . = foo + 10
.byte 1 .byte 1

5
test/MC/ELF/dot-symbol-assignment.s
View File

@ -11,6 +11,9 @@ two:
three: three:
.quad 0xdddddddddddddddd .quad 0xdddddddddddddddd
.align 4
. = three + 9
// CHECK: Section { // CHECK: Section {
// CHECK: Name: .text // CHECK: Name: .text
// CHECK-NEXT: Type: // CHECK-NEXT: Type:
@ -18,5 +21,5 @@ three:
// CHECK: SectionData ( // CHECK: SectionData (
// CHECK-NEXT: 0000: FFFFFFFF FFFFFFFF 00000000 00000000 // CHECK-NEXT: 0000: FFFFFFFF FFFFFFFF 00000000 00000000
// CHECK-NEXT: 0010: 00000000 00000000 EEEEEEEE EEEEEEEE // CHECK-NEXT: 0010: 00000000 00000000 EEEEEEEE EEEEEEEE
// CHECK-NEXT: 0020: DDDDDDDD DDDDDDDD // CHECK-NEXT: 0020: DDDDDDDD DDDDDDDD 00 |
// CHECK-NEXT: ) // CHECK-NEXT: )