Removed indirection in system_dei
This commit is contained in:
parent
07b60021af
commit
f785d15d65
|
@ -91,12 +91,12 @@ system_boot(Uint8 *ram, char *rom)
|
||||||
/* IO */
|
/* IO */
|
||||||
|
|
||||||
Uint8
|
Uint8
|
||||||
system_dei(Uxn *u, Uint8 addr)
|
system_dei(Uint8 addr)
|
||||||
{
|
{
|
||||||
switch(addr) {
|
switch(addr) {
|
||||||
case 0x4: return u->wst.ptr;
|
case 0x4: return uxn.wst.ptr;
|
||||||
case 0x5: return u->rst.ptr;
|
case 0x5: return uxn.rst.ptr;
|
||||||
default: return u->dev[addr];
|
default: return uxn.dev[addr];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ void system_inspect();
|
||||||
int system_error(char *msg, const char *err);
|
int system_error(char *msg, const char *err);
|
||||||
int system_boot(Uint8 *ram, char *rom);
|
int system_boot(Uint8 *ram, char *rom);
|
||||||
|
|
||||||
Uint8 system_dei(Uxn *u, Uint8 addr);
|
Uint8 system_dei(Uint8 addr);
|
||||||
void system_deo(Uxn *u, Uint8 *d, Uint8 port);
|
void system_deo(Uxn *u, Uint8 *d, Uint8 port);
|
||||||
|
|
||||||
extern char *boot_rom;
|
extern char *boot_rom;
|
|
@ -48,7 +48,7 @@ Uint8
|
||||||
emu_dei(Uint8 addr)
|
emu_dei(Uint8 addr)
|
||||||
{
|
{
|
||||||
switch(addr & 0xf0) {
|
switch(addr & 0xf0) {
|
||||||
case 0x00: return system_dei(&uxn, addr);
|
case 0x00: return system_dei(addr);
|
||||||
case 0x10: return console_dei(&uxn, addr);
|
case 0x10: return console_dei(&uxn, addr);
|
||||||
case 0x20: return screen_dei(addr);
|
case 0x20: return screen_dei(addr);
|
||||||
case 0xc0: return datetime_dei(addr);
|
case 0xc0: return datetime_dei(addr);
|
||||||
|
|
|
@ -24,7 +24,7 @@ Uint8
|
||||||
emu_dei(Uint8 addr)
|
emu_dei(Uint8 addr)
|
||||||
{
|
{
|
||||||
switch(addr & 0xf0) {
|
switch(addr & 0xf0) {
|
||||||
case 0x00: return system_dei(&uxn, addr);
|
case 0x00: return system_dei(addr);
|
||||||
case 0x10: return console_dei(&uxn, addr);
|
case 0x10: return console_dei(&uxn, addr);
|
||||||
case 0xc0: return datetime_dei(addr);
|
case 0xc0: return datetime_dei(addr);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue