Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7134 → Rev 6196

/programs/develop/SPForth/MACROS.INC
0,0 → 1,264
; new application structure
macro meos_app_start
{
use32
org 0x0
 
db 'MENUET01'
dd 0x01
dd __start
dd __end
dd __memory
dd __stack
 
if used __params & ~defined __params
dd __params
else
dd 0x0
end if
 
dd 0x0
}
MEOS_APP_START fix meos_app_start
 
macro code
{
__start:
}
CODE fix code
 
macro data
{
__data:
}
DATA fix data
 
macro udata
{
if used __params & ~defined __params
__params:
db 0
__end:
rb 255
else
__end:
end if
__udata:
}
UDATA fix udata
 
macro meos_app_end
{
align 32
rb 2048
__stack:
__memory:
}
MEOS_APP_END fix meos_app_end
 
 
; macro for defining multiline text data
struc mstr [sstring]
{
forward
local ssize
virtual at 0
db sstring
ssize = $
end virtual
dd ssize
db sstring
common
dd -1
}
 
 
; strings
macro sz name,[data] { ; from MFAR [mike.dld]
common
if used name
label name
end if
forward
if used name
db data
end if
common
if used name
.size = $-name
end if
}
 
macro lsz name,[lng,data] { ; from MFAR [mike.dld]
common
label name
forward
if lang eq lng
db data
end if
common
.size = $-name
}
 
 
 
; easy system call macro
macro mpack dest, hsrc, lsrc
{
if (hsrc eqtype 0) & (lsrc eqtype 0)
mov dest, (hsrc) shl 16 + lsrc
else
if (hsrc eqtype 0) & (~lsrc eqtype 0)
mov dest, (hsrc) shl 16
add dest, lsrc
else
mov dest, hsrc
shl dest, 16
add dest, lsrc
end if
end if
}
 
macro __mov reg,a,b { ; mike.dld
if (~a eq)&(~b eq)
mpack reg,a,b
else if (~a eq)&(b eq)
mov reg,a
end if
}
 
macro mcall a,b,c,d,e,f { ; mike.dld
__mov eax,a
__mov ebx,b
__mov ecx,c
__mov edx,d
__mov esi,e
__mov edi,f
int 0x40
}
 
 
 
; language for programs
;lang fix ru ; ru en fr ge fi
 
 
 
; optimize the code for size
__regs fix <eax,ebx,ecx,edx,esi,edi,ebp,esp>
 
macro add arg1,arg2
{
if (arg2 eqtype 0)
if (arg2) = 1
inc arg1
else
add arg1,arg2
end if
else
add arg1,arg2
end if
}
 
macro sub arg1,arg2
{
if (arg2 eqtype 0)
if (arg2) = 1
dec arg1
else
sub arg1,arg2
end if
else
sub arg1,arg2
end if
}
 
macro mov arg1,arg2
{
if (arg1 in __regs) & (arg2 eqtype 0)
if (arg2) = 0
xor arg1,arg1
else if (arg2) = 1
xor arg1,arg1
inc arg1
else if (arg2) = -1
or arg1,-1
else if (arg2) > -128 & (arg2) < 128
push arg2
pop arg1
else
mov arg1,arg2
end if
else
mov arg1,arg2
end if
}
 
 
macro struct name
{
virtual at 0
name name
sizeof.#name = $ - name
end virtual
}
 
; structures used in MeOS
struc process_information
{
.cpu_usage dd ? ; +0
.window_stack_position dw ? ; +4
.window_stack_value dw ? ; +6
.not_used1 dw ? ; +8
.process_name rb 12 ; +10
.memory_start dd ? ; +22
.used_memory dd ? ; +26
.PID dd ? ; +30
.x_start dd ? ; +34
.y_start dd ? ; +38
.x_size dd ? ; +42
.y_size dd ? ; +46
.slot_state dw ? ; +50
rb (1024-52)
}
struct process_information
 
struc system_colors
{
.frame dd ?
.grab dd ?
.work_3d_dark dd ?
.work_3d_light dd ?
.grab_text dd ?
.work dd ?
.work_button dd ?
.work_button_text dd ?
.work_text dd ?
.work_graph dd ?
}
struct system_colors
 
 
; constants
 
; events
EV_IDLE = 0
EV_TIMER = 0
EV_REDRAW = 1
EV_KEY = 2
EV_BUTTON = 3
EV_EXIT = 4
EV_BACKGROUND = 5
EV_MOUSE = 6
EV_IPC = 7
EV_STACK = 8
 
; event mask bits for function 40
EVM_REDRAW = 1b
EVM_KEY = 10b
EVM_BUTTON = 100b
EVM_EXIT = 1000b
EVM_BACKGROUND = 10000b
EVM_MOUSE = 100000b
EVM_IPC = 1000000b
EVM_STACK = 10000000b
/programs/develop/SPForth/Tupfile.lua
1,4 → 1,3
if tup.getconfig("NO_FASM") ~= "" then return end
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")
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")
/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.box.width]
mov eax,[pinfo.x_size]
cdq
sub eax,20
mov ebx,6
div ebx
mov [pinfo.box.left],eax
mov [pinfo.x_start],eax
 
mov eax,[pinfo.box.height]
mov eax,[pinfo.y_size]
cdq
sub eax,40
mov ebx,ROWH
div ebx
 
mov [pinfo.box.top],eax
mov [pinfo.y_start],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.box.height]
add ecx,[pinfo.y_size]
sub ecx,eax
sub ecx,4
mov ebx,[pinfo.box.width]
mov ebx,[pinfo.x_size]
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.box.left]
mov ecx,[pinfo.x_start]
; test ecx,ecx
; jnz .no0
; inc ecx
261,7 → 261,7
jb .again
and dword[ebp],0
; dpd esi
mov eax,[pinfo.box.top]
mov eax,[pinfo.y_start]
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.box.left]
mov ecx,[pinfo.x_start]
; test ecx,ecx
; jnz .no0
; inc ecx
339,7 → 339,7
jb e_.again
and dword[ebp],0
; dpd esi
mov eax,[pinfo.box.top]
mov eax,[pinfo.y_start]
shl eax,3
sub ebp,eax
cmp ebp,os_work