Merge branch 'master' of https://github.com/grumpycoders/pcsx-redux into ftdi

Author: nicolasnoble

src/core/cdriso.h

@@ -22,9 +22,9 @@
 
 #include <stdio.h>
 
-#include "core/file.h"
 #include "core/plugins.h"
 #include "core/psxemulator.h"
+#include "support/file.h"
 
 namespace PCSX {
 

src/core/psxmem.cc

@@ -23,9 +23,9 @@
 
 #include "core/psxmem.h"
 #include "core/debug.h"
-#include "core/file.h"
 #include "core/psxhw.h"
 #include "core/r3000a.h"
+#include "support/file.h"
 
 int PCSX::Memory::psxMemInit() {
     int i;

src/core/sstate.h

@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include "core/protobuf.h"
 #include "main/settings.h"
 #include "spu/types.h"
+#include "support/protobuf.h"
 
 namespace PCSX {
 

src/core/system.cc

@@ -22,8 +22,8 @@
 #include <iomanip>
 #include <sstream>
 
-#include "core/file.h"
 #include "core/system.h"
+#include "support/file.h"
 
 PCSX::System* PCSX::g_system = NULL;
 

src/main/main.cc

@@ -32,6 +32,7 @@
 #include "flags.h"
 #include "gui/gui.h"
 #include "spu/interface.h"
+#include "support/slice.h"
 
 static PCSX::GUI *s_gui;
 
@@ -168,6 +169,7 @@ using json = nlohmann::json;
 
 int main(int argc, char **argv) {
     const flags::args args(argc, argv);
+    PCSX::Slice slice;
 
     if (args.get<bool>("dumpproto")) {
         PCSX::SaveStates::ProtoFile::dumpSchema(std::cout);

src/spu/types.h

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "core/protobuf.h"
+#include "support/protobuf.h"
 
 namespace PCSX {
 

src/core/file.cc renamed to src/support/file.cc

@@ -19,7 +19,7 @@
 
 #include <algorithm>
 
-#include "core/file.h"
+#include "support/file.h"
 
 const uint8_t PCSX::File::m_internalBuffer = 0;
 void PCSX::File::close() {

src/core/file.h renamed to src/support/file.h

@@ -0,0 +1,76 @@
+/***************************************************************************
+ *   Copyright (C) 2020 PCSX-Redux authors                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ ***************************************************************************/
+
+#pragma once
+
+#include <assert.h>
+#include <stdint.h>
+
+namespace PCSX {
+
+class Slice {
+  public:
+    Slice() : m_isInlined(false), m_isOwned(false), m_size(0) {
+        m_data.ptr = nullptr;
+    }
+    ~Slice() { maybeFree(); }
+    void copy(const void * data, uint32_t size) {
+        assert(size < (1 << 30));
+        maybeFree();
+        m_size = size;
+        m_isOwned = true;
+        if (size > sizeof(m_data.inlined)) {
+            m_isInlined = false;
+            m_data.ptr = (uint8_t *) malloc(size);
+            memcpy(m_data.ptr, data, size);
+        } else {
+            m_isInlined = true;
+            memcpy(m_data.inlined, data, size);
+        }
+    }
+    void acquire(void * data, uint32_t size) {
+        assert(size < (1 << 30));
+        maybeFree();
+        m_size = size;
+        m_isOwned = true;
+        m_isInlined = false;
+        m_data.ptr = data;
+    }
+    void borrow(const void * data, uint32_t size) {
+        assert(size < (1 << 30));
+        maybeFree();
+        m_size = size;
+        m_isOwned = false;
+        m_isInlined = false;
+        m_data.ptr = const_cast<void*>(data);
+    }
+    const void * data() { return m_isInlined ? m_data.inlined : m_data.ptr; }
+    const uint32_t size() { return m_size; }
+  private:
+    void maybeFree() { if (m_isOwned && !m_isInlined) free(m_data.ptr); }
+    union {
+        uint8_t inlined[24];
+        void * ptr;
+    } m_data;
+    bool m_isInlined : 1;
+    bool m_isOwned : 1;
+    uint32_t m_size : 30;
+};
+
+}  // namespace PCSX