... | ... |
@@ -125,9 +125,9 @@ uxn_step(Uxn *u, Uint8 instr) |
125 | 125 |
if(fkeep) { |
126 | 126 |
pop8 = pop8_keep; |
127 | 127 |
u->src->kptr = u->src->ptr; |
128 |
- } else { |
|
128 |
+ } else |
|
129 | 129 |
pop8 = pop8_nokeep; |
130 |
- } |
|
130 |
+ /* run */ |
|
131 | 131 |
(*ops[op])(u); |
132 | 132 |
if(u->wst.error) |
133 | 133 |
return uxn_halt(u, u->wst.error, "Working-stack", instr); |
... | ... |
@@ -132,7 +132,7 @@ run(Uxn *u) |
132 | 132 |
} |
133 | 133 |
|
134 | 134 |
static int |
135 |
-loaduxn(Uxn *u, char *filepath) |
|
135 |
+load(Uxn *u, char *filepath) |
|
136 | 136 |
{ |
137 | 137 |
FILE *f; |
138 | 138 |
if(!(f = fopen(filepath, "rb"))) |
... | ... |
@@ -151,7 +151,7 @@ main(int argc, char **argv) |
151 | 151 |
return error("Input", "Missing"); |
152 | 152 |
if(!uxn_boot(&u)) |
153 | 153 |
return error("Boot", "Failed"); |
154 |
- if(!loaduxn(&u, argv[1])) |
|
154 |
+ if(!load(&u, argv[1])) |
|
155 | 155 |
return error("Load", "Failed"); |
156 | 156 |
|
157 | 157 |
devsystem = uxn_port(&u, 0x0, "system", system_talk); |
... | ... |
@@ -476,7 +476,7 @@ run(Uxn *u) |
476 | 476 |
} |
477 | 477 |
|
478 | 478 |
static int |
479 |
-loaduxn(Uxn *u, char *filepath) |
|
479 |
+load(Uxn *u, char *filepath) |
|
480 | 480 |
{ |
481 | 481 |
FILE *f; |
482 | 482 |
if(!(f = fopen(filepath, "rb"))) |
... | ... |
@@ -498,7 +498,7 @@ main(int argc, char **argv) |
498 | 498 |
return error("usage", "uxnemu file.rom"); |
499 | 499 |
if(!uxn_boot(&u)) |
500 | 500 |
return error("Boot", "Failed to start uxn."); |
501 |
- if(!loaduxn(&u, argv[1])) |
|
501 |
+ if(!load(&u, argv[1])) |
|
502 | 502 |
return error("Load", "Failed to open rom."); |
503 | 503 |
if(!init()) |
504 | 504 |
return error("Init", "Failed to initialize emulator."); |