This is an archive of the discontinued LLVM Phabricator instance.

Differential D55905

Add PLATFORM constants for iOS, tvOS, and watchOS simulators
ClosedPublic

Authored by mtrent on Dec 19 2018, 3:24 PM.

Details

Reviewers
ab
davide
Commits
rGf44d830e2da3: Add PLATFORM constants for iOS, tvOS, and watchOS simulators
rL349779: Add PLATFORM constants for iOS, tvOS, and watchOS simulators
Summary

Add PLATFORM constants for iOS, tvOS, and watchOS simulators, as well
as human readable names for these constants, to the Mach-O file format
header files.

rdar://46854119

Diff Detail

Event Timeline

mtrent created this revision.Dec 19 2018, 3:24 PM
Harbormaster completed remote builds in B26160: Diff 178977.Dec 19 2018, 3:24 PM
davide accepted this revision.Dec 19 2018, 3:29 PM

lgtm

This revision is now accepted and ready to land.Dec 19 2018, 3:29 PM
ab accepted this revision.Dec 19 2018, 5:50 PM

Looks good, thanks!

Closed by commit rL349779: Add PLATFORM constants for iOS, tvOS, and watchOS simulators (authored by mtrent). · Explain WhyDec 20 2018, 9:54 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
include/
llvm/
BinaryFormat/
5 lines
Object/
3 lines
lib/
MC/
13 lines
MCParser/
5 lines

Diff 178977

include/llvm/BinaryFormat/MachO.h

