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

 ; flat assembler core
-; Copyright (c) 1999-2012, Tomasz Grysztar.
+; Copyright (c) 1999-2013, Tomasz Grysztar.
 ; All rights reserved.
 formatter:
 	mov	[current_offset],edi
 	cmp	[symbols_file],0
 	je	labels_table_ok
 	mov	ecx,[memory_end]
 	sub	ecx,[labels_list]
-	mov	edi,[display_buffer]
+	mov	edi,[tagged_blocks]
 	sub	edi,8
 	mov	[edi],ecx
 	or	dword [edi+4],-1
 	sub	edi,ecx
 	cmp	edi,[current_offset]
 	jbe	out_of_memory
-	mov	[display_buffer],edi
+	mov	[tagged_blocks],edi
 	mov	esi,[memory_end]
       copy_labels:
 	sub	esi,32
 	cmp	esi,[labels_list]
 	jb	labels_table_ok
 	mov	ecx,32 shr 2
 	ret
 format_directive:
 	cmp	edi,[code_start]
 	jne	unexpected_instruction
-	cmp	[virtual_data],0
+	mov	ebp,[addressing_space]
+	test	byte [ds:ebp+0Ah],1
-	jne	unexpected_instruction
+	jnz	unexpected_instruction
 	cmp	[output_format],0
 	jne	unexpected_instruction
 	lods	byte [esi]
 	cmp	al,1Ch
 	je	format_prefix
 	cmp	al,18h
 	cmp	al,3
 	je	pe_heap
 	jmp	illegal_instruction
 segment_directive:
-	cmp	[virtual_data],0
+	mov	al,[output_format]
-	jne	illegal_instruction
-	mov	al,[output_format]
 	cmp	al,2
 	je	mz_segment
 	cmp	al,5
 	je	elf_segment
 	jmp	illegal_instruction
 section_directive:
-	cmp	[virtual_data],0
+	mov	al,[output_format]
-	jne	illegal_instruction
-	mov	al,[output_format]
 	cmp	al,3
 	je	pe_section
 	cmp	al,4
 	je	coff_section
 	cmp	al,5
 	mov	[edx+8],ecx
 	xor	eax,eax
 	xor	edx,edx
 	xor	ebp,ebp
-	mov	ch,2
+	mov	[address_sign],0
+	mov	ch,2
 	test	[format_flags],8
 	jz	make_free_label
 	mov	ch,4
 	jmp	make_free_label
 mark_relocation:
 	cmp	[value_type],0
 	je	relocation_ok
-	cmp	[virtual_data],0
+	mov	ebp,[addressing_space]
+	test	byte [ds:ebp+0Ah],1
-	jne	relocation_ok
+	jnz	relocation_ok
 	cmp	[output_format],2
 	je	mark_mz_relocation
 	cmp	[output_format],3
 	je	mark_pe_relocation
 	cmp	[output_format],4
 	je	mark_coff_relocation
 	sub	ecx,eax
 	mov	edx,edi
 	xor	eax,eax
 	rep	stos byte [edi]
-	mov	dword [org_origin],edi
+	mov	eax,edx
-	mov	dword [org_origin+4],eax
-	mov	[org_origin_sign],al
-	mov	[org_registers],eax
-	mov	[org_start],edi
-	mov	eax,edx
 	call	undefined_data
-	mov	eax,edi
+	push	ebx
+	call	create_addressing_space
+	pop	ebx
+	mov	eax,edi
 	sub	eax,[code_start]
 	shr	eax,4
 	cmp	eax,10000h
 	jae	value_out_of_range
 	mov	edx,eax
       segment_type_ok:
 	mov	[code_type],al
 	mov	eax,edx
 	mov	ch,1
-	mov	[label_size],0
+	mov	[address_sign],0
 	xor	edx,edx
 	xor	ebp,ebp
-	mov	[address_symbol],edx
+	mov	[label_size],0
+	mov	[address_symbol],edx
 	jmp	make_free_label
 mz_entry:
 	lods	byte [esi]
 	cmp	al,'('
 	jne	invalid_argument
 	add	ecx,11b
 	and	ecx,not 11b
 	add	ecx,(40h-1Ch) shr 2
 	lea	eax,[edi+ecx*4]
-	cmp	edi,[display_buffer]
+	cmp	edi,[tagged_blocks]
 	jae	out_of_memory
 	xor	eax,eax
 	rep	stos dword [edi]
 	mov	edx,40h
 	xchg	dx,[esi+18h]
 	xor	al,al
 	shr	ecx,3
 	inc	ecx
 	shl	ecx,1
 	lea	eax,[edi+ecx*4]
-	cmp	eax,[display_buffer]
+	cmp	eax,[tagged_blocks]
 	jae	out_of_memory
 	xor	eax,eax
 	rep	stos dword [edi]
 	pop	ecx
      read_stub_code:
 	call	read
 	mov	[esi+0Eh],ax
 	mov	[esi+16h],ax
 	mov	word [esi+14h],100h
 	mov	byte [esi+18h],40h
-	mov	eax,[display_buffer]
+	mov	eax,[tagged_blocks]
 	sub	eax,ecx
 	cmp	edi,eax
 	jae	out_of_memory
 	mov	edx,edi
 	shr	ecx,2
 	xor	eax,eax
 	inc	ebx
 	shl	ebx,cl
 	sub	ebx,ebp
 	mov	ecx,ebx
-	mov	eax,[display_buffer]
+	mov	eax,[tagged_blocks]
 	sub	eax,ecx
 	cmp	edi,eax
 	jae	out_of_memory
 	shr	ecx,2
 	xor	eax,eax
 	rep	stos dword [edi]
 	bt	[resolver_flags],0
 	jc	pe_labels_type_ok
 	xor	bh,bh
       pe_labels_type_ok:
-	mov	[labels_type],bh
+	push	eax ebx
+	call	init_addressing_space
+	mov	ebp,ebx
-	mov	dword [org_origin],eax
+	pop	ebx eax
-	mov	dword [org_origin+4],ecx
+	mov	[ds:ebp],eax
-	mov	[org_origin_sign],bl
+	mov	[ds:ebp+4],ecx
-	and	[org_registers],0
+	mov	[ds:ebp+8],bx
-	mov	[org_start],edi
+	mov	[ds:ebp+18h],edi
 	bt	[format_flags],8
 	jnc	dll_flag_ok
 	or	byte [edx+16h+1],20h
       dll_flag_ok:
 	bt	[format_flags],9
 	jnc	wdm_flag_ok
       nx_ok:
 	jmp	format_defined
 pe_section:
 	call	close_pe_section
-	bts	[format_flags],5
+	push	eax ebx
+	call	create_addressing_space
+	mov	ebp,ebx
+	pop	ebx eax
+	bts	[format_flags],5
 	lea	ecx,[ebx+28h]
 	add	edx,[edx+54h]
 	sub	edx,[stub_size]
 	cmp	ecx,edx
 	jbe	new_section
 	mov	[ebx+14h],edi
 	mov	edx,[code_start]
 	mov	eax,edi
 	xor	ecx,ecx
-	mov	[org_origin_sign],0
+	sub	eax,[ebx+0Ch]
-	sub	eax,[ebx+0Ch]
 	sbb	ecx,0
-	sbb	[org_origin_sign],0
+	sbb	byte [ds:ebp+8],0
-	mov	[labels_type],2
+	mov	byte [ds:ebp+9],2
 	mov	[code_type],32
 	test	[format_flags],8
 	jz	pe_section_code_type_ok
-	mov	[labels_type],4
+	mov	byte [ds:ebp+9],4
 	mov	[code_type],64
       pe_section_code_type_ok:
 	test	[format_flags],4
 	jnz	peplus_section_org
 	sub	eax,[edx+34h]
 	sbb	ecx,0
-	sbb	[org_origin_sign],0
+	sbb	byte [ds:ebp+8],0
 	bt	[resolver_flags],0
 	jc	pe_section_org_ok
-	mov	[labels_type],0
+	mov	byte [ds:ebp+9],0
 	jmp	pe_section_org_ok
       peplus_section_org:
 	sub	eax,[edx+30h]
 	sbb	ecx,[edx+34h]
