FIXED THAT BUG.

2 files changed, 9 insertions, 4 deletions

diff --git a/src/cpu/instructions.c b/src/cpu/instructions.c
index 2b034c4..0f002d3 100644
--- a/src/cpu/instructions.c
+++ b/src/cpu/instructions.c
@@ -226,9 +226,11 @@ void fLSR(Addressing addr) {
 void fROL(Addressing addr){
 	byte m = (addr == eAccumulator) ? acc : idata.value;
 	
-	SetFlag(flag_C, (m & 0b10000000));
+	byte flag_store = (m & 0b10000000);
+	//SetFlag(flag_C, (m & 0b10000000));
 	m = (m << 1) & 0b11111110;
 	m |= (getFlag(flag_C)) ? 0b00000001 : 0;
+	SetFlag(flag_C, flag_store);
 	SetFlagN(m);
 	SetFlagZ(m);
 	
@@ -239,13 +241,16 @@ void fROL(Addressing addr){
 
 void fROR(Addressing addr){
 	byte m = (addr == eAccumulator) ? acc : idata.value;
-	
-	SetFlag(flag_C, (m & 0b00000001));
+
+	byte flag_store = (m & 0b00000001);
+	//SetFlag(flag_C, (m & 0b00000001));
 	m = (m >> 1) & 0b01111111;
 	m |= (getFlag(flag_C)) ? 0b10000000 : 0;
+	SetFlag(flag_C, flag_store);
 	SetFlagN(m);
 	SetFlagZ(m);
 	
+	
 	(addr == eAccumulator)
 	?	acc = m
 	:	SetMemory(idata.add, m);
diff --git a/src/main.c b/src/main.c
index f8b5457..59f4117 100644
--- a/src/main.c
+++ b/src/main.c
@@ -20,7 +20,7 @@ int main() {
 		// Logging
 		fprintf(Log,
 				"%04x : %04x : %02x : %02x : %02x : %c%c_%c%c%c%c%c : %02x\n",
-				Time, PC-idata.length, acc, X, Y,
+				Time, PC, acc, X, Y,
 				getFlag(flag_N) ? 'N':'.' ,
 				getFlag(flag_V) ? 'V':'.' ,
 				getFlag(flag_B) ? 'B':'.' ,