diff --git a/LICENSE.TXT b/LICENSE.TXT index 9e0d2ce..7fd1315 100644 --- a/LICENSE.TXT +++ b/LICENSE.TXT @@ -1,6 +1,6 @@ flat assembler version 1.73 -Copyright (c) 1999-2019, Tomasz Grysztar. +Copyright (c) 1999-2020, Tomasz Grysztar. All rights reserved. This program is free for commercial and non-commercial use as long as diff --git a/SOURCE/ASSEMBLE.INC b/SOURCE/ASSEMBLE.INC index 1712ea2..e230feb 100644 --- a/SOURCE/ASSEMBLE.INC +++ b/SOURCE/ASSEMBLE.INC @@ -1,6 +1,6 @@ ; flat assembler core -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. assembler: diff --git a/SOURCE/AVX.INC b/SOURCE/AVX.INC index b028ef9..9c20ca4 100644 --- a/SOURCE/AVX.INC +++ b/SOURCE/AVX.INC @@ -1,6 +1,6 @@ ; flat assembler core -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. avx_single_source_pd_instruction_er_evex: diff --git a/SOURCE/DOS/DPMI.INC b/SOURCE/DOS/DPMI.INC index bbc7456..4a78486 100644 --- a/SOURCE/DOS/DPMI.INC +++ b/SOURCE/DOS/DPMI.INC @@ -1,6 +1,6 @@ ; flat assembler interface for DOS -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. init_dpmi_memory: diff --git a/SOURCE/DOS/FASM.ASM b/SOURCE/DOS/FASM.ASM index 74a929d..bd1f932 100644 --- a/SOURCE/DOS/FASM.ASM +++ b/SOURCE/DOS/FASM.ASM @@ -1,6 +1,6 @@ ; flat assembler interface for DOS -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. format MZ @@ -336,7 +336,7 @@ get_params: include '..\version.inc' _logo db 'flat assembler version ',VERSION_STRING,24h -_copyright db 'Copyright (c) 1999-2019, Tomasz Grysztar',0Dh,0Ah,0 +_copyright db 'Copyright (c) 1999-2020, Tomasz Grysztar',0Dh,0Ah,0 _usage db 0Dh,0Ah db 'usage: fasm [output]',0Dh,0Ah diff --git a/SOURCE/DOS/FASMLITE.ASM b/SOURCE/DOS/FASMLITE.ASM index 7851196..f34fa1a 100644 --- a/SOURCE/DOS/FASMLITE.ASM +++ b/SOURCE/DOS/FASMLITE.ASM @@ -1,6 +1,6 @@ ; flat assembler lite interface for DOS -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. format MZ @@ -336,7 +336,7 @@ get_params: include '..\version.inc' _logo db 'flat assembler version ',VERSION_STRING,' lite',24h -_copyright db 'Copyright (c) 1999-2019, Tomasz Grysztar',0Dh,0Ah,0 +_copyright db 'Copyright (c) 1999-2020, Tomasz Grysztar',0Dh,0Ah,0 _usage db 0Dh,0Ah db 'usage: fasm [output]',0Dh,0Ah diff --git a/SOURCE/DOS/MODES.INC b/SOURCE/DOS/MODES.INC index a039ab0..ac737a1 100644 --- a/SOURCE/DOS/MODES.INC +++ b/SOURCE/DOS/MODES.INC @@ -1,6 +1,6 @@ ; flat assembler interface for DOS -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. segment modes use16 diff --git a/SOURCE/DOS/SYSTEM.INC b/SOURCE/DOS/SYSTEM.INC index 859729e..cd05bb4 100644 --- a/SOURCE/DOS/SYSTEM.INC +++ b/SOURCE/DOS/SYSTEM.INC @@ -1,6 +1,6 @@ ; flat assembler interface for DOS -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. go32: diff --git a/SOURCE/ERRORS.INC b/SOURCE/ERRORS.INC index 61c0b6f..438c948 100644 --- a/SOURCE/ERRORS.INC +++ b/SOURCE/ERRORS.INC @@ -1,6 +1,6 @@ ; flat assembler core -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. out_of_memory: diff --git a/SOURCE/EXPRCALC.INC b/SOURCE/EXPRCALC.INC index bf9057c..57e34e5 100644 --- a/SOURCE/EXPRCALC.INC +++ b/SOURCE/EXPRCALC.INC @@ -1,6 +1,6 @@ ; flat assembler core -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. calculate_expression: diff --git a/SOURCE/EXPRPARS.INC b/SOURCE/EXPRPARS.INC index 2df388b..0869b6d 100644 --- a/SOURCE/EXPRPARS.INC +++ b/SOURCE/EXPRPARS.INC @@ -1,6 +1,6 @@ ; flat assembler core -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. convert_expression: diff --git a/SOURCE/FORMATS.INC b/SOURCE/FORMATS.INC index d63c41f..6840764 100644 --- a/SOURCE/FORMATS.INC +++ b/SOURCE/FORMATS.INC @@ -1,6 +1,6 @@ ; flat assembler core -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. formatter: diff --git a/SOURCE/LIBC/FASM.ASM b/SOURCE/LIBC/FASM.ASM index ca8c85c..1e4dff9 100644 --- a/SOURCE/LIBC/FASM.ASM +++ b/SOURCE/LIBC/FASM.ASM @@ -1,6 +1,6 @@ ; flat assembler interface for Unix/libc -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. format ELF @@ -310,7 +310,7 @@ include 'system.inc' include '..\version.inc' -_copyright db 'Copyright (c) 1999-2019, Tomasz Grysztar',0xA,0 +_copyright db 'Copyright (c) 1999-2020, Tomasz Grysztar',0xA,0 _logo db 'flat assembler version ',VERSION_STRING,0 _usage db 0xA diff --git a/SOURCE/LIBC/SYSTEM.INC b/SOURCE/LIBC/SYSTEM.INC index d2d4f87..93c0fe9 100644 --- a/SOURCE/LIBC/SYSTEM.INC +++ b/SOURCE/LIBC/SYSTEM.INC @@ -1,6 +1,6 @@ ; flat assembler interface for Unix/libc -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. extrn malloc diff --git a/SOURCE/LINUX/FASM.ASM b/SOURCE/LINUX/FASM.ASM index fb54181..1616019 100644 --- a/SOURCE/LINUX/FASM.ASM +++ b/SOURCE/LINUX/FASM.ASM @@ -1,6 +1,6 @@ ; flat assembler interface for Linux -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. format ELF executable 3 @@ -288,7 +288,7 @@ include 'system.inc' include '..\version.inc' -_copyright db 'Copyright (c) 1999-2019, Tomasz Grysztar',0xA,0 +_copyright db 'Copyright (c) 1999-2020, Tomasz Grysztar',0xA,0 _logo db 'flat assembler version ',VERSION_STRING,0 _usage db 0xA diff --git a/SOURCE/LINUX/SYSTEM.INC b/SOURCE/LINUX/SYSTEM.INC index a9c0ff3..e82eb54 100644 --- a/SOURCE/LINUX/SYSTEM.INC +++ b/SOURCE/LINUX/SYSTEM.INC @@ -1,6 +1,6 @@ ; flat assembler interface for Linux -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. O_ACCMODE = 0003o diff --git a/SOURCE/LINUX/X64/FASM.ASM b/SOURCE/LINUX/X64/FASM.ASM index e22cfbd..a1750d7 100644 --- a/SOURCE/LINUX/X64/FASM.ASM +++ b/SOURCE/LINUX/X64/FASM.ASM @@ -1,6 +1,6 @@ ; flat assembler interface for Linux x64 -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. format ELF64 executable 3 at 400000h @@ -304,7 +304,7 @@ include 'system.inc' include '..\..\version.inc' -_copyright db 'Copyright (c) 1999-2019, Tomasz Grysztar',0xA,0 +_copyright db 'Copyright (c) 1999-2020, Tomasz Grysztar',0xA,0 _logo db 'flat assembler version ',VERSION_STRING,0 _usage db 0xA diff --git a/SOURCE/LINUX/X64/MODES.INC b/SOURCE/LINUX/X64/MODES.INC index 8e3f551..dee8d55 100644 --- a/SOURCE/LINUX/X64/MODES.INC +++ b/SOURCE/LINUX/X64/MODES.INC @@ -1,6 +1,6 @@ ; flat assembler interface for Linux x64 -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. esp equ +rsp diff --git a/SOURCE/LINUX/X64/SYSTEM.INC b/SOURCE/LINUX/X64/SYSTEM.INC index e2238f9..2744e9f 100644 --- a/SOURCE/LINUX/X64/SYSTEM.INC +++ b/SOURCE/LINUX/X64/SYSTEM.INC @@ -1,6 +1,6 @@ ; flat assembler interface for Linux x64 -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. O_ACCMODE = 0003o diff --git a/SOURCE/MESSAGES.INC b/SOURCE/MESSAGES.INC index 2c7a4a6..8d69a80 100644 --- a/SOURCE/MESSAGES.INC +++ b/SOURCE/MESSAGES.INC @@ -1,6 +1,6 @@ ; flat assembler core -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. _out_of_memory db 'out of memory',0 diff --git a/SOURCE/PARSER.INC b/SOURCE/PARSER.INC index db61519..9da7563 100644 --- a/SOURCE/PARSER.INC +++ b/SOURCE/PARSER.INC @@ -1,6 +1,6 @@ ; flat assembler core -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. parser: diff --git a/SOURCE/PREPROCE.INC b/SOURCE/PREPROCE.INC index 51196e6..284fb0b 100644 --- a/SOURCE/PREPROCE.INC +++ b/SOURCE/PREPROCE.INC @@ -1,6 +1,6 @@ ; flat assembler core -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. preprocessor: @@ -765,8 +765,8 @@ preprocess_line: inc ebx jmp check_for_broken_label label_broken: - push line_preprocessed - jmp replace_symbolic_constant + call replace_symbolic_constant + jmp line_preprocessed label_constant_ok: mov ecx,edi sub ecx,esi diff --git a/SOURCE/SYMBDUMP.INC b/SOURCE/SYMBDUMP.INC index ac235ef..47fea17 100644 --- a/SOURCE/SYMBDUMP.INC +++ b/SOURCE/SYMBDUMP.INC @@ -1,6 +1,6 @@ ; flat assembler core -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. dump_symbols: diff --git a/SOURCE/TABLES.INC b/SOURCE/TABLES.INC index bc4df3d..2adf9e2 100644 --- a/SOURCE/TABLES.INC +++ b/SOURCE/TABLES.INC @@ -1,6 +1,6 @@ ; flat assembler core -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. include_variable db 'INCLUDE',0 diff --git a/SOURCE/VARIABLE.INC b/SOURCE/VARIABLE.INC index 43cf6a7..1c5612f 100644 --- a/SOURCE/VARIABLE.INC +++ b/SOURCE/VARIABLE.INC @@ -1,6 +1,6 @@ ; flat assembler core variables -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. ; Variables which have to be set up by interface: diff --git a/SOURCE/VERSION.INC b/SOURCE/VERSION.INC index 3a87130..f481d9f 100644 --- a/SOURCE/VERSION.INC +++ b/SOURCE/VERSION.INC @@ -1,6 +1,6 @@ ; flat assembler version 1.73 -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. ; ; This programs is free for commercial and non-commercial use as long as @@ -33,7 +33,7 @@ ; cannot simply be copied and put under another distribution licence ; (including the GNU Public Licence). -VERSION_STRING equ "1.73.21" +VERSION_STRING equ "1.73.22" VERSION_MAJOR = 1 VERSION_MINOR = 73 diff --git a/SOURCE/WIN32/FASM.ASM b/SOURCE/WIN32/FASM.ASM index 1764aa9..a2daa48 100644 --- a/SOURCE/WIN32/FASM.ASM +++ b/SOURCE/WIN32/FASM.ASM @@ -1,6 +1,6 @@ ; flat assembler interface for Win32 -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. format PE console @@ -342,7 +342,7 @@ section '.data' data readable writeable include '..\version.inc' -_copyright db 'Copyright (c) 1999-2019, Tomasz Grysztar',0Dh,0Ah,0 +_copyright db 'Copyright (c) 1999-2020, Tomasz Grysztar',0Dh,0Ah,0 _logo db 'flat assembler version ',VERSION_STRING,0 _usage db 0Dh,0Ah diff --git a/SOURCE/WIN32/SYSTEM.INC b/SOURCE/WIN32/SYSTEM.INC index d1b39f2..09cc1d7 100644 --- a/SOURCE/WIN32/SYSTEM.INC +++ b/SOURCE/WIN32/SYSTEM.INC @@ -1,6 +1,6 @@ ; flat assembler interface for Win32 -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. CREATE_NEW = 1 diff --git a/SOURCE/X86_64.INC b/SOURCE/X86_64.INC index 264917b..69976e9 100644 --- a/SOURCE/X86_64.INC +++ b/SOURCE/X86_64.INC @@ -1,6 +1,6 @@ ; flat assembler core -; Copyright (c) 1999-2019, Tomasz Grysztar. +; Copyright (c) 1999-2020, Tomasz Grysztar. ; All rights reserved. simple_instruction_except64: diff --git a/WHATSNEW.TXT b/WHATSNEW.TXT index f462616..3dc504a 100644 --- a/WHATSNEW.TXT +++ b/WHATSNEW.TXT @@ -2,6 +2,12 @@ Visit http://flatassembler.net/ for more information. +version 1.73.22 (Feb 02, 2020) + +[-] Removed a trick from preprocessor's implementation that caused + the x64 version to crash when replacing symbolic constant in a label. + + version 1.73.21 (Dec 05, 2019) [+] Added "$%" and "$%%" symbols, and output offset addressing with "load"