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

 	cmp	eax,[structures_buffer]
 	jae	out_of_memory
 	cmp	[file_extension],0
 	jne	extension_specified
-	cmp	[output_format],2
+	mov	al,[output_format]
-	je	exe_extension
+	cmp	al,2
+	je	exe_extension
 	jb	bin_extension
-	cmp	[output_format],4
+	cmp	al,4
 	je	obj_extension
-	cmp	[output_format],5
+	cmp	al,5
 	je	o_extension
-	cmp	[output_format],3
+	cmp	al,3
 	jne	no_extension
 	cmp	[subsystem],1
 	je	sys_extension
 	cmp	[subsystem],10
 	jae	efi_extension
 	bt	[format_flags],8
       calculate_code_size:
 	mov	[current_offset],edi
 	sub	edi,[code_start]
 	mov	[code_size],edi
-	mov	[written_size],0
+	and	[written_size],0
 	mov	edx,[output_file]
 	call	create
 	jc	write_failed
 	cmp	[output_format],3
 	jne	stub_written
 	mov	edx,[code_start]
 	lods	dword [esi]
 	cmp	eax,0Fh
 	jb	invalid_use_of_symbol
 	je	reserved_word_used_as_symbol
-	mov	dx,[current_pass]
+	inc	esi
+	mov	dx,[current_pass]
 	mov	[eax+18],dx
 	or	byte [eax+8],8
-	inc	esi
+	cmp	[symbols_file],0
+	je	public_reference_ok
+	cmp	[next_pass_needed],0
+	jne	public_reference_ok
+	mov	ebx,eax
+	call	store_label_reference
+	mov	eax,ebx
-	mov	ebx,[free_additional_memory]
+      public_reference_ok:
+	mov	ebx,[free_additional_memory]
 	lea	edx,[ebx+10h]
 	cmp	edx,[structures_buffer]
 	jae	out_of_memory
 	mov	[free_additional_memory],edx
 	mov	[ebx+8],eax
 	cmp	al,11h
 	jne	invalid_argument
       extrn_size_ok:
 	mov	[address_symbol],edx
-	movzx	ecx,ah
+	mov	[label_size],ah
+	movzx	ecx,ah
 	mov	[edx+8],ecx
 	xor	eax,eax
 	xor	edx,edx
 	xor	ebp,ebp
 	mov	ch,2
 	xor	eax,eax
 	rep	stos byte [edi]
 	mov	dword [org_origin],edi
 	mov	dword [org_origin+4],eax
-	mov	[org_registers],eax
+	mov	[org_origin_sign],al
+	mov	[org_registers],eax
 	mov	[org_start],edi
 	mov	eax,edx
 	call	undefined_data
 	mov	eax,edi
 	sub	eax,[code_start]
 	lods	byte [esi]
       segment_type_ok:
 	mov	[code_type],al
 	mov	eax,edx
-	mov	cx,0100h
+	mov	ch,1
-	xor	edx,edx
+	mov	[label_size],0
+	xor	edx,edx
 	xor	ebp,ebp
 	mov	[address_symbol],edx
 	jmp	make_free_label
 mz_entry:
 	lods	byte [esi]
 	jne	invalid_argument
 	call	get_word_value
 	cmp	[value_type],1
 	je	initial_cs_ok
-	cmp	[error_line],0
+	call	recoverable_invalid_address
-	jne	initial_cs_ok
-	mov	eax,[current_line]
-	mov	[error_line],eax
-	mov	[error],invalid_address
       initial_cs_ok:
 	mov	edx,[additional_memory]
 	mov	[edx+16h],ax
 	lods	byte [esi]
 	cmp	al,':'
 	jne	invalid_argument
 	jne	invalid_use_of_symbol
 	mov	edx,[additional_memory]
 	mov	[edx+14h],ax
 	jmp	instruction_assembled
