pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor reformatting and cleanup

Browse source
This commit is contained in:
Dimitris Panokostas 2020-06-24 21:07:05 +02:00
parent 8e39bd83a7
commit 01d2b66603
1 changed files with 20 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/osdep/amiberry_mem.cpp
View file

@ -71,10 +71,6 @@ bool can_have_1gb()
void alloc_AmigaMem(void) void alloc_AmigaMem(void)
{ {
int i;
uae_u64 total;
int max_allowed_mman;
free_AmigaMem(); free_AmigaMem();
set_expamem_z3_hack_mode(Z3MAPPING_AUTO); set_expamem_z3_hack_mode(Z3MAPPING_AUTO);
@ -225,7 +221,7 @@ static bool HandleA3000Mem(unsigned int lowsize, unsigned int highsize)
static bool A3000MemAvailable(void) static bool A3000MemAvailable(void)
{ {
return (a3000_mem != MAP_FAILED); return a3000_mem != MAP_FAILED;
} }
bool uae_mman_info(addrbank* ab, struct uae_mman_data* md) bool uae_mman_info(addrbank* ab, struct uae_mman_data* md)
@ -504,7 +500,7 @@ bool mapped_malloc(addrbank* ab)
} }
ab->flags |= ABFLAG_DIRECTMAP; ab->flags |= ABFLAG_DIRECTMAP;
return (ab->baseaddr != nullptr); return ab->baseaddr != nullptr;
} }
void mapped_free(addrbank* ab) void mapped_free(addrbank* ab)
@ -522,27 +518,26 @@ void mapped_free(addrbank* ab)
void protect_roms(bool protect) void protect_roms(bool protect)
{ {
/* //If this code is enabled, we can't switch back from JIT to nonJIT emulation...
If this code is enabled, we can't switch back from JIT to nonJIT emulation...
if (protect) { //if (protect) {
// protect only if JIT enabled, always allow unprotect // // protect only if JIT enabled, always allow unprotect
if (!currprefs.cachesize) // if (!currprefs.cachesize || currprefs.comptrustbyte || currprefs.comptrustword || currprefs.comptrustlong)
return; // return;
} //}
// Protect all regions, which contains ROM // Protect all regions, which contains ROM
if(extendedkickmem_bank.baseaddr != NULL) //if (extendedkickmem_bank.baseaddr != NULL)
mprotect(extendedkickmem_bank.baseaddr, 0x80000, protect ? PROT_READ : PROT_READ | PROT_WRITE); //mprotect(extendedkickmem_bank.baseaddr, 0x80000, protect ? PROT_READ : PROT_READ | PROT_WRITE);
if(extendedkickmem2_bank.baseaddr != NULL) //if (extendedkickmem2_bank.baseaddr != NULL)
mprotect(extendedkickmem2_bank.baseaddr, 0x80000, protect ? PROT_READ : PROT_READ | PROT_WRITE); //mprotect(extendedkickmem2_bank.baseaddr, 0x80000, protect ? PROT_READ : PROT_READ | PROT_WRITE);
if(kickmem_bank.baseaddr != NULL) //if (kickmem_bank.baseaddr != NULL)
mprotect(kickmem_bank.baseaddr, 0x80000, protect ? PROT_READ : PROT_READ | PROT_WRITE); //mprotect(kickmem_bank.baseaddr, 0x80000, protect ? PROT_READ : PROT_READ | PROT_WRITE);
if(rtarea != NULL) //if (rtarea != NULL)
mprotect(rtarea, RTAREA_SIZE, protect ? PROT_READ : PROT_READ | PROT_WRITE); // mprotect(rtarea, RTAREA_SIZE, protect ? PROT_READ : PROT_READ | PROT_WRITE);
if(filesysory != NULL) //if (filesysory != NULL)
mprotect(filesysory, 0x10000, protect ? PROT_READ : PROT_READ | PROT_WRITE); // mprotect(filesysory, 0x10000, protect ? PROT_READ : PROT_READ | PROT_WRITE);
*/
} }
static int doinit_shm(void) static int doinit_shm(void)