diff --git a/src/uxn.c b/src/uxn.c index afab81e..8c09a52 100644 --- a/src/uxn.c +++ b/src/uxn.c @@ -125,9 +125,9 @@ uxn_step(Uxn *u, Uint8 instr) if(fkeep) { pop8 = pop8_keep; u->src->kptr = u->src->ptr; - } else { + } else pop8 = pop8_nokeep; - } + /* run */ (*ops[op])(u); if(u->wst.error) return uxn_halt(u, u->wst.error, "Working-stack", instr); diff --git a/src/uxncli.c b/src/uxncli.c index dea34c4..e527ba4 100644 --- a/src/uxncli.c +++ b/src/uxncli.c @@ -132,7 +132,7 @@ run(Uxn *u) } static int -loaduxn(Uxn *u, char *filepath) +load(Uxn *u, char *filepath) { FILE *f; if(!(f = fopen(filepath, "rb"))) @@ -151,7 +151,7 @@ main(int argc, char **argv) return error("Input", "Missing"); if(!uxn_boot(&u)) return error("Boot", "Failed"); - if(!loaduxn(&u, argv[1])) + if(!load(&u, argv[1])) return error("Load", "Failed"); devsystem = uxn_port(&u, 0x0, "system", system_talk); diff --git a/src/uxnemu.c b/src/uxnemu.c index 4dd3841..13289ab 100644 --- a/src/uxnemu.c +++ b/src/uxnemu.c @@ -476,7 +476,7 @@ run(Uxn *u) } static int -loaduxn(Uxn *u, char *filepath) +load(Uxn *u, char *filepath) { FILE *f; if(!(f = fopen(filepath, "rb"))) @@ -498,7 +498,7 @@ main(int argc, char **argv) return error("usage", "uxnemu file.rom"); if(!uxn_boot(&u)) return error("Boot", "Failed to start uxn."); - if(!loaduxn(&u, argv[1])) + if(!load(&u, argv[1])) return error("Load", "Failed to open rom."); if(!init()) return error("Init", "Failed to initialize emulator.");