From nobody Fri Oct 18 09:16:40 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1712907361; cv=none; d=zohomail.com; s=zohoarc; b=ipmzAbfFGXmBQXWpoX+hLJAiIsQSLvGYJCfX6h/ZE2BmGN3yEIKKgUKy2hG1gwvszWzqhuKmw/FInlxxlhyPWJYofsWXf5BF6fym6UZRGn7ORQdhDcISE8+cQnzdG+N7yKdWPOMXvt1xGZbzvt6ClztRbMP8FUR6jT37VvHCmmU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907361; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=AgGhBfcq1sGSX/QZG2Od2RrYyCzuXj5RVatE7xiS5E8=; b=So4YAKEzpEkuvgBXAiPOhs9WY8r8jn+vCudEfuGVhnIN91Acf7xsa6HMcv8e18DZofMQyGUx7ZpI/N9loj64A89cmEry9zPvrcmT4KXr8cuwLIzw7ZFYfL6qFmdBXLwlE0k40jpMAgiN/oa3SjVFRzakq+p9Rp8kJ/to/7Bz3jo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712907361679197.8476464953136; Fri, 12 Apr 2024 00:36:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQS-00078X-QI; Fri, 12 Apr 2024 03:34:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rvBQJ-00074h-Dz for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:11 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQF-0007Cq-D1 for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:09 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1e455b630acso3259765ad.1 for ; Fri, 12 Apr 2024 00:34:06 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.34.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:34:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907243; x=1713512043; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=AgGhBfcq1sGSX/QZG2Od2RrYyCzuXj5RVatE7xiS5E8=; b=gLxsOA2WwL0b9xr/Ux4/Tu3GoGnidWSQfSXUdei1Y06Ri1HwtzKfDosvL+6eNVO0lj Q9azJiPq5r4ZezMZTYX/IeX9GtX+/EGNENs8Rjh1oYDDSQdlD4u271AG+BlyrPfNcMCH U4SIHMMOs2VmYKW4zRWhRt4qjQiCxS7lNOmHefn7pTjonGNo1mFfHKxM5CjkiZQIU8v6 5/NL57Cv3/PvsMErOEd4Xmkg+CGAhZhqYIWpMLMVyD5YV2QeUmJN7MGrMyC4w+ocnNW2 rUAwQ2j5sTiuC6uY2PwQrE5jwByYI40lS1ZxCc9bZPuZu3eOGpwPzRQg+dsWO7ndD3LK Nz2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907243; x=1713512043; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AgGhBfcq1sGSX/QZG2Od2RrYyCzuXj5RVatE7xiS5E8=; b=HGuQNV7K8/vH1j6JsB8LhE49x82e/V48y8mLLlVu+PsRPedOEL0BRiIO1pK/kUKpGd xsjpjjnbiSrjuHJIAjmdL2aiOtXquqi/gJOuL1V4UhukHJTwo+YA188lilwQjo6SAJpf Gmx3v+E6ddpDbb1KGX0JbeLA1MiZWd7rR/P4LpyAN2GThLsZZu7e1MsEJ/H1CdbegSIZ tVnU1hiScrzwdBSqYFxdaJBtq4lLNqUeA5V43iwKbuAEkavSrhQYUK1wWl/947UdpI4p 0MmZWoXb/U1kLzOVdO+EnDPOMJmSFYJzu1qOwVifzKeaXrkoLXYsJyeaEkW2nM8h6N+t W6mw== X-Gm-Message-State: AOJu0Yx9FTrxWgIb8AcztSlM5OLLJfvYP7yp7U+Dw2QZGIAHCdSad/58 egJZyOA8wAcB1UdcspdXbIjoVhcnfZyyJTIc9hAHOtbhQ14QlR3mNk08teWoWBSmRmJOexWCnUq W X-Google-Smtp-Source: AGHT+IEId0spMx11GxYKMczs8l5n5n6AUD8ut89Y7HlXKlEQYtjr6c1vE4SbGbpk/4fWvMuC20W8Cg== X-Received: by 2002:a17:902:f545:b0:1e2:6b5d:5b18 with SMTP id h5-20020a170902f54500b001e26b5d5b18mr1965285plf.51.1712907243634; Fri, 12 Apr 2024 00:34:03 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 20/27] disas/microblaze: Split get_field_special Date: Fri, 12 Apr 2024 00:33:39 -0700 Message-Id: <20240412073346.458116-21-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62b.google.com 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1712907362775100009 Content-Type: text/plain; charset="utf-8" Extract the raw special index and a function to lookup a name. Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- disas/microblaze.c | 142 +++++++++++++++++++-------------------------- 1 file changed, 61 insertions(+), 81 deletions(-) diff --git a/disas/microblaze.c b/disas/microblaze.c index 24febfdea9..197327fae4 100644 --- a/disas/microblaze.c +++ b/disas/microblaze.c @@ -564,8 +564,6 @@ static const struct op_code_struct { =20 /* prefix for register names */ #define register_prefix "r" -static const char pvr_register_prefix[] =3D "rpvr"; - =20 /* #defines for valid immediate range */ #define MIN_IMM ((int) 0x80000000) @@ -580,6 +578,7 @@ static const char pvr_register_prefix[] =3D "rpvr"; =20 #define PRIreg register_prefix "%ld" #define PRIrfsl register_prefix "fsl%ld" +#define PRIpvr register_prefix "pvr%d" #define PRIimm "%d" =20 #define get_field_rd(instr) ((instr & RD_MASK) >> RD_LOW) @@ -593,83 +592,48 @@ static const char pvr_register_prefix[] =3D "rpvr"; #define get_int_field_imm(instr) ((instr & IMM_MASK) >> IMM_LOW) #define get_int_field_r1(instr) ((instr & RA_MASK) >> RA_LOW) =20 -/* - char * - get_field_special (instr)=20 - long instr; - { - char tmpstr[25]; - =20 - snprintf(tmpstr, sizeof(tmpstr), "%s%s", register_prefix, - (((instr & IMM_MASK) >> IMM_LOW) & REG_MSR_MASK) =3D=3D 0 ? "pc"= : "msr"); - =20 - return(strdup(tmpstr)); - } -*/ - -static char * -get_field_special(long instr, const struct op_code_struct *op) +static int get_field_special(long instr, const struct op_code_struct *op) { - char tmpstr[25]; - char spr[6]; + return ((instr & IMM_MASK) >> IMM_LOW) ^ op->immval_mask; +} =20 - switch ( (((instr & IMM_MASK) >> IMM_LOW) ^ op->immval_mask) ) { - - case REG_MSR_MASK : - strcpy(spr, "msr"); - break; - case REG_PC_MASK : - strcpy(spr, "pc"); - break; - case REG_EAR_MASK : - strcpy(spr, "ear"); - break; - case REG_ESR_MASK : - strcpy(spr, "esr"); - break; - case REG_FSR_MASK : - strcpy(spr, "fsr"); - break; - case REG_BTR_MASK : - strcpy(spr, "btr"); - break; =20 - case REG_EDR_MASK : - strcpy(spr, "edr"); - break; - case REG_PID_MASK : - strcpy(spr, "pid"); - break; - case REG_ZPR_MASK : - strcpy(spr, "zpr"); - break; - case REG_TLBX_MASK : - strcpy(spr, "tlbx"); - break; - case REG_TLBLO_MASK : - strcpy(spr, "tlblo"); - break; - case REG_TLBHI_MASK : - strcpy(spr, "tlbhi"); - break; - case REG_TLBSX_MASK : - strcpy(spr, "tlbsx"); - break; - default : - { - if ( ((((instr & IMM_MASK) >> IMM_LOW) ^ op->immval_mask) & 0xE000)= =3D=3D REG_PVR_MASK) { - snprintf(tmpstr, sizeof(tmpstr), "%s%u", pvr_register_prefix, - (unsigned short)(((instr & IMM_MASK) >> IMM_LOW) ^ - op->immval_mask) ^ REG_PVR_MASK); - return(strdup(tmpstr)); - } else { - strcpy(spr, "pc"); - } - } - break; - } - =20 - snprintf(tmpstr, sizeof(tmpstr), "%s%s", register_prefix, spr); - return(strdup(tmpstr)); +/* Returns NULL for PVR registers, which should be rendered differently. */ +static const char *get_special_name(int special) +{ + switch (special) { + case REG_MSR_MASK: + return register_prefix "msr"; + case REG_PC_MASK: + return register_prefix "pc"; + case REG_EAR_MASK: + return register_prefix "ear"; + case REG_ESR_MASK: + return register_prefix "esr"; + case REG_FSR_MASK: + return register_prefix "fsr"; + case REG_BTR_MASK: + return register_prefix "btr"; + case REG_EDR_MASK: + return register_prefix "edr"; + case REG_PID_MASK: + return register_prefix "pid"; + case REG_ZPR_MASK: + return register_prefix "zpr"; + case REG_TLBX_MASK: + return register_prefix "tlbx"; + case REG_TLBLO_MASK: + return register_prefix "tlblo"; + case REG_TLBHI_MASK: + return register_prefix "tlbhi"; + case REG_TLBSX_MASK: + return register_prefix "tlbsx"; + default: + if ((special & 0xE000) =3D=3D REG_PVR_MASK) { + /* pvr register */ + return NULL; + } + return register_prefix "pc"; + } } =20 static unsigned long @@ -739,6 +703,8 @@ print_insn_microblaze(bfd_vma memaddr, struct disassemb= le_info *info) static bfd_vma prev_insn_addr =3D -1; /*init the prev insn addr */ static int prev_insn_vma =3D -1; /*init the prev insn vma */ int curr_insn_vma =3D info->buffer_vma; + int special; + const char *special_name; =20 info->bytes_per_chunk =3D 4; =20 @@ -799,12 +765,26 @@ print_insn_microblaze(bfd_vma memaddr, struct disasse= mble_info *info) op->name, get_field_r1(inst), get_field_rfsl(inst)); break; case INST_TYPE_RD_SPECIAL: - fprintf_func(stream, "%s\t" PRIreg ", %s", - op->name, get_field_rd(inst), get_field_special(inst,= op)); + special =3D get_field_special(inst, op); + special_name =3D get_special_name(special); + if (special_name) { + fprintf_func(stream, "%s\t" PRIreg ", %s", + op->name, get_field_rd(inst), special_name); + } else { + fprintf_func(stream, "%s\t" PRIreg ", " PRIpvr, + op->name, get_field_rd(inst), special ^ REG_PVR_M= ASK); + } break; case INST_TYPE_SPECIAL_R1: - fprintf_func(stream, "%s\t%s, " PRIreg, - op->name, get_field_special(inst, op), get_field_r1(i= nst)); + special =3D get_field_special(inst, op); + special_name =3D get_special_name(special); + if (special_name) { + fprintf_func(stream, "%s\t%s, " PRIreg, + op->name, special_name, get_field_r1(inst)); + } else { + fprintf_func(stream, "%s\t" PRIpvr ", " PRIreg, + op->name, special ^ REG_PVR_MASK, get_field_r1(in= st)); + } break; case INST_TYPE_RD_R1: fprintf_func(stream, "%s\t" PRIreg ", " PRIreg, --=20 2.34.1