• R/O
  • HTTP
  • SSH
  • HTTPS

common_source_project-fm7: Commit

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


Commit MetaInfo

Revision1f4c39a5e304bfbe07918f39152f5592e3c51d5b (tree)
Time2018-07-07 10:43:08
AuthorK.Ohta <whatisthis.sowhat@gmai...>
CommiterK.Ohta

Log Message

[STATE] Update SOVERSION.

Change Summary

Incremental Difference

--- a/source/src/qt/emuutils/CMakeLists.txt
+++ b/source/src/qt/emuutils/CMakeLists.txt
@@ -15,7 +15,7 @@ set(s_qt_emuutils_srcs
1515
1616 QT5_WRAP_CPP(s_qt_emuutils_headers_MOC ${s_qt_emuutils_headers})
1717
18-SET(THIS_LIB_VERSION 2.11.6)
18+SET(THIS_LIB_VERSION 2.11.7)
1919
2020 if(WIN32)
2121 include (GenerateExportHeader)
--- a/source/src/statesub.cpp
+++ b/source/src/statesub.cpp
@@ -1060,6 +1060,127 @@ csp_state_utils::~csp_state_utils()
10601060 {
10611061 }
10621062
1063+
1064+template <class T>
1065+void csp_state_utils::add_entry(const _TCHAR *__name, T *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0)
1066+{
1067+ __list_t _l;
1068+ std::string _name = std::string(__name);
1069+ if(__num >= 0) _name = _name + std::string("_#[") +std::to_string(__num) + std::string("]");
1070+ _l.ptr = (void *)p;
1071+ _l.type_id = typeid_map[typeid(T)];
1072+ _l.len = _len;
1073+ _l.atomlen = sizeof(T);
1074+ _l.name = _name;
1075+ _l.datalenptr = NULL;
1076+ _l.local_num = __num;
1077+ _l.assume_byte = false;
1078+ _l.recv_ptr = 0;
1079+ _l.stride = stride;
1080+ out_debug_log("ADD ENTRY: NAME=%s TYPE=%s len=%d atomlen=%d", _name.c_str(), typeid(T).name(), _len, _l.atomlen);
1081+ if(is_const) _l.type_id = _l.type_id | csp_saver_entry_const;
1082+ listptr.push_back(_l);
1083+};
1084+
1085+template <class T>
1086+void csp_state_utils::add_entry_vararray(const _TCHAR *__name, T **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0)
1087+{
1088+ __list_t _l;
1089+
1090+ if(datalen == NULL) {
1091+ add_entry(__name, p, 1);
1092+ return;
1093+ }
1094+ std::string _name = std::string(__name);
1095+ if(__num >= 0) _name = _name + std::string("_#[") +std::to_string(__num) + std::string("]");
1096+
1097+ _l.ptr = (void *)p;
1098+ _l.type_id = typeid_map[typeid(T)];;
1099+ _l.len = 0;
1100+ _l.atomlen = sizeof(T);
1101+ _l.name = _name;
1102+ _l.local_num = __num;
1103+ _l.datalenptr = (int *) datalen;
1104+ _l.assume_byte = assume_byte;
1105+ _l.type_id = _l.type_id | csp_saver_entry_vararray;
1106+ _l.recv_ptr = 0;
1107+ _l.stride = stride;
1108+ out_debug_log("ADD ENTRY(VARARRAY): NAME=%s TYPE=%s atomlen=%d linked len=%08x", __name, typeid(T).name(), _l.atomlen, datalen);
1109+ listptr.push_back(_l);
1110+};
1111+
1112+
1113+// template <class T>
1114+// void csp_state_utils::add_entry(const _TCHAR *__name, T *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
1115+
1116+template
1117+ 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);
1118+template
1119+ 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);
1120+template
1121+ 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);
1122+template
1123+ 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);
1124+template
1125+ 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);
1126+template
1127+ 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);
1128+template
1129+ 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);
1130+template
1131+ 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);
1132+template
1133+ 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);
1134+template
1135+ 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);
1136+template
1137+ 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);
1138+template
1139+ 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);
1140+template
1141+ 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);
1142+template
1143+ 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);
1144+template
1145+ 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);
1146+template
1147+ 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);
1148+
1149+//template <class T>
1150+// void csp_state_utils::add_entry_vararray(const _TCHAR *__name, T **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
1151+
1152+template
1153+ 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);
1154+template
1155+ 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);
1156+template
1157+ 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);
1158+template
1159+ 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);
1160+template
1161+ 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);
1162+template
1163+ 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);
1164+template
1165+ 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);
1166+template
1167+ 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);
1168+template
1169+ 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);
1170+template
1171+ 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);
1172+template
1173+ 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);
1174+template
1175+ 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);
1176+template
1177+ 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);
1178+template
1179+ 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);
1180+template
1181+ 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);
1182+
1183+
10631184 /*
10641185 * Note:
10651186 * With MinGW and DLL linker, not able top find extern symbols.
--- a/source/src/statesub.h
+++ b/source/src/statesub.h
@@ -201,58 +201,16 @@ protected:
201201 { typeid(cur_time_t), csp_saver_entry_cur_time_t },
202202 { typeid(scrntype_t), csp_saver_entry_scrntype_t }
203203 };
204+
204205 public:
205206 csp_state_utils(int _version = 1, int device_id = 1, const _TCHAR *classname = NULL, CSP_Logger* p_logger = NULL);
206207 ~csp_state_utils();
207208 std::list<std::string> get_entries_list(void);
208209
209210 template <class T>
210- void add_entry(const _TCHAR *__name, T *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0)
211- {
212- __list_t _l;
213- std::string _name = std::string(__name);
214- if(__num >= 0) _name = _name + std::string("_#[") +std::to_string(__num) + std::string("]");
215- _l.ptr = (void *)p;
216- _l.type_id = typeid_map[typeid(T)];
217- _l.len = _len;
218- _l.atomlen = sizeof(T);
219- _l.name = _name;
220- _l.datalenptr = NULL;
221- _l.local_num = __num;
222- _l.assume_byte = false;
223- _l.recv_ptr = 0;
224- _l.stride = stride;
225- out_debug_log("ADD ENTRY: NAME=%s TYPE=%s len=%d atomlen=%d", _name.c_str(), typeid(T).name(), _len, _l.atomlen);
226- if(is_const) _l.type_id = _l.type_id | csp_saver_entry_const;
227- listptr.push_back(_l);
228- };
229-
211+ void add_entry(const _TCHAR *__name, T *p, int _len = 1, int __num = -1, bool is_const = false, int stride = 0);
230212 template <class T>
231- void add_entry_vararray(const _TCHAR *__name, T **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0)
232- {
233- __list_t _l;
234-
235- if(datalen == NULL) {
236- add_entry(__name, p, 1);
237- return;
238- }
239- std::string _name = std::string(__name);
240- if(__num >= 0) _name = _name + std::string("_#[") +std::to_string(__num) + std::string("]");
241-
242- _l.ptr = (void *)p;
243- _l.type_id = typeid_map[typeid(T)];;
244- _l.len = 0;
245- _l.atomlen = sizeof(T);
246- _l.name = _name;
247- _l.local_num = __num;
248- _l.datalenptr = (int *) datalen;
249- _l.assume_byte = assume_byte;
250- _l.type_id = _l.type_id | csp_saver_entry_vararray;
251- _l.recv_ptr = 0;
252- _l.stride = stride;
253- out_debug_log("ADD ENTRY(VARARRAY): NAME=%s TYPE=%s atomlen=%d linked len=%08x", __name, typeid(T).name(), _l.atomlen, datalen);
254- listptr.push_back(_l);
255- };
213+ void add_entry_vararray(const _TCHAR *__name, T **p, void *datalen, bool assume_byte = false, int __num = -1, int stride = 0);
256214
257215 void add_entry_fifo(const _TCHAR *__name, FIFO **p, int _len = 1, int __num = -1, int stride = 0);
258216 void add_entry_cur_time_t(const _TCHAR *__name, cur_time_t *p, int _len = 1, int __num = -1, int stride = 0);
--- a/source/src/vm/common_vm/CMakeLists.txt
+++ b/source/src/vm/common_vm/CMakeLists.txt
@@ -1,6 +1,6 @@
11 message("* vm/common_vm")
22
3-SET(THIS_LIB_VERSION 1.4.5)
3+SET(THIS_LIB_VERSION 1.4.6)
44
55 #include(cotire)
66 set(s_vm_common_vm_srcs
--- a/source/src/vm/fmgen/CMakeLists.txt
+++ b/source/src/vm/fmgen/CMakeLists.txt
@@ -1,7 +1,7 @@
11 cmake_minimum_required (VERSION 2.6)
22
33 message("* vm/fmgen")
4-SET(THIS_LIB_VERSION 1.2.2)
4+SET(THIS_LIB_VERSION 1.2.3)
55
66 SET(s_vm_fmgen_srcs
77 fmgen.cpp
Show on old repository browser