Show First 20 Lines • Show All 480 Lines • ▼ Show 20 Lines
enum { VM_PROT_READ = 0x1, VM_PROT_WRITE = 0x2, VM_PROT_EXECUTE = 0x4 }; enum { VM_PROT_READ = 0x1, VM_PROT_WRITE = 0x2, VM_PROT_EXECUTE = 0x4 };
// Values for platform field in build_version_command. // Values for platform field in build_version_command.
enum PlatformType { enum PlatformType {
PLATFORM_MACOS = 1, PLATFORM_MACOS = 1,
PLATFORM_IOS = 2, PLATFORM_IOS = 2,
PLATFORM_TVOS = 3, PLATFORM_TVOS = 3,
PLATFORM_WATCHOS = 4, PLATFORM_WATCHOS = 4,
PLATFORM_BRIDGEOS = 5 PLATFORM_BRIDGEOS = 5,
PLATFORM_IOSSIMULATOR = 7,
PLATFORM_TVOSSIMULATOR = 8,
PLATFORM_WATCHOSSIMULATOR = 9
}; };
// Values for tools enum in build_tool_version. // Values for tools enum in build_tool_version.
enum { TOOL_CLANG = 1, TOOL_SWIFT = 2, TOOL_LD = 3 }; enum { TOOL_CLANG = 1, TOOL_SWIFT = 2, TOOL_LD = 3 };
// Structs from <mach-o/loader.h> // Structs from <mach-o/loader.h>
struct mach_header { struct mach_header {
▲ Show 20 Lines • Show All 1,488 Lines • Show Last 20 Lines

include/llvm/Object/MachO.h

Show First 20 Lines • Show All 610 Lines • ▼ Show 20 Linespublic:
static std::string getBuildPlatform(uint32_t platform) { static std::string getBuildPlatform(uint32_t platform) {
switch (platform) { switch (platform) {
case MachO::PLATFORM_MACOS: return "macos"; case MachO::PLATFORM_MACOS: return "macos";
case MachO::PLATFORM_IOS: return "ios"; case MachO::PLATFORM_IOS: return "ios";
case MachO::PLATFORM_TVOS: return "tvos"; case MachO::PLATFORM_TVOS: return "tvos";
case MachO::PLATFORM_WATCHOS: return "watchos"; case MachO::PLATFORM_WATCHOS: return "watchos";
case MachO::PLATFORM_BRIDGEOS: return "bridgeos"; case MachO::PLATFORM_BRIDGEOS: return "bridgeos";
case MachO::PLATFORM_IOSSIMULATOR: return "iossimulator";
case MachO::PLATFORM_TVOSSIMULATOR: return "tvossimulator";
case MachO::PLATFORM_WATCHOSSIMULATOR: return "watchossimulator";
default: default:
std::string ret; std::string ret;
raw_string_ostream ss(ret); raw_string_ostream ss(ret);
ss << format_hex(platform, 8, true); ss << format_hex(platform, 8, true);
return ss.str(); return ss.str();
} }
} }
▲ Show 20 Lines • Show All 113 Lines • Show Last 20 Lines

lib/MC/MCAsmStreamer.cpp

Show First 20 Lines • Show All 534 Lines • ▼ Show 20 Linesvoid MCAsmStreamer::EmitVersionMin(MCVersionMinType Type, unsigned Major,
if (Update) if (Update)
OS << ", " << Update; OS << ", " << Update;
EmitSDKVersionSuffix(OS, SDKVersion); EmitSDKVersionSuffix(OS, SDKVersion);
EmitEOL(); EmitEOL();
} }
static const char *getPlatformName(MachO::PlatformType Type) { static const char *getPlatformName(MachO::PlatformType Type) {
switch (Type) { switch (Type) {
case MachO::PLATFORM_MACOS: return "macos"; case MachO::PLATFORM_MACOS: return "macos";
case MachO::PLATFORM_IOS: return "ios"; case MachO::PLATFORM_IOS: return "ios";
case MachO::PLATFORM_TVOS: return "tvos"; case MachO::PLATFORM_TVOS: return "tvos";
case MachO::PLATFORM_WATCHOS: return "watchos"; case MachO::PLATFORM_WATCHOS: return "watchos";
case MachO::PLATFORM_BRIDGEOS: return "bridgeos"; case MachO::PLATFORM_BRIDGEOS: return "bridgeos";
case MachO::PLATFORM_IOSSIMULATOR: return "iossimulator";
case MachO::PLATFORM_TVOSSIMULATOR: return "tvossimulator";
case MachO::PLATFORM_WATCHOSSIMULATOR: return "watchossimulator";
} }
llvm_unreachable("Invalid Mach-O platform type"); llvm_unreachable("Invalid Mach-O platform type");
} }
void MCAsmStreamer::EmitBuildVersion(unsigned Platform, unsigned Major, void MCAsmStreamer::EmitBuildVersion(unsigned Platform, unsigned Major,
unsigned Minor, unsigned Update, unsigned Minor, unsigned Update,
VersionTuple SDKVersion) { VersionTuple SDKVersion) {
const char *PlatformName = getPlatformName((MachO::PlatformType)Platform); const char *PlatformName = getPlatformName((MachO::PlatformType)Platform);
▲ Show 20 Lines • Show All 1,385 Lines • Show Last 20 Lines

lib/MC/MCParser/DarwinAsmParser.cpp

Show First 20 Lines • Show All 1,142 Lines • ▼ Show 20 Lines
} }
static Triple::OSType getOSTypeFromPlatform(MachO::PlatformType Type) { static Triple::OSType getOSTypeFromPlatform(MachO::PlatformType Type) {
switch (Type) { switch (Type) {
case MachO::PLATFORM_MACOS: return Triple::MacOSX; case MachO::PLATFORM_MACOS: return Triple::MacOSX;
case MachO::PLATFORM_IOS: return Triple::IOS; case MachO::PLATFORM_IOS: return Triple::IOS;
case MachO::PLATFORM_TVOS: return Triple::TvOS; case MachO::PLATFORM_TVOS: return Triple::TvOS;
case MachO::PLATFORM_WATCHOS: return Triple::WatchOS; case MachO::PLATFORM_WATCHOS: return Triple::WatchOS;
case MachO::PLATFORM_BRIDGEOS: /* silence warning */break; case MachO::PLATFORM_BRIDGEOS: /* silence warning */ break;
case MachO::PLATFORM_IOSSIMULATOR: /* silence warning */ break;
case MachO::PLATFORM_TVOSSIMULATOR: /* silence warning */ break;
case MachO::PLATFORM_WATCHOSSIMULATOR: /* silence warning */ break;
} }
llvm_unreachable("Invalid mach-o platform type"); llvm_unreachable("Invalid mach-o platform type");
} }
/// parseBuildVersion /// parseBuildVersion
/// ::= .build_version (macos|ios|tvos|watchos), parseVersion parseSDKVersion /// ::= .build_version (macos|ios|tvos|watchos), parseVersion parseSDKVersion
bool DarwinAsmParser::parseBuildVersion(StringRef Directive, SMLoc Loc) { bool DarwinAsmParser::parseBuildVersion(StringRef Directive, SMLoc Loc) {
StringRef PlatformName; StringRef PlatformName;
▲ Show 20 Lines • Show All 45 Lines • Show Last 20 Lines