Skip to content

Commit 0230a3b

Browse files
kperkper
committed
Addressed feedback
1 parent 5c23fe3 commit 0230a3b

File tree

2 files changed

+87
-217
lines changed

2 files changed

+87
-217
lines changed

‎lldb/test/API/functionalities/gdb_remote_client/TestGDBServerTargetXML.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -696,6 +696,7 @@ class MyResponder(MockGDBServerResponder):
696696

697697
def qXferRead(self, obj, annex, offset, length):
698698
if annex == "target.xml":
699+
# Note that this XML does not include any aliases, LLDB must generate them itself.
699700
return (
700701
"""<?xml version="1.0"?>
701702
<!DOCTYPE feature SYSTEM "gdb-target.dtd">

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

Lines changed: 86 additions & 217 deletions
Original file line numberDiff line numberDiff line change
@@ -703,108 +703,43 @@ def test_riscv64_regs_gpr_fpr(self):
703703
self.assertTrue(target, VALID_TARGET)
704704
process = target.LoadCore("linux-riscv64.gpr_fpr.core")
705705

706-
values = {}
707-
alias = {}
708-
values["pc"] = "0x000000000001016e"
709-
710-
values["ra"] = "0x00000000000101a4"
711-
alias["x1"] = "ra"
712-
713-
values["sp"] = "0x0000003fffc1d2d0"
714-
alias["x2"] = "sp"
715-
716-
values["gp"] = "0x0000002ae6eccf50"
717-
alias["x3"] = "gp"
718-
719-
values["tp"] = "0x0000003ff3cb5400"
720-
alias["x4"] = "tp"
721-
722-
values["t0"] = "0x7f7f7f7fffffffff"
723-
alias["x5"] = "t0"
724-
725-
values["t1"] = "0x0000002ae6eb9b1c"
726-
alias["x6"] = "t1"
727-
728-
values["t2"] = "0xffffffffffffffff"
729-
alias["x7"] = "t2"
730-
731-
values["fp"] = "0x0000003fffc1d300"
732-
alias["x8"] = "fp"
733-
734-
values["s1"] = "0x0000002ae6eced98"
735-
alias["x9"] = "s1"
736-
737-
values["a0"] = "0x0"
738-
alias["x10"] = "a0"
739-
740-
values["a1"] = "0x0000000000010144"
741-
alias["x11"] = "a1"
742-
743-
values["a2"] = "0x0000002ae6ecedb0"
744-
alias["x12"] = "a2"
745-
746-
values["a3"] = "0xafdbdbff81cf7f81"
747-
alias["x13"] = "a3"
748-
749-
values["a4"] = "0x00000000000101e4"
750-
alias["x14"] = "a4"
751-
752-
values["a5"] = "0x0"
753-
alias["x15"] = "a5"
754-
755-
values["a6"] = "0x2f5b5a40014e0001"
756-
alias["x16"] = "a6"
757-
758-
values["a7"] = "0x00000000000000dd"
759-
alias["x17"] = "a7"
760-
761-
values["s2"] = "0x0000002ae6ec8860"
762-
alias["x18"] = "s2"
763-
764-
values["s3"] = "0x0000002ae6ecedb0"
765-
alias["x19"] = "s3"
766-
767-
values["s4"] = "0x0000003fff886c18"
768-
alias["x20"] = "s4"
769-
770-
values["s5"] = "0x0000002ae6eceb78"
771-
alias["x21"] = "s5"
772-
773-
values["s6"] = "0x0000002ae6ec8860"
774-
alias["x22"] = "s6"
775-
776-
values["s7"] = "0x0000002ae6ec8860"
777-
alias["x23"] = "s7"
778-
779-
values["s8"] = "0x0"
780-
alias["x24"] = "s8"
781-
782-
values["s9"] = "0x000000000000000f"
783-
alias["x25"] = "s9"
784-
785-
values["s10"] = "0x0000002ae6ecc8d0"
786-
alias["x26"] = "s10"
787-
788-
values["s11"] = "0x0000000000000008"
789-
alias["x27"] = "s11"
790-
791-
values["t3"] = "0x0000003ff3be3728"
792-
alias["x28"] = "t3"
793-
794-
values["t4"] = "0x0"
795-
alias["x29"] = "t4"
796-
797-
values["t5"] = "0x0000000000000002"
798-
alias["x30"] = "t5"
799-
800-
values["t6"] = "0x0000002ae6ed08b9"
801-
alias["x31"] = "t6"
802-
803-
values["zero"] = "0x0"
804-
alias["x0"] = "zero"
805-
806-
values["fa5"] = "0xffffffff423c0000"
807-
values["fcsr"] = "0x00000000"
706+
values = {
707+
"pc": ( "0x000000000001016e", None ),
708+
"zero": ( "0x0", "x0" ),
709+
"ra": ( "0x00000000000101a4", "x1" ),
710+
"sp": ( "0x0000003fffc1d2d0", "x2" ),
711+
"gp": ( "0x0000002ae6eccf50", "x3" ),
712+
"tp": ( "0x0000003ff3cb5400", "x4" ),
713+
"t0": ( "0x7f7f7f7fffffffff", "x5" ),
714+
"t1": ( "0x0000002ae6eb9b1c", "x6" ),
715+
"t2": ( "0xffffffffffffffff", "x7" ),
716+
"fp": ( "0x0000003fffc1d300", "x8" ),
717+
"s1": ( "0x0000002ae6eced98", "x9" ),
718+
"a0": ( "0x0000000000000000", "x10" ),
719+
"a1": ( "0x0000000000010144", "x11" ),
720+
"a2": ( "0x0000002ae6ecedb0", "x12" ),
721+
"a3": ( "0xafdbdbff81cf7f81", "x13" ),
722+
"a4": ( "0x00000000000101e4", "x14" ),
723+
"a5": ( "0x0000000000000000", "x15" ),
724+
"a6": ( "0x2f5b5a40014e0001", "x16" ),
725+
"a7": ( "0x00000000000000dd", "x17" ),
726+
"s2": ( "0x0000002ae6ec8860", "x18" ),
727+
"s3": ( "0x0000002ae6ecedb0", "x19" ),
728+
"s4": ( "0x0000003fff886c18", "x20" ),
729+
"s5": ( "0x0000002ae6eceb78", "x21" ),
730+
"s6": ( "0x0000002ae6ec8860", "x22" ),
731+
"s7": ( "0x0000002ae6ec8860", "x23" ),
732+
"s8": ( "0x0000000000000000", "x24" ),
733+
"s9": ( "0x000000000000000f", "x25" ),
734+
"s10": ( "0x0000002ae6ecc8d0", "x26" ),
735+
"s11": ( "0x0000000000000008", "x27" ),
736+
"t3": ( "0x0000003ff3be3728", "x28" ),
737+
"t4": ( "0x0000000000000000", "x29" ),
738+
"t5": ( "0x0000000000000002", "x30" ),
739+
"t6": ( "0x0000002ae6ed08b9", "x31" ),
740+
"fa5": ( "0xffffffff423c0000", None),
741+
"fcsr": ( "0x00000000", None)
742+
}
808743

809744
fpr_names = {
810745
"ft0",
@@ -842,25 +777,24 @@ def test_riscv64_regs_gpr_fpr(self):
842777
}
843778
fpr_value = "0x0000000000000000"
844779

845-
for regname, value in values.items():
780+
for regname in values:
781+
value, alias = values[regname]
846782
self.expect(
847783
"register read {}".format(regname),
848784
substrs=["{} = {}".format(regname, value)],
849785
)
786+
if alias:
787+
self.expect(
788+
"register read {}".format(alias),
789+
substrs=["{} = {}".format(regname, value)],
790+
)
850791

851792
for regname in fpr_names:
852793
self.expect(
853794
"register read {}".format(regname),
854795
substrs=["{} = {}".format(regname, fpr_value)],
855796
)
856797

857-
for aliasname, regname in alias.items():
858-
value = values[regname]
859-
self.expect(
860-
"register read {}".format(aliasname),
861-
substrs=["{} = {}".format(regname, value)],
862-
)
863-
864798
self.expect("register read --all")
865799

866800
@skipIfLLVMTargetMissing("RISCV")
@@ -870,118 +804,53 @@ def test_riscv64_regs_gpr_only(self):
870804
self.assertTrue(target, VALID_TARGET)
871805
process = target.LoadCore("linux-riscv64.gpr_only.core")
872806

873-
values = {}
874-
alias = {}
875-
values["pc"] = "0x0000000000010164"
876-
877-
values["ra"] = "0x0000000000010194"
878-
alias["x1"] = "ra"
879-
880-
values["sp"] = "0x00fffffff4d5fcc0"
881-
alias["x2"] = "sp"
882-
883-
values["gp"] = "0x0000000000157678"
884-
alias["x3"] = "gp"
885-
886-
values["tp"] = "0x00ffffff99c43400"
887-
alias["x4"] = "tp"
888-
889-
values["t0"] = "0x00ffffff99c6b260"
890-
alias["x5"] = "t0"
891-
892-
values["t1"] = "0x00ffffff99b7bd54"
893-
alias["x6"] = "t1"
894-
895-
values["t2"] = "0x0000000003f0b27f"
896-
alias["x7"] = "t2"
897-
898-
values["fp"] = "0x00fffffff4d5fcf0"
899-
alias["x8"] = "fp"
900-
901-
values["s1"] = "0x0000000000000003"
902-
alias["x9"] = "s1"
903-
904-
values["a0"] = "0x0"
905-
alias["x10"] = "a0"
906-
907-
values["a1"] = "0x0000000000010144"
908-
alias["x11"] = "a1"
909-
910-
values["a2"] = "0x0000000000176460"
911-
alias["x12"] = "a2"
912-
913-
values["a3"] = "0x000000000015ee38"
914-
alias["x13"] = "a3"
915-
916-
values["a4"] = "0x00000000423c0000"
917-
alias["x14"] = "a4"
918-
919-
values["a5"] = "0x0"
920-
alias["x15"] = "a5"
921-
922-
values["a6"] = "0x0"
923-
alias["x16"] = "a6"
924-
925-
values["a7"] = "0x00000000000000dd"
926-
alias["x17"] = "a7"
927-
928-
values["s2"] = "0x0"
929-
alias["x18"] = "s2"
930-
931-
values["s3"] = "0x000000000014ddf8"
932-
alias["x19"] = "s3"
933-
934-
values["s4"] = "0x000000000003651c"
935-
alias["x20"] = "s4"
936-
937-
values["s5"] = "0x00fffffffccd8d28"
938-
alias["x21"] = "s5"
939-
940-
values["s6"] = "0x000000000014ddf8"
941-
alias["x22"] = "s6"
942-
943-
values["s7"] = "0x00ffffff99c69d48"
944-
alias["x23"] = "s7"
945-
946-
values["s8"] = "0x00ffffff99c6a008"
947-
alias["x24"] = "s8"
948-
949-
values["s9"] = "0x0"
950-
alias["x25"] = "s9"
951-
952-
values["s10"] = "0x0"
953-
alias["x26"] = "s10"
954-
955-
values["s11"] = "0x0"
956-
alias["x27"] = "s11"
957-
958-
values["t3"] = "0x00ffffff99c42000"
959-
alias["x28"] = "t3"
960-
961-
values["t4"] = "0x00ffffff99af8e20"
962-
alias["x29"] = "t4"
963-
964-
values["t5"] = "0x0000000000000005"
965-
alias["x30"] = "t5"
966-
967-
values["t6"] = "0x44760bdd8d5f6381"
968-
alias["x31"] = "t6"
969-
970-
values["zero"] = "0x0"
971-
alias["x0"] = "zero"
807+
values = {
808+
"pc": ( "0x0000000000010164", None ),
809+
"zero": ( "0x0", "x0" ),
810+
"ra": ( "0x0000000000010194", "x1" ),
811+
"sp": ( "0x00fffffff4d5fcc0", "x2" ),
812+
"gp": ( "0x0000000000157678", "x3" ),
813+
"tp": ( "0x00ffffff99c43400", "x4" ),
814+
"t0": ( "0x00ffffff99c6b260", "x5" ),
815+
"t1": ( "0x00ffffff99b7bd54", "x6" ),
816+
"t2": ( "0x0000000003f0b27f", "x7" ),
817+
"fp": ( "0x00fffffff4d5fcf0", "x8" ),
818+
"s1": ( "0x0000000000000003", "x9" ),
819+
"a0": ( "0x0", "x10" ),
820+
"a1": ( "0x0000000000010144", "x11" ),
821+
"a2": ( "0x0000000000176460", "x12" ),
822+
"a3": ( "0x000000000015ee38", "x13" ),
823+
"a4": ( "0x00000000423c0000", "x14" ),
824+
"a5": ( "0x0", "x15" ),
825+
"a6": ( "0x0", "x16" ),
826+
"a7": ( "0x00000000000000dd", "x17" ),
827+
"s2": ( "0x0", "x18" ),
828+
"s3": ( "0x000000000014ddf8", "x19" ),
829+
"s4": ( "0x000000000003651c", "x20" ),
830+
"s5": ( "0x00fffffffccd8d28", "x21" ),
831+
"s6": ( "0x000000000014ddf8", "x22" ),
832+
"s7": ( "0x00ffffff99c69d48", "x23" ),
833+
"s8": ( "0x00ffffff99c6a008", "x24" ),
834+
"s9": ( "0x0", "x25" ),
835+
"s10": ( "0x0", "x26" ),
836+
"s11": ( "0x0", "x27" ),
837+
"t3": ( "0x00ffffff99c42000", "x28" ),
838+
"t4": ( "0x00ffffff99af8e20", "x29" ),
839+
"t5": ( "0x0000000000000005", "x30" ),
840+
"t6": ( "0x44760bdd8d5f6381", "x31" ),
841+
}
972842

973-
for regname, value in values.items():
843+
for regname in values:
844+
value, alias = values[regname]
974845
self.expect(
975846
"register read {}".format(regname),
976847
substrs=["{} = {}".format(regname, value)],
977848
)
978-
979-
for aliasname, regname in alias.items():
980-
value = values[regname]
981-
self.expect(
982-
"register read {}".format(aliasname),
983-
substrs=["{} = {}".format(regname, value)],
984-
)
849+
if alias:
850+
self.expect(
851+
"register read {}".format(alias),
852+
substrs=["{} = {}".format(regname, value)],
853+
)
985854

986855
# Check that LLDB does not try to read other registers from core file
987856
self.expect(

0 commit comments

Comments
 (0)