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

 	ja	invalid_operand_size
 	cmp	al,'('
 	jne	invalid_operand
 	call	get_byte_value
-	cmp	[next_pass_needed],0
+	test	eax,eax
-	jne	int_imm_ok
-	test	eax,eax
-	js	value_out_of_range
+	jns	int_imm_ok
+	call	recoverable_overflow
       int_imm_ok:
 	mov	ah,al
 	mov	al,0CDh
 	stos	word [edi]
 	jmp	instruction_assembled
 aa_instruction:
 	cmp	[value_type],4
 	jae	long_immediate_not_encodable
 	jmp	basic_mem_imm_32bit_ok
       basic_mem_imm_nosize:
-	cmp	[error_line],0
+	call	recoverable_unknown_size
-	jne	basic_mem_imm_8bit
-	mov	eax,[current_line]
-	mov	[error_line],eax
-	mov	[error],operand_size_not_specified
       basic_mem_imm_8bit:
 	call	get_byte_value
 	mov	byte [value],al
 	mov	al,[base_code]
 	shr	al,3
 	mov	[postbyte_register],al
       basic_eax_imm:
 	add	[base_code],5
 	call	store_instruction_code
 	jmp	basic_store_imm_32bit
-single_operand_instruction:
+      recoverable_unknown_size:
+	cmp	[error_line],0
+	jne	ignore_unknown_size
+	push	[current_line]
+	pop	[error_line]
+	mov	[error],operand_size_not_specified
+      ignore_unknown_size:
+	ret
+single_operand_instruction:
 	mov	[base_code],0F6h
 	mov	[postbyte_register],al
 	lods	byte [esi]
 	call	get_size_operator
 	cmp	al,10h
 	call	operand_autodetect
 	inc	[base_code]
 	jmp	instruction_ready
       single_mem_nosize:
-	cmp	[error_line],0
+	call	recoverable_unknown_size
-	jne	single_mem_8bit
-	mov	eax,[current_line]
-	mov	[error_line],eax
-	mov	[error],operand_size_not_specified
       single_mem_8bit:
 	jmp	instruction_ready
       single_reg:
 	lods	byte [esi]
 	call	convert_register
 	mov	bl,al
 	pop	ecx ebx edx
 	call	store_instruction_with_imm16
 	jmp	instruction_assembled
       mov_mem_imm_nosize:
-	cmp	[error_line],0
+	call	recoverable_unknown_size
-	jne	mov_mem_imm_32bit
-	mov	eax,[current_line]
-	mov	[error_line],eax
-	mov	[error],operand_size_not_specified
       mov_mem_imm_32bit:
 	call	operand_32bit
 	call	get_dword_value
       mov_mem_imm_32bit_store:
 	mov	dword [value],eax
 	mov	[postbyte_register],0
       mov_xrx_64bit:
 	cmp	ah,8
 	je	mov_xrx_store
 	jmp	invalid_operand_size
-cmov_instruction:
+test_instruction:
-	mov	[base_code],0Fh
-	mov	[extended_code],al
-	lods	byte [esi]
-	call	get_size_operator
-	cmp	al,10h
-	jne	invalid_operand
-	lods	byte [esi]
-	call	convert_register
-	mov	[postbyte_register],al
-	lods	byte [esi]
-	cmp	al,','
-	jne	invalid_operand
-	lods	byte [esi]
-	call	get_size_operator
-	cmp	al,'['
-	je	cmov_reg_mem
-	cmp	al,10h
-	jne	invalid_operand
-      cmov_reg_reg:
-	lods	byte [esi]
-	call	convert_register
-	mov	bl,al
-	mov	al,ah
-	call	operand_autodetect
-	jmp	nomem_instruction_ready
-      cmov_reg_mem:
-	call	get_address
-	mov	al,[operand_size]
-	call	operand_autodetect
-	jmp	instruction_ready
-test_instruction:
 	mov	[base_code],84h
 	lods	byte [esi]
 	call	get_size_operator
 	cmp	al,10h
 	je	test_reg
 	pop	ecx ebx edx
 	call	store_instruction_with_imm16
 	jmp	instruction_assembled
       test_mem_imm_nosize:
