Broken Travis?

christopherpow · Mar 21, 2020 · 2d559eb · 2d559eb
1 parent 34a7fa6
commit 2d559eb
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 18 deletions.
diff --git a/PHONY b/PHONY
@@ -1 +1 @@
-2301
+0
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ The following steps are required prior to building this project on any platform.
 
 0. Install `git`
 1. Install [Qt 5.12.6](http://download.qt.io/archive/qt/5.12/5.12.6/) as it was the latest kit to be verified to build NESICIDE properly without errors. Please do not use a kit later than this, or if you do, please create a pull request with necessary changes.
-2. Make sure qmake is in your PATH.
+2. Make sure qmake and your Qt installation is in your PATH.
 
 At the time of writing this Mac OS Homewbrew contains Qt 5.14.1 and NESICIDE can also be built with that version of Qt. So, alternatively, you can install Qt using
 
@@ -28,7 +28,7 @@ At the time of writing this Mac OS Homewbrew contains Qt 5.14.1 and NESICIDE can
 ### Debian prerequisites
 
 ```sh
-sudo apt-get install build-essential libasound2-dev liblua5.1-dev libsdl1.2-dev libgl1-mesa-dev wine-dev
+sudo apt-get install qtchooser build-essential libasound2-dev liblua5.1-dev libsdl1.2-dev libgl1-mesa-dev 
 ```
 
 ### Arch Linux prerequisites

diff --git a/libs/nes/emulator/cmemory.cpp b/libs/nes/emulator/cmemory.cpp
@@ -49,9 +49,9 @@ uint32_t CMEMORYBANK::BASEADDR() const
 
 
 void CMEMORYBANK::INITIALIZE(CMEMORY *parent,
-                        uint32_t bankNum,
-                        uint32_t size,
-                        uint32_t sizeMask)
+                             uint32_t bankNum,
+                             uint32_t size,
+                             uint32_t sizeMask)
 {
    uint32_t addr;
 

diff --git a/libs/nes/emulator/cmemory.h b/libs/nes/emulator/cmemory.h
@@ -164,11 +164,11 @@ class CMEMORY
    }
 
    // Support functions for inline disassembly
-   inline void OPCODEMASK ( uint32_t virtAddr, uint8_t mask )
+   virtual void OPCODEMASK ( uint32_t virtAddr, uint8_t mask )
    {
       (*(m_pBank+virtBankFromVirtAddr(virtAddr)))->OPCODEMASK(virtAddr,mask);
    }
-   inline void OPCODEMASKATPHYSADDR ( uint32_t physAddr, uint8_t mask )
+   virtual void OPCODEMASKATPHYSADDR ( uint32_t physAddr, uint8_t mask )
    {
       (m_bank+physBankFromPhysAddr(physAddr))->OPCODEMASK(physAddr,mask);
    }
@@ -182,15 +182,15 @@ class CMEMORY
    }
    uint32_t SLOC2VIRTADDR ( uint16_t sloc );
    uint16_t ADDR2SLOC ( uint32_t virtAddr );
-   inline uint32_t SLOC ( uint32_t virtAddr )
+   virtual uint32_t SLOC ( uint32_t virtAddr )
    {
       return (*(m_pBank+virtBankFromVirtAddr(virtAddr)))->SLOC();
    }
-   char* DISASSEMBLY ( uint32_t virtAddr )
+   virtual char* DISASSEMBLY ( uint32_t virtAddr )
    {
       return (*(m_pBank+virtBankFromVirtAddr(virtAddr)))->DISASSEMBLY(virtAddr);
    }
-   char* DISASSEMBLYATPHYSADDR ( uint32_t physAddr, char* buffer )
+   virtual char* DISASSEMBLYATPHYSADDR ( uint32_t physAddr, char* buffer )
    {
       return ::DISASSEMBLE((m_bank+physBankFromPhysAddr(physAddr))->MEMPTR(physAddr),buffer);
    }
@@ -217,7 +217,7 @@ class CMEMORY
       }
    }
 
-   inline uint8_t* MEMPTR (uint32_t addr)
+   virtual uint8_t* MEMPTR (uint32_t addr)
    {
       return (*(m_pBank+virtBankFromVirtAddr(addr)))->MEMPTR(addr);
    }
