• R/O
  • HTTP
  • SSH
  • HTTPS

common_source_project-fm7: Commit

Common Source Code Project for Qt (a.k.a for FM-7).


Commit MetaInfo

Revisione3aaa3868623d92a6662f1ce339d6c33da6f7830 (tree)
Time2018-07-30 16:28:53
AuthorK.Ohta <whatisthis.sowhat@gmai...>
CommiterK.Ohta

Log Message

[VM] Fix FTBFSs.

Change Summary

Incremental Difference

--- a/source/src/vm/fm16beta/fm16beta.h
+++ b/source/src/vm/fm16beta/fm16beta.h
@@ -132,7 +132,7 @@ public:
132132
133133 // drive virtual machine
134134 void reset();
135- //void notify_power_off();
135+ void notify_power_off() { }
136136 void run();
137137
138138 #ifdef USE_DEBUGGER
--- a/source/src/vm/j3100/j3100.h
+++ b/source/src/vm/j3100/j3100.h
@@ -150,7 +150,7 @@ public:
150150
151151 // drive virtual machine
152152 void reset();
153- void notify_power_off();
153+ void notify_power_off() { }
154154 void run();
155155
156156 #ifdef USE_DEBUGGER
--- a/source/src/vm/jr100/jr100.h
+++ b/source/src/vm/jr100/jr100.h
@@ -179,8 +179,8 @@ public:
179179 #endif
180180
181181 // notify key
182- void key_down(int code, bool repeat);
183- void key_up(int code);
182+ void key_down(int code, bool repeat) { }
183+ void key_up(int code) { }
184184
185185 // user interface
186186 void play_tape(int drv, const _TCHAR* file_path);
--- a/source/src/vm/jx/jx.h
+++ b/source/src/vm/jx/jx.h
@@ -124,7 +124,7 @@ public:
124124
125125 // drive virtual machine
126126 void reset();
127- void notify_power_off();
127+ void notify_power_off() { }
128128 void run();
129129
130130 #ifdef USE_DEBUGGER
--- a/source/src/vm/mz2800/reset.cpp
+++ b/source/src/vm/mz2800/reset.cpp
@@ -18,7 +18,7 @@ void RESET::write_signal(int id, uint32_t data, uint32_t mask)
1818 {
1919 // from i8255 port c
2020 if(!(prev & 2) && (data & 2)) {
21- vm->cpu_reset();
21+ static_cast<VM *>(vm)->cpu_reset();
2222 }
2323 if(!(prev & 8) && (data & 8)) {
2424 vm->reset();
--- a/source/src/vm/mz3500/mz3500.h
+++ b/source/src/vm/mz3500/mz3500.h
@@ -81,7 +81,7 @@ class MAIN;
8181 class SUB;
8282 class KEYBOARD;
8383
84-class VM
84+class VM : public VM_TEMPLATE
8585 {
8686 protected:
8787 //EMU* emu;
--- a/source/src/vm/mz5500/mz5500.h
+++ b/source/src/vm/mz5500/mz5500.h
@@ -106,7 +106,7 @@ class KEYBOARD;
106106 class MEMORY;
107107 class SYSPORT;
108108
109-class VM
109+class VM : public VM_TEMPLATE
110110 {
111111 protected:
112112 //EMU* emu;
--- a/source/src/vm/mz700/mz700.h
+++ b/source/src/vm/mz700/mz700.h
@@ -212,7 +212,7 @@ class PSG;
212212 class QUICKDISK;
213213 #endif
214214
215-class VM
215+class VM : public VM_TEMPLATE
216216 {
217217 protected:
218218 //EMU* emu;
--- a/source/src/vm/pc2001/pc2001.h
+++ b/source/src/vm/pc2001/pc2001.h
@@ -40,6 +40,7 @@
4040 #define USE_CPU_UPD7810
4141
4242 #include "../../common.h"
43+#include "../../fileio.h"
4344 #include "../vm_template.h"
4445
4546 #ifdef USE_SOUND_VOLUME
@@ -61,10 +62,7 @@ class UPD1990A;
6162 class UPD7810;
6263
6364 class IO;
64-
65-#include "../../fileio.h"
66-
67-class VM
65+class VM : public VM_TEMPLATE
6866 {
6967 protected:
7068 //EMU* emu;
--- a/source/src/vm/x07/x07.h
+++ b/source/src/vm/x07/x07.h
@@ -45,6 +45,7 @@
4545 #define USE_CPU_Z80
4646
4747 #include "../../common.h"
48+#include "../../fileio.h"
4849 #include "../vm_template.h"
4950
5051 #ifdef USE_SOUND_VOLUME
@@ -64,9 +65,6 @@ class MEMORY;
6465 class Z80;
6566
6667 class IO;
67-
68-#include "../../fileio.h"
69-
7068 class VM : public VM_TEMPLATE
7169 {
7270 protected:
Show on old repository browser