Do code formatting in the build project and generated code

This commit is contained in:
Alex Barney 2022-11-10 23:13:27 -07:00
parent 80d52dd499
commit 0dc556d69e
21 changed files with 44 additions and 207 deletions

View file

@ -25,6 +25,20 @@ public static class Common
"//-----------------------------------------------------------------------------";
}
private static void WriteToLog(string message)
{
// If the logger is of type "SilentLogger", we're probably running as a separate process from nuke,
// so we want to log to the console so the nuke instance that launched us will get our output.
if (Serilog.Log.Logger.GetType().Name.Contains("SilentLogger"))
{
Console.WriteLine(message);
}
else
{
Serilog.Log.Debug(message);
}
}
// Write the file only if it has changed
// Preserve the UTF-8 BOM usage if the file already exists
public static void WriteOutput(string relativePath, string text)
@ -67,11 +81,11 @@ public static class Common
if (oldFile?.SequenceEqual(newFile) == true)
{
Serilog.Log.Debug($"{relativePath} is already up-to-date");
WriteToLog($"{relativePath} is already up-to-date");
return;
}
Serilog.Log.Debug($"Generated file {relativePath}");
WriteToLog($"Generated file {relativePath}");
File.WriteAllBytes(fullPath, newFile);
}

View file

@ -75,6 +75,13 @@ public class IndentingStringBuilder
return this;
}
public IndentingStringBuilder DecreaseAndAppend(string value)
{
DecreaseLevel();
Append(value);
return this;
}
private void IndentIfNeeded()
{
if (!_hasIndentedCurrentLine)
@ -85,4 +92,4 @@ public class IndentingStringBuilder
}
public override string ToString() => _sb.ToString();
}
}

View file

@ -295,8 +295,7 @@ public static class ResultCodeGen
sb.DecreaseLevel();
}
sb.DecreaseAndAppendLine("}");
sb.DecreaseAndAppend("}");
return sb.ToString();
}
@ -405,7 +404,7 @@ public static class ResultCodeGen
sb.AppendLine();
sb.DecreaseAndAppendLine("};");
sb.DecreaseAndAppendLine("}");
sb.DecreaseAndAppend("}");
return sb.ToString();
}

View file

@ -49,7 +49,7 @@ public static class KeysCodeGen
BuildArray(sb, "RsaSigningKeysProd", SpanHelpers.AsReadOnlyByteSpan(in keySet.KeyStruct.RsaSigningKeysProd));
BuildArray(sb, "RsaKeys", SpanHelpers.AsReadOnlyByteSpan(in keySet.KeyStruct.RsaKeys));
sb.DecreaseAndAppendLine("}");
sb.DecreaseAndAppend("}");
return sb.ToString();
}
@ -145,7 +145,7 @@ public static class KeysCodeGen
private static ReadOnlySpan<byte> StandardPublicExponent => new byte[]
{
0x01, 0x00, 0x01
0x01, 0x00, 0x01
};
private static ReadOnlySpan<byte> BetaNca0Modulus => new byte[]

View file

@ -9,6 +9,7 @@ namespace LibHacBuild.CodeGen.Stage2;
public static class RunStage2
{
private const string SolutionFileName = "LibHac.sln";
public static int Main(string[] args)
{
if (!File.Exists(SolutionFileName))

View file

@ -132,4 +132,4 @@ public partial class Build
{
return BitConverter.ToString(arr).ToLower().Replace("-", "");
}
}
}

View file

@ -15,4 +15,4 @@ internal static partial class DefaultKeySet
private static ReadOnlySpan<byte> RsaSigningKeysDev => new byte[] { };
private static ReadOnlySpan<byte> RsaSigningKeysProd => new byte[] { };
private static ReadOnlySpan<byte> RsaKeys => new byte[] { };
}
}

View file

@ -92,4 +92,4 @@ public static class ResultLibHac
public static Result.Base InvalidPackage1MarikoBodySize => new Result.Base(ModuleLibHac, 1042);
/// <summary>Error code: 2428-1043; Inner value: 0x827ac</summary>
public static Result.Base InvalidPackage1Pk11Size => new Result.Base(ModuleLibHac, 1043);
}
}

View file

@ -2161,4 +2161,4 @@ public static class ResultFs
public static Result.Base DbmDirectoryNameTooLong => new Result.Base(ModuleFs, 7916);
/// <summary>Error code: 2002-7917; Inner value: 0x3dda02</summary>
public static Result.Base DbmFileNameTooLong => new Result.Base(ModuleFs, 7917);
}
}

View file

@ -1,184 +0,0 @@
//-----------------------------------------------------------------------------
// This file was automatically generated.
// Changes to this file will be lost when the file is regenerated.
//
// To change this file, modify /build/CodeGen/results.csv at the root of this
// repo and run the build script.
//
// The script can be run with the "codegen" option to run only the
// code generation portion of the build.
//-----------------------------------------------------------------------------
using System.Runtime.CompilerServices;
namespace LibHac.FsSrv;
public static class ResultSdmmc
{
public const int ModuleSdmmc = 24;
/// <summary>Error code: 2024-0001; Inner value: 0x218</summary>
public static Result.Base NoDevice => new Result.Base(ModuleSdmmc, 1);
/// <summary>Error code: 2024-0002; Inner value: 0x418</summary>
public static Result.Base NotActivated => new Result.Base(ModuleSdmmc, 2);
/// <summary>Error code: 2024-0003; Inner value: 0x618</summary>
public static Result.Base DeviceRemoved => new Result.Base(ModuleSdmmc, 3);
/// <summary>Error code: 2024-0004; Inner value: 0x818</summary>
public static Result.Base NotAwakened => new Result.Base(ModuleSdmmc, 4);
/// <summary>Error code: 2024-0032; Range: 32-126; Inner value: 0x4018</summary>
public static Result.Base CommunicationError => new Result.Base(ModuleSdmmc, 32, 126);
/// <summary>Error code: 2024-0033; Range: 33-46; Inner value: 0x4218</summary>
public static Result.Base CommunicationNotAttained => new Result.Base(ModuleSdmmc, 33, 46);
/// <summary>Error code: 2024-0034; Inner value: 0x4418</summary>
public static Result.Base ResponseIndexError => new Result.Base(ModuleSdmmc, 34);
/// <summary>Error code: 2024-0035; Inner value: 0x4618</summary>
public static Result.Base ResponseEndBitError => new Result.Base(ModuleSdmmc, 35);
/// <summary>Error code: 2024-0036; Inner value: 0x4818</summary>
public static Result.Base ResponseCrcError => new Result.Base(ModuleSdmmc, 36);
/// <summary>Error code: 2024-0037; Inner value: 0x4a18</summary>
public static Result.Base ResponseTimeoutError => new Result.Base(ModuleSdmmc, 37);
/// <summary>Error code: 2024-0038; Inner value: 0x4c18</summary>
public static Result.Base DataEndBitError => new Result.Base(ModuleSdmmc, 38);
/// <summary>Error code: 2024-0039; Inner value: 0x4e18</summary>
public static Result.Base DataCrcError => new Result.Base(ModuleSdmmc, 39);
/// <summary>Error code: 2024-0040; Inner value: 0x5018</summary>
public static Result.Base DataTimeoutError => new Result.Base(ModuleSdmmc, 40);
/// <summary>Error code: 2024-0041; Inner value: 0x5218</summary>
public static Result.Base AutoCommandResponseIndexError => new Result.Base(ModuleSdmmc, 41);
/// <summary>Error code: 2024-0042; Inner value: 0x5418</summary>
public static Result.Base AutoCommandResponseEndBitError => new Result.Base(ModuleSdmmc, 42);
/// <summary>Error code: 2024-0043; Inner value: 0x5618</summary>
public static Result.Base AutoCommandResponseCrcError => new Result.Base(ModuleSdmmc, 43);
/// <summary>Error code: 2024-0044; Inner value: 0x5818</summary>
public static Result.Base AutoCommandResponseTimeoutError => new Result.Base(ModuleSdmmc, 44);
/// <summary>Error code: 2024-0045; Inner value: 0x5a18</summary>
public static Result.Base CommandCompleteSoftwareTimeout => new Result.Base(ModuleSdmmc, 45);
/// <summary>Error code: 2024-0046; Inner value: 0x5c18</summary>
public static Result.Base TransferCompleteSoftwareTimeout => new Result.Base(ModuleSdmmc, 46);
/// <summary>Error code: 2024-0048; Range: 48-70; Inner value: 0x6018</summary>
public static Result.Base DeviceStatusHasError => new Result.Base(ModuleSdmmc, 48, 70);
/// <summary>Error code: 2024-0049; Inner value: 0x6218</summary>
public static Result.Base DeviceStatusAddressOutOfRange => new Result.Base(ModuleSdmmc, 49);
/// <summary>Error code: 2024-0050; Inner value: 0x6418</summary>
public static Result.Base DeviceStatusAddressMisaligned => new Result.Base(ModuleSdmmc, 50);
/// <summary>Error code: 2024-0051; Inner value: 0x6618</summary>
public static Result.Base DeviceStatusBlockLenError => new Result.Base(ModuleSdmmc, 51);
/// <summary>Error code: 2024-0052; Inner value: 0x6818</summary>
public static Result.Base DeviceStatusEraseSeqError => new Result.Base(ModuleSdmmc, 52);
/// <summary>Error code: 2024-0053; Inner value: 0x6a18</summary>
public static Result.Base DeviceStatusEraseParam => new Result.Base(ModuleSdmmc, 53);
/// <summary>Error code: 2024-0054; Inner value: 0x6c18</summary>
public static Result.Base DeviceStatusWpViolation => new Result.Base(ModuleSdmmc, 54);
/// <summary>Error code: 2024-0055; Inner value: 0x6e18</summary>
public static Result.Base DeviceStatusLockUnlockFailed => new Result.Base(ModuleSdmmc, 55);
/// <summary>Error code: 2024-0056; Inner value: 0x7018</summary>
public static Result.Base DeviceStatusComCrcError => new Result.Base(ModuleSdmmc, 56);
/// <summary>Error code: 2024-0057; Inner value: 0x7218</summary>
public static Result.Base DeviceStatusIllegalCommand => new Result.Base(ModuleSdmmc, 57);
/// <summary>Error code: 2024-0058; Inner value: 0x7418</summary>
public static Result.Base DeviceStatusDeviceEccFailed => new Result.Base(ModuleSdmmc, 58);
/// <summary>Error code: 2024-0059; Inner value: 0x7618</summary>
public static Result.Base DeviceStatusCcError => new Result.Base(ModuleSdmmc, 59);
/// <summary>Error code: 2024-0060; Inner value: 0x7818</summary>
public static Result.Base DeviceStatusError => new Result.Base(ModuleSdmmc, 60);
/// <summary>Error code: 2024-0061; Inner value: 0x7a18</summary>
public static Result.Base DeviceStatusCidCsdOverwrite => new Result.Base(ModuleSdmmc, 61);
/// <summary>Error code: 2024-0062; Inner value: 0x7c18</summary>
public static Result.Base DeviceStatusWpEraseSkip => new Result.Base(ModuleSdmmc, 62);
/// <summary>Error code: 2024-0063; Inner value: 0x7e18</summary>
public static Result.Base DeviceStatusEraseReset => new Result.Base(ModuleSdmmc, 63);
/// <summary>Error code: 2024-0064; Inner value: 0x8018</summary>
public static Result.Base DeviceStatusSwitchError => new Result.Base(ModuleSdmmc, 64);
/// <summary>Error code: 2024-0072; Inner value: 0x9018</summary>
public static Result.Base UnexpectedDeviceState => new Result.Base(ModuleSdmmc, 72);
/// <summary>Error code: 2024-0073; Inner value: 0x9218</summary>
public static Result.Base UnexpectedDeviceCsdValue => new Result.Base(ModuleSdmmc, 73);
/// <summary>Error code: 2024-0074; Inner value: 0x9418</summary>
public static Result.Base AbortTransactionSoftwareTimeout => new Result.Base(ModuleSdmmc, 74);
/// <summary>Error code: 2024-0075; Inner value: 0x9618</summary>
public static Result.Base CommandInhibitCmdSoftwareTimeout => new Result.Base(ModuleSdmmc, 75);
/// <summary>Error code: 2024-0076; Inner value: 0x9818</summary>
public static Result.Base CommandInhibitDatSoftwareTimeout => new Result.Base(ModuleSdmmc, 76);
/// <summary>Error code: 2024-0077; Inner value: 0x9a18</summary>
public static Result.Base BusySoftwareTimeout => new Result.Base(ModuleSdmmc, 77);
/// <summary>Error code: 2024-0078; Inner value: 0x9c18</summary>
public static Result.Base IssueTuningCommandSoftwareTimeout => new Result.Base(ModuleSdmmc, 78);
/// <summary>Error code: 2024-0079; Inner value: 0x9e18</summary>
public static Result.Base TuningFailed => new Result.Base(ModuleSdmmc, 79);
/// <summary>Error code: 2024-0080; Inner value: 0xa018</summary>
public static Result.Base MmcInitializationSoftwareTimeout => new Result.Base(ModuleSdmmc, 80);
/// <summary>Error code: 2024-0081; Inner value: 0xa218</summary>
public static Result.Base MmcNotSupportExtendedCsd => new Result.Base(ModuleSdmmc, 81);
/// <summary>Error code: 2024-0082; Inner value: 0xa418</summary>
public static Result.Base UnexpectedMmcExtendedCsdValue => new Result.Base(ModuleSdmmc, 82);
/// <summary>Error code: 2024-0083; Inner value: 0xa618</summary>
public static Result.Base MmcEraseSoftwareTimeout => new Result.Base(ModuleSdmmc, 83);
/// <summary>Error code: 2024-0084; Inner value: 0xa818</summary>
public static Result.Base SdCardValidationError => new Result.Base(ModuleSdmmc, 84);
/// <summary>Error code: 2024-0085; Inner value: 0xaa18</summary>
public static Result.Base SdCardInitializationSoftwareTimeout => new Result.Base(ModuleSdmmc, 85);
/// <summary>Error code: 2024-0086; Inner value: 0xac18</summary>
public static Result.Base SdCardGetValidRcaSoftwareTimeout => new Result.Base(ModuleSdmmc, 86);
/// <summary>Error code: 2024-0087; Inner value: 0xae18</summary>
public static Result.Base UnexpectedSdCardAcmdDisabled => new Result.Base(ModuleSdmmc, 87);
/// <summary>Error code: 2024-0088; Inner value: 0xb018</summary>
public static Result.Base SdCardNotSupportSwitchFunctionStatus => new Result.Base(ModuleSdmmc, 88);
/// <summary>Error code: 2024-0089; Inner value: 0xb218</summary>
public static Result.Base UnexpectedSdCardSwitchFunctionStatus => new Result.Base(ModuleSdmmc, 89);
/// <summary>Error code: 2024-0090; Inner value: 0xb418</summary>
public static Result.Base SdCardNotSupportAccessMode => new Result.Base(ModuleSdmmc, 90);
/// <summary>Error code: 2024-0091; Inner value: 0xb618</summary>
public static Result.Base SdCardNot4BitBusWidthAtUhsIMode => new Result.Base(ModuleSdmmc, 91);
/// <summary>Error code: 2024-0092; Inner value: 0xb818</summary>
public static Result.Base SdCardNotSupportSdr104AndSdr50 => new Result.Base(ModuleSdmmc, 92);
/// <summary>Error code: 2024-0093; Inner value: 0xba18</summary>
public static Result.Base SdCardCannotSwitchAccessMode => new Result.Base(ModuleSdmmc, 93);
/// <summary>Error code: 2024-0094; Inner value: 0xbc18</summary>
public static Result.Base SdCardFailedSwitchAccessMode => new Result.Base(ModuleSdmmc, 94);
/// <summary>Error code: 2024-0095; Inner value: 0xbe18</summary>
public static Result.Base SdCardUnacceptableCurrentConsumption => new Result.Base(ModuleSdmmc, 95);
/// <summary>Error code: 2024-0096; Inner value: 0xc018</summary>
public static Result.Base SdCardNotReadyToVoltageSwitch => new Result.Base(ModuleSdmmc, 96);
/// <summary>Error code: 2024-0097; Inner value: 0xc218</summary>
public static Result.Base SdCardNotCompleteVoltageSwitch => new Result.Base(ModuleSdmmc, 97);
/// <summary>Error code: 2024-0128; Range: 128-158; Inner value: 0x10018</summary>
public static Result.Base HostControllerUnexpected { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ModuleSdmmc, 128, 158); }
/// <summary>Error code: 2024-0129; Inner value: 0x10218</summary>
public static Result.Base InternalClockStableSoftwareTimeout => new Result.Base(ModuleSdmmc, 129);
/// <summary>Error code: 2024-0130; Inner value: 0x10418</summary>
public static Result.Base SdHostStandardUnknownAutoCmdError => new Result.Base(ModuleSdmmc, 130);
/// <summary>Error code: 2024-0131; Inner value: 0x10618</summary>
public static Result.Base SdHostStandardUnknownError => new Result.Base(ModuleSdmmc, 131);
/// <summary>Error code: 2024-0132; Inner value: 0x10818</summary>
public static Result.Base SdmmcDllCalibrationSoftwareTimeout => new Result.Base(ModuleSdmmc, 132);
/// <summary>Error code: 2024-0133; Inner value: 0x10a18</summary>
public static Result.Base SdmmcDllApplicationSoftwareTimeout => new Result.Base(ModuleSdmmc, 133);
/// <summary>Error code: 2024-0134; Inner value: 0x10c18</summary>
public static Result.Base SdHostStandardFailSwitchTo18V => new Result.Base(ModuleSdmmc, 134);
/// <summary>Error code: 2024-0135; Inner value: 0x10e18</summary>
public static Result.Base DriveStrengthCalibrationNotCompleted => new Result.Base(ModuleSdmmc, 135);
/// <summary>Error code: 2024-0136; Inner value: 0x11018</summary>
public static Result.Base DriveStrengthCalibrationSoftwareTimeout => new Result.Base(ModuleSdmmc, 136);
/// <summary>Error code: 2024-0137; Inner value: 0x11218</summary>
public static Result.Base SdmmcCompShortToGnd => new Result.Base(ModuleSdmmc, 137);
/// <summary>Error code: 2024-0138; Inner value: 0x11418</summary>
public static Result.Base SdmmcCompOpen => new Result.Base(ModuleSdmmc, 138);
/// <summary>Error code: 2024-0160; Range: 160-190; Inner value: 0x14018</summary>
public static Result.Base InternalError { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ModuleSdmmc, 160, 190); }
/// <summary>Error code: 2024-0161; Inner value: 0x14218</summary>
public static Result.Base NoWaitedInterrupt => new Result.Base(ModuleSdmmc, 161);
/// <summary>Error code: 2024-0162; Inner value: 0x14418</summary>
public static Result.Base WaitInterruptSoftwareTimeout => new Result.Base(ModuleSdmmc, 162);
/// <summary>Error code: 2024-0192; Inner value: 0x18018</summary>
public static Result.Base AbortCommandIssued => new Result.Base(ModuleSdmmc, 192);
/// <summary>Error code: 2024-0200; Inner value: 0x19018</summary>
public static Result.Base NotSupported => new Result.Base(ModuleSdmmc, 200);
/// <summary>Error code: 2024-0201; Inner value: 0x19218</summary>
public static Result.Base NotImplemented => new Result.Base(ModuleSdmmc, 201);
}

