Apple-2-Tools
/
Epple-II
mirror of https://github.com/cmosher01/Epple-II.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix uninitialized vars (per valgrind); add debugging for LSS13; add some std lib bounds checking

This commit is contained in:
Christopher A. Mosher 2022-12-11 02:07:28 -05:00
parent 5c3d14b795
commit 340c8294f4
14 changed files with 192 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/E2wxApp.cpp
View File

@ -136,6 +136,8 @@ bool E2wxApp::OnInit() {
InitBoostLog();
BOOST_LOG_TRIVIAL(info) << "Application ID: " << this->GetID();
BOOST_LOG_TRIVIAL(info) << "Application version: " << this->GetVersion();
this->confdir = dirConfig() / path_from_string(GetID()+".d");

23
src/addressbus.cpp
View File

@ -25,10 +25,11 @@
#include "speakerclicker.h"
#include "cassettein.h"
#include "cassetteout.h"
#include "diskcontroller.h"
#include "slots.h"
AddressBus::AddressBus(ScreenImage& gui, int& revision, MemoryRandomAccess& ram, Memory& rom, Keyboard& kbd, VideoMode& vid, Paddles& paddles, PaddleButtonStates& paddleButtonStates, SpeakerClicker& speaker, CassetteIn& cassetteIn, CassetteOut& cassetteOut, Slots& slts):
gui(gui), revision(revision), ram(ram), rom(rom), kbd(kbd), vid(vid), paddles(paddles), paddleButtonStates(paddleButtonStates), speaker(speaker), cassetteIn(cassetteIn), cassetteOut(cassetteOut), slts(slts) {
gui(gui), revision(revision), ram(ram), rom(rom), kbd(kbd), vid(vid), paddles(paddles), paddleButtonStates(paddleButtonStates), speaker(speaker), cassetteIn(cassetteIn), cassetteOut(cassetteOut), slts(slts), debugoutpos(0), debugfirst(true) {
}
@ -153,6 +154,26 @@ void AddressBus::readSwitch(unsigned short address) {
const int islot = (address >> 4) & 0xF;
const int iswch = (address & 0xF);
this->data = this->slts.io(islot, iswch, this->data, false);
///////////////////////////////////////////////
// debug raw nibble disk reads
if (islot==6 && ((this->data & 0x80u) != 0u)) {
if (debugfirst) {
debugfirst = false;
for (int i = 0; i < 128; ++i) {
printf("%02X", i);
}
printf("\n");
}
printf("%02X", this->data);
++debugoutpos;
if (128 <= debugoutpos) {
debugoutpos = 0;
printf("\n");
// DiskController* dsk = (DiskController*)(this->slts.get(6));
// dsk->dumpLss();
}
}
///////////////////////////////////////////////
}
}

3
src/addressbus.h
View File

@ -47,6 +47,9 @@ class AddressBus {
unsigned char data; // this emulates the (floating) data bus
int debugoutpos;
bool debugfirst;
void setD7(const bool set);
void readSwitch(unsigned short address);
void writeSwitch(unsigned short address);

9
src/analogtv.cpp
View File

@ -44,6 +44,7 @@ AnalogTV::AnalogTV(ScreenImage& image):
image(image),
on(false),
noise(false),
type(TV_OLD_COLOR),
bleed_down(true)
{
hirescolor.push_back(colors.c()[A2ColorsObserved::HIRES_GREEN]);
@ -115,7 +116,7 @@ void AnalogTV::toggleBleedDown()
// int i = ((yiqv>>8)&0xFF)-IQINTOFF;
// int q = ((yiqv>>16)&0xFF)-IQINTOFF;
// System.out.printf("(%+04d,%+04d,%+04d)",y,i,q);
//
//
// const int rgb = yiq2rgb(yiqv);
// const int r = (rgb >> 16) & 0xff;
// const int g = (rgb >> 8) & 0xff;
@ -124,7 +125,7 @@ void AnalogTV::toggleBleedDown()
// }
// System.out.println();
// }
//
//
// }
@ -461,8 +462,8 @@ int inline AnalogTV::yiq2rgb(const int yiq)
double b = (((yiq)&0xFF)-IQINTOFF) - 1.105 * (((yiq>>8)&0xFF)-IQINTOFF) + 1.702 * (((yiq>>16)&0xFF)-IQINTOFF);
const int rgb =
(calc_color(r) << 16)|
(calc_color(g) << 8)|
(calc_color(r) << 16)|
(calc_color(g) << 8)|
(calc_color(b) << 0);
return rgb;

9
src/cpu.cpp
View File

@ -24,7 +24,14 @@
CPU::CPU(AddressBus& addressBus):
addressBus(addressBus)
addressBus(addressBus),
started(false),
pendingReset(false),
pendingIRQ(false),
pendingNMI(false),
p(PMASK_M),
t(0),
data(0)
{
}

11
src/diskcontroller.cpp
View File

@ -26,8 +26,11 @@ DiskController::DiskController(ScreenImage& gui, int slot, bool lss13, double ra
load(false),
write(false),
ioStepped(false),
dataBusReadOnlyCopy(0),
lssp6rom(lss13),
dataRegister(0),
seq(0x20), // gotta start somewhere
prev_seq(seq),
t(0) {
}
@ -125,6 +128,8 @@ void DiskController::rotateCurrentDisk() {
}
}
enum lss_cmd { NOP, SL, SR, LD };
void DiskController::stepLss() {
std::uint8_t adr = this->write<<3 | this->load<<2 | (this->dataRegister>>7)<<1 | this->currentDrive->readPulse();
std::uint8_t cmd = this->lssp6rom.read(this->seq|adr);
@ -140,14 +145,14 @@ void DiskController::stepLss() {
}
}
switch (cmd & 3u) {
case 3:
case LD:
this->dataRegister = this->dataBusReadOnlyCopy;
break;
case 2:
case SR:
this->dataRegister >>= 1;
this->dataRegister |= (isWriteProtected() << 7);
break;
case 1:
case SL:
this->dataRegister <<= 1;
this->dataRegister |= ((cmd & 4u) >> 2);
break;

4
src/diskcontroller.h
View File

@ -152,4 +152,8 @@ public:
virtual std::string getName() {
return "disk][ drive 1 drive 2 ";
}
void dumpLss() {
this->lssp6rom.dump();
}
};

1
src/keyboard.cpp
View File

@ -23,6 +23,7 @@ Keyboard::Keyboard(KeypressQueue& q, HyperMode& fhyper, KeyboardBufferMode& buff
keys(q),
fhyper(fhyper),
buffered(buffered),
latch(0xC1u), // TODO: randomize this a little
cGet(0)
{
}

145
src/lss.cpp
View File

@ -22,16 +22,16 @@
#include <algorithm>
#include <iterator>
static void setcmd(std::uint8_t lssrom[], std::uint8_t x, std::uint8_t cmd) {
lssrom[x] = (lssrom[x] & 0xF0u) | cmd;
static void setcmd(std::array<std::uint8_t, 0x100> &lssrom, std::uint8_t x, std::uint8_t cmd) {
lssrom.at(x) = (lssrom.at(x) & 0xF0u) | cmd;
}
static void setseq(std::uint8_t lssrom[], std::uint8_t x, std::uint8_t seq) {
lssrom[x] = (lssrom[x] & 0x0Fu) | seq;
static void setseq(std::array<std::uint8_t, 0x100> &lssrom, std::uint8_t x, std::uint8_t seq) {
lssrom.at(x) = (lssrom.at(x) & 0x0Fu) | seq;
}
static void setbth(std::uint8_t lssrom[], std::uint8_t x, std::uint8_t both) {
lssrom[x] = both;
static void setbth(std::array<std::uint8_t, 0x100> &lssrom, std::uint8_t x, std::uint8_t both) {
lssrom.at(x) = both;
}
static void inst(std::uint8_t seq, std::uint8_t inst) {
@ -71,28 +71,28 @@ static void inst(std::uint8_t seq, std::uint8_t inst) {
printf(" ");
}
static void showua2seq(std::uint8_t lssrom[], std::uint8_t seq) {
static void showua2seq(const std::array<std::uint8_t, 0x100> &lssrom, std::uint8_t seq) {
const std::uint8_t s(seq >> 4);
printf("%1X: | ", s);
inst(s,lssrom[seq|0x9]);
inst(s,lssrom[seq|0xB]);
inst(s,lssrom[seq|0xD]);
inst(s,lssrom[seq|0xF]);
inst(s,lssrom.at(seq|0x9));
inst(s,lssrom.at(seq|0xB));
inst(s,lssrom.at(seq|0xD));
inst(s,lssrom.at(seq|0xF));
printf("| ");
inst(s,lssrom[seq|0x8]);
inst(s,lssrom[seq|0xA]);
inst(s,lssrom[seq|0xC]);
inst(s,lssrom[seq|0xE]);
inst(s,lssrom.at(seq|0x8));
inst(s,lssrom.at(seq|0xA));
inst(s,lssrom.at(seq|0xC));
inst(s,lssrom.at(seq|0xE));
printf("| ");
inst(s,lssrom[seq|0x1]);
inst(s,lssrom[seq|0x0]);
inst(s,lssrom[seq|0x3]);
inst(s,lssrom[seq|0x2]);
inst(s,lssrom.at(seq|0x1));
inst(s,lssrom.at(seq|0x0));
inst(s,lssrom.at(seq|0x3));
inst(s,lssrom.at(seq|0x2));
printf("| ");
inst(s,lssrom[seq|0x5]);
inst(s,lssrom[seq|0x4]);
inst(s,lssrom[seq|0x7]);
inst(s,lssrom[seq|0x6]);
inst(s,lssrom.at(seq|0x5));
inst(s,lssrom.at(seq|0x4));
inst(s,lssrom.at(seq|0x7));
inst(s,lssrom.at(seq|0x6));
printf("\n");
if (s == 7) {
printf(" +-------------------------+-------------------------+-------------------------+------------------------\n");
@ -101,6 +101,13 @@ static void showua2seq(std::uint8_t lssrom[], std::uint8_t seq) {
LSS::LSS(bool use13SectorDos32LSS):
use13Sector(use13SectorDos32LSS) {
// fill all with invalid value, to aid in error detection
for (int i = 0; i < 0x100; ++i) {
this->lssrom.at(i) = 0x44u;
this->lss13rom.at(i) = 0x44u;
}
/*
* LSS P6 ROM is stored here with different addressing bits
* than in the original hardware, just for ease of understanding.
@ -121,12 +128,12 @@ LSS::LSS(bool use13SectorDos32LSS):
for (std::uint8_t s(0u); s < 0x10u; ++s) {
std::uint8_t seq(s << 4u);
for (std::uint8_t adr(0u); adr < 0x10u; ++adr) {
lssrom[seq|adr] = seq+0x18u;
lssrom.at(seq|adr) = seq+0x18u;
if ((adr & 0xCu) == 4u) {
lssrom[seq|adr] = 0x0Au;
lssrom.at(seq|adr) = 0x0Au;
}
if (adr == 1u || adr == 3u) {
lssrom[seq|adr] = 0xD8u;
lssrom.at(seq|adr) = 0xD8u;
}
}
}
@ -217,17 +224,83 @@ LSS::LSS(bool use13SectorDos32LSS):
setseq(lss13rom,0x23u,0x30u);
setseq(lss13rom,0x33u,0xD0u);
printf("Disk ][ Controller Logic State Sequencer ROM:\n");
if (use13Sector) {
for (unsigned int seq = 0; seq < 0x100u; seq += 0x10u) {
showua2seq(lss13rom,seq);
}
} else {
for (unsigned int seq = 0; seq < 0x100u; seq += 0x10u) {
showua2seq(lssrom,seq);
}
}
dump();
}
LSS::~LSS() {
}
void LSS::dump() const {
printf("%s\n", "Disk ][ Controller Logic State Sequencer ROM:");
if (this->use13Sector) {
printf("%s\n", "for 13-sector disks");
for (unsigned int seq = 0; seq < 0x100u; seq += 0x10u) {
showua2seq(this->lss13rom,seq);
}
// printf("%s\n", "===================================================");
// for (int r = 0; r < 0x10; ++r) {
// for (int c = 0; c < 0x10; ++c) {
// printf("%02X ", this->lss13rom.at(r*0x10+c));
// }
// printf("\n");
// }
} else {
printf("%s\n", "for 16-sector disks");
for (unsigned int seq = 0; seq < 0x100u; seq += 0x10u) {
showua2seq(this->lssrom,seq);
}
// printf("%s\n", "===================================================");
// for (int r = 0; r < 0x10; ++r) {
// for (int c = 0; c < 0x10; ++c) {
// printf("%02X ", this->lssrom.at(r*0x10+c));
// }
// printf("\n");
// }
}
}
/*
* AA 10101010
* AE 10101110
* B6 10110110
* BA 10111010
* BE 10111110
* D6 11010110
* DA 11011010
* DE 11011110
* EA 11101010
* EE 11101110
* F6 11110110
* FA 11111010
* FE 11111110
*/
std::uint8_t LSS::read(const std::uint8_t addr) {
int i = addr;
i &= 0x000000FF;
if (0x100 <= i) {
throw std::runtime_error("bad lss ROM read");
}
//return use13Sector ? lss13rom[addr] : lssrom[addr];
std::uint8_t r = 0;
if (this->use13Sector) {
const std::uint8_t candidate = this->lss13rom.at(i);
if (candidate == 0x44u) {
throw std::runtime_error("attempt to read uninitialized LSS ROM");
}
r = candidate;
} else {
const std::uint8_t candidate = this->lssrom.at(i);
if (candidate == 0x44u) {
throw std::runtime_error("attempt to read uninitialized LSS ROM");
}
r = candidate;
}
return r;
}

16
src/lss.h
View File

@ -20,22 +20,22 @@
#ifndef LSS_H
#define LSS_H
#include <stdexcept>
#include <array>
#include <cstdint>
class LSS
{
class LSS {
private:
bool use13Sector;
std::uint8_t lssrom[0x100];
std::uint8_t lss13rom[0x100];
const bool use13Sector;
std::array<std::uint8_t, 0x100> lss13rom;
std::array<std::uint8_t, 0x100> lssrom;
public:
LSS(bool use13SectorDos32LSS);
~LSS();
std::uint8_t read(const std::uint8_t addr) {
return use13Sector ? lss13rom[addr] : lssrom[addr];
}
std::uint8_t read(const std::uint8_t addr);
void dump() const;
};
#endif

2
src/textcharacters.h
View File

@ -30,7 +30,7 @@ public:
~TextCharacters() {}
unsigned char get(unsigned int iRow)
{
return this->rows[iRow];
return this->rows.at(iRow);
}
};

4
src/video.cpp
View File

@ -78,7 +78,7 @@ unsigned char Video::getDataByte()
{
// TODO should fix the mixed-mode scanning during VBL (see U.A.][, p. 5-13)
std::vector<unsigned short>& lut =
std::vector<unsigned short>& lut =
(this->mode.isDisplayingText(this->t) || !this->mode.isHiRes())
?
this->lutTEXT[this->mode.getPage()]
@ -107,7 +107,7 @@ bool Video::inverseChar(const unsigned char d)
{
bool inverse;
const int cs = (d >> 6) & 3;
const unsigned char cs = (d >> 6) & 3;
if (cs == 0)
{
inverse = true;

4
src/video.h
View File

@ -35,8 +35,8 @@ private:
enum { HRES_BASE_1 = 0x2000 };
enum { HRES_BASE_2 = 0x4000 };
enum { HRES_LEN = 0x2000 };
std::vector<unsigned short> lutTEXT[2]; // [0] is page 1, [1] is page 2
std::vector<unsigned short> lutTEXT[2]; // [0] is page 1, [1] is page 2
std::vector<unsigned short> lutHRES[2]; // [0] is page 1, [1] is page 2
VideoMode& mode;

20
src/wozfile.cpp
View File

@ -45,7 +45,7 @@ struct trk_t {
std::uint32_t bitCount;
};
WozFile::WozFile() : tmap(0) {
WozFile::WozFile() : tmap(0), lastQuarterTrack(C_QTRACK) {
for (int i(0); i < C_QTRACK; ++i) {
this->trk[i] = 0;
}
@ -162,6 +162,11 @@ bool WozFile::load(const std::filesystem::path& orig_file) {
case 0x4F464E49: { // INFO
std::uint8_t* buf = new std::uint8_t[chunk_size];
in->read((char*)buf, chunk_size);
const std::streamsize n_actual = in->gcount();
printf("read INFO chuck of size: %ld\n", n_actual);
if (n_actual < chunk_size) {
printf("WARNING: read less than expected bytes from woz file: %ld < %u\n", n_actual, chunk_size);
}
printf("INFO version %d\n", *buf);
if (*buf != 2) {
printf("File is not WOZ2 version.\n");
@ -185,7 +190,7 @@ bool WozFile::load(const std::filesystem::path& orig_file) {
printf("Creator: \"%.32s\"\n", buf+5);
this->timing = buf[39];
printf("Timing: %d/8 microseconds per bit\n", this->timing);
std::uint16_t compat = *((std::uint16_t*)buf+40);
std::uint16_t compat = *((std::uint16_t*)(buf+40));
printf("Compatible hardware: ");
if (!compat) {
printf("unknown\n");
@ -527,20 +532,29 @@ void WozFile::rotateOneBit(std::uint8_t currentQuarterTrack) {
return;
}
// this is the case where we are here for the first time,
// and lastQuarterTrack has not been set to any valid prior track
if (this->lastQuarterTrack == C_QTRACK) {
this->lastQuarterTrack = currentQuarterTrack;
}
// If we changed tracks since the last time we were called,
// we may need to adjust the rotational position. The new
// position will be at the same relative position as the
// previous, based on each track's length (tracks can be of
// different lengths in the WOZ image).
if (currentQuarterTrack != this->lastQuarterTrack) {
// printf("switching from tmap[%02x] --> [%02x]\n", this->lastQuarterTrack, currentQuarterTrack);
printf("\nswitching from tmap[%02x] --> [%02x]\n", this->lastQuarterTrack, currentQuarterTrack);
const double oldLen = this->trk_bits[this->tmap[this->lastQuarterTrack]];
const double newLen = this->trk_bits[this->tmap[currentQuarterTrack]];
const double ratio = newLen/oldLen;
if (!(fabs(1-ratio) < 0.0001)) {
const std::uint16_t newBit = static_cast<std::uint16_t>(round((this->byt*8+bc(this->bit)) * ratio));
printf("... detected non 1:1 ratio: %f\n", ratio);
printf("... old byt/bit: %hu/%hu\n", this->byt, this->bit);
this->byt = newBit / 8;
this->bit = cb(newBit % 8);
printf("... new byt/bit: %hu/%hu\n", this->byt, this->bit);
}
this->lastQuarterTrack = currentQuarterTrack;
}