nasm-cvs — CVS commit messages

[nasm:master] version: Make them dynamic for regression tests sake

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  f6b1720a2d11af83c659e41d988f472f041b0088
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=f6b1720a2d11af83c659e41d988f472f041b0088
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sat, 24 Nov 2018 16:33:18 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sat, 24 Nov 2018 16:59:32 +0300

version: Make them dynamic for regression tests sake

When we are running regression tests we compare binary
forms and the strings better to be the constants to not
trigger false positives.

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 include/ver.h     | 10 ++++++++--
 nasmlib/ver.c     | 44 ++++++++++++++++++++++++++++++++++++++++++--
 output/outelf.c   |  6 +++---
 output/outieee.c  |  2 +-
 output/outmacho.c |  2 +-
 output/outobj.c   |  2 +-
 6 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/include/ver.h b/include/ver.h
index 62d9c52..dfc4c6a 100644
--- a/include/ver.h
+++ b/include/ver.h
@@ -41,7 +41,13 @@
 extern const char nasm_version[];
 extern const char nasm_date[];
 extern const char nasm_compile_options[];
-extern const char nasm_comment[];
-extern const char nasm_signature[];
+
+extern const char *nasm_comment(void);
+extern size_t nasm_comment_len(void);
+
+extern const char *nasm_signature(void);
+extern size_t nasm_signature_len(void);
+
+extern int nasm_test_run(void);
 
 #endif /* NASM_VER_H */
diff --git a/nasmlib/ver.c b/nasmlib/ver.c
index 98362e3..b1638b7 100644
--- a/nasmlib/ver.c
+++ b/nasmlib/ver.c
@@ -31,6 +31,9 @@
  *
  * ----------------------------------------------------------------------- */
 
+#include <stdlib.h>
+#include <string.h>
+
 #include "ver.h"
 #include "version.h"
 
@@ -44,8 +47,45 @@ const char nasm_compile_options[] = ""
     ;
 
 /* These are used by some backends. */
-const char nasm_comment[] =
+static const char __nasm_comment[] =
     "The Netwide Assembler " NASM_VER;
 
-const char nasm_signature[] =
+static const char __nasm_signature[] =
     "NASM " NASM_VER;
+
+/* These are constant so we could pass regression tests  */
+static const char __nasm_comment_const[] ="The Netwide Assembler CONST";
+static const char __nasm_signature_const[] = "NASM CONST";
+
+int nasm_test_run(void)
+{
+	return getenv("NASM_TEST_RUN") ? 1 : 0;
+}
+
+const char *nasm_comment(void)
+{
+	if (!nasm_test_run())
+		return __nasm_comment;
+	return __nasm_comment_const;
+}
+
+size_t nasm_comment_len(void)
+{
+	if (!nasm_test_run())
+		return strlen(__nasm_comment);
+	return strlen(__nasm_comment_const);
+}
+
+const char *nasm_signature(void)
+{
+	if (!nasm_test_run())
+		return __nasm_signature;
+	return __nasm_signature_const;
+}
+
+size_t nasm_signature_len(void)
+{
+	if (!nasm_test_run())
+		return strlen(__nasm_signature);
+	return strlen(__nasm_signature_const);
+}
diff --git a/output/outelf.c b/output/outelf.c
index d8a5541..e3e3a68 100644
--- a/output/outelf.c
+++ b/output/outelf.c
@@ -2996,7 +2996,7 @@ static void dwarf_generate(void)
         saa_write32(pinforel, 0);
         saa_write32(pinfo,0);       /* DW_AT_stmt_list */
         saa_wbytes(pinfo, elf_module, strlen(elf_module)+1);
-        saa_wbytes(pinfo, nasm_signature, strlen(nasm_signature)+1);
+        saa_wbytes(pinfo, nasm_signature(), nasm_signature_len()+1);
         saa_write16(pinfo,DW_LANG_Mips_Assembler);
         saa_write8(pinfo,2);        /* abbrviation number LEB128u */
         saa_write32(pinforel, pinfo->datalen + 4);
@@ -3035,7 +3035,7 @@ static void dwarf_generate(void)
         saa_write32(pinforel, 0);
         saa_write32(pinfo,0);			/* DW_AT_stmt_list */
         saa_wbytes(pinfo, elf_module, strlen(elf_module)+1);
-        saa_wbytes(pinfo, nasm_signature, strlen(nasm_signature)+1);
+        saa_wbytes(pinfo, nasm_signature(), nasm_signature_len()+1);
         saa_write16(pinfo,DW_LANG_Mips_Assembler);
         saa_write8(pinfo,2);			/* abbrviation number LEB128u */
         saa_write32(pinforel, pinfo->datalen + 4);
@@ -3075,7 +3075,7 @@ static void dwarf_generate(void)
         saa_write64(pinforel, 0);
         saa_write32(pinfo,0);			/* DW_AT_stmt_list */
         saa_wbytes(pinfo, elf_module, strlen(elf_module)+1);
-        saa_wbytes(pinfo, nasm_signature, strlen(nasm_signature)+1);
+        saa_wbytes(pinfo, nasm_signature(), nasm_signature_len()+1);
         saa_write16(pinfo,DW_LANG_Mips_Assembler);
         saa_write8(pinfo,2);			/* abbrviation number LEB128u */
         saa_write64(pinforel, pinfo->datalen + 4);
diff --git a/output/outieee.c b/output/outieee.c
index 211cdab..ce4830d 100644
--- a/output/outieee.c
+++ b/output/outieee.c
@@ -893,7 +893,7 @@ static void ieee_write_file(void)
     /*
      * Write the NASM boast comment.
      */
-    ieee_putascii("CO0,%02X%s.\n", strlen(nasm_comment), nasm_comment);
+    ieee_putascii("CO0,%02X%s.\n", nasm_comment_len(), nasm_comment());
 
     /*
      * write processor-specific information
diff --git a/output/outmacho.c b/output/outmacho.c
index 769aac0..14aec07 100644
--- a/output/outmacho.c
+++ b/output/outmacho.c
@@ -1950,7 +1950,7 @@ static void macho_dbg_generate(void)
         nasm_assert(p_section != NULL);
 
         producer_str_offset = 0;
-        module_str_offset = dir_str_offset = saa_wcstring(p_str, nasm_signature);
+        module_str_offset = dir_str_offset = saa_wcstring(p_str, nasm_signature());
         dir_str_offset += saa_wcstring(p_str, cur_file);
         saa_wcstring(p_str, cur_dir);
 
diff --git a/output/outobj.c b/output/outobj.c
index b766c54..1caaf20 100644
--- a/output/outobj.c
+++ b/output/outobj.c
@@ -1981,7 +1981,7 @@ static void obj_write_file(void)
      */
     orp->type = COMENT;
     obj_rword(orp, dTRANSL);
-    obj_name(orp, nasm_comment);
+    obj_name(orp, nasm_comment());
     obj_emit2(orp);
 
     /*

[nasm:master] preproc: Pass include paths as strlist

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  8c0666b0e6896c79ae2e4d2390962c951a1bea83
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=8c0666b0e6896c79ae2e4d2390962c951a1bea83
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sat, 24 Nov 2018 14:33:48 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sat, 24 Nov 2018 14:33:48 +0300

preproc: Pass include paths as strlist

Instead of copying data just reuse already
allocated paths.

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 asm/nasm.c        | 13 +++----------
 asm/preproc-nop.c |  4 ++--
 asm/preproc.c     | 17 ++++++++---------
 include/nasm.h    |  2 +-
 4 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/asm/nasm.c b/asm/nasm.c
index 37c82d6..8f23b4b 100644
--- a/asm/nasm.c
+++ b/asm/nasm.c
@@ -328,18 +328,11 @@ static void define_macros(void)
  * Command-line specified preprocessor directives (-p, -d, -u,
  * --pragma, --before) are processed after this function.
  */
-static void preproc_init(struct strlist **ipath)
+static void preproc_init(struct strlist *ipath)
 {
-    struct strlist_entry *l;
-
     preproc->init();
     define_macros();
-
-    list_for_each(l, (*ipath)->head)
-        preproc->include_path(l->str);
-
-    strlist_free(*ipath);
-    *ipath = strlist_alloc();
+    preproc->include_path(ipath);
 }
 
 static void emit_dependencies(struct strlist *list)
@@ -503,7 +496,7 @@ int main(int argc, char **argv)
         }
     }
 
-    preproc_init(&include_path);
+    preproc_init(include_path);
 
     parse_cmdline(argc, argv, 2);
     if (terminate_after_phase) {
diff --git a/asm/preproc-nop.c b/asm/preproc-nop.c
index 90f18e6..655eff7 100644
--- a/asm/preproc-nop.c
+++ b/asm/preproc-nop.c
@@ -170,9 +170,9 @@ static void nop_pre_command(const char *what, char *string)
     (void)string;
 }
 
