WebSVN – Kolibri OS – Diff – /programs/develop/fasm/trunk/preproce.inc

-        xor     eax,eax
+	xor	eax,eax
-        mov     [source_start],eax
+	mov	[source_start],eax
-        mov     [display_buffer],eax
+	mov	[display_buffer],eax
-        mov     [hash_tree],eax
+	mov	[hash_tree],eax
-        mov     [macro_status],al
+	mov	[error],eax
+	mov	[macro_status],al
-        mov     esi,[input_file]
+	mov	esi,[input_file]
-        mov     edx,esi
+	mov	edx,esi
-        call    open
+	call	open
-        jc      main_file_not_found
+	jc	main_file_not_found
-        mov     edi,[memory_start]
+	mov	edi,[memory_start]
-        cmp     al,'{'
+	cmp	al,'{'
-        je      found_macro_block
+	je	found_macro_block
-        jmp     invalid_macro_arguments
+	jmp	invalid_macro_arguments
       macro_argument_with_default_value:
-        call    skip_macro_argument_value
+	or	[default_argument_value],-1
+	call	skip_macro_argument_value
-        inc     esi
+	inc	esi
-        jmp     macro_argument_end
+	jmp	macro_argument_end
       skip_macro_argument_value:
-        cmp     byte [esi],'<'
+	cmp	byte [esi],'<'
-        jne     simple_argument
+	jne	simple_argument
-        or      al,al
+	or	al,al
-        jz      argument_value_end
+	jz	argument_value_end
-        cmp     al,','
+	cmp	al,','
-        je      argument_value_end
+	je	argument_value_end
-        or      ebp,ebp
+	cmp	[default_argument_value],0
+	je	invalid_macro_arguments
+	cmp	al,'{'
+	je	argument_value_end
+	or	ebp,ebp
-        jz      invalid_macro_arguments
+	jz	invalid_macro_arguments
-        cmp     al,']'
+	cmp	al,']'
-        je      argument_value_end
+	je	argument_value_end
-        jmp     invalid_macro_arguments
+	jmp	invalid_macro_arguments
       simple_argument:
-        cmp     al,22h
+	cmp	al,22h
-        je      argument_string
+	je	argument_string
-        cmp     al,1Ah
+	cmp	al,1Ah
-        je      argument_symbol
+	je	argument_symbol
-        or      ebp,ebp
+	cmp	[default_argument_value],0
+	je	simple_argument
+	cmp	al,'{'
+	je	argument_value_end
+	or	ebp,ebp
-        jz      simple_argument
+	jz	simple_argument
-        cmp     al,']'
+	cmp	al,']'
-        je      argument_value_end
+	je	argument_value_end
       argument_symbol:
-        movzx   eax,byte [esi]
+	movzx	eax,byte [esi]
-        call    add_macro_symbol
+	call	add_macro_symbol
-        add     esi,ecx
+	add	esi,ecx
-        xchg    esi,ebx
+	xchg	esi,ebx
-        mov     [edx+12],esi
+	mov	[edx+12],esi
-        push    ebp
+	mov	[default_argument_value],0
-        xor     ebp,ebp
-        call    skip_macro_argument_value
+	call	skip_macro_argument_value
-        pop     ebp
+	call	finish_macro_argument
-        call    finish_macro_argument
-        xchg    esi,ebx
+	xchg	esi,ebx
-        cmp     byte [esi],'='
+	cmp	byte [esi],'='
-        je      argument_with_default_value
+	je	argument_with_default_value
-        cmp     byte [esi],'*'
+	cmp	byte [esi],'*'
-        jne     macro_argument_ok
+	jne	macro_argument_ok
-        cmp     byte [eax],'<'
+	cmp	byte [eax],'<'
-        jne     argument_value_length_ok
+	jne	argument_value_length_ok
-        inc     dword [edx+12]
+	inc	dword [edx+12]
-        sub     ecx,2
+	sub	ecx,2
-      argument_value_length_ok:
+	or	ecx,80000000h
+      argument_value_length_ok:
-        mov     [edx+8],ecx
+	mov	[edx+8],ecx
-        ret
+	ret
       argument_with_default_value:
-        inc     esi
+	inc	esi
-        push    esi
+	push	esi
-        call    skip_macro_argument_value
+	or	[default_argument_value],-1
+	call	skip_macro_argument_value
-        pop     eax
+	pop	eax
-        cmp     dword [edx+8],0
+	cmp	dword [edx+8],0
-        jne     macro_argument_ok
+	jne	macro_argument_ok
-        mov     [edx+12],eax
+	mov	[edx+12],eax
-        call    finish_macro_argument
+	call	finish_macro_argument
-        mov     al,')'
+	mov	al,')'
-        stosb
+	stosb
-        push    esi
+	push	esi
-        mov     esi,[esp+4]
+	mov	esi,[esp+4]
-        mov     [value_size],8
+	mov	[error_line],0
+	mov	[value_size],0
-        call    calculate_expression
+	call	calculate_expression
-        mov     eax,[edi]
+	cmp	[error_line],0
+	je	value_precalculated
+	jmp	[error]
+      value_precalculated:
+	mov	eax,[edi]
-        mov     ecx,[edi+4]
+	mov	ecx,[edi+4]
-        pop     esi edi
+	cdq
-        cdq
-        cmp     edx,ecx
+	cmp	edx,ecx
-        jne     value_out_of_range
+	jne	value_out_of_range
-        ret
+	cmp	dl,[edi+13]
+	jne	value_out_of_range
+	pop	esi edi
+	ret
 do_irp:
