From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id A4D013858418 for ; Tue, 4 Apr 2023 08:21:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A4D013858418 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680596478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=flxKO76MIRdEC8Ymu4XBo3le4y+j5AnnkswaUMurahg=; b=csDsS/FMjKJ0nv21Komv0YUgcSlDZJhlwnbF1LrHs9Y00eVyB8c8QN8+aH5VgsUnBFvfBO /mv3+VI5Yy/n22vvDbs+rxgr2TpWDBKr5U3dhi/URPc+ix2qbvhjSksT0wVvg7fuG6Flux eBkCi2TmVx0EQapXBN8AdRuXmH8NxIA= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-454-h6gxGHBsP6a_uNCGkismMA-1; Tue, 04 Apr 2023 04:21:17 -0400 X-MC-Unique: h6gxGHBsP6a_uNCGkismMA-1 Received: by mail-qv1-f72.google.com with SMTP id y19-20020ad445b3000000b005a5123cb627so14221666qvu.20 for ; Tue, 04 Apr 2023 01:21:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680596476; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=flxKO76MIRdEC8Ymu4XBo3le4y+j5AnnkswaUMurahg=; b=iKzdngTM+d9et7oUfdv7w14iAzjQsIn0sWvmxqJcgtjBfaBzAfa1zXoopNIbfQbd8u VC9UVHP+WiCYFpe36yfWuJBFXMDSZpALF6LmROtZQ2OPvHP8ui3F5SvEVDrG78cd23bz E1Cz3KlanprPEZn2u9NMm0Kogs1takUFUNQ+lLtc8OMcjzdNbsGaX/iMR+uSiCsJHcGP JlFgJqDqW57eIip9I1dIzTnRsZHpUSv/5sboApTNjc09ziRrY3xYBi3dTL9EihhmbX+f 37qLwkkBrSzAuwLIWwB+Y2B2EIZp2RuvqoExpWpFaBq05uh1oVtYov8tCR0KiKxbZXxQ IfoQ== X-Gm-Message-State: AAQBX9cE4C1Dz7wHP1iieYh2mrQ5sZL0ja/4epsQ+ZbRkjKWZs/yMTqv 8aXNItpSZrpRZ6CFFBbL4nk8jKaW1uYMi8Vy2lM+pQvLdgx7QPlrwkBqLPaosfqnPcns/SQsJwK r7tQEo+4BqD+j6YX3FETvifm9zgfPsQMfQCUll7yaGS5coTo51ZxfS2pkkTt0ASklabuszzrUrN JeW8Xkpg== X-Received: by 2002:a05:622a:54:b0:3ba:1167:72d7 with SMTP id y20-20020a05622a005400b003ba116772d7mr1788091qtw.61.1680596476633; Tue, 04 Apr 2023 01:21:16 -0700 (PDT) X-Google-Smtp-Source: AKy350arlkDbTPLu0uetTkHVo009SeRjuMrLNQMFUtOdsDcaOFGf/Wjomg5BxnuyFV446EZoEJHUMQ== X-Received: by 2002:a05:622a:54:b0:3ba:1167:72d7 with SMTP id y20-20020a05622a005400b003ba116772d7mr1788076qtw.61.1680596476321; Tue, 04 Apr 2023 01:21:16 -0700 (PDT) Received: from localhost (95.72.115.87.dyn.plus.net. [87.115.72.95]) by smtp.gmail.com with ESMTPSA id r17-20020ac85211000000b003e37e0a3d89sm3092140qtn.42.2023.04.04.01.21.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 01:21:16 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCH 3/5] gdb/python: implement DisassemblerResult.__str__ method Date: Tue, 4 Apr 2023 09:21:05 +0100 Message-Id: <2e5f2835f1a8ed0ae57255cb29e505261db74826.1680596378.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Add the DisassemblerResult.__str__ method. This gives the same result as the DisassemblerResult.string attribute, but can be useful sometime where a user just wants to print the DisassemblerResult object and have GDB do something sane. There's a test for the new functionality. --- gdb/python/py-disasm.c | 26 +++++++++++++++++--------- gdb/testsuite/gdb.python/py-disasm.exp | 1 + gdb/testsuite/gdb.python/py-disasm.py | 12 ++++++++++++ 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/gdb/python/py-disasm.c b/gdb/python/py-disasm.c index 999d0e0192c..c61fe70c26b 100644 --- a/gdb/python/py-disasm.c +++ b/gdb/python/py-disasm.c @@ -605,6 +605,21 @@ gdbpy_disassembler::read_memory_func (bfd_vma memaddr, gdb_byte *buff, return 0; } +/* Implement __str__ for the DisassemblerResult type. */ + +static PyObject * +disasmpy_result_str (PyObject *self) +{ + disasm_result_object *obj = (disasm_result_object *) self; + + gdb_assert (obj->content != nullptr); + gdb_assert (obj->content->size () > 0); + gdb_assert (obj->length > 0); + return PyUnicode_Decode (obj->content->c_str (), + obj->content->size (), + host_charset (), nullptr); +} + /* Implement DisassemblerResult.length attribute, return the length of the disassembled instruction. */ @@ -621,14 +636,7 @@ disasmpy_result_length (PyObject *self, void *closure) static PyObject * disasmpy_result_string (PyObject *self, void *closure) { - disasm_result_object *obj = (disasm_result_object *) self; - - gdb_assert (obj->content != nullptr); - gdb_assert (obj->content->size () > 0); - gdb_assert (obj->length > 0); - return PyUnicode_Decode (obj->content->c_str (), - obj->content->size (), - host_charset (), nullptr); + return disasmpy_result_str (self); } /* Implement DisassemblerResult.__init__. Takes two arguments, an @@ -1140,7 +1148,7 @@ PyTypeObject disasm_result_object_type = { 0, /*tp_as_mapping*/ 0, /*tp_hash */ 0, /*tp_call*/ - 0, /*tp_str*/ + disasmpy_result_str, /*tp_str*/ 0, /*tp_getattro*/ 0, /*tp_setattro*/ 0, /*tp_as_buffer*/ diff --git a/gdb/testsuite/gdb.python/py-disasm.exp b/gdb/testsuite/gdb.python/py-disasm.exp index 44b8398bf21..66ed39f048b 100644 --- a/gdb/testsuite/gdb.python/py-disasm.exp +++ b/gdb/testsuite/gdb.python/py-disasm.exp @@ -76,6 +76,7 @@ set test_plans \ [list "ShowInfoRepr" "${base_pattern}\\s+## \r\n.*"] \ [list "ShowInfoSubClassRepr" "${base_pattern}\\s+## \r\n.*"] \ [list "ShowResultRepr" "${base_pattern}\\s+## \r\n.*"] \ + [list "ShowResultStr" "${base_pattern}\\s+## ${nop}\r\n.*"] \ [list "GlobalPreInfoDisassembler" "${base_pattern}\\s+## ad = $hex, ar = ${curr_arch}\r\n.*"] \ [list "GlobalPostInfoDisassembler" "${base_pattern}\\s+## ad = $hex, ar = ${curr_arch}\r\n.*"] \ [list "GlobalReadDisassembler" "${base_pattern}\\s+## bytes =( $hex)+\r\n.*"] \ diff --git a/gdb/testsuite/gdb.python/py-disasm.py b/gdb/testsuite/gdb.python/py-disasm.py index 977cdbf3c37..435a3bf5339 100644 --- a/gdb/testsuite/gdb.python/py-disasm.py +++ b/gdb/testsuite/gdb.python/py-disasm.py @@ -113,6 +113,18 @@ class ShowResultRepr(TestDisassembler): return DisassemblerResult(length=length, string=string) +class ShowResultStr(TestDisassembler): + """Call the __str__ method on a DisassemblerResult object, incude the + resulting string in a comment within the disassembler output.""" + + def disassemble(self, info): + result = gdb.disassembler.builtin_disassemble(info) + comment = "\t## " + str(result) + string = result.string + comment + length = result.length + return DisassemblerResult(length=length, string=string) + + class GlobalPreInfoDisassembler(TestDisassembler): """Check the attributes of DisassembleInfo before disassembly has occurred.""" -- 2.25.4