Washi1337
/
Emux
mirror of https://github.com/Washi1337/Emux.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disassembler read directly from field

This commit is contained in:
Washi 2017-08-13 23:12:39 +02:00
parent 40b78f62c5
commit 1d3c48c602
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Emux.GameBoy/Cpu/Z80Disassembler.cs
View File

@ -8,6 +8,7 @@ namespace Emux.GameBoy.Cpu
public class Z80Disassembler
{
private readonly GameBoyMemory _memory;
private ushort _position;
public Z80Disassembler(GameBoyMemory memory)
{
@ -19,8 +20,8 @@ namespace Emux.GameBoy.Cpu
/// </summary>
public ushort Position
{
get;
set;
get { return _position; }
set { _position = value; }
}
/// <summary>
@ -29,15 +30,15 @@ namespace Emux.GameBoy.Cpu
/// <returns>The disassembled instruction.</returns>
public Z80Instruction ReadNextInstruction()
{
ushort offset = Position;
byte code = _memory.ReadByte(Position++);
ushort offset = _position;
byte code = _memory.ReadByte(_position++);
var opcode = code != 0xCB
? Z80OpCodes.SingleByteOpCodes[code]
: Z80OpCodes.PrefixedOpCodes[_memory.ReadByte(Position++)];
: Z80OpCodes.PrefixedOpCodes[_memory.ReadByte(_position++)];
byte[] operand = _memory.ReadBytes(Position, opcode.OperandLength);
Position += (ushort) operand.Length;
byte[] operand = _memory.ReadBytes(_position, opcode.OperandLength);
_position += (ushort) operand.Length;
var instruction = new Z80Instruction(offset, opcode, operand);
return instruction;

2
Emux.GameBoy/Graphics/GameBoyGpu.cs
View File

@ -86,7 +86,7 @@ namespace Emux.GameBoy.Graphics
public byte ObjP1;
public byte WY;
public byte WX;
public GameBoyGpu(GameBoy device)
{
if (device == null)