-mz_stack:
+      recoverable_invalid_address:
+	cmp	[error_line],0
+	jne	ignore_invalid_address
+	push	[current_line]
+	pop	[error_line]
+	mov	[error],invalid_address
+      ignore_invalid_address:
+	ret
+mz_stack:
 	lods	byte [esi]
 	cmp	al,'('
 	jne	invalid_argument
 	call	get_word_value
 	cmp	byte [esi],':'
 	jmp	instruction_assembled
       stack_pointer:
 	cmp	[value_type],1
 	je	initial_ss_ok
-	cmp	[error_line],0
+	call	recoverable_invalid_address
-	jne	initial_ss_ok
-	mov	eax,[current_line]
-	mov	[error_line],eax
-	mov	[error],invalid_address
       initial_ss_ok:
 	mov	edx,[additional_memory]
 	mov	[edx+0Eh],ax
 	lods	byte [esi]
 	cmp	al,':'
 	jne	invalid_argument
 	mov	[machine],14Ch
 	mov	[subsystem],3
 	mov	[subsystem_version],3 + 10 shl 16
 	mov	[image_base],400000h
-	mov	[image_base_high],0
+	and	[image_base_high],0
 	test	[format_flags],8
 	jz	pe_settings
 	mov	[machine],8664h
 	mov	[subsystem_version],5 + 0 shl 16
       pe_settings:
 	cmp	byte [esi],84h
 	bt	[format_flags],8
 	jc	pe_entry_init_ok
 	mov	[edx+28h],eax		; entry point rva
       pe_entry_init_ok:
-	mov	[number_of_sections],0
+	and	[number_of_sections],0
 	movzx	ebx,word [edx+14h]
 	lea	ebx,[edx+18h+ebx]
 	mov	[current_section],ebx
 	mov	dword [ebx],'.fla'
 	mov	dword [ebx+4],'t'
 	mov	[ebx+14h],edi
 	mov	[ebx+0Ch],eax
 	mov	dword [ebx+24h],0E0000060h
 	xor	ecx,ecx
-	not	eax
+	xor	bl,bl
+	not	eax
 	not	ecx
-	add	eax,1
+	not	bl
+	add	eax,1
 	adc	ecx,0
-	add	eax,edi
+	adc	bl,0
+	add	eax,edi
 	adc	ecx,0
-	test	[format_flags],4
+	adc	bl,0
+	test	[format_flags],4
 	jnz	peplus_org
 	sub	eax,[edx+34h]
 	sbb	ecx,0
-	jmp	pe_org_ok
+	sbb	bl,0
+	jmp	pe_org_ok
       peplus_org:
 	sub	eax,[edx+30h]
 	sbb	ecx,[edx+34h]
-      pe_org_ok:
+	sbb	bl,0
+      pe_org_ok:
 	test	[format_flags],8
 	jnz	pe64_code
-	mov	bl,2
+	mov	bh,2
 	mov	[code_type],32
 	jmp	pe_code_type_ok
       pe64_code:
-	mov	bl,4
+	mov	bh,4
 	mov	[code_type],64
       pe_code_type_ok:
 	bt	[resolver_flags],0
 	jc	pe_labels_type_ok
-	xor	bl,bl
+	xor	bh,bh
       pe_labels_type_ok:
-	mov	[labels_type],bl
+	mov	[labels_type],bh
 	mov	dword [org_origin],eax
 	mov	dword [org_origin+4],ecx
-	mov	[org_registers],0
+	mov	[org_origin_sign],bl
+	and	[org_registers],0
 	mov	[org_start],edi
 	bt	[format_flags],8
 	jnc	dll_flag_ok
 	or	byte [edx+16h+1],20h
       dll_flag_ok:
 	bt	[format_flags],9
 	mov	edi,ebx
 	mov	esi,edx
 	rep	movs byte [edi],[esi]
 	pop	edi esi
-	mov	dword [ebx+24h],0
+	and	dword [ebx+24h],0
 	mov	[ebx+14h],edi
 	mov	edx,[code_start]
 	mov	eax,edi
 	xor	ecx,ecx
