Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 339 → Rev 340

/programs/develop/fasm/trunk/assemble.inc
1,6 → 1,6
 
; flat assembler core
; Copyright (c) 1999-2006, Tomasz Grysztar.
; Copyright (c) 1999-2007, Tomasz Grysztar.
; All rights reserved.
 
assembler:
/programs/develop/fasm/trunk/errors.inc
1,6 → 1,6
 
; flat assembler core
; Copyright (c) 1999-2006, Tomasz Grysztar.
; Copyright (c) 1999-2007, Tomasz Grysztar.
; All rights reserved.
 
out_of_memory:
/programs/develop/fasm/trunk/expressi.inc
1,6 → 1,6
 
; flat assembler core
; Copyright (c) 1999-2006, Tomasz Grysztar.
; Copyright (c) 1999-2007, Tomasz Grysztar.
; All rights reserved.
 
convert_expression:
2011,7 → 2011,7
jz address_size_ok
cmp al,ah
je address_size_ok
cmp ax,0408h
cmp ax,0804h
jne address_sizes_do_not_agree
mov [value_type],2
mov eax,[edi]
/programs/develop/fasm/trunk/formats.inc
1,6 → 1,6
 
; flat assembler core
; Copyright (c) 1999-2006, Tomasz Grysztar.
; Copyright (c) 1999-2007, Tomasz Grysztar.
; All rights reserved.
 
formatter:
/programs/develop/fasm/trunk/parser.inc
1,6 → 1,6
 
; flat assembler core
; Copyright (c) 1999-2006, Tomasz Grysztar.
; Copyright (c) 1999-2007, Tomasz Grysztar.
; All rights reserved.
 
parser:
1297,10 → 1297,14
cmp al,39h
jbe invalid_name
name_first_char_ok:
cmp al,'$'
jne check_for_reserved_word
cmp ecx,1
jne check_for_reserved_word
cmp al,'$'
je reserved_word
jne invalid_name
reserved_word:
mov eax,0Fh
pop edi
ret
check_for_reserved_word:
call get_instruction
jnc reserved_word
1341,10 → 1345,6
mov [eax+24],ebx
pop edi
ret
reserved_word:
mov eax,0Fh
pop edi
ret
allocate_label:
mov eax,[labels_list]
mov ecx,LABEL_STRUCTURE_SIZE shr 2
/programs/develop/fasm/trunk/preproce.inc
1,6 → 1,6
 
; flat assembler core
; Copyright (c) 1999-2006, Tomasz Grysztar.
; Copyright (c) 1999-2007, Tomasz Grysztar.
; All rights reserved.
 
preprocessor:
/programs/develop/fasm/trunk/tables.inc
1,6 → 1,6
 
; flat assembler core
; Copyright (c) 1999-2006, Tomasz Grysztar.
; Copyright (c) 1999-2007, Tomasz Grysztar.
; All rights reserved.
 
include_variable db 'INCLUDE',0
/programs/develop/fasm/trunk/variable.inc
1,6 → 1,6
 
; flat assembler core variables
; Copyright (c) 1999-2006, Tomasz Grysztar.
; Copyright (c) 1999-2007, Tomasz Grysztar.
; All rights reserved.
 
; Variables which have to be set up by interface:
/programs/develop/fasm/trunk/version.inc
1,6 → 1,6
 
; flat assembler version 1.67
; Copyright (c) 1999-2006, Tomasz Grysztar.
; Copyright (c) 1999-2007, 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.67.18"
VERSION_STRING equ "1.67.20"
 
VERSION_MAJOR = 1
VERSION_MINOR = 67
/programs/develop/fasm/trunk/x86_64.inc
1,6 → 1,6
 
; flat assembler core
; Copyright (c) 1999-2006, Tomasz Grysztar.
; Copyright (c) 1999-2007, Tomasz Grysztar.
; All rights reserved.
 
simple_instruction_except64:
6344,6 → 6344,14
shl cl,3
or al,cl
stos word [edi]
address_32bit_value:
cmp [code_type],64
jne store_address_32bit_value
mov eax,edx
cdq
cmp edx,[address_high]
jne value_out_of_range
mov edx,eax
jmp store_address_32bit_value
sib_address_8bit_value:
or al,01000000b
6374,10 → 6382,12
or al,cl
stos word [edi]
test ch,44h
jnz store_address_32bit_value
jnz address_32bit_value
test ch,88h
jnz address_32bit_value
or ch,ch
jnz invalid_address_size
jmp store_address_32bit_value
jmp address_32bit_value
zero_index_register:
mov bl,4
mov cl,1
6405,7 → 6415,7
shl cl,3
or al,cl
stos byte [edi]
jmp store_address_32bit_value
jmp address_32bit_value
simple_address_8bit_value:
or al,01000000b
mov cl,[postbyte_register]
6452,6 → 6462,10
jz address_32bit_relocation_ok
mov eax,ecx
shr eax,16
cmp al,4
jne address_32bit_relocation
mov al,2
address_32bit_relocation:
xchg [value_type],al
mov ebx,[address_symbol]
xchg ebx,[symbol_identifier]