H. Peter Anvin (Intel) df2195b6a9 Merge remote-tracking branch 'origin/nasm-2.14.xx' ...

Resolved Conflicts:
	Makefile.in
	Mkfiles/msvc.mak
	Mkfiles/openwcom.mak
	asm/nasm.c
	nasmlib/alloc.c

Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>

2018-12-13 16:43:43 -08:00

..

assemble.c

warnings: Make WARN_ constants consistent with -w options

2018-12-12 18:13:47 -08:00

assemble.h

Add a generic pragma-handling infrastructure

2017-03-07 21:32:37 -08:00

directiv.c

warnings: rename ERR_WARN_* to WARN_*

2018-12-12 17:48:38 -08:00

directiv.dat

Make any execution limit configurable, add eval limit

2018-06-12 13:54:42 -07:00

error.c

Merge remote-tracking branch 'origin/nasm-2.14.xx'

2018-12-12 18:05:52 -08:00

eval.c

eval: Use nasm_error helpers

2018-12-01 19:54:15 +03:00

eval.h

Reorganize the source code into subdirectories

2016-05-25 12:06:29 -07:00

exprdump.c

exprlib: move dumping code to a separate C file

2017-02-28 18:13:43 -08:00

exprlib.c

exprlib: move dumping code to a separate C file

2017-02-28 18:13:43 -08:00

float.c

warnings: Make WARN_ constants consistent with -w options

2018-12-12 18:13:47 -08:00

float.h

Reorganize the source code into subdirectories

2016-05-25 12:06:29 -07:00

labels.c

warnings: Make WARN_ constants consistent with -w options

2018-12-12 18:13:47 -08:00

listing.c

Merge remote-tracking branch 'origin/nasm-2.14.xx'

2018-12-12 18:05:52 -08:00

listing.h

error: new flag ERR_HERE

2018-12-12 17:43:25 -08:00

nasm.c

Merge remote-tracking branch 'origin/nasm-2.14.xx'

2018-12-13 16:43:43 -08:00

parser.c

warnings: Make WARN_ constants consistent with -w options

2018-12-12 18:13:47 -08:00

parser.h

Cleanup of label renaming infrastructure, add subsection support

2018-06-01 18:06:25 -07:00

phash.pl

Reorganize the source code into subdirectories

2016-05-25 12:06:29 -07:00

pptok.dat

Merge remote-tracking branch 'origin/nasm-2.12.xx'

2016-10-04 14:09:07 -07:00

pptok.pl

perl: change to the new, safer 3-operand form of open()

2017-04-02 19:36:41 -07:00

pragma.c

warnings: rename ERR_WARN_* to WARN_*

2018-12-12 17:48:38 -08:00

preproc-nop.c

error: Cover all levels with helpers

2018-11-25 01:15:51 +03:00

preproc.c

warnings: Make WARN_ constants consistent with -w options

2018-12-12 18:13:47 -08:00

preproc.h

Reorganize the source code into subdirectories

2016-05-25 12:06:29 -07:00

quote.c

Reorganize the source code into subdirectories

2016-05-25 12:06:29 -07:00

quote.h

Reorganize the source code into subdirectories

2016-05-25 12:06:29 -07:00

rdstrnum.c

rdstrnum: Make sure we dont shift out of bound

2018-10-29 22:25:16 +03:00

segalloc.c

segalloc: DO NOT reset segment numbers

2018-06-14 16:42:03 -07:00

srcfile.c

hashtbl: revamp the hash table interface, support binary keys

2018-12-11 13:18:49 -08:00

srcfile.h

srcfile: simplify and make most functions inline

2018-12-10 23:28:01 -08:00

stdscan.c

warnings: rename ERR_WARN_* to WARN_*

2018-12-12 17:48:38 -08:00

stdscan.h

Reorganize the source code into subdirectories

2016-05-25 12:06:29 -07:00

strfunc.c

Reorganize the source code into subdirectories

2016-05-25 12:06:29 -07:00

tokens.dat

Reorganize the source code into subdirectories

2016-05-25 12:06:29 -07:00

tokhash.pl

perl: change to the new, safer 3-operand form of open()

2017-04-02 19:36:41 -07:00