empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Debugger: Assembler - Fixed minor issue with opcode $FF

Browse source
This commit is contained in:
Sour 2020-02-13 00:05:12 -05:00
parent 61aaf6193e
commit effd016dc7
2 changed files with 1 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Core/Assembler.cpp
View file

@ -324,7 +324,7 @@ void Assembler::AssembleInstruction(LineData &lineData, uint16_t &instructionAdd
instructionAddress++; instructionAddress++;
foundMatch = true; foundMatch = true;
} else { } else {
for(uint8_t i = 0; i < 255; i++) { for(int i = 0; i < 256; i++) {
AddrMode opMode = DisassemblyInfo::OPMode[i]; AddrMode opMode = DisassemblyInfo::OPMode[i];
if(lineData.OpCode.compare(opName[i]) == 0) { if(lineData.OpCode.compare(opName[i]) == 0) {
bool modeMatch = opMode == lineData.Mode; bool modeMatch = opMode == lineData.Mode;

34
GUI.NET/Debugger/frmAssembler.cs
View file

@ -468,38 +468,4 @@ namespace Mesen.GUI.Debugger
} }
} }
} }
public class ZoomlessRichTextBox : RichTextBox
{
public int NumberOfVisibleLines
{
get
{
int topIndex = this.GetCharIndexFromPosition(new Point(1, 1));
int bottomIndex = this.GetCharIndexFromPosition(new Point(1, this.Height - 1));
int topLine = this.GetLineFromCharIndex(topIndex);
int bottomLine = this.GetLineFromCharIndex(bottomIndex);
return bottomLine - topLine + 1;
}
}
protected override void WndProc(ref Message m)
{
const int WM_SCROLLWHEEL = 0x20A;
bool ctrl = Control.ModifierKeys.HasFlag(Keys.Control);
bool wheel = m.Msg == WM_SCROLLWHEEL;
if(!ctrl || !wheel) {
//Block mouse wheel messages
base.WndProc(ref m);
}
}
protected override void OnKeyDown(KeyEventArgs e)
{
e.SuppressKeyPress = e.Control && e.Shift && (e.KeyValue == (int)Keys.Oemcomma || e.KeyValue == (int)Keys.OemPeriod);
base.OnKeyDown(e);
}
}
} }