mister-devel/Arcade-Blockade_MiSTer
1
0
Fork 0
mirror of https://github.com/MiSTer-devel/Arcade-Blockade_MiSTer.git synced 2026-05-24 03:01:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix sim video and cleanup

Browse Source
This commit is contained in:
jimmystones
2022-01-28 17:05:21 +00:00
parent 6669627212
commit 7ac9e72d7d
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
verilator/sim/sim_video.cpp
View File

@@ -412,18 +412,17 @@ void SimVideo::Clock(bool hblank, bool vblank, bool hsync, bool vsync, uint32_t
bool vb_falling = (!vblank && last_vblank);
bool vb_rising = (vblank && !last_vblank);
// Next line on end of hblank
if (hb_falling) {
// Increment line and reset pixel count
count_line++;
count_pixel = 0;
}
//else {
if (!vblank) {
// Next line on end of hblank
if (hb_falling) {
// Increment line and reset pixel count
count_line++;
count_pixel = 0;
}
if (de) {
count_pixel++;
}
//}
}
//frame_ready = 1;
// Reset on rising vsync

10
verilator/sim_main.cpp
View File

@@ -272,7 +272,7 @@ int verilate()
if (clk_sys.clk) { bus.AfterEval(); }
#ifdef CPU_DEBUG
if (!top->reset ) {
if (!top->reset) {
cpu_sync = top->emu__DOT__blockade__DOT__SYNC;
unsigned short pc = top->emu__DOT__blockade__DOT__cpu__DOT__core__DOT__r16_pc;
@@ -510,13 +510,13 @@ int main(int argc, char** argv, char** env)
ImGui::SliderInt("Rotate", &video.output_rotate, -1, 1); ImGui::SameLine();
ImGui::Checkbox("Flip V", &video.output_vflip);
ImGui::Text("main_time: %d frame_count: %d sim FPS: %f", main_time, video.count_frame, video.stats_fps);
ImGui::Text("pixel: %06d line: %03d", video.count_pixel, video.count_line);
ImGui::Text("xmax: %04d ymax: %04d", video.stats_xMax, video.stats_yMax);
#ifdef DEBUG_AUDIO
//float vol_l = ((signed short)(top->AUDIO_L) / 256.0f) / 256.0f;
//float vol_r = ((signed short)(top->AUDIO_R) / 256.0f) / 256.0f;
//ImGui::ProgressBar(vol_l + 0.5, ImVec2(200, 16), 0); ImGui::SameLine();
//ImGui::ProgressBar(vol_r + 0.5, ImVec2(200, 16), 0);
#endif
// Draw VGA output
ImGui::Image(video.texture_id, ImVec2(video.output_width * VGA_SCALE_X, video.output_height * VGA_SCALE_Y));
@@ -541,10 +541,6 @@ int main(int argc, char** argv, char** env)
//mem_edit.DrawContents(&top->emu__DOT__blockade__DOT__rom_msb__DOT__mem, 512, 0);
//ImGui::End();
// ImGui::Begin("ROM");
// memoryEditor_hs.DrawContents(&top->top__DOT__blockade__DOT__MEM_ROM__DOT__ram, 4096, 0);
// ImGui::End();
video.UpdateTexture();
// Pass inputs to sim