-static void nop_include_path(const char *path)
+static void nop_include_path(struct strlist *list)
 {
-    (void)path;
+    (void)list;
 }
 
 static void nop_error_list_macros(int severity)
diff --git a/asm/preproc.c b/asm/preproc.c
index 3d54c07..76bd722 100644
--- a/asm/preproc.c
+++ b/asm/preproc.c
@@ -386,7 +386,7 @@ static int LocalOffset = 0;
 
 static Context *cstk;
 static Include *istk;
-static struct strlist *ipath;
+static const struct strlist *ipath_list;
 
 static int pass;            /* HACK: pass 0 = generate dependencies only */
 static struct strlist *deplist;
@@ -1501,12 +1501,15 @@ enum incopen_mode {
 static FILE *inc_fopen_search(const char *file, char **slpath,
                               enum incopen_mode omode, enum file_flags fmode)
 {
+    const struct strlist_entry *ip = NULL;
     FILE *fp;
     const char *prefix = "";
-    const struct strlist_entry *ip = ipath->head;
     char *sp;
     bool found;
 
+    if (ipath_list)
+        ip = ipath_list->head;
+
     while (1) {
         sp = nasm_catfile(prefix, file);
         if (omode == INC_PROBE) {
@@ -4993,7 +4996,6 @@ pp_reset(const char *file, int apass, struct strlist *dep_list)
 static void pp_init(void)
 {
     hash_init(&FileHash, HASH_MEDIUM);
-    ipath = strlist_alloc();
 }
 
 static char *pp_getline(void)
@@ -5261,16 +5263,13 @@ static void pp_cleanup(int pass)
         predef = NULL;
         delete_Blocks();
         freeTokens = NULL;
-        strlist_free(ipath);
+        ipath_list = NULL;
     }
 }
 
-static void pp_include_path(const char *path)
+static void pp_include_path(struct strlist *list)
 {
-    if (!path)
-        path = "";
-
-    strlist_add(ipath, path);
+    ipath_list = list;
 }
 
 static void pp_pre_include(char *fname)
diff --git a/include/nasm.h b/include/nasm.h
index a6ff11c..ebbf6c4 100644
--- a/include/nasm.h
+++ b/include/nasm.h
@@ -362,7 +362,7 @@ struct preproc_ops {
     void (*pre_command)(const char *what, char *str);
 
     /* Include path from command line */
-    void (*include_path)(const char *path);
+    void (*include_path)(struct strlist *ipath);
 
     /* Unwind the macro stack when printing an error message */
     void (*error_list_macros)(int severity);

[nasm:master] strlist: Rework to drop type

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  b7bb5acdaf942acd2c4030a32dd21017678f1c3e
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=b7bb5acdaf942acd2c4030a32dd21017678f1c3e
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sun, 11 Nov 2018 21:33:52 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sat, 24 Nov 2018 13:24:09 +0300

strlist: Rework to drop type

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 asm/nasm.c        | 20 +++++++++----------
 asm/preproc-nop.c |  4 ++--
 asm/preproc.c     | 20 +++++++++----------
 include/nasm.h    |  4 ++--
 include/strlist.h | 21 ++++++++++----------
 nasmlib/strlist.c | 59 ++++++++++++++++++++++++++-----------------------------
 6 files changed, 63 insertions(+), 65 deletions(-)

diff --git a/asm/nasm.c b/asm/nasm.c
index f1283e4..37c82d6 100644
--- a/asm/nasm.c
+++ b/asm/nasm.c
@@ -75,7 +75,7 @@ struct forwrefinfo {            /* info held on forward refs. */
 };
 
 static void parse_cmdline(int, char **, int);
-static void assemble_file(const char *, StrList *);
+static void assemble_file(const char *, struct strlist *);
 static bool is_suppressed_warning(int severity);
 static bool skip_this_pass(int severity);
 static void nasm_verror_gnu(int severity, const char *fmt, va_list args);
@@ -134,7 +134,7 @@ static struct SAA *forwrefs;    /* keep track of forward references */
 static const struct forwrefinfo *forwref;
 
 static const struct preproc_ops *preproc;
-static StrList *include_path;
+static struct strlist *include_path;
 
 #define OP_NORMAL           (1u << 0)
 #define OP_PREPROCESS       (1u << 1)
@@ -147,7 +147,7 @@ static bool depend_emit_phony = false;
 static bool depend_missing_ok = false;
 static const char *depend_target = NULL;
 static const char *depend_file = NULL;
-StrList *depend_list;
+struct strlist *depend_list;
 
 static bool want_usage;
 static bool terminate_after_phase;
@@ -328,7 +328,7 @@ static void define_macros(void)
  * Command-line specified preprocessor directives (-p, -d, -u,
  * --pragma, --before) are processed after this function.
  */
-static void preproc_init(StrList **ipath)
+static void preproc_init(struct strlist **ipath)
 {
     struct strlist_entry *l;
 
@@ -339,10 +339,10 @@ static void preproc_init(StrList **ipath)
         preproc->include_path(l->str);
 
     strlist_free(*ipath);
-    *ipath = strlist_allocate();
+    *ipath = strlist_alloc();
 }
 
-static void emit_dependencies(StrList *list)
+static void emit_dependencies(struct strlist *list)
 {
     FILE *deps;
     int linepos, len;
@@ -455,7 +455,7 @@ int main(int argc, char **argv)
     iflag_set_default_cpu(&cpu);
     iflag_set_default_cpu(&cmd_cpu);
 
-    include_path = strlist_allocate();
+    include_path = strlist_alloc();
 
     pass0 = 0;
     want_usage = terminate_after_phase = false;
@@ -531,7 +531,7 @@ int main(int argc, char **argv)
     }
 
     if (depend_file || (operating_mode & OP_DEPEND))
-        depend_list = strlist_allocate();
+        depend_list = strlist_alloc();
 
     if (!depend_target)
         depend_target = quote_for_make(outname);
@@ -972,7 +972,7 @@ static bool process_arg(char *p, char *q, int pass)
         case 'i':       /* include search path */
         case 'I':
             if (pass == 1)
-                strlist_add_string(include_path, param);
+                strlist_add(include_path, param);
             break;
 
         case 'l':       /* listing file */
@@ -1417,7 +1417,7 @@ static void parse_cmdline(int argc, char **argv, int pass)
     }
 }
 
-static void assemble_file(const char *fname, StrList *depend_list)
+static void assemble_file(const char *fname, struct strlist *depend_list)
 {
     char *line;
     insn output_ins;
diff --git a/asm/preproc-nop.c b/asm/preproc-nop.c
index 94614dd..90f18e6 100644
--- a/asm/preproc-nop.c
+++ b/asm/preproc-nop.c
@@ -63,7 +63,7 @@ static void nop_init(void)
     /* Nothing to do */
 }
 
-static void nop_reset(const char *file, int pass, StrList *deplist)
+static void nop_reset(const char *file, int pass, struct strlist *deplist)
 {
     src_set(0, file);
     nop_lineinc = 1;
@@ -73,7 +73,7 @@ static void nop_reset(const char *file, int pass, StrList *deplist)
 	nasm_fatal_fl(ERR_NOFILE, "unable to open input file `%s'", file);
     (void)pass;                 /* placate compilers */
 
-    strlist_add_string(deplist, file);
+    strlist_add(deplist, file);
 }
 
 static char *nop_getline(void)
diff --git a/asm/preproc.c b/asm/preproc.c
index e5ad05a..3d54c07 100644
--- a/asm/preproc.c
+++ b/asm/preproc.c
@@ -386,10 +386,10 @@ static int LocalOffset = 0;
 
 static Context *cstk;
 static Include *istk;
-static StrList *ipath;
+static struct strlist *ipath;
 
 static int pass;            /* HACK: pass 0 = generate dependencies only */
-static StrList *deplist;
+static struct strlist *deplist;
 
 static uint64_t unique;     /* unique identifier numbers */
 
@@ -1538,7 +1538,7 @@ static FILE *inc_fopen_search(const char *file, char **slpath,
  * considering the include path.
  */
 static FILE *inc_fopen(const char *file,
-                       StrList *dhead,
+                       struct strlist *dhead,
                        const char **found_path,
                        enum incopen_mode omode,
                        enum file_flags fmode)
@@ -1552,7 +1552,7 @@ static FILE *inc_fopen(const char *file,
     if (hp) {
         path = *hp;
         if (path || omode != INC_NEEDED) {
-            strlist_add_string(dhead, path ? path : file);
+            strlist_add(dhead, path ? path : file);
         }
     } else {
         /* Need to do the actual path search */
@@ -1565,7 +1565,7 @@ static FILE *inc_fopen(const char *file,
          * Add file to dependency path.
          */
         if (path || omode != INC_NEEDED)
-            strlist_add_string(dhead, file);
+            strlist_add(dhead, file);
     }
 
     if (!path) {
@@ -2558,7 +2558,7 @@ static int do_directive(Token *tline, char **output)
         p = t->text;
         if (t->type != TOK_INTERNAL_STRING)
             nasm_unquote_cstr(p, i);
-        strlist_add_string(deplist, p);
+        strlist_add(deplist, p);
         free_tlist(origline);
         return DIRECTIVE_FOUND;
 
@@ -4932,7 +4932,7 @@ static void pp_verror(int severity, const char *fmt, va_list arg)
 }
 
 static void
-pp_reset(const char *file, int apass, StrList *dep_list)
+pp_reset(const char *file, int apass, struct strlist *dep_list)
 {
     Token *t;
 
@@ -4976,7 +4976,7 @@ pp_reset(const char *file, int apass, StrList *dep_list)
      */
     pass = apass > 2 ? 2 : apass;
 
-    strlist_add_string(deplist, file);
+    strlist_add(deplist, file);
 
     /*
      * Define the __PASS__ macro.  This is defined here unlike
@@ -4993,7 +4993,7 @@ pp_reset(const char *file, int apass, StrList *dep_list)
 static void pp_init(void)
 {
     hash_init(&FileHash, HASH_MEDIUM);
-    ipath = strlist_allocate();
+    ipath = strlist_alloc();
 }
 
 static char *pp_getline(void)
@@ -5270,7 +5270,7 @@ static void pp_include_path(const char *path)
     if (!path)
         path = "";
 
-    strlist_add_string(ipath, path);
+    strlist_add(ipath, path);
 }
 
 static void pp_pre_include(char *fname)
diff --git a/include/nasm.h b/include/nasm.h
index 463b91b..a6ff11c 100644
--- a/include/nasm.h
+++ b/include/nasm.h
@@ -336,7 +336,7 @@ struct preproc_ops {
      * of the pass, an error reporting function, an evaluator
      * function, and a listing generator to talk to.
      */
-    void (*reset)(const char *file, int pass, StrList *deplist);
+    void (*reset)(const char *file, int pass, struct strlist *deplist);
 
     /*
      * Called to fetch a line of preprocessed source. The line
@@ -372,7 +372,7 @@ extern const struct preproc_ops nasmpp;
 extern const struct preproc_ops preproc_nop;
 
 /* List of dependency files */
-extern StrList *depend_list;
+extern struct strlist *depend_list;
 
 /*
  * Some lexical properties of the NASM source language, included
diff --git a/include/strlist.h b/include/strlist.h
index caf11e1..fd5a019 100644
--- a/include/strlist.h
+++ b/include/strlist.h
@@ -43,18 +43,19 @@
 #include "hashtbl.h"
 
 struct strlist_entry {
-    struct strlist_entry *next;
-    size_t len;
-    char str[1];
+	struct strlist_entry	*next;
+	size_t			len;
+	char			str[1];
 };
 
-typedef struct string_list {
-    struct hash_table hash;
-    struct strlist_entry *head, **tailp;
-} StrList;
+struct strlist {
+	struct hash_table	hash;
+	struct strlist_entry	*head;
+	struct strlist_entry	**tailp;
+};
 
-StrList safe_alloc *strlist_allocate(void);
-bool strlist_add_string(StrList *list, const char *str);
-void strlist_free(StrList *list);
+struct strlist safe_alloc *strlist_alloc(void);
+void strlist_free(struct strlist *list);
+bool strlist_add(struct strlist *list, const char *str);
 
 #endif /* NASM_STRLIST_H */
diff --git a/nasmlib/strlist.c b/nasmlib/strlist.c
index 8a8213a..868fa3b 100644
--- a/nasmlib/strlist.c
+++ b/nasmlib/strlist.c
@@ -40,54 +40,51 @@
 /*
  * Create a string list
  */
-StrList *strlist_allocate(void)
+struct strlist *strlist_alloc(void)
 {
-    StrList *list;
-
-    nasm_new(list);
-    hash_init(&list->hash, HASH_MEDIUM);
-    list->tailp = &list->head;
-
-    return list;
+	struct strlist *list = nasm_zalloc(sizeof(*list));
+	hash_init(&list->hash, HASH_MEDIUM);
+	list->tailp = &list->head;
+	return list;
 }
 
 /*
  * Append a string to a string list if and only if it isn't
  * already there.  Return true if it was added.
  */
-bool strlist_add_string(StrList *list, const char *str)
+bool strlist_add(struct strlist *list, const char *str)
 {
-    struct hash_insert hi;
-    struct strlist_entry *sl;
-    size_t l;
+	struct strlist_entry *e;
+	struct hash_insert hi;
+	size_t len;
 
-    if (!list)
-        return false;
+	if (!list)
+		return false;
 
-    if (hash_find(&list->hash, str, &hi))
-        return false;           /* Already present */
+	if (hash_find(&list->hash, str, &hi))
+		return false;
 
-    l = strlen(str);
+	len = strlen(str);
 
-    sl = nasm_malloc(sizeof(struct strlist_entry) + l);
-    sl->len = l;
-    memcpy(sl->str, str, l+1);
-    sl->next = NULL;
-    *list->tailp = sl;
-    list->tailp = &sl->next;
+	/* Structure already has char[1] as EOS */
+	e = nasm_zalloc(sizeof(*e) + len);
+	e->len = len;
+	memcpy(e->str, str, len + 1);
 
-    hash_add(&hi, sl->str, (void *)sl);
-    return true;
+	*list->tailp = e;
+	list->tailp = &e->next;
+
+	hash_add(&hi, e->str, (void *)e);
+	return true;
 }
 
 /*
  * Free a string list
  */
-void strlist_free(StrList *list)
+void strlist_free(struct strlist *list)
 {
-    if (!list)
-        return;
-
-    hash_free_all(&list->hash, false);
-    nasm_free(list);
+	if (list) {
+		hash_free_all(&list->hash, false);
+		nasm_free(list);
+	}
 }

[nasm:master] test: nasm-t -- Test for sigsegv on multiple outputs

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  afd8d2f11affbf835449ffa3f8ba5ca6311b3655
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=afd8d2f11affbf835449ffa3f8ba5ca6311b3655
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sat, 24 Nov 2018 12:11:47 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sat, 24 Nov 2018 12:12:15 +0300

test: nasm-t -- Test for sigsegv on multiple outputs

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 travis/test/mout.json   | 13 +++++++++++++
 travis/test/mout.stderr |  1 +
 2 files changed, 14 insertions(+)

diff --git a/travis/test/mout.json b/travis/test/mout.json
new file mode 100644
index 0000000..33510cf
--- /dev/null
+++ b/travis/test/mout.json
@@ -0,0 +1,13 @@
+[
+	{
+		"description": "Test sigsegv fix if multiple outputs passed",
+		"id": "mout",
+		"format": "bin",
+		"source": "mout.asm",
+		"option": "-o mout.bin -o mout.bin",
+		"target": [
+			{ "stderr": "mout.stderr" }
+		],
+		"error": "expected"
+	}
+]
diff --git a/travis/test/mout.stderr b/travis/test/mout.stderr
new file mode 100644
index 0000000..84dde58
--- /dev/null
+++ b/travis/test/mout.stderr
@@ -0,0 +1 @@
+mout.bin:fatal: more than one output file specified: mout.bin
\ No newline at end of file

[nasm:master] Fix sigsegv if two outputs specified

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  f5a48a6ba25a4d96d1204e9a2ba9faf246a7de7c
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=f5a48a6ba25a4d96d1204e9a2ba9faf246a7de7c
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sat, 24 Nov 2018 12:02:13 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sat, 24 Nov 2018 12:02:13 +0300

Fix sigsegv if two outputs specified

outname is only set up by pass two so
earlier access may lead to sigsegv.

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 asm/nasm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/asm/nasm.c b/asm/nasm.c
index c7d5e3c..25ac36c 100644
--- a/asm/nasm.c
+++ b/asm/nasm.c
@@ -1743,7 +1743,9 @@ static void nasm_verror_gnu(int severity, const char *fmt, va_list ap)
     if (!(severity & ERR_NOFILE)) {
 	src_get(&lineno, &currentfile);
         if (!currentfile || (severity & ERR_TOPFILE)) {
-            currentfile = inname[0] ? inname : outname[0] ? outname : NULL;
+            currentfile = inname && inname[0] ?
+		    inname : outname && outname[0] ?
+		    outname : NULL;
             lineno = 0;
         }
     }

[nasm:master] Pass input filename into error message

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  8e0acaad66c969d10c1477031bc7625d01c17a72
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=8e0acaad66c969d10c1477031bc7625d01c17a72
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sat, 24 Nov 2018 12:03:31 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sat, 24 Nov 2018 12:12:15 +0300

Pass input filename into error message

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 asm/nasm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/asm/nasm.c b/asm/nasm.c
index 25ac36c..f1283e4 100644
--- a/asm/nasm.c
+++ b/asm/nasm.c
@@ -525,7 +525,7 @@ int main(int argc, char **argv)
         if (!strcmp(outname, inname)) {
             outname = "nasm.out";
             nasm_error(ERR_WARNING,
-                       "default output file same as input, using `%s' for output\n",
+                       "default output file same as input `%s', using `%s' for output\n",
                        inname, outname);
         }
     }

[nasm:master] test: nasm-t -- Add br3392528

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  69f77d5c34e5cbf1a91a2125738d64dd46bfd27e
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=69f77d5c34e5cbf1a91a2125738d64dd46bfd27e
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Wed, 14 Nov 2018 10:20:50 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Wed, 14 Nov 2018 10:26:26 +0300

test: nasm-t -- Add br3392528

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 travis/test/br3392528.asm    |  5 +++++
 travis/test/br3392528.json   | 13 +++++++++++++
 travis/test/br3392528.stderr |  2 ++
 3 files changed, 20 insertions(+)

diff --git a/travis/test/br3392528.asm b/travis/test/br3392528.asm
new file mode 100644
index 0000000..88a3de6
--- /dev/null
+++ b/travis/test/br3392528.asm
@@ -0,0 +1,5 @@
+%macro huge_params 2222222222-222222222211
+	mov eax, eax
+%endm
+
+huge_params
diff --git a/travis/test/br3392528.json b/travis/test/br3392528.json
new file mode 100644
index 0000000..0c0be61
--- /dev/null
+++ b/travis/test/br3392528.json
@@ -0,0 +1,13 @@
+[
+	{
+		"description": "Test the macro params count being integer",
+		"id": "br3392528",
+		"format": "bin",
+		"source": "br3392528.asm",
+		"option": "-Ox -o br3392528.bin",
+		"target": [
+			{ "stderr": "br3392528.stderr" }
+		],
+		"error": "expected"
+	}
+]
diff --git a/travis/test/br3392528.stderr b/travis/test/br3392528.stderr
new file mode 100644
index 0000000..36fe326
--- /dev/null
+++ b/travis/test/br3392528.stderr
@@ -0,0 +1,2 @@
+./travis/test/br3392528.asm:1: error: parameter count `2222222222' is out of bounds [0; 2147483647]
+./travis/test/br3392528.asm:1: error: parameter count `222222222211' is out of bounds [0; 2147483647]
\ No newline at end of file

[nasm:master] preproc: Fix malformed parameter count

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  3079f7966dbed4497e36d5067cbfd896a90358cb
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=3079f7966dbed4497e36d5067cbfd896a90358cb
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Wed, 14 Nov 2018 10:03:42 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Wed, 14 Nov 2018 10:26:26 +0300

preproc: Fix malformed parameter count

readnum returns 64bit number which may become
a negative integer upon conversion which in
turn lead to out of bound array access.

Fix it by explicit conversion with bounds check

 | POC6:2: error: parameter count `2222222222' is out of bounds [0; 2147483647]

https://bugzilla.nasm.us/show_bug.cgi?id=3392528

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 asm/preproc.c | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/asm/preproc.c b/asm/preproc.c
index b6afee3..e5ad05a 100644
--- a/asm/preproc.c
+++ b/asm/preproc.c
@@ -1650,6 +1650,23 @@ smacro_defined(Context * ctx, const char *name, int nparam, SMacro ** defn,
     return false;
 }
 
+/* param should be a natural number [0; INT_MAX] */
+static int read_param_count(const char *str)
+{
+    int result;
+    bool err;
+
+    result = readnum(str, &err);
+    if (result < 0 || result > INT_MAX) {
+        result = 0;
+        nasm_error(ERR_NONFATAL, "parameter count `%s' is out of bounds [%d; %d]",
+                   str, 0, INT_MAX);
+    } else if (err) {
+        nasm_error(ERR_NONFATAL, "unable to parse parameter count `%s'", str);
+    }
+    return result;
+}
+
 /*
  * Count and mark off the parameters in a multi-line macro call.
  * This is called both from within the multi-line macro expansion
@@ -1871,11 +1888,7 @@ static bool if_condition(Token * tline, enum preproc_token ct)
                   pp_directives[ct]);
         } else {
             searching.nparam_min = searching.nparam_max =
-                readnum(tline->text, &j);
-            if (j)
-                nasm_error(ERR_NONFATAL,
-                      "unable to parse parameter count `%s'",
-                      tline->text);
+                read_param_count(tline->text);
         }
         if (tline && tok_is_(tline->next, "-")) {
             tline = tline->next->next;
@@ -1886,11 +1899,7 @@ static bool if_condition(Token * tline, enum preproc_token ct)
                       "`%s' expects a parameter count after `-'",
                       pp_directives[ct]);
             else {
-                searching.nparam_max = readnum(tline->text, &j);
-                if (j)
-                    nasm_error(ERR_NONFATAL,
-                          "unable to parse parameter count `%s'",
-                          tline->text);
+                searching.nparam_max = read_param_count(tline->text);
                 if (searching.nparam_min > searching.nparam_max) {
                     nasm_error(ERR_NONFATAL,
                           "minimum parameter count exceeds maximum");
@@ -2079,8 +2088,6 @@ static void undef_smacro(Context *ctx, const char *mname)
  */
 static bool parse_mmacro_spec(Token *tline, MMacro *def, const char *directive)
 {
-    bool err;
-
     tline = tline->next;
     skip_white_(tline);
     tline = expand_id(tline);
@@ -2103,11 +2110,7 @@ static bool parse_mmacro_spec(Token *tline, MMacro *def, const char *directive)
     if (!tok_type_(tline, TOK_NUMBER)) {
         nasm_error(ERR_NONFATAL, "`%s' expects a parameter count", directive);
     } else {
-        def->nparam_min = def->nparam_max =
-            readnum(tline->text, &err);
-        if (err)
-            nasm_error(ERR_NONFATAL,
-                  "unable to parse parameter count `%s'", tline->text);
+        def->nparam_min = def->nparam_max = read_param_count(tline->text);
     }
     if (tline && tok_is_(tline->next, "-")) {
         tline = tline->next->next;
@@ -2117,11 +2120,7 @@ static bool parse_mmacro_spec(Token *tline, MMacro *def, const char *directive)
             nasm_error(ERR_NONFATAL,
                   "`%s' expects a parameter count after `-'", directive);
         } else {
-            def->nparam_max = readnum(tline->text, &err);
-            if (err) {
-                nasm_error(ERR_NONFATAL, "unable to parse parameter count `%s'",
-                      tline->text);
-            }
+            def->nparam_max = read_param_count(tline->text);
             if (def->nparam_min > def->nparam_max) {
                 nasm_error(ERR_NONFATAL, "minimum parameter count exceeds maximum");
                 def->nparam_max = def->nparam_min;

[nasm:master] test: nasm-t -- Extend inctest

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  fcc85aeef70d60032f3a8794a9340225814f052b
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=fcc85aeef70d60032f3a8794a9340225814f052b
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Mon, 12 Nov 2018 23:28:18 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Mon, 12 Nov 2018 23:28:18 +0300

test: nasm-t -- Extend inctest

To address https://bugzilla.nasm.us/show_bug.cgi?id=3392527

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 travis/test/inc3.asm     | 6 ++++++
 travis/test/inctest.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/travis/test/inc3.asm b/travis/test/inc3.asm
new file mode 100644
index 0000000..797599e
--- /dev/null
+++ b/travis/test/inc3.asm
@@ -0,0 +1,6 @@
+;
+; To address https://bugzilla.nasm.us/show_bug.cgi?id=3392527
+;
+%ifndef __OUTPUT_FORMAT__
+	%fatal '__OUTPUT_FORMAT__ defined as ', __OUTPUT_FORMAT__
+%endif
diff --git a/travis/test/inctest.json b/travis/test/inctest.json
index f0947ff..9d64125 100644
--- a/travis/test/inctest.json
+++ b/travis/test/inctest.json
@@ -4,7 +4,7 @@
 		"id": "inctest",
 		"format": "bin",
 		"source": "inctest.asm",
-		"option": "-i./travis/test/",
+		"option": "-i./travis/test/ -p inc3.asm",
 		"target": [
 			{ "output": "inctest.com" }
 		]

[nasm:master] preproc_init: Just clean include path

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  feabd742a3520d0835428f47d474979b4566c4ce
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=feabd742a3520d0835428f47d474979b4566c4ce
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Tue, 13 Nov 2018 01:23:47 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Tue, 13 Nov 2018 01:23:47 +0300

preproc_init: Just clean include path

It is more natural to keep include path valid
during the whole lifetime.

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 asm/nasm.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/asm/nasm.c b/asm/nasm.c
index 52df47d..9e36314 100644
--- a/asm/nasm.c
+++ b/asm/nasm.c
@@ -328,15 +328,18 @@ static void define_macros(void)
  * Command-line specified preprocessor directives (-p, -d, -u,
  * --pragma, --before) are processed after this function.
  */
-static void preproc_init(StrList *list)
+static void preproc_init(StrList **ipath)
 {
     struct strlist_entry *l;
 
     preproc->init();
     define_macros();
 
-    list_for_each(l, list->head)
+    list_for_each(l, (*ipath)->head)
         preproc->include_path(l->str);
+
+    strlist_free(*ipath);
+    *ipath = strlist_allocate();
 }
 
 static void emit_dependencies(StrList *list)
@@ -500,9 +503,7 @@ int main(int argc, char **argv)
         }
     }
 
-    preproc_init(include_path);
-    strlist_free(include_path);
-    include_path = NULL;
+    preproc_init(&include_path);
 
     parse_cmdline(argc, argv, 2);
     if (terminate_after_phase) {
@@ -633,6 +634,7 @@ int main(int argc, char **argv)
     eval_cleanup();
     stdscan_cleanup();
     src_free();
+    strlist_free(include_path);
 
     return terminate_after_phase;
 }

[nasm:master] test: nasm-t -- Add br560575

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  7373a8e606cc52389da0b0568fefbc82f463336b
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=7373a8e606cc52389da0b0568fefbc82f463336b
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sun, 11 Nov 2018 19:30:38 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sun, 11 Nov 2018 21:43:46 +0300

test: nasm-t -- Add br560575

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 travis/test/br560575.asm    |  5 +++++
 travis/test/br560575.json   | 37 +++++++++++++++++++++++++++++++++++++
 travis/test/br560575.stderr |  3 +++
 3 files changed, 45 insertions(+)

diff --git a/travis/test/br560575.asm b/travis/test/br560575.asm
new file mode 100644
index 0000000..20806a6
--- /dev/null
+++ b/travis/test/br560575.asm
@@ -0,0 +1,5 @@
+;Test for bug report 560575 - Using SEG with non-relocatable values doesn't work
+;
+	dw seg ~1
+	dw seg "a"
+	dw seg 'a'
diff --git a/travis/test/br560575.json b/travis/test/br560575.json
new file mode 100644
index 0000000..35ac215
--- /dev/null
+++ b/travis/test/br560575.json
@@ -0,0 +1,37 @@
+[
+	{
+		"description": "Test SEG with non-relocatable values (bin)",
+		"id": "br560575",
+		"format": "bin",
+		"source": "br560575.asm",
+		"option": "-Ox",
+		"target": [
+			{ "stderr": "br560575.stderr" }
+		],
+		"error": "expected"
+	},
+	{
+		"description": "Test SEG with non-relocatable values (elf32)",
+		"ref": "br560575",
+		"format": "elf32",
+		"update": "false"
+	},
+	{
+		"description": "Test SEG with non-relocatable values (elf64)",
+		"ref": "br560575",
+		"format": "elf64",
+		"update": "false"
+	},
+	{
+		"description": "Test SEG with non-relocatable values (macho32)",
+		"ref": "br560575",
+		"format": "macho32",
+		"update": "false"
+	},
+	{
+		"description": "Test SEG with non-relocatable values (macho64)",
+		"ref": "br560575",
+		"format": "macho64",
+		"update": "false"
+	}
+]
diff --git a/travis/test/br560575.stderr b/travis/test/br560575.stderr
new file mode 100644
index 0000000..873f908
--- /dev/null
+++ b/travis/test/br560575.stderr
@@ -0,0 +1,3 @@
+./travis/test/br560575.asm:3: error: cannot apply SEG to a non-relocatable value
+./travis/test/br560575.asm:4: error: cannot apply SEG to a non-relocatable value
+./travis/test/br560575.asm:5: error: cannot apply SEG to a non-relocatable value
\ No newline at end of file

[nasm:master] test: nasm-t -- Add br978756

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  9354f72a41e446a96031c7ddcedd78acb1794ea7
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=9354f72a41e446a96031c7ddcedd78acb1794ea7
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sun, 11 Nov 2018 19:22:30 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sun, 11 Nov 2018 21:43:46 +0300

test: nasm-t -- Add br978756

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 travis/test/br978756.asm                    |   6 ++++++
 travis/test/br978756.json                   |  12 ++++++++++++
 travis/test/{br3392259.o.t => br978756.o.t} | Bin 576 -> 576 bytes
 3 files changed, 18 insertions(+)

diff --git a/travis/test/br978756.asm b/travis/test/br978756.asm
new file mode 100644
index 0000000..44f7a51
--- /dev/null
+++ b/travis/test/br978756.asm
@@ -0,0 +1,6 @@
+[bits 64]
+	movntdqa	xmm1, oword [rsi]
+	movlpd		xmm2, qword [rdi]
+	movlpd		xmm2, [rdi]
+	movlpd		qword [rdi], xmm2
+	movlpd		[rdi], xmm2
diff --git a/travis/test/br978756.json b/travis/test/br978756.json
new file mode 100644
index 0000000..114bd66
--- /dev/null
+++ b/travis/test/br978756.json
@@ -0,0 +1,12 @@
+[
+	{
+		"description": "Test for movlpd instruction",
+		"id": "br978756",
+		"format": "elf64",
+		"source": "br978756.asm",
+		"option": "-Ox",
+		"target": [
+			{ "output": "br978756.o" }
+		]
+	}
+]
diff --git a/travis/test/br3392259.o.t b/travis/test/br978756.o.t
similarity index 55%
copy from travis/test/br3392259.o.t
copy to travis/test/br978756.o.t
index e8c03c5..9ba6a44 100644
Binary files a/travis/test/br3392259.o.t and b/travis/test/br978756.o.t differ

[nasm:master] test: nasm-t -- Add br3385573

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  3d5195704d86636f398f66c6a09966da650972b7
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=3d5195704d86636f398f66c6a09966da650972b7
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sun, 11 Nov 2018 19:09:11 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sun, 11 Nov 2018 21:43:46 +0300

test: nasm-t -- Add br3385573

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 travis/test/br3385573.asm   |   9 +++++++++
 travis/test/br3385573.bin.t | Bin 0 -> 36 bytes
 travis/test/br3385573.json  |  18 ++++++++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/travis/test/br3385573.asm b/travis/test/br3385573.asm
new file mode 100644
index 0000000..0f5f1f0
--- /dev/null
+++ b/travis/test/br3385573.asm
@@ -0,0 +1,9 @@
+[bits 64]
+
+	vpmovsxbw	ymm1, xmm2
+	vpsllw		ymm1, ymm2, 3
+	vpslld		ymm1, ymm2, 3
+	vpsllq		ymm1, ymm2, 3
+	vpsrld		ymm1, ymm2, 3
+	vpsrad		ymm1, ymm2, 3
+	vpermq		ymm1, [rsi], 9
diff --git a/travis/test/br3385573.bin.t b/travis/test/br3385573.bin.t
new file mode 100644
index 0000000..877207c
Binary files /dev/null and b/travis/test/br3385573.bin.t differ
diff --git a/travis/test/br3385573.json b/travis/test/br3385573.json
new file mode 100644
index 0000000..10c0219
--- /dev/null
+++ b/travis/test/br3385573.json
@@ -0,0 +1,18 @@
+[
+	{
+		"description": "Test vpsl instructions (-Ox)",
+		"id": "br3385573",
+		"format": "bin",
+		"source": "br3385573.asm",
+		"option": "-Ox",
+		"target": [
+			{ "output": "br3385573.bin" }
+		]
+	},
+	{
+		"description": "Test vpsl instructions (-O0)",
+		"ref": "br3385573",
+		"option": "-O0",
+		"update": "false"
+	}
+]

[nasm:master] test: nasm-t -- Add br3392259

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  634b0e405b7ab009a067777934b23d92e246fcf7
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=634b0e405b7ab009a067777934b23d92e246fcf7
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sun, 11 Nov 2018 19:19:10 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sun, 11 Nov 2018 21:43:46 +0300

test: nasm-t -- Add br3392259

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 travis/test/br3392259.asm  |   7 +++++++
 travis/test/br3392259.json |  12 ++++++++++++
 travis/test/br3392259.o.t  | Bin 0 -> 576 bytes
 3 files changed, 19 insertions(+)

diff --git a/travis/test/br3392259.asm b/travis/test/br3392259.asm
new file mode 100644
index 0000000..655b22b
--- /dev/null
+++ b/travis/test/br3392259.asm
@@ -0,0 +1,7 @@
+[BITS 64]
+
+	vmovntdqa	ymm1, yword [rsi]	; fails: "error: invalid combination of opcode and operands"
+	vmovntdqa	ymm1, [rsi]		; works
+	vmovntdqa	xmm1, oword [rsi]	; works
+	movntdqa	xmm1, oword [rsi]	; fails, see bug 978756: "error: mismatch in operand sizes"
+	movntdqa	xmm1, [rsi]		; works
diff --git a/travis/test/br3392259.json b/travis/test/br3392259.json
new file mode 100644
index 0000000..f882165
--- /dev/null
+++ b/travis/test/br3392259.json
@@ -0,0 +1,12 @@
+[
+	{
+		"description": "Test vmovnt, movnt instructions",
+		"id": "br3392259",
+		"format": "elf64",
+		"source": "br3392259.asm",
+		"option": "-Ox",
+		"target": [
+			{ "output": "br3392259.o" }
+		]
+	}
+]
diff --git a/travis/test/br3392259.o.t b/travis/test/br3392259.o.t
new file mode 100644
index 0000000..e8c03c5
Binary files /dev/null and b/travis/test/br3392259.o.t differ

[nasm:master] test: nasm-t -- Add br3109604

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  a138610100dce425952b9ef0ec2b3db7d498a508
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=a138610100dce425952b9ef0ec2b3db7d498a508
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sun, 11 Nov 2018 18:24:02 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sun, 11 Nov 2018 21:43:46 +0300

test: nasm-t -- Add br3109604

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 travis/test/br3109604.asm   |   6 ++++++
 travis/test/br3109604.bin.t | Bin 0 -> 12 bytes
 travis/test/br3109604.json  |  18 ++++++++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/travis/test/br3109604.asm b/travis/test/br3109604.asm
new file mode 100644
index 0000000..0cc39e2
--- /dev/null
+++ b/travis/test/br3109604.asm
@@ -0,0 +1,6 @@
+	bits 64
+b0:	vmovd xmm2, [rdx+r9]
+e0:
+
+	section .data
+len:	dd e0 - b0		; Should be 6
diff --git a/travis/test/br3109604.bin.t b/travis/test/br3109604.bin.t
new file mode 100644
index 0000000..9709a97
Binary files /dev/null and b/travis/test/br3109604.bin.t differ
diff --git a/travis/test/br3109604.json b/travis/test/br3109604.json
new file mode 100644
index 0000000..6c63f70
--- /dev/null
+++ b/travis/test/br3109604.json
@@ -0,0 +1,18 @@
+[
+	{
+		"description": "Test vmovd (-Ox)",
+		"id": "br3109604",
+		"format": "bin",
+		"source": "br3109604.asm",
+		"option": "-Ox",
+		"target": [
+			{ "output": "br3109604.bin" }
+		]
+	},
+	{
+		"description": "Test vmovd (-O0)",
+		"ref": "br3109604",
+		"option": "-O0",
+		"update": "false"
+	}
+]

[nasm:master] test: nasm-t -- Add br3392252

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  f9e3e8168b5928332c222a363be9a2acd71dd5eb
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=f9e3e8168b5928332c222a363be9a2acd71dd5eb
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sun, 11 Nov 2018 19:15:58 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sun, 11 Nov 2018 21:43:46 +0300

test: nasm-t -- Add br3392252

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 {test => travis/test}/br3392252.asm |   2 --
 travis/test/br3392252.bin.t         | Bin 0 -> 167 bytes
 travis/test/br3392252.json          |  12 ++++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/test/br3392252.asm b/travis/test/br3392252.asm
similarity index 85%
copy from test/br3392252.asm
copy to travis/test/br3392252.asm
index 82b9e1c..12a739e 100644
--- a/test/br3392252.asm
+++ b/travis/test/br3392252.asm
@@ -1,5 +1,3 @@
-;Testname=br3392252; Arguments=-Ox -fbin -obrbr3392252.o; Files=stdout stderr br3392252.o
-
 [BITS 64]
 
 	bextr rax, rsi, 1
diff --git a/travis/test/br3392252.bin.t b/travis/test/br3392252.bin.t
new file mode 100644
index 0000000..6020391
Binary files /dev/null and b/travis/test/br3392252.bin.t differ
diff --git a/travis/test/br3392252.json b/travis/test/br3392252.json
new file mode 100644
index 0000000..ed34c17
--- /dev/null
+++ b/travis/test/br3392252.json
@@ -0,0 +1,12 @@
+[
+	{
+		"description": "Test bls, blc instructions",
+		"id": "br3392252",
+		"format": "bin",
+		"source": "br3392252.asm",
+		"option": "-Ox",
+		"target": [
+			{ "output": "br3392252.bin" }
+		]
+	}
+]

[nasm:master] test: nasm-t -- Add br3200749

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  6fcb91cbc1a510ab8563d638b315ce7bd265464b
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=6fcb91cbc1a510ab8563d638b315ce7bd265464b
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sun, 11 Nov 2018 19:13:15 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sun, 11 Nov 2018 21:43:46 +0300

test: nasm-t -- Add br3200749

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 travis/test/br3200749.asm    |  7 +++++++
 travis/test/br3200749.json   | 13 +++++++++++++
 travis/test/br3200749.stderr |  2 ++
 3 files changed, 22 insertions(+)

diff --git a/travis/test/br3200749.asm b/travis/test/br3200749.asm
new file mode 100644
index 0000000..a809b75
--- /dev/null
+++ b/travis/test/br3200749.asm
@@ -0,0 +1,7 @@
+%define IFNDEF %ifndef
+%define ENDIF %endif
+
+IFNDEF foo
+	; bar
+ENDIF
+
diff --git a/travis/test/br3200749.json b/travis/test/br3200749.json
new file mode 100644
index 0000000..6d4bc28
--- /dev/null
+++ b/travis/test/br3200749.json
@@ -0,0 +1,13 @@
+[
+	{
+		"description": "Test macro expansion",
+		"id": "br3200749",
+		"format": "bin",
+		"source": "br3200749.asm",
+		"option": "-Ox",
+		"target": [
+			{ "stderr": "br3200749.stderr" }
+		],
+		"error": "expected"
+	}
+]
diff --git a/travis/test/br3200749.stderr b/travis/test/br3200749.stderr
new file mode 100644
index 0000000..ce6ada2
--- /dev/null
+++ b/travis/test/br3200749.stderr
@@ -0,0 +1,2 @@
+./travis/test/br3200749.asm:4: error: label or instruction expected at start of line
+./travis/test/br3200749.asm:6: error: label or instruction expected at start of line
\ No newline at end of file

[nasm:master] test: nasm-t -- Add br3174983

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  f4c33801a2e74a41c5a13316ca24c7d40e7d028a
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=f4c33801a2e74a41c5a13316ca24c7d40e7d028a
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sun, 11 Nov 2018 18:27:33 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sun, 11 Nov 2018 21:43:46 +0300

test: nasm-t -- Add br3174983

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 travis/test/br3174983.asm   |  6 ++++++
 travis/test/br3174983.bin.t |  1 +
 travis/test/br3174983.json  | 18 ++++++++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/travis/test/br3174983.asm b/travis/test/br3174983.asm
new file mode 100644
index 0000000..48a293a
--- /dev/null
+++ b/travis/test/br3174983.asm
@@ -0,0 +1,6 @@
+	bits 32
+	vpextrw ecx,xmm0,8	; c5 f9 c5 c8 08
+	vpextrw ecx,xmm2,3	; c5 f9 c5 ca 03
+
+	bits 64
+	vpextrw rcx,xmm0,8	; c5 f9 c5 c8 08
diff --git a/travis/test/br3174983.bin.t b/travis/test/br3174983.bin.t
new file mode 100644
index 0000000..f5ba588
--- /dev/null
+++ b/travis/test/br3174983.bin.t
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/travis/test/br3174983.json b/travis/test/br3174983.json
new file mode 100644
index 0000000..0f9646e
--- /dev/null
+++ b/travis/test/br3174983.json
@@ -0,0 +1,18 @@
+[
+	{
+		"description": "Test vpextrw instruction (-Ox)",
+		"id": "br3174983",
+		"format": "bin",
+		"source": "br3174983.asm",
+		"option": "-Ox",
+		"target": [
+			{ "output": "br3174983.bin" }
+		]
+	},
+	{
+		"description": "Test vpextrw instruction (-O0)",
+		"ref": "br3174983",
+		"option": "-Ox",
+		"update": "false"
+	}
+]

[nasm:master] test: nasm-t -- Add br3189064

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  e8d773c5789daf5673199d11c84de5360297116b
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=e8d773c5789daf5673199d11c84de5360297116b
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sun, 11 Nov 2018 19:06:44 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sun, 11 Nov 2018 21:43:46 +0300

test: nasm-t -- Add br3189064

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 travis/test/br3189064.asm   |  4 ++++
 travis/test/br3189064.bin.t |  1 +
 travis/test/br3189064.json  | 18 ++++++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/travis/test/br3189064.asm b/travis/test/br3189064.asm
new file mode 100644
index 0000000..4d120cd
--- /dev/null
+++ b/travis/test/br3189064.asm
@@ -0,0 +1,4 @@
+[bits 64]
+	vmaskmovps	[edi],ymm0,ymm1
+	vextractf128	xmm0,ymm1,1
+	vextractf128	[edi],ymm1,1
diff --git a/travis/test/br3189064.bin.t b/travis/test/br3189064.bin.t
new file mode 100644
index 0000000..2235ace
--- /dev/null
+++ b/travis/test/br3189064.bin.t
@@ -0,0 +1 @@
+g}.}
g}

\ No newline at end of file
diff --git a/travis/test/br3189064.json b/travis/test/br3189064.json
new file mode 100644
index 0000000..a68d56e
--- /dev/null
+++ b/travis/test/br3189064.json
@@ -0,0 +1,18 @@
+[
+	{
+		"description": "Test vextractf128 instruction (-Ox)",
+		"id": "br3189064",
+		"format": "bin",
+		"source": "br3189064.asm",
+		"option": "-Ox",
+		"target": [
+			{ "output": "br3189064.bin" }
+		]
+	},
+	{
+		"description": "Test vextractf128 instruction (-O0)",
+		"ref": "br3189064",
+		"option": "-O0",
+		"update": "false"
+	}
+]

[nasm:master] test: nasm-t -- Add multisection

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  7af13e04663c53d946889c619f33201f960b69fd
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=7af13e04663c53d946889c619f33201f960b69fd
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sun, 11 Nov 2018 16:11:57 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sun, 11 Nov 2018 21:43:46 +0300

test: nasm-t -- Add multisection

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 travis/test/multisection-elf32.o.t     | Bin 0 -> 1680 bytes
 travis/test/multisection-elf32.stderr  |   1 +
 travis/test/multisection-elf64.o.t     | Bin 0 -> 2320 bytes
 travis/test/multisection-elf64.stderr  |   1 +
 {test => travis/test}/multisection.asm |   4 ++--
 travis/test/multisection.bin.t         | Bin 0 -> 205 bytes
 travis/test/multisection.json          |  31 +++++++++++++++++++++++++++++++
 travis/test/multisection.stderr        |   1 +
 8 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/travis/test/multisection-elf32.o.t b/travis/test/multisection-elf32.o.t
