diff --git a/Makefile b/Makefile
index 518afbb..ae3f277 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ PROGRAMS = m16vm m16as
 all: $(PROGRAMS)
 
 m16vm : vm/vm.o vm/cpu.o vm/mm.o vm/instr_decode.o \
-	vm/syscall.o vm/program.o lib/libm16.a
+	vm/syscall.o vm/program.o vm/debug.o lib/libm16.a
 	$(QUIET_LD)$(LD) $(LDFLAGS) -o $@ $^
 
 m16as : as/as.o as/parser.o as/lexer.o \
diff --git a/vm/debug.c b/vm/debug.c
new file mode 100644
index 0000000..e548270
--- /dev/null
+++ b/vm/debug.c
@@ -0,0 +1,46 @@
+/* debug.c
+ *
+ *   Copyright (C) 2019   Henrik Hautakoski <henrik.hautakoski@gmail.com>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *   MA 02110-1301, USA.
+ */
+#include <stdio.h>
+#include "cpu.h"
+#include "debug.h"
+
+void debug_print_memory(uint8_t *mm) {
+
+	int i = 0;
+
+	printf("\n");
+
+	for(i = 0; i < 32; i++) {
+		printf("%.2X ", mm[i]);
+	}
+	printf("\n");
+}
+
+void debug_print_regs(int16_t *regs) {
+
+	int i = 0;
+
+	printf("\n");
+
+	for(i = 0; i < CPU_NUM_REGS; i++) {
+		printf("r%i = %i\n", i, regs[i]);
+	}
+	printf("\n");
+}
diff --git a/vm/debug.h b/vm/debug.h
new file mode 100644
index 0000000..731017f
--- /dev/null
+++ b/vm/debug.h
@@ -0,0 +1,29 @@
+/* debug.h
+ *
+ *   Copyright (C) 2019   Henrik Hautakoski <henrik.hautakoski@gmail.com>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *   MA 02110-1301, USA.
+ */
+#ifndef DEBUG_H
+#define DEBUG_H
+
+#include <stdint.h>
+
+void debug_print_memory(uint8_t *mm);
+
+void debug_print_regs(int16_t *regs);
+
+#endif /* DEBUG_H */