Board emu rework

README.md

@@ -5,7 +5,7 @@ This is mostly an _extremely hacky_ PicoSystem emulator.
 ./DERP_SDL file.uf2
 ```
 
-(To run uf2s built with the PicoSystem SDK add `--picosystem-sdk` before the file to apply some workarounds)
+(To run some uf2s built with the PicoSystem SDK add `--board pimoroni_picosystem` before the file to override the board value)
 
 ## Bootrom
 A copy of the RP2040 bootrom is required in bootrom.bin.

core/CMakeLists.txt

@@ -11,6 +11,7 @@ target_sources(DERPCore INTERFACE
     I2C.cpp
     Logging.cpp
     MemoryBus.cpp
+    PIO.cpp
     PWM.cpp
     Timer.cpp
     UART.cpp

core/DMA.cpp

@@ -55,7 +55,10 @@ void DMA::update(uint64_t target)
     for(uint32_t cycle = 0; cycle < passed; cycle++)
     {
         if(!channelTriggered)
+        {
+            clock.addCycles(passed - cycle);
             break;
+        }
 
         for(int i = 0; i < numChannels; i++, curChannel++)
         {
@@ -74,21 +77,6 @@ void DMA::update(uint64_t target)
             {
                 auto val = mem.read<uint8_t>(this, readAddr[curChannel], cycles, false);
                 mem.write(this, writeAddr[curChannel], val, cycles, false);
-
-                // tufty hax
-                if(writeAddr[curChannel] == 0x50300010 /*PIO1 TXF0*/)
-                {
-                    static int off = 0;
-                    extern uint16_t screenData[];
-
-                    auto screenData8 = reinterpret_cast<uint8_t *>(screenData);
-                    screenData8[off ^ 1] = val;
-                    off++;
-
-                    if(off == 320 * 240 * 2)
-                        off = 0;
-                }
-
             }
             else if(transferSize == 2)
             {
@@ -97,18 +85,6 @@ void DMA::update(uint64_t target)
                     val = val >> 8 | val << 8;
 
                 mem.write(this, writeAddr[curChannel], val, cycles, false);
-
-                // picosystem hax (hires)
-                if(writeAddr[curChannel] == 0x50200010 /*PIO0 TXF0*/)
-                {
-                    static int off = 0;
-                    extern uint16_t screenData[];
-
-                    screenData[off++] = val;
-
-                    if(off == 240 * 240)
-                        off = 0;
-                }
             }
             else
             {
@@ -117,25 +93,6 @@ void DMA::update(uint64_t target)
                     val = val >> 24 | val << 24 | (val & 0xFF00) << 8 | (val & 0xFF0000) >> 8;
 
                 mem.write(this, writeAddr[curChannel], val, cycles, false);
-
-                // picosystem hax (lores)
-                if(writeAddr[curChannel] == 0x50200010 /*PIO0 TXF0*/)
-                {
-                    static int off = 0;
-                    extern uint16_t screenData[];
-
-                    // picosystem sdk unswaps in the pio program
-                    if(bswap)
-                        val = val >> 16 | val << 16;
-
-                    screenData[off++] = val;
-                    screenData[off++] = val;
-                    screenData[off++] = val >> 16;
-                    screenData[off++] = val >> 16;
-
-                    if(off == 240 * 240)
-                        off = 0;
-                }
             }
 
             if(ctrl[curChannel] & DMA_CH0_CTRL_TRIG_INCR_READ_BITS)
@@ -157,9 +114,9 @@ void DMA::update(uint64_t target)
             }
             break;
         }
-    }
 
-    clock.addCycles(passed);
+        clock.addCycles(1);
+    }
 }
 
 uint64_t DMA::getNextInterruptTime(uint64_t target)
@@ -320,4 +277,9 @@ void DMA::regWrite(uint32_t addr, uint32_t data)
 
         logf(LogLevel::NotImplemented, logComponent, "W %03X%s%08X", addr, op[atomic], data);
     }
+}
+
+bool DMA::isChannelActive(int ch) const
+{
+    return channelTriggered & (1 << ch);
 }

core/DMA.h

@@ -29,6 +29,8 @@ class DMA final
 
     ClockTarget &getClock() {return clock;}
 
+    bool isChannelActive(int ch) const;
+
 private:
     MemoryBus &mem;
 

core/GPIO.h

@@ -73,6 +73,8 @@ class GPIO final
 
     void setReadCallback(ReadCallback cb);
 
+    uint32_t getPadState() const {return padState;}
+
     void openLogFile(const char *filename);
     void closeLogFile();
 

core/Logging.cpp

@@ -42,6 +42,8 @@
                 return "other";
             case Component::ArmCore:
                 return "armcore";
+            case Component::Board:
+                return "board";
             case Component::Clocks:
                 return "clocks";
             case Component::DMA:
@@ -56,6 +58,8 @@
                 return "main";
             case Component::MemoryBus:
                 return "membus";
+            case Component::PIO:
+                return "pio";
             case Component::PWM:
                 return "pwm";
             case Component::Timer:
@@ -95,6 +99,8 @@
             return Component::Other;
         if(str == "armcore")
             return Component::ArmCore;
+        if(str == "board")
+            return Component::Board;
         if(str == "clocks")
             return Component::Clocks;
         if(str == "dma")
@@ -109,6 +115,8 @@
             return Component::Main;
         if(str == "membus")
             return Component::MemoryBus;
+        if(str == "pio")
+            return Component::PIO;
         if(str == "pwm")
             return Component::PWM;
         if(str == "timer")
@@ -165,8 +173,8 @@
         auto levelStr = levelToString(level);
         auto compStr = componentToString(component);
 
         int levelPad = 16 - strlen(levelStr);
         int compPad = 9 - strlen(compStr);
 
         printf("[%s]%*s[%s]%*s%s\n", levelStr, levelPad, "", compStr, compPad, "", buf);
 

core/Logging.h

@@ -26,13 +26,15 @@ namespace Logging
         Other = 0,
 
         ArmCore,
+        Board,
         Clocks,
         DMA,
         GDB,
         GPIO,
         I2C,
         Main,
         MemoryBus,
+        PIO,
         PWM,
         Timer,
         UART,

core/MemoryBus.cpp

@@ -123,13 +123,16 @@
     return bank * 64 * 1024 + word * 4 + (addr & 3);
 }
 
-MemoryBus::MemoryBus() : gpio(*this), uart{{*this, 0}, {*this, 1}}, i2c{{*this, 0}, {*this, 1}}, pwm(*this), watchdog(*this), timer(*this), dma(*this), usb(*this)
+MemoryBus::MemoryBus() : gpio(*this), uart{{*this, 0}, {*this, 1}}, i2c{{*this, 0}, {*this, 1}}, pwm(*this), watchdog(*this), timer(*this), dma(*this), usb(*this), pio{{*this, 0}, {*this, 1}}
 {
     clocks.addClockTarget(clk_ref, watchdog.getClock());
 
-    clocks.addClockTarget(clk_sys, dma.getClock());
     clocks.addClockTarget(clk_sys, gpio.getClock());
     clocks.addClockTarget(clk_sys, pwm.getClock());
+
+    clocks.addClockTarget(clk_sys, dma.getClock());
+    clocks.addClockTarget(clk_sys, pio[0].getClock());
+    clocks.addClockTarget(clk_sys, pio[1].getClock());
 }
 
 void MemoryBus::setBootROM(const uint8_t *rom)
@@ -159,6 +162,8 @@
 
     dma.reset();
     usb.reset();
+    pio[0].reset();
+    pio[1].reset();
 
     nextInterruptTime = 0;
 
@@ -386,6 +391,8 @@
 
     dma.update(target);
     usb.update(target);
+    pio[0].update(target);
+    pio[1].update(target);
 }
 
 void MemoryBus::gpioUpdate(uint64_t target)
@@ -394,6 +401,11 @@
     // TODO: need to ensure correct ordering...
     pwm.update(target);
 
+    // technically affects IO, but not implemented yet
+    // would also need to sync DMA most of the time
+    //pio[0].update(target);
+    //pio[1].update(target);
+
     gpio.update(target);
 }
 
@@ -420,6 +432,12 @@
 
     if(irqMask & (1 << USBCTRL_IRQ))
         usb.updateForInterrupts(target);
+
+    if(irqMask & (1 << PIO0_IRQ_0 | 1 << PIO0_IRQ_1))
+        pio[0].update(target);
+
+    if(irqMask & (1 << PIO1_IRQ_0 | 1 << PIO1_IRQ_1))
+        pio[1].update(target);
 }
 
 void MemoryBus::calcNextInterruptTime()
@@ -434,6 +452,8 @@
     nextInterruptTime = timer.getNextInterruptTime(nextInterruptTime);
     nextInterruptTime = dma.getNextInterruptTime(nextInterruptTime);
     nextInterruptTime = usb.getNextInterruptTime(nextInterruptTime);
+    nextInterruptTime = pio[0].getNextInterruptTime(nextInterruptTime);
+    nextInterruptTime = pio[1].getNextInterruptTime(nextInterruptTime);
 }
 
 void MemoryBus::setInterruptUpdateCallback(InterruptUpdateCallback cb)
@@ -906,7 +926,7 @@
         case APBPeripheral::PSM:
         {
             int atomic = periphAddr >> 12;
             int addr = periphAddr & 0xFFF;
             if(addr == PSM_FRCE_OFF_OFFSET)
             {
                 logf(LogLevel::NotImplemented, logComponent, "PSM FRCE_OFF %i %08X", atomic, data);
@@ -1030,10 +1050,14 @@
     auto peripheral = static_cast<AHBPeripheral>((addr >> 20) & 0xF);
     auto periphAddr = addr & 0xFFFF;
 
+    // update DMA for any periph read
+    // TODO: any access that DMA could affect, possibly filter by dest addrs
+    dma.update(masterClock.getTime());
+
     switch(peripheral)
     {
         case AHBPeripheral::DMA:
-            dma.update(masterClock.getTime());
+            //dma.update(masterClock.getTime());
             return dma.regRead(periphAddr);
 
         case AHBPeripheral::USB:
@@ -1052,25 +1076,12 @@
         }
 
         case AHBPeripheral::PIO0:
-        {
-            if(periphAddr == PIO_FSTAT_OFFSET)
-                return PIO_FSTAT_TXEMPTY_BITS | PIO_FSTAT_RXEMPTY_BITS; // all FIFOs empty
-            if(periphAddr == PIO_FDEBUG_OFFSET)
-                return PIO_FDEBUG_TXSTALL_BITS; // all TXSTALL
+            pio[0].update(masterClock.getTime());
+            return pio[0].regRead(periphAddr);
 
-            logf(LogLevel::NotImplemented, logComponent, "PIO0 R %08X", addr);
-            break;
-        }
         case AHBPeripheral::PIO1:
-        {
-            if(periphAddr == PIO_FSTAT_OFFSET)
-                return PIO_FSTAT_TXEMPTY_BITS | PIO_FSTAT_RXEMPTY_BITS; // all FIFOs empty
-            if(periphAddr == PIO_FDEBUG_OFFSET)
-                return PIO_FDEBUG_TXSTALL_BITS; // all TXSTALL
-
-            logf(LogLevel::NotImplemented, logComponent, "PIO1 R %08X", addr);
-            break;
-        }
+            pio[1].update(masterClock.getTime());
+            return pio[1].regRead(periphAddr);
 
         case AHBPeripheral::XIPAux:
             logf(LogLevel::NotImplemented, logComponent, "AHBP XIP_AUX R %08X", addr);
@@ -1143,18 +1154,14 @@
 
         case AHBPeripheral::PIO0:
         {
-            if(periphAddr == PIO_TXF0_OFFSET)
-            {}
-            else
-                logf(LogLevel::NotImplemented, logComponent, "PIO0 W %08X = %08X", addr, data);
+            pio[0].update(masterClock.getTime());
+            pio[0].regWrite(periphAddr, data);
             return;
         }
         case AHBPeripheral::PIO1:
         {
-            if(periphAddr == PIO_TXF0_OFFSET)
-            {}
-            else
-                logf(LogLevel::NotImplemented, logComponent, "PIO1 W %08X = %08X", addr, data);
+            pio[1].update(masterClock.getTime());
+            pio[1].regWrite(periphAddr, data);
             return;
         }
 

core/MemoryBus.h

@@ -10,6 +10,7 @@
 #include "GPIO.h"
 #include "FIFO.h"
 #include "I2C.h"
+#include "PIO.h"
 #include "PWM.h"
 #include "Timer.h"
 #include "UART.h"
@@ -88,7 +89,9 @@ class MemoryBus
     PWM &getPWM() {return pwm;}
     Watchdog &getWatchdog() {return watchdog;}
 
+    DMA &getDMA() {return dma;}
     USB &getUSB() {return usb;}
+    PIO &getPIO(int i) {return pio[i];}
 
 private:
     template<class T, size_t size>
@@ -168,6 +171,8 @@ class MemoryBus
 
     USB usb;
 
+    PIO pio[2];
+
     uint64_t nextInterruptTime;
 
     InterruptUpdateCallback interruptUpdateCallback;