6502
/
v6502cpp
mirror of https://github.com/cmosher01/v6502cpp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

seems to be working

This commit is contained in:
Christopher Mosher 2013-11-25 23:28:26 -05:00
parent 3a0229555b
commit ba6ae1751e
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
cpu.cpp
View File

@ -14,7 +14,8 @@
#include "nodes.h" #include "nodes.h"
#include "addressbus.h" #include "addressbus.h"
//#define TRACE 1 #define TRACE 1
#define TRACEMEM 1
CPU::CPU(AddressBus& addressBus) : CPU::CPU(AddressBus& addressBus) :
addressBus(addressBus) { addressBus(addressBus) {
@ -88,13 +89,6 @@ addressBus(addressBus) {
segs[t.c1].c1c2s.push_back(i); segs[t.c1].c1c2s.push_back(i);
segs[t.c2].c1c2s.push_back(i); segs[t.c2].c1c2s.push_back(i);
} }
// TODO: init();
std::cout << "running some..." << std::endl;
for (int i(0); i < 100; ++i) {
step();
}
std::cout << "end" << std::endl;
} }
CPU::~CPU() { CPU::~CPU() {
@ -273,7 +267,7 @@ static void onTrans(trn& t, std::set<int>& rcl) {
} }
t.on = true; t.on = true;
addRecalc(t.c1, rcl); addRecalc(t.c1, rcl);
// addRecalc(t.c2,rcl); //looks like this is not necessary? addRecalc(t.c2, rcl); //looks like this is not necessary?
} }
static void offTrans(trn& t, std::set<int>& rcl) { static void offTrans(trn& t, std::set<int>& rcl) {
@ -300,7 +294,9 @@ bool CPU::getGroupValue(const std::set<int>& s) {
if (s.pulldown) { if (s.pulldown) {
return false; return false;
} }
// if (s.on) { return true; } if (s.on) {
return true;
}
} }
for (std::set<int>::const_iterator i = s.begin(); i != s.end(); ++i) { for (std::set<int>::const_iterator i = s.begin(); i != s.end(); ++i) {
const seg& s = segs[*i]; const seg& s = segs[*i];
@ -515,18 +511,22 @@ void CPU::powerOn() {
s.insert(SO); s.insert(SO);
recalc(s); recalc(s);
//dumpSegs(); //dumpSegs();
// std::cout << "recalc all" << std::endl; std::cout << "recalc all" << std::endl;
// recalcAll(); recalcAll();
rw(); rw();
#ifdef TRACE #ifdef TRACE
dumpRegs(); dumpRegs();
#endif #endif
// std::cout << "some power-up pre-reset cycles" << std::endl; std::cout << "some power-up pre-reset cycles" << std::endl;
// for (int i(0); i < 10; ++i) { for (int i(0); i < 40; ++i) {
// step(); step();
// } }
//
// std::cout << " RESET" << std::endl; std::cout << " RESET" << std::endl;
reset();
for (int i(0); i < 40; ++i) {
step();
}
} }
void CPU::reset() { void CPU::reset() {