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

Linux: Fixed compilation warnings

Browse source
This commit is contained in:
Sour 2018-12-25 00:32:33 -05:00
parent d8097a1c94
commit ae0822e7cd
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Core/CPU.cpp
View file

@ -128,7 +128,6 @@ void CPU::Exec()
void CPU::IRQ()
{
uint16_t originalPc = PC();
DummyRead(); //fetch opcode (and discard it - $00 (BRK) is forced into the opcode register instead)
DummyRead(); //read next instruction byte (actually the same as above, since PC increment is suppressed. Also discarded.)
Push((uint16_t)(PC()));
@ -137,6 +136,7 @@ void CPU::IRQ()
Push((uint8_t)(PS() | PSFlags::Reserved));
SetFlags(PSFlags::Interrupt);
uint16_t originalPc = PC();
SetPC(MemoryReadWord(CPU::NMIVector));
_state.NMIFlag = false;
@ -147,6 +147,8 @@ void CPU::IRQ()
} else {
Push((uint8_t)(PS() | PSFlags::Reserved));
SetFlags(PSFlags::Interrupt);
uint16_t originalPc = PC();
SetPC(MemoryReadWord(CPU::IRQVector));
#ifndef DUMMYCPU

2
Core/CPU.h
View file

@ -16,7 +16,9 @@ class DummyCpu;
class CPU : public Snapshotable
{
#ifndef DUMMYCPU
friend DummyCpu;
#endif
public:
static constexpr uint16_t NMIVector = 0xFFFA;

1
GUI.NET/Debugger/Controls/ctrlSourceViewer.cs
View file

@ -398,7 +398,6 @@ namespace Mesen.GUI.Debugger.Controls
public LineProperties GetLineStyle(int cpuAddress, int lineIndex)
{
DebugInfo info = ConfigManager.Config.DebugInfo;
LineProperties props = new LineProperties();
int nextLineIndex = lineIndex + 1;

1
GUI.NET/Debugger/frmDebugger.cs
View file

@ -501,7 +501,6 @@ namespace Mesen.GUI.Debugger
int breakpointId = (int)(param >> 40);
byte bpValue = (byte)((param >> 32) & 0xFF);
BreakpointType bpType = (BreakpointType)(byte)((param >> 8) & 0x0F);
InteropMemoryOperationType memOpType = (InteropMemoryOperationType)(byte)((param >> 12) & 0x0F);
UInt16 bpAddress = (UInt16)(param >> 16);
ReadOnlyCollection<Breakpoint> breakpoints = BreakpointManager.Breakpoints;