-	sbb	[org_origin_sign],0
+	sbb	byte [ds:ebp+8],0
 	bt	[resolver_flags],0
 	jc	pe_section_org_ok
-	mov	[labels_type],0
+	mov	byte [ds:ebp+9],0
       pe_section_org_ok:
-	mov	dword [org_origin],eax
+	mov	[ds:ebp],eax
-	mov	dword [org_origin+4],ecx
+	mov	[ds:ebp+4],ecx
-	and	[org_registers],0
+	mov	[ds:ebp+18h],edi
-	mov	[org_start],edi
       get_section_flags:
 	lods	byte [esi]
 	cmp	al,1Ah
 	je	set_directory
 	cmp	al,19h
 	je	section_flag
 	mov	[ecx+7Ch],edx
 	cmp	edx,[ecx+74h]
 	ja	value_out_of_range
 	jb	instruction_assembled
-	cmp	eax,[edx+70h]
+	cmp	eax,[ecx+70h]
 	ja	value_out_of_range
 	jmp	instruction_assembled
 mark_pe_relocation:
 	push	eax ebx
 	test	[format_flags],4
 	jz	check_standard_pe_relocation_type
 	jne	reserve_space_for_resource
 	and	[resource_size],0
       reserve_space_for_resource:
 	add	edi,[resource_size]
-	cmp	edi,[display_buffer]
+	cmp	edi,[tagged_blocks]
 	ja	out_of_memory
 	jmp	resource_done
       resource_from_file:
 	push	esi
 	mov	esi,edx
 	call	open_binary_file
 	xor	eax,eax
 	mov	[esi],eax
 	mov	[resource_data],edi
 	lea	eax,[edi+16]
-	cmp	eax,[display_buffer]
+	cmp	eax,[tagged_blocks]
 	jae	out_of_memory
 	xor	eax,eax
 	stos	dword [edi]
 	call	make_timestamp
 	stos	dword [edi]
 	xor	eax,eax
       make_type_name_entry:
 	mov	eax,[resource_data]
 	inc	word [eax+12]
 	lea	eax,[edi+8]
-	cmp	eax,[display_buffer]
+	cmp	eax,[tagged_blocks]
 	jae	out_of_memory
 	mov	eax,ebx
 	stos	dword [edi]
 	xor	eax,eax
 	stos	dword [edi]
 	jmp	make_type_name_directory
       make_type_id_entry:
 	mov	eax,[resource_data]
 	inc	word [eax+14]
 	lea	eax,[edi+8]
-	cmp	eax,[display_buffer]
+	cmp	eax,[tagged_blocks]
 	jae	out_of_memory
 	mov	eax,ebx
 	stos	dword [edi]
 	xor	eax,eax
 	stos	dword [edi]
 	jmp	make_type_id_directory
 	sub	edx,[resource_data]
 	bts	edx,31
 	mov	[esi+4],edx
 	lea	eax,[edi+16]
-	cmp	eax,[display_buffer]
+	cmp	eax,[tagged_blocks]
 	jae	out_of_memory
 	xor	eax,eax
 	stos	dword [edi]
 	call	make_timestamp
 	stos	dword [edi]
 	xor	eax,eax
       make_resource_name_entry:
 	mov	eax,[esp]
 	inc	word [eax+12]
 	lea	eax,[edi+8]
-	cmp	eax,[display_buffer]
+	cmp	eax,[tagged_blocks]
 	jae	out_of_memory
 	mov	eax,ebx
 	stos	dword [edi]
 	xor	eax,eax
 	stos	dword [edi]
 	jmp	make_resource_name_directory
       make_resource_id_entry:
 	mov	eax,[esp]
 	inc	word [eax+14]
 	lea	eax,[edi+8]
-	cmp	eax,[display_buffer]
+	cmp	eax,[tagged_blocks]
 	jae	out_of_memory
 	mov	eax,ebx
 	stos	dword [edi]
 	xor	eax,eax
 	stos	dword [edi]
 	jmp	make_resource_id_directory
 	sub	edx,[resource_data]
 	bts	edx,31
 	mov	[esi+4],edx
 	lea	eax,[edi+16]
-	cmp	eax,[display_buffer]
+	cmp	eax,[tagged_blocks]
 	jae	out_of_memory
 	xor	eax,eax
 	stos	dword [edi]
 	call	make_timestamp
 	stos	dword [edi]
 	xor	eax,eax
       make_language_id_entry:
 	mov	eax,[esp]
 	inc	word [eax+14]
 	lea	eax,[edi+8]
-	cmp	eax,[display_buffer]
+	cmp	eax,[tagged_blocks]
 	jae	out_of_memory
 	mov	eax,ebx
 	stos	dword [edi]
 	mov	eax,dword [value]
 	stos	dword [edi]
 	jmp	make_language_id_directory
 	xor	ax,ax
 	stos	word [edi]
       copy_string_data:
 	lea	eax,[edi+2]
-	cmp	eax,[display_buffer]
+	cmp	eax,[tagged_blocks]
 	jae	out_of_memory
 	mov	ax,[edx]
 	or	ax,ax
 	jz	string_data_copied
 	stos	word [edi]
 	inc	word [ebx]
 	mov	esi,edi
 	sub	esi,[resource_data]
 	xchg	esi,[ebx+4]
 	lea	eax,[edi+16]
-	cmp	eax,[display_buffer]
+	cmp	eax,[tagged_blocks]
 	jae	out_of_memory
 	mov	eax,esi
 	stos	dword [edi]
 	mov	eax,[esi+12]
 	stos	dword [edi]
 	xor	eax,eax
 	call	lseek
 	mov	edx,edi
 	mov	ecx,[esi+4]
 	add	edi,ecx
-	cmp	edi,[display_buffer]
+	cmp	edi,[tagged_blocks]
 	ja	out_of_memory
 	call	read
 	mov	eax,edi
 	sub	eax,[resource_data]
 	and	eax,11b
 	jz	resource_data_alignment_ok
 	mov	dword [ebx+14h],eax
 	mov	[current_section],ebx
 	xor	eax,eax
 	mov	[number_of_sections],eax
-	call	setup_coff_section_org
+	mov	edx,ebx
+	call	init_addressing_space
-	mov	[code_type],32
+	mov	[ebx+14h],edx
+	mov	byte [ebx+9],2
+	mov	[code_type],32
 	test	[format_flags],8
 	jz	format_defined
-	mov	[code_type],64
+	mov	byte [ebx+9],4
+	mov	[code_type],64
 	jmp	format_defined
-      setup_coff_section_org:
+coff_section:
-	xor	eax,eax
-	mov	dword [org_origin],edi
-	mov	dword [org_origin+4],eax
-	mov	[org_origin_sign],al
-	mov	[org_registers],eax
-	mov	[org_start],edi
-	mov	[org_symbol],ebx
-	test	[format_flags],8
-	jnz	coff_64bit_labels
-	mov	[labels_type],2
-	ret
-      coff_64bit_labels:
-	mov	[labels_type],4
-	ret
-coff_section:
 	call	close_coff_section
 	mov	ebx,[free_additional_memory]
 	lea	eax,[ebx+20h]
 	cmp	eax,[structures_buffer]
 	jae	out_of_memory
 	mov	[ebx],al
 	mov	[ebx+8],edi
 	mov	[ebx+10h],eax
 	mov	[ebx+14h],eax
-	call	setup_coff_section_org
+	mov	edx,ebx
+	call	create_addressing_space
-	lods	word [esi]
+	xchg	edx,ebx
+	mov	[edx+14h],ebx
+	mov	byte [edx+9],2
+	test	[format_flags],8
+	jz	coff_labels_type_ok
+	mov	byte [edx+9],4
+      coff_labels_type_ok:
+	lods	word [esi]
 	cmp	ax,'('
 	jne	invalid_argument
 	mov	[ebx+4],esi
 	mov	ecx,[esi]
 	lea	esi,[esi+4+ecx+1]
 	push	ebx eax
 	test	[format_flags],8
 	jnz	coff_64bit_relocation
 	mov	al,6
