Fixes to sioload and common.mk

Author: asmblur

src/mips/common.mk

@@ -31,7 +31,7 @@ all: $(TARGET)
 	$(MAKE) -C ../ps1sdk all
 
 clean:
-	rm -f $(OBJS) $(TARGETBASE).psx $(TARGETBASE).elf $(TARGET).map $(TARGETBASE).bin $(TARGET)
+	rm -f $(OBJS) $(TARGETBASE).psx $(TARGETBASE).elf $(TARGETBASE).map $(TARGETBASE).bin $(TARGET)
 
 $(TARGETBASE).bin: $(TARGETBASE).elf
 	$(PREFIX)-objcopy -O binary $< $@

src/mips/hello/src/main.c

@@ -19,7 +19,4 @@
 
 #include "common/hardware/cop0.h"
 
-int main()
-{
-    return 0;
-}
+int main() { return 0; }

src/mips/ps1sdk/include/ario.h

@@ -1,30 +1,29 @@
-/* 
+/*
  * File:   ario.h
  * Author: aric
  *
  * Created on February 10, 2009, 1:13 AM
  */
 
 #ifndef _ARIO_H
-#define	_ARIO_H
+#define _ARIO_H
 
-#ifdef	__cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
 /* prototypes */
 
-int ar12_peek(uint8_t *ch, int timeout);
+int ar12_peek(uint8_t* ch, int timeout);
 int ar12_poke(uint8_t ch, int timeout);
 int ar12_reset(void);
 
-int ar3_peek(uint8_t *ch, int timeout);
+int ar3_peek(uint8_t* ch, int timeout);
 int ar3_poke(uint8_t ch, int timeout);
 int ar3_reset(void);
 
-#ifdef	__cplusplus
+#ifdef __cplusplus
 }
 #endif
 
-#endif	/* _ARIO_H */
-
+#endif /* _ARIO_H */

src/mips/ps1sdk/include/assert.h

@@ -9,9 +9,9 @@
 */
 
 #ifndef _ASSERT_H
-#define	_ASSERT_H
+#define _ASSERT_H
 
-#ifdef	__cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -20,15 +20,14 @@ extern "C" {
 #endif
 
 #ifndef NDEBUG
-    void __assert(const char *, const char *, int);
-    #define assert(e) ((e) ? (void) 0 : __assert(#e, __FILE__, __LINE__))
+void __assert(const char*, const char*, int);
+#define assert(e) ((e) ? (void)0 : __assert(#e, __FILE__, __LINE__))
 #else
-    #define assert(ignore) ((void) 0)
+#define assert(ignore) ((void)0)
 #endif
 
-#ifdef	__cplusplus
+#ifdef __cplusplus
 }
 #endif
 
-#endif	/* _ASSERT_H */
-
+#endif /* _ASSERT_H */

src/mips/ps1sdk/include/ctype.h

@@ -13,8 +13,7 @@
 
 extern unsigned char __ctype_table[];
 
