add SRAM memdomain to vbanext
This commit is contained in:
parent
fcbf4adbec
commit
5ed2e46982
|
@ -326,7 +326,7 @@ namespace BizHawk.Client.EmuHawk
|
||||||
// back on regular object serialization when needed. so try to undo a TypeConverter
|
// back on regular object serialization when needed. so try to undo a TypeConverter
|
||||||
// operation here
|
// operation here
|
||||||
var converter = TypeDescriptor.GetConverter(prop.PropertyType);
|
var converter = TypeDescriptor.GetConverter(prop.PropertyType);
|
||||||
val = converter.ConvertFromString((string)val);
|
val = converter.ConvertFromString(null,System.Globalization.CultureInfo.InvariantCulture,((string)val));
|
||||||
}
|
}
|
||||||
else if (!(val is bool) && prop.PropertyType.IsPrimitive)
|
else if (!(val is bool) && prop.PropertyType.IsPrimitive)
|
||||||
{
|
{
|
||||||
|
|
|
@ -174,6 +174,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
|
||||||
public IntPtr oam;
|
public IntPtr oam;
|
||||||
public IntPtr rom;
|
public IntPtr rom;
|
||||||
public IntPtr mmio;
|
public IntPtr mmio;
|
||||||
|
public IntPtr sram;
|
||||||
}
|
}
|
||||||
|
|
||||||
// this isn't used directly at the moment. but it could be used for something eventually...
|
// this isn't used directly at the moment. but it could be used for something eventually...
|
||||||
|
|
|
@ -23,6 +23,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
|
||||||
mm.Add(MemoryDomain.FromIntPtr("VRAM", 96 * 1024, l, s.vram, true, 4));
|
mm.Add(MemoryDomain.FromIntPtr("VRAM", 96 * 1024, l, s.vram, true, 4));
|
||||||
mm.Add(MemoryDomain.FromIntPtr("OAM", 1024, l, s.oam, true, 4));
|
mm.Add(MemoryDomain.FromIntPtr("OAM", 1024, l, s.oam, true, 4));
|
||||||
mm.Add(MemoryDomain.FromIntPtr("ROM", 32 * 1024 * 1024, l, s.rom, true, 4));
|
mm.Add(MemoryDomain.FromIntPtr("ROM", 32 * 1024 * 1024, l, s.rom, true, 4));
|
||||||
|
mm.Add(MemoryDomain.FromIntPtr("SRAM", 128 * 1024, l, s.sram, true, 4));
|
||||||
|
|
||||||
mm.Add(new MemoryDomainDelegate("System Bus", 0x10000000, l,
|
mm.Add(new MemoryDomainDelegate("System Bus", 0x10000000, l,
|
||||||
delegate(long addr)
|
delegate(long addr)
|
||||||
|
|
Binary file not shown.
|
@ -13443,6 +13443,7 @@ template<bool isReader>bool SyncBatteryRam(NewState *ns)
|
||||||
mem.rom = rom;
|
mem.rom = rom;
|
||||||
mem.vram = vram;
|
mem.vram = vram;
|
||||||
mem.oam = oam;
|
mem.oam = oam;
|
||||||
|
mem.sram = flashSaveMemory;
|
||||||
}
|
}
|
||||||
|
|
||||||
void BusWrite(u32 addr, u8 val)
|
void BusWrite(u32 addr, u8 val)
|
||||||
|
|
|
@ -28,6 +28,7 @@ struct MemoryAreas
|
||||||
void *palram;
|
void *palram;
|
||||||
void *vram;
|
void *vram;
|
||||||
void *oam;
|
void *oam;
|
||||||
|
void *sram;
|
||||||
void *rom;
|
void *rom;
|
||||||
void *mmio;
|
void *mmio;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue