KolibriOS/kolibrios
13
14
Fork 12
Code Issues 113 Pull Requests 16 Actions Projects 1 Releases Wiki Activity

Refactored function 42, now its faster in about 100 times, than the old version from Menuet. See sysfuncs.txt (sysfuncr.txt) for more details.

Browse Source 
git-svn-id: svn://kolibrios.org@760 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Rus
2008-02-28 21:01:15 +00:00
parent 064055e18f
commit b6f863a2e2
3 changed files with 97 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
kernel/trunk/docs/sysfuncr.txt
View File

@@ -2036,26 +2036,43 @@ dd 638
* eax = -1 <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>४⭮<E0A5AA><E2ADAE> ebx
======================================================================
========== <20>㭪<EFBFBD><E3ADAA><EFBFBD> 42 - <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD>祭<EFBFBD><EFBFBD><EFBFBD> <20><> IRQ. =========
========== <20>㭪<EFBFBD><E3ADAA><EFBFBD> 42 - ࠡ<EFBFBD><EFBFBD><EFBFBD> <EFBFBD> <20><><EFBFBD><EFBFBD>묨, <20><><EFBFBD><EFBFBD>祭<EFBFBD>묨 <20><> IRQ. =======
======================================================================
------------------------ <20>⥭<EFBFBD><E2A5AD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> -------------------------------
<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> IRQ <20><><EFBFBD>⥬<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>뢠<EFBFBD><EBA2A0> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> 㪠<><E3AAA0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
࠭<EFBFBD><EFBFBD> <20>㭪樥<E3ADAA> 44 <20><><EFBFBD>⮢ <20> <20><><EFBFBD><EFBFBD><EFBFBD>뢠<EFBFBD><EBA2A0> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD>.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD>뢠<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>㭪<EFBFBD><E3ADAA><EFBFBD> <20><><EFBFBD><EFBFBD>뢠<EFBFBD><EBA2A0> <20><><EFBFBD><EFBFBD><EFBFBD>⭮ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20>⮣<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD>뢠<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>㭪<EFBFBD><E3ADAA><EFBFBD> <20><><EFBFBD><EFBFBD>뢠<EFBFBD><EBA2A0> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20>⮣<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD>
㪠<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD>⢥ <20><>ࠬ<EFBFBD><E0A0AC><EFBFBD><EFBFBD>.
<EFBFBD><EFBFBD>ࠬ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
* eax = 42 - <20><><EFBFBD><EFBFBD><EFBFBD> <20>㭪樨
* ebx = <20><><EFBFBD><EFBFBD><EFBFBD> IRQ, 0..15
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>頥<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>祭<EFBFBD><E7A5AD>: (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> ࠧ<><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <EFBFBD><EFBFBD><EFBFBD>祭<EFBFBD><EFBFBD> ecx)
* bl = <20><><EFBFBD><EFBFBD><EFBFBD> IRQ, 0..15
* bh = <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>㭪樨, 0
<EFBFBD><EFBFBD>⠫쭠<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> ॣ<><E0A5A3><EFBFBD><EFBFBD><EFBFBD> ebx <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD>㫥<EFBFBD><E3ABA5>.
* ecx = 㪠<><E3AAA0>⥫<EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>, <20>㤠 <20><><EFBFBD><EFBFBD><EFBFBD> <20>ਭ<EFBFBD><E0A8AD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>頥<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>祭<EFBFBD><E7A5AD>: (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> ࠧ<><E0A0A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD>祭<EFBFBD><E7A5AD> eax)
* <20>᫨ <20><>⮪ <20><><><EFA2AB><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>楬 IRQ
(<28><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> IRQ <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>୮):
* ecx = 2
* eax = -1
* <20>᫨ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>:
* eax = 0
* ecx = 1
* ebx ࠧ<><E0A0A7>蠥<EFBFBD><E8A0A5><EFBFBD>
* <20>᫨ <20><><EFBFBD> <20> <20><><EFBFBD>浪<EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>뫨:
* eax = ࠧ<><E0A0A7><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>⠭<EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
* ecx = 0
* ebx = <20><><EFBFBD>।<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
* eax = ࠧ<><E0A0A7><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD>⠭<EFBFBD><E2A0AD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>砭<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>.
------------------------ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ࠧ<><E0A0A7><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ---------------
<EFBFBD><EFBFBD>ࠬ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
* eax = 42 - <20><><EFBFBD><EFBFBD><EFBFBD> <20>㭪樨
* bl = <20><><EFBFBD><EFBFBD><EFBFBD> IRQ, 0..15
* bh = <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>㭪樨, 1
<EFBFBD><EFBFBD>⠫쭠<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> ॣ<><E0A5A3><EFBFBD><EFBFBD><EFBFBD> ebx <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD>㫥<EFBFBD><E3ABA5>.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>頥<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>祭<EFBFBD><E7A5AD>: (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> ࠧ<><E0A0A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD>祭<EFBFBD><E7A5AD> eax)
* <20>᫨ <20><>⮪ <20><><><EFA2AB><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>楬 IRQ
(<28><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> IRQ <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>୮):
* eax = -1
* <20>᫨ <20><><EFBFBD> <20> <20><><EFBFBD>浪<EFBFBD>, <20> eax ࠧ<><E0A0A7><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD>砭<EFBFBD><EFBFBD>:
* <20>।<EFBFBD><E0A5A4><EFBFBD><EFBFBD>⥫쭮 <20><>⮪ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>१<EFBFBD>ࢨ஢<E0A2A8><E0AEA2><EFBFBD> <20><><EFBFBD> ᥡ<> 㪠<><E3AAA0><EFBFBD><EFBFBD><EFBFBD><EFBFBD> IRQ
<20>㭪樥<E3ADAA> 45.

