[VM] Really update to upstream 2018-10-07.

diff --git a/source/src/vm/fp1100/fp1100.h b/source/src/vm/fp1100/fp1100.h
index a973116..49e363f 100644 (file)
--- a/source/src/vm/fp1100/fp1100.h
+++ b/source/src/vm/fp1100/fp1100.h
@@ -26,7 +26,6 @@
 #define SCREEN_HEIGHT          400
 #define WINDOW_HEIGHT_ASPECT   480
 #define MAX_DRIVE              4
-#define SUPPORT_VARIABLE_TIMING
 
 // device informations for win32
 #define SUPPORT_TV_RENDER

diff --git a/source/src/vm/fp200/io.cpp b/source/src/vm/fp200/io.cpp
index 13176c7..c1d7fad 100644 (file)
--- a/source/src/vm/fp200/io.cpp
+++ b/source/src/vm/fp200/io.cpp
@@ -507,51 +507,11 @@ void IO::close_tape()
                                
                                wav_header_t wav_header;
                                wav_chunk_t wav_chunk;
-#if 0                          
-                               pair_t __riff_chunk_size;
-                               pair_t __fmt_chunk_size;
-                               pair_t __wav_chunk_size;
-                               pair16_t __fmt_id;
-                               pair16_t __channels;
-                               pair_t __sample_rate;
-                               pair16_t __block_size;
-                               pair16_t __sample_bits;
-
-                               __riff_chunk_size.d = length - 8;
-                               __fmt_chunk_size.d = 16;
-                               __fmt_id.u16 = 1;
-                               __channels.u16 = 1;
-                               __sample_rate.d = CMT_SAMPLE_RATE;
-                               __block_size.u16 = 1;
-                               __sample_bits.u16 = 8;
-       
-                               memcpy(wav_header.riff_chunk.id, "RIFF", 4);
-                               wav_header.riff_chunk.size = __riff_chunk_size.get_4bytes_le_to();
-       
-                               memcpy(wav_header.wave, "WAVE", 4);
-                               memcpy(wav_header.fmt_chunk.id, "fmt ", 4);
-                               wav_header.fmt_chunk.size = __riff_chunk_size.get_4bytes_le_to();
-                               wav_header.format_id = __fmt_id.get_2bytes_le_to();
-                               wav_header.channels = __channels.get_2byte_le_to();
-                               wav_header.sample_rate = __sample_rate.get_4bytes_le_to();
-                               wav_header.data_speed =  __sample_rate.get_4bytes_le_to();
-                               wav_header.block_size = __block_size.get_2bytes_le_to();
-                               wav_header.sample_bits = __sample_bits_get_2bytes_le_to();
-       
-                               memcpy(wav_chunk.id, "data", 4);
-                               __wav_chunk_size.d = length - sizeof(wav_header) - sizeof(wav_chunk);
-                               wav_chunk.size = __wav_chunk_size.get_4bytes_le_to();
-                               
-                               cmt_fio->Fseek(0, FILEIO_SEEK_SET);
-                               cmt_fio->Fwrite(&wav_header, sizeof(wav_header), 1);
-                               cmt_fio->Fwrite(&wav_chunk, sizeof(wav_chunk), 1);
-#else
                                if(set_wav_header(&wav_header, &wav_chunk, 1, CMT_SAMPLE_RATE, 8, length)) {
                                        cmt_fio->Fseek(0, FILEIO_SEEK_SET);
                                        cmt_fio->Fwrite(&wav_header, sizeof(wav_header), 1);
                                        cmt_fio->Fwrite(&wav_chunk, sizeof(wav_chunk), 1);
                                }
-#endif
                        }
                }
                cmt_fio->Fclose();

diff --git a/source/src/vm/msx/memory.h b/source/src/vm/msx/memory.h
index 055997e..6e0d73d 100644 (file)
--- a/source/src/vm/msx/memory.h
+++ b/source/src/vm/msx/memory.h
@@ -240,7 +240,7 @@ public:
        void write_signal(int id, uint32_t data, uint32_t mask);
 #if !defined(_PX7)
        uint32_t read_signal(int id);
-       bool bios_ret_z80(uint16_t PC, pair_t* af, pair_t* bc, pair_t* de, pair_t* hl, pair_t* ix, pair_t* iy, uint8_t* iff1);
+       bool bios_ret_z80(uint16_t PC, pair32_t* af, pair32_t* bc, pair32_t* de, pair32_t* hl, pair32_t* ix, pair32_t* iy, uint8_t* iff1);
 #endif
        bool process_state(FILEIO* state_fio, bool loading);
        

diff --git a/source/src/vm/msx/memory_ex.h b/source/src/vm/msx/memory_ex.h
index d6b2384..9542032 100644 (file)
--- a/source/src/vm/msx/memory_ex.h
+++ b/source/src/vm/msx/memory_ex.h
@@ -413,7 +413,7 @@ public:
        void write_signal(int id, uint32_t data, uint32_t mask);
 #if defined(FDD_PATCH_SLOT)
        uint32_t read_signal(int id);
-       bool bios_ret_z80(uint16_t PC, pair_t* af, pair_t* bc, pair_t* de, pair_t* hl, pair_t* ix, pair_t* iy, uint8_t* iff1);
+       bool bios_ret_z80(uint16_t PC, pair32_t* af, pair32_t* bc, pair32_t* de, pair32_t* hl, pair32_t* ix, pair32_t* iy, uint8_t* iff1);
 #endif
        bool process_state(FILEIO* state_fio, bool loading);
        

diff --git a/source/src/vm/multi8/multi8.h b/source/src/vm/multi8/multi8.h
index d738187..f6c7b16 100644 (file)
--- a/source/src/vm/multi8/multi8.h
+++ b/source/src/vm/multi8/multi8.h
@@ -26,7 +26,6 @@
 #define MAX_DRIVE              4
 #define UPD765A_DONT_WAIT_SEEK
 #define HAS_AY_3_8912
-#define SUPPORT_VARIABLE_TIMING
 
 // device informations for win32
 #define SUPPORT_TV_RENDER

diff --git a/source/src/vm/pc6001/psub.cpp b/source/src/vm/pc6001/psub.cpp
index ea594b3..bf27b67 100644 (file)
--- a/source/src/vm/pc6001/psub.cpp
+++ b/source/src/vm/pc6001/psub.cpp
@@ -817,51 +817,11 @@ void PSUB::close_tape()
                                }
 #endif
                                uint32_t length = fio->Ftell();
-#if 0                          
-                               pair_t __riff_chunk_size;
-                               pair_t __fmt_chunk_size;
-                               pair_t __wav_chunk_size;
-                               pair16_t __fmt_id;
-                               pair16_t __channels;
-                               pair_t __sample_rate;
-                               pair16_t __block_size;
-                               pair16_t __sample_bits;
-
-                               __riff_chunk_size.d = length - 8;
-                               __fmt_chunk_size.d = 16;
-                               __fmt_id.w = 1;
-                               __channels.w = 1;
-                               __sample_rate.d = sample_rate;
-                               __block_size.w = 1;
-                               __sample_bits.w = 8;
-       
-                               memcpy(wav_header.riff_chunk.id, "RIFF", 4);
-                               wav_header.riff_chunk.size = __riff_chunk_size.get_4bytes_le_to();
-       
-                               memcpy(wav_header.wave, "WAVE", 4);
-                               memcpy(wav_header.fmt_chunk.id, "fmt ", 4);
-                               wav_header.fmt_chunk.size = __riff_chunk_size.get_4bytes_le_to();
-                               wav_header.format_id = __fmt_id.get_2bytes_le_to();
-                               wav_header.channels = __channels.get_2byte_le_to();
-                               wav_header.sample_rate = __sample_rate.get_4bytes_le_to();
-                               wav_header.data_speed =  __sample_rate.get_4bytes_le_to();
-                               wav_header.block_size = __block_size.get_2bytes_le_to();
-                               wav_header.sample_bits = __sample_bits_get_2bytes_le_to();
-       
-                               memcpy(wav_chunk.id, "data", 4);
-                               __wav_chunk_size.d = length - sizeof(wav_header) - sizeof(wav_chunk);
-                               wav_chunk.size = __wav_chunk_size.get_4bytes_le_to();
-       
-                               fio->Fseek(0, FILEIO_SEEK_SET);
-                               fio->Fwrite(&wav_header, sizeof(wav_header), 1);
-                               fio->Fwrite(&wav_chunk, sizeof(wav_chunk), 1);
-#else
                                if(set_wav_header(&wav_header, &wav_chunk, 1, sample_rate, 8, length)) {
                                        fio->Fseek(0, FILEIO_SEEK_SET);
                                        fio->Fwrite(&wav_header, sizeof(wav_header), 1);
                                        fio->Fwrite(&wav_chunk, sizeof(wav_chunk), 1);
                                }
