Author: dsanders Date: Mon Apr 27 04:44:39 2015 New Revision: 235856 URL: http://llvm.org/viewvc/llvm-project?rev=235856&view=rev Log: Merging r226905: ------------------------------------------------------------------------ r226905 | tomatabacu | 2015-01-23 10:40:19 +0000 (Fri, 23 Jan 2015) | 18 lines
[mips] Add new error message and improve testing for parsing the .module directive. Summary: We used to silently ignore any empty .module's and we used to give an error saying that we found an "unexpected token at start of statement" when the value of the option wasn't an identifier (e.g. if it was a number). We now give an error saying that we "expected .module option identifier" in both of those cases. I also fixed the other tests in mips-abi-bad.s, which all seemed to be broken. Reviewers: dsanders Reviewed By: dsanders Subscribers: llvm-commits Differential Revision: http://reviews.llvm.org/D7095 ------------------------------------------------------------------------ Modified: llvm/branches/release_36/ (props changed) llvm/branches/release_36/lib/Target/Mips/AsmParser/MipsAsmParser.cpp llvm/branches/release_36/test/MC/Mips/mips-abi-bad.s Propchange: llvm/branches/release_36/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 04:44:39 2015 @@ -1,3 +1,3 @@ /llvm/branches/Apple/Pertwee:110850,110961 /llvm/branches/type-system-rewrite:133420-134817 -/llvm/trunk:155241,226023,226029,226044,226046,226048,226058,226075,226151,226164-226166,226170-226171,226182,226407-226409,226473,226588,226616,226652,226664,226708,226711,226755,226791,226808-226809,227005,227085,227087,227089,227250,227260-227261,227290,227294,227299,227319,227339,227491,227584,227603,227628,227670,227809,227815,227903,227934,227972,227983,228049,228129,228168,228331,228411,228444,228490,228500,228507,228518,228525,228565,228656,228760-228761,228793,228842,228899,228957,228969,228979,229029,229343,229351-229352,229421,229495,229529,229731,229911,230058,231219,231227,231563,231601,232046,232085,232189 +/llvm/trunk:155241,226023,226029,226044,226046,226048,226058,226075,226151,226164-226166,226170-226171,226182,226407-226409,226473,226588,226616,226652,226664,226708,226711,226755,226791,226808-226809,226905,227005,227085,227087,227089,227250,227260-227261,227290,227294,227299,227319,227339,227491,227584,227603,227628,227670,227809,227815,227903,227934,227972,227983,228049,228129,228168,228331,228411,228444,228490,228500,228507,228518,228525,228565,228656,228760-228761,228793,228842,228899,228957,228969,228979,229029,229343,229351-229352,229421,229495,229529,229731,229911,230058,231219,231227,231563,231601,232046,232085,232189 Modified: llvm/branches/release_36/lib/Target/Mips/AsmParser/MipsAsmParser.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_36/lib/Target/Mips/AsmParser/MipsAsmParser.cpp?rev=235856&r1=235855&r2=235856&view=diff ============================================================================== --- llvm/branches/release_36/lib/Target/Mips/AsmParser/MipsAsmParser.cpp (original) +++ llvm/branches/release_36/lib/Target/Mips/AsmParser/MipsAsmParser.cpp Mon Apr 27 04:44:39 2015 @@ -3667,43 +3667,44 @@ bool MipsAsmParser::parseDirectiveModule return false; } - if (Lexer.is(AsmToken::Identifier)) { - StringRef Option = Parser.getTok().getString(); - Parser.Lex(); - - if (Option == "oddspreg") { - getTargetStreamer().emitDirectiveModuleOddSPReg(true, isABI_O32()); - clearFeatureBits(Mips::FeatureNoOddSPReg, "nooddspreg"); - - if (getLexer().isNot(AsmToken::EndOfStatement)) { - reportParseError("unexpected token, expected end of statement"); - return false; - } + StringRef Option; + if (Parser.parseIdentifier(Option)) { + reportParseError("expected .module option identifier"); + return false; + } + + if (Option == "oddspreg") { + getTargetStreamer().emitDirectiveModuleOddSPReg(true, isABI_O32()); + clearFeatureBits(Mips::FeatureNoOddSPReg, "nooddspreg"); + + // 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; + } + return false; // parseDirectiveModule has finished successfully. + } else if (Option == "nooddspreg") { + if (!isABI_O32()) { + Error(L, "'.module nooddspreg' requires the O32 ABI"); return false; - } else if (Option == "nooddspreg") { - if (!isABI_O32()) { - Error(L, "'.module nooddspreg' requires the O32 ABI"); - return false; - } - - getTargetStreamer().emitDirectiveModuleOddSPReg(false, isABI_O32()); - setFeatureBits(Mips::FeatureNoOddSPReg, "nooddspreg"); - - if (getLexer().isNot(AsmToken::EndOfStatement)) { - reportParseError("unexpected token, expected end of statement"); - return false; - } + } + getTargetStreamer().emitDirectiveModuleOddSPReg(false, isABI_O32()); + setFeatureBits(Mips::FeatureNoOddSPReg, "nooddspreg"); + + // 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; - } else if (Option == "fp") { - return parseDirectiveModuleFP(); } + return false; // parseDirectiveModule has finished successfully. + } else if (Option == "fp") { + return parseDirectiveModuleFP(); + } else { return Error(L, "'" + Twine(Option) + "' is not a valid .module option."); } - - return false; } /// parseDirectiveModuleFP Modified: llvm/branches/release_36/test/MC/Mips/mips-abi-bad.s URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_36/test/MC/Mips/mips-abi-bad.s?rev=235856&r1=235855&r2=235856&view=diff ============================================================================== --- llvm/branches/release_36/test/MC/Mips/mips-abi-bad.s (original) +++ llvm/branches/release_36/test/MC/Mips/mips-abi-bad.s Mon Apr 27 04:44:39 2015 @@ -1,20 +1,30 @@ -# Error checking for malformed abi related directives # RUN: not llvm-mc -triple mips-unknown-unknown %s 2>&1 | FileCheck %s -# CHECK: .text + +# Error checking for malformed .module directives (and .set fp=...). + .module fp=3 -# CHECK : mips-abi-bad.s:4:16: error: unsupported option -# CHECK-NEXT : .module fp=3 -# CHECK-NEXT : ^ +# CHECK: :[[@LINE-1]]:17: error: unsupported value, expected 'xx', '32' or '64' +# CHECK-NEXT: .module fp=3 +# CHECK-NEXT: ^ +# FIXME: Add separate test for .set fp=xx/32/64. .set fp=xx,6 -# CHECK :mips-abi-bad.s:5:15: error: unexpected token in statement -# CHECK-NEXT : .set fp=xx,6 -# CHECK-NEXT : ^ +# CHECK: :[[@LINE-1]]:15: error: unexpected token, expected end of statement +# CHECK-NEXT: .set fp=xx,6 +# CHECK-NEXT: ^ + + .module +# CHECK: :[[@LINE-1]]:12: error: expected .module option identifier +# CHECK-NEXT: .module +# CHECK-NEXT: ^ + + .module 34 +# CHECK: :[[@LINE-1]]:13: error: expected .module option identifier +# CHECK-NEXT: .module 34 +# CHECK-NEXT: ^ -# CHECK :.set mips16 .set mips16 .module fp=32 - -# CHECK :mips-abi-bad.s:14:13: error: .module directive must come before any code -# CHECK-NEXT : .module fp=32 -# CHECK-NEXT : ^ +# CHECK: :[[@LINE-1]]:13: error: .module directive must appear before any code +# CHECK-NEXT: .module fp=32 +# CHECK-NEXT: ^ _______________________________________________ llvm-branch-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/llvm-branch-commits
