diff options
| author | Daniel Sanders <daniel.sanders@imgtec.com> | 2016-05-03 13:35:44 +0000 |
|---|---|---|
| committer | Daniel Sanders <daniel.sanders@imgtec.com> | 2016-05-03 13:35:44 +0000 |
| commit | c8b0a11468678d8fc15ff69aa94d2060b56f71ae (patch) | |
| tree | f5d6017ecf81f47360c6777f7e93bdc094a64fae /test/MC/Mips/cprestore-noreorder.s | |
| parent | d56fee3447e8d5771f01fe9accf95e22408ba609 (diff) | |
[mips] Use MipsMCExpr instead of MCSymbolRefExpr for all relocations.
Summary:
This is much closer to the way MIPS relocation expressions work
(%hi(foo + 2) rather than %hi(foo) + 2) and removes the need for the
various bodges in MipsAsmParser::evaluateRelocExpr().
Removing those bodges ensures that the constant stored in MCValue is the
full 32 or 64-bit (depending on ABI) offset from the symbol. This will be used
to correct the %hi/%lo matching needed to sort the relocation table correctly.
As part of this:
* Gave MCExpr::print() the ability to omit parenthesis when emitting a
symbol reference inside a MipsMCExpr operator like %hi(X). Without this
we print things like %lo(($L1)).
* %hi(%neg(%gprel(X))) is now three MipsMCExpr's instead of one. Most of
the related special cases have been removed or moved to MipsMCExpr. We
can remove the rest as we gain support for the less common relocations
when they are not part of this specific combination.
* Renamed MipsMCExpr::VariantKind and the enum prefix ('VK_') to avoid confusion
with MCSymbolRefExpr::VariantKind and its prefix (also 'VK_').
* fixup_Mips_GOT_Local and fixup_Mips_GOT_Global were found to be identical
and merged into fixup_Mips_GOT.
* MO_GOT16 and MO_GOT turned out to be identical and have been merged into
MO_GOT.
* VK_Mips_GOT and VK_Mips_GOT16 turned out to be the same thing so they
have been merged into MEK_GOT
Reviewers: sdardis
Subscribers: dsanders, sdardis, llvm-commits
Differential Revision: http://reviews.llvm.org/D19716
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@268379 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/MC/Mips/cprestore-noreorder.s')
| -rw-r--r-- | test/MC/Mips/cprestore-noreorder.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/MC/Mips/cprestore-noreorder.s b/test/MC/Mips/cprestore-noreorder.s index 750c95a63f0c..4c2213301c2b 100644 --- a/test/MC/Mips/cprestore-noreorder.s +++ b/test/MC/Mips/cprestore-noreorder.s @@ -44,9 +44,9 @@ foo: # CHECK: lw $gp, 8($sp) # encoding: [0x8f,0xbc,0x00,0x08] # CHECK: lw $25, %got(foo)($gp) # encoding: [0x8f,0x99,A,A] -# CHECK: # fixup A - offset: 0, value: foo@GOT, kind: fixup_Mips_GOT_Local +# CHECK: # fixup A - offset: 0, value: %got(foo), kind: fixup_Mips_GOT # CHECK: addiu $25, $25, %lo(foo) # encoding: [0x27,0x39,A,A] -# CHECK: # fixup A - offset: 0, value: foo@ABS_LO, kind: fixup_Mips_LO16 +# CHECK: # fixup A - offset: 0, value: %lo(foo), kind: fixup_Mips_LO16 # CHECK: jalr $25 # encoding: [0x03,0x20,0xf8,0x09] # CHECK: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK: lw $gp, 8($sp) # encoding: [0x8f,0xbc,0x00,0x08] @@ -62,9 +62,9 @@ foo: # MICROMIPS: lw $gp, 8($sp) # encoding: [0xff,0x9d,0x00,0x08] # MICROMIPS: lw $25, %got(foo)($gp) # encoding: [0xff,0x3c,A,A] -# MICROMIPS: # fixup A - offset: 0, value: foo@GOT, kind: fixup_MICROMIPS_GOT16 +# MICROMIPS: # fixup A - offset: 0, value: %got(foo), kind: fixup_MICROMIPS_GOT16 # MICROMIPS: addiu $25, $25, %lo(foo) # encoding: [0x33,0x39,A,A] -# MICROMIPS: # fixup A - offset: 0, value: foo@ABS_LO, kind: fixup_MICROMIPS_LO16 +# MICROMIPS: # fixup A - offset: 0, value: %lo(foo), kind: fixup_MICROMIPS_LO16 # MICROMIPS: jalrs $ra, $25 # encoding: [0x03,0xf9,0x4f,0x3c] # MICROMIPS: nop # encoding: [0x0c,0x00] # MICROMIPS: lw $gp, 8($sp) # encoding: [0xff,0x9d,0x00,0x08] @@ -91,7 +91,7 @@ foo: # BAD-ABI-N32: lw $25, %got_disp(foo)($gp) # encoding: [0x8f,0x99,A,A] # BAD-ABI-N64: ld $25, %got_disp(foo)($gp) # encoding: [0xdf,0x99,A,A] -# BAD-ABI: # fixup A - offset: 0, value: foo@GOT_DISP, kind: fixup_Mips_GOT_DISP +# BAD-ABI: # fixup A - offset: 0, value: %got_disp(foo), kind: fixup_Mips_GOT_DISP # BAD-ABI: jalr $25 # encoding: [0x03,0x20,0xf8,0x09] # BAD-ABI-NOT: lw $gp, 8($sp) # encoding: [0x8f,0xbc,0x00,0x08] # BAD-ABI: .end foo |