From patchwork Thu May 3 09:18:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 10377421 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9E4FB6037D for ; Thu, 3 May 2018 09:25:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 947BE29070 for ; Thu, 3 May 2018 09:25:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8777929090; Thu, 3 May 2018 09:25:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, FSL_HELO_FAKE, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0200B29070 for ; Thu, 3 May 2018 09:25:03 +0000 (UTC) Received: from localhost ([::1]:54857 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEAU2-0005DX-58 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 03 May 2018 05:25:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54940) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEAOl-0000j8-Hq for qemu-devel@nongnu.org; Thu, 03 May 2018 05:19:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fEAOk-0004zA-Dg for qemu-devel@nongnu.org; Thu, 03 May 2018 05:19:35 -0400 Received: from mail-lf0-x244.google.com ([2a00:1450:4010:c07::244]:35066) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fEAOk-0004yq-5Q for qemu-devel@nongnu.org; Thu, 03 May 2018 05:19:34 -0400 Received: by mail-lf0-x244.google.com with SMTP id y72-v6so11178122lfd.2 for ; Thu, 03 May 2018 02:19:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pciS/DhpFdr4qShQmXJvh/x4zVyu8k35Di6GJVKxzOY=; b=mJUdvP1BGHeapuB/z08ipXIWKKRHsodNurDDtvNJbPBX+g/1AIgZYs1enu0uXz+Pqs 82nTSh6DvbLbWVJ0xDbjnKV6iE+6aACkVr4jBwip87eakbI3q970PQNZb/hPm/jH3Sd8 8PnexEBwM4pTSBQiDdZ6/aGp0HHliFRAkYfqBmjAHzf6oQj6CGovPCC/fK9WTUy5VbVj CBCA7zvUQ+4lYozbymTl5U5uq/48Y2GS9cEbwG5vmH2MFRmw001wRQprW4q6vwe8ZlYr 0Hw7lLYoyk96AwMje5J6I6V/rTfeqh2QYeSj4PqJyxYvS8unV+E+u6Afq58lfC6B01CI gMxg== 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; bh=pciS/DhpFdr4qShQmXJvh/x4zVyu8k35Di6GJVKxzOY=; b=WfRhOk0cBvbQ/kodBo+rbd2ydi4ku0mz5Rc8m2rS1Zu0lC9/D9gRgdKxOTmV2m4xHe 73iVRq8hWuoOoD3BmstvNqogjwtocFIrIqKA/dK4/ejpz6MXJOvD7pqKydxFF0smAcvs d3L0+L70ZEqAcI0is8migj2bLXL0uw+VmXsXaqd8cn9vyxgx7ehdTDiQTI27eZx5qBkQ 7H2+O/mm4h6f7jVt0AFdtOjD+NXt1mfVbWCJybra17J2anJOJWQv/UnlEiydp1nBqcxO WRjNw3m+bEbejS0l9DWwZUUeLsAW6r4go8tAqd22Joav4YU+m9E6/cLs5cn5Y+plLcmP 3ILA== X-Gm-Message-State: ALQs6tBWc9/kMkaydUVcLnGVSyGcCh+EqtxFahWE+KGM4SuGGS3KAUuk I+uc/AknPVK3XuShNeeCMMkj7w== X-Google-Smtp-Source: AB8JxZqVSByU95q9BK+j5X4IwmuuS2HB+RmFRjYN8hdhsQvduYN6MWdoNQFLfKSWlL9oOpCEWHZ1TA== X-Received: by 2002:a2e:2a45:: with SMTP id q66-v6mr9757697ljq.40.1525339172697; Thu, 03 May 2018 02:19:32 -0700 (PDT) Received: from gmail.com (81-231-232-130-no39.tbcn.telia.com. [81.231.232.130]) by smtp.gmail.com with ESMTPSA id r6-v6sm2746360ljj.86.2018.05.03.02.19.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 May 2018 02:19:31 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Date: Thu, 3 May 2018 11:18:58 +0200 Message-Id: <20180503091922.28733-6-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180503091922.28733-1-edgar.iglesias@gmail.com> References: <20180503091922.28733-1-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::244 Subject: [Qemu-devel] [PATCH v1 05/29] target-microblaze: Correct special register array sizes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, sai.pavan.boddu@xilinx.com, frasse.iglesias@gmail.com, alistair@alistair23.me, richard.henderson@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: "Edgar E. Iglesias" Correct special register array sizes. Signed-off-by: Edgar E. Iglesias Reviewed-by: Richard Henderson --- target/microblaze/cpu.h | 4 ++-- target/microblaze/translate.c | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index 5be71bc320..994496515f 100644 --- a/target/microblaze/cpu.h +++ b/target/microblaze/cpu.h @@ -242,8 +242,8 @@ struct CPUMBState { uint32_t bimm; uint32_t imm; - uint32_t regs[33]; - uint32_t sregs[24]; + uint32_t regs[32]; + uint32_t sregs[14]; float_status fp_status; /* Stack protectors. Yes, it's a hw feature. */ uint32_t slr, shr; diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 9232b42a8a..75079f18fa 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -54,7 +54,7 @@ static TCGv env_debug; static TCGv cpu_R[32]; -static TCGv cpu_SR[18]; +static TCGv cpu_SR[14]; static TCGv env_imm; static TCGv env_btaken; static TCGv env_btarget; @@ -106,8 +106,7 @@ static const char *regnames[] = static const char *special_regnames[] = { "rpc", "rmsr", "sr2", "sr3", "sr4", "sr5", "sr6", "sr7", - "sr8", "sr9", "sr10", "sr11", "sr12", "sr13", "sr14", "sr15", - "sr16", "sr17", "sr18" + "sr8", "sr9", "sr10", "sr11", "sr12", "sr13" }; static inline void t_sync_flags(DisasContext *dc)