From f2e004fbb80303bb53915963a8e778ba079e0cec Mon Sep 17 00:00:00 2001 From: KyleMiles Date: Thu, 29 Jun 2023 20:54:29 -0400 Subject: [PATCH] Replace calls to get_view_of_file with load --- api/python/debuggercontroller.py | 2 +- test/debugger_test.py | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/api/python/debuggercontroller.py b/api/python/debuggercontroller.py index 30b90cb..f04f087 100644 --- a/api/python/debuggercontroller.py +++ b/api/python/debuggercontroller.py @@ -497,7 +497,7 @@ class DebuggerController: Most operations of the debugger are performed on this class. For example, we can launch the debugger as follows:: - >>> bv = BinaryViewType.get_view_of_file("test/binaries/helloworld") + >>> bv = load("test/binaries/helloworld") >>> dbg = DebuggerController(bv) >>> dbg.launch() True diff --git a/test/debugger_test.py b/test/debugger_test.py index 64071d1..94af6a8 100644 --- a/test/debugger_test.py +++ b/test/debugger_test.py @@ -10,7 +10,7 @@ import subprocess import unittest -from binaryninja import BinaryView, BinaryViewType, LowLevelILOperation, mainthread, Settings +from binaryninja import load try: from debugger import DebuggerController, DebugStopReason except: @@ -52,7 +52,7 @@ def setUp(self) -> None: def test_repeated_use(self): fpath = name_to_fpath('helloworld', self.arch) - bv = BinaryViewType.get_view_of_file(fpath) + bv = load(fpath) def run_once(): dbg = DebuggerController(bv) @@ -78,7 +78,7 @@ def run_once(): def test_return_code(self): # return code tests fpath = name_to_fpath('exitcode', self.arch) - bv = BinaryViewType.get_view_of_file(fpath) + bv = load(fpath) # some systems return byte, or low byte of 32-bit code and others return 32-bit code testvals = [('-11', [245, 4294967285]), @@ -107,7 +107,7 @@ def expect_segfault(self, reason): def test_exception_segfault(self): fpath = name_to_fpath('do_exception', self.arch) - bv = BinaryViewType.get_view_of_file(fpath) + bv = load(fpath) dbg = DebuggerController(bv) dbg.cmd_line = 'segfault' @@ -120,7 +120,7 @@ def test_exception_segfault(self): # # This would not work until we fix the test binary # def test_exception_illegalinstr(self): # fpath = name_to_fpath('do_exception', self.arch) - # bv = BinaryViewType.get_view_of_file(fpath) + # bv = load(fpath) # dbg = DebuggerController(bv) # dbg.cmd_line = 'illegalinstr' # self.assertNotIn(dbg.launch_and_wait(), [DebugStopReason.ProcessExited, DebugStopReason.InternalError]) @@ -142,7 +142,7 @@ def expect_divide_by_zero(self, reason): def test_exception_divzero(self): fpath = name_to_fpath('do_exception', self.arch) - bv = BinaryViewType.get_view_of_file(fpath) + bv = load(fpath) dbg = DebuggerController(bv) if not self.arch == 'arm64': dbg.cmd_line = 'divzero' @@ -153,7 +153,7 @@ def test_exception_divzero(self): def test_step_into(self): fpath = name_to_fpath('helloworld', self.arch) - bv = BinaryViewType.get_view_of_file(fpath) + bv = load(fpath) dbg = DebuggerController(bv) dbg.cmd_line = 'foobar' self.assertNotIn(dbg.launch_and_wait(), [DebugStopReason.ProcessExited, DebugStopReason.InternalError]) @@ -166,7 +166,7 @@ def test_step_into(self): def test_breakpoint(self): fpath = name_to_fpath('helloworld', self.arch) - bv = BinaryViewType.get_view_of_file(fpath) + bv = load(fpath) dbg = DebuggerController(bv) self.assertNotIn(dbg.launch_and_wait(), [DebugStopReason.ProcessExited, DebugStopReason.InternalError]) # TODO: right now we are not returning whether the operation succeeds, so we cannot use assertTrue/assertFalse @@ -184,7 +184,7 @@ def test_breakpoint(self): def test_register_read_write(self): fpath = name_to_fpath('helloworld', self.arch) - bv = BinaryViewType.get_view_of_file(fpath) + bv = load(fpath) dbg = DebuggerController(bv) self.assertNotIn(dbg.launch_and_wait(), [DebugStopReason.ProcessExited, DebugStopReason.InternalError]) @@ -216,7 +216,7 @@ def test_register_read_write(self): def test_memory_read_write(self): fpath = name_to_fpath('helloworld', self.arch) - bv = BinaryViewType.get_view_of_file(fpath) + bv = load(fpath) dbg = DebuggerController(bv) self.assertNotIn(dbg.launch_and_wait(), [DebugStopReason.ProcessExited, DebugStopReason.InternalError]) @@ -237,7 +237,7 @@ def test_memory_read_write(self): # @unittest.skip def test_thread(self): fpath = name_to_fpath('helloworld_thread', self.arch) - bv = BinaryViewType.get_view_of_file(fpath) + bv = load(fpath) dbg = DebuggerController(bv) self.assertNotIn(dbg.launch_and_wait(), [DebugStopReason.ProcessExited, DebugStopReason.InternalError]) @@ -262,7 +262,7 @@ def test_thread(self): def test_assembly_code(self): if self.arch == 'x86_64': fpath = name_to_fpath('asmtest', 'x86_64') - bv = BinaryViewType.get_view_of_file(fpath) + bv = load(fpath) dbg = DebuggerController(bv) self.assertNotIn(dbg.launch_and_wait(), [DebugStopReason.ProcessExited, DebugStopReason.InternalError]) entry = dbg.data.entry_point @@ -304,7 +304,7 @@ def test_attach(self): print('attaching test not yet implemented on %s' % platform.system()) self.assertIsNotNone(pid) - bv = BinaryViewType.get_view_of_file(fpath) + bv = load(fpath) dbg = DebuggerController(bv) dbg.pid_attach = pid self.assertTrue(dbg.attach_and_wait())