Large diffs are not rendered by default.

@@ -37,7 +37,7 @@ class State(num: Int, data: DataSet, pr: State) {

def divError(): Boolean = {
if (condition(1)) {
val z = ccr.getCcr.extract(2, 2).equal(1)
val z = ccr.ccr.extract(2, 2).equal(1)
val ans = Symbolic.solverCheck(z.symbol)
error =
if (ans) (Some(getModel()), Some("div0 error"))
@@ -16,7 +16,7 @@ class DataSet(r: Register, m: Memory, p: ProgramCounter, c: ConditionRegister, p
val reg = new Register(r.reg)
val mem = new Memory(m.mem, arrayClone(m.in), arrayClone(m.ib.clone()))
val pc = new ProgramCounter(p.pc)
val ccr = new ConditionRegister(c.getCcr)
val ccr = new ConditionRegister(c.ccr)
val path = new PathCondition(pt.path)
val conset = cs

@@ -25,7 +25,7 @@ class DataSet(r: Register, m: Memory, p: ProgramCounter, c: ConditionRegister, p
new Register(reg.reg),
new Memory(mem.mem, mem.in, mem.ib),
new ProgramCounter(pc.pc),
new ConditionRegister(ccr.getCcr),
new ConditionRegister(ccr.ccr),
new PathCondition(path.path),
conset.clone()
)
@@ -12,10 +12,6 @@ class ConditionRegister(c: CtxSymbol) {

var ccr = c

def getCcr: CtxSymbol = ccr

def setCcr(c: CtxSymbol) = ccr = c

def clearC() = ccr = ccr & 0xFE

def clearV() = ccr = ccr & 0xFD