aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2020-10-11 15:52:41 +0300
committerCyrill Gorcunov <gorcunov@gmail.com>2020-10-11 15:52:41 +0300
commit84c35517de2ffa33a5525dcc17a311c30fbd7c4c (patch)
tree855cb92545237f31ea1cef2c1d3c4608a5ff8405
parentc0e2bbc66a345f7a76ff01dfb67a216ab5313dfa (diff)
downloadnasm-84c35517de2ffa33a5525dcc17a311c30fbd7c4c.tar.gz
nasm-84c35517de2ffa33a5525dcc17a311c30fbd7c4c.tar.xz
nasm-84c35517de2ffa33a5525dcc17a311c30fbd7c4c.zip
travis: add masmdisp
It is failing right now so I'm not sure if masm test is correct one. Lets merge it in this form and update if needed. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
-rw-r--r--travis/test/masmdisp.asm40
-rw-r--r--travis/test/masmdisp.json13
-rw-r--r--travis/test/masmdisp.stderr8
3 files changed, 61 insertions, 0 deletions
diff --git a/travis/test/masmdisp.asm b/travis/test/masmdisp.asm
new file mode 100644
index 00000000..c5e9af4f
--- /dev/null
+++ b/travis/test/masmdisp.asm
@@ -0,0 +1,40 @@
+ %use masm
+
+ global fproc, nproc
+
+ bits 64
+
+_TEXT segment
+
+fproc proc far
+ mov eax,dword ptr foo
+ mov rdx,offset foo
+ mov ecx,bar[rbx]
+ lea rsi,foo
+ lea rsi,dword ptr foo
+ lea rsi,[foo]
+ lea rsi,dword [foo]
+ mov rdi,gs:[rbx]
+ ret
+fproc endp
+
+nproc proc near
+ mov eax,dword ptr foo
+ mov rdx,offset foo
+ mov ecx,bar[rbx]
+ mov rdi,[gs:foo]
+ mov rdi,qword ptr gs:foo
+ ret
+nproc endp
+
+_TEXT ends
+
+_DATA segment
+nxx dd 80
+foo dd 100
+_DATA ends
+
+ segment _BSS nobits
+bar resd 100
+xyzzy dd 64 dup (?)
+_BSS ends
diff --git a/travis/test/masmdisp.json b/travis/test/masmdisp.json
new file mode 100644
index 00000000..1ed7817c
--- /dev/null
+++ b/travis/test/masmdisp.json
@@ -0,0 +1,13 @@
+[
+ {
+ "description": "Test masm",
+ "id": "masmdisp",
+ "format": "win32",
+ "source": "masmdisp.asm",
+ "option": "-Ox",
+ "target": [
+ { "stderr": "masmdisp.stderr" }
+ ],
+ "error": "expected"
+ }
+]
diff --git a/travis/test/masmdisp.stderr b/travis/test/masmdisp.stderr
new file mode 100644
index 00000000..2428dee3
--- /dev/null
+++ b/travis/test/masmdisp.stderr
@@ -0,0 +1,8 @@
+./travis/test/masmdisp.asm:19: error: label `fproc' inconsistently redefined
+./travis/test/masmdisp.asm:9: info: label `fproc' originally defined here
+./travis/test/masmdisp.asm:28: error: label `nproc' inconsistently redefined
+./travis/test/masmdisp.asm:21: info: label `nproc' originally defined here
+./travis/test/masmdisp.asm:30: error: label `_TEXT' inconsistently redefined
+./travis/test/masmdisp.asm:7: info: label `_TEXT' originally defined here
+./travis/test/masmdisp.asm:35: error: label `_DATA' inconsistently redefined
+./travis/test/masmdisp.asm:32: info: label `_DATA' originally defined here