Commit graph

3130 commits

Author SHA1 Message Date
Daniel Lundqvist
439875c1d9 ldrdf: Remove output file if there are any errors
If there are any errors while linking, we should not create an
output file.

Signed-off-by: Daniel Lundqvist <daniel@malarhojden.nu>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2016-10-04 03:36:27 -07:00
H. Peter Anvin
ce63783e85 changes.src: typographical adjustment
Extremely minor typographical fix.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2016-10-04 00:04:44 -07:00
H. Peter Anvin
20a38e43e4 NASM 2.12.03rc1 2016-10-03 23:57:44 -07:00
H. Peter Anvin
6a6a40c268 changes.src: document CLWB and PCOMMIT
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2016-10-03 23:37:51 -07:00
H. Peter Anvin
9b630b4361 insns: add OBSOLETE flag for instructions removed from architecture
There aren't that many instructions which have been rmeoved from the
x86 architecture, but there is a handful.  Flag those with an OBSOLETE
flag.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2016-10-03 23:35:25 -07:00
H. Peter Anvin
a617487b50 Add the CLWB and (already deprecated) PCOMMIT instructions
Add the CLWB and PCOMMIT instructions.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2016-10-03 23:23:02 -07:00
H. Peter Anvin
5e0d3b773f changes.src: update for a 2.12.03 release
We seem to have accumulated enough fixes that it ought to be time for
a 2.12.03 release.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2016-10-03 23:01:58 -07:00
H. Peter Anvin
e346b3b4a0 assemble: avoid redundant repetition in RESx warning message
Clean up the language in this warning message, so as not be so
unnecessarily repetitive.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2016-10-03 22:45:23 -07:00
H. Peter Anvin
c5d40b3576 assemble: print a warning on a forward reference in RESx
Print a warning on a forward reference in RESx.  This really should
have been a critical expression, and a forward reference should have
been an error, but it wasn't implemented that way and as such we can't
just randomly break people's code, even if it is dangerous.
2016-10-03 22:18:31 -07:00
H. Peter Anvin
976ba73062 Correct /is4 encoding for EVEX instructions
For EVEX instructions, /is4 can contain a fifth register bit, encoded
in bit 3 of the imm8.  Properly generate this case, and simplifiy the
/is4 generation code somewhat.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2016-09-20 16:39:46 -07:00
Henrik Gramner
ae707bace4 insns.dat: Enable contracted forms for additional instructions
Improve consistency by allowing contracted forms for EVEX-encoded
instructions when it's allowed for similar VEX-encoded instructions.

Previously the behavior would change depending on the vector size or
the register number which could be somewhat confusing:

    vaddps xmm0, xmm1  ; ok
    vaddps ymm0, ymm1  ; ok
    vaddps zmm0, zmm1  ; error
    vaddps xmm0, xmm16 ; error

Also allow contracted forms for a few additional older AVX instructions
where it makes sense.

Signed-off-by: Henrik Gramner <henrik@gramner.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
2016-08-25 17:22:40 -07:00
Henrik Gramner
4098f5655f insns.dat: Fix EVEX vpbroadcast(b|w), vpextr(b|w), and vpinsr(b|w)
Use the correct T1S compressed displacements.

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

Signed-off-by: Henrik Gramner <henrik@gramner.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
2016-08-25 17:22:34 -07:00
H. Peter Anvin
40fc4dcb39 Run make alldeps 2016-08-16 15:06:11 -07:00
Fabian Giesen
1df89ea039 codeview: Fix ill-formed "S_COMPILE2" record.
write_symbolinfo_properties didn't match the S_COMPILE2 record it's
supposed to be writing (the "compiler version" string was emitted
starting in the final "version" field); fix that.

Write version 8.0.50727; the Windows App Certification Kit (WACK)
checks compiler versions as given in app debug info and complains
when the toolchain is too old. 8.0.50727 is the lowest permitted
"MASM" version for WACK to be happy, so that's what we write.

Signed-off-by: Fabian Giesen <fabiang@radgametools.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
2016-07-27 01:06:09 +03:00
Fabian Giesen
199f3d7354 rdoff: Add rdf2bin input dependency
On host platforms where $(LN_S) is cp, need to make sure to
link rdf2bin first.

Backport of 6d67dbfa95

Signed-off-by: Fabian Giesen <fabiang@radgametools.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
2016-07-27 01:03:45 +03:00
Cyrill Gorcunov
5dfcab6bf9 labels: Warn if new label created on pass two
When symbols are created turing non-first pass we
should at least warn a user since it's a sign of
potential problem.

http://bugzilla.nasm.us/show_bug.cgi?id=3392358

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
2016-07-18 11:49:47 +03:00
bcallah@devio.us
065c34273c Add explicit void parameter to newmembuf() function declaration.
In rdoff/rdoff.c, the function declaration for newmembuf is written:
static memorybuf *newmembuf()
The attached diff adds an explicit void parameter.
It seems like it would be nicer with an explicit void parameter
especially since the -Werror build options seem to want to find such
things.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2016-07-14 14:15:41 -07:00
H. Peter Anvin
2fc232bd23 compiler.h: always undefine __STRICT_ANSI__ for gcc
It is not just DJGPP which has broken header files if __STRICT_ANSI__
is defined.  Cygwin has also been confirmed to have problems.  It
would be somewhat different if configure didn't still detect those
functions.

