Merge pull request #808 from rickgaiser/for-ps2dev

uyjulian · web-flow · commit b3e53b33b346 · 2026-01-20T16:04:04.000-06:00
General code improvements while trying to use LLVM
diff --git a/.gitignore b/.gitignore
@@ -39,3 +39,4 @@ iop_obj/
 ee/erl-loader/src/exports.c
 tools/**/bin/
 docs/
+build/
diff --git a/iop/arcade/acata/src/acata-entry.c b/iop/arcade/acata/src/acata-entry.c
@@ -34,7 +34,7 @@ int acAtaEntry(int argc, char **argv)
 	{
 		return ret;
 	}
-	if ( !RegisterLibraryEntries(&_exp_acata) == 0 )
+	if ( RegisterLibraryEntries(&_exp_acata) != 0 )
 		return -16;
 	return 0;
 }
diff --git a/iop/cdvd/cdvdman/include/cdvdman.h b/iop/cdvd/cdvdman/include/cdvdman.h
@@ -64,7 +64,7 @@ typedef struct cdvdman_dma3_parameter_
 typedef struct cdvdman_internal_struct_
 {
 	char m_cdvdman_command;
-	char m_last_error;
+	unsigned char m_last_error;
 	char m_unused_002;
 	char m_ncmd_intr_count;
 	int m_wait_flag;
diff --git a/iop/debug/iopdebug/src/iop_exceptions.S b/iop/debug/iopdebug/src/iop_exceptions.S
@@ -231,7 +231,7 @@ ___iop_ex_def_handler_start:
                         lw      $s0, 0x040($s0) // restore s0
                         nop
                         jr      $k1
-                        cop0    0x10
+                        rfe
                         nop
                         nop
 .end _iop_ex_def_handler
@@ -280,7 +280,7 @@ _iop_ex_dbg_handler:
                         lw      $s0, 0x040($s0) // restore s0
                         nop
                         jr      $k1
-                        cop0    0x10
+                        rfe
                         nop
                         nop
 .end _iop_ex_dbg_handler
diff --git a/iop/debug/ioptrap/src/handler.S b/iop/debug/ioptrap/src/handler.S
@@ -147,7 +147,7 @@ def_exc_handler:
     lw      $k1, 0($k0)
     lw      $k0, 0x410($0)      # k0 saved here by exception prologue (at 0x80)
     jr      $k1
-    cop0    0x10
+    rfe
     nop
     .set pop
     .end def_exc_handler
@@ -288,7 +288,7 @@ bp_exc_handler:
     lw      $k1, 0($k0)
     lw      $k0, 0x420($0)      # k0 saved here by debug exception prologue (at 0x40)
     jr      $k1
-    cop0    0x10
+    rfe
     nop
     .set    pop
     .end    bp_exc_handler
diff --git a/iop/dev9/atad/src/ps2atad.c b/iop/dev9/atad/src/ps2atad.c
@@ -1030,7 +1030,7 @@ int ata_device_sector_io64(int device, void *buf, u64 lba, u32 nsectors, int dir
 
         if (atad_devinfo[device].lba48 && (ata_dvrp_workaround ? (lba >= atad_devinfo[device].total_sectors) : 1)) {
             /* Setup for 48-bit LBA.  */
-            len = (nsectors > 65536) ? 65536 : nsectors;
+            len = (u16)((nsectors > 65536) ? 65536 : nsectors); /* 0 means 65536 in LBA48 */
 
             /* Combine bits 24-31 and bits 0-7 of lba into sector.  */
             sector = ((lba >> 16) & 0xff00) | (lba & 0xff);
diff --git a/iop/fs/bdm/src/bdm.c b/iop/fs/bdm/src/bdm.c
@@ -51,7 +51,7 @@ void bdm_connect_bd(struct block_device *bd)
 {
     int i;
 
-    M_PRINTF("connecting device %s%dp%d id=0x%x\n", bd->name, bd->devNr, bd->parNr, bd->parId);
+    M_PRINTF("connecting device %s%dp%d size=%luMB id=0x%x\n", bd->name, bd->devNr, bd->parNr, (u32)bd->sectorCount / ((1000 * 1000) / bd->sectorSize), bd->parId);
 
     for (i = 0; i < MAX_CONNECTIONS; ++i) {
         if (g_mount[i].bd == NULL) {
@@ -69,7 +69,7 @@ void bdm_disconnect_bd(struct block_device *bd)
 {
     int i;
 
-    M_PRINTF("disconnecting device %s%dp%d id=0x%x\n", bd->name, bd->devNr, bd->parNr, bd->parId);
+    M_PRINTF("disconnecting device %s%dp%d\n", bd->name, bd->devNr, bd->parNr);
 
     for (i = 0; i < MAX_CONNECTIONS; ++i) {
         if (g_mount[i].bd == bd) {
diff --git a/iop/fs/bdm/src/part_driver_gpt.c b/iop/fs/bdm/src/part_driver_gpt.c
@@ -67,7 +67,7 @@ int part_connect_gpt(struct block_device *bd)
     entriesPerSector = bd->sectorSize / sizeof(gpt_partition_table_entry);
 
     // Loop through all the partition table entries and attempt to mount each one.
-    printf("Found GPT disk '%08x...'\n", *(u32*)&pGptHeader->disk_guid);
+    M_PRINTF("Found GPT disk '%08x...'\n", *(u32*)&pGptHeader->disk_guid);
     for (int i = 0; i < pGptHeader->partition_count && endOfTable == 0; )
     {
         // Check if we need to buffer more data, GPT usually uses LBA 2-33 for partition table entries. Typically there will
@@ -133,7 +133,7 @@ int part_connect_gpt(struct block_device *bd)
                 if ((partIndex = GetNextFreePartitionIndex()) == -1)
                 {
                     // No more free partition slots.
-                    printf("Can't mount partition, no more free partition slots!\n");
+                    M_PRINTF("Can't mount partition, no more free partition slots!\n");
                     continue;
                 }
 
diff --git a/iop/fs/bdm/src/part_driver_mbr.c b/iop/fs/bdm/src/part_driver_mbr.c
@@ -14,21 +14,21 @@ int partitions_sanity_check_mbr(struct block_device *bd, master_boot_record* pMb
     //At least one of them must be active.
     int valid = 0;
     int active = 0;
-    
+
     for (int i = 0; i < 4; i++)
     {
-        
+
         if (pMbrBlock->primary_partitions[i].partition_type != 0) {
-            
+
             if((pMbrBlock->primary_partitions[i].first_lba == 0) || (pMbrBlock->primary_partitions[i].first_lba >= bd->sectorCount))
                 return 0; //invalid
-            
+
             active++;
         }
-        
+
         valid++; //Considered at least a valid partition.
     }
-    
+
     return (valid == 4) && (active > 0);
 }
 
@@ -42,7 +42,7 @@ int part_connect_mbr(struct block_device *bd)
     int valid_partitions;
 
     M_DEBUG("%s\n", __func__);
-    
+
     // Filter out any block device where sectorOffset != 0, as this will be a block device for a file system partition and not
     // the raw device.
     if (bd->sectorOffset != 0)
@@ -82,18 +82,18 @@ int part_connect_mbr(struct block_device *bd)
         FreeSysMemory(pMbrBlock);
         return rval;
     }
-    
-    
+
+
     valid_partitions = partitions_sanity_check_mbr(bd, pMbrBlock);
 
     //Most likely a VBR
     if(valid_partitions == 0) {
-        printf("MBR disk valid_partitions=%d \n", valid_partitions);
+        M_PRINTF("MBR disk valid_partitions=%d \n", valid_partitions);
         FreeSysMemory(pMbrBlock);
         return -1;
     }
 
-    printf("Found MBR disk\n");
+    M_PRINTF("Found MBR disk\n");
 
     // Loop and parse the primary partition entries in the MBR block.
     for (int i = 0; i < 4; i++)
@@ -106,14 +106,14 @@ int part_connect_mbr(struct block_device *bd)
         if (pMbrBlock->primary_partitions[i].partition_type == 0)
             continue;
 
-        printf("Found partition type 0x%02x\n", pMbrBlock->primary_partitions[i].partition_type);
-        
+        M_PRINTF("Found partition type 0x%02x\n", pMbrBlock->primary_partitions[i].partition_type);
+
         // TODO: Filter out unsupported partition types.
 
         if ((partIndex = GetNextFreePartitionIndex()) == -1)
         {
             // No more free partition slots.
-            printf("Can't mount partition, no more free partition slots!\n");
+            M_PRINTF("Can't mount partition, no more free partition slots!\n");
             continue;
         }
 
diff --git a/iop/fs/filexio/src/fileXio_iop.c b/iop/fs/filexio/src/fileXio_iop.c
@@ -386,7 +386,7 @@ static int fileXio_GetDir_RPC(const char* pathname, struct fileXioDirEntry dirEn
 		}
 		// wait for any previous DMA to complete
 	      // before over-writing localDirEntry
-	      while(sceSifDmaStat(dmaID)>=0);
+	      while(sceSifDmaStat(dmaID)>=0) {}
             DirEntryCopy(&localDirEntry, &dirbuf);
 	      // DMA localDirEntry to the address specified by dirEntry[matched_entries]
 	      // setup the dma struct
diff --git a/iop/fs/http/src/ps2http.c b/iop/fs/http/src/ps2http.c
@@ -140,7 +140,7 @@ int readLine( int socket, char * buffer, int size )
 
 		if ( rc <= 0 ) return rc;
 
-		if ( (*ptr == '\n') ) break;
+		if (*ptr == '\n') break;
 
 		// increment after check for cr.  Don't want to count the cr.
 		count++;
diff --git a/iop/iLink/IEEE1394_bd/src/scsi.c b/iop/iLink/IEEE1394_bd/src/scsi.c
@@ -174,7 +174,7 @@ static int scsi_warmup(struct block_device *bd)
     bd->sectorSize   = getBI32(&rcd.block_length);
     bd->sectorOffset = 0;
     bd->sectorCount  = getBI32(&rcd.last_lba);
-    M_PRINTF("%u %u-byte logical blocks: (%uMB / %uMiB)\n", bd->sectorCount, bd->sectorSize, bd->sectorCount / ((1000 * 1000) / bd->sectorSize), bd->sectorCount / ((1024 * 1024) / bd->sectorSize));
+    M_PRINTF("%lu %u-byte logical blocks: (%luMB / %luMiB)\n", (u32)bd->sectorCount, bd->sectorSize, (u32)bd->sectorCount / ((1000 * 1000) / bd->sectorSize), (u32)bd->sectorCount / ((1024 * 1024) / bd->sectorSize));
 
     return 0;
 }
diff --git a/iop/sio/mx4sio_bd/src/spi_sdcard_driver_config.h b/iop/sio/mx4sio_bd/src/spi_sdcard_driver_config.h
@@ -4,15 +4,7 @@
 /* Includes ------------------------------------------------------------------*/
 
 #include <stdio.h>
-#include <tamtypes.h>
-
-typedef u8 uint8_t;
-typedef u16 uint16_t;
-typedef u32 uint32_t;
-
-typedef s8 int8_t;
-typedef s16 int16_t;
-typedef s32 int32_t;
+#include <stdint.h>
 
 #define SPISD_ASSERT(cond) \
     while (!cond) {};
diff --git a/iop/sound/libsnd2/src/ssclose.c b/iop/sound/libsnd2/src/ssclose.c
@@ -25,7 +25,7 @@ static void _SsClose(s16 seq_sep_no)
 
 		score_struct = &_ss_score[sep_no][seq_no];
 		score_struct->m_flags = 0;
-		score_struct->m_next_sep = 255;
+		score_struct->m_next_sep = -1;
 		score_struct->m_next_seq = 0;
 		score_struct->m_unk48 = 0;
 		score_struct->m_unk4A = 0;
diff --git a/iop/sound/libsnd2/src/sstable.c b/iop/sound/libsnd2/src/sstable.c
@@ -38,7 +38,7 @@ void SsSetTableSize(char *table, s16 s_max, s16 t_max)
 
 			score_struct = &_ss_score[i][j];
 			score_struct->m_flags = 0;
-			score_struct->m_next_sep = 255;
+			score_struct->m_next_sep = -1;
 			score_struct->m_next_seq = 0;
 			score_struct->m_unk48 = 0;
 			score_struct->m_unk4A = 0;
diff --git a/iop/usb/usbmass_bd/src/scsi.c b/iop/usb/usbmass_bd/src/scsi.c
@@ -174,7 +174,7 @@ static int scsi_warmup(struct block_device *bd)
     bd->sectorSize   = getBI32(&rcd.block_length);
     bd->sectorOffset = 0;
     bd->sectorCount  = getBI32(&rcd.last_lba);
-    M_PRINTF("%u %u-byte logical blocks: (%uMB / %uMiB)\n", bd->sectorCount, bd->sectorSize, bd->sectorCount / ((1000 * 1000) / bd->sectorSize), bd->sectorCount / ((1024 * 1024) / bd->sectorSize));
+    M_PRINTF("%lu %u-byte logical blocks: (%luMB / %luMiB)\n", (u32)bd->sectorCount, bd->sectorSize, (u32)bd->sectorCount / ((1000 * 1000) / bd->sectorSize), (u32)bd->sectorCount / ((1024 * 1024) / bd->sectorSize));
 
     return 0;
 }
diff --git a/samples/ps2dev_iop.cmake b/samples/ps2dev_iop.cmake
@@ -27,9 +27,7 @@ SET(CMAKE_SYSTEM_VERSION 1)
 SET(CMAKE_SYSTEM_PROCESSOR mips)
 SET(CMAKE_C_COMPILER mipsel-none-elf-gcc)
 SET(CMAKE_CXX_COMPILER mipsel-none-elf-g++)
-SET(CMAKE_C_COMPILER_WORKS 1) #Hack by f0bes
-SET(CMAKE_CXX_COMPILER_WORKS 1) #Hack by f0bes
-
+SET(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
 
 #
 # set arch flags depending on gcc version

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ int acAtaEntry(int argc, char **argv)`
`34`	`34`	`{`
`35`	`35`	`return ret;`
`36`	`36`	`}`
`37`		`- if ( !RegisterLibraryEntries(&_exp_acata) == 0 )`
	`37`	`+ if ( RegisterLibraryEntries(&_exp_acata) != 0 )`
`38`	`38`	`return -16;`
`39`	`39`	`return 0;`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ typedef struct cdvdman_dma3_parameter_`
`64`	`64`	`typedef struct cdvdman_internal_struct_`
`65`	`65`	`{`
`66`	`66`	`char m_cdvdman_command;`
`67`		`- char m_last_error;`
	`67`	`+ unsigned char m_last_error;`
`68`	`68`	`char m_unused_002;`
`69`	`69`	`char m_ncmd_intr_count;`
`70`	`70`	`int m_wait_flag;`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ void bdm_connect_bd(struct block_device *bd)`
`51`	`51`	`{`
`52`	`52`	`int i;`
`53`	`53`
`54`		`- M_PRINTF("connecting device %s%dp%d id=0x%x\n", bd->name, bd->devNr, bd->parNr, bd->parId);`
	`54`	`+ M_PRINTF("connecting device %s%dp%d size=%luMB id=0x%x\n", bd->name, bd->devNr, bd->parNr, (u32)bd->sectorCount / ((1000 * 1000) / bd->sectorSize), bd->parId);`
`55`	`55`
`56`	`56`	`for (i = 0; i < MAX_CONNECTIONS; ++i) {`
`57`	`57`	`if (g_mount[i].bd == NULL) {`
`@@ -69,7 +69,7 @@ void bdm_disconnect_bd(struct block_device *bd)`
`69`	`69`	`{`
`70`	`70`	`int i;`
`71`	`71`
`72`		`- M_PRINTF("disconnecting device %s%dp%d id=0x%x\n", bd->name, bd->devNr, bd->parNr, bd->parId);`
	`72`	`+ M_PRINTF("disconnecting device %s%dp%d\n", bd->name, bd->devNr, bd->parNr);`
`73`	`73`
`74`	`74`	`for (i = 0; i < MAX_CONNECTIONS; ++i) {`
`75`	`75`	`if (g_mount[i].bd == bd) {`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ int part_connect_gpt(struct block_device *bd)`
`67`	`67`	`entriesPerSector = bd->sectorSize / sizeof(gpt_partition_table_entry);`
`68`	`68`
`69`	`69`	`// Loop through all the partition table entries and attempt to mount each one.`
`70`		`- printf("Found GPT disk '%08x...'\n", (u32)&pGptHeader->disk_guid);`
	`70`	`+ M_PRINTF("Found GPT disk '%08x...'\n", (u32)&pGptHeader->disk_guid);`
`71`	`71`	`for (int i = 0; i < pGptHeader->partition_count && endOfTable == 0; )`
`72`	`72`	`{`
`73`	`73`	`// Check if we need to buffer more data, GPT usually uses LBA 2-33 for partition table entries. Typically there will`
`@@ -133,7 +133,7 @@ int part_connect_gpt(struct block_device *bd)`
`133`	`133`	`if ((partIndex = GetNextFreePartitionIndex()) == -1)`
`134`	`134`	`{`
`135`	`135`	`// No more free partition slots.`
`136`		`- printf("Can't mount partition, no more free partition slots!\n");`
	`136`	`+ M_PRINTF("Can't mount partition, no more free partition slots!\n");`
`137`	`137`	`continue;`
`138`	`138`	`}`
`139`	`139`
Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ static int fileXio_GetDir_RPC(const char* pathname, struct fileXioDirEntry dirEn`
`386`	`386`	`}`
`387`	`387`	`// wait for any previous DMA to complete`
`388`	`388`	`// before over-writing localDirEntry`
`389`		`- while(sceSifDmaStat(dmaID)>=0);`
	`389`	`+ while(sceSifDmaStat(dmaID)>=0) {}`
`390`	`390`	`DirEntryCopy(&localDirEntry, &dirbuf);`
`391`	`391`	`// DMA localDirEntry to the address specified by dirEntry[matched_entries]`
`392`	`392`	`// setup the dma struct`