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

revert r5763

This commit is contained in:
goyuken 2014-01-06 21:50:52 +00:00
parent d191575fd2
commit 4191537359
5 changed files with 54 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs
View File

@ -2,7 +2,7 @@
using System.Drawing;
using System.Drawing.Imaging;
using System.Windows.Forms;
using BizHawk.Emulation.Cores.Consoles.Nintendo.NES;
using BizHawk.Emulation.Cores.Nintendo.NES;
using BizHawk.Client.Common;
@ -13,8 +13,8 @@ namespace BizHawk.Client.EmuHawk
//TODO:
//Show Scroll Lines + UI Toggle
private INESPPUDebug _nes;
private int Scanline = 0;
private NES _nes;
private readonly NES.PPU.DebugCallback Callback = new NES.PPU.DebugCallback();
public bool AskSave() { return true; }
public bool UpdateBefore { get { return true; } }
@ -23,6 +23,7 @@ namespace BizHawk.Client.EmuHawk
{
InitializeComponent();
Closing += (o, e) => SaveConfigSettings();
Callback.Callback = () => Generate();
}
private void SaveConfigSettings()
@ -46,16 +47,16 @@ namespace BizHawk.Client.EmuHawk
int* dptr = (int*)bmpdata.Scan0.ToPointer();
int pitch = bmpdata.Stride / 4;
int pt_add = _nes.bg_pattern_hi ? 0x1000 : 0;
int pt_add = _nes.ppu.reg_2000.bg_pattern_hi ? 0x1000 : 0;
//buffer all the data from the ppu, because it will be read multiple times and that is slow
byte[] p = new byte[0x3000];
for (int x = 0; x < 0x3000; x++)
p[x] = _nes.PPUBUS(x);
p[x] = _nes.ppu.ppubus_peek(x);
byte[] palram = new byte[0x20];
for (int x = 0; x < 0x20; x++)
palram[x] = _nes.PALRAM(x);
palram[x] = _nes.ppu.PALRAM[x];
int ytable = 0, yline = 0;
for (int y = 0; y < 480; y++)
@ -108,11 +109,10 @@ namespace BizHawk.Client.EmuHawk
public void UpdateValues()
{
if (Global.Emulator is IHasNESPPUDebug)
if (Global.Emulator is NES)
{
_nes = (Global.Emulator as IHasNESPPUDebug).GetDebugger();
_nes.SetNTViewCallback(Scanline, () => Generate());
NES.PPU ppu = (Global.Emulator as NES).ppu;
ppu.NTViewCallback = Callback;
}
else
{
@ -122,9 +122,9 @@ namespace BizHawk.Client.EmuHawk
public void Restart()
{
if (Global.Emulator is IHasNESPPUDebug)
if (Global.Emulator is NES)
{
_nes = (Global.Emulator as IHasNESPPUDebug).GetDebugger();
_nes = Global.Emulator as NES;
Generate(true);
}
else
@ -138,7 +138,7 @@ namespace BizHawk.Client.EmuHawk
if (Global.Config.NESNameTableSaveWindowPosition && Global.Config.NESNameTableWndx >= 0 && Global.Config.NESNameTableWndy >= 0)
Location = new Point(Global.Config.NESNameTableWndx, Global.Config.NESNameTableWndy);
_nes = (Global.Emulator as IHasNESPPUDebug).GetDebugger();
_nes = Global.Emulator as NES;
RefreshRate.Value = Global.Config.NESNameTableRefreshRate;
Generate(true);
}
@ -169,15 +169,15 @@ namespace BizHawk.Client.EmuHawk
int temp;
if (int.TryParse(txtScanline.Text, out temp))
{
Scanline = temp;
_nes.SetNTViewCallback(Scanline, () => Generate());
Callback.Scanline = temp;
}
}
private void NESNameTableViewer_FormClosed(object sender, FormClosedEventArgs e)
{
if (_nes == null) return;
_nes.SetNTViewCallback(Scanline, null);
if (_nes.ppu.NTViewCallback == Callback)
_nes.ppu.NTViewCallback = null;
}
@ -225,7 +225,7 @@ namespace BizHawk.Client.EmuHawk
XYLabel.Text = TileX.ToString() + " : " + TileY.ToString();
int PPUAddress = 0x2000 + (NameTable * 0x400) + ((TileY % 30) * 32) + (TileX % 32);
PPUAddressLabel.Text = String.Format("{0:X4}", PPUAddress);
int TileID = _nes.PPUBUS(PPUAddress);
int TileID = _nes.ppu.ppubus_read(PPUAddress, true);
TileIDLabel.Text = String.Format("{0:X2}", TileID);
TableLabel.Text = NameTable.ToString();
@ -242,7 +242,7 @@ namespace BizHawk.Client.EmuHawk
int tx = px >> 3;
int ty = py >> 3;
int atbyte_ptr = ntaddr + 0x3C0 + ((ty >> 2) << 3) + (tx >> 2);
int at = _nes.PPUBUS(atbyte_ptr + 0x2000);
int at = _nes.ppu.ppubus_peek(atbyte_ptr + 0x2000);
if ((ty & 2) != 0) at >>= 4;
if ((tx & 2) != 0) at >>= 2;
at &= 0x03;

69
BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs
View File

@ -2,8 +2,9 @@
using System.Drawing;
using System.Windows.Forms;
using System.Globalization;
using BizHawk.Client.Common;
using BizHawk.Emulation.Cores.Consoles.Nintendo.NES;
using BizHawk.Emulation.Cores.Nintendo.NES;
namespace BizHawk.Client.EmuHawk
{
@ -16,12 +17,12 @@ namespace BizHawk.Client.EmuHawk
//Maybe 48 individual bitmaps for sprites is faster than the overhead of redrawing all that transparent space
private Bitmap ZoomBoxDefaultImage = new Bitmap(64, 64);
private INESPPUDebug _nes;
private NES _nes;
private readonly byte[] PPUBus = new byte[0x2000];
private readonly byte[] PPUBusprev = new byte[0x2000];
private readonly byte[] PALRAM = new byte[0x20];
private readonly byte[] PALRAMprev = new byte[0x20];
private int Scanline;
private readonly NES.PPU.DebugCallback Callback = new NES.PPU.DebugCallback();
private bool ForceChange;
public bool AskSave() { return true; }
@ -31,6 +32,7 @@ namespace BizHawk.Client.EmuHawk
{
InitializeComponent();
Closing += (o, e) => SaveConfigSettings();
Callback.Callback = () => Generate();
for (int x = 0; x < 0x2000; x++)
{
PPUBus[x] = 0;
@ -53,9 +55,9 @@ namespace BizHawk.Client.EmuHawk
public void Restart()
{
if (Global.Emulator is IHasNESPPUDebug)
if (Global.Emulator is NES)
{
_nes = (Global.Emulator as IHasNESPPUDebug).GetDebugger();
_nes = Global.Emulator as NES;
Generate(true);
}
else
@ -81,7 +83,7 @@ namespace BizHawk.Client.EmuHawk
for (int x = 0; x < 0x20; x++)
{
PALRAMprev[x] = PALRAM[x];
PALRAM[x] = _nes.PALRAM(x);
PALRAM[x] = _nes.ppu.PALRAM[x];
if (PALRAM[x] != PALRAMprev[x])
{
changed = true;
@ -91,7 +93,7 @@ namespace BizHawk.Client.EmuHawk
for (int x = 0; x < 0x2000; x++)
{
PPUBusprev[x] = PPUBus[x];
PPUBus[x] = _nes.PPUBUS(x);
PPUBus[x] = _nes.ppu.ppubus_peek(x);
if (PPUBus[x] != PPUBusprev[x])
{
changed = true;
@ -125,8 +127,8 @@ namespace BizHawk.Client.EmuHawk
{
PaletteView.BgPalettesPrev[x].Value = PaletteView.BgPalettes[x].Value;
PaletteView.SpritePalettesPrev[x].Value = PaletteView.SpritePalettes[x].Value;
PaletteView.BgPalettes[x].Value = _nes.LookupColor(_nes.PALRAM(PaletteView.BgPalettes[x].Address));
PaletteView.SpritePalettes[x].Value = _nes.LookupColor(_nes.PALRAM(PaletteView.SpritePalettes[x].Address));
PaletteView.BgPalettes[x].Value = _nes.LookupColor(_nes.ppu.PALRAM[PaletteView.BgPalettes[x].Address]);
PaletteView.SpritePalettes[x].Value = _nes.LookupColor(_nes.ppu.PALRAM[PaletteView.SpritePalettes[x].Address]);
}
if (PaletteView.HasChanged())
{
@ -156,7 +158,7 @@ namespace BizHawk.Client.EmuHawk
b1 = (byte)(((PPUBus[address + 8] >> (7 - x)) & 1));
value = (byte)(b0 + (b1 << 1));
cvalue = _nes.LookupColor(_nes.PALRAM(value + (pal << 2)));
cvalue = _nes.LookupColor(_nes.ppu.PALRAM[value + (pal << 2)]);
int adr = (x + (j << 3)) + (y + (i << 3)) * (bmpdata.Stride >> 2);
framebuf[adr + (z << 7)] = cvalue;
}
@ -171,8 +173,8 @@ namespace BizHawk.Client.EmuHawk
System.Drawing.Imaging.BitmapData bmpdata2 = SpriteView.sprites.LockBits(new Rectangle(new Point(0, 0), SpriteView.sprites.Size), System.Drawing.Imaging.ImageLockMode.WriteOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
int* framebuf2 = (int*)bmpdata2.Scan0.ToPointer();
int pt_add = _nes.obj_pattern_hi ? 0x1000 : 0;
bool is8x16 = _nes.obj_size_16;
int pt_add = _nes.ppu.reg_2000.obj_pattern_hi ? 0x1000 : 0;
bool is8x16 = _nes.ppu.reg_2000.obj_size_16;
//Sprite Viewer
@ -181,7 +183,7 @@ namespace BizHawk.Client.EmuHawk
for (int r = 0; r < 16; r++)
{
int BaseAddr = (r << 2) + (n << 6);
int TileNum = _nes.OAM(BaseAddr + 1);
int TileNum = _nes.ppu.OAM[BaseAddr + 1];
int PatAddr;
if (is8x16)
@ -196,7 +198,7 @@ namespace BizHawk.Client.EmuHawk
}
int Attributes = _nes.OAM(BaseAddr + 2);
int Attributes = _nes.ppu.OAM[BaseAddr + 2];
int Palette = Attributes & 0x03;
for (int x = 0; x < 8; x++)
@ -207,7 +209,7 @@ namespace BizHawk.Client.EmuHawk
b0 = (byte)(((PPUBus[address] >> (7 - x)) & 1));
b1 = (byte)(((PPUBus[address + 8] >> (7 - x)) & 1));
value = (byte)(b0 + (b1 << 1));
cvalue = _nes.LookupColor(_nes.PALRAM(16 + value + (Palette << 2)));
cvalue = _nes.LookupColor(_nes.ppu.PALRAM[16 + value + (Palette << 2)]);
int adr = (x + (r * 16)) + (y + (n * 24)) * (bmpdata2.Stride >> 2);
framebuf2[adr] = cvalue;
@ -221,7 +223,7 @@ namespace BizHawk.Client.EmuHawk
b0 = (byte)(((PPUBus[address] >> (7 - x)) & 1));
b1 = (byte)(((PPUBus[address + 8] >> (7 - x)) & 1));
value = (byte)(b0 + (b1 << 1));
cvalue = _nes.LookupColor(_nes.PALRAM(16 + value + (Palette << 2)));
cvalue = _nes.LookupColor(_nes.ppu.PALRAM[16 + value + (Palette << 2)]);
int adr = (x + (r << 4)) + ((y+8) + (n * 24)) * (bmpdata2.Stride >> 2);
framebuf2[adr] = cvalue;
@ -238,10 +240,9 @@ namespace BizHawk.Client.EmuHawk
public void UpdateValues()
{
if (Global.Emulator is IHasNESPPUDebug)
if (Global.Emulator is NES)
{
_nes = (Global.Emulator as IHasNESPPUDebug).GetDebugger();
_nes.SetPPUViewCallback(Scanline, () => Generate());
_nes.ppu.PPUViewCallback = Callback;
}
else
{
@ -252,7 +253,7 @@ namespace BizHawk.Client.EmuHawk
private void NESPPU_Load(object sender, EventArgs e)
{
LoadConfigSettings();
_nes = (Global.Emulator as IHasNESPPUDebug).GetDebugger();
_nes = Global.Emulator as NES;
ClearDetails();
RefreshRate.Value = Global.Config.NESPPURefreshRate;
Generate(true);
@ -296,13 +297,13 @@ namespace BizHawk.Client.EmuHawk
if (baseAddr == 0x3F00)
{
val = _nes.PALRAM(PaletteView.BgPalettes[column].Address);
val = _nes.ppu.PALRAM[PaletteView.BgPalettes[column].Address];
ValueLabel.Text = "ID: BG" + (column / 4).ToString();
g.FillRectangle(new SolidBrush(PaletteView.BgPalettes[column].Color), 0, 0, 64, 64);
}
else
{
val = _nes.PALRAM(PaletteView.SpritePalettes[column].Address);
val = _nes.ppu.PALRAM[PaletteView.SpritePalettes[column].Address];
ValueLabel.Text = "ID: SPR" + (column / 4).ToString();
g.FillRectangle(new SolidBrush(PaletteView.SpritePalettes[column].Color), 0, 0, 64, 64);
}
@ -390,12 +391,12 @@ namespace BizHawk.Client.EmuHawk
tile += (e.Y / 8) * 16;
string Usage = "Usage: ";
if ((_nes.Reg2000Value & 0x10) << 4 == ((address >> 4) & 0x100))
if ((_nes.ppu.reg_2000.Value & 0x10) << 4 == ((address >> 4) & 0x100))
Usage = "BG";
else if (((_nes.Reg2000Value & 0x08) << 5) == ((address >> 4) & 0x100))
else if (((_nes.ppu.reg_2000.Value & 0x08) << 5) == ((address >> 4) & 0x100))
Usage = "SPR";
if ((_nes.Reg2000Value & 0x20) > 0)
if ((_nes.ppu.reg_2000.Value & 0x20) > 0)
Usage += " (SPR16)";
AddressLabel.Text = "Address: " + String.Format("{0:X4}", address);
@ -533,15 +534,15 @@ namespace BizHawk.Client.EmuHawk
int temp;
if (int.TryParse(txtScanline.Text, out temp))
{
Scanline = temp;
_nes.SetPPUViewCallback(Scanline, () => Generate());
Callback.Scanline = temp;
}
}
private void NESPPU_FormClosed(object sender, FormClosedEventArgs e)
{
if (_nes == null) return;
_nes.SetPPUViewCallback(Scanline, null);
if (_nes.ppu.PPUViewCallback == Callback)
_nes.ppu.PPUViewCallback = null;
}
private void SpriteView_MouseEnter(object sender, EventArgs e)
@ -556,12 +557,12 @@ namespace BizHawk.Client.EmuHawk
private void SpriteView_MouseMove(object sender, MouseEventArgs e)
{
bool is8x16 = _nes.obj_size_16;
bool is8x16 = _nes.ppu.reg_2000.obj_size_16;
int SpriteNumber = ((e.Y / 24) * 16) + (e.X / 16);
int X = _nes.OAM((SpriteNumber * 4) + 3);
int Y = _nes.OAM(SpriteNumber * 4);
int Color = _nes.OAM((SpriteNumber * 4) + 2) & 0x03;
int Attributes = _nes.OAM((SpriteNumber * 4) + 2);
int X = _nes.ppu.OAM[(SpriteNumber * 4) + 3];
int Y = _nes.ppu.OAM[SpriteNumber * 4];
int Color = _nes.ppu.OAM[(SpriteNumber * 4) + 2] & 0x03;
int Attributes = _nes.ppu.OAM[(SpriteNumber * 4) + 2];
string flags = "Flags: ";
int h = GetBit(Attributes, 6);
@ -576,7 +577,7 @@ namespace BizHawk.Client.EmuHawk
else
flags += "Front";
int Tile = _nes.OAM(SpriteNumber * 1);
int Tile = _nes.ppu.OAM[SpriteNumber * 1];
AddressLabel.Text = "Number: " + String.Format("{0:X2}", SpriteNumber);
ValueLabel.Text = "X: " + String.Format("{0:X2}", X);

1
BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
View File

@ -386,7 +386,6 @@
<Compile Include="Consoles\Nintendo\NES\FDS\FDSAudio.cs" />
<Compile Include="Consoles\Nintendo\NES\FDS\RamAdapter.cs" />
<Compile Include="Consoles\Nintendo\NES\iNES.cs" />
<Compile Include="Consoles\Nintendo\NES\INESPPUDebug.cs" />
<Compile Include="Consoles\Nintendo\NES\NES.cs" />
<Compile Include="Consoles\Nintendo\NES\Palettes.cs" />
<Compile Include="Consoles\Nintendo\NES\PPU.cs" />

131
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/INESPPUDebug.cs
View File

@ -1,131 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using BizHawk.Common;
namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NES
{
public interface IHasNESPPUDebug
{
INESPPUDebug GetDebugger();
}
public interface INESPPUDebug
{
/// <summary>
/// looks up an internal NES pixel value to an rgb int (applying the core's current palette and assuming no deemph)
/// </summary>
int LookupColor(int pixel);
// reg 2000 stuff
Bit vram_incr32 { get; } //(0: increment by 1, going across; 1: increment by 32, going down)
Bit obj_pattern_hi { get; } //Sprite pattern table address for 8x8 sprites (0: $0000; 1: $1000)
Bit bg_pattern_hi { get; } //Background pattern table address (0: $0000; 1: $1000)
Bit obj_size_16 { get; } //Sprite size (0: 8x8 sprites; 1: 8x16 sprites)
Bit ppu_layer { get; } //PPU layer select (should always be 0 in the NES; some Nintendo arcade boards presumably had two PPUs)
Bit vblank_nmi_gen { get; } //Vertical blank NMI generation (0: off; 1: on)
byte Reg2000Value { get; }
byte OAM(int addr);
byte PALRAM(int addr);
byte PPUBUS(int addr);
void SetNTViewCallback(int scanline, Action target);
void SetPPUViewCallback(int scanline, Action target);
}
// implementation for NESHAWK
public class NESHawkPPUDebug : INESPPUDebug
{
private BizHawk.Emulation.Cores.Nintendo.NES.NES _nes;
private BizHawk.Emulation.Cores.Nintendo.NES.NES.PPU _ppu;
public NESHawkPPUDebug(BizHawk.Emulation.Cores.Nintendo.NES.NES nes)
{
_nes = nes;
_ppu = nes.ppu;
}
public int LookupColor(int pixel)
{
return _nes.LookupColor(pixel);
}
public Bit vram_incr32
{
get { return _ppu.reg_2000.vram_incr32; }
}
public Bit obj_pattern_hi
{
get { return _ppu.reg_2000.obj_pattern_hi; }
}
public Bit bg_pattern_hi
{
get { return _ppu.reg_2000.bg_pattern_hi; }
}
public Bit obj_size_16
{
get { return _ppu.reg_2000.obj_size_16; }
}
public Bit ppu_layer
{
get { return _ppu.reg_2000.ppu_layer; }
}
public Bit vblank_nmi_gen
{
get { return _ppu.reg_2000.vblank_nmi_gen; }
}
public byte Reg2000Value
{
get { return _ppu.reg_2000.Value; }
}
public byte OAM(int addr)
{
return _ppu.OAM[addr];
}
public byte PALRAM(int addr)
{
return _ppu.PALRAM[addr];
}
public byte PPUBUS(int addr)
{
return _ppu.ppubus_peek(addr);
}
public void SetNTViewCallback(int scanline, Action target)
{
if (target != null)
_ppu.NTViewCallback = new Cores.Nintendo.NES.NES.PPU.DebugCallback
{
Scanline = scanline,
Callback = target
};
else
_ppu.NTViewCallback = null;
}
public void SetPPUViewCallback(int scanline, Action target)
{
if (target != null)
_ppu.PPUViewCallback = new Cores.Nintendo.NES.NES.PPU.DebugCallback
{
Scanline = scanline,
Callback = target
};
else
_ppu.PPUViewCallback = null;
}
}
}

8
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs
View File

@ -6,18 +6,12 @@ using System.Collections.Generic;
using BizHawk.Common;
using BizHawk.Emulation.Common;
//TODO - redo all timekeeping in terms of master clock
using BizHawk.Emulation.Cores.Consoles.Nintendo.NES;
namespace BizHawk.Emulation.Cores.Nintendo.NES
{
public partial class NES : IEmulator, IHasNESPPUDebug
public partial class NES : IEmulator
{
public INESPPUDebug GetDebugger()
{
return new NESHawkPPUDebug(this);
}
static readonly bool USE_DATABASE = true;
public RomStatus RomStatus;