From nobody Mon Sep 16 20:09:04 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=1712907408; cv=none; d=zohomail.com; s=zohoarc; b=KKEAxrklnbDQjMVkVAcb+3Z6ZOePM1pKmCGAOui3en28HSjWmerW7rnavLYLqqR5KmjnakwPSBxV0lWOLxmrKFPzcyjden3FbUVgRk6dtIfMky9PWAQ9vp5Y9/AzN/rnXuKbcs+Z7LUfxA7vEhaz3WKKMJK0R9ibbDCcLc+j1k0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907408; 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=6HJ1SMmA8I+3QuAFdhuJVGFMyvOQ304pvIkGq8bmlYE=; b=lKh+C25l1VkjCDZ/ljyO7Fro7xThAaJVhXip62DwVfwCQKXyDr/yPAgfUipfpLtBOGSjKBKKltZspYg3nNE5m4K35+YrBmqZQFzs0Be0k5kCDUhbg5SdguTka2FFW9Vl+5d3TFnB6CXWnvo6Wu84FRBM5+lj7OFFq1UAJucQc+M= 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 1712907408299211.82190138054204; Fri, 12 Apr 2024 00:36:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQH-000740-Fl; Fri, 12 Apr 2024 03:34:09 -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 1rvBQB-00071Z-W9 for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:04 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQ9-0007Bz-67 for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:02 -0400 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-1e3cf5b171eso5656085ad.0 for ; Fri, 12 Apr 2024 00:34:00 -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.33.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:33:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907240; x=1713512040; 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=6HJ1SMmA8I+3QuAFdhuJVGFMyvOQ304pvIkGq8bmlYE=; b=fRWCKJ16wj/9zLqvhGd1JWRQZn6wUegW8N9LV/hGOeVqc/SesWVm2f88wcSwSPJHfX hanCVfY8ysxdXySt4AZ+puG6mj5SPCEBp+ZrqJTcKwYK8zKIzv8lNHsYm9rzLwe/f1E+ RYGXp4c+/pA3FbV56bXlTNuSfKkokvKBfY14HhKNmgMQylu6OmfplbUKrFNm0XAmltZ8 xOB4U93KIjo5OGF0dL+2X9UL1/+fZet4Bz1pPyzaWfdaCI0ekZCNLLHyhxXZ8cdts4RK xo95E2UJ/NwlvSV5CHJSJtqnUtAcWzCNzGoACHd6kLl8mAlVKat89IjN5aVA+T+x8pRV CbZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907240; x=1713512040; 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=6HJ1SMmA8I+3QuAFdhuJVGFMyvOQ304pvIkGq8bmlYE=; b=Fq8exkgfPAQswrPk2xWJfxOviWCoHPifXWBcfFhrWflnvp9jTd2eujHkh/n4FDKGfh yll7/roYMhCPOss2ULqcSNhJ2PSGvi+1vOzAQEA+xdKUHqEdQ13egZ9gGoGj/hnLv4um nWpx/RKqFHKsCvIwBTq5cTRZxhoxgAo4rn1alnf1BKAOuiYmdhD6d7PAPCahmhn/yisz mnwAN//S8KUbMeMbouGrDJltVKNty8suxmSeRQoYbaMTrndUdgafOLaocHmnu23o7GcU upIpzNrUL6aNi/pVIBsATBRH8Vfrwp7uAGLGq+FxZ4Npub+CAkhpD2o+DU3gwfyn2xe8 FBZw== X-Gm-Message-State: AOJu0YzZrnWgQD6UnicGSUe8Ghc2dKYQ/+N4Di+T9pmcs+QZVGEjrzP8 7uGgWZpWx1B8Fr2gwNL4t5RNK76DdziMZSsnT8y8uo9noz7sJH2EdUnVMvn9IKgh+qw8gAA54Z2 H X-Google-Smtp-Source: AGHT+IHpJFz5Lq/IyHGyhh3KLglRPs4wpTYLyI/hFXwz1nYFKVayjRnLPqe9fJ4hul0efOkixz6q9A== X-Received: by 2002:a17:902:a98a:b0:1e3:de79:35d1 with SMTP id bh10-20020a170902a98a00b001e3de7935d1mr1685068plb.23.1712907239662; Fri, 12 Apr 2024 00:33:59 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 15/27] target/microblaze: Re-indent print_insn_microblaze Date: Fri, 12 Apr 2024 00:33:34 -0700 Message-Id: <20240412073346.458116-16-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::629; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x629.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: 1712907409071100004 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- disas/microblaze.c | 263 ++++++++++++++++++++++++--------------------- 1 file changed, 141 insertions(+), 122 deletions(-) diff --git a/disas/microblaze.c b/disas/microblaze.c index 3473c94164..c729c76585 100644 --- a/disas/microblaze.c +++ b/disas/microblaze.c @@ -787,134 +787,153 @@ static void print_immval_addr(struct disassemble_in= fo *info, bool immfound, } =20 int=20 -print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info) +print_insn_microblaze(bfd_vma memaddr, struct disassemble_info *info) { - fprintf_function fprintf_func =3D info->fprintf_func; - void * stream =3D info->stream; - unsigned long inst, prev_inst; - const struct op_code_struct *op, *pop; - int immval =3D 0; - bfd_boolean immfound =3D FALSE; - 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; + fprintf_function fprintf_func =3D info->fprintf_func; + void *stream =3D info->stream; + unsigned long inst, prev_inst; + const struct op_code_struct *op, *pop; + int immval =3D 0; + bool immfound =3D false; + 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; =20 - info->bytes_per_chunk =3D 4; + info->bytes_per_chunk =3D 4; =20 - inst =3D read_insn_microblaze (memaddr, info, &op); - if (inst =3D=3D 0) { - return -1; - } + inst =3D read_insn_microblaze (memaddr, info, &op); + if (inst =3D=3D 0) { + return -1; + } =20 - if (prev_insn_vma =3D=3D curr_insn_vma) { - if (memaddr-(info->bytes_per_chunk) =3D=3D prev_insn_addr) { - prev_inst =3D read_insn_microblaze (prev_insn_addr, info, &pop); - if (prev_inst =3D=3D 0) - return -1; - if (pop->instr =3D=3D imm) { - immval =3D (get_int_field_imm(prev_inst) << 16) & 0xffff0000; - immfound =3D TRUE; + if (prev_insn_vma =3D=3D curr_insn_vma) { + if (memaddr - info->bytes_per_chunk =3D=3D prev_insn_addr) { + prev_inst =3D read_insn_microblaze (prev_insn_addr, info, &pop= ); + if (prev_inst =3D=3D 0) + return -1; + if (pop->instr =3D=3D imm) { + immval =3D (get_int_field_imm(prev_inst) << 16) & 0xffff00= 00; + immfound =3D TRUE; + } + else { + immval =3D 0; + immfound =3D FALSE; + } + } } - else { - immval =3D 0; - immfound =3D FALSE; - } - } - } - /* make curr insn as prev insn */ - prev_insn_addr =3D memaddr; - prev_insn_vma =3D curr_insn_vma; + /* make curr insn as prev insn */ + prev_insn_addr =3D memaddr; + prev_insn_vma =3D curr_insn_vma; =20 - if (op->name =3D=3D 0) { - fprintf_func (stream, ".short 0x%04lx", inst); - } - else - { - fprintf_func (stream, "%s", op->name); + if (op->name =3D=3D 0) { + fprintf_func (stream, ".short 0x%04lx", inst); + return 4; + } + + fprintf_func (stream, "%s", op->name); =20 - switch (op->inst_type) - { - case INST_TYPE_RD_R1_R2: - fprintf_func(stream, "\t%s, %s, %s", get_field_rd(inst), get_field_r1= (inst), get_field_r2(inst)); - break; - case INST_TYPE_RD_R1_IMM: - fprintf_func(stream, "\t%s, %s, %s", get_field_rd(inst), get_field_r1(i= nst), get_field_imm(inst)); - if (get_int_field_r1(inst) =3D=3D 0) { - print_immval_addr(info, immfound, immval, inst, 0); - } - break; - case INST_TYPE_RD_R1_IMM5: - fprintf_func(stream, "\t%s, %s, %s", get_field_rd(inst), get_field_r1(i= nst), get_field_imm5(inst)); - break; - case INST_TYPE_RD_RFSL: - fprintf_func(stream, "\t%s, %s", get_field_rd(inst), get_field_rfsl(ins= t)); - break; - case INST_TYPE_R1_RFSL: - fprintf_func(stream, "\t%s, %s", get_field_r1(inst), get_field_rfsl(ins= t)); - break; - case INST_TYPE_RD_SPECIAL: - fprintf_func(stream, "\t%s, %s", get_field_rd(inst), get_field_special(= inst, op)); - break; - case INST_TYPE_SPECIAL_R1: - fprintf_func(stream, "\t%s, %s", get_field_special(inst, op), get_field= _r1(inst)); - break; - case INST_TYPE_RD_R1: - fprintf_func(stream, "\t%s, %s", get_field_rd(inst), get_field_r1(inst)= ); - break; - case INST_TYPE_R1_R2: - fprintf_func(stream, "\t%s, %s", get_field_r1(inst), get_field_r2(inst)= ); - break; - case INST_TYPE_R1_IMM: - fprintf_func(stream, "\t%s, %s", get_field_r1(inst), get_field_imm(inst= )); - /* The non-pc relative instructions are returns, which shouldn't=20 - have a label printed */ - if (op->inst_offset_type =3D=3D INST_PC_OFFSET) { - print_immval_addr(info, immfound, immval, inst, memaddr); - } - break; - case INST_TYPE_RD_IMM: - fprintf_func(stream, "\t%s, %s", get_field_rd(inst), get_field_imm(inst= )); - print_immval_addr(info, immfound, immval, inst, - op->inst_offset_type =3D=3D INST_PC_OFFSET - ? memaddr : 0); - break; - case INST_TYPE_IMM: - fprintf_func(stream, "\t%s", get_field_imm(inst)); - if (op->instr !=3D imm) { - print_immval_addr(info, immfound, immval, inst, - op->inst_offset_type =3D=3D INST_PC_OFFSET - ? memaddr : 0); - } - break; - case INST_TYPE_RD_R2: - fprintf_func(stream, "\t%s, %s", get_field_rd(inst), get_field_r2(inst)= ); - break; - case INST_TYPE_R2: - fprintf_func(stream, "\t%s", get_field_r2(inst)); - break; - case INST_TYPE_R1: - fprintf_func(stream, "\t%s", get_field_r1(inst)); - break; - case INST_TYPE_RD_R1_SPECIAL: - fprintf_func(stream, "\t%s, %s", get_field_rd(inst), get_field_r2(ins= t)); - break; - case INST_TYPE_RD_IMM15: - fprintf_func(stream, "\t%s, %s", get_field_rd(inst), get_field_imm15(= inst)); - break; - /* For tuqula instruction */ - case INST_TYPE_RD: - fprintf_func(stream, "\t%s", get_field_rd(inst)); - break; - case INST_TYPE_RFSL: - fprintf_func(stream, "\t%s", get_field_rfsl(inst)); - break; - default: - /* if the disassembler lags the instruction set */ - fprintf_func (stream, "\tundecoded operands, inst is 0x%04lx", inst); - break; - } + switch (op->inst_type) { + case INST_TYPE_RD_R1_R2: + fprintf_func(stream, "\t%s, %s, %s", + get_field_rd(inst), get_field_r1(inst), + get_field_r2(inst)); + break; + case INST_TYPE_RD_R1_IMM: + fprintf_func(stream, "\t%s, %s, %s", + get_field_rd(inst), get_field_r1(inst), + get_field_imm(inst)); + if (get_int_field_r1(inst) =3D=3D 0) { + print_immval_addr(info, immfound, immval, inst, 0); + } + break; + case INST_TYPE_RD_R1_IMM5: + fprintf_func(stream, "\t%s, %s, %s", + get_field_rd(inst), get_field_r1(inst), + get_field_imm5(inst)); + break; + case INST_TYPE_RD_RFSL: + fprintf_func(stream, "\t%s, %s", + get_field_rd(inst), get_field_rfsl(inst)); + break; + case INST_TYPE_R1_RFSL: + fprintf_func(stream, "\t%s, %s", + get_field_r1(inst), get_field_rfsl(inst)); + break; + case INST_TYPE_RD_SPECIAL: + fprintf_func(stream, "\t%s, %s", + get_field_rd(inst), get_field_special(inst, op)); + break; + case INST_TYPE_SPECIAL_R1: + fprintf_func(stream, "\t%s, %s", + get_field_special(inst, op), get_field_r1(inst)); + break; + case INST_TYPE_RD_R1: + fprintf_func(stream, "\t%s, %s", + get_field_rd(inst), get_field_r1(inst)); + break; + case INST_TYPE_R1_R2: + fprintf_func(stream, "\t%s, %s", + get_field_r1(inst), get_field_r2(inst)); + break; + case INST_TYPE_R1_IMM: + fprintf_func(stream, "\t%s, %s", + get_field_r1(inst), get_field_imm(inst)); + /* + * The non-pc relative instructions are returns, + * which shouldn't have a label printed. + */ + if (op->inst_offset_type =3D=3D INST_PC_OFFSET) { + print_immval_addr(info, immfound, immval, inst, memaddr); + } + break; + case INST_TYPE_RD_IMM: + fprintf_func(stream, "\t%s, %s", + get_field_rd(inst), get_field_imm(inst)); + print_immval_addr(info, immfound, immval, inst, + op->inst_offset_type =3D=3D INST_PC_OFFSET + ? memaddr : 0); + break; + case INST_TYPE_IMM: + fprintf_func(stream, "\t%s", get_field_imm(inst)); + if (op->instr !=3D imm) { + print_immval_addr(info, immfound, immval, inst, + op->inst_offset_type =3D=3D INST_PC_OFFSET + ? memaddr : 0); + } + break; + case INST_TYPE_RD_R2: + fprintf_func(stream, "\t%s, %s", + get_field_rd(inst), get_field_r2(inst)); + break; + case INST_TYPE_R2: + fprintf_func(stream, "\t%s", + get_field_r2(inst)); + break; + case INST_TYPE_R1: + fprintf_func(stream, "\t%s", + get_field_r1(inst)); + break; + case INST_TYPE_RD_R1_SPECIAL: + fprintf_func(stream, "\t%s, %s", + get_field_rd(inst), get_field_r2(inst)); + break; + case INST_TYPE_RD_IMM15: + fprintf_func(stream, "\t%s, %s", + get_field_rd(inst), get_field_imm15(inst)); + break; + /* For tuqula instruction */ + case INST_TYPE_RD: + fprintf_func(stream, "\t%s", + get_field_rd(inst)); + break; + case INST_TYPE_RFSL: + fprintf_func(stream, "\t%s", + get_field_rfsl(inst)); + break; + default: + /* if the disassembler lags the instruction set */ + fprintf_func(stream, "\tundecoded operands, inst is 0x%04lx", inst= ); + break; } - =20 - /* Say how many bytes we consumed? */ - return 4; + return 4; } --=20 2.34.1