new file mode 100644
index 0000000..0568615
Binary files /dev/null and b/travis/test/multisection-elf32.o.t differ
diff --git a/travis/test/multisection-elf32.stderr b/travis/test/multisection-elf32.stderr
new file mode 100644
index 0000000..8a6df4b
--- /dev/null
+++ b/travis/test/multisection-elf32.stderr
@@ -0,0 +1 @@
+./travis/test/multisection.asm:84: warning: uninitialized space declared in non-BSS section `.hmm': zeroing
\ No newline at end of file
diff --git a/travis/test/multisection-elf64.o.t b/travis/test/multisection-elf64.o.t
new file mode 100644
index 0000000..64f250a
Binary files /dev/null and b/travis/test/multisection-elf64.o.t differ
diff --git a/travis/test/multisection-elf64.stderr b/travis/test/multisection-elf64.stderr
new file mode 100644
index 0000000..8a6df4b
--- /dev/null
+++ b/travis/test/multisection-elf64.stderr
@@ -0,0 +1 @@
+./travis/test/multisection.asm:84: warning: uninitialized space declared in non-BSS section `.hmm': zeroing
\ No newline at end of file
diff --git a/test/multisection.asm b/travis/test/multisection.asm
similarity index 98%
copy from test/multisection.asm
copy to travis/test/multisection.asm
index 34e7f7d..08b7319 100644
--- a/test/multisection.asm
+++ b/travis/test/multisection.asm
@@ -32,7 +32,7 @@ section .stringdata
 mystr1: db "Hello, this is string 1", 13, 10, '$'
 
 section .extra_code
