From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id EI1AMRhGpWPTsgcAWB0awg (envelope-from ) for ; Fri, 23 Dec 2022 01:09:28 -0500 Received: by simark.ca (Postfix, from userid 112) id C78F81E222; Fri, 23 Dec 2022 01:09:28 -0500 (EST) Authentication-Results: simark.ca; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=VxLCYoWZ; dkim-atps=neutral X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RDNS_DYNAMIC,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 6B36D1E110 for ; Fri, 23 Dec 2022 01:09:28 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0C6E23881D10 for ; Fri, 23 Dec 2022 06:09:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0C6E23881D10 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1671775768; bh=2TEqb+fx2hqxtQBOni4xdDeQuKM1MZpK6YOV5Z5gGlU=; 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=VxLCYoWZKgx79BeL8UG+O9Y5wzHzWuCLg/eeayFnkJZvFnKxDU9u2cyHDYoKQw9hN qhueg2yXoCkVM53iF2SJx7kIxUaDiu/AqdFVKbHEzdmPpiBVMV9xXqHk0lZN9OXDjC QrRhZzqr/cXMGO1Ut484xM91WHUPfeUhD7gqWaPo= Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 69A4B3861018 for ; Fri, 23 Dec 2022 06:07:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 69A4B3861018 Received: by smtp.gentoo.org (Postfix, from userid 559) id 1D98C3411D8; Fri, 23 Dec 2022 06:07:44 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH 12/20] sim: microblaze: move arch-specific settings to internal header Date: Fri, 23 Dec 2022 01:07:05 -0500 Message-Id: <20221223060713.28821-13-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 Content-Transfer-Encoding: 8bit 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: , From: Mike Frysinger via Gdb-patches Reply-To: Mike Frysinger Errors-To: gdb-patches-bounces+public-inbox=simark.ca@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/microblaze/interp.c | 1 + sim/microblaze/microblaze-sim.h | 46 +++++++++++++++++++++++++++++++++ sim/microblaze/sim-main.h | 24 ----------------- 3 files changed, 47 insertions(+), 24 deletions(-) create mode 100644 sim/microblaze/microblaze-sim.h diff --git a/sim/microblaze/interp.c b/sim/microblaze/interp.c index 3d7fde0af3e3..8a8cb9f2b832 100644 --- a/sim/microblaze/interp.c +++ b/sim/microblaze/interp.c @@ -33,6 +33,7 @@ #include "sim-signal.h" #include "sim-syscall.h" +#include "microblaze-sim.h" #include "microblaze-dis.h" #define target_big_endian (CURRENT_TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) diff --git a/sim/microblaze/microblaze-sim.h b/sim/microblaze/microblaze-sim.h new file mode 100644 index 000000000000..9e5fb0711c58 --- /dev/null +++ b/sim/microblaze/microblaze-sim.h @@ -0,0 +1,46 @@ +/* Copyright 2009-2022 Free Software Foundation, Inc. + + This file is part of the Xilinx MicroBlaze simulator. + + This library 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 MICROBLAZE_SIM_H +#define MICROBLAZE_SIM_H + +#include "microblaze.h" + +/* The machine state. + This state is maintained in host byte order. The + fetch/store register functions must translate between host + byte order and the target processor byte order. + Keeping this data in target byte order simplifies the register + read/write functions. Keeping this data in native order improves + the performance of the simulator. Simulation speed is deemed more + important. */ + +/* The ordering of the microblaze_regset structure is matched in the + gdb/config/microblaze/tm-microblaze.h file in the REGISTER_NAMES macro. */ + struct microblaze_regset +{ + signed_4 regs[32]; /* primary registers */ + signed_4 spregs[2]; /* pc + msr */ + int cycles; + int insts; + unsigned_1 imm_enable; + signed_2 imm_high; +}; + +#define MICROBLAZE_SIM_CPU(cpu) ((struct microblaze_regset *) CPU_ARCH_DATA (cpu)) + +#endif /* MICROBLAZE_SIM_H */ diff --git a/sim/microblaze/sim-main.h b/sim/microblaze/sim-main.h index 160f10156fff..7646dad044fe 100644 --- a/sim/microblaze/sim-main.h +++ b/sim/microblaze/sim-main.h @@ -18,31 +18,7 @@ #ifndef MICROBLAZE_SIM_MAIN #define MICROBLAZE_SIM_MAIN -#include "microblaze.h" #include "sim-basics.h" #include "sim-base.h" -/* The machine state. - This state is maintained in host byte order. The - fetch/store register functions must translate between host - byte order and the target processor byte order. - Keeping this data in target byte order simplifies the register - read/write functions. Keeping this data in native order improves - the performance of the simulator. Simulation speed is deemed more - important. */ - -/* The ordering of the microblaze_regset structure is matched in the - gdb/config/microblaze/tm-microblaze.h file in the REGISTER_NAMES macro. */ - struct microblaze_regset -{ - signed_4 regs[32]; /* primary registers */ - signed_4 spregs[2]; /* pc + msr */ - int cycles; - int insts; - unsigned_1 imm_enable; - signed_2 imm_high; -}; - -#define MICROBLAZE_SIM_CPU(cpu) ((struct microblaze_regset *) CPU_ARCH_DATA (cpu)) - #endif /* MICROBLAZE_SIM_MAIN */ -- 2.39.0