Emulation/Mesen2
1
0
Fork 0
mirror of https://github.com/SourMesen/Mesen2.git synced 2024-05-20 13:08:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: Emulation:2bb4faaf02fd53f302ae092d94e40b4437934fa0
Branches Tags
Emulation:master
Emulation:2.0.0-preview1
...
compare: Emulation:c00270970466cbe596bf89677b95251459403b13
Branches Tags
Emulation:master
Emulation:2.0.0-preview1

3 commits
2bb4faaf02 ... c002709704

Author SHA1 Message Date
Victor Zhavoronkov c002709704
Merge d19bcff30a into 5b69530ab0 2024-05-08 19:56:20 +04:00
Sour 5b69530ab0 Debugger: SMS - Fixed screen resizing unexpectedly when stepping when "draw partial frame" is enabled 2024-05-07 20:57:16 +09:00
Victor d19bcff30a UI: Move Trace Logger tooltip strings to resources 2024-05-04 11:35:25 +04:00
3 changed files with 44 additions and 20 deletions
Show stats Expand all files Collapse all files

2
Core/SMS/SmsVdp.cpp
View file

@ -909,7 +909,7 @@ void SmsVdp::DebugSendFrame()
memset(_currentOutputBuffer + offset, 0, pixelsToClear * sizeof(uint16_t));
}
uint32_t height = _console->GetModel() == SmsModel::Sms ? _state.VisibleScanlineCount : 144;
uint32_t height = _console->GetModel() == SmsModel::Sms ? 240 : 144;
RenderedFrame frame(_currentOutputBuffer, width, height, 1.0, _state.FrameCount);
_emu->GetVideoDecoder()->UpdateFrame(frame, false, false);
}

39
UI/Debugger/ViewModels/TraceLoggerViewModel.cs
View file

