Add Verilator simulation (ImGui + headless)
verilator/ runs the core on the host with the shared FM-7 / Apple-IIgs sim framework: windowed (ImGui/SDL2) or --headless, typing on a frame schedule, screenshots, text-screen dump, 6809 disassembly trace, floppy/SDC/cart/cassette, and RS-232 Pak serial debugging (TXD decoder, RXD driver, pty bridge, ACIA trace) with a minimal DriveWire server and a script to run the real FujiNet daemon against the sim. See verilator/README.md. - The VHDL the build uses (ROMs, RAMs, font) is converted to Verilog in verilator/rtl/; the VHDL CPU is not instantiated (CoCo3_CYC_ACC_6809). - sdram2.sv is simulated with its own controller logic and an SDR chip model. - run_tests.sh: boot, keyboard, disk, WIDTH 80 and HSCREEN tests, judged on the text screen and byte-for-byte against test-ref/ screenshots. rtl/wd1793.sv: spt_addr and buff_wr are declared at module scope instead of inside generate blocks. They are assigned outside those blocks; Quartus accepted it, Verilator rejected spt_addr and silently split buff_wr into a separate net. No change on the FPGA (FM-7 made the same fix). Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
This commit is contained in:
1 parent
aae1ceabf1
commit
874f4f3083
79 files changed
+81058
-2
No files matched your search
@@ -0,0 +1,210 @@
|
||||
#include <iostream>
|
||||
#include <queue>
|
||||
#include <string>
|
||||
|
||||
#include "sim_blkdevice.h"
|
||||
#include "sim_console.h"
|
||||
#include "verilated.h"
|
||||
|
||||
#ifndef _MSC_VER
|
||||
#else
|
||||
#define WIN32
|
||||
#endif
|
||||
|
||||
|
||||
static DebugConsole console;
|
||||
|
||||
IData* sd_lba[kVDNUM]= {NULL,NULL,NULL,NULL,NULL,
|
||||
NULL,NULL,NULL,NULL,NULL};
|
||||
SData* sd_rd=NULL;
|
||||
SData* sd_wr=NULL;
|
||||
SData* sd_ack=NULL;
|
||||
SData* sd_buff_addr=NULL;
|
||||
CData* sd_buff_dout=NULL;
|
||||
CData* sd_buff_din[kVDNUM]= {NULL,NULL,NULL,NULL,NULL,
|
||||
NULL,NULL,NULL,NULL,NULL};
|
||||
CData* sd_buff_wr=NULL;
|
||||
SData* img_mounted=NULL;
|
||||
CData* img_readonly=NULL;
|
||||
QData* img_size=NULL;
|
||||
|
||||
// Writes reach the mounted .d77 ONLY when this is set. It defaults off because
|
||||
// the harness opens every image read-write and a sweep runs hundreds of them:
|
||||
// two disks in cohort 02 (FM Sound Editor V1.0 and F-BASIC V3.3L11 System Disk,
|
||||
// both titles that legitimately save to disk) were silently modified at
|
||||
// 2026-08-27 17:40:08 while the sweep ran. That mutates the user's collection,
|
||||
// and it also breaks the cohort bookkeeping, which identifies a disk by its
|
||||
// content hash -- the two showed up as retired-but-not-in-population.
|
||||
//
|
||||
// The core is still told the disk is writable (img_readonly stays 0) and the
|
||||
// write still takes the same number of cycles, so emulated behaviour and the
|
||||
// gate's counters are unchanged; only the file on disk is spared.
|
||||
bool disk_persist_writes = false;
|
||||
|
||||
|
||||
#define bitset(byte,nbit) ((byte) |= (1<<(nbit)))
|
||||
#define bitclear(byte,nbit) ((byte) &= ~(1<<(nbit)))
|
||||
#define bitflip(byte,nbit) ((byte) ^= (1<<(nbit)))
|
||||
#define bitcheck(byte,nbit) ((byte) & (1<<(nbit)))
|
||||
|
||||
|
||||
void SimBlockDevice::MountDisk( std::string file, int index) {
|
||||
disk[index].open(file.c_str(), std::ios::out | std::ios::in | std::ios::binary | std::ios::ate);
|
||||
if (disk[index]) {
|
||||
// we shouldn't do the actual mount here..
|
||||
disk_size[index]= disk[index].tellg();
|
||||
disk[index].seekg(0);
|
||||
mountQueue[index]=1;
|
||||
printf("BLKDEV: disk %d inserted (%s) size=%ld bytes\n", index, file.c_str(), disk_size[index]);
|
||||
// (The Apple-IIgs original checked for a 232960-byte NIB image here.
|
||||
// FM-7 images are .d77, whose size is self-describing -- the header
|
||||
// carries the total length at offset 0x1c -- so no size check.)
|
||||
}else {
|
||||
fprintf(stderr,"BLKDEV ERROR: Failed to open: %s\n",file.c_str());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
void SimBlockDevice::BeforeEval(uint64_t cycles)
|
||||
{
|
||||
//
|
||||
// switch to a new disk if current_disk is -1
|
||||
// check to see if we need a read or a write or a mount
|
||||
//
|
||||
|
||||
// wait until the computer boots to start mounting, etc
|
||||
if (cycles<2000) return;
|
||||
|
||||
for (int i=0; i<kVDNUM;i++)
|
||||
{
|
||||
|
||||
//fprintf(stderr,"current_disk = %d *sd_rd %x ack_delay %x reading %d writing %d\n",current_disk,*sd_rd,ack_delay,reading,writing);
|
||||
|
||||
if (current_disk == i) {
|
||||
// send data
|
||||
if (ack_delay==1) {
|
||||
if (reading && (*sd_buff_wr==0) && (bytecnt<kBLKSZ)) {
|
||||
*sd_buff_dout = disk[i].get();
|
||||
*sd_buff_addr = bytecnt++;
|
||||
*sd_buff_wr= 1;
|
||||
} else if(writing && *sd_buff_addr != bytecnt && (*sd_buff_addr< kBLKSZ)) {
|
||||
//} else if(writing && (bytecnt < kBLKSZ)) {
|
||||
//printf("writing disk %i at sd_buff_addr %x data %x ack %x\n",i,*sd_buff_addr,*sd_buff_din[i],*sd_ack);
|
||||
if (disk_persist_writes) disk[i].put(*(sd_buff_din[i]));
|
||||
*sd_buff_addr = bytecnt;
|
||||
} else {
|
||||
*sd_buff_wr=0;
|
||||
|
||||
if (writing) {
|
||||
if (bytecnt>=kBLKSZ) {
|
||||
writing=0;
|
||||
//printf("writing stopped: bytecnt %x sd_buff_addr %x \n",bytecnt,*sd_buff_addr);
|
||||
}
|
||||
if (bytecnt<kBLKSZ)
|
||||
bytecnt++;
|
||||
}
|
||||
else if (reading) {
|
||||
if(bytecnt == kBLKSZ) {
|
||||
reading = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
*sd_buff_wr=0;
|
||||
}
|
||||
}
|
||||
|
||||
// issue a mount if we aren't doing anything, and the img_mounted has no bits set
|
||||
if (!reading && !writing && mountQueue[i] && !*img_mounted) {
|
||||
const size_t extrabytes = disk_size[i] % kBLKSZ;
|
||||
if (disk_size[i] >= (kBLKSZ + 64) && extrabytes == 64) {
|
||||
char hdr[4];
|
||||
disk[i].seekg(0);
|
||||
disk[i].read(hdr, 4);
|
||||
if (!memcmp(hdr, "2IMG", 4)) {
|
||||
fprintf(stderr, "Detected \"2IMG\" signature; adjusting sizes\n");
|
||||
header_size[i] = 64;
|
||||
disk_size[i] -= header_size[i];
|
||||
}
|
||||
}
|
||||
printf("BLKDEV: Mounting drive %d, img_size=%ld, header_offset=%ld\n", i, disk_size[i], header_size[i]);
|
||||
mountQueue[i]=0;
|
||||
*img_size = disk_size[i];
|
||||
*img_readonly=0;
|
||||
disk[i].seekg(header_size[i]);
|
||||
bitset(*img_mounted,i);
|
||||
ack_delay=1200;
|
||||
} else if (ack_delay==1 && bitcheck(*img_mounted,i) ) {
|
||||
printf("BLKDEV: Mount flag cleared for drive %d\n", i);
|
||||
bitclear(*img_mounted,i) ;
|
||||
//*img_size = 0;
|
||||
} else { if (!reading && !writing && ack_delay>0) ack_delay--; }
|
||||
|
||||
// start reading when sd_rd pulses high
|
||||
if ((current_disk==-1 || current_disk==i) && (bitcheck(*sd_rd,i) || bitcheck(*sd_wr,i) )) {
|
||||
// set current disk here..
|
||||
current_disk=i;
|
||||
if (!ack_delay) {
|
||||
int lba = *(sd_lba[i]);
|
||||
if (bitcheck(*sd_rd,i)) {
|
||||
reading = true;
|
||||
}
|
||||
if (bitcheck(*sd_wr,i)) {
|
||||
writing = true;
|
||||
}
|
||||
|
||||
disk[i].clear();
|
||||
disk[i].seekg((lba) * kBLKSZ + header_size[i]);
|
||||
printf("BLKDEV: drive=%d LBA=%d seek=%06X reading=%d writing=%d\n",
|
||||
i, lba, (int)((lba) * kBLKSZ + header_size[i]), reading, writing);
|
||||
bytecnt = 0;
|
||||
*sd_buff_addr = 0;
|
||||
ack_delay = 1200;
|
||||
}
|
||||
}
|
||||
|
||||
if (current_disk == i) {
|
||||
if (ack_delay==1) {
|
||||
bitset(*sd_ack,i);
|
||||
//printf("setting sd_ack: %x\n",*sd_ack);
|
||||
} else {
|
||||
bitclear(*sd_ack,i);
|
||||
//printf("clearing sd_ack: %x\n",*sd_ack);
|
||||
}
|
||||
if((ack_delay > 1) || ((ack_delay == 1) && !reading && !writing))
|
||||
ack_delay--;
|
||||
if (ack_delay==0 && !reading && !writing)
|
||||
current_disk=-1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void SimBlockDevice::AfterEval()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
SimBlockDevice::SimBlockDevice(DebugConsole c) {
|
||||
console = c;
|
||||
current_disk=-1;
|
||||
|
||||
sd_rd = NULL;
|
||||
sd_wr = NULL;
|
||||
sd_ack = NULL;
|
||||
sd_buff_addr = NULL;
|
||||
sd_buff_dout = NULL;
|
||||
for (int i=0;i<kVDNUM;i++) {
|
||||
sd_lba[i] = NULL;
|
||||
sd_buff_din[i] = NULL;
|
||||
mountQueue[i]=0;
|
||||
}
|
||||
sd_buff_wr=NULL;
|
||||
img_mounted=NULL;
|
||||
img_readonly=NULL;
|
||||
img_size=NULL;
|
||||
}
|
||||
|
||||
SimBlockDevice::~SimBlockDevice() {
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user