6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-04-03 18:32:50 +00:00
Code Issues Projects Releases Wiki Activity

[mips] Improve error/warning messages and testing for the .cpload assembler directive.

Browse Source 
Summary:
Improved warning message when using .cpload inside a reorder section and added an error message for using .cpload with Mips16 enabled.
Modified the tests to fit with the changes mentioned above, added a test-case for the N32 ABI in cpload.s and did some reformatting to make the tests easier to read.

Reviewers: dsanders

Reviewed By: dsanders

Subscribers: llvm-commits

Differential Revision: http://reviews.llvm.org/D5465

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@221447 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Toma Tabacu 2014-11-06 10:02:45 +00:00
parent 10f28ec3ef
commit ea60f51d87
3 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Target/Mips/AsmParser/MipsAsmParser.cpp
View File

@ -3030,9 +3030,12 @@ bool MipsAsmParser::eatComma(StringRef ErrorStr) {
bool MipsAsmParser::parseDirectiveCpLoad(SMLoc Loc) {
if (AssemblerOptions.back()->isReorder())
Warning(Loc, ".cpload in reorder section");
Warning(Loc, ".cpload should be inside a noreorder section");
// FIXME: Warn if cpload is used in Mips16 mode.
if (inMips16Mode()) {
reportParseError(".cpload is not supported in Mips16 mode");
return false;
}
SmallVector<std::unique_ptr<MCParsedAsmOperand>, 1> Reg;
OperandMatchResultTy ResTy = parseAnyRegister(Reg);
@ -3047,6 +3050,12 @@ bool MipsAsmParser::parseDirectiveCpLoad(SMLoc Loc) {
return false;
}
// If this is not the end of the statement, report an error.
if (getLexer().isNot(AsmToken::EndOfStatement)) {
reportParseError("unexpected token, expected end of statement");
return false;
}
getTargetStreamer().emitDirectiveCpLoad(RegOpnd.getGPR32Reg());
return false;
}

14
test/MC/Mips/cpload-bad.s
View File

@ -3,13 +3,25 @@
.text
.option pic2
.set noreorder
.set mips16
.cpload $25
# ASM: :[[@LINE-1]]:17: error: .cpload is not supported in Mips16 mode
.set nomips16
.set reorder
.cpload $25
# ASM: :[[@LINE-1]]:9: warning: .cpload in reorder section
# ASM: :[[@LINE-1]]:9: warning: .cpload should be inside a noreorder section
.set noreorder
.cpload $32
# ASM: :[[@LINE-1]]:17: error: invalid register
.cpload $foo
# ASM: :[[@LINE-1]]:17: error: expected register containing function address
.cpload bar
# ASM: :[[@LINE-1]]:17: error: expected register containing function address
.cpload $25 foobar
# ASM: :[[@LINE-1]]:21: error: unexpected token, expected end of statement

41
test/MC/Mips/cpload.s
View File

@ -1,12 +1,16 @@
# RUN: llvm-mc %s -arch=mips -mcpu=mips32r2 | FileCheck %s -check-prefix=ASM
#
# RUN: llvm-mc %s -arch=mips -mcpu=mips32r2 -filetype=obj -o -| \
# RUN: llvm-objdump -d -r -arch=mips - | \
# RUN: FileCheck %s -check-prefix=OBJ
# RUN: llvm-mc %s -arch=mips -mcpu=mips32r2 -mattr=+o32 -filetype=obj -o -| \
# RUN: llvm-objdump -d -r -arch=mips - | \
# RUN: FileCheck %s -check-prefix=OBJ-O32
# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64r2 -filetype=obj -o -| \
# RUN: llvm-objdump -d -r -arch=mips - | \
# RUN: FileCheck %s -check-prefix=OBJ64
# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64r2 -mattr=-n64,+n32 -filetype=obj -o -| \
# RUN: llvm-objdump -d -r -arch=mips - | \
# RUN: FileCheck %s -check-prefix=OBJ-N32
# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64r2 -mattr=+n64 -filetype=obj -o -| \
# RUN: llvm-objdump -d -r -arch=mips - | \
# RUN: FileCheck %s -check-prefix=OBJ-N64
# ASM: .text
# ASM: .option pic2
@ -14,17 +18,22 @@
# ASM: .cpload $25
# ASM: .set reorder
# OBJ: .text
# OBJ: lui $gp, 0
# OBJ: R_MIPS_HI16 _gp_disp
# OBJ: addiu $gp, $gp, 0
# OBJ: R_MIPS_LO16 _gp_disp
# OBJ: addu $gp, $gp, $25
# OBJ-O32: .text
# OBJ-O32: lui $gp, 0
# OBJ-O32: R_MIPS_HI16 _gp_disp
# OBJ-O32: addiu $gp, $gp, 0
# OBJ-O32: R_MIPS_LO16 _gp_disp
# OBJ-O32: addu $gp, $gp, $25
# OBJ64: .text
# OBJ64-NOT: lui $gp, 0
# OBJ64-NOT: addiu $gp, $gp, 0
# OBJ64-NOT: addu $gp, $gp, $25
# OBJ-N32: .text
# OBJ-N32-NOT: lui $gp, 0
# OBJ-N32-NOT: addiu $gp, $gp, 0
# OBJ-N32-NOT: addu $gp, $gp, $25
# OBJ-N64: .text
# OBJ-N64-NOT: lui $gp, 0
# OBJ-N64-NOT: addiu $gp, $gp, 0
# OBJ-N64-NOT: addu $gp, $gp, $25
.text
.option pic2