This is an archive of the discontinued LLVM Phabricator instance.

[debugserver] Initial support for Apple Silicon.
ClosedPublic

Authored by davide on Jun 23 2020, 10:23 AM.

Download Raw Diff

Details

Reviewers

friss
jasonmolenda
jingham
aprantl

Commits

rG2276bb48be01: [debugserver] Initial support for Apple Silicon.

Summary

Set the correct os type in the arch triple when running macOS. Debugserver currently always assumes macOS == x86_64. This patch generalizes the support to make sure it works on a different architecture.

Diff Detail

Event Timeline

davide created this revision.Jun 23 2020, 10:23 AM

davide added a subscriber: lldb-commits.

aprantl accepted this revision.Jun 23 2020, 10:41 AM

This revision is now accepted and ready to land.Jun 23 2020, 10:41 AM

Danke shoen

commit 2276bb48be0175f96b1494ca67b7921f0d4e87d8 (HEAD -> master, origin/master, origin/HEAD)
Author: Davide Italiano <ditaliano@apple.com>
Date:   Tue Jun 23 10:18:54 2020 -0700

    [debugserver] Initial support for Apple Silicon.
    
    Set the correct os type in the arch triple when running macOS.
    Debugserver currently always assumes macOS == x86_64. This patch
    generalizes the support to make sure it works on a different
    architecture.
    
    Differential Revision:  https://reviews.llvm.org/D82394

Revision Contents

Path

Size

lldb/

tools/

debugserver/

source/

RNBRemote.cpp

8 lines

Diff 272767

