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

Rewrite the GetFileInSDK methods in PlatformRemoteiOS,

Browse Source 
PlatformRemoteAppleWatch, PlatformRemoteAppleTV and remove the 
GetFileInSDKRoot method from those classes.

The rewrite uses the more modern FileSpec etc API to simplify,
and handles the case where an SDK Root is given to lldb with
the "/Symbols" directory name already appended.  The new version
will try appending "/Symbols" and "/Symbols.Internal" to the 
sdk root directories, and will also try appending nothing to
the sdk root directory in case it's handed such an sdkroot.

<rdar://problem/28000054> 

llvm-svn: 279688
This commit is contained in:
Jason Molenda 2016-08-24 23:46:48 +00:00
parent 3d0a039e96
commit 541ec9bde8
6 changed files with 57 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
lldb/source/Plugins/Platform/MacOSX/PlatformRemoteAppleTV.cpp
View File

@ -613,83 +613,34 @@ PlatformRemoteAppleTV::GetFileInSDK (const char *platform_file_path,
uint32_t sdk_idx,
lldb_private::FileSpec &local_file)
{
Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
if (sdk_idx < m_sdk_directory_infos.size())
{
char sdkroot_path[PATH_MAX];
const SDKDirectoryInfo &sdk_dir_info = m_sdk_directory_infos[sdk_idx];
if (sdk_dir_info.directory.GetPath(sdkroot_path, sizeof(sdkroot_path)))
std::string sdkroot_path = m_sdk_directory_infos[sdk_idx].directory.GetPath();
if (!sdkroot_path.empty() && platform_file_path && platform_file_path[0])
{
const bool symbols_dirs_only = true;
// We may need to interpose "/Symbols/" or "/Symbols.Internal/" between the
// SDK root directory and the file path.
return GetFileInSDKRoot (platform_file_path,
sdkroot_path,
symbols_dirs_only,
local_file);
}
}
return false;
}
bool
PlatformRemoteAppleTV::GetFileInSDKRoot (const char *platform_file_path,
const char *sdkroot_path,
bool symbols_dirs_only,
lldb_private::FileSpec &local_file)
{
Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
if (sdkroot_path && sdkroot_path[0] && platform_file_path && platform_file_path[0])
{
char resolved_path[PATH_MAX];
if (!symbols_dirs_only)
{
::snprintf (resolved_path,
sizeof(resolved_path),
"%s%s",
sdkroot_path,
platform_file_path);
local_file.SetFile(resolved_path, true);
if (local_file.Exists())
const char *paths_to_try[] = { "Symbols", "", "Symbols.Internal", nullptr };
for (size_t i = 0; paths_to_try[i] != nullptr; i++)
{
if (log)
local_file.SetFile (sdkroot_path.c_str(), false);
if (paths_to_try[i][0] != '\0')
local_file.AppendPathComponent (paths_to_try[i]);
local_file.AppendPathComponent (platform_file_path);
local_file.ResolvePath();
if (local_file.Exists())
{
log->Printf ("Found a copy of %s in the SDK dir %s", platform_file_path, sdkroot_path);
if (log)
log->Printf ("Found a copy of %s in the SDK dir %s/%s", platform_file_path,
sdkroot_path.c_str(),
paths_to_try[i]);
return true;
}
return true;
local_file.Clear();
}
}
::snprintf (resolved_path,
sizeof(resolved_path),
"%s/Symbols.Internal%s",
sdkroot_path,
platform_file_path);
local_file.SetFile(resolved_path, true);
if (local_file.Exists())
{
if (log)
{
log->Printf ("Found a copy of %s in the SDK dir %s/Symbols.Internal", platform_file_path, sdkroot_path);
}
return true;
}
::snprintf (resolved_path,
sizeof(resolved_path),
"%s/Symbols%s",
sdkroot_path,
platform_file_path);
local_file.SetFile(resolved_path, true);
if (local_file.Exists())
{
if (log)
{
log->Printf ("Found a copy of %s in the SDK dir %s/Symbols", platform_file_path, sdkroot_path);
}
return true;
}
}
return false;
}