-	sub	eax,[ebx+0Ch]
+	mov	[org_origin_sign],0
+	sub	eax,[ebx+0Ch]
 	sbb	ecx,0
-	mov	[labels_type],2
+	sbb	[org_origin_sign],0
+	mov	[labels_type],2
 	mov	[code_type],32
 	test	[format_flags],8
 	jz	pe_section_code_type_ok
 	mov	[labels_type],4
 	mov	[code_type],64
 	test	[format_flags],4
 	jnz	peplus_section_org
 	sub	eax,[edx+34h]
 	sbb	ecx,0
-	bt	[resolver_flags],0
+	sbb	[org_origin_sign],0
+	bt	[resolver_flags],0
 	jc	pe_section_org_ok
 	mov	[labels_type],0
 	jmp	pe_section_org_ok
       peplus_section_org:
 	sub	eax,[edx+30h]
 	sbb	ecx,[edx+34h]
-	bt	[resolver_flags],0
+	sbb	[org_origin_sign],0
+	bt	[resolver_flags],0
 	jc	pe_section_org_ok
 	mov	[labels_type],0
       pe_section_org_ok:
 	mov	dword [org_origin],eax
 	mov	dword [org_origin+4],ecx
-	mov	[org_registers],0
+	and	[org_registers],0
 	mov	[org_start],edi
       get_section_flags:
 	lods	byte [esi]
 	cmp	al,1Ah
 	je	set_directory
 	cmp	al,19h
 	cmp	dword [edx+38h],1000h
 	jb	align_section
 	mov	edi,[undefined_data_start]
       align_section:
-	mov	[undefined_data_end],0
+	and	[undefined_data_end],0
 	mov	ebp,edi
 	sub	ebp,[ebx+14h]
 	mov	ecx,[edx+3Ch]
 	dec	ecx
 	lea	eax,[ebp+ecx]
 	not	ecx
 	xor	bl,bl
       check_pe_entry_label_type:
 	cmp	[value_type],bl
 	je	pe_entry_ok
-	cmp	[error_line],0
+	call	recoverable_invalid_address
-	jne	pe_entry_ok
-	mov	edx,[current_line]
-	mov	[error_line],edx
-	mov	[error],invalid_address
       pe_entry_ok:
       cdq
 	test	[format_flags],4
 	jnz	pe64_entry_type_ok
 	mov	edx,[code_start]
 	sub	eax,[edx+34h]
 	xor	bl,bl
       check_pe64_entry_label_type:
 	cmp	[value_type],bl
 	je	pe64_entry_type_ok
-	cmp	[error_line],0
+	call	recoverable_invalid_address
-	jne	pe64_entry_type_ok
-	mov	edx,[current_line]
-	mov	[error_line],edx
-	mov	[error],invalid_address
       pe64_entry_type_ok:
 	mov	ecx,[code_start]
 	sub	eax,[ecx+30h]
 	sbb	edx,[ecx+34h]
 	jz	pe64_entry_range_ok
-	mov	edx,[current_line]
+	call	recoverable_overflow
-	mov	[error_line],edx
-	mov	[error],value_out_of_range
       pe64_entry_range_ok:
 	mov	[ecx+28h],eax
 	jmp	instruction_assembled
 pe_stack:
 	lods	byte [esi]
 	cmp	al,'('
 	je	pe_relocation_type_ok
       check_standard_pe_relocation_type:
 	cmp	[value_type],2
 	je	pe_relocation_type_ok
-	cmp	[error_line],0
+	call	recoverable_misuse
-	jne	pe_relocation_type_ok
+      pe_relocation_type_ok:
-	mov	eax,[current_line]
-	mov	[error_line],eax
-	mov	[error],invalid_use_of_symbol
-      pe_relocation_type_ok:
 	mov	ebx,[current_section]
 	mov	eax,edi
 	sub	eax,[ebx+14h]
 	add	eax,[ebx+0Ch]
 	mov	ebx,[free_additional_memory]
 	bts	[resolver_flags],0
 	jc	fixups_ready
 	or	[next_pass_needed],-1
       fixups_ready:
