shithub: psxe

Download patch

ref: 9046482bd047ddbc460ad9e4a18f9cc862731fac
parent: f0b4a61f4ec93f13e5b7d118499a2dcc06c95751
author: allkern <lisandroaalarcon@gmail.com>
date: Tue Sep 5 12:28:07 EDT 2023

Implement disc format detection

Modularize

--- a/psx/dev/cdrom.c
+++ b/psx/dev/cdrom.c
@@ -4,6 +4,7 @@
 
 #include "cdrom.h"
 #include "../log.h"
+#include "../msf.h"
 
 #define RESP_PUSH(data) \
     cdrom->rfifo[cdrom->rfifo_index++] = data; \
@@ -11,54 +12,6 @@
 
 #define PFIFO_POP (cdrom->pfifo[--cdrom->pfifo_index])
 
-uint8_t cdrom_btoi(uint8_t b) {
-    if ((b >> 4) > 0x9) { log_set_quiet(0); log_fatal("BCD high nibble > 9"); log_set_quiet(1); }
-    if ((b & 0xf) > 0x9) { log_set_quiet(0); log_fatal("BCD low  nibble > 9"); log_set_quiet(1); }
-    return ((b >> 4) * 10) + (b & 0xf);
-}
-
-uint8_t cdrom_itob(int i) {
-    return i + (6 * (i / 10));
-}
-
-#define BTOI(b) cdrom_btoi(b)
-//#define BTOI(b) g_psx_cdrom_btoi_table[b]
-
-static const uint8_t g_psx_cdrom_btoi_table[] = {
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11,
-    0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19,
-    0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b,
-    0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23,
-    0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25,
-    0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
-    0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
-    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
-    0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
-    0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41,
-    0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41, 0x42, 0x43,
-    0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b,
-    0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d,
-    0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55,
-    0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
-    0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
-    0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x60, 0x61,
-    0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
-    0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b,
-    0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73,
-    0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75,
-    0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d,
-    0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
-    0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
-    0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
-    0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91,
-    0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93,
-    0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b,
-    0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d,
-    0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5,
-};
-
 void cdrom_cmd_error(psx_cdrom_t* cdrom) {
     SET_BITS(ifr, IFR_INT, IFR_INT5);
     RESP_PUSH(cdrom->error);
@@ -467,15 +420,13 @@
 
             psx_disc_get_track_addr(cdrom->disc, &td, cdrom->gettd_track);
 
-            log_fatal("GetTD track=%u, addr=%02u:%02u (%02x:%02x)",
-                cdrom->gettd_track,
-                td.m, td.s,
-                cdrom_itob(td.m), cdrom_itob(td.s)
-            );
+            log_fatal("GetTD track=%u, addr=%02u:%02u", cdrom->gettd_track, td.m, td.s);
 
+            // To-do: Handle OOB tracks
+
             SET_BITS(ifr, IFR_INT, IFR_INT3);
-            RESP_PUSH(cdrom_itob(td.s));
-            RESP_PUSH(cdrom_itob(td.m));
+            RESP_PUSH(ITOB(td.s));
+            RESP_PUSH(ITOB(td.m));
             RESP_PUSH(GETSTAT_MOTOR);
 
             cdrom->delayed_command = CDL_NONE;
@@ -988,23 +939,74 @@
     }
 }
 
