[FM][FM7][FM7_MAINMEM] (Temporally) Apply upstream 2022-12-04. See below.

- [ToDo] Will FM7_MAINMEM:: inherit MEMORY:: class with wait processing.
- [ToDo] Also FM7::DISPLAY:: will inherit MEMORY:: class with wait processing.
- [ToDo] MMIO for FM7 main/sub will inherit IO:: class without? wait
         processing.
- [ToDo] MC6809:: will processing with memory waiting value.
- [ToDo] Split some I/O nodes of MAIN/SUB into separate device.

diff --git a/source/src/vm/fm7/fm7_mainmem.cpp b/source/src/vm/fm7/fm7_mainmem.cpp
index 133b9b5..04b8dbc 100644 (file)
--- a/source/src/vm/fm7/fm7_mainmem.cpp
+++ b/source/src/vm/fm7/fm7_mainmem.cpp
@@ -23,7 +23,7 @@ FM7_MAINMEM::FM7_MAINMEM(VM_TEMPLATE* parent_vm, EMU_TEMPLATE* parent_emu) : DEV
        maincpu = NULL;
 #if defined(CAPABLE_DICTROM)
        kanjiclass1 = NULL;
-#endif 
+#endif
 #if defined(_FM77AV40) || defined(_FM77AV40EX) || defined(_FM77AV40SX)  || \
     defined(_FM77_VARIANTS)
        fm7_mainmem_extram = NULL;
@@ -73,7 +73,7 @@ void FM7_MAINMEM::reset()
        } else {
                use_page2_extram = ((config.dipswitch & FM7_DIPSW_EXTRAM_AV) != 0) ? true : false;
        }
-#endif   
+#endif
 #ifdef HAS_MMR
        mmr_extend = false;
        mmr_segment = 0;
@@ -103,17 +103,17 @@ void FM7_MAINMEM::setclock(int mode)
        uint32_t clock = MAINCLOCK_SLOW;
        if(mode == 1) { // SLOW
                clock = MAINCLOCK_SLOW; // Temporally
-#if defined(HAS_MMR)           
+#if defined(HAS_MMR)
                if(!mmr_fast && !window_fast) {
                        if(refresh_fast) {
                                if(mmr_enabled || window_enabled) {
                                        clock = (uint32_t)((double)clock * 1.089);
                                } else {
                                        clock = (uint32_t)((double)clock * 1.086);
-                               }                                       
+                               }
                        }
                }
-#endif         
+#endif
        } else {
 #if defined(HAS_MMR)
 #  if defined(_FM77AV40) || defined(_FM77AV40EX) || defined(_FM77AV40SX)
@@ -124,10 +124,10 @@ void FM7_MAINMEM::setclock(int mode)
                                clock = MAINCLOCK_FAST_MMR - ((100000000 / 1302) * 1);  // Fast Refresh: 1wait
                        } else {
                                clock = MAINCLOCK_FAST_MMR - ((100000000 / 1302) * 3);  // Slow Refresh: 3Wait(!)
-                       }                               
+                       }
                        if(mmr_enabled || window_enabled) {
                                clock = (uint32_t)((double)clock * 0.87);
-                       }                                       
+                       }
                } else {
                        clock = MAINCLOCK_FAST_MMR;
                        //if(!(mmr_enabled) && !(window_enabled)) clock = MAINCLOCK_NORMAL;
@@ -141,7 +141,7 @@ void FM7_MAINMEM::setclock(int mode)
 #  endif
 #else
                clock = MAINCLOCK_NORMAL;
-#endif                         
+#endif
        }
        //mem_waitcount = 0;
        uint32_t before_waitfactor = mem_waitfactor;
@@ -156,7 +156,7 @@ void FM7_MAINMEM::setclock(int mode)
        // Below is ugly hack cause of CPU#0 cannot modify clock.
        if(before_waitfactor != mem_waitfactor) maincpu->write_signal(SIG_CPU_WAIT_FACTOR, mem_waitfactor, 0xffffffff);
 }