39
kernel/trunk/docs/sysfuncs.txt
View File

@@ -2010,26 +2010,45 @@ Returned value:
* eax = -1 for incorrect ebx
======================================================================
==================== Function 42 - read IRQ data. ====================
==================== Function 42 - work with IRQ data. ===============
======================================================================
------------------------ Reading data --------------------------------
When an IRQ occurs, the system reads data from ports indicated
earlier by function 44 and writes this data to
internal buffer. This function reads out data from that buffer
bytewise.
to the buffer specified as parameter.
Parameters:
* eax = 42 - function number
* ebx = IRQ number, 0..15
Returned value: (use value of ecx to distinguish)
* bl = IRQ number, 0..15
* bh = subfunction number, 0
Other part of register ebx, must be zero.
* ecx = pointer to the receive buffer
Returned value: (use value of eax to distinguish)
* if the thread is not IRQ owner (or IRQ number is incorrect):
* ecx = 2
* eax = -1
* if there is no data:
* eax = 0
* ecx = 1
* ebx destroyed
* if all is ok:
* eax = byte size of data, not yet read from buffer
* ecx = 0
* ebx = current byte
* eax = byte size of data, read from buffer
See remarks below.
------------------------ Get data size -------------------------------
Parameters:
* eax = 42 - function number
* bl = IRQ number, 0..15
* bh = subfunction number, 0
Other part of register ebx, must be zero.
* ecx = pointer to receive buffer
Returned value: (use value of eax to distinguish)
* if the thread is not IRQ owner (or IRQ number is incorrect):
* eax = -1
* if all is ok:
* eax = byte size of data in buffer
Remarks:
* Previously the thread must reserve indicated IRQ for itself
by function 45.

67
kernel/trunk/kernel.asm
View File

@@ -3933,52 +3933,67 @@ sys_programirq:
align 4
get_irq_data:
cmp ebx,16
movzx esi, bh ; save number of subfunction, if bh = 1, return data size, otherwise, read data
xor bh, bh
cmp ebx, 16
jae .not_owner
mov eax, [4 * ebx + irq_owner]
mov edx, [4 * ebx + irq_owner] ; check for irq owner
mov edi,[TASK_BASE]
mov eax,[TASK_BASE]
cmp eax,[edi+TASKDATA.pid]
cmp edx,[eax+TASKDATA.pid]
je gidril1
.not_owner:
mov [esp+28],dword 2 ; ecx=2
ret
xor edx, edx
dec edx
jmp gid1
gidril1:
shl ebx,12
xor ecx, ecx
inc ecx
lea eax,[ebx + IRQ_SAVE]
mov edx,[eax]
test edx,edx
shl ebx, 12
lea eax, [ebx + IRQ_SAVE] ; calculate address of the beginning of buffer + 0x0 - data size
mov edx, [eax] ; + 0x4 - data offset
dec esi
jz gid1
test edx, edx ; check if buffer is empty
jz gid1
dec edx
mov [eax], edx
mov ebx, [eax + 0x4]
mov edi, ecx
mov ecx, [eax + 0x4]
mov ecx, 4000 ; buffer size, used frequently
cmp ecx, 4000
cmp ebx, ecx ; check for the end of buffer, if end of buffer, begin cycle again
jb @f
xor ecx, ecx
xor ebx, ebx
@@:
inc ecx
mov [eax + 0x4], ecx
dec ecx
add eax, ecx
movzx ebx,byte [eax + 0x10]
lea esi, [ebx + edx] ; calculate data size and offset
cld
cmp esi, ecx ; if greater than the buffer size, begin cycle again
jbe @f
xor ecx, ecx
sub ecx, ebx
sub edx, ecx
lea esi, [eax + ebx + 0x10]
rep movsb
xor ebx, ebx
@@:
lea esi, [eax + ebx + 0x10]
mov ecx, edx
add ebx, edx
rep movsb
mov edx, [eax]
mov [eax], ecx ; set data size to zero
mov [eax + 0x4], ebx ; set data offset
gid1:
mov [esp+32],edx
mov [esp+28],ecx
mov [esp+20],ebx
mov [esp+32], edx ; eax
ret