View file

@ -29,4 +29,4 @@ public static class ResultKvdb
public static Result.Base InvalidFileSystemState => new Result.Base(ModuleKvdb, 8);
/// <summary>Error code: 2020-0009; Inner value: 0x1214</summary>
public static Result.Base NotCreated => new Result.Base(ModuleKvdb, 9);
}
}

View file

@ -87,4 +87,4 @@ public static class ResultLoader
public static Result.Base InvalidCapabilityDebugFlags => new Result.Base(ModuleLoader, 116);
/// <summary>Error code: 2009-0200; Inner value: 0x19009</summary>
public static Result.Base InternalError => new Result.Base(ModuleLoader, 200);
}
}

View file

@ -37,4 +37,4 @@ public static class ResultLr
public static Result.Base DebugProgramNotFound => new Result.Base(ModuleLr, 10);
/// <summary>Error code: 2008-0090; Inner value: 0xb408</summary>
public static Result.Base TooManyRegisteredPaths => new Result.Base(ModuleLr, 90);
}
}

View file

@ -109,4 +109,4 @@ public static class ResultNcm
public static Result.Base InvalidArgument { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base(ModuleNcm, 8181, 8191); }
/// <summary>Error code: 2005-8182; Inner value: 0x3fec05</summary>
public static Result.Base InvalidOffset => new Result.Base(ModuleNcm, 8182);
}
}

View file

@ -181,4 +181,4 @@ public static class ResultSdmmc
public static Result.Base NotSupported => new Result.Base(ModuleSdmmc, 200);
/// <summary>Error code: 2024-0201; Inner value: 0x19218</summary>
public static Result.Base NotImplemented => new Result.Base(ModuleSdmmc, 201);
}
}

View file

@ -39,4 +39,4 @@ public static class ResultCmif
public static Result.Base TargetObjectNotFound => new Result.Base(ModuleSf, 261);
/// <summary>Error code: 2010-0301; Inner value: 0x25a0a</summary>
public static Result.Base OutOfDomainEntry => new Result.Base(ModuleSf, 301);
}
}

View file

@ -23,4 +23,4 @@ public static class ResultSfImpl
public static Result.Base.Abstract RequestInvalidated { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base.Abstract(ModuleSf, 801, 809); }
/// <summary>Error code: 2010-0802; Inner value: 0x6440a</summary>
public static Result.Base RequestInvalidatedByUser => new Result.Base(ModuleSf, 802);
}
}

View file

@ -29,4 +29,4 @@ public static class ResultSf
public static Result.Base.Abstract RequestDeferred { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => new Result.Base.Abstract(ModuleSf, 811, 819); }
/// <summary>Error code: 2010-0812; Inner value: 0x6580a</summary>
public static Result.Base RequestDeferredByUser => new Result.Base(ModuleSf, 812);
}
}

View file

@ -33,4 +33,4 @@ public static class ResultSm
public static Result.Base NotAllowed => new Result.Base(ModuleSm, 8);
/// <summary>Error code: 2021-0009; Inner value: 0x1215</summary>
public static Result.Base TooLargeAccessControl => new Result.Base(ModuleSm, 9);
}
}

View file

@ -48,4 +48,4 @@ public static class ResultSpl
public static Result.Base BootReasonNotSet => new Result.Base(ModuleSpl, 107);
/// <summary>Error code: 2026-0108; Inner value: 0xd81a</summary>
public static Result.Base InvalidArgument => new Result.Base(ModuleSpl, 108);
}
}

View file

@ -103,4 +103,4 @@ public static class ResultSvc
public static Result.Base InvalidId => new Result.Base(ModuleSvc, 519);
/// <summary>Error code: 2001-0520; Inner value: 0x41001</summary>
public static Result.Base ProcessTerminated => new Result.Base(ModuleSvc, 520);
}
}