+const char* g_psx_cdrom_extensions[] = {
+    "cue",
+    "bin",
+    0
+};
+
+enum {
+    CD_EXT_CUE,
+    CD_EXT_BIN,
+    CD_EXT_UNSUPPORTED
+};
+
+int cdrom_get_extension(const char* path) {
+    const char* ptr = &path[strlen(path) - 1];
+    int i = 0;
+
+    while ((*ptr != '.') && (ptr != path))
+        ptr--;
+    
+    if (ptr == path)
+        return CD_EXT_UNSUPPORTED;
+
+    while (g_psx_cdrom_extensions[i]) {
+        if (!strcmp(ptr + 1, g_psx_cdrom_extensions[i]))
+            return i;
+        
+        ++i;
+    }
+
+    return CD_EXT_UNSUPPORTED;
+}
+
 void psx_cdrom_open(psx_cdrom_t* cdrom, const char* path) {
     cdrom->disc = psx_disc_create();
 
-    // To-do: Init disc based on extension.
-    //        e.g. If file extension is .cue then init with
-    //        psxd_cue, if file extension is .bin, then init
-    //        with psxd_bin, etc.
+    int ext = cdrom_get_extension(path);
+    int error = 0;
 
-    psxd_cue_t* cue = psxd_cue_create();
+    switch (ext) {
+        case CD_EXT_CUE: {
+            psxd_cue_t* cue = psxd_cue_create();
 
-    psxd_cue_init_disc(cue, cdrom->disc);
-    psxd_cue_init(cue, 0);
-    psxd_cue_parse(cue, path);
-    psxd_cue_load(cue);
-}
+            psxd_cue_init_disc(cue, cdrom->disc);
+            psxd_cue_init(cue);
+            error = psxd_cue_load(cue, path);
+        } break;
 
-void psx_cdrom_close(psx_cdrom_t* cdrom) {
+        case CD_EXT_BIN: {
+            psxd_bin_t* bin = psxd_bin_create();
+
+            psxd_bin_init_disc(bin, cdrom->disc);
+            psxd_bin_init(bin);
+            
+            error = psxd_bin_load(bin, path);
+        } break;
+
+        case CD_EXT_UNSUPPORTED: {
+            log_fatal("Unsupported disc format");
+
+            exit(1);
+        } break;
+    }
+
+    if (error) {
+        log_fatal("Error loading file \'%s\'", path);
+
+        exit(1);
+    }
 }
 
 void psx_cdrom_destroy(psx_cdrom_t* cdrom) {
--- a/psx/dev/cdrom.h
+++ b/psx/dev/cdrom.h
@@ -7,6 +7,8 @@
 #include "ic.h"
 #include "../disc.h"
 #include "../disc/cue.h"
+#include "../disc/bin.h"
+#include "../msf.h"
 
 #define DELAY_1MS (PSX_CPU_CPS / 1000)
 #define READ_SINGLE_DELAY (PSX_CPU_CPS / 75)
@@ -16,9 +18,6 @@
 #define PSX_CDROM_SIZE  0x4
 #define PSX_CDROM_END   0x1f801803
 
-#define CD_SECTOR_SIZE 0x930
-#define CD_SECTORS_PER_SECOND 75
-
 enum {
     CD_STATE_RECV_CMD,
     CD_STATE_SEND_RESP1,
@@ -201,7 +200,6 @@
 void psx_cdrom_update(psx_cdrom_t*);
 void psx_cdrom_destroy(psx_cdrom_t*);
 void psx_cdrom_open(psx_cdrom_t*, const char*);
-void psx_cdrom_close(psx_cdrom_t*);
 
 /*
   Command          Parameters      Response(s)
--- a/psx/disc.h
+++ b/psx/disc.h
@@ -12,17 +12,12 @@
 #include <stdio.h>
 
 #include "log.h"
+#include "msf.h"
 
 enum {
     DISC_ERR_TRACK_OUT_OF_BOUNDS = 1,
     DISC_ERR_ADDR_OUT_OF_BOUNDS
 };
-
-typedef struct {
-    uint32_t m;
-    uint32_t s;
-    uint32_t f;
-} msf_t;
 
 typedef int (*disc_seek_t)(void*, msf_t);
 typedef int (*disc_read_sector_t)(void*, void*);
--- /dev/null
+++ b/psx/disc/bin.c
@@ -1,0 +1,110 @@
+/*
+    This file is part of the PSXE Emulator Project
+
+    BIN Loader
+*/
+
+#include "bin.h"
+
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+psxd_bin_t* psxd_bin_create() {
+    return (psxd_bin_t*)malloc(sizeof(psxd_bin_t));
+}
+
+void psxd_bin_init(psxd_bin_t* bin) {
+    memset(bin, 0, sizeof(psxd_bin_t));
+}
+
+int psxd_bin_load(psxd_bin_t* bin, const char* path) {
+    log_fatal("Loading CD image...");
+
+    FILE* file = fopen(path, "rb");
+
+    if (ferror(file) || !file) {
+        fclose(file);
+
+        return 1;
+    }
+
+    fseek(file, 0, SEEK_END);
+
+    bin->buf_size = ftell(file);
+    
+    fseek(file, 0, SEEK_SET);
+
+    bin->buf = malloc(bin->buf_size);
+
+    fread(bin->buf, 1, bin->buf_size, file);
+
+    msf_from_address(&bin->end, bin->buf_size);
+
+    fclose(file);
+
+    log_fatal("Loaded BIN image, size=%08x, end=%02u:%02u:%02u",
+        bin->buf_size,
+        bin->end.m,
+        bin->end.s,
+        bin->end.f
+    );
+
+    return 0;
+}
+
+int psxd_bin_seek(void* udata, msf_t msf) {
+    psxd_bin_t* bin = udata;
+
+    msf.s -= 2;
+
+    bin->seek_offset = msf_to_address(msf);
+
+    log_fatal("BIN seek to %02u:%02u:%02u (%08x < %08x)", msf.m, msf.s, msf.f, bin->seek_offset, bin->buf_size);
+
+    if (bin->seek_offset >= bin->buf_size)
+        return DISC_ERR_ADDR_OUT_OF_BOUNDS;
+
+    return 0;
+}
+
+int psxd_bin_read_sector(void* udata, void* buf) {
+    psxd_bin_t* bin = udata;
+
+    log_fatal("BIN reading sector at offset %08x", bin->seek_offset);
+
+    memcpy(buf, bin->buf + bin->seek_offset, CD_SECTOR_SIZE);
+
+    return 0;
+}
+
+int psxd_bin_get_track_addr(void* udata, msf_t* msf, int track) {
+    if (track > 0)
+        return DISC_ERR_TRACK_OUT_OF_BOUNDS;
+
+    msf->m = 0;
+    msf->s = 2;
+
+    return 0;
+}
+
+int psxd_bin_get_track_count(void* udata, int* count) {
+    *count = 1;
+
+    return 0;
+}
+
+void psxd_bin_init_disc(psxd_bin_t* bin, psx_disc_t* disc) {
+    disc->udata = bin;
+    disc->seek_func = psxd_bin_seek;
+    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;
+}
+
+void psxd_bin_destroy(psxd_bin_t* bin) {
+    free(bin->buf);
+    free(bin);
+}
\ No newline at end of file
--- /dev/null
+++ b/psx/disc/bin.h
@@ -1,0 +1,30 @@
+/*
+    This file is part of the PSXE Emulator Project
+
+    BIN Loader
+*/
+
+#ifndef BIN_H
+#define BIN_H
+
+#include "../disc.h"
+
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+typedef struct {
+    char* buf;
+    uint32_t buf_size;
+    uint32_t seek_offset;
+    msf_t end;
+} psxd_bin_t;
+
+psxd_bin_t* psxd_bin_create();
+void psxd_bin_init(psxd_bin_t*);
+int psxd_bin_load(psxd_bin_t*, const char*);
+void psxd_bin_init_disc(psxd_bin_t*, psx_disc_t*);
+void psxd_bin_destroy(psxd_bin_t*);
+
+#endif
\ No newline at end of file
--- a/psx/disc/cue.c
+++ b/psx/disc/cue.c
@@ -10,12 +10,20 @@
 #include <ctype.h>
 
 #include "cue.h"
-#include "../disc.h"
 #include "../log.h"
 
-#define CUE_SECTOR_SIZE 0x930
-#define CUE_SECTORS_PER_SECOND 75
+#define CUE_BUF_SIZE 256
 
+static const char* g_psxd_cue_errors[] = {
+    "PE_NO_ERROR",
+    "PE_EXPECTED_KEYWORD",
+    "PE_EXPECTED_STRING",
+    "PE_EXPECTED_NUMBER",
+    "PE_EXPECTED_COLON",
+    "PE_NON_SEQUENTIAL_TRACKS",
+    "PE_UNEXPECTED_TOKEN"
+};
+
 static const char* g_psxd_cue_tokens[] = {
     "4CH",
     "AIFF",
@@ -56,26 +64,6 @@
     if (cue_get_keyword(cue) != kw) \
         ERROR_OUT(PE_UNEXPECTED_TOKEN);
 
-void msf_adjust(msf_t* msf) {
-    if (msf->f > 75) {
-        int s = msf->f / CUE_SECTORS_PER_SECOND;
-
-        msf->s += s;
-        msf->f -= CUE_SECTORS_PER_SECOND * s;
-    }
-
-    if (msf->s > 60) {
-        int m = msf->s / 60;
-
-        msf->m += m;
-        msf->s -= 60 * m;
-    }
-}
-
-uint32_t msf_to_address(msf_t msf) {
-    return (((msf.m * 60) * 75) + (msf.s * 75) + msf.f) * CUE_SECTOR_SIZE;
-}
-
 void cue_add_track(psxd_cue_t* cue) {
     ++cue->num_tracks;
 
@@ -285,78 +273,117 @@
     return (psxd_cue_t*)malloc(sizeof(psxd_cue_t));
 }
 
-void psxd_cue_init(psxd_cue_t* cue, int preload) {
+void psxd_cue_init(psxd_cue_t* cue) {
     memset(cue, 0, sizeof(psxd_cue_t));
 
     cue->buf = malloc(CUE_BUF_SIZE);
     cue->ptr = cue->buf;
-    cue->preload = preload;
     cue->current_file = malloc(CUE_BUF_SIZE);
 }
 
-void psxd_cue_parse(psxd_cue_t* cue, const char* path) {
-    FILE* file = fopen(path, "rb");
+char* cue_get_directory(const char* path) {
+    char* ptr = &path[strlen(path) - 1];
+    char* dir = NULL;
+    int i = 0;
 
-    cue_parse(cue, file);
+    while ((*ptr != '/') && (*ptr != '\\') && (ptr != path))
+        ptr--;
+    
+    // If no directory specified, assume CWD
+    if (ptr == path) {
+        dir = malloc(3);
 
-    if (cue->error) {
-        log_fatal("CUE error %u");
+        strcpy(dir, ".\\");
 
-        exit(1);
+        return dir;
     }
+    
+    ptrdiff_t len = (ptr - path) + 1;
+
+    dir = malloc(len + 1);
+
+    strncpy(dir, path, len);
+
+    dir[len] = 0;
+
+    return dir;
 }
 
-// To-do: Rework CUE loader
-//        I want to put every track one after the other
-//        on a big buffer for absolute MSF addressing.
-//        We should also save metadata about the tracks in
-//        the CUE struct.
+int psxd_cue_load(psxd_cue_t* cue, const char* path) {
+    log_fatal("Parsing CUE...");
 
-void psxd_cue_load(psxd_cue_t* cue) {
+    FILE* file = fopen(path, "rb");
+
+    if (ferror(file) || !file) {
+        fclose(file);
+
+        return 1;
+    }
+
+    if (cue_parse(cue, file)) {
+        log_fatal("CUE error %s (%u)",
+            g_psxd_cue_errors[cue->error],
+            cue->error
+        );
+
+        exit(1);
+    }
+
     log_fatal("Loading CD image...");
 
     size_t offset = 0;
 
+    char* directory = cue_get_directory(path);
+    size_t directory_len = strlen(directory);
+
     for (int i = 0; i < cue->num_tracks; i++) {
         cue_track_t* track = cue->track[i];
 
-        FILE* file = fopen(track->filename, "rb");
+        int len = strlen(track->filename) + directory_len;
 
+        char* full_path = malloc(len + 2);
+
+        strcpy(full_path, directory);
+        strcat(full_path, track->filename);
+
+        log_fatal("Loading track %u at \'%s\'...", i + 1, full_path);
+
+        FILE* track_file = fopen(full_path, "rb");
+
+        if (ferror(track_file) || !track_file) {
+            fclose(track_file);
+
+            return 1;
+        }
+
         uint32_t data_offset = msf_to_address(track->index[1]);
 
         // Get track size
-        fseek(file, 0, SEEK_END);
+        fseek(track_file, 0, SEEK_END);
 
         // Account for index 1 offset
-        track->size = ftell(file) - data_offset;
+        track->size = ftell(track_file) - data_offset;
 
         cue->buf_size += track->size;
 
         // Calculate track MS(F)
-        track->disc_offset.f = offset / CUE_SECTOR_SIZE;
-        track->disc_offset.s = track->disc_offset.f / CUE_SECTORS_PER_SECOND;
-        track->disc_offset.m = track->disc_offset.s / 60;
-        track->disc_offset.s -= track->disc_offset.m * 60;
-        track->disc_offset.s += 2;
+        msf_from_address(&track->disc_offset, offset);
+        msf_add_s(&track->disc_offset, 2);
 
-        msf_adjust(&track->disc_offset);
-
         cue->buf = cue_alloc_block(cue->buf, &offset, track->size);
 
-        fseek(file, data_offset, SEEK_SET);
-        fread(cue->buf + (offset - track->size), 1, track->size, file);
+        fseek(track_file, data_offset, SEEK_SET);
+        fread(cue->buf + (offset - track->size), 1, track->size, track_file);
 
-        fclose(file);
+        fclose(track_file);
+        free(full_path);
     }
 
-    cue->end.f = offset / CUE_SECTOR_SIZE;
-    cue->end.s = cue->end.f / CUE_SECTORS_PER_SECOND;
-    cue->end.m = cue->end.s / 60;
-    cue->end.s -= cue->end.m * 60;
-    cue->end.f -= ((cue->end.m * 60) + cue->end.s) * CUE_SECTORS_PER_SECOND;
-    cue->end.s += 2;
+    // Calculate disc end MSF
+    msf_from_address(&cue->end, offset);
+    msf_add_s(&cue->end, 2);
 
-    msf_adjust(&cue->end);
+    free(directory);
 
     log_fatal("Loaded CUE image, size=%08x, end=%02u:%02u:%02u",
         cue->buf_size,
@@ -364,6 +391,8 @@
         cue->end.s,
         cue->end.f
     );
+
+    return 0;
 }
 
 int psxd_cue_seek(void* udata, msf_t msf) {
@@ -371,9 +400,9 @@
 
     // To-do: Check for OOB seeks
 
-    uint32_t sectors = (((msf.m * 60) + msf.s - 2) * CUE_SECTORS_PER_SECOND) + msf.f;
+    uint32_t sectors = (((msf.m * 60) + msf.s - 2) * CD_SECTORS_PS) + msf.f;
 
-    cue->seek_offset = sectors * CUE_SECTOR_SIZE;
+    cue->seek_offset = sectors * CD_SECTOR_SIZE;
 
     log_fatal("CUE seek to %02u:%02u:%02u (%08x < %08x)", msf.m, msf.s, msf.f, cue->seek_offset, cue->buf_size);
 
@@ -388,7 +417,7 @@
 
     log_fatal("Reading sector at offset %08x", cue->seek_offset);
 
-    memcpy(buf, cue->buf + cue->seek_offset, CUE_SECTOR_SIZE);
+    memcpy(buf, cue->buf + cue->seek_offset, CD_SECTOR_SIZE);
 
     return 0;
 }
--- a/psx/disc/cue.h
+++ b/psx/disc/cue.h
@@ -7,9 +7,8 @@
 #ifndef CUE_H
 #define CUE_H
 
-#define CUE_BUF_SIZE 256
-
 #include "../disc.h"
+#include "../msf.h"
 
 #include <stdlib.h>
 #include <stdint.h>
@@ -77,6 +76,7 @@
     int num_tracks;
     cue_track_t** track;
     char* current_file;
+    char* directory;
     uint32_t seek_offset;
     uint32_t buf_size;
     msf_t end;
@@ -83,9 +83,8 @@
 } psxd_cue_t;
 
 psxd_cue_t* psxd_cue_create();
-void psxd_cue_init(psxd_cue_t*, int);
-void psxd_cue_parse(psxd_cue_t*, const char*);
-void psxd_cue_load(psxd_cue_t*);
+void psxd_cue_init(psxd_cue_t*);
+int psxd_cue_load(psxd_cue_t*, const char*);
 void psxd_cue_init_disc(psxd_cue_t*, psx_disc_t*);
 void psxd_cue_destroy(psxd_cue_t*);
 
--- /dev/null
+++ b/psx/msf.c
@@ -1,0 +1,67 @@
+#include "msf.h"
+
+uint8_t msf_btoi(uint8_t b) {
+    return ((b >> 4) * 10) + (b & 0xf);
+}
+
+uint8_t msf_itob(int i) {
+    return i + (6 * (i / 10));
+}
+
+void msf_copy(msf_t* dst, msf_t src) {
+    dst->m = src.m;
+    dst->s = src.s;
+    dst->f = src.f;
+}
+
+void msf_adjust(msf_t* msf) {
+    if (msf->f > 75) {
+        int s = msf->f / CD_SECTORS_PS;
+
+        msf->s += s;
+        msf->f -= CD_SECTORS_PS * s;
+    }
+
+    if (msf->s > 60) {
+        int m = msf->s / 60;
+
+        msf->m += m;
+        msf->s -= 60 * m;
+    }
+}
+
+void msf_to_bcd(msf_t* msf) {
+    msf->m = BTOI(msf->m);
+    msf->s = BTOI(msf->s);
+    msf->f = BTOI(msf->f);
+}
+
+void msf_from_bcd(msf_t* msf) {
+    msf->m = ITOB(msf->m);
+    msf->s = ITOB(msf->s);
+    msf->f = ITOB(msf->f);
+}
+
+uint32_t msf_to_address(msf_t msf) {
+    return (((msf.m * 60) * CD_SECTORS_PS) + (msf.s * 75) + msf.f) * CD_SECTOR_SIZE;
+}
+
+void msf_from_address(msf_t* msf, uint32_t addr) {
+    msf->f = addr / CD_SECTOR_SIZE;
+    msf->s = msf->f / CD_SECTORS_PS;
+    msf->m = msf->s / 60;
+    msf->s -= msf->m * 60;
+    msf->f -= ((msf->m * 60) + msf->s) * CD_SECTORS_PS;
+}
+
+void msf_add_f(msf_t* msf, int f) {
+    msf->f += f;
+
+    msf_adjust(msf);
+}
+
+void msf_add_s(msf_t* msf, int s) {
+    msf->s += s;
+
+    msf_adjust(msf);
+}
\ No newline at end of file
--- /dev/null
+++ b/psx/msf.h
@@ -1,0 +1,99 @@
+#ifndef MSF_H
+#define MSF_H
+
+#include <stdint.h>
+
+#define CD_SECTOR_SIZE 0x930
+#define CD_SECTORS_PS 75
+
+// #define BTOI(b) msf_btoi(b)
+// #define ITOB(b) msf_itob(b)
+#define BTOI(b) g_btoi_table[b]
+#define ITOB(b) g_itob_table[b]
+
+static const uint8_t g_btoi_table[] = {
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+    0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11,
+    0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19,
+    0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b,
+    0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23,
+    0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25,
+    0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
+    0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+    0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
+    0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41,
+    0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41, 0x42, 0x43,
+    0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b,
+    0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d,
+    0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55,
+    0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+    0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
+    0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x60, 0x61,
+    0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
+    0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b,
+    0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73,
+    0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75,
+    0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d,
+    0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
+    0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+    0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
+    0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91,
+    0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93,
+    0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b,
+    0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d,
+    0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5,
+};
+
+static const uint8_t g_itob_table[] = {
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x08, 0x09, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
+    0x16, 0x17, 0x18, 0x19, 0x20, 0x21, 0x22, 0x23,
+    0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x30, 0x31,
+    0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
+    0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+    0x48, 0x49, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55,
+    0x56, 0x57, 0x58, 0x59, 0x60, 0x61, 0x62, 0x63,
+    0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x70, 0x71,
+    0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
+    0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+    0x88, 0x89, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95,
+    0x96, 0x97, 0x98, 0x99, 0xa0, 0xa1, 0xa2, 0xa3,
+    0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xb0, 0xb1,
+    0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9,
+    0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+    0xc8, 0xc9, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5,
+    0xd6, 0xd7, 0xd8, 0xd9, 0xe0, 0xe1, 0xe2, 0xe3,
+    0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xf0, 0xf1,
+    0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9,
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x08, 0x09, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
+    0x16, 0x17, 0x18, 0x19, 0x20, 0x21, 0x22, 0x23,
+    0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x30, 0x31,
+    0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
+    0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+    0x48, 0x49, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55,
+    0x56, 0x57, 0x58, 0x59, 0x60, 0x61, 0x62, 0x63,
+    0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x70, 0x71,
+    0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
+    0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+    0x88, 0x89, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95,
+};
+
+typedef struct {
+    uint32_t m;
+    uint32_t s;
+    uint32_t f;
+} msf_t;
+
+void msf_copy(msf_t*, msf_t);
+void msf_adjust(msf_t*);
+void msf_to_bcd(msf_t*);
+void msf_from_bcd(msf_t*);
+uint32_t msf_to_address(msf_t);
+void msf_from_address(msf_t*, uint32_t);
+void msf_add_f(msf_t*, int);
+void msf_add_s(msf_t*, int);
+
+#endif
\ No newline at end of file
--