• R/O
  • HTTP
  • SSH
  • HTTPS

common_source_project-fm7: Commit

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


Commit MetaInfo

Revision6698678c957cc70a359a71c9994f662d6a2d780a (tree)
Time2018-07-12 22:20:05
AuthorK.Ohta <whatisthis.sowhat@gmai...>
CommiterK.Ohta

Log Message

[VM][STATE] Fix FTBFSs.

Change Summary

Incremental Difference

--- a/source/src/statesub.cpp
+++ b/source/src/statesub.cpp
@@ -1151,73 +1151,73 @@ void csp_state_utils::add_entry_vararray(const _TCHAR *__name, T **p, void *data
11511151 // void csp_state_utils::add_entry(const _TCHAR *__name, T *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
11521152
11531153 template
1154- void csp_state_utils::add_entry<char>(const _TCHAR *__name, char *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
1154+ void DLL_PREFIX csp_state_utils::add_entry<char>(const _TCHAR *__name, char *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
11551155 template
1156- void csp_state_utils::add_entry<float>(const _TCHAR *__name, float *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
1156+ void DLL_PREFIX csp_state_utils::add_entry<float>(const _TCHAR *__name, float *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
11571157 template
1158- void csp_state_utils::add_entry<double>(const _TCHAR *__name, double *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
1158+ void DLL_PREFIX csp_state_utils::add_entry<double>(const _TCHAR *__name, double *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
11591159 template
1160- void csp_state_utils::add_entry<long double>(const _TCHAR *__name, long double *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
1160+ void DLL_PREFIX csp_state_utils::add_entry<long double>(const _TCHAR *__name, long double *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
11611161 template
1162- void csp_state_utils::add_entry<int>(const _TCHAR *__name, int *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
1162+ void DLL_PREFIX csp_state_utils::add_entry<int>(const _TCHAR *__name, int *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
11631163 template
1164- void csp_state_utils::add_entry<uint8_t>(const _TCHAR *__name, uint8_t *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
1164+ void DLL_PREFIX csp_state_utils::add_entry<uint8_t>(const _TCHAR *__name, uint8_t *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
11651165 template
1166- void csp_state_utils::add_entry<int8_t>(const _TCHAR *__name, int8_t *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
1166+ void DLL_PREFIX csp_state_utils::add_entry<int8_t>(const _TCHAR *__name, int8_t *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
11671167 template
1168- void csp_state_utils::add_entry<uint16_t>(const _TCHAR *__name, uint16_t *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
1168+ void DLL_PREFIX csp_state_utils::add_entry<uint16_t>(const _TCHAR *__name, uint16_t *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
11691169 template
1170- void csp_state_utils::add_entry<int16_t>(const _TCHAR *__name, int16_t *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
1170+ void DLL_PREFIX csp_state_utils::add_entry<int16_t>(const _TCHAR *__name, int16_t *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
11711171 template
1172- void csp_state_utils::add_entry<uint32_t>(const _TCHAR *__name, uint32_t *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
1172+ void DLL_PREFIX csp_state_utils::add_entry<uint32_t>(const _TCHAR *__name, uint32_t *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
11731173 template
1174- void csp_state_utils::add_entry<int32_t>(const _TCHAR *__name, int32_t *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
1174+ void DLL_PREFIX csp_state_utils::add_entry<int32_t>(const _TCHAR *__name, int32_t *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
11751175 template
1176- void csp_state_utils::add_entry<uint64_t>(const _TCHAR *__name, uint64_t *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
1176+ void DLL_PREFIX csp_state_utils::add_entry<uint64_t>(const _TCHAR *__name, uint64_t *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
11771177 template
1178- void csp_state_utils::add_entry<int64_t>(const _TCHAR *__name, int64_t *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
1178+ void DLL_PREFIX csp_state_utils::add_entry<int64_t>(const _TCHAR *__name, int64_t *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
11791179 template
1180- void csp_state_utils::add_entry<bool>(const _TCHAR *__name, bool *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
1180+ void DLL_PREFIX csp_state_utils::add_entry<bool>(const _TCHAR *__name, bool *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
11811181 template
1182- void csp_state_utils::add_entry<void>(const _TCHAR *__name, void *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
1182+ void DLL_PREFIX csp_state_utils::add_entry<void>(const _TCHAR *__name, void *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
11831183 template
1184- void csp_state_utils::add_entry<pair_t>(const _TCHAR *__name, pair_t *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
1184+ void DLL_PREFIX csp_state_utils::add_entry<pair_t>(const _TCHAR *__name, pair_t *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
11851185 template
1186- void csp_state_utils::add_entry<scrntype_t>(const _TCHAR *__name, scrntype_t *p, int _len = -1, int __num = -1, bool is_const = false, int stride = 0);
1186+ void DLL_PREFIX csp_state_utils::add_entry<scrntype_t>(const _TCHAR *__name, scrntype_t *p, int _len = -1, int __num = -1, bool is_const = false, int stride = 0);
11871187
11881188 //template <class T>
11891189 // void csp_state_utils::add_entry_vararray(const _TCHAR *__name, T **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
11901190
11911191 template
1192- void csp_state_utils::add_entry_vararray<int>(const _TCHAR *__name, int **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
1192+ void DLL_PREFIX csp_state_utils::add_entry_vararray<int>(const _TCHAR *__name, int **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
11931193 template
1194- void csp_state_utils::add_entry_vararray<float>(const _TCHAR *__name, float **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
1194+ void DLL_PREFIX csp_state_utils::add_entry_vararray<float>(const _TCHAR *__name, float **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
11951195 template
1196- void csp_state_utils::add_entry_vararray<double>(const _TCHAR *__name, double **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
1196+ void DLL_PREFIX csp_state_utils::add_entry_vararray<double>(const _TCHAR *__name, double **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
11971197 template
1198- void csp_state_utils::add_entry_vararray<long double>(const _TCHAR *__name, long double **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
1198+ void DLL_PREFIX csp_state_utils::add_entry_vararray<long double>(const _TCHAR *__name, long double **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
11991199 template
1200- void csp_state_utils::add_entry_vararray<pair_t>(const _TCHAR *__name, pair_t **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
1200+ void DLL_PREFIX csp_state_utils::add_entry_vararray<pair_t>(const _TCHAR *__name, pair_t **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
12011201 template
1202- void csp_state_utils::add_entry_vararray<uint8_t>(const _TCHAR *__name, uint8_t **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
1202+ void DLL_PREFIX csp_state_utils::add_entry_vararray<uint8_t>(const _TCHAR *__name, uint8_t **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
12031203 template
1204- void csp_state_utils::add_entry_vararray<int8_t>(const _TCHAR *__name, int8_t **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
1204+ void DLL_PREFIX csp_state_utils::add_entry_vararray<int8_t>(const _TCHAR *__name, int8_t **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
12051205 template
1206- void csp_state_utils::add_entry_vararray<uint16_t>(const _TCHAR *__name, uint16_t **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
1206+ void DLL_PREFIX csp_state_utils::add_entry_vararray<uint16_t>(const _TCHAR *__name, uint16_t **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
12071207 template
1208- void csp_state_utils::add_entry_vararray<int16_t>(const _TCHAR *__name, int16_t **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
1208+ void DLL_PREFIX csp_state_utils::add_entry_vararray<int16_t>(const _TCHAR *__name, int16_t **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
12091209 template
1210- void csp_state_utils::add_entry_vararray<uint32_t>(const _TCHAR *__name, uint32_t **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
1210+ void DLL_PREFIX csp_state_utils::add_entry_vararray<uint32_t>(const _TCHAR *__name, uint32_t **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
12111211 template
1212- void csp_state_utils::add_entry_vararray<int32_t>(const _TCHAR *__name, int32_t **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
1212+ void DLL_PREFIX csp_state_utils::add_entry_vararray<int32_t>(const _TCHAR *__name, int32_t **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
12131213 template
1214- void csp_state_utils::add_entry_vararray<uint64_t>(const _TCHAR *__name, uint64_t **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
1214+ void DLL_PREFIX csp_state_utils::add_entry_vararray<uint64_t>(const _TCHAR *__name, uint64_t **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
12151215 template
1216- void csp_state_utils::add_entry_vararray<int64_t>(const _TCHAR *__name, int64_t **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
1216+ void DLL_PREFIX csp_state_utils::add_entry_vararray<int64_t>(const _TCHAR *__name, int64_t **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
12171217 template
1218- void csp_state_utils::add_entry_vararray<bool>(const _TCHAR *__name, bool **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
1218+ void DLL_PREFIX csp_state_utils::add_entry_vararray<bool>(const _TCHAR *__name, bool **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
12191219 template
1220- void csp_state_utils::add_entry_vararray<scrntype_t>(const _TCHAR *__name, scrntype_t **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
1220+ void DLL_PREFIX csp_state_utils::add_entry_vararray<scrntype_t>(const _TCHAR *__name, scrntype_t **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
12211221
12221222
12231223 /*
--- a/source/src/vm/babbage2nd/display.cpp
+++ b/source/src/vm/babbage2nd/display.cpp
@@ -168,7 +168,7 @@ void DISPLAY::decl_state()
168168 {
169169 enter_decl_state(STATE_VERSION);
170170
171- DECL_STATE_ENTRY_1D_ARRAY(seg, sizeof(seg));
171+ DECL_STATE_ENTRY_2D_ARRAY(seg, 6, 7);
172172 DECL_STATE_ENTRY_UINT8(ls373);
173173 DECL_STATE_ENTRY_UINT8(pio_7seg);
174174 DECL_STATE_ENTRY_UINT8(pio_8bit);
--- a/source/src/vm/hc20/memory.cpp
+++ b/source/src/vm/hc20/memory.cpp
@@ -839,7 +839,12 @@ void MEMORY::decl_state()
839839
840840 DECL_STATE_ENTRY_INT32(cmt_count);
841841 DECL_STATE_ENTRY_1D_ARRAY(cmt_buffer, sizeof(cmt_buffer));
842- DECL_STATE_ENTRY_1D_ARRAY(lcd, sizeof(lcd));
842+ for(int i = 0; i < 6; i++) {
843+ DECL_STATE_ENTRY_1D_ARRAY_MEMBER((lcd[i].buffer), 80, i);
844+ DECL_STATE_ENTRY_INT32_MEMBER((lcd[i].bank), i);
845+ DECL_STATE_ENTRY_INT32_MEMBER((lcd[i].addr), i);
846+ }
847+
843848 DECL_STATE_ENTRY_UINT8(lcd_select);
844849 DECL_STATE_ENTRY_UINT8(lcd_data);
845850 DECL_STATE_ENTRY_INT32(lcd_clock);
--- a/source/src/vm/mz2800/crtc.cpp
+++ b/source/src/vm/mz2800/crtc.cpp
@@ -1360,7 +1360,7 @@ void CRTC::decl_state()
13601360 DECL_STATE_ENTRY_SCRNTYPE_T_2D_ARRAY(palette4096pri, 16, 9);
13611361 DECL_STATE_ENTRY_UINT8(prev16);
13621362 DECL_STATE_ENTRY_BOOL(update16);
1363- DECL_STATE_ENTRY_1D_ARRAY(map_addr, sizeof(map_addr) / sizeof(uint32_t));
1363+ DECL_STATE_ENTRY_2D_ARRAY(map_addr, 400, 80);
13641364 DECL_STATE_ENTRY_2D_ARRAY(map_hdsc, 400, 80);
13651365 DECL_STATE_ENTRY_3D_ARRAY(text_matrix, 256, 8, 8);
13661366 DECL_STATE_ENTRY_3D_ARRAY(text_matrixw, 256, 8, 16);
--- a/source/src/vm/pc8801/pc88.cpp
+++ b/source/src/vm/pc8801/pc88.cpp
@@ -3046,16 +3046,18 @@ void PC88::decl_state()
30463046 DECL_STATE_ENTRY_INT32(gvram_wait_clocks_r);
30473047 DECL_STATE_ENTRY_INT32(gvram_wait_clocks_w);
30483048 DECL_STATE_ENTRY_INT32(busreq_clocks);
3049- DECL_STATE_ENTRY_1D_ARRAY(palette, sizeof(palette));
3049+ DECL_STATE_ENTRY_UINT8_STRIDE((palette[0].b), 9, sizeof(palette[0]));
3050+ DECL_STATE_ENTRY_UINT8_STRIDE((palette[0].r), 9, sizeof(palette[0]));
3051+ DECL_STATE_ENTRY_UINT8_STRIDE((palette[0].g), 9, sizeof(palette[0]));
30503052 DECL_STATE_ENTRY_BOOL(update_palette);
30513053 DECL_STATE_ENTRY_BOOL(hireso);
30523054 DECL_STATE_ENTRY_2D_ARRAY(text, 200, 640);
30533055 DECL_STATE_ENTRY_2D_ARRAY(graph, 400, 640);
30543056
30553057 // ToDo: Read register value, then calculate display values.
3056- DECL_STATE_ENTRY_1D_ARRAY(palette_text_pc, 9);
3058+ DECL_STATE_ENTRY_SCRNTYPE_T_1D_ARRAY(palette_text_pc, 9);
30573059 // ToDo: Read register value, then calculate display values.
3058- DECL_STATE_ENTRY_1D_ARRAY(palette_graph_pc, 9);
3060+ DECL_STATE_ENTRY_SCRNTYPE_T_1D_ARRAY(palette_graph_pc, 9);
30593061 DECL_STATE_ENTRY_BOOL(usart_dcd);
30603062 DECL_STATE_ENTRY_BOOL(opn_busy);
30613063 DECL_STATE_ENTRY_UINT8(key_caps);
Show on old repository browser