diff --git a/src/emucore/M6502.ins b/src/emucore/M6502.ins
index d4f7aa343..e84867a07 100644
--- a/src/emucore/M6502.ins
+++ b/src/emucore/M6502.ins
@@ -14,7 +14,7 @@
 // See the file "License.txt" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: M6502.m4 2138 2010-10-03 00:23:13Z stephena $
+// $Id: M6502.m4 2145 2010-10-10 20:24:22Z stephena $
 //============================================================================
 
 /** 
@@ -24,7 +24,7 @@
     'm4 M6502.m4 > M6502.ins'
 
   @author  Bradford W. Mott
-  @version $Id: M6502.m4 2138 2010-10-03 00:23:13Z stephena $
+  @version $Id: M6502.m4 2145 2010-10-10 20:24:22Z stephena $
 */
 
 #ifndef NOTSAMEPAGE
@@ -865,7 +865,7 @@ case 0x90:
 {
   if(!C)
   {
-    peek(PC, DISASM_NONE);
+    peek(PC, DISASM_CODE);
     uInt16 address = PC + (Int8)operand;
     if(NOTSAMEPAGE(PC, address))
       peek((PC & 0xFF00) | (address & 0x00FF), DISASM_DATA);
@@ -882,7 +882,7 @@ case 0xb0:
 {
   if(C)
   {
-    peek(PC, DISASM_NONE);
+    peek(PC, DISASM_CODE);
     uInt16 address = PC + (Int8)operand;
     if(NOTSAMEPAGE(PC, address))
       peek((PC & 0xFF00) | (address & 0x00FF), DISASM_DATA);
@@ -899,7 +899,7 @@ case 0xf0:
 {
   if(!notZ)
   {
-    peek(PC, DISASM_NONE);
+    peek(PC, DISASM_CODE);
     uInt16 address = PC + (Int8)operand;
     if(NOTSAMEPAGE(PC, address))
       peek((PC & 0xFF00) | (address & 0x00FF), DISASM_DATA);
@@ -941,7 +941,7 @@ case 0x30:
 {
   if(N)
   {
-    peek(PC, DISASM_NONE);
+    peek(PC, DISASM_CODE);
     uInt16 address = PC + (Int8)operand;
     if(NOTSAMEPAGE(PC, address))
       peek((PC & 0xFF00) | (address & 0x00FF), DISASM_DATA);
@@ -958,7 +958,7 @@ case 0xD0:
 {
   if(notZ)
   {
-    peek(PC, DISASM_NONE);
+    peek(PC, DISASM_CODE);
     uInt16 address = PC + (Int8)operand;
     if(NOTSAMEPAGE(PC, address))
       peek((PC & 0xFF00) | (address & 0x00FF), DISASM_DATA);
@@ -975,7 +975,7 @@ case 0x10:
 {
   if(!N)
   {
-    peek(PC, DISASM_NONE);
+    peek(PC, DISASM_CODE);
     uInt16 address = PC + (Int8)operand;
     if(NOTSAMEPAGE(PC, address))
       peek((PC & 0xFF00) | (address & 0x00FF), DISASM_DATA);
@@ -1010,7 +1010,7 @@ case 0x50:
 {
   if(!V)
   {
-    peek(PC, DISASM_NONE);
+    peek(PC, DISASM_CODE);
     uInt16 address = PC + (Int8)operand;
     if(NOTSAMEPAGE(PC, address))
       peek((PC & 0xFF00) | (address & 0x00FF), DISASM_DATA);
@@ -1027,7 +1027,7 @@ case 0x70:
 {
   if(V)
   {
-    peek(PC, DISASM_NONE);
+    peek(PC, DISASM_CODE);
     uInt16 address = PC + (Int8)operand;
     if(NOTSAMEPAGE(PC, address))
       peek((PC & 0xFF00) | (address & 0x00FF), DISASM_DATA);
diff --git a/src/emucore/M6502.m4 b/src/emucore/M6502.m4
index 30ea98fda..b8eb8c1e3 100644
--- a/src/emucore/M6502.m4
+++ b/src/emucore/M6502.m4
@@ -230,7 +230,7 @@ define(M6502_INDIRECTY_READMODIFYWRITE, `{
 define(M6502_BCC, `{
   if(!C)
   {
-    peek(PC, DISASM_NONE);
+    peek(PC, DISASM_CODE);
     uInt16 address = PC + (Int8)operand;
     if(NOTSAMEPAGE(PC, address))
       peek((PC & 0xFF00) | (address & 0x00FF), DISASM_DATA);
@@ -241,7 +241,7 @@ define(M6502_BCC, `{
 define(M6502_BCS, `{
   if(C)
   {
-    peek(PC, DISASM_NONE);
+    peek(PC, DISASM_CODE);
     uInt16 address = PC + (Int8)operand;
     if(NOTSAMEPAGE(PC, address))
       peek((PC & 0xFF00) | (address & 0x00FF), DISASM_DATA);
@@ -252,7 +252,7 @@ define(M6502_BCS, `{
 define(M6502_BEQ, `{
   if(!notZ)
   {
-    peek(PC, DISASM_NONE);
+    peek(PC, DISASM_CODE);
     uInt16 address = PC + (Int8)operand;
     if(NOTSAMEPAGE(PC, address))
       peek((PC & 0xFF00) | (address & 0x00FF), DISASM_DATA);
@@ -263,7 +263,7 @@ define(M6502_BEQ, `{
 define(M6502_BMI, `{
   if(N)
   {
-    peek(PC, DISASM_NONE);
+    peek(PC, DISASM_CODE);
     uInt16 address = PC + (Int8)operand;
     if(NOTSAMEPAGE(PC, address))
       peek((PC & 0xFF00) | (address & 0x00FF), DISASM_DATA);
@@ -274,7 +274,7 @@ define(M6502_BMI, `{
 define(M6502_BNE, `{
   if(notZ)
   {
-    peek(PC, DISASM_NONE);
+    peek(PC, DISASM_CODE);
     uInt16 address = PC + (Int8)operand;
     if(NOTSAMEPAGE(PC, address))
       peek((PC & 0xFF00) | (address & 0x00FF), DISASM_DATA);
@@ -285,7 +285,7 @@ define(M6502_BNE, `{
 define(M6502_BPL, `{
   if(!N)
   {
-    peek(PC, DISASM_NONE);
+    peek(PC, DISASM_CODE);
     uInt16 address = PC + (Int8)operand;
     if(NOTSAMEPAGE(PC, address))
       peek((PC & 0xFF00) | (address & 0x00FF), DISASM_DATA);
@@ -296,7 +296,7 @@ define(M6502_BPL, `{
 define(M6502_BVC, `{
   if(!V)
   {
-    peek(PC, DISASM_NONE);
+    peek(PC, DISASM_CODE);
     uInt16 address = PC + (Int8)operand;
     if(NOTSAMEPAGE(PC, address))
       peek((PC & 0xFF00) | (address & 0x00FF), DISASM_DATA);
@@ -307,7 +307,7 @@ define(M6502_BVC, `{
 define(M6502_BVS, `{
   if(V)
   {
-    peek(PC, DISASM_NONE);
+    peek(PC, DISASM_CODE);
     uInt16 address = PC + (Int8)operand;
     if(NOTSAMEPAGE(PC, address))
       peek((PC & 0xFF00) | (address & 0x00FF), DISASM_DATA);