From patchwork Fri Aug 18 10:34:22 2023 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: 714631 Delivered-To: patch@linaro.org Received: by 2002:a5d:484e:0:b0:317:ecd7:513f with SMTP id n14csp523364wrs; Fri, 18 Aug 2023 07:12:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHTMdNpn/sCi9lWLd6swTrC0R7QydzPHfk0Oebnz+hH+t6S1edvIH7ysaCudQXi5ahxz25C X-Received: by 2002:a1f:df42:0:b0:47e:8a9:478c with SMTP id w63-20020a1fdf42000000b0047e08a9478cmr3004019vkg.16.1692367948139; Fri, 18 Aug 2023 07:12:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692367948; cv=none; d=google.com; s=arc-20160816; b=ys+O6kjC9aGX1Aik9DVvnluMmHPhtfTEV7K4LdyFZUGFOYJCsOgBX5nNUuye3gHYPW Bm0vxKyHx4/sGk0IZrKzCaY5+eRNRSRPl/H3jOhFeXg5Nir2MtfK52AKOUsDJEj1OKMa p3AZ2BLYU9Jm/GifbqQW3OqslNHt58LurT2k3+BgBlgeeN25qDzzeX4dhu/RrjNeNf66 l7Ze/KrEUvTbLIFKSaOfYymMt51TTgwxoHy9kn72MJidblnuFch0m2JD+S+gsNa1VwVE 3olpYLMY1i6j0LeT39xqEEI9q73x3kyhcUpY9X7YZUf8Yx9SK63feF46tYaA9d91kVsn ugDA== 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=tvng4YPVMkWkkh2eZJ6qlqU3fIhQVOx369AKXLs8f1o=; fh=BVT+wNaEQ6DYU2fJ+3RLrSAfhPFgaPFe1wC3+pPOUB8=; b=foySyvi7eodcz7bmJ6VWtLkEq7/f1YibrW6QzaIoBe1sXk3mBdOhevB012LN5PSNJa 6C/BMU+sIyOWD4tlYZHERCfmK8RfWMcDQn3Kw+kN6LvHdI/lvgyfrq1H5SOiu9/HHh+i woOqQLEEkzfVdxjvOY85ao0wSFBb7iuK8W3MprAIcQunSZIXGkyB/dPw/B1ywAUjoqtQ cKYKaoN9RrTuyupIJn0DvId5f9U5YXK6qlG4gwf5erZak6UBpcq88UUhsIStLn+cDGcR LrrzTrXUCSpOfCZBDO01YvqbO5VHnrl/Snww27BW37htfh4Bvxf1N/HFybuhTVeflmh0 feFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qiyJDYcF; 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 b192-20020a1f1bc9000000b0048af91c36e6si179575vkb.176.2023.08.18.07.12.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 Aug 2023 07:12: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=qiyJDYcF; 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 1qX05m-0004xb-P0; Fri, 18 Aug 2023 10:04:46 -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 1qWwoT-0006Lm-DF for qemu-devel@nongnu.org; Fri, 18 Aug 2023 06:34:41 -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 1qWwoQ-0002wl-N9 for qemu-devel@nongnu.org; Fri, 18 Aug 2023 06:34:40 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-31757edd9edso655054f8f.2 for ; Fri, 18 Aug 2023 03:34:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692354876; x=1692959676; 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=tvng4YPVMkWkkh2eZJ6qlqU3fIhQVOx369AKXLs8f1o=; b=qiyJDYcFDlEr6qQeCyCJJkeBmKLn8Ygl0Q+qA3Yi1B4L5Y5ERdxx3njPKTo5veWzBF cXIKB7uvST+n9WGH9NLvQjfwTbzflyAE4frULIHH6BTYkQQW+ClaWSaYfrBmkjTsZAPF SjV61yXSBz3xUAzKzRm1o7OqiLlQuh35ONNqCba64WyqS75LyTNMB1M8iPEMBNbNjkWU OuQx3mzg4dZ5J5CjH7Haj/uKKrXcj1G13DiaK9PkvC43+xqwZg3NHJH1RjErEaJw2XI/ y+dHH5/3xwWdaf9+p6nsF2oAbs33qYSzVqfQGuBSbr9+Ddgxl3YEXD1qgZ2HpDRADZWI /1Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692354876; x=1692959676; 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=tvng4YPVMkWkkh2eZJ6qlqU3fIhQVOx369AKXLs8f1o=; b=kja4Sfle9G/FmPqfQCqEJcWtHA/OeFt3qH/c/cknacRxUeVAo3gxFhEu0+bWRU/AjD Jfo+hqt4BTzn3b9hNl0HROiPl/9Ol79uzafsbARSl+xGUmTI00uEKeU99DwgmkqMxSST RpUkJ9cDpwsRL7NStWVcG2UNdXhl8u8coRR5Ufcxgfy3ewW1x9mcqJUvcOuyco1cHV76 HeP2FdP5iR1zft/vuJ+Nc9XmFYScX5adbab7qjf7jwdAkcskPnEp6uU4y3thZT0+wW5s bJ1nN47mbVlmgqw4787fT11OOtwbpGZzL3Ay6Bw3OaeA4V1ibB1vWAtL7YGqPPCWCnOM AWcQ== X-Gm-Message-State: AOJu0Yz2dByboWyGBsIML2Ucxk3jtCQy57XCOmQe3ZGVU0V1I+65Ginc dmdGAEH39b3GM/bq+oVZ3oeYml8ceXUQsY+tZ7M= X-Received: by 2002:a5d:50d0:0:b0:317:6965:ef4d with SMTP id f16-20020a5d50d0000000b003176965ef4dmr1520039wrt.56.1692354876651; Fri, 18 Aug 2023 03:34:36 -0700 (PDT) Received: from localhost.localdomain ([92.88.170.41]) by smtp.gmail.com with ESMTPSA id r11-20020a5d4e4b000000b00317b063590fsm2330351wrt.55.2023.08.18.03.34.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 18 Aug 2023 03:34:36 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Huacai Chen , Song Gao , Xiaojuan Yang , Jiajie Chen , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 1/4] target/loongarch: Log I/O write accesses to CSR registers Date: Fri, 18 Aug 2023 12:34:22 +0200 Message-ID: <20230818103425.16271-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230818103425.16271-1-philmd@linaro.org> References: <20230818103425.16271-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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Various CSR registers have Read/Write fields. We might want to see guest trying to change such registers. Signed-off-by: Philippe Mathieu-Daudé --- target/loongarch/cpu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c index ad93ecac92..7107968699 100644 --- a/target/loongarch/cpu.c +++ b/target/loongarch/cpu.c @@ -544,6 +544,8 @@ static void loongarch_cpu_realizefn(DeviceState *dev, Error **errp) static void loongarch_qemu_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { + qemu_log_mask(LOG_UNIMP, "[%s]: Unimplemented reg 0x%" HWADDR_PRIx "\n", + __func__, addr); } static uint64_t loongarch_qemu_read(void *opaque, hwaddr addr, unsigned size) From patchwork Fri Aug 18 10:34:23 2023 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: 714633 Delivered-To: patch@linaro.org Received: by 2002:a5d:484e:0:b0:317:ecd7:513f with SMTP id n14csp523789wrs; Fri, 18 Aug 2023 07:13:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHGqzv3aL9rJyxZAsq6ptdC8Kq2W+Y1C7PDT9YQ895TkXY0Id09uhPt9MfH8dmF2BhSIAJZ X-Received: by 2002:a05:6808:4e:b0:3a7:4c81:875d with SMTP id v14-20020a056808004e00b003a74c81875dmr2927652oic.25.1692367986472; Fri, 18 Aug 2023 07:13:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692367986; cv=none; d=google.com; s=arc-20160816; b=JnvM1hS2Pr0yd6XAltW1l6rjoJitQoKeDuZl/8pBcSFPJYLgqGgbB1bBZscb+mq0RU wyCkRJFVA3aHNexV54w7TGSQ7XA+BsgjfxrDvIcgbiQ780dMCbaB6Kuh2aVV1cNvEPBW XjF6P9UaFj2ihTyjS+zvzD5fDMToUfQOiksV2awo6p5KivQYRxff4VaWxiTnUqruZhhu RB8SmrA8TIXvsPPKLX5lY0pjdTD6/FLfhexbSvvkp+UrMTGpSRscol2fjkJyV19hBt1u csPpaaGkhlOehGcwCq8Lz1oHBtFWCRMyu4pHVgfKMDY1Nzee2ysU1lXxy+3EURU/ZKLI t06Q== 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=ymM53Ev0232IoCe+uLOGROzpIIU7OjxGy8keEyXRRBo=; fh=BVT+wNaEQ6DYU2fJ+3RLrSAfhPFgaPFe1wC3+pPOUB8=; b=nW05u7Ix/I+WhmH63uiHucbZIIcfG0hQIsWI7YPczwzT70CsfX2pIYfgQe1gtoOS6T KmVgBvXshxLTf0lbYwxaASoxNzd1o+ISgXy7k5TWQ5HejjIod8g7E3vQ7usRugqpZDAG 0Ja5HOGEAKwCKW8YFwuVmpSV2f8luZ7wf6IrvhKNSnpC6ZHyP/tZNPuBrwq70Lmf02po 8iNJQaSzQN9kOt66dE6BquZDVgPLZ/RzkD9ok0upnm0aaHoqFDGZZdmEw5IVG21hboIo DpLJiK/EqnjnBMb2z0VzSZW8tOVLFcvqUhbdT/TA+rtg0AhF9cy6S7iFnBQYG7uLXTqt ljpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xLu7PcdH; 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 p6-20020a0ccb86000000b0064730f53eeesi1285152qvk.21.2023.08.18.07.13.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 Aug 2023 07:13:06 -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=xLu7PcdH; 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 1qX05u-000528-5w; Fri, 18 Aug 2023 10:04:54 -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 1qWwoY-0006Mi-Vo for qemu-devel@nongnu.org; Fri, 18 Aug 2023 06:34:48 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qWwoV-0002xA-Q2 for qemu-devel@nongnu.org; Fri, 18 Aug 2023 06:34:46 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-3fe24dd8898so7235045e9.2 for ; Fri, 18 Aug 2023 03:34:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692354882; x=1692959682; 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=ymM53Ev0232IoCe+uLOGROzpIIU7OjxGy8keEyXRRBo=; b=xLu7PcdHMfuNwzZ0Mzv4tNdHLkrl5YILGI4QzYlzjaEJL8Tfgiu8wtGI51WoFQF0eW 35/8Gyag7jrFo8ArapSj7PrZCiTcxcqrSAnNI0bdPzn9J4RoizUO7l1ZiF63WKw4yOr4 c7YblFlFyr1RPNxgIsrNUZ1/3cYuKEnu58DpJXJg/x7dKapPgnVdQGSYt8eibgR5WM2r W2ROSmWozRZyuDu1swDDdE4v6w/eTTOlU8kkeq7egcZhDdx+8O70y6fPjPmtP5D+zeur ceAH8UsCS+ySDa8K9T7yo+1zUmS+K+f70jd6R22zxIZxoGolWXg2dfpM7xgaldaEkJ0Q +36w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692354882; x=1692959682; 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=ymM53Ev0232IoCe+uLOGROzpIIU7OjxGy8keEyXRRBo=; b=cuIxGkPjTfnR0D2PWx5IiL1gbruFgM6DQBJC5FabLJsrOFwAwTre5Y6VWUgksx3KCd FQ616Lh1bxR+MzWAqmdjuBQB+GDFuwZrr9U9CCQIgvx5q9TDe8HUKVkwpQ0xGstIL22o Ulbk0uYQFYxIhWazruY5kOdzYVjpTzoK4xtD9rmqHnRVCQ2MBH9mKgb5j8oGHJMLp0Al RqFVW2+Uh3l5LtbNEUWgyieZiKCfFNvaKvokyjGQilH9BOBqYe3aDKw4il6w5lXU+uBM rQ7Igp3/8hirWakD+q+NjIzUcHc/0m6IReJ+XNMV4ZX3tg9dmc9zgu37gv6w2TkCPYbv LL9A== X-Gm-Message-State: AOJu0YzlNztxKhhksU3Bj/G8tsQdH9dcSXAF5ay8EJTfCtgfZa9FLrez K8YIdjVk6RheOgMz+NFIeqw+T1U1NK7HT+xijDs= X-Received: by 2002:a05:600c:28f:b0:3fe:26bf:6605 with SMTP id 15-20020a05600c028f00b003fe26bf6605mr1700877wmk.26.1692354882279; Fri, 18 Aug 2023 03:34:42 -0700 (PDT) Received: from localhost.localdomain ([92.88.170.41]) by smtp.gmail.com with ESMTPSA id l11-20020a1c790b000000b003fbca942499sm5762728wme.14.2023.08.18.03.34.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 18 Aug 2023 03:34:41 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Huacai Chen , Song Gao , Xiaojuan Yang , Jiajie Chen , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 2/4] target/loongarch: Remove duplicated disas_set_info assignment Date: Fri, 18 Aug 2023 12:34:23 +0200 Message-ID: <20230818103425.16271-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230818103425.16271-1-philmd@linaro.org> References: <20230818103425.16271-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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 Commit 228021f05e ("target/loongarch: Add core definition") sets disas_set_info to loongarch_cpu_disas_set_info. Probably due to a failed git-rebase, commit ca61e75071 ("target/loongarch: Add gdb support") also sets it to the same value. Remove the duplication. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/loongarch/cpu.c | 1 - 1 file changed, 1 deletion(-) diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c index 7107968699..dc617be36f 100644 --- a/target/loongarch/cpu.c +++ b/target/loongarch/cpu.c @@ -723,7 +723,6 @@ static void loongarch_cpu_class_init(ObjectClass *c, void *data) cc->disas_set_info = loongarch_cpu_disas_set_info; cc->gdb_read_register = loongarch_cpu_gdb_read_register; cc->gdb_write_register = loongarch_cpu_gdb_write_register; - cc->disas_set_info = loongarch_cpu_disas_set_info; cc->gdb_num_core_regs = 35; cc->gdb_core_xml_file = "loongarch-base64.xml"; cc->gdb_stop_before_watchpoint = true; From patchwork Fri Aug 18 10:34:24 2023 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: 714629 Delivered-To: patch@linaro.org Received: by 2002:a5d:484e:0:b0:317:ecd7:513f with SMTP id n14csp522599wrs; Fri, 18 Aug 2023 07:11:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGPtR8I6/ger/+fibROfYXJfizSgw5aV6a/I+FFsUG4Em3T3tGyFJZksfUxZytDVkCv3hxN X-Received: by 2002:a67:fb4f:0:b0:44a:ce05:a283 with SMTP id e15-20020a67fb4f000000b0044ace05a283mr2887384vsr.16.1692367881313; Fri, 18 Aug 2023 07:11:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692367881; cv=none; d=google.com; s=arc-20160816; b=FQO5jKgJzkpNhcdnRLxG2/daa/yVs5gJsNesvnT3fS3FxQH6JM7098VhlEvhGqVCtZ x0gzZH0ZtuKB6y+FyHIaIUXssz7xZhD7scZ+MkU497+bArjpNJEVJi0pBac+p6bC7S/Q CErfNJpqIvdord0yXyBV66Ap+kVvOZ9o6GVCGWXYkePNn+taVwkKrDBGC4SLw0lRPIl/ llsMTALDqoJi2sAfo1OYVrEwmGkj2nEkSE5LjCDzOFEC42pr8DEFTAol+OMy31rVb7vk G5e/i/1DO+eekmSeaVbt6boyEsFyS4Ui32XIa9vWDZ06xmqokSzitEmeWNMvqgd/WnK4 0o/A== 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=IkmPByYqMTHfKD7x50TDBOyupt/4VUOGL0uYh2iijAE=; fh=BVT+wNaEQ6DYU2fJ+3RLrSAfhPFgaPFe1wC3+pPOUB8=; b=ehpUsgwLnyiHJ/5uvDbf+ZxAsszjGlAu/6x0X7LdI9x3CRnN/9viLMa+IoaCmQsvzK DfZ0QNSMMzdXIqBtg8q4nfx/oFF8fKuxNT+TIHT0QNeEa21+i1h0pQtqY5L7PpZ7aw7H 7/l2uqrRw+47LGvYgfpCTOoiGWimANM7DUmjVOn7v8xS2h7JuTCm53r/pKjm0E74vS2X J4WiQQep/s9KfcbCHC3DIUlwPrPd7Ws6d8ZzUjC2QkEhS1g/QWV14eSC+haJxM+ZfPXg XGKhO6sEqVrVIttPuTYdyeUbYV6OTseTcvhZVCBOOCfnc9nJMQDqIcU5ZvRcnj9qIsvA 97gQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LW5Y12yE; 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 z16-20020a67ca10000000b0044c034c3049si176841vsk.391.2023.08.18.07.11.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 Aug 2023 07:11:21 -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=LW5Y12yE; 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 1qX05v-00053O-Jd; Fri, 18 Aug 2023 10:04:55 -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 1qWwog-0006ND-BN for qemu-devel@nongnu.org; Fri, 18 Aug 2023 06:34:55 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qWwoc-0002xy-2Z for qemu-devel@nongnu.org; Fri, 18 Aug 2023 06:34:53 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3fe32016bc8so6954515e9.1 for ; Fri, 18 Aug 2023 03:34:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692354888; x=1692959688; 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=IkmPByYqMTHfKD7x50TDBOyupt/4VUOGL0uYh2iijAE=; b=LW5Y12yEweki3nDnVUDoWQRPsG+CsPWs+xaaWO5H3gqcSQFHeLdpdkmYOkt1FUenLi 1uf+F3B5v97uDtjcztl8GhFeegQJwOiZ+Jy4d+eNPaXtpL8Zip5Xsi/bgp+2yABAMhvB zi7lnZkYOvJbartRiMcY9FKe65NKn0apmAzCB/3sTx7qIk+20+WjWpBmks2GSytD/bDk 40baAGgbb6HxVEwqlsc2399Q5xKEnxqELopFuN05mAb0GWknneDg0SETyI9no5QkQZyg xTQvUgCbbokGwLkPTddW9R3fZaxTivkACjYqxQvSaCh/w8LyRY6kSiqe8At4OQNpuzka i7qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692354888; x=1692959688; 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=IkmPByYqMTHfKD7x50TDBOyupt/4VUOGL0uYh2iijAE=; b=QwWKV/EOf0kyInryiMooIpGnuPLS1sdgwMLupiVnj8s3kXT5/SxhWp+DWE1qXLwnHl EYux6AdPdjzhRRncHwXCVkp77k40QcyEgAVKzaM/HDDS231nCLll3Tdte9Dtl+Xi+KRn dcvBYwj6JovAmZ8iBRMO/UWMxr0Dg6DkdRqoU7diue1fDAy4Uk0EhrspKLM9JZe6FNdj XfzCpyL8xUuc54Q87ZjGC5toI5q8+5gXJinO8fDckcCeuoJZyVP7mdnXIvKEj63QFHu4 01C76AIUbvBNb31OOn5Ix2IW3Lkxlfy9y6ML/4sf7zsKH1Z62xgYTcxxgkOEd/z7GPxs hA7w== X-Gm-Message-State: AOJu0YwxHyW41cR8rOS9WyyDw135PUYvi39j6WvoamyvO+FueRGiekBH uwYGFdJsihakDgTtZSP3p+m/d8RyLlRJcH8USsc= X-Received: by 2002:a05:600c:212:b0:3fe:212c:f790 with SMTP id 18-20020a05600c021200b003fe212cf790mr1803146wmi.36.1692354888165; Fri, 18 Aug 2023 03:34:48 -0700 (PDT) Received: from localhost.localdomain ([92.88.170.41]) by smtp.gmail.com with ESMTPSA id l3-20020a1ced03000000b003fe1a96845bsm5816099wmh.2.2023.08.18.03.34.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 18 Aug 2023 03:34:47 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Huacai Chen , Song Gao , Xiaojuan Yang , Jiajie Chen , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 3/4] target/loongarch: Rename 64-bit specific functions Date: Fri, 18 Aug 2023 12:34:24 +0200 Message-ID: <20230818103425.16271-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230818103425.16271-1-philmd@linaro.org> References: <20230818103425.16271-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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 These functions are specific to loongarch64 cores. Rename including the '64' suffix in preparation of supporting loongarch32 cores. Signed-off-by: Philippe Mathieu-Daudé --- target/loongarch/cpu.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c index dc617be36f..19572e37ad 100644 --- a/target/loongarch/cpu.c +++ b/target/loongarch/cpu.c @@ -76,7 +76,7 @@ void G_NORETURN do_raise_exception(CPULoongArchState *env, cpu_loop_exit_restore(cs, pc); } -static void loongarch_cpu_set_pc(CPUState *cs, vaddr value) +static void loongarch64_cpu_set_pc(CPUState *cs, vaddr value) { LoongArchCPU *cpu = LOONGARCH_CPU(cs); CPULoongArchState *env = &cpu->env; @@ -84,7 +84,7 @@ static void loongarch_cpu_set_pc(CPUState *cs, vaddr value) env->pc = value; } -static vaddr loongarch_cpu_get_pc(CPUState *cs) +static vaddr loongarch64_cpu_get_pc(CPUState *cs) { LoongArchCPU *cpu = LOONGARCH_CPU(cs); CPULoongArchState *env = &cpu->env; @@ -356,7 +356,7 @@ static bool loongarch_cpu_has_work(CPUState *cs) #endif } -static void loongarch_la464_initfn(Object *obj) +static void loongarch64_la464_initfn(Object *obj) { LoongArchCPU *cpu = LOONGARCH_CPU(obj); CPULoongArchState *env = &cpu->env; @@ -694,7 +694,7 @@ static const struct SysemuCPUOps loongarch_sysemu_ops = { }; #endif -static gchar *loongarch_gdb_arch_name(CPUState *cs) +static gchar *loongarch64_gdb_arch_name(CPUState *cs) { return g_strdup("loongarch64"); } @@ -714,8 +714,8 @@ static void loongarch_cpu_class_init(ObjectClass *c, void *data) cc->class_by_name = loongarch_cpu_class_by_name; cc->has_work = loongarch_cpu_has_work; cc->dump_state = loongarch_cpu_dump_state; - cc->set_pc = loongarch_cpu_set_pc; - cc->get_pc = loongarch_cpu_get_pc; + cc->set_pc = loongarch64_cpu_set_pc; + cc->get_pc = loongarch64_cpu_get_pc; #ifndef CONFIG_USER_ONLY dc->vmsd = &vmstate_loongarch_cpu; cc->sysemu_ops = &loongarch_sysemu_ops; @@ -726,14 +726,14 @@ static void loongarch_cpu_class_init(ObjectClass *c, void *data) cc->gdb_num_core_regs = 35; cc->gdb_core_xml_file = "loongarch-base64.xml"; cc->gdb_stop_before_watchpoint = true; - cc->gdb_arch_name = loongarch_gdb_arch_name; + cc->gdb_arch_name = loongarch64_gdb_arch_name; #ifdef CONFIG_TCG cc->tcg_ops = &loongarch_tcg_ops; #endif } -#define DEFINE_LOONGARCH_CPU_TYPE(model, initfn) \ +#define DEFINE_LOONGARCH64_CPU_TYPE(model, initfn) \ { \ .parent = TYPE_LOONGARCH_CPU, \ .instance_init = initfn, \ @@ -751,7 +751,7 @@ static const TypeInfo loongarch_cpu_type_infos[] = { .class_size = sizeof(LoongArchCPUClass), .class_init = loongarch_cpu_class_init, }, - DEFINE_LOONGARCH_CPU_TYPE("la464", loongarch_la464_initfn), + DEFINE_LOONGARCH64_CPU_TYPE("la464", loongarch64_la464_initfn), }; DEFINE_TYPES(loongarch_cpu_type_infos) From patchwork Fri Aug 18 10:34:25 2023 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: 714630 Delivered-To: patch@linaro.org Received: by 2002:a5d:484e:0:b0:317:ecd7:513f with SMTP id n14csp523240wrs; Fri, 18 Aug 2023 07:12:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHJOmguWo9c8degDZidm0jS9hetwSyAc80N0uA374BDejDnlv0zhRF9nUIE1WHsIs//iPGs X-Received: by 2002:ac8:5708:0:b0:406:56cb:b617 with SMTP id 8-20020ac85708000000b0040656cbb617mr4157749qtw.53.1692367937062; Fri, 18 Aug 2023 07:12:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692367937; cv=none; d=google.com; s=arc-20160816; b=wXriyklGidt9EECu04d29cnyVBtnF5b6HBwC1aSvAeOYCrCuTfdTb+UT01S/NG0IRg NZyQrQvkE5Bs+0mkLjEZdXy6apIMyTZVurvu/TUiRxRjW4m5ToIbzR1cvbLyZSuw4Ppa dj0WurifaAqM3AuUWsxC4Gf8stKI/P7ZaM7eR4mAnIGRsCDeXQcJG0ODYjH7gZ4+vSGj NP9eW5oLkca024O9GiL6BzSxRe15TQ412y7wNIU8pYQCm/Ff7FZ2WG3e7AES2NmAnI7d iRnfttTADGTYKP2mjRTe1nd35xUeHb91p6zYD8+YBwbLG8hOoL9hg5GRrM9hktymfsz9 yxfA== 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=fW46fogpRD0z/3au3liqhnlpv4cot2Ttk3TraxBL1oU=; fh=BVT+wNaEQ6DYU2fJ+3RLrSAfhPFgaPFe1wC3+pPOUB8=; b=B2/CR9Y/ltqCyeelVb+TzhRETA40jAT5Xcbyw/MQ+mo14D3KNs7lqW2Jnx9klwfdnP CMGoLWZgJSAeCRXev0EqcF1XPX9aAZ7go8fjWbdwAToMEoHbD/1amJYRRrELFpFgyCgn QpwI0paElgvyJkj1c9tMVxcA1B5tZaK0oN0BYQ1MoSQZ5kqrKks/YUfiYVZh1KubLX73 IoEjuPfMaJBqxM3Z2sekldLQDueZJo9RVj10FqCfOVTv/ktVG/zAkerEMZE/HHasQ2If D8IJzkirtRFKFzBIHgg3oc10krjd59m3CQNp7lNYjxH+qYeCKRJ3RvUcTP230gXEGHAB Y/tA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nHCqP+Xv; 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 a20-20020a05622a02d400b004039b86b885si1243802qtx.614.2023.08.18.07.12.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 Aug 2023 07:12:17 -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=nHCqP+Xv; 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 1qX05n-0004yD-DS; Fri, 18 Aug 2023 10:04:47 -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 1qWwol-0006Nr-2W for qemu-devel@nongnu.org; Fri, 18 Aug 2023 06:35:00 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qWwoi-0002ye-6j for qemu-devel@nongnu.org; Fri, 18 Aug 2023 06:34:58 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-3fe1fc8768aso7190605e9.1 for ; Fri, 18 Aug 2023 03:34:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692354894; x=1692959694; 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=fW46fogpRD0z/3au3liqhnlpv4cot2Ttk3TraxBL1oU=; b=nHCqP+Xve8KUI4ERf6Zc+4QKEd6XZkDP7lTAPt7hPg/0n2oZDBL3Toa8jfRVJdJ84+ deMkyuCZrwvFeOHBD+OyUd2AJ/hC0IJbRaQEfPvrytAK/36sb89oYM8MbCi8CrqA9efR pdFH7aPhDJCjmozd0KEoco/q/qdI0FPTEtQZhSJZl7Vp3NKV4Drp5p2GOhh+jqJf1lLG bCpLoTNoMFDaoCTfk2PCAQlaY/5cZDD80wvIl/c6k0WvqusCvKbcfynsvBpmUEdgjSzU h1BhkC8nJJAN4Wz0lejbscD1W64/wDRTLBaSJSpm0rqk0SWUPnEtTwXug2RLVCPbbQF4 LXKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692354894; x=1692959694; 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=fW46fogpRD0z/3au3liqhnlpv4cot2Ttk3TraxBL1oU=; b=Wq79JMLqcHloGCABDG+YOJ5IED8q2EnwtnG6CbMmONwvCpfSTLoB7OfnX/JUbM5Oxc sETfaF/bkILxPVfW6v9p31UJPDsAlyk85v7OZMuW6ztSwE0TmPwC/EusYl9InAzZQwBI goN7FMQRsvMEwHekAfec6nxaggzKAEecUVsNhk+FRZMbCAx4/Jj6kDzyS1a26lfv7QcA NbnyRGsDw2taRrRkmfYDQjeQ46pU9a2IxC4Mmc1+Tiu1F8QS2XTXfkxX6RCOOu/+DoNr S5M/odYcDRoPbgDtYWXXWWHnJvnyVyJgLtz6xhPuDexAVKQFdnS9Gqfj/sFhir+c9r9I uejQ== X-Gm-Message-State: AOJu0YzN7er5TtqyYBHPvkywNZhfAcl8b6Q4LKKg+WuaX6Jxi4uYzC/X AzvysPJRwZF7fLR2+fs2CfeiSYYcWFAMM+JalWo= X-Received: by 2002:a1c:7c0f:0:b0:3f9:b244:c294 with SMTP id x15-20020a1c7c0f000000b003f9b244c294mr1934808wmc.35.1692354894139; Fri, 18 Aug 2023 03:34:54 -0700 (PDT) Received: from localhost.localdomain ([92.88.170.41]) by smtp.gmail.com with ESMTPSA id n24-20020a7bc5d8000000b003fe17e04269sm2371236wmk.40.2023.08.18.03.34.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 18 Aug 2023 03:34:53 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Huacai Chen , Song Gao , Xiaojuan Yang , Jiajie Chen , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 4/4] target/loongarch: Extract 64-bit specifics to loongarch64_cpu_class_init Date: Fri, 18 Aug 2023 12:34:25 +0200 Message-ID: <20230818103425.16271-5-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230818103425.16271-1-philmd@linaro.org> References: <20230818103425.16271-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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 Extract loongarch64 specific code from loongarch_cpu_class_init() to a new loongarch64_cpu_class_init(). Adapt DEFINE_LOONGARCH64_CPU_TYPE() macro. Signed-off-by: Philippe Mathieu-Daudé --- target/loongarch/cpu.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c index 19572e37ad..6bd5ca93fd 100644 --- a/target/loongarch/cpu.c +++ b/target/loongarch/cpu.c @@ -694,11 +694,6 @@ static const struct SysemuCPUOps loongarch_sysemu_ops = { }; #endif -static gchar *loongarch64_gdb_arch_name(CPUState *cs) -{ - return g_strdup("loongarch64"); -} - static void loongarch_cpu_class_init(ObjectClass *c, void *data) { LoongArchCPUClass *lacc = LOONGARCH_CPU_CLASS(c); @@ -714,8 +709,6 @@ static void loongarch_cpu_class_init(ObjectClass *c, void *data) cc->class_by_name = loongarch_cpu_class_by_name; cc->has_work = loongarch_cpu_has_work; cc->dump_state = loongarch_cpu_dump_state; - cc->set_pc = loongarch64_cpu_set_pc; - cc->get_pc = loongarch64_cpu_get_pc; #ifndef CONFIG_USER_ONLY dc->vmsd = &vmstate_loongarch_cpu; cc->sysemu_ops = &loongarch_sysemu_ops; @@ -723,21 +716,35 @@ static void loongarch_cpu_class_init(ObjectClass *c, void *data) cc->disas_set_info = loongarch_cpu_disas_set_info; cc->gdb_read_register = loongarch_cpu_gdb_read_register; cc->gdb_write_register = loongarch_cpu_gdb_write_register; - cc->gdb_num_core_regs = 35; - cc->gdb_core_xml_file = "loongarch-base64.xml"; cc->gdb_stop_before_watchpoint = true; - cc->gdb_arch_name = loongarch64_gdb_arch_name; #ifdef CONFIG_TCG cc->tcg_ops = &loongarch_tcg_ops; #endif } +static gchar *loongarch64_gdb_arch_name(CPUState *cs) +{ + return g_strdup("loongarch64"); +} + +static void loongarch64_cpu_class_init(ObjectClass *c, void *data) +{ + CPUClass *cc = CPU_CLASS(c); + + cc->set_pc = loongarch64_cpu_set_pc; + cc->get_pc = loongarch64_cpu_get_pc; + cc->gdb_num_core_regs = 35; + cc->gdb_core_xml_file = "loongarch-base64.xml"; + cc->gdb_arch_name = loongarch64_gdb_arch_name; +} + #define DEFINE_LOONGARCH64_CPU_TYPE(model, initfn) \ { \ .parent = TYPE_LOONGARCH_CPU, \ - .instance_init = initfn, \ .name = LOONGARCH_CPU_TYPE_NAME(model), \ + .instance_init = initfn, \ + .class_init = loongarch64_cpu_class_init, \ } static const TypeInfo loongarch_cpu_type_infos[] = {