-	cmp	[value_type],5
+	cmp	[value_type],2
+	je	coff_relocation
+	cmp	[value_type],5
-	jne	coff_relocation
+	jne	invalid_use_of_symbol
 	inc	al
 	jmp	coff_relocation
       coff_64bit_relocation:
 	mov	al,1
 	cmp	[value_type],4
 	je	coff_relocation
 	mov	al,2
-	cmp	[value_type],5
+	cmp	[value_type],2
+	je	coff_relocation
+	cmp	[value_type],5
-	jne	coff_relocation
+	jne	invalid_use_of_symbol
 	inc	al
 	jmp	coff_relocation
       coff_relocation_relative:
 	push	ebx
 	bt	[format_flags],0
 	jnc	relative_ok
 	sub	ebx,edi
 	sub	eax,ebx
 	add	eax,4
       relative_ok:
-	push	eax
+	mov	ebx,[addressing_space]
+	push	eax
 	mov	al,20
 	test	[format_flags],8
 	jnz	relative_coff_64bit_relocation
-	cmp	[labels_type],2
+	cmp	byte [ebx+9],2
 	jne	invalid_use_of_symbol
 	jmp	coff_relocation
       relative_coff_64bit_relocation:
 	mov	al,4
-	cmp	[labels_type],4
+	cmp	byte [ebx+9],4
 	jne	invalid_use_of_symbol
       coff_relocation:
 	mov	ebx,[free_additional_memory]
 	add	ebx,0Ch
 	cmp	ebx,[structures_buffer]
 	jae	out_of_memory
 	add	esi,10h
 	jmp	find_relocations
       add_relocation:
 	lea	eax,[ebx+0Ah]
-	cmp	eax,[display_buffer]
+	cmp	eax,[tagged_blocks]
 	ja	out_of_memory
 	mov	eax,[esi+4]
 	mov	[ebx],eax
 	mov	eax,[esi+8]
 	mov	eax,[eax]
 	shr	eax,8
 	jnz	format_elf64
 	mov	edx,edi
 	mov	ecx,34h shr 2
 	lea	eax,[edi+ecx*4]
-	cmp	eax,[display_buffer]
+	cmp	eax,[tagged_blocks]
 	jae	out_of_memory
 	xor	eax,eax
 	rep	stos dword [edi]
 	mov	dword [edx],7Fh + 'ELF' shl 8
 	mov	al,1
 	mov	[edx+4],al
 	mov	al,111b
 	mov	[ebx+14h],eax
 	mov	al,4
 	mov	[ebx+10h],eax
-	call	setup_coff_section_org
+	mov	edx,ebx
+	call	init_addressing_space
-	test	[format_flags],8
+	xchg	edx,ebx
+	mov	[edx+14h],ebx
+	mov	byte [edx+9],2
+	test	[format_flags],8
 	jz	format_defined
-	mov	byte [ebx+10h],8
+	mov	byte [edx+9],4
+	mov	byte [ebx+10h],8
 	jmp	format_defined
       format_elf64:
 	mov	edx,edi
 	mov	ecx,40h shr 2
 	lea	eax,[edi+ecx*4]
-	cmp	eax,[display_buffer]
+	cmp	eax,[tagged_blocks]
 	jae	out_of_memory
 	xor	eax,eax
 	rep	stos dword [edi]
 	mov	dword [edx],7Fh + 'ELF' shl 8
 	mov	al,1
 	mov	[edx+5],al
 	mov	[ebx+8],edi
 	mov	[ebx+10h],eax
 	mov	al,10b
 	mov	[ebx+14h],eax
-	call	setup_coff_section_org
+	mov	edx,ebx
+	call	create_addressing_space
-	lods	word [esi]
+	xchg	edx,ebx
+	mov	[edx+14h],ebx
+	mov	byte [edx+9],2
+	test	[format_flags],8
+	jz	elf_labels_type_ok
+	mov	byte [edx+9],4
+      elf_labels_type_ok:
+	lods	word [esi]
 	cmp	ax,'('
 	jne	invalid_argument
 	mov	[ebx+4],esi
 	mov	ecx,[esi]
 	lea	esi,[esi+4+ecx+1]
 	jz	instruction_assembled
 	mov	byte [ebx+10h],8
 	jmp	instruction_assembled
 mark_elf_relocation:
-	cmp	[value_type],3
+	push	ebx
+	mov	ebx,[addressing_space]
+	cmp	[value_type],3
 	je	elf_relocation_relative
 	cmp	[value_type],7
 	je	elf_relocation_relative
-	push	ebx eax
+	push	eax
 	cmp	[value_type],5
 	je	elf_gotoff_relocation
 	ja	invalid_use_of_symbol
 	mov	al,1			; R_386_32 / R_AMD64_64
 	test	[format_flags],8
 	jz	coff_relocation
 	jnz	invalid_use_of_symbol
 	mov	al,9			; R_386_GOTOFF
 	jmp	coff_relocation
       elf_relocation_relative:
-	cmp	[labels_type],0
+	cmp	byte [ebx+9],0
 	je	invalid_use_of_symbol
-	push	ebx
+	mov	ebx,[current_section]
-	mov	ebx,[current_section]
 	mov	ebx,[ebx+8]
 	sub	ebx,edi
 	sub	eax,ebx
 	push	eax
 	mov	al,2			; R_386_PC32 / R_AMD64_PC32
 	adc	cl,0
 	add	eax,edi
 	adc	ebp,0
 	adc	cl,0
-	mov	dword [org_origin],eax
+      elf_exe_addressing_setup:
-	mov	dword [org_origin+4],edx
+	push	eax
+	call	init_addressing_space
-	mov	[org_origin_sign],cl
+	pop	eax
+	mov	[ebx],eax
-	and	[org_registers],0
+	mov	[ebx+4],edx
-	mov	[org_start],edi
+	mov	[ebx+8],cl
 	mov	[symbols_stream],edi
 	jmp	format_defined
       format_elf64_exe:
 	add	esi,2
 	or	[format_flags],1
 	cmp	byte [esi],'('
 	adc	cl,0
 	add	eax,edi
 	adc	edx,0
 	adc	cl,0
-	mov	dword [org_origin],eax
+	jmp	elf_exe_addressing_setup
-	mov	dword [org_origin+4],edx
-	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,'('
 	jne	invalid_argument
 	cmp	byte [esi],'.'
 	je	invalid_value
 	test	[format_flags],8
 	jnz	elf64_segment
 	call	close_elf_segment
 	push	eax
-	mov	ebx,[number_of_sections]
+	call	create_addressing_space
+	mov	ebp,ebx
+	mov	ebx,[number_of_sections]
 	shl	ebx,5
 	add	ebx,[code_start]
 	add	ebx,34h
 	cmp	ebx,[symbols_stream]
 	jb	new_elf_segment
 	adc	cl,0
 	add	eax,edi
 	adc	edx,0
 	adc	cl,0
-	mov	dword [org_origin],eax
+      elf_segment_addressing_setup:
-	mov	dword [org_origin+4],edx
+	mov	[ds:ebp],eax
-	mov	[org_origin_sign],cl
+	mov	[ds:ebp+4],edx
-	and	[org_registers],0
+	mov	[ds:ebp+8],cl
-	mov	[org_start],edi
 	inc	[number_of_sections]
 	jmp	instruction_assembled
       close_elf_segment:
 	cmp	[number_of_sections],0
 	jne	finish_elf_segment
 	cmp	edi,[symbols_stream]
 	ret
       elf64_segment:
 	call	close_elf64_segment
 	push	eax edx
-	mov	ebx,[number_of_sections]
+	call	create_addressing_space
+	mov	ebp,ebx
+	mov	ebx,[number_of_sections]
 	imul	ebx,38h
 	add	ebx,[code_start]
 	add	ebx,40h
 	cmp	ebx,[symbols_stream]
 	jb	new_elf64_segment
 	adc	cl,0
 	add	eax,edi
 	adc	edx,0
 	adc	cl,0
-	mov	dword [org_origin],eax
+	jmp	elf_segment_addressing_setup
-	mov	dword [org_origin+4],edx
-	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
 	cmp	edi,[symbols_stream]
 	jne	first_elf64_segment_ok
 	push	edi

Subversion Repositories Kolibri OS

(root)/programs/develop/fasm/trunk/formats.inc – Rev 2665 → 4039