-	mov	[last_fixup_base],0
+	and	[last_fixup_base],0
 	call	make_fixups
 	xchg	eax,[actual_fixups_size]
 	sub	eax,[actual_fixups_size]
 	ja	reserve_forward_fixups
 	xor	eax,eax
       reserve_forward_fixups:
 	cmp	[next_pass_needed],0
 	je	resource_from_file
 	cmp	[current_pass],0
 	jne	reserve_space_for_resource
-	mov	[resource_size],0
+	and	[resource_size],0
       reserve_space_for_resource:
 	add	edi,[resource_size]
 	cmp	edi,[display_buffer]
 	ja	out_of_memory
 	jmp	resource_done
       resource_from_file:
 	mov	dword [ebx+14h],eax
 	mov	[current_section],ebx
 	xor	eax,eax
 	mov	[number_of_sections],eax
-	mov	dword [org_origin],edi
+	call	setup_coff_section_org
+	mov	[code_type],32
+	test	[format_flags],8
+	jz	format_defined
+	mov	[code_type],64
+	jmp	format_defined
+      setup_coff_section_org:
+	xor	eax,eax
+	mov	dword [org_origin],edi
 	mov	dword [org_origin+4],eax
-	mov	[org_registers],eax
+	mov	[org_origin_sign],al
+	mov	[org_registers],eax
 	mov	[org_start],edi
 	mov	[org_symbol],ebx
-	mov	[labels_type],2
+	test	[format_flags],8
-	mov	[code_type],32
-	test	[format_flags],8
-	jz	format_defined
+	jnz	coff_64bit_labels
-	mov	[labels_type],4
+	mov	[labels_type],2
+	ret
+      coff_64bit_labels:
+	mov	[labels_type],4
-	mov	[code_type],64
+	ret
-	jmp	format_defined
-coff_section:
+coff_section:
 	call	close_coff_section
 	mov	ebx,[free_additional_memory]
 	lea	eax,[ebx+20h]
 	cmp	eax,[structures_buffer]
 	jae	out_of_memory
 	inc	[number_of_sections]
 	xor	eax,eax
 	mov	[ebx],al
 	mov	[ebx+8],edi
-	mov	dword [org_origin],edi
+	mov	[ebx+10h],eax
-	mov	dword [org_origin+4],eax
-	mov	[org_registers],eax
-	mov	[org_start],edi
-	mov	[org_symbol],ebx
-	mov	[labels_type],2
-	test	[format_flags],8
-	jz	coff_labels_type_ok
-	mov	[labels_type],4
-      coff_labels_type_ok:
-	mov	[ebx+10h],eax
 	mov	[ebx+14h],eax
-	lods	word [esi]
+	call	setup_coff_section_org
+	lods	word [esi]
 	cmp	ax,'('
 	jne	invalid_argument
 	mov	[ebx+4],esi
 	mov	ecx,[esi]
 	lea	esi,[esi+4+ecx+1]
 	mov	[esi],edx
 	mov	edx,[esi+8]
 	add	esi,10h
 	inc	eax
-	cmp	byte [edx+11],2
+	cmp	byte [edx+11],0
-	jne	enumerate_symbols
+	je	enumerate_symbols
 	mov	edx,[edx+20]
 	cmp	byte [edx],0C0h
 	jae	enumerate_symbols
 	cmp	byte [edx],80h
 	jb	enumerate_symbols
 	inc	eax
 	jne	invalid_use_of_symbol
 	mov	cx,[ecx+1Eh]
 	mov	[ebx+0Ch],cx
       public_symbol_section_ok:
-	cmp	dword [eax+4],0
+	movzx	ecx,byte [eax+9]
-	je	store_public_symbol
+	shr	cl,1
-	cmp	dword [eax+4],-1
+	and	cl,1
+	neg	ecx
+	cmp	ecx,[eax+4]
 	jne	value_out_of_range
