[General] Merge Upstream 2017-03-07.

[csp-qt/common_source_project-fm7.git] / source / src / vm / j3100 / slmemory.h

diff --git a/source/src/vm/j3100/slmemory.h b/source/src/vm/j3100/slmemory.h
index b310572..b8277e9 100644 (file)
--- a/source/src/vm/j3100/slmemory.h
+++ b/source/src/vm/j3100/slmemory.h
@@ -46,7 +46,10 @@ private:
        void update_ems(int page);
        
 public:
-       MEMORY(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu) {}
+       MEMORY(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
+       {
+               set_device_name(_T("Memory Bus"));
+       }
        ~MEMORY() {}
        
        // common functions