diff --git a/MC6809/src/mc6809.cpp b/MC6809/src/mc6809.cpp
index 62059a9..2c87015 100644
--- a/MC6809/src/mc6809.cpp
+++ b/MC6809/src/mc6809.cpp
@@ -49,256 +49,256 @@ int EightBit::mc6809::executeUnprefixed(uint8_t opcode) {
 	case 0x11:	m_prefix11 = true;	break;
 
 	// ABX
-	case 0x3a:	addCycles(3);	X() += B();								break;		// ABX (inherent)
+	case 0x3a:	addCycles(3);	X() += B();											break;		// ABX (inherent)
 
 	// ADC
-	case 0x89:	addCycles(2);	A() = adc(A(), AM_immediate_byte());	break;		// ADC (ADCA immediate)
-	case 0x99:	addCycles(4);	A() = adc(A(), AM_direct_byte());		break;		// ADC (ADCA direct)
-	case 0xa9:	addCycles(4);	A() = adc(A(), AM_indexed_byte());		break;		// ADC (ADCA indexed)
-	case 0xb9:	addCycles(4);	A() = adc(A(), AM_extended_byte());		break;		// ADC (ADCA extended)
+	case 0x89:	addCycles(2);	A() = adc(A(), AM_immediate_byte());				break;		// ADC (ADCA immediate)
+	case 0x99:	addCycles(4);	A() = adc(A(), AM_direct_byte());					break;		// ADC (ADCA direct)
+	case 0xa9:	addCycles(4);	A() = adc(A(), AM_indexed_byte());					break;		// ADC (ADCA indexed)
+	case 0xb9:	addCycles(4);	A() = adc(A(), AM_extended_byte());					break;		// ADC (ADCA extended)
 
-	case 0xc9:	addCycles(2);	B() = adc(B(), AM_immediate_byte());	break;		// ADC (ADCB immediate)
-	case 0xd9:	addCycles(4);	B() = adc(B(), AM_direct_byte());		break;		// ADC (ADCB direct)
-	case 0xe9:	addCycles(4);	B() = adc(B(), AM_indexed_byte());		break;		// ADC (ADCB indexed)
-	case 0xf9:	addCycles(4);	B() = adc(B(), AM_extended_byte());		break;		// ADC (ADCB extended)
+	case 0xc9:	addCycles(2);	B() = adc(B(), AM_immediate_byte());				break;		// ADC (ADCB immediate)
+	case 0xd9:	addCycles(4);	B() = adc(B(), AM_direct_byte());					break;		// ADC (ADCB direct)
+	case 0xe9:	addCycles(4);	B() = adc(B(), AM_indexed_byte());					break;		// ADC (ADCB indexed)
+	case 0xf9:	addCycles(4);	B() = adc(B(), AM_extended_byte());					break;		// ADC (ADCB extended)
 
 	// ADD
-	case 0x8b: addCycles(2);	A() = add(A(), AM_immediate_byte());	break;		// ADD (ADDA immediate)
-	case 0x9b: addCycles(4);	A() = add(A(), AM_direct_byte());		break;		// ADD (ADDA direct)
-	case 0xab: addCycles(4);	A() = add(A(), AM_indexed_byte());		break;		// ADD (ADDA indexed)
-	case 0xbb: addCycles(5);	A() = add(A(), AM_extended_byte());		break;		// ADD (ADDA extended)
+	case 0x8b: addCycles(2);	A() = add(A(), AM_immediate_byte());				break;		// ADD (ADDA immediate)
+	case 0x9b: addCycles(4);	A() = add(A(), AM_direct_byte());					break;		// ADD (ADDA direct)
+	case 0xab: addCycles(4);	A() = add(A(), AM_indexed_byte());					break;		// ADD (ADDA indexed)
+	case 0xbb: addCycles(5);	A() = add(A(), AM_extended_byte());					break;		// ADD (ADDA extended)
 
-	case 0xcb: addCycles(2);	B() = add(B(), AM_immediate_byte());	break;		// ADD (ADDB immediate)
-	case 0xdb: addCycles(4);	B() = add(B(), AM_direct_byte());		break;		// ADD (ADDB direct)
-	case 0xeb: addCycles(4);	B() = add(B(), AM_indexed_byte());		break;		// ADD (ADDB indexed)
-	case 0xfb: addCycles(5);	B() = add(B(), AM_extended_byte());		break;		// ADD (ADDB extended)
+	case 0xcb: addCycles(2);	B() = add(B(), AM_immediate_byte());				break;		// ADD (ADDB immediate)
+	case 0xdb: addCycles(4);	B() = add(B(), AM_direct_byte());					break;		// ADD (ADDB direct)
+	case 0xeb: addCycles(4);	B() = add(B(), AM_indexed_byte());					break;		// ADD (ADDB indexed)
+	case 0xfb: addCycles(5);	B() = add(B(), AM_extended_byte());					break;		// ADD (ADDB extended)
 
-	case 0xc3: addCycles(4);	D() = add(D(), AM_immediate_word());	break;		// ADD (ADDD immediate)
-	case 0xd3: addCycles(6);	D() = add(D(), AM_direct_word());		break;		// ADD (ADDD direct)
-	case 0xe3: addCycles(6);	D() = add(D(), AM_indexed_word());		break;		// ADD (ADDD indexed)
-	case 0xf3: addCycles(7);	D() = add(D(), AM_extended_word());		break;		// ADD (ADDD extended)
+	case 0xc3: addCycles(4);	D() = add(D(), AM_immediate_word());				break;		// ADD (ADDD immediate)
+	case 0xd3: addCycles(6);	D() = add(D(), AM_direct_word());					break;		// ADD (ADDD direct)
+	case 0xe3: addCycles(6);	D() = add(D(), AM_indexed_word());					break;		// ADD (ADDD indexed)
+	case 0xf3: addCycles(7);	D() = add(D(), AM_extended_word());					break;		// ADD (ADDD extended)
 
 	// AND
-	case 0x84:	addCycles(2);	A() = andr(A(), AM_immediate_byte());	break;		// AND (ANDA immediate)
-	case 0x94:	addCycles(4);	A() = andr(A(), AM_direct_byte());		break;		// AND (ANDA direct)
-	case 0xa4:	addCycles(4);	A() = andr(A(), AM_indexed_byte());		break;		// AND (ANDA indexed)
-	case 0xb4:	addCycles(5);	A() = andr(A(), AM_extended_byte());	break;		// AND (ANDA extended)
+	case 0x84:	addCycles(2);	A() = andr(A(), AM_immediate_byte());				break;		// AND (ANDA immediate)
+	case 0x94:	addCycles(4);	A() = andr(A(), AM_direct_byte());					break;		// AND (ANDA direct)
+	case 0xa4:	addCycles(4);	A() = andr(A(), AM_indexed_byte());					break;		// AND (ANDA indexed)
+	case 0xb4:	addCycles(5);	A() = andr(A(), AM_extended_byte());				break;		// AND (ANDA extended)
 
-	case 0xc4:	addCycles(2);	B() = andr(B(), AM_immediate_byte());	break;		// AND (ANDB immediate)
-	case 0xd4:	addCycles(4);	B() = andr(B(), AM_direct_byte());		break;		// AND (ANDB direct)
-	case 0xe4:	addCycles(4);	B() = andr(B(), AM_indexed_byte());		break;		// AND (ANDB indexed)
-	case 0xf4:	addCycles(5);	B() = andr(B(), AM_extended_byte());	break;		// AND (ANDB extended)
+	case 0xc4:	addCycles(2);	B() = andr(B(), AM_immediate_byte());				break;		// AND (ANDB immediate)
+	case 0xd4:	addCycles(4);	B() = andr(B(), AM_direct_byte());					break;		// AND (ANDB direct)
+	case 0xe4:	addCycles(4);	B() = andr(B(), AM_indexed_byte());					break;		// AND (ANDB indexed)
+	case 0xf4:	addCycles(5);	B() = andr(B(), AM_extended_byte());				break;		// AND (ANDB extended)
 
-	case 0x1c:	addCycles(3);	CC() &= AM_immediate_byte();			break;		// AND (ANDCC immediate)
+	case 0x1c:	addCycles(3);	CC() &= AM_immediate_byte();						break;		// AND (ANDCC immediate)
 
 	// ASL/LSL
-	case 0x08:	addCycles(6);	BUS().write(asl(AM_direct_byte()));		break;		// ASL (direct)
-	case 0x48:	addCycles(2);	A() = asl(A());							break;		// ASL (ASLA inherent)
-	case 0x58:	addCycles(2);	B() = asl(B());							break;		// ASL (ASLB inherent)
-	case 0x68:	addCycles(6);	BUS().write(asl(AM_indexed_byte()));	break;		// ASL (indexed)
-	case 0x78:	addCycles(7);	BUS().write(asl(AM_extended_byte()));	break;		// ASL (extended)
+	case 0x08:	addCycles(6);	BUS().write(asl(AM_direct_byte()));					break;		// ASL (direct)
+	case 0x48:	addCycles(2);	A() = asl(A());										break;		// ASL (ASLA inherent)
+	case 0x58:	addCycles(2);	B() = asl(B());										break;		// ASL (ASLB inherent)
+	case 0x68:	addCycles(6);	BUS().write(asl(AM_indexed_byte()));				break;		// ASL (indexed)
+	case 0x78:	addCycles(7);	BUS().write(asl(AM_extended_byte()));				break;		// ASL (extended)
 
 	// ASR
-	case 0x07:	addCycles(6);	BUS().write(asr(AM_direct_byte()));		break;		// ASR (direct)
-	case 0x47:	addCycles(2);	A() = asr(A());							break;		// ASR (ASRA inherent)
-	case 0x57:	addCycles(2);	B() = asr(B());							break;		// ASR (ASRB inherent)
-	case 0x67:	addCycles(6);	BUS().write(asr(AM_indexed_byte()));	break;		// ASR (indexed)
-	case 0x77:	addCycles(7);	BUS().write(asr(AM_extended_byte()));	break;		// ASR (extended)
+	case 0x07:	addCycles(6);	BUS().write(asr(AM_direct_byte()));					break;		// ASR (direct)
+	case 0x47:	addCycles(2);	A() = asr(A());										break;		// ASR (ASRA inherent)
+	case 0x57:	addCycles(2);	B() = asr(B());										break;		// ASR (ASRB inherent)
+	case 0x67:	addCycles(6);	BUS().write(asr(AM_indexed_byte()));				break;		// ASR (indexed)
+	case 0x77:	addCycles(7);	BUS().write(asr(AM_extended_byte()));				break;		// ASR (extended)
 
 	// BIT
-	case 0x85:	addCycles(2);	andr(A(), AM_immediate_byte());			break;		// BIT (BITA immediate)
-	case 0x95:	addCycles(4);	andr(A(), AM_direct_byte());			break;		// BIT (BITA direct)
-	case 0xa5:	addCycles(4);	andr(A(), AM_indexed_byte());			break;		// BIT (BITA indexed)
-	case 0xb5:	addCycles(5);	andr(A(), AM_extended_byte());			break;		// BIT (BITA extended)
+	case 0x85:	addCycles(2);	andr(A(), AM_immediate_byte());						break;		// BIT (BITA immediate)
+	case 0x95:	addCycles(4);	andr(A(), AM_direct_byte());						break;		// BIT (BITA direct)
+	case 0xa5:	addCycles(4);	andr(A(), AM_indexed_byte());						break;		// BIT (BITA indexed)
+	case 0xb5:	addCycles(5);	andr(A(), AM_extended_byte());						break;		// BIT (BITA extended)
 
-	case 0xc5:	addCycles(2);	andr(B(), AM_immediate_byte());			break;		// BIT (BITB immediate)
-	case 0xd5:	addCycles(4);	andr(B(), AM_direct_byte());			break;		// BIT (BITB direct)
-	case 0xe5:	addCycles(4);	andr(B(), AM_indexed_byte());			break;		// BIT (BITB indexed)
-	case 0xf5:	addCycles(5);	andr(B(), AM_extended_byte());			break;		// BIT (BITB extended)
+	case 0xc5:	addCycles(2);	andr(B(), AM_immediate_byte());						break;		// BIT (BITB immediate)
+	case 0xd5:	addCycles(4);	andr(B(), AM_direct_byte());						break;		// BIT (BITB direct)
+	case 0xe5:	addCycles(4);	andr(B(), AM_indexed_byte());						break;		// BIT (BITB indexed)
+	case 0xf5:	addCycles(5);	andr(B(), AM_extended_byte());						break;		// BIT (BITB extended)
 
 	// CLR
-	case 0x0f:	addCycles(6);	BUS().write(Address_direct(), clr());	break;		// CLR (direct)
-	case 0x4f:	addCycles(2);	A() = clr();							break;		// CLR (CLRA implied)
-	case 0x5f:	addCycles(2);	B() = clr();							break;		// CLR (CLRB implied)
-	case 0x6f:	addCycles(6);	BUS().write(Address_indexed(), clr());	break;		// CLR (indexed)
-	case 0x7f:	addCycles(7);	BUS().write(Address_extended(), clr());	break;		// CLR (extended)
+	case 0x0f:	addCycles(6);	BUS().write(Address_direct(), clr());				break;		// CLR (direct)
+	case 0x4f:	addCycles(2);	A() = clr();										break;		// CLR (CLRA implied)
+	case 0x5f:	addCycles(2);	B() = clr();										break;		// CLR (CLRB implied)
+	case 0x6f:	addCycles(6);	BUS().write(Address_indexed(), clr());				break;		// CLR (indexed)
+	case 0x7f:	addCycles(7);	BUS().write(Address_extended(), clr());				break;		// CLR (extended)
 
 	// CMP
 
 	// CMPA
-	case 0x81:	addCycles(2);	cmp(A(), AM_immediate_byte());			break;		// CMP (CMPA, immediate)
-	case 0x91:	addCycles(4);	cmp(A(), AM_direct_byte());				break;		// CMP (CMPA, direct)
-	case 0xa1:	addCycles(4);	cmp(A(), AM_indexed_byte());			break;		// CMP (CMPA, indexed)
-	case 0xb1:	addCycles(5);	cmp(A(), AM_extended_byte());			break;		// CMP (CMPA, extended)
+	case 0x81:	addCycles(2);	cmp(A(), AM_immediate_byte());						break;		// CMP (CMPA, immediate)
+	case 0x91:	addCycles(4);	cmp(A(), AM_direct_byte());							break;		// CMP (CMPA, direct)
+	case 0xa1:	addCycles(4);	cmp(A(), AM_indexed_byte());						break;		// CMP (CMPA, indexed)
+	case 0xb1:	addCycles(5);	cmp(A(), AM_extended_byte());						break;		// CMP (CMPA, extended)
 
 	// CMPB
-	case 0xc1:	addCycles(2);	cmp(B(), AM_immediate_byte());			break;		// CMP (CMPB, immediate)
-	case 0xd1:	addCycles(4);	cmp(B(), AM_direct_byte());				break;		// CMP (CMPB, direct)
-	case 0xe1:	addCycles(4);	cmp(B(), AM_indexed_byte());			break;		// CMP (CMPB, indexed)
-	case 0xf1:	addCycles(5);	cmp(B(), AM_extended_byte());			break;		// CMP (CMPB, extended)
+	case 0xc1:	addCycles(2);	cmp(B(), AM_immediate_byte());						break;		// CMP (CMPB, immediate)
+	case 0xd1:	addCycles(4);	cmp(B(), AM_direct_byte());							break;		// CMP (CMPB, direct)
+	case 0xe1:	addCycles(4);	cmp(B(), AM_indexed_byte());						break;		// CMP (CMPB, indexed)
+	case 0xf1:	addCycles(5);	cmp(B(), AM_extended_byte());						break;		// CMP (CMPB, extended)
 
 	// CMPX
-	case 0x8c:	addCycles(4);	cmp(X(), AM_immediate_word());			break;		// CMP (CMPX, immediate)
-	case 0x9c:	addCycles(6);	cmp(X(), AM_direct_word());				break;		// CMP (CMPX, direct)
-	case 0xac:	addCycles(6);	cmp(X(), AM_indexed_word());			break;		// CMP (CMPX, indexed)
-	case 0xbc:	addCycles(7);	cmp(X(), AM_extended_word());			break;		// CMP (CMPX, extended)
+	case 0x8c:	addCycles(4);	cmp(X(), AM_immediate_word());						break;		// CMP (CMPX, immediate)
+	case 0x9c:	addCycles(6);	cmp(X(), AM_direct_word());							break;		// CMP (CMPX, direct)
+	case 0xac:	addCycles(6);	cmp(X(), AM_indexed_word());						break;		// CMP (CMPX, indexed)
+	case 0xbc:	addCycles(7);	cmp(X(), AM_extended_word());						break;		// CMP (CMPX, extended)
 
 	// COM
-	case 0x03:	addCycles(6);	BUS().write(com(AM_direct_byte()));		break;		// COM (direct)
-	case 0x43:	addCycles(2);	A() = com(A());							break;		// COM (COMA inherent)
-	case 0x53:	addCycles(2);	B() = com(B());							break;		// COM (COMB inherent)
-	case 0x63:	addCycles(6);	BUS().write(com(AM_indexed_byte()));	break;		// COM (indexed)
-	case 0x73:	addCycles(7);	BUS().write(com(AM_extended_byte()));	break;		// COM (extended)
+	case 0x03:	addCycles(6);	BUS().write(com(AM_direct_byte()));					break;		// COM (direct)
+	case 0x43:	addCycles(2);	A() = com(A());										break;		// COM (COMA inherent)
+	case 0x53:	addCycles(2);	B() = com(B());										break;		// COM (COMB inherent)
+	case 0x63:	addCycles(6);	BUS().write(com(AM_indexed_byte()));				break;		// COM (indexed)
+	case 0x73:	addCycles(7);	BUS().write(com(AM_extended_byte()));				break;		// COM (extended)
 
 	// CWAI
-	case 0x3c:	addCycles(20);	cwai(AM_direct_byte());					break;		// CWAI (direct)
+	case 0x3c:	addCycles(20);	cwai(AM_direct_byte());								break;		// CWAI (direct)
 
 	// DAA
-	case 0x19:	addCycles(2);	A() = da(A());							break;		// DAA (inherent)
+	case 0x19:	addCycles(2);	A() = da(A());										break;		// DAA (inherent)
 
 	// DEC
-	case 0x0a:	addCycles(6);	BUS().write(dec(AM_direct_byte()));		break;		// DEC (direct)
-	case 0x4a:	addCycles(2);	A() = dec(A());							break;		// DEC (DECA inherent)
-	case 0x5a:	addCycles(2);	B() = dec(B());							break;		// DEC (DECB inherent)
-	case 0x6a:	addCycles(6);	BUS().write(dec(AM_indexed_byte()));	break;		// DEC (indexed)
-	case 0x7a:	addCycles(7);	BUS().write(dec(AM_extended_byte()));	break;		// DEC (extended)
+	case 0x0a:	addCycles(6);	BUS().write(dec(AM_direct_byte()));					break;		// DEC (direct)
+	case 0x4a:	addCycles(2);	A() = dec(A());										break;		// DEC (DECA inherent)
+	case 0x5a:	addCycles(2);	B() = dec(B());										break;		// DEC (DECB inherent)
+	case 0x6a:	addCycles(6);	BUS().write(dec(AM_indexed_byte()));				break;		// DEC (indexed)
+	case 0x7a:	addCycles(7);	BUS().write(dec(AM_extended_byte()));				break;		// DEC (extended)
 
 	// EOR
 
 	// EORA
-	case 0x88:	addCycles(2);	A() = eor(A(), AM_immediate_byte());	break;		// EOR (EORA immediate)
-	case 0x98:	addCycles(4);	A() = eor(A(), AM_direct_byte());		break;		// EOR (EORA direct)
-	case 0xa8:	addCycles(4);	A() = eor(A(), AM_indexed_byte());		break;		// EOR (EORA indexed)
-	case 0xb8:	addCycles(5);	A() = eor(A(), AM_extended_byte());		break;		// EOR (EORA extended)
+	case 0x88:	addCycles(2);	A() = eor(A(), AM_immediate_byte());				break;		// EOR (EORA immediate)
+	case 0x98:	addCycles(4);	A() = eor(A(), AM_direct_byte());					break;		// EOR (EORA direct)
+	case 0xa8:	addCycles(4);	A() = eor(A(), AM_indexed_byte());					break;		// EOR (EORA indexed)
+	case 0xb8:	addCycles(5);	A() = eor(A(), AM_extended_byte());					break;		// EOR (EORA extended)
 
 	// EORB
-	case 0xc8:	addCycles(2);	B() = eor(B(), AM_immediate_byte());	break;		// EOR (EORB immediate)
-	case 0xd8:	addCycles(4);	B() = eor(B(), AM_direct_byte());		break;		// EOR (EORB direct)
-	case 0xe8:	addCycles(4);	B() = eor(B(), AM_indexed_byte());		break;		// EOR (EORB indexed)
-	case 0xf8:	addCycles(5);	B() = eor(B(), AM_extended_byte());		break;		// EOR (EORB extended)
+	case 0xc8:	addCycles(2);	B() = eor(B(), AM_immediate_byte());				break;		// EOR (EORB immediate)
+	case 0xd8:	addCycles(4);	B() = eor(B(), AM_direct_byte());					break;		// EOR (EORB direct)
+	case 0xe8:	addCycles(4);	B() = eor(B(), AM_indexed_byte());					break;		// EOR (EORB indexed)
+	case 0xf8:	addCycles(5);	B() = eor(B(), AM_extended_byte());					break;		// EOR (EORB extended)
 
 	// EXG
-	case 0x1e:	addCycles(8);	exg(AM_immediate_byte());				break;		// EXG (R1,R2 immediate)
+	case 0x1e:	addCycles(8);	exg(AM_immediate_byte());							break;		// EXG (R1,R2 immediate)
 
 	// INC
-	case 0x0c:	addCycles(6);	BUS().write(inc(AM_direct_byte()));		break;		// INC (direct)
-	case 0x4c:	addCycles(2);	A() = inc(A());							break;		// INC (INCA inherent)
-	case 0x5c:	addCycles(2);	B() = inc(B());							break;		// INC (INCB inherent)
-	case 0x6c:	addCycles(6);	BUS().write(inc(AM_indexed_byte()));	break;		// INC (indexed)
-	case 0x7c:	addCycles(7);	BUS().write(inc(AM_extended_byte()));	break;		// INC (extended)
+	case 0x0c:	addCycles(6);	BUS().write(inc(AM_direct_byte()));					break;		// INC (direct)
+	case 0x4c:	addCycles(2);	A() = inc(A());										break;		// INC (INCA inherent)
+	case 0x5c:	addCycles(2);	B() = inc(B());										break;		// INC (INCB inherent)
+	case 0x6c:	addCycles(6);	BUS().write(inc(AM_indexed_byte()));				break;		// INC (indexed)
+	case 0x7c:	addCycles(7);	BUS().write(inc(AM_extended_byte()));				break;		// INC (extended)
 
 	// JMP
-	case 0x0e:	addCycles(6);	jump(Address_direct());					break;		// JMP (direct)
-	case 0x6e:	addCycles(6);	jump(Address_indexed());				break;		// JMP (indexed)
-	case 0x7e:	addCycles(7);	jump(Address_extended());				break;		// JMP (extended)
+	case 0x0e:	addCycles(6);	jump(Address_direct());								break;		// JMP (direct)
+	case 0x6e:	addCycles(6);	jump(Address_indexed());							break;		// JMP (indexed)
+	case 0x7e:	addCycles(7);	jump(Address_extended());							break;		// JMP (extended)
 
 	// JSR
-	case 0x9d:	addCycles(6);	call(Address_direct());					break;		// JSR (direct)
-	case 0xad:	addCycles(6);	call(Address_indexed());				break;		// JSR (indexed)
-	case 0xbd:	addCycles(7);	call(Address_extended());				break;		// JSR (extended)
+	case 0x9d:	addCycles(6);	call(Address_direct());								break;		// JSR (direct)
+	case 0xad:	addCycles(6);	call(Address_indexed());							break;		// JSR (indexed)
+	case 0xbd:	addCycles(7);	call(Address_extended());							break;		// JSR (extended)
 
 	// LD
 
 	// LDA
-	case 0x86:	addCycles(2);	A() = ld(AM_immediate_byte());			break;		// LD (LDA immediate)
-	case 0x96:	addCycles(4);	A() = ld(AM_direct_byte());				break;		// LD (LDA direct)
-	case 0xa6:	addCycles(4);	A() = ld(AM_indexed_byte());			break;		// LD (LDA indexed)
-	case 0xb6:	addCycles(5);	A() = ld(AM_extended_byte());			break;		// LD (LDA extended)
+	case 0x86:	addCycles(2);	A() = ld(AM_immediate_byte());						break;		// LD (LDA immediate)
+	case 0x96:	addCycles(4);	A() = ld(AM_direct_byte());							break;		// LD (LDA direct)
+	case 0xa6:	addCycles(4);	A() = ld(AM_indexed_byte());						break;		// LD (LDA indexed)
+	case 0xb6:	addCycles(5);	A() = ld(AM_extended_byte());						break;		// LD (LDA extended)
 
 	// LDB
-	case 0xc6:	addCycles(2);	B() = ld(AM_immediate_byte());			break;		// LD (LDB immediate)
-	case 0xd6:	addCycles(4);	B() = ld(AM_direct_byte());				break;		// LD (LDB direct)
-	case 0xe6:	addCycles(4);	B() = ld(AM_indexed_byte());			break;		// LD (LDB indexed)
-	case 0xf6:	addCycles(5);	B() = ld(AM_extended_byte());			break;		// LD (LDB extended)
+	case 0xc6:	addCycles(2);	B() = ld(AM_immediate_byte());						break;		// LD (LDB immediate)
+	case 0xd6:	addCycles(4);	B() = ld(AM_direct_byte());							break;		// LD (LDB direct)
+	case 0xe6:	addCycles(4);	B() = ld(AM_indexed_byte());						break;		// LD (LDB indexed)
+	case 0xf6:	addCycles(5);	B() = ld(AM_extended_byte());						break;		// LD (LDB extended)
 
 	// LDD
-	case 0xcc:	addCycles(3);	D() = ld(AM_immediate_word());			break;		// LD (LDD immediate)
-	case 0xdc:	addCycles(5);	D() = ld(AM_direct_word());				break;		// LD (LDD direct)
-	case 0xec:	addCycles(5);	D() = ld(AM_indexed_word());			break;		// LD (LDD indexed)
-	case 0xfc:	addCycles(6);	D() = ld(AM_extended_word());			break;		// LD (LDD extended)
+	case 0xcc:	addCycles(3);	D() = ld(AM_immediate_word());						break;		// LD (LDD immediate)
+	case 0xdc:	addCycles(5);	D() = ld(AM_direct_word());							break;		// LD (LDD direct)
+	case 0xec:	addCycles(5);	D() = ld(AM_indexed_word());						break;		// LD (LDD indexed)
+	case 0xfc:	addCycles(6);	D() = ld(AM_extended_word());						break;		// LD (LDD extended)
 
 	// LDU
-	case 0xce:	addCycles(3);	U() = ld(AM_immediate_word());			break;		// LD (LDU immediate)
-	case 0xde:	addCycles(5);	U() = ld(AM_direct_word());				break;		// LD (LDU direct)
-	case 0xee:	addCycles(5);	U() = ld(AM_indexed_word());			break;		// LD (LDU indexed)
-	case 0xfe:	addCycles(6);	U() = ld(AM_extended_word());			break;		// LD (LDU extended)
+	case 0xce:	addCycles(3);	U() = ld(AM_immediate_word());						break;		// LD (LDU immediate)
+	case 0xde:	addCycles(5);	U() = ld(AM_direct_word());							break;		// LD (LDU direct)
+	case 0xee:	addCycles(5);	U() = ld(AM_indexed_word());						break;		// LD (LDU indexed)
+	case 0xfe:	addCycles(6);	U() = ld(AM_extended_word());						break;		// LD (LDU extended)
 
 	// LDX
-	case 0x8e:	addCycles(3);	X() = ld(AM_immediate_word());			break;		// LD (LDX immediate)
-	case 0x9e:	addCycles(5);	X() = ld(AM_direct_word());				break;		// LD (LDX direct)
-	case 0xae:	addCycles(5);	X() = ld(AM_indexed_word());			break;		// LD (LDX indexed)
-	case 0xbe:	addCycles(6);	X() = ld(AM_extended_word());			break;		// LD (LDX extended)
+	case 0x8e:	addCycles(3);	X() = ld(AM_immediate_word());						break;		// LD (LDX immediate)
+	case 0x9e:	addCycles(5);	X() = ld(AM_direct_word());							break;		// LD (LDX direct)
+	case 0xae:	addCycles(5);	X() = ld(AM_indexed_word());						break;		// LD (LDX indexed)
+	case 0xbe:	addCycles(6);	X() = ld(AM_extended_word());						break;		// LD (LDX extended)
 
 	// LEA
-	case 0x30:	addCycles(4);	adjustZero(X() = Address_indexed());	break;		// LEA (LEAX indexed)
-	case 0x31:	addCycles(4);	adjustZero(Y() = Address_indexed());	break;		// LEA (LEAY indexed)
-	case 0x32:	addCycles(4);	S() = Address_indexed();				break;		// LEA (LEAS indexed)
-	case 0x33:	addCycles(4);	U() = Address_indexed();				break;		// LEA (LEAU indexed)
+	case 0x30:	addCycles(4);	adjustZero(X() = Address_indexed());				break;		// LEA (LEAX indexed)
+	case 0x31:	addCycles(4);	adjustZero(Y() = Address_indexed());				break;		// LEA (LEAY indexed)
+	case 0x32:	addCycles(4);	S() = Address_indexed();							break;		// LEA (LEAS indexed)
+	case 0x33:	addCycles(4);	U() = Address_indexed();							break;		// LEA (LEAU indexed)
 
 	// LSR
-	case 0x04:	addCycles(6);	BUS().write(lsr(AM_direct_byte()));		break;		// LSR (direct)
-	case 0x44:	addCycles(2);	A() = lsr(A());							break;		// LSR (LSRA inherent)
-	case 0x54:	addCycles(2);	B() = lsr(B());							break;		// LSR (LSRB inherent)
-	case 0x64:	addCycles(6);	BUS().write(lsr(AM_indexed_byte()));	break;		// LSR (indexed)
-	case 0x74:	addCycles(7);	BUS().write(lsr(AM_extended_byte()));	break;		// LSR (extended)
+	case 0x04:	addCycles(6);	BUS().write(lsr(AM_direct_byte()));					break;		// LSR (direct)
+	case 0x44:	addCycles(2);	A() = lsr(A());										break;		// LSR (LSRA inherent)
+	case 0x54:	addCycles(2);	B() = lsr(B());										break;		// LSR (LSRB inherent)
+	case 0x64:	addCycles(6);	BUS().write(lsr(AM_indexed_byte()));				break;		// LSR (indexed)
+	case 0x74:	addCycles(7);	BUS().write(lsr(AM_extended_byte()));				break;		// LSR (extended)
 
 	// MUL
-	case 0x3d:	addCycles(11);	D() = mul(A(), B());					break;		// MUL (inherent)
+	case 0x3d:	addCycles(11);	D() = mul(A(), B());								break;		// MUL (inherent)
 
 	// NEG
-	case 0x00:	addCycles(6);	BUS().write(neg(AM_direct_byte()));		break;		// NEG (direct)
-	case 0x40:	addCycles(2);	A() = neg(A());							break;		// NEG (NEGA, inherent)
-	case 0x50:	addCycles(2);	B() = neg(B());							break;		// NEG (NEGB, inherent)
-	case 0x60:	addCycles(6);	BUS().write(neg(AM_indexed_byte()));	break;		// NEG (indexed)
-	case 0x70:	addCycles(7);	BUS().write(neg(AM_extended_byte()));	break;		// NEG (extended)
+	case 0x00:	addCycles(6);	BUS().write(neg(AM_direct_byte()));					break;		// NEG (direct)
+	case 0x40:	addCycles(2);	A() = neg(A());										break;		// NEG (NEGA, inherent)
+	case 0x50:	addCycles(2);	B() = neg(B());										break;		// NEG (NEGB, inherent)
+	case 0x60:	addCycles(6);	BUS().write(neg(AM_indexed_byte()));				break;		// NEG (indexed)
+	case 0x70:	addCycles(7);	BUS().write(neg(AM_extended_byte()));				break;		// NEG (extended)
 
 	// NOP
-	case 0x12:	addCycles(2);											break;		// NOP (inherent)
+	case 0x12:	addCycles(2);														break;		// NOP (inherent)
 
 	// OR
 
 	// ORA
-	case 0x8a:	addCycles(2);	A() = orr(A(), AM_immediate_byte());	break;		// OR (ORA immediate)
-	case 0x9a:	addCycles(4);	A() = orr(A(), AM_direct_byte());		break;		// OR (ORA direct)
-	case 0xaa:	addCycles(4);	A() = orr(A(), AM_indexed_byte());		break;		// OR (ORA indexed)
-	case 0xba:	addCycles(5);	A() = orr(A(), AM_extended_byte());		break;		// OR (ORA extended)
+	case 0x8a:	addCycles(2);	A() = orr(A(), AM_immediate_byte());				break;		// OR (ORA immediate)
+	case 0x9a:	addCycles(4);	A() = orr(A(), AM_direct_byte());					break;		// OR (ORA direct)
+	case 0xaa:	addCycles(4);	A() = orr(A(), AM_indexed_byte());					break;		// OR (ORA indexed)
+	case 0xba:	addCycles(5);	A() = orr(A(), AM_extended_byte());					break;		// OR (ORA extended)
 
 	// ORB
-	case 0xca:	addCycles(2);	A() = orr(A(), AM_immediate_byte());	break;		// OR (ORB immediate)
-	case 0xda:	addCycles(4);	A() = orr(A(), AM_direct_byte());		break;		// OR (ORB direct)
-	case 0xea:	addCycles(4);	A() = orr(A(), AM_indexed_byte());		break;		// OR (ORB indexed)
-	case 0xfa:	addCycles(5);	A() = orr(A(), AM_extended_byte());		break;		// OR (ORB extended)
+	case 0xca:	addCycles(2);	A() = orr(A(), AM_immediate_byte());				break;		// OR (ORB immediate)
+	case 0xda:	addCycles(4);	A() = orr(A(), AM_direct_byte());					break;		// OR (ORB direct)
+	case 0xea:	addCycles(4);	A() = orr(A(), AM_indexed_byte());					break;		// OR (ORB indexed)
+	case 0xfa:	addCycles(5);	A() = orr(A(), AM_extended_byte());					break;		// OR (ORB extended)
 
 	// ORCC
-	case 0x1a:	addCycles(3);	CC() |= AM_immediate_byte();			break;		// OR (ORCC immediate)
+	case 0x1a:	addCycles(3);	CC() |= AM_immediate_byte();						break;		// OR (ORCC immediate)
 
 	// PSH
-	case 0x34:	addCycles(5);	pshs(AM_immediate_byte());				break;		// PSH (PSHS immediate)
-	case 0x36:	addCycles(5);	pshu(AM_immediate_byte());				break;		// PSH (PSHU immediate)
+	case 0x34:	addCycles(5);	pshs(AM_immediate_byte());							break;		// PSH (PSHS immediate)
+	case 0x36:	addCycles(5);	pshu(AM_immediate_byte());							break;		// PSH (PSHU immediate)
 
 	// PUL
-	case 0x35:	addCycles(5);	puls(AM_immediate_byte());				break;		// PUL (PULS immediate)
-	case 0x37:	addCycles(5);	pulu(AM_immediate_byte());				break;		// PUL (PULU immediate)
+	case 0x35:	addCycles(5);	puls(AM_immediate_byte());							break;		// PUL (PULS immediate)
+	case 0x37:	addCycles(5);	pulu(AM_immediate_byte());							break;		// PUL (PULU immediate)
 
 	// ROL
-	case 0x09:	addCycles(6);	BUS().write(rol(AM_direct_byte()));		break;		// ROL (direct)
-	case 0x49:	addCycles(2);	A() = rol(A());							break;		// ROL (ROLA inherent)
-	case 0x59:	addCycles(2);	B() = rol(B());							break;		// ROL (ROLB inherent)
-	case 0x69:	addCycles(6);	BUS().write(rol(AM_indexed_byte()));	break;		// ROL (indexed)
-	case 0x79:	addCycles(7);	BUS().write(rol(AM_extended_byte()));	break;		// ROL (extended)
+	case 0x09:	addCycles(6);	BUS().write(rol(AM_direct_byte()));					break;		// ROL (direct)
+	case 0x49:	addCycles(2);	A() = rol(A());										break;		// ROL (ROLA inherent)
+	case 0x59:	addCycles(2);	B() = rol(B());										break;		// ROL (ROLB inherent)
+	case 0x69:	addCycles(6);	BUS().write(rol(AM_indexed_byte()));				break;		// ROL (indexed)
+	case 0x79:	addCycles(7);	BUS().write(rol(AM_extended_byte()));				break;		// ROL (extended)
 
 	// ROR
-	case 0x06:	addCycles(6);	BUS().write(ror(AM_direct_byte()));		break;		// ROR (direct)
-	case 0x46:	addCycles(2);	A() = ror(A());							break;		// ROR (RORA inherent)
-	case 0x56:	addCycles(2);	B() = ror(B());							break;		// ROR (RORB inherent)
-	case 0x66:	addCycles(6);	BUS().write(ror(AM_indexed_byte()));	break;		// ROR (indexed)
-	case 0x76:	addCycles(7);	BUS().write(ror(AM_extended_byte()));	break;		// ROR (extended)
+	case 0x06:	addCycles(6);	BUS().write(ror(AM_direct_byte()));					break;		// ROR (direct)
+	case 0x46:	addCycles(2);	A() = ror(A());										break;		// ROR (RORA inherent)
+	case 0x56:	addCycles(2);	B() = ror(B());										break;		// ROR (RORB inherent)
+	case 0x66:	addCycles(6);	BUS().write(ror(AM_indexed_byte()));				break;		// ROR (indexed)
+	case 0x76:	addCycles(7);	BUS().write(ror(AM_extended_byte()));				break;		// ROR (extended)
 
 	// RTI
-	case 0x3B:	addCycles(6);	rti();									break;		// RTI (inherent)
+	case 0x3B:	addCycles(6);	rti();												break;		// RTI (inherent)
 
 	// RTS
-	case 0x39:	addCycles(5);	rts();									break;		// RTS (inherent)
+	case 0x39:	addCycles(5);	rts();												break;		// RTS (inherent)
 
 	// SBC
 
@@ -315,7 +315,7 @@ int EightBit::mc6809::executeUnprefixed(uint8_t opcode) {
 	case 0xf2:	addCycles(5);	break;		// SBC (SBCB extended)
 
 	// SEX
-	case 0x1d:	addCycles(2);	A() = sex(B());							break;		// SEX (inherent)
+	case 0x1d:	addCycles(2);	A() = sex(B());										break;		// SEX (inherent)
 
 	// ST
 
@@ -365,13 +365,13 @@ int EightBit::mc6809::executeUnprefixed(uint8_t opcode) {
 	case 0xb3:	addCycles(7);	break;		// SUB (SUBD extended)
 
 	// SWI
-	case 0x3f:	addCycles(19);	swi();									break;		// SWI (inherent)
+	case 0x3f:	addCycles(19);	swi();												break;		// SWI (inherent)
 
 	// SYNC
-	case 0x13:	addCycles(4);	halt();									break;		// SYNC (inherent)
+	case 0x13:	addCycles(4);	halt();												break;		// SYNC (inherent)
 
 	// TFR
-	case 0x1f:	addCycles(6);	tfr(AM_immediate_byte());				break;		// TFR (immediate)
+	case 0x1f:	addCycles(6);	tfr(AM_immediate_byte());							break;		// TFR (immediate)
 
 	// TST
 	case 0x0d:	addCycles(6);	break;		// TST (direct)
@@ -382,26 +382,26 @@ int EightBit::mc6809::executeUnprefixed(uint8_t opcode) {
 
 	// Branching
 
-	case 0x16:	addCycles(5);	jump(Address_relative_word());			break;		// BRA (LBRA relative)
-	case 0x17:	addCycles(9);	call(Address_relative_word());			break;		// BSR (LBSR relative)
-	case 0x20:	addCycles(3);	jump(Address_relative_byte());			break;		// BRA (relative)
-	case 0x21:	addCycles(3);	Address_relative_byte();				break;		// BRN (relative)
-	case 0x22:	addCycles(3);	branchShort(BHI());						break;		// BHI (relative)
-	case 0x23:	addCycles(3);	branchShort(BLS());						break;		// BLS (relative)
-	case 0x24:	addCycles(3);	branchShort(!carry());					break;		// BCC (relative)
-	case 0x25:	addCycles(3);	branchShort(carry());					break;		// BCS (relative)
-	case 0x26:	addCycles(3);	branchShort(!zero());					break;		// BNE (relative)
-	case 0x27:	addCycles(3);	branchShort(zero());					break;		// BEQ (relative)
-	case 0x28: 	addCycles(3);	branchShort(!overflow());				break;		// BVC (relative)
-	case 0x29: 	addCycles(3);	branchShort(overflow());				break;		// BVS (relative)
-	case 0x2a: 	addCycles(3);	branchShort(!negative());				break;		// BPL (relative)
-	case 0x2b: 	addCycles(3);	branchShort(negative());				break;		// BMI (relative)
-	case 0x2c:	addCycles(3);	branchShort(BGE());						break;		// BGE (relative)
-	case 0x2d:	addCycles(3);	branchShort(BLT());						break;		// BLT (relative)
-	case 0x2e:	addCycles(3);	branchShort(BGT());						break;		// BGT (relative)
-	case 0x2f:	addCycles(3);	branchShort(BLE());						break;		// BLE (relative)
+	case 0x16:	addCycles(5);	jump(Address_relative_word());						break;		// BRA (LBRA relative)
+	case 0x17:	addCycles(9);	call(Address_relative_word());						break;		// BSR (LBSR relative)
+	case 0x20:	addCycles(3);	jump(Address_relative_byte());						break;		// BRA (relative)
+	case 0x21:	addCycles(3);	Address_relative_byte();							break;		// BRN (relative)
+	case 0x22:	addCycles(3);	branchShort(BHI());									break;		// BHI (relative)
+	case 0x23:	addCycles(3);	branchShort(BLS());									break;		// BLS (relative)
+	case 0x24:	addCycles(3);	branchShort(!carry());								break;		// BCC (relative)
+	case 0x25:	addCycles(3);	branchShort(carry());								break;		// BCS (relative)
+	case 0x26:	addCycles(3);	branchShort(!zero());								break;		// BNE (relative)
+	case 0x27:	addCycles(3);	branchShort(zero());								break;		// BEQ (relative)
+	case 0x28: 	addCycles(3);	branchShort(!overflow());							break;		// BVC (relative)
+	case 0x29: 	addCycles(3);	branchShort(overflow());							break;		// BVS (relative)
+	case 0x2a: 	addCycles(3);	branchShort(!negative());							break;		// BPL (relative)
+	case 0x2b: 	addCycles(3);	branchShort(negative());							break;		// BMI (relative)
+	case 0x2c:	addCycles(3);	branchShort(BGE());									break;		// BGE (relative)
+	case 0x2d:	addCycles(3);	branchShort(BLT());									break;		// BLT (relative)
+	case 0x2e:	addCycles(3);	branchShort(BGT());									break;		// BGT (relative)
+	case 0x2f:	addCycles(3);	branchShort(BLE());									break;		// BLE (relative)
 
-	case 0x8d:	addCycles(7);	call(Address_relative_byte());			break;		// BSR (relative)
+	case 0x8d:	addCycles(7);	call(Address_relative_byte());						break;		// BSR (relative)
 
 	default:
 		UNREACHABLE;
@@ -426,48 +426,48 @@ int EightBit::mc6809::execute10(uint8_t opcode) {
 	// CMP
 
 	// CMPD
-	case 0x83:	addCycles(5);	cmp(D(), AM_immediate_word());			break;		// CMP (CMPD, immediate)
-	case 0x93:	addCycles(7);	cmp(D(), AM_direct_word());				break;		// CMP (CMPD, direct)
-	case 0xa3:	addCycles(7);	cmp(D(), AM_indexed_word());			break;		// CMP (CMPD, indexed)
-	case 0xb3:	addCycles(8);	cmp(D(), AM_extended_word());			break;		// CMP (CMPD, extended)
+	case 0x83:	addCycles(5);	cmp(D(), AM_immediate_word());						break;		// CMP (CMPD, immediate)
+	case 0x93:	addCycles(7);	cmp(D(), AM_direct_word());							break;		// CMP (CMPD, direct)
+	case 0xa3:	addCycles(7);	cmp(D(), AM_indexed_word());						break;		// CMP (CMPD, indexed)
+	case 0xb3:	addCycles(8);	cmp(D(), AM_extended_word());						break;		// CMP (CMPD, extended)
 
 	// CMPY
-	case 0x8c:	addCycles(5);	cmp(Y(), AM_immediate_word());			break;		// CMP (CMPY, immediate)
-	case 0x9c:	addCycles(7);	cmp(Y(), AM_direct_word());				break;		// CMP (CMPY, direct)
-	case 0xac:	addCycles(7);	cmp(Y(), AM_indexed_word());			break;		// CMP (CMPY, indexed)
-	case 0xbc:	addCycles(8);	cmp(Y(), AM_extended_word());			break;		// CMP (CMPY, extended)
+	case 0x8c:	addCycles(5);	cmp(Y(), AM_immediate_word());						break;		// CMP (CMPY, immediate)
+	case 0x9c:	addCycles(7);	cmp(Y(), AM_direct_word());							break;		// CMP (CMPY, direct)
+	case 0xac:	addCycles(7);	cmp(Y(), AM_indexed_word());						break;		// CMP (CMPY, indexed)
+	case 0xbc:	addCycles(8);	cmp(Y(), AM_extended_word());						break;		// CMP (CMPY, extended)
 
 	// LD
 
 	// LDS
-	case 0xce:	addCycles(4);	S() = ld(AM_immediate_word());			break;		// LD (LDS immediate)
-	case 0xde:	addCycles(6);	S() = ld(AM_direct_word());				break;		// LD (LDS direct)
-	case 0xee:	addCycles(6);	S() = ld(AM_indexed_word());			break;		// LD (LDS indexed)
-	case 0xfe:	addCycles(7);	S() = ld(AM_extended_word());			break;		// LD (LDS extended)
+	case 0xce:	addCycles(4);	S() = ld(AM_immediate_word());						break;		// LD (LDS immediate)
+	case 0xde:	addCycles(6);	S() = ld(AM_direct_word());							break;		// LD (LDS direct)
+	case 0xee:	addCycles(6);	S() = ld(AM_indexed_word());						break;		// LD (LDS indexed)
+	case 0xfe:	addCycles(7);	S() = ld(AM_extended_word());						break;		// LD (LDS extended)
 
 	// LDY
-	case 0x8e:	addCycles(4);	Y() = ld(AM_immediate_word());			break;		// LD (LDY immediate)
-	case 0x9e:	addCycles(6);	Y() = ld(AM_direct_word());				break;		// LD (LDY direct)
-	case 0xae:	addCycles(6);	Y() = ld(AM_indexed_word());			break;		// LD (LDY indexed)
-	case 0xbe:	addCycles(7);	Y() = ld(AM_extended_word());			break;		// LD (LDY extended)
+	case 0x8e:	addCycles(4);	Y() = ld(AM_immediate_word());						break;		// LD (LDY immediate)
+	case 0x9e:	addCycles(6);	Y() = ld(AM_direct_word());							break;		// LD (LDY direct)
+	case 0xae:	addCycles(6);	Y() = ld(AM_indexed_word());						break;		// LD (LDY indexed)
+	case 0xbe:	addCycles(7);	Y() = ld(AM_extended_word());						break;		// LD (LDY extended)
 
 	// Branching
 
-	case 0x21:	addCycles(5);	Address_relative_word();				break;		// BRN (LBRN relative)
-	case 0x22:	addCycles(5);	if (branchLong(BHI())) addCycle();		break;		// BHI (LBHI relative)
-	case 0x23:	addCycles(5);	if (branchLong(BLS())) addCycle();		break;		// BLS (LBLS relative)
-	case 0x24:	addCycles(5);	if (branchLong(!carry())) addCycle();	break;		// BCC (LBCC relative)
-	case 0x25:	addCycles(5);	if (branchLong(carry())) addCycle();	break;		// BCS (LBCS relative)
-	case 0x26:	addCycles(5);	if (branchLong(!zero())) addCycle();	break;		// BNE (LBNE relative)
-	case 0x27:	addCycles(5);	if (branchLong(zero())) addCycle();		break;		// BEQ (LBEQ relative)
-	case 0x28:	addCycles(5);	if (branchLong(!overflow())) addCycle();break;		// BVC (LBVC relative)
-	case 0x29:	addCycles(5);	if (branchLong(overflow())) addCycle();	break;		// BVS (LBVS relative)
-	case 0x2a:	addCycles(5);	if (branchLong(!negative())) addCycle();break;		// BPL (LBPL relative)
-	case 0x2b: 	addCycles(5);	if (branchLong(negative())) addCycle();	break;		// BMI (LBMI relative)
-	case 0x2c:	addCycles(5);	if (branchLong(BGE())) addCycle();		break;		// BGE (LBGE relative)
-	case 0x2d:	addCycles(5);	if (branchLong(BLT())) addCycle();		break;		// BLT (LBLT relative)
-	case 0x2e:	addCycles(5);	if (branchLong(BGT())) addCycle();		break;		// BGT (LBGT relative)
-	case 0x2f:	addCycles(5);	if (branchLong(BLE())) addCycle();		break;		// BLE (LBLE relative)
+	case 0x21:	addCycles(5);	Address_relative_word();							break;		// BRN (LBRN relative)
+	case 0x22:	addCycles(5);	if (branchLong(BHI())) addCycle();					break;		// BHI (LBHI relative)
+	case 0x23:	addCycles(5);	if (branchLong(BLS())) addCycle();					break;		// BLS (LBLS relative)
+	case 0x24:	addCycles(5);	if (branchLong(!carry())) addCycle();				break;		// BCC (LBCC relative)
+	case 0x25:	addCycles(5);	if (branchLong(carry())) addCycle();				break;		// BCS (LBCS relative)
+	case 0x26:	addCycles(5);	if (branchLong(!zero())) addCycle();				break;		// BNE (LBNE relative)
+	case 0x27:	addCycles(5);	if (branchLong(zero())) addCycle();					break;		// BEQ (LBEQ relative)
+	case 0x28:	addCycles(5);	if (branchLong(!overflow())) addCycle();			break;		// BVC (LBVC relative)
+	case 0x29:	addCycles(5);	if (branchLong(overflow())) addCycle();				break;		// BVS (LBVS relative)
+	case 0x2a:	addCycles(5);	if (branchLong(!negative())) addCycle();			break;		// BPL (LBPL relative)
+	case 0x2b: 	addCycles(5);	if (branchLong(negative())) addCycle();				break;		// BMI (LBMI relative)
+	case 0x2c:	addCycles(5);	if (branchLong(BGE())) addCycle();					break;		// BGE (LBGE relative)
+	case 0x2d:	addCycles(5);	if (branchLong(BLT())) addCycle();					break;		// BLT (LBLT relative)
+	case 0x2e:	addCycles(5);	if (branchLong(BGT())) addCycle();					break;		// BGT (LBGT relative)
+	case 0x2f:	addCycles(5);	if (branchLong(BLE())) addCycle();					break;		// BLE (LBLE relative)
 
 	// STS
 	case 0xdf:	addCycles(6);	Processor::setWord(Address_direct(), st(S()));		break;		// ST (STS direct)
@@ -480,7 +480,7 @@ int EightBit::mc6809::execute10(uint8_t opcode) {
 	case 0xbf:	addCycles(7);	Processor::setWord(Address_extended(), st(Y()));	break;		// ST (STY extended)
 
 	// SWI
-	case 0x3f:	addCycles(20);	swi2();									break;		// SWI (SWI2 inherent)
+	case 0x3f:	addCycles(20);	swi2();												break;		// SWI (SWI2 inherent)
 
 	default:
 		UNREACHABLE;
@@ -503,19 +503,19 @@ int EightBit::mc6809::execute11(uint8_t opcode) {
 	// CMP
 
 	// CMPU
-	case 0x83:	addCycles(5);	cmp(U(), AM_immediate_word());			break;		// CMP (CMPU, immediate)
-	case 0x93:	addCycles(7);	cmp(U(), AM_direct_word());				break;		// CMP (CMPU, direct)
-	case 0xa3:	addCycles(7);	cmp(U(), AM_indexed_word());			break;		// CMP (CMPU, indexed)
-	case 0xb3:	addCycles(8);	cmp(U(), AM_extended_word());			break;		// CMP (CMPU, extended)
+	case 0x83:	addCycles(5);	cmp(U(), AM_immediate_word());						break;		// CMP (CMPU, immediate)
+	case 0x93:	addCycles(7);	cmp(U(), AM_direct_word());							break;		// CMP (CMPU, direct)
+	case 0xa3:	addCycles(7);	cmp(U(), AM_indexed_word());						break;		// CMP (CMPU, indexed)
+	case 0xb3:	addCycles(8);	cmp(U(), AM_extended_word());						break;		// CMP (CMPU, extended)
 
 	// CMPS
-	case 0x8c:	addCycles(5);	cmp(S(), AM_immediate_word());			break;		// CMP (CMPS, immediate)
-	case 0x9c:	addCycles(7);	cmp(S(), AM_direct_word());				break;		// CMP (CMPS, direct)
-	case 0xac:	addCycles(7);	cmp(S(), AM_indexed_word());			break;		// CMP (CMPS, indexed)
-	case 0xbc:	addCycles(8);	cmp(S(), AM_extended_word());			break;		// CMP (CMPS, extended)
+	case 0x8c:	addCycles(5);	cmp(S(), AM_immediate_word());						break;		// CMP (CMPS, immediate)
+	case 0x9c:	addCycles(7);	cmp(S(), AM_direct_word());							break;		// CMP (CMPS, direct)
+	case 0xac:	addCycles(7);	cmp(S(), AM_indexed_word());						break;		// CMP (CMPS, indexed)
+	case 0xbc:	addCycles(8);	cmp(S(), AM_extended_word());						break;		// CMP (CMPS, extended)
 
 	// SWI
-	case 0x3f:	addCycles(20);	swi3();									break;		// SWI (SWI3 inherent)
+	case 0x3f:	addCycles(20);	swi3();												break;		// SWI (SWI3 inherent)
 
 	default:
 		UNREACHABLE;