Pshittyload

.circleci/config.yml

@@ -18,6 +18,10 @@ jobs:
           name: Build
           command: |
             make -j 2
+            make -C src/mips/serial -j 2
+            make -C src/mips/hello -j 2
+            make -C src/mips/pshittyload -j 2
+            make -C src/mips/tinyload -j 2
             make -C src/mips/shell -j 2
             make -C src/mips/openbios -j 2
 

.gitignore

@@ -33,3 +33,4 @@ vsprojects/packages
 /memcard1.mcd
 /memcard2.mcd
 
+src/.clang-format

env.list

@@ -4,3 +4,4 @@ LD=clang++-9
 XDG_DATA_HOME=/home/coder
 XDG_CACHE_HOME=/home/coder
 HOME=/home/coder
+PS1SDK=/project/src/mips/ps1sdk

src/.clang-format-asm

@@ -0,0 +1,4 @@
+BasedOnStyle: WebKit
+IndentWidth: 4
+ColumnLimit: 120
+AccessModifierOffset: -2

src/core/cdrom.cc

@@ -65,7 +65,7 @@ class CDRomImpl : public PCSX::CDRom {
         CdlReadToc = 30,
     };
 
-    static const inline char *CmdName[] = {
+    static const inline char* CmdName[] = {
         "CdlSync",     "CdlNop",     "CdlSetloc", "CdlPlay",  "CdlForward", "CdlBackward",  "CdlReadN",   "CdlStandby",
         "CdlStop",     "CdlPause",   "CdlInit",   "CdlMute",  "CdlDemute",  "CdlSetfilter", "CdlSetmode", "CdlGetmode",
         "CdlGetlocL",  "CdlGetlocP", "CdlReadT",  "CdlGetTN", "CdlGetTD",   "CdlSeekL",     "CdlSeekP",   "CdlSetclock",
@@ -141,16 +141,16 @@ class CDRomImpl : public PCSX::CDRom {
 
     struct CdrStat cdr_stat;
 
-    static constexpr unsigned int msf2sec(const uint8_t *msf) { return ((msf[0] * 60 + msf[1]) * 75) + msf[2]; }
-    static constexpr void sec2msf(unsigned int s, uint8_t *msf) {
+    static constexpr unsigned int msf2sec(const uint8_t* msf) { return ((msf[0] * 60 + msf[1]) * 75) + msf[2]; }
+    static constexpr void sec2msf(unsigned int s, uint8_t* msf) {
         msf[0] = s / 75 / 60;
         s = s - msf[0] * 75 * 60;
         msf[1] = s / 75;
         s = s - msf[1] * 75;
         msf[2] = s;
     }
     // for that weird psemu API..
-    static constexpr unsigned int fsm2sec(const uint8_t *msf) { return ((msf[2] * 60 + msf[1]) * 75) + msf[0]; }
+    static constexpr unsigned int fsm2sec(const uint8_t* msf) { return ((msf[2] * 60 + msf[1]) * 75) + msf[0]; }
 
     static const uint32_t H_SPUirqAddr = 0x1f801da4;
     static const uint32_t H_SPUaddr = 0x1f801da6;
@@ -334,7 +334,7 @@ class CDRomImpl : public PCSX::CDRom {
         }
     }
 
-    void Find_CurTrack(const uint8_t *time) {
+    void Find_CurTrack(const uint8_t* time) {
         int current, sect;
 
         current = msf2sec(time);
@@ -347,7 +347,7 @@ class CDRomImpl : public PCSX::CDRom {
         CDR_LOG("Find_CurTrack *** %02d %02d\n", m_curTrack, current);
     }
 
-    void generate_subq(const uint8_t *time) {
+    void generate_subq(const uint8_t* time) {
         unsigned char start[3], next[3];
         unsigned int this_s, start_s, next_s, pregap;
         int relative_s;
@@ -394,9 +394,9 @@ class CDRomImpl : public PCSX::CDRom {
         m_subq.absolute[2] = itob(time[2]);
     }
 
-    void ReadTrack(const uint8_t *time) {
+    void ReadTrack(const uint8_t* time) {
         unsigned char tmp[3];
-        struct SubQ *subq;
+        struct SubQ* subq;
         uint16_t crc;
 
         tmp[0] = itob(time[0]);
@@ -410,9 +410,9 @@ class CDRomImpl : public PCSX::CDRom {
         m_suceeded = m_iso.readTrack(tmp);
         memcpy(m_prev, tmp, 3);
 
-        subq = (struct SubQ *)m_iso.getBufferSub();
+        subq = (struct SubQ*)m_iso.getBufferSub();
         if (subq != NULL && m_curTrack == 1) {
-            crc = calcCrc((uint8_t *)subq + 12, 10);
+            crc = calcCrc((uint8_t*)subq + 12, 10);
             if (crc == (((uint16_t)subq->CRC[0] << 8) | subq->CRC[1])) {
                 m_subq.track = subq->TrackNumber;
                 m_subq.index = subq->IndexNumber;
@@ -526,8 +526,8 @@ class CDRomImpl : public PCSX::CDRom {
         if (!m_muted) {
             m_iso.readCDDA(m_setSectorPlay[0], m_setSectorPlay[1], m_setSectorPlay[2], m_transfer);
 
-            attenuate((int16_t *)m_transfer, CD_FRAMESIZE_RAW / 4, 1);
-            PCSX::g_emulator.m_spu->playCDDAchannel((short *)m_transfer, CD_FRAMESIZE_RAW);
+            attenuate((int16_t*)m_transfer, CD_FRAMESIZE_RAW / 4, 1);
+            PCSX::g_emulator.m_spu->playCDDAchannel((short*)m_transfer, CD_FRAMESIZE_RAW);
         }
 
         m_setSectorPlay[2]++;
@@ -891,7 +891,7 @@ class CDRomImpl : public PCSX::CDRom {
                 }
                 m_result[0] |= (m_result[1] >> 4) & 0x08;
 
-                strncpy((char *)&m_result[4], "PCSX", 4);
+                strncpy((char*)&m_result[4], "PCSX", 4);
                 m_stat = Complete;
                 break;
 
@@ -943,7 +943,7 @@ class CDRomImpl : public PCSX::CDRom {
                 // Crusaders of Might and Magic - update getlocl now
                 // - fixes cutscene speech
                 {
-                    uint8_t *buf = m_iso.getBuffer();
+                    uint8_t* buf = m_iso.getBuffer();
                     if (buf != NULL) memcpy(m_transfer, buf, 8);
                 }
 
@@ -1024,7 +1024,7 @@ class CDRomImpl : public PCSX::CDRom {
         return v;
     }
 
-    void attenuate(int16_t *buf, int samples, int stereo) final {
+    void attenuate(int16_t* buf, int samples, int stereo) final {
         int i, l, r;
         int ll = m_attenuatorLeftToLeft;
         int lr = m_attenuatorLeftToRight;
@@ -1054,7 +1054,7 @@ class CDRomImpl : public PCSX::CDRom {
     }
 
     void readInterrupt() final {
-        uint8_t *buf;
+        uint8_t* buf;
 
         if (!m_reading) return;
 
@@ -1353,7 +1353,7 @@ class CDRomImpl : public PCSX::CDRom {
     void dma(uint32_t madr, uint32_t bcr, uint32_t chcr) final {
         uint32_t cdsize;
         unsigned i;
-        uint8_t *ptr;
+        uint8_t* ptr;
 
         CDR_LOG("dma() Log: *** DMA 3 *** %x addr = %x size = %x\n", chcr, madr, bcr);
 
@@ -1384,7 +1384,7 @@ class CDRomImpl : public PCSX::CDRom {
                     }
                 }
 
-                ptr = (uint8_t *)PSXM(madr);
+                ptr = (uint8_t*)PSXM(madr);
                 if (ptr == NULL) {
                     CDR_LOG("dma() Log: *** DMA 3 *** NULL Pointer!\n");
                     break;
@@ -1568,4 +1568,4 @@ class CDRomImpl : public PCSX::CDRom {
 
 }  // namespace
 
-PCSX::CDRom *PCSX::CDRom::factory() { return new CDRomImpl; }
+PCSX::CDRom* PCSX::CDRom::factory() { return new CDRomImpl; }

src/core/cheat.cc

@@ -43,8 +43,8 @@ void PCSX::Cheats::ClearAllCheats() {
 }
 
 // load cheats from the specific filename
-void PCSX::Cheats::LoadCheats(const char *filename) {
-    FILE *fp;
+void PCSX::Cheats::LoadCheats(const char* filename) {
+    FILE* fp;
     char buf[256];
     int count = 0;
     unsigned int t1, t2;
@@ -73,9 +73,9 @@ void PCSX::Cheats::LoadCheats(const char *filename) {
                 if (g_cheats == NULL) {
                     assert(g_numCheats == 0);
                     assert(s_numCheatsAllocated == ALLOC_INCREMENT);
-                    g_cheats = (Cheat *)malloc(sizeof(Cheat) * s_numCheatsAllocated);
+                    g_cheats = (Cheat*)malloc(sizeof(Cheat) * s_numCheatsAllocated);
                 } else {
-                    g_cheats = (Cheat *)realloc(g_cheats, sizeof(Cheat) * s_numCheatsAllocated);
+                    g_cheats = (Cheat*)realloc(g_cheats, sizeof(Cheat) * s_numCheatsAllocated);
                 }
             }
 
@@ -104,9 +104,9 @@ void PCSX::Cheats::LoadCheats(const char *filename) {
             if (g_cheatCodes == NULL) {
                 assert(g_numCodes == 0);
                 assert(s_numCodesAllocated == ALLOC_INCREMENT);
-                g_cheatCodes = (CheatCode *)malloc(sizeof(CheatCode) * s_numCodesAllocated);
+                g_cheatCodes = (CheatCode*)malloc(sizeof(CheatCode) * s_numCodesAllocated);
             } else {
-                g_cheatCodes = (CheatCode *)realloc(g_cheatCodes, sizeof(CheatCode) * s_numCodesAllocated);
+                g_cheatCodes = (CheatCode*)realloc(g_cheatCodes, sizeof(CheatCode) * s_numCodesAllocated);
             }
         }
 
@@ -127,8 +127,8 @@ void PCSX::Cheats::LoadCheats(const char *filename) {
 }
 
 // save all cheats to the specified filename
-void PCSX::Cheats::SaveCheats(const char *filename) {
-    FILE *fp;
+void PCSX::Cheats::SaveCheats(const char* filename) {
+    FILE* fp;
     int i, j;
 
     fp = fopen(filename, "w");
@@ -269,7 +269,7 @@ void PCSX::Cheats::ApplyCheats() {
     }
 }
 
-int PCSX::Cheats::AddCheat(const char *descr, char *code) {
+int PCSX::Cheats::AddCheat(const char* descr, char* code) {
     int c = 1;
     char *p1, *p2;
 
@@ -279,9 +279,9 @@ int PCSX::Cheats::AddCheat(const char *descr, char *code) {
         if (g_cheats == NULL) {
             assert(g_numCheats == 0);
             assert(s_numCheatsAllocated == ALLOC_INCREMENT);
-            g_cheats = (Cheat *)malloc(sizeof(Cheat) * s_numCheatsAllocated);
+            g_cheats = (Cheat*)malloc(sizeof(Cheat) * s_numCheatsAllocated);
         } else {
-            g_cheats = (Cheat *)realloc(g_cheats, sizeof(Cheat) * s_numCheatsAllocated);
+            g_cheats = (Cheat*)realloc(g_cheats, sizeof(Cheat) * s_numCheatsAllocated);
         }
     }
 
@@ -314,9 +314,9 @@ int PCSX::Cheats::AddCheat(const char *descr, char *code) {
                 if (g_cheatCodes == NULL) {
                     assert(g_numCodes == 0);
                     assert(s_numCodesAllocated == ALLOC_INCREMENT);
-                    g_cheatCodes = (CheatCode *)malloc(sizeof(CheatCode) * s_numCodesAllocated);
+                    g_cheatCodes = (CheatCode*)malloc(sizeof(CheatCode) * s_numCodesAllocated);
                 } else {
-                    g_cheatCodes = (CheatCode *)realloc(g_cheatCodes, sizeof(CheatCode) * s_numCodesAllocated);
+                    g_cheatCodes = (CheatCode*)realloc(g_cheatCodes, sizeof(CheatCode) * s_numCodesAllocated);
                 }
             }
 
@@ -350,7 +350,7 @@ void PCSX::Cheats::RemoveCheat(int index) {
     g_numCheats--;
 }
 
-int PCSX::Cheats::EditCheat(int index, const char *descr, char *code) {
+int PCSX::Cheats::EditCheat(int index, const char* descr, char* code) {
     int c = 1;
     int prev = g_numCodes;
     char *p1, *p2;
@@ -381,9 +381,9 @@ int PCSX::Cheats::EditCheat(int index, const char *descr, char *code) {
                 if (g_cheatCodes == NULL) {
                     assert(g_numCodes == 0);
                     assert(s_numCodesAllocated == ALLOC_INCREMENT);
-                    g_cheatCodes = (CheatCode *)malloc(sizeof(CheatCode) * s_numCodesAllocated);
+                    g_cheatCodes = (CheatCode*)malloc(sizeof(CheatCode) * s_numCodesAllocated);
                 } else {
-                    g_cheatCodes = (CheatCode *)realloc(g_cheatCodes, sizeof(CheatCode) * s_numCodesAllocated);
+                    g_cheatCodes = (CheatCode*)realloc(g_cheatCodes, sizeof(CheatCode) * s_numCodesAllocated);
                 }
             }
 
@@ -432,7 +432,7 @@ void PCSX::Cheats::CheatSearchBackupMemory() {
 
 void PCSX::Cheats::CheatSearchInitBackupMemory() {
     if (g_prevM == NULL) {
-        g_prevM = (int8_t *)malloc(0x200000);
+        g_prevM = (int8_t*)malloc(0x200000);
         CheatSearchBackupMemory();
     }
 }
@@ -442,9 +442,9 @@ void PCSX::Cheats::CheatSearchAddResult(uint32_t addr) {
         s_numSearchResultsAllocated += ALLOC_INCREMENT;
 
         if (g_searchResults == NULL) {
-            g_searchResults = (uint32_t *)malloc(sizeof(uint32_t) * s_numSearchResultsAllocated);
+            g_searchResults = (uint32_t*)malloc(sizeof(uint32_t) * s_numSearchResultsAllocated);
         } else {
-            g_searchResults = (uint32_t *)realloc(g_searchResults, sizeof(uint32_t) * s_numSearchResultsAllocated);
+            g_searchResults = (uint32_t*)realloc(g_searchResults, sizeof(uint32_t) * s_numSearchResultsAllocated);
         }
     }
 

src/core/cheat.h

@@ -30,22 +30,22 @@ class Cheats {
     } CheatCode;
 
     typedef struct {
-        char *Descr;
+        char* Descr;
         int First;  // index of the first cheat code
         int n;      // number of cheat codes for this cheat
         int Enabled;
     } Cheat;
 
     void ClearAllCheats();
 
-    void LoadCheats(const char *filename);
-    void SaveCheats(const char *filename);
+    void LoadCheats(const char* filename);
+    void SaveCheats(const char* filename);
 
     void ApplyCheats();
 
-    int AddCheat(const char *descr, char *code);
+    int AddCheat(const char* descr, char* code);
     void RemoveCheat(int index);
-    int EditCheat(int index, const char *descr, char *code);
+    int EditCheat(int index, const char* descr, char* code);
 
     void FreeCheatSearchResults();
     void FreeCheatSearchMem();
@@ -80,9 +80,9 @@ class Cheats {
     void CheatSearchNoChange32();
 
 #define PREVM(mem) (&g_prevM[mem])
-#define PrevMu8(mem) (*(uint8_t *)PREVM(mem))
-#define PrevMu16(mem) (SWAP_LE16(*(uint16_t *)PREVM(mem)))
-#define PrevMu32(mem) (SWAP_LE32(*(uint32_t *)PREVM(mem)))
+#define PrevMu8(mem) (*(uint8_t*)PREVM(mem))
+#define PrevMu16(mem) (SWAP_LE16(*(uint16_t*)PREVM(mem)))
+#define PrevMu32(mem) (SWAP_LE32(*(uint32_t*)PREVM(mem)))
 
     // cheat types
     enum {
@@ -106,12 +106,12 @@ class Cheats {
     };
 
   private:
-    Cheat *g_cheats = NULL;
-    CheatCode *g_cheatCodes = NULL;
+    Cheat* g_cheats = NULL;
+    CheatCode* g_cheatCodes = NULL;
     int g_numCodes = 0;
 
-    int8_t *g_prevM = NULL;
-    uint32_t *g_searchResults = NULL;
+    int8_t* g_prevM = NULL;
+    uint32_t* g_searchResults = NULL;
     int g_numSearchResults = 0;
 
     int g_numCheats = 0;

src/core/debug.cc

@@ -95,7 +95,7 @@ void PCSX::Debug::processAfter() {
 
     if (m_stepping) {
         const bool gotException = pc == 0x80000080 || pc == 0xbfc00180;
-        if (gotException) m_steppingJumps += 2; // there ought to be two jr $k0
+        if (gotException) m_steppingJumps += 2;  // there ought to be two jr $k0
 
         auto none = m_breakpoints.end();
         switch (m_stepType) {