From patchwork Tue Jan 19 08:36:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 366146 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp545147jam; Tue, 19 Jan 2021 00:39:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJxUgSQdr14i7VD3kAZct6NnwhQ/n381KWXkS5wWYAh0Ccbep6K0jT20VQqzb6X5wJ9kKpkI X-Received: by 2002:a25:e047:: with SMTP id x68mr4470534ybg.160.1611045576651; Tue, 19 Jan 2021 00:39:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611045576; cv=none; d=google.com; s=arc-20160816; b=jmOWAo/rihGk7Bdrlc2HwALvIKvECTAvkhlYjKmatLLj7buM3fXVAvQQ89X8J6VVJB ZVrjsYMBKOT/hqbeAK/LWS9V9NvN/b82JZynPksQ2G08xvs5oq+SEpN5h2jYtHH73K/9 UTqBOJ9hmDWbUJ2MkB8732SEGJraRUny9SLf41HV6dYSChZDTWmNTyRuUAFXD01Zn+t0 E3RPmoRpz66rXkaP/TO5waqjAuTIv9ILzw+XBaIYNOwJ9gp5QurGWgXc0YjuzwWZdmlX eai9ac6i6l97PCVWT2F9OTn7oz3ulyN/IHwM78Oln/qqu8nIeiwsraX23Ypsccr4uuGd l02w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=f2G0ytv9WcsWXoZLiyBGCtsUjm9fyhsF0T8dbHJkcok=; b=j29mFoanPnU8d3qW5ydR+f7/2lsUr85/RnOmyv5/MPbBZPSbLLWvPfmJXuRxdrtFtn YG9x1SOvrR7XBhIfFPk8KfVb49a1PWiaFTD8FoynGPQm/D9ZfzHO5Q2LaiF2lSzWbNg4 w4LwyNQixwSoHZaQyUGaTD2ajrQg47vRmDSiSdgAqMDArcwfTxOzuzEKsBHjDhSjw0aw uLJVXNRNS/acDnna8DWBzHyypKcSI1T1evQMA7SLXWVYm1eBW7f9kD9VdYYokOvY6cHt jcpdOYHOgrtZuHTqk/OkdwNBoiOlF/tXSzYge2+XJDbFnAqJYgAwd3XRFVJpVNLsSk1d rQcg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y4si5073046ybk.298.2021.01.19.00.39.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jan 2021 00:39:36 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:34508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1mY4-0003Mh-3d for patch@linaro.org; Tue, 19 Jan 2021 03:39:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1mVX-0008Ic-UB for qemu-devel@nongnu.org; Tue, 19 Jan 2021 03:37:00 -0500 Received: from mail-wr1-f49.google.com ([209.85.221.49]:41978) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l1mVW-0003Tu-7G for qemu-devel@nongnu.org; Tue, 19 Jan 2021 03:36:59 -0500 Received: by mail-wr1-f49.google.com with SMTP id a12so18806649wrv.8 for ; Tue, 19 Jan 2021 00:36:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=f2G0ytv9WcsWXoZLiyBGCtsUjm9fyhsF0T8dbHJkcok=; b=RXRGJngghecGOsYqlaQyd3314WdD5lrio2zuGeAmikrZCTiBb6d7wHaWg84A92J0TM njihVaOd+ZFAk42SkD+P/eH8pcF4alltY/hPlVZsTdfebeCe6wJSV4U38onYJ1g4Z3JJ uk6t1PB8uY3qKcJbVaAsNX1LoW7UCZrzGKaXozhEdPW8CFPp+fVBOOkhM1fgmgVrFoDJ FzaofttYY2QVjmZXJtcXvdh7xzRqHMM56pTG+pIbTeq8Ja+hl3hq7OjtD224l/7kpYuI cpi4VrdYhcQqDDMkUOcHeoFrwSYqxasoX+nURCYINuTnZISwiC/3mVR/4OFnMEneAoX+ eiSA== X-Gm-Message-State: AOAM533uak0+2P/L9013S64HwteguLusw5pT+t45XKj7WcPjixj5ygG9 MnZW/sbzXDh61N4yuobctCJHgrGpvhw= X-Received: by 2002:a5d:5181:: with SMTP id k1mr3092583wrv.226.1611045416745; Tue, 19 Jan 2021 00:36:56 -0800 (PST) Received: from localhost.localdomain (pd9e83aed.dip0.t-ipconnect.de. [217.232.58.237]) by smtp.gmail.com with ESMTPSA id z14sm540833wrm.5.2021.01.19.00.36.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jan 2021 00:36:56 -0800 (PST) From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 06/11] hw/m68k/next-cube: Move int_status and int_mask to NeXTPC struct Date: Tue, 19 Jan 2021 09:36:12 +0100 Message-Id: <20210119083617.6337-7-huth@tuxfamily.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119083617.6337-1-huth@tuxfamily.org> References: <20210119083617.6337-1-huth@tuxfamily.org> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.221.49; envelope-from=th.huth@gmail.com; helo=mail-wr1-f49.google.com X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell All the code which accesses int_status and int_mask is now doing so via the NeXTPC->NeXTState indirection, so we can move these fields into the NeXTPC struct where they belong. Signed-off-by: Peter Maydell Message-Id: <20210115201206.17347-7-peter.maydell@linaro.org> Signed-off-by: Thomas Huth --- hw/m68k/next-cube.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) -- 2.29.2 diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index 83e219a79a..9b9b051231 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -73,9 +73,6 @@ typedef struct NextRtc { struct NeXTState { MachineState parent; - uint32_t int_mask; - uint32_t int_status; - next_dma dma[10]; qemu_irq *scsi_irq; qemu_irq scsi_dma; @@ -104,6 +101,8 @@ struct NeXTPC { uint32_t scr2; uint8_t scsi_csr_1; uint8_t scsi_csr_2; + uint32_t int_mask; + uint32_t int_status; }; /* Thanks to NeXT forums for this */ @@ -244,7 +243,7 @@ static void nextscr2_write(NeXTPC *s, uint32_t val, int size) /* clear FTU */ if (rtc->value & 0x04) { rtc->status = rtc->status & (~0x18); - s->ns->int_status = s->ns->int_status & (~0x04); + s->int_status = s->int_status & (~0x04); } } } @@ -303,12 +302,12 @@ static uint32_t mmio_readl(NeXTPC *s, hwaddr addr) { switch (addr) { case 0x7000: - /* DPRINTF("Read INT status: %x\n", s->ns->int_status); */ - return s->ns->int_status; + /* DPRINTF("Read INT status: %x\n", s->int_status); */ + return s->int_status; case 0x7800: - DPRINTF("MMIO Read INT mask: %x\n", s->ns->int_mask); - return s->ns->int_mask; + DPRINTF("MMIO Read INT mask: %x\n", s->int_mask); + return s->int_mask; case 0xc000: return s->scr1; @@ -343,12 +342,12 @@ static void mmio_writel(NeXTPC *s, hwaddr addr, uint32_t val) { switch (addr) { case 0x7000: - DPRINTF("INT Status old: %x new: %x\n", s->ns->int_status, val); - s->ns->int_status = val; + DPRINTF("INT Status old: %x new: %x\n", s->int_status, val); + s->int_status = val; break; case 0x7800: - DPRINTF("INT Mask old: %x new: %x\n", s->ns->int_mask, val); - s->ns->int_mask = val; + DPRINTF("INT Mask old: %x new: %x\n", s->int_mask, val); + s->int_mask = val; break; case 0xc000: DPRINTF("SCR1 Write: %x\n", val); @@ -505,9 +504,9 @@ static void scr_writeb(NeXTPC *s, hwaddr addr, uint32_t value) DPRINTF("SCSICSR CPUDMA\n"); /* qemu_irq_raise(s->scsi_dma); */ - s->ns->int_status |= 0x4000000; + s->int_status |= 0x4000000; } else { - s->ns->int_status &= ~(0x4000000); + s->int_status &= ~(0x4000000); } if (value & SCSICSR_INTMASK) { DPRINTF("SCSICSR INTMASK\n"); @@ -799,14 +798,14 @@ static void next_irq(void *opaque, int number, int level) * this HAS to be wrong, the interrupt handlers in mach and together * int_status and int_mask and return if there is a hit */ - if (s->ns->int_mask & (1 << shift)) { + if (s->int_mask & (1 << shift)) { DPRINTF("%x interrupt masked @ %x\n", 1 << shift, cpu->env.pc); /* return; */ } /* second switch triggers the correct interrupt */ if (level) { - s->ns->int_status |= 1 << shift; + s->int_status |= 1 << shift; switch (number) { /* level 3 - floppy, kbd/mouse, power, ether rx/tx, scsi, clock */ @@ -835,7 +834,7 @@ static void next_irq(void *opaque, int number, int level) break; } } else { - s->ns->int_status &= ~(1 << shift); + s->int_status &= ~(1 << shift); cpu_reset_interrupt(CPU(cpu), CPU_INTERRUPT_HARD); } }