mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-12-12 13:30:51 +00:00
Refactor ARM subarchitecture parsing
Re-commit of a patch to rework the triple parsing on ARM to a more sane model. Patch by Gabor Ballabas. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@213367 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Renato Golin
parent
11c20581d6
commit
03ac7db89d
@ -79,6 +79,21 @@ public:
|
||||
spir64, // SPIR: standard portable IR for OpenCL 64-bit version
|
||||
kalimba // Kalimba: generic kalimba
|
||||
};
|
||||
enum SubArchType {
|
||||
NoSubArch,
|
||||
|
||||
ARMSubArch_v8,
|
||||
ARMSubArch_v7,
|
||||
ARMSubArch_v7em,
|
||||
ARMSubArch_v7m,
|
||||
ARMSubArch_v7s,
|
||||
ARMSubArch_v6,
|
||||
ARMSubArch_v6m,
|
||||
ARMSubArch_v6t2,
|
||||
ARMSubArch_v5,
|
||||
ARMSubArch_v5te,
|
||||
ARMSubArch_v4t
|
||||
};
|
||||
enum VendorType {
|
||||
UnknownVendor,
|
||||
|
||||
@ -151,6 +166,9 @@ private:
|
||||
/// The parsed arch type.
|
||||
ArchType Arch;
|
||||
|
||||
/// The parsed subarchitecture type.
|
||||
SubArchType SubArch;
|
||||
|
||||
/// The parsed vendor type.
|
||||
VendorType Vendor;
|
||||
|
||||
@ -193,6 +211,9 @@ public:
|
||||
/// getArch - Get the parsed architecture type of this triple.
|
||||
ArchType getArch() const { return Arch; }
|
||||
|
||||
/// getSubArch - get the parsed subarchitecture type for this triple.
|
||||
SubArchType getSubArch() const { return SubArch; }
|
||||
|
||||
/// getVendor - Get the parsed vendor type of this triple.
|
||||
VendorType getVendor() const { return Vendor; }
|
||||
|
||||
|
||||
@ -357,6 +357,28 @@ static Triple::ObjectFormatType parseFormat(StringRef EnvironmentName) {
|
||||
.Default(Triple::UnknownObjectFormat);
|
||||
}
|
||||
|
||||
static Triple::SubArchType parseSubArch(StringRef SubArchName) {
|
||||
return StringSwitch<Triple::SubArchType>(SubArchName)
|
||||
.EndsWith("v8", Triple::ARMSubArch_v8)
|
||||
.EndsWith("v8a", Triple::ARMSubArch_v8)
|
||||
.EndsWith("v7", Triple::ARMSubArch_v7)
|
||||
.EndsWith("v7a", Triple::ARMSubArch_v7)
|
||||
.EndsWith("v7em", Triple::ARMSubArch_v7em)
|
||||
.EndsWith("v7l", Triple::ARMSubArch_v7)
|
||||
.EndsWith("v7m", Triple::ARMSubArch_v7m)
|
||||
.EndsWith("v7r", Triple::ARMSubArch_v7)
|
||||
.EndsWith("v7s", Triple::ARMSubArch_v7s)
|
||||
.EndsWith("v6", Triple::ARMSubArch_v6)
|
||||
.EndsWith("v6m", Triple::ARMSubArch_v6m)
|
||||
.EndsWith("v6t2", Triple::ARMSubArch_v6t2)
|
||||
.EndsWith("v5", Triple::ARMSubArch_v5)
|
||||
.EndsWith("v5e", Triple::ARMSubArch_v5)
|
||||
.EndsWith("v5t", Triple::ARMSubArch_v5)
|
||||
.EndsWith("v5te", Triple::ARMSubArch_v5te)
|
||||
.EndsWith("v4t", Triple::ARMSubArch_v4t)
|
||||
.Default(Triple::NoSubArch);
|
||||
}
|
||||
|
||||
static const char *getObjectFormatTypeName(Triple::ObjectFormatType Kind) {
|
||||
switch (Kind) {
|
||||
case Triple::UnknownObjectFormat: return "";
|
||||
@ -382,6 +404,7 @@ static Triple::ObjectFormatType getDefaultFormat(const Triple &T) {
|
||||
Triple::Triple(const Twine &Str)
|
||||
: Data(Str.str()),
|
||||
Arch(parseArch(getArchName())),
|
||||
SubArch(parseSubArch(getArchName())),
|
||||
Vendor(parseVendor(getVendorName())),
|
||||
OS(parseOS(getOSName())),
|
||||
Environment(parseEnvironment(getEnvironmentName())),
|
||||
@ -399,6 +422,7 @@ Triple::Triple(const Twine &Str)
|
||||
Triple::Triple(const Twine &ArchStr, const Twine &VendorStr, const Twine &OSStr)
|
||||
: Data((ArchStr + Twine('-') + VendorStr + Twine('-') + OSStr).str()),
|
||||
Arch(parseArch(ArchStr.str())),
|
||||
SubArch(parseSubArch(ArchStr.str())),
|
||||
Vendor(parseVendor(VendorStr.str())),
|
||||
OS(parseOS(OSStr.str())),
|
||||
Environment(), ObjectFormat(Triple::UnknownObjectFormat) {
|
||||
@ -415,6 +439,7 @@ Triple::Triple(const Twine &ArchStr, const Twine &VendorStr, const Twine &OSStr,
|
||||
: Data((ArchStr + Twine('-') + VendorStr + Twine('-') + OSStr + Twine('-') +
|
||||
EnvironmentStr).str()),
|
||||
Arch(parseArch(ArchStr.str())),
|
||||
SubArch(parseSubArch(ArchStr.str())),
|
||||
Vendor(parseVendor(VendorStr.str())),
|
||||
OS(parseOS(OSStr.str())),
|
||||
Environment(parseEnvironment(EnvironmentStr.str())),
|
||||
|
||||
@ -84,93 +84,85 @@ static bool getITDeprecationInfo(MCInst &MI, MCSubtargetInfo &STI,
|
||||
std::string ARM_MC::ParseARMTriple(StringRef TT, StringRef CPU) {
|
||||
Triple triple(TT);
|
||||
|
||||
// Set the boolean corresponding to the current target triple, or the default
|
||||
// if one cannot be determined, to true.
|
||||
unsigned Len = TT.size();
|
||||
unsigned Idx = 0;
|
||||
|
||||
// FIXME: Enhance Triple helper class to extract ARM version.
|
||||
bool isThumb = triple.getArch() == Triple::thumb ||
|
||||
triple.getArch() == Triple::thumbeb;
|
||||
if (Len >= 5 && TT.substr(0, 4) == "armv")
|
||||
Idx = 4;
|
||||
else if (Len >= 7 && TT.substr(0, 6) == "armebv")
|
||||
Idx = 6;
|
||||
else if (Len >= 7 && TT.substr(0, 6) == "thumbv")
|
||||
Idx = 6;
|
||||
else if (Len >= 9 && TT.substr(0, 8) == "thumbebv")
|
||||
Idx = 8;
|
||||
|
||||
bool NoCPU = CPU == "generic" || CPU.empty();
|
||||
std::string ARMArchFeature;
|
||||
if (Idx) {
|
||||
unsigned SubVer = TT[Idx];
|
||||
if (SubVer == '8') {
|
||||
if (NoCPU)
|
||||
// v8a: FeatureDB, FeatureFPARMv8, FeatureNEON, FeatureDSPThumb2,
|
||||
// FeatureMP, FeatureHWDiv, FeatureHWDivARM, FeatureTrustZone,
|
||||
// FeatureT2XtPk, FeatureCrypto, FeatureCRC
|
||||
ARMArchFeature = "+v8,+db,+fp-armv8,+neon,+t2dsp,+mp,+hwdiv,+hwdiv-arm,"
|
||||
"+trustzone,+t2xtpk,+crypto,+crc";
|
||||
else
|
||||
// Use CPU to figure out the exact features
|
||||
ARMArchFeature = "+v8";
|
||||
} else if (SubVer == '7') {
|
||||
if (Len >= Idx+2 && TT[Idx+1] == 'm') {
|
||||
isThumb = true;
|
||||
if (NoCPU)
|
||||
// v7m: FeatureNoARM, FeatureDB, FeatureHWDiv, FeatureMClass
|
||||
ARMArchFeature = "+v7,+noarm,+db,+hwdiv,+mclass";
|
||||
else
|
||||
// Use CPU to figure out the exact features.
|
||||
ARMArchFeature = "+v7";
|
||||
} else if (Len >= Idx+3 && TT[Idx+1] == 'e'&& TT[Idx+2] == 'm') {
|
||||
if (NoCPU)
|
||||
// v7em: FeatureNoARM, FeatureDB, FeatureHWDiv, FeatureDSPThumb2,
|
||||
// FeatureT2XtPk, FeatureMClass
|
||||
ARMArchFeature = "+v7,+noarm,+db,+hwdiv,+t2dsp,t2xtpk,+mclass";
|
||||
else
|
||||
// Use CPU to figure out the exact features.
|
||||
ARMArchFeature = "+v7";
|
||||
} else if (Len >= Idx+2 && TT[Idx+1] == 's') {
|
||||
if (NoCPU)
|
||||
// v7s: FeatureNEON, FeatureDB, FeatureDSPThumb2, FeatureHasRAS
|
||||
// Swift
|
||||
ARMArchFeature = "+v7,+swift,+neon,+db,+t2dsp,+ras";
|
||||
else
|
||||
// Use CPU to figure out the exact features.
|
||||
ARMArchFeature = "+v7";
|
||||
} else {
|
||||
// v7 CPUs have lots of different feature sets. If no CPU is specified,
|
||||
// then assume v7a (e.g. cortex-a8) feature set. Otherwise, return
|
||||
// the "minimum" feature set and use CPU string to figure out the exact
|
||||
// features.
|
||||
if (NoCPU)
|
||||
// v7a: FeatureNEON, FeatureDB, FeatureDSPThumb2, FeatureT2XtPk
|
||||
ARMArchFeature = "+v7,+neon,+db,+t2dsp,+t2xtpk";
|
||||
else
|
||||
// Use CPU to figure out the exact features.
|
||||
ARMArchFeature = "+v7";
|
||||
}
|
||||
} else if (SubVer == '6') {
|
||||
if (Len >= Idx+3 && TT[Idx+1] == 't' && TT[Idx+2] == '2')
|
||||
ARMArchFeature = "+v6t2";
|
||||
else if (Len >= Idx+2 && TT[Idx+1] == 'm') {
|
||||
isThumb = true;
|
||||
if (NoCPU)
|
||||
// v6m: FeatureNoARM, FeatureMClass
|
||||
ARMArchFeature = "+v6m,+noarm,+mclass";
|
||||
else
|
||||
ARMArchFeature = "+v6";
|
||||
} else
|
||||
ARMArchFeature = "+v6";
|
||||
} else if (SubVer == '5') {
|
||||
if (Len >= Idx+3 && TT[Idx+1] == 't' && TT[Idx+2] == 'e')
|
||||
ARMArchFeature = "+v5te";
|
||||
else
|
||||
ARMArchFeature = "+v5t";
|
||||
} else if (SubVer == '4' && Len >= Idx+2 && TT[Idx+1] == 't')
|
||||
ARMArchFeature = "+v4t";
|
||||
switch (triple.getSubArch()) {
|
||||
case Triple::ARMSubArch_v8:
|
||||
if (NoCPU)
|
||||
// v8a: FeatureDB, FeatureFPARMv8, FeatureNEON, FeatureDSPThumb2,
|
||||
// FeatureMP, FeatureHWDiv, FeatureHWDivARM, FeatureTrustZone,
|
||||
// FeatureT2XtPk, FeatureCrypto, FeatureCRC
|
||||
ARMArchFeature = "+v8,+db,+fp-armv8,+neon,+t2dsp,+mp,+hwdiv,+hwdiv-arm,"
|
||||
"+trustzone,+t2xtpk,+crypto,+crc";
|
||||
else
|
||||
// Use CPU to figure out the exact features
|
||||
ARMArchFeature = "+v8";
|
||||
break;
|
||||
case Triple::ARMSubArch_v7m:
|
||||
isThumb = true;
|
||||
if (NoCPU)
|
||||
// v7m: FeatureNoARM, FeatureDB, FeatureHWDiv, FeatureMClass
|
||||
ARMArchFeature = "+v7,+noarm,+db,+hwdiv,+mclass";
|
||||
else
|
||||
// Use CPU to figure out the exact features.
|
||||
ARMArchFeature = "+v7";
|
||||
break;
|
||||
case Triple::ARMSubArch_v7em:
|
||||
if (NoCPU)
|
||||
// v7em: FeatureNoARM, FeatureDB, FeatureHWDiv, FeatureDSPThumb2,
|
||||
// FeatureT2XtPk, FeatureMClass
|
||||
ARMArchFeature = "+v7,+noarm,+db,+hwdiv,+t2dsp,t2xtpk,+mclass";
|
||||
else
|
||||
// Use CPU to figure out the exact features.
|
||||
ARMArchFeature = "+v7";
|
||||
break;
|
||||
case Triple::ARMSubArch_v7s:
|
||||
if (NoCPU)
|
||||
// v7s: FeatureNEON, FeatureDB, FeatureDSPThumb2, FeatureHasRAS
|
||||
// Swift
|
||||
ARMArchFeature = "+v7,+swift,+neon,+db,+t2dsp,+ras";
|
||||
else
|
||||
// Use CPU to figure out the exact features.
|
||||
ARMArchFeature = "+v7";
|
||||
break;
|
||||
case Triple::ARMSubArch_v7:
|
||||
// v7 CPUs have lots of different feature sets. If no CPU is specified,
|
||||
// then assume v7a (e.g. cortex-a8) feature set. Otherwise, return
|
||||
// the "minimum" feature set and use CPU string to figure out the exact
|
||||
// features.
|
||||
if (NoCPU)
|
||||
// v7a: FeatureNEON, FeatureDB, FeatureDSPThumb2, FeatureT2XtPk
|
||||
ARMArchFeature = "+v7,+neon,+db,+t2dsp,+t2xtpk";
|
||||
else
|
||||
// Use CPU to figure out the exact features.
|
||||
ARMArchFeature = "+v7";
|
||||
break;
|
||||
case Triple::ARMSubArch_v6t2:
|
||||
ARMArchFeature = "+v6t2";
|
||||
break;
|
||||
case Triple::ARMSubArch_v6m:
|
||||
isThumb = true;
|
||||
if (NoCPU)
|
||||
// v6m: FeatureNoARM, FeatureMClass
|
||||
ARMArchFeature = "+v6m,+noarm,+mclass";
|
||||
else
|
||||
ARMArchFeature = "+v6";
|
||||
break;
|
||||
case Triple::ARMSubArch_v6:
|
||||
ARMArchFeature = "+v6";
|
||||
break;
|
||||
case Triple::ARMSubArch_v5te:
|
||||
ARMArchFeature = "+v5te";
|
||||
break;
|
||||
case Triple::ARMSubArch_v5:
|
||||
ARMArchFeature = "+v5t";
|
||||
break;
|
||||
case Triple::ARMSubArch_v4t:
|
||||
ARMArchFeature = "+v4t";
|
||||
break;
|
||||
}
|
||||
|
||||
if (isThumb) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user