From patchwork Tue Feb 21 22:52:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 655393 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp371408wrb; Tue, 21 Feb 2023 14:57:09 -0800 (PST) X-Google-Smtp-Source: AK7set/lK1MGzmkPSEbbjZlREPgfZZouoS5SkJoHTXIeAS1KXxYMFo7Tk+LKshsnKXB8pCJBBteu X-Received: by 2002:a05:6214:29c6:b0:56e:aeaa:95b2 with SMTP id gh6-20020a05621429c600b0056eaeaa95b2mr10162035qvb.9.1677020228814; Tue, 21 Feb 2023 14:57:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677020228; cv=none; d=google.com; s=arc-20160816; b=qKtLjlVPw8ik8kN6we84aZr1PRbf+f5Oq6E8dp0taJuYCFqFWV7TWqiny5Yi3Y65nL KvXNpmOXMFpYGt0N2zYgYtuILgKHbF+uZUhSjoPYIPa9iANQJLFyYWZY35aDDWrJ5utd xQ/5yxVC/fSMPvrFSyrf1udBgVNs8pm8V9qScls4LHmBJg0ftA9PudfPqqshTZrMXn+8 iswGDUNKIqpkUQZS4egcVTtH59sUWJ6BM1dWlliF4zn49gIYAIWiIEy6Pi3INAwVPpG1 cejAnqHZ+3M9ldBsmq/kHAi1jnrvOCsfTl4wv6dRCDL2+Jm3lcsjM4Lh3aZesDPfvVt6 5X6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=9mUY4+g/opijKwSa+F/l4rWh/3cE9JUQ/z+LHjWXlOU=; b=klib9WAg47sxWpqJAVBG75c8r0BTwvYz0I6i0Rc6ypMAxT9dFz8x8mNyLxvwdZ2k9K lHFqdsHRbkXb+Ma9bP89RXZrOqBAvAfDApZb7e3QNwEUQUgZ6EpFk3vqHZNqv24pNXRS LqEk7HsNsh+iH4YQc1Gr8eEnyzZHrPrAYvRID+RLIdBec4MNps6bUM3sD39vs7hmkvrY 51EH6UPeJPHq2HBXFjM2uSL/lhMEU0A0pc8xvmagvLtpexGkll8nrkYXJ6rfcYC/VVVV tCVklItbmxTLnhTuqhMc/5pctVkgAMRy5JJKCdf0SYA1DGKY3huz32MVGNhFfx1nHmqw qTIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=j93AlVyn; 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 z20-20020a0cf254000000b005377156456esi12902720qvl.329.2023.02.21.14.57.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Feb 2023 14:57:08 -0800 (PST) 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=j93AlVyn; 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 1pUbVH-0007YG-8B; Tue, 21 Feb 2023 17:52:55 -0500 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 1pUbV6-0007OQ-GD for qemu-devel@nongnu.org; Tue, 21 Feb 2023 17:52:45 -0500 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 1pUbUw-00046D-2b for qemu-devel@nongnu.org; Tue, 21 Feb 2023 17:52:44 -0500 Received: by mail-wr1-x429.google.com with SMTP id 6so5622858wrb.11 for ; Tue, 21 Feb 2023 14:52:33 -0800 (PST) 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=9mUY4+g/opijKwSa+F/l4rWh/3cE9JUQ/z+LHjWXlOU=; b=j93AlVynkig88vm6c4n5Jmn15lyRfnIsr3Wx3S/YdEq4YBon8O97toruA2X3zN+H15 Ber/+RUafLGZXD1TsLYB6Cm8thNClKO86LwIenPSsKAf/t0YA7RFr/L2PayzM7Z26Nmu mPEoLP84Huum+JZZ0sgv1r401WVBxVHoFS69/uh31Ety6x/v381wCgkcfhWfWZ4CmUZY qzqOCjrqxamQy+hV3s2P7vXu9GUzt5MN00nk+XrZYbZCSxH+KJsH4WLOjSkqx/fUgoGu Ez7jZcdWKneNcLpjkISYSgwlL6NUUEXQYC6IU0UGVlzpdotiKAQoyOR3frCEHh4E3nep RPDA== 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=9mUY4+g/opijKwSa+F/l4rWh/3cE9JUQ/z+LHjWXlOU=; b=w92yPjHO50f4SrTvHMemHuo2vwUABXNusO2PKm209pfkKzx5D5ML7JOfacynLwYUTl zAJ0bV0AiUu5innR8+8UpUOPt5DfoPEeSxfuplaCEjkLnK+IQ0Y+LvZ2mD4MIKqnI1q4 F6mlnukyKexLFBTJ61QSNDJNgDSd3xObA/qoAHaXyXZfamRaKl9WAT0TJsntF9Q+/+fm ymxverOuOBr32HZnwJZvPe5ewDe/CUGiUSZINpWyyAOQg1r8IIk9Rdj+7v+7/+YI2v84 4Ann07tWwy9JF6nz1lIikCwsngEGKdj7cVOiLhc0XANnooDvNxZ9c2zl4YGfqKAUK0cp /LYw== X-Gm-Message-State: AO0yUKVpaX4FkFIKzTYbvgyDE2HoZiiQmvvRnQdoid+NghAoBjHawQ1x Wbdk0GXG4i3xemvrshm9KY3PIw== X-Received: by 2002:adf:e584:0:b0:2c7:4ec:8d79 with SMTP id l4-20020adfe584000000b002c704ec8d79mr3078591wrm.21.1677019952541; Tue, 21 Feb 2023 14:52:32 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id s14-20020a5d510e000000b002c569acab1esm5965998wrt.73.2023.02.21.14.52.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 14:52:31 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D3A1F1FFC1; Tue, 21 Feb 2023 22:52:28 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-arm@nongnu.org, qemu-riscv@nongnu.org, qemu-s390x@nongnu.org, Yoshinori Sato , nicolas.eder@lauterbach.com, Stafford Horne , Daniel Henrique Barboza , Mahmoud Mandour , Taylor Simpson , mads@ynddal.dk, Marek Vasut , Artyom Tarasenko , Alistair Francis , qemu-ppc@nongnu.org, Yanan Wang , Sunil Muthuswamy , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Eduardo Habkost , Bin Meng , Bastian Koppelmann , Palmer Dabbelt , Marcel Apfelbaum , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Rolnik , Aleksandar Rikalo , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Aurelien Jarno , Xiaojuan Yang , Richard Henderson , Peter Maydell , Alexandre Iooss , Chris Wulff , Jiaxun Yang , David Gibson , "Edgar E. Iglesias" , Greg Kurz , David Hildenbrand , Song Gao , Ilya Leoshkevich , Max Filippov , Mark Cave-Ayland Subject: [PATCH v3 11/24] gdbstub: rationalise signal mapping in softmmu Date: Tue, 21 Feb 2023 22:52:14 +0000 Message-Id: <20230221225227.3735319-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221225227.3735319-1-alex.bennee@linaro.org> References: <20230221225227.3735319-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We don't really need a table for mapping two symbols. Signed-off-by: Alex Bennée Suggested-by: Richard Henderson Reviewed-by: Richard Henderson --- gdbstub/softmmu.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/gdbstub/softmmu.c b/gdbstub/softmmu.c index 864ecee38f..79674b8bea 100644 --- a/gdbstub/softmmu.c +++ b/gdbstub/softmmu.c @@ -499,21 +499,16 @@ enum { TARGET_SIGTRAP = 5 }; -static int gdb_signal_table[] = { - -1, - -1, - TARGET_SIGINT, - -1, - -1, - TARGET_SIGTRAP -}; - int gdb_signal_to_target (int sig) { - if (sig < ARRAY_SIZE (gdb_signal_table)) - return gdb_signal_table[sig]; - else + switch (sig) { + case 2: + return TARGET_SIGINT; + case 5: + return TARGET_SIGTRAP; + default: return -1; + } } /*