-	cmp	[error_line],0
+	call	recoverable_unknown_size
-	jne	test_mem_imm_32bit
-	mov	eax,[current_line]
-	mov	[error_line],eax
-	mov	[error],operand_size_not_specified
       test_mem_imm_32bit:
 	call	operand_32bit
 	call	get_dword_value
       test_mem_imm_32bit_store:
 	mov	dword [value],eax
 	mov	[postbyte_register],0
 	cmp	ah,4
 	je	push_mem_32bit
 	cmp	ah,8
 	je	push_mem_64bit
-	cmp	[error_line],0
+	call	recoverable_unknown_size
-	jne	push_mem_store
-	mov	eax,[current_line]
-	mov	[error_line],eax
-	mov	[error],operand_size_not_specified
 	jmp	push_mem_store
       push_mem_16bit:
 	test	ah,not 2
 	jnz	invalid_operand_size
 	call	operand_16bit
 	jmp	push_mem_store
 	cmp	ah,4
 	je	pop_mem_32bit
 	cmp	ah,8
 	je	pop_mem_64bit
-	cmp	[error_line],0
+	call	recoverable_unknown_size
-	jne	pop_mem_store
-	mov	eax,[current_line]
-	mov	[error_line],eax
-	mov	[error],operand_size_not_specified
 	jmp	pop_mem_store
       pop_mem_16bit:
 	test	ah,not 2
 	jnz	invalid_operand_size
 	call	operand_16bit
 	jmp	pop_mem_store
 	xchg	al,[base_code]
 	mov	[postbyte_register],al
 	jmp	instruction_ready
       inc_mem_nosize:
-	cmp	[error_line],0
+	call	recoverable_unknown_size
-	jne	inc_mem_8bit
-	mov	eax,[current_line]
-	mov	[error_line],eax
-	mov	[error],operand_size_not_specified
       inc_mem_8bit:
 	mov	al,0FEh
 	xchg	al,[base_code]
 	mov	[postbyte_register],al
 	jmp	instruction_ready
       inc_reg:
 	call	operand_autodetect
 	mov	[base_code],0D3h
 	jmp	instruction_ready
       sh_mem_cl_nosize:
-	cmp	[error_line],0
+	call	recoverable_unknown_size
-	jne	sh_mem_cl_8bit
-	mov	eax,[current_line]
-	mov	[error_line],eax
-	mov	[error],operand_size_not_specified
       sh_mem_cl_8bit:
 	mov	[base_code],0D2h
 	jmp	instruction_ready
       sh_mem_imm:
 	mov	al,[operand_size]
 	or	al,al
       sh_mem_1:
 	mov	[base_code],0D1h
 	jmp	instruction_ready
       sh_mem_imm_nosize:
-	cmp	[error_line],0
+	call	recoverable_unknown_size
-	jne	sh_mem_imm_8bit
-	mov	eax,[current_line]
-	mov	[error_line],eax
-	mov	[error],operand_size_not_specified
       sh_mem_imm_8bit:
 	cmp	byte [value],1
 	je	sh_mem_1_8bit
 	mov	[base_code],0C0h
 	call	store_instruction_with_imm8
 	jmp	instruction_assembled
       movx_mem_store:
 	call	operand_autodetect
 	jmp	instruction_ready
       movx_unknown_size:
-	cmp	[error_line],0
+	call	recoverable_unknown_size
-	jne	movx_mem_store
-	mov	eax,[current_line]
-	mov	[error_line],eax
-	mov	[error],operand_size_not_specified
 	jmp	movx_mem_store
       movx_reg:
 	lods	byte [esi]
 	call	convert_register
 	pop	ebx
 	xchg	bl,al
 	mov	[extended_code],0BAh
 	call	store_instruction_with_imm8
 	jmp	instruction_assembled
       bt_mem_imm_nosize:
-	cmp	[error_line],0
+	call	recoverable_unknown_size
-	jne	bt_mem_imm_store
-	mov	eax,[current_line]
-	mov	[error_line],eax
-	mov	[error],operand_size_not_specified
 	jmp	bt_mem_imm_store
       bt_reg:
 	lods	byte [esi]
 	call	convert_register
 	mov	bl,al
 	lods	byte [esi]
 	jmp	instruction_assembled
 bs_instruction:
 	mov	[extended_code],al
 	mov	[base_code],0Fh
