[COMMON] Fix unaligned SIMD variables.Fix crash built with "-msse2" at Win32.

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

diff --git a/source/src/vm/z80tvgame/memory.h b/source/src/vm/z80tvgame/memory.h
index 2669cee..1947346 100644 (file)
--- a/source/src/vm/z80tvgame/memory.h
+++ b/source/src/vm/z80tvgame/memory.h
@@ -16,40 +16,46 @@
 #include "../../emu.h"
 #include "../device.h"
 
+namespace Z80TVGAME {
+
 class MEMORY : public DEVICE
 {
 private:
        // memory
-       uint8 rom[0x8000];
-       uint8 ram[0x6000];
-       uint8 wdmy[0x1000];
-       uint8 rdmy[0x1000];
-       uint8* wbank[16];
-       uint8* rbank[16];
+       uint8_t rom[0x8000];
+       uint8_t ram[0x6000];
+       uint8_t wdmy[0x1000];
+       uint8_t rdmy[0x1000];
+       uint8_t* wbank[16];
+       uint8_t* rbank[16];
        
        bool inserted;
-       
+
+       __DECL_ALIGNED(32) _bit_trans_table_scrn_t pixel_trans_table;
 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"));
+       }
        ~MEMORY() {}
        
        // common functions
        void initialize();
        void reset();
-       void write_data8(uint32 addr, uint32 data);
-       uint32 read_data8(uint32 addr);
-       void save_state(FILEIO* state_fio);
-       bool load_state(FILEIO* state_fio);
+       void write_data8(uint32_t addr, uint32_t data);
+       uint32_t read_data8(uint32_t addr);
+       bool process_state(FILEIO* state_fio, bool loading);
        
        // unique functions
        void open_cart(const _TCHAR* file_path);
        void close_cart();
-       bool cart_inserted()
+       bool is_cart_inserted()
        {
                return inserted;
        }
        void draw_screen();
 };
 
+}
 #endif