diff --git a/doc/notes.txt b/doc/notes.txt
index b63f2152..6d8cd962 100644
--- a/doc/notes.txt
+++ b/doc/notes.txt
@@ -18,7 +18,6 @@ TODO:
 - break on BRK/illegal opcode?
 - multiple breakpoints, expression breakpoints
 - better disasm/listing selection
-- disasm for z80
 - watchpoints
 - breakpoints
 - debug inspector
diff --git a/index.html b/index.html
index 2c5904ba..dbf30529 100644
--- a/index.html
+++ b/index.html
@@ -149,7 +149,7 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
     <button id="dbg_memory" type="submit" title="Show Memory" style="display:none"><span class="glyphicon glyphicon-sunglasses" aria-hidden="true"></span></button>
     <button id="dbg_profile" type="submit" title="Show Profile" style="display:none"><span class="glyphicon glyphicon-stats" aria-hidden="true"></span></button>
     <button id="dbg_bitmap" type="submit" title="Edit Bitmap"><span class="glyphicon glyphicon-camera" aria-hidden="true"></span></button>
-    <button id="dbg_record" type="submit" title="Start/Stop Replay Recording"><span class="glyphicon glyphicon-record" aria-hidden="true"></span></button>
+    <button id="dbg_record" type="submit" title="Start/Stop Replay Recording" style="display:none"><span class="glyphicon glyphicon-record" aria-hidden="true"></span></button>
   </span>
   <span class="dropdown" style="float:right">
     <a class="btn btn-secondary dropdown-toggle" id="booksMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