Undefine __STRICT_ANSI__ for all gcc platforms.  If this breaks then,
well, we'll have to really narrow down the problems.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2016-07-14 13:51:01 -07:00
H. Peter Anvin
f640b61d55 NASM 2.12.02 2016-07-06 13:22:32 -07:00
H. Peter Anvin
0fcb488df3 Don't suppress ERR_DEBUG messages from the list file
In some cases, debug messages in the list file can be enormously
powerful for finding problems.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2016-07-06 11:55:25 -07:00
Cyrill Gorcunov
bbb7a1aad9 preproc: Fix accessing OOM address
In case if there is no environment variable present
we allocated empty string but when working with tokens
we test for second byte for special symbols, accessing
out of memory address (->text[1] for the reference).

http://bugzilla.nasm.us/show_bug.cgi?id=3392333

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
2016-06-19 12:15:24 +03:00
H. Peter Anvin
41d8a17195 NASM 2.12.02rc9 2016-06-16 15:33:53 -07:00
H. Peter Anvin
f500d83ca4 preproc.c: fix assignment incorrectly coded as ==
Assignment is = not ==.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2016-06-16 15:28:09 -07:00
H. Peter Anvin
fd2b1a6be9 NASM 2.12.02rc8 2016-06-16 15:08:15 -07:00
Jim Kukunas
65a8afcaba preproc: for include files, include correct path in filename
The codeview backend needs to be able to open each source file passed in
so that it can calculate its checksum. In order to take into account
include paths, this patch updates the filename to include the path where
the file was found.

Signed-off-by: Jim Kukunas <james.t.kukunas@linux.intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

[ hpa: resolved one conflict in preproc.c ]
2016-06-16 15:07:32 -07:00
H. Peter Anvin
b41952986b outmacho: Fix relative relocations for 32-bit Mach-O (fix typo)
This unbreaks checkin 84f6860ed5, which
was broken due to a transcription error of mine.  Zenith432 was
faultless in this case.

This fixes bug report 3392355.

Reported-by: Zenith432 <zenith432@users.sourceforge.net>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2016-06-14 18:04:46 -07:00
H. Peter Anvin
5e0eb0c08b NASM 2.12.02rc7 2016-06-03 23:57:10 -07:00
knut st. osmundsen
8e6feefb3b outobj.c: Fix for RIP relative addressing relocation.
For 16-bit and 32-bit x86 code, the size and realsize() always
matches as only jumps, calls and loops uses PC relative
addressing and the address isn't followed by any other opcode
bytes.  In 64-bit mode there is RIP relative addressing which
means the fixup location can be followed by an immediate value,
meaning that size > realsize().

When the CPU is calculating the effective address, it takes the
RIP at the end of the instruction and adds the fixed up relative
address value to it.

The linker's point of reference is the end of the fixup location
(which is the end of the instruction for Jcc, CALL, LOOP[cc]).
It is calculating distance between the target symbol and the end
of the fixup location, and add this to the displacement value we
are calculating here and storing at the fixup location.

To get the right effect, we need to _reduce_ the displacement
value by the number of bytes following the fixup.

Example:
 data at address 0x100; REL4ADR at 0x050, 4 byte immediate,
 end of fixup at 0x054, end of instruction at 0x058.
 => size = 8.
 => realsize() -> 4
 => CPU needs a value of:   0x100 - 0x058 = 0x0a8
 => linker/loader will add: 0x100 - 0x054 = 0x0ac
 => We must add an addend of -4.
 => realsize() - size = -4.

The code used to do size - realsize() at least since v0.90,
probably because it wasn't needed...

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2016-06-03 23:54:12 -07:00
H. Peter Anvin
9f9ba28043 NASM 2.12.02rc6 2016-05-25 03:11:02 -07:00
H. Peter Anvin
0183894895 codeview: use nasm_realpath() to find the canonical name of the outfile
Concatenating the cwd with the name of the output file is incorrect
for filenames which are specified as absolute.  We already have
nasm_realpath() for this purpose, use it.

Cc: Jim Kukunas <james.t.kukunas@intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2016-05-24 23:35:57 -07:00
H. Peter Anvin
8794350751 NASM 2.12.02rc5 2016-05-24 23:06:11 -07:00
H. Peter Anvin
aa958b1ab6 ifunc.mac: the ilog2 warning may want to be both ceil and floor
There is no reason why the warning-generating ilog2 has to be only the
floor variant.  However, I am pretty sure we can simply implement the
ilog2cw() as a macro only; we can always fix that if that turns out to
be incorrect.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2016-05-24 23:03:17 -07:00
H. Peter Anvin
57a0581394 codeview: don't walk the file list for every line
Instead of walking a linear list of files for every line, make a
simple comparison for the common case of the same file, and otherwise
use a hash table.

