Mercurial > repos > blastem

comparison genesis.c @ 1984:0d5f88e53dca mame_interp

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix merge error
author Michael Pavone <pavone@retrodev.com>
date Sun, 10 May 2020 00:16:00 -0700
parents a7b753e260a2
children 638eb2d25696
comparison
equal deleted inserted replaced
1983:a7b753e260a2 1984:0d5f88e53dca
474 #ifndef NEW_CORE 474 #ifndef NEW_CORE
475 if (use_native_states || slot >= SERIALIZE_SLOT) { 475 if (use_native_states || slot >= SERIALIZE_SLOT) {
476 #endif 476 #endif
477 serialize_buffer state; 477 serialize_buffer state;
478 init_serialize(&state); 478 init_serialize(&state);
479 genesis_serialize(gen, &state, address); 479 genesis_serialize(gen, &state, address, slot != EVENTLOG_SLOT);
480 if (slot == SERIALIZE_SLOT) { 480 if (slot == SERIALIZE_SLOT) {
481 gen->serialize_tmp = state.data; 481 gen->serialize_tmp = state.data;
482 gen->serialize_size = state.size; 482 gen->serialize_size = state.size;
483 context->sync_cycle = context->current_cycle; 483 context->sync_cycle = context->current_cycle;
484 context->should_return = 1; 484 context->should_return = 1;