WebSVN – Kolibri OS – Diff – /programs/demos/life2/include/kos_func.inc

 ;const int
-MENUET_BORDER_SIZE = 4;
+KOLIBRI_BORDER_SIZE = 4;
 ;const int
-MENUET_HEADER_SIZE = 20;
+KOLIBRI_HEADER_SIZE = 20;
 ;const int
 KOLIBRI_THREAD_DATA_USER     = 0; // Thread data begin from the user dword
 ;const int
 KOLIBRI_THREAD_DATA_LAST_SY  = 15;
 ;const int
 KOLIBRI_THREAD_DATA_LEN	    = 16;
 ;const int
-MENUET_MUTEX_MAX_TIME_WAIT  = 20;
+KOLIBRI_MUTEX_MAX_TIME_WAIT  = 20;
 ;const int
 macro segment name
+{
   segment name
   if name eq _init_ | name eq _INIT_
-Menuet_SegmentInit:
+Kolibri_SegmentInit:
   else if name eq _exit_ | name eq _EXIT_
-Menuet_SegmentExit:
+Kolibri_SegmentExit:
   end if
+}
 macro endseg  name
 {
   if name eq _init_ | name eq _INIT_
-Menuet_SegmentInitEnd:
+Kolibri_SegmentInitEnd:
   else if name eq _exit_ | name eq _EXIT_
-Menuet_SegmentExitEnd:
+Kolibri_SegmentExitEnd:
   end if
   endseg  name
+}
-macro Menuet_Put_MovEaxVal_Ret	address,val
+macro Kolibri_Put_MovEaxVal_Ret	address,val
+{
   mov  byte [address],0xB8
   mov  dword [address+4],0xC089C300
   mov  dword [address+1],val
+}
 proc @Kolibri@Main$qv
   and  esp,not 3
   sub  esp,1024
-  mov  eax,9
+  mov  eax,SF_THREAD_INFO
   mov  ebx,esp
 end if
   xor  eax,eax
   cld
   mov  edi,@Kolibri@_ThreadTable
   mov  ecx,256
-  rep stos dword [edi]
+  rep stosd
   mov  esi,@Kolibri@GetPid$qv
   mov  edi,@Kolibri@_ThreadSavedBegProc
-  movs dword [edi],[esi]
+  movsd
-  movs dword [edi],[esi]
+  movsd
   mov  esi,@Kolibri@GetThreadData$qv
-  movs dword [edi],[esi]
+  movsd
-  movs dword [edi],[esi]
+  movsd
-  Menuet_Put_MovEaxVal_Ret  @Kolibri@GetPid$qv,edx
+  Kolibri_Put_MovEaxVal_Ret  @Kolibri@GetPid$qv,edx
-if defined MenuetHeapInit
+if defined KolibriHeapInit
   mov  ecx,esp
   push ebx
   push ecx
   push U_END
-  call MenuetHeapInit	; Initialize a dynamic heap and create new memory in its begin.
+  call KolibriHeapInit	; Initialize a dynamic heap and create new memory in its begin.
   pop  ecx		; Parameters: begin of a new heap, end of data to create in
   mov  [esp+4],eax	; the begin of a heap. Return address of the created data.
   mov  dword [esp],0
 else
   xor  eax,eax
   push eax
 end if
   call @Kolibri@ThreadMain$qpvt1
 .ThreadFinish:
   add  esp,8
-if defined MenuetHeapFreeAndThreadFinish
+if defined KolibriHeapFreeAndThreadFinish
   test eax,eax
   jz   .ThreadFinish_end
   push dword @Kolibri@_ExitProcessNow
   push eax
-  call MenuetHeapFreeAndThreadFinish   ; Free the given memory and finish the thread,
+  call KolibriHeapFreeAndThreadFinish   ; Free the given memory and finish the thread,
 end if				       ; should exit process if second argument points to not zero.
 .ThreadFinish_end:
   or   eax,-1
   int  0x40
 endp
   xchg ebp,[esp+8]
   push esi edi
   sub  esp,KOLIBRI_THREAD_DATA_LEN*4
   mov  [esp],ebx
   mov  [esp+4],ebp
-  mov  eax,40
+  mov  eax,SF_SET_EVENTS_MASK
   mov  ebx,0x27
   int  0x40
   mov  ebx,esp
   cmp  byte [@Kolibri@_ThreadSavedBegProc],0x90
   jz   .main_else_first_check
