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

 	jne	illegal_instruction
 	bt	[format_flags],0
 	jc	illegal_instruction
       public_allowed:
-	lods	byte [esi]
+	mov	[base_code],0C0h
+	lods	byte [esi]
 	cmp	al,2
-	jne	invalid_argument
+	je	public_label
+	cmp	al,1Dh
+	jne	invalid_argument
-	lods	dword [esi]
+	lods	byte [esi]
+	and	al,7
+	add	[base_code],al
+	lods	byte [esi]
+	cmp	al,2
+	jne	invalid_argument
+      public_label:
+	lods	dword [esi]
 	cmp	eax,0Fh
 	jb	invalid_use_of_symbol
 	je	reserved_word_used_as_symbol
 	mov	dx,[current_pass]
 	mov	[eax+18],dx
 	jne	invalid_argument
 	mov	[ebx+4],esi
 	lods	dword [esi]
 	lea	esi,[esi+eax+1]
-	mov	byte [ebx],80h
+	mov	al,[base_code]
+	mov	[ebx],al
 	jmp	instruction_assembled
 extrn_directive:
 	mov	al,[output_format]
 	cmp	al,4
 	je	extrn_allowed
 	cmp	al,5
 	lea	eax,[edx+0Ch]
 	cmp	eax,[structures_buffer]
 	jae	out_of_memory
 	mov	[free_additional_memory],eax
-	mov	byte [edx],81h
+	mov	byte [edx],80h
 	mov	[edx+4],ebx
 	lods	byte [esi]
 	cmp	al,86h
 	jne	invalid_argument
 	lods	byte [esi]
 	cmp	al,2
 	je	symbols_enumerated
 	mov	dl,[esi]
 	or	dl,dl
 	jz	enumerate_section
-	cmp	dl,80h
+	cmp	dl,0C0h
+	jae	enumerate_public
+	cmp	dl,80h
-	je	enumerate_public
+	jae	enumerate_extrn
-	ja	enumerate_extrn
 	add	esi,0Ch
 	jmp	enumerate_symbols
       enumerate_section:
 	mov	edx,eax
 	shl	edx,8
 	mov	[esi],edx
 	jmp	enumerate_symbols
       enumerate_public:
 	mov	edx,eax
 	shl	edx,8
-	mov	dl,80h
+	mov	dl,[esi]
 	mov	[esi],edx
 	mov	edx,[esi+8]
 	add	esi,10h
 	inc	eax
 	cmp	byte [edx+11],2
 	jne	enumerate_symbols
 	mov	edx,[edx+20]
-	cmp	byte [edx],81h
+	cmp	byte [edx],0C0h
+	jae	enumerate_symbols
+	cmp	byte [edx],80h
-	jne	enumerate_symbols
+	jb	enumerate_symbols
 	inc	eax
 	jmp	enumerate_symbols
       enumerate_extrn:
 	mov	edx,eax
 	shl	edx,8
-	mov	dl,81h
+	mov	dl,[esi]
 	mov	[esi],edx
 	add	esi,0Ch
 	inc	eax
 	jmp	enumerate_symbols
       prepare_default_section:
 	mov	ebx,[symbols_stream]
       check_reference:
 	mov	al,[ebx]
 	or	al,al
 	jz	skip_other_section
-	cmp	al,80h
+	cmp	al,0C0h
+	jae	check_public_reference
+	cmp	al,80h
-	je	check_public_reference
+	jae	next_reference
-	ja	next_reference
 	cmp	edx,[ebx+8]
 	je	default_section_ok
       next_reference:
 	add	ebx,0Ch
 	jmp	find_references_to_default_section
       check_public_reference:
 	mov	al,[esi]
 	or	al,al
 	jz	section_found
 	add	esi,0Ch
-	cmp	al,80h
+	cmp	al,0C0h
-	jne	find_section
+	jb	find_section
 	add	esi,4
 	jmp	find_section
       section_found:
 	push	esi edi
 	mov	esi,[esi+4]
 	or	esi,esi
 	or	al,al
 	jz	section_relocations_done
 	cmp	al,80h
 	jb	add_relocation
-	ja	next_relocation
+	cmp	al,0C0h
+	jb	next_relocation
 	add	esi,10h
 	jmp	find_relocations
       add_relocation:
 	lea	eax,[ebx+0Ah]
 	cmp	eax,[display_buffer]
 	ja	out_of_memory
       make_symbols_table:
 	cmp	esi,[free_additional_memory]
 	je	symbols_table_ok
 	mov	al,[esi]