-        cmp     byte [esi],1Ah
+	cmp	byte [esi],1Ah
-        jne     invalid_macro_arguments
+	jne	invalid_macro_arguments
-        movzx   eax,byte [esi+1]
+	movzx	eax,byte [esi+1]
-        lea     esi,[esi+2+eax]
+	lea	esi,[esi+2+eax]
-        jne     invalid_macro_arguments
+	jne	invalid_macro_arguments
-        jmp     irp_parameters_start
+	jmp	irp_parameters_start
       irp_with_default_value:
-        xor     ebp,ebp
+	xor	ebp,ebp
-        call    skip_macro_argument_value
+	or	[default_argument_value],-1
+	call	skip_macro_argument_value
-        inc     esi
+	inc	esi
       irps_name_ok:
-        cmp     al,','
+	cmp	al,','
-        jne     invalid_macro_arguments
+	jne	invalid_macro_arguments
-        mov     al,[esi]
+	mov	al,[esi]
-        dec     edi
+	dec	edi
-        jmp     cut_current_file_name
+	jmp	cut_current_file_name
       current_file_path_ok:
-        mov     esi,[esp+4]
+	mov	esi,[esp+4]
-        call    preprocess_path
+	call	expand_path
-        pop     edx
+	pop	edx
-        mov     esi,edx
+	mov	esi,edx
-        call    open
+	call	open
-        jnc     include_path_ok
+	jnc	include_path_ok
-        mov     ebp,[include_paths]
+	mov	ebp,[include_paths]
       try_include_directories:
-        cmp     byte [esi],0
+	cmp	byte [esi],0
-        je      try_in_current_directory
+	je	try_in_current_directory
-        push    ebp
+	push	ebp
-        push    edi
+	push	edi
-      copy_include_directory:
+	call	get_include_directory
-        lods    byte [esi]
+	mov	[esp+4],esi
-        cmp     al,';'
-        je      include_directory_ok
-        stos    byte [edi]
-        or      al,al
-        jnz     copy_include_directory
-        dec     esi
-        dec     edi
-      include_directory_ok:
-        cmp     byte [edi-1],'/'
-        je      path_separator_ok
-        cmp     byte [edi-1],'\'
-        je      path_separator_ok
-        mov     al,'/'
-        stos    byte [edi]
-      path_separator_ok:
-        mov     [esp+4],esi
-        mov     esi,[esp+8]
+	mov	esi,[esp+8]
-        call    preprocess_path
+	call	expand_path
-        pop     edx
+	pop	edx
-        mov     esi,edx
+	mov	esi,edx
-        call    open
+	call	open
-        pop     ebp
+	pop	ebp
-        jnc     include_path_ok
+	jnc	include_path_ok
-        jmp     try_include_directories
+	jmp	try_include_directories
-        mov     edi,esi
+	mov	edi,esi
       try_in_current_directory:
-        mov     esi,[esp]
+	mov	esi,[esp]
-        push    edi
+	push	edi
-        call    preprocess_path
+	call	expand_path
-        pop     edx
+	pop	edx
-        mov     esi,edx
+	mov	esi,edx
-        call    open
+	call	open
-        jc      file_not_found
+	jc	file_not_found
       include_path_ok:
-        mov     edi,[esp]
+	mov	edi,[esp]
-        push    dword [macro_status]
+	push	dword [macro_status]
-        and     [macro_status],0Fh
+	and	[macro_status],0Fh
-        call    preprocess_file
+	call	preprocess_file
-        pop     eax
+	pop	eax
-        mov     [macro_status],al
+	and	al,0F0h
+	and	[macro_status],0Fh
+	or	[macro_status],al
-        jmp     line_preprocessed
+	jmp	line_preprocessed
       preprocess_path:
-        lods    byte [esi]
-        cmp     al,'%'
-        je      environment_variable
-        stos    byte [edi]
-        or      al,al
-        jnz     preprocess_path
-        cmp     edi,[memory_end]
-        ja      out_of_memory
-        ret
-      environment_variable:
-        mov     ebx,esi
-      find_variable_end:
-        lods    byte [esi]
-        or      al,al
-        jz      not_environment_variable
-        cmp     al,'%'
-        jne     find_variable_end
-        mov     byte [esi-1],0
-        push    esi
-        mov     esi,ebx
-        call    get_environment_variable
-        pop     esi
-        mov     byte [esi-1],'%'
-        jmp     preprocess_path
-      not_environment_variable:
-        mov     al,'%'
-        stos    byte [edi]
-        mov     esi,ebx
-        jmp     preprocess_path
->

Subversion Repositories Kolibri OS

(root)/programs/develop/fasm/trunk/preproce.inc – Rev 2664 → 2665