diff --git a/programs/develop/fasm/trunk/expressi.inc b/programs/develop/fasm/trunk/expressi.inc index 4f59111002..2446f71694 100644 --- a/programs/develop/fasm/trunk/expressi.inc +++ b/programs/develop/fasm/trunk/expressi.inc @@ -2624,6 +2624,8 @@ get_logical_value: je defined_fp_value cmp al,')' je expression_checked + cmp al,'!' + je invalid_expression cmp al,0Fh je check_expression cmp al,10h diff --git a/programs/develop/fasm/trunk/fasm.asm b/programs/develop/fasm/trunk/fasm.asm index c0e3ea43ea..a6f9ea00b9 100644 --- a/programs/develop/fasm/trunk/fasm.asm +++ b/programs/develop/fasm/trunk/fasm.asm @@ -23,7 +23,6 @@ APP_MEMORY = 0x00800000 ;; Menuet header appname equ "FASM " -version equ "1.67.12" use32 @@ -383,8 +382,6 @@ print_text: ; DATA -header db appname,version,0 - text: db ' INFILE:' .line_size = $-text @@ -507,6 +504,8 @@ include 'formats.inc' include 'x86_64.inc' include 'tables.inc' +header db appname,VERSION_STRING,0 + _logo db 'flat assembler version ',VERSION_STRING,13,10,0 _passes_suffix db ' passes, ',0 diff --git a/programs/develop/fasm/trunk/formats.inc b/programs/develop/fasm/trunk/formats.inc index 63d77bdafe..e14f8a3409 100644 --- a/programs/develop/fasm/trunk/formats.inc +++ b/programs/develop/fasm/trunk/formats.inc @@ -1,4 +1,4 @@ - + ; flat assembler core ; Copyright (c) 1999-2006, Tomasz Grysztar. ; All rights reserved. diff --git a/programs/develop/fasm/trunk/version.inc b/programs/develop/fasm/trunk/version.inc index 47308909a9..7d10689443 100644 --- a/programs/develop/fasm/trunk/version.inc +++ b/programs/develop/fasm/trunk/version.inc @@ -33,7 +33,7 @@ ; cannot simply be copied and put under another distribution licence ; (including the GNU Public Licence). -VERSION_STRING equ "1.67.12" +VERSION_STRING equ "1.67.13" VERSION_MAJOR = 1 VERSION_MINOR = 67 diff --git a/programs/develop/fasm/trunk/x86_64.inc b/programs/develop/fasm/trunk/x86_64.inc index ab2ccc4f0e..2c71648209 100644 --- a/programs/develop/fasm/trunk/x86_64.inc +++ b/programs/develop/fasm/trunk/x86_64.inc @@ -6008,6 +6008,8 @@ get_address: test ch,0Fh jnz address_ok calculate_relative_address: + mov edx,[address_symbol] + mov [symbol_identifier],edx mov edx,[address_high] call calculate_relative_offset mov [address_high],edx