From patchwork Tue May 8 17:31:21 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: 910356 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="vHLMiwbI"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40gRQn1KdYz9ryk for ; Wed, 9 May 2018 03:33:05 +1000 (AEST) Received: from localhost ([::1]:52550 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG6U2-00089k-OP for incoming@patchwork.ozlabs.org; Tue, 08 May 2018 13:33:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43854) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG6T6-00085n-RG for qemu-devel@nongnu.org; Tue, 08 May 2018 13:32:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fG6T5-0005I3-VX for qemu-devel@nongnu.org; Tue, 08 May 2018 13:32:04 -0400 Received: from mail-lf0-x242.google.com ([2a00:1450:4010:c07::242]:44875) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fG6T5-0005Hd-Nt for qemu-devel@nongnu.org; Tue, 08 May 2018 13:32:03 -0400 Received: by mail-lf0-x242.google.com with SMTP id h197-v6so47004501lfg.11 for ; Tue, 08 May 2018 10:32:03 -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=gHoiS5aEbCOdRweszdhERPSAE9Bd6kTb6DojwlpxcH4=; b=vHLMiwbIOHF4RCAb7mHqBh7ON71vlExgL3cSk8fhVJJ5/lPM/GIegyK6t4GkqZ5z4v /oJW+tw3pg/dOPw7i7etmW+27iObOTOGkzeAJ5iO/VJKWuKhOtS2q6ei7fz8JrdcTApm GgTeOTUW3KCqZatnzGo1PxpeY+pjteNorupHVwfiqV5CzHHBStSjQnxQGiLpGXmKNNyx ojzH1MCfpFhFN6C6wZppAU1wBwkI2LXtD2pb6AuWqocXXDNBy9UuQ0jPlVtmnjFuCbva fhW7djZFtQC6tCsLL4zOE6dQ8oRjFNLkmlXz9FGCyWTxqOea0qRcVfptnnJmYDi9cM6S veQA== 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=gHoiS5aEbCOdRweszdhERPSAE9Bd6kTb6DojwlpxcH4=; b=BVDFvLwRsk+l/lemfHxY1AUSNrjVtsKYk6lh8zhMij+VWjHSQoWJ3WDXoyTy0+h0E2 2Zd1yPQHRtmJwW5HkSV1ER1QzG56gATZkAk187H1y4OBoxaNbdtfFT90oHJ202+vGT3t AIpdJ7eyzDBYcMfmtHPAHsZDrOATkQ17YpdGi2nQdoZYC7fXpuP4MG6XYRLhq4giD/MA YpzuLk6n1k6dNX9MDzFYQXtu7GIsxYsY/WnfqDFaM6UvMhxlb1gJZ4EJ44ew8K9FpsQB ta1PLS8JOEUR4N37s3wtQiIKDRh4xAECbbv1K+5YRUKtB48ga+aNvHnOLi9xyA/Fd9GI EMFw== X-Gm-Message-State: ALQs6tA369Xdh4yCXBGxAJO0KJ9z+ET95MbxnmfQWbMVi6ds21w02n44 OMJFvDVzGRS7DDunIS3BNwpg7g== X-Google-Smtp-Source: AB8JxZo6f8mOAo1u0U+OQCYT+QgYpcCCPqosD/FXDaxpOxQcOZIRCMMHH4gl4cBcZsv07s2oRzGhVw== X-Received: by 2002:a2e:9047:: with SMTP id n7-v6mr27371751ljg.50.1525800722278; Tue, 08 May 2018 10:32:02 -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 a124-v6sm4159265lfe.38.2018.05.08.10.32.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 May 2018 10:32:01 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Date: Tue, 8 May 2018 19:31:21 +0200 Message-Id: <20180508173152.29327-6-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180508173152.29327-1-edgar.iglesias@gmail.com> References: <20180508173152.29327-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::242 Subject: [Qemu-devel] [PATCH v2 05/36] 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, frederic.konrad@adacore.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: "Edgar E. Iglesias" Correct special register array sizes. Reviewed-by: Richard Henderson Signed-off-by: Edgar E. Iglesias --- 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)