shithub: psxe

--- a/frontend/config.c

+++ b/frontend/config.c

@@ -33,7 +33,6 @@

     "[console]\n"

     "    region          = \"auto\"\n";

 static const char* g_models_text =

     "Available console models:\n"

     "\"scph1000\" (SCPH-1000) [NTSC-J]\n"

@@ -65,7 +64,6 @@

 static const char* g_desc_text =

     "\nPlease report any bugs to <https://github.com/allkern/psxe/issues>\n";

 psxe_config_t* psxe_cfg_create() {

     return (psxe_config_t*)malloc(sizeof(psxe_config_t));

@@ -272,13 +270,9 @@

         cfg->psxe_version = psxe_version;

+// To-do: Implement BIOS searching

 char* psxe_cfg_get_bios_path(psxe_config_t* cfg) {

-    if (cfg->bios) {

-        return cfg->bios;

-    }

-    if (!cfg->bios_search)

-        return NULL;

+    return NULL;

 #undef STR1

--- a/psx/cpu.c

+++ b/psx/cpu.c

@@ -114,41 +114,43 @@

     0x00000000  // PRID     - Processor ID (R)

};

-static const uint8_t g_psx_gte_unr_table[] = {

-    0xff, 0xfd, 0xfb, 0xf9, 0xf7, 0xf5, 0xf3, 0xf1,

-    0xef, 0xee, 0xec, 0xea, 0xe8, 0xe6, 0xe4, 0xe3,

-    0xe1, 0xdf, 0xdd, 0xdc, 0xda, 0xd8, 0xd6, 0xd5,

-    0xd3, 0xd1, 0xd0, 0xce, 0xcd, 0xcb, 0xc9, 0xc8,

-    0xc6, 0xc5, 0xc3, 0xc1, 0xc0, 0xbe, 0xbd, 0xbb,

-    0xba, 0xb8, 0xb7, 0xb5, 0xb4, 0xb2, 0xb1, 0xb0,

-    0xae, 0xad, 0xab, 0xaa, 0xa9, 0xa7, 0xa6, 0xa4,

-    0xa3, 0xa2, 0xa0, 0x9f, 0x9e, 0x9c, 0x9b, 0x9a,

-    0x99, 0x97, 0x96, 0x95, 0x94, 0x92, 0x91, 0x90,

-    0x8f, 0x8d, 0x8c, 0x8b, 0x8a, 0x89, 0x87, 0x86,

-    0x85, 0x84, 0x83, 0x82, 0x81, 0x7f, 0x7e, 0x7d,

-    0x7c, 0x7b, 0x7a, 0x79, 0x78, 0x77, 0x75, 0x74,

-    0x73, 0x72, 0x71, 0x70, 0x6f, 0x6e, 0x6d, 0x6c,

-    0x6b, 0x6a, 0x69, 0x68, 0x67, 0x66, 0x65, 0x64,

-    0x63, 0x62, 0x61, 0x60, 0x5f, 0x5e, 0x5d, 0x5d,

-    0x5c, 0x5b, 0x5a, 0x59, 0x58, 0x57, 0x56, 0x55,

-    0x54, 0x53, 0x53, 0x52, 0x51, 0x50, 0x4f, 0x4e,

-    0x4d, 0x4d, 0x4c, 0x4b, 0x4a, 0x49, 0x48, 0x48,

-    0x47, 0x46, 0x45, 0x44, 0x43, 0x43, 0x42, 0x41,

-    0x40, 0x3f, 0x3f, 0x3e, 0x3d, 0x3c, 0x3c, 0x3b,

-    0x3a, 0x39, 0x39, 0x38, 0x37, 0x36, 0x36, 0x35,

-    0x34, 0x33, 0x33, 0x32, 0x31, 0x31, 0x30, 0x2f,

-    0x2e, 0x2e, 0x2d, 0x2c, 0x2c, 0x2b, 0x2a, 0x2a,

-    0x29, 0x28, 0x28, 0x27, 0x26, 0x26, 0x25, 0x24,

-    0x24, 0x23, 0x22, 0x22, 0x21, 0x20, 0x20, 0x1f,

-    0x1e, 0x1e, 0x1d, 0x1d, 0x1c, 0x1b, 0x1b, 0x1a,

-    0x19, 0x19, 0x18, 0x18, 0x17, 0x16, 0x16, 0x15,

-    0x15, 0x14, 0x14, 0x13, 0x12, 0x12, 0x11, 0x11,

-    0x10, 0x0f, 0x0f, 0x0e, 0x0e, 0x0d, 0x0d, 0x0c,

-    0x0c, 0x0b, 0x0a, 0x0a, 0x09, 0x09, 0x08, 0x08,

-    0x07, 0x07, 0x06, 0x06, 0x05, 0x05, 0x04, 0x04,

-    0x03, 0x03, 0x02, 0x02, 0x01, 0x01, 0x00, 0x00,

-    0x00

-};

+// To-do: Commented out until we properly implement GTE

+// static const uint8_t g_psx_gte_unr_table[] = {

+//     0xff, 0xfd, 0xfb, 0xf9, 0xf7, 0xf5, 0xf3, 0xf1,

+//     0xef, 0xee, 0xec, 0xea, 0xe8, 0xe6, 0xe4, 0xe3,

+//     0xe1, 0xdf, 0xdd, 0xdc, 0xda, 0xd8, 0xd6, 0xd5,

+//     0xd3, 0xd1, 0xd0, 0xce, 0xcd, 0xcb, 0xc9, 0xc8,

+//     0xc6, 0xc5, 0xc3, 0xc1, 0xc0, 0xbe, 0xbd, 0xbb,

+//     0xba, 0xb8, 0xb7, 0xb5, 0xb4, 0xb2, 0xb1, 0xb0,

+//     0xae, 0xad, 0xab, 0xaa, 0xa9, 0xa7, 0xa6, 0xa4,

+//     0xa3, 0xa2, 0xa0, 0x9f, 0x9e, 0x9c, 0x9b, 0x9a,

+//     0x99, 0x97, 0x96, 0x95, 0x94, 0x92, 0x91, 0x90,

+//     0x8f, 0x8d, 0x8c, 0x8b, 0x8a, 0x89, 0x87, 0x86,

+//     0x85, 0x84, 0x83, 0x82, 0x81, 0x7f, 0x7e, 0x7d,

+//     0x7c, 0x7b, 0x7a, 0x79, 0x78, 0x77, 0x75, 0x74,

+//     0x73, 0x72, 0x71, 0x70, 0x6f, 0x6e, 0x6d, 0x6c,

+//     0x6b, 0x6a, 0x69, 0x68, 0x67, 0x66, 0x65, 0x64,

+//     0x63, 0x62, 0x61, 0x60, 0x5f, 0x5e, 0x5d, 0x5d,

+//     0x5c, 0x5b, 0x5a, 0x59, 0x58, 0x57, 0x56, 0x55,

+//     0x54, 0x53, 0x53, 0x52, 0x51, 0x50, 0x4f, 0x4e,

+//     0x4d, 0x4d, 0x4c, 0x4b, 0x4a, 0x49, 0x48, 0x48,

+//     0x47, 0x46, 0x45, 0x44, 0x43, 0x43, 0x42, 0x41,

+//     0x40, 0x3f, 0x3f, 0x3e, 0x3d, 0x3c, 0x3c, 0x3b,

+//     0x3a, 0x39, 0x39, 0x38, 0x37, 0x36, 0x36, 0x35,

+//     0x34, 0x33, 0x33, 0x32, 0x31, 0x31, 0x30, 0x2f,

+//     0x2e, 0x2e, 0x2d, 0x2c, 0x2c, 0x2b, 0x2a, 0x2a,

+//     0x29, 0x28, 0x28, 0x27, 0x26, 0x26, 0x25, 0x24,

+//     0x24, 0x23, 0x22, 0x22, 0x21, 0x20, 0x20, 0x1f,

+//     0x1e, 0x1e, 0x1d, 0x1d, 0x1c, 0x1b, 0x1b, 0x1a,

+//     0x19, 0x19, 0x18, 0x18, 0x17, 0x16, 0x16, 0x15,

+//     0x15, 0x14, 0x14, 0x13, 0x12, 0x12, 0x11, 0x11,

+//     0x10, 0x0f, 0x0f, 0x0e, 0x0e, 0x0d, 0x0d, 0x0c,

+//     0x0c, 0x0b, 0x0a, 0x0a, 0x09, 0x09, 0x08, 0x08,

+//     0x07, 0x07, 0x06, 0x06, 0x05, 0x05, 0x04, 0x04,

+//     0x03, 0x03, 0x02, 0x02, 0x01, 0x01, 0x00, 0x00,

+//     0x00

+// };

 #define OP ((cpu->opcode >> 26) & 0x3f)

 #define S ((cpu->opcode >> 21) & 0x1f)

--- a/psx/dev/dma.c

+++ b/psx/dev/dma.c

@@ -191,8 +191,6 @@

     uint32_t size = hdr >> 24;

     uint32_t addr = dma->gpu.madr;

-    int count = 0;

     while (true) {

         while (size--) {

             addr = (addr + (CHCR_STEP(gpu) ? -4 : 4)) & 0x1ffffc;

--- a/psx/dev/gpu.c

+++ b/psx/dev/gpu.c

@@ -911,7 +911,6 @@

                 gpu->vram[gpu->v0.x + (gpu->v0.y * 1024)] = gpu_to_bgr555(gpu->color);

                 gpu->state = GPU_STATE_RECV_CMD;

         } break;

--- a/psx/dev/mdec.c

+++ b/psx/dev/mdec.c

@@ -87,6 +87,8 @@

         } break;

         case 4: return mdec->status;

+    return 0x0;

 uint16_t psx_mdec_read16(psx_mdec_t* mdec, uint32_t offset) {

--- a/psx/disc.c

+++ b/psx/disc.c

@@ -6,7 +6,6 @@

 #include "disc.h"

 #include <stdint.h>

 #include <stdlib.h>

 #include <stdio.h>

--- a/psx/disc/bin.c

+++ b/psx/disc/bin.c

@@ -101,7 +101,7 @@

     disc->read_sector_func = psxd_bin_read_sector;

     disc->get_track_addr_func = psxd_bin_get_track_addr;

     disc->get_track_count_func = psxd_bin_get_track_count;

-    disc->destroy_func = psxd_bin_destroy;

+    disc->destroy_func = (disc_destroy_t)psxd_bin_destroy;

 void psxd_bin_destroy(psxd_bin_t* bin) {

--- a/psx/disc/cue.c

+++ b/psx/disc/cue.c

@@ -197,8 +197,6 @@

     cue->file = file;

     cue->c = fgetc(file);

-    void* filebuf;

-    size_t filesz;

     msf_t msf;

     EXPECT_KEYWORD(CUE_FILE);

@@ -282,9 +280,8 @@

 char* cue_get_directory(const char* path) {

-    char* ptr = &path[strlen(path) - 1];

+    const char* ptr = &path[strlen(path) - 1];

     char* dir = NULL;

-    int i = 0;

     while ((*ptr != '/') && (*ptr != '\\') && (ptr != path))

         ptr--;

@@ -455,7 +452,7 @@

     disc->read_sector_func = psxd_cue_read_sector;

     disc->get_track_addr_func = psxd_cue_get_track_addr;

     disc->get_track_count_func = psxd_cue_get_track_count;

-    disc->destroy_func = psxd_cue_destroy;

+    disc->destroy_func = (disc_destroy_t)psxd_cue_destroy;

 void psxd_cue_destroy(psxd_cue_t* cue) {

--- a/psx/input/sda.c

+++ b/psx/input/sda.c

@@ -101,7 +101,8 @@

 // To-do: Implement analog mode

 void psxi_sda_on_analog_change(void* udata, uint16_t data) {

-    psxi_sda_t* sda = (psxi_sda_t*)udata;

+    // Suppress warning until we implement analog mode

+    // psxi_sda_t* sda = (psxi_sda_t*)udata;

 int psxi_sda_query_fifo(void* udata) {

--

⑨