OSDN Git Service
(root)
/
csp-qt
/
common_source_project-fm7.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[VM][STATE] Apply new state framework to some devices a lot (excepts some devices...
[csp-qt/common_source_project-fm7.git]
/
source
/
src
/
vm
/
fm7
/
fm7_mainmem.cpp
diff --git
a/source/src/vm/fm7/fm7_mainmem.cpp
b/source/src/vm/fm7/fm7_mainmem.cpp
index
81a8470
..
f888eb9
100644
(file)
--- a/
source/src/vm/fm7/fm7_mainmem.cpp
+++ b/
source/src/vm/fm7/fm7_mainmem.cpp
@@
-526,7
+526,7
@@
void FM7_MAINMEM::update_config()
void FM7_MAINMEM::decl_state(void)
{
void FM7_MAINMEM::decl_state(void)
{
-
state_entry = new csp_state_utils(STATE_VERSION, this_device_id, _T("MAINMEM")
);
+
enter_decl_state(STATE_VERSION
);
DECL_STATE_ENTRY_BOOL(ioaccess_wait);
DECL_STATE_ENTRY_INT32(waitfactor);
DECL_STATE_ENTRY_BOOL(ioaccess_wait);
DECL_STATE_ENTRY_INT32(waitfactor);
@@
-637,6
+637,8
@@
void FM7_MAINMEM::decl_state(void)
DECL_STATE_ENTRY_UINT32(mem_waitcount); // OK?
DECL_STATE_ENTRY_UINT32(cpu_clocks); // OK?
DECL_STATE_ENTRY_UINT32(mem_waitcount); // OK?
DECL_STATE_ENTRY_UINT32(cpu_clocks); // OK?
+
+ leave_decl_state();
}
void FM7_MAINMEM::save_state(FILEIO *state_fio)
}
void FM7_MAINMEM::save_state(FILEIO *state_fio)