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

Inline local vars, use interpolated strings, and use {0:P;M} format string

This commit is contained in:
YoshiRulz 2019-03-03 17:55:25 +10:00
parent 20087cd804
commit 2f3ac59c7a
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
BizHawk.Emulation.Cores/CPUs/Z80A/NewDisassembler.cs
View File

@ -12,29 +12,12 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
//d immediately succeeds the opcode //d immediately succeeds the opcode
//n immediate succeeds the opcode and the displacement (if present) //n immediate succeeds the opcode and the displacement (if present)
//nn immediately succeeds the opcode and the displacement (if present) //nn immediately succeeds the opcode and the displacement (if present)
if (format.IndexOf("nn") != -1)
{
byte B = read(addr++);
byte C = read(addr++);
format = format.Replace("nn", string.Format("{0:X4}h", B + C * 256));
}
if (format.IndexOf("n") != -1) if (format.IndexOf("nn") != -1) format = format.Replace("nn", $"{read(addr++) + (read(addr++) << 8):X4}h"); // LSB is read first
{ if (format.IndexOf("n") != -1) format = format.Replace("n", $"{read(addr++):X2}h");
byte B = read(addr++);
format = format.Replace("n", string.Format("{0:X2}h", B));
}
if (format.IndexOf("+d") != -1) format = format.Replace("+d", "d"); if (format.IndexOf("+d") != -1) format = format.Replace("+d", "d");
if (format.IndexOf("d") != -1) format = format.Replace("d", $"{(sbyte)read(addr++):+X2;-X2}h");
if (format.IndexOf("d") != -1)
{
byte B = read(addr++);
bool neg = ((B & 0x80) != 0);
char sign = neg ? '-' : '+';
int val = neg ? 256 - B : B;
format = format.Replace("d", string.Format("{0}{1:X2}h", sign, val));
}
return format; return format;
} }