https://github.com/da-viper created
https://github.com/llvm/llvm-project/pull/136034
Backported #134626 to 20.X
>From be595e63f7050a204e5c588e656c5b6e40fb024b Mon Sep 17 00:00:00 2001
From: Ebuka Ezike <yerimy...@gmail.com>
Date: Fri, 11 Apr 2025 13:45:19 +0100
Subject: [PATCH 1/2] [lldb] Fix SBTarget::ReadInstruction with flavor
(#134626)
When you call the `SBTarget::ReadInstructions` with flavor from lldb
crashes. This is because the wrong order of the `DisassemblyBytes`
constructor this fixes that
---------
Signed-off-by: Ebuka Ezike <yerimy...@gmail.com>
---
lldb/source/API/SBTarget.cpp | 6 +--
.../target/read-instructions-flavor/Makefile | 3 ++
.../TestTargetReadInstructionsFlavor.py | 39 +++++++++++++++++++
.../target/read-instructions-flavor/main.c | 21 ++++++++++
4 files changed, 66 insertions(+), 3 deletions(-)
create mode 100644
lldb/test/API/python_api/target/read-instructions-flavor/Makefile
create mode 100644
lldb/test/API/python_api/target/read-instructions-flavor/TestTargetReadInstructionsFlavor.py
create mode 100644
lldb/test/API/python_api/target/read-instructions-flavor/main.c
diff --git a/lldb/source/API/SBTarget.cpp b/lldb/source/API/SBTarget.cpp
index 2a33161bc21ed..665b903aff79d 100644
--- a/lldb/source/API/SBTarget.cpp
+++ b/lldb/source/API/SBTarget.cpp
@@ -2020,9 +2020,9 @@ lldb::SBInstructionList
SBTarget::ReadInstructions(lldb::SBAddress base_addr,
error, force_live_memory, &load_addr);
const bool data_from_file = load_addr == LLDB_INVALID_ADDRESS;
sb_instructions.SetDisassembler(Disassembler::DisassembleBytes(
- target_sp->GetArchitecture(), nullptr,
target_sp->GetDisassemblyCPU(),
- target_sp->GetDisassemblyFeatures(), flavor_string, *addr_ptr,
- data.GetBytes(), bytes_read, count, data_from_file));
+ target_sp->GetArchitecture(), nullptr, flavor_string,
+ target_sp->GetDisassemblyCPU(), target_sp->GetDisassemblyFeatures(),
+ *addr_ptr, data.GetBytes(), bytes_read, count, data_from_file));
}
}
diff --git a/lldb/test/API/python_api/target/read-instructions-flavor/Makefile
b/lldb/test/API/python_api/target/read-instructions-flavor/Makefile
new file mode 100644
index 0000000000000..10495940055b6
--- /dev/null
+++ b/lldb/test/API/python_api/target/read-instructions-flavor/Makefile
@@ -0,0 +1,3 @@
+C_SOURCES := main.c
+
+include Makefile.rules
diff --git
a/lldb/test/API/python_api/target/read-instructions-flavor/TestTargetReadInstructionsFlavor.py
b/lldb/test/API/python_api/target/read-instructions-flavor/TestTargetReadInstructionsFlavor.py
new file mode 100644
index 0000000000000..40edc57df21ce
--- /dev/null
+++
b/lldb/test/API/python_api/target/read-instructions-flavor/TestTargetReadInstructionsFlavor.py
@@ -0,0 +1,39 @@
+"""
+Test SBTarget Read Instruction.
+"""
+
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+
+
+class TargetReadInstructionsFlavor(TestBase):
+ @skipIf(archs=no_match(["x86_64", "x86", "i386"]), oslist=["windows"])
+ def test_read_instructions_with_flavor(self):
+ self.build()
+ executable = self.getBuildArtifact("a.out")
+
+ # create a target
+ target = self.dbg.CreateTarget(executable)
+ self.assertTrue(target.IsValid(), "target is not valid")
+
+ functions = target.FindFunctions("test_add")
+ self.assertEqual(len(functions), 1)
+ test_add = functions[0]
+
+ test_add_symbols = test_add.GetSymbol()
+ self.assertTrue(
+ test_add_symbols.IsValid(), "test_add function symbols is not
valid"
+ )
+
+ expected_instructions = (("mov", "eax, edi"), ("add", "eax, esi"),
("ret", ""))
+ test_add_insts = test_add_symbols.GetInstructions(target, "intel")
+ # clang adds an extra nop instruction but gcc does not. It makes more
sense
+ # to check if it is at least 3
+ self.assertLessEqual(len(expected_instructions), len(test_add_insts))
+
+ # compares only the expected instructions
+ for expected_instr, instr in zip(expected_instructions,
test_add_insts):
+ self.assertTrue(instr.IsValid(), "instruction is not valid")
+ expected_mnemonic, expected_op_str = expected_instr
+ self.assertEqual(instr.GetMnemonic(target), expected_mnemonic)
+ self.assertEqual(instr.GetOperands(target), expected_op_str)
diff --git a/lldb/test/API/python_api/target/read-instructions-flavor/main.c
b/lldb/test/API/python_api/target/read-instructions-flavor/main.c
new file mode 100644
index 0000000000000..6022d63fb6ed7
--- /dev/null
+++ b/lldb/test/API/python_api/target/read-instructions-flavor/main.c
@@ -0,0 +1,21 @@
+
+// This simple program is to test the lldb Python API SBTarget ReadInstruction
+// function.
+//
+// When the target is create we get all the instructions using the intel
+// flavor and see if it is correct.
+
+int test_add(int a, int b);
+
+__asm__("test_add:\n"
+ " movl %edi, %eax\n"
+ " addl %esi, %eax\n"
+ " ret \n");
+
+int main(int argc, char **argv) {
+ int a = 10;
+ int b = 20;
+ int result = test_add(a, b);
+
+ return 0;
+}
\ No newline at end of file
>From d937fc08d8c9cd9a293f2a45e58bdca57af14640 Mon Sep 17 00:00:00 2001
From: David Spickett <david.spick...@linaro.org>
Date: Fri, 11 Apr 2025 13:14:16 +0000
Subject: [PATCH 2/2] [lldb][test] Adjust TestTargetReadInstructionsFlavor
skipIfs
Original in https://github.com/llvm/llvm-project/pull/134626 was
written as if it was "this or this" but it's "this and this".
So the test ran on AArch64 Linux, because Linux is not Windows.
Split out the Windows check to fix that.
---
.../TestTargetReadInstructionsFlavor.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/lldb/test/API/python_api/target/read-instructions-flavor/TestTargetReadInstructionsFlavor.py
b/lldb/test/API/python_api/target/read-instructions-flavor/TestTargetReadInstructionsFlavor.py
index 40edc57df21ce..12805985798de 100644
---
a/lldb/test/API/python_api/target/read-instructions-flavor/TestTargetReadInstructionsFlavor.py
+++
b/lldb/test/API/python_api/target/read-instructions-flavor/TestTargetReadInstructionsFlavor.py
@@ -7,7 +7,8 @@
class TargetReadInstructionsFlavor(TestBase):
- @skipIf(archs=no_match(["x86_64", "x86", "i386"]), oslist=["windows"])
+ @skipIfWindows
+ @skipIf(archs=no_match(["x86_64", "x86", "i386"]))
def test_read_instructions_with_flavor(self):
self.build()
executable = self.getBuildArtifact("a.out")
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
