mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-03 10:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove macros CORO_LEAVE/CORO_ENTER/CORO_SUB

Browse Source
This commit is contained in:
twinaphex 2018-01-19 16:54:44 +01:00
parent bd883ad4d5
commit 4f16ff8c2e
2 changed files with 713 additions and 723 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
cheevos/cheevos.c
View File

@ -2507,15 +2507,8 @@ typedef struct
#define CHEEVOS_VAR_CHEEVO_CURR coro->cheevo #define CHEEVOS_VAR_CHEEVO_CURR coro->cheevo
#define CHEEVOS_VAR_CHEEVO_END coro->cheevo_end #define CHEEVOS_VAR_CHEEVO_END coro->cheevo_end
static int cheevos_iterate(coro_t* coro) enum
{ {
ssize_t num_read = 0;
size_t to_read = 4096;
uint8_t *buffer = NULL;
const char *end = NULL;
enum
{
/* Negative values because CORO_SUB generates positive values */ /* Negative values because CORO_SUB generates positive values */
SNES_MD5 = -1, SNES_MD5 = -1,
GENESIS_MD5 = -2, GENESIS_MD5 = -2,
@ -2532,7 +2525,14 @@ static int cheevos_iterate(coro_t* coro)
DEACTIVATE = -13, DEACTIVATE = -13,
PLAYING = -14, PLAYING = -14,
DELAY = -15 DELAY = -15
}; };
static int cheevos_iterate(coro_t *coro)
{
ssize_t num_read = 0;
size_t to_read = 4096;
uint8_t *buffer = NULL;
const char *end = NULL;
static const uint32_t genesis_exts[] = static const uint32_t genesis_exts[] =
{ {
@ -2577,8 +2577,13 @@ static int cheevos_iterate(coro_t* coro)
{GENERIC_MD5, "Generic (plain content)", NULL} {GENERIC_MD5, "Generic (plain content)", NULL}
}; };
CORO_ENTER() {
CORO_again: ;
/* Use at the beginning of the coroutine,
* you must have declared a variable coro_t* coro */
switch (coro->step)
{
case CORO_BEGIN:
cheevos_locals.addrs_patched = false; cheevos_locals.addrs_patched = false;
CHEEVOS_VAR_SETTINGS = config_get_ptr(); CHEEVOS_VAR_SETTINGS = config_get_ptr();
@ -2731,7 +2736,7 @@ static int cheevos_iterate(coro_t* coro)
RARCH_LOG("[CHEEVOS]: this game doesn't feature achievements.\n"); RARCH_LOG("[CHEEVOS]: this game doesn't feature achievements.\n");
CORO_STOP(); CORO_STOP();
found: found:
#ifdef CHEEVOS_JSON_OVERRIDE #ifdef CHEEVOS_JSON_OVERRIDE
{ {
@ -2833,7 +2838,7 @@ static int cheevos_iterate(coro_t* coro)
* Input CHEEVOS_VAR_INFO the content info * Input CHEEVOS_VAR_INFO the content info
* Output CHEEVOS_VAR_GAMEID the Retro Achievements game ID, or 0 if not found * Output CHEEVOS_VAR_GAMEID the Retro Achievements game ID, or 0 if not found
*************************************************************************/ *************************************************************************/
CORO_SUB(SNES_MD5) case SNES_MD5:
MD5_Init(&CHEEVOS_VAR_MD5); MD5_Init(&CHEEVOS_VAR_MD5);
@ -2866,7 +2871,7 @@ static int cheevos_iterate(coro_t* coro)
* Input CHEEVOS_VAR_INFO the content info * Input CHEEVOS_VAR_INFO the content info
* Output CHEEVOS_VAR_GAMEID the Retro Achievements game ID, or 0 if not found * Output CHEEVOS_VAR_GAMEID the Retro Achievements game ID, or 0 if not found
*************************************************************************/ *************************************************************************/
CORO_SUB(GENESIS_MD5) case GENESIS_MD5:
MD5_Init(&CHEEVOS_VAR_MD5); MD5_Init(&CHEEVOS_VAR_MD5);
@ -2895,7 +2900,7 @@ static int cheevos_iterate(coro_t* coro)
* Input CHEEVOS_VAR_INFO the content info * Input CHEEVOS_VAR_INFO the content info
* Output CHEEVOS_VAR_GAMEID the Retro Achievements game ID, or 0 if not found * Output CHEEVOS_VAR_GAMEID the Retro Achievements game ID, or 0 if not found
*************************************************************************/ *************************************************************************/
CORO_SUB(LYNX_MD5) case LYNX_MD5:
if (CHEEVOS_VAR_LEN < 0x0240) if (CHEEVOS_VAR_LEN < 0x0240)
{ {
@ -2917,7 +2922,7 @@ static int cheevos_iterate(coro_t* coro)
* Input CHEEVOS_VAR_INFO the content info * Input CHEEVOS_VAR_INFO the content info
* Output CHEEVOS_VAR_GAMEID the Retro Achievements game ID, or 0 if not found * Output CHEEVOS_VAR_GAMEID the Retro Achievements game ID, or 0 if not found
*************************************************************************/ *************************************************************************/
CORO_SUB(NES_MD5) case NES_MD5:
/* Note about the references to the FCEU emulator below. There is no /* Note about the references to the FCEU emulator below. There is no
* core-specific code in this function, it's rather Retro Achievements * core-specific code in this function, it's rather Retro Achievements
@ -2980,7 +2985,7 @@ static int cheevos_iterate(coro_t* coro)
* Input CHEEVOS_VAR_INFO the content info * Input CHEEVOS_VAR_INFO the content info
* Output CHEEVOS_VAR_GAMEID the Retro Achievements game ID, or 0 if not found * Output CHEEVOS_VAR_GAMEID the Retro Achievements game ID, or 0 if not found
*************************************************************************/ *************************************************************************/
CORO_SUB(GENERIC_MD5) case GENERIC_MD5:
MD5_Init(&CHEEVOS_VAR_MD5); MD5_Init(&CHEEVOS_VAR_MD5);
@ -3000,7 +3005,7 @@ static int cheevos_iterate(coro_t* coro)
* Inputs CHEEVOS_VAR_INFO, CHEEVOS_VAR_OFFSET, CHEEVOS_VAR_COUNT * Inputs CHEEVOS_VAR_INFO, CHEEVOS_VAR_OFFSET, CHEEVOS_VAR_COUNT
* Outputs CHEEVOS_VAR_MD5, CHEEVOS_VAR_COUNT * Outputs CHEEVOS_VAR_MD5, CHEEVOS_VAR_COUNT
*************************************************************************/ *************************************************************************/
CORO_SUB(EVAL_MD5) case EVAL_MD5:
if (CHEEVOS_VAR_COUNT == 0) if (CHEEVOS_VAR_COUNT == 0)
CHEEVOS_VAR_COUNT = CHEEVOS_VAR_LEN; CHEEVOS_VAR_COUNT = CHEEVOS_VAR_LEN;
@ -3019,7 +3024,7 @@ static int cheevos_iterate(coro_t* coro)
* Inputs CHEEVOS_VAR_OFFSET, CHEEVOS_VAR_COUNT * Inputs CHEEVOS_VAR_OFFSET, CHEEVOS_VAR_COUNT
* Outputs CHEEVOS_VAR_MD5 * Outputs CHEEVOS_VAR_MD5
*************************************************************************/ *************************************************************************/
CORO_SUB(FILL_MD5) case FILL_MD5:
{ {
char buffer[4096]; char buffer[4096];
@ -3044,7 +3049,7 @@ static int cheevos_iterate(coro_t* coro)
* Inputs CHEEVOS_VAR_HASH * Inputs CHEEVOS_VAR_HASH
* Outputs CHEEVOS_VAR_GAMEID * Outputs CHEEVOS_VAR_GAMEID
*************************************************************************/ *************************************************************************/
CORO_SUB(GET_GAMEID) case GET_GAMEID:
{ {
char gameid[16]; char gameid[16];
@ -3097,7 +3102,7 @@ static int cheevos_iterate(coro_t* coro)
* Inputs CHEEVOS_VAR_GAMEID * Inputs CHEEVOS_VAR_GAMEID
* Outputs CHEEVOS_VAR_JSON * Outputs CHEEVOS_VAR_JSON
*************************************************************************/ *************************************************************************/
CORO_SUB(GET_CHEEVOS) case GET_CHEEVOS:
CORO_GOSUB(LOGIN); CORO_GOSUB(LOGIN);
@ -3129,7 +3134,7 @@ static int cheevos_iterate(coro_t* coro)
* Inputs CHEEVOS_VAR_GAMEID * Inputs CHEEVOS_VAR_GAMEID
* Outputs CHEEVOS_VAR_JSON * Outputs CHEEVOS_VAR_JSON
*************************************************************************/ *************************************************************************/
CORO_SUB(GET_BADGES) case GET_BADGES:
badges_ctx = new_badges_ctx; badges_ctx = new_badges_ctx;
@ -3185,7 +3190,7 @@ static int cheevos_iterate(coro_t* coro)
/************************************************************************** /**************************************************************************
* Info Logs in the user at Retro Achievements * Info Logs in the user at Retro Achievements
*************************************************************************/ *************************************************************************/
CORO_SUB(LOGIN) case LOGIN:
if (cheevos_locals.token[0]) if (cheevos_locals.token[0])
CORO_RET(); CORO_RET();
@ -3248,7 +3253,7 @@ static int cheevos_iterate(coro_t* coro)
/************************************************************************** /**************************************************************************
* Info Pauses execution for five seconds * Info Pauses execution for five seconds
*************************************************************************/ *************************************************************************/
CORO_SUB(DELAY) case DELAY:
{ {
retro_time_t t1; retro_time_t t1;
@ -3269,7 +3274,7 @@ static int cheevos_iterate(coro_t* coro)
* Inputs CHEEVOS_VAR_URL * Inputs CHEEVOS_VAR_URL
* Outputs CHEEVOS_VAR_JSON * Outputs CHEEVOS_VAR_JSON
*************************************************************************/ *************************************************************************/
CORO_SUB(HTTP_GET) case HTTP_GET:
for (CHEEVOS_VAR_K = 0; CHEEVOS_VAR_K < 5; CHEEVOS_VAR_K++) for (CHEEVOS_VAR_K = 0; CHEEVOS_VAR_K < 5; CHEEVOS_VAR_K++)
{ {
@ -3342,7 +3347,7 @@ static int cheevos_iterate(coro_t* coro)
* Inputs CHEEVOS_VAR_GAMEID * Inputs CHEEVOS_VAR_GAMEID
* Outputs * Outputs
*************************************************************************/ *************************************************************************/
CORO_SUB(DEACTIVATE) case DEACTIVATE:
#ifndef CHEEVOS_DONT_DEACTIVATE #ifndef CHEEVOS_DONT_DEACTIVATE
CORO_GOSUB(LOGIN); CORO_GOSUB(LOGIN);
@ -3413,7 +3418,7 @@ static int cheevos_iterate(coro_t* coro)
* Inputs CHEEVOS_VAR_GAMEID * Inputs CHEEVOS_VAR_GAMEID
* Outputs * Outputs
*************************************************************************/ *************************************************************************/
CORO_SUB(PLAYING) case PLAYING:
snprintf( snprintf(
CHEEVOS_VAR_URL, sizeof(CHEEVOS_VAR_URL), CHEEVOS_VAR_URL, sizeof(CHEEVOS_VAR_URL),
@ -3442,7 +3447,9 @@ static int cheevos_iterate(coro_t* coro)
RARCH_LOG("[CHEEVOS]: posted playing activity.\n"); RARCH_LOG("[CHEEVOS]: posted playing activity.\n");
CORO_RET(); CORO_RET();
CORO_LEAVE(); }
}
return 0;
} }
static void cheevos_task_handler(retro_task_t *task) static void cheevos_task_handler(retro_task_t *task)

17
cheevos/coro.h
View File

@ -5,23 +5,6 @@
Released under the CC0: https://creativecommons.org/publicdomain/zero/1.0/ Released under the CC0: https://creativecommons.org/publicdomain/zero/1.0/
*/ */
/* Use at the beginning of the coroutine, you must have declared a variable coro_t* coro */
#define CORO_ENTER() \
{ \
CORO_again: ; \
switch ( coro->step ) { \
case CORO_BEGIN: ;
/* Use to define labels which are targets to GOTO and GOSUB */
#define CORO_SUB( x ) \
case x: ;
/* Use at the end of the coroutine */
#define CORO_LEAVE() \
} \
} \
do { return 0; } while ( 0 )
/* Go to the x label */ /* Go to the x label */
#define CORO_GOTO( x ) \ #define CORO_GOTO( x ) \
do { \ do { \