lldb/tools/debugserver/source/RNBRemote.cpp

	Show First 20 Lines • Show All 992 Lines • ▼ Show 20 Lines
	if (cputype == CPU_TYPE_ARM \|\| cputype == CPU_TYPE_ARM64			if (cputype == CPU_TYPE_ARM \|\| cputype == CPU_TYPE_ARM64
	\|\| cputype == CPU_TYPE_ARM64_32) {			\|\| cputype == CPU_TYPE_ARM64_32) {
	#if defined(TARGET_OS_TV) && TARGET_OS_TV == 1			#if defined(TARGET_OS_TV) && TARGET_OS_TV == 1
	strm << "ostype:tvos;";			strm << "ostype:tvos;";
	#elif defined(TARGET_OS_WATCH) && TARGET_OS_WATCH == 1			#elif defined(TARGET_OS_WATCH) && TARGET_OS_WATCH == 1
	strm << "ostype:watchos;";			strm << "ostype:watchos;";
	#elif defined(TARGET_OS_BRIDGE) && TARGET_OS_BRIDGE == 1			#elif defined(TARGET_OS_BRIDGE) && TARGET_OS_BRIDGE == 1
	strm << "ostype:bridgeos;";			strm << "ostype:bridgeos;";
				#elif defined(TARGET_OS_OSX) && TARGET_OS_OSX == 1
				strm << "ostype:macosx;";
	#else			#else
	strm << "ostype:ios;";			strm << "ostype:ios;";
	#endif			#endif

	// On armv7 we use "synchronous" watchpoints which means the exception is			// On armv7 we use "synchronous" watchpoints which means the exception is
	// delivered before the instruction executes.			// delivered before the instruction executes.
	strm << "watchpoint_exceptions_received:before;";			strm << "watchpoint_exceptions_received:before;";
	} else {			} else {
	▲ Show 20 Lines • Show All 1,412 Lines • ▼ Show 20 Lines

	rep << "cpusubtype:" << std::hex << cpusubtype << ';';			rep << "cpusubtype:" << std::hex << cpusubtype << ';';
	}			}

	bool os_handled = false;			bool os_handled = false;
	if (addr_size > 0) {			if (addr_size > 0) {
	rep << "ptrsize:" << std::dec << addr_size << ';';			rep << "ptrsize:" << std::dec << addr_size << ';';

	#if (defined(__x86_64__) \|\| defined(__i386__))			#if defined(TARGET_OS_OSX) && TARGET_OS_OSX == 1
	// Try and get the OS type by looking at the load commands in the main			// Try and get the OS type by looking at the load commands in the main
	// executable and looking for a LC_VERSION_MIN load command. This is the			// executable and looking for a LC_VERSION_MIN load command. This is the
	// most reliable way to determine the "ostype" value when on desktop.			// most reliable way to determine the "ostype" value when on desktop.

	mach_header mh;			mach_header mh;
	nub_addr_t exe_mach_header_addr =			nub_addr_t exe_mach_header_addr =
	GetMachHeaderForMainExecutable(pid, addr_size, mh);			GetMachHeaderForMainExecutable(pid, addr_size, mh);
	if (exe_mach_header_addr != INVALID_NUB_ADDRESS) {			if (exe_mach_header_addr != INVALID_NUB_ADDRESS) {
	Show All 13 Lines
	if (platform) {			if (platform) {
	os_handled = true;			os_handled = true;
	rep << "ostype:" << platform << ";";			rep << "ostype:" << platform << ";";
	break;			break;
	}			}
	load_command_addr = load_command_addr + lc.cmdsize;			load_command_addr = load_command_addr + lc.cmdsize;
	}			}
	}			}
	#endif // when compiling this on x86 targets			#endif // TARGET_OS_OSX
	}			}

	// If we weren't able to find the OS in a LC_VERSION_MIN load command, try			// If we weren't able to find the OS in a LC_VERSION_MIN load command, try
	// to set it correctly by using the cpu type and other tricks			// to set it correctly by using the cpu type and other tricks
	if (!os_handled) {			if (!os_handled) {
	// The OS in the triple should be "ios" or "macosx" which doesn't match our			// The OS in the triple should be "ios" or "macosx" which doesn't match our
	// "Darwin" which gets returned from "kern.ostype", so we need to hardcode			// "Darwin" which gets returned from "kern.ostype", so we need to hardcode
	// this for now.			// this for now.
	if (cputype == CPU_TYPE_ARM \|\| cputype == CPU_TYPE_ARM64			if (cputype == CPU_TYPE_ARM \|\| cputype == CPU_TYPE_ARM64
	\|\| cputype == CPU_TYPE_ARM64_32) {			\|\| cputype == CPU_TYPE_ARM64_32) {
	#if defined(TARGET_OS_TV) && TARGET_OS_TV == 1			#if defined(TARGET_OS_TV) && TARGET_OS_TV == 1
	rep << "ostype:tvos;";			rep << "ostype:tvos;";
	#elif defined(TARGET_OS_WATCH) && TARGET_OS_WATCH == 1			#elif defined(TARGET_OS_WATCH) && TARGET_OS_WATCH == 1
	rep << "ostype:watchos;";			rep << "ostype:watchos;";
	#elif defined(TARGET_OS_BRIDGE) && TARGET_OS_BRIDGE == 1			#elif defined(TARGET_OS_BRIDGE) && TARGET_OS_BRIDGE == 1
	rep << "ostype:bridgeos;";			rep << "ostype:bridgeos;";
				#elif defined(TARGET_OS_OSX) && TARGET_OS_OSX == 1
				rep << "ostype:macosx;";
	#else			#else
	rep << "ostype:ios;";			rep << "ostype:ios;";
	#endif			#endif
	} else {			} else {
	bool is_ios_simulator = false;			bool is_ios_simulator = false;
	if (cputype == CPU_TYPE_X86 \|\| cputype == CPU_TYPE_X86_64) {			if (cputype == CPU_TYPE_X86 \|\| cputype == CPU_TYPE_X86_64) {
	// Check for iOS simulator binaries by getting the process argument			// Check for iOS simulator binaries by getting the process argument
	// and environment and checking for SIMULATOR_UDID in the environment			// and environment and checking for SIMULATOR_UDID in the environment
	▲ Show 20 Lines • Show All 139 Lines • Show Last 20 Lines