From patchwork Tue May 29 10:49:38 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: 921958 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="OdvR89fr"; 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 40w9WN4KCZz9rxs for ; Tue, 29 May 2018 20:51:12 +1000 (AEST) Received: from localhost ([::1]:60087 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNcDe-0001HV-4s for incoming@patchwork.ozlabs.org; Tue, 29 May 2018 06:51:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36788) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNcCu-0001CJ-FY for qemu-devel@nongnu.org; Tue, 29 May 2018 06:50:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fNcCt-0003nR-Nb for qemu-devel@nongnu.org; Tue, 29 May 2018 06:50:24 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:55549) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fNcCt-0003md-HR for qemu-devel@nongnu.org; Tue, 29 May 2018 06:50:23 -0400 Received: by mail-wm0-x242.google.com with SMTP id a8-v6so39176742wmg.5 for ; Tue, 29 May 2018 03:50:23 -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=lU9gHChb8u2XTPHjLHseXLIYX0zoW/9g6fwRf52uqnw=; b=OdvR89fr+lgLT7ieOTk9F7EPztmqVeZqaGPFnT4/NDA4owPF88XKIpXAgfSvKrEwhi 6fpDV33IqOezj3laW1tyE0SbMtwmJy8MZV1hKARHJiPqU231ZY146EioZVYlWZCa5KKe v0QByKBJUHSPKFlF3g49Ptygx1PhkGGpXN8KB341sEk9INtJRJ1YmrHkK2UldEIPdAez a/SNrBvv8FSuMVa0qXypzTj82eA6tx9Qib7rrUvMv6J4FMDYYNxVGF7ivyT+OFEo1Hi1 INrc54KM6TNrOsJMN9e1C0mD1K161zxXzH9kG0pLM4toyWoYt8xLIpHN8tUWEFJM9vL2 CdUw== 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=lU9gHChb8u2XTPHjLHseXLIYX0zoW/9g6fwRf52uqnw=; b=fcPb2tLqZAm3YfChDBihLKAl3RXC+LHWPCGRbzXulSfJJ2HBuCofgb/qhAAVC5MhQw BLCt1BD7Z9ddfahuiC+6dbiNVufTAumn2UJTmREu1f/Bw4Mx/E7bCHJdEwoydyoiLOtD kIqOPQcDxn7Y57WYXx9bIoCcCfPN8+ccOUVaR+XX62M7NJv5X5UWm9feSXa5wtkmbGWB QIk/5VM62Isl6viqHQAfccu6Uiis3kVcReL1HbZoMxozW0XsQwfbX5N2/7LNHhEhTc3G X31Ww2flUeCdAXPdMO0ETjDT5vvk7SU977c8SeUZpCfYzj2IgXJ8cSm2IjWuMQ6HEs6X Y+lg== X-Gm-Message-State: ALKqPweN4afxGbCLdAsY9CDmPjSl2eddozAWlSIbWHDaCB5/zE6jkD5p LQ5beneu/M1dhUwgP4pP6wEfYg== X-Google-Smtp-Source: AB8JxZrL9KmgLeAVooAQRmZer2OpO9mjZTE8V6osankecjStW2fmqxYQSLD7sKuVncWqhSSACP0rCQ== X-Received: by 2002:a2e:997:: with SMTP id 145-v6mr10621205ljj.46.1527591022229; Tue, 29 May 2018 03:50:22 -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 v9-v6sm7263833lfa.30.2018.05.29.03.50.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 May 2018 03:50:21 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Date: Tue, 29 May 2018 12:49:38 +0200 Message-Id: <20180529105011.1914-6-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180529105011.1914-1-edgar.iglesias@gmail.com> References: <20180529105011.1914-1-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PULL v1 05/38] 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 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 46595e6336..9614f15d58 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)