mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-25 03:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12077 from Jamiras/cheevos_memref_validation

Browse Source 
(cheevos) only validate addresses once
This commit is contained in:
Autechre 2021-02-25 11:51:40 +01:00 committed by GitHub
commit 623725d668
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cheevos/cheevos.c
View File

@ -503,9 +503,6 @@ static unsigned rcheevos_peek(unsigned address, unsigned num_bytes, void* ud)
} }
} }
if (address < rcheevos_locals.memory.total_size)
rcheevos_invalidate_address(address);
return 0; return 0;
} }
@ -706,6 +703,22 @@ static void rcheevos_async_task_callback(
} }
} }
static void rcheevos_validate_memrefs(rcheevos_locals_t* locals)
{
rc_memref_value_t* memref = locals->runtime.memrefs;
while (memref)
{
if (!memref->memref.is_indirect)
{
uint8_t* data = rcheevos_memory_find(&rcheevos_locals.memory, memref->memref.address);
if (!data)
rcheevos_invalidate_address(memref->memref.address);
}
memref = memref->next;
}
}
static void rcheevos_activate_achievements(rcheevos_locals_t *locals, static void rcheevos_activate_achievements(rcheevos_locals_t *locals,
rcheevos_racheevo_t* cheevo, unsigned count, unsigned flags) rcheevos_racheevo_t* cheevo, unsigned count, unsigned flags)
{ {
@ -878,6 +891,10 @@ static int rcheevos_parse(rcheevos_locals_t *locals, const char* json)
rcheevos_async_schedule(request, CHEEVOS_PING_FREQUENCY / 4); rcheevos_async_schedule(request, CHEEVOS_PING_FREQUENCY / 4);
} }
/* validate the memrefs */
if (rcheevos_locals.memory.count != 0)
rcheevos_validate_memrefs(&rcheevos_locals);
return 0; return 0;
error: error:
@ -1861,6 +1878,8 @@ void rcheevos_test(void)
rcheevos_pause_hardcore(); rcheevos_pause_hardcore();
return; return;
} }
rcheevos_validate_memrefs(&rcheevos_locals);
} }
rc_runtime_do_frame(&rcheevos_locals.runtime, &rcheevos_runtime_event_handler, rcheevos_peek, NULL, 0); rc_runtime_do_frame(&rcheevos_locals.runtime, &rcheevos_runtime_event_handler, rcheevos_peek, NULL, 0);