@@ -321,19 +321,28 @@ class COPENBUS: public CMEMORY
    COPENBUS() : CMEMORY(0,1) {}
    virtual ~COPENBUS() {}
 
-   uint32_t TOTALSIZE() const { return 0; }
-
    // Code/Data logger support functions
    CCodeDataLogger* LOGGER (uint32_t virtAddr = 0);
    CCodeDataLogger* LOGGERATPHYSADDR (uint32_t physAddr);
 
+   void OPCODEMASK ( uint32_t virtAddr, uint8_t mask ) {}
+   virtual void OPCODEMASKATPHYSADDR ( uint32_t physAddr, uint8_t mask ) {}
+
    uint8_t MEM (uint32_t addr);
    void MEM (uint32_t addr, uint8_t data);
    uint8_t MEMATPHYSADDR (uint32_t absAddr);
    void MEMATPHYSADDR (uint32_t absAddr, uint8_t data);
 
+   uint8_t* MEMPTR (uint32_t addr) { return m_pBank[0]->MEMPTR(0); }
+
    void REMAP(uint32_t virt, uint32_t phys) {}
    void REMAPEXT(uint32_t virt, CMEMORYBANK* phys) {}
+
+   uint32_t SLOC ( uint32_t virtAddr ) { return 1; }
+   char* DISASSEMBLY ( uint32_t virtAddr ) { return "???"; }
+   char* DISASSEMBLYATPHYSADDR ( uint32_t physAddr, char* buffer ) { return "???"; }
+
+   uint32_t TOTALSIZE() const { return 0; }
 };
 
 #endif // CMEMORY_H
diff --git a/libs/nes/emulator/cnes.cpp b/libs/nes/emulator/cnes.cpp
@@ -237,11 +237,9 @@ uint32_t CNES::PHYSADDR ( uint32_t addr )
 
 void CNES::FRONTLOAD ( uint32_t mapper )
 {
-   CROM* cartSave = m_cart;
-
-   // Create cartridge space.   
+   delete m_cart;
+   // Create cartridge space.
    m_cart = CARTFACTORY(mapper);
-   delete cartSave;
 }
 
 void CNES::RESET ( bool soft )

diff --git a/libs/nes/emulator/cnesrommapper004.cpp b/libs/nes/emulator/cnesrommapper004.cpp
@@ -123,6 +123,9 @@ void CROMMapper004::RESET ( bool soft )
    for ( idx = 0; idx < 8; idx++ )
    {
       m_reg [ idx ] = 0x00;
+   }
+   for ( idx = 0; idx < 6; idx++ )
+   {
       m_chr [ idx ] = 0;
    }
 

diff --git a/libs/nes/emulator/cnesrommapper005.h b/libs/nes/emulator/cnesrommapper005.h
@@ -14,14 +14,23 @@ class CNAMETABLEFILLER: public CMEMORY
    CCodeDataLogger* LOGGER (uint32_t virtAddr = 0);
    CCodeDataLogger* LOGGERATPHYSADDR (uint32_t physAddr);
 
+   void OPCODEMASK ( uint32_t virtAddr, uint8_t mask ) {}
+   virtual void OPCODEMASKATPHYSADDR ( uint32_t physAddr, uint8_t mask ) {}
+
    uint8_t MEM (uint32_t addr);
    void MEM (uint32_t addr, uint8_t data);
    uint8_t MEMATPHYSADDR (uint32_t absAddr);
    void MEMATPHYSADDR (uint32_t absAddr, uint8_t data);
 
+   uint8_t* MEMPTR (uint32_t addr) { return m_pBank[0]->MEMPTR(0); }
+
    void REMAP(uint32_t virt, uint32_t phys) {}
    void REMAPEXT(uint32_t virt, CMEMORYBANK* phys) {}
 
+   uint32_t SLOC ( uint32_t virtAddr ) { return 1; }
+   char* DISASSEMBLY ( uint32_t virtAddr ) { return "???"; }
+   char* DISASSEMBLYATPHYSADDR ( uint32_t physAddr, char* buffer ) { return "???"; }
+
    uint32_t TOTALSIZE() const { return 0; }
 
 protected: