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 C511E3858C31 for ; Tue, 4 Apr 2023 08:21:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C511E3858C31 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=1680596476; 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=Hb/6SaA7n3mP4Xpa6G0ZUlAG+XF0+y1r3ZTxyhTSiHU=; b=V9QHujYBLJ7HyhT+xdR7N0i3mN05EZAl5UlFQjJmrenp45FuR1is7uKZWJGHXiHLHNkHtv dtMwcKEnUsMNSNjKVYp2hjgfgjGSZJz9x2sOp/mTk6sQNTf7Z5LgQSihefob/d66mKZmLQ oEcX4tZLMdskvmWUFJmzxllhWaZtOVY= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-392-PJ64wxlENY2xlYDtywmr1A-1; Tue, 04 Apr 2023 04:21:15 -0400 X-MC-Unique: PJ64wxlENY2xlYDtywmr1A-1 Received: by mail-qt1-f199.google.com with SMTP id x5-20020a05622a000500b003e259c363f9so21564515qtw.22 for ; Tue, 04 Apr 2023 01:21:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680596475; 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=Hb/6SaA7n3mP4Xpa6G0ZUlAG+XF0+y1r3ZTxyhTSiHU=; b=C4I7qC9q5mRNKMaTtSfhqs5idD+1L/d7O2OJtfEZmRj3JOwhgyfr25orRVG7n4yYYW LxBar/z4fMBPPzE9urxDCq6Yjypu5NVNR8o9COzIgANPwAKS76RLIdrKx238GLawb31V ZklfYI9kKg1TUMX+OOgyf6sMlDwyQITuHzZdmR4MAdC2KSr110wjwV7VdZJg1tOIUY1m JTKhJzWhQKOpmux9L3LM6DrENeHGj/bLqjoJ+XyrOq5u3NtjqIvwJLGi233R9oW20fCO IOcFYZT8yne6/RzfhjBul2EYdmjWfAz1mui8zyUsFfLyKCp/9uS1h7qJZW6F4E/fzJFl 09rQ== X-Gm-Message-State: AAQBX9cz6jc4XsiXPANA1FhbG4oj52g7LRkw8AiRc6AQpLLYjEsEuSwl HHGz2Xb3+fYw6WvFOgFgo7JoPYAE5mdFTGIL5T4fA76dt5IW6sex+5fFbj0ZvaSXFp9RHpGqdTk T1yokkfyFYVGLArsYyi38tYByjUBRp46cwi4I160YlqmVP9fvHgL9NagWFLPctfRoR/GA5XFmlV 7OT3QQVA== X-Received: by 2002:a05:622a:120b:b0:3e6:3e15:9037 with SMTP id y11-20020a05622a120b00b003e63e159037mr2232642qtx.6.1680596474761; Tue, 04 Apr 2023 01:21:14 -0700 (PDT) X-Google-Smtp-Source: AKy350YuzkX+4v3LFLIjVcd9ODkk2YJWZvUYGf581So+1HJdmAabZ3//uud5yA7LxqHPKWeDVojwFw== X-Received: by 2002:a05:622a:120b:b0:3e6:3e15:9037 with SMTP id y11-20020a05622a120b00b003e63e159037mr2232621qtx.6.1680596474429; Tue, 04 Apr 2023 01:21:14 -0700 (PDT) Received: from localhost (95.72.115.87.dyn.plus.net. [87.115.72.95]) by smtp.gmail.com with ESMTPSA id u5-20020a37ab05000000b007484a7fa2d2sm3424909qke.34.2023.04.04.01.21.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 01:21:14 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCH 2/5] gdb/python: implement __repr__ methods for py-disasm.c types Date: Tue, 4 Apr 2023 09:21:04 +0100 Message-Id: <3c73ee1a5e45e740be722fe731d28bcb4a485355.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 a __repr__ method for the DisassembleInfo and DisassemblerResult types, and add some tests for these new methods. --- gdb/python/py-disasm.c | 31 ++++++++++++++-- gdb/testsuite/gdb.python/py-disasm.exp | 3 ++ gdb/testsuite/gdb.python/py-disasm.py | 49 ++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 2 deletions(-) diff --git a/gdb/python/py-disasm.c b/gdb/python/py-disasm.c index 2dabec0013d..999d0e0192c 100644 --- a/gdb/python/py-disasm.c +++ b/gdb/python/py-disasm.c @@ -247,6 +247,18 @@ disasm_info_dealloc (PyObject *self) Py_TYPE (self)->tp_free (self); } +/* Implement __repr__ for the DisassembleInfo type. */ + +static PyObject * +disasmpy_info_repr (PyObject *self) +{ + disasm_info_object *obj = (disasm_info_object *) self; + + return PyUnicode_FromFormat ("<%s address=%s>", + Py_TYPE (obj)->tp_name, + core_addr_to_string_nz (obj->address)); +} + /* Implement DisassembleInfo.is_valid(), really just a wrapper around the disasm_info_object_is_valid function above. */ @@ -653,6 +665,21 @@ disasmpy_result_init (PyObject *self, PyObject *args, PyObject *kwargs) return 0; } +/* Implement __repr__ for the DisassemblerResult type. */ + +static PyObject * +disasmpy_result_repr (PyObject *self) +{ + disasm_result_object *obj = (disasm_result_object *) self; + + gdb_assert (obj->content != nullptr); + + return PyUnicode_FromFormat ("<%s length=%d string=\"%s\">", + Py_TYPE (obj)->tp_name, + obj->length, + obj->content->string ().c_str ()); +} + /* Implement memory_error_func callback for disassemble_info. Extract the underlying DisassembleInfo Python object, and set a memory error on it. */ @@ -1065,7 +1092,7 @@ PyTypeObject disasm_info_object_type = { 0, /*tp_getattr*/ 0, /*tp_setattr*/ 0, /*tp_compare*/ - 0, /*tp_repr*/ + disasmpy_info_repr, /*tp_repr*/ 0, /*tp_as_number*/ 0, /*tp_as_sequence*/ 0, /*tp_as_mapping*/ @@ -1107,7 +1134,7 @@ PyTypeObject disasm_result_object_type = { 0, /*tp_getattr*/ 0, /*tp_setattr*/ 0, /*tp_compare*/ - 0, /*tp_repr*/ + disasmpy_result_repr, /*tp_repr*/ 0, /*tp_as_number*/ 0, /*tp_as_sequence*/ 0, /*tp_as_mapping*/ diff --git a/gdb/testsuite/gdb.python/py-disasm.exp b/gdb/testsuite/gdb.python/py-disasm.exp index 38a2b766320..44b8398bf21 100644 --- a/gdb/testsuite/gdb.python/py-disasm.exp +++ b/gdb/testsuite/gdb.python/py-disasm.exp @@ -73,6 +73,9 @@ set test_plans \ [list \ [list "" "${base_pattern}\r\n.*"] \ [list "GlobalNullDisassembler" "${base_pattern}\r\n.*"] \ + [list "ShowInfoRepr" "${base_pattern}\\s+## \r\n.*"] \ + [list "ShowInfoSubClassRepr" "${base_pattern}\\s+## \r\n.*"] \ + [list "ShowResultRepr" "${base_pattern}\\s+## \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 0ee883a5e5e..977cdbf3c37 100644 --- a/gdb/testsuite/gdb.python/py-disasm.py +++ b/gdb/testsuite/gdb.python/py-disasm.py @@ -64,6 +64,55 @@ class TestDisassembler(Disassembler): raise NotImplementedError("override the disassemble method") +class ShowInfoRepr(TestDisassembler): + """Call the __repr__ method on the DisassembleInfo, convert the result + to a string, and incude it in a comment in the disassembler output.""" + + def disassemble(self, info): + comment = "\t## " + repr(info) + result = gdb.disassembler.builtin_disassemble(info) + string = result.string + comment + length = result.length + return DisassemblerResult(length=length, string=string) + + +class ShowInfoSubClassRepr(TestDisassembler): + """Create a sub-class of DisassembleInfo. Create an instace of this + sub-class and call the __repr__ method on it. Convert the result + to a string, and incude it in a comment in the disassembler + output. The DisassembleInfo sub-class does not override __repr__ + so we are calling the implementation on the parent class.""" + + class MyInfo(gdb.disassembler.DisassembleInfo): + """A wrapper around DisassembleInfo, doesn't add any new + functionality, just gives a new name in order to check the + __repr__ functionality.""" + + def __init__(self, info): + super().__init__(info) + + def disassemble(self, info): + info = self.MyInfo(info) + comment = "\t## " + repr(info) + result = gdb.disassembler.builtin_disassemble(info) + string = result.string + comment + length = result.length + return DisassemblerResult(length=length, string=string) + + +class ShowResultRepr(TestDisassembler): + """Call the __repr__ method on the DisassemblerResult, convert the + result to a string, and incude it in a comment in the disassembler + output.""" + + def disassemble(self, info): + result = gdb.disassembler.builtin_disassemble(info) + comment = "\t## " + repr(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