-	lods	byte [esi]
+	call	get_reg_mem
+	jc	bs_reg_reg
+	mov	al,[operand_size]
+	call	operand_autodetect
+	jmp	instruction_ready
+      bs_reg_reg:
+	mov	al,ah
+	call	operand_autodetect
+	jmp	nomem_instruction_ready
+      get_reg_mem:
+	lods	byte [esi]
 	call	get_size_operator
 	cmp	al,10h
 	jne	invalid_operand
 	lods	byte [esi]
 	call	convert_register
 	jne	invalid_operand
 	lods	byte [esi]
 	call	get_size_operator
 	cmp	al,10h
-	je	bs_reg_reg
+	je	get_reg_reg
 	cmp	al,'['
 	jne	invalid_argument
 	call	get_address
-	mov	al,[operand_size]
+	clc
-	call	operand_autodetect
-	jmp	instruction_ready
+	ret
-      bs_reg_reg:
+      get_reg_reg:
 	lods	byte [esi]
 	call	convert_register
 	mov	bl,al
-	mov	al,ah
+	stc
-	call	operand_autodetect
+	ret
-	jmp	nomem_instruction_ready
-imul_instruction:
+imul_instruction:
 	mov	[base_code],0F6h
 	mov	[postbyte_register],5
 	lods	byte [esi]
 	call	get_size_operator
 	cmp	al,10h
 	call	operand_autodetect
 	inc	[base_code]
 	jmp	instruction_ready
       imul_mem_nosize:
-	cmp	[error_line],0
+	call	recoverable_unknown_size
-	jne	imul_mem_8bit
-	mov	eax,[current_line]
-	mov	[error_line],eax
-	mov	[error],operand_size_not_specified
       imul_mem_8bit:
 	jmp	instruction_ready
       imul_reg:
 	lods	byte [esi]
 	call	convert_register
 	cmp	byte [esi],','
 	cmp	[jump_type],3
 	je	jmp_mem_far
 	cmp	[jump_type],2
 	je	jmp_mem_near
-	cmp	[error_line],0
+	call	recoverable_unknown_size
-	jne	jmp_mem_near
-	mov	eax,[current_line]
-	mov	[error_line],eax
-	mov	[error],operand_size_not_specified
       jmp_mem_near:
 	cmp	[code_type],16
 	je	jmp_mem_16bit
 	cmp	[code_type],32
 	je	jmp_mem_near_32bit
       jmp_mem_64bit:
 	jc	jmp_short
       jmp_imm_32bit_store:
 	mov	edx,eax
 	sub	edx,3
-	mov	al,[base_code]
+	jno	jmp_imm_32bit_ok
+	cmp	[code_type],64
+	je	relative_jump_out_of_range
+      jmp_imm_32bit_ok:
+	mov	al,[base_code]
 	stos	byte [edi]
 	mov	eax,edx
 	call	mark_relocation
 	stos	dword [edi]
 	jmp	instruction_assembled
 	call	calculate_jump_offset
 	mov	ecx,edx
 	cdq
 	cmp	edx,ecx
-	jne	value_out_of_range
+	jne	relative_jump_out_of_range
 	call	check_for_short_jump
 	jnc	jmp_imm_32bit_store
       jmp_short:
 	mov	ah,al
 	mov	al,0EBh
 	stos	word [edi]
 	call	calculate_jump_offset
 	mov	ecx,edx
 	cdq
 	cmp	edx,ecx
-	jne	value_out_of_range
+	jne	relative_jump_out_of_range
 	call	check_for_short_jump
 	jnc	conditional_jump_32bit_store
       conditional_jump_short:
 	mov	ah,al
 	mov	al,[base_code]
 	stos	word [edi]
 	call	calculate_jump_offset
 	mov	ecx,edx
 	cdq
 	cmp	edx,ecx
-	jne	value_out_of_range
+	jne	relative_jump_out_of_range
 	jmp	make_loop_jump
       loop_jump_16bit:
 	call	get_address_word_value
 	cmp	[code_type],16
 	je	loop_jump_16bit_prefix_ok
 	mov	byte [edi],66h
 	cmp	bl,8
 	je	simple_instruction_64bit
 	or	bl,bl
 	jnz	invalid_operand_size
-	cmp	[error_line],0
+	call	recoverable_unknown_size
-	jne	simple_instruction
-	mov	ebx,[current_line]
-	mov	[error_line],ebx
-	mov	[error],operand_size_not_specified
 	jmp	simple_instruction
 lods_instruction:
 	lods	byte [esi]
 	call	get_size_operator
 	cmp	al,'['
 	jne	invalid_operand
 	cmp	al,8
 	je	basic_fpu_mem_64bit
 	or	al,al
 	jnz	invalid_operand_size