@ -616,30 +616,31 @@ namespace Mesen.Debugger.ViewModels
void addRow(string text) { panel.Children.Add(new TextBlock() { Text = text }); }
void addBoldRow(string text) { panel.Children.Add(new TextBlock() { Text = text, FontWeight = Avalonia.Media.FontWeight.Bold }); }
string getResourceString(string id) { return ResourceHelper.GetViewLabel(nameof(TraceLoggerWindow), "tipFormat" + id); }
addBoldRow("Notes");
addRow("You can customize the output by enabling the 'Use custom format' option and manually editing the format.");
addBoldRow(getResourceString("NotesLine"));
addRow(getResourceString("CustomFormatDescLine"));
addRow(" ");
addRow("Tags can have their display format configured by using a comma and specifying the format options. e.g:");
addRow(" [Scanline,3] - display scanline in decimal, pad to always be 3 characters wide");
addRow(" [Scanline,h] - display scanline in hexadecimal");
addRow(" [Scanline,3h] - display scanline in decimal, pad to always be 3 characters wide");
addRow(getResourceString("TagDisplayFormatDescLine"));
addRow(" [Scanline,3] - " + getResourceString("TagDisplayDecimalPaddedDesc"));
addRow(" [Scanline,h] - " + getResourceString("TagDisplayHexadecimalDesc"));
addRow(" [Scanline,3h] - " + getResourceString("TagDisplayHexadecimalPaddedDesc"));
addRow(" ");
addBoldRow("Common tags (all CPUs)");
addRow(" [ByteCode] - byte code for the instruction (1 to 3 bytes)");
addRow(" [Disassembly] - disassembly for the current instruction");
addRow(" [EffectiveAddress] - effective address used for indirect addressing modes");
addRow(" [MemoryValue] - value stored at the memory location referred to by the instruction");
addRow(" [PC] - program counter");
addRow(" [Cycle] - current horizontal cycle (H)");
addRow(" [HClock] - current horizontal cycle (H, in master clocks)");
addRow(" [Scanline] - current scanline (V)");
addRow(" [FrameCount] - current frame number");
addRow(" [CycleCount] - current CPU cycle (64-bit unsigned value)");
addRow(" [Align,X] - add spaces to ensure the line is X characters long");
addBoldRow(getResourceString("CommonTagsDescLine"));
addRow(" [ByteCode] - " + getResourceString("ByteCodeTagDesc"));
addRow(" [Disassembly] - " + getResourceString("DisassemblyTagDesc"));
addRow(" [EffectiveAddress] - " + getResourceString("EffectiveAddressTagDesc"));
addRow(" [MemoryValue] - " + getResourceString("MemoryValueTagDesc"));
addRow(" [PC] - " + getResourceString("PCTagDesc"));
addRow(" [Cycle] - " + getResourceString("CycleTagDesc"));
addRow(" [HClock] - " + getResourceString("HClockTagDesc"));
addRow(" [Scanline] - " + getResourceString("ScanlineTagDesc"));
addRow(" [FrameCount] - " + getResourceString("FrameCountTagDesc"));
addRow(" [CycleCount] - " + getResourceString("CycleCountTagDesc"));
addRow(" [Align,X] - " + getResourceString("AlignXTagDesc"));
addRow(" ");
addBoldRow("CPU-specific tags (" + ResourceHelper.GetEnumText(CpuType) + ")");
addBoldRow(getResourceString("CpuSpecificTagsDesc") + " (" + ResourceHelper.GetEnumText(CpuType) + ")");
string[] tokens = CpuType switch {
CpuType.Snes or CpuType.Sa1 => new string[] { "A", "X", "Y", "D", "DB", "P", "SP" },

23
UI/Localization/resources.en.xml
View file

@ -1121,6 +1121,29 @@
<Control ID="btnStart">Log to file...</Control>
<Control ID="btnStop">Stop logging</Control>
<Control ID="btnClear">Clear log</Control>
<Control ID="tipFormatNotesLine">Notes</Control>
<Control ID="tipFormatCustomFormatDescLine">You can customize the output by enabling the 'Use custom format' option and manually editing the format.</Control>
<Control ID="tipFormatTagDisplayFormatDescLine">Tags can have their display format configured by using a comma and specifying the format options. e.g:</Control>
<Control ID="tipFormatTagDisplayDecimalPaddedDesc">display scanline in decimal, pad to always be 3 characters wide</Control>
<Control ID="tipFormatTagDisplayHexadecimalDesc">display scanline in hexadecimal</Control>
<Control ID="tipFormatTagDisplayHexadecimalPaddedDesc">display scanline in hexadecimal, pad to always be 3 characters wide</Control>
<Control ID="tipFormatCommonTagsDescLine">Common tags (all CPUs)</Control>
<Control ID="tipFormatByteCodeTagDesc">byte code for the instruction (1 to 3 bytes)</Control>
<Control ID="tipFormatDisassemblyTagDesc">disassembly for the current instruction</Control>
<Control ID="tipFormatEffectiveAddressTagDesc">effective address used for indirect addressing modes</Control>
<Control ID="tipFormatMemoryValueTagDesc">value stored at the memory location referred to by the instruction</Control>
<Control ID="tipFormatPCTagDesc">program counter</Control>
<Control ID="tipFormatCycleTagDesc">current horizontal cycle (H)</Control>
<Control ID="tipFormatHClockTagDesc">current horizontal cycle (H, in master clocks)</Control>
<Control ID="tipFormatScanlineTagDesc">current scanline (V)</Control>
<Control ID="tipFormatFrameCountTagDesc">current frame number</Control>
<Control ID="tipFormatCycleCountTagDesc">current CPU cycle (64-bit unsigned value)</Control>
<Control ID="tipFormatAlignXTagDesc">add spaces to ensure the line is X characters long</Control>
<Control ID="tipFormatCpuSpecificTagsDesc">CPU-specific tags</Control>
</Form>
<Form ID="EventViewerWindow">