Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-03-02 07:16:29 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Make our handling of MMX x SSE closer to what gcc does:

Browse Source 
* Enabling sse enables mmx.
* Disabling (-mno-mmx) mmx, doesn't disable sse (we got this right already).
* The order in not important. -msse -mno-mmx is the same as -mno-mmx -msse.

llvm-svn: 145194
This commit is contained in:
Rafael Espindola 2011-11-27 20:00:43 +00:00
parent 080dd7ce30
commit a6416a7c73
2 changed files with 47 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
clang/lib/Basic/Targets.cpp
View File

@ -1587,23 +1587,26 @@ bool X86TargetInfo::setFeatureEnabled(llvm::StringMap<bool> &Features,
(Name != "sse4" && Name != "sse4.2" && Name != "sse4.1"))
return false;
// FIXME: this should probably use a switch with fall through.
if (Enabled) {
if (Name == "mmx")
Features["mmx"] = true;
else if (Name == "sse")
Features["sse"] = true;
Features["mmx"] = Features["sse"] = true;
else if (Name == "sse2")
Features["sse"] = Features["sse2"] = true;
Features["mmx"] = Features["sse"] = Features["sse2"] = true;
else if (Name == "sse3")
Features["sse"] = Features["sse2"] = Features["sse3"] = true;
Features["mmx"] = Features["sse"] = Features["sse2"] = Features["sse3"] =
true;
else if (Name == "ssse3")
Features["sse"] = Features["sse2"] = Features["sse3"] =
Features["mmx"] = Features["sse"] = Features["sse2"] = Features["sse3"] =
Features["ssse3"] = true;
else if (Name == "sse4" || Name == "sse4.2")
Features["sse"] = Features["sse2"] = Features["sse3"] =
Features["mmx"] = Features["sse"] = Features["sse2"] = Features["sse3"] =
Features["ssse3"] = Features["sse41"] = Features["sse42"] = true;
else if (Name == "sse4.1")
Features["sse"] = Features["sse2"] = Features["sse3"] =
Features["mmx"] = Features["sse"] = Features["sse2"] = Features["sse3"] =
Features["ssse3"] = Features["sse41"] = true;
else if (Name == "3dnow")
Features["mmx"] = Features["3dnow"] = true;
@ -1612,10 +1615,11 @@ bool X86TargetInfo::setFeatureEnabled(llvm::StringMap<bool> &Features,
else if (Name == "aes")
Features["aes"] = true;
else if (Name == "avx")
Features["avx"] = Features["sse"] = Features["sse2"] = Features["sse3"] =
Features["ssse3"] = Features["sse41"] = Features["sse42"] = true;
Features["mmx"] = Features["sse"] = Features["sse2"] = Features["sse3"] =
Features["ssse3"] = Features["sse41"] = Features["sse42"] =
Features["avx"] = true;
else if (Name == "sse4a")
Features["sse4a"] = true;
Features["mmx"] = Features["sse4a"] = true;
} else {
if (Name == "mmx")
Features["mmx"] = Features["3dnow"] = Features["3dnowa"] = false;
@ -3671,13 +3675,32 @@ TargetInfo *TargetInfo::CreateTargetInfo(DiagnosticsEngine &Diags,
Target->getDefaultFeatures(Features);
// Apply the user specified deltas.
// First the enables.
for (std::vector<std::string>::const_iterator it = Opts.Features.begin(),
ie = Opts.Features.end(); it != ie; ++it) {
const char *Name = it->c_str();
if (Name[0] != '+')
continue;
// Apply the feature via the target.
if ((Name[0] != '-' && Name[0] != '+') ||
!Target->setFeatureEnabled(Features, Name + 1, (Name[0] == '+'))) {
if (!Target->setFeatureEnabled(Features, Name + 1, true)) {
Diags.Report(diag::err_target_invalid_feature) << Name;
return 0;
}
}
// Then the disables.
for (std::vector<std::string>::const_iterator it = Opts.Features.begin(),
ie = Opts.Features.end(); it != ie; ++it) {
const char *Name = it->c_str();
if (Name[0] == '+')
continue;
// Apply the feature via the target.
if (Name[0] != '-' ||
!Target->setFeatureEnabled(Features, Name + 1, false)) {
Diags.Report(diag::err_target_invalid_feature) << Name;
return 0;
}

13
clang/test/Preprocessor/mmx.c Normal file
View File

@ -0,0 +1,13 @@
// RUN: %clang -march=i386 -m32 -E -dM %s -msse -o - 2>&1 \
// RUN: | FileCheck %s -check-prefix=SSE_AND_MMX
// RUN: %clang -march=i386 -m32 -E -dM %s -msse -mno-mmx -o - 2>&1 \
// RUN: | FileCheck %s -check-prefix=SSE_NO_MMX
// RUN: %clang -march=i386 -m32 -E -dM %s -mno-mmx -msse -o - 2>&1 \
// RUN: | FileCheck %s -check-prefix=SSE_NO_MMX
// SSE_AND_MMX: #define __MMX__
// SSE_AND_MMX: #define __SSE__
// SSE_NO_MMX-NOT: __MMX__
// SSE_NO_MMX: __SSE__
// SSE_NO_MMX-NOT: __MMX__