From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from muminek.juszkiewicz.com.pl (muminek.juszkiewicz.com.pl [213.251.184.221]) by mx.groups.io with SMTP id smtpd.web10.1369.1685947075966977610 for ; Sun, 04 Jun 2023 23:37:56 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=softfail (domain: linaro.org, ip: 213.251.184.221, mailfrom: marcin.juszkiewicz@linaro.org) Received: from localhost (localhost [127.0.0.1]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTP id 50C832606B8; Mon, 5 Jun 2023 08:37:54 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at juszkiewicz.com.pl Received: from muminek.juszkiewicz.com.pl ([127.0.0.1]) by localhost (muminek.juszkiewicz.com.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JPVnf9Eg1hLl; Mon, 5 Jun 2023 08:37:52 +0200 (CEST) Received: from applejack.lan (83.21.93.182.ipv4.supernova.orange.pl [83.21.93.182]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTPSA id C7B03260AD9; Mon, 5 Jun 2023 08:37:50 +0200 (CEST) From: "Marcin Juszkiewicz" To: devel@edk2.groups.io Cc: Sami Mujawar , Ard Biesheuvel , Leif Lindholm , Marcin Juszkiewicz Subject: [PATCH v2 2/8] ArmPkg: shorten register field in ArmCpuInfo Date: Mon, 5 Jun 2023 08:37:37 +0200 Message-Id: <20230605063743.405487-4-marcin.juszkiewicz@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230605063743.405487-1-marcin.juszkiewicz@linaro.org> References: <20230605063743.405487-1-marcin.juszkiewicz@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable It is hard to fit in 80 columns so let drop extra spaces and ID_AA64 prefix from system register names. Signed-off-by: Marcin Juszkiewicz --- ArmPkg/Application/ArmCpuInfo/ArmCpuInfo.c | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/ArmPkg/Application/ArmCpuInfo/ArmCpuInfo.c b/ArmPkg/Applicat= ion/ArmCpuInfo/ArmCpuInfo.c index 3f0a49649790..982714ef6ca0 100644 --- a/ArmPkg/Application/ArmCpuInfo/ArmCpuInfo.c +++ b/ArmPkg/Application/ArmCpuInfo/ArmCpuInfo.c @@ -53,7 +53,7 @@ PrintText ( CONST CHAR8 *Description ) { - AsciiPrint (" %-16a | %5a | %5a | %a\n", Field, Bits, Value, Descripti= on); + AsciiPrint ("%-5a | %5a | %5a | %a\n", Field, Bits, Value, Description= ); } =20 /** @@ -88,7 +88,7 @@ PrintSpacer ( VOID ) { - AsciiPrint ("------------------|-------|-------|----------------------= ------------------------\n"); + AsciiPrint ("------|-------|-------|----------------------------------= ------------\n"); } =20 /** @@ -102,7 +102,7 @@ HandleAa64Dfr0 ( ) { UINT64 Value; - STATIC CONST CHAR8 RegName[] =3D "ID_AA64DFR0"; + STATIC CONST CHAR8 RegName[] =3D "DFR0"; CONST CHAR8 *Description; CONST CHAR8 *Bits; =20 @@ -362,7 +362,7 @@ HandleAa64Isar0 ( ) { UINT64 Value; - STATIC CONST CHAR8 RegName[] =3D "ID_AA64ISAR0"; + STATIC CONST CHAR8 RegName[] =3D "ISAR0"; CONST CHAR8 *Description; CONST CHAR8 *Bits; =20 @@ -632,7 +632,7 @@ HandleAa64Isar1 ( ) { UINT64 Value; - STATIC CONST CHAR8 RegName[] =3D "ID_AA64ISAR1"; + STATIC CONST CHAR8 RegName[] =3D "ISAR1"; CONST CHAR8 *Description; CONST CHAR8 *Bits; =20 @@ -949,7 +949,7 @@ HandleAa64Isar2 ( ) { UINT64 Value; - STATIC CONST CHAR8 RegName[] =3D "ID_AA64ISAR2"; + STATIC CONST CHAR8 RegName[] =3D "ISAR2"; CONST CHAR8 *Description; CONST CHAR8 *Bits; =20 @@ -1091,7 +1091,7 @@ HandleAa64Mmfr0 ( ) { UINT64 Value; - STATIC CONST CHAR8 RegName[] =3D "ID_AA64MMFR0"; + STATIC CONST CHAR8 RegName[] =3D "MMFR0"; CONST CHAR8 *Description; CONST CHAR8 *Bits; =20 @@ -1164,11 +1164,11 @@ HandleAa64Mmfr0 ( // If mixed-endian is present, check whether supported at EL0 if (((Aa64Mmfr0 >> 8) & 0xf) !=3D b0000 ) { if (((Aa64Mmfr0 >> 16) & 0xf) =3D=3D b0000 ) { - PrintValues ("ID_AA64MMFR0", "19:16", b0000, "No mixed-endian supp= ort at EL0."); + PrintValues ("MMFR0", "19:16", b0000, "No mixed-endian support at = EL0."); } =20 if (((Aa64Mmfr0 >> 16) & 0xf) =3D=3D b0001 ) { - PrintValues ("ID_AA64MMFR0", "19:16", b0001, "Mixed-endian support= at EL0."); + PrintValues ("MMFR0", "19:16", b0001, "Mixed-endian support at EL0= ."); } } =20 @@ -1363,7 +1363,7 @@ HandleAa64Mmfr1 ( ) { UINT64 Value; - STATIC CONST CHAR8 RegName[] =3D "ID_AA64MMFR1"; + STATIC CONST CHAR8 RegName[] =3D "MMFR1"; CONST CHAR8 *Description; CONST CHAR8 *Bits; =20 @@ -1480,12 +1480,12 @@ HandleAa64Mmfr1 ( (((Aa64Pfr0 >> 28) & 0xf) =3D=3D b0010)) { if (((Aa64Mmfr1 >> 24) & 0xf) =3D=3D b0000 ) { - PrintValues ("ID_AA64MMFR1", "27:24", b0000, "The PE never generat= es an SError interrupt due to"); + PrintValues ("MMFR1", "27:24", b0000, "The PE never generates an S= Error interrupt due to"); PrintText ("", "", "", "an External abort on a speculative read.")= ; } =20 if (((Aa64Mmfr1 >> 24) & 0xf) =3D=3D b0001 ) { - PrintValues ("ID_AA64MMFR1", "27:24", b0001, "The PE might generat= e an SError interrupt due to"); + PrintValues ("MMFR1", "27:24", b0001, "The PE might generate an SE= rror interrupt due to"); PrintText ("", "", "", "an External abort on a speculative read.")= ; } } @@ -1632,7 +1632,7 @@ HandleAa64Mmfr2 ( ) { UINT64 Value; - STATIC CONST CHAR8 RegName[] =3D "ID_AA64MMFR2"; + STATIC CONST CHAR8 RegName[] =3D "MMFR2"; CONST CHAR8 *Description; CONST CHAR8 *Bits; =20 @@ -1901,7 +1901,7 @@ HandleAa64Pfr0 ( ) { UINT64 Value; - STATIC CONST CHAR8 RegName[] =3D "ID_AA64PFR0"; + STATIC CONST CHAR8 RegName[] =3D "PFR0"; CONST CHAR8 *Description; CONST CHAR8 *Bits; =20 @@ -2059,7 +2059,7 @@ HandleAa64Pfr0 ( PrintValues (RegName, Bits, Value, Description); if (Value =3D=3D b0001) { if (((Aa64Pfr1 >> 12) & 0xf) =3D=3D b0001 ) { - PrintValues ("ID_AA64PRF1", "15:12", b0001, "FEAT_RASv1p1 implemen= ted."); + PrintValues ("PRF1", "15:12", b0001, "FEAT_RASv1p1 implemented."); } } =20 @@ -2199,11 +2199,11 @@ HandleAa64Pfr0 ( PrintValues (RegName, Bits, Value, Description); if (Value =3D=3D b0001) { if (((Aa64Pfr1 >> 32) & 0xf) =3D=3D b0001 ) { - PrintValues ("ID_AA64PRF1", "35:32", b0001, "FEAT_CSV2_1p1 impleme= nted."); + PrintValues ("PRF1", "35:32", b0001, "FEAT_CSV2_1p1 implemented.")= ; } =20 if (((Aa64Pfr1 >> 32) & 0xf) =3D=3D b0010 ) { - PrintValues ("ID_AA64PRF1", "35:32", b0010, "FEAT_CSV2_1p2 impleme= nted."); + PrintValues ("PRF1", "35:32", b0010, "FEAT_CSV2_1p2 implemented.")= ; } } =20 @@ -2235,7 +2235,7 @@ HandleAa64Pfr1 ( ) { UINT64 Value; - STATIC CONST CHAR8 RegName[] =3D "ID_AA64PFR1"; + STATIC CONST CHAR8 RegName[] =3D "PFR1"; CONST CHAR8 *Description; CONST CHAR8 *Bits; =20 --=20 2.40.1