feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ABI: Add sh architecture

Browse Source 
* incl. unit test

Change-Id: Id56f713104cf05cb25fc788fa8b06a9df90b417b
Reviewed-on: http://codereview.qt-project.org/5398
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Tobias Hunger
2011-09-22 14:26:10 +00:00
parent 12fda1a098
commit ddacec3eb5
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/debugger/memoryagent.cpp
View File

@@ -315,6 +315,7 @@ bool MemoryAgent::isBigEndian(const ProjectExplorer::Abi &a)
case ProjectExplorer::Abi::X86Architecture: case ProjectExplorer::Abi::X86Architecture:
case ProjectExplorer::Abi::ItaniumArchitecture: // Configureable case ProjectExplorer::Abi::ItaniumArchitecture: // Configureable
case ProjectExplorer::Abi::ArmArchitecture: // Configureable case ProjectExplorer::Abi::ArmArchitecture: // Configureable
case ProjectExplorer::Abi::ShArchitecture: // Configureable
break; break;
case ProjectExplorer::Abi::MipsArchitecture: // Configureable case ProjectExplorer::Abi::MipsArchitecture: // Configureable
case ProjectExplorer::Abi::PowerPCArchitecture: // Configureable case ProjectExplorer::Abi::PowerPCArchitecture: // Configureable

14
src/plugins/projectexplorer/abi.cpp
View File

@@ -225,6 +225,9 @@ static QList<Abi> abiOf(const QByteArray &data)
case 62: // EM_X86_64 case 62: // EM_X86_64
result.append(Abi(Abi::X86Architecture, os, flavor, Abi::ElfFormat, 64)); result.append(Abi(Abi::X86Architecture, os, flavor, Abi::ElfFormat, 64));
break; break;
case 42: // EM_SH
result.append(Abi(Abi::ShArchitecture, os, flavor, Abi::ElfFormat, 32));
break;
case 50: // EM_IA_64 case 50: // EM_IA_64
result.append(Abi(Abi::ItaniumArchitecture, os, flavor, Abi::ElfFormat, 64)); result.append(Abi(Abi::ItaniumArchitecture, os, flavor, Abi::ElfFormat, 64));
break; break;
@@ -340,6 +343,8 @@ Abi::Abi(const QString &abiString) :
m_architecture = PowerPCArchitecture; m_architecture = PowerPCArchitecture;
else if (abiParts.at(0) == QLatin1String("itanium")) else if (abiParts.at(0) == QLatin1String("itanium"))
m_architecture = ItaniumArchitecture; m_architecture = ItaniumArchitecture;
else if (abiParts.at(0) == QLatin1String("sh"))
m_architecture = ShArchitecture;
else else
return; return;
} }
@@ -511,6 +516,8 @@ QString Abi::toString(const Architecture &a)
return QLatin1String("ppc"); return QLatin1String("ppc");
case ItaniumArchitecture: case ItaniumArchitecture:
return QLatin1String("itanium"); return QLatin1String("itanium");
case ShArchitecture:
return QLatin1String("sh ");
case UnknownArchitecture: // fall through! case UnknownArchitecture: // fall through!
default: default:
return QLatin1String("unknown"); return QLatin1String("unknown");
@@ -818,6 +825,9 @@ void ProjectExplorer::ProjectExplorerPlugin::testAbiOfBinary_data()
QTest::newRow("dynamic QtCore: arm linux 32bit (angstrom)") QTest::newRow("dynamic QtCore: arm linux 32bit (angstrom)")
<< QString::fromLatin1("%1/dynamic/arm-angstrom-linux.so").arg(prefix) << QString::fromLatin1("%1/dynamic/arm-angstrom-linux.so").arg(prefix)
<< (QStringList() << QString::fromLatin1("arm-linux-generic-elf-32bit")); << (QStringList() << QString::fromLatin1("arm-linux-generic-elf-32bit"));
QTest::newRow("dynamic QtCore: sh4 linux 32bit")
<< QString::fromLatin1("%1/dynamic/sh4-linux.so").arg(prefix)
<< (QStringList() << QString::fromLatin1("sh-linux-generic-elf-32bit"));
QTest::newRow("dynamic QtCore: mips linux 32bit") QTest::newRow("dynamic QtCore: mips linux 32bit")
<< QString::fromLatin1("%1/dynamic/mips-linux.so").arg(prefix) << QString::fromLatin1("%1/dynamic/mips-linux.so").arg(prefix)
<< (QStringList() << QString::fromLatin1("mips-linux-generic-elf-32bit")); << (QStringList() << QString::fromLatin1("mips-linux-generic-elf-32bit"));
@@ -833,6 +843,10 @@ void ProjectExplorer::ProjectExplorerPlugin::testAbiOfBinary_data()
QTest::newRow("dynamic QtCore: x86 freebsd 32bit") QTest::newRow("dynamic QtCore: x86 freebsd 32bit")
<< QString::fromLatin1("%1/dynamic/freebsd-elf-32bit.so").arg(prefix) << QString::fromLatin1("%1/dynamic/freebsd-elf-32bit.so").arg(prefix)
<< (QStringList() << QString::fromLatin1("x86-bsd-freebsd-elf-32bit")); << (QStringList() << QString::fromLatin1("x86-bsd-freebsd-elf-32bit"));
QTest::newRow("executable: x86 win 32bit cygwin executable")
<< QString::fromLatin1("%1/executable/cygwin-32bit.exe").arg(prefix)
<< (QStringList() << QString::fromLatin1("x86-windows-msys-pe-32bit"));
} }
void ProjectExplorer::ProjectExplorerPlugin::testAbiOfBinary() void ProjectExplorer::ProjectExplorerPlugin::testAbiOfBinary()

1
src/plugins/projectexplorer/abi.h
View File

@@ -52,6 +52,7 @@ public:
ItaniumArchitecture, ItaniumArchitecture,
MipsArchitecture, MipsArchitecture,
PowerPCArchitecture, PowerPCArchitecture,
ShArchitecture,
UnknownArchitecture UnknownArchitecture
}; };