6
lldb/source/Plugins/Platform/MacOSX/PlatformRemoteAppleTV.h
View File

@ -151,12 +151,6 @@ protected:
uint32_t sdk_idx,
lldb_private::FileSpec &local_file);
bool
GetFileInSDKRoot (const char *platform_file_path,
const char *sdkroot_path,
bool symbols_dirs_only,
lldb_private::FileSpec &local_file);
uint32_t
FindFileInAllSDKs (const lldb_private::FileSpec &platform_file,
lldb_private::FileSpecList &file_list);

87
lldb/source/Plugins/Platform/MacOSX/PlatformRemoteAppleWatch.cpp
View File

@ -624,83 +624,34 @@ PlatformRemoteAppleWatch::GetFileInSDK (const char *platform_file_path,
uint32_t sdk_idx,
lldb_private::FileSpec &local_file)
{
Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
if (sdk_idx < m_sdk_directory_infos.size())
{
char sdkroot_path[PATH_MAX];
const SDKDirectoryInfo &sdk_dir_info = m_sdk_directory_infos[sdk_idx];
if (sdk_dir_info.directory.GetPath(sdkroot_path, sizeof(sdkroot_path)))
std::string sdkroot_path = m_sdk_directory_infos[sdk_idx].directory.GetPath();
if (!sdkroot_path.empty() && platform_file_path && platform_file_path[0])
{
const bool symbols_dirs_only = true;
// We may need to interpose "/Symbols/" or "/Symbols.Internal/" between the
// SDK root directory and the file path.
return GetFileInSDKRoot (platform_file_path,
sdkroot_path,
symbols_dirs_only,
local_file);
}
}
return false;
}
bool
PlatformRemoteAppleWatch::GetFileInSDKRoot (const char *platform_file_path,
const char *sdkroot_path,
bool symbols_dirs_only,
lldb_private::FileSpec &local_file)
{
Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
if (sdkroot_path && sdkroot_path[0] && platform_file_path && platform_file_path[0])
{
char resolved_path[PATH_MAX];
if (!symbols_dirs_only)
{
::snprintf (resolved_path,
sizeof(resolved_path),
"%s%s",
sdkroot_path,
platform_file_path);
local_file.SetFile(resolved_path, true);
if (local_file.Exists())
const char *paths_to_try[] = { "Symbols", "", "Symbols.Internal", nullptr };
for (size_t i = 0; paths_to_try[i] != nullptr; i++)
{
if (log)
local_file.SetFile (sdkroot_path.c_str(), false);
if (paths_to_try[i][0] != '\0')
local_file.AppendPathComponent (paths_to_try[i]);
local_file.AppendPathComponent (platform_file_path);
local_file.ResolvePath();
if (local_file.Exists())
{
log->Printf ("Found a copy of %s in the SDK dir %s", platform_file_path, sdkroot_path);
if (log)
log->Printf ("Found a copy of %s in the SDK dir %s/%s", platform_file_path,
sdkroot_path.c_str(),
paths_to_try[i]);
return true;
}
return true;
local_file.Clear();
}
}
::snprintf (resolved_path,
sizeof(resolved_path),
"%s/Symbols.Internal%s",
sdkroot_path,
platform_file_path);
local_file.SetFile(resolved_path, true);
if (local_file.Exists())
{
if (log)
{
log->Printf ("Found a copy of %s in the SDK dir %s/Symbols.Internal", platform_file_path, sdkroot_path);
}
return true;
}
::snprintf (resolved_path,
sizeof(resolved_path),
"%s/Symbols%s",
sdkroot_path,
platform_file_path);
local_file.SetFile(resolved_path, true);
if (local_file.Exists())
{
if (log)
{
log->Printf ("Found a copy of %s in the SDK dir %s/Symbols", platform_file_path, sdkroot_path);
}
return true;
}
}
return false;
}

6
lldb/source/Plugins/Platform/MacOSX/PlatformRemoteAppleWatch.h
View File

