From nobody Fri Apr 19 14:24:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618763518; cv=none; d=zohomail.com; s=zohoarc; b=mnWNSIIfYo+HBRcrEnOc3g/8XBIWOSps+kAZOAwkjXFwsywqPLdZMlFUt9y6MA6lH1tvhr3Oz9AgVNxW+DiGa1oCxEGUjBCfzYORQ837pVSgo7xod4uqpAKV2ePPgiYyNtO7YU2fcebwOdY1amHlE07dggoJXv6P7ob6Squ5PjE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618763518; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KkMLKi9URbSSexv+2AdOqXoFAo2NU5IuIgDwkDUDa78=; b=P6IXaAHq3IZEbikuOBkIxnUs2uW4X/UVVcf86BDO1aCYIXcU70tD+Dw4YfIvZT578f6zEk3SQ+3j+TMxWrZuMScYhqJyzw770of42R1tBlul6k1wzymsketYGLu+h6tj5x1H5dYwiSHlkUhoklKAjOkNoruIKpYArdvkhDIdD0U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1618763518166554.2527236175782; Sun, 18 Apr 2021 09:31:58 -0700 (PDT) Received: by mail-wr1-f50.google.com with SMTP id e5so2842458wrg.7 for ; Sun, 18 Apr 2021 09:31:57 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id f6sm17035612wmf.28.2021.04.18.09.31.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 09:31:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KkMLKi9URbSSexv+2AdOqXoFAo2NU5IuIgDwkDUDa78=; b=sfBVFGPB9aAMCh3hJY55KGt5CpyNjDM5l/enCQ79trqQwziYqwSUdObasYCg7sZAdQ +L4FZEYYo8UjjL5WiLPX/N8arulalC2JrImDanpw/2t0cNFGSyhTEo+LHF8gX1HHdWzh 6rOGWabMbW91c6cS2E5x/yQF8UJZwFJ/5Phzl8ul4UXp7blawrmmQgUHO4sIJa+40p2Z aQh6+AU7zRF/S0p2CcZPeN0DVNjRjj49D+gpQzfEfC0NHAZTGqbYhLuMzCb9w2v+i9Qk 4Ejye2hDSHBG/DPZzw4nzBq4jXspRALfYqkg5ZS/ZuO5uoVsp2GLslELo1SV5iHJ5TCp WodA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=KkMLKi9URbSSexv+2AdOqXoFAo2NU5IuIgDwkDUDa78=; b=E2d7kp90jgF+Hrt69B+BervJk4HgXmIxEvB+XGb/Z0oB6QFw3CXtxbQjPVuJDYY21S +h+I9PymTe3WKepViIIZGQvlDiEhRX65Uafxhlbofs2LcWxwmie2bESDlx9vZBXEovaZ ufdJVvWjkyqXekFVgBBvqk6jCt2jb0OBjXD9Wv0qMtD9XDexaGMUpiG9CvojY3egiU17 i/QiHnrAeOBoaZwVvWjBlIC0AAu+Zz3bbAvJ+bLXm7vHJa+nL2H97U4zgfrCL4YRXz7+ L/NTeLnrtK0Pi9v3nAQvmWPnE4LYF3zFPqEuyJ6e8hzSCs0XU5Py/SNMCo8cUKFfHfXa XqdQ== X-Gm-Message-State: AOAM5315TYiMBYbEZ85f87TZ2KtQJ05aj5SeO8S74IWqmQ9KoUJ7ak/J 7PBFJZJLQtJV/7I1YaaeeIs= X-Google-Smtp-Source: ABdhPJxcHv/DaGmTgGE+92W4kxuzLmk8odZAeaitMaE5cLP2k+kqRlpcch9Xjw9PPZSECxN6/M9/Tw== X-Received: by 2002:adf:ec42:: with SMTP id w2mr9871201wrn.373.1618763516420; Sun, 18 Apr 2021 09:31:56 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Huacai Chen , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Richard Henderson , Aurelien Jarno Subject: [PATCH 04/26] target/mips: Make CPU/FPU regnames[] arrays global Date: Sun, 18 Apr 2021 18:31:12 +0200 Message-Id: <20210418163134.1133100-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210418163134.1133100-1-f4bug@amsat.org> References: <20210418163134.1133100-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The CPU/FPU regnames[] arrays is used in mips_tcg_init() and mips_cpu_dump_state(), which while being in translate.c is not specific to TCG. To be able to move mips_cpu_dump_state() to cpu.c, which is compiled for all accelerator, we need to make the regnames[] arrays global to target/mips/ by declaring them in "internal.h". Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/internal.h | 3 +++ target/mips/cpu.c | 7 +++++++ target/mips/fpu.c | 7 +++++++ target/mips/translate.c | 14 -------------- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/target/mips/internal.h b/target/mips/internal.h index 99264b8bf6a..a8644f754a6 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -71,6 +71,9 @@ struct mips_def_t { int32_t SAARP; }; =20 +extern const char * const regnames[32]; +extern const char * const fregnames[32]; + extern const struct mips_def_t mips_defs[]; extern const int mips_defs_number; =20 diff --git a/target/mips/cpu.c b/target/mips/cpu.c index dce1e166bde..f354d18aec4 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -35,6 +35,13 @@ #include "qapi/qapi-commands-machine-target.h" #include "fpu_helper.h" =20 +const char * const regnames[32] =3D { + "r0", "at", "v0", "v1", "a0", "a1", "a2", "a3", + "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7", + "s0", "s1", "s2", "s3", "s4", "s5", "s6", "s7", + "t8", "t9", "k0", "k1", "gp", "sp", "s8", "ra", +}; + #if !defined(CONFIG_USER_ONLY) =20 /* Called for updates to CP0_Status. */ diff --git a/target/mips/fpu.c b/target/mips/fpu.c index 39a2f7fd22e..1447dba3fa3 100644 --- a/target/mips/fpu.c +++ b/target/mips/fpu.c @@ -16,3 +16,10 @@ const FloatRoundMode ieee_rm[4] =3D { float_round_up, float_round_down }; + +const char * const fregnames[32] =3D { + "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", + "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", + "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23", + "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31", +}; diff --git a/target/mips/translate.c b/target/mips/translate.c index 71fa5ec1973..f99d4d4016d 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -1267,13 +1267,6 @@ TCGv_i64 fpu_f64[32]; #define DISAS_STOP DISAS_TARGET_0 #define DISAS_EXIT DISAS_TARGET_1 =20 -static const char * const regnames[] =3D { - "r0", "at", "v0", "v1", "a0", "a1", "a2", "a3", - "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7", - "s0", "s1", "s2", "s3", "s4", "s5", "s6", "s7", - "t8", "t9", "k0", "k1", "gp", "sp", "s8", "ra", -}; - static const char * const regnames_HI[] =3D { "HI0", "HI1", "HI2", "HI3", }; @@ -1282,13 +1275,6 @@ static const char * const regnames_LO[] =3D { "LO0", "LO1", "LO2", "LO3", }; =20 -static const char * const fregnames[] =3D { - "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", - "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", - "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23", - "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31", -}; - /* General purpose registers moves. */ void gen_load_gpr(TCGv t, int reg) { --=20 2.26.3