[General] Convert sourcecode's CRLF format: DOS(WINDOWS) to Unix, to apply patches...

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

diff --git a/source/src/vm/mycomz80a/memory.h b/source/src/vm/mycomz80a/memory.h
index e58b539..36efe23 100644 (file)
--- a/source/src/vm/mycomz80a/memory.h
+++ b/source/src/vm/mycomz80a/memory.h
@@ -1,42 +1,49 @@
-/*\r
-       Japan Electronics College MYCOMZ-80A Emulator 'eMYCOMZ-80A'\r
-\r
-       Author : Takeda.Toshiya\r
-       Date   : 2009.05.13-\r
-\r
-       [ memory ]\r
-*/\r
-\r
-#ifndef _MEMORY_H_\r
-#define _MEMORY_H_\r
-\r
-#include "../vm.h"\r
-#include "../../emu.h"\r
-#include "../device.h"\r
-\r
-class MEMORY : public DEVICE\r
-{\r
-private:\r
-       uint8* rbank[16];\r
-       uint8* wbank[16];\r
-       uint8 wdmy[0x1000];\r
-       uint8 rdmy[0x1000];\r
-       uint8 ram[0x10000];     // Main RAM 64KB\r
-       uint8 bios[0x3000];     // IPL 12KB\r
-       uint8 basic[0x1000];    // BASIC 4KB\r
-       uint32 amask;\r
-       \r
-public:\r
-       MEMORY(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu) {}\r
-       ~MEMORY() {}\r
-       \r
-       // common functions\r
-       void initialize();\r
-       void reset();\r
-       void write_data8(uint32 addr, uint32 data);\r
-       uint32 read_data8(uint32 addr);\r
-       void write_io8(uint32 addr, uint32 data);\r
-};\r
-\r
-#endif\r
-\r
+/*
+       Japan Electronics College MYCOMZ-80A Emulator 'eMYCOMZ-80A'
+
+       Author : Takeda.Toshiya
+       Date   : 2009.05.13-
+
+       [ memory ]
+*/
+
+#ifndef _MEMORY_H_
+#define _MEMORY_H_
+
+#include "../vm.h"
+#include "../../emu.h"
+#include "../device.h"
+
+class MEMORY : public DEVICE
+{
+private:
+       uint8* rbank[16];
+       uint8* wbank[16];
+       uint8 wdmy[0x1000];
+       uint8 rdmy[0x1000];
+       uint8 ram[0x10000];     // Main RAM 64KB
+       uint8 bios[0x3000];     // IPL 12KB
+       uint8 basic[0x1000];    // BASIC 4KB
+       uint32 addr_mask;
+       
+       uint32 addr_mask;
+       bool rom_sel;
+       
+       void update_memory_map();
+       
+public:
+       MEMORY(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu) {}
+       ~MEMORY() {}
+       
+       // common functions
+       void initialize();
+       void reset();
+       void write_data8(uint32 addr, uint32 data);
+       uint32 read_data8(uint32 addr);
+       void write_io8(uint32 addr, uint32 data);
+       void save_state(FILEIO* state_fio);
+       bool load_state(FILEIO* state_fio);
+};
+
+#endif
+