UserspaceEmulator: Move SimpleRegion to its own files

4 files changed, 133 insertions, 56 deletions

diff --git a/DevTools/UserspaceEmulator/CMakeLists.txt b/DevTools/UserspaceEmulator/CMakeLists.txt
index 767fd8b49b..ddf0116633 100644
--- a/DevTools/UserspaceEmulator/CMakeLists.txt
+++ b/DevTools/UserspaceEmulator/CMakeLists.txt
@@ -1,7 +1,8 @@
 set(SOURCES
+    Emulator.cpp
+    SimpleRegion.cpp
     SoftCPU.cpp
     SoftMMU.cpp
-    Emulator.cpp
     main.cpp
 )
 
diff --git a/DevTools/UserspaceEmulator/Emulator.cpp b/DevTools/UserspaceEmulator/Emulator.cpp
index 8e10c940d2..4ac805a5ee 100644
--- a/DevTools/UserspaceEmulator/Emulator.cpp
+++ b/DevTools/UserspaceEmulator/Emulator.cpp
@@ -25,6 +25,7 @@
  */
 
 #include "Emulator.h"
+#include "SimpleRegion.h"
 #include "SoftCPU.h"
 #include <AK/LexicalPath.h>
 #include <AK/LogStream.h>
@@ -43,61 +44,6 @@ namespace UserspaceEmulator {
 static constexpr u32 stack_location = 0x10000000;
 static constexpr size_t stack_size = 64 * KB;
 
-class SimpleRegion final : public SoftMMU::Region {
-public:
-    SimpleRegion(u32 base, u32 size)
-        : Region(base, size)
-    {
-        m_data = (u8*)calloc(1, size);
-    }
-
-    ~SimpleRegion()
-    {
-        free(m_data);
-    }
-
-    virtual u8 read8(u32 offset) override
-    {
-        ASSERT(offset < size());
-        return *reinterpret_cast<const u8*>(m_data + offset);
-    }
-
-    virtual u16 read16(u32 offset) override
-    {
-        ASSERT(offset + 1 < size());
-        return *reinterpret_cast<const u16*>(m_data + offset);
-    }
-
-    virtual u32 read32(u32 offset) override
-    {
-        ASSERT(offset + 3 < size());
-        return *reinterpret_cast<const u32*>(m_data + offset);
-    }
-
-    virtual void write8(u32 offset, u8 value) override
-    {
-        ASSERT(offset < size());
-        *reinterpret_cast<u8*>(m_data + offset) = value;
-    }
-
-    virtual void write16(u32 offset, u16 value) override
-    {
-        ASSERT(offset + 1 < size());
-        *reinterpret_cast<u16*>(m_data + offset) = value;
-    }
-
-    virtual void write32(u32 offset, u32 value) override
-    {
-        ASSERT(offset + 3 < size());
-        *reinterpret_cast<u32*>(m_data + offset) = value;
-    }
-
-    u8* data() { return m_data; }
-
-private:
-    u8* m_data { nullptr };
-};
-
 Emulator::Emulator(const String& executable_path, NonnullRefPtr<ELF::Loader> elf)
     : m_elf(move(elf))
     , m_cpu(*this)
diff --git a/DevTools/UserspaceEmulator/SimpleRegion.cpp b/DevTools/UserspaceEmulator/SimpleRegion.cpp
new file mode 100644
index 0000000000..324e651798
--- /dev/null
+++ b/DevTools/UserspaceEmulator/SimpleRegion.cpp
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "SimpleRegion.h"
+
+namespace UserspaceEmulator {
+
+SimpleRegion::SimpleRegion(u32 base, u32 size)
+    : Region(base, size)
+{
+    m_data = (u8*)calloc(1, size);
+}
+
+SimpleRegion::~SimpleRegion()
+{
+    free(m_data);
+}
+
+u8 SimpleRegion::read8(FlatPtr offset)
+{
+    ASSERT(offset < size());
+    return *reinterpret_cast<const u8*>(m_data + offset);
+}
+
+u16 SimpleRegion::read16(u32 offset)
+{
+    ASSERT(offset + 1 < size());
+    return *reinterpret_cast<const u16*>(m_data + offset);
+}
+
+u32 SimpleRegion::read32(u32 offset)
+{
+    ASSERT(offset + 3 < size());
+    return *reinterpret_cast<const u32*>(m_data + offset);
+}
+
+void SimpleRegion::write8(u32 offset, u8 value)
+{
+    ASSERT(offset < size());
+    *reinterpret_cast<u8*>(m_data + offset) = value;
+}
+
+void SimpleRegion::write16(u32 offset, u16 value)
+{
+    ASSERT(offset + 1 < size());
+    *reinterpret_cast<u16*>(m_data + offset) = value;
+}
+
+void SimpleRegion::write32(u32 offset, u32 value)
+{
+    ASSERT(offset + 3 < size());
+    *reinterpret_cast<u32*>(m_data + offset) = value;
+}
+
+}
diff --git a/DevTools/UserspaceEmulator/SimpleRegion.h b/DevTools/UserspaceEmulator/SimpleRegion.h
new file mode 100644
index 0000000000..c4df498882
--- /dev/null
+++ b/DevTools/UserspaceEmulator/SimpleRegion.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include "SoftMMU.h"
+
+namespace UserspaceEmulator {
+
+class SimpleRegion final : public SoftMMU::Region {
+public:
+    SimpleRegion(u32 base, u32 size);
+    virtual ~SimpleRegion() override;
+
+    virtual u8 read8(u32 offset) override;
+    virtual u16 read16(u32 offset) override;
+    virtual u32 read32(u32 offset) override;
+
+    virtual void write8(u32 offset, u8 value) override;
+    virtual void write16(u32 offset, u16 value) override;
+    virtual void write32(u32 offset, u32 value) override;
+
+    u8* data() { return m_data; }
+
+private:
+    u8* m_data { nullptr };
+};
+
+}