shithub: psxe

Download patch

ref: 478a6bd0cd359b42614c125b9d1c8f275e551715
parent: fb110f6a1ec0a0322c5ad8649d4069db0ab817b4
parent: 9d08c4f7b5ac919d6123363f2c34085d94e5c679
author: allkern <lisandroaalarcon@gmail.com>
date: Sun Aug 6 06:58:21 EDT 2023 

Merge branch 'master' of https://github.com/allkern/psxe


--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -14,6 +14,7 @@
         fetch-depth: 0
     - name: Install SDL2
       run: |
+           sudo apt update
            sudo apt install libsdl2-dev
     - name: Build PSXE
       run: |
@@ -27,4 +28,4 @@
     - uses: actions/upload-artifact@v3
       with:
         name: psxe-ubuntu-latest
-        path: ./psxe-ubuntu-latest.tar.gz
\ No newline at end of file
+        path: ./psxe-ubuntu-latest.tar.gz
--- a/README.md
+++ b/README.md
@@ -20,13 +20,15 @@
 
 ## Progress
 Here's a list of what's currently implemented:
-- All CPU instructions, excluding GTE
-- Several GPU registers
-- A bunch of GPU commands
-- Most CDROM commands
-- CPU quirks (Branch, Load delay slots)
-- Bus structure
-- OTC DMA (Burst), GPU DMA (Request, Linked), CDROM DMA (Burst)
+
+<img src="https://github.com/allkern/psxe/assets/15825466/199c20e4-4e7e-4d0a-a033-eda347034ed5" width="12" height="12"/> CPU </br>
+<img src="https://github.com/allkern/psxe/assets/15825466/199c20e4-4e7e-4d0a-a033-eda347034ed5" width="12" height="12"/> DMA </br>
+<img src="https://github.com/allkern/psxe/assets/15825466/0ed1fe97-de2f-47de-bb30-82286e6c5fa0" width="12" height="12"/> GPU </br>
+<img src="https://github.com/allkern/psxe/assets/15825466/0ed1fe97-de2f-47de-bb30-82286e6c5fa0" width="12" height="12"/> CDROM </br>
+<img src="https://github.com/allkern/psxe/assets/15825466/0ed1fe97-de2f-47de-bb30-82286e6c5fa0" width="12" height="12"/> Timers </br>
+<img src="https://github.com/allkern/psxe/assets/15825466/66bf03b1-ef39-46a1-9c73-ddd00cfaf9c2" width="12" height="12"/> MDEC </br>
+<img src="https://github.com/allkern/psxe/assets/15825466/66bf03b1-ef39-46a1-9c73-ddd00cfaf9c2" width="12" height="12"/> SPU </br>
+<img src="https://github.com/allkern/psxe/assets/15825466/66bf03b1-ef39-46a1-9c73-ddd00cfaf9c2" width="12" height="12"/> GTE </br>
 
 ## Building
 Building the emulator should be easy, just use the scripts provided in this repo.
--- a/psx/dev/cdrom.c
+++ b/psx/dev/cdrom.c
@@ -158,7 +158,7 @@
         case CD_STATE_SEND_RESP1: {
             log_fatal("CdlReadN: CD_STATE_SEND_RESP1");
 
-            SET_BITS(ifr, IFR_INT, 3);
+            SET_BITS(ifr, IFR_INT, IFR_INT3);
             RESP_PUSH(GETSTAT_MOTOR);
 
             fseek(cdrom->disc, cdrom->seek_offset, 0);
@@ -178,7 +178,7 @@
         case CD_STATE_SEND_RESP2: {
             log_fatal("CdlReadN: CD_STATE_SEND_RESP2");
 
-            SET_BITS(ifr, IFR_INT, 1);
+            SET_BITS(ifr, IFR_INT, IFR_INT1);
             RESP_PUSH(GETSTAT_MOTOR | GETSTAT_READ);
 
             log_fatal("Reading data from disc. offset=%02x:%02x:%02x (%08x, tellg=%08x)",
-- 
⑨