diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/docs/ClangCommandLineReference.rst | 21 | ||||
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticDriverKinds.td | 4 | ||||
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticGroups.td | 3 | ||||
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticSemaKinds.td | 2 | ||||
| -rw-r--r-- | clang/include/clang/Basic/TargetInfo.h | 6 | ||||
| -rw-r--r-- | clang/include/clang/Driver/Options.td | 5 | ||||
| -rw-r--r-- | clang/lib/Basic/Targets/ARM.cpp | 32 | ||||
| -rw-r--r-- | clang/lib/Basic/Targets/ARM.h | 3 | ||||
| -rw-r--r-- | clang/lib/Driver/ToolChains/Arch/ARM.cpp | 38 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaDecl.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Driver/arm-reserved-reg-options.c | 35 | ||||
| -rw-r--r-- | clang/test/Sema/arm-global-regs.c | 20 |
12 files changed, 7 insertions, 164 deletions
diff --git a/clang/docs/ClangCommandLineReference.rst b/clang/docs/ClangCommandLineReference.rst index 492eec71f2e..e8d561fae95 100644 --- a/clang/docs/ClangCommandLineReference.rst +++ b/clang/docs/ClangCommandLineReference.rst @@ -2430,31 +2430,10 @@ Enable XNACK (AMDGPU only) ARM --- - -.. option:: -ffixed-r6 - -Reserve the r6 register (ARM only) - -.. option:: -ffixed-r7 - -Reserve the r7 register (ARM only) - -.. option:: -ffixed-r8 - -Reserve the r8 register (ARM only) - .. option:: -ffixed-r9 Reserve the r9 register (ARM only) -.. option:: -ffixed-r10 - -Reserve the r10 register (ARM only) - -.. option:: -ffixed-r11 - -Reserve the r11 register (ARM only) - .. option:: -mexecute-only, -mno-execute-only, -mpure-code Disallow generation of data access to code sections (ARM only) diff --git a/clang/include/clang/Basic/DiagnosticDriverKinds.td b/clang/include/clang/Basic/DiagnosticDriverKinds.td index b4904bb9d2d..39242c972ea 100644 --- a/clang/include/clang/Basic/DiagnosticDriverKinds.td +++ b/clang/include/clang/Basic/DiagnosticDriverKinds.td @@ -464,10 +464,6 @@ def warn_drv_msp430_hwmult_no_device : Warning<"no MCU device specified, but " "specify a MSP430 device, or -mhwmult to set hardware multiply type " "explicitly.">, InGroup<InvalidCommandLineArgument>; -// Frame pointer reservation. -def err_reserved_frame_pointer : Error< - "'%0' has been specified but '%1' is used as the frame pointer for this target">; - def warn_drv_libstdcxx_not_found : Warning< "include path for libstdc++ headers not found; pass '-stdlib=libc++' on the " "command line to use the libc++ standard library instead">, diff --git a/clang/include/clang/Basic/DiagnosticGroups.td b/clang/include/clang/Basic/DiagnosticGroups.td index 5bfb3de86a4..35e939fda95 100644 --- a/clang/include/clang/Basic/DiagnosticGroups.td +++ b/clang/include/clang/Basic/DiagnosticGroups.td @@ -1120,6 +1120,3 @@ def CrossTU : DiagGroup<"ctu">; def CTADMaybeUnsupported : DiagGroup<"ctad-maybe-unsupported">; def FortifySource : DiagGroup<"fortify-source">; - -// Register reservation. -def FixedRegs : DiagGroup<"fixed-registers">; diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index c30f65d9458..73e329fcf2f 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -7743,8 +7743,6 @@ let CategoryName = "Inline Assembly Issue" in { def err_asm_unknown_register_name : Error<"unknown register name '%0' in asm">; def err_asm_invalid_global_var_reg : Error<"register '%0' unsuitable for " "global register variables on this target">; - def err_asm_missing_fixed_reg_opt : Error<"-ffixed-%0 is required for " - "global named register variable declaration">; def err_asm_register_size_mismatch : Error<"size of register '%0' does not " "match variable size">; def err_asm_bad_register_type : Error<"bad type for named register variable">; diff --git a/clang/include/clang/Basic/TargetInfo.h b/clang/include/clang/Basic/TargetInfo.h index cc83f4c34c1..33cecdadc68 100644 --- a/clang/include/clang/Basic/TargetInfo.h +++ b/clang/include/clang/Basic/TargetInfo.h @@ -938,12 +938,6 @@ public: return true; } - /// Check if the register is reserved globally - /// - /// This function returns true if the register passed in RegName is reserved - /// using the corresponding -ffixed-RegName option. - virtual bool isRegisterReservedGlobally(StringRef) const { return true; } - // validateOutputConstraint, validateInputConstraint - Checks that // a constraint is valid and provides information about it. // FIXME: These should return a real error instead of just true/false. diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index daba98a39da..a64d0acb06f 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -2267,9 +2267,8 @@ def mrestrict_it: Flag<["-"], "mrestrict-it">, Group<m_arm_Features_Group>, def mno_restrict_it: Flag<["-"], "mno-restrict-it">, Group<m_arm_Features_Group>, HelpText<"Allow generation of deprecated IT blocks for ARMv8. It is off by default for ARMv8 Thumb mode">; def marm : Flag<["-"], "marm">, Alias<mno_thumb>; -foreach i = {6-11} in - def ffixed_r#i : Flag<["-"], "ffixed-r"#i>, Group<m_arm_Features_Group>, - HelpText<"Reserve the r"#i#" register (ARM only)">; +def ffixed_r9 : Flag<["-"], "ffixed-r9">, Group<m_arm_Features_Group>, + HelpText<"Reserve the r9 register (ARM only)">; def mno_movt : Flag<["-"], "mno-movt">, Group<m_arm_Features_Group>, HelpText<"Disallow use of movt/movw pairs (ARM only)">; def mcrc : Flag<["-"], "mcrc">, Group<m_Group>, diff --git a/clang/lib/Basic/Targets/ARM.cpp b/clang/lib/Basic/Targets/ARM.cpp index 92e5e26eba3..437a77afdc9 100644 --- a/clang/lib/Basic/Targets/ARM.cpp +++ b/clang/lib/Basic/Targets/ARM.cpp @@ -879,38 +879,6 @@ ArrayRef<TargetInfo::GCCRegAlias> ARMTargetInfo::getGCCRegAliases() const { return llvm::makeArrayRef(GCCRegAliases); } -bool ARMTargetInfo::validateGlobalRegisterVariable( - StringRef RegName, unsigned RegSize, bool &HasSizeMismatch) const { - bool isValid = llvm::StringSwitch<bool>(RegName) - .Case("r6", true) - .Case("r7", true) - .Case("r8", true) - .Case("r9", true) - .Case("r10", true) - .Case("r11", true) - .Case("sp", true) - .Default(false); - HasSizeMismatch = false; - return isValid; -} - -bool ARMTargetInfo::isRegisterReservedGlobally(StringRef RegName) const { - // The "sp" register does not have a -ffixed-sp option, - // so reserve it unconditionally. - if (RegName.equals("sp")) - return true; - - // reserve rN (N:6-11) registers only if the corresponding - // +reserve-rN feature is found - const std::vector<std::string> &Features = getTargetOpts().Features; - const std::string SearchFeature = "+reserve-" + RegName.str(); - for (const std::string &Feature : Features) { - if (Feature.compare(SearchFeature) == 0) - return true; - } - return false; -} - bool ARMTargetInfo::validateAsmConstraint( const char *&Name, TargetInfo::ConstraintInfo &Info) const { switch (*Name) { diff --git a/clang/lib/Basic/Targets/ARM.h b/clang/lib/Basic/Targets/ARM.h index 90fb20f8f7a..ce87a626593 100644 --- a/clang/lib/Basic/Targets/ARM.h +++ b/clang/lib/Basic/Targets/ARM.h @@ -161,9 +161,6 @@ public: ArrayRef<const char *> getGCCRegNames() const override; ArrayRef<TargetInfo::GCCRegAlias> getGCCRegAliases() const override; - bool validateGlobalRegisterVariable(StringRef RegName, unsigned RegSize, - bool &HasSizeMismatch) const override; - bool isRegisterReservedGlobally(StringRef RegName) const override; bool validateAsmConstraint(const char *&Name, TargetInfo::ConstraintInfo &Info) const override; std::string convertConstraint(const char *&Constraint) const override; diff --git a/clang/lib/Driver/ToolChains/Arch/ARM.cpp b/clang/lib/Driver/ToolChains/Arch/ARM.cpp index cca47722c20..68a57310ad4 100644 --- a/clang/lib/Driver/ToolChains/Arch/ARM.cpp +++ b/clang/lib/Driver/ToolChains/Arch/ARM.cpp @@ -592,39 +592,11 @@ fp16_fml_fallthrough: Features.push_back("+strict-align"); } - // Do not allow r9 reservation with -frwpi. - if (Args.hasArg(options::OPT_ffixed_r9) && Args.hasArg(options::OPT_frwpi)) { - Arg *A = Args.getLastArg(options::OPT_ffixed_r9); - Arg *B = Args.getLastArg(options::OPT_frwpi); - D.Diag(diag::err_opt_not_valid_with_opt) - << A->getAsString(Args) << B->getAsString(Args); - } - - // The compiler can still use a FP in certain circumstances, - // even when frame pointer elimination is enabled. Thus we should - // not allow to reserve a target's FP register. - const llvm::opt::OptSpecifier RestrictFPOpt = - (Triple.isOSDarwin() || (!Triple.isOSWindows() && Triple.isThumb())) - ? options::OPT_ffixed_r7 - : options::OPT_ffixed_r11; - if (Args.hasArg(RestrictFPOpt)) { - const std::string OptStr = - Args.getLastArg(RestrictFPOpt)->getAsString(Args); - const unsigned int SubStrIndex = strlen("ffixed-r"); - D.Diag(diag::err_reserved_frame_pointer) - << OptStr << OptStr.substr(SubStrIndex); - } - -// Reservation of general purpose registers. -#define HANDLE_FFIXED_R(n) \ - if (Args.hasArg(options::OPT_ffixed_r##n)) \ - Features.push_back("+reserve-r" #n) - HANDLE_FFIXED_R(6); - HANDLE_FFIXED_R(7); - HANDLE_FFIXED_R(8); - HANDLE_FFIXED_R(9); - HANDLE_FFIXED_R(10); - HANDLE_FFIXED_R(11); + // llvm does not support reserving registers in general. There is support + // for reserving r9 on ARM though (defined as a platform-specific register + // in ARM EABI). + if (Args.hasArg(options::OPT_ffixed_r9)) + Features.push_back("+reserve-r9"); // The kext linker doesn't know how to deal with movw/movt. if (KernelOrKext || Args.hasArg(options::OPT_mno_movt)) diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index dffb460cedc..d3503727310 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -7042,8 +7042,6 @@ NamedDecl *Sema::ActOnVariableDeclarator( Diag(E->getExprLoc(), diag::err_asm_invalid_global_var_reg) << Label; else if (HasSizeMismatch) Diag(E->getExprLoc(), diag::err_asm_register_size_mismatch) << Label; - else if (!TI.isRegisterReservedGlobally(Label)) - Diag(E->getExprLoc(), diag::err_asm_missing_fixed_reg_opt) << Label; } if (!R->isIntegralType(Context) && !R->isPointerType()) { diff --git a/clang/test/Driver/arm-reserved-reg-options.c b/clang/test/Driver/arm-reserved-reg-options.c deleted file mode 100644 index e97c717d7e7..00000000000 --- a/clang/test/Driver/arm-reserved-reg-options.c +++ /dev/null @@ -1,35 +0,0 @@ -// ## FP ARM + Thumb -// RUN: %clang -target arm-arm-none-eabi -### -ffixed-r11 -c %s 2>&1 | FileCheck -check-prefix=CHECK-ERROR-R11 %s -// RUN: %clang -target arm-arm-none-eabi -### -ffixed-r7 -c %s 2>&1 | FileCheck -check-prefix=CHECK-NO-ERROR %s - -// RUN: %clang -target arm-arm-none-eabi -### -ffixed-r7 -mthumb -c %s 2>&1 | FileCheck -check-prefix=CHECK-ERROR-R7 %s -// RUN: %clang -target arm-arm-none-eabi -### -ffixed-r11 -mthumb -c %s 2>&1 | FileCheck -check-prefix=CHECK-NO-ERROR %s - -// RUN: %clang -target thumbv6m-none-eabi -### -ffixed-r7 -c %s 2>&1 | FileCheck -check-prefix=CHECK-ERROR-R7 %s -// RUN: %clang -target thumbv6m-none-eabi -### -ffixed-r11 -c %s 2>&1 | FileCheck -check-prefix=CHECK-NO-ERROR %s - -// ## FP Darwin (R7) -// RUN: %clang -target armv6-apple-darwin9 -### -ffixed-r7 -c %s 2>&1 | FileCheck -check-prefix=CHECK-ERROR-R7 %s -// RUN: %clang -target armv6-apple-darwin9 -### -ffixed-r11 -c %s 2>&1 | FileCheck -check-prefix=CHECK-NO-ERROR %s - -// RUN: %clang -target armv6-apple-ios3 -### -ffixed-r7 -c %s 2>&1 | FileCheck -check-prefix=CHECK-ERROR-R7 %s -// RUN: %clang -target armv6-apple-ios3 -### -ffixed-r11 -c %s 2>&1 | FileCheck -check-prefix=CHECK-NO-ERROR %s - -// RUN: %clang -target armv7s-apple-darwin10 -### -ffixed-r7 -c %s 2>&1 | FileCheck -check-prefix=CHECK-ERROR-R7 %s -// RUN: %clang -target armv7s-apple-darwin10 -### -ffixed-r11 -c %s 2>&1 | FileCheck -check-prefix=CHECK-NO-ERROR %s - -// ## FP Windows (R11) -// RUN: %clang -target armv7-windows -### -ffixed-r11 -c %s 2>&1 | FileCheck -check-prefix=CHECK-ERROR-R11 %s -// RUN: %clang -target armv7-windows -### -ffixed-r7 -c %s 2>&1 | FileCheck -check-prefix=CHECK-NO-ERROR %s - -// ## FRWPI (R9) -// RUN: %clang -target arm-arm-none-eabi -### -frwpi -ffixed-r9 -c %s 2>&1 | FileCheck -check-prefix=CHECK-RESERVED-FRWPI-CONFLICT %s -// RUN: %clang -target arm-arm-none-eabi -### -ffixed-r9 -c %s 2>&1 | FileCheck -check-prefix=CHECK-RESERVED-FRWPI-VALID %s -// RUN: %clang -target arm-arm-none-eabi -### -frwpi -c %s 2>&1 | FileCheck -check-prefix=CHECK-RESERVED-FRWPI-VALID %s - -// CHECK-ERROR-R11: error: '-ffixed-r11' has been specified but 'r11' is used as the frame pointer for this target -// CHECK-ERROR-R7: error: '-ffixed-r7' has been specified but 'r7' is used as the frame pointer for this target -// CHECK-NO-ERROR-NOT: may still be used as a frame pointer - -// CHECK-RESERVED-FRWPI-CONFLICT: option '-ffixed-r9' cannot be specified with '-frwpi' -// CHECK-RESERVED-FRWPI-VALID-NOT: option '-ffixed-r9' cannot be specified with '-frwpi' diff --git a/clang/test/Sema/arm-global-regs.c b/clang/test/Sema/arm-global-regs.c deleted file mode 100644 index 753cb60e683..00000000000 --- a/clang/test/Sema/arm-global-regs.c +++ /dev/null @@ -1,20 +0,0 @@ -// RUN: %clang_cc1 -ffreestanding -fsyntax-only -target-feature +reserve-r9 -verify -triple arm-arm-none-eabi %s - -// Check a small subset of valid and invalid global register variable declarations. -// Also check that for global register variables without -ffixed-reg options it throws an error. - -register unsigned arm_r3 __asm("r3"); //expected-error {{register 'r3' unsuitable for global register variables on this target}} - -register unsigned arm_r12 __asm("r12"); //expected-error {{register 'r12' unsuitable for global register variables on this target}} - -register unsigned arm_r5 __asm("r5"); //expected-error {{register 'r5' unsuitable for global register variables on this target}} - -register unsigned arm_r9 __asm("r9"); - -register unsigned arm_r6 __asm("r6"); //expected-error {{-ffixed-r6 is required for global named register variable declaration}} - -register unsigned arm_r7 __asm("r7"); //expected-error {{-ffixed-r7 is required for global named register variable declaration}} - -register unsigned *parm_r7 __asm("r7"); //expected-error {{-ffixed-r7 is required for global named register variable declaration}} - -register unsigned arm_sp __asm("sp"); |
