Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7133 → Rev 7134

/programs/develop/SPForth/MACROS.INC
File deleted
/programs/develop/SPForth/Tupfile.lua
1,3 → 1,4
if tup.getconfig("NO_FASM") ~= "" then return end
tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > lang.inc", {"lang.inc"})
tup.rule({"meforth.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "meforth")
HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
tup.include(HELPERDIR .. "/use_fasm.lua")
tup.rule("meforth.ASM", FASM .. " -dlang=" .. tup.getconfig("LANG") .. " %f %o " .. tup.getconfig("KPACK_CMD"), "meforth")
/programs/develop/SPForth/meforth.ASM
101,8 → 101,8
dd cur_dir_path
 
lang fix ru
include 'MACROS.INC'
include '..\..\proc32.inc'
include 'macros.inc'
include 'proc32.inc'
 
align 4
proc strncmp stdcall, s1:dword, s2:dword, n:dword
182,20 → 182,20
mcall 71, 1, header
 
mcall 9,pinfo,-1
mov eax,[pinfo.x_size]
mov eax,[pinfo.box.width]
cdq
sub eax,20
mov ebx,6
div ebx
mov [pinfo.x_start],eax
mov [pinfo.box.left],eax
 
mov eax,[pinfo.y_size]
mov eax,[pinfo.box.height]
cdq
sub eax,40
mov ebx,ROWH
div ebx
 
mov [pinfo.y_start],eax
mov [pinfo.box.top],eax
call erase_screen
mcall 12, 2
mcall 67,-1,-1,FW_WIDTH,FW_HEIGHT
214,10 → 214,10
GetSkinHeight
mov ecx,eax
shl ecx,16
add ecx,[pinfo.y_size]
add ecx,[pinfo.box.height]
sub ecx,eax
sub ecx,4
mov ebx,[pinfo.x_size]
mov ebx,[pinfo.box.width]
add ebx,5 shl 16 - 9
mcall 13,,,0;xff
ret
238,7 → 238,7
mov [ebp],edi
mov esi,[cursor]
sub esi,edi
mov ecx,[pinfo.x_start]
mov ecx,[pinfo.box.left]
; test ecx,ecx
; jnz .no0
; inc ecx
261,7 → 261,7
jb .again
and dword[ebp],0
; dpd esi
mov eax,[pinfo.y_start]
mov eax,[pinfo.box.top]
shl eax,3
sub ebp,eax
cmp ebp,os_work
316,7 → 316,7
mov [ebp],edi
mov esi,[cursor]
sub esi,edi
mov ecx,[pinfo.x_start]
mov ecx,[pinfo.box.left]
; test ecx,ecx
; jnz .no0
; inc ecx
339,7 → 339,7
jb e_.again
and dword[ebp],0
; dpd esi
mov eax,[pinfo.y_start]
mov eax,[pinfo.box.top]
shl eax,3
sub ebp,eax
cmp ebp,os_work
/programs/develop/fast_call_test/macros.inc
File deleted
/programs/develop/fast_call_test/Tupfile.lua
1,2 → 1,4
if tup.getconfig("NO_FASM") ~= "" then return end
tup.rule("test.ASM", "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "test")
HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
tup.include(HELPERDIR .. "/use_fasm.lua")
tup.rule("test.ASM", FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "test")
/programs/develop/ktcc/trunk/libc/proc32.inc
File deleted
/programs/develop/ktcc/trunk/libc/start/debug-fdo.inc
File deleted
/programs/develop/ktcc/trunk/libc/start/macros.inc
File deleted
\ No newline at end of file
/programs/develop/libraries/console/examples/proc32.inc
File deleted
/programs/develop/libraries/console/examples/Tupfile.lua
1,3 → 1,5
if tup.getconfig("NO_FASM") ~= "" then return end
HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR")
tup.include(HELPERDIR .. "/use_fasm.lua")
ROOT = "../../../../.."
tup.foreach_rule("*.asm", "fasm %f %o " .. tup.getconfig("PESTRIP_CMD") .. tup.getconfig("KPACK_CMD"), "%B")
tup.foreach_rule("*.asm", FASM .. " %f %o " .. tup.getconfig("PESTRIP_CMD") .. tup.getconfig("KPACK_CMD"), "%B")
/programs/develop/libraries/console_coff/examples/proc32.inc
File deleted
/programs/develop/libraries/console_coff/examples/Tupfile.lua
1,2 → 1,4
if tup.getconfig("NO_FASM") ~= "" then return end
tup.foreach_rule("*.asm", "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "%B")
HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR")
tup.include(HELPERDIR .. "/use_fasm.lua")
tup.foreach_rule("*.asm", FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "%B")
/programs/develop/libraries/pixlib/proc32.inc
File deleted
/programs/develop/open watcom/trunk/clib/h/struct.inc
File deleted
/programs/develop/scc/MACROS.INC
File deleted
\ No newline at end of file
/programs/develop/scc/OSFUNC.ASM
1,4 → 1,4
include "MACROS.INC"
include "macros.inc"
;
; OS function implementation
; SmallC for KolibriOS
/programs/develop/scc/Tupfile.lua
1,2 → 1,4
if tup.getconfig("NO_FASM") ~= "" then return end
tup.rule("SCC.ASM", "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "SCC")
HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
tup.include(HELPERDIR .. "/use_fasm.lua")
tup.rule("SCC.ASM", FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "SCC")
/programs/develop/sdk/trunk/sound/src/proc32.inc
File deleted
/programs/develop/sdk/trunk/sound/src/Tupfile.lua
1,6 → 1,8
if tup.getconfig("NO_FASM") ~= "" or (tup.getconfig("NO_MSVC") ~= "" and tup.getconfig("NO_GCC") ~= "") then return end
HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../../.." or tup.getconfig("HELPERDIR")
tup.include(HELPERDIR .. "/use_fasm.lua")
 
OBJS = tup.foreach_rule("*.asm", "fasm %f %o", "%B.obj")
OBJS = tup.foreach_rule("*.asm", FASM .. " %f %o", "%B.obj")
if tup.getconfig("NO_GCC") == ""
then tup.rule(OBJS, "kos32-ar rcs %o %f", "sound.lib")
else tup.rule(OBJS, "link.exe /lib /out:%o %f", "sound.lib")
/programs/develop/tinypad/trunk/tinypad.asm
35,7 → 35,7
 
;purge mov,add,sub ;  SPEED
 
header '01',1,@CODE,TINYPAD_END,STATIC_MEM_END,MAIN_STACK,@PARAMS,ini_path
__header '01',1,@CODE,TINYPAD_END,STATIC_MEM_END,MAIN_STACK,@PARAMS,ini_path
 
APP_VERSION equ '4.1'
 
63,7 → 63,7
INI_SEC_PREFIX equ ''
 
;-----------------------------------------------------------------------------
section @CODE ;:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
__section @CODE ;:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
;-----------------------------------------------------------------------------
cld
mov edi,@UDATA
614,7 → 614,7
include '../../../dll.inc'
 
;-----------------------------------------------------------------------------
section @DATA ;:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
__section @DATA ;:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
;-----------------------------------------------------------------------------
 
;include_debug_strings
622,7 → 622,7
include 'data/tp-idata.inc'
 
;-----------------------------------------------------------------------------
section @IMPORT ;:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
__section @IMPORT ;:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
;-----------------------------------------------------------------------------
 
library \
678,13 → 678,13
TINYPAD_END: ; end of file
 
;-----------------------------------------------------------------------------
section @UDATA ;::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
__section @UDATA ;::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
;-----------------------------------------------------------------------------
 
include 'data/tp-udata.inc'
 
;-----------------------------------------------------------------------------
section @PARAMS ;:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
__section @PARAMS ;:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
;-----------------------------------------------------------------------------
 
fasm_parameters:
/programs/develop/tinypad/trunk/tp-popup.asm
103,7 → 103,7
mov [mi_cur],0
mcall -1
 
func draw_popup_wnd
__func draw_popup_wnd
mcall 12,1
 
mov ebx,dword[ebp+POPUP.x-2]
208,7 → 208,7
ret
endf
 
func setup_main_menu_popup
__func setup_main_menu_popup
mov ebx,[p_info.box.left]
add ebx,[p_info.client_box.left]
@@: dec ecx
/programs/develop/tinypy/tinypy/fasm_modules/proc32.inc
File deleted
/programs/develop/tinypy/tinypy/fasm_modules/macros.inc
File deleted
/programs/develop/tinypy/tinypy/fasm_modules/struct.inc
File deleted