[VM][DEVICE] Use __FASTCALL with interfaces, read_*() ,write_*(), fetch_op() and...

[csp-qt/common_source_project-fm7.git] / source / src / vm / sc3000 / memory.h

diff --git a/source/src/vm/sc3000/memory.h b/source/src/vm/sc3000/memory.h
index 869d8b6..691d286 100644 (file)
--- a/source/src/vm/sc3000/memory.h
+++ b/source/src/vm/sc3000/memory.h
@@ -16,6 +16,8 @@
 
 #define SIG_MEMORY_SEL 0
 
+namespace SC3000 {
+
 class MEMORY : public DEVICE
 {
 private:
@@ -36,7 +38,7 @@ private:
        void update_bank();
        
 public:
-       MEMORY(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
+       MEMORY(VM_TEMPLATE* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
        {
                set_device_name(_T("Memory Bus"));
        }
@@ -44,12 +46,10 @@ public:
        
        // common functions
        void initialize();
-       void write_data8(uint32_t addr, uint32_t data);
-       uint32_t read_data8(uint32_t addr);
-       void write_signal(int id, uint32_t data, uint32_t mask);
-       void decl_state();
-       void save_state(FILEIO* state_fio);
-       bool load_state(FILEIO* state_fio);
+       void __FASTCALL write_data8(uint32_t addr, uint32_t data);
+       uint32_t __FASTCALL read_data8(uint32_t addr);
+       void __FASTCALL write_signal(int id, uint32_t data, uint32_t mask);
+       bool process_state(FILEIO* state_fio, bool loading);
        
        // unique functions
        void open_cart(const _TCHAR* file_path);
@@ -60,5 +60,6 @@ public:
        }
 };
 
+}
 #endif