-#endif
                        } else {
                                fio->Fwrite(CasData, CasIndex, 1);
                                if(is_p6t) {

diff --git a/source/src/vm/pc6001/sub.cpp b/source/src/vm/pc6001/sub.cpp
index 9960a14..cd95cf4 100644 (file)
--- a/source/src/vm/pc6001/sub.cpp
+++ b/source/src/vm/pc6001/sub.cpp
@@ -293,51 +293,11 @@ void SUB::close_tape()
                                }
 #endif
                                uint32_t length = fio->Ftell();
-#if 0                          
-                               pair_t __riff_chunk_size;
-                               pair_t __fmt_chunk_size;
-                               pair_t __wav_chunk_size;
-                               pair16_t __fmt_id;
-                               pair16_t __channels;
-                               pair_t __sample_rate;
-                               pair16_t __block_size;
-                               pair16_t __sample_bits;
-
-                               __riff_chunk_size.d = length - 8;
-                               __fmt_chunk_size.d = 16;
-                               __fmt_id.w = 1;
-                               __channels.w = 1;
-                               __sample_rate.d = sample_rate;
-                               __block_size.w = 1;
-                               __sample_bits.w = 8;
-       
-                               memcpy(wav_header.riff_chunk.id, "RIFF", 4);
-                               wav_header.riff_chunk.size = __riff_chunk_size.get_4bytes_le_to();
-       
-                               memcpy(wav_header.wave, "WAVE", 4);
-                               memcpy(wav_header.fmt_chunk.id, "fmt ", 4);
-                               wav_header.fmt_chunk.size = __riff_chunk_size.get_4bytes_le_to();
-                               wav_header.format_id = __fmt_id.get_2bytes_le_to();
-                               wav_header.channels = __channels.get_2byte_le_to();
-                               wav_header.sample_rate = __sample_rate.get_4bytes_le_to();
-                               wav_header.data_speed =  __sample_rate.get_4bytes_le_to();
-                               wav_header.block_size = __block_size.get_2bytes_le_to();
-                               wav_header.sample_bits = __sample_bits_get_2bytes_le_to();
-       
-                               memcpy(wav_chunk.id, "data", 4);
-                               __wav_chunk_size.d = length - sizeof(wav_header) - sizeof(wav_chunk);
-                               wav_chunk.size = __wav_chunk_size.get_4bytes_le_to();
-                               
-                               fio->Fseek(0, FILEIO_SEEK_SET);
-                               fio->Fwrite(&wav_header, sizeof(wav_header), 1);
-                               fio->Fwrite(&wav_chunk, sizeof(wav_chunk), 1);
-#else
                                if(set_wav_header(&wav_header, &wav_chunk, 1, sample_rate, 8, length)) {
                                        fio->Fseek(0, FILEIO_SEEK_SET);
                                        fio->Fwrite(&wav_header, sizeof(wav_header), 1);
                                        fio->Fwrite(&wav_chunk, sizeof(wav_chunk), 1);
                                }
-#endif
                        } else {
                                fio->Fwrite(buffer, index, 1);
                                if(is_p6t) {

diff --git a/source/src/vm/pc8201/cmt.cpp b/source/src/vm/pc8201/cmt.cpp
index 58c8f4d..b2a9c53 100644 (file)
--- a/source/src/vm/pc8201/cmt.cpp
+++ b/source/src/vm/pc8201/cmt.cpp
@@ -129,53 +129,11 @@ void CMT::close_tape()
                        uint32_t length = fio->Ftell();
                        wav_header_t wav_header;
                        wav_chunk_t wav_chunk;
-#if 0                  
-                       
-                       pair_t __riff_chunk_size;
-                       pair_t __fmt_chunk_size;
-                       pair_t __wav_chunk_size;
-                       pair16_t __fmt_id;
-                       pair16_t __channels;
-                       pair_t __sample_rate;
-                       pair16_t __block_size;
-                       pair16_t __sample_bits;
-
-                       __riff_chunk_size.d = length - 8;
-                       __fmt_chunk_size.d = 16;
-                       __fmt_id.w = 1;
-                       __channels.w = 1;
-                       __sample_rate.d = SAMPLE_RATE;
-                       __block_size.w = 1;
-                       __sample_bits.w = 8;
-       
-                       memcpy(wav_header.riff_chunk.id, "RIFF", 4);
-                       wav_header.riff_chunk.size = __riff_chunk_size.get_4bytes_le_to();
-       
-                       memcpy(wav_header.wave, "WAVE", 4);
-                       memcpy(wav_header.fmt_chunk.id, "fmt ", 4);
-                       wav_header.fmt_chunk.size = __riff_chunk_size.get_4bytes_le_to();
-                       wav_header.format_id = __fmt_id.get_2bytes_le_to();
-                       wav_header.channels = __channels.get_2byte_le_to();
-                       wav_header.sample_rate = __sample_rate.get_4bytes_le_to();
-                       wav_header.data_speed =  __sample_rate.get_4bytes_le_to();
-                       wav_header.block_size = __block_size.get_2bytes_le_to();
-                       wav_header.sample_bits = __sample_bits_get_2bytes_le_to();
-       
-                       memcpy(wav_chunk.id, "data", 4);
-                       __wav_chunk_size.d = length - sizeof(wav_header) - sizeof(wav_chunk);
-                       wav_chunk.size = __wav_chunk_size.get_4bytes_le_to();
-
-                       
-                       fio->Fseek(0, FILEIO_SEEK_SET);
-                       fio->Fwrite(&wav_header, sizeof(wav_header), 1);
-                       fio->Fwrite(&wav_chunk, sizeof(wav_chunk), 1);
-#else
                        if(set_wav_header(&wav_header, &wav_chunk, 1, SAMPLE_RATE, 8, length)) {
                                fio->Fseek(0, FILEIO_SEEK_SET);
                                fio->Fwrite(&wav_header, sizeof(wav_header), 1);
                                fio->Fwrite(&wav_chunk, sizeof(wav_chunk), 1);
                        }
-#endif
                }
                fio->Fclose();
        }