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

[Chores] Format code

Author: nicolasnoble

src/core/debug.cc

@@ -258,7 +258,7 @@ void PCSX::Debug::checkBP(uint32_t address, BreakpointType type, uint32_t width,
         auto it = torun.begin();
         auto bp = &*it;
         torun.erase(it);
-        if (!triggerBP(bp, address, width, cause)) delete bp; 
+        if (!triggerBP(bp, address, width, cause)) delete bp;
     }
 }
 

src/lua/extra.lua

@@ -17,25 +17,21 @@
 --   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 Support.extra = {
 
-    loadfile = function(name)
-        return loadstring(Support._internal.loadfile(name), '@' .. name)
-    end,
+    loadfile = function(name) return loadstring(Support._internal.loadfile(name), '@' .. name) end,
 
     dofile = function(name)
         local func, msg = loadstring(Support._internal.loadfile(name), '@' .. name)
         if func then return func() end
         error(msg)
     end,
 
-    open = function(name)
-        return Support.File._createFileWrapper(ffi.cast('LuaFile*', Support._internal.open(name)))
-    end,
+    open = function(name) return Support.File._createFileWrapper(ffi.cast('LuaFile*', Support._internal.open(name))) end,
 
     safeFFI = function(name, func, ...)
         local status, ret = pcall(func, ...)
         if status then return ret end
         error('FFI call failed in ' .. name .. ': ' .. ret)
-    end
+    end,
 
 }
 -- )EOF"

src/lua/fileffi.lua

@@ -20,7 +20,7 @@ local C = ffi.load 'SUPPORT_FILE'
 local function validateBuffer(buffer)
     if buffer:maxsize() < buffer.size then
         error('Invalid or corrupted LuaBuffer: claims size of ' .. buffer.size .. ' but actual size is ' ..
-            buffer:maxsize())
+                  buffer:maxsize())
     end
     return buffer
 end
@@ -33,7 +33,8 @@ local function read(self, ptr, size)
         buf.size = size
         return validateBuffer(buf)
     elseif type(ptr) == 'cdata' and size == nil and ffi.typeof(ptr) == Support.File._LuaBuffer then
-        return Support.extra.safeFFI('File::read(C.readFileBuffer)', C.readFileBuffer, self._wrapper, validateBuffer(ptr))
+        return Support.extra.safeFFI('File::read(C.readFileBuffer)', C.readFileBuffer, self._wrapper,
+                                     validateBuffer(ptr))
     elseif type(ptr) == 'userdata' and size == nil then
         return Support._internal.readFileUserData(self._wrapper, ptr)
     end
@@ -49,7 +50,8 @@ local function readAt(self, ptr, size, pos)
         buf.size = size
         return validateBuffer(buf)
     elseif type(ptr) == 'cdata' and type(size) == 'number' and pos == nil and ffi.typeof(ptr) == LuaBuffer then
-        return Support.extra.safeFFI('File::readAt(C.readFileAtBuffer)', C.readFileAtBuffer, self._wrapper, validateBuffer(ptr), size)
+        return Support.extra.safeFFI('File::readAt(C.readFileAtBuffer)', C.readFileAtBuffer, self._wrapper,
+                                     validateBuffer(ptr), size)
     elseif type(ptr) == 'userdata' and type(size) == 'number' and pos == nil then
         return Support._internal.readFileAtUserData(self._wrapper, ptr, size)
     end
@@ -58,26 +60,31 @@ end
 
 local function write(self, data, size)
     if type(data) == 'cdata' and size == nil and ffi.typeof(data) == LuaBuffer then
-        return Support.extra.safeFFI('File::write(C.writeFileBuffer)', C.writeFileBuffer, self._wrapper, validateBuffer(data))
+        return Support.extra.safeFFI('File::write(C.writeFileBuffer)', C.writeFileBuffer, self._wrapper,
+                                     validateBuffer(data))
     elseif type(data) == 'userdata' and size == nil then
         return Support._internal.writeFileUserData(self._wrapper, data)
     elseif type(size) == 'number' then
         return Support.extra.safeFFI('File::write(C.writeFileRawPtr)', C.writeFileRawPtr, self._wrapper, data, size)
     end
     if type(data) ~= 'string' then data = tostring(data) end
-    return Support.extra.safeFFI('File::write(C.writeFileRawPtr)', C.writeFileRawPtr, self._wrapper, data, string.len(data))
+    return Support.extra.safeFFI('File::write(C.writeFileRawPtr)', C.writeFileRawPtr, self._wrapper, data,
+                                 string.len(data))
 end
 
 local function writeAt(self, data, size, pos)
     if type(data) == 'cdata' and type(size) == 'number' and pos == nil and ffi.typeof(data) == LuaBuffer then
-        return Support.extra.safeFFI('File::writeAt(C.writeFileAtBuffer)', C.writeFileAtBuffer, self._wrapper, validateBuffer(data), size)
+        return Support.extra.safeFFI('File::writeAt(C.writeFileAtBuffer)', C.writeFileAtBuffer, self._wrapper,
+                                     validateBuffer(data), size)
     elseif type(data) == 'userdata' and type(size) == 'number' and pos == nil then
         return Support._internal.writeFileAtUserData(self._wrapper, data, size)
     elseif type(size) == 'number' and type(pos) == 'number' then
-        return Support.extra.safeFFI('File::writeAt(C.writeFileAtRawPtr)', C.writeFileAtRawPtr, self._wrapper, data, size, pos)
+        return Support.extra.safeFFI('File::writeAt(C.writeFileAtRawPtr)', C.writeFileAtRawPtr, self._wrapper, data,
+                                     size, pos)
     end
     if type(data) ~= 'string' then data = tostring(data) end
-    return Support.extra.safeFFI('File::writeAt(C.writeFileAtRawPtr)', C.writeFileAtRawPtr, self._wrapper, data, string.len(data), size)
+    return Support.extra.safeFFI('File::writeAt(C.writeFileAtRawPtr)', C.writeFileAtRawPtr, self._wrapper, data,
+                                 string.len(data), size)
 end
 
 local function writeMoveSlice(self, slice) C.writeFileMoveSlice(self._wrapper, slice._wrapper) end
@@ -157,9 +164,7 @@ local int16_t = ffi.typeof 'int16_t[1]'
 local int32_t = ffi.typeof 'int32_t[1]'
 local int64_t = ffi.typeof 'int64_t[1]'
 
-local function deleteFile(wrapper)
-    Support.extra.safeFFI('File::~File', C.deleteFile, wrapper)
-end
+local function deleteFile(wrapper) Support.extra.safeFFI('File::~File', C.deleteFile, wrapper) end
 
 local function createFileWrapper(wrapper)
     local file = {
@@ -295,9 +300,10 @@ end
 local function ffmpegAudioFile(file, options)
     if type(options) ~= 'table' then options = {} end
     local channels, endianness, sampleFormat, frequency = options.channels, options.endianness, options.sampleFormat,
-        options.frequency
-    return createFileWrapper(Support.extra.safeFFI('Support.File.ffmpegAudioFile', C.ffmpegAudioFile, file._wrapper, channels or 'Stereo', endianness or 'Little',
-        sampleFormat or 'S16', frequency or 44100))
+                                                          options.frequency
+    return createFileWrapper(Support.extra.safeFFI('Support.File.ffmpegAudioFile', C.ffmpegAudioFile, file._wrapper,
+                                                   channels or 'Stereo', endianness or 'Little', sampleFormat or 'S16',
+                                                   frequency or 44100))
 end
 
 if (type(Support) ~= 'table') then Support = {} end

src/main/main.cc

@@ -333,8 +333,10 @@ int pcsxMain(int argc, char **argv) {
     bool luacovEnabled = false;
     if (args.get<bool>("luacov")) {
         auto L = *emulator->m_lua;
-        L.load("package.path = package.path .. ';./lua_modules/share/lua/5.1/?.lua;../../../third_party/luacov/src/?.lua;./third_party/luacov/src/?.lua'",
-               "internal:package.path.lua");
+        L.load(
+            "package.path = package.path .. "
+            "';./lua_modules/share/lua/5.1/?.lua;../../../third_party/luacov/src/?.lua;./third_party/luacov/src/?.lua'",
+            "internal:package.path.lua");
         try {
             L.load(R"(
 local runner = require 'luacov.runner'

src/mips/common/crt0/memory-c.c

@@ -24,8 +24,8 @@ SOFTWARE.
 
 */
 
-#include <stdint.h>
 #include <stddef.h>
+#include <stdint.h>
 
 // These are the 4 essential functions expected by gcc for a naked build.
 // The implementation of memcpy is in memory-s.s, and the rest are here.
@@ -87,4 +87,3 @@ __attribute__((weak)) void* memset(void* s_, int c, size_t n) {
 
     return s_;
 }
-

src/support/typestring-wrapper.h

@@ -28,7 +28,7 @@ SOFTWARE.
 
 #include "typestring.hh"
 
-#if defined(_MSC_VER) // && !defined(__clang__)
+#if defined(_MSC_VER)  // && !defined(__clang__)
 #define TYPESTRING_MAX_CONST_CHAR 63
 
 #define TYPESTRING_MIN(a, b) (a) < (b) ? (a) : (b)

src/supportpsx/adpcmffi.lua

@@ -79,12 +79,8 @@ PCSX.Adpcm = {
                     channels = outData
                     outData = nil
                 end
-                if outData == nil then
-                    outData = Support.NewLuaBuffer(56)
-                end
-                if channels == nil then
-                    channels = 1
-                end
+                if outData == nil then outData = Support.NewLuaBuffer(56) end
+                if channels == nil then channels = 1 end
                 local inp = inData
                 local out = outData
                 if Support.isLuaBuffer(inp) then
@@ -109,12 +105,8 @@ PCSX.Adpcm = {
                     blockAttribute = outData
                     outData = nil
                 end
-                if outData == nil then
-                    outData = Support.NewLuaBuffer(16)
-                end
-                if blockAttribute == nil then
-                    blockAttribute = 'OneShot'
-                end
+                if outData == nil then outData = Support.NewLuaBuffer(16) end
+                if blockAttribute == nil then blockAttribute = 'OneShot' end
                 local inp = inData
                 local out = outData
                 if Support.isLuaBuffer(inp) then
@@ -135,13 +127,9 @@ PCSX.Adpcm = {
                 return outData
             end,
             finishSPU = function(self, outData)
-                if outData == nil then
-                    outData = Support.NewLuaBuffer(16)
-                end
+                if outData == nil then outData = Support.NewLuaBuffer(16) end
                 local out = outData
-                if Support.isLuaBuffer(out) then
-                    out = out.data
-                end
+                if Support.isLuaBuffer(out) then out = out.data end
                 C.adpcmEncoderFinishSPU(self._wrapped, out)
                 return outData
             end,
@@ -158,15 +146,9 @@ PCSX.Adpcm = {
                     channels = mode
                     mode = nil
                 end
-                if outData == nil then
-                    outData = Support.NewLuaBuffer(128)
-                end
-                if mode == nil then
-                    mode = 'XAFourBits'
-                end
-                if channels == nil then
-                    channels = 1
-                end
+                if outData == nil then outData = Support.NewLuaBuffer(128) end
+                if mode == nil then mode = 'XAFourBits' end
+                if channels == nil then channels = 1 end
                 local inp = inData
                 local out = outData
                 if Support.isLuaBuffer(inp) then
@@ -190,7 +172,7 @@ PCSX.Adpcm = {
         }
         debug.setmetatable(encoder._proxy, { __gc = function() C.destroyAdpcmEncoder(encoder._wrapped) end })
         return encoder
-    end
+    end,
 }
 
 -- )EOF"