-               
+
 
 void FM7_MAINMEM::iowait()
 {
@@ -175,7 +175,7 @@ void FM7_MAINMEM::iowait()
        }
 #else
        _waitfactor = 2;
-#endif   
+#endif
        if(_waitfactor <= 0) return;
        waitcount++;
        if(waitcount >= _waitfactor) {
@@ -225,7 +225,7 @@ int FM7_MAINMEM::check_extrom(uint32_t raddr, uint32_t *realaddr)
                        return FM7_MAINMEM_NULL;
                }
        }
-#endif 
+#endif
        return -1;
 }
 
@@ -250,8 +250,8 @@ uint32_t FM7_MAINMEM::read_signal(int sigid)
        case FM7_MAINIO_BOOTRAM_RW:
                value = (boot_ram_write) ? 0xffffffff : 0x00000000;
                break;
-#endif                 
-#ifdef HAS_MMR                 
+#endif
+#ifdef HAS_MMR
        case FM7_MAINIO_WINDOW_ENABLED:
                value = (window_enabled) ? 0xffffffff : 0x00000000;
                break;
@@ -270,16 +270,16 @@ uint32_t FM7_MAINMEM::read_signal(int sigid)
        case FM7_MAINIO_MEM_REFRESH_FAST:
                value = (refresh_fast) ? 0xffffffff : 0x00000000;
                break;
-#endif                 
+#endif
 #if defined(_FM77AV_VARIANTS)
        case FM7_MAINIO_INITROM_ENABLED:
                value = (initiator_enabled) ? 0xffffffff: 0x00000000;
                break;
-# if defined(_FM77AV40EX) || defined(_FM77AV40SX)         
+# if defined(_FM77AV40EX) || defined(_FM77AV40SX)
        case FM7_MAINIO_EXTROM:
                value = (extrom_bank) ? 0xffffffff: 0x00000000;
                break;
-# endif           
+# endif
        case FM7_MAINIO_EXTBANK:
                value = extcard_bank & 0x3f;
                value |= (dictram_enabled) ? 0x80 : 0;
@@ -315,7 +315,7 @@ void FM7_MAINMEM::write_signal(int sigid, uint32_t data, uint32_t mask)
                case FM7_MAINIO_BOOTRAM_RW:
                        boot_ram_write = flag;
                        break;
-#endif                 
+#endif
 #ifdef _FM77AV_VARIANTS
                case FM7_MAINIO_INITROM_ENABLED:
                        initiator_enabled = flag;
@@ -325,13 +325,13 @@ void FM7_MAINMEM::write_signal(int sigid, uint32_t data, uint32_t mask)
                        dictram_enabled = ((data & 0x80) != 0) ? true : false;
                        dictrom_enabled = ((data & 0x40) != 0) ? true : false;
                        break;
-# if defined(_FM77AV40EX) || defined(_FM77AV40SX)         
+# if defined(_FM77AV40EX) || defined(_FM77AV40SX)
                case FM7_MAINIO_EXTROM:
                        extrom_bank = flag;
                        break;
-# endif           
-#endif                 
-#ifdef HAS_MMR                 
+# endif
+#endif
+#ifdef HAS_MMR
                case FM7_MAINIO_WINDOW_ENABLED:
                        window_enabled = flag;
                        setclock(config.cpu_type);
@@ -355,7 +355,7 @@ void FM7_MAINMEM::write_signal(int sigid, uint32_t data, uint32_t mask)
                        refresh_fast = flag;
                        setclock(config.cpu_type);
                        break;
-#endif                 
+#endif
        }
 }
 
