mister-devel/InputTest_MiSTer
1
0
Fork 0
mirror of https://github.com/MiSTer-devel/InputTest_MiSTer.git synced 2026-04-19 03:04:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Integrate Aznable codebase

Browse Source
This commit is contained in:
jimmystones
2021-12-22 17:11:57 +00:00
parent 2aab758881
commit 8a93d6fdb2
169 changed files with 17233 additions and 2032 deletions
Download Patch File Download Diff File Expand all files Collapse all files

348
verilator/sim_main.cpp
View File

@@ -10,7 +10,6 @@
#define WIN32
#include <dinput.h>
#endif
#include <chrono>
#include "sim_console.h"
#include "sim_bus.h"
@@ -21,22 +20,36 @@
#include "../imgui/imgui_memory_editor.h"
#include "../imgui/ImGuiFileDialog.h"
#include <iostream>
#include <fstream>
using namespace std;
// Simulation control
// ------------------
int initialReset = 48;
bool run_enable = 1;
int batchSize = 150000;
bool single_step = 0;
bool multi_step = 0;
int multi_step_amount = 1024;
// Debug GUI
// ---------
const char* windowTitle = "Verilator Sim: InputTest";
bool showDebugWindow = true;
const char* debugWindowTitle = "Virtual Dev Board v1.0";
const char* windowTitle = "Verilator Sim: Aznable";
const char* windowTitle_Control = "Simulation control";
const char* windowTitle_DebugLog = "Debug log";
const char* windowTitle_Video = "VGA output";
bool showDebugLog = true;
DebugConsole console;
MemoryEditor mem_edit_1;
MemoryEditor mem_edit_2;
MemoryEditor mem_edit_3;
MemoryEditor mem_edit;
// HPS emulator
// ------------
SimBus bus(console);
// Input handling
// --------------
SimInput input(12);
SimInput input(13, console);
const int input_right = 0;
const int input_left = 1;
const int input_down = 2;
@@ -49,53 +62,46 @@ const int input_l = 8;
const int input_r = 9;
const int input_select = 10;
const int input_start = 11;
const int input_menu = 12;
// Video
// -----
#define VGA_WIDTH 320
#define VGA_HEIGHT 240
#define VGA_ROTATE 0 // 90 degrees anti-clockwise
#define VGA_SCALE_X vga_scale
#define VGA_SCALE_Y vga_scale
SimVideo video(VGA_WIDTH, VGA_HEIGHT, VGA_ROTATE);
// Simulation control
// ------------------
int initialReset = 48;
bool run_enable = 1;
int batchSize = 150000;
bool single_step = 0;
bool multi_step = 0;
int multi_step_amount = 1024;
float vga_scale = 3.0;
// Verilog module
// --------------
Vemu* top = NULL;
vluint64_t main_time = 0; // Current simulation time.
vluint32_t timestamp = 0; // Simulated Unix timestamp.
vluint16_t timestamp_ticksperms = 24000; // Number of simulation ticks per simulated millisecond
vluint16_t timestamp_ticks = 0; // Ticks left until next ms
unsigned short timestamp_updatefreq = 5000; // Only update sim every 5 seconds
unsigned short timestamp_update = 0; // Ms to next update.
bool timestamp_clock = 1; // Timestamp update clock
double sc_time_stamp() { // Called by $time in Verilog.
vluint64_t main_time = 0; // Current simulation time.
double sc_time_stamp() { // Called by $time in Verilog.
return main_time;
}
SimClock clk_sys(1);
//#define DEBUG_AUDIO
#ifdef DEBUG_AUDIO
// Audio
SimClock clk_audio(2205);
ofstream audioFile;
#endif
long GetTime() {
return std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
}
// Reset simulation variables and clocks
void resetSim() {
main_time = 0;
timestamp = GetTime();
top->reset = 1;
clk_sys.Reset();
#ifdef DEBUG_AUDIO
clk_audio.Reset();
#endif
}
int verilate() {
@@ -110,24 +116,6 @@ int verilate() {
// Clock dividers
clk_sys.Tick();
// Increment timestamp
timestamp_ticks ++;
if (timestamp_ticks >= timestamp_ticksperms) {
timestamp_ticks -= timestamp_ticksperms;
timestamp++;
top->timestamp = timestamp;
timestamp_clock = !timestamp_clock;
if (timestamp_clock) {
timestamp_update--;
if (timestamp_update <= 0) {
top->timestamp |= ((uint64_t)1) << 32;
timestamp_update = timestamp_updatefreq;
}
}
}
// Set system clock in core
top->clk_sys = clk_sys.clk;
@@ -141,16 +129,31 @@ int verilate() {
if (clk_sys.clk) { bus.AfterEval(); }
}
#ifdef DEBUG_AUDIO
clk_audio.Tick();
if (clk_audio.IsRising()) {
// Output audio
unsigned short audio_l = top->AUDIO_L;
unsigned char audio_8 = audio_l;
if (audio_l > 0) {
audio_8 = audio_l >> 8;
//console.AddLog("%d %d",audio_l, audio_8);
}
//audioFile.write((const char*)&audio_8, 1);
audioFile.write((const char*)&audio_l, 2);
}
#endif
// Output pixels on rising edge of pixel clock
if (clk_sys.IsRising() && top->emu__DOT__ce_pix) {
if (clk_sys.IsRising() && top->emu__DOT__ce_6) {
uint32_t colour = 0xFF000000 | top->VGA_B << 16 | top->VGA_G << 8 | top->VGA_R;
video.Clock(top->VGA_HB, top->VGA_VB, top->VGA_HS, top->VGA_VS, colour);
}
main_time++;
return 1;
}
// Stop verilating and cleanup
top->final();
delete top;
@@ -159,7 +162,8 @@ int verilate() {
}
unsigned char mouse_clock = 0;
unsigned char mouse_buttons= 0;
unsigned char mouse_clock_reduce = 0;
unsigned char mouse_buttons = 0;
unsigned char mouse_x = 0;
unsigned char mouse_y = 0;
@@ -187,6 +191,11 @@ int main(int argc, char** argv, char** env) {
//bus.ioctl_din = &top->ioctl_din;
input.ps2_key = &top->ps2_key;
#ifdef DEBUG_AUDIO
// Setup Audio output stream
audioFile.open("audio.wav", ios::binary);
#endif
// Set up input module
input.Initialise();
#ifdef WIN32
@@ -202,27 +211,24 @@ int main(int argc, char** argv, char** env) {
input.SetMapping(input_r, DIK_W); // R
input.SetMapping(input_select, DIK_1); // Select
input.SetMapping(input_start, DIK_2); // Start
input.SetMapping(input_menu, DIK_M); // System menu trigger
#else
input.SetMapping(input_up, SDL_SCANCODE_UP);
input.SetMapping(input_right, SDL_SCANCODE_RIGHT);
input.SetMapping(input_down, SDL_SCANCODE_DOWN);
input.SetMapping(input_left, SDL_SCANCODE_LEFT);
input.SetMapping(input_a, SDL_SCANCODE_A);
input.SetMapping(input_b, SDL_SCANCODE_B);
input.SetMapping(input_x, SDL_SCANCODE_X);
input.SetMapping(input_y, SDL_SCANCODE_Y);
input.SetMapping(input_l, SDL_SCANCODE_L);
input.SetMapping(input_r, SDL_SCANCODE_R);
input.SetMapping(input_select, SDL_SCANCODE_1);
input.SetMapping(input_start, SDL_SCANCODE_2);
input.SetMapping(input_fire1, SDL_SCANCODE_SPACE);
input.SetMapping(input_start_1, SDL_SCANCODE_1);
input.SetMapping(input_start_2, SDL_SCANCODE_2);
input.SetMapping(input_coin_1, SDL_SCANCODE_3);
input.SetMapping(input_coin_2, SDL_SCANCODE_4);
input.SetMapping(input_coin_3, SDL_SCANCODE_5);
input.SetMapping(input_pause, SDL_SCANCODE_P);
#endif
// Setup video output
if (video.Initialise(windowTitle) == 1) { return 1; }
// Initial reset
resetSim();
#ifdef WIN32
MSG msg;
ZeroMemory(&msg, sizeof(msg));
@@ -255,81 +261,111 @@ int main(int argc, char** argv, char** env) {
// --------
ImGui::NewFrame();
console.Draw("Debug Log", &showDebugWindow);
ImGui::Begin(debugWindowTitle);
ImGui::SetWindowPos(debugWindowTitle, ImVec2(580, 10), ImGuiCond_Once);
ImGui::SetWindowSize(debugWindowTitle, ImVec2(1000, 1000), ImGuiCond_Once);
if (ImGui::Button("RESET")) { resetSim(); } ImGui::SameLine();
if (ImGui::Button("START")) { run_enable = 1; } ImGui::SameLine();
if (ImGui::Button("STOP")) { run_enable = 0; } ImGui::SameLine();
if (ImGui::Button("LOAD"))
ImGuiFileDialog::Instance()->OpenDialog("ChooseFileDlgKey", "Choose File", ".bin", ".");
// Simulation control window
ImGui::Begin(windowTitle_Control);
ImGui::SetWindowPos(windowTitle_Control, ImVec2(0, 0), ImGuiCond_Once);
ImGui::SetWindowSize(windowTitle_Control, ImVec2(500, 150), ImGuiCond_Once);
if (ImGui::Button("Reset simulation")) { resetSim(); } ImGui::SameLine();
if (ImGui::Button("Start running")) { run_enable = 1; } ImGui::SameLine();
if (ImGui::Button("Stop running")) { run_enable = 0; } ImGui::SameLine();
ImGui::Checkbox("RUN", &run_enable);
ImGui::SliderInt("Batch size", &batchSize, 1, 250000);
//ImGui::PopItemWidth();
ImGui::SliderInt("Run batch size", &batchSize, 1, 250000);
if (single_step == 1) { single_step = 0; }
if (ImGui::Button("Single Step")) { run_enable = 0; single_step = 1; }
ImGui::SameLine();
if (multi_step == 1) { multi_step = 0; }
if (ImGui::Button("Multi Step")) { run_enable = 0; multi_step = 1; }
ImGui::SameLine();
//ImGui::SameLine();
ImGui::SliderInt("Multi step amount", &multi_step_amount, 8, 1024);
ImGui::SliderInt("Step amount", &multi_step_amount, 8, 1024);
ImGui::End();
// Debug log window
console.Draw(windowTitle_DebugLog, &showDebugLog, ImVec2(500, 700));
ImGui::SetWindowPos(windowTitle_DebugLog, ImVec2(0, 160), ImGuiCond_Once);
// Memory debug
//ImGui::Begin("PGROM Editor");
//mem_edit.DrawContents(top->emu__DOT__system__DOT__pgrom__DOT__mem, 32768, 0);
//ImGui::End();
//ImGui::Begin("CHROM Editor");
//mem_edit.DrawContents(top->emu__DOT__system__DOT__chrom__DOT__mem, 2048, 0);
//ImGui::End();
//ImGui::Begin("WKRAM Editor");
//mem_edit.DrawContents(&top->emu__DOT__system__DOT__wkram__DOT__mem, 16384, 0);
//ImGui::End();
//ImGui::Begin("CHRAM Editor");
//mem_edit.DrawContents(&top->emu__DOT__system__DOT__chram__DOT__mem, 2048, 0);
//ImGui::End();
//ImGui::Begin("FGCOLRAM Editor");
//mem_edit.DrawContents(&top->emu__DOT__system__DOT__fgcolram__DOT__mem, 2048, 0);
//ImGui::End();
//ImGui::Begin("BGCOLRAM Editor");
//mem_edit.DrawContents(&top->emu__DOT__system__DOT__bgcolram__DOT__mem, 2048, 0);
//ImGui::End();
//ImGui::Begin("Sprite RAM");
//mem_edit.DrawContents(&top->emu__DOT__system__DOT__spriteram__DOT__mem, 96, 0);
//ImGui::End();
//ImGui::Begin("Sprite Linebuffer RAM");
//mem_edit.DrawContents(&top->emu__DOT__system__DOT__spritelbram__DOT__mem, 1024, 0);
//ImGui::End();
//ImGui::Begin("Sprite Collision Buffer RAM A");
//mem_edit.DrawContents(&top->emu__DOT__system__DOT__comet__DOT__spritecollisionbufferram_a__DOT__mem, 512, 0);
//ImGui::End();
//ImGui::Begin("Sprite Collision Buffer RAM B");
//mem_edit.DrawContents(&top->emu__DOT__system__DOT__comet__DOT__spritecollisionbufferram_b__DOT__mem, 512, 0);
//ImGui::End();
//ImGui::Begin("Sprite Collision RAM ");
//mem_edit.DrawContents(&top->emu__DOT__system__DOT__spritecollisionram__DOT__mem, 32, 0);
//ImGui::End();
//ImGui::Begin("Sprite Debug RAM");
//mem_edit.DrawContents(&top->emu__DOT__system__DOT__spritedebugram__DOT__mem, 128000, 0);
//ImGui::End();
//ImGui::Begin("Palette ROM");
//mem_edit.DrawContents(&top->emu__DOT__system__DOT__palrom__DOT__mem, 64, 0);
//ImGui::End();
//ImGui::Begin("Sprite ROM");
//mem_edit.DrawContents(&top->emu__DOT__system__DOT__spriterom__DOT__mem, 2048, 0);
//ImGui::End();
//ImGui::Begin("Tilemap ROM");
//mem_edit.DrawContents(&top->emu__DOT__system__DOT__tilemaprom__DOT__mem, 8192, 0);
//ImGui::End();
//ImGui::Begin("Tilemap RAM");
// mem_edit.DrawContents(&top->emu__DOT__system__DOT__tilemapram__DOT__mem, 768, 0);
//ImGui::End();
//ImGui::Begin("Sound ROM");
//mem_edit.DrawContents(&top->emu__DOT__system__DOT__soundrom__DOT__mem, 64000, 0);
//ImGui::End();
// Video window
ImGui::Begin(windowTitle_Video);
ImGui::SetWindowPos(windowTitle_Video, ImVec2(550, 0), ImGuiCond_Once);
ImGui::SetWindowSize(windowTitle_Video, ImVec2((VGA_WIDTH * VGA_SCALE_X) + 24, (VGA_HEIGHT * VGA_SCALE_Y) + 114), ImGuiCond_Once);
ImGui::SliderFloat("Zoom", &vga_scale, 1, 8);
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("timestamp: %d actual ms: %d frame_ms: %d ", timestamp, timestamp/1000, video.count_frame * 1000);
ImGui::Text("minx: %d maxx: %d miny: %d maxy: %d", video.stats_xMin, video.stats_xMax, video.stats_yMin, video.stats_yMax);
//ImGui::Text("pixel: %06d line: %03d", video.count_pixel, video.count_line);
#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
float m = 2.0;
ImGui::Image(video.texture_id, ImVec2(video.output_width * m, video.output_height * m));
ImGui::End();
/*ImGui::Begin("PGROM Editor");
mem_edit_1.DrawContents(top->emu__DOT__system__DOT__pgrom__DOT__mem, 16384, 0);
ImGui::End();
ImGui::Begin("CHROM Editor");
mem_edit_1.DrawContents(top->emu__DOT__system__DOT__chrom__DOT__mem, 2048, 0);
ImGui::End();*/
ImGui::Begin("WKRAM Editor");
mem_edit_2.DrawContents(&top->emu__DOT__system__DOT__wkram__DOT__mem, 16384, 0);
ImGui::End();
//ImGui::Begin("CHRAM Editor");
//mem_edit_3.DrawContents(top->emu__DOT__system__DOT__chram__DOT__mem, 2048, 0);
//ImGui::End();
//ImGui::Begin("COLRAM Editor");
//mem_edit_3.DrawContents(top->emu__DOT__system__DOT__colram__DOT__mem, 2048, 0);
//ImGui::End();
// File Dialog to load rom
if (ImGuiFileDialog::Instance()->Display("ChooseFileDlgKey"))
{
// action if OK
if (ImGuiFileDialog::Instance()->IsOk())
{
std::string filePathName = ImGuiFileDialog::Instance()->GetFilePathName();
std::string filePath = ImGuiFileDialog::Instance()->GetCurrentPath();
// action
bus.QueueDownload(filePathName, 0, true);
}
// close
ImGuiFileDialog::Instance()->Close();
}
ImGui::Begin("CPU Registers");
ImGui::Spacing();
ImGui::Text("PC 0x%04X", top->emu__DOT__system__DOT__T80x__DOT__i_tv80_core__DOT__PC);
ImGui::Text("ACC 0x%04X", top->emu__DOT__system__DOT__T80x__DOT__i_tv80_core__DOT__ACC);
ImGui::Image(video.texture_id, ImVec2(video.output_width * VGA_SCALE_X, video.output_height * VGA_SCALE_Y));
ImGui::End();
video.UpdateTexture();
// Pass inputs to sim
top->menu = input.inputs[input_menu];
top->joystick_0 = 0;
for (int i = 0; i < input.inputCount; i++)
{
@@ -337,56 +373,34 @@ int main(int argc, char** argv, char** env) {
}
top->joystick_1 = top->joystick_0;
top->joystick_l_analog_0 += 1;
top->joystick_l_analog_0 -= 256;
top->joystick_r_analog_0 += 1;
top->joystick_r_analog_0 -= 256;
/*top->joystick_analog_0 += 1;
top->joystick_analog_0 -= 256;*/
//top->paddle_0 += 1;
//if (input.inputs[0] || input.inputs[1]) {
// spinner_toggle = !spinner_toggle;
// top->spinner_0 = (input.inputs[0]) ? 16 : -16;
// for (char b = 8; b < 16; b++) {
// top->spinner_0 &= ~(1UL << b);
// }
// if (spinner_toggle) { top->spinner_0 |= 1UL << 8; }
//}
top->joystick_l_analog_1 += 1;
top->joystick_l_analog_1 -= 256;
top->joystick_r_analog_1 += 1;
top->joystick_r_analog_1 -= 256;
mouse_buttons = 0;
mouse_x = 0;
mouse_y = 0;
if (input.inputs[input_left]) { mouse_x = -2; }
if (input.inputs[input_right]) { mouse_x = 2; }
if (input.inputs[input_up]) { mouse_y = 2; }
if (input.inputs[input_down]) { mouse_y = -2; }
top->joystick_l_analog_2 = 40;
top->joystick_l_analog_2 += 1024;
top->joystick_r_analog_2 = 50;
top->joystick_r_analog_2 += 1024;
if (input.inputs[input_a]) { mouse_buttons |= (1UL << 0); }
if (input.inputs[input_b]) { mouse_buttons |= (1UL << 1); }
top->joystick_l_analog_3 = 60;
top->joystick_l_analog_3 += 2048;
top->joystick_r_analog_3 = 70;
top->joystick_r_analog_3 += 2048;
top->joystick_l_analog_4 = 80;
top->joystick_l_analog_4 += 4096;
top->joystick_r_analog_4 = 90;
top->joystick_r_analog_4 += 4096;
top->joystick_l_analog_5 = 100;
top->joystick_l_analog_5 += 8192;
top->joystick_r_analog_5 = 110;
top->joystick_r_analog_5 += 8192;
top->paddle_0 += 1;
if (input.inputs[0] || input.inputs[1]) {
spinner_toggle = !spinner_toggle;
top->spinner_0 = (input.inputs[0]) ? 4 : -4;
for (char b = 8; b < 16; b++) {
top->spinner_0 &= ~(1UL << b);
}
if (spinner_toggle) { top->spinner_0 |= 1UL << 8; }
}
mouse_buttons += 1;
mouse_x += 1;
mouse_y -= 1;
unsigned long mouse_temp = mouse_buttons;
mouse_temp += (mouse_x << 8);
mouse_temp += (mouse_y << 16);
if (mouse_clock) { mouse_temp |= (1UL << 24); }
mouse_clock = !mouse_clock;
mouse_clock = !mouse_clock;
top->ps2_mouse = mouse_temp;
top->ps2_mouse_ext = mouse_x + (mouse_buttons << 8);
@@ -403,13 +417,15 @@ int main(int argc, char** argv, char** env) {
}
}
// Clean up before exit
// --------------------
#ifdef DEBUG_AUDIO
audioFile.close();
#endif
video.CleanUp();
input.CleanUp();
return 0;
}