Merge branch 'atirage-hacks'.

CMakeLists.txt

@@ -11,6 +11,8 @@ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
 if (NOT WIN32)
 find_package(SDL2 REQUIRED)
 include_directories(${SDL2_INCLUDE_DIRS})
+else()
+include_directories("${PROJECT_SOURCE_DIR}/thirdparty/SDL2/include/")
 if (UNIX AND NOT APPLE)
     find_package (Threads)
 endif()
@@ -82,6 +84,8 @@ include_directories("${PROJECT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/devices"
                     "${PROJECT_SOURCE_DIR}/debugger"
                     "${PROJECT_SOURCE_DIR}/utils"
 					"${PROJECT_SOURCE_DIR}/thirdparty/loguru/"
+                    "${PROJECT_SOURCE_DIR}/thirdparty/CLI11/"
+#                    ${SDL2_INCLUDE_DIRS})
 					"${PROJECT_SOURCE_DIR}/thirdparty/SDL2/")
 #                    "${PROJECT_SOURCE_DIR}/thirdparty/cubeb/include")
 #                    ${LIBSOUNDIO_HEADERS})

cpu/ppc/CMakeLists.txt

@@ -1,4 +1,5 @@
-include_directories("${PROJECT_SOURCE_DIR}")
+include_directories("${PROJECT_SOURCE_DIR}"
+                    "${PROJECT_SOURCE_DIR}/thirdparty/loguru/")
 
 file(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
 

cpu/ppc/poweropcodes.cpp

@@ -30,7 +30,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <limits>
 #include <stdexcept>
 #include <stdio.h>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 // Affects the XER register's SO and OV Bits
 

cpu/ppc/ppcexec.cpp

@@ -26,7 +26,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <stdexcept>
 #include <stdio.h>
 #include <string>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 #include <unordered_map>
 
 #include "ppcemu.h"

cpu/ppc/ppcfpopcodes.cpp

@@ -33,7 +33,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <stdexcept>
 #include <stdio.h>
 #include <unordered_map>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 // Used for FP calcs
 uint64_t ppc_result64_b;

cpu/ppc/ppcopcodes.cpp

@@ -31,7 +31,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <stdexcept>
 #include <stdio.h>
 #include <stdlib.h>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 #include <thread>
 #include <vector>
 

debugger/CMakeLists.txt

@@ -1,4 +1,5 @@
 include_directories("${PROJECT_SOURCE_DIR}"
+                    "${PROJECT_SOURCE_DIR}/thirdparty/loguru/"
                     "${PROJECT_SOURCE_DIR}/thirdparty/capstone/include")
 
 file(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")

debugger/debugger.cpp

@@ -27,7 +27,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <sstream>
 #include <stdio.h>
 #include <string>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 #include "../cpu/ppc/ppcdisasm.h"
 #include "../cpu/ppc/ppcemu.h"
 #include "../cpu/ppc/ppcmmu.h"

devices/CMakeLists.txt

@@ -1,4 +1,6 @@
-include_directories("${PROJECT_SOURCE_DIR}")
+include_directories("${PROJECT_SOURCE_DIR}"
+                    "${PROJECT_SOURCE_DIR}/thirdparty/loguru/"
+                    "${PROJECT_SOURCE_DIR}/thirdparty/SDL2/")
 
 file(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
 

devices/adb.cpp

@@ -37,7 +37,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <thirdparty/SDL2/include/SDL_stdinc.h>
 #endif
 
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 using namespace std;
 

devices/atirage.cpp

@@ -24,9 +24,10 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include "memaccess.h"
 #include "pcidevice.h"
 #include <atirage.h>
+#include <chrono>
 #include <cstdint>
 #include <map>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 /* Mach64 post dividers. */
 static const int mach64_post_div[8] = {
@@ -75,6 +76,12 @@ static const std::map<uint16_t, std::string> mach64_reg_names = {
     {0x01FC, "SCALE_3D_CNTL"},
     {0x0310, "FIFO_STAT"},
     {0x0338, "GUI_STAT"},
+    {0x04C0, "MPP_CONFIG"},
+    {0x04C4, "MPP_STROBE_SEQ"},
+    {0x04C8, "MPP_ADDR"},
+    {0x04CC, "MPP_DATA"},
+    {0x0500, "TVO_CNTL"},
+    {0x0704, "SETUP_CNTL"},
 };
 
 
@@ -89,6 +96,9 @@ ATIRage::ATIRage(uint16_t dev_id, uint32_t mem_amount) : PCIDevice("ati-rage") {
     /* ATI Rage driver needs to know ASIC ID (manufacturer's internal chip code)
        to operate properly */
     switch (dev_id) {
+    case ATI_RAGE_GT_DEV_ID:
+        asic_id = 0x9A; // GT-B2U3 fabricated by UMC
+        break;
     case ATI_RAGE_PRO_DEV_ID:
         asic_id = 0x5C; // R3B/D/P-A4 fabricated by UMC
         break;
@@ -108,10 +118,14 @@ ATIRage::ATIRage(uint16_t dev_id, uint32_t mem_amount) : PCIDevice("ati-rage") {
 
     /* initialize display identification */
     this->disp_id = new DisplayID();
+
+    //this->surface = new uint8_t[640 * 480];
 }
 
 ATIRage::~ATIRage()
 {
+    //delete (this->surface);
+
     if (this->vram_ptr) {
         delete this->vram_ptr;
     }
@@ -163,11 +177,6 @@ uint32_t ATIRage::read_reg(uint32_t offset, uint32_t size) {
             read_mem(&this->block_io_regs[offset], size));
     }
 
-    if (offset > sizeof(this->block_io_regs)) {
-        LOG_F(WARNING, "ATI Rage: register offset 0x%04X out of bounds!", offset);
-        return 0;
-    }
-
     res = read_mem(&this->block_io_regs[offset], size);
 
     return res;
@@ -177,21 +186,30 @@ void ATIRage::write_reg(uint32_t offset, uint32_t value, uint32_t size) {
     uint32_t gpio_val;
     uint16_t gpio_dir;
 
-    if (offset > sizeof(this->block_io_regs)) {
-        LOG_F(WARNING, "ATI Rage: register offset 0x%04X out of bounds!", offset);
-        return;
-    }
-
     /* size-dependent endian conversion */
     write_mem(&this->block_io_regs[offset], value, size);
 
     switch (offset & ~3) {
+    case ATI_CRTC_OFF_PITCH:
+        LOG_F(INFO, "ATI Rage: CRTC_OFF_PITCH=0x%08X", READ_DWORD_LE_A(&this->block_io_regs[ATI_CRTC_OFF_PITCH]));
+        break;
     case ATI_CRTC_GEN_CNTL:
         if (this->block_io_regs[ATI_CRTC_GEN_CNTL+3] & 2) {
             this->crtc_enable();
         } else {
             this->crtc_on = false;
         }
+        LOG_F(INFO, "ATI Rage: CRTC_GEN_CNTL:CRTC_ENABLE=%d", !!(this->block_io_regs[ATI_CRTC_GEN_CNTL+3] & 2));
+        LOG_F(INFO, "ATI Rage: CRTC_GEN_CNTL:CRTC_DISPLAY_DIS=%d", !!(this->block_io_regs[ATI_CRTC_GEN_CNTL] & 0x40));
+        break;
+    case ATI_CUR_OFFSET:
+        LOG_F(INFO, "ATI Rage: CUR_OFFSET=0x%08X", READ_DWORD_LE_A(&this->block_io_regs[ATI_CUR_OFFSET]));
+        break;
+    case ATI_CUR_HORZ_VERT_POSN:
+        LOG_F(INFO, "ATI Rage: CUR_HORZ_VERT_POSN=0x%08X", READ_DWORD_LE_A(&this->block_io_regs[ATI_CUR_HORZ_VERT_POSN]));
+        break;
+    case ATI_CUR_HORZ_VERT_OFF:
+        LOG_F(INFO, "ATI Rage: CUR_HORZ_VERT_OFF=0x%08X", READ_DWORD_LE_A(&this->block_io_regs[ATI_CUR_HORZ_VERT_OFF]));
         break;
     case ATI_GP_IO:
         if (offset < (ATI_GP_IO + 2)) {
@@ -239,6 +257,9 @@ void ATIRage::write_reg(uint32_t offset, uint32_t value, uint32_t size) {
             }
         }
         break;
+    case ATI_GEN_TEST_CNTL:
+        LOG_F(INFO, "HW cursor: %s", this->block_io_regs[ATI_GEN_TEST_CNTL] & 0x80 ? "on" : "off");
+        break;
     default:
         LOG_F(
             INFO,
@@ -247,6 +268,11 @@ void ATIRage::write_reg(uint32_t offset, uint32_t value, uint32_t size) {
             offset & ~3,
             READ_DWORD_LE_A(&this->block_io_regs[offset & ~3]));
     }
+
+    if ((this->block_io_regs[ATI_CRTC_GEN_CNTL+3] & 2) &&
+        !(this->block_io_regs[ATI_CRTC_GEN_CNTL] & 0x40)) {
+        this->update_screen();
+    }
 }
 
 
@@ -373,9 +399,17 @@ uint32_t ATIRage::read(uint32_t reg_start, uint32_t offset, int size)
         /* read from little-endian VRAM region */
         return read_mem(this->vram_ptr + offset, size);
     }
-    else if (offset >= MEMMAP_OFFSET) {
+    else if (offset >= BE_FB_OFFSET) {
-        /* read from memory-mapped registers */
+        /* read from big-endian VRAM region */
-        return this->read_reg(offset - MEMMAP_OFFSET, size);
+        return read_mem_rev(this->vram_ptr + (offset - BE_FB_OFFSET), size);
+    }
+    else if (offset >= MM_REGS_0_OFF) {
+        /* read from memory-mapped registers, block 0 */
+        return this->read_reg(offset - MM_REGS_0_OFF, size);
+    }
+    else if (offset >= MM_REGS_1_OFF) {
+        /* read from memory-mapped registers, block 1 */
+        return this->read_reg(offset - MM_REGS_1_OFF + 0x400, size);
     }
     else {
         LOG_F(WARNING, "ATI Rage: read attempt from unmapped aperture region at 0x%08X", offset);
@@ -396,9 +430,18 @@ void ATIRage::write(uint32_t reg_start, uint32_t offset, uint32_t value, int siz
     if (offset < this->vram_size) {
         /* write to little-endian VRAM region */
         write_mem(this->vram_ptr + offset, value, size);
-    } else if (offset >= MEMMAP_OFFSET) {
+    }
-        /* write to memory-mapped registers */
+    else if (offset >= BE_FB_OFFSET) {
-        this->write_reg(offset - MEMMAP_OFFSET, value, size);
+        /* write to big-endian VRAM region */
+        write_mem_rev(this->vram_ptr + (offset - BE_FB_OFFSET), value, size);
+    }
+    else if (offset >= MM_REGS_0_OFF) {
+        /* write to memory-mapped registers, block 0 */
+        this->write_reg(offset - MM_REGS_0_OFF, value, size);
+    }
+    else if (offset >= MM_REGS_1_OFF) {
+        /* write to memory-mapped registers, block 1 */
+        this->write_reg(offset - MM_REGS_1_OFF + 0x400, value, size);
     }
     else {
         LOG_F(WARNING, "ATI Rage: write attempt to unmapped aperture region at 0x%08X", offset);
@@ -497,3 +540,84 @@ void ATIRage::crtc_enable() {
 
     this->crtc_on = true;
 }
+
+void ATIRage::draw_hw_cursor(uint8_t *dst_buf, int dst_pitch) {
+    uint8_t *src_buf, *src_row, *dst_row, px4;
+
+    int horz_offset = READ_DWORD_LE_A(&this->block_io_regs[ATI_CUR_HORZ_VERT_OFF]) & 0x3F;
+    int vert_offset = (READ_DWORD_LE_A(&this->block_io_regs[ATI_CUR_HORZ_VERT_OFF]) >> 16) & 0x3F;
+
+    src_buf = this->vram_ptr + (READ_DWORD_LE_A(&this->block_io_regs[ATI_CUR_OFFSET]) * 8);
+
+    int cur_height = 64 - vert_offset;
+
+    uint32_t color0 = READ_DWORD_LE_A(&this->block_io_regs[ATI_CUR_CLR0]) | 0x000000FFUL;
+    uint32_t color1 = READ_DWORD_LE_A(&this->block_io_regs[ATI_CUR_CLR1]) | 0x000000FFUL;
+
+    for (int h = 0; h < cur_height; h++) {
+        dst_row = &dst_buf[h * dst_pitch];
+        src_row = &src_buf[h * 16];
+
+        for (int x = 0; x < 16; x++) {
+            px4 = src_row[x];
+
+            for (int p = 0; p < 4; p++, px4 >>= 2, dst_row += 4) {
+                switch(px4 & 3) {
+                case 0: // cursor color 0
+                    WRITE_DWORD_BE_A(dst_row, color0);
+                    break;
+                case 1: // cursor color 1
+                    WRITE_DWORD_BE_A(dst_row, color1);
+                    break;
+                case 2: // transparent
+                    break;
+                case 3: // 1's complement of display pixel
+                    break;
+                }
+            }
+        }
+    }
+}
+
+void ATIRage::update_screen() {
+    uint8_t *src_buf, *dst_buf, *src_row, *dst_row, pix;
+    int     src_pitch, dst_pitch;
+
+    //auto start_time = std::chrono::steady_clock::now();
+
+    this->disp_id->get_disp_texture((void **)&dst_buf, &dst_pitch);
+
+    uint32_t src_offset = (READ_DWORD_LE_A(&this->block_io_regs[ATI_CRTC_OFF_PITCH]) & 0xFFFF) * 8;
+
+    src_pitch = ((READ_DWORD_LE_A(&this->block_io_regs[ATI_CRTC_OFF_PITCH])) >> 19) & 0x1FF8;
+
+    src_buf = this->vram_ptr + src_offset;
+
+    for (int h = 0; h < this->active_height; h++) {
+        src_row = &src_buf[h * src_pitch];
+        dst_row = &dst_buf[h * dst_pitch];
+
+        for (int x = 0; x < this->active_width; x++) {
+            pix = src_row[x];
+            dst_row[0] = this->palette[pix][2]; // B
+            dst_row[1] = this->palette[pix][1]; // G
+            dst_row[2] = this->palette[pix][0]; // R
+            dst_row[3] = 255; // A
+            dst_row += 4;
+        }
+    }
+
+    // HW cursor data is stored at the beginning of the video memory
+    // HACK: use src_offset to recognize cursor data being ready
+    // Normally, we should check GEN_CUR_ENABLE bit in the GEN_TEST_CNTL register
+    if (src_offset > 0x400 && READ_DWORD_LE_A(&this->block_io_regs[ATI_CUR_OFFSET])) {
+        this->draw_hw_cursor(dst_buf + dst_pitch * 20 + 120, dst_pitch);
+    }
+
+    this->disp_id->update_screen();
+
+    //auto end_time = std::chrono::steady_clock::now();
+    //auto time_elapsed = std::chrono::duration_cast<std::chrono::nanoseconds>(end_time - start_time);
+    //LOG_F(INFO, "Display uodate took: %lld ns", time_elapsed.count());
+    SDL_Delay(15);
+}

devices/atirage.h

@@ -169,6 +169,7 @@ enum {
     ATI_MPP_ADDR              = 0x04C8,
     ATI_MPP_DATA              = 0x04CC,
     ATI_TVO_CNTL              = 0x0500,
+    ATI_SETUP_CNTL            = 0x0704,
 };
 
 /* Mach64 PLL register indices. */
@@ -184,7 +185,9 @@ enum {
 };
 
 constexpr auto APERTURE_SIZE = 0x01000000UL; /* Mach64 aperture size */
-constexpr auto MEMMAP_OFFSET = 0x007FFC00UL; /* offset to memory mapped registers */
+constexpr auto MM_REGS_0_OFF = 0x007FFC00UL; /* offset to memory mapped registers, block 0 */
+constexpr auto MM_REGS_1_OFF = 0x007FF800UL; /* offset to memory mapped registers, block 1 */
+constexpr auto BE_FB_OFFSET  = 0x00800000UL; /* Offset to the big-endian frame buffer */
 
 constexpr auto ATI_XTAL = 14318180.0f; // external crystal oscillator frequency
 
@@ -221,9 +224,11 @@ protected:
     float calc_pll_freq(int scale, int fb_div);
     void verbose_pixel_format(int crtc_index);
     void crtc_enable();
+    void draw_hw_cursor(uint8_t *dst_buf, int dst_pitch);
+    void update_screen();
 
 private:
-    uint8_t block_io_regs[512] = {0};
+    uint8_t block_io_regs[2048] = {0};
 
     uint8_t pci_cfg[256] = {0}; /* PCI configuration space */
 
@@ -246,5 +251,6 @@ private:
 
     uint8_t palette[256][4]; /* internal DAC palette in RGBA format */
     int comp_index;          /* color component index for DAC palette access */
+    uint8_t *surface;
 };
 #endif /* ATI_RAGE_H */

devices/awacs.cpp

@@ -30,7 +30,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include "machines/machinebase.h"
 #include "soundserver.h"
 #include <algorithm>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 static int awac_freqs[8] = {44100, 29400, 22050, 17640, 14700, 11025, 8820, 7350};
 

devices/awacs.h

@@ -32,7 +32,6 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include "i2c.h"
 #include "soundserver.h"
 #include <cinttypes>
-#include <thirdparty/SDL2/include/SDL.h>
 
 /** AWAC registers offsets. */
 enum {

devices/dbdma.cpp

@@ -26,7 +26,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include "endianswap.h"
 #include <cinttypes>
 #include <cstring>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 void DMAChannel::get_next_cmd(uint32_t cmd_addr, DMACmd* p_cmd) {
     /* load DMACmd from physical memory */

devices/displayid.cpp

@@ -20,7 +20,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
 #include "displayid.h"
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
+#include "SDL.h"
 
 DisplayID::DisplayID() {
     /* Initialize Apple monitor codes */
@@ -37,8 +38,76 @@ DisplayID::DisplayID() {
 
     /* DDC sense mode is on by default */
     this->i2c_on = true;
+
+    LOG_F(INFO, "Create display window...");
+
+    // Create display window
+    this->display_wnd = SDL_CreateWindow(
+        "DingusPPC Display",
+        SDL_WINDOWPOS_UNDEFINED,
+        SDL_WINDOWPOS_UNDEFINED,
+        640,
+        480,
+        SDL_WINDOW_OPENGL
+    );
+
+    if (this->display_wnd == NULL) {
+        LOG_F(ERROR, "Display: SDL_CreateWindow failed with %s\n", SDL_GetError());
+    }
+
+    this->renderer = SDL_CreateRenderer(this->display_wnd, -1, SDL_RENDERER_ACCELERATED);
+    if (this->renderer == NULL) {
+        LOG_F(ERROR, "Display: SDL_CreateRenderer failed with %s\n", SDL_GetError());
+    }
+
+    SDL_SetRenderDrawColor(this->renderer, 0, 0, 0, 255);
+    SDL_RenderClear(this->renderer);
+    SDL_RenderPresent(this->renderer);
+
+    // Stupidly poll for 10 events.
+    // Otherwise no window will be shown on mac OS!
+    SDL_Event e;
+    for (int i = 0; i < 10; i++) {
+        SDL_PollEvent(&e);
+    }
+
+    this->disp_texture = SDL_CreateTexture(
+        this->renderer,
+        SDL_PIXELFORMAT_ARGB8888,
+        SDL_TEXTUREACCESS_STREAMING,
+        640, 480
+    );
+
+    if (this->disp_texture == NULL) {
+        LOG_F(ERROR, "Display: SDL_CreateTexture failed with %s\n", SDL_GetError());
+    }
 }
 
+DisplayID::~DisplayID() {
+    if (this->disp_texture) {
+        SDL_DestroyTexture(this->disp_texture);
+    }
+
+    if (this->renderer) {
+        SDL_DestroyRenderer(this->renderer);
+    }
+
+    if (this->display_wnd) {
+        SDL_DestroyWindow(this->display_wnd);
+    }
+}
+
+void DisplayID::get_disp_texture(void **pix_buf, int *pitch) {
+    SDL_LockTexture(this->disp_texture, NULL, pix_buf, pitch);
+}
+
+void DisplayID::update_screen() {
+    SDL_UnlockTexture(this->disp_texture);
+    //SDL_SetRenderDrawColor(this->renderer, 255, 255, 255, 255);
+    SDL_RenderClear(this->renderer);
+    SDL_RenderCopy(this->renderer, this->disp_texture, NULL, NULL);
+    SDL_RenderPresent(this->renderer);
+}
 
 uint16_t DisplayID::set_result(uint8_t sda, uint8_t scl) {
     this->last_sda = sda;

devices/displayid.h

@@ -33,6 +33,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #ifndef DISPLAY_ID_H
 #define DISPLAY_ID_H
 
+#include "SDL.h"
 #include <cinttypes>
 
 /** I2C bus states. */
@@ -50,15 +51,21 @@ enum I2CState : uint8_t {
 class DisplayID {
 public:
     DisplayID();
-    ~DisplayID() = default;
+    ~DisplayID();
 
     uint16_t read_monitor_sense(uint16_t data, uint16_t dirs);
+    void get_disp_texture(void **pix_buf, int *pitch);
+    void update_screen(void);
 
 protected:
     uint16_t set_result(uint8_t sda, uint8_t scl);
     uint16_t update_ddc_i2c(uint8_t sda, uint8_t scl);
 
 private:
+    SDL_Window      *display_wnd;
+    SDL_Renderer    *renderer;
+    SDL_Texture     *disp_texture;
+
     bool i2c_on;
 
     uint8_t std_sense_code;

devices/heathrow.cpp

@@ -26,7 +26,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include "viacuda.h"
 #include <cinttypes>
 #include <iostream>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 #include <cpu/ppc/ppcemu.h>
 
 /** Heathrow Mac I/O device emulation.

devices/i2c.h

@@ -30,7 +30,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <stdexcept>
 #include <cstring>
 #include <string>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 /** Base class for I2C devices */
 class I2CDevice {

devices/mpc106.cpp

@@ -27,7 +27,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <cinttypes>
 #include <cstring>
 #include <iostream>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 #include "hwcomponent.h"
 #include "memctrlbase.h"

devices/nvram.cpp

@@ -24,7 +24,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <cstring>
 #include <fstream>
 #include <iostream>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 /** @file Non-volatile RAM implementation.
  */

devices/soundserver.cpp

@@ -21,7 +21,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "soundserver.h"
 //#include <thirdparty/libsoundio/soundio/soundio.h>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 #include <cubeb/cubeb.h>
 #ifdef _WIN32
 #include <objbase.h>

devices/spdram.h

@@ -52,7 +52,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <cinttypes>
 #include <stdexcept>
 #include <string>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 enum RAMType : int { SDRAM = 4 };
 

devices/viacuda.cpp

@@ -27,7 +27,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include "viacuda.h"
 #include "adb.h"
 #include <cinttypes>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 using namespace std;
 

execution/CMakeLists.txt

@@ -1,4 +1,5 @@
-include_directories("${PROJECT_SOURCE_DIR}")
+include_directories("${PROJECT_SOURCE_DIR}"
+                    "${PROJECT_SOURCE_DIR}/thirdparty/loguru/")
 
 file(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
 

execution/interpreter_loop.cpp

@@ -24,7 +24,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <ctime>
 #include <iostream>
 #include <interpreter_loop.h>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 #include <cpu/ppc/ppcemu.h>
 
 std::chrono::high_resolution_clock::time_point global;        // global timer
@@ -108,4 +108,4 @@ void interpreter_main_loop() {
 
         interpreter_update_counters();
     }
-}
+}

machines/CMakeLists.txt

@@ -1,6 +1,7 @@
 set(CMAKE_CXX_STANDARD 11)
 
-include_directories("${PROJECT_SOURCE_DIR}")
+include_directories("${PROJECT_SOURCE_DIR}"
+                    "${PROJECT_SOURCE_DIR}/thirdparty/loguru/")
 
 file(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
 

machines/machinebase.cpp

@@ -3,7 +3,7 @@
 #include <map>
 #include <memory>
 #include <string>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 std::unique_ptr<MachineBase> gMachineObj = 0;
 

machines/machinefactory.cpp

@@ -38,7 +38,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <memory>
 #include <string>
 #include <vector>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 using namespace std;
 

machines/machinegossamer.cpp

@@ -34,7 +34,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include "devices/viacuda.h"
 #include "machinebase.h"
 #include "machineproperties.h"
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 #include <string>
 
 

machines/machinepdm.cpp

@@ -28,6 +28,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include "devices/hmc.h"
 #include "machinebase.h"
 #include "machineproperties.h"
+#include <loguru.hpp>
 #include <string>
 
 int create_pdm(std::string& id) {

machines/machineproperties.h

@@ -1,11 +1,11 @@
 #include "endianswap.h"
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 #include <algorithm>
 #include <cinttypes>
 #include <string>
 #include <map>
 #include <memory>
-#include <limits> 
+#include <limits>
 #include <sstream>
 #include <utility>
 #include <vector>

main.cpp

@@ -35,9 +35,9 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <iostream>
 #include <sstream>
 #include <stdio.h>
-#include <thirdparty/CLI11/CLI11.hpp>
+#include <CLI11.hpp>
-#include <thirdparty/SDL2/include/SDL.h>
+#include <SDL.h>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 using namespace std;
 
@@ -47,6 +47,7 @@ void sigint_handler(int signum) {
     LOG_F(INFO, "Shutting down...");
 
     delete gMachineObj.release();
+    SDL_Quit();
     exit(0);
 }
 
@@ -54,6 +55,7 @@ void sigabrt_handler(int signum) {
     LOG_F(INFO, "Shutting down...");
 
     delete gMachineObj.release();
+    SDL_Quit();
 }
 
 static string appDescription = string(
@@ -170,6 +172,11 @@ int main(int argc, char** argv) {
     cout << "BootROM path: " << bootrom_path << endl;
     cout << "Execution mode: " << execution_mode << endl;
 
+    if (SDL_Init(SDL_INIT_VIDEO)) {
+        LOG_F(ERROR, "SDL_Init error: %s", SDL_GetError());
+        return 0;
+    }
+
     // initialize global profiler object
     gProfilerObj.reset(new Profiler());
 
@@ -190,13 +197,6 @@ int main(int argc, char** argv) {
     // redirect SIGABRT to our own handler
     signal(SIGABRT, sigabrt_handler);
 
-#ifdef SDL
-        if (SDL_Init(SDL_INIT_AUDIO)){
-            LOG_F(ERROR, "SDL_Init error: %s", SDL_GetError());
-            return 0;
-        }
-#endif
-
     switch (execution_mode) {
         case 0:
             interpreter_main_loop();
@@ -214,5 +214,7 @@ bail:
 
     delete gMachineObj.release();
 
+    SDL_Quit();
+
     return 0;
 }

memaccess.h

@@ -7,7 +7,7 @@
 
 #include "endianswap.h"
 #include <cinttypes>
-#include <thirdparty/loguru/loguru.hpp>
+#include <loguru.hpp>
 
 /* read an aligned big-endian WORD (16bit) */
 #define READ_WORD_BE_A(addr) (BYTESWAP_16(*((uint16_t*)((addr)))))