-	bt	dword [eax],31
+	xor	ecx,[eax]
-	jnc	value_out_of_range
+	js	value_out_of_range
-      store_public_symbol:
+	mov	eax,[eax]
-	mov	eax,[eax]
 	mov	[ebx+8],eax
 	mov	al,2
 	cmp	byte [esi],0C0h
 	je	store_symbol_class
 	inc	al
 	sub	eax,edx
 	mov	[edx],eax
 	sub	edi,[code_start]
 	mov	[code_size],edi
-	mov	[written_size],0
+	and	[written_size],0
 	mov	edx,[output_file]
 	call	create
 	jc	write_failed
 	mov	edx,[free_additional_memory]
 	pop	ecx
 	add	[written_size],ecx
 	mov	byte [edx+2Eh],28h
 	mov	[code_type],32
 	cmp	word [esi],1D19h
 	je	format_elf_exe
-	mov	[labels_type],2
+      elf_header_ok:
-      elf_header_ok:
 	mov	byte [edx+10h],1
 	mov	eax,[additional_memory]
 	mov	[symbols_stream],eax
 	mov	ebx,eax
 	add	eax,20h
 	mov	[free_additional_memory],eax
 	xor	eax,eax
 	mov	[current_section],ebx
 	mov	[number_of_sections],eax
-	mov	dword [org_origin],edi
+	mov	[ebx],al
-	mov	dword [org_origin+4],eax
-	mov	[org_registers],eax
-	mov	[org_start],edi
-	mov	[org_symbol],ebx
-	mov	[ebx],al
 	mov	[ebx+4],eax
 	mov	[ebx+8],edi
 	mov	al,111b
 	mov	[ebx+14h],eax
 	mov	al,4
 	mov	[ebx+10h],eax
-	test	[format_flags],8
+	call	setup_coff_section_org
+	test	[format_flags],8
 	jz	format_defined
 	mov	byte [ebx+10h],8
 	jmp	format_defined
       format_elf64:
 	mov	edx,edi
 	mov	byte [edx+34h],40h
 	mov	byte [edx+3Ah],40h
 	mov	[code_type],64
 	cmp	word [esi],1D19h
-	je	format_elf64_exe
+	jne	elf_header_ok
-	mov	[labels_type],4
+	jmp	format_elf64_exe
-	jmp	elf_header_ok
 elf_section:
 	bt	[format_flags],0
 	jc	illegal_instruction
 	call	close_coff_section
 	mov	ebx,[free_additional_memory]
 	lea	eax,[ebx+20h]
 	jz	format_limitations_exceeded
 	xor	eax,eax
 	mov	[ebx],al
 	mov	[ebx+8],edi
-	mov	dword [org_origin],edi
+	mov	[ebx+10h],eax
-	mov	dword [org_origin+4],eax
-	mov	[org_registers],eax
-	mov	[org_start],edi
-	mov	[org_symbol],ebx
-	test	[format_flags],8
-	jnz	elf64_labels_type
-	mov	[labels_type],2
-	jmp	elf_labels_type_ok
-      elf64_labels_type:
-	mov	[labels_type],4
-      elf_labels_type_ok:
-	mov	[ebx+10h],eax
 	mov	al,10b
 	mov	[ebx+14h],eax
-	lods	word [esi]
+	call	setup_coff_section_org
+	lods	word [esi]
 	cmp	ax,'('
 	jne	invalid_argument
 	mov	[ebx+4],esi
 	mov	ecx,[esi]
 	lea	esi,[esi+4+ecx+1]
 	jne	invalid_use_of_symbol
 	mov	dx,[eax+0Eh]
 	jmp	section_for_public_ok
       undefined_public:
-	mov	eax,[ebx+24]
+	mov	[error_info],ebx
-	mov	[error_info],eax
 	jmp	undefined_symbol
       elf64_public:
 	cmp	dl,4
 	jne	invalid_use_of_symbol
 	mov	dx,[eax+6]
 	jmp	section_for_public_ok
 	mov	eax,[esi+4]
 	stos	dword [edi]
 	test	[format_flags],8
 	jnz	elf64_public_symbol