-org 0x200
+;org 0x200
 bits 16
 more:
    mov si, asciz1
@@ -56,7 +56,7 @@ section .appspecific
 asciz1: db "This is string 2", 0
 
 section .code
-org 0x100
+;org 0x100
 bits 16
 
 start:
diff --git a/travis/test/multisection.bin.t b/travis/test/multisection.bin.t
new file mode 100644
index 0000000..47933b3
Binary files /dev/null and b/travis/test/multisection.bin.t differ
diff --git a/travis/test/multisection.json b/travis/test/multisection.json
new file mode 100644
index 0000000..61a0449
--- /dev/null
+++ b/travis/test/multisection.json
@@ -0,0 +1,31 @@
+[
+	{
+		"description": "Test mutlisecions (bin)",
+		"id": "multisection",
+		"format": "bin",
+		"source": "multisection.asm",
+		"option": "-Ox",
+		"target": [
+			{ "output": "multisection.bin" },
+			{ "stderr": "multisection.stderr" }
+		]
+	},
+	{
+		"description": "Test mutlisecions (elf32)",
+		"ref": "multisection",
+		"format": "elf32",
+		"target": [
+			{ "output": "multisection-elf32.o" },
+			{ "stderr": "multisection-elf32.stderr" }
+		]
+	},
+	{
+		"description": "Test mutlisecions (elf64)",
+		"ref": "multisection",
+		"format": "elf64",
+		"target": [
+			{ "output": "multisection-elf64.o" },
+			{ "stderr": "multisection-elf64.stderr" }
+		]
+	}
+]
diff --git a/travis/test/multisection.stderr b/travis/test/multisection.stderr
new file mode 100644
index 0000000..5629020
--- /dev/null
+++ b/travis/test/multisection.stderr
@@ -0,0 +1 @@
+./travis/test/multisection.asm:84: warning: uninitialized space declared in .hmm section: zeroing
\ No newline at end of file

[nasm:master] test: nasm-t -- Add br3187743

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  679a470aa7f83b3d9751a7971d04e762d0195d78
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=679a470aa7f83b3d9751a7971d04e762d0195d78
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sun, 11 Nov 2018 19:04:01 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sun, 11 Nov 2018 21:43:46 +0300

test: nasm-t -- Add br3187743

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 travis/test/br3187743.asm   |  4 ++++
 travis/test/br3187743.bin.t |  1 +
 travis/test/br3187743.json  | 18 ++++++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/travis/test/br3187743.asm b/travis/test/br3187743.asm
new file mode 100644
index 0000000..03a2e5c
--- /dev/null
+++ b/travis/test/br3187743.asm
@@ -0,0 +1,4 @@
+	bits 64
+
+	vlddqu	xmm0,[edi]
+	vlddqu	ymm0,[edi]
diff --git a/travis/test/br3187743.bin.t b/travis/test/br3187743.bin.t
new file mode 100644
index 0000000..b32db5a
--- /dev/null
+++ b/travis/test/br3187743.bin.t
@@ -0,0 +1 @@
+gg
\ No newline at end of file
diff --git a/travis/test/br3187743.json b/travis/test/br3187743.json
new file mode 100644
index 0000000..0aca672
--- /dev/null
+++ b/travis/test/br3187743.json
@@ -0,0 +1,18 @@
+[
+	{
+		"description": "Test vlddqu instruction (-Ox)",
+		"id": "br3187743",
+		"format": "bin",
+		"source": "br3187743.asm",
+		"option": "-Ox",
+		"target": [
+			{ "output": "br3187743.bin" }
+		]
+	},
+	{
+		"description": "Test vlddqu instruction (-O0)",
+		"ref": "br3187743",
+		"option": "-O0",
+		"update": "false"
+	}
+]

[nasm:master] test: nasm-t -- Add br3041451

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  3402778330bbbfa80254b94b3dacd80e8d40ecb7
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=3402778330bbbfa80254b94b3dacd80e8d40ecb7
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sun, 11 Nov 2018 18:10:36 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sun, 11 Nov 2018 21:43:46 +0300

test: nasm-t -- Add br3041451

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 {test => travis/test}/br3041451.asm |   7 ++-----
 travis/test/br3041451.bin.t         | Bin 0 -> 10 bytes
 travis/test/br3041451.json          |  13 +++++++++++++
 travis/test/br3041451.stderr        |   4 ++++
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/test/br3041451.asm b/travis/test/br3041451.asm
similarity index 83%
copy from test/br3041451.asm
copy to travis/test/br3041451.asm
index c8b0f3a..12f55a0 100644
--- a/test/br3041451.asm
+++ b/travis/test/br3041451.asm
@@ -1,11 +1,9 @@
-;Testname=br3041451; Arguments=-Ox -fbin -obr3041451.bin; Files=stdout stderr br3041451.bin
-
 	[bits 64]
 
 	;
 	; HIT: Maximum possible value
 	%assign i 0
-	%rep ((1<<62)-1)
+	%rep 1000000
 		mov rax, i
 		%assign i i+1
 		%if i == 2
@@ -33,7 +31,7 @@
 		%if i == 2
 			%exitrep
 		%endif