diff --git a/javatari.js b/javatari.js
index bd17384f..4cd5b798 160000
--- a/javatari.js
+++ b/javatari.js
@@ -1 +1 @@
-Subproject commit bd17384fd2c6b020497e5e6a625a1b8130e39ea1
+Subproject commit 4cd5b798f534336d09a80e8a1fa962959f401359
diff --git a/src/baseplatform.ts b/src/baseplatform.ts
index 7367ff6e..1416afaf 100644
--- a/src/baseplatform.ts
+++ b/src/baseplatform.ts
@@ -29,7 +29,8 @@ export interface EmuControlsState {
 }
 export type DisasmLine = {
   line:string,
-  nbytes:number
+  nbytes:number,
+  isaddr:boolean
 };
 
 export interface Platform {
diff --git a/src/cpu/disasm6502.ts b/src/cpu/disasm6502.ts
index 7a7cfb60..9657c323 100644
--- a/src/cpu/disasm6502.ts
+++ b/src/cpu/disasm6502.ts
@@ -260,18 +260,22 @@ var OPS_6502 = [
   {mn:"ISB",am:"AAAA,x",nb:3,il:1,c1:7,c2:1}, // FF
 ];
 
-export function disassemble6502(pc:number, b0:number, b1:number, b2:number) : {line:string, nbytes:number} {
+export function disassemble6502(pc:number, b0:number, b1:number, b2:number) : {line:string, nbytes:number, isaddr:boolean} {
 
   var op = OPS_6502[b0];
   var s = op.mn;
   var am = op.am;
+  var isaddr = false;
   if (am == 'branch') {
     var offset = (b1 < 0x80) ? (pc+2+b1) : (pc+2-(256-b1));
     offset &= 0xffff;
     am = '$'+hex(offset, 4);
+    isaddr = true;
   } else {
     am = am.replace('aa','$'+hex(b1, 2));
     am = am.replace('AAAA','$'+hex(b1+(b2<<8), 4));
+    if (am.indexOf('#') < 0 && am.indexOf('$') >= 0)
+      isaddr = true;
   }
-  return {line:op.mn + " " + am, nbytes:op.nb};
+  return {line:op.mn + " " + am, nbytes:op.nb, isaddr:isaddr};
 };
diff --git a/src/cpu/disasmz80.ts b/src/cpu/disasmz80.ts
index 8aaf7bb1..dc8b4b34 100644
--- a/src/cpu/disasmz80.ts
+++ b/src/cpu/disasmz80.ts
@@ -1,16 +1,15 @@
 
 import { hex } from "../util";
 
-const Z80_OPS = ["nop","ld bc,xx","ld (bc),a","inc bc","inc b","dec b","ld b,x","rlca","ex af,af'","add hl,bc","ld a,(bc)","dec bc","inc c","dec c","ld c,x","rrca","djnz x","ld de,xx","ld (de),a","inc de","inc d","dec d","ld d,x","rla","jr x","add hl,de","ld a,(de)","dec de","inc e","dec e","ld e,x","rra","jr nz,x","ld hl,xx","ld (xx),hl","inc hl","inc h","dec h","ld h,x","daa","jr z,x","add hl,hl","ld hl,(xx)","dec hl","inc l","dec l","ld l,x","cpl","jr nc,x","ld sp,xx","ld (xx),a","inc sp","inc (hl)","dec (hl)","ld (hl),x","scf","jr c,x","add hl,sp","ld a,(xx)","dec sp","inc a","dec a","ld a,x","ccf","ld b,b","ld b,c","ld b,d","ld b,e","ld b,h","ld b,l","ld b,(hl)","ld b,a","ld c,b","ld c,c","ld c,d","ld c,e","ld c,h","ld c,l","ld c,(hl)","ld c,a","ld d,b","ld d,c","ld d,d","ld d,e","ld d,h","ld d,l","ld d,(hl)","ld d,a","ld e,b","ld e,c","ld e,d","ld e,e","ld e,h","ld e,l","ld e,(hl)","ld e,a","ld h,b","ld h,c","ld h,d","ld h,e","ld h,h","ld h,l","ld h,(hl)","ld h,a","ld l,b","ld l,c","ld l,d","ld l,e","ld l,h","ld l,l","ld l,(hl)","ld l,a","ld (hl),b","ld (hl),c","ld (hl),d","ld (hl),e","ld (hl),h","ld (hl),l","","ld (hl),a","ld a,b","ld a,c","ld a,d","ld a,e","ld a,h","ld a,l","ld a,(hl)","ld a,a","add a,b","add a,c","add a,d","add a,e","add a,h","add a,l","add a,(hl)","add a,a","adc a,b","adc a,c","adc a,d","adc a,e","adc a,h","adc a,l","adc a,(hl)","adc a,a","sub b","sub c","sub d","sub e","sub h","sub l","sub (hl)","sub a","sbc a,b","sbc a,c","sbc a,d","sbc a,e","sbc a,h","sbc a,l","sbc a,(hl)","sbc a,a","and b","and c","and d","and e","and h","and l","and (hl)","and a","xor b","xor c","xor d","xor e","xor h","xor l","xor (hl)","xor a","or b","or c","or d","or e","or h","or l","or (hl)","or a","cp b","cp c","cp d","cp e","cp h","cp l","cp (hl)","cp a","ret nz","pop bc","jp nz,xx","jp xx","call nz,xx","push bc","add a,x","rst 00h","ret z","","jp z,xx","xxBITxx","call z,xx","call xx","adc a,x","rst 08h","ret nc","pop de","jp nc,xx","out (x),a","call nc,xx","push de","sub x","rst 10h","ret c","exx","jp c,xx","in a,(x)","call c,xx","xxIXxx","sbc a,x","rst 18h","ret po","pop hl","jp po,xx","ex (sp),hl","call po,xx","push hl","and x","rst 20h","ret pe","jp (hl)","jp pe,xx","ex de,hl","call pe,xx","xx80xx","xor x","rst 28h","ret p","pop af","jp p,xx","di","call p,xx","push af","or x","rst 30h","ret m","ld sp,hl","jp m,xx","ei","call m,xx","xxIYxx","cp x","rst 38h"];
+const Z80_OPS = ["nop","ld bc,xx","ld (bc),a","inc bc","inc b","dec b","ld b,x","rlca","ex af,af'","add hl,bc","ld a,(bc)","dec bc","inc c","dec c","ld c,x","rrca","djnz x","ld de,xx","ld (de),a","inc de","inc d","dec d","ld d,x","rla","jr x","add hl,de","ld a,(de)","dec de","inc e","dec e","ld e,x","rra","jr nz,x","ld hl,xx","ld (xx),hl","inc hl","inc h","dec h","ld h,x","daa","jr z,x","add hl,hl","ld hl,(xx)","dec hl","inc l","dec l","ld l,x","cpl","jr nc,x","ld sp,xx","ld (xx),a","inc sp","inc (hl)","dec (hl)","ld (hl),x","scf","jr c,x","add hl,sp","ld a,(xx)","dec sp","inc a","dec a","ld a,x","ccf","ld b,b","ld b,c","ld b,d","ld b,e","ld b,h","ld b,l","ld b,(hl)","ld b,a","ld c,b","ld c,c","ld c,d","ld c,e","ld c,h","ld c,l","ld c,(hl)","ld c,a","ld d,b","ld d,c","ld d,d","ld d,e","ld d,h","ld d,l","ld d,(hl)","ld d,a","ld e,b","ld e,c","ld e,d","ld e,e","ld e,h","ld e,l","ld e,(hl)","ld e,a","ld h,b","ld h,c","ld h,d","ld h,e","ld h,h","ld h,l","ld h,(hl)","ld h,a","ld l,b","ld l,c","ld l,d","ld l,e","ld l,h","ld l,l","ld l,(hl)","ld l,a","ld (hl),b","ld (hl),c","ld (hl),d","ld (hl),e","ld (hl),h","ld (hl),l","halt","ld (hl),a","ld a,b","ld a,c","ld a,d","ld a,e","ld a,h","ld a,l","ld a,(hl)","ld a,a","add a,b","add a,c","add a,d","add a,e","add a,h","add a,l","add a,(hl)","add a,a","adc a,b","adc a,c","adc a,d","adc a,e","adc a,h","adc a,l","adc a,(hl)","adc a,a","sub b","sub c","sub d","sub e","sub h","sub l","sub (hl)","sub a","sbc a,b","sbc a,c","sbc a,d","sbc a,e","sbc a,h","sbc a,l","sbc a,(hl)","sbc a,a","and b","and c","and d","and e","and h","and l","and (hl)","and a","xor b","xor c","xor d","xor e","xor h","xor l","xor (hl)","xor a","or b","or c","or d","or e","or h","or l","or (hl)","or a","cp b","cp c","cp d","cp e","cp h","cp l","cp (hl)","cp a","ret nz","pop bc","jp nz,xx","jp xx","call nz,xx","push bc","add a,x","rst 00h","ret z","ret","jp z,xx","xxBITxx","call z,xx","call xx","adc a,x","rst 08h","ret nc","pop de","jp nc,xx","out (x),a","call nc,xx","push de","sub x","rst 10h","ret c","exx","jp c,xx","in a,(x)","call c,xx","xxIXxx","sbc a,x","rst 18h","ret po","pop hl","jp po,xx","ex (sp),hl","call po,xx","push hl","and x","rst 20h","ret pe","jp (hl)","jp pe,xx","ex de,hl","call pe,xx","xx80xx","xor x","rst 28h","ret p","pop af","jp p,xx","di","call p,xx","push af","or x","rst 30h","ret m","ld sp,hl","jp m,xx","ei","call m,xx","xxIYxx","cp x","rst 38h"];
 const Z80_OPS_ED = ["in b,(c)","out (c),b","sbc hl,bc","ld (xx),bc","neg","retn","im 0","ld i,a","in c,(c)","out (c),c","adc hl,bc","ld bc,(xx)","neg","reti","","ld r,a","in d,(c)","out (c),d","sbc hl,de","ld (xx),de","neg","retn","im 1","ld a,i","in e,(c)","out (c),e","adc hl,de","ld de,(xx)","neg","retn","im 2","ld a,r","in h,(c)","out (c),h","sbc hl,hl","ld (xx),hl","neg","retn","","rrd","in l,(c)","out (c),l","adc hl,hl","ld hl,(xx)","neg","retn","","rld","in f,(c)","out (c),f","sbc hl,sp","ld (xx),sp","neg","retn","","","in a,(c)","out (c),a","adc hl,sp","ld sp,(xx)","neg","reti","","","ldi","cpi","ini","outi","","","","","ldd","cpd","ind","outd","","","","","ldir","cpir","inir","otir","","","","","lddr","cpdr","indr","otdr","","","",""];
 const Z80_OPS_CB = ["rlc b","rlc c","rlc d","rlc e","rlc h","rlc l","rlc (hl)","rlc a","rrc b","rrc c","rrc d","rrc e","rrc h","rrc l","rrc (hl)","rrc a","rl b","rl c","rl d","rl e","rl h","rl l","rl (hl)","rl a","rr b","rr c","rr d","rr e","rr h","rr l","rr (hl)","rr a","sla b","sla c","sla d","sla e","sla h","sla l","sla (hl)","sla a","sra b","sra c","sra d","sra e","sra h","sra l","sra (hl)","sra a","sll b","sll c","sll d","sll e","sll h","sll l","sll (hl)","sll a","srl b","srl c","srl d","srl e","srl h","srl l","srl (hl)","srl a","bit 0,b","bit 0,c","bit 0,d","bit 0,e","bit 0,h","bit 0,l","bit 0,(hl)","bit 0,a","bit 1,b","bit 1,c","bit 1,d","bit 1,e","bit 1,h","bit 1,l","bit 1,(hl)","bit 1,a","bit 2,b","bit 2,c","bit 2,d","bit 2,e","bit 2,h","bit 2,l","bit 2,(hl)","bit 2,a","bit 3,b","bit 3,c","bit 3,d","bit 3,e","bit 3,h","bit 3,l","bit 3,(hl)","bit 3,a","bit 4,b","bit 4,c","bit 4,d","bit 4,e","bit 4,h","bit 4,l","bit 4,(hl)","bit 4,a","bit 5,b","bit 5,c","bit 5,d","bit 5,e","bit 5,h","bit 5,l","bit 5,(hl)","bit 5,a","bit 6,b","bit 6,c","bit 6,d","bit 6,e","bit 6,h","bit 6,l","bit 6,(hl)","bit 6,a","bit 7,b","bit 7,c","bit 7,d","bit 7,e","bit 7,h","bit 7,l","bit 7,(hl)","bit 7,a","res 0,b","res 0,c","res 0,d","res 0,e","res 0,h","res 0,l","res 0,(hl)","res 0,a","res 1,b","res 1,c","res 1,d","res 1,e","res 1,h","res 1,l","res 1,(hl)","res 1,a","res 2,b","res 2,c","res 2,d","res 2,e","res 2,h","res 2,l","res 2,(hl)","res 2,a","res 3,b","res 3,c","res 3,d","res 3,e","res 3,h","res 3,l","res 3,(hl)","res 3,a","res 4,b","res 4,c","res 4,d","res 4,e","res 4,h","res 4,l","res 4,(hl)","res 4,a","res 5,b","res 5,c","res 5,d","res 5,e","res 5,h","res 5,l","res 5,(hl)","res 5,a","res 6,b","res 6,c","res 6,d","res 6,e","res 6,h","res 6,l","res 6,(hl)","res 6,a","res 7,b","res 7,c","res 7,d","res 7,e","res 7,h","res 7,l","res 7,(hl)","res 7,a","set 0,b","set 0,c","set 0,d","set 0,e","set 0,h","set 0,l","set 0,(hl)","set 0,a","set 1,b","set 1,c","set 1,d","set 1,e","set 1,h","set 1,l","set 1,(hl)","set 1,a","set 2,b","set 2,c","set 2,d","set 2,e","set 2,h","set 2,l","set 2,(hl)","set 2,a","set 3,b","set 3,c","set 3,d","set 3,e","set 3,h","set 3,l","set 3,(hl)","set 3,a","set 4,b","set 4,c","set 4,d","set 4,e","set 4,h","set 4,l","set 4,(hl)","set 4,a","set 5,b","set 5,c","set 5,d","set 5,e","set 5,h","set 5,l","set 5,(hl)","set 5,a","set 6,b","set 6,c","set 6,d","set 6,e","set 6,h","set 6,l","set 6,(hl)","set 6,a","set 7,b","set 7,c","set 7,d","set 7,e","set 7,h","set 7,l","set 7,(hl)","set 7,a"];
 
-// TODO: DD, etc -- http://z80-heaven.wikidot.com/opcode-reference-chart
-
-export function disassembleZ80(pc:number, b0:number, b1:number, b2:number, b3:number) : {line:string, nbytes:number} {
+export function disassembleZ80(pc:number, b0:number, b1:number, b2:number, b3:number) : {line:string, nbytes:number, isaddr:boolean} {
 
   var op,n,am;
   var bytes = [b0,b1,b2,b3];
+  var isaddr = false;
   n=1;
   switch (b0) {
     case 0xcb:
@@ -23,7 +22,19 @@ export function disassembleZ80(pc:number, b0:number, b1:number, b2:number, b3:nu
       n++;
       break;
     case 0xdd:
-      am = Z80_OPS[b1].replace(/\bhl\b/, 'ix');
+    case 0xfd:
+      var ireg = (b0 == 0xdd) ? 'ix' : 'iy';
+      if (b1 == 0xcb) {
+        // swap the 3rd and 4th bytes [$dd $cb displacement opcode]
+        am = Z80_OPS_CB[b3];
+        bytes[2] = b3;
+        bytes[3] = b2;
+        n++;
+      } else {
+        am = Z80_OPS[b1];
+      }
+      am = am.replace(/[(]hl[)]/, '('+ireg+'+x)');
+      am = am.replace(/\bhl\b/, ireg);
       n++;
       break;
     default:
@@ -31,42 +42,20 @@ export function disassembleZ80(pc:number, b0:number, b1:number, b2:number, b3:nu
       break;
   }
   if (!am || !am.length) am = "??";
-  if (am.indexOf('xx') >= 0) {
+  if (/\bxx\b/.test(am)) {
     am = am.replace(/\bxx\b/,'$'+hex(bytes[n]+(bytes[n+1]<<8), 4));
     n += 2;
-  } else if (am.indexOf('x') >= 0) {
+    isaddr = true;
+  } else if (/\bx\b/.test(am)) {
     if (am.startsWith('j')) {
       var offset = (b1 < 0x80) ? (pc+2+b1) : (pc+2-(256-b1));
       offset &= 0xffff;
       am = am.replace(/\bx\b/,'$'+hex(offset, 4));
+      isaddr = true;
     } else {
       am = am.replace(/\bx\b/,'$'+hex(bytes[n], 2));
     }
     n += 1;
   }
-  /*
-  if (b0 == 0xcd && (s = cb_prefixed_ops[b1])) {
-    n = 2;
-  } else if (s = one_byte_instructions[b0]) {
-    n = 1;
-  } else if (s = two_byte_instructions[b0]) {
-    n = 2;
-  } else if (s = three_byte_instructions[b0]) {
-    n = 3;
-  } else {
-    s = "??";
-    n = 1;
-  }
-  /*
-  TODO: http://z80-heaven.wikidot.com/opcode-reference-chart
-  if (am == 'branch') {
-    var offset = (b1 < 0x80) ? (pc+2+b1) : (pc+2-(256-b1));
-    offset &= 0xffff;
-    am = '$'+formatHex(offset, 4);
-  } else {
-    am = am.replace('aa','$'+formatHex(b1, 2));
-    am = am.replace('AAAA','$'+formatHex(b1+(b2<<8), 4));
-  }
-  */
-  return {line:am.toUpperCase(), nbytes:n};
+  return {line:am.toUpperCase(), nbytes:n, isaddr:isaddr};
 };
diff --git a/src/ui.ts b/src/ui.ts
index a42d60b2..38de7ccf 100644
--- a/src/ui.ts
+++ b/src/ui.ts
@@ -257,7 +257,7 @@ function handleFileUpload(files: File[]) {
       var path = "local/" + f.name;
       var reader = new FileReader();
       reader.onload = function(e) {
-        var data = e.target.result;
+        var data = (<any>e.target).result;
         store.setItem(path, data, function(err, result) {
           if (err)
             console.log(err);
@@ -849,7 +849,7 @@ function setupDebugControls(){
   }
   updateDebugWindows();
   // setup replay slider
-  if (platform.advance) {
+  if (platform.setRecorder && platform.advance) {
     setupReplaySlider();
   }
 }
@@ -888,7 +888,7 @@ function setupReplaySlider() {
     $("#replay_back").click(() => { setFrameTo(parseInt(replayslider.val()) - 1); });
     $("#replay_fwd").click(() => { setFrameTo(parseInt(replayslider.val()) + 1); });
     $("#replay_bar").show();
-    $("#dbg_record").click(_toggleRecording);
+    $("#dbg_record").click(_toggleRecording).show();
 }
 
 function showWelcomeMessage() {
diff --git a/src/util.ts b/src/util.ts
index 970380a1..5d9b45b3 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -6,6 +6,12 @@ export function lpad(s:string, n:number):string {
   return s;
 }
 
+export function rpad(s:string, n:number):string {
+  s += ''; // convert to string
+  while (s.length<n) s+=" ";
+  return s;
+}
+
 export function byte2signed(b:number):number {
   b &= 0xff;
   return (b < 0x80) ? b : -(256-b);
diff --git a/src/views.ts b/src/views.ts
index fdae5fca..1a42f1b9 100644
--- a/src/views.ts
+++ b/src/views.ts
@@ -5,7 +5,7 @@ import $ = require("jquery");
 import { CodeProject } from "./project";
 import { SourceFile, WorkerError } from "./workertypes";
 import { Platform } from "./baseplatform";
-import { hex } from "./util";
+import { hex, lpad, rpad } from "./util";
 import { CodeAnalyzer } from "./analysis";
 
 export interface ProjectView {
@@ -455,12 +455,13 @@ export class DisassemblerView implements ProjectView {
         }
         */
         var bytes = "";
+        var comment = "";
         for (var i=0; i<disasm.nbytes; i++)
           bytes += hex(platform.readAddress(a+i));
         while (bytes.length < 14)
           bytes += ' ';
         var dstr = disasm.line;
-        if (addr2symbol) {
+        if (addr2symbol && disasm.isaddr) {
           dstr = dstr.replace(/([^#])[$]([0-9A-F]+)/, (substr:string, ...args:any[]):string => {
             var addr = parseInt(args[1], 16);
             var sym = addr2symbol[addr];
@@ -470,7 +471,13 @@ export class DisassemblerView implements ProjectView {
             return substr;
           });
         }
-        var dline = hex(parseInt(a), 4) + "\t" + bytes + "\t" + dstr + "\n";
+        if (addr2symbol) {
+          var sym = addr2symbol[a];
+          if (sym) {
+            comment = "; " + sym;
+          }
+        }
+        var dline = hex(parseInt(a), 4) + "\t" + rpad(bytes,14) + "\t" + rpad(dstr,30) + comment + "\n";
         s += dline;
         if (a == pc) selline = curline;
         curline++;
diff --git a/test/cli/6502/test6502disasm.js b/test/cli/6502/test6502disasm.js
index 737ce3ea..6f1fe75a 100644
--- a/test/cli/6502/test6502disasm.js
+++ b/test/cli/6502/test6502disasm.js
@@ -6,10 +6,10 @@ var disassemble6502 = require("gen/cpu/disasm6502.js").disassemble6502;
 
 describe('6502 disassembler', function() {
   it('Should work', function() {
-    assert.deepEqual({line:"BRK ",nbytes:1}, disassemble6502(0, 0, 0, 0));
-    assert.deepEqual({line:"LDA #$A9",nbytes:2}, disassemble6502(0, 0xa9, 0xa9, 0xa9));
-    assert.deepEqual({line:"JMP $6010",nbytes:3}, disassemble6502(0, 0x4c, 0x10, 0x60));
-    assert.deepEqual({line:"BPL $FFF2",nbytes:2}, disassemble6502(0, 0x10, 0xf0, 0));
-    assert.deepEqual({line:"BMI $0012",nbytes:2}, disassemble6502(0, 0x30, 0x10, 0));
+    assert.deepEqual({line:"BRK ",nbytes:1,isaddr:false}, disassemble6502(0, 0, 0, 0));
+    assert.deepEqual({line:"LDA #$A9",nbytes:2,isaddr:false}, disassemble6502(0, 0xa9, 0xa9, 0xa9));
+    assert.deepEqual({line:"JMP $6010",nbytes:3,isaddr:true}, disassemble6502(0, 0x4c, 0x10, 0x60));
+    assert.deepEqual({line:"BPL $FFF2",nbytes:2,isaddr:true}, disassemble6502(0, 0x10, 0xf0, 0));
+    assert.deepEqual({line:"BMI $0012",nbytes:2,isaddr:true}, disassemble6502(0, 0x30, 0x10, 0));
   });
 });
diff --git a/test/cli/z80/testz80disasm.js b/test/cli/z80/testz80disasm.js
index cba9046e..01867990 100644
--- a/test/cli/z80/testz80disasm.js
+++ b/test/cli/z80/testz80disasm.js
@@ -6,13 +6,18 @@ var disassembleZ80 = require("gen/cpu/disasmz80.js").disassembleZ80;
 
 describe('Z80 disassembler', function() {
   it('Should work', function() {
-    assert.deepEqual({line:"LD SP,$E800",nbytes:3}, disassembleZ80(0, 0x31, 0x00, 0xe8, 0));
-    assert.deepEqual({line:"DI",nbytes:1}, disassembleZ80(0, 0xF3, 0, 0, 0));
-    assert.deepEqual({line:"JP $0007",nbytes:3}, disassembleZ80(0, 0xC3, 0x07, 0x00, 0));
-    assert.deepEqual({line:"LD A,$01",nbytes:2}, disassembleZ80(0, 0x3E, 0x01, 0, 0));
-    assert.deepEqual({line:"LDIR",nbytes:2}, disassembleZ80(0, 0xED, 0xB0, 0, 0));
-    assert.deepEqual({line:"JR C,$0027",nbytes:2}, disassembleZ80(0x4e, 0x38, 0xD7, 0, 0));
-    assert.deepEqual({line:"XOR A",nbytes:2}, disassembleZ80(0, 0xaf, 0xd3, 0, 0));
-    assert.deepEqual({line:"LD IX,$41E0",nbytes:4}, disassembleZ80(0, 0xdd, 0x21, 0xe0, 0x41));
+    assert.deepEqual({line:"LD SP,$E800",nbytes:3,isaddr:true}, disassembleZ80(0, 0x31, 0x00, 0xe8, 0));
+    assert.deepEqual({line:"DI",nbytes:1,isaddr:false}, disassembleZ80(0, 0xF3, 0, 0, 0));
+    assert.deepEqual({line:"JP $0007",nbytes:3,isaddr:true}, disassembleZ80(0, 0xC3, 0x07, 0x00, 0));
+    assert.deepEqual({line:"LD A,$01",nbytes:2,isaddr:false}, disassembleZ80(0, 0x3E, 0x01, 0, 0));
+    assert.deepEqual({line:"LDIR",nbytes:2,isaddr:false}, disassembleZ80(0, 0xED, 0xB0, 0, 0));
+    assert.deepEqual({line:"JR C,$0027",nbytes:2,isaddr:true}, disassembleZ80(0x4e, 0x38, 0xD7, 0, 0));
+    assert.deepEqual({line:"XOR A",nbytes:1,isaddr:false}, disassembleZ80(0, 0xaf, 0, 0, 0));
+    assert.deepEqual({line:"LD IX,$41E0",nbytes:4,isaddr:true}, disassembleZ80(0, 0xdd, 0x21, 0xe0, 0x41));
+    assert.deepEqual({line:"PUSH IX",nbytes:2,isaddr:false}, disassembleZ80(0, 0xdd, 0xe5, 0, 0));
+    assert.deepEqual({line:"LD C,(IX+$81)",nbytes:3,isaddr:false}, disassembleZ80(0, 0xdd, 0x4e, 0x81, 0));
+    assert.deepEqual({line:"LD E,(IY+$82)",nbytes:3,isaddr:false}, disassembleZ80(0, 0xfd, 0x5e, 0x82, 0));
+    assert.deepEqual({line:"RES 4,(IX+$02)",nbytes:4,isaddr:false}, disassembleZ80(0, 0xdd, 0xcb, 0x02, 0xa6));
+    assert.deepEqual({line:"RES 4,(IY+$02)",nbytes:4,isaddr:false}, disassembleZ80(0, 0xfd, 0xcb, 0x02, 0xa6));
   });
 });