@@ -371,29 +371,29 @@ void FM7_MAINMEM::write_io8(uint32_t addr, uint32_t data)
 
 uint32_t FM7_MAINMEM::read_dma_data8(uint32_t addr)
 {
-#if defined(HAS_MMR)   
+#if defined(HAS_MMR)
        uint32_t val;
        val = this->read_data8_main(addr & 0xffff, true);
        return val;
 #else
        return this->read_data8(addr & 0xffff);
-#endif 
+#endif
 }
 
 uint32_t FM7_MAINMEM::read_dma_io8(uint32_t addr)
 {
-#if defined(HAS_MMR)   
+#if defined(HAS_MMR)
        uint32_t val;
        val = this->read_data8_main(addr & 0xffff, true);
        return val;
 #else
        return this->read_data8(addr & 0xffff);
-#endif 
+#endif
 }
 
 uint32_t FM7_MAINMEM::read_data8(uint32_t addr)
 {
-#if defined(HAS_MMR)   
+#if defined(HAS_MMR)
        if(addr >= FM7_MAINIO_WINDOW_OFFSET) {
                switch(addr) {
                case FM7_MAINIO_WINDOW_OFFSET:
@@ -410,7 +410,7 @@ uint32_t FM7_MAINMEM::read_data8(uint32_t addr)
                }
                return 0xff;
        }
-#endif   
+#endif
        return read_data8_main(addr, false);
 }
 
@@ -420,7 +420,7 @@ void FM7_MAINMEM::write_dma_data8(uint32_t addr, uint32_t data)
        write_data8_main(addr & 0xffff, data, true);
 #else
        write_data8(addr & 0xffff, data);
-#endif 
+#endif
 }
 
 void FM7_MAINMEM::write_dma_io8(uint32_t addr, uint32_t data)
@@ -429,12 +429,12 @@ void FM7_MAINMEM::write_dma_io8(uint32_t addr, uint32_t data)
        write_data8_main(addr & 0xffff, data, true);
 #else
        write_data8(addr & 0xffff, data);