@ -153,12 +153,6 @@ protected:
uint32_t sdk_idx,
lldb_private::FileSpec &local_file);
bool
GetFileInSDKRoot (const char *platform_file_path,
const char *sdkroot_path,
bool symbols_dirs_only,
lldb_private::FileSpec &local_file);
uint32_t
FindFileInAllSDKs (const lldb_private::FileSpec &platform_file,
lldb_private::FileSpecList &file_list);

88
lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp
View File

@ -610,84 +610,34 @@ PlatformRemoteiOS::GetFileInSDK (const char *platform_file_path,
uint32_t sdk_idx,
lldb_private::FileSpec &local_file)
{
Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
if (sdk_idx < m_sdk_directory_infos.size())
{
char sdkroot_path[PATH_MAX];
const SDKDirectoryInfo &sdk_dir_info = m_sdk_directory_infos[sdk_idx];
if (sdk_dir_info.directory.GetPath(sdkroot_path, sizeof(sdkroot_path)))
std::string sdkroot_path = m_sdk_directory_infos[sdk_idx].directory.GetPath();
local_file.Clear();
if (!sdkroot_path.empty() && platform_file_path && platform_file_path[0])
{
const bool symbols_dirs_only = true;
// We may need to interpose "/Symbols/" or "/Symbols.Internal/" between the
// SDK root directory and the file path.
return GetFileInSDKRoot (platform_file_path,
sdkroot_path,
symbols_dirs_only,
local_file);
}
}
return false;
}
bool
PlatformRemoteiOS::GetFileInSDKRoot (const char *platform_file_path,
const char *sdkroot_path,
bool symbols_dirs_only,
lldb_private::FileSpec &local_file)
{
Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
if (sdkroot_path && sdkroot_path[0] && platform_file_path && platform_file_path[0])
{
char resolved_path[PATH_MAX];
if (!symbols_dirs_only)
{
::snprintf (resolved_path,
sizeof(resolved_path),
"%s%s",
sdkroot_path,
platform_file_path);
local_file.SetFile(resolved_path, true);
if (local_file.Exists())
const char *paths_to_try[] = { "Symbols", "", "Symbols.Internal", nullptr };
for (size_t i = 0; paths_to_try[i] != nullptr; i++)
{
if (log)
local_file.SetFile (sdkroot_path.c_str(), false);
if (paths_to_try[i][0] != '\0')
local_file.AppendPathComponent (paths_to_try[i]);
local_file.AppendPathComponent (platform_file_path);
local_file.ResolvePath();
if (local_file.Exists())
{
log->Printf ("Found a copy of %s in the SDK dir %s", platform_file_path, sdkroot_path);
if (log)
log->Printf ("Found a copy of %s in the SDK dir %s/%s", platform_file_path, sdkroot_path.c_str(), paths_to_try[i]);
return true;
}
return true;
local_file.Clear();
}
}
::snprintf (resolved_path,
sizeof(resolved_path),
"%s/Symbols.Internal%s",
sdkroot_path,
platform_file_path);
local_file.SetFile(resolved_path, true);
if (local_file.Exists())
{
if (log)
{
log->Printf ("Found a copy of %s in the SDK dir %s/Symbols.Internal", platform_file_path, sdkroot_path);
}
return true;
}
::snprintf (resolved_path,
sizeof(resolved_path),
"%s/Symbols%s",
sdkroot_path,
platform_file_path);
local_file.SetFile(resolved_path, true);
if (local_file.Exists())
{
if (log)
{
log->Printf ("Found a copy of %s in the SDK dir %s/Symbols", platform_file_path, sdkroot_path);
}
return true;
}
}
return false;
}

6
lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h
View File

@ -149,12 +149,6 @@ protected:
uint32_t sdk_idx,
lldb_private::FileSpec &local_file);
bool
GetFileInSDKRoot (const char *platform_file_path,
const char *sdkroot_path,
bool symbols_dirs_only,
lldb_private::FileSpec &local_file);
uint32_t
FindFileInAllSDKs (const lldb_private::FileSpec &platform_file,
lldb_private::FileSpecList &file_list);