Merge pull request #1787 from grumpycoders/chores-code-format

nicolasnoble · web-flow · commit faee80688fa0 · 2025-02-09T20:07:34.000-08:00
[Chores] Format code
diff --git a/src/cdrom/file.cc b/src/cdrom/file.cc
@@ -19,9 +19,10 @@
 
 #include "cdrom/file.h"
 
+#include <magic_enum_all.hpp>
+
 #include "cdrom/cdriso.h"
 #include "iec-60908b/edcecc.h"
-#include <magic_enum_all.hpp>
 
 PCSX::CDRIsoFile::CDRIsoFile(std::shared_ptr<CDRIso> iso, uint32_t lba, int32_t size, SectorMode mode)
     : File(RW_SEEKABLE), m_iso(iso), m_lba(lba) {
diff --git a/src/core/cdrom.cc b/src/core/cdrom.cc
@@ -23,11 +23,12 @@
 
 #include "core/cdrom.h"
 
+#include <magic_enum_all.hpp>
+
 #include "cdrom/iso9660-reader.h"
 #include "core/debug.h"
 #include "core/psxdma.h"
 #include "core/psxemulator.h"
-#include <magic_enum_all.hpp>
 #include "spu/interface.h"
 #include "support/strings-helpers.h"
 
diff --git a/src/core/display.cc b/src/core/display.cc
@@ -17,10 +17,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 #include <algorithm>
+#include <magic_enum_all.hpp>
 
 #include "core/gpu.h"
 #include "core/psxemulator.h"
-#include <magic_enum_all.hpp>
 
 void PCSX::GPU::Display::reset() {
     x1 = 0x200;
diff --git a/src/core/gdb-server.cc b/src/core/gdb-server.cc
@@ -21,14 +21,15 @@
 
 #include <assert.h>
 
+#include <magic_enum_all.hpp>
+
 #include "core/cdrom.h"
 #include "core/debug.h"
 #include "core/psxemulator.h"
 #include "core/psxmem.h"
 #include "core/r3000a.h"
 #include "core/system.h"
 #include "fmt/format.h"
-#include <magic_enum_all.hpp>
 #include "support/strings-helpers.h"
 
 const char PCSX::GdbClient::toHex[] = "0123456789ABCDEF";
diff --git a/src/core/gpu.cc b/src/core/gpu.cc
@@ -21,14 +21,15 @@
 
 #include "core/gpu.h"
 
+#include <magic_enum_all.hpp>
+
 #include "core/debug.h"
 #include "core/gpulogger.h"
 #include "core/pgxp_mem.h"
 #include "core/psxdma.h"
 #include "core/psxhw.h"
 #include "imgui/imgui.h"
 #include "imgui/imgui_internal.h"
-#include <magic_enum_all.hpp>
 
 #define GPUSTATUS_READYFORVRAM 0x08000000
 #define GPUSTATUS_IDLE 0x04000000  // CMD ready
diff --git a/src/core/gpu.h b/src/core/gpu.h
@@ -22,6 +22,7 @@
 #include <stdint.h>
 
 #include <functional>
+#include <magic_enum_all.hpp>
 #include <memory>
 #include <stdexcept>
 #include <string>
@@ -31,7 +32,6 @@
 
 #include "core/psxemulator.h"
 #include "core/psxmem.h"
-#include <magic_enum_all.hpp>
 #include "support/eventbus.h"
 #include "support/file.h"
 #include "support/list.h"
diff --git a/src/core/kernel.cc b/src/core/kernel.cc
@@ -19,11 +19,11 @@
 
 #include "core/kernel.h"
 
+#include <magic_enum_all.hpp>
 #include <string>
 
 #include "core/psxmem.h"
 #include "fmt/format.h"
-#include <magic_enum_all.hpp>
 
 enum class Hw {
     VBLANK = 0x00000001,
diff --git a/src/core/logger.h b/src/core/logger.h
@@ -19,11 +19,11 @@
 
 #pragma once
 
+#include <magic_enum_all.hpp>
 #include <utility>
 
 #include "core/system.h"
 #include "fmt/printf.h"
-#include <magic_enum_all.hpp>
 
 namespace PCSX {
 
diff --git a/src/core/pad.cc b/src/core/pad.cc
@@ -27,13 +27,13 @@
 #include <algorithm>
 #include <array>
 #include <cmath>
+#include <magic_enum_all.hpp>
 
 #include "core/psxemulator.h"
 #include "core/system.h"
 #include "fmt/format.h"
 #include "gui/gui.h"
 #include "imgui.h"
-#include <magic_enum_all.hpp>
 #include "support/file.h"
 #include "support/imgui-helpers.h"
 
diff --git a/src/core/pcsxlua.cc b/src/core/pcsxlua.cc
@@ -34,7 +34,7 @@ struct LuaBreakpoint {
     PCSX::Debug::BreakpointUserListType wrapper;
 };
 
-uint64_t getCPUCycles() { return PCSX::g_emulator->m_cpu->m_regs.cycle;  }
+uint64_t getCPUCycles() { return PCSX::g_emulator->m_cpu->m_regs.cycle; }
 void* getMemPtr() { return PCSX::g_emulator->m_mem->m_wram; }
 void* getParPtr() { return PCSX::g_emulator->m_mem->m_exp1; }
 void* getRomPtr() { return PCSX::g_emulator->m_mem->m_bios; }
diff --git a/src/core/psxemulator.cc b/src/core/psxemulator.cc
@@ -128,7 +128,7 @@ void PCSX::Emulator::setLua() {
     L.pop();
     L.pop();
     L.pop();
-    
+
     m_pads->setLua(L);
 
     assert(L.gettop() == 0);
diff --git a/src/core/r3000a.cc b/src/core/r3000a.cc
@@ -23,6 +23,8 @@
 
 #include "core/r3000a.h"
 
+#include <magic_enum_all.hpp>
+
 #include "core/cdrom.h"
 #include "core/debug.h"
 #include "core/gpu.h"
@@ -33,7 +35,6 @@
 #include "core/sio1.h"
 #include "core/spu.h"
 #include "fmt/format.h"
-#include <magic_enum_all.hpp>
 
 int PCSX::R3000Acpu::psxInit() {
     g_system->printf(_("PCSX-Redux booting\n"));
diff --git a/src/core/web-server.cc b/src/core/web-server.cc
@@ -19,7 +19,11 @@
 
 #include "core/web-server.h"
 
+#include <llhttp.h>
+#include <multipart_parser.h>
+
 #include <charconv>
+#include <magic_enum_all.hpp>
 #include <map>
 #include <memory>
 #include <string>
@@ -36,10 +40,7 @@
 #include "core/r3000a.h"
 #include "core/system.h"
 #include "gui/gui.h"
-#include <llhttp.h>
 #include "lua/luawrapper.h"
-#include <magic_enum_all.hpp>
-#include <multipart_parser.h>
 #include "support/file.h"
 #include "support/hashtable.h"
 #include "support/strings-helpers.h"
diff --git a/src/gui/gui.cc b/src/gui/gui.cc
@@ -42,6 +42,7 @@ extern "C" {
 #include <exception>
 #include <fstream>
 #include <iomanip>
+#include <magic_enum_all.hpp>
 #include <numbers>
 #include <type_traits>
 #include <unordered_set>
@@ -78,7 +79,6 @@ extern "C" {
 #include "lua/glffi.h"
 #include "lua/luafile.h"
 #include "lua/luawrapper.h"
-#include <magic_enum_all.hpp>
 #include "nanovg/src/nanovg.h"
 #include "nanovg/src/nanovg_gl.h"
 #include "nanovg/src/nanovg_gl_utils.h"
diff --git a/src/gui/gui.h b/src/gui/gui.h
@@ -23,6 +23,7 @@
 #include <stdarg.h>
 
 #include <functional>
+#include <magic_enum_all.hpp>
 #include <map>
 #include <set>
 #include <string>
@@ -59,7 +60,6 @@
 #include "imgui.h"
 #include "imgui_md/imgui_md.h"
 #include "imgui_memory_editor/imgui_memory_editor.h"
-#include <magic_enum_all.hpp>
 #include "support/eventbus.h"
 #include "support/settings.h"
 #include "support/version.h"
diff --git a/src/gui/luaimguiextra.cc b/src/gui/luaimguiextra.cc
@@ -17,10 +17,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
-#include <string_view>
-
 #include "gui/luaimguiextra.h"
 
+#include <string_view>
+
 #include "gui/gui.h"
 #include "imgui/imgui.h"
 #include "imgui_stdlib.h"
diff --git a/src/gui/widgets/log.cc b/src/gui/widgets/log.cc
@@ -19,13 +19,14 @@
 
 #include "gui/widgets/log.h"
 
+#include <magic_enum_all.hpp>
+
 #include "core/logger.h"
 #include "core/psxemulator.h"
 #include "core/system.h"
 #include "gui/gui.h"
 #include "imgui.h"
 #include "imgui_internal.h"
-#include <magic_enum_all.hpp>
 
 PCSX::Widgets::Log::json PCSX::Widgets::Log::serialize() const {
     json ret;
diff --git a/src/mips/common/crt0/cxxglue.c b/src/mips/common/crt0/cxxglue.c
@@ -43,9 +43,9 @@ extern fptr __preinit_array_end[] __attribute__((weak));
 extern fptr __init_array_start[] __attribute__((weak));
 extern fptr __init_array_end[] __attribute__((weak));
 
-int main(int argc, char ** argv);
+int main(int argc, char** argv);
 
-void cxxmain(int argc, char ** argv) {
+void cxxmain(int argc, char** argv) {
     size_t count, i;
 
     count = __preinit_array_end - __preinit_array_start;
@@ -69,16 +69,16 @@ void cxxmain(int argc, char ** argv) {
 
 // These two technically aren't part of the standard library requirements, but can
 // be invoked by the freestanding libstdc++, so might as well.
-__attribute__((weak)) size_t strlen(const char * s) {
+__attribute__((weak)) size_t strlen(const char* s) {
     size_t r = 0;
 
     while (*s++) r++;
 
     return r;
 }
 
-__attribute__((weak)) const void * memchr(const void * _s, int c, size_t n) {
-    const uint8_t * s = (uint8_t *) _s;
+__attribute__((weak)) const void* memchr(const void* _s, int c, size_t n) {
+    const uint8_t* s = (uint8_t*)_s;
     size_t i;
 
     for (i = 0; i < n; i++, s++) {
diff --git a/src/mips/psyqo/examples/cube/cube.cpp b/src/mips/psyqo/examples/cube/cube.cpp
@@ -175,7 +175,7 @@ void CubeScene::frame() {
 
         // Read the result of nclip and skip rendering this face if it's not facing us
         int32_t mac0 = 0;
-        psyqo::GTE::read<psyqo::GTE::Register::MAC0>(reinterpret_cast<uint32_t *>(&mac0));
+        psyqo::GTE::read<psyqo::GTE::Register::MAC0>(reinterpret_cast<uint32_t*>(&mac0));
         if (mac0 <= 0) continue;
 
         // Since the GTE can only handle 3 vertices at a time, we need to store our first vertex
@@ -191,7 +191,7 @@ void CubeScene::frame() {
         // Calculate the average Z for the z-Index to be put in the ordering table
         psyqo::GTE::Kernels::avsz4();
         int32_t zIndex = 0;
-        psyqo::GTE::read<psyqo::GTE::Register::OTZ>(reinterpret_cast<uint32_t *>(&zIndex));
+        psyqo::GTE::read<psyqo::GTE::Register::OTZ>(reinterpret_cast<uint32_t*>(&zIndex));
 
         // If the Z-index is out of bounds for our ordering table, we skip rendering this face.
         if (zIndex < 0 || zIndex >= ORDERING_TABLE_SIZE) continue;
diff --git a/src/mips/psyqo/examples/pcsxlua/pcsxlua.lua b/src/mips/psyqo/examples/pcsxlua/pcsxlua.lua
@@ -20,31 +20,32 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
---]]
-
--- This is the companion Lua script for the PCSX-Redux Lua editor demo.
+--]] -- This is the companion Lua script for the PCSX-Redux Lua editor demo.
 -- See pcsxlua.cpp for the C++ side of the demo.
-
 local addresses = {}
 PCSX.execSlots[255] = function()
-  local mem = PCSX.getMemPtr()
-  local regs = PCSX.getRegisters().GPR.n
-  local name = ffi.string(mem + bit.band(regs.a1, 0x7fffff))
-  addresses[name] = regs.a0
+    local mem = PCSX.getMemPtr()
+    local regs = PCSX.getRegisters().GPR.n
+    local name = ffi.string(mem + bit.band(regs.a1, 0x7fffff))
+    addresses[name] = regs.a0
 end
 
 function DrawImguiFrame()
-  imgui.safe.Begin('Lua editor demo', true, function()
-    local mem = PCSX.getMemoryAsFile()
-    local addr = addresses['pcsxLuaScene.m_bg']
-    if type(addr) == 'number' then
-      local color = { r = mem:readU8At(addr + 0) / 255, g = mem:readU8At(addr + 1) / 255, b = mem:readU8At(addr + 2) / 255 }
-      local modified, n = imgui.extra.ColorEdit3('bgColor', color)
-      if modified then
-        mem:writeU8At(n.r * 255, addr + 0)
-        mem:writeU8At(n.g * 255, addr + 1)
-        mem:writeU8At(n.b * 255, addr + 2)
-      end
-    end
-  end)
+    imgui.safe.Begin('Lua editor demo', true, function()
+        local mem = PCSX.getMemoryAsFile()
+        local addr = addresses['pcsxLuaScene.m_bg']
+        if type(addr) == 'number' then
+            local color = {
+                r = mem:readU8At(addr + 0) / 255,
+                g = mem:readU8At(addr + 1) / 255,
+                b = mem:readU8At(addr + 2) / 255,
+            }
+            local modified, n = imgui.extra.ColorEdit3('bgColor', color)
+            if modified then
+                mem:writeU8At(n.r * 255, addr + 0)
+                mem:writeU8At(n.g * 255, addr + 1)
+                mem:writeU8At(n.b * 255, addr + 2)
+            end
+        end
+    end)
 end
diff --git a/src/mips/psyqo/iso9660-parser.hh b/src/mips/psyqo/iso9660-parser.hh
@@ -26,12 +26,12 @@ SOFTWARE.
 
 #pragma once
 
-#include <coroutine>
-
 #include <EASTL/fixed_string.h>
 #include <EASTL/functional.h>
 #include <EASTL/string_view.h>
 
+#include <coroutine>
+
 #include "psyqo/cdrom.hh"
 #include "psyqo/task.hh"
 
diff --git a/src/mips/psyqo/kernel.hh b/src/mips/psyqo/kernel.hh
@@ -110,7 +110,8 @@ enum class IRQ : unsigned {
 /**
  * @brief Stops the execution of the application.
  */
-[[noreturn]] static inline void abort(const char* msg, std::source_location location = std::source_location::current()) {
+[[noreturn]] static inline void abort(const char* msg,
+                                      std::source_location location = std::source_location::current()) {
     if constexpr (debugMode) {
         Internal::abort(msg, location);
     } else if constexpr (!debugMode) {
diff --git a/src/mips/psyqo/primitives/common.hh b/src/mips/psyqo/primitives/common.hh
@@ -102,7 +102,7 @@ enum ColorMode { Tex4Bits, Tex8Bits, Tex16Bits };
 }  // namespace Prim::TPageAttr
 
 namespace Prim {
-    enum class Transparency { Auto, Opaque, SemiTransparent };
+enum class Transparency { Auto, Opaque, SemiTransparent };
 }
 
 namespace PrimPieces {
diff --git a/src/mips/psyqo/primitives/control.hh b/src/mips/psyqo/primitives/control.hh
diff --git a/src/mips/psyqo/shared.hh b/src/mips/psyqo/shared.hh
diff --git a/src/support/settings.h b/src/support/settings.h
