d6
/
uxn11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(uxn.c) Silenced warnings

This commit is contained in:
Devine Lu Linvega 2024-08-25 09:27:46 -07:00
parent 641170c4cb
commit fc6328148d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/uxn.c
View File

@ -24,7 +24,7 @@ WITH REGARD TO THIS SOFTWARE.
/* Microcode */ /* Microcode */
#define JMI pc += uxn.ram[pc++] << 8 | uxn.ram[pc++]; #define JMI a = uxn.ram[pc ] << 8 | uxn.ram[pc + 1], pc += a + 2;
#define JMP(i) if(_2) pc = i; else pc += (Sint8)i; #define JMP(i) if(_2) pc = i; else pc += (Sint8)i;
#define REM if(_r) uxn.rst.ptr -= 1 + _2; else uxn.wst.ptr -= 1 + _2; #define REM if(_r) uxn.rst.ptr -= 1 + _2; else uxn.wst.ptr -= 1 + _2;
#define INC(s) uxn.s.dat[uxn.s.ptr++] #define INC(s) uxn.s.dat[uxn.s.ptr++]
@ -36,7 +36,7 @@ WITH REGARD TO THIS SOFTWARE.
#define PU1(i) if(_r) INC(rst) = i; else INC(wst) = i; #define PU1(i) if(_r) INC(rst) = i; else INC(wst) = i;
#define RP1(i) if(_r) INC(wst) = i; else INC(rst) = i; #define RP1(i) if(_r) INC(wst) = i; else INC(rst) = i;
#define GET(o) if(_2) PO1(o[1]) PO1(o[0]) #define GET(o) if(_2) PO1(o[1]) PO1(o[0])
#define PUT(i) PU1(i[0]) if(_2) PU1(i[1]) #define PUT(i) PU1(i[0]) if(_2) { PU1(i[1]) }
#define DEI(i,o) o[0] = emu_dei(i); if(_2) o[1] = emu_dei(i + 1); PUT(o) #define DEI(i,o) o[0] = emu_dei(i); if(_2) o[1] = emu_dei(i + 1); PUT(o)
#define DEO(i,j) emu_deo(i, j[0]); if(_2) emu_deo(i + 1, j[1]); #define DEO(i,j) emu_deo(i, j[0]); if(_2) emu_deo(i + 1, j[1]);
#define PEK(i,o,m) o[0] = uxn.ram[i]; if(_2) o[1] = uxn.ram[(i + 1) & m]; PUT(o) #define PEK(i,o,m) o[0] = uxn.ram[i]; if(_2) o[1] = uxn.ram[(i + 1) & m]; PUT(o)
@ -69,9 +69,9 @@ uxn_eval(Uint16 pc)
/* GTH */ OPC(0x0a, POx(a) POx(b),PU1(b > a)) /* GTH */ OPC(0x0a, POx(a) POx(b),PU1(b > a))
/* LTH */ OPC(0x0b, POx(a) POx(b),PU1(b < a)) /* LTH */ OPC(0x0b, POx(a) POx(b),PU1(b < a))
/* JMP */ OPC(0x0c, POx(a),JMP(a)) /* JMP */ OPC(0x0c, POx(a),JMP(a))
/* JCN */ OPC(0x0d, POx(a) PO1(b), if(b) JMP(a)) /* JCN */ OPC(0x0d, POx(a) PO1(b), if(b) { JMP(a) })
/* JSR */ OPC(0x0e, POx(a),RP1(pc >> 8) RP1(pc) JMP(a)) /* JSR */ OPC(0x0e, POx(a),RP1(pc >> 8) RP1(pc) JMP(a))
/* STH */ OPC(0x0f, GET(x),RP1(x[0]) if(_2) RP1(x[1])) /* STH */ OPC(0x0f, GET(x),RP1(x[0]) if(_2) { RP1(x[1]) })
/* LDZ */ OPC(0x10, PO1(a),PEK(a, x, 0xff)) /* LDZ */ OPC(0x10, PO1(a),PEK(a, x, 0xff))
/* STZ */ OPC(0x11, PO1(a) GET(y),POK(a, y, 0xff)) /* STZ */ OPC(0x11, PO1(a) GET(y),POK(a, y, 0xff))
/* LDR */ OPC(0x12, PO1(a),PEK(pc + (Sint8)a, x, 0xffff)) /* LDR */ OPC(0x12, PO1(a),PEK(pc + (Sint8)a, x, 0xffff))

2
src/uxn11.c
View File

@ -266,7 +266,7 @@ main(int argc, char **argv)
int i = 1; int i = 1;
char *rom; char *rom;
if(i != argc && argv[i][0] == '-' && argv[i][1] == 'v') { if(i != argc && argv[i][0] == '-' && argv[i][1] == 'v') {
fprintf(stdout, "Uxn11 - Varvara Emulator, 22 Aug 2024.\n"); fprintf(stdout, "Uxn11 - Varvara Emulator, 25 Aug 2024.\n");
exit(0); exit(0);
} }
rom = i == argc ? "boot.rom" : argv[i++]; rom = i == argc ? "boot.rom" : argv[i++];

2
src/uxncli.c
View File

@ -68,7 +68,7 @@ main(int argc, char **argv)
int i = 1; int i = 1;
char *rom; char *rom;
if(i != argc && argv[i][0] == '-' && argv[i][1] == 'v') { if(i != argc && argv[i][0] == '-' && argv[i][1] == 'v') {
fprintf(stdout, "Uxncli - Console Varvara Emulator, 22 Aug 2024.\n"); fprintf(stdout, "Uxncli - Console Varvara Emulator, 25 Aug 2024.\n");
exit(0); exit(0);
} }
rom = i == argc ? "boot.rom" : argv[i++]; rom = i == argc ? "boot.rom" : argv[i++];