-	call	get_public_value
+	movzx	eax,byte [ebx+9]
+	shr	al,1
+	and	al,1
+	neg	eax
+	cmp	eax,[ebx+4]
+	jne	value_out_of_range
+	xor	eax,[ebx]
+	js	value_out_of_range
-	stos	dword [edi]
+	mov	eax,[ebx]
+	stos	dword [edi]
 	xor	eax,eax
 	mov	al,[ebx+10]
 	stos	dword [edi]
 	mov	eax,edx
 	shl	eax,16
       elf64_public_function:
 	or	al,2
       store_elf64_public_info:
 	stos	dword [edi]
-	call	get_public_value
+	mov	al,[ebx+9]
+	shl	eax,31-1
+	xor	eax,[ebx+4]
+	js	value_out_of_range
-	stos	dword [edi]
+	mov	eax,[ebx]
+	stos	dword [edi]
-	xor	eax,eax
+	mov	eax,[ebx+4]
 	stos	dword [edi]
 	mov	al,[ebx+10]
 	stos	dword [edi]
 	xor	al,al
 	stos	dword [edi]
       public_symbol_ok:
 	mov	al,0C0h
 	mov	[esi],eax
 	add	esi,10h
 	jmp	find_other_symbols
-      get_public_value:
+      make_extrn_symbol:
-	mov	eax,[ebx]
-	cmp	dword [ebx+4],0
-	je	public_value_ok
-	cmp	dword [ebx+4],-1
-	jne	value_out_of_range
-	bt	eax,31
-	jnc	value_out_of_range
-      public_value_ok:
-	ret
-      make_extrn_symbol:
 	mov	eax,[esi+4]
 	stos	dword [edi]
 	test	[format_flags],8
 	jnz	elf64_extrn_symbol
 	xor	eax,eax
       store_elf_machine_word:
 	stos	dword [edi]
 	test	[format_flags],8
 	jz	elf_machine_word_ok
-	mov	dword [edi],0
+	and	dword [edi],0
 	add	edi,4
       elf_machine_word_ok:
 	ret
       relocations_converted:
 	cmp	edi,ebp
 	xchg	edi,[esp]
 	imul	ecx,[number_of_sections]
       init_elf_segments:
 	xor	eax,eax
 	rep	stos dword [edi]
-	mov	[number_of_sections],0
+	and	[number_of_sections],0
 	mov	byte [ebx],1
 	mov	word [ebx+1Ch],1000h
 	mov	byte [ebx+18h],111b
 	mov	eax,edi
-	sub	eax,[code_start]
+	xor	ebp,ebp
+	xor	cl,cl
+	sub	eax,[code_start]
-	mov	[ebx+4],eax
+	sbb	ebp,0
+	sbb	cl,0
+	mov	[ebx+4],eax
 	add	eax,[image_base]
-	mov	[ebx+8],eax
+	adc	ebp,0
+	adc	cl,0
+	mov	[ebx+8],eax
 	mov	[ebx+0Ch],eax
 	mov	[edx+18h],eax
-	xor	edx,edx
+	not	eax
-	not	eax
-	not	edx
+	not	ebp
-	add	eax,1
+	not	cl
+	add	eax,1
-	adc	edx,0
+	adc	ebp,0
-	add	eax,edi
+	adc	cl,0
+	add	eax,edi
-	adc	edx,0
+	adc	ebp,0
-	mov	dword [org_origin],eax
+	adc	cl,0
+	mov	dword [org_origin],eax
 	mov	dword [org_origin+4],edx
-	mov	[org_registers],0
+	mov	[org_origin_sign],cl
+	and	[org_registers],0
 	mov	[org_start],edi
 	mov	[symbols_stream],edi
 	jmp	format_defined
       format_elf64_exe:
 	add	esi,2
 	or	[format_flags],1
 	pop	edx
 	mov	[edx+7],al
       elf64_exe_brand_ok:
 	mov	[image_base],400000h
-	mov	[image_base_high],0
+	and	[image_base_high],0
 	cmp	byte [esi],80h
 	jne	elf64_exe_base_ok
 	lods	word [esi]
 	cmp	ah,'('
 	jne	invalid_argument
 	cmp	byte [esi],'.'
 	imul	ecx,[number_of_sections]
       init_elf64_segments:
 	xor	eax,eax
 	rep	stos dword [edi]
-	mov	[number_of_sections],0
+	and	[number_of_sections],0
 	mov	byte [ebx],1
 	mov	word [ebx+30h],1000h
 	mov	byte [ebx+4],111b
 	push	edx
 	mov	eax,edi
 	sub	eax,[code_start]
 	mov	[ebx+8],eax
 	xor	edx,edx
-	add	eax,[image_base]
+	xor	cl,cl
+	add	eax,[image_base]
 	adc	edx,[image_base_high]
-	mov	[ebx+10h],eax
+	adc	cl,0
+	mov	[ebx+10h],eax
 	mov	[ebx+10h+4],edx
 	mov	[ebx+18h],eax
 	mov	[ebx+18h+4],edx
 	pop	ebx
 	mov	[ebx+18h],eax
 	mov	[ebx+18h+4],edx
 	not	eax
 	not	edx
-	add	eax,1
+	not	cl
+	add	eax,1
 	adc	edx,0
-	add	eax,edi
+	adc	cl,0
+	add	eax,edi
 	adc	edx,0
-	mov	dword [org_origin],eax
+	adc	cl,0
+	mov	dword [org_origin],eax
 	mov	dword [org_origin+4],edx
-	mov	[org_registers],0
+	mov	[org_origin_sign],cl
+	and	[org_registers],0
 	mov	[org_start],edi
 	mov	[symbols_stream],edi
 	jmp	format_defined
 elf_entry:
 	lods	byte [esi]
 	cmp	al,'('
 	mov	[ebx+8],edx
 	mov	[ebx+0Ch],edx
 	mov	eax,edx
 	xor	edx,edx
-	not	eax
+	xor	cl,cl
+	not	eax
 	not	edx
-	add	eax,1
+	not	cl
+	add	eax,1
 	adc	edx,0
-	add	eax,edi
+	adc	cl,0
+	add	eax,edi
 	adc	edx,0
-	mov	dword [org_origin],eax
+	adc	cl,0
+	mov	dword [org_origin],eax
 	mov	dword [org_origin+4],edx
-	mov	[org_registers],0
+	mov	[org_origin_sign],cl
+	and	[org_registers],0
 	mov	[org_start],edi
 	inc	[number_of_sections]
 	jmp	instruction_assembled
       close_elf_segment:
 	cmp	[number_of_sections],0
 	jne	finish_elf_segment
 	mov	[ebx+10h],eax
 	mov	[ebx+10h+4],edx
 	mov	[ebx+18h],eax
 	mov	[ebx+18h+4],edx
-	not	eax
+	xor	cl,cl
+	not	eax
 	not	edx
-	add	eax,1
+	not	cl
+	add	eax,1
 	adc	edx,0
-	add	eax,edi
+	adc	cl,0
+	add	eax,edi
 	adc	edx,0
-	mov	dword [org_origin],eax
+	adc	cl,0
+	mov	dword [org_origin],eax
 	mov	dword [org_origin+4],edx
-	mov	[org_registers],0
+	mov	[org_origin_sign],cl
+	and	[org_registers],0
 	mov	[org_start],edi
 	inc	[number_of_sections]
 	jmp	instruction_assembled
       close_elf64_segment:
 	cmp	[number_of_sections],0
 	jne	finish_elf64_segment

Subversion Repositories Kolibri OS

(root)/programs/develop/fasm/trunk/formats.inc @ 3010 – Rev 2664 → 2665