-	%endrep 
+	%endrep
 
 	;
 	; MISS: It's negative
@@ -56,4 +54,3 @@
 			%exitrep
 		%endif
 	%endrep
-
diff --git a/travis/test/br3041451.bin.t b/travis/test/br3041451.bin.t
new file mode 100644
index 0000000..83aa34c
Binary files /dev/null and b/travis/test/br3041451.bin.t differ
diff --git a/travis/test/br3041451.json b/travis/test/br3041451.json
new file mode 100644
index 0000000..c5d8df7
--- /dev/null
+++ b/travis/test/br3041451.json
@@ -0,0 +1,13 @@
+[
+	{
+		"description": "Test rep directive",
+		"id": "br3041451",
+		"format": "bin",
+		"source": "br3041451.asm",
+		"option": "-Ox",
+		"target": [
+			{ "output": "br3041451.bin" },
+			{ "stderr": "br3041451.stderr" }
+		]
+	}
+]
diff --git a/travis/test/br3041451.stderr b/travis/test/br3041451.stderr
new file mode 100644
index 0000000..802a799
--- /dev/null
+++ b/travis/test/br3041451.stderr
@@ -0,0 +1,4 @@
+./travis/test/br3041451.asm:17: warning: negative `%rep' count: -2 [-w+negative-rep]
+./travis/test/br3041451.asm:28: warning: negative `%rep' count: -1 [-w+negative-rep]
+./travis/test/br3041451.asm:39: warning: negative `%rep' count: -2 [-w+negative-rep]
+./travis/test/br3041451.asm:50: warning: negative `%rep' count: -1 [-w+negative-rep]
\ No newline at end of file

[nasm:master] test: nasm-t -- Add br3028880

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  0feb41b08706643baf5770c81d1d104ccef436eb
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=0feb41b08706643baf5770c81d1d104ccef436eb
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sun, 11 Nov 2018 18:00:06 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sun, 11 Nov 2018 21:43:46 +0300

test: nasm-t -- Add br3028880

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 test/ifenv.asm => travis/test/br3028880.asm | 19 ++++++++++---------
 travis/test/br3028880.bin.t                 |  8 ++++++++
 travis/test/br3028880.json                  | 13 +++++++++++++
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/test/ifenv.asm b/travis/test/br3028880.asm
similarity index 52%
copy from test/ifenv.asm
copy to travis/test/br3028880.asm
index 15f12f8..d8395f0 100644
--- a/test/ifenv.asm
+++ b/travis/test/br3028880.asm
@@ -1,3 +1,5 @@
+;Testname=br3028880; Arguments=-Ox -fbin -obr3028880.o; Files=stdout stderr br3028880.o
+
 %macro import 1
 	%defstr %%incfile %!PROJECTBASEDIR/%{1}.inc
 	%defstr %%decfile %!'PROJECTBASEDIR'/%{1}.dec
@@ -6,26 +8,25 @@
 %endmacro
 
 %ifenv PROJECTBASEDIR
-import foo
+	import foo
 %else
-%warning No PROJECTBASEDIR defined
+	%warning No PROJECTBASEDIR defined
 %endif
 
 %ifenv %!PROJECTBASEDIR
-import foo
+	import foo
 %else
-%warning No PROJECTBASEDIR defined
+	%warning No PROJECTBASEDIR defined
 %endif
 
 %ifenv 'PROJECTBASEDIR'
-import foo
+	import foo
 %else
-%warning No PROJECTBASEDIR defined
+	%warning No PROJECTBASEDIR defined
 %endif
 
 %ifenv %!'PROJECTBASEDIR'
-import foo
+	import foo
 %else
-%warning No PROJECTBASEDIR defined
+	%warning No PROJECTBASEDIR defined
 %endif
-
diff --git a/travis/test/br3028880.bin.t b/travis/test/br3028880.bin.t
new file mode 100644
index 0000000..79681ff
--- /dev/null
+++ b/travis/test/br3028880.bin.t
@@ -0,0 +1,8 @@
+./travis/test/foo.inc
+./travis/test/foo.dec
+./travis/test/foo.inc
+./travis/test/foo.dec
+./travis/test/foo.inc
+./travis/test/foo.dec
+./travis/test/foo.inc
+./travis/test/foo.dec
diff --git a/travis/test/br3028880.json b/travis/test/br3028880.json
new file mode 100644
index 0000000..751deda
--- /dev/null
+++ b/travis/test/br3028880.json
@@ -0,0 +1,13 @@
+[
+	{
+		"description": "Test environment variables",
+		"id": "br3028880",
+		"format": "bin",
+		"source": "br3028880.asm",
+		"option": "-Ox",
+		"environ": ["PROJECTBASEDIR=./travis/test"],
+		"target": [
+			{ "output": "br3028880.bin" }
+		]
+	}
+]

[nasm:master] test: nasm-t -- Add br3066383

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  323f5ae7650091731c38f447a98b5272cc23cc67
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=323f5ae7650091731c38f447a98b5272cc23cc67
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sun, 11 Nov 2018 18:18:59 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sun, 11 Nov 2018 21:43:46 +0300

test: nasm-t -- Add br3066383

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 {test => travis/test}/br3066383.asm |   2 --
 travis/test/br3066383.bin.t         | Bin 0 -> 28 bytes
 travis/test/br3066383.json          |  12 ++++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/test/br3066383.asm b/travis/test/br3066383.asm
similarity index 93%
copy from test/br3066383.asm
copy to travis/test/br3066383.asm
index d6a8646..09222ac 100644
--- a/test/br3066383.asm
+++ b/travis/test/br3066383.asm
@@ -1,5 +1,3 @@
-;Testname=br3066383; Arguments=-Ox -fbin -obr3066383.bin; Files=stdout stderr br3066383.bin
-
 ;
 ; this is a for BR3005117
 ; http://sourceforge.net/tracker/?func=detail&aid=3005117&group_id=6208&atid=106208
diff --git a/travis/test/br3066383.bin.t b/travis/test/br3066383.bin.t
new file mode 100644
index 0000000..be139fb
Binary files /dev/null and b/travis/test/br3066383.bin.t differ
diff --git a/travis/test/br3066383.json b/travis/test/br3066383.json
new file mode 100644
index 0000000..9aea9a2
--- /dev/null
+++ b/travis/test/br3066383.json
@@ -0,0 +1,12 @@
+[
+	{
+		"description": "Test macro expansion",
+		"id": "br3066383",
+		"format": "bin",
+		"source": "br3066383.asm",
+		"option": "-Ox",
+		"target": [
+			{ "output": "br3066383.bin" }
+		]
+	}
+]

[nasm:master] test: nasm-t -- Add ifelse

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  88ef14eed8994ab60ff9dd893d88dbd4837a80f0
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=88ef14eed8994ab60ff9dd893d88dbd4837a80f0
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sun, 11 Nov 2018 15:33:56 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sun, 11 Nov 2018 21:43:46 +0300

test: nasm-t -- Add ifelse

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 {test => travis/test}/ifelse.asm |  0
 travis/test/ifelse.bin.t         |  1 +
 travis/test/ifelse.json          | 12 ++++++++++++
 travis/test/ifelse.stderr        |  4 ++++
 4 files changed, 17 insertions(+)

diff --git a/test/ifelse.asm b/travis/test/ifelse.asm
similarity index 100%
copy from test/ifelse.asm
copy to travis/test/ifelse.asm
diff --git a/travis/test/ifelse.bin.t b/travis/test/ifelse.bin.t
new file mode 100644
index 0000000..8d99a0d
--- /dev/null
+++ b/travis/test/ifelse.bin.t
@@ -0,0 +1 @@
+	
\ No newline at end of file
diff --git a/travis/test/ifelse.json b/travis/test/ifelse.json
new file mode 100644
index 0000000..56a9c3a
--- /dev/null
+++ b/travis/test/ifelse.json
@@ -0,0 +1,12 @@
+[
+	{
+		"description": "Test if,elif,else directives",
+		"id": "ifelse",
+		"format": "bin",
+		"source": "ifelse.asm",
+		"target": [
+			{ "output": "ifelse.bin" },
+			{ "stderr": "ifelse.stderr" }
+		]
+	}
+]
diff --git a/travis/test/ifelse.stderr b/travis/test/ifelse.stderr
new file mode 100644
index 0000000..dd9dfb5
--- /dev/null
+++ b/travis/test/ifelse.stderr
@@ -0,0 +1,4 @@
+./travis/test/ifelse.asm:17: warning: trailing garbage after `%else' ignored
+./travis/test/ifelse.asm:19: warning: `%elif' after `%else' ignored
+./travis/test/ifelse.asm:26: warning: trailing garbage after `%endif' ignored
+./travis/test/ifelse.asm:33: warning: `%else' after `%else' ignored.
\ No newline at end of file