-enum
-{
+enum {
     // uppercase alphabetic
     CTYPE_UCASE = (1 << 0),
     // lowercase alphabetic
@@ -33,23 +32,24 @@ enum
     CTYPE_BLANK = (1 << 7)
 };
 
-#define __isctype(___ch, ___type) ((__ctype_table[(int) ___ch] & (___type)) != 0)
+#define __isctype(___ch, ___type) ((__ctype_table[(int)___ch] & (___type)) != 0)
 
-#define isalnum(___ch)  (isalpha(___ch) || isdigit(___ch))
-#define isalpha(___ch)  (isupper(___ch) || islower(___ch))
-#define isascii(___ch)  (((unsigned char) ___ch) <= 127)
-#define isblank(___ch)  (__isctype(___ch, CTYPE_BLANK))
-#define iscntrl(___ch)  (__isctype(___ch, CTYPE_CNTRL))
-#define isdigit(___ch)  (__isctype(___ch, CTYPE_NUMER))
-#define isgraph(___ch)  (isprint(___ch) && !isspace(___ch))
-#define islower(___ch)  (__isctype(___ch, CTYPE_LCASE))
-#define isprint(___ch)  (__isctype(___ch, (CTYPE_UCASE | CTYPE_LCASE | CTYPE_NUMER | CTYPE_WSPAC | CTYPE_PUNCT | CTYPE_BLANK)))
-#define ispunct(___ch)  (__isctype(___ch, CTYPE_PUNCT))
-#define isspace(___ch)  (__isctype(___ch, (CTYPE_WSPAC | CTYPE_BLANK)))
-#define isupper(___ch)  (__isctype(___ch, CTYPE_UCASE))
+#define isalnum(___ch) (isalpha(___ch) || isdigit(___ch))
+#define isalpha(___ch) (isupper(___ch) || islower(___ch))
+#define isascii(___ch) (((unsigned char)___ch) <= 127)
+#define isblank(___ch) (__isctype(___ch, CTYPE_BLANK))
+#define iscntrl(___ch) (__isctype(___ch, CTYPE_CNTRL))
+#define isdigit(___ch) (__isctype(___ch, CTYPE_NUMER))
+#define isgraph(___ch) (isprint(___ch) && !isspace(___ch))
+#define islower(___ch) (__isctype(___ch, CTYPE_LCASE))
+#define isprint(___ch)                                                                                                 \
+    (__isctype(___ch, (CTYPE_UCASE | CTYPE_LCASE | CTYPE_NUMER | CTYPE_WSPAC | CTYPE_PUNCT | CTYPE_BLANK)))
+#define ispunct(___ch) (__isctype(___ch, CTYPE_PUNCT))
+#define isspace(___ch) (__isctype(___ch, (CTYPE_WSPAC | CTYPE_BLANK)))
+#define isupper(___ch) (__isctype(___ch, CTYPE_UCASE))
 #define isxdigit(___ch) (__isctype(___ch, CTYPE_HEXAD))
 
-#define _toupper(___ch) (islower(___ch) ? ((___ch) - 0x20) : (___ch))
+#define _toupper(___ch) (islower(___ch) ? ((___ch)-0x20) : (___ch))
 #define _tolower(___ch) (isupper(___ch) ? ((___ch) + 0x20) : (___ch))
 
 #endif // _PS1_CTYPE_H_

src/mips/ps1sdk/include/defs.h

@@ -14,14 +14,14 @@
 #include "types.h"
 
 #ifndef NULL
-#define NULL	((void *)0)
+#define NULL ((void*)0)
 #endif
 
-#define ALIGN(x, align)	(((x)+((align)-1))&~((align)-1))
+#define ALIGN(x, align) (((x) + ((align)-1)) & ~((align)-1))
 
-#define PHYSADDR(a)	(((uint32_t)(a)) & 0x1fffffff)
+#define PHYSADDR(a) (((uint32_t)(a)) & 0x1fffffff)
 
-#define KSEG1		0xa0000000
-#define KSEG1ADDR(a)	((__typeof__(a))(((uint32_t)(a) & 0x1fffffff) | KSEG1))
+#define KSEG1 0xa0000000
+#define KSEG1ADDR(a) ((__typeof__(a))(((uint32_t)(a)&0x1fffffff) | KSEG1))
 
 #endif /* PS1_DEFS_H */

src/mips/ps1sdk/include/endian.h

@@ -1,9 +1,9 @@
 #ifndef _ENDIAN_H
 #define _ENDIAN_H
 
-#define	__LITTLE_ENDIAN	1234
-#define	__BIG_ENDIAN	4321
-#define	__PDP_ENDIAN	3412
+#define __LITTLE_ENDIAN 1234
+#define __BIG_ENDIAN 4321
+#define __PDP_ENDIAN 3412
 
 /* PlayStation 1 is little-endian */
 #define __BYTE_ORDER __LITTLE_ENDIAN

src/mips/ps1sdk/include/exec.h

@@ -9,62 +9,53 @@
 */
 
 #ifndef _EXEC_H
-#define	_EXEC_H
+#define _EXEC_H
 
-#ifdef	__cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
 /* Executable file types returned by LoadEx() */
-enum
-{
-    ExecTypeUNK = 0,
-    ExecTypePSX = 1,
-    ExecTypeSCE = 2,
-    ExecTypeECO = 3,
-    ExecTypeCPE = 4
-};
+enum { ExecTypeUNK = 0, ExecTypePSX = 1, ExecTypeSCE = 2, ExecTypeECO = 3, ExecTypeCPE = 4 };
 
 // sizeof() == 0x3C(60)
-typedef struct st_ExecInfo
-{
-    uint32_t entry;      // 0x00 : Address of program entry-point.
-    uint32_t init_gp;    // 0x04 : SCE only.  Initial value the "gp" register is set to.  0 for PS-X EXE.
-    uint32_t text_addr;  // 0x08 : Memory address to which the .text section is loaded.
-    uint32_t text_size;  // 0x0C : Size of the .text section in the file and memory.
-    uint32_t data_addr;  // 0x10 : SCE only.  Memory address to which the .data section is loaded.  0 for PS-X EXE.
-    uint32_t data_size;  // 0x14 : SCE only.  Size of the .data section in the file and memory.  0 for PS-X EXE.
-    uint32_t bss_addr;   // 0x18 : Memory address of the .bss section.  .bss is initialized by Exec().
-    uint32_t bss_size;   // 0x1C : Size of the .bss section in memory.
-    uint32_t stack_addr; // 0x20 : Memory address pointing to the bottom(lowest address) of the stack. BIOS replaces with "STACK" parameter of "SYSTEM.CNF" file.
+typedef struct st_ExecInfo {
+    uint32_t entry; // 0x00 : Address of program entry-point.
+    uint32_t init_gp; // 0x04 : SCE only.  Initial value the "gp" register is set to.  0 for PS-X EXE.
+    uint32_t text_addr; // 0x08 : Memory address to which the .text section is loaded.
+    uint32_t text_size; // 0x0C : Size of the .text section in the file and memory.
+    uint32_t data_addr; // 0x10 : SCE only.  Memory address to which the .data section is loaded.  0 for PS-X EXE.
+    uint32_t data_size; // 0x14 : SCE only.  Size of the .data section in the file and memory.  0 for PS-X EXE.
+    uint32_t bss_addr; // 0x18 : Memory address of the .bss section.  .bss is initialized by Exec().
+    uint32_t bss_size; // 0x1C : Size of the .bss section in memory.
+    uint32_t stack_addr; // 0x20 : Memory address pointing to the bottom(lowest address) of the stack. BIOS replaces
+                         // with "STACK" parameter of "SYSTEM.CNF" file.
     uint32_t stack_size; // 0x24 : Size of the stack.  Can be 0.
-    uint32_t saved_sp;   // 0x28 : Used by BIOS Exec() function to preserve the "sp" register.
-    uint32_t saved_fp;   // 0x2C : Used by BIOS Exec() function to preserve the "fp" register.
-    uint32_t saved_gp;   // 0x30 : Used by BIOS Exec() function to preserve the "gp" register.
-    uint32_t saved_ra;   // 0x34 : Used by BIOS Exec() function to preserve the "ra" register.
-    uint32_t saved_s0;   // 0x38 : Used by BIOS Exec() function to preserve the "s0" register.
+    uint32_t saved_sp; // 0x28 : Used by BIOS Exec() function to preserve the "sp" register.
+    uint32_t saved_fp; // 0x2C : Used by BIOS Exec() function to preserve the "fp" register.
+    uint32_t saved_gp; // 0x30 : Used by BIOS Exec() function to preserve the "gp" register.
+    uint32_t saved_ra; // 0x34 : Used by BIOS Exec() function to preserve the "ra" register.
+    uint32_t saved_s0; // 0x38 : Used by BIOS Exec() function to preserve the "s0" register.
 } ExecInfo;
 
 // sizeof() == 0x88(136)
-typedef struct st_EXE_Header
-{
-    uint8_t magic[8];    // 0x00-0x07 : "PS-X EXE"(retail) or "SCE EXE"(???)
-    uint32_t text_off;   // 0x08 : SCE only.  Offset of the start of the .text section in the file. 0 for PS-X EXE.
-    uint32_t data_off;   // 0x0C : SCE only.  Offset of the start of the .text section in the file. 0 for PS-X EXE.
+typedef struct st_EXE_Header {
+    uint8_t magic[8]; // 0x00-0x07 : "PS-X EXE"(retail) or "SCE EXE"(???)
+    uint32_t text_off; // 0x08 : SCE only.  Offset of the start of the .text section in the file. 0 for PS-X EXE.
+    uint32_t data_off; // 0x0C : SCE only.  Offset of the start of the .text section in the file. 0 for PS-X EXE.
     struct st_ExecInfo exec; // 0x10-0x4B
     char license[60]; // 0x4C-0x87
 } EXE_Header;
 
-int ParseExecHeader(const void *hdr, ExecInfo *exec);
-int ReadExecHeader(int fd, ExecInfo *exec);
-int LoadEx(const char *fname, ExecInfo *exec);
-int LoadExBuffer(const void *fbuf, ExecInfo *exec);
-void LoadExecEx(const void *f, uint32_t stack_addr, int stack_size);
-int ExecEx(ExecInfo *exec, int arg1, int arg2);
+int ParseExecHeader(const void* hdr, ExecInfo* exec);
+int ReadExecHeader(int fd, ExecInfo* exec);
+int LoadEx(const char* fname, ExecInfo* exec);
+int LoadExBuffer(const void* fbuf, ExecInfo* exec);
+void LoadExecEx(const void* f, uint32_t stack_addr, int stack_size);
+int ExecEx(ExecInfo* exec, int arg1, int arg2);
 
-#ifdef	__cplusplus
+#ifdef __cplusplus
 }
 #endif
 
-#endif	/* _EXEC_H */
-
+#endif /* _EXEC_H */