Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 853 → Rev 872

/programs/develop/examples/cpuspeed/trunk/cpuspeed.asm
7,13 → 7,13
use32
org 0x0
 
db 'MENUET00' ; 8 byte id
dd 38 ; required os
dd START ; program start
dd I_END ; program image size
dd 0x1000 ; required amount of memory
db 'MENUET01' ; 8 byte id
dd 0x01 ; header version
dd START ; start of code
dd I_END ; size of image
dd 0x1000 ; memory for app
dd 0x1000 ; esp
dd 0x00000000 ; reserved=no extended header
dd 0x0,0x0 ; I_Param , I_Icon
 
include 'lang.inc'
include '..\..\..\..\macros.inc'
/programs/develop/fasm/trunk/formats.inc
601,7 → 601,6
inc si
or ax,ax
jnz mz_size_ok
mov ax,200h
dec si
mz_size_ok:
mov [edx+2],ax ; number of bytes in last page
705,6 → 704,10
dec ecx
shl ecx,9
movzx edx,word [esi+2]
test edx,edx
jnz stub_header_size_ok
mov dx,200h
stub_header_size_ok:
add ecx,edx
mov edx,edi
sub ecx,eax
/programs/develop/fasm/trunk/preproce.inc
805,6 → 805,11
ret
add_preprocessor_symbol:
push edi esi
 
mov edi,preprocessor_directives
call get_directive
jnc reserved_word_used_as_symbol
 
call calculate_hash
mov ebp,eax
and ebp,3FFh
1655,8 → 1660,7
cmp dword [edi+4],0
jne value_out_of_range
mov eax,[edi]
or eax,eax
jz instant_macro_done
 
cmp eax,80000000h
jae value_out_of_range
push [free_additional_memory]
1708,9 → 1712,12
jmp add_rept_counter
rept_counters_ok:
dec esi
cmp [counter_limit],0
je instant_macro_finish
instant_macro_parameters_ok:
xor eax,eax
call process_macro
instant_macro_finish:
pop [counter_limit]
pop [macro_symbols]
pop [free_additional_memory]
/programs/develop/fasm/trunk/version.inc
33,7 → 33,7
; cannot simply be copied and put under another distribution licence
; (including the GNU Public Licence).
 
VERSION_STRING equ "1.67.26"
VERSION_STRING equ "1.67.27"
 
VERSION_MAJOR = 1
VERSION_MINOR = 67
/programs/develop/fasm/trunk/x86_64.inc
3355,14 → 3355,14
loop_instruction_16bit:
cmp [code_type],64
je illegal_instruction
mov dl,al
call address_16bit_prefix
mov al,dl
cmp [code_type],16
je loop_instruction
mov [operand_prefix],67h
jmp loop_instruction
loop_instruction_32bit:
mov dl,al
call address_32bit_prefix
mov al,dl
cmp [code_type],32
je loop_instruction
mov [operand_prefix],67h
jmp loop_instruction
loop_instruction_64bit:
cmp [code_type],64
3400,6 → 3400,7
mov byte [edi],66h
inc edi
loop_jump_32bit_prefix_ok:
call loop_counter_size
call calculate_jump_offset
cdq
make_loop_jump:
3406,6 → 3407,15
call check_for_short_jump
jc conditional_jump_short
jmp jump_out_of_range
loop_counter_size:
cmp [operand_prefix],0
je loop_counter_size_ok
push eax
mov al,[operand_prefix]
stos byte [edi]
pop eax
loop_counter_size_ok:
ret
loop_jump_64bit:
cmp [code_type],64
jne invalid_operand_size
3423,6 → 3433,7
mov byte [edi],66h
inc edi
loop_jump_16bit_prefix_ok:
call loop_counter_size
call calculate_jump_offset
cwde
cdq
4885,6 → 4896,8
jmp instruction_assembled
movq_mmreg_mmreg:
call convert_mmx_register
cmp ah,[mmx_size]
jne invalid_operand_size
mov bl,al
call store_nomem_instruction
jmp instruction_assembled
5839,8 → 5852,7
lods byte [esi]
call convert_register
mov [postbyte_register],al
cmp [operand_size],4
jne invalid_operand_size
call vmread_check_size
jmp vmx_size_ok
vmread_nomem:
lods byte [esi]
5858,8 → 5870,7
lods byte [esi]
call convert_register
mov [postbyte_register],al
cmp [operand_size],4
jne invalid_operand_size
call vmread_check_size
pop ebx
mov [base_code],0Fh
call store_nomem_instruction
5883,8 → 5894,7
lods byte [esi]
call convert_register
mov [postbyte_register],al
cmp [operand_size],4
jne invalid_operand_size
call vmread_check_size
mov [operand_size],0
lods byte [esi]
cmp al,','
6447,7 → 6457,13
mov eax,edx
cdq
cmp edx,[address_high]
jne value_out_of_range
je address_32bit_value_ok
cmp [error_line],0
jne address_32bit_value_ok
mov edx,[current_line]
mov [error_line],edx
mov [error],value_out_of_range
address_32bit_value_ok:
mov edx,eax
jmp store_address_32bit_value
sib_address_8bit_value: