empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add ability to step emulator.

Browse source 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
Andrea Odetti 2021-03-14 11:14:03 +00:00
parent 7152b82a45
commit 5230a6a558
3 changed files with 37 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/frontends/sdl/imgui/sdlimguiframe.cpp
View file

@ -149,7 +149,8 @@ namespace sa2
ImGui_ImplSDL2_NewFrame(myWindow.get());
ImGui::NewFrame();
mySettings.show();
// "this" is a bit circular
mySettings.show(this);
DrawAppleVideo();
ImGui::Render();

36
source/frontends/sdl/imgui/sdlsettings.cpp
View file

@ -1,6 +1,7 @@
#include "StdAfx.h"
#include "frontends/sdl/imgui/sdlsettings.h"
#include "frontends/sdl/imgui/settingshelper.h"
#include "frontends/sdl/sdlframe.h"
#include "Interface.h"
#include "CardManager.h"
@ -141,7 +142,7 @@ namespace sa2
ImGui::End();
}
void ImGuiSettings::show()
void ImGuiSettings::show(SDLFrame * frame)
{
if (myShowSettings)
{
@ -155,7 +156,7 @@ namespace sa2
if (myShowCPU)
{
showCPU();
showCPU(frame);
}
if (myShowDemo)
@ -217,7 +218,7 @@ namespace sa2
ImGui::End();
}
void ImGuiSettings::showCPU()
void ImGuiSettings::showCPU(SDLFrame * frame)
{
if (ImGui::Begin("CPU", &myShowCPU))
{
@ -225,12 +226,32 @@ namespace sa2
// complicated if condition to preserve widget order
const bool recalc = mySyncCPU || (ImGui::SameLine(), ImGui::Button("Sync PC"));
if (ImGui::Button("Step"))
{
g_nAppMode = MODE_STEPPING;
frame->Execute(myStepCycles);
}
ImGui::SameLine();
ImGui::PushItemWidth(150);
ImGui::DragInt("cycles", &myStepCycles, 0.2f, 0, 32, "%d");
ImGui::PopItemWidth();
if ((ImGui::SameLine(), ImGui::Button("Run")))
{
g_nAppMode = MODE_RUNNING;
}
if ((ImGui::SameLine(), ImGui::Button("Pause")))
{
g_nAppMode = MODE_PAUSED;
}
ImGui::SameLine(); ImGui::Text("%016llu - %04X", g_nCumulativeCycles, regs.pc);
if (ImGui::SliderInt("PC position", &g_nDisasmCurLine, 1, 100) || recalc)
{
g_nDisasmCurAddress = regs.pc;
DisasmCalcTopBotAddress();
}
if (ImGui::BeginChild("CPU"))
{
const ImGuiTableFlags flags = ImGuiTableFlags_RowBg | ImGuiTableFlags_SizingStretchProp | ImGuiTableFlags_BordersV | ImGuiTableFlags_BordersOuter;
@ -265,19 +286,18 @@ namespace sa2
DisasmLine_t line;
const char* pSymbol = FindSymbolFromAddress(nAddress);
const int bDisasmFormatFlags = GetDisassemblyLine(nAddress, line);
nAddress += line.nOpbyte;
char buffer[CONSOLE_WIDTH];
FormatDisassemblyLine(line, buffer, sizeof(buffer));
ImGui::TableNextRow();
if (nAddress == regs.pc)
{
const ImU32 currentBgColor = ImGui::GetColorU32(ImVec4(0, 0, 1, 1));
ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0, currentBgColor);
}
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::Selectable(buffer, false, ImGuiSelectableFlags_SpanAllColumns);
@ -304,6 +324,8 @@ namespace sa2
ImGui::TableNextColumn();
ImGui::TextUnformatted(line.sBranch);
nAddress += line.nOpbyte;
}
}
ImGui::EndTable();

9
source/frontends/sdl/imgui/sdlsettings.h
View file

@ -5,10 +5,12 @@
namespace sa2
{
class SDLFrame;
class ImGuiSettings
{
public:
void show();
void show(SDLFrame* frame);
float drawMenuBar();
bool windowed = false;
@ -18,8 +20,9 @@ namespace sa2
bool myShowSettings = false;
bool myShowMemory = false;
bool myShowCPU = false;
bool mySyncCPU = false;
bool mySyncCPU = true;
int myStepCycles = 0;
int mySpeakerVolume = 50;
int myMockingboardVolume = 50;
@ -27,8 +30,8 @@ namespace sa2
MemoryEditor myAuxMemoryEditor;
void showSettings();
void showCPU(SDLFrame* frame);
void showMemory();
void showCPU();
};
}