Author: jmolenda
Date: Wed Jun 13 15:37:01 2018
New Revision: 334667
URL: http://llvm.org/viewvc/llvm-project?rev=334667&view=rev
Log:
Move the header file to be in the same new place as the .mm file.
Added:
lldb/trunk/source/Plugins/Platform/MacOSX/objcxx/PlatformiOSSimulatorCoreSimulatorSupport.h
- copied unchanged from r334666,
lldb/trunk/source/Plugins/Platform/MacOSX/PlatformiOSSimulatorCoreSimulatorSupport.h
Removed:
lldb/trunk/source/Plugins/Platform/MacOSX/PlatformiOSSimulatorCoreSimulatorSupport.h
Modified:
lldb/trunk/lldb.xcodeproj/project.pbxproj
Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=334667&r1=334666&r2=334667&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Wed Jun 13 15:37:01 2018
@@ -2813,7 +2813,6 @@
945261C91B9A14E000BF138D /* CXXFunctionPointer.h */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.h; name =
CXXFunctionPointer.h; path = include/lldb/DataFormatters/CXXFunctionPointer.h;
sourceTree = "<group>"; };
9455630A1BEAD0570073F75F /* PlatformAppleSimulator.cpp */ =
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path =
PlatformAppleSimulator.cpp; sourceTree = "<group>"; };
9455630B1BEAD0570073F75F /* PlatformAppleSimulator.h */ = {isa
= PBXFileReference; lastKnownFileType = sourcecode.c.h; path =
PlatformAppleSimulator.h; sourceTree = "<group>"; };
- 9455630C1BEAD0570073F75F /*
PlatformiOSSimulatorCoreSimulatorSupport.h */ = {isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h; path =
PlatformiOSSimulatorCoreSimulatorSupport.h; sourceTree = "<group>"; };
945759651534941F005A9070 /* PlatformPOSIX.cpp */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = PlatformPOSIX.cpp; path = POSIX/PlatformPOSIX.cpp; sourceTree =
"<group>"; };
945759661534941F005A9070 /* PlatformPOSIX.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
PlatformPOSIX.h; path = POSIX/PlatformPOSIX.h; sourceTree = "<group>"; };
9461568614E355F2003A195C /* SBTypeFilter.h */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SBTypeFilter.h;
path = include/lldb/API/SBTypeFilter.h; sourceTree = "<group>"; };
@@ -3173,6 +3172,7 @@
AF9FF1F41FAA79A400474976 /* LibCxxTuple.cpp */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = LibCxxTuple.cpp; path = Language/CPlusPlus/LibCxxTuple.cpp; sourceTree =
"<group>"; };
AF9FF1F61FAA79FE00474976 /* LibCxxQueue.cpp */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = LibCxxQueue.cpp; path = Language/CPlusPlus/LibCxxQueue.cpp; sourceTree =
"<group>"; };
AFAFD8091E57E1B90017A14F /* ModuleCacheTest.cpp */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = ModuleCacheTest.cpp; path = Target/ModuleCacheTest.cpp; sourceTree =
"<group>"; };
+ AFB1682620D1D4CC00A74F25 /*
PlatformiOSSimulatorCoreSimulatorSupport.h */ = {isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h; name =
PlatformiOSSimulatorCoreSimulatorSupport.h; path =
objcxx/PlatformiOSSimulatorCoreSimulatorSupport.h; sourceTree = "<group>"; };
AFB3D27E1AC262AB003B4B30 /* MICmdCmdGdbShow.cpp */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = MICmdCmdGdbShow.cpp; path = "tools/lldb-mi/MICmdCmdGdbShow.cpp";
sourceTree = SOURCE_ROOT; };
AFB3D27F1AC262AB003B4B30 /* MICmdCmdGdbShow.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
MICmdCmdGdbShow.h; path = "tools/lldb-mi/MICmdCmdGdbShow.h"; sourceTree =
SOURCE_ROOT; };
AFC234061AF85CE000CDE8B6 /* CommandObjectLanguage.cpp */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = CommandObjectLanguage.cpp; path =
source/Commands/CommandObjectLanguage.cpp; sourceTree = "<group>"; };
@@ -5674,7 +5674,6 @@
2697A54C133A6305004E4240 /* PlatformDarwin.h */,
26B7564C14F89356008D9CB3 /*
PlatformiOSSimulator.cpp */,
26B7564D14F89356008D9CB3 /*
PlatformiOSSimulator.h */,
- 9455630C1BEAD0570073F75F /*
PlatformiOSSimulatorCoreSimulatorSupport.h */,
26C5577B132575AD008FD8FE /* PlatformMacOSX.cpp
*/,
26C5577C132575AD008FD8FE /* PlatformMacOSX.h */,
AF3A4AD01EA05C4700B5DEB4 /*
PlatformRemoteDarwinDevice.cpp */,
@@ -6789,6 +6788,7 @@
isa = PBXGroup;
children = (
AFF81FB220D1CC910010F95E /*
PlatformiOSSimulatorCoreSimulatorSupport.mm */,
+ AFB1682620D1D4CC00A74F25 /*
PlatformiOSSimulatorCoreSimulatorSupport.h */,
);
name = objcxx;
sourceTree = "<group>";
Removed:
lldb/trunk/source/Plugins/Platform/MacOSX/PlatformiOSSimulatorCoreSimulatorSupport.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/MacOSX/PlatformiOSSimulatorCoreSimulatorSupport.h?rev=334666&view=auto
==============================================================================
---
lldb/trunk/source/Plugins/Platform/MacOSX/PlatformiOSSimulatorCoreSimulatorSupport.h
(original)
+++
lldb/trunk/source/Plugins/Platform/MacOSX/PlatformiOSSimulatorCoreSimulatorSupport.h
(removed)
@@ -1,225 +0,0 @@
-//===-- PlatformiOSSimulatorCoreSimulatorSupport.h ----------------*- C++
-//-*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef liblldb_PlatformiOSSimulatorCoreSimulatorSupport_h_
-#define liblldb_PlatformiOSSimulatorCoreSimulatorSupport_h_
-
-// C Includes
-// C++ Includes
-#include <functional>
-#include <ostream>
-#include <string>
-#include <vector>
-// Other libraries and framework includes
-#ifdef __APPLE__
-#include <objc/objc.h>
-#else
-typedef void *id;
-#endif
-// Project includes
-#include "lldb/Target/ProcessLaunchInfo.h"
-#include "lldb/Utility/Args.h"
-#include "lldb/Utility/ConstString.h"
-#include "lldb/Utility/Status.h"
-
-#include "llvm/ADT/Optional.h"
-
-// And now the actual magic
-namespace CoreSimulatorSupport {
-class Process {
-public:
- lldb::pid_t GetPID() { return m_pid; }
-
- explicit operator bool() { return m_pid != LLDB_INVALID_PROCESS_ID; }
-
- lldb_private::Status GetError() { return m_error; }
-
-private:
- Process(lldb::pid_t p);
-
- Process(lldb_private::Status error);
-
- Process(lldb::pid_t p, lldb_private::Status error);
-
- lldb::pid_t m_pid;
- lldb_private::Status m_error;
-
- friend class Device;
-};
-
-class ModelIdentifier {
-public:
- ModelIdentifier(const std::string &mi);
- ModelIdentifier();
-
- explicit operator bool() const { return !m_versions.empty(); }
-
- size_t GetNumVersions() const { return m_versions.size(); }
-
- unsigned int GetVersionAtIndex(size_t idx) const { return m_versions[idx]; }
-
- std::string GetFamily() const { return m_family.c_str(); }
-
-private:
- std::string m_family;
- std::vector<unsigned int> m_versions;
-};
-
-class DeviceType {
-public:
- enum class ProductFamilyID : int32_t {
- iPhone = 1,
- iPad = 2,
- appleTV = 3,
- appleWatch = 4
- };
-
- DeviceType();
-
- DeviceType(id d);
-
- explicit operator bool();
-
- std::string GetName();
-
- lldb_private::ConstString GetIdentifier();
-
- ModelIdentifier GetModelIdentifier();
-
- lldb_private::ConstString GetProductFamily();
-
- ProductFamilyID GetProductFamilyID();
-
-private:
- id m_dev;
- llvm::Optional<ModelIdentifier> m_model_identifier;
-};
-
-class OSVersion {
-public:
- OSVersion(const std::string &ver, const std::string &build);
-
- OSVersion();
-
- explicit operator bool() const { return !m_versions.empty(); }
-
- size_t GetNumVersions() const { return m_versions.size(); }
-
- unsigned int GetVersionAtIndex(size_t idx) const { return m_versions[idx]; }
-
- const char *GetBuild() const { return m_build.c_str(); }
-
-private:
- std::vector<unsigned int> m_versions;
- std::string m_build;
-};
-
-class DeviceRuntime {
-public:
- DeviceRuntime();
-
- DeviceRuntime(id d);
-
- explicit operator bool();
-
- OSVersion GetVersion();
-
- bool IsAvailable();
-
-private:
- id m_dev;
- llvm::Optional<OSVersion> m_os_version;
-};
-
-class Device {
-private:
- typedef unsigned long int NSUInteger;
-
-public:
- enum class State : NSUInteger {
- Creating,
- Shutdown,
- Booting,
- Booted,
- ShuttingDown
- };
-
- Device();
-
- Device(id d);
-
- explicit operator bool();
-
- std::string GetName() const;
-
- DeviceType GetDeviceType();
-
- DeviceRuntime GetDeviceRuntime();
-
- State GetState();
-
- bool Boot(lldb_private::Status &err);
-
- bool Shutdown(lldb_private::Status &err);
-
- std::string GetUDID() const;
-
- Process Spawn(lldb_private::ProcessLaunchInfo &launch_info);
-
-private:
- id m_dev;
- llvm::Optional<DeviceType> m_dev_type;
- llvm::Optional<DeviceRuntime> m_dev_runtime;
-
- friend class DeviceSet;
-};
-
-bool operator>(const OSVersion &lhs, const OSVersion &rhs);
-
-bool operator>(const ModelIdentifier &lhs, const ModelIdentifier &rhs);
-
-bool operator<(const OSVersion &lhs, const OSVersion &rhs);
-
-bool operator<(const ModelIdentifier &lhs, const ModelIdentifier &rhs);
-
-bool operator==(const OSVersion &lhs, const OSVersion &rhs);
-
-bool operator==(const ModelIdentifier &lhs, const ModelIdentifier &rhs);
-
-bool operator!=(const OSVersion &lhs, const OSVersion &rhs);
-
-bool operator!=(const ModelIdentifier &lhs, const ModelIdentifier &rhs);
-
-class DeviceSet {
-public:
- static DeviceSet GetAllDevices(const char *developer_dir);
-
- static DeviceSet GetAvailableDevices(const char *developer_dir);
-
- size_t GetNumDevices();
-
- Device GetDeviceAtIndex(size_t idx);
-
- void ForEach(std::function<bool(const Device &)> f);
-
- DeviceSet GetDevicesIf(std::function<bool(Device)> f);
-
- DeviceSet GetDevices(DeviceType::ProductFamilyID dev_id);
-
- Device GetFanciest(DeviceType::ProductFamilyID dev_id);
-
-private:
- DeviceSet(id arr) : m_dev(arr) {}
-
- id m_dev;
-};
-}
-
-#endif // liblldb_PlatformiOSSimulatorCoreSimulatorSupport_h_
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
