From 9394dde67a03b86243fb718c33ed2fa338211036 Mon Sep 17 00:00:00 2001 From: Arisotura Date: Sun, 6 Mar 2022 21:21:50 +0100 Subject: [PATCH] fix copyright headers --- src/ARMJIT.cpp | 2 +- src/ARMJIT.h | 2 +- src/ARMJIT_Memory.cpp | 38 +++++++++---------- src/ARMJIT_Memory.h | 4 +- src/ARMJIT_x64/ARMJIT_ALU.cpp | 6 +-- src/ARMJIT_x64/ARMJIT_Branch.cpp | 4 +- src/ARMJIT_x64/ARMJIT_Compiler.cpp | 2 +- src/ARMJIT_x64/ARMJIT_Compiler.h | 6 +-- src/ARMJIT_x64/ARMJIT_Linkage.S | 2 +- src/ARMJIT_x64/ARMJIT_LoadStore.cpp | 2 +- src/ARM_InstrInfo.cpp | 2 +- src/ARM_InstrInfo.h | 6 +-- src/GBACart.cpp | 2 +- src/GBACart.h | 2 +- src/frontend/qt_sdl/ArchiveUtil.cpp | 2 +- src/frontend/qt_sdl/ArchiveUtil.h | 2 +- .../qt_sdl/FirmwareSettingsDialog.cpp | 2 +- src/frontend/qt_sdl/FirmwareSettingsDialog.h | 2 +- .../qt_sdl/InterfaceSettingsDialog.cpp | 2 +- src/frontend/qt_sdl/InterfaceSettingsDialog.h | 2 +- .../PowerManagement/PowerManagementDialog.cpp | 2 +- .../PowerManagement/PowerManagementDialog.h | 3 +- src/frontend/qt_sdl/ROMInfoDialog.cpp | 2 +- src/frontend/qt_sdl/ROMInfoDialog.h | 2 +- 24 files changed, 51 insertions(+), 50 deletions(-) diff --git a/src/ARMJIT.cpp b/src/ARMJIT.cpp index 1e7a72ce..99e5a3ff 100644 --- a/src/ARMJIT.cpp +++ b/src/ARMJIT.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2022 melonDS team, RSDuck + Copyright 2016-2022 melonDS team This file is part of melonDS. diff --git a/src/ARMJIT.h b/src/ARMJIT.h index 0432b117..ec2161a5 100644 --- a/src/ARMJIT.h +++ b/src/ARMJIT.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2022 melonDS team, RSDuck + Copyright 2016-2022 melonDS team This file is part of melonDS. diff --git a/src/ARMJIT_Memory.cpp b/src/ARMJIT_Memory.cpp index 9013cea1..dbad9a7f 100644 --- a/src/ARMJIT_Memory.cpp +++ b/src/ARMJIT_Memory.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2022 melonDS team, RSDuck + Copyright 2016-2022 melonDS team This file is part of melonDS. @@ -55,7 +55,7 @@ and map the memory regions as they're structured on the DS in it. - On most systems you have a single piece of main ram, + On most systems you have a single piece of main ram, maybe some video ram and faster cache RAM and that's about it. Here we have not only a lot more different memory regions, but also two address spaces. Not only that but they all have @@ -119,7 +119,7 @@ void HandleFault(u64 pc, u64 lr, u64 fp, u64 faultAddr, u32 desc); extern "C" { - + void ARM_RestoreContext(u64* registers) __attribute__((noreturn)); extern char __start__; @@ -146,7 +146,7 @@ void __libnx_exception_handler(ThreadExceptionDump* ctx) { integerRegisters[32] = (u64)desc.FaultPC; - ARM_RestoreContext(integerRegisters); + ARM_RestoreContext(integerRegisters); } HandleFault(ctx->pc.x, ctx->lr.x, ctx->fp.x, ctx->far.x, ctx->error_desc); @@ -311,7 +311,7 @@ bool MapIntoRange(u32 addr, u32 num, u32 offset, u32 size) { u8* dst = (u8*)(num == 0 ? FastMem9Start : FastMem7Start) + addr; #ifdef __SWITCH__ - Result r = (svcMapProcessMemory(dst, envGetOwnProcessHandle(), + Result r = (svcMapProcessMemory(dst, envGetOwnProcessHandle(), (u64)(MemoryBaseCodeMem + offset), size)); return R_SUCCEEDED(r); #elif defined(_WIN32) @@ -452,7 +452,7 @@ void SetCodeProtection(int region, u32 offset, bool protect) u32 effectiveAddr = mapping.Addr + (offset - mapping.LocalOffset); if (mapping.Num == 0 - && region != memregion_DTCM + && region != memregion_DTCM && (effectiveAddr & NDS::ARM9->DTCMMask) == NDS::ARM9->DTCMBase) continue; @@ -621,7 +621,7 @@ bool MapAtAddress(u32 addr) // this overcomplicated piece of code basically just finds whole pieces of code memory // which can be mapped/protected - u32 offset = 0; + u32 offset = 0; bool skipDTCM = num == 0 && region != memregion_DTCM; while (offset < mirrorSize) { @@ -700,10 +700,10 @@ void Init() virtmemLock(); MemoryBaseCodeMem = (u8*)virtmemFindCodeMemory(MemoryTotalSize, 0x1000); - bool succeded = R_SUCCEEDED(svcMapProcessCodeMemory(envGetOwnProcessHandle(), (u64)MemoryBaseCodeMem, + bool succeded = R_SUCCEEDED(svcMapProcessCodeMemory(envGetOwnProcessHandle(), (u64)MemoryBaseCodeMem, (u64)MemoryBase, MemoryTotalSize)); assert(succeded); - succeded = R_SUCCEEDED(svcSetProcessMemoryPermission(envGetOwnProcessHandle(), (u64)MemoryBaseCodeMem, + succeded = R_SUCCEEDED(svcSetProcessMemoryPermission(envGetOwnProcessHandle(), (u64)MemoryBaseCodeMem, MemoryTotalSize, Perm_Rw)); assert(succeded); @@ -740,7 +740,7 @@ void Init() u8* basePtr = MemoryBase; #else // this used to be allocated with three different mmaps - // The idea was to give the OS more freedom where to position the buffers, + // The idea was to give the OS more freedom where to position the buffers, // but something was bad about this so instead we take this vmem eating monster // which seems to work better. MemoryBase = (u8*)mmap(NULL, AddrSpaceSize*4, PROT_NONE, MAP_ANON | MAP_PRIVATE, -1, 0); @@ -855,7 +855,7 @@ bool IsFastmemCompatible(int region) TODO: with some hacks, the smaller shared WRAM regions could be mapped in some occaisons as well */ - if (region == memregion_DTCM + if (region == memregion_DTCM || region == memregion_SharedWRAM || region == memregion_NewSharedWRAM_B || region == memregion_NewSharedWRAM_C) @@ -1071,7 +1071,7 @@ int ClassifyAddress9(u32 addr) { return memregion_DTCM; } - else + else { if (NDS::ConsoleType == 1 && addr >= 0xFFFF0000 && !(DSi::SCFG_BIOS & (1<<1))) { @@ -1219,8 +1219,8 @@ void* GetFuncForAddr(ARM* cpu, u32 addr, bool store, int size) { switch (size | store) { - case 8: return (void*)GPU3D::Read8; - case 9: return (void*)GPU3D::Write8; + case 8: return (void*)GPU3D::Read8; + case 9: return (void*)GPU3D::Write8; case 16: return (void*)GPU3D::Read16; case 17: return (void*)GPU3D::Write16; case 32: return (void*)GPU3D::Read32; @@ -1256,7 +1256,7 @@ void* GetFuncForAddr(ARM* cpu, u32 addr, bool store, int size) case 0x06000000: switch (size | store) { - case 8: return (void*)VRAMRead; + case 8: return (void*)VRAMRead; case 9: return NULL; case 16: return (void*)VRAMRead; case 17: return (void*)VRAMWrite; @@ -1275,8 +1275,8 @@ void* GetFuncForAddr(ARM* cpu, u32 addr, bool store, int size) { switch (size | store) { - case 8: return (void*)SPU::Read8; - case 9: return (void*)SPU::Write8; + case 8: return (void*)SPU::Read8; + case 9: return (void*)SPU::Write8; case 16: return (void*)SPU::Read16; case 17: return (void*)SPU::Write16; case 32: return (void*)SPU::Read32; @@ -1289,7 +1289,7 @@ void* GetFuncForAddr(ARM* cpu, u32 addr, bool store, int size) switch (size | store) { case 8: return (void*)NDS::ARM7IORead8; - case 9: return (void*)NDS::ARM7IOWrite8; + case 9: return (void*)NDS::ARM7IOWrite8; case 16: return (void*)NDS::ARM7IORead16; case 17: return (void*)NDS::ARM7IOWrite16; case 32: return (void*)NDS::ARM7IORead32; @@ -1301,7 +1301,7 @@ void* GetFuncForAddr(ARM* cpu, u32 addr, bool store, int size) switch (size | store) { case 8: return (void*)DSi::ARM7IORead8; - case 9: return (void*)DSi::ARM7IOWrite8; + case 9: return (void*)DSi::ARM7IOWrite8; case 16: return (void*)DSi::ARM7IORead16; case 17: return (void*)DSi::ARM7IOWrite16; case 32: return (void*)DSi::ARM7IORead32; diff --git a/src/ARMJIT_Memory.h b/src/ARMJIT_Memory.h index 69f66628..726b7108 100644 --- a/src/ARMJIT_Memory.h +++ b/src/ARMJIT_Memory.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2022 melonDS team, RSDuck + Copyright 2016-2022 melonDS team This file is part of melonDS. @@ -78,4 +78,4 @@ void* GetFuncForAddr(ARM* cpu, u32 addr, bool store, int size); } -#endif \ No newline at end of file +#endif diff --git a/src/ARMJIT_x64/ARMJIT_ALU.cpp b/src/ARMJIT_x64/ARMJIT_ALU.cpp index 699cf24e..0a364eaf 100644 --- a/src/ARMJIT_x64/ARMJIT_ALU.cpp +++ b/src/ARMJIT_x64/ARMJIT_ALU.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2022 melonDS team, RSDuck + Copyright 2016-2022 melonDS team This file is part of melonDS. @@ -364,7 +364,7 @@ void Compiler::A_Comp_Mul_Long() { BSR(32, RSCRATCH, R(RSCRATCH3)); } - + SHR(32, R(RSCRATCH), Imm8(3)); SetJumpTarget(zeroBSR); // fortunately that's even right Comp_AddCycles_CI(RSCRATCH, 2); @@ -617,7 +617,7 @@ void Compiler::T_Comp_AddSub_() int op = (CurInstr.Instr >> 9) & 0x3; OpArg rn = op >= 2 ? Imm32((CurInstr.Instr >> 6) & 0x7) : MapReg(CurInstr.T_Reg(6)); - + Comp_AddCycles_C(); // special case for thumb mov being alias to add rd, rn, #0 diff --git a/src/ARMJIT_x64/ARMJIT_Branch.cpp b/src/ARMJIT_x64/ARMJIT_Branch.cpp index 699af219..84516655 100644 --- a/src/ARMJIT_x64/ARMJIT_Branch.cpp +++ b/src/ARMJIT_x64/ARMJIT_Branch.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2022 melonDS team, RSDuck + Copyright 2016-2022 melonDS team This file is part of melonDS. @@ -30,7 +30,7 @@ int squeezePointer(T* ptr) assert((T*)((u64)truncated) == ptr); return truncated; } - + void Compiler::Comp_JumpTo(u32 addr, bool forceNonConstantCycles) { // we can simplify constant branches by a lot diff --git a/src/ARMJIT_x64/ARMJIT_Compiler.cpp b/src/ARMJIT_x64/ARMJIT_Compiler.cpp index d9332c84..fa015f4b 100644 --- a/src/ARMJIT_x64/ARMJIT_Compiler.cpp +++ b/src/ARMJIT_x64/ARMJIT_Compiler.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2022 melonDS team, RSDuck + Copyright 2016-2022 melonDS team This file is part of melonDS. diff --git a/src/ARMJIT_x64/ARMJIT_Compiler.h b/src/ARMJIT_x64/ARMJIT_Compiler.h index b3bc8d78..f5817a92 100644 --- a/src/ARMJIT_x64/ARMJIT_Compiler.h +++ b/src/ARMJIT_x64/ARMJIT_Compiler.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2022 melonDS team, RSDuck + Copyright 2016-2022 melonDS team This file is part of melonDS. @@ -121,7 +121,7 @@ public: void A_Comp_Mul_Long(); void A_Comp_CLZ(); - + void A_Comp_MemWB(); void A_Comp_MemHalf(); void A_Comp_LDM_STM(); @@ -170,7 +170,7 @@ public: s32 Comp_MemAccessBlock(int rn, BitSet16 regs, bool store, bool preinc, bool decrement, bool usermode, bool skipLoadingRn); bool Comp_MemLoadLiteral(int size, bool signExtend, int rd, u32 addr); - void Comp_ArithTriOp(void (Compiler::*op)(int, const Gen::OpArg&, const Gen::OpArg&), + void Comp_ArithTriOp(void (Compiler::*op)(int, const Gen::OpArg&, const Gen::OpArg&), Gen::OpArg rd, Gen::OpArg rn, Gen::OpArg op2, bool carryUsed, int opFlags); void Comp_ArithTriOpReverse(void (Compiler::*op)(int, const Gen::OpArg&, const Gen::OpArg&), Gen::OpArg rd, Gen::OpArg rn, Gen::OpArg op2, bool carryUsed, int opFlags); diff --git a/src/ARMJIT_x64/ARMJIT_Linkage.S b/src/ARMJIT_x64/ARMJIT_Linkage.S index ba88bd76..fe7b1435 100644 --- a/src/ARMJIT_x64/ARMJIT_Linkage.S +++ b/src/ARMJIT_x64/ARMJIT_Linkage.S @@ -1,5 +1,5 @@ /* - Copyright 2016-2022 melonDS team, RSDuck + Copyright 2016-2022 melonDS team This file is part of melonDS. diff --git a/src/ARMJIT_x64/ARMJIT_LoadStore.cpp b/src/ARMJIT_x64/ARMJIT_LoadStore.cpp index 80c3237c..7b28e68e 100644 --- a/src/ARMJIT_x64/ARMJIT_LoadStore.cpp +++ b/src/ARMJIT_x64/ARMJIT_LoadStore.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2022 melonDS team, RSDuck + Copyright 2016-2022 melonDS team This file is part of melonDS. diff --git a/src/ARM_InstrInfo.cpp b/src/ARM_InstrInfo.cpp index 42860ff0..a7171ba0 100644 --- a/src/ARM_InstrInfo.cpp +++ b/src/ARM_InstrInfo.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2022 melonDS team, RSDuck + Copyright 2016-2022 melonDS team This file is part of melonDS. diff --git a/src/ARM_InstrInfo.h b/src/ARM_InstrInfo.h index 058981e4..0104027f 100644 --- a/src/ARM_InstrInfo.h +++ b/src/ARM_InstrInfo.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2022 melonDS team, RSDuck + Copyright 2016-2022 melonDS team This file is part of melonDS. @@ -222,7 +222,7 @@ enum tk_POP, tk_LDMIA, tk_STMIA, - + tk_BCOND, tk_BX, tk_BLX_REG, @@ -278,4 +278,4 @@ Info Decode(bool thumb, u32 num, u32 instr); } -#endif \ No newline at end of file +#endif diff --git a/src/GBACart.cpp b/src/GBACart.cpp index e09661e4..68507bca 100644 --- a/src/GBACart.cpp +++ b/src/GBACart.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2022 melonDS team, Raphaël Zumer + Copyright 2016-2022 melonDS team This file is part of melonDS. diff --git a/src/GBACart.h b/src/GBACart.h index 23814016..8610714e 100644 --- a/src/GBACart.h +++ b/src/GBACart.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2022 melonDS team, Raphaël Zumer + Copyright 2016-2022 melonDS team This file is part of melonDS. diff --git a/src/frontend/qt_sdl/ArchiveUtil.cpp b/src/frontend/qt_sdl/ArchiveUtil.cpp index 12264ba1..fff1a944 100644 --- a/src/frontend/qt_sdl/ArchiveUtil.cpp +++ b/src/frontend/qt_sdl/ArchiveUtil.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2022 melonDS team, WaluigiWare64 + Copyright 2016-2022 melonDS team This file is part of melonDS. diff --git a/src/frontend/qt_sdl/ArchiveUtil.h b/src/frontend/qt_sdl/ArchiveUtil.h index 23a55670..761f5427 100644 --- a/src/frontend/qt_sdl/ArchiveUtil.h +++ b/src/frontend/qt_sdl/ArchiveUtil.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2022 melonDS team, WaluigiWare64 + Copyright 2016-2022 melonDS team This file is part of melonDS. diff --git a/src/frontend/qt_sdl/FirmwareSettingsDialog.cpp b/src/frontend/qt_sdl/FirmwareSettingsDialog.cpp index 976934f9..90b5182e 100644 --- a/src/frontend/qt_sdl/FirmwareSettingsDialog.cpp +++ b/src/frontend/qt_sdl/FirmwareSettingsDialog.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2020 Arisotura + Copyright 2016-2022 melonDS team This file is part of melonDS. diff --git a/src/frontend/qt_sdl/FirmwareSettingsDialog.h b/src/frontend/qt_sdl/FirmwareSettingsDialog.h index 7ed8b0bd..f4b4b8bd 100644 --- a/src/frontend/qt_sdl/FirmwareSettingsDialog.h +++ b/src/frontend/qt_sdl/FirmwareSettingsDialog.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2020 Arisotura + Copyright 2016-2022 melonDS team This file is part of melonDS. diff --git a/src/frontend/qt_sdl/InterfaceSettingsDialog.cpp b/src/frontend/qt_sdl/InterfaceSettingsDialog.cpp index d3694f89..7c5eae61 100644 --- a/src/frontend/qt_sdl/InterfaceSettingsDialog.cpp +++ b/src/frontend/qt_sdl/InterfaceSettingsDialog.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2022 melonDS team, WaluigiWare64 + Copyright 2016-2022 melonDS team This file is part of melonDS. diff --git a/src/frontend/qt_sdl/InterfaceSettingsDialog.h b/src/frontend/qt_sdl/InterfaceSettingsDialog.h index 579af0ac..114aa047 100644 --- a/src/frontend/qt_sdl/InterfaceSettingsDialog.h +++ b/src/frontend/qt_sdl/InterfaceSettingsDialog.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2022 melonDS team, WaluigiWare64 + Copyright 2016-2022 melonDS team This file is part of melonDS. diff --git a/src/frontend/qt_sdl/PowerManagement/PowerManagementDialog.cpp b/src/frontend/qt_sdl/PowerManagement/PowerManagementDialog.cpp index b67736a0..0cd204d6 100644 --- a/src/frontend/qt_sdl/PowerManagement/PowerManagementDialog.cpp +++ b/src/frontend/qt_sdl/PowerManagement/PowerManagementDialog.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2021 Rayyan Ansari + Copyright 2016-2022 melonDS team This file is part of melonDS. diff --git a/src/frontend/qt_sdl/PowerManagement/PowerManagementDialog.h b/src/frontend/qt_sdl/PowerManagement/PowerManagementDialog.h index c9f3b4a8..666bbd69 100644 --- a/src/frontend/qt_sdl/PowerManagement/PowerManagementDialog.h +++ b/src/frontend/qt_sdl/PowerManagement/PowerManagementDialog.h @@ -1,5 +1,6 @@ /* - Copyright 2016-2021 Rayyan Ansari + Copyright 2016-2022 melonDS team + This file is part of melonDS. melonDS is free software: you can redistribute it and/or modify it under diff --git a/src/frontend/qt_sdl/ROMInfoDialog.cpp b/src/frontend/qt_sdl/ROMInfoDialog.cpp index 6680bf86..0a71dc8b 100644 --- a/src/frontend/qt_sdl/ROMInfoDialog.cpp +++ b/src/frontend/qt_sdl/ROMInfoDialog.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2022 melonDS team, WaluigiWare64 + Copyright 2016-2022 melonDS team This file is part of melonDS. diff --git a/src/frontend/qt_sdl/ROMInfoDialog.h b/src/frontend/qt_sdl/ROMInfoDialog.h index a3c5a143..fd036a02 100644 --- a/src/frontend/qt_sdl/ROMInfoDialog.h +++ b/src/frontend/qt_sdl/ROMInfoDialog.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2022 melonDS team, WaluigiWare64 + Copyright 2016-2022 melonDS team This file is part of melonDS.