claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied greatpsycho's latest changes (hopefully correctly).

Browse Source
This commit is contained in:
OBattler
2017-11-19 12:52:09 +01:00
parent 77ea2b2ab9
commit b97aacdc70
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mem.c
View File

@@ -1380,7 +1380,7 @@ void mem_init(void)
for (c = 0; c < (mem_size / 64); c++) for (c = 0; c < (mem_size / 64); c++)
{ {
isram[c] = 1; isram[c] = 1;
if (c >= 0xa && c <= 0xf) if ((c >= 0xa && c <= 0xf) || (cpu_16bitbus && c >= 0xfe && c <= 0xff))
isram[c] = 0; isram[c] = 0;
} }
@@ -1476,7 +1476,7 @@ void mem_resize()
for (c = 0; c < (mem_size / 64); c++) for (c = 0; c < (mem_size / 64); c++)
{ {
isram[c] = 1; isram[c] = 1;
if (c >= 0xa && c <= 0xf) if ((c >= 0xa && c <= 0xf) || (cpu_16bitbus && c >= 0xfe && c <= 0xff))
isram[c] = 0; isram[c] = 0;
} }

2
src/pc.c
View File

@@ -683,6 +683,7 @@ pc_reset_hard_init(void)
initalmain(0, NULL); initalmain(0, NULL);
/* Reset the general machine support modules. */ /* Reset the general machine support modules. */
cpu_set();
mem_resize(); mem_resize();
io_init(); io_init();
device_init(); device_init();
@@ -782,7 +783,6 @@ pc_reset_hard_init(void)
device_add(&bugger_device); device_add(&bugger_device);
/* Reset the CPU module. */ /* Reset the CPU module. */
cpu_set();
cpu_update_waitstates(); cpu_update_waitstates();
cpu_cache_int_enabled = cpu_cache_ext_enabled = 0; cpu_cache_int_enabled = cpu_cache_ext_enabled = 0;
resetx86(); resetx86();