-	cmp	[error_line],0
+	call	recoverable_unknown_size
-	jne	basic_fpu_mem_32bit
-	mov	eax,[current_line]
-	mov	[error_line],eax
-	mov	[error],operand_size_not_specified
       basic_fpu_mem_32bit:
 	jmp	instruction_ready
       basic_fpu_mem_64bit:
 	mov	[base_code],0DCh
 	jmp	instruction_ready
       basic_fpu_streg:
 	cmp	al,4
 	je	fi_mem_32bit
 	or	al,al
 	jnz	invalid_operand_size
-	cmp	[error_line],0
+	call	recoverable_unknown_size
-	jne	fi_mem_32bit
-	mov	eax,[current_line]
-	mov	[error_line],eax
-	mov	[error],operand_size_not_specified
       fi_mem_32bit:
 	mov	[base_code],0DAh
 	jmp	instruction_ready
       fi_mem_16bit:
 	mov	[base_code],0DEh
 	jmp	instruction_ready
 	cmp	al,10
 	je	fld_mem_80bit
 	or	al,al
 	jnz	invalid_operand_size
-	cmp	[error_line],0
+	call	recoverable_unknown_size
-	jne	fld_mem_32bit
-	mov	eax,[current_line]
-	mov	[error_line],eax
-	mov	[error],operand_size_not_specified
       fld_mem_32bit:
 	mov	[base_code],0D9h
 	jmp	instruction_ready
       fld_mem_64bit:
 	mov	[base_code],0DDh
 	jmp	instruction_ready
 	cmp	al,8
 	je	fild_mem_64bit
 	or	al,al
 	jnz	invalid_operand_size
-	cmp	[error_line],0
+	call	recoverable_unknown_size
-	jne	fild_mem_32bit
-	mov	eax,[current_line]
-	mov	[error_line],eax
-	mov	[error],operand_size_not_specified
       fild_mem_32bit:
 	mov	[base_code],0DBh
 	jmp	instruction_ready
       fild_mem_16bit:
 	mov	[base_code],0DFh
 	jmp	instruction_ready
 	cmp	al,'['
 	jne	invalid_operand
 	call	get_address
 	cmp	[operand_size],0
-	je	mmx_imm8
+	je	instruction_ready
 	mov	al,[mmx_size]
 	cmp	al,[operand_size]
 	jne	invalid_operand_size
 	jmp	instruction_ready
       pmovsx_xmmreg_reg:
 	lods	byte [esi]
 movntdqa_instruction:
 	mov	[opcode_prefix],66h
 	mov	[base_code],0Fh
 	mov	[extended_code],38h
-	mov	[supplemental_code],2Ah
+	mov	[supplemental_code],al
 	lods	byte [esi]
 	call	get_size_operator
 	cmp	al,10h
 	jne	invalid_operand
 	lods	byte [esi]
 	call	convert_xmm_register
 	call	operand_autodetect
       crc32_reg32_mem_store:
 	jmp	instruction_ready
       crc32_unknown_size:
-	cmp	[error_line],0
+	call	recoverable_unknown_size
-	jne	crc32_reg32_mem_store
-	mov	eax,[current_line]
+	jmp	crc32_reg32_mem_store
-	mov	[error_line],eax
-	mov	[error],operand_size_not_specified
-	jmp	crc32_reg32_mem_store
       crc32_reg32_reg:
 	lods	byte [esi]
 	call	convert_register
 	mov	bl,al
 	mov	al,ah
 	mov	al,ah
 	call	operand_autodetect
 	jmp	nomem_instruction_ready
 rdfsbase_instruction:
-	mov	[opcode_prefix],0F3h
+	cmp	[code_type],64
+	jne	illegal_instruction
+	mov	[opcode_prefix],0F3h
 	mov	[base_code],0Fh
 	mov	[extended_code],0AEh
 	mov	[postbyte_register],al
 	lods	byte [esi]
 	call	get_size_operator
 	je	invalid_operand_size
 	call	operand_autodetect
 	jmp	nomem_instruction_ready
