ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

uae: refactor settings 

enable cycle exact for cpu below 68030
add mouse speed
This commit is contained in:
feos 2024-06-12 12:57:51 +03:00
parent b8e44e67e7
commit b98045108f
2 changed files with 91 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/BizHawk.Emulation.Cores/Computers/Amiga/PUAE.ISettable.cs
View File

@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
@ -111,6 +112,33 @@ namespace BizHawk.Emulation.Cores.Computers.Amiga
MB_1_5 = 6,
Auto
}
private void AppendSetting(List<string> settings)
{
foreach (var s in settings)
{
AppendSetting(s);
}
}
private void AppendSetting(string setting)
{
_args.AddRange(new List<string>
{
"-s", setting
});
}
private void EnableCycleExact()
{
AppendSetting(new List<string>
{
"cpu_compatible=true",
"cpu_cycle_exact=true",
"cpu_memory_cycle_exact=true",
"blitter_cycle_exact=true",
});
}
public object GetSettings() => null;
public PutSettingsDirtyBits PutSettings(object o) => PutSettingsDirtyBits.None;
@ -165,12 +193,19 @@ namespace BizHawk.Emulation.Cores.Computers.Amiga
public SlowMemory SlowMemory { get; set; }
[DisplayName("Fast memory")]
[Description("Size in megabytes of fast-memory. -1 means Auto.")]
[Description("Size in megabytes of fast-memory. -1 means Auto.")]
[Range(FASTMEM_AUTO, 512)]
[DefaultValue(FASTMEM_AUTO)]
[TypeConverter(typeof(ConstrainedIntConverter))]
public int FastMemory { get; set; }
[DisplayName("Mouse speed")]
[Description("Mouse speed in percents (1% - 1000%). Adjust if there's mismatch between emulated and host mouse movement. Note that maximum mouse movement is still 127 pixels due to Amiga hardware limitations.")]
[Range(1, 1000)]
[DefaultValue(100)]
[TypeConverter(typeof(ConstrainedIntConverter))]
public int MouseSpeed { get; set; }
public PUAESyncSettings()
=> SettingsUtil.SetDefaultValues(this);

105
src/BizHawk.Emulation.Cores/Computers/Amiga/PUAE.cs
View File

