Fix #123: Be explicit that errors are such by printing "error:" at beginning

of error messages.

svn path=/trunk/yasm/; revision=2019

diff --git a/frontends/yasm/yasm.c b/frontends/yasm/yasm.c
index 83d052417fea123f7fe43acbebd965e3851895d0..475d2ba883aa2cada508cba0fd05461b46b96209 100644 (file)
--- a/frontends/yasm/yasm.c
+++ b/frontends/yasm/yasm.c
@@ -1272,16 +1272,17 @@ print_yasm_error(const char *filename, unsigned long line, const char *msg,
                  const char *xref_msg)
 {
     if (line)
-        fprintf(errfile, fmt[ewmsg_style], filename, line, "", msg);
+        fprintf(errfile, fmt[ewmsg_style], filename, line, _("error: "), msg);
     else
-        fprintf(errfile, fmt_noline[ewmsg_style], filename, "", msg);
+        fprintf(errfile, fmt_noline[ewmsg_style], filename, _("error: "), msg);
 
     if (xref_fn && xref_msg) {
         if (xref_line)
-            fprintf(errfile, fmt[ewmsg_style], xref_fn, xref_line, "",
+            fprintf(errfile, fmt[ewmsg_style], xref_fn, xref_line, _("error: "),
                     xref_msg);
         else
-            fprintf(errfile, fmt_noline[ewmsg_style], xref_fn, "", xref_msg);
+            fprintf(errfile, fmt_noline[ewmsg_style], xref_fn, _("error: "),
+                    xref_msg);
     }
 }
 

diff --git a/libyasm/tests/absloop-err.errwarn b/libyasm/tests/absloop-err.errwarn
index 79983393e325ed1d139e35f1ad48371b35d25995..29d3a33477af6dbd680885ff0818af1c97d1aa85 100644 (file)
--- a/libyasm/tests/absloop-err.errwarn
+++ b/libyasm/tests/absloop-err.errwarn
@@ -1 +1 @@
--:6: circular reference detected in memory expression
+-:6: error: circular reference detected in memory expression

diff --git a/libyasm/tests/duplabel-err.errwarn b/libyasm/tests/duplabel-err.errwarn
index 69014ad89aff1cbd4b4f413fad389412e2007ade..4ce13bffaad00b01b13fb757c39afa290034143e 100644 (file)
--- a/libyasm/tests/duplabel-err.errwarn
+++ b/libyasm/tests/duplabel-err.errwarn
@@ -1,4 +1,4 @@
--:16: redefinition of `label'
--:12: `label' previously defined here
--:18: redefinition of `label'
--:12: `label' previously defined here
+-:16: error: redefinition of `label'
+-:12: error: `label' previously defined here
+-:18: error: redefinition of `label'
+-:12: error: `label' previously defined here

diff --git a/libyasm/tests/jmpsize1-err.errwarn b/libyasm/tests/jmpsize1-err.errwarn
index 9b821accb94e1584d6b593725c0ba7a91441373c..276b1eb8b991e696329e44d9b19b1560b77a3988 100644 (file)
--- a/libyasm/tests/jmpsize1-err.errwarn
+++ b/libyasm/tests/jmpsize1-err.errwarn
@@ -1,2 +1,2 @@
--:132: short jump out of range
--:263: short jump out of range
+-:132: error: short jump out of range
+-:263: error: short jump out of range

diff --git a/libyasm/tests/opt-circular1-err.errwarn b/libyasm/tests/opt-circular1-err.errwarn
index b26f47adb1af764e456356b1d356bd173b564314..9b09e1c512be257b09c1433a366855b83b4f7eb6 100644 (file)
--- a/libyasm/tests/opt-circular1-err.errwarn
+++ b/libyasm/tests/opt-circular1-err.errwarn
@@ -1 +1 @@
--:1: circular reference detected
+-:1: error: circular reference detected

diff --git a/libyasm/tests/opt-circular2-err.errwarn b/libyasm/tests/opt-circular2-err.errwarn
index b26f47adb1af764e456356b1d356bd173b564314..9b09e1c512be257b09c1433a366855b83b4f7eb6 100644 (file)
--- a/libyasm/tests/opt-circular2-err.errwarn
+++ b/libyasm/tests/opt-circular2-err.errwarn
@@ -1 +1 @@
--:1: circular reference detected
+-:1: error: circular reference detected

diff --git a/libyasm/tests/opt-circular3-err.errwarn b/libyasm/tests/opt-circular3-err.errwarn
index bf1d3fa20ae385af83be0942f6cc4f23adef9484..041cbba24f323ad270dc381e6a00b48cad1bb32f 100644 (file)
--- a/libyasm/tests/opt-circular3-err.errwarn
+++ b/libyasm/tests/opt-circular3-err.errwarn
@@ -1 +1 @@
--:6: circular reference detected
+-:6: error: circular reference detected

diff --git a/libyasm/tests/reserve-err1.errwarn b/libyasm/tests/reserve-err1.errwarn
index e3da650a2a85ff7a2830a2c41f52fb53f2f6c07d..e53fe3c72911a42e40e99c79ea059db65681a7d4 100644 (file)
--- a/libyasm/tests/reserve-err1.errwarn
+++ b/libyasm/tests/reserve-err1.errwarn
@@ -1,2 +1,2 @@
--:7: multiple expression not absolute
--:14: multiple expression not absolute
+-:7: error: multiple expression not absolute
+-:14: error: multiple expression not absolute

diff --git a/libyasm/tests/reserve-err2.errwarn b/libyasm/tests/reserve-err2.errwarn
index 44c5efa984538d561043237367da28f7704724d7..d3fbbabb27e621b4fe6d27af6d981b0150a9fe49 100644 (file)
--- a/libyasm/tests/reserve-err2.errwarn
+++ b/libyasm/tests/reserve-err2.errwarn
@@ -1,6 +1,6 @@
--:3: multiple is negative
--:4: expression must not contain floating point value
--:5: expression must not contain floating point value
--:10: multiple is negative
--:11: expression must not contain floating point value
--:12: expression must not contain floating point value
+-:3: error: multiple is negative
+-:4: error: expression must not contain floating point value
+-:5: error: expression must not contain floating point value
+-:10: error: multiple is negative
+-:11: error: expression must not contain floating point value
+-:12: error: expression must not contain floating point value

diff --git a/libyasm/tests/timesover-err.errwarn b/libyasm/tests/timesover-err.errwarn
index c972a1d99c74b6ba12120c3c574c7f55ea229cbd..81441ac3e448627d172e4fdafaaec28172e61fcc 100644 (file)
--- a/libyasm/tests/timesover-err.errwarn
+++ b/libyasm/tests/timesover-err.errwarn
@@ -1 +1 @@
--:2: multiple is negative
+-:2: error: multiple is negative

diff --git a/libyasm/tests/value-err.errwarn b/libyasm/tests/value-err.errwarn
index a753552437dbc3a644927b2595c2e7fd93343243..a949cd85ae87087e56b80be6167da714239934c3 100644 (file)
--- a/libyasm/tests/value-err.errwarn
+++ b/libyasm/tests/value-err.errwarn
@@ -1,3 +1,3 @@
--:2: effective address too complex
--:3: immediate expression too complex
--:8: data expression too complex
+-:2: error: effective address too complex
+-:3: error: immediate expression too complex
+-:8: error: data expression too complex

diff --git a/modules/arch/lc3b/tests/lc3b-ea-err.errwarn b/modules/arch/lc3b/tests/lc3b-ea-err.errwarn
index afc28697065ae91723d56a2f05df57549a8bb437..e49df726ab90c1e8aa7ba8b983944bff757bd958 100644 (file)
--- a/modules/arch/lc3b/tests/lc3b-ea-err.errwarn
+++ b/modules/arch/lc3b/tests/lc3b-ea-err.errwarn
@@ -1 +1 @@
--:1: invalid combination of opcode and operands
+-:1: error: invalid combination of opcode and operands

diff --git a/modules/arch/x86/tests/addrop-err.errwarn b/modules/arch/x86/tests/addrop-err.errwarn
index 72040ee77e8714d3e294c689a392546f3ea71057..0bf0b548057f0dacddb10a0ff3b836cd3a5e73d2 100644 (file)
--- a/modules/arch/x86/tests/addrop-err.errwarn
+++ b/modules/arch/x86/tests/addrop-err.errwarn
@@ -1 +1 @@
--:2: invalid effective address (displacement size)
+-:2: error: invalid effective address (displacement size)

diff --git a/modules/arch/x86/tests/cpubasic-err.errwarn b/modules/arch/x86/tests/cpubasic-err.errwarn
index 917843e59e770efc273e1193f7db976b798efc87..3c2b876c0f3e71a364c3927ab5d7e0237993b5be 100644 (file)
--- a/modules/arch/x86/tests/cpubasic-err.errwarn
+++ b/modules/arch/x86/tests/cpubasic-err.errwarn
@@ -1,6 +1,6 @@
 -:2: warning: `pause' is an instruction in CPU P4
--:4: requires CPU 186
+-:4: error: requires CPU 186
 -:7: warning: `fninit' is an instruction in CPU FPU
--:15: requires CPU 186
+-:15: error: requires CPU 186
 -:16: warning: `movsd' is an instruction in CPU 386
--:17: requires CPU 186
+-:17: error: requires CPU 186

diff --git a/modules/arch/x86/tests/div-err.errwarn b/modules/arch/x86/tests/div-err.errwarn
index 4b6340e7d6e9ebcfa80c8d4b206af5adebeaab35..af4662526246ac8429f63a63429eff0e4fb89bc1 100644 (file)
--- a/modules/arch/x86/tests/div-err.errwarn
+++ b/modules/arch/x86/tests/div-err.errwarn
@@ -1,4 +1,4 @@
--:1: cannot override register size
--:3: cannot override register size
--:4: cannot override register size
--:5: cannot override register size
+-:1: error: cannot override register size
+-:3: error: cannot override register size
+-:4: error: cannot override register size
+-:5: error: cannot override register size

diff --git a/modules/arch/x86/tests/lds-err.errwarn b/modules/arch/x86/tests/lds-err.errwarn
index cd07464a1b8da7aad0ff4a32e865637358201811..e29dc72858b461718ecc8142238e7a2b9d91a02d 100644 (file)
--- a/modules/arch/x86/tests/lds-err.errwarn
+++ b/modules/arch/x86/tests/lds-err.errwarn
@@ -1,4 +1,4 @@
--:2: invalid size for operand 2
--:3: invalid size for operand 2
--:5: invalid size for operand 2
--:6: invalid size for operand 2
+-:2: error: invalid size for operand 2
+-:3: error: invalid size for operand 2
+-:5: error: invalid size for operand 2
+-:6: error: invalid size for operand 2

diff --git a/modules/arch/x86/tests/mem64-err.errwarn b/modules/arch/x86/tests/mem64-err.errwarn
index c9b1943defcc90b3dec2b7d968abf7c196b7dfae..6f37650d025b627f35becea35b12704a189d6276 100644 (file)
--- a/modules/arch/x86/tests/mem64-err.errwarn
+++ b/modules/arch/x86/tests/mem64-err.errwarn
@@ -1,5 +1,5 @@
--:2: 16-bit addresses not supported in 64-bit mode
--:4: 16-bit addresses not supported in 64-bit mode
--:5: invalid effective address
--:6: invalid effective address
--:7: cannot use A/B/C/DH with instruction needing REX
+-:2: error: 16-bit addresses not supported in 64-bit mode
+-:4: error: 16-bit addresses not supported in 64-bit mode
+-:5: error: invalid effective address
+-:6: error: invalid effective address
+-:7: error: cannot use A/B/C/DH with instruction needing REX

diff --git a/modules/arch/x86/tests/nomem64-err.errwarn b/modules/arch/x86/tests/nomem64-err.errwarn
index 2694d2fb8ca0a024c54eebdfa349133034aa01f0..73bfcf975bb3e5276bf65a6fdf1758973688eb9b 100644 (file)
--- a/modules/arch/x86/tests/nomem64-err.errwarn
+++ b/modules/arch/x86/tests/nomem64-err.errwarn
@@ -1,12 +1,12 @@
 -:2: warning: `es' segment register ignored in 64-bit mode
--:4: `pushaw' invalid in 64-bit mode
--:5: `popa' invalid in 64-bit mode
--:6: `lds' invalid in 64-bit mode
--:7: `aas' invalid in 64-bit mode
--:8: `das' invalid in 64-bit mode
--:9: `aad' invalid in 64-bit mode
--:10: `into' invalid in 64-bit mode
--:11: `salc' invalid in 64-bit mode
+-:4: error: `pushaw' invalid in 64-bit mode
+-:5: error: `popa' invalid in 64-bit mode
+-:6: error: `lds' invalid in 64-bit mode
+-:7: error: `aas' invalid in 64-bit mode
+-:8: error: `das' invalid in 64-bit mode
+-:9: error: `aad' invalid in 64-bit mode
+-:10: error: `into' invalid in 64-bit mode
+-:11: error: `salc' invalid in 64-bit mode
 -:13: warning: `xmm9' is a register in 64-bit mode
 -:14: warning: `rax' is a register in 64-bit mode
 -:15: warning: `rdx' is a register in 64-bit mode

diff --git a/modules/arch/x86/tests/nomem64-err2.errwarn b/modules/arch/x86/tests/nomem64-err2.errwarn
index b26a14d18cddd6ca4d92ee7f361902ccf39e7026..8a78539210ac125fd094a737fb7ba5f3775c7a7d 100644 (file)
--- a/modules/arch/x86/tests/nomem64-err2.errwarn
+++ b/modules/arch/x86/tests/nomem64-err2.errwarn
@@ -1,2 +1,2 @@
--:2: cannot use A/B/C/DH with instruction needing REX
--:3: cannot use A/B/C/DH with instruction needing REX
+-:2: error: cannot use A/B/C/DH with instruction needing REX
+-:3: error: cannot use A/B/C/DH with instruction needing REX

diff --git a/modules/arch/x86/tests/opsize-err.errwarn b/modules/arch/x86/tests/opsize-err.errwarn
index da7bf083a5bec07700800549423915f0b86e441c..f515f51e3c60a09adfbacf0bfe07e4c8493cfb81 100644 (file)
--- a/modules/arch/x86/tests/opsize-err.errwarn
+++ b/modules/arch/x86/tests/opsize-err.errwarn
@@ -1 +1 @@
--:3: invalid size for operand 2
+-:3: error: invalid size for operand 2

diff --git a/modules/arch/x86/tests/pushf-err.errwarn b/modules/arch/x86/tests/pushf-err.errwarn
index 79f3177a81435ebd6f9b5afd8ac8af352cbde507..498610ba54f62abf405fa437048503387cd88ccb 100644 (file)
--- a/modules/arch/x86/tests/pushf-err.errwarn
+++ b/modules/arch/x86/tests/pushf-err.errwarn
@@ -1,10 +1,10 @@
 -:5: warning: `pushfq' is an instruction in 64-bit mode
 -:9: warning: `popfq' is an instruction in 64-bit mode
 -:15: warning: `pushfq' is an instruction in 64-bit mode
--:15: redefinition of `pushfq'
--:5: `pushfq' previously defined here
+-:15: error: redefinition of `pushfq'
+-:5: error: `pushfq' previously defined here
 -:19: warning: `popfq' is an instruction in 64-bit mode
--:19: redefinition of `popfq'
--:9: `popfq' previously defined here
--:24: `pushfd' invalid in 64-bit mode
--:28: `popfd' invalid in 64-bit mode
+-:19: error: redefinition of `popfq'
+-:9: error: `popfq' previously defined here
+-:24: error: `pushfd' invalid in 64-bit mode
+-:28: error: `popfd' invalid in 64-bit mode

diff --git a/modules/arch/x86/tests/sse4-err.errwarn b/modules/arch/x86/tests/sse4-err.errwarn
index b26a14d18cddd6ca4d92ee7f361902ccf39e7026..8a78539210ac125fd094a737fb7ba5f3775c7a7d 100644 (file)
--- a/modules/arch/x86/tests/sse4-err.errwarn
+++ b/modules/arch/x86/tests/sse4-err.errwarn
@@ -1,2 +1,2 @@
--:2: cannot use A/B/C/DH with instruction needing REX
--:3: cannot use A/B/C/DH with instruction needing REX
+-:2: error: cannot use A/B/C/DH with instruction needing REX
+-:3: error: cannot use A/B/C/DH with instruction needing REX

diff --git a/modules/arch/x86/tests/sse5-err.errwarn b/modules/arch/x86/tests/sse5-err.errwarn
index 19df6e09303fc2e79693f3a6e39307ec94cff010..3c76880e655019d8cf999a1e2161af844790c19b 100644 (file)
--- a/modules/arch/x86/tests/sse5-err.errwarn
+++ b/modules/arch/x86/tests/sse5-err.errwarn
@@ -1,84 +1,84 @@
--:1: one of source operand 1 or 3 must match dest operand
--:2: one of source operand 1 or 3 must match dest operand
--:3: one of source operand 1 or 3 must match dest operand
--:5: one of source operand 1 or 3 must match dest operand
--:6: one of source operand 1 or 3 must match dest operand
--:7: one of source operand 1 or 3 must match dest operand
--:9: one of source operand 1 or 3 must match dest operand
--:10: one of source operand 1 or 3 must match dest operand
--:11: one of source operand 1 or 3 must match dest operand
--:13: one of source operand 1 or 3 must match dest operand
--:14: one of source operand 1 or 3 must match dest operand
--:15: one of source operand 1 or 3 must match dest operand
--:17: one of source operand 1 or 3 must match dest operand
--:18: one of source operand 1 or 3 must match dest operand
--:19: one of source operand 1 or 3 must match dest operand
--:21: one of source operand 1 or 3 must match dest operand
--:22: one of source operand 1 or 3 must match dest operand
--:23: one of source operand 1 or 3 must match dest operand
--:25: one of source operand 1 or 3 must match dest operand
--:26: one of source operand 1 or 3 must match dest operand
--:27: one of source operand 1 or 3 must match dest operand
--:29: one of source operand 1 or 3 must match dest operand
--:30: one of source operand 1 or 3 must match dest operand
--:31: one of source operand 1 or 3 must match dest operand
--:33: one of source operand 1 or 3 must match dest operand
--:34: one of source operand 1 or 3 must match dest operand
--:35: one of source operand 1 or 3 must match dest operand
--:37: one of source operand 1 or 3 must match dest operand
--:38: one of source operand 1 or 3 must match dest operand
--:39: one of source operand 1 or 3 must match dest operand
--:41: one of source operand 1 or 3 must match dest operand
--:42: one of source operand 1 or 3 must match dest operand
--:43: one of source operand 1 or 3 must match dest operand
--:45: one of source operand 1 or 3 must match dest operand
--:46: one of source operand 1 or 3 must match dest operand
--:47: one of source operand 1 or 3 must match dest operand
--:49: one of source operand 1 or 3 must match dest operand
--:50: one of source operand 1 or 3 must match dest operand
--:51: one of source operand 1 or 3 must match dest operand
--:53: one of source operand 1 or 3 must match dest operand
--:54: one of source operand 1 or 3 must match dest operand
--:55: one of source operand 1 or 3 must match dest operand
--:57: one of source operand 1 or 3 must match dest operand
--:58: one of source operand 1 or 3 must match dest operand
--:59: one of source operand 1 or 3 must match dest operand
--:61: one of source operand 1 or 3 must match dest operand
--:62: one of source operand 1 or 3 must match dest operand
--:63: one of source operand 1 or 3 must match dest operand
--:65: one of source operand 1 or 3 must match dest operand
--:66: one of source operand 1 or 3 must match dest operand
--:67: one of source operand 1 or 3 must match dest operand
--:69: one of source operand 1 or 3 must match dest operand
--:70: one of source operand 1 or 3 must match dest operand
--:71: one of source operand 1 or 3 must match dest operand
--:73: one of source operand 1 or 3 must match dest operand
--:74: one of source operand 1 or 3 must match dest operand
--:75: one of source operand 1 or 3 must match dest operand
--:77: one of source operand 1 or 3 must match dest operand
--:78: one of source operand 1 or 3 must match dest operand
--:80: one of source operand 1 or 3 must match dest operand
--:81: one of source operand 1 or 3 must match dest operand
--:83: one of source operand 1 or 3 must match dest operand
--:84: one of source operand 1 or 3 must match dest operand
--:86: one of source operand 1 or 3 must match dest operand
--:87: one of source operand 1 or 3 must match dest operand
--:89: one of source operand 1 or 3 must match dest operand
--:90: one of source operand 1 or 3 must match dest operand
--:92: one of source operand 1 or 3 must match dest operand
--:93: one of source operand 1 or 3 must match dest operand
--:95: one of source operand 1 or 3 must match dest operand
--:96: one of source operand 1 or 3 must match dest operand
--:98: one of source operand 1 or 3 must match dest operand
--:99: one of source operand 1 or 3 must match dest operand
--:101: one of source operand 1 or 3 must match dest operand
--:102: one of source operand 1 or 3 must match dest operand
--:104: one of source operand 1 or 3 must match dest operand
--:105: one of source operand 1 or 3 must match dest operand
--:107: one of source operand 1 or 3 must match dest operand
--:108: one of source operand 1 or 3 must match dest operand
--:110: one of source operand 1 or 3 must match dest operand
--:111: one of source operand 1 or 3 must match dest operand
--:113: one of source operand 1 or 3 must match dest operand
--:114: one of source operand 1 or 3 must match dest operand
--:115: one of source operand 1 or 3 must match dest operand
+-:1: error: one of source operand 1 or 3 must match dest operand
+-:2: error: one of source operand 1 or 3 must match dest operand
+-:3: error: one of source operand 1 or 3 must match dest operand
+-:5: error: one of source operand 1 or 3 must match dest operand
+-:6: error: one of source operand 1 or 3 must match dest operand
+-:7: error: one of source operand 1 or 3 must match dest operand
+-:9: error: one of source operand 1 or 3 must match dest operand
+-:10: error: one of source operand 1 or 3 must match dest operand
+-:11: error: one of source operand 1 or 3 must match dest operand
+-:13: error: one of source operand 1 or 3 must match dest operand
+-:14: error: one of source operand 1 or 3 must match dest operand
+-:15: error: one of source operand 1 or 3 must match dest operand
+-:17: error: one of source operand 1 or 3 must match dest operand
+-:18: error: one of source operand 1 or 3 must match dest operand
+-:19: error: one of source operand 1 or 3 must match dest operand
+-:21: error: one of source operand 1 or 3 must match dest operand
+-:22: error: one of source operand 1 or 3 must match dest operand
+-:23: error: one of source operand 1 or 3 must match dest operand
+-:25: error: one of source operand 1 or 3 must match dest operand
+-:26: error: one of source operand 1 or 3 must match dest operand
+-:27: error: one of source operand 1 or 3 must match dest operand
+-:29: error: one of source operand 1 or 3 must match dest operand
+-:30: error: one of source operand 1 or 3 must match dest operand
+-:31: error: one of source operand 1 or 3 must match dest operand
+-:33: error: one of source operand 1 or 3 must match dest operand
+-:34: error: one of source operand 1 or 3 must match dest operand
+-:35: error: one of source operand 1 or 3 must match dest operand
+-:37: error: one of source operand 1 or 3 must match dest operand
+-:38: error: one of source operand 1 or 3 must match dest operand
+-:39: error: one of source operand 1 or 3 must match dest operand
+-:41: error: one of source operand 1 or 3 must match dest operand
+-:42: error: one of source operand 1 or 3 must match dest operand
+-:43: error: one of source operand 1 or 3 must match dest operand
+-:45: error: one of source operand 1 or 3 must match dest operand
+-:46: error: one of source operand 1 or 3 must match dest operand
+-:47: error: one of source operand 1 or 3 must match dest operand
+-:49: error: one of source operand 1 or 3 must match dest operand
+-:50: error: one of source operand 1 or 3 must match dest operand
+-:51: error: one of source operand 1 or 3 must match dest operand
+-:53: error: one of source operand 1 or 3 must match dest operand
+-:54: error: one of source operand 1 or 3 must match dest operand
+-:55: error: one of source operand 1 or 3 must match dest operand
+-:57: error: one of source operand 1 or 3 must match dest operand
+-:58: error: one of source operand 1 or 3 must match dest operand
+-:59: error: one of source operand 1 or 3 must match dest operand
+-:61: error: one of source operand 1 or 3 must match dest operand
+-:62: error: one of source operand 1 or 3 must match dest operand
+-:63: error: one of source operand 1 or 3 must match dest operand
+-:65: error: one of source operand 1 or 3 must match dest operand
+-:66: error: one of source operand 1 or 3 must match dest operand
+-:67: error: one of source operand 1 or 3 must match dest operand
+-:69: error: one of source operand 1 or 3 must match dest operand
+-:70: error: one of source operand 1 or 3 must match dest operand
+-:71: error: one of source operand 1 or 3 must match dest operand
+-:73: error: one of source operand 1 or 3 must match dest operand
+-:74: error: one of source operand 1 or 3 must match dest operand
+-:75: error: one of source operand 1 or 3 must match dest operand
+-:77: error: one of source operand 1 or 3 must match dest operand
+-:78: error: one of source operand 1 or 3 must match dest operand
+-:80: error: one of source operand 1 or 3 must match dest operand
+-:81: error: one of source operand 1 or 3 must match dest operand
+-:83: error: one of source operand 1 or 3 must match dest operand
+-:84: error: one of source operand 1 or 3 must match dest operand
+-:86: error: one of source operand 1 or 3 must match dest operand
+-:87: error: one of source operand 1 or 3 must match dest operand
+-:89: error: one of source operand 1 or 3 must match dest operand
+-:90: error: one of source operand 1 or 3 must match dest operand
+-:92: error: one of source operand 1 or 3 must match dest operand
+-:93: error: one of source operand 1 or 3 must match dest operand
+-:95: error: one of source operand 1 or 3 must match dest operand
+-:96: error: one of source operand 1 or 3 must match dest operand
+-:98: error: one of source operand 1 or 3 must match dest operand
+-:99: error: one of source operand 1 or 3 must match dest operand
+-:101: error: one of source operand 1 or 3 must match dest operand
+-:102: error: one of source operand 1 or 3 must match dest operand
+-:104: error: one of source operand 1 or 3 must match dest operand
+-:105: error: one of source operand 1 or 3 must match dest operand
+-:107: error: one of source operand 1 or 3 must match dest operand
+-:108: error: one of source operand 1 or 3 must match dest operand
+-:110: error: one of source operand 1 or 3 must match dest operand
+-:111: error: one of source operand 1 or 3 must match dest operand
+-:113: error: one of source operand 1 or 3 must match dest operand
+-:114: error: one of source operand 1 or 3 must match dest operand
+-:115: error: one of source operand 1 or 3 must match dest operand

diff --git a/modules/arch/x86/tests/strict-err.errwarn b/modules/arch/x86/tests/strict-err.errwarn
index 62ebb456fa6c12298d1983371fa07606264f803a..ac3b21b874b23809436857e71a054cd8fd3a4cb3 100644 (file)
--- a/modules/arch/x86/tests/strict-err.errwarn
+++ b/modules/arch/x86/tests/strict-err.errwarn
@@ -1,4 +1,4 @@
--:2: invalid size for operand 1
--:3: invalid size for operand 1
--:4: invalid size for operand 2
--:5: invalid size for operand 2
+-:2: error: invalid size for operand 1
+-:3: error: invalid size for operand 1
+-:4: error: invalid size for operand 2
+-:5: error: invalid size for operand 2

diff --git a/modules/arch/x86/tests/vmx-err.errwarn b/modules/arch/x86/tests/vmx-err.errwarn
index 6faab0a7310d4131a5123714e859bc59bb4e9f3f..7db4b3cbad86f3441cd067e362e379e6f29dec0c 100644 (file)
--- a/modules/arch/x86/tests/vmx-err.errwarn
+++ b/modules/arch/x86/tests/vmx-err.errwarn
@@ -1,2 +1,2 @@
--:6: invalid size for operand 2
--:7: invalid size for operand 1
+-:6: error: invalid size for operand 2
+-:7: error: invalid size for operand 1

diff --git a/modules/dbgfmts/dwarf2/tests/pass32/dwarf32-err.errwarn b/modules/dbgfmts/dwarf2/tests/pass32/dwarf32-err.errwarn
index d22fdf917dffb7bcc456d641838e8368c6e1aac4..9c333565666bf4134449503e61301793fc8055d2 100644 (file)
--- a/modules/dbgfmts/dwarf2/tests/pass32/dwarf32-err.errwarn
+++ b/modules/dbgfmts/dwarf2/tests/pass32/dwarf32-err.errwarn
@@ -1,22 +1,22 @@
--:1: directive `.loc' requires an argument
--:2: file number required
--:3: file number required
--:4: file number less than one
--:6: line number required
--:7: line number required
--:8: line number required
--:11: line number required
+-:1: error: directive `.loc' requires an argument
+-:2: error: file number required
+-:3: error: file number required
+-:4: error: file number less than one
+-:6: error: line number required
+-:7: error: line number required
+-:8: error: line number required
+-:11: error: line number required
 -:12: warning: unrecognized numeric qualifier
--:13: column number is not a constant
--:14: is_stmt requires value
--:17: is_stmt value is not a constant
--:19: is_stmt value is not a constant
--:20: is_stmt value is not a constant
--:22: is_stmt value not 0 or 1
--:23: isa requires value
--:26: isa value is not a constant
--:28: isa value is not a constant
--:30: isa value less than zero
--:31: column number is not a constant
+-:13: error: column number is not a constant
+-:14: error: is_stmt requires value
+-:17: error: is_stmt value is not a constant
+-:19: error: is_stmt value is not a constant
+-:20: error: is_stmt value is not a constant
+-:22: error: is_stmt value not 0 or 1
+-:23: error: isa requires value
+-:26: error: isa value is not a constant
+-:28: error: isa value is not a constant
+-:30: error: isa value less than zero
+-:31: error: column number is not a constant
 -:33: warning: unrecognized loc option `foo'
 -:33: warning: unrecognized numeric qualifier

diff --git a/modules/objfmts/bin/tests/float-err.errwarn b/modules/objfmts/bin/tests/float-err.errwarn
index 33fcebec8929816b2634218c084edb2f3f10fcf3..4aaa9402928599fd0f13cbc53608969d231eba84 100644 (file)
--- a/modules/objfmts/bin/tests/float-err.errwarn
+++ b/modules/objfmts/bin/tests/float-err.errwarn
@@ -1,8 +1,8 @@
--:2: invalid floating point constant size
+-:2: error: invalid floating point constant size
 -:3: warning: overflow in floating point expression
 -:4: warning: overflow in floating point expression
 -:5: warning: underflow in floating point expression
--:8: invalid floating point constant size
+-:8: error: invalid floating point constant size
 -:9: warning: overflow in floating point expression
 -:11: warning: overflow in floating point expression
 -:12: warning: underflow in floating point expression

diff --git a/modules/objfmts/bin/tests/multisect/follows-loop1-err.errwarn b/modules/objfmts/bin/tests/multisect/follows-loop1-err.errwarn
index c7ba6a5af3f2675a08d4ad0659c5aed6d425f63b..613280e9c562ac087d9cc0ab8908a1069da8b5e0 100644 (file)
--- a/modules/objfmts/bin/tests/multisect/follows-loop1-err.errwarn
+++ b/modules/objfmts/bin/tests/multisect/follows-loop1-err.errwarn
@@ -1 +1 @@
--: follows loop between section `sect2' and section `sect1'
+-: error: follows loop between section `sect2' and section `sect1'

diff --git a/modules/objfmts/bin/tests/multisect/follows-loop2-err.errwarn b/modules/objfmts/bin/tests/multisect/follows-loop2-err.errwarn
index f4f46dd9311fd25a4be4f13873593be7dd127c79..bc832e009b4802e218d6c89dd20595f044f7a8a0 100644 (file)
--- a/modules/objfmts/bin/tests/multisect/follows-loop2-err.errwarn
+++ b/modules/objfmts/bin/tests/multisect/follows-loop2-err.errwarn
@@ -1 +1 @@
--: follows loop between section `sect' and section `sect'
+-: error: follows loop between section `sect' and section `sect'

diff --git a/modules/objfmts/bin/tests/multisect/follows-notfound-err.errwarn b/modules/objfmts/bin/tests/multisect/follows-notfound-err.errwarn
index 8523476704d5919ff0bd540a5160a4d525bf722c..53d29d80e5f5c7efbbe9d6077c9d263fdab766a9 100644 (file)
--- a/modules/objfmts/bin/tests/multisect/follows-notfound-err.errwarn
+++ b/modules/objfmts/bin/tests/multisect/follows-notfound-err.errwarn
@@ -1 +1 @@
--: section `foo' follows an invalid or unknown section `bar'
+-: error: section `foo' follows an invalid or unknown section `bar'

diff --git a/modules/objfmts/bin/tests/multisect/vfollows-loop1-err.errwarn b/modules/objfmts/bin/tests/multisect/vfollows-loop1-err.errwarn
index b7a9006dc40b2d9f1045307a7b9bacfe3e76c8f1..3965e589d1bcea46a67085c4accae0e786b6c39f 100644 (file)
--- a/modules/objfmts/bin/tests/multisect/vfollows-loop1-err.errwarn
+++ b/modules/objfmts/bin/tests/multisect/vfollows-loop1-err.errwarn
@@ -1 +1 @@
--: vfollows loop between section `sect2' and section `sect1'
+-: error: vfollows loop between section `sect2' and section `sect1'

diff --git a/modules/objfmts/bin/tests/multisect/vfollows-loop2-err.errwarn b/modules/objfmts/bin/tests/multisect/vfollows-loop2-err.errwarn
index d48bbc8544edb6c60f9b4f1eec9f816359eb6ded..4f252b4272a344656f937adcdbb553ab17d8e83a 100644 (file)
--- a/modules/objfmts/bin/tests/multisect/vfollows-loop2-err.errwarn
+++ b/modules/objfmts/bin/tests/multisect/vfollows-loop2-err.errwarn
@@ -1 +1 @@
--: vfollows loop between section `sect' and section `sect'
+-: error: vfollows loop between section `sect' and section `sect'

diff --git a/modules/objfmts/bin/tests/multisect/vfollows-notfound-err.errwarn b/modules/objfmts/bin/tests/multisect/vfollows-notfound-err.errwarn
index ecbc97d498ea702447c05988c48b16b432cc4023..93b44d086c5b6942d1dd3b28fd6f9af0b5771ba4 100644 (file)
--- a/modules/objfmts/bin/tests/multisect/vfollows-notfound-err.errwarn
+++ b/modules/objfmts/bin/tests/multisect/vfollows-notfound-err.errwarn
@@ -1 +1 @@
--: section `foo' vfollows an invalid or unknown section `bar'
+-: error: section `foo' vfollows an invalid or unknown section `bar'

diff --git a/modules/objfmts/elf/tests/curpos-err.errwarn b/modules/objfmts/elf/tests/curpos-err.errwarn
index fb6f65d78c6a97f7940c4d08b80d2f5aeccc0138..efe6b093081ddfb52589fc6df616c6fff8156c22 100644 (file)
--- a/modules/objfmts/elf/tests/curpos-err.errwarn
+++ b/modules/objfmts/elf/tests/curpos-err.errwarn
@@ -1,2 +1,2 @@
--:15: data expression too complex
--:21: data expression too complex
+-:15: error: data expression too complex
+-:21: error: data expression too complex

diff --git a/modules/objfmts/macho/tests/nasm64/macho-reloc64-err.errwarn b/modules/objfmts/macho/tests/nasm64/macho-reloc64-err.errwarn
index 3d4e5d972abccecc1cb04d167455f72652592493..8297a5bb12843815cd5a17a965790f51e7dafc69 100644 (file)
--- a/modules/objfmts/macho/tests/nasm64/macho-reloc64-err.errwarn
+++ b/modules/objfmts/macho/tests/nasm64/macho-reloc64-err.errwarn
@@ -1,8 +1,8 @@
--:20: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
--:21: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
--:23: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
--:24: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
--:25: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
--:26: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
--:27: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
--:29: macho: WRT not supported
+-:20: error: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
+-:21: error: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
+-:23: error: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
+-:24: error: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
+-:25: error: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
+-:26: error: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
+-:27: error: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
+-:29: error: macho: WRT not supported

diff --git a/modules/objfmts/win64/tests/sce1-err.errwarn b/modules/objfmts/win64/tests/sce1-err.errwarn
index f5b67933ccdd123fe0b2dea82aef0d6023d46a4e..bfb88c14a5624fa9f820bed408ba41d76546f7fb 100644 (file)
--- a/modules/objfmts/win64/tests/sce1-err.errwarn
+++ b/modules/objfmts/win64/tests/sce1-err.errwarn
@@ -1,8 +1,8 @@
--:9: ended procedure without ending prologue
--:1: procedure started here
--:20: nested procedures not supported (didn't use [ENDPROC_FRAME]?)
--:11: previous procedure started here
--:27: [SAVEREG] after end of prologue
--:26: prologue ended here
--:31: [ENDPROLOG] without preceding [PROC_FRAME]
--:32: [SAVEREG] without preceding [PROC_FRAME]
+-:9: error: ended procedure without ending prologue
+-:1: error: procedure started here
+-:20: error: nested procedures not supported (didn't use [ENDPROC_FRAME]?)
+-:11: error: previous procedure started here
+-:27: error: [SAVEREG] after end of prologue
+-:26: error: prologue ended here
+-:31: error: [ENDPROLOG] without preceding [PROC_FRAME]
+-:32: error: [SAVEREG] without preceding [PROC_FRAME]

diff --git a/modules/objfmts/win64/tests/sce2-err.errwarn b/modules/objfmts/win64/tests/sce2-err.errwarn
index d7f0d2901a66a7cfc3b259e1cf7ece15560dbc71..73e186527a15a3f008848770654cf6b59b5880ca 100644 (file)
--- a/modules/objfmts/win64/tests/sce2-err.errwarn
+++ b/modules/objfmts/win64/tests/sce2-err.errwarn
@@ -1,2 +1,2 @@
--: end of file in procedure frame
--:1: procedure started here
+-: error: end of file in procedure frame
+-:1: error: procedure started here

diff --git a/modules/objfmts/win64/tests/sce4-err.errwarn b/modules/objfmts/win64/tests/sce4-err.errwarn
index 92d9cb029d99da102097d9774a664c10c995f63d..b477ceb7b2538b9bff4494bbcd87dcece8541860 100644 (file)
--- a/modules/objfmts/win64/tests/sce4-err.errwarn
+++ b/modules/objfmts/win64/tests/sce4-err.errwarn
@@ -1,9 +1,9 @@
--:2: frame offset of -4 bytes, must be between 0 and 240
--:3: negative offset not allowed
--:5: negative offset not allowed
--:6: negative offset not allowed
--:11: frame offset of 248 bytes, must be between 0 and 240
--:17: frame offset of 236 is not a multiple of 16
--:18: offset of 124 is not a multiple of 8
--:20: offset of 1032 is not a multiple of 16
--:21: offset of 1028 is not a multiple of 8
+-:2: error: frame offset of -4 bytes, must be between 0 and 240
+-:3: error: negative offset not allowed
+-:5: error: negative offset not allowed
+-:6: error: negative offset not allowed
+-:11: error: frame offset of 248 bytes, must be between 0 and 240
+-:17: error: frame offset of 236 is not a multiple of 16
+-:18: error: offset of 124 is not a multiple of 8
+-:20: error: offset of 1032 is not a multiple of 16
+-:21: error: offset of 1028 is not a multiple of 8

diff --git a/modules/objfmts/xdf/tests/xdfsect-err.errwarn b/modules/objfmts/xdf/tests/xdfsect-err.errwarn
index 4a9d5b3a3d00c5bd6bba37db02a4182057dcb8cd..84acc4c1e2a256839c4e1944609a553e3bfe78f6 100644 (file)
--- a/modules/objfmts/xdf/tests/xdfsect-err.errwarn
+++ b/modules/objfmts/xdf/tests/xdfsect-err.errwarn
@@ -1,4 +1,4 @@
--:1: directive `section' requires an argument
+-:1: error: directive `section' requires an argument
 -:2: warning: Unrecognized qualifier `use16'
 -:3: warning: Unrecognized qualifier `use32'
 -:4: warning: Unrecognized qualifier `use64'
@@ -6,15 +6,15 @@
 -:6: warning: Unrecognized qualifier `flat'
 -:7: warning: Unrecognized qualifier `foo'
 -:8: warning: Unrecognized qualifier `foo'
--:9: argument to `absolute' is not an integer
--:9: undefined symbol `foo' (first use)
--:9:  (Each undefined symbol is reported only once.)
--:10: argument to `absolute' is not an integer
+-:9: error: argument to `absolute' is not an integer
+-:9: error: undefined symbol `foo' (first use)
+-:9: error:  (Each undefined symbol is reported only once.)
+-:10: error: argument to `absolute' is not an integer
 -:11: warning: Unrecognized qualifier `absolute'
--:12: argument to `virtual' is not an integer
--:13: argument to `virtual' is not an integer
+-:12: error: argument to `virtual' is not an integer
+-:13: error: argument to `virtual' is not an integer
 -:14: warning: Unrecognized qualifier `virtual'
--:15: argument to `align' is not an integer
--:16: argument to `align' is not an integer
+-:15: error: argument to `align' is not an integer
+-:16: error: argument to `align' is not an integer
 -:17: warning: Unrecognized qualifier `align'
 -:18: warning: Unrecognized string qualifier

diff --git a/modules/parsers/gas/tests/bin/rept-err.errwarn b/modules/parsers/gas/tests/bin/rept-err.errwarn
index 050398c2aca0a660545c43823710068685479250..3f64c8eb8c9b77d6c1f7104fd9a75924dc2bd286 100644 (file)
--- a/modules/parsers/gas/tests/bin/rept-err.errwarn
+++ b/modules/parsers/gas/tests/bin/rept-err.errwarn
@@ -1 +1 @@
--:1: rept without matching endr
+-:1: error: rept without matching endr

diff --git a/modules/parsers/gas/tests/bin/reptnested-err.errwarn b/modules/parsers/gas/tests/bin/reptnested-err.errwarn
index 016b13e94afb4065b7ff22026230d719cdcd839f..d7ac0b710b7368781c765f5c74a9eb48d59f004b 100644 (file)
--- a/modules/parsers/gas/tests/bin/reptnested-err.errwarn
+++ b/modules/parsers/gas/tests/bin/reptnested-err.errwarn
@@ -1,7 +1,7 @@
--:2: nested rept not supported
--:3: rept without matching endr
--:4: nested rept not supported
--:4: nested rept not supported
--:4: nested rept not supported
--:4: nested rept not supported
--:4: nested rept not supported
+-:2: error: nested rept not supported
+-:3: error: rept without matching endr
+-:4: error: nested rept not supported
+-:4: error: nested rept not supported
+-:4: error: nested rept not supported
+-:4: error: nested rept not supported
+-:4: error: nested rept not supported

diff --git a/modules/parsers/gas/tests/gas-line-err.errwarn b/modules/parsers/gas/tests/gas-line-err.errwarn
index 8f92ad62c6e90f2d7c580841ccb5b1d14f9fbe36..f08f8be8c1f16acf317f9a9e35344ab47f4ac7e6 100644 (file)
--- a/modules/parsers/gas/tests/gas-line-err.errwarn
+++ b/modules/parsers/gas/tests/gas-line-err.errwarn
@@ -1,6 +1,6 @@
--:1: invalid number of operands
--:3: invalid number of operands
-bar1.s:601: invalid number of operands
-bar1.s:201: invalid number of operands
-bar2.s:203: invalid number of operands
-bar2.s:205: invalid number of operands
+-:1: error: invalid number of operands
+-:3: error: invalid number of operands
+bar1.s:601: error: invalid number of operands
+bar1.s:201: error: invalid number of operands
+bar2.s:203: error: invalid number of operands
+bar2.s:205: error: invalid number of operands

diff --git a/modules/parsers/gas/tests/gas-line2-err.errwarn b/modules/parsers/gas/tests/gas-line2-err.errwarn
index 4cfc626fb9bd3c22736697a9fb58d9d8496d910b..5cd6b05bdcc9dabbb78899ef7d97267aa6dfa4cb 100644 (file)
--- a/modules/parsers/gas/tests/gas-line2-err.errwarn
+++ b/modules/parsers/gas/tests/gas-line2-err.errwarn
@@ -1,3 +1,3 @@
--:1: invalid number of operands
--:3: invalid number of operands
-bar1.s:603: invalid number of operands
+-:1: error: invalid number of operands
+-:3: error: invalid number of operands
+bar1.s:603: error: invalid number of operands

diff --git a/modules/parsers/gas/tests/reggroup-err.errwarn b/modules/parsers/gas/tests/reggroup-err.errwarn
index 1b6d02b77e11eb2edbcabbce75734558aa924307..3f428a79b8a9a5035e6495dd8a511e892c7a448f 100644 (file)
--- a/modules/parsers/gas/tests/reggroup-err.errwarn
+++ b/modules/parsers/gas/tests/reggroup-err.errwarn
@@ -1 +1 @@
--:5: bad register index `8'
+-:5: error: bad register index `8'

diff --git a/modules/preprocs/nasm/tests/ifcritical-err.errwarn b/modules/preprocs/nasm/tests/ifcritical-err.errwarn
index 55b237a3e71936051958797d09c4f4d651b8a1d8..73ca327cb511515bb20cd0256a4e3a78b778b1df 100644 (file)
--- a/modules/preprocs/nasm/tests/ifcritical-err.errwarn
+++ b/modules/preprocs/nasm/tests/ifcritical-err.errwarn
@@ -1 +1 @@
--:5: non-constant value given to `%if'
+-:5: error: non-constant value given to `%if'