moved sigsegv / filesystem code into system

CMakeLists.txt

@@ -104,7 +104,6 @@ add_custom_target(format ${CLANG_FORMAT_EXECUTABLE} -style=Google -i ${CLANG_FOR
 
 set(DREAVM_SOURCES
   src/core/assert.cc
-  src/core/filesystem.cc
   src/core/log.cc
   src/emu/emulator.cc
   src/emu/profiler.cc
@@ -142,19 +141,20 @@ set(DREAVM_SOURCES
   src/jit/runtime.cc
   src/renderer/gl_backend.cc
   src/renderer/gl_shader.cc
-  src/sigsegv/sigsegv_handler.cc
+  src/system/files.cc
   src/system/keys.cc
+  src/system/sigsegv_handler.cc
   src/system/system.cc
   src/trace/trace.cc
   src/trace/trace_viewer.cc
   src/main.cc)
 
 if(WIN32)
-  list(APPEND DREAVM_SOURCES src/sigsegv/sigsegv_handler_win.cc)
+  list(APPEND DREAVM_SOURCES src/system/sigsegv_handler_win.cc)
 elseif(APPLE)
-  list(APPEND DREAVM_SOURCES src/sigsegv/sigsegv_handler_mac.cc)
+  list(APPEND DREAVM_SOURCES src/system/sigsegv_handler_mac.cc)
 else()
-  list(APPEND DREAVM_SOURCES src/sigsegv/sigsegv_handler_linux.cc)
+  list(APPEND DREAVM_SOURCES src/system/sigsegv_handler_linux.cc)
 endif()
 
 

src/core/core.h

@@ -7,7 +7,6 @@
 #include "core/assert.h"
 #include "core/log.h"
 #include "core/math.h"
-#include "core/filesystem.h"
 #include "core/platform.h"
 
 #endif

src/hw/dreamcast.cc

@@ -16,7 +16,7 @@ using namespace dreavm::jit::backend::interpreter;
 using namespace dreavm::jit::backend::x64;
 using namespace dreavm::jit::frontend::sh4;
 using namespace dreavm::renderer;
-using namespace dreavm::sigsegv;
+using namespace dreavm::system;
 using namespace dreavm::trace;
 
 Dreamcast::Dreamcast()

src/hw/dreamcast.h

@@ -14,7 +14,7 @@
 #include "jit/frontend/frontend.h"
 #include "jit/runtime.h"
 #include "renderer/backend.h"
-#include "sigsegv/sigsegv_handler.h"
+#include "system/sigsegv_handler.h"
 #include "trace/trace.h"
 
 namespace dreavm {
@@ -117,7 +117,7 @@ class Dreamcast {
   hw::sh4::SH4 *sh4() { return sh4_; }
   hw::holly::TileAccelerator *ta() { return ta_; }
 
-  sigsegv::SIGSEGVHandler *sigsegv() { return sigsegv_; }
+  system::SIGSEGVHandler *sigsegv() { return sigsegv_; }
 
   renderer::Backend *rb() { return rb_; }
   void set_rb(renderer::Backend *rb) { rb_ = rb; }
@@ -176,7 +176,7 @@ class Dreamcast {
   hw::holly::TileAccelerator *ta_;
 
   // not owned by us
-  sigsegv::SIGSEGVHandler *sigsegv_;
+  system::SIGSEGVHandler *sigsegv_;
   renderer::Backend *rb_;
   trace::TraceWriter *trace_writer_;
 };

src/hw/gdrom/disc.cc

@@ -5,6 +5,7 @@
 
 using namespace dreavm;
 using namespace dreavm::hw::gdrom;
+using namespace dreavm::system;
 
 //
 // GDI format

src/hw/gdrom/disc.h

@@ -2,7 +2,7 @@
 #define DISC_H
 
 #include <vector>
-#include "core/filesystem.h"
+#include "system/files.h"
 
 namespace dreavm {
 namespace hw {

src/system/files.cc

@@ -4,6 +4,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include "core/core.h"
+#include "system/files.h"
 #ifdef PLATFORM_WINDOWS
 #include <userenv.h>
 #else
@@ -12,6 +13,7 @@
 #endif
 
 namespace dreavm {
+namespace system {
 
 static bool GetUserDir(char *userdir, size_t size) {
 #ifdef PLATFORM_WINDOWS
@@ -133,3 +135,4 @@ bool CreateDir(const char *path) {
   return res == 0 || errno == EEXIST;
 }
 }
+}

src/system/files.h

@@ -1,5 +1,5 @@
-#ifndef FILESYSTEM_H
-#define FILESYSTEM_H
+#ifndef FILES_H
+#define FILES_H
 
 #include "core/platform.h"
 
@@ -21,6 +21,7 @@
 #endif
 
 namespace dreavm {
+namespace system {
 
 const char *GetAppDir();
 void EnsureAppDirExists();
@@ -31,5 +32,6 @@ void BaseName(const char *path, char *base, size_t size);
 bool Exists(const char *path);
 bool CreateDir(const char *path);
 }
+}
 
 #endif

src/system/sigsegv_handler.cc

@@ -1,10 +1,10 @@
 #include "core/core.h"
 #include "core/interval_tree.h"
-#include "sigsegv/sigsegv_handler.h"
+#include "system/sigsegv_handler.h"
 
-using namespace dreavm::sigsegv;
+using namespace dreavm::system;
 
-SIGSEGVHandler *dreavm::sigsegv::SIGSEGVHandler::global_handler_ = nullptr;
+SIGSEGVHandler *dreavm::system::SIGSEGVHandler::global_handler_ = nullptr;
 
 SIGSEGVHandler *SIGSEGVHandler::Install() {
   if (global_handler_) {

src/system/sigsegv_handler.h

@@ -6,7 +6,7 @@
 #include "core/interval_tree.h"
 
 namespace dreavm {
-namespace sigsegv {
+namespace system {
 
 // implemented in the platform specific souce file
 class SIGSEGVHandler;

src/system/sigsegv_handler_linux.cc

@@ -2,11 +2,11 @@
 #include <signal.h>
 #include <unistd.h>
 #include "core/core.h"
-#include "sigsegv/sigsegv_handler_linux.h"
+#include "system/sigsegv_handler_linux.h"
 
-using namespace dreavm::sigsegv;
+using namespace dreavm::system;
 
-SIGSEGVHandler *dreavm::sigsegv::CreateSIGSEGVHandler() {
+SIGSEGVHandler *dreavm::system::CreateSIGSEGVHandler() {
   return new SIGSEGVHandlerLinux();
 }
 

src/system/sigsegv_handler_linux.h

@@ -2,10 +2,10 @@
 #define SIGSEGV_HANDLER_LINUX
 
 #include <thread>
-#include "sigsegv/sigsegv_handler.h"
+#include "system/sigsegv_handler.h"
 
 namespace dreavm {
-namespace sigsegv {
+namespace system {
 
 class SIGSEGVHandlerLinux : public SIGSEGVHandler {
  public:

src/system/sigsegv_handler_mac.cc

@@ -2,11 +2,11 @@
 #include <sys/mman.h>
 #include <unistd.h>
 #include "core/core.h"
-#include "sigsegv/sigsegv_handler_mac.h"
+#include "system/sigsegv_handler_mac.h"
 
-using namespace dreavm::sigsegv;
+using namespace dreavm::system;
 
-SIGSEGVHandler *dreavm::sigsegv::CreateSIGSEGVHandler() {
+SIGSEGVHandler *dreavm::system::CreateSIGSEGVHandler() {
   return new SIGSEGVHandlerMac();
 }
 

src/system/sigsegv_handler_mac.h

@@ -2,10 +2,10 @@
 #define SIGSEGV_HANDLER_MAC
 
 #include <thread>
-#include "sigsegv/sigsegv_handler.h"
+#include "system/sigsegv_handler.h"
 
 namespace dreavm {
-namespace sigsegv {
+namespace system {
 
 class SIGSEGVHandlerMac : public SIGSEGVHandler {
  public:

src/system/sigsegv_handler_win.cc

@@ -1,10 +1,10 @@
 #include <windows.h>
 #include "core/core.h"
-#include "sigsegv/sigsegv_handler_win.h"
+#include "system/sigsegv_handler_win.h"
 
-using namespace dreavm::sigsegv;
+using namespace dreavm::system;
 
-SIGSEGVHandler *dreavm::sigsegv::CreateSIGSEGVHandler() {
+SIGSEGVHandler *dreavm::system::CreateSIGSEGVHandler() {
   return new SIGSEGVHandlerWin();
 }
 

src/system/sigsegv_handler_win.h

@@ -2,10 +2,10 @@
 #define SIGSEGV_HANDLER_WIN
 
 #include <thread>
-#include "sigsegv/sigsegv_handler.h"
+#include "system/sigsegv_handler.h"
 
 namespace dreavm {
-namespace sigsegv {
+namespace system {
 
 class SIGSEGVHandlerWin : public SIGSEGVHandler {
  public:

src/trace/trace.cc

@@ -1,9 +1,11 @@
 #include <unordered_map>
 #include "core/core.h"
+#include "system/files.h"
 #include "trace/trace.h"
 
 using namespace dreavm;
 using namespace dreavm::hw::holly;
+using namespace dreavm::system;
 using namespace dreavm::trace;
 
 void dreavm::trace::GetNextTraceFilename(char *filename, size_t size) {