@ -17,6 +17,7 @@ namespace BizHawk.Emulation.Cores.Computers.Amiga
public partial class PUAE : WaterboxCore
{
private LibPUAE _puae;
private List<string> _args;
private static string _chipsetCompatible = "";
[CoreConstructor(VSystemID.Raw.Amiga)]
@ -48,7 +49,8 @@ namespace BizHawk.Emulation.Cores.Computers.Amiga
});
var filesToRemove = new List<string>();
var args = CreateArguments(_syncSettings);
CreateArguments(_syncSettings);
_exe.AddReadonlyFile(lp.Roms[0].FileData, "romfile");
filesToRemove.Add("romfile");
@ -58,14 +60,14 @@ namespace BizHawk.Emulation.Cores.Computers.Amiga
"Firmware files are usually required and may stop your game from loading");
_exe.AddReadonlyFile(kickstartData, kickstartInfo.Name);
filesToRemove.Add(kickstartInfo.Name);
args.AddRange(new List<string>
_args.AddRange(new List<string>
{
"-r", kickstartInfo.Name
});
ControllerDefinition = InitInput();
if (!_puae.Init(args.Count, args.ToArray()))
if (!_puae.Init(_args.Count, _args.ToArray()))
throw new InvalidOperationException("Core rejected the rom!");
foreach (var s in filesToRemove)
@ -76,105 +78,108 @@ namespace BizHawk.Emulation.Cores.Computers.Amiga
PostInit();
}
private static List<string> CreateArguments(PUAESyncSettings settings)
private void CreateArguments(PUAESyncSettings settings)
{
var args = new List<string>
_args = new List<string>
{
"puae"
, "-0", "romfile"
, "-s", "cpu_compatible=true"
, "-s", "cpu_cycle_exact=true"
, "-s", "cpu_memory_cycle_exact=true"
, "-s", "blitter_cycle_exact=true"
"puae",
"-0", "romfile",
};
switch(settings.MachineConfig)
{
case MachineConfig.A500_OCS_130_512K_512K:
_chipsetCompatible = Enum.GetName(typeof(ChipsetCompatible), ChipsetCompatible.A500);
args.AddRange(new List<string>
AppendSetting(new List<string>
{
"-s", "cpu_model=" + (int)CpuModel._68000
, "-s", "chipset=" + Chipset.OCS
, "-s", "chipset_compatible=" + _chipsetCompatible
, "-s", "chipmem_size=" + (int)ChipMemory.KB_512
, "-s", "bogomem_size=" + (int)SlowMemory.KB_512
, "-s", "fastmem_size=0"
"cpu_model=" + (int)CpuModel._68000,
"chipset=" + Chipset.OCS,
"chipset_compatible=" + _chipsetCompatible,
"chipmem_size=" + (int)ChipMemory.KB_512,
"bogomem_size=" + (int)SlowMemory.KB_512,
"fastmem_size=0",
});
EnableCycleExact();
break;
case MachineConfig.A600_ECS_205_2M:
_chipsetCompatible = Enum.GetName(typeof(ChipsetCompatible), ChipsetCompatible.A600);
args.AddRange(new List<string>
AppendSetting(new List<string>
{
"-s", "cpu_model=" + (int)CpuModel._68000
, "-s", "chipset=" + Chipset.ECS
, "-s", "chipset_compatible=" + _chipsetCompatible
, "-s", "chipmem_size=" + (int)ChipMemory.MB_2
, "-s", "bogomem_size=" + (int)SlowMemory.KB_0
, "-s", "fastmem_size=0"
"cpu_model=" + (int)CpuModel._68000,
"chipset=" + Chipset.ECS,
"chipset_compatible=" + _chipsetCompatible,
"chipmem_size=" + (int)ChipMemory.MB_2,
"bogomem_size=" + (int)SlowMemory.KB_0,
"fastmem_size=0",
});
EnableCycleExact();
break;
case MachineConfig.A1200_AGA_310_2M_8M:
_chipsetCompatible = Enum.GetName(typeof(ChipsetCompatible), ChipsetCompatible.A1200);
args.AddRange(new List<string>
AppendSetting(new List<string>
{
"-s", "cpu_model=" + (int)CpuModel._68020
, "-s", "chipset=" + Chipset.AGA
, "-s", "chipset_compatible=" + _chipsetCompatible
, "-s", "chipmem_size=" + (int)ChipMemory.MB_2
, "-s", "bogomem_size=" + (int)SlowMemory.KB_0
, "-s", "fastmem_size=8"
"cpu_model=" + (int)CpuModel._68020,
"chipset=" + Chipset.AGA,
"chipset_compatible=" + _chipsetCompatible,
"chipmem_size=" + (int)ChipMemory.MB_2,
"bogomem_size=" + (int)SlowMemory.KB_0,
"fastmem_size=8",
});
EnableCycleExact();
break;
case MachineConfig.A4000_AGA_310_2M_8M:
_chipsetCompatible = Enum.GetName(typeof(ChipsetCompatible), ChipsetCompatible.A4000);
args.AddRange(new List<string>
AppendSetting(new List<string>
{
"-s", "cpu_model=" + (int)CpuModel._68040
, "-s", "fpu_model=68040"
, "-s", "mmu_model=68040"
, "-s", "chipset=" + Chipset.AGA
, "-s", "chipset_compatible=" + _chipsetCompatible
, "-s", "chipmem_size=" + (int)ChipMemory.MB_2
, "-s", "bogomem_size=" + (int)SlowMemory.KB_0
, "-s", "fastmem_size=8"
"cpu_model=" + (int)CpuModel._68040,
"fpu_model=68040",
"mmu_model=68040",
"chipset=" + Chipset.AGA,
"chipset_compatible=" + _chipsetCompatible,
"chipmem_size=" + (int)ChipMemory.MB_2,
"bogomem_size=" + (int)SlowMemory.KB_0,
"fastmem_size=8",
});
break;
}
if (settings.CpuModel != CpuModel.Auto)
{
args.AddRange(new List<string> { "-s", "cpu_model=" + (int)settings.CpuModel });
AppendSetting("cpu_model=" + (int)settings.CpuModel);
if (settings.CpuModel < CpuModel._68030)
{
EnableCycleExact();
}
}
if (settings.Chipset != Chipset.Auto)
{
args.AddRange(new List<string> { "-s", "chipset=" + (int)settings.Chipset });
AppendSetting("chipset=" + (int)settings.Chipset);
}
if (settings.ChipsetCompatible != ChipsetCompatible.Auto)
{
args.AddRange(new List<string> { "-s", "chipset_compatible="
+ Enum.GetName(typeof(ChipsetCompatible), settings.ChipsetCompatible) });
AppendSetting("chipset_compatible="
+ Enum.GetName(typeof(ChipsetCompatible), settings.ChipsetCompatible));
}
if (settings.ChipMemory != ChipMemory.Auto)
{
args.AddRange(new List<string> { "-s", "chipmem_size=" + (int)settings.ChipMemory });
AppendSetting("chipmem_size=" + (int)settings.ChipMemory);
}
if (settings.SlowMemory != SlowMemory.Auto)
{
args.AddRange(new List<string> { "-s", "bogomem_size=" + (int)settings.SlowMemory });
AppendSetting("bogomem_size=" + (int)settings.SlowMemory);
}
if (settings.FastMemory != FASTMEM_AUTO)
{
args.AddRange(new List<string> { "-s", "fastmem_size=" + settings.FastMemory });
AppendSetting("fastmem_size=" + settings.FastMemory);
}
return args;
AppendSetting("input.mouse_speed=" + settings.MouseSpeed);
}
private static ControllerDefinition InitInput()