diff --git a/programs/develop/fasm/trunk/expressi.inc b/programs/develop/fasm/trunk/expressi.inc index 5cf3b0d472..0784d1a7f0 100644 --- a/programs/develop/fasm/trunk/expressi.inc +++ b/programs/develop/fasm/trunk/expressi.inc @@ -2266,7 +2266,8 @@ preevaluate_logical_expression: inc esi jmp skip_logical_value negation_skipped: - cmp byte [esi],'{' + mov al,[esi] + cmp al,'{' jne skip_simple_logical_value inc esi xchg al,[logical_value_wrapping] @@ -2290,6 +2291,7 @@ preevaluate_logical_expression: clc ret wrongly_structured_logical_expression: + pop eax stc ret skip_simple_logical_value: @@ -2310,7 +2312,7 @@ preevaluate_logical_expression: jne skip_logical_value_symbol sub [logical_value_parentheses],1 jnc skip_logical_value_symbol - cmp [logical_value_wrapping],al + cmp [logical_value_wrapping],'{' jne skip_logical_value_symbol jmp logical_value_skipped skip_logical_value_internal_parenthesis: diff --git a/programs/develop/fasm/trunk/preproce.inc b/programs/develop/fasm/trunk/preproce.inc index bedbe62492..6a755c8157 100644 --- a/programs/develop/fasm/trunk/preproce.inc +++ b/programs/develop/fasm/trunk/preproce.inc @@ -5,12 +5,11 @@ preprocessor: mov edi,characters - mov ecx,100h xor al,al make_characters_table: stosb inc al - loop make_characters_table + jnz make_characters_table mov esi,characters+'a' mov edi,characters+'A' mov ecx,26 diff --git a/programs/develop/fasm/trunk/version.inc b/programs/develop/fasm/trunk/version.inc index f43d7fc876..ca049c2d3c 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.17" +VERSION_STRING equ "1.67.18" VERSION_MAJOR = 1 VERSION_MINOR = 67