Cleaned up a few function names
This commit is contained in:
parent
4f822f55f3
commit
5d7151ab61
|
@ -125,9 +125,9 @@ uxn_step(Uxn *u, Uint8 instr)
|
||||||
if(fkeep) {
|
if(fkeep) {
|
||||||
pop8 = pop8_keep;
|
pop8 = pop8_keep;
|
||||||
u->src->kptr = u->src->ptr;
|
u->src->kptr = u->src->ptr;
|
||||||
} else {
|
} else
|
||||||
pop8 = pop8_nokeep;
|
pop8 = pop8_nokeep;
|
||||||
}
|
/* run */
|
||||||
(*ops[op])(u);
|
(*ops[op])(u);
|
||||||
if(u->wst.error)
|
if(u->wst.error)
|
||||||
return uxn_halt(u, u->wst.error, "Working-stack", instr);
|
return uxn_halt(u, u->wst.error, "Working-stack", instr);
|
||||||
|
|
|
@ -132,7 +132,7 @@ run(Uxn *u)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
loaduxn(Uxn *u, char *filepath)
|
load(Uxn *u, char *filepath)
|
||||||
{
|
{
|
||||||
FILE *f;
|
FILE *f;
|
||||||
if(!(f = fopen(filepath, "rb")))
|
if(!(f = fopen(filepath, "rb")))
|
||||||
|
@ -151,7 +151,7 @@ main(int argc, char **argv)
|
||||||
return error("Input", "Missing");
|
return error("Input", "Missing");
|
||||||
if(!uxn_boot(&u))
|
if(!uxn_boot(&u))
|
||||||
return error("Boot", "Failed");
|
return error("Boot", "Failed");
|
||||||
if(!loaduxn(&u, argv[1]))
|
if(!load(&u, argv[1]))
|
||||||
return error("Load", "Failed");
|
return error("Load", "Failed");
|
||||||
|
|
||||||
devsystem = uxn_port(&u, 0x0, "system", system_talk);
|
devsystem = uxn_port(&u, 0x0, "system", system_talk);
|
||||||
|
|
|
@ -476,7 +476,7 @@ run(Uxn *u)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
loaduxn(Uxn *u, char *filepath)
|
load(Uxn *u, char *filepath)
|
||||||
{
|
{
|
||||||
FILE *f;
|
FILE *f;
|
||||||
if(!(f = fopen(filepath, "rb")))
|
if(!(f = fopen(filepath, "rb")))
|
||||||
|
@ -498,7 +498,7 @@ main(int argc, char **argv)
|
||||||
return error("usage", "uxnemu file.rom");
|
return error("usage", "uxnemu file.rom");
|
||||||
if(!uxn_boot(&u))
|
if(!uxn_boot(&u))
|
||||||
return error("Boot", "Failed to start uxn.");
|
return error("Boot", "Failed to start uxn.");
|
||||||
if(!loaduxn(&u, argv[1]))
|
if(!load(&u, argv[1]))
|
||||||
return error("Load", "Failed to open rom.");
|
return error("Load", "Failed to open rom.");
|
||||||
if(!init())
|
if(!init())
|
||||||
return error("Init", "Failed to initialize emulator.");
|
return error("Init", "Failed to initialize emulator.");
|
||||||
|
|
Loading…
Reference in New Issue