diff --git a/test/asm/listing/control/120-errormsg.err b/test/asm/listing/control/120-errormsg.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/asm/listing/control/121-errormsg.err b/test/asm/listing/control/121-errormsg.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/asm/listing/control/122-errormsg.err b/test/asm/listing/control/122-errormsg.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/asm/listing/control/123-errormsg.err b/test/asm/listing/control/123-errormsg.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/asm/listing/control/124-errormsg.err b/test/asm/listing/control/124-errormsg.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/asm/listing/control/125-errormsg.err b/test/asm/listing/control/125-errormsg.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/asm/listing/control/126-errormsg.err b/test/asm/listing/control/126-errormsg.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/asm/listing/control/127-errormsg.err b/test/asm/listing/control/127-errormsg.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/asm/listing/control/128-errormsg.err b/test/asm/listing/control/128-errormsg.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/asm/listing/control/129-errormsg.err b/test/asm/listing/control/129-errormsg.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/asm/listing/control/130-errormsg.err b/test/asm/listing/control/130-errormsg.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/asm/listing/control/131-errormsg.err b/test/asm/listing/control/131-errormsg.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/asm/listing/control/132-errormsg.err b/test/asm/listing/control/132-errormsg.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/asm/listing/control/133-errormsg.err b/test/asm/listing/control/133-errormsg.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/asm/listing/control/134-errormsg.err b/test/asm/listing/control/134-errormsg.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/asm/listing/control/135-errormsg.err b/test/asm/listing/control/135-errormsg.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/asm/listing/control/136-errormsg.err b/test/asm/listing/control/136-errormsg.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/asm/listing/control/137-errormsg.err b/test/asm/listing/control/137-errormsg.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/asm/listing/control/138-errormsg.err b/test/asm/listing/control/138-errormsg.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/asm/listing/control/139-errormsg.err b/test/asm/listing/control/139-errormsg.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/asm/listing/control/140-errormsg.err b/test/asm/listing/control/140-errormsg.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/asm/listing/control/141-errormsg.err b/test/asm/listing/control/141-errormsg.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/asm/listing/control/142-errormsg.err b/test/asm/listing/control/142-errormsg.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/asm/listing/ref/120-errormsg.err2-ref b/test/asm/listing/ref/120-errormsg.err2-ref
new file mode 100644
index 000000000..80595d97d
--- /dev/null
+++ b/test/asm/listing/ref/120-errormsg.err2-ref
@@ -0,0 +1 @@
+120-errormsg.s:1: Error: Expected a mnemonic but found '0'
diff --git a/test/asm/listing/ref/121-errormsg.err2-ref b/test/asm/listing/ref/121-errormsg.err2-ref
new file mode 100644
index 000000000..abc16d4d5
--- /dev/null
+++ b/test/asm/listing/ref/121-errormsg.err2-ref
@@ -0,0 +1 @@
+121-errormsg.s:1: Error: Expected ':' after identifier to form a label but found 'end-of-line'
diff --git a/test/asm/listing/ref/122-errormsg.err2-ref b/test/asm/listing/ref/122-errormsg.err2-ref
new file mode 100644
index 000000000..692ac0cc6
--- /dev/null
+++ b/test/asm/listing/ref/122-errormsg.err2-ref
@@ -0,0 +1 @@
+122-errormsg.s:1: Error: Expected a struct/union name but found 'X'
diff --git a/test/asm/listing/ref/123-errormsg.err2-ref b/test/asm/listing/ref/123-errormsg.err2-ref
new file mode 100644
index 000000000..f7db86f47
--- /dev/null
+++ b/test/asm/listing/ref/123-errormsg.err2-ref
@@ -0,0 +1 @@
+123-errormsg.s:1: Error: Expected 'end-of-line' but found 'foo'
diff --git a/test/asm/listing/ref/124-errormsg.err2-ref b/test/asm/listing/ref/124-errormsg.err2-ref
new file mode 100644
index 000000000..b96690f68
--- /dev/null
+++ b/test/asm/listing/ref/124-errormsg.err2-ref
@@ -0,0 +1 @@
+124-errormsg.s:1: Error: Expected 'Y' but found 'A'
diff --git a/test/asm/listing/ref/125-errormsg.err2-ref b/test/asm/listing/ref/125-errormsg.err2-ref
new file mode 100644
index 000000000..4640ed3d5
--- /dev/null
+++ b/test/asm/listing/ref/125-errormsg.err2-ref
@@ -0,0 +1,2 @@
+125-errormsg.s:1: Error: Expected 'X' or 'S' but found 'A'
+125-errormsg.s:1: Error: Illegal addressing mode
diff --git a/test/asm/listing/ref/126-errormsg.err2-ref b/test/asm/listing/ref/126-errormsg.err2-ref
new file mode 100644
index 000000000..ba42cc0bb
--- /dev/null
+++ b/test/asm/listing/ref/126-errormsg.err2-ref
@@ -0,0 +1 @@
+126-errormsg.s:2: Error: Expected a storage allocator after the field name but found 'end-of-line'
diff --git a/test/asm/listing/ref/127-errormsg.err2-ref b/test/asm/listing/ref/127-errormsg.err2-ref
new file mode 100644
index 000000000..cdc5eada7
--- /dev/null
+++ b/test/asm/listing/ref/127-errormsg.err2-ref
@@ -0,0 +1 @@
+127-errormsg.s:1: Error: Expected a mnemonic but found '127'
diff --git a/test/asm/listing/ref/128-errormsg.err2-ref b/test/asm/listing/ref/128-errormsg.err2-ref
new file mode 100644
index 000000000..28982e479
--- /dev/null
+++ b/test/asm/listing/ref/128-errormsg.err2-ref
@@ -0,0 +1 @@
+128-errormsg.s:1: Error: Expected ',' but found 'end-of-line'
diff --git a/test/asm/listing/ref/129-errormsg.err2-ref b/test/asm/listing/ref/129-errormsg.err2-ref
new file mode 100644
index 000000000..4b35ded67
--- /dev/null
+++ b/test/asm/listing/ref/129-errormsg.err2-ref
@@ -0,0 +1 @@
+129-errormsg.s:1: Error: Expected ',' but found 'end-of-line'
diff --git a/test/asm/listing/ref/130-errormsg.err2-ref b/test/asm/listing/ref/130-errormsg.err2-ref
new file mode 100644
index 000000000..79b40a915
--- /dev/null
+++ b/test/asm/listing/ref/130-errormsg.err2-ref
@@ -0,0 +1,2 @@
+130-errormsg.s:1: Error: Expected an expression but found '|'
+130-errormsg.s:1: Error: Expected an expression but found 'end-of-line'
diff --git a/test/asm/listing/ref/131-errormsg.err2-ref b/test/asm/listing/ref/131-errormsg.err2-ref
new file mode 100644
index 000000000..46cc77c62
--- /dev/null
+++ b/test/asm/listing/ref/131-errormsg.err2-ref
@@ -0,0 +1 @@
+131-errormsg.s:1: Error: Expected 'end-of-line' but found '1'
diff --git a/test/asm/listing/ref/132-errormsg.err2-ref b/test/asm/listing/ref/132-errormsg.err2-ref
new file mode 100644
index 000000000..b8e73fdf8
--- /dev/null
+++ b/test/asm/listing/ref/132-errormsg.err2-ref
@@ -0,0 +1,2 @@
+132-errormsg.s:1: Error: Expected a parameter name but found 'X'
+132-errormsg.s:1: Error: Expected ')' but found 'X'
diff --git a/test/asm/listing/ref/133-errormsg.err2-ref b/test/asm/listing/ref/133-errormsg.err2-ref
new file mode 100644
index 000000000..bfa637d67
--- /dev/null
+++ b/test/asm/listing/ref/133-errormsg.err2-ref
@@ -0,0 +1,2 @@
+133-errormsg.s:3: Error: Expected '.ENDREPEAT' but found 'end-of-file'
+133-errormsg.s:1: Note: For this '.REPEAT' command
diff --git a/test/asm/listing/ref/134-errormsg.err2-ref b/test/asm/listing/ref/134-errormsg.err2-ref
new file mode 100644
index 000000000..7e674fdc3
--- /dev/null
+++ b/test/asm/listing/ref/134-errormsg.err2-ref
@@ -0,0 +1,2 @@
+134-errormsg.s:3: Error: Symbol 'foo' is already an import
+134-errormsg.s:1: Note: The symbol was previously imported here
diff --git a/test/asm/listing/ref/135-errormsg.err2-ref b/test/asm/listing/ref/135-errormsg.err2-ref
new file mode 100644
index 000000000..8391770fa
--- /dev/null
+++ b/test/asm/listing/ref/135-errormsg.err2-ref
@@ -0,0 +1,2 @@
+135-errormsg.s:4: Error: Symbol 'foo' is already defined
+135-errormsg.s:1: Note: The symbol was previously defined here
diff --git a/test/asm/listing/ref/136-errormsg.err2-ref b/test/asm/listing/ref/136-errormsg.err2-ref
new file mode 100644
index 000000000..bed70989d
--- /dev/null
+++ b/test/asm/listing/ref/136-errormsg.err2-ref
@@ -0,0 +1,2 @@
+136-errormsg.s:5: Error: Missing '.ENDMACRO' for definition of macro 'mac'
+136-errormsg.s:1: Note: Macro definition started here
diff --git a/test/asm/listing/ref/137-errormsg.err2-ref b/test/asm/listing/ref/137-errormsg.err2-ref
new file mode 100644
index 000000000..81ca9cd69
--- /dev/null
+++ b/test/asm/listing/ref/137-errormsg.err2-ref
@@ -0,0 +1,3 @@
+137-errormsg.s:1: Error: Cannot use an instruction as macro name
+137-errormsg.s:5: Error: Expected '.ENDMACRO' but found 'end-of-file'
+137-errormsg.s:1: Note: Macro definition started here
diff --git a/test/asm/listing/ref/138-errormsg.err2-ref b/test/asm/listing/ref/138-errormsg.err2-ref
new file mode 100644
index 000000000..7a73e48fc
--- /dev/null
+++ b/test/asm/listing/ref/138-errormsg.err2-ref
@@ -0,0 +1,3 @@
+138-errormsg.s:2: Error: Expected an identifier but found '.ENDMACRO'
+138-errormsg.s:4: Error: Macro 'mac' contains errors and cannot be expanded
+138-errormsg.s:1: Note: Definition of macro 'mac' was here
diff --git a/test/asm/listing/ref/139-errormsg.err2-ref b/test/asm/listing/ref/139-errormsg.err2-ref
new file mode 100644
index 000000000..370835210
--- /dev/null
+++ b/test/asm/listing/ref/139-errormsg.err2-ref
@@ -0,0 +1,2 @@
+139-errormsg.s:4: Error: A macro named 'mac' is already defined
+139-errormsg.s:1: Note: Previous definition of macro 'mac' was here
diff --git a/test/asm/listing/ref/140-errormsg.err2-ref b/test/asm/listing/ref/140-errormsg.err2-ref
new file mode 100644
index 000000000..f9e9adace
--- /dev/null
+++ b/test/asm/listing/ref/140-errormsg.err2-ref
@@ -0,0 +1,2 @@
+140-errormsg.s:5: Error: Too many parameters for macro 'foo'
+140-errormsg.s:1: Note: See definition of macro 'foo' which was here
diff --git a/test/asm/listing/ref/141-errormsg.err2-ref b/test/asm/listing/ref/141-errormsg.err2-ref
new file mode 100644
index 000000000..b99e2d9fe
--- /dev/null
+++ b/test/asm/listing/ref/141-errormsg.err2-ref
@@ -0,0 +1,3 @@
+141-errormsg.s:7: Error: Cannot delete macro 'mac2' which is currently expanded
+141-errormsg.s:5: Note: Expanded from macro here
+141-errormsg.s:2: Note: Expanded from macro here
diff --git a/test/asm/listing/ref/142-errormsg.err2-ref b/test/asm/listing/ref/142-errormsg.err2-ref
new file mode 100644
index 000000000..8d15ac44d
--- /dev/null
+++ b/test/asm/listing/ref/142-errormsg.err2-ref
@@ -0,0 +1,2 @@
+142-errormsg.s:4: Error: A macro named 'mac' is already defined
+142-errormsg.s:1: Note: Previous definition of macro 'mac' was here