+xabort_instruction:
+	lods	byte [esi]
+	call	get_size_operator
+	cmp	ah,1
+	ja	invalid_operand_size
+	cmp	al,'('
+	jne	invalid_operand
+	call	get_byte_value
+	mov	dl,al
+	mov	ax,0F8C6h
+	stos	word [edi]
+	mov	al,dl
+	stos	byte [edi]
+	jmp	instruction_assembled
+xbegin_instruction:
+	lods	byte [esi]
+	cmp	al,'('
+	jne	invalid_operand
+	mov	al,[code_type]
+	cmp	al,64
+	je	xbegin_64bit
+	cmp	al,32
+	je	xbegin_32bit
+      xbegin_16bit:
+	call	get_address_word_value
+	add	edi,4
+	call	calculate_relative_offset
+	sub	edi,4
+	shl	eax,16
+	mov	ax,0F8C7h
+	stos	dword [edi]
+	jmp	instruction_assembled
+      xbegin_32bit:
+	call	get_address_dword_value
+	jmp	xbegin_address_ok
+      xbegin_64bit:
+	call	get_address_qword_value
+      xbegin_address_ok:
+	add	edi,5
+	call	calculate_relative_offset
+	sub	edi,5
+	mov	edx,eax
+	cwde
+	cmp	eax,edx
+	jne	xbegin_rel32
+	mov	al,66h
+	stos	byte [edi]
+	mov	eax,edx
+	shl	eax,16
+	mov	ax,0F8C7h
+	stos	dword [edi]
+	jmp	instruction_assembled
+      xbegin_rel32:
+	sub	edx,1
+	jno	xbegin_rel32_ok
+	cmp	[code_type],64
+	je	relative_jump_out_of_range
+      xbegin_rel32_ok:
+	mov	ax,0F8C7h
+	stos	word [edi]
+	mov	eax,edx
+	stos	dword [edi]
+	jmp	instruction_assembled
 convert_register:
 	mov	ah,al
 	shr	ah,4
 	and	al,0Fh
 	cmp	ah,8
 	mov	[address_high],edx
 	cdq
 	cmp	edx,[address_high]
 	je	address_high_ok
-	cmp	[error_line],0
+	call	recoverable_overflow
-	jne	address_high_ok
-	mov	ebx,[current_line]
-	mov	[error_line],ebx
-	mov	[error],value_out_of_range
       address_high_ok:
 	mov	edx,eax
 	ror	ecx,16
 	mov	cl,[value_type]
 	rol	ecx,16
 	mov	bx,0FF00h
 	jz	rex_prefix_ok
 	cmp	[code_type],64
 	jne	invalid_operand
 	test	al,0B0h
-	jnz	prefix_conflict
+	jnz	disallowed_combination_of_registers
 	stos	byte [edi]
       rex_prefix_ok:
 	mov	al,[base_code]
 	stos	byte [edi]
 	cmp	al,0Fh
 	jne	instruction_code_ok
 	jnz	address_value_ok
 	test	bx,8080h
 	jz	address_value_ok
       address_value_out_of_range:
-	cmp	[error_line],0
+	call	recoverable_overflow
-	jne	address_value_ok
-	mov	edx,[current_line]
-	mov	[error_line],edx
-	mov	[error],value_out_of_range
       address_value_ok:
 	call	store_segment_prefix_if_necessary
-	or	bx,bx
+	test	[vex_required],4
+	jnz	address_vsib
+	or	bx,bx
 	jz	address_immediate
 	cmp	bx,0F800h
 	je	address_rip_based
 	cmp	bx,0F400h
 	je	address_eip_based
 	shl	cl,3
 	or	al,cl
 	stos	byte [edi]
 	ret
-      postbyte_32bit:
+      address_vsib:
+	mov	al,bl
+	shr	al,4
+	cmp	al,0Ch
+	je	vector_index_ok
+	cmp	al,0Dh
+	jne	invalid_address
+      vector_index_ok:
+	mov	al,bh
+	shr	al,4
+	cmp	al,4
+	je	postbyte_32bit
+	cmp	[code_type],64
+	je	address_prefix_ok
+	test	al,al
+	jnz	invalid_address
+      postbyte_32bit:
 	call	address_32bit_prefix
 	jmp	address_prefix_ok
       postbyte_64bit:
 	cmp	[code_type],64
 	jne	invalid_address_size
 	shl	bl,3
 	or	ah,bl
 	and	bh,111b
 	or	ah,bh
-	test	ch,44h
+      sib_ready:
+	test	ch,44h
 	jnz	sib_address_32bit_value
 	test	ch,88h
 	jnz	sib_address_32bit_value
 	or	ch,ch
 	jnz	address_sizes_do_not_agree

Subversion Repositories Kolibri OS

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