Skip to content

Commit e656524

Browse files
Meet review items
1 parent cf1c295 commit e656524

File tree

6 files changed

+40
-36
lines changed

6 files changed

+40
-36
lines changed

lldb/test/API/functionalities/postmortem/elf-core/TestLinuxCore.py

Lines changed: 40 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ class LinuxCoreTestCase(TestBase):
2121
_x86_64_pid = 32259
2222
_s390x_pid = 1045
2323
_ppc64le_pid = 28147
24-
_riscv64_pid = 89328
25-
_riscv64_no_fpr_pid = 97
24+
_riscv64_gpr_fpr_pid = 1089
25+
_riscv64_gpr_only_pid = 97
2626

2727
_aarch64_regions = 4
2828
_i386_regions = 4
@@ -62,17 +62,21 @@ def test_s390x(self):
6262
self.do_test("linux-s390x", self._s390x_pid, self._s390x_regions, "a.out")
6363

6464
@skipIfLLVMTargetMissing("RISCV")
65-
def test_riscv64(self):
65+
def test_riscv64_gpr_fpr(self):
6666
"""Test that lldb can read the process information from an riscv64 linux core file."""
67-
self.do_test("linux-riscv64", self._riscv64_pid, self._riscv64_regions, "a.out")
67+
self.do_test(
68+
"linux-riscv64.gpr_fpr",
69+
self._riscv64_gpr_fpr_pid,
70+
self._riscv64_regions,
71+
"a.out")
6872

6973
@skipIfLLVMTargetMissing("RISCV")
70-
def test_riscv64_no_fpr(self):
74+
def test_riscv64_gpr_only(self):
7175
"""Test that lldb can read the process information from an riscv64 linux core file
7276
made for a RV64IMAC target, having no FP-registers."""
7377
self.do_test(
74-
"linux-riscv64.no_fpr",
75-
self._riscv64_no_fpr_pid,
78+
"linux-riscv64.gpr_only",
79+
self._riscv64_gpr_only_pid,
7680
self._riscv64_regions,
7781
"a.out",
7882
)
@@ -680,46 +684,47 @@ def test_arm_core(self):
680684
self.expect("register read --all")
681685

682686
@skipIfLLVMTargetMissing("RISCV")
683-
def test_riscv64_regs(self):
687+
def test_riscv64_regs_gpr_fpr(self):
684688
# check basic registers using 64 bit RISC-V core file
685689
target = self.dbg.CreateTarget(None)
686690
self.assertTrue(target, VALID_TARGET)
687-
process = target.LoadCore("linux-riscv64.core")
691+
process = target.LoadCore("linux-riscv64.gpr_fpr.core")
688692

689693
values = {}
690-
values["pc"] = "0x000000000001015e"
691-
values["ra"] = "0x000000000001018c"
692-
values["sp"] = "0x0000003fffd132a0"
693-
values["gp"] = "0x0000002ae919af50"
694-
values["tp"] = "0x0000003fdceae3e0"
695-
values["t0"] = "0x0"
696-
values["t1"] = "0x0000002ae9187b1c"
697-
values["t2"] = "0x0000000000000021"
698-
values["fp"] = "0x0000003fffd132d0"
699-
values["s1"] = "0x0000002ae919cd98"
694+
values["pc"] = "0x000000000001016e"
695+
values["ra"] = "0x00000000000101a4"
696+
values["sp"] = "0x0000003fffc1d2d0"
697+
values["gp"] = "0x0000002ae6eccf50"
698+
values["tp"] = "0x0000003ff3cb5400"
699+
values["t0"] = "0x7f7f7f7fffffffff"
700+
values["t1"] = "0x0000002ae6eb9b1c"
701+
values["t2"] = "0xffffffffffffffff"
702+
values["fp"] = "0x0000003fffc1d300"
703+
values["s1"] = "0x0000002ae6eced98"
700704
values["a0"] = "0x0"
701705
values["a1"] = "0x0000000000010144"
702-
values["a2"] = "0x0000002ae919cdb0"
703-
values["a3"] = "0x000000000000002f"
704-
values["a4"] = "0x000000000000002f"
706+
values["a2"] = "0x0000002ae6ecedb0"
707+
values["a3"] = "0xafdbdbff81cf7f81"
708+
values["a4"] = "0x00000000000101e4"
705709
values["a5"] = "0x0"
706-
values["a6"] = "0x7efefefefefefeff"
710+
values["a6"] = "0x2f5b5a40014e0001"
707711
values["a7"] = "0x00000000000000dd"
708-
values["s2"] = "0x0000002ae9196860"
709-
values["s3"] = "0x0000002ae919cdb0"
710-
values["s4"] = "0x0000003fffc63be8"
711-
values["s5"] = "0x0000002ae919cb78"
712-
values["s6"] = "0x0000002ae9196860"
713-
values["s7"] = "0x0000002ae9196860"
712+
values["s2"] = "0x0000002ae6ec8860"
713+
values["s3"] = "0x0000002ae6ecedb0"
714+
values["s4"] = "0x0000003fff886c18"
715+
values["s5"] = "0x0000002ae6eceb78"
716+
values["s6"] = "0x0000002ae6ec8860"
717+
values["s7"] = "0x0000002ae6ec8860"
714718
values["s8"] = "0x0"
715719
values["s9"] = "0x000000000000000f"
716-
values["s10"] = "0x0000002ae919a8d0"
720+
values["s10"] = "0x0000002ae6ecc8d0"
717721
values["s11"] = "0x0000000000000008"
718-
values["t3"] = "0x0000003fdce07df4"
722+
values["t3"] = "0x0000003ff3be3728"
719723
values["t4"] = "0x0"
720-
values["t5"] = "0x0000000000000020"
721-
values["t6"] = "0x0000002ae919f1b0"
724+
values["t5"] = "0x0000000000000002"
725+
values["t6"] = "0x0000002ae6ed08b9"
722726
values["zero"] = "0x0"
727+
values["fa5"] = "0xffffffff423c0000"
723728
values["fcsr"] = "0x00000000"
724729

725730
fpr_names = {
@@ -740,7 +745,6 @@ def test_riscv64_regs(self):
740745
"fa2",
741746
"fa3",
742747
"fa4",
743-
"fa5",
744748
"fa6",
745749
"fa7",
746750
"fs0",
@@ -773,11 +777,11 @@ def test_riscv64_regs(self):
773777
self.expect("register read --all")
774778

775779
@skipIfLLVMTargetMissing("RISCV")
776-
def test_riscv64_no_fpr_regs(self):
780+
def test_riscv64_regs_gpr_only(self):
777781
# check registers using 64 bit RISC-V core file containing GP-registers only
778782
target = self.dbg.CreateTarget(None)
779783
self.assertTrue(target, VALID_TARGET)
780-
process = target.LoadCore("linux-riscv64.no_fpr.core")
784+
process = target.LoadCore("linux-riscv64.gpr_only.core")
781785

782786
values = {}
783787
values["pc"] = "0x0000000000010164"
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)