maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[testsuite] Adapt lldb-server base test helper to run on arm64

This commit is contained in:
Davide Italiano 2020-07-20 14:11:58 -07:00
parent bd994b81d3
commit cd05406b10
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
View File

@ -1537,7 +1537,7 @@ class GdbRemoteTestCaseBase(TestBase):
g_c2_address = int(context.get("g_c2_address"), 16)
# Set a breakpoint at the given address.
if self.getArchitecture() == "arm":
if self.getArchitecture().startswith("arm"):
# TODO: Handle case when setting breakpoint in thumb code
BREAKPOINT_KIND = 4
else:
@ -1601,8 +1601,18 @@ class GdbRemoteTestCaseBase(TestBase):
# variable value
if re.match("s390x", arch):
expected_step_count = 2
# ARM64 requires "4" instructions: 2 to compute the address (adrp, add),
# one to materialize the constant (mov) and the store
if re.match("arm64", arch):
expected_step_count = 4
self.assertEqual(step_count, expected_step_count)
# ARM64: Once addresses and constants are materialized, only one
# instruction is needed.
if re.match("arm64", arch):
expected_step_count = 1
# Verify we hit the next state.
args["expected_g_c1"] = "0"
args["expected_g_c2"] = "0"