1.1 diff -r 5005879cb6fc -r dc28926b353c src/memory.c 1.2 --- a/src/memory.c Tue Dec 28 18:19:48 2010 +0000 1.3 +++ b/src/memory.c Tue Dec 28 18:36:39 2010 +0000 1.4 @@ -489,7 +489,8 @@ 1.5 case 0xD40000: // Expansion slot 5 1.6 case 0xD80000: // Expansion slot 6 1.7 case 0xDC0000: // Expansion slot 7 1.8 - fprintf(stderr, "NOTE: RD32 from expansion card space, addr=0x%08X\n", address); 1.9 + fprintf(stderr, "NOTE: RD%d from expansion card space, addr=0x%08X\n", bits, address); 1.10 + handled = true; 1.11 break; 1.12 } 1.13 break; 1.14 @@ -713,7 +714,7 @@ 1.15 if (newAddr <= 0x1fffff) { 1.16 WR32(state.base_ram, newAddr, state.base_ram_size - 1, value); 1.17 } else { 1.18 -// WR32(state.exp_ram, newAddr - 0x200000, state.exp_ram_size - 1, value); 1.19 + WR32(state.exp_ram, newAddr - 0x200000, state.exp_ram_size - 1, value); 1.20 } 1.21 } else if ((address >= 0x400000) && (address <= 0x7FFFFF)) { 1.22 // I/O register space, zone A 1.23 @@ -754,7 +755,7 @@ 1.24 if (newAddr <= 0x1fffff) { 1.25 WR16(state.base_ram, newAddr, state.base_ram_size - 1, value); 1.26 } else { 1.27 -// WR16(state.exp_ram, newAddr - 0x200000, state.exp_ram_size - 1, value); 1.28 + WR16(state.exp_ram, newAddr - 0x200000, state.exp_ram_size - 1, value); 1.29 } 1.30 } else if ((address >= 0x400000) && (address <= 0x7FFFFF)) { 1.31 // I/O register space, zone A 1.32 @@ -795,7 +796,7 @@ 1.33 if (newAddr <= 0x1fffff) { 1.34 WR8(state.base_ram, newAddr, state.base_ram_size - 1, value); 1.35 } else { 1.36 -// WR8(state.exp_ram, newAddr - 0x200000, state.exp_ram_size - 1, value); 1.37 + WR8(state.exp_ram, newAddr - 0x200000, state.exp_ram_size - 1, value); 1.38 } 1.39 } else if ((address >= 0x400000) && (address <= 0x7FFFFF)) { 1.40 // I/O register space, zone A