KolibriOS/umka
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean some ugly macros.

Browse Source
This commit is contained in:
Ivan B
2020-02-28 00:22:44 +03:00
parent 67f7873e27
commit 13c5b4ac7a
1 changed files with 28 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
umka.asm
View File

@@ -45,8 +45,6 @@ MAX_PRIORITY = 0 ; highest, used for kernel tasks
USER_PRIORITY = 1 ; default USER_PRIORITY = 1 ; default
IDLE_PRIORITY = 2 ; lowest, only IDLE thread goes here IDLE_PRIORITY = 2 ; lowest, only IDLE thread goes here
purge mov,add,sub
purge mov,add,sub
section '.text' executable align 32 section '.text' executable align 32
coverage_begin: coverage_begin:
@@ -133,12 +131,6 @@ include 'network/stack.inc'
include 'sha3.asm' include 'sha3.asm'
struct VDISK
File dd ?
SectCnt DQ ?
SectSize dd ? ; sector size
ends
proc sha3_256_oneshot c uses ebx esi edi ebp, _ctx, _data, _len proc sha3_256_oneshot c uses ebx esi edi ebp, _ctx, _data, _len
stdcall sha3_256.oneshot, [_ctx], [_data], [_len] stdcall sha3_256.oneshot, [_ctx], [_data], [_len]
ret ret
@@ -254,14 +246,6 @@ proc kos_init c uses ebx esi edi ebp
ret ret
endp endp
proc alloc_page
ret
endp
proc alloc_pages _cnt
ret
endp
proc sys_msg_board proc sys_msg_board
cmp cl, 0x0d cmp cl, 0x0d
jz @f jz @f
@@ -278,32 +262,11 @@ proc sys_msg_board
ret ret
endp endp
proc disable_irq _irq
ret
endp
proc enable_irq _irq
ret
endp
proc map_page _one, _two, _three
ret
endp
proc create_ring_buffer stdcall, size:dword, flags:dword
ret
endp
proc map_memEx stdcall, lin_addr:dword,slot:dword,\
ofs:dword,buf_size:dword,req_access:dword
ret
endp
change_task: change_task:
mov [REDRAW_BACKGROUND], 0 mov [REDRAW_BACKGROUND], 0
ret ret
sysfn_saveramdisk: sysfn_saveramdisk:
sysfn_meminfo: sysfn_meminfo:
check_fdd_motor_status: check_fdd_motor_status:
@@ -353,7 +316,8 @@ init_fpu:
init_mtrr: init_mtrr:
map_io_mem: map_io_mem:
create_trampoline_pgmap: create_trampoline_pgmap:
ret alloc_page:
sys_settime: sys_settime:
sys_pcibios: sys_pcibios:
sys_IPC: sys_IPC:
@@ -363,25 +327,29 @@ f68:
sys_posix: sys_posix:
ret ret
alloc_pages:
enable_irq:
disable_irq:
ret 4
create_ring_buffer:
ret 8
map_page:
ret 12
map_memEx:
ret 20
macro format a,b,c,d {
macro pew x \{
\}
}
pewpew: macro include_ x {
inclu#de `x
macro pew x, y {
if y eq 1
include `x
end if
} }
include fix pew include fix pew
HEAP_BASE equ macro pew x {}
macro org x {} macro org x {}
include 'init.inc', 1 macro format [x] {}
sys_msg_board equ tyu HEAP_BASE equ
include_ 'init.inc'
sys_msg_board equ __pew
macro lea r, v { macro lea r, v {
if v eq [(ecx-(CURRENT_TASK and 1FFFFFFFh)-TASKDATA.state)*8+SLOT_BASE] if v eq [(ecx-(CURRENT_TASK and 1FFFFFFFh)-TASKDATA.state)*8+SLOT_BASE]
@@ -392,6 +360,7 @@ macro lea r, v {
lea r, v lea r, v
end if end if
} }
macro add r, v { macro add r, v {
if v eq CURRENT_TASK - (SLOT_BASE shr 3) if v eq CURRENT_TASK - (SLOT_BASE shr 3)
int3 int3
@@ -399,23 +368,17 @@ macro add r, v {
add r, v add r, v
end if end if
} }
include 'kernel.asm', 1
purge lea include_ 'kernel.asm'
restore lea
purge add purge lea,add,org,pew
restore add restore lea,add,org,pew
purge sys_msg_board purge sys_msg_board,HEAP_BASE
restore org
purge org
purge HEAP_BASE
restore pew
coverage_end: coverage_end:
section '.data' writeable align 64 section '.data' writeable align 64
;include_debug_strings
timer_ticks dd 0 timer_ticks dd 0
fpu_owner dd ? fpu_owner dd ?
@@ -464,7 +427,4 @@ BUTTON_INFO rb 64*1024
BUTTON_INFO equ BUTTON_INFO equ
endg endg
macro iii { include_ 'data32.inc'
inclu#de 'data32.inc'
}
iii