aboutsummaryrefslogtreecommitdiffstats
path: root/travis/test
diff options
context:
space:
mode:
authorH. Peter Anvin (Intel) <hpa@zytor.com>2020-08-25 16:16:09 -0700
committerH. Peter Anvin (Intel) <hpa@zytor.com>2020-08-25 16:16:09 -0700
commitcc843efa38bd6a4622ce046e51a192a05580fa4a (patch)
tree8c5b05bafda40161c8957e1bc3d6181a86418799 /travis/test
parent1227a5d7fbf2d5ad691a5940c4c32ced83477089 (diff)
parent717348304378b9148e3e87d41bf54f67d36dee72 (diff)
downloadnasm-cc843efa38bd6a4622ce046e51a192a05580fa4a.tar.gz
nasm-cc843efa38bd6a4622ce046e51a192a05580fa4a.tar.xz
nasm-cc843efa38bd6a4622ce046e51a192a05580fa4a.zip
Merge tag 'nasm-2.15.04'
NASM 2.15.04 Conflicts: asm/listing.h asm/pptok.pl asm/preproc.c version This doesn't pass travis test 3392711, which is using an extremely odd construct of %?? in the middle of an argument sequence for an smacro while not being in a macro itself, and expecting it to expand to the macro name. This seems to *really* confuse the master branch. Resolve this later...
Diffstat (limited to 'travis/test')
-rw-r--r--travis/test/br3392643.asm4
-rw-r--r--travis/test/br3392643.json13
-rw-r--r--travis/test/br3392643.obj.tbin0 -> 349 bytes
-rw-r--r--travis/test/br3392643.stderr1
-rw-r--r--travis/test/br3392711.asm18
-rw-r--r--travis/test/br3392711.json12
-rw-r--r--travis/test/br3392711.o.tbin0 -> 1024 bytes
7 files changed, 48 insertions, 0 deletions
diff --git a/travis/test/br3392643.asm b/travis/test/br3392643.asm
new file mode 100644
index 00000000..a57ae29a
--- /dev/null
+++ b/travis/test/br3392643.asm
@@ -0,0 +1,4 @@
+;
+; Test long section name to be trimmed down to RECORD_MAX
+;
+section .name0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
diff --git a/travis/test/br3392643.json b/travis/test/br3392643.json
new file mode 100644
index 00000000..6442cc02
--- /dev/null
+++ b/travis/test/br3392643.json
@@ -0,0 +1,13 @@
+[
+ {
+ "description": "Test br3392643 (name limit in OBJ files)",
+ "id": "br3392643",
+ "format": "obj",
+ "source": "br3392643.asm",
+ "option": "-Ox",
+ "target": [
+ { "output": "br3392643.obj" },
+ { "stderr": "br3392643.stderr" }
+ ]
+ }
+]
diff --git a/travis/test/br3392643.obj.t b/travis/test/br3392643.obj.t
new file mode 100644
index 00000000..de1dafbb
--- /dev/null
+++ b/travis/test/br3392643.obj.t
Binary files differ
diff --git a/travis/test/br3392643.stderr b/travis/test/br3392643.stderr
new file mode 100644
index 00000000..a430b9a5
--- /dev/null
+++ b/travis/test/br3392643.stderr
@@ -0,0 +1 @@
+./travis/test/br3392643.asm: warning: truncating object name `name012345678901234567890123456789012345678901234567890123456789...' to 255 bytes [-w+other]
diff --git a/travis/test/br3392711.asm b/travis/test/br3392711.asm
new file mode 100644
index 00000000..435fc5f6
--- /dev/null
+++ b/travis/test/br3392711.asm
@@ -0,0 +1,18 @@
+;
+; In br33927711 we've not been expanding %?? and %*?? correctly
+;
+ section .text
+
+%define label(prefix, suffix) prefix %+ suffix
+
+label_1:
+ mov eax, label(%??, _1)
+label_2:
+ mov eax, label(%?, _2)
+
+%define label0123456789a0123456789a0123456789a0123456789a0123456789a0123456789a0123456789(prefix, suffix) prefix %+ suffix
+
+label0123456789a0123456789a0123456789a0123456789a0123456789a0123456789a0123456789_1:
+ mov eax, label0123456789a0123456789a0123456789a0123456789a0123456789a0123456789a0123456789(%??, _1)
+label0123456789a0123456789a0123456789a0123456789a0123456789a0123456789a0123456789_2:
+ mov eax, label0123456789a0123456789a0123456789a0123456789a0123456789a0123456789a0123456789(%??, _2)
diff --git a/travis/test/br3392711.json b/travis/test/br3392711.json
new file mode 100644
index 00000000..884d083a
--- /dev/null
+++ b/travis/test/br3392711.json
@@ -0,0 +1,12 @@
+[
+ {
+ "description": "Test br3392711 (%?? and %? expansion)",
+ "id": "br3392711",
+ "format": "elf64",
+ "source": "br3392711.asm",
+ "option": "-Ox",
+ "target": [
+ { "output": "br3392711.o" }
+ ]
+ }
+]
diff --git a/travis/test/br3392711.o.t b/travis/test/br3392711.o.t
new file mode 100644
index 00000000..ec025c98
--- /dev/null
+++ b/travis/test/br3392711.o.t
Binary files differ