From patchwork Fri Dec 23 06:07:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 62335 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 A8AAA383F0B5 for ; Fri, 23 Dec 2022 06:09:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A8AAA383F0B5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1671775743; bh=qlEgNCf/S4ZBzIYDd33obpda9bONz629cmdwwExzmMQ=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=F+4Ecu4POnQKxpRD5t+L6qbK2ZnMkQdG9DcJwdfneLAWuRmYSy/ovDticHX35Iu0t wRH95hUOgCJw4MTKgwfVJoJxw338pTMo8HLaWdhtnnF4p8GCwJKAN1qbm2ECA75vW6 0LJON72mqOv3dCPFwYkp22I+hmHmTnOzqMRgfjL8= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 538DE3857C43 for ; Fri, 23 Dec 2022 06:07:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 538DE3857C43 Received: by smtp.gentoo.org (Postfix, from userid 559) id 063853411D4; Fri, 23 Dec 2022 06:07:42 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH 11/20] sim: example-synacor: move arch-specific settings to internal header Date: Fri, 23 Dec 2022 01:07:04 -0500 Message-Id: <20221223060713.28821-12-vapier@gentoo.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221223060713.28821-1-vapier@gentoo.org> References: <20221223060713.28821-1-vapier@gentoo.org> 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, KAM_SHORT, 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" There's no need for these settings to be in sim-main.h which is shared with common/ sim code, so move it all out to a new header which only this port will include. --- sim/example-synacor/example-synacor-sim.h | 38 +++++++++++++++++++++++ sim/example-synacor/interp.c | 2 ++ sim/example-synacor/sim-main.c | 2 ++ sim/example-synacor/sim-main.h | 14 --------- 4 files changed, 42 insertions(+), 14 deletions(-) create mode 100644 sim/example-synacor/example-synacor-sim.h diff --git a/sim/example-synacor/example-synacor-sim.h b/sim/example-synacor/example-synacor-sim.h new file mode 100644 index 000000000000..55701a7f0d57 --- /dev/null +++ b/sim/example-synacor/example-synacor-sim.h @@ -0,0 +1,38 @@ +/* Example synacor simulator. + + Copyright (C) 2005-2022 Free Software Foundation, Inc. + Contributed by Mike Frysinger. + + This file is part of the GNU simulators. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef EXAMPLE_SYNACOR_SIM_H +#define EXAMPLE_SYNACOR_SIM_H + +struct example_sim_cpu { + uint16_t regs[8]; + sim_cia pc; + + /* This isn't a real register, and the stack is not directly addressable, + so use memory outside of the 16-bit address space. */ + uint32_t sp; +}; + +#define EXAMPLE_SIM_CPU(cpu) ((struct example_sim_cpu *) CPU_ARCH_DATA (cpu)) + +extern void step_once (SIM_CPU *); +extern void initialize_cpu (SIM_DESC, SIM_CPU *); + +#endif diff --git a/sim/example-synacor/interp.c b/sim/example-synacor/interp.c index cbde166c9b32..20ae057d43a1 100644 --- a/sim/example-synacor/interp.c +++ b/sim/example-synacor/interp.c @@ -31,6 +31,8 @@ #include "sim/callback.h" #include "sim-main.h" #include "sim-options.h" + +#include "example-synacor-sim.h" /* This function is the main loop. It should process ticks and decode+execute a single instruction. diff --git a/sim/example-synacor/sim-main.c b/sim/example-synacor/sim-main.c index 0757d6925c8f..2971c7ffd227 100644 --- a/sim/example-synacor/sim-main.c +++ b/sim/example-synacor/sim-main.c @@ -26,6 +26,8 @@ #include "sim-main.h" #include "sim-signal.h" + +#include "example-synacor-sim.h" /* Get the register number from the number. */ static uint16_t diff --git a/sim/example-synacor/sim-main.h b/sim/example-synacor/sim-main.h index 258d61879cc9..ffd695ea226a 100644 --- a/sim/example-synacor/sim-main.h +++ b/sim/example-synacor/sim-main.h @@ -24,18 +24,4 @@ #include "sim-basics.h" #include "sim-base.h" -struct example_sim_cpu { - uint16_t regs[8]; - sim_cia pc; - - /* This isn't a real register, and the stack is not directly addressable, - so use memory outside of the 16-bit address space. */ - uint32_t sp; -}; - -#define EXAMPLE_SIM_CPU(cpu) ((struct example_sim_cpu *) CPU_ARCH_DATA (cpu)) - -extern void step_once (SIM_CPU *); -extern void initialize_cpu (SIM_DESC, SIM_CPU *); - #endif