diff --git a/build.lua b/build.lua
index 156ff7cea..d7eb0829f 100644
--- a/build.lua
+++ b/build.lua
@@ -20,11 +20,11 @@ vars.plats = {
 }
 vars.plats_with_tests = {
 	"cpm",
---	"linux386",
---	"linux68k",
---	"linuxmips",
---	"linuxppc",
---	"pc86",
+	"linux68k",
+	"linux386",
+	"linuxppc",
+	"linuxmips",
+	"pc86",
 }
 
 local plat_packages = {}
diff --git a/plat/cpm/emu/dis8080.c b/plat/cpm/emu/dis8080.c
new file mode 100644
index 000000000..1adf2bc26
--- /dev/null
+++ b/plat/cpm/emu/dis8080.c
@@ -0,0 +1,366 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include "intel_8080_emulator.h"
+#include "dis8080.h"
+
+enum
+{
+    NOTHING,
+    CONST8,
+    CONST16,
+};
+
+struct insn
+{
+    const char* name;
+    int operand;
+};
+
+static struct insn insns[0x100] =
+{
+    /* 00-07 */
+    { "nop",            NOTHING },
+    { "lxi b, 0x%04x",  CONST16 },
+    { "stax b",         NOTHING },
+    { "inx b",          NOTHING },
+    { "inr b",          NOTHING },
+    { "dcr b",          NOTHING },
+    { "mvi b, 0x%02x",  CONST8 },
+    { "rlc",            NOTHING },
+
+    /* 08-0f */
+    { "undef",          NOTHING },
+    { "dad b",          NOTHING },
+    { "ldax b",         NOTHING },
+    { "dcx b",          NOTHING },
+    { "inr c",          NOTHING },
+    { "dcr c",          NOTHING },
+    { "mvi c, 0x%02x",  CONST8 },
+    { "rrc",            NOTHING },
+
+    /* 10-17 */
+    { "nop",            NOTHING },
+    { "lxi d, 0x%04x",  CONST16 },
+    { "stax d",         NOTHING },
+    { "inx d",          NOTHING },
+    { "inr d",          NOTHING },
+    { "dcr d",          NOTHING },
+    { "mvi d, 0x%02x",  CONST8 },
+    { "ral",            NOTHING },
+
+    /* 18-1f */
+    { "undef",          NOTHING },
+    { "dad d",          NOTHING },
+    { "ldax d",         NOTHING },
+    { "dcx d",          NOTHING },
+    { "inr e",          NOTHING },
+    { "dcr e",          NOTHING },
+    { "mvi e, 0x%02x",  CONST8 },
+    { "rar",            NOTHING },
+
+    /* 20-27 */
+    { "nop",            NOTHING },
+    { "lxi h, 0x%04x",  CONST16 },
+    { "shld 0x%04x",    CONST16 },
+    { "inx h",          NOTHING },
+    { "inr h",          NOTHING },
+    { "dcr h",          NOTHING },
+    { "mvi h, 0x%02x",  CONST8 },
+    { "daa",            NOTHING },
+
+    /* 28-2f */
+    { "undef",          NOTHING },
+    { "dad h",          NOTHING },
+    { "lhld 0x%04x",    CONST16 },
+    { "dcx h",          NOTHING },
+    { "inr l",          NOTHING },
+    { "dcr l",          NOTHING },
+    { "mvi l, 0x%02x",  CONST8 },
+    { "cma",            NOTHING },
+
+    /* 30-37 */
+    { "nop",            NOTHING },
+    { "lxi sp, 0x%04x", CONST16 },
+    { "sta 0x%04x",     CONST16 },
+    { "inx sp",         NOTHING },
+    { "inr m",          NOTHING },
+    { "dcr m",          NOTHING },
+    { "mvi m, 0x%02x",  CONST8 },
+    { "stc",            NOTHING },
+
+    /* 38-3f */
+    { "undef",         NOTHING },
+    { "dad sp",        NOTHING },
+    { "lda 0x%04x",    CONST16 },
+    { "dcx sp",        NOTHING },
+    { "inr a",         NOTHING },
+    { "dcr a",         NOTHING },
+    { "mvi a, 0x%02x", CONST8 },
+    { "cmc",           NOTHING },
+
+    /* 40-47 */
+    { "mov b, b",      NOTHING },
+    { "mov b, c",      NOTHING },
+    { "mov b, d",      NOTHING },
+    { "mov b, e",      NOTHING },
+    { "mov b, h",      NOTHING },
+    { "mov b, l",      NOTHING },
+    { "mov b, m",      NOTHING },
+    { "mov b, a",      NOTHING },
+
+    /* 47-4f */
+    { "mov c, b",      NOTHING },
+    { "mov c, c",      NOTHING },
+    { "mov c, d",      NOTHING },
+    { "mov c, e",      NOTHING },
+    { "mov c, h",      NOTHING },
+    { "mov c, l",      NOTHING },
+    { "mov c, m",      NOTHING },
+    { "mov c, a",      NOTHING },
+
+    /* 50-57 */
+    { "mov d, b",      NOTHING },
+    { "mov d, c",      NOTHING },
+    { "mov d, d",      NOTHING },
+    { "mov d, e",      NOTHING },
+    { "mov d, h",      NOTHING },
+    { "mov d, l",      NOTHING },
+    { "mov d, m",      NOTHING },
+    { "mov d, a",      NOTHING },
+
+    /* 57-5f */
+    { "mov e, b",      NOTHING },
+    { "mov e, c",      NOTHING },
+    { "mov e, d",      NOTHING },
+    { "mov e, e",      NOTHING },
+    { "mov e, h",      NOTHING },
+    { "mov e, l",      NOTHING },
+    { "mov e, m",      NOTHING },
+    { "mov e, a",      NOTHING },
+
+    /* 60-67 */
+    { "mov h, b",      NOTHING },
+    { "mov h, c",      NOTHING },
+    { "mov h, d",      NOTHING },
+    { "mov h, e",      NOTHING },
+    { "mov h, h",      NOTHING },
+    { "mov h, l",      NOTHING },
+    { "mov h, m",      NOTHING },
+    { "mov h, a",      NOTHING },
+
+    /* 67-6f */
+    { "mov l, b",      NOTHING },
+    { "mov l, c",      NOTHING },
+    { "mov l, d",      NOTHING },
+    { "mov l, e",      NOTHING },
+    { "mov l, h",      NOTHING },
+    { "mov l, l",      NOTHING },
+    { "mov l, m",      NOTHING },
+    { "mov l, a",      NOTHING },
+
+    /* 70-77 */
+    { "mov m, b",      NOTHING },
+    { "mov m, c",      NOTHING },
+    { "mov m, d",      NOTHING },
+    { "mov m, e",      NOTHING },
+    { "mov m, h",      NOTHING },
+    { "mov m, l",      NOTHING },
+    { "mov m, m",      NOTHING },
+    { "hlt",           NOTHING },
+
+    /* 77-7f */
+    { "mov a, b",      NOTHING },
+    { "mov a, c",      NOTHING },
+    { "mov a, d",      NOTHING },
+    { "mov a, e",      NOTHING },
+    { "mov a, h",      NOTHING },
+    { "mov a, l",      NOTHING },
+    { "mov a, m",      NOTHING },
+    { "mov a, a",      NOTHING },
+
+    /* 80-87 */
+    { "add b",         NOTHING },
+    { "add c",         NOTHING },
+    { "add d",         NOTHING },
+    { "add e",         NOTHING },
+    { "add h",         NOTHING },
+    { "add l",         NOTHING },
+    { "add m",         NOTHING },
+    { "add a",         NOTHING },
+
+    /* 88-8f */
+    { "adc b",         NOTHING },
+    { "adc c",         NOTHING },
+    { "adc d",         NOTHING },
+    { "adc e",         NOTHING },
+    { "adc h",         NOTHING },
+    { "adc l",         NOTHING },
+    { "adc m",         NOTHING },
+    { "adc a",         NOTHING },
+
+    /* 90-97 */
+    { "sub b",         NOTHING },
+    { "sub c",         NOTHING },
+    { "sub d",         NOTHING },
+    { "sub e",         NOTHING },
+    { "sub h",         NOTHING },
+    { "sub l",         NOTHING },
+    { "sub m",         NOTHING },
+    { "sub a",         NOTHING },
+
+    /* 98-9f */
+    { "sbb b",         NOTHING },
+    { "sbb c",         NOTHING },
+    { "sbb d",         NOTHING },
+    { "sbb e",         NOTHING },
+    { "sbb h",         NOTHING },
+    { "sbb l",         NOTHING },
+    { "sbb m",         NOTHING },
+    { "sbb a",         NOTHING },
+
+    /* a0-a7 */
+    { "ana b",         NOTHING },
+    { "ana c",         NOTHING },
+    { "ana d",         NOTHING },
+    { "ana e",         NOTHING },
+    { "ana h",         NOTHING },
+    { "ana l",         NOTHING },
+    { "ana m",         NOTHING },
+    { "ana a",         NOTHING },
+
+    /* a8-af */
+    { "xra b",         NOTHING },
+    { "xra c",         NOTHING },
+    { "xra d",         NOTHING },
+    { "xra e",         NOTHING },
+    { "xra h",         NOTHING },
+    { "xra l",         NOTHING },
+    { "xra m",         NOTHING },
+    { "xra a",         NOTHING },
+
+    /* b0-b7 */
+    { "ora b",         NOTHING },
+    { "ora c",         NOTHING },
+    { "ora d",         NOTHING },
+    { "ora e",         NOTHING },
+    { "ora h",         NOTHING },
+    { "ora l",         NOTHING },
+    { "ora m",         NOTHING },
+    { "ora a",         NOTHING },
+
+    /* b8-bf */
+    { "cmp b",         NOTHING },
+    { "cmp c",         NOTHING },
+    { "cmp d",         NOTHING },
+    { "cmp e",         NOTHING },
+    { "cmp h",         NOTHING },
+    { "cmp l",         NOTHING },
+    { "cmp m",         NOTHING },
+    { "cmp a",         NOTHING },
+
+    /* c0-c7 */
+    { "rnz",           NOTHING },
+    { "pop b",         NOTHING },
+    { "jnz 0x%04x",    CONST16 },
+    { "jmp 0x%04x",    CONST16 },
+    { "cnz 0x%04x",    CONST16 },
+    { "push b",        NOTHING },
+    { "adi 0x%02x",    CONST8 },
+    { "rst 0",         NOTHING },
+
+    /* c8-cf */
+    { "rz",            NOTHING },
+    { "ret",           NOTHING },
+    { "jz 0x%04x",     CONST16 },
+    { "*jmp 0x%04x",   CONST16 },
+    { "cz 0x%04x",     CONST16 },
+    { "call 0x%04x",   CONST16 },
+    { "aci 0x%02x",    CONST8 },
+    { "rst 1",         NOTHING },
+
+    /* d0-d7 */
+    { "rnc",           NOTHING },
+    { "pop d",         NOTHING },
+    { "jnc 0x%04x",    CONST16 },
+    { "out 0x%02x",    CONST8 },
+    { "cnc 0x%04x",    CONST16 },
+    { "push d",        NOTHING },
+    { "sui 0x%02x",    CONST8 },
+    { "rst 2",         NOTHING },
+
+    /* d8-df */
+    { "rc",            NOTHING },
+    { "*ret",          NOTHING },
+    { "jc 0x%04x",     CONST16 },
+    { "in 0x%02x",     CONST8 },
+    { "cc 0x%04x",     CONST16 },
+    { "*call 0x%04x",  CONST16 },
+    { "sbi 0x%02x",    CONST8 },
+    { "rst 3",         NOTHING },
+
+    /* e0-e7 */
+    { "rpo",           NOTHING },
+    { "pop h",         NOTHING },
+    { "jpo 0x%04x",    CONST16 },
+    { "xthl",          NOTHING },
+    { "cpo 0x%04x",    CONST16 },
+    { "push h",        NOTHING },
+    { "ani 0x%02x",    CONST8 },
+    { "rst 4",         NOTHING },
+
+    /* e8-ef */
+    { "rpe",           NOTHING },
+    { "pchl",          NOTHING },
+    { "jpe 0x%04x",    CONST16 },
+    { "xchg",          NOTHING },
+    { "cpe 0x%04x",    CONST16 },
+    { "*call 0x%04x",  CONST16 },
+    { "xri 0x%02x",    CONST8 },
+    { "rst 5",         NOTHING },
+
+    /* f0-f7 */
+    { "rp",            NOTHING },
+    { "pop psw",       NOTHING },
+    { "jp 0x%04x",     CONST16 },
+    { "di",            NOTHING },
+    { "cp 0x%04x",     CONST16 },
+    { "push psw",      NOTHING },
+    { "ori 0x%02x",    CONST8 },
+    { "rst 6",         NOTHING },
+
+    /* f8-ff */
+    { "rm",            NOTHING },
+    { "sphl",          NOTHING },
+    { "jm 0x%04x",     CONST16 },
+    { "ei",            NOTHING },
+    { "cm 0x%04x",     CONST16 },
+    { "*call 0x%04x",  CONST16 },
+    { "cpi 0x%02x",    CONST8 },
+    { "rst 7",         NOTHING },
+};
+
+uint16_t i8080_disassemble(char* buffer, size_t bufsiz, uint16_t pc)
+{
+    uint8_t opcode = i8080_read(pc++);
+    struct insn* insn = &insns[opcode];
+    uint16_t value = 0;
+    switch (insn->operand)
+    {
+        case NOTHING:
+            break;
+
+        case CONST8:
+            value = i8080_read(pc++);
+            break;
+
+        case CONST16:
+            value = i8080_read(pc++);
+            value |= i8080_read(pc++) << 8;
+            break;
+    }
+
+    snprintf(buffer, bufsiz, insn->name, value);
+    return pc;
+}
diff --git a/plat/cpm/emu/dis8080.h b/plat/cpm/emu/dis8080.h
new file mode 100644
index 000000000..5379a6104
--- /dev/null
+++ b/plat/cpm/emu/dis8080.h
@@ -0,0 +1,6 @@
+#ifndef DIS8080_H
+#define DIS8080_H
+
+extern uint16_t i8080_disassemble(char* buffer, size_t bufsiz, uint16_t pc);
+
+#endif
diff --git a/plat/cpm/emu/emulator.c b/plat/cpm/emu/emulator.c
index 0bed46532..5f8dd1c43 100644
--- a/plat/cpm/emu/emulator.c
+++ b/plat/cpm/emu/emulator.c
@@ -5,6 +5,7 @@
 #include <signal.h>
 #include <string.h>
 #include "intel_8080_emulator.h"
+#include "dis8080.h"
 #include "globals.h"
 
 uint8_t ram[0x10000];
@@ -63,8 +64,7 @@ void showregs(void)
 	char buffer[80];
 	int tstates;
 	uint16_t pc = i8080_read_reg16(PC);
-	//z80ex_dasm(buffer, sizeof(buffer), 0, &tstates, &tstates, dasm_read_cb, pc, NULL);
-	strcpy(buffer, "<not implemented>");
+	i8080_disassemble(buffer, sizeof(buffer), pc);
 	printf("%04x : %s\n", pc, buffer);
 }
 
@@ -289,7 +289,7 @@ static void debug(void)
 		if (!fgets(cmdline, sizeof(cmdline), stdin))
 			exit(0);
 
-		char* token = strtok(cmdline, " ");
+		char* token = strtok(cmdline, " \n\r\t");
 		if (token != NULL)
 		{
 			if (strcmp(token, "?") == 0)