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

Merge pull request #644 from alyosha-tas/master 

Minor Update
This commit is contained in:
alyosha-tas 2016-06-16 11:35:30 -04:00 committed by GitHub
parent 24bbaa19bd 55feae8bf6
commit cd95bb3e62
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
BizHawk.Emulation.Cores/CPUs/MOS 6502X/Execute.cs
View File

@ -197,7 +197,7 @@ namespace BizHawk.Emulation.Cores.Components.M6502
/*TYA [implied]*/ new Uop[] { Uop.Imp_TYA, Uop.End }, /*TYA [implied]*/ new Uop[] { Uop.Imp_TYA, Uop.End },
/*STA addr,Y [absolute indexed WRITE]*/ new Uop[] { Uop.Fetch2, Uop.AbsIdx_Stage3_Y, Uop.AbsIdx_Stage4, Uop.AbsIdx_WRITE_Stage5_STA, Uop.End }, /*STA addr,Y [absolute indexed WRITE]*/ new Uop[] { Uop.Fetch2, Uop.AbsIdx_Stage3_Y, Uop.AbsIdx_Stage4, Uop.AbsIdx_WRITE_Stage5_STA, Uop.End },
/*TXS [implied]*/ new Uop[] { Uop.Imp_TXS, Uop.End }, /*TXS [implied]*/ new Uop[] { Uop.Imp_TXS, Uop.End },
/*SHS* addr,Y [absolute indexed WRITE X] [unofficial] [NOT IMPLEMENTED - TRICKY, AND NO TEST]*/ new Uop[] { Uop.Fetch2, Uop.AbsIdx_Stage3_Y, Uop.AbsIdx_Stage4, Uop.AbsIdx_WRITE_Stage5_ERROR, Uop.End }, /*SHS* addr,Y [absolute indexed WRITE Y] [unofficial] */ new Uop[] { Uop.Fetch2, Uop.AbsIdx_Stage3_Y, Uop.AbsIdx_Stage4, Uop.AbsIdx_WRITE_Stage5_ERROR, Uop.End },
/*SHY** [absolute indexed WRITE] [unofficial]*/ new Uop[] { Uop.Fetch2, Uop.AbsIdx_Stage3_X, Uop.AbsIdx_Stage4, Uop.AbsIdx_WRITE_Stage5_SHY, Uop.End }, /*SHY** [absolute indexed WRITE] [unofficial]*/ new Uop[] { Uop.Fetch2, Uop.AbsIdx_Stage3_X, Uop.AbsIdx_Stage4, Uop.AbsIdx_WRITE_Stage5_SHY, Uop.End },
/*STA addr,X [absolute indexed WRITE]*/ new Uop[] { Uop.Fetch2, Uop.AbsIdx_Stage3_X, Uop.AbsIdx_Stage4, Uop.AbsIdx_WRITE_Stage5_STA, Uop.End }, /*STA addr,X [absolute indexed WRITE]*/ new Uop[] { Uop.Fetch2, Uop.AbsIdx_Stage3_X, Uop.AbsIdx_Stage4, Uop.AbsIdx_WRITE_Stage5_STA, Uop.End },
/*SHX* addr,Y [absolute indexed WRITE Y] [unofficial]*/ new Uop[] { Uop.Fetch2, Uop.AbsIdx_Stage3_Y, Uop.AbsIdx_Stage4, Uop.AbsIdx_WRITE_Stage5_SHX, Uop.End }, /*SHX* addr,Y [absolute indexed WRITE Y] [unofficial]*/ new Uop[] { Uop.Fetch2, Uop.AbsIdx_Stage3_Y, Uop.AbsIdx_Stage4, Uop.AbsIdx_WRITE_Stage5_SHX, Uop.End },
@ -2298,14 +2298,8 @@ namespace BizHawk.Emulation.Cores.Components.M6502
} }
void AbsIdx_WRITE_Stage5_ERROR() void AbsIdx_WRITE_Stage5_ERROR()
{ {
//rdy_freeze = !RDY;
//if (RDY)
//{
//alu_temp = ReadMemory((ushort)ea);
//throw new InvalidOperationException("UNSUPPORTED OPCODE [probably SHS] PLEASE REPORT");
//}
S = (byte)(X & A); S = (byte)(X & A);
WriteMemory((ushort)ea, (byte)(S & opcode3)); WriteMemory((ushort)ea, (byte)(S & (opcode3+1)));
} }
void AbsIdx_RMW_Stage5() void AbsIdx_RMW_Stage5()
@ -2526,7 +2520,6 @@ namespace BizHawk.Emulation.Cores.Components.M6502
if (RDY) if (RDY)
{ {
alu_temp = ReadMemory((ushort)ea); alu_temp = ReadMemory((ushort)ea);
// Alyosha: wish me luck!
S &= (byte)alu_temp; S &= (byte)alu_temp;
X = S; X = S;
A = S; A = S;
@ -2965,7 +2958,7 @@ namespace BizHawk.Emulation.Cores.Components.M6502
public void ExecuteOne() public void ExecuteOne()
{ {
// total cycles now incraments every time a cycle is called to accurately count during RDY
TotalExecutedCycles++; TotalExecutedCycles++;
if (!rdy_freeze) if (!rdy_freeze)
{ {

17
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/APU.cs
View File

@ -730,7 +730,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
timer = timer_reload; timer = timer_reload;
Clock(); Clock();
} }
}
//Any time the sample buffer is in an empty state and bytes remaining is not zero, the following occur:
if (!sample_buffer_filled && sample_length > 0)
Fetch();
}
void Clock() void Clock()
@ -779,10 +783,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
} }
else out_bits_remaining--; else out_bits_remaining--;
//Any time the sample buffer is in an empty state and bytes remaining is not zero, the following occur:
if (!sample_buffer_filled && sample_length > 0)
Fetch();
} }
public void set_lenctr_en(bool en) public void set_lenctr_en(bool en)
@ -801,11 +802,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
{ {
sample_address = user_address; sample_address = user_address;
sample_length = user_length; sample_length = user_length;
if (out_silence)
{
timer = 0;
out_bits_remaining = 0;
}
} }
} }