-  Menuet_Put_MovEaxVal_Ret  @Kolibri@GetThreadData$qv,esp
+  Kolibri_Put_MovEaxVal_Ret  @Kolibri@GetThreadData$qv,esp
-if defined Menuet_SegmentInit & defined Menuet_SegmentInitEnd
+if defined Kolibri_SegmentInit & defined Kolibri_SegmentInitEnd
-  push Menuet_SegmentInitEnd
+  push Kolibri_SegmentInitEnd
-  push Menuet_SegmentInit
+  push Kolibri_SegmentInit
   jmp  .main_after_first_check
 end if
 .main_else_first_check:
   xor  eax,eax
   push eax eax
   test al,al
   jnz  .main_test_close_first
   jmp  .main_end
 .main_close_first:
   btr  dword [esp+KOLIBRI_THREAD_DATA_FLAG*4],31
+if defined @@KolibriOnClose$qppv
   push esp
   call @@KolibriOnClose$qppv
   pop  ecx
   test al,al
   jnz  .main_end
+end if
 .main_test_close_first:
   cmp  dword [esp+KOLIBRI_THREAD_DATA_FLAG*4],0
   jl   .main_close_first
   push esp
   push dword 1
   call @Kolibri@Redraw$qippv
   add  esp,8
 .main_paint_msg:
   or   dword [esp+KOLIBRI_THREAD_DATA_FLAG*4],3
   sub  esp,1024
-  mov  eax,9
+  mov  eax,SF_THREAD_INFO
   mov  ebx,esp
   mov  ecx,-1
   int  0x40
   mov  eax,[esp+34]
   mov  ebx,[esp+38]
   cmp  edx,[esp+KOLIBRI_THREAD_DATA_LAST_SY*4]
   jz   .main_paint
 .main_size:
   mov  [esp+KOLIBRI_THREAD_DATA_LAST_SX*4],ecx
   mov  [esp+KOLIBRI_THREAD_DATA_LAST_SY*4],edx
+if defined @@KolibriOnSize$qpippv
   push edx
   push ecx
   push ebx
   push eax
   lea  ecx,[esp+16]
   mov  edx,esp
   push ecx
   push edx
   call @@KolibriOnSize$qpippv
   add  esp,24
+end if
   test dword [esp+KOLIBRI_THREAD_DATA_FLAG*4],3
   jz   .main_cycle
 .main_paint:
   cmp  dword [esp+KOLIBRI_THREAD_DATA_FLAG*4],0
   jl   .main_close
   push esp
   push dword 0
   call @Kolibri@Redraw$qippv
   add  esp,8
 .main_cycle:
-  mov  eax,11
+  mov  eax,SF_CHECK_EVENT
 .main_message:
   cmp  dword [esp+KOLIBRI_THREAD_DATA_FLAG*4],0
   jl   .main_close
   int  0x40
   test eax,eax
   jnz  .main_on_message
   cmp  dword [esp+KOLIBRI_THREAD_DATA_FLAG*4],0
   jne  .main_paint
+if defined @@KolibriOnIdle$qppv
   push esp
   call @@KolibriOnIdle$qppv
   pop  ecx
+else
+  or eax,-1
+end if
   test eax,eax
   jz   .main_cycle
   jl   .main_wait_message
   mov  ebx,eax
-  mov  eax,23
+  mov  eax,SF_WAIT_EVENT_TIMEOUT
   jmp  .main_message
 .main_wait_message:
-  mov  eax,10
+  mov  eax,SF_WAIT_EVENT
   jmp  .main_message
+if defined @@KolibriOnKeyPress$qppv
 .main_key_press:
   push esp
   call @@KolibriOnKeyPress$qppv
   pop  ecx
   jmp  .main_cycle
+end if
+if defined @@KolibriOnMouse$qppv
 .main_mouse:
   push esp
   call @@KolibriOnMouse$qppv
   pop  ecx
   jmp  .main_cycle
+end if
+align 4
 .main_on_message:
   dec  eax
   jz   .main_paint_msg
   dec  eax
+if defined @@KolibriOnKeyPress$qppv
   jz   .main_key_press
+else
+  jz   .main_cycle
+end if
   cmp  eax,4
+if defined @@KolibriOnMouse$qppv
   jz   .main_mouse
+else
+  jz   .main_cycle
+end if
   dec  eax
   jnz  .main_cycle
+align 4
 .main_button:
-  mov  eax,17
+  mov  eax,SF_GET_BUTTON
   int  0x40
+  shr  eax,8
+  cmp  eax,1
+  je   .main_close
+if defined @@KolibriOnButton$qlppv
+  push esp
-  test al,al
+  push eax
+  call @@KolibriOnButton$qlppv
+  add  esp,8
+end if
-  jnz  .main_cycle
+  jmp  .main_cycle
 .main_close:
   btr  dword [esp+KOLIBRI_THREAD_DATA_FLAG*4],31
+if defined @@KolibriOnClose$qppv
   push esp
   call @@KolibriOnClose$qppv
   pop  ecx
   test al,al
   jz   .main_button
+end if
 .main_end:
   mov  ebx,esp
   lock dec dword [@Kolibri@_ThreadNumber]
-if defined Menuet_SegmentExit & defined Menuet_SegmentExitEnd
+if defined Kolibri_SegmentExit & defined Kolibri_SegmentExitEnd
   jnz  .main_else_last_check
-  push Menuet_SegmentExitEnd
+  push Kolibri_SegmentExitEnd
-  push Menuet_SegmentExit
+  push Kolibri_SegmentExit
   jmp  .main_after_last_check
 end if
 .main_else_last_check:
   xor  eax,eax
   push eax
   add  esp,12
   lock inc dword [@Kolibri@_ThreadScanCount+4]
   mov  ebx,1
   jmp  .main_end_wait
 .main_end_wait_loop:
-  mov  eax,5
+  mov  eax,SF_SLEEP
   int  0x40
   shl  ebx,1
-  cmp  ebx,MENUET_MUTEX_MAX_TIME_WAIT
+  cmp  ebx,KOLIBRI_MUTEX_MAX_TIME_WAIT
   jna  .main_end_wait
-  mov  ebx,MENUET_MUTEX_MAX_TIME_WAIT
+  mov  ebx,KOLIBRI_MUTEX_MAX_TIME_WAIT
 .main_end_wait:
   cmp  dword [@Kolibri@_ExitProcessNow],0
   jnz  @Kolibri@ExitProcess$qv
   cmp  dword [@Kolibri@_ThreadScanCount],0
   jnz  .main_end_wait_loop
 .redraw_begin:
   push ebx esi edi
   and  dword [ebp+KOLIBRI_THREAD_DATA_FLAG*4],0xFFFFFFFC
   test dl,2
   jz   .redraw_picture
-  mov  eax,12
+  mov  eax,SF_REDRAW
-  mov  ebx,1
+  mov  ebx,SSF_BEGIN_DRAW
   int  0x40
   xor  eax,eax
   mov  ebx,[ebp+KOLIBRI_THREAD_DATA_X*4]
   mov  ecx,[ebp+KOLIBRI_THREAD_DATA_Y*4]
   mov  edx,[ebp+KOLIBRI_THREAD_DATA_C_WINDOW*4]
   repnz scas byte [edi]
   not  ecx
   mov  esi,ecx
   dec  esi
   jz   .window_defined
-  mov  eax,4
+  mov  eax,SF_DRAW_TEXT
   mov  ebx,0x00070007
   mov  ecx,[ebp+KOLIBRI_THREAD_DATA_C_TITLE*4]
   int  0x40
 .window_defined:
-  mov  eax,12
-  mov  ebx,2
-  int  0x40
 .redraw_picture:
-  mov  eax,12
+  mov  eax,SF_REDRAW
-  mov  ebx,2
+  mov  ebx,SSF_END_DRAW
   int  0x40
   mov  esi,[ebp+KOLIBRI_THREAD_DATA_PICTURE*4]
   test esi,esi
   jz   .redraw_end_draw
   mov  ecx,[ebp+KOLIBRI_THREAD_DATA_SZ_PICT*4]
   jecxz .redraw_end_draw
   mov  al,byte [ebp+KOLIBRI_THREAD_DATA_C_WINDOW*4+3]
   and  al,15
-  mov  edx,MENUET_BORDER_SIZE*65536+MENUET_HEADER_SIZE
+  mov  edx,KOLIBRI_BORDER_SIZE*65536+KOLIBRI_HEADER_SIZE
   cmp  al,3
   jnz  .redraw_no_skin
-  mov  eax,48
+  mov  eax,SF_STYLE_SETTINGS
-  mov  ebx,4
+  mov  ebx,SSF_GET_SKIN_HEIGHT
   int  0x40
   mov  dx,ax
 .redraw_no_skin:
-  mov  eax,7
+  mov  eax,SF_PUT_IMAGE
   mov  ebx,esi
   int  0x40
 .redraw_end_draw:
   pop  edi esi ebx ebp
   ret
   mov  eax,[esp+12]
   mov  ebx,[eax]
   mov  ecx,[eax+4]
   mov  edx,[eax+8]
   mov  esi,[eax+12]
-  mov  eax,67
+  mov  eax,SF_CHANGE_WINDOW
   int  0x40
   ret
 endp
-;proc @Kolibri@Abort$qv
+proc @Kolibri@ExitDebug$qv
-;  push dword [@Kolibri@DebugPrefix]
+  push dword [@Kolibri@DebugPrefix]
-;  call @Kolibri@DebugPutString$qpxc
+  call @Kolibri@DebugPutString$qpxc
-;  mov	dword [esp],Menuet_abort_string
+  mov	dword [esp],Kolibri_debug_string
-;  call @Kolibri@DebugPutString$qpxc
+  call @Kolibri@DebugPutString$qpxc
+  pop	ecx
+  jmp  @Kolibri@ExitProcess$qv
+endp
 ;  pop	ecx
 proc @Kolibri@ExitProcess$qv
   lock bts dword [@Kolibri@_ExitProcessNow],0
   jc   .exit_process_wait
   sub  esp,1024
-  mov  eax,9
+  mov  eax,SF_THREAD_INFO
   mov  ebx,esp
   mov  ecx,-1
   int  0x40
   mov  esi,eax
   mov  edi,[esp+30]
 .exit_process_loop:
-  mov  eax,9
+  mov  eax,SF_THREAD_INFO
   mov  ebx,esp
   mov  ecx,esi
   int  0x40
   mov  eax,[esp+30]
   mov  ebx,eax
   or   bl,15
   inc  ebx
   jz   .exit_process_continue
   mov  ebx,eax
-  call Menuet_HashInt
+  call Kolibri_HashInt
   movzx eax,al
   mov  eax,dword [@Kolibri@_ThreadTable+eax*4]
   jmp  .exit_process_test
 .exit_process_next:
   mov  eax,dword [eax+KOLIBRI_THREAD_DATA_NEXT*4]
 .exit_process_test:
   test eax,eax
   jz   .exit_process_continue
   cmp  ebx,[eax+KOLIBRI_THREAD_DATA_PID*4]
   jnz  .exit_process_next
-  mov  eax,18
+  mov  eax,SF_SYSTEM
-  mov  ebx,2
+  mov  ebx,SSF_TERMINATE_THREAD
   mov  ecx,esi
   int  0x40
 .exit_process_continue:
   dec  esi
   jnl  .exit_process_loop
 .exit_process_end:
   mov  dword [@Kolibri@_ThreadMutex],0
   or   eax,-1
   int  0x40
 .exit_process_wait:
-  mov  eax,5
+  mov  eax,SF_SLEEP
   mov  ebx,1
 .exit_process_wait_loop:
   cmp  dword [@Kolibri@_ExitProcessNow],0
   jl   .exit_process_end
   int  0x40
   shl  ebx,1
-  cmp  ebx,MENUET_MUTEX_MAX_TIME_WAIT
+  cmp  ebx,KOLIBRI_MUTEX_MAX_TIME_WAIT
   jna  .exit_process_wait_loop
-  mov  ebx,MENUET_MUTEX_MAX_TIME_WAIT
+  mov  ebx,KOLIBRI_MUTEX_MAX_TIME_WAIT
   jmp  .exit_process_wait_loop
 endp
 proc @Kolibri@ExitThread$qppv,@Kolibri@ThreadMain$qpvt1
   mov  esp,[esp+4]
-  jmp  Menuet_main_end
+  jmp  Kolibri_main_end
 endp
 proc @Kolibri@ReturnMessageLoop$qppv,@Kolibri@ThreadMain$qpvt1
   mov  esp,[esp+4]
   bt   dword [esp+KOLIBRI_THREAD_DATA_FLAG*4],30
-  jc   Menuet_main_end
+  jc   Kolibri_main_end
-  jmp  Menuet_main_cycle
+  jmp  Kolibri_main_cycle
 endp
 proc @Kolibri@Delay$qui uses ebx
-  mov  eax,5
+  mov  eax,SF_SLEEP
   mov  ebx,[esp+8]
   int  0x40
+  ret
+endp
-  ret
+proc @Kolibri@Clock$qv uses ebx
+  mov  eax,SF_SYSTEM_GET
+  mov  ebx,SSF_TIME_COUNT
+  int  0x40
+  ret
+endp
+proc @Kolibri@DrawButton$qllllll uses ebx esi
+  mov  eax,SF_DEFINE_BUTTON
-endp
+  mov  ebx,[esp+12-2+8]
+  mov  bx,[esp+20+8]
   mov  ecx,[esp+16-2+8]
-proc @Kolibri@Clock$qv uses ebx
+  mov  cx,[esp+24+8]
-  mov  eax,26
+  mov  edx,[esp+4+8]
-  mov  ebx,9
+  mov  esi,[esp+8+8]
   int  0x40
   ret
 endp
 proc @Kolibri@GetPackedTime$qv
-  mov  eax,3
+  mov  eax,SF_GET_SYS_TIME
   int  0x40
   ret
 endp
 proc @Kolibri@GetTime$qpi
   mov  dword [edx],ecx
   ret
 endp
 proc @Kolibri@GetPackedDate$qv
-  mov  eax,29
+  mov  eax,SF_GET_SYS_DATE
   int  0x40
   ret
 endp
 proc @Kolibri@GetDate$qpi
-  mov  eax,29
+  mov  eax,SF_GET_SYS_DATE
   int  0x40
   mov  edx,[esp+4]
   movzx ecx,al
   mov  dword [edx+8],ecx
   ret
 endp
 proc @Kolibri@ReadCommonColors$qpui uses ebx
-  mov  eax,48
+  mov  eax,SF_STYLE_SETTINGS
-  mov  ebx,3
+  mov  ebx,SSF_GET_COLORS
   mov  ecx,[esp+8]
   mov  edx,40
   int  0x40
   ret
 endp
 proc @Kolibri@DrawText$qssipxc uses ebx
-  mov  eax,4
+  mov  eax,SF_DRAW_TEXT
   mov  ebx,[esp+8-2]
   mov  bx,[esp+12]
   mov  ecx,[esp+16]
   or   ecx,0x80000000
   mov  edx,[esp+20]
   int  0x40
+  ret
+endp
+proc @Kolibri@SetWindowCaption$qpxc uses ebx
+  mov  eax,SF_SET_CAPTION
+  mov  ebx,2
+  mov  ecx,[esp+8]
+  int  0x40
   ret
 endp
 proc @Kolibri@GetProcessInfo$qpuipct1t1piui uses ebx esi edi
   sub  esp,1024
-  mov  eax,9
+  mov  eax,SF_THREAD_INFO
   mov  ebx,esp
   mov  ecx,[1024+12+24+esp]
 .get_proc_info_no_usecpu:
   or   edi,[1024+12+8+esp]
   jz   .get_proc_info_no_name
   lea  esi,[esp+10]
   cld
-  movs dword [edi],[esi]
+  movsd
-  movs dword [edi],[esi]
+  movsd
-  movs dword [edi],[esi]
+  movsd
   mov  byte [edi],0
   xor  edi,edi
 .get_proc_info_no_name:
   or   edi,[1024+12+12+esp]
   jz   .get_proc_info_no_mem
 .get_proc_info_no_pid:
   or   edi,[1024+12+20+esp]
   jz   .get_proc_info_no_rect
   lea  esi,[esp+34]
   cld
-  movs dword [edi],[esi]
+  movsd
-  movs dword [edi],[esi]
+  movsd
-  movs dword [edi],[esi]
+  movsd
-  movs dword [edi],[esi]
+  movsd
   xor  edi,edi
 .get_proc_info_no_rect:
   add  esp,1024
   ret
 endp
 proc @Kolibri@GetPid$qv uses ebx
   sub  esp,1024
-  mov  eax,9
+  mov  eax,SF_THREAD_INFO
   mov  ebx,esp
   mov  ecx,-1
   int  0x40
   mov  eax,[esp+30]
 proc @Kolibri@_HashByte$qui
 @Kolibri@_HashWord$qui:
 @Kolibri@_HashDword$qui:
   mov  eax,[esp+4]
-Menuet_HashInt:
+Kolibri_HashInt:
-  mul  dword [Menuet_hash_int_val0]
+  mul  dword [Kolibri_hash_int_val0]
   xor  eax,edx
   bswap eax
-  mul  dword [Menuet_hash_int_val1]
+  mul  dword [Kolibri_hash_int_val1]
   shrd eax,edx,14
   bswap eax
   lea  eax,[eax+4*eax]
   ror  eax,9
   ret
+endp
-endp
 if defined @Kolibri@_HashByte$qui | defined @Kolibri@_HashWord$qui | defined @Kolibri@_HashDword$qui
-Menuet_hash_int_val0:
+Kolibri_hash_int_val0:
   dd   0xA82F94C5
+Kolibri_hash_int_val1:
-Menuet_hash_int_val1:
+  dd   0x9193780B
-  dd   0x9193780B
+end if
 proc @Kolibri@GetThreadData$qv
   ret
 endp
 proc @Kolibri@GetThreadData$qui
   mov  eax,[esp+4]
-  call Menuet_HashInt
+  call Kolibri_HashInt
   movzx eax,al
   cmp  dword [@Kolibri@_ThreadScanCount+4],0
   jnz  .get_thread_data_wait
 .get_thread_data_nowait:
 .get_thread_data_end:
   lock dec dword [@Kolibri@_ThreadScanCount]
   ret
 .get_thread_data_wait:
   push eax ebx
-  mov  eax,5
+  mov  eax,SF_SLEEP
   mov  ebx,1
 .get_thread_data_wait_loop:
   int  0x40
   cmp  dword [@Kolibri@_ThreadScanCount+4],0
   jz   .get_thread_data_wait_end
   shl  ebx,1
-  cmp  ebx,MENUET_MUTEX_MAX_TIME_WAIT
+  cmp  ebx,KOLIBRI_MUTEX_MAX_TIME_WAIT
   jna  .get_thread_data_wait_loop
-  mov  ebx,MENUET_MUTEX_MAX_TIME_WAIT
+  mov  ebx,KOLIBRI_MUTEX_MAX_TIME_WAIT
   jmp  .get_thread_data_wait_loop
 .get_thread_data_wait_end:
   pop  ebx eax
   jmp .get_thread_data_nowait
 endp
 proc @Kolibri@_GetSkinHeader$qv uses ebx
-  mov  eax,48
+  mov  eax,SF_STYLE_SETTINGS
-  mov  ebx,4
+  mov  ebx,SSF_GET_SKIN_HEIGHT
   int  0x40
   ret
 endp
 proc @Kolibri@GetScreenSize$qrust1
-  mov  eax,14
+  mov  eax,SF_GET_SCREEN_SIZE
   int  0x40
   mov  ecx,[esp+8]
   mov  word [ecx],ax
   mov  ecx,[esp+4]
   shr  eax,16
   mov  word [ecx],ax
   ret
 endp
-proc Menuet_MutexLockNoWait
+proc Kolibri_MutexLockNoWait
   pop  eax
   xor  al,al
   ret
 endp
-proc Menuet_MutexLockWait uses ebx
+proc Kolibri_MutexLockWait uses ebx
-  mov  eax,5
+  mov  eax,SF_SLEEP
   xor  ebx,ebx
 .lock_wait_cycle:
   int  0x40
   shl  byte [ecx],1
   jz   .lock_wait_cycle
   mov  al,1
   ret
 endp
-proc Menuet_MutexLockWaitTime
+proc Kolibri_MutexLockWaitTime
   cmp  dword [esp+12],0
   jng  .MutexLockWait
   push ebx edx
   mov  edx,[esp+20]
-  mov  eax,26
+  mov  eax,SF_SYSTEM_GET
-  mov  ebx,9
+  mov  ebx,SSF_TIME_COUNT
   int  0x40
   add  edx,eax
 .lock_wait_time_cycle:
-  mov  eax,5
+  mov  eax,SF_SLEEP
   xor  ebx,ebx
   int  0x40
   shl  byte [ecx],1
   jnz  .lock_wait_time_ret_true
-  mov  eax,26
+  mov  eax,SF_SYSTEM_GET
-  mov  ebx,9
+  mov  ebx,SSF_TIME_COUNT
   pop  edx ebx
   mov  al,1
   ret
 endp
-proc Menuet_MutexLock
+proc Kolibri_MutexLock
   shl  byte [ecx],1
   jnz  .lock_first
   call eax
 .lock_first:
   mov  al,1
   ret
 endp
 proc @Kolibri@TryLock$qp14Kolibri@TMutex
-  mov  eax,Menuet_MutexLockNoWait
+  mov  eax,Kolibri_MutexLockNoWait
   mov  ecx,[esp+4]
-  jmp  Menuet_MutexLock
+  jmp  Kolibri_MutexLock
 endp
 proc @Kolibri@Lock$qp14Kolibri@TMutex
-  mov  eax,Menuet_MutexLockWait
+  mov  eax,Kolibri_MutexLockWait
   mov  ecx,[esp+4]
-  jmp  Menuet_MutexLock
+  jmp  Kolibri_MutexLock
 endp
 proc @Kolibri@LockTime$qp14Kolibri@TMutexi
-  mov  eax,Menuet_MutexLockWaitTime
+  mov  eax,Kolibri_MutexLockWaitTime
   mov  ecx,[esp+4]
-  jmp  Menuet_MutexLock
+  jmp  Kolibri_MutexLock
 endp
 proc @Kolibri@UnLock$qp14Kolibri@TMutex
   mov  ecx,[esp+4]
   shr  byte [ecx],1
   jz   .unlock_pause
   ret
 .unlock_pause:
   mov  byte [ecx],0x40
   push ebx
-  mov  eax,5
+  mov  eax,SF_SLEEP
   xor  ebx,ebx
   int  0x40
   pop  ebx
   ret
 endp
   jc   .lock_rec_overflow
   ret
 .lock_rec_overflow:
   push dword [@Kolibri@DebugPrefix]
   call @Kolibri@DebugPutString$qpxc
-  mov  dword [esp],Menuet_try_lock_rec_overflow_string
+  mov  dword [esp],Kolibri_try_lock_rec_overflow_string
   call @Kolibri@DebugPutString$qpxc
   pop  ecx
-  jmp  @Kolibri@Abort$qv
+  jmp  @Kolibri@ExitDebug$qv
 endp
 proc @Kolibri@TryLock$qp16Kolibri@TRecMutexui
-  mov  eax,Menuet_MutexLockNoWait
+  mov  eax,Kolibri_MutexLockNoWait
   mov  ecx,[esp+4]
   mov  edx,[esp+8]
-  jmp  Menuet_MutexLockRec
+  jmp  Kolibri_MutexLockRec
 endp
 proc @Kolibri@Lock$qp16Kolibri@TRecMutexui
-  mov  eax,Menuet_MutexLockWait
+  mov  eax,Kolibri_MutexLockWait
   mov  ecx,[esp+4]
   mov  edx,[esp+8]
-  jmp  Menuet_MutexLockRec
+  jmp  Kolibri_MutexLockRec
 endp
 proc @Kolibri@LockTime$qp16Kolibri@TRecMutexiui
-  mov  eax,Menuet_MutexLockWaitTime
+  mov  eax,Kolibri_MutexLockWaitTime
   mov  ecx,[esp+4]
   mov  edx,[esp+12]
-  jmp  Menuet_MutexLockRec
+  jmp  Kolibri_MutexLockRec
 endp
 .unlock_rec_end:
   ret
 .unlock_rec_pause:
   mov  byte [ecx],0x20
   push ebx
-  mov  eax,5
+  mov  eax,SF_SLEEP
   xor  ebx,ebx
   int  0x40
   pop  ebx
   ret
 .unlock_rec_notlocked:
   push dword [@Kolibri@DebugPrefix]
   call @Kolibri@DebugPutString$qpxc
-  mov  dword [esp],Menuet_unlock_rec_notlocked_string
+  mov  dword [esp],Kolibri_unlock_rec_notlocked_string
   call @Kolibri@DebugPutString$qpxc
   pop  ecx
-  jmp  @Kolibri@Abort$qv
+  jmp  @Kolibri@ExitDebug$qv
 endp
 proc @Kolibri@DebugPutChar$qc
   mov  cl,byte [esp+4]
   cmp  cl,13
   jz   .debug_put_char_ret
   push ebx
   cmp  cl,10
   jz   .debug_put_char_enter
 .debug_put_char_after_cmp:
-  mov  eax,63
+  mov  eax,SF_BOARD
-  mov  ebx,1
+  mov  ebx,SSF_DEBUG_WRITE
   int  0x40
   pop  ebx
 .debug_put_char_ret:
   ret
 .debug_put_char_enter:
   mov  cl,13
-  mov  eax,63
+  mov  eax,SF_BOARD
-  mov  ebx,1
+  mov  ebx,SSF_DEBUG_WRITE
   int  0x40
   mov  cl,10
   jmp  .debug_put_char_after_cmp
 endp
 proc @Kolibri@DebugPutString$qpxc
-  push esi
+proc @Kolibri@DebugPutString$qpxc uses esi
   push dword 0
   mov  esi,dword [esp+12]
   jmp  .debug_put_string_test
 .debug_put_string_test:
   xor  eax,eax
   or   al,[esi]
   test al,al
   jnz  .debug_put_string_loop
-  pop  ecx esi
+  pop  ecx
   ret
 endp
 proc @Kolibri@GetKey$qv
-  mov  eax,2
+  mov  eax,SF_GET_KEY
   int  0x40
   test al,al
   jnz  .get_key_eof
   movzx eax,ah
   ret
 .get_key_eof:
-  mov  eax,-1
+  mov  eax,SF_TERMINATE_PROCESS
   ret
 endp
 proc @Kolibri@GetMouseButton$qv uses ebx
-  mov  eax,37
+  mov  eax,SF_MOUSE_GET
-  mov  ebx,2
+  mov  ebx,SSF_BUTTON
   int  0x40
   ret
 endp
 proc @Kolibri@GetMousePosition$qrst1o uses ebx
-  mov  eax,37
+  mov  eax,SF_MOUSE_GET
-  xor  ebx,ebx
+  xor  ebx,ebx ;SSF_SCREEN_POSITION
   cmp  byte [esp+16],0
   jnz  .get_mouse_pos_absolute
   push ebx
   mov  edx,[esp+16]
   mov  ebx,[esp+12]
   test edx,edx
   jnz  .create_thread_after_new
-if defined MenuetHeapAlloc
+if defined KolibriHeapAlloc
   cmp  ebx,4096
   jnb  .create_thread_alloc
   mov  ebx,STACKSIZE
 .create_thread_alloc:
   push ebx
-  call MenuetHeapAlloc	 ; Create new dynamic memory of the given size
+  call KolibriHeapAlloc	 ; Create new dynamic memory of the given size
   pop  ecx
   test eax,eax
   jnz  .create_thread_mem_created
 end if
   or   eax,-1
   and  edx,not 3
   sub  edx,12
   mov  ecx,[esp+8]
   mov  dword [edx+8],ebx
   mov  dword [edx+4],ecx
-  mov  dword [edx],Menuet_ThreadFinish
+  mov  dword [edx],Kolibri_ThreadFinish
-  mov  eax,51
+  mov  eax,SF_CREATE_THREAD
   mov  ebx,1
   mov  ecx,@Kolibri@ThreadMain$qpvt1
   int  0x40
   mov  ebx,eax
   or   bl,15
   inc  ebx
   jnz  .create_thread_end
   lock dec dword [@Kolibri@_ThreadNumber]
-if defined MenuetHeapFree
+if defined KolibriHeapFree
   or   ebx,[edx+8]
   jz   .create_thread_end
   push ebx
-  call MenuetHeapFree	; Delete the given dynamic memory
+  call KolibriHeapFree	; Delete the given dynamic memory
   pop  ecx
 end if
 .create_thread_end:
   pop  ebx
   ret
 .create_thread_init:
   push esi edi
   cld
   mov  esi,@Kolibri@_ThreadSavedBegProc
   mov  edi,@Kolibri@GetPid$qv
-  movs dword [edi],[esi]
+  movsd
-  movs dword [edi],[esi]
+  movsd
   mov  edi,@Kolibri@GetThreadData$qv
-  movs dword [edi],[esi]
+  movsd
-  movs dword [edi],[esi]
+  movsd
   mov  eax,0x90909090
   mov  edi,@Kolibri@_ThreadSavedBegProc
-  stos dword [edi]
+  stosd
-  stos dword [edi]
+  stosd
-  stos dword [edi]
+  stosd
-  stos dword [edi]
+  stosd
   pop  edi esi
   jmp  .create_thread_fill_stack
 endp
 proc @Kolibri@_FileAccess$qpv uses ebx
-  mov  eax,70
+  mov  eax,SF_FILE
   mov  ebx,[esp+8]
   int  0x40
   mov  ecx,[esp+8]
   mov  [ecx],ebx
   ret
+endp
-endp
 if defined Kolibri_debug_string
+Kolibri_debug_string:
+  db 'Abnormal program termination.',10,0
+end if
-Menuet_abort_string:
-  db 'Abnormal program termination.',10,0
+if defined Kolibri_MutexLockRec
+Kolibri_try_lock_rec_overflow_string:
+  db 'Recursive mutex lock count overflow.',10,0
+end if
-Menuet_try_lock_rec_overflow_string:
-  db 'Recursive mutex lock count overflow.',10,0
+if defined @Kolibri@UnLock$qp16Kolibri@TRecMutexui
+Kolibri_unlock_rec_notlocked_string:
-Menuet_unlock_rec_notlocked_string:
+  db 'Recursive mutex unlock error.',10,0
-  db 'Recursive mutex unlock error.',10,0
+end if

Subversion Repositories Kolibri OS

(root)/programs/demos/life2/include/kos_func.inc – Rev 8133 → 8170