From patchwork Mon Sep 7 18:04:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 249253 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp3891839ilg; Mon, 7 Sep 2020 11:07:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyXQu0uxYSkeSdlsmm5meZ+6xMPCV3ldGInNleGXakGJHJUdZDNtsWIsVMoPVX6JhRGa+rJ X-Received: by 2002:a25:8512:: with SMTP id w18mr4328428ybk.432.1599502061599; Mon, 07 Sep 2020 11:07:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599502061; cv=none; d=google.com; s=arc-20160816; b=eqEYk7862ZF0iGqKrbkjVdHJsCrRey0kIM5Te5dqANJs+IgQJrH/NKmliFt1ba3+Tk iJXhr9WCbqpSfOmnXnndoQN3Wg6l0JiWoRzkGczEURWlJsAY33RRzoovLm7yWtUfm4Ee JVy1KxPygb/WiM9xiKRXNn+bxWKGiHrgzDOwl4Pp8oe/Qrx0S8w+rMV/AEUgpNt6mh8D Yn6lfHm6/n9FNFRNy2k0ghfWdzSa7yyXYsbbLepPZlqc/hCpjNI+gtubFOyG44Sws791 LjqLNsJif1fj9P7wj26ObRPCny0tYiqadLFiv4S6jwyW0BfkGdst7UvLjwU3vWmGHFAk lWlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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 :dkim-signature; bh=BV7UzgSMM3A3H8QtCGnB/gl3FBbCJtYPNUPwgrX+UHQ=; b=PywqYLYLAw000046bqjH8F+CCFSEAW26O/cTQ/5iBzvHaY4TvpOBvdG0gzY63744Vx 0Cq1ZBy+9ZqLcGz/WS3jXfArgMZkp+fxg7V9yBmhGDBs7RgsAwWVQFh5sdXqzw+J6MF1 ENH/zZxujitF04uanj+Auk8i0YrwLIguqqWYxvDSdLINIdEwz11WDlmgGbgjPEyyyiC3 0LzSiGL1jzVIIF3aZdb46q6bAtWhT8McHkJ5Fr4YYm64uNKUXl9JmySwT1ht0uHidmKH Q4kme7V4Wf46I38UGvvaCnCc5Wb5RRc9Tnw+UlPVxwRcpyngFKHQ8fZ/8De7PnNohSwD lrfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=sXN95DMJ; 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"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t4si15889849ybi.422.2020.09.07.11.07.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 07 Sep 2020 11:07:41 -0700 (PDT) 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; dkim=fail header.i=@linaro.org header.s=google header.b=sXN95DMJ; 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"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFLYL-0007AZ-4D for patch@linaro.org; Mon, 07 Sep 2020 14:07:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38764) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFLVu-0003kr-Bn for qemu-devel@nongnu.org; Mon, 07 Sep 2020 14:05:10 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]:36271) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kFLVp-0002NP-O5 for qemu-devel@nongnu.org; Mon, 07 Sep 2020 14:05:10 -0400 Received: by mail-pl1-x62d.google.com with SMTP id k13so2794087plk.3 for ; Mon, 07 Sep 2020 11:05:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BV7UzgSMM3A3H8QtCGnB/gl3FBbCJtYPNUPwgrX+UHQ=; b=sXN95DMJNz/SuqFVAmT0QvAY8b1QhUoEQyTSScvyvZOrbOg2BxiM8cyHrDtiwezM9O /aiVDDcHsjNzIBjHo7h4lcOCMYk2r03aZk+oTYLEZtjeesItby7qdtOwsP+XuHi5tYc2 OUlhEno8mpkKLvBmZ1/bSnS20SLw65QYyJMUzJ/KsIXJ/DpKEr5JJmskJKtqLDkkmwvx dDrVUY9xzx+aaFyyulCGcdckTzXB1JtG3oZwLxLBa9w+dLR8ltsBMoIKdqdzq3GofDQW XF2VKEnboJVX11HBXDuPyAjYk3F7qANsyBrKgQPuB1XSFWtBnq8RWEwzasEvQZXEe2BJ npBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BV7UzgSMM3A3H8QtCGnB/gl3FBbCJtYPNUPwgrX+UHQ=; b=NqylOlHTZoGiLnaxZ3KZV8IbhK/q1a9X53bcjSEWb2NGMSZcJyMFFgaVfK+1qJtSwf FHeQXACSPXuvgqYfkNm+r0HEr2uN01uFGgCplMo7SujIDFryP+fXJMkSw5PDFwwSi/4B JFJojXqJBFg4337SVoCdI+gVgE5AEuToCVQFcIk1hopikZc2J7mTpHt/Ev7EHRDC3LMr 7woJHM2YTy0TbV4aWYMoFXkQSlk/kflawoUgK8zgUvz92qDH9m3W+qlFtbkmnfPFex7r OAaNultAfjKenMnMoqEVsv0+Q/EFkCkKulyr5QPIg66jY9WByfe68idS3/ajTMnkHPwn 7MSA== X-Gm-Message-State: AOAM533yMRxTmtdQqpv3Ea+Y3qpZPAvU9CHpabHuhIsU4m+2JlqQkvLq 2LbCoESlJgRoI36UzHB0tKPlD9xN7J7zxQ== X-Received: by 2002:a17:90a:930e:: with SMTP id p14mr421362pjo.49.1599501903898; Mon, 07 Sep 2020 11:05:03 -0700 (PDT) Received: from localhost.localdomain ([71.212.141.89]) by smtp.gmail.com with ESMTPSA id v6sm11367768pfi.38.2020.09.07.11.05.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2020 11:05:03 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 12/19] target/microblaze: Split out MicroBlazeCPUConfig Date: Mon, 7 Sep 2020 11:04:52 -0700 Message-Id: <20200907180459.29025-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200907180459.29025-1-richard.henderson@linaro.org> References: <20200907175102.28027-1-richard.henderson@linaro.org> <20200907180459.29025-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62d.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Cc: "Edgar E . Iglesias" , peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This struct was previously unnamed, and defined in MicroBlazeCPU. Pull it out to its own typedef so that we can reuse it. Tested-by: Edgar E. Iglesias Reviewed-by: Edgar E. Iglesias Signed-off-by: Richard Henderson --- target/microblaze/cpu.h | 55 ++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 26 deletions(-) -- 2.25.1 diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index 20c2979396..59d2a079c4 100644 --- a/target/microblaze/cpu.h +++ b/target/microblaze/cpu.h @@ -291,6 +291,34 @@ struct CPUMBState { } pvr; }; +/* + * Microblaze Configuration Settings + */ +typedef struct { + bool stackprot; + uint32_t base_vectors; + uint8_t addr_size; + uint8_t use_fpu; + uint8_t use_hw_mul; + bool use_barrel; + bool use_div; + bool use_msr_instr; + bool use_pcmp_instr; + bool use_mmu; + bool dcache_writeback; + bool endi; + bool dopb_bus_exception; + bool iopb_bus_exception; + bool illegal_opcode_exception; + bool opcode_0_illegal; + bool div_zero_exception; + bool unaligned_exceptions; + uint8_t pvr_user1; + uint32_t pvr_user2; + char *version; + uint8_t pvr; +} MicroBlazeCPUConfig; + /** * MicroBlazeCPU: * @env: #CPUMBState @@ -305,32 +333,7 @@ struct MicroBlazeCPU { CPUNegativeOffsetState neg; CPUMBState env; - - /* Microblaze Configuration Settings */ - struct { - bool stackprot; - uint32_t base_vectors; - uint8_t addr_size; - uint8_t use_fpu; - uint8_t use_hw_mul; - bool use_barrel; - bool use_div; - bool use_msr_instr; - bool use_pcmp_instr; - bool use_mmu; - bool dcache_writeback; - bool endi; - bool dopb_bus_exception; - bool iopb_bus_exception; - bool illegal_opcode_exception; - bool opcode_0_illegal; - bool div_zero_exception; - bool unaligned_exceptions; - uint8_t pvr_user1; - uint32_t pvr_user2; - char *version; - uint8_t pvr; - } cfg; + MicroBlazeCPUConfig cfg; };