Cc: Jim Kukunas <james.t.kukunas@intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2016-05-24 23:00:23 -07:00
Jim Kukunas
4de0e93677 codeview.c: register all filenames
This essentially reverts 6503051dcc since
that workaround is no longer needed thanks to support for multiple source
files

Signed-off-by: Jim Kukunas <james.t.kukunas@linux.intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2016-05-17 11:35:44 -07:00
Jim Kukunas
f8259c662a codeview.c: Add support for multiple source files
Handle the existence of multiple source files, as is normal when using
include files.

Signed-of-by: Jim Kukunas <james.t.kukunas@linux.intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2016-05-17 11:35:44 -07:00
H. Peter Anvin
c9fd7b2aa5 configure: correctly discover -W options for clang
clang doesn't error out on unknown -W options unless
-Werror=unknown-warning-option is specified first, so do that so the
configure script can do its job.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2016-05-16 21:35:48 -07:00
H. Peter Anvin
acbf8f0e19 doc: remove obsolete references
We don't use comp.lang.asm.x86 or freshmeat for announements anymore.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2016-05-16 20:39:04 -07:00
H. Peter Anvin
407166001c Fix building in a separate directory from the source code
The code to handle building in a separate directory had seriously
bitrotted.  This contains a number of fixes to make it possible,
including bits like the documentation which never worked in the past.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2016-05-16 20:30:09 -07:00
H. Peter Anvin
b06736ae7e Unbreak building in a separate object directory
Fix bitrot in building in a separate object directory.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2016-05-16 13:20:01 -07:00
H. Peter Anvin
cba1aca466 autogen.sh: remove configure-generated files
Remove files generated by configure when running autogen.sh.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2016-05-16 13:05:04 -07:00
H. Peter Anvin
6a5b3ecb16 codeview: use nasm_free() instead of plain free()
We want to consistently use our allocator wrapper functions whereever
possible.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2016-05-10 15:40:24 -07:00
Cyrill Gorcunov
771d04e263 preproc: Don't dereference nil @istk
If not input was specified istk = NULL, so don't dereference it.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
2016-05-10 23:27:03 +03:00
H. Peter Anvin
acb48602fc srcfile.c: remove unnecessary #include's
Remove #include's inherited from nasmlib.c which aren't needed in this
file.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2016-05-10 09:01:10 -07:00
H. Peter Anvin
cfbdc3c6fa NASM 2.12.02rc4 2016-05-10 03:12:28 -07:00
H. Peter Anvin
02f49f2c1e stdscan: put some error message strings in quotes
Put some error message strings inside `...' quotes to match existing
usage.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2016-05-10 03:08:09 -07:00
H. Peter Anvin
274cda81f8 Use a hash to keep exactly one copy of each filename around
The old code for keeping track of source file name and line was
confused as hell about ownership of the strings, and it is pretty
clear we leaked that information all over the place.

Instead, use a hash table to keep a copy of each string as necessary,
and simply make references to a string pool that we keep until the end
of the assembly session.

This pool probably should be unified with the list of dependency
files, and so on, but that is for the development branch.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2016-05-10 03:01:58 -07:00
H. Peter Anvin
b157701b17 quote: make the input argument to nasm_quote() const
Whereas nasm_unquote() unquotes the argument in place, nasm_quote()
has to allocate a new string (since the new string will *always* be
longer than the old string!)  Make the old string const since we're
making a copy anyway.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2016-05-10 02:59:04 -07:00
Fabian Giesen
c74a709885 codeview: Call register_file only when producing line numbers
Previously, debug info would refer to the first file seen, even
when it did not actually generate line numbers (e.g. segto=-1).

Fix it so we only lock in the file name the first time we actually
produce a line number record. Not as good as proper support for
debug info referencing multiple source files but much more useful
than the current behavior.

Signed-off-by: Fabian Giesen <fabiang@radgametools.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
2016-05-10 12:01:32 +03:00
Fabian Giesen
142285ddd8 codeview: Make md5sum calc read file in 'binary' mode
When assembling on Windows machines with CRLF line endings, computing
the MD5 hash from the file read in "text" mode (transforms CRLF->LF)
gives incorrect results.

Signed-off-by: Fabian Giesen <fabiang@radgametools.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
2016-05-10 12:01:22 +03:00
Fabian Giesen
86d8756f0c codeview: Look up %include path when determining files to hash.
The hash calculation in calc_md5 tries to open the source file via
"filename" again. For %includes, this is the file name that was
specified in the %include directive, not the actual name of the file
that was opened by the preprocessor. In other words, this fails if the
include file is not in the current working directory.

Add pp_input_fopen that uses the preprocessor include path lookup
code to resolve a file name and open it, and use that in codeview.c.

Signed-off-by: Fabian Giesen <fabiang@radgametools.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
2016-05-10 12:01:08 +03:00