Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7133 → Rev 7134

/programs/demos/life/trunk/macros.inc
File deleted
\ No newline at end of file
/programs/demos/life/trunk/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({"life.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "life")
HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
tup.include(HELPERDIR .. "/use_fasm.lua")
tup.rule("life.asm", FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "life")
/programs/demos/unvwater/trunk/proc32.inc
File deleted
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/programs/demos/unvwater/trunk/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({"unvwater.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "unvwater")
HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
tup.include(HELPERDIR .. "/use_fasm.lua")
tup.rule("unvwater.asm", FASM .. " -dlang=" .. tup.getconfig("LANG") .. " %f %o " .. tup.getconfig("KPACK_CMD"), "%B")
/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
/programs/emulator/PrMK/trunk/proc32.inc
File deleted
/programs/emulator/PrMK/trunk/macros.inc
File deleted
/programs/emulator/PrMK/trunk/struct.inc
File deleted
/programs/emulator/PrMK/trunk/config.inc
File deleted
/programs/emulator/PrMK/trunk/PrMK.asm
5,7 → 5,7
 
include 'macros.inc'
 
header '01',1,START,I_END,(D_END+0x100),(D_END+0x100),0,cur_dir_path
__header '01',1,START,I_END,(D_END+0x100),(D_END+0x100),0,cur_dir_path
 
include 'opcodes.inc'
include 'proc32.inc'
/programs/emulator/PrMK/trunk/Tupfile.lua
1,2 → 1,5
if tup.getconfig("NO_FASM") ~= "" then return end
tup.rule("PrMK.asm", "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "PrMK")
HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
tup.include(HELPERDIR .. "/use_fasm.lua")
 
tup.rule("PrMK.asm", FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "PrMK")
/programs/fs/mfar/trunk/mf-copy.inc
2,7 → 2,7
;///// COPYING ////////////////////////////////////////////////////////////////
;------------------------------------------------------------------------------
 
func copy_file
__func copy_file
pushad
 
cmp [active_panel],0
126,7 → 126,7
 
;------------------------------------------------------------------------------
 
func draw_window_copy_main
__func draw_window_copy_main
mcall2 MF_FILLRECT,oX+tW*2,tW*76,oY+tH*7,tH*8,0x00C0C0C0
 
mmov esi,oX+tW*4+2,oX+tW*75+3
168,7 → 168,7
 
;------------------------------------------------------------------------------
 
func draw_copy_input
__func draw_copy_input
mcall2 MF_FILLRECT,oX+tW*6,tW*68,oY+tH*10,tH,0x00008080
 
mov edx,fc_info.path
/programs/fs/mfar/trunk/mf-sort.inc
11,7 → 11,7
dd compare_by_extension
 
; AL = panel
func mfar_sort
__func mfar_sort
pusha
cmp al,0
jne ._00
69,7 → 69,7
 
; ESI = pointer to 1st file info
; EDI = pointer to 2nd file info
func compare_by_name
__func compare_by_name
mov ecx,11
push edi esi
repe cmpsb
102,7 → 102,7
 
; ESI = pointer to 1st file info
; EDI = pointer to 2nd file info
func compare_by_extension
__func compare_by_extension
push edi esi
mov ecx,3
add esi,8
/programs/fs/mfar/trunk/mfar.asm
290,7 → 290,7
;///// DRAW WINDOW ////////////////////////////////////////////////////////////
;------------------------------------------------------------------------------
 
func draw_window
__func draw_window
mcall MF_WINPROPS,WP_GETSYSCLRS,sc,sizeof.system_colors
 
mcall MF_WNDDRAW,WD_BEGINDRAW
340,7 → 340,7
;//////////////////////////////////////////////////////////////////////////////
;------------------------------------------------------------------------------
 
func draw_window_full
__func draw_window_full
call draw_window
mov edx,1
call get_files_data
360,7 → 360,7
align 4
len dd ?
 
func get_normal_path
__func get_normal_path
pusha
mov ecx,5
rep movsb
394,7 → 394,7
; EAX = length needed
; ECX = current length
; EDI = path string
func get_path_ellipses
__func get_path_ellipses
cmp ecx,eax
jbe @f
pushad
416,7 → 416,7
;//////////////////////////////////////////////////////////////////////////////
;------------------------------------------------------------------------------
 
func draw_path
__func draw_path
pushad
cmp [active_panel],0
jne ._00
444,7 → 444,7
;------------------------------------------------------------------------------
 
; AL = panel
func draw_files
__func draw_files
push eax
mmov ecx,oY+tH*2-1,tH*FPC
mov edx,[fc.background]
519,7 → 519,7
;//////////////////////////////////////////////////////////////////////////////
;------------------------------------------------------------------------------
 
func draw_bottom_keys
__func draw_bottom_keys
pushad
mcall2 MF_FILLRECT,oX-1,tW*80+1,oY+tH*24-1,tH+1,[fc.pathbg]
dec ecx
551,7 → 551,7
; ESI = X1*65536+X2
; EDI = Y1*65536+Y2
; EDX = color
func draw_frame
__func draw_frame
mov ecx,edi
mov ebx,edi
shr ebx,16
578,7 → 578,7
;------------------------------------------------------------------------------
 
; EDX = pointer to file data
func get_file_color
__func get_file_color
push esi
mov cl,[edx+11]
test cl,(FA_HIDDEN or FA_SYSTEM)
632,7 → 632,7
;------------------------------------------------------------------------------
 
; EDI = color
func draw_sel
__func draw_sel
pushad
cmp [active_panel],0
jne ._00
715,7 → 715,7
;------------------------------------------------------------------------------
 
; AL = panel
func draw_file_info
__func draw_file_info
push eax
mmov ecx,oY+tH*21,tH
mov edx,[fc.background]
790,7 → 790,7
;//////////////////////////////////////////////////////////////////////////////
;------------------------------------------------------------------------------
 
func get_file_name
__func get_file_name
pushad
mov eax,[esi+0]
mov [f_name+0],eax
810,7 → 810,7
;------------------------------------------------------------------------------
 
; ESI = pointer to file data
func get_file_info
__func get_file_info
pushad
mov eax,[esi+12]
mov dword[f_info],FS_READ
888,7 → 888,7
;------------------------------------------------------------------------------
 
; DL = panel
func get_files_data
__func get_files_data
pushad
mov [d_tcnt],0
mov [d_ttsz],0
985,7 → 985,7
;//////////////////////////////////////////////////////////////////////////////
;------------------------------------------------------------------------------
 
func execute_current_file
__func execute_current_file
pushad
cmp [active_panel],0
jne ._00
1080,7 → 1080,7
;//////////////////////////////////////////////////////////////////////////////
;------------------------------------------------------------------------------
 
func delete_current_file
__func delete_current_file
pushad
popad
ret
/programs/games/bnc/trunk/macros.inc
File deleted
\ No newline at end of file
/programs/games/bnc/trunk/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({"bnc.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "bnc")
HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
tup.include(HELPERDIR .. "/use_fasm.lua")
tup.rule("bnc.asm", FASM .. " -dlang=" .. tup.getconfig("LANG") .. " %f %o " .. tup.getconfig("KPACK_CMD"), "bnc")
/programs/games/megamaze/trunk/macros.inc
File deleted
/programs/games/megamaze/trunk/Tupfile.lua
1,2 → 1,4
if tup.getconfig("NO_FASM") ~= "" then return end
tup.rule("megamaze.asm", "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "megamaze")
HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
tup.include(HELPERDIR .. "/use_fasm.lua")
tup.rule("megamaze.asm", FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "megamaze")
/programs/games/megamaze/trunk/megamaze.asm
589,11 → 589,11
mov ebp,[pack]
.red:
mcall 12,1
mov ebx,[prc_info.x_start]
add ebx,[prc_info.x_size]
mov ebx,[prc_info.box.left]
add ebx,[prc_info.box.width]
shl ebx,16
add ebx,310
mov ecx,[prc_info.y_start]
mov ecx,[prc_info.box.top]
shl ecx,16
add ecx,220
mcall 0,,,0x03c0c0c0
/programs/games/rsquare/trunk/MACROS.INC
File deleted
\ No newline at end of file
/programs/games/rsquare/trunk/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({"rsquare.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "rsquare")
HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
tup.include(HELPERDIR .. "/use_fasm.lua")
tup.rule("rsquare.asm", FASM .. " -dlang=" .. tup.getconfig("LANG") .. " %f %o " .. tup.getconfig("KPACK_CMD"), "rsquare")
/programs/games/rsquare/trunk/rsquare.asm
17,9 → 17,8
dd stak+0x400 ; memory for app
dd stak+0x400 ; esp
dd 0x0 , 0x0 ; I_Param , I_Icon
include "lang.inc"
include "MACROS.INC"
;include "DEBUG.INC"
include "macros.inc"
;include "debug.inc"
 
run:
if LEVELCONV eq 1
/programs/games/soko/trunk/MACROS.INC
File deleted
\ No newline at end of file
/programs/games/soko/trunk/SOKO.ASM
29,11 → 29,9
 
format binary as ""
 
include '../../../macros.inc' ; decrease code size (optional)
include 'macros.inc' ; decrease code size (optional)
include 'CELLTYPE.INC' ; object identifiers
;include 'debug.inc'
;lang equ ru ; russian interface; english if undefined
include 'lang.inc'
 
CUR_DIR equ '/sys/games/' ; change it to appropriate path
 
/programs/games/soko/trunk/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({"SOKO.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "SOKO")
HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
tup.include(HELPERDIR .. "/use_fasm.lua")
tup.rule("SOKO.ASM", FASM .. " -dlang=" .. tup.getconfig("LANG") .. " %f %o " .. tup.getconfig("KPACK_CMD"), "SOKO")
/programs/games/sq_game/trunk/MACROS.INC
File deleted
\ No newline at end of file
/programs/games/sq_game/trunk/SQ_GAME.ASM
28,8 → 28,7
dd 0x0 ;  ¤à¥á ¡ãä¥à  ¤«ï ¯ à ¬¥â஢ (­¥ ¨á¯®«ì§ã¥âáï)
dd 0x0 ; § à¥§¥à¢¨à®¢ ­®
 
include 'lang.inc'
include 'MACROS.INC' ; ¬ ªà®áë ®¡«¥£ç îâ ¦¨§­ì  áᥬ¡«¥à騪®¢!
include 'macros.inc' ; ¬ ªà®áë ®¡«¥£ç îâ ¦¨§­ì  áᥬ¡«¥à騪®¢!
 
 
START:
/programs/games/sq_game/trunk/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({"SQ_GAME.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "SQ_GAME")
HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
tup.include(HELPERDIR .. "/use_fasm.lua")
tup.rule("SQ_GAME.ASM", FASM .. " -dlang=" .. tup.getconfig("LANG") .. " %f %o " .. tup.getconfig("KPACK_CMD"), "SQ_GAME")
/programs/macros.inc
329,7 → 329,7
 
 
; -------------------------
macro header a,[b] {
macro __header a,[b] {
common
use32
org 0
339,10 → 339,15
dd 0
else
dd b
end if }
macro section name { align 16
label name }
macro func name {
end if
}
 
macro __section name {
align 16
label name
}
 
macro __func name {
if ~used name
display 'FUNC NOT USED: ',`name,13,10
else
349,14 → 354,8
align 4
name:
;diff16 `name,0,name
;pushad
;pushfd
;dps `name
;newline
;mcall 5,1
;popfd
;popad
}
 
macro endf { end if }
 
macro diff16 title,l1,l2
/programs/media/ac97snd/Tupfile.lua
1,9 → 1,10
if tup.getconfig("NO_FASM") ~= "" or tup.getconfig("NO_MSVC") ~= "" then return end
HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
tup.include(HELPERDIR .. "/use_fasm.lua")
tup.include(HELPERDIR .. "/use_msvc.lua")
 
compile_msvc{"ac97snd/ac97wav.c", "ac97snd/crt.c"}
OBJS += tup.foreach_rule({"ac97snd/k_lib.asm", "ufmod-config.asm"}, "fasm %f %o", "%B.obj")
OBJS += tup.foreach_rule({"ac97snd/k_lib.asm", "ufmod-config.asm"}, FASM .. " %f %o", "%B.obj")
OBJS += "mpg/mpg.lib"
OBJS += "../../develop/sdk/trunk/sound/src/sound.lib"
link_msvc("ac97snd.bin")
/programs/media/ac97snd/ac97snd/proc32.inc
File deleted
/programs/media/ac97snd/ac97snd/struct.inc
File deleted
/programs/media/ac97snd/mpg/proc32.inc
File deleted
/programs/media/ac97snd/mpg/Tupfile.lua
1,6 → 1,7
if tup.getconfig("NO_FASM") ~= "" or tup.getconfig("NO_MSVC") ~= "" then return end
HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
tup.include(HELPERDIR .. "/use_fasm.lua")
tup.include(HELPERDIR .. "/use_msvc.lua")
compile_msvc{"*.c"}
tup.append_table(OBJS, tup.rule("pow.asm", "fasm %f %o", "pow.obj"))
tup.append_table(OBJS, tup.rule("pow.asm", FASM .. " %f %o", "pow.obj"))
tup.rule(OBJS, "link.exe /lib /out:%o %f", "mpg.lib")
/programs/media/zsea/config.inc
File deleted
/programs/system/cd_tray/MACROS.INC
File deleted
\ No newline at end of file
/programs/system/cd_tray/CD_tray.ASM
15,8 → 15,7
dd 0x0 ; àäðåñ áóôåðà äëÿ ïàðàìåòðîâ (íå èñïîëüçóåòñÿ)
dd 0x0 ; çàðåçåðâèðîâàíî
 
include 'MACROS.INC' ; ìàêðîñû îáëåã÷àþò æèçíü àññåìáëåðùèêîâ!
include 'lang.inc'
include 'macros.inc' ; ìàêðîñû îáëåã÷àþò æèçíü àññåìáëåðùèêîâ!
 
;---------------------------------------------------------------------
;--- ÍÀ×ÀËÎ ÏÐÎÃÐÀÌÌÛ ----------------------------------------------
/programs/system/cd_tray/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({"CD_tray.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "CD_tray")
HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
tup.include(HELPERDIR .. "/use_fasm.lua")
tup.rule("CD_tray.ASM", FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "%B")
/programs/system/cpuid/trunk/Tupfile.lua
1,3 → 1,3
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({"CPUID.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "CPUID")
tup.rule({"CPUID.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o -m70000" .. tup.getconfig("KPACK_CMD"), "CPUID")
/programs/system/gmon/macros.inc
File deleted
/programs/system/gmon/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({"gmon.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "gmon")
HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
tup.include(HELPERDIR .. "/use_fasm.lua")
tup.rule("gmon.asm", FASM .. " -dlang=" .. tup.getconfig("LANG") .. " %f %o " .. tup.getconfig("KPACK_CMD"), "gmon")
/programs/system/gmon/gmon.asm
35,10 → 35,25
; 12 - Update time decriment (tab_conf.inc)
; 13..17 - Color Changing buttons CPU_load, Mem_usage, Temp1, Temp2, Temp3
 
include 'lang.inc'
include 'config.inc'
include 'macros.inc'
 
macro clear_prev_no arg1 ; clears previous number printed at arg1
{
pusha
mov ebx, 0x00070000
mov ecx, 1000000 ; dummy value
mov edx, arg1
mov esi, 0x40000000 + tcol
mov edi, tcol ; bg col
mov eax, 47
int 0x40
popa
}
 
nl equ 0x0d, 0x0a
 
 
tcol equ 0x5080d0
atcol equ 0x4070c0
val_mod equ 0x3090
/programs/system/launch/trunk/Tupfile.lua
3,4 → 3,4
tup.include(HELPERDIR .. "/use_fasm.lua")
 
add_include(HELPERDIR .. "/develop/libraries/libs-dev/libio")
tup.rule("launch.asm", FASM .. " -dlang=" .. tup.getconfig("LANG") .. " %f %o" .. tup.getconfig("KPACK_CMD"), "launch")
tup.rule("launch.asm", FASM .. " -dlang=" .. tup.getconfig("LANG") .. " %f %o" .. tup.getconfig("KPACK_CMD"), "%B")
/programs/system/pcidev/branches/new_api/macros.inc
File deleted
\ No newline at end of file
/programs/system/pcidev/branches/new_api/PCIDEV.ASM
142,7 → 142,6
; * detect Revision, Class and Subclass of Device,
; * and make Description based on Class
;-------------------------------------------------------------
include 'lang.inc'
include 'macros.inc'
MEOS_APP_START
CODE
159,13 → 158,13
 
red: ; redraw
mcall 9, Proc_Info, -1 ; window redraw requested so get new window coordinates and size
mov eax, [Proc_Info.x_start]; store the window coordinates into the Form Structure
mov eax, [Proc_Info.box.left]; store the window coordinates into the Form Structure
mov [Form + 2], ax ; x start position
mov eax, [Proc_Info.y_start];
mov eax, [Proc_Info.box.top];
mov [Form + 6], ax ; ystart position
mov eax, [Proc_Info.x_size] ;
mov eax, [Proc_Info.box.width];
mov [Form], ax ; window width
mov eax, [Proc_Info.y_size] ;
mov eax, [Proc_Info.box.height];
mov [Form + 4] ,ax ; window height
call draw_window ; go redraw window now
jmp still
/programs/system/pcidev/branches/new_api/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({"PCIDEV.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "PCIDEV")
HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR")
tup.include(HELPERDIR .. "/use_fasm.lua")
tup.rule("PCIDEV.ASM", FASM .. " -dlang=" .. tup.getconfig("LANG") .. " %f %o " .. tup.getconfig("KPACK_CMD"), "%B")