From patchwork Sun Oct 30 22:28:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 620020 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2451078pvb; Sun, 30 Oct 2022 15:33:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7FO3WvyzmlQbF2aKhC9kMwLmHmE85h1nrg7m8g6Kkw09AHDJ7tw5zOtlVQAR1F+17/t5nP X-Received: by 2002:ad4:5dc6:0:b0:4bb:798f:5272 with SMTP id m6-20020ad45dc6000000b004bb798f5272mr8414717qvh.131.1667169207938; Sun, 30 Oct 2022 15:33:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667169207; cv=none; d=google.com; s=arc-20160816; b=d7/glcEf/F+0ckJ0HzsbyGn1G18j0rq0OfkG1TW7j3aCUiv/OkkESLKNaUDuJ78aNG 8PBwcGZZLDa/X1yVr6qeo6nIUnsqawoamNrcB1f9GsWq5ulCCS6ewfI+CBdCDY53NHVl Pu4Lo+zovF60wnZgrYllrWL4ZvNgmXChzufKUl3CwBtL2d3IihDa1gayqwLNWvzxmSNC +kkPZcR5REgLITGbv8dQ7TFHY0Bu3IEqt5FElHSjsF5sNamKPyRWV6ZUfSBXWPxVQdic mBKWqonGE5mdiPR2cuLjtDgFkAdztrLKRY9ImJ2LjsuDJPgswut8H4pc4Ga59sprMZYr 0OlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=XG3sgTPrYyBX5qscbuiJzqy4z78ePhiDy+Vo34aVSx0=; b=ENXnVuSfCuDqBjc3lOVAA5MEfpZ++TFvpJP8wWZ+0Fk1v5XRUtpyN8acbVbWrgdenF SYZ8Oa+qDDMdb+cvqyHq0L/OklXm5nHRSQ9cQyXoc7o7Ve4q1phKFXk/Zqs1MFtmoLyK 6MVqqOrxZptEawnCZ8dWGt/YSFjLHzV6O2j4HQqJAJ8vTUDdNxchAYX+g+sUjV3nHwPt IWUJGi6iets6G/pJ1N7ssf0+o5J4BHi0X+14tODjoktHkR35pNzdO20EfoAqkceU9p/6 zkjlbZRU3ECRhzTNM6e2x5NklzohZ0kzWdAL3xPyGqA75GzzEyP6gci7RUie8N/x0dCB lEkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="RjQG5K/t"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u8-20020a0562141c0800b004b19e0703b3si3166647qvc.368.2022.10.30.15.33.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 30 Oct 2022 15:33:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="RjQG5K/t"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opGrJ-00022U-7S; Sun, 30 Oct 2022 18:32:49 -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 1opGqt-00008R-VH for qemu-devel@nongnu.org; Sun, 30 Oct 2022 18:32:24 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opGqs-0008Of-4s for qemu-devel@nongnu.org; Sun, 30 Oct 2022 18:32:23 -0400 Received: by mail-wr1-x429.google.com with SMTP id h9so13721867wrt.0 for ; Sun, 30 Oct 2022 15:32:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XG3sgTPrYyBX5qscbuiJzqy4z78ePhiDy+Vo34aVSx0=; b=RjQG5K/thBtl2J2wrWHPSYQZfER0gIFxaFUEkSKduvW3YERp2rIPBz+aFI9D1oQKle 8IFHtG1bmGJi06po8YOD4m5nOYlpCDwGrcEprv1YCogigMOPtcsJH4L4oi2vdBzlZy7q HQRf/of5rYHcJQO69q276Dt2AXWuCOQnBl+ZHYqODpjGRq/4PWhNDpIktARJDntuxSF/ eVphyTrYQ3UiOfNGRmIaFDejrVf96pHDMaci0oVbefj1zfh3ZVf4AACV4CXAi9PAz4oP MdyRFC2LacIbHrod6XsZdIEGQj6DZY4yuJrUvrUtAIdsmBjVm+Blcf8NUOcFTAX9TuFf Knlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XG3sgTPrYyBX5qscbuiJzqy4z78ePhiDy+Vo34aVSx0=; b=FaK2ZqbpLn5t0pGIsVRxfQMIbSrF2lhoFPp/v9avW4ZuylmqiYgx+JnpJwglWOPDpw gQ8iU3Z+Z5dlMZD9fbT3tkzcK7sw1lpKk7IzH+4UT2o9M61ZXM7EKD2V/1iJ6kJW9AwJ VxxBVzgJKR3W4IgeEiwHnSXtlylvKsSEHLE5f+gCKl4Jk2WkkUMRQzrgMZEYmwfUtCNO hKSxQqQGPx1Lg7F4YHz3J/ozvUzU7rhThtZO8XXsVov3112Qb8GWjknmYvwi9FeO7JBY TqSq98molEHZmW0byw8RShwFw1OGdej+9hs/ikTPuah+JMzU9LKXHR9EnTg3O+Jj4Y9L +wsw== X-Gm-Message-State: ACrzQf1UAnXS9/R2jjtJzbga5Ldge3r2xzrqpCxruzyp53GcFPhu1E2H 9dh6CCIAHXOkQb91pfVr8YY6zN4CsBfFZQ== X-Received: by 2002:a5d:4804:0:b0:236:94d4:5472 with SMTP id l4-20020a5d4804000000b0023694d45472mr6095829wrq.286.1667169139252; Sun, 30 Oct 2022 15:32:19 -0700 (PDT) Received: from localhost.localdomain ([185.126.107.38]) by smtp.gmail.com with ESMTPSA id k25-20020a7bc419000000b003cf4eac8e80sm5874622wmi.23.2022.10.30.15.32.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 30 Oct 2022 15:32:18 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Huacai Chen , Stefan Pejic , Jiaxun Yang , Aurelien Jarno , Paul Burton , Milica Lazarevic , Richard Henderson Subject: [PULL 33/55] disas/nanomips: Remove function overloading Date: Sun, 30 Oct 2022 23:28:19 +0100 Message-Id: <20221030222841.42377-34-philmd@linaro.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221030222841.42377-1-philmd@linaro.org> References: <20221030222841.42377-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Milica Lazarevic Disassemble function that calls the other variant of it is deleted. Where it is called, now we're directly calling the other implementation. Signed-off-by: Milica Lazarevic Reviewed-by: Richard Henderson Message-Id: <20220912122635.74032-20-milica.lazarevic@syrmia.com> Signed-off-by: Philippe Mathieu-Daudé --- disas/nanomips.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp index ce93fdad62..85f5784770 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -21917,12 +21917,6 @@ static const Pool MAJOR[2] = { 0x0 }, /* P16 */ }; -static int Disassemble(const uint16 *data, char **dis, - TABLE_ENTRY_TYPE & type, Dis_info *info) -{ - return Disassemble(data, dis, type, MAJOR, 2, info); -} - static int nanomips_dis(char **buf, Dis_info *info, unsigned short one, @@ -21932,7 +21926,7 @@ static int nanomips_dis(char **buf, uint16 bits[3] = {one, two, three}; TABLE_ENTRY_TYPE type; - int size = Disassemble(bits, buf, type, info); + int size = Disassemble(bits, buf, type, MAJOR, 2, info); return size; }