-	cmp	al,80h
+	cmp	al,0C0h
+	jae	add_public_symbol
+	cmp	al,80h
-	je	add_public_symbol
+	jae	add_extrn_symbol
-	ja	add_extrn_symbol
 	or	al,al
 	jz	add_section_symbol
 	add	esi,0Ch
 	jmp	make_symbols_table
       add_section_symbol:
 	call	store_symbol_name
 	cmp	cl,4
 	jne	invalid_use_of_symbol
       public_symbol_type_ok:
 	mov	ecx,[eax+20]
-	cmp	byte [ecx],81h
+	cmp	byte [ecx],80h
 	je	alias_symbol
 	cmp	byte [ecx],0
 	jne	invalid_use_of_symbol
 	mov	cx,[ecx+1Eh]
 	mov	[ebx+0Ch],cx
       public_symbol_section_ok:
 	jnc	value_out_of_range
       store_public_symbol:
 	mov	eax,[eax]
 	mov	[ebx+8],eax
-	mov	byte [ebx+10h],2
+	mov	al,2
+	cmp	byte [esi],0C0h
+	je	store_symbol_class
+	inc	al
+	cmp	byte [esi],0C1h
+	je	store_symbol_class
+	mov	al,105
+      store_symbol_class:
+	mov	byte [ebx+10h],al
 	add	esi,10h
 	add	ebx,12h
 	jmp	make_symbols_table
       alias_symbol:
 	bt	[format_flags],0
 	jnc	invalid_use_of_symbol
       find_first_section:
 	mov	al,[esi]
 	or	al,al
 	jz	first_section_found
-	cmp	al,80h
+	cmp	al,0C0h
-	jne	skip_other_symbol
+	jb	skip_other_symbol
 	add	esi,4
       skip_other_symbol:
 	add	esi,0Ch
 	jmp	find_first_section
       first_section_found:
 	mov	ebx,esi
 	je	make_section_symbol
 	mov	al,[esi]
 	or	al,al
 	jz	make_section_symbol
-	cmp	al,80h
+	cmp	al,0C0h
+	jae	skip_public
+	cmp	al,80h
-	je	skip_public
+	jae	skip_extrn
-	ja	skip_extrn
 	or	byte [ebx+14h],40h
       skip_extrn:
 	add	esi,0Ch
 	jmp	find_next_section
       skip_public:
 	add	esi,10h
 	je	elf_symbol_table_ok
 	mov	al,[esi]
 	or	al,al
 	jz	skip_section
-	cmp	al,80h
+	cmp	al,0C0h
+	jae	make_public_symbol
+	cmp	al,80h
-	je	make_public_symbol
+	jae	make_extrn_symbol
-	ja	make_extrn_symbol
 	add	esi,0Ch
 	jmp	find_other_symbols
       skip_section:
 	add	esi,20h
 	jmp	find_other_symbols
       make_public_symbol:
 	mov	eax,[esi+0Ch]
 	mov	[current_line],eax
-	mov	ebx,[esi+8]
+	cmp	byte [esi],0C0h
+	jne	invalid_argument
+	mov	ebx,[esi+8]
 	test	byte [ebx+8],1
 	jz	undefined_symbol
 	mov	ax,[current_pass]
 	cmp	ax,[ebx+16]
 	jne	undefined_symbol
       public_symbol_ok:
 	inc	ecx
 	mov	eax,ecx
 	shl	eax,8
-	mov	al,80h
+	mov	al,0C0h
 	mov	[esi],eax
 	add	esi,10h
 	jmp	find_other_symbols
       get_public_value:
 	mov	eax,[ebx]
 	cmp	dword [ebx+4],0
       extrn_symbol_ok:
 	inc	ecx
 	mov	eax,ecx
 	shl	eax,8
-	mov	al,81h
+	mov	al,80h
 	mov	[esi],eax
 	add	esi,0Ch
 	jmp	find_other_symbols
       elf_symbol_table_ok:
 	mov	edx,edi
 	mov	ebx,[free_additional_memory]
 	or	al,al
 	jz	relocations_converted
 	cmp	al,80h
 	jb	make_relocation_entry
-	ja	relocation_entry_ok
+	cmp	al,0C0h
+	jb	relocation_entry_ok
 	add	esi,10h
 	jmp	convert_relocations
       make_relocation_entry:
 	test	[format_flags],8
 	jnz	make_elf64_relocation_entry
 	mov	eax,[esi+4]

Subversion Repositories Kolibri OS

(root)/programs/develop/fasm/trunk/formats.inc @ 872 – Rev 607 → 624