From patchwork Thu Nov 10 15:23:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 60356 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2CA3E38376DA for ; Thu, 10 Nov 2022 15:26:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2CA3E38376DA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1668093970; bh=xlZreLdRt+gTWxyNYB3NyvqhbBywoefCZ/7PbQyf6Fo=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=olEjlz0dZkLiBj3j3MnjQTyLqWQtDxGxrWLInfKqEqoJbVfN631yIxEvw04eWXUMW EoW1gtyevZOnnocaQmtTyLpuu68hzQwjhtYPEmv922vddQXLZyJgE5j/5rAa4wDI6c U2nJf1Gpak46H5Eu0RiJIzGMPLKNmIbMjSa4ePEk= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 5ED493858C60 for ; Thu, 10 Nov 2022 15:23:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5ED493858C60 Received: by smtp.gentoo.org (Postfix, from userid 559) id AA01634096C; Thu, 10 Nov 2022 15:23:49 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH] sim: dv-core: add hw_detach_address method [PR sim/25211] Date: Thu, 10 Nov 2022 22:23:46 +0700 Message-Id: <20221110152346.12043-1-vapier@gentoo.org> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Mike Frysinger via Gdb-patches From: Mike Frysinger Reply-To: Mike Frysinger Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" The core device has an attach address method as the root of the tree which calls out to the sim API. But it doesn't have a corresponding detach method which means we just crash if anything tries to detach itself from the core. In practice, the m68hc11 is the only model that actually tries to detach itself on the fly, so no one noticed earlier. With this in place, we can delete the existing detach code from the m68hc11 model since it defaults to "passthru" callback which will in turn call the dv-core detach, and they have the same behavior -- call the sim core API to detach from the address space. Bug: https://sourceware.org/PR25211 --- sim/common/dv-core.c | 18 ++++++++++++++++++ sim/m68hc11/dv-m68hc11.c | 13 ------------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/sim/common/dv-core.c b/sim/common/dv-core.c index 4a5f5a0eb579..4cff41bea8ef 100644 --- a/sim/common/dv-core.c +++ b/sim/common/dv-core.c @@ -72,6 +72,23 @@ dv_core_attach_address_callback (struct hw *me, } +static void +dv_core_detach_address_callback (struct hw *me, + int level, + int space, + address_word addr, + address_word nr_bytes, + struct hw *client) +{ + HW_TRACE ((me, "detach - level=%d, space=%d, addr=0x%lx, nr_bytes=%ld, client=%s", + level, space, (unsigned long) addr, (unsigned long) nr_bytes, hw_path (client))); + /* NOTE: At preset the space is assumed to be zero. Perhaphs the + space should be mapped onto something for instance: space0 - + unified memory; space1 - IO memory; ... */ + sim_core_detach (hw_system (me), NULL, /*cpu*/ level, space, addr); +} + + static unsigned dv_core_dma_read_buffer_callback (struct hw *me, void *dest, @@ -109,6 +126,7 @@ static void dv_core_finish (struct hw *me) { set_hw_attach_address (me, dv_core_attach_address_callback); + set_hw_detach_address (me, dv_core_detach_address_callback); set_hw_dma_write_buffer (me, dv_core_dma_write_buffer_callback); set_hw_dma_read_buffer (me, dv_core_dma_read_buffer_callback); } diff --git a/sim/m68hc11/dv-m68hc11.c b/sim/m68hc11/dv-m68hc11.c index cdcc9f8eb918..f255f100d706 100644 --- a/sim/m68hc11/dv-m68hc11.c +++ b/sim/m68hc11/dv-m68hc11.c @@ -253,18 +253,6 @@ dv_m6811_attach_address_callback (struct hw *me, } } -static void -dv_m6811_detach_address_callback (struct hw *me, - int level, - int space, - address_word addr, - address_word nr_bytes, - struct hw *client) -{ - sim_core_detach (hw_system (me), NULL, /*cpu*/ - level, space, addr); -} - static void m68hc11_delete (struct hw* me) { @@ -387,7 +375,6 @@ m68hc11cpu_finish (struct hw *me) set_hw_ports (me, m68hc11cpu_ports); set_hw_port_event (me, m68hc11cpu_port_event); set_hw_attach_address (me, dv_m6811_attach_address_callback); - set_hw_detach_address (me, dv_m6811_detach_address_callback); #ifdef set_hw_ioctl set_hw_ioctl (me, m68hc11_ioctl); #else