-#endif 
+#endif
 }
 
 void FM7_MAINMEM::write_data8(uint32_t addr, uint32_t data)
 {
-#if defined(HAS_MMR)   
+#if defined(HAS_MMR)
        if(addr >= FM7_MAINIO_WINDOW_OFFSET) {
                switch(addr) {
                case FM7_MAINIO_WINDOW_OFFSET:
@@ -465,41 +465,57 @@ uint32_t FM7_MAINMEM::read_data16(uint32_t addr)
 {
        uint32_t hi, lo;
        uint32_t val;
-   
+
        hi = read_data8(addr) & 0xff;
        lo = read_data8(addr + 1) & 0xff;
-   
+
        val = hi * 256 + lo;
        return val;
 }
 
+uint32_t FM7_MAINMEM::read_data16w(uint32_t addr, int *wait)
+{
+       return read_data16(addr);
+}
+
 uint32_t FM7_MAINMEM::read_data32(uint32_t addr)
 {
        uint32_t ah, a2, a3, al;
        uint32_t val;
-   
+
        ah = read_data8(addr) & 0xff;
        a2 = read_data8(addr + 1) & 0xff;
        a3 = read_data8(addr + 2) & 0xff;
        al = read_data8(addr + 3) & 0xff;
-   
+
        val = ah * (65536 * 256) + a2 * 65536 + a3 * 256 + al;
        return val;
 }
 
+uint32_t FM7_MAINMEM::read_data32w(uint32_t addr, int *wait)
+{
+       return read_data32(addr);
+}
+
+
 void FM7_MAINMEM::write_data16(uint32_t addr, uint32_t data)
 {
        uint32_t d = data;
-   
+
        write_data8(addr + 1, d & 0xff);
        d = d / 256;
        write_data8(addr + 0, d & 0xff);
 }
 
+void FM7_MAINMEM::write_data16w(uint32_t addr, uint32_t data, int *wait)
+{
+       write_data16(addr, data);
+}
+
 void FM7_MAINMEM::write_data32(uint32_t addr, uint32_t data)
 {
        uint32_t d = data;
-   
+
        write_data8(addr + 3, d & 0xff);
        d = d / 256;
        write_data8(addr + 2, d & 0xff);
@@ -509,6 +525,11 @@ void FM7_MAINMEM::write_data32(uint32_t addr, uint32_t data)
        write_data8(addr + 0, d & 0xff);
 }
 
+void FM7_MAINMEM::write_data32w(uint32_t addr, uint32_t data, int *wait)
+{
+       write_data32(addr, data);
+}
+
 
 void FM7_MAINMEM::update_config()
 {
@@ -525,12 +546,12 @@ bool FM7_MAINMEM::process_state(FILEIO *state_fio, bool loading)
        if(!state_fio->StateCheckInt32(this_device_id)) {
                return false;
        }
-       
+
        state_fio->StateValue(ioaccess_wait);
        state_fio->StateValue(waitfactor);
        state_fio->StateValue(waitcount);
        state_fio->StateValue(sub_halted);
-       
+
        state_fio->StateValue(diag_load_basicrom);
        state_fio->StateValue(diag_load_bootrom_bas);
        state_fio->StateValue(diag_load_bootrom_dos);
@@ -546,15 +567,15 @@ bool FM7_MAINMEM::process_state(FILEIO *state_fio, bool loading)
        state_fio->StateArray(fm7_mainmem_bioswork, sizeof(fm7_mainmem_bioswork), 1);
        state_fio->StateArray(fm7_mainmem_bootrom_vector, sizeof(fm7_mainmem_bootrom_vector), 1);
        state_fio->StateArray(fm7_mainmem_reset_vector, sizeof(fm7_mainmem_reset_vector), 1);
-       
+
 #if defined(_FM77AV_VARIANTS) || defined(_FM77_VARIANTS)
        state_fio->StateArray(fm7_bootram, sizeof(fm7_bootram), 1);
-#endif 
+#endif
 #if defined(_FM77_VARIANTS) || defined(_FM8)
        for(int i = 0; i < 8; i++) state_fio->StateArray(fm7_bootroms[i], 0x200, 1);
 #elif defined(_FM7) || defined(_FMNEW7)
        for(int i = 0; i < 4; i++) state_fio->StateArray(fm7_bootroms[i], 0x200, 1);
-#endif 
+#endif
 
 #if defined(_FM8)
        state_fio->StateValue(diag_load_sm11_14);
@@ -565,20 +586,20 @@ bool FM7_MAINMEM::process_state(FILEIO *state_fio, bool loading)
        state_fio->StateValue(diag_load_tl11_11);
 #  if defined(_FMNEW7)
        state_fio->StateValue(diag_load_tl11_12);
-#  endif       
+#  endif
 #elif defined(_FM77AV_VARIANTS)
        state_fio->StateValue(dictrom_connected);
        state_fio->StateValue(use_page2_extram);
-       
+
        state_fio->StateValue(diag_load_initrom);
        state_fio->StateValue(diag_load_dictrom);
        state_fio->StateValue(diag_load_learndata);
        state_fio->StateArray(fm7_mainmem_initrom, sizeof(fm7_mainmem_initrom), 1);
        state_fio->StateArray(fm77av_hidden_bootmmr, sizeof(fm77av_hidden_bootmmr), 1);
-       
+
        state_fio->StateArray(fm7_mainmem_mmrbank_0, sizeof(fm7_mainmem_mmrbank_0), 1);
        state_fio->StateArray(fm7_mainmem_mmrbank_2, sizeof(fm7_mainmem_mmrbank_2), 1);
-       
+
 # if defined(_FM77AV40EX) || defined(_FM77AV40SX)
        state_fio->StateValue(diag_load_extrarom);
        state_fio->StateArray(fm7_mainmem_extrarom, sizeof(fm7_mainmem_extrarom), 1);
@@ -600,7 +621,7 @@ bool FM7_MAINMEM::process_state(FILEIO *state_fio, bool loading)
 #  endif
 # endif
 #endif
-                                                         
+
        { // V2;
                state_fio->StateValue(is_basicrom);
                state_fio->StateValue(clockmode);
@@ -615,13 +636,13 @@ bool FM7_MAINMEM::process_state(FILEIO *state_fio, bool loading)
 #endif
 #if defined(_FM77AV_VARIANTS) || defined(_FM77_VARIANTS)
                state_fio->StateValue(boot_ram_write);
-#endif         
+#endif
 #if defined(HAS_MMR)
                state_fio->StateValue(window_enabled);
                state_fio->StateValue(mmr_enabled);
                state_fio->StateValue(mmr_fast);
                state_fio->StateValue(mmr_extend);
-               
+
                state_fio->StateValue(window_offset);
                state_fio->StateValue(window_fast);
                state_fio->StateValue(refresh_fast);
@@ -637,7 +658,7 @@ bool FM7_MAINMEM::process_state(FILEIO *state_fio, bool loading)
 #if defined(HAS_MMR)
 #  if defined(_FM77_VARIANTS)
                if(extram_pages > 3) extram_pages = 3;
-#  elif defined(_FM77AV40) || defined(_FM77AV40EX) || defined(_FM77AV40SX) 
+#  elif defined(_FM77AV40) || defined(_FM77AV40EX) || defined(_FM77AV40SX)
                if(extram_pages > 12) extram_pages = 12;
 #  endif
 #endif
@@ -645,7 +666,7 @@ bool FM7_MAINMEM::process_state(FILEIO *state_fio, bool loading)
        //extram_size = extram_pages * 0x10000;
                init_data_table();
                update_all_mmr_jumptable();
-       }               
+       }
        return true;
 }
 

diff --git a/source/src/vm/fm7/fm7_mainmem.h b/source/src/vm/fm7/fm7_mainmem.h
index e265b4a..f0d34c3 100644 (file)
--- a/source/src/vm/fm7/fm7_mainmem.h
+++ b/source/src/vm/fm7/fm7_mainmem.h
@@ -41,11 +41,11 @@ class FM7_MAINMEM : public DEVICE
                uint8_t *write_data;
                void (__FASTCALL FM7_MAINMEM::*write_func)(uint32_t, uint32_t, bool);
        } data_func_table_t;
-       
+
        data_func_table_t data_table[ADDRESS_SPACE / 0x80];
        //data_func_table_t data_table[0x100000 / 0x80];
 #if defined(HAS_MMR)
-# if defined(_FM77AV40) || defined(_FM77AV40EX) || defined(_FM77AV40SX)        
+# if defined(_FM77AV40) || defined(_FM77AV40EX) || defined(_FM77AV40SX)
        data_func_table_t mmr_update_table_ext[(0x80 * 0x1000) / 0x80];
        uint32_t mmr_baseaddr_table_ext[(0x80 * 0x1000) / 0x80];
 # endif
@@ -57,7 +57,7 @@ class FM7_MAINMEM : public DEVICE
        int waitfactor;
        int waitcount;
        int cpu_clocks;
-       
+
        bool sub_halted;
        // V2
 #ifdef HAS_MMR
@@ -90,7 +90,7 @@ class FM7_MAINMEM : public DEVICE
        uint8_t fm7_mainmem_bioswork[0x80];
 #if !defined(_FM77AV)
        uint8_t fm7_bootroms[8][0x200];
-#endif 
+#endif
        uint8_t fm7_mainmem_bootrom_vector[0x1e]; // Without
        uint8_t fm7_mainmem_reset_vector[2]; // Without
 #if defined(_FM77AV_VARIANTS) || defined(_FM77_VARIANTS)
@@ -115,7 +115,7 @@ class FM7_MAINMEM : public DEVICE
        bool dictrom_connected;
        bool dictrom_enabled;
        bool dictram_enabled;
-       
+
        bool use_page2_extram;
        uint8_t fm7_mainmem_initrom[0x2000]; // $00000-$0ffff
        uint8_t fm77av_hidden_bootmmr[0x200];
@@ -125,7 +125,7 @@ class FM7_MAINMEM : public DEVICE
        uint8_t fm7_mainmem_dictrom[0x40000]; // $00000-$3ffff, banked
        uint8_t fm7_mainmem_learndata[0x2000];
 #  endif
-#  if defined(_FM77AV40) || defined(_FM77AV40EX) || defined(_FM77AV40SX) 
+#  if defined(_FM77AV40) || defined(_FM77AV40EX) || defined(_FM77AV40SX)
        bool diag_load_extrarom;
        uint8_t fm7_mainmem_extrarom[0x10000]; // $20000-$2bfff, banked
        int extram_pages;
@@ -143,11 +143,11 @@ class FM7_MAINMEM : public DEVICE
 #if defined(CAPABLE_DICTROM)
        FM7::KANJIROM *kanjiclass1;
        //KANJIROM *kanjiclass2;
-#endif 
+#endif
        MC6809 *maincpu;
        FM7::FM7_MAINIO *mainio;
        FM7::DISPLAY *display;
-       
+
        bool diag_load_basicrom;
        bool diag_load_bootrom_bas;
        bool diag_load_bootrom_dos;
@@ -161,12 +161,12 @@ class FM7_MAINMEM : public DEVICE
        uint32_t mem_waitcount;
 
        int check_extrom(uint32_t raddr, uint32_t *realaddr);
-       
+
        int window_convert(uint32_t addr, uint32_t *realaddr);
        uint32_t read_bios(const _TCHAR *name, uint8_t *ptr, uint32_t size);
        uint32_t write_bios(const _TCHAR *name, uint8_t *ptr, uint32_t size);
        void setclock(int mode);
-       
+
        uint8_t __FASTCALL read_shared_ram(uint32_t realaddr, bool dmamode);
        void __FASTCALL write_shared_ram(uint32_t realaddr, uint32_t data, bool dmamode);
        uint8_t __FASTCALL read_direct_access(uint32_t realaddr, bool dmamode);
@@ -182,7 +182,7 @@ class FM7_MAINMEM : public DEVICE
        uint8_t __FASTCALL read_page2(uint32_t addr, bool dmamode);
        void __FASTCALL write_page2(uint32_t addr, uint32_t data, bool dmamode);
        int __FASTCALL check_page2(uint32_t addr, uint32_t *realaddr, bool write_state, bool dmamode);
-       
+
        void init_data_table(void);
        uint8_t __FASTCALL read_data(uint32_t addr, bool dmamode);
        void __FASTCALL write_data(uint32_t addr, uint32_t data, bool dmamode);
@@ -238,13 +238,17 @@ class FM7_MAINMEM : public DEVICE
        void __FASTCALL write_dma_data8(uint32_t addr, uint32_t data);
        void __FASTCALL write_dma_io8(uint32_t addr, uint32_t data);
        void __FASTCALL write_data8_main(uint32_t addr, uint32_t data, bool dmamode);
-   
+
        virtual uint32_t __FASTCALL read_data16(uint32_t addr);
        virtual void __FASTCALL write_data16(uint32_t addr, uint32_t data);
-   
+       virtual uint32_t read_data16w(uint32_t addr, int *wait);
+       virtual void write_data16w(uint32_t addr, uint32_t data, int *wait);
+
        virtual uint32_t __FASTCALL read_data32(uint32_t addr);
        virtual void __FASTCALL write_data32(uint32_t addr, uint32_t data);
-   
+       virtual uint32_t read_data32w(uint32_t addr, int *wait);
+       virtual void write_data32w(uint32_t addr, uint32_t data, int *wait);
+
        void initialize(void);
        void __FASTCALL iowait(void);
        void __FASTCALL dram_refresh(void);
@@ -255,7 +259,7 @@ class FM7_MAINMEM : public DEVICE
        bool get_loadstat_bootrom_bas(void);
        bool get_loadstat_bootrom_dos(void);
        void update_config();
-       
+
        bool process_state(FILEIO *state_fio, bool loading);
 
        void set_context_display(DEVICE *p){
@@ -271,7 +275,7 @@ class FM7_MAINMEM : public DEVICE
        void set_context_kanjirom_class1(DEVICE *p){
                kanjiclass1 = (FM7::KANJIROM *)p;
        }
-#endif 
+#endif
        void __FASTCALL write_signal(int sigid, uint32_t data, uint32_t mask);
        uint32_t __FASTCALL read_signal(int sigid);
        uint32_t __FASTCALL read_io8(uint32_t addr);