Merge branch 'master' of https://github.com/BlitterStudio/amiberry

BlitterStudio · Dec 19, 2024 · 656e2ce · 656e2ce
2 parents cc55f01 + 964add6
commit 656e2ce
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/cfgfile.cpp b/src/cfgfile.cpp
@@ -9019,8 +9019,10 @@ static int bip_a3000 (struct uae_prefs *p, int config, int compa, int romcheck)
 		p->mmu_model = 68030;
 	} else {
 #ifdef JIT
+		p->mmu_model = 0;
 		p->cachesize = MAX_JIT_CACHE;
 #else
+		p->mmu_model = 0;
 		p->cachesize = 0;
 #endif
 	}
@@ -9059,6 +9061,7 @@ static int bip_a4000 (struct uae_prefs *p, int config, int compa, int romcheck)
 	p->mbresmem_low.size = 8 * 1024 * 1024;
 	p->cpu_model = 68030;
 	p->fpu_model = 68882;
+	p->mmu_model = 0;
 	switch (config)
 	{
 		case 1:
@@ -9112,6 +9115,7 @@ static int bip_a4000t (struct uae_prefs *p, int config, int compa, int romcheck)
 	p->mbresmem_low.size = 8 * 1024 * 1024;
 	p->cpu_model = 68030;
 	p->fpu_model = 68882;
+	p->mmu_model = 0;
 	if (config > 0) {
 		p->cpu_model = 68040;
 		p->fpu_model = 68040;
@@ -9137,6 +9141,7 @@ static int bip_a4000t (struct uae_prefs *p, int config, int compa, int romcheck)
 
 static void bip_velvet(struct uae_prefs *p, int config, int compa, int romcheck)
 {
+	p->mmu_model = 0;
 	p->chipset_mask = 0;
 	p->bogomem.size = 0;
 	p->sound_filter = FILTER_SOUND_ON;
@@ -9157,6 +9162,7 @@ static int bip_a1000 (struct uae_prefs *p, int config, int compa, int romcheck)
 
 	roms[0] = 24;
 	roms[1] = -1;
+	p->mmu_model = 0;
 	p->chipset_mask = 0;
 	p->bogomem.size = 0;
 	p->sound_filter = FILTER_SOUND_ON;
@@ -9184,6 +9190,7 @@ static int bip_cdtvcr (struct uae_prefs *p, int config, int compa, int romcheck)
 {
 	int roms[4];
 
+	p->mmu_model = 0;
 	p->bogomem.size = 0;
 	p->chipmem.size = 0x100000;
 	p->chipset_mask = CSMASK_ECS_AGNUS | CSMASK_ECS_DENISE;
@@ -9220,6 +9227,7 @@ static int bip_cdtv (struct uae_prefs *p, int config, int compa, int romcheck)
 	if (config >= 2)
 		return bip_cdtvcr(p, config - 2, compa, romcheck);
 
+	p->mmu_model = 0;
 	p->bogomem.size = 0;
 	p->chipmem.size = 0x100000;
 	p->chipset_mask = CSMASK_ECS_AGNUS;
@@ -9262,6 +9270,7 @@ static int bip_cd32 (struct uae_prefs *p, int config, int compa, int romcheck)
 	p->floppyslots[0].dfxtype = DRV_NONE;
 	p->floppyslots[1].dfxtype = DRV_NONE;
 	p->cs_unmapped_space = 1;
+	p->mmu_model = 0;
 	set_68020_compa (p, compa, 1);
 	p->cs_compatible = CP_CD32;
 	built_in_chipset_prefs (p);
@@ -9321,6 +9330,7 @@ static int bip_a1200 (struct uae_prefs *p, int config, int compa, int romcheck)
 	roms_bliz[0] = -1;
 	roms_bliz[1] = -1;
 	p->cs_rtc = 0;
+	p->mmu_model = 0;
 	p->cs_compatible = CP_A1200;
 	built_in_chipset_prefs (p);
     switch (config)
@@ -9394,6 +9404,7 @@ static int bip_a600 (struct uae_prefs *p, int config, int compa, int romcheck)
 	p->cs_compatible = CP_A600;
 	p->bogomem.size = 0;
 	p->chipmem.size = 0x100000;
+	p->mmu_model = 0;
 	if (config > 0)
 		p->cs_rtc = 1;
 	switch (config)

diff --git a/src/fpp_native.cpp b/src/fpp_native.cpp
@@ -160,9 +160,11 @@ static void set_fpucw_x87(uae_u32 m68k_cw)
 
 static void native_set_fpucw(uae_u32 m68k_cw)
 {
+#ifndef __MACH__
 #if defined(CPU_i386) || defined(CPU_x86_64)
 	set_fpucw_x87(m68k_cw);
 #endif
+#endif
 }
 
 /* Functions for setting host/library modes and getting status */