Skip to content

Commit 933d8db

Browse files
bit-hackbit-hack
committedFeb 22, 2016
Refactor GetSoftwareBreakpointTrapOpcode
This patch aims to reduce the code duplication among all of the platforms in GetSoftwareBreakpointTrapOpcode by pushing all common code into the Platform base class. Differential Revision: http://reviews.llvm.org/D17395 llvm-svn: 261536
·
llvmorg-21-initllvmorg-3.9.0-rc1
1 parent 46e39cc commit 933d8db

File tree

10 files changed

+123
-250
lines changed

10 files changed

+123
-250
lines changed
 

‎lldb/include/lldb/Target/Platform.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ class ModuleCache;
427427

428428
virtual size_t
429429
GetSoftwareBreakpointTrapOpcode (Target &target,
430-
BreakpointSite *bp_site) = 0;
430+
BreakpointSite *bp_site);
431431

432432
//------------------------------------------------------------------
433433
/// Launch a new process on a platform, not necessarily for

‎lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp

+13-65
Original file line numberDiff line numberDiff line change
@@ -614,84 +614,32 @@ PlatformFreeBSD::GetStatus (Stream &strm)
614614
size_t
615615
PlatformFreeBSD::GetSoftwareBreakpointTrapOpcode (Target &target, BreakpointSite *bp_site)
616616
{
617-
ArchSpec arch = target.GetArchitecture();
618-
const uint8_t *trap_opcode = NULL;
619-
size_t trap_opcode_size = 0;
620-
621-
switch (arch.GetMachine())
617+
switch (target.GetArchitecture().GetMachine())
622618
{
623-
default:
624-
assert(false && "Unhandled architecture in PlatformFreeBSD::GetSoftwareBreakpointTrapOpcode()");
625-
break;
626-
case llvm::Triple::aarch64:
627-
{
628-
static const uint8_t g_aarch64_opcode[] = { 0x00, 0x00, 0x20, 0xd4 };
629-
trap_opcode = g_aarch64_opcode;
630-
trap_opcode_size = sizeof(g_aarch64_opcode);
631-
}
632-
break;
633-
// TODO: support big-endian arm and thumb trap codes.
634619
case llvm::Triple::arm:
635620
{
636-
static const uint8_t g_arm_breakpoint_opcode[] = { 0xfe, 0xde, 0xff, 0xe7 };
637-
static const uint8_t g_thumb_breakpoint_opcode[] = { 0x01, 0xde };
638-
639-
lldb::BreakpointLocationSP bp_loc_sp (bp_site->GetOwnerAtIndex (0));
621+
lldb::BreakpointLocationSP bp_loc_sp(bp_site->GetOwnerAtIndex(0));
640622
AddressClass addr_class = eAddressClassUnknown;
641623

642624
if (bp_loc_sp)
643-
addr_class = bp_loc_sp->GetAddress ().GetAddressClass ();
625+
{
626+
addr_class = bp_loc_sp->GetAddress().GetAddressClass();
627+
if (addr_class == eAddressClassUnknown && (bp_loc_sp->GetAddress().GetFileAddress() & 1))
628+
addr_class = eAddressClassCodeAlternateISA;
629+
}
644630

645-
if (addr_class == eAddressClassCodeAlternateISA
646-
|| (addr_class == eAddressClassUnknown && (bp_site->GetLoadAddress() & 1)))
631+
if (addr_class == eAddressClassCodeAlternateISA)
647632
{
648633
// TODO: Enable when FreeBSD supports thumb breakpoints.
649634
// FreeBSD kernel as of 10.x, does not support thumb breakpoints
650-
trap_opcode = g_thumb_breakpoint_opcode;
651-
trap_opcode_size = 0;
652-
}
653-
else
654-
{
655-
trap_opcode = g_arm_breakpoint_opcode;
656-
trap_opcode_size = sizeof(g_arm_breakpoint_opcode);
635+
return 0;
657636
}
658637
}
659-
break;
660-
case llvm::Triple::mips64:
661-
{
662-
static const uint8_t g_hex_opcode[] = { 0x00, 0x00, 0x00, 0x0d };
663-
trap_opcode = g_hex_opcode;
664-
trap_opcode_size = sizeof(g_hex_opcode);
665-
}
666-
break;
667-
case llvm::Triple::mips64el:
668-
{
669-
static const uint8_t g_hex_opcode[] = { 0x0d, 0x00, 0x00, 0x00 };
670-
trap_opcode = g_hex_opcode;
671-
trap_opcode_size = sizeof(g_hex_opcode);
672-
}
673-
break;
674-
case llvm::Triple::ppc:
675-
case llvm::Triple::ppc64:
676-
{
677-
static const uint8_t g_ppc_opcode[] = { 0x7f, 0xe0, 0x00, 0x08 };
678-
trap_opcode = g_ppc_opcode;
679-
trap_opcode_size = sizeof(g_ppc_opcode);
680-
}
681-
break;
682-
case llvm::Triple::x86:
683-
case llvm::Triple::x86_64:
684-
{
685-
static const uint8_t g_i386_opcode[] = { 0xCC };
686-
trap_opcode = g_i386_opcode;
687-
trap_opcode_size = sizeof(g_i386_opcode);
688-
}
689-
break;
690-
}
691638

692-
if (bp_site->SetTrapOpcode(trap_opcode, trap_opcode_size))
693-
return trap_opcode_size;
694-
return 0;
639+
// Fall through...
640+
default:
641+
return Platform::GetSoftwareBreakpointTrapOpcode(target, bp_site);
642+
}
695643
}
696644

697645

‎lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp

-92
Original file line numberDiff line numberDiff line change
@@ -522,98 +522,6 @@ PlatformLinux::GetStatus (Stream &strm)
522522
#endif
523523
}
524524

525-
size_t
526-
PlatformLinux::GetSoftwareBreakpointTrapOpcode (Target &target,
527-
BreakpointSite *bp_site)
528-
{
529-
ArchSpec arch = target.GetArchitecture();
530-
const uint8_t *trap_opcode = NULL;
531-
size_t trap_opcode_size = 0;
532-
533-
switch (arch.GetMachine())
534-
{
535-
default:
536-
assert(false && "CPU type not supported!");
537-
break;
538-
539-
case llvm::Triple::aarch64:
540-
{
541-
static const uint8_t g_aarch64_opcode[] = { 0x00, 0x00, 0x20, 0xd4 };
542-
trap_opcode = g_aarch64_opcode;
543-
trap_opcode_size = sizeof(g_aarch64_opcode);
544-
}
545-
break;
546-
case llvm::Triple::x86:
547-
case llvm::Triple::x86_64:
548-
{
549-
static const uint8_t g_i386_breakpoint_opcode[] = { 0xCC };
550-
trap_opcode = g_i386_breakpoint_opcode;
551-
trap_opcode_size = sizeof(g_i386_breakpoint_opcode);
552-
}
553-
break;
554-
case llvm::Triple::hexagon:
555-
{
556-
static const uint8_t g_hex_opcode[] = { 0x0c, 0xdb, 0x00, 0x54 };
557-
trap_opcode = g_hex_opcode;
558-
trap_opcode_size = sizeof(g_hex_opcode);
559-
}
560-
break;
561-
case llvm::Triple::arm:
562-
{
563-
// The ARM reference recommends the use of 0xe7fddefe and 0xdefe
564-
// but the linux kernel does otherwise.
565-
static const uint8_t g_arm_breakpoint_opcode[] = { 0xf0, 0x01, 0xf0, 0xe7 };
566-
static const uint8_t g_thumb_breakpoint_opcode[] = { 0x01, 0xde };
567-
568-
lldb::BreakpointLocationSP bp_loc_sp (bp_site->GetOwnerAtIndex (0));
569-
AddressClass addr_class = eAddressClassUnknown;
570-
571-
if (bp_loc_sp)
572-
{
573-
addr_class = bp_loc_sp->GetAddress ().GetAddressClass ();
574-
575-
if (addr_class == eAddressClassUnknown &&
576-
(bp_loc_sp->GetAddress ().GetFileAddress () & 1))
577-
{
578-
addr_class = eAddressClassCodeAlternateISA;
579-
}
580-
}
581-
582-
if (addr_class == eAddressClassCodeAlternateISA)
583-
{
584-
trap_opcode = g_thumb_breakpoint_opcode;
585-
trap_opcode_size = sizeof(g_thumb_breakpoint_opcode);
586-
}
587-
else
588-
{
589-
trap_opcode = g_arm_breakpoint_opcode;
590-
trap_opcode_size = sizeof(g_arm_breakpoint_opcode);
591-
}
592-
}
593-
break;
594-
case llvm::Triple::mips:
595-
case llvm::Triple::mips64:
596-
{
597-
static const uint8_t g_hex_opcode[] = { 0x00, 0x00, 0x00, 0x0d };
598-
trap_opcode = g_hex_opcode;
599-
trap_opcode_size = sizeof(g_hex_opcode);
600-
}
601-
break;
602-
case llvm::Triple::mipsel:
603-
case llvm::Triple::mips64el:
604-
{
605-
static const uint8_t g_hex_opcode[] = { 0x0d, 0x00, 0x00, 0x00 };
606-
trap_opcode = g_hex_opcode;
607-
trap_opcode_size = sizeof(g_hex_opcode);
608-
}
609-
break;
610-
}
611-
612-
if (bp_site->SetTrapOpcode(trap_opcode, trap_opcode_size))
613-
return trap_opcode_size;
614-
return 0;
615-
}
616-
617525
int32_t
618526
PlatformLinux::GetResumeCountForLaunchInfo (ProcessLaunchInfo &launch_info)
619527
{

‎lldb/source/Plugins/Platform/Linux/PlatformLinux.h

-4
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,6 @@ namespace platform_linux {
8787
bool
8888
GetSupportedArchitectureAtIndex (uint32_t idx, ArchSpec &arch) override;
8989

90-
size_t
91-
GetSoftwareBreakpointTrapOpcode (Target &target,
92-
BreakpointSite *bp_site) override;
93-
9490
int32_t
9591
GetResumeCountForLaunchInfo (ProcessLaunchInfo &launch_info) override;
9692

‎lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp

+6-16
Original file line numberDiff line numberDiff line change
@@ -583,22 +583,13 @@ PlatformDarwin::GetSharedModule (const ModuleSpec &module_spec,
583583
size_t
584584
PlatformDarwin::GetSoftwareBreakpointTrapOpcode (Target &target, BreakpointSite *bp_site)
585585
{
586-
const uint8_t *trap_opcode = NULL;
586+
const uint8_t *trap_opcode = nullptr;
587587
uint32_t trap_opcode_size = 0;
588588
bool bp_is_thumb = false;
589-
589+
590590
llvm::Triple::ArchType machine = target.GetArchitecture().GetMachine();
591591
switch (machine)
592592
{
593-
case llvm::Triple::x86:
594-
case llvm::Triple::x86_64:
595-
{
596-
static const uint8_t g_i386_breakpoint_opcode[] = { 0xCC };
597-
trap_opcode = g_i386_breakpoint_opcode;
598-
trap_opcode_size = sizeof(g_i386_breakpoint_opcode);
599-
}
600-
break;
601-
602593
case llvm::Triple::aarch64:
603594
{
604595
// TODO: fix this with actual darwin breakpoint opcode for arm64.
@@ -635,7 +626,7 @@ PlatformDarwin::GetSoftwareBreakpointTrapOpcode (Target &target, BreakpointSite
635626
trap_opcode_size = sizeof(g_arm_breakpoint_opcode);
636627
}
637628
break;
638-
629+
639630
case llvm::Triple::ppc:
640631
case llvm::Triple::ppc64:
641632
{
@@ -644,12 +635,11 @@ PlatformDarwin::GetSoftwareBreakpointTrapOpcode (Target &target, BreakpointSite
644635
trap_opcode_size = sizeof(g_ppc_breakpoint_opcode);
645636
}
646637
break;
647-
638+
648639
default:
649-
assert(!"Unhandled architecture in PlatformDarwin::GetSoftwareBreakpointTrapOpcode()");
650-
break;
640+
return Platform::GetSoftwareBreakpointTrapOpcode(target, bp_site);
651641
}
652-
642+
653643
if (trap_opcode && trap_opcode_size)
654644
{
655645
if (bp_site->SetTrapOpcode(trap_opcode, trap_opcode_size))

‎lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp

-28
Original file line numberDiff line numberDiff line change
@@ -585,34 +585,6 @@ PlatformNetBSD::GetStatus (Stream &strm)
585585
Platform::GetStatus(strm);
586586
}
587587

588-
size_t
589-
PlatformNetBSD::GetSoftwareBreakpointTrapOpcode (Target &target, BreakpointSite *bp_site)
590-
{
591-
ArchSpec arch = target.GetArchitecture();
592-
const uint8_t *trap_opcode = NULL;
593-
size_t trap_opcode_size = 0;
594-
595-
switch (arch.GetMachine())
596-
{
597-
default:
598-
assert(false && "Unhandled architecture in PlatformNetBSD::GetSoftwareBreakpointTrapOpcode()");
599-
break;
600-
case llvm::Triple::x86:
601-
case llvm::Triple::x86_64:
602-
{
603-
static const uint8_t g_i386_opcode[] = { 0xCC };
604-
trap_opcode = g_i386_opcode;
605-
trap_opcode_size = sizeof(g_i386_opcode);
606-
}
607-
break;
608-
}
609-
610-
if (bp_site->SetTrapOpcode(trap_opcode, trap_opcode_size))
611-
return trap_opcode_size;
612-
return 0;
613-
}
614-
615-
616588
void
617589
PlatformNetBSD::CalculateTrapHandlerSymbolNames ()
618590
{

‎lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.h

-4
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,6 @@ namespace platform_netbsd {
8686
lldb::ModuleSP &module_sp,
8787
const FileSpecList *module_search_paths_ptr) override;
8888

89-
size_t
90-
GetSoftwareBreakpointTrapOpcode(Target &target,
91-
BreakpointSite *bp_site) override;
92-
9389
bool
9490
GetRemoteOSVersion () override;
9591

‎lldb/source/Plugins/Platform/Windows/PlatformWindows.cpp

-36
Original file line numberDiff line numberDiff line change
@@ -321,42 +321,6 @@ PlatformWindows::ResolveExecutable (const ModuleSpec &ms,
321321
return error;
322322
}
323323

324-
size_t
325-
PlatformWindows::GetSoftwareBreakpointTrapOpcode (Target &target, BreakpointSite *bp_site)
326-
{
327-
ArchSpec arch = target.GetArchitecture();
328-
const uint8_t *trap_opcode = nullptr;
329-
size_t trap_opcode_size = 0;
330-
331-
switch (arch.GetMachine())
332-
{
333-
case llvm::Triple::x86:
334-
case llvm::Triple::x86_64:
335-
{
336-
static const uint8_t g_i386_opcode[] = { 0xCC };
337-
trap_opcode = g_i386_opcode;
338-
trap_opcode_size = sizeof(g_i386_opcode);
339-
}
340-
break;
341-
342-
case llvm::Triple::hexagon:
343-
{
344-
static const uint8_t g_hex_opcode[] = { 0x0c, 0xdb, 0x00, 0x54 };
345-
trap_opcode = g_hex_opcode;
346-
trap_opcode_size = sizeof(g_hex_opcode);
347-
}
348-
break;
349-
default:
350-
llvm_unreachable("Unhandled architecture in PlatformWindows::GetSoftwareBreakpointTrapOpcode()");
351-
break;
352-
}
353-
354-
if (bp_site->SetTrapOpcode(trap_opcode, trap_opcode_size))
355-
return trap_opcode_size;
356-
357-
return 0;
358-
}
359-
360324
bool
361325
PlatformWindows::GetRemoteOSVersion ()
362326
{

‎lldb/source/Plugins/Platform/Windows/PlatformWindows.h

-4
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ class PlatformWindows : public Platform
7272
return GetPluginDescriptionStatic(IsHost());
7373
}
7474

75-
size_t
76-
GetSoftwareBreakpointTrapOpcode(lldb_private::Target &target,
77-
lldb_private::BreakpointSite *bp_site) override;
78-
7975
bool
8076
GetRemoteOSVersion() override;
8177

‎lldb/source/Target/Platform.cpp

+103
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
// Project includes
2121
#include "lldb/Target/Platform.h"
2222
#include "lldb/Breakpoint/BreakpointIDList.h"
23+
#include "lldb/Breakpoint/BreakpointLocation.h"
2324
#include "lldb/Core/DataBufferHeap.h"
2425
#include "lldb/Core/Debugger.h"
2526
#include "lldb/Core/Error.h"
@@ -2046,3 +2047,105 @@ Platform::ConnectToWaitingProcesses(lldb_private::Debugger& debugger, lldb_priva
20462047
error.Clear();
20472048
return 0;
20482049
}
2050+
2051+
size_t
2052+
Platform::GetSoftwareBreakpointTrapOpcode(Target &target, BreakpointSite *bp_site)
2053+
{
2054+
ArchSpec arch = target.GetArchitecture();
2055+
const uint8_t *trap_opcode = nullptr;
2056+
size_t trap_opcode_size = 0;
2057+
2058+
switch (arch.GetMachine())
2059+
{
2060+
case llvm::Triple::aarch64:
2061+
{
2062+
static const uint8_t g_aarch64_opcode[] = {0x00, 0x00, 0x20, 0xd4};
2063+
trap_opcode = g_aarch64_opcode;
2064+
trap_opcode_size = sizeof(g_aarch64_opcode);
2065+
}
2066+
break;
2067+
2068+
// TODO: support big-endian arm and thumb trap codes.
2069+
case llvm::Triple::arm:
2070+
{
2071+
// The ARM reference recommends the use of 0xe7fddefe and 0xdefe
2072+
// but the linux kernel does otherwise.
2073+
static const uint8_t g_arm_breakpoint_opcode[] = {0xf0, 0x01, 0xf0, 0xe7};
2074+
static const uint8_t g_thumb_breakpoint_opcode[] = {0x01, 0xde};
2075+
2076+
lldb::BreakpointLocationSP bp_loc_sp(bp_site->GetOwnerAtIndex(0));
2077+
AddressClass addr_class = eAddressClassUnknown;
2078+
2079+
if (bp_loc_sp)
2080+
{
2081+
addr_class = bp_loc_sp->GetAddress().GetAddressClass();
2082+
if (addr_class == eAddressClassUnknown && (bp_loc_sp->GetAddress().GetFileAddress() & 1))
2083+
addr_class = eAddressClassCodeAlternateISA;
2084+
}
2085+
2086+
if (addr_class == eAddressClassCodeAlternateISA)
2087+
{
2088+
trap_opcode = g_thumb_breakpoint_opcode;
2089+
trap_opcode_size = sizeof(g_thumb_breakpoint_opcode);
2090+
}
2091+
else
2092+
{
2093+
trap_opcode = g_arm_breakpoint_opcode;
2094+
trap_opcode_size = sizeof(g_arm_breakpoint_opcode);
2095+
}
2096+
}
2097+
break;
2098+
2099+
case llvm::Triple::mips64:
2100+
{
2101+
static const uint8_t g_hex_opcode[] = {0x00, 0x00, 0x00, 0x0d};
2102+
trap_opcode = g_hex_opcode;
2103+
trap_opcode_size = sizeof(g_hex_opcode);
2104+
}
2105+
break;
2106+
2107+
case llvm::Triple::mips64el:
2108+
{
2109+
static const uint8_t g_hex_opcode[] = {0x0d, 0x00, 0x00, 0x00};
2110+
trap_opcode = g_hex_opcode;
2111+
trap_opcode_size = sizeof(g_hex_opcode);
2112+
}
2113+
break;
2114+
2115+
case llvm::Triple::hexagon:
2116+
{
2117+
static const uint8_t g_hex_opcode[] = {0x0c, 0xdb, 0x00, 0x54};
2118+
trap_opcode = g_hex_opcode;
2119+
trap_opcode_size = sizeof(g_hex_opcode);
2120+
}
2121+
break;
2122+
2123+
case llvm::Triple::ppc:
2124+
case llvm::Triple::ppc64:
2125+
{
2126+
static const uint8_t g_ppc_opcode[] = {0x7f, 0xe0, 0x00, 0x08};
2127+
trap_opcode = g_ppc_opcode;
2128+
trap_opcode_size = sizeof(g_ppc_opcode);
2129+
}
2130+
break;
2131+
2132+
case llvm::Triple::x86:
2133+
case llvm::Triple::x86_64:
2134+
{
2135+
static const uint8_t g_i386_opcode[] = {0xCC};
2136+
trap_opcode = g_i386_opcode;
2137+
trap_opcode_size = sizeof(g_i386_opcode);
2138+
}
2139+
break;
2140+
2141+
default:
2142+
assert(!"Unhandled architecture in Platform::GetSoftwareBreakpointTrapOpcode");
2143+
break;
2144+
}
2145+
2146+
assert(bp_site);
2147+
if (bp_site->SetTrapOpcode(trap_opcode, trap_opcode_size))
2148+
return trap_opcode_size;
2149+
2150+
return 0;
2151+
}

0 commit comments

Comments
 (0)
Please sign in to comment.