80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Some mem.c fixes.

Browse Source
This commit is contained in:
OBattler
2020-07-19 05:54:09 +02:00
parent 96db0badca
commit 6ba0d715cc
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mem/mem.c
View File

@@ -2546,7 +2546,7 @@ mem_reset(void)
free(ram); free(ram);
ram = NULL; ram = NULL;
} }
#if (defined __amd64__ || defined _M_X64) #if (!(defined __amd64__ || defined _M_X64))
if (ram2 != NULL) { if (ram2 != NULL) {
free(ram2); free(ram2);
ram2 = NULL; ram2 = NULL;
@@ -2555,18 +2555,34 @@ mem_reset(void)
if (mem_size > 2097152) if (mem_size > 2097152)
fatal("Attempting to use more than 2 GB of guest RAM\n"); fatal("Attempting to use more than 2 GB of guest RAM\n");
#if (defined __amd64__ || defined _M_X64) #if (!(defined __amd64__ || defined _M_X64))
if (mem_size > 1048576) { if (mem_size > 1048576) {
ram = (uint8_t *)malloc(1 << 30); /* allocate and clear the RAM block of the first 1 GB */ ram = (uint8_t *)malloc(1 << 30); /* allocate and clear the RAM block of the first 1 GB */
if (ram == NULL) {
fatal("X86 > 1 GB: Failed to malloc() ram\n");
return;
}
memset(ram, 0x00, (1 << 30)); memset(ram, 0x00, (1 << 30));
ram2 = (uint8_t *)malloc(m - (1 << 30)); /* allocate and clear the RAM block above 1 GB */ ram2 = (uint8_t *)malloc(m - (1 << 30)); /* allocate and clear the RAM block above 1 GB */
if (ram2 == NULL) {
fatal("X86 > 1 GB: Failed to malloc() ram2\n");
return;
}
memset(ram2, 0x00, m - (1 << 30)); memset(ram2, 0x00, m - (1 << 30));
} else { } else {
ram = (uint8_t *)malloc(m); /* allocate and clear the RAM block */ ram = (uint8_t *)malloc(m); /* allocate and clear the RAM block */
if (ram == NULL) {
fatal("X86 <= 1 GB: Failed to malloc() ram\n");
return;
}
memset(ram, 0x00, m); memset(ram, 0x00, m);
} }
#else #else
ram = (uint8_t *)malloc(m); /* allocate and clear the RAM block */ ram = (uint8_t *)malloc(m); /* allocate and clear the RAM block */
if (ram == NULL) {
fatal("X64: Failed to malloc() ram\n");
return;
}
memset(ram, 0x00, m); memset(ram, 0x00, m);
if (mem_size > 1048576) if (mem_size > 1048576)
ram2 = &(ram[1 << 30]); ram2 = &(ram[1 << 30]);