Menu
▾
▴
win32forth-cvs — CVS Commit List
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(70) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(38) |
Feb
(4) |
Mar
(11) |
Apr
(49) |
May
(81) |
Jun
(65) |
Jul
(36) |
Aug
(57) |
Sep
(63) |
Oct
(57) |
Nov
(49) |
Dec
(41) |
| 2006 |
Jan
(75) |
Feb
(80) |
Mar
(10) |
Apr
(13) |
May
(100) |
Jun
(100) |
Jul
(77) |
Aug
(87) |
Sep
(80) |
Oct
(124) |
Nov
(39) |
Dec
(41) |
| 2007 |
Jan
(20) |
Feb
(32) |
Mar
(32) |
Apr
(43) |
May
(146) |
Jun
(40) |
Jul
(49) |
Aug
(33) |
Sep
(25) |
Oct
(19) |
Nov
(11) |
Dec
(8) |
| 2008 |
Jan
(4) |
Feb
(11) |
Mar
(31) |
Apr
(40) |
May
(34) |
Jun
(24) |
Jul
(39) |
Aug
(104) |
Sep
(27) |
Oct
(35) |
Nov
(34) |
Dec
(97) |
| 2009 |
Jan
(75) |
Feb
(29) |
Mar
(45) |
Apr
(76) |
May
(121) |
Jun
(103) |
Jul
(67) |
Aug
(28) |
Sep
(22) |
Oct
(39) |
Nov
(9) |
Dec
(15) |
| 2010 |
Jan
(7) |
Feb
(39) |
Mar
(40) |
Apr
(57) |
May
(67) |
Jun
(69) |
Jul
(49) |
Aug
(68) |
Sep
(22) |
Oct
(7) |
Nov
(2) |
Dec
(10) |
| 2011 |
Jan
|
Feb
|
Mar
(10) |
Apr
(4) |
May
(6) |
Jun
(10) |
Jul
(16) |
Aug
(23) |
Sep
(9) |
Oct
|
Nov
(28) |
Dec
(3) |
| 2012 |
Jan
(11) |
Feb
(10) |
Mar
(1) |
Apr
|
May
(4) |
Jun
(3) |
Jul
(3) |
Aug
(4) |
Sep
(2) |
Oct
|
Nov
|
Dec
(1) |
| 2013 |
Jan
|
Feb
(7) |
Mar
(30) |
Apr
(4) |
May
(4) |
Jun
(8) |
Jul
(10) |
Aug
(4) |
Sep
|
Oct
(2) |
Nov
(24) |
Dec
(13) |
| 2014 |
Jan
(7) |
Feb
(2) |
Mar
|
Apr
(1) |
May
(9) |
Jun
|
Jul
(3) |
Aug
(9) |
Sep
|
Oct
(2) |
Nov
|
Dec
(3) |
| 2015 |
Jan
(4) |
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
(5) |
Sep
(1) |
Oct
(4) |
Nov
(7) |
Dec
(39) |
| 2016 |
Jan
(17) |
Feb
(2) |
Mar
(2) |
Apr
|
May
(1) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(2) |
| 2017 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
(1) |
Jun
(2) |
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2018 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2022 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
(2) |
Nov
(1) |
Dec
(1) |
| 2023 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Dirk B. <db...@us...> - 2005-01-08 13:51:56
|
Update of /cvsroot/win32forth/win32forth/apps/WinEd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14455/apps/WinEd Modified Files: WinEd.f Log Message: dbu: changed the path to the icon files's to match the new folder structure Index: WinEd.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/WinEd/WinEd.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WinEd.f 21 Dec 2004 00:18:50 -0000 1.1 --- WinEd.f 8 Jan 2005 13:51:46 -0000 1.2 *************** *** 7050,7054 **** :M DefaultIcon: ( -- hIcon ) \ return the default icon handle for window \ 101 appInst Call LoadIcon ! s" res\WinEd.ico" Prepend<home>\ LoadIconFile ;M --- 7050,7054 ---- :M DefaultIcon: ( -- hIcon ) \ return the default icon handle for window \ 101 appInst Call LoadIcon ! s" src\res\WinEd.ico" Prepend<home>\ LoadIconFile ;M |
|
From: Dirk B. <db...@us...> - 2005-01-08 13:51:56
|
Update of /cvsroot/win32forth/win32forth In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14455 Modified Files: setup.exe Log Message: dbu: changed the path to the icon files's to match the new folder structure Index: setup.exe =================================================================== RCS file: /cvsroot/win32forth/win32forth/setup.exe,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsNw384B and /tmp/cvsj05GYk differ |
|
From: Dirk B. <db...@us...> - 2005-01-08 13:51:55
|
Update of /cvsroot/win32forth/win32forth/apps/ProMgr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14455/apps/ProMgr Modified Files: ProjectManager.f Log Message: dbu: changed the path to the icon files's to match the new folder structure Index: ProjectManager.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ProMgr/ProjectManager.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ProjectManager.f 21 Dec 2004 00:18:46 -0000 1.1 --- ProjectManager.f 8 Jan 2005 13:51:45 -0000 1.2 *************** *** 1117,1121 **** :M DefaultIcon: ( -- hIcon ) \ return the default icon handle for window \ 101 appInst Call LoadIcon ! s" res\Project.ico" Prepend<home>\ LoadIconFile ;M --- 1117,1121 ---- :M DefaultIcon: ( -- hIcon ) \ return the default icon handle for window \ 101 appInst Call LoadIcon ! s" src\res\Project.ico" Prepend<home>\ LoadIconFile ;M |
|
From: Dirk B. <db...@us...> - 2005-01-08 13:51:55
|
Update of /cvsroot/win32forth/win32forth/apps/ForthForm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14455/apps/ForthForm Modified Files: FORTHFORM.F Log Message: dbu: changed the path to the icon files's to match the new folder structure Index: FORTHFORM.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/FORTHFORM.F,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FORTHFORM.F 21 Dec 2004 00:18:45 -0000 1.1 --- FORTHFORM.F 8 Jan 2005 13:51:45 -0000 1.2 *************** *** 809,813 **** :M DefaultIcon: ( -- hIcon ) \ return the default icon handle for window \ 101 appInst Call LoadIcon ! s" res\ForthForm.ico" Prepend<home>\ LoadIconFile ;M --- 809,813 ---- :M DefaultIcon: ( -- hIcon ) \ return the default icon handle for window \ 101 appInst Call LoadIcon ! s" src\res\ForthForm.ico" Prepend<home>\ LoadIconFile ;M |
|
From: Dirk B. <db...@us...> - 2005-01-08 13:51:54
|
Update of /cvsroot/win32forth/win32forth/apps/Setup In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14455/apps/Setup Modified Files: Setup_dtop_lnk.f Log Message: dbu: changed the path to the icon files's to match the new folder structure Index: Setup_dtop_lnk.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Setup/Setup_dtop_lnk.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvseiNr1u and /tmp/cvsg1KC2c differ |
|
From: Dirk B. <db...@us...> - 2005-01-06 16:55:10
|
Update of /cvsroot/win32forth/win32forth/apps/SciEdit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15229/apps/SciEdit Modified Files: CommandID.f EdCommand.f EdMenu.f EdVersion.f Main.f Log Message: dbu: New command "Help for highlighted Win32-API function" added to the help menu. The Win32-SDK help file is needed for this command. If you don't have a copy you can download it from: http://www.borland.com/devsupport/borlandcpp/patches/BC52HLP1.ZIP Don't forget to copy the win32.hlp file into the 'doc\\hlp' folder of your Win32Forth version Index: Main.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/Main.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Main.f 21 Dec 2004 00:18:48 -0000 1.1 --- Main.f 6 Jan 2005 16:54:52 -0000 1.2 *************** *** 18,23 **** : sysgen ; ! s" apps\SciEdit" "fpath+ ! \ s" src\wined" "fpath+ s" apps\wined\res" "fpath+ --- 18,22 ---- : sysgen ; ! s" apps\SciEdit" "fpath+ s" apps\wined\res" "fpath+ *************** *** 617,620 **** --- 616,620 ---- \ Help menu FCONTROL VK_F1 IDM_W32F_ANS_HELP ACCELENTRY + FSHIFT VK_F1 IDM_API_HELP ACCELENTRY 0 VK_F1 IDM_W32F_DOC ACCELENTRY FALT VK_F1 IDM_ANS_DOC ACCELENTRY Index: EdVersion.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/EdVersion.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EdVersion.f 21 Dec 2004 00:18:48 -0000 1.1 --- EdVersion.f 6 Jan 2005 16:54:52 -0000 1.2 *************** *** 1,5 **** \ $Id$ ! 10120 value sciedit_version# \ Version numbers: v.ww.rr --- 1,5 ---- \ $Id$ ! 10121 value sciedit_version# \ Version numbers: v.ww.rr *************** *** 162,166 **** dbu Montag, November 08 2004 - Update w32fScintilla.dll to use the latest Scintilla Version 1.62 ! - File>Exit terminated SciEdit without saving changed files \ changes for Version 1.01.20 --- 162,166 ---- dbu Montag, November 08 2004 - Update w32fScintilla.dll to use the latest Scintilla Version 1.62 ! - File>Exit terminated SciEdit without saving changed files; fixed \ changes for Version 1.01.20 *************** *** 169,171 **** --- 169,183 ---- used to navigate within HTML documents and for browseing within the source files (Hyperlinking) + + \ changes for Version 1.01.21 + dbu Sonntag, Dezember 26 2004 + - New command "Help for highlighted Win32-API function" added to + the help menu. The Win32-SDK help file is needed for this command. + If you don't have a copy you can download it from: + + http://www.borland.com/devsupport/borlandcpp/patches/BC52HLP1.ZIP + + Don't forget to copy the win32.hlp file into the 'doc\hlp' folder of + your Win32Forth version + |
|
From: Alex M. <ale...@us...> - 2005-01-05 23:30:11
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27134/src Modified Files: imagehds.f imageman.f Log Message: arm: add export dictionary table (EDT) structure; simplify error handling Index: imagehds.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/imagehds.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** imagehds.f 21 Dec 2004 00:19:09 -0000 1.1 --- imagehds.f 5 Jan 2005 23:30:00 -0000 1.2 *************** *** 142,145 **** --- 142,158 ---- \ VALUE LEN-HINT DROP \ modifiable + FLDBASE BASE-EDT \ export dictionary table + 4 FLD EDT-FLAGS \ EXPORT FLAGS + 4 FLD EDT-TIMEDATE \ time date of binding + 4 FLD EDT-VERSION \ VERSION + 4 FLD EDT-DLLNAME \ NAME RVA + 4 FLD EDT-ORDBASE \ ORDINAL BASE + 4 FLD EDT-#EAT \ # EAT ENTRIES + 4 FLD EDT-#NAMES \ # NAME POINTERS + 4 FLD EDT-RVA-ADDR \ ADDRESS TABLE RVA + 4 FLD EDT-RVA-NAME \ NAME POINTER TABLE RVA + 4 FLD EDT-RVA-ORD \ ORDINAL TABLE RVA + CONSTANT LEN-EDT DROP + FLDBASE BASE-RELOC \ relocation 4 FLD RELOC-RVA-PAGE \ rva of page for relocation table Index: imageman.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/imageman.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** imageman.f 21 Dec 2004 00:19:09 -0000 1.1 --- imageman.f 5 Jan 2005 23:30:00 -0000 1.2 *************** *** 157,185 **** -1 VALUE PEIMG-HNDL ! : PEIMG-FERROR ( -- ) cr ." File '" PEIMG-NAME count type ." ' : " ! WinErrMsg ON GetLastWinErr ; : PEIMG-FCREATE ( -- ) ! PEIMG-NAME COUNT r/w create-file if PEIMG-FERROR then to PEIMG-HNDL ; : PEIMG-FOPEN ( -- ) ! PEIMG-NAME COUNT r/w open-file if PEIMG-FERROR then to PEIMG-HNDL ; : PEIMG-FCLOSE ( -- ) ! PEIMG-HNDL CLOSE-FILE if PEIMG-FERROR then -1 to PEIMG-HNDL ; : PEIMG-FWRITE ( addr len -- ) ! PEIMG-HNDL WRITE-FILE if PEIMG-FERROR then ; : PEIMG-FREPOS ( n -- ) \ reposition file ! s>d PEIMG-HNDL REPOSITION-FILE if PEIMG-FERROR then ; : PEIMG-FPOS ( -- n ) \ file position ! PEIMG-HNDL FILE-POSITION if PEIMG-FERROR then d>s ; --- 157,187 ---- -1 VALUE PEIMG-HNDL ! : ?PEIMG-FERROR ( flag -- ) ! if cr ." File '" PEIMG-NAME count type ." ' : " ! WinErrMsg ON GetLastWinErr ! then ; : PEIMG-FCREATE ( -- ) ! PEIMG-NAME COUNT r/w create-file ?PEIMG-FERROR to PEIMG-HNDL ; : PEIMG-FOPEN ( -- ) ! PEIMG-NAME COUNT r/w open-file ?PEIMG-FERROR to PEIMG-HNDL ; : PEIMG-FCLOSE ( -- ) ! PEIMG-HNDL CLOSE-FILE ?PEIMG-FERROR -1 to PEIMG-HNDL ; : PEIMG-FWRITE ( addr len -- ) ! PEIMG-HNDL WRITE-FILE ?PEIMG-FERROR ; : PEIMG-FREPOS ( n -- ) \ reposition file ! s>d PEIMG-HNDL REPOSITION-FILE ?PEIMG-FERROR ; : PEIMG-FPOS ( -- n ) \ file position ! PEIMG-HNDL FILE-POSITION ?PEIMG-FERROR d>s ; *************** *** 228,236 **** : RES-FOPEN ( -- ) ! RES-NAME COUNT r/w open-file if PEIMG-FERROR then to RES-HNDL ; : RES-FSIZE ( -- n ) ! RES-HNDL file-size if PEIMG-FERROR then abort" File too large to process" ; --- 230,238 ---- : RES-FOPEN ( -- ) ! RES-NAME COUNT r/w open-file ?PEIMG-FERROR to RES-HNDL ; : RES-FSIZE ( -- n ) ! RES-HNDL file-size ?PEIMG-FERROR abort" File too large to process" ; |
|
From: Alex M. <ale...@us...> - 2005-01-03 23:46:44
|
Update of /cvsroot/win32forth/win32forth/src/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26918/src/kernel Modified Files: fkernel.f Log Message: arm: corrected bug in \ comment Index: fkernel.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/kernel/fkernel.f,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** fkernel.f 2 Jan 2005 23:04:55 -0000 1.2 --- fkernel.f 3 Jan 2005 23:46:33 -0000 1.3 *************** *** 2030,2035 **** VARIABLE LOADLINE VARIABLE ?LOADING - 0 VALUE SOURCE-ID VARIABLE >IN \ offset in to input stream MAXSTRING 2 + ALIGNED EQU TIBLEN --- 2030,2035 ---- VARIABLE LOADLINE VARIABLE ?LOADING VARIABLE >IN \ offset in to input stream + 0 VALUE SOURCE-ID MAXSTRING 2 + ALIGNED EQU TIBLEN *************** *** 4591,4609 **** DEFER INTERPRET ' _INTERPRET IS INTERPRET - \ -------------------- Evaluate --------------------------------------------- - - : EVALUATE ( addr len -- ) \ interpret string addr,len - SOURCE 2>R - >IN @ >R - SOURCE-ID >R - (SOURCE) 2! - >IN OFF - -1 TO SOURCE-ID - ['] INTERPRET CATCH - R> TO SOURCE-ID - R> >IN ! - 2R> (SOURCE) 2! - THROW ; - 1 PROC Sleep --- 4591,4594 ---- *************** *** 4787,4790 **** --- 4772,4777 ---- in-application + \ -------------------- save/restore file input ------------------------------ + : SAVE-INPUT ( -- ... 7 ) \ save input LOADFILE *************** *** 4810,4816 **** FALSE ; ! in-system ! ! | CODE (SAVE-INPUT) ( -- R: ... 7 ) \ save input to rstack mov -8 CELLS [ebp], ebx pop -7 CELLS [ebp] --- 4797,4801 ---- FALSE ; ! | CODE (SAVE-INPUT) ( ... 7 -- R: ... 7 ) \ save input to rstack mov -8 CELLS [ebp], ebx pop -7 CELLS [ebp] *************** *** 4825,4829 **** next c; ! | CODE (RESTORE-INPUT) ( -- R: ... 7 ) \ save input to rstack push ebx push 7 CELLS [ebp] --- 4810,4814 ---- next c; ! | CODE (RESTORE-INPUT) ( R: ... 7 -- ... 7 ) \ save input to stack push ebx push 7 CELLS [ebp] *************** *** 4838,4841 **** --- 4823,4841 ---- next c; + \ -------------------- Evaluate --------------------------------------------- + + : EVALUATE ( addr len -- ) \ interpret string addr,len + save-input (save-input) + (SOURCE) 2! + >IN OFF + -1 TO SOURCE-ID + ['] INTERPRET CATCH + (restore-input) restore-input drop + THROW ; + + \ -------------------- Include file support --------------------------------- + + in-system + DEFER START-INCLUDE ' NOOP IS START-INCLUDE DEFER END-INCLUDE ' NOOP IS END-INCLUDE *************** *** 4844,4850 **** SAVE-INPUT (SAVE-INPUT) \ save source to rstack ( fileid ) TO SOURCE-ID - \ TIBLEN _LOCALALLOC - \ (SOURCE) CELL+ ! \ point at new buffer - ?LOADING ON \ mark as loading a file POCKET LINKFILE \ create a filename link --- 4844,4847 ---- *************** *** 4855,4859 **** END-INCLUDE - \ _LOCALFREE SOURCE-ID CLOSE-FILE DROP THROW \ throw load error if any --- 4852,4855 ---- *************** *** 4886,4891 **** : \ ( -- ) ! (SOURCE) >IN ! ; IMMEDIATE ! \ -------------------- Locals Allocation on rstack -------------------------- --- 4882,4886 ---- : \ ( -- ) ! (SOURCE) @ >IN ! ; IMMEDIATE \ -------------------- Locals Allocation on rstack -------------------------- |
|
From: Alex M. <ale...@us...> - 2005-01-03 23:46:42
|
Update of /cvsroot/win32forth/win32forth In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26918 Modified Files: fkernel.exe Log Message: arm: corrected bug in \ comment Index: fkernel.exe =================================================================== RCS file: /cvsroot/win32forth/win32forth/fkernel.exe,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvs2Ocz7V and /tmp/cvsysXMDf differ |
|
From: Alex M. <ale...@us...> - 2005-01-02 23:05:09
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25726/src Modified Files: 486ASM.F ASMWIN32.F CALLBACK.f MAPFILE.F Log Message: arm: removed callback from kernel; added cmovxx instructions to assembler; factored macro[ ]macro Index: ASMWIN32.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/ASMWIN32.F,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ASMWIN32.F 21 Dec 2004 00:19:07 -0000 1.1 --- ASMWIN32.F 2 Jan 2005 23:04:55 -0000 1.2 *************** *** 3,6 **** --- 3,7 ---- \ ASMWIN32.F beta 3.1A 2002/09/25 arm performance enhancements \ ASMWIN32.F beta 3.3D 2002/10/08 Consolidation + \ arm 02/01/2005 21:28:34 factor macro[ ]macro to reduce postpone word count cr .( Loading 486ASM/Win32Forth Interface File...) *************** *** 92,103 **** also assembler also asm-hidden current @ also forth definitions nostack1 : macro[ ( create a macro in the assembler vocabulary ) save-current also assembler definitions ! postpone enter-macro ! postpone a; ; immediate : ]macro ( end a macro definition ) ! postpone a; ! postpone leave-macro previous restore-current ; immediate --- 93,105 ---- also assembler also asm-hidden current @ also forth definitions nostack1 + : (macro[) a; enter-macro ; + : (]macro) leave-macro a; ; + : macro[ ( create a macro in the assembler vocabulary ) save-current also assembler definitions ! postpone (macro[) ; immediate : ]macro ( end a macro definition ) ! postpone (]macro) previous restore-current ; immediate Index: CALLBACK.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/CALLBACK.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CALLBACK.f 21 Dec 2004 00:19:07 -0000 1.1 --- CALLBACK.f 2 Jan 2005 23:04:55 -0000 1.2 *************** *** 2,8 **** --- 2,115 ---- \ CALLBACK.F Windows Callback support by Tom Zimmer + \ arm 21/12/2004 21:21:09 Callback support -- moved out of kernel cr .( Loading Windows Callback...) + in-application + + \ -------------------- Callback Support ------------------------------------- + + \ CALLBACK-RETURN and CALLBACK-BEGIN restore and save regs, set up EBP and ESP + \ BUILD-CALLBACK uses ECX as parm count, ret count on stack -- __CDECL sets to zero + + NCODE CALLBACK-RETURN \ general return code, restores all but ecx! + code-here cell+ code-, \ make an ITC + mov eax, ebx \ return value + mov esp, ebp + pop SP0 [UP] + pop esi + pop edi + pop ebx + pop ebp + pop ecx \ count + lea ecx, 1234 [ecx] [ecx*2] \ calculate jump offset (4 byte lea version!) + a; code-here cell- \ point at the offset in lea + jmp ecx \ back to caller + a; code-here swap ! \ correct the lea calculation + ret nop nop \ 3 bytes long ret + ret 1 cells + ret 2 cells + ret 3 cells + ret 4 cells + ret 5 cells + ret 6 cells + ret 7 cells + c; + + CFA-CODE CALLBACK-BEGIN \ general start code, don't disturb EAX! + push ebp \ save regs, return count is already on the stack + push ebx + push edi + push esi + + xor edi, edi \ edi is constant 0 + mov edx, fs: 0x14 \ edx is now ptr TIB pvArbitrary + push SP0 [UP] \ save sp0 on stack + + mov ebp, esp + sub esp, # 4096 32 - \ room for return stack (Not RSTACKSIZE, please!) + and esp, # -16 \ align to 16 byte boundary + mov SP0 [UP] , esp \ reset SP0 + + lea ebx, [ebp] [ecx*4] \ adjust ebx + neg ecx \ negate ecx + lea ecx, 1234 [ecx] [ecx*2] \ calculate jump offset (4 byte lea version!) + a; code-here cell- \ point at the offset (the 1234) in lea + jmp ecx \ and leap... + a; code-here 7 3 * + swap ! \ correct the lea calculation + push ( 0 cells) [ebx] nop \ 7 callback, nop for short from + push 1 cells [ebx] \ all entries 3 bytes + push 2 cells [ebx] + push 3 cells [ebx] + push 4 cells [ebx] + push 5 cells [ebx] \ 2 callback + push 6 cells [ebx] \ 1 callback + pop ebx \ 0 callback -- recover ebx + + mov esi, # ' callback-return + exec c; \ go for it + + in-system + + variable __CDECLV 0 __CDECLV ! \ for __cdecl type callbacks + : __STDCALL ; IMMEDIATE \ does nothing, callback is stdcall + : __CDECL __CDECLV ON ; \ turn on __cdecl type callback + + : BUILD-CALLBACK ( n1 -- a1 a2 ) \ define a callback procedure + >r \ generated via macro[ ]macro + code-here \ func address (a1) + macro[ mov eax, # 1234 \ mov eax, # cfa to execute + mov ecx, # r@ \ mov ecx, # args + push \ push something + __cdeclv @ if + __cdeclv off \ turn off cdecl + # 0 \ if __cdecl, push # 0 + else + ecx \ else push # args + then jmp callback-begin + ]macro + r>drop dup 2 + \ cfa address (a2) + ; + + : CALLBACK ( n1 -<name function>- ) \ define a callback with "name" that has n1 args + ( -- a1 ) \ runtime, returns address of callback + BUILD-CALLBACK >R CONSTANT ' R> ! + ; + + : CALLBACK: ( args -<name>- ) \ makes a headerless callback function, only + ( -- a1 ) \ the callback structure has a header + BUILD-CALLBACK >R + MAXSTRING _LOCALALLOC >R \ use a dynamic string buffer + S" CONSTANT &" R@ PLACE + >IN @ BL WORD COUNT R@ +PLACE + >IN ! \ get a copy of next word in input stream + R> COUNT EVALUATE \ make a constant starting with '&' + _LOCALFREE + : \ build the colon definitions starting structure + HERE CELL- R> ! \ patch callback structure + ; + + IN-APPLICATION + \ ************************************************************************* \ **************** allow Forth to handle windows messages ***************** *************** *** 112,114 **** in-application - |
|
From: Alex M. <ale...@us...> - 2005-01-02 23:05:07
|
Update of /cvsroot/win32forth/win32forth/src/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25726/src/kernel Modified Files: fkernel.f Log Message: arm: removed callback from kernel; added cmovxx instructions to assembler; factored macro[ ]macro Index: fkernel.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/kernel/fkernel.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** fkernel.f 21 Dec 2004 00:19:09 -0000 1.1 --- fkernel.f 2 Jan 2005 23:04:55 -0000 1.2 *************** *** 2782,2785 **** --- 2782,2787 ---- VARIABLE [UNKNOWN] \ also used to store last cfa found + in-system + CODE >NAME ( CFA -- NFA ) \ search vocabs for cfa, return nfa \ Follows the VOC-LINK pointer to all of the vocabularies, searches threads for CFA *************** *** 2815,2818 **** --- 2817,2822 ---- pop edx \ restore edx next c; + + in-application 4 CONSTANT OFA-BIT *************** *** 3079,3083 **** TRUE TO SYS-WARNING? ; ! : COMPILE, ( xt -- ) \ compile DUP SYS-ADDR? \ address in system space IN-SYS? 0= AND \ not currently system pointer --- 3083,3087 ---- TRUE TO SYS-WARNING? ; ! : (COMPILE,) ( xt -- ) \ compile DUP SYS-ADDR? \ address in system space IN-SYS? 0= AND \ not currently system pointer *************** *** 3086,3089 **** --- 3090,3095 ---- , ; \ same as , but with warning + DEFER COMPILE, ' (COMPILE,) IS COMPILE, + CODE COMPILE ( -- ) \ compile xt following push ebx *************** *** 3158,3178 **** BL WORD 1+ C@ ; in-system : [CHAR] ( -- char ) CHAR [COMPILE] LITERAL ; IMMEDIATE - in-application - - : ' ( -- cfa ) - DEFINED ?MISSING ; - in-system - : ['] ( -<name>- ) ' [COMPILE] LITERAL ; IMMEDIATE - : [COMPILE] ( -<name>- ) - ' COMPILE, ; IMMEDIATE - : POSTPONE ( -<name>- ) DEFINED DUP ?MISSING --- 3164,3180 ---- BL WORD 1+ C@ ; + : ' ( -- cfa ) + DEFINED ?MISSING ; in-system + : [COMPILE] ( -<name>- ) + ' COMPILE, ; IMMEDIATE + : [CHAR] ( -- char ) CHAR [COMPILE] LITERAL ; IMMEDIATE : ['] ( -<name>- ) ' [COMPILE] LITERAL ; IMMEDIATE : POSTPONE ( -<name>- ) DEFINED DUP ?MISSING *************** *** 4121,4125 **** : IF ?COMP HERE 2 CELLS - @ DUP ['] COMPILE = SWAP ['] LIT = OR 0= ! HERE CELL - @ ['] DUP = AND IF CELL NEGATE ALLOT COMPILE -?BRANCH ELSE COMPILE ?BRANCH --- 4123,4127 ---- : IF ?COMP HERE 2 CELLS - @ DUP ['] COMPILE = SWAP ['] LIT = OR 0= ! HERE CELL - @ ['] DUP = AND IF CELL NEGATE ALLOT COMPILE -?BRANCH ELSE COMPILE ?BRANCH *************** *** 4250,4254 **** DUP 0= THROW_NAMEREQD AND THROW "CLIP" - \ CAPS @ IF 2DUP UPPER THEN \ bad; should really copy 2dup UPPER \ bad; should really copy WARNING @ IF --- 4252,4255 ---- *************** *** 5258,5262 **** R> BASE ! \ restore base ; ! : WARNMSG ( n -- ) \ prints Warning: S" Warning" (TYPEMSG) ; \ mark the source line in error, warning --- 5259,5263 ---- R> BASE ! \ restore base ; ! : WARNMSG ( n -- ) \ prints Warning: S" Warning" (TYPEMSG) ; \ mark the source line in error, warning *************** *** 5525,5636 **** - \ -------------------- Callback Support ------------------------------------- - - \ CALLBACK-RETURN and CALLBACK-BEGIN restore and save regs, set up EBP and ESP - \ BUILD-CALLBACK uses ECX as parm count, EDX as ret count -- __CDECL sets to zero - - NCODE CALLBACK-RETURN \ general return code, restores all but ecx! - here-c cell+ ,-c \ make an ITC - mov eax, ebx \ return value - mov esp, ebp - pop SP0 [UP] - pop esi - pop edi - pop ebx - pop ebp - pop ecx \ count - lea ecx, 1234 [ecx] [ecx*2] \ calculate jump offset (4 byte lea version!) - a; here-c cell- \ point at the offset in lea - jmp ecx \ back to caller - a; here-c swap !-C \ correct the lea calculation - ret nop nop \ 3 bytes long ret - ret 1 cells - ret 2 cells - ret 3 cells - ret 4 cells - ret 5 cells - ret 6 cells - ret 7 cells - c; - - CFA-CODE CALLBACK-BEGIN \ general start code, don't disturb EAX! - push ebp \ save regs, return count is already on the stack - push ebx - push edi - push esi - - xor edi, edi \ edi is constant 0 - mov edx, fs: 0x14 \ edx is now ptr TIB pvArbitrary - push SP0 [UP] \ save sp0 on stack - - mov ebp, esp - sub esp, # 4096 32 - \ room for return stack (Not RSTACKSIZE, please!) - and esp, # -16 \ align to 16 byte boundary - mov SP0 [UP] , esp \ reset SP0 - - lea ebx, [ebp] [ecx*4] \ adjust ebx - neg ecx \ negate ecx - lea ecx, 1234 [ecx] [ecx*2] \ calculate jump offset (4 byte lea version!) - a; here-c cell- \ point at the offset (the 1234) in lea - jmp ecx \ and leap... - a; here-c 7 3 * + swap !-C \ correct the lea calculation - push ( 0 cells) [ebx] nop \ 7 callback, nop for short from - push 1 cells [ebx] \ all entries 3 bytes - push 2 cells [ebx] - push 3 cells [ebx] - push 4 cells [ebx] - push 5 cells [ebx] \ 2 callback - push 6 cells [ebx] \ 1 callback - pop ebx \ 0 callback -- recover ebx - - lea esi, ' callback-return - exec c; \ go for it - - ASSEMBLER CALLBACK-BEGIN META CONSTANT CALLBACK-BEGIN - - in-system - - variable __CDECLV 0 __CDECLV ! \ for __cdecl type callbacks - : __STDCALL ; IMMEDIATE \ does nothing, callback is stdcall - : __CDECL __CDECLV ON ; \ turn on __cdecl type callback - - : BUILD-CALLBACK ( n1 -- a1 a2 ) \ define a callback procedure - >R - CODE-HERE \ func address (a1) - 0XB8 CODE-C, \ mov eax, # cfa to execute - CODE-HERE \ cfa address (a2) - 0 CODE-, \ the cfa address - 0XB9 CODE-C, \ mov ecx, # args - R> CODE-, \ # of args - __CDECLV @ IF \ if __cdecl call - 0X006A CODE-W, \ push # 0 - __CDECLV OFF \ turn off cdecl - ELSE - 0X51 CODE-C, \ push ecx - THEN - 0XE9 CODE-C, \ jmp callback-begin - CALLBACK-BEGIN CODE-HERE CELL+ - CODE-, \ jmp address - ; - - : CALLBACK ( n1 -<name function>- ) \ define a callback with "name" that has n1 args - ( -- a1 ) \ runtime, returns address of callback - BUILD-CALLBACK >R CONSTANT ' R> ! - ; - - : CALLBACK: ( args -<name>- ) \ makes a headerless callback function, only - ( -- a1 ) \ the callback structure has a header - BUILD-CALLBACK >R - MAXCSTRING _LOCALALLOC >R \ use a dynamic string buffer - S" CONSTANT &" R@ PLACE - >IN @ BL WORD COUNT R@ +PLACE - >IN ! \ get a copy of next word in input stream - R> COUNT EVALUATE \ make a constant starting with '&' - _LOCALFREE - : \ build the colon definitions starting structure - HERE CELL- R> ! \ patch callback structure - ; - - IN-APPLICATION - \ -------------------- Tools -------------------- --- 5526,5529 ---- *************** *** 5880,5882 **** \ Prad~ - |
|
From: Alex M. <ale...@us...> - 2005-01-02 23:05:04
|
Update of /cvsroot/win32forth/win32forth In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25726 Modified Files: fkernel.exe Log Message: arm: removed callback from kernel; added cmovxx instructions to assembler; factored macro[ ]macro Index: fkernel.exe =================================================================== RCS file: /cvsroot/win32forth/win32forth/fkernel.exe,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsAyvV2L and /tmp/cvszRHi4g differ |
|
From: Jos v.d.V. <jo...@us...> - 2005-01-02 13:26:50
|
Update of /cvsroot/win32forth/win32forth/proj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8651/proj Modified Files: WinEd.fpj Log Message: - Jos: Adapted for the new directory structure Index: WinEd.fpj =================================================================== RCS file: /cvsroot/win32forth/win32forth/proj/WinEd.fpj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WinEd.fpj 1 Jan 2005 19:52:02 -0000 1.2 --- WinEd.fpj 2 Jan 2005 13:26:40 -0000 1.3 *************** *** 25,30 **** wined.NDX WinEdColorize.f ! apps\WinEd\res\WinEdit.res ! apps\WinEd\res\WinEdit.h Resources,1 apps\WinEd\res\WinEd.bmp --- 25,30 ---- wined.NDX WinEdColorize.f ! src\WinEd\res\WinEdit.res ! src\WinEd\res\WinEdit.h Resources,1 apps\WinEd\res\WinEd.bmp |
|
From: Jos v.d.V. <jo...@us...> - 2005-01-01 19:52:14
|
Update of /cvsroot/win32forth/win32forth/proj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12412/proj Modified Files: WinEd.fpj Log Message: - Jos: Adapted for the new directory structure Index: WinEd.fpj =================================================================== RCS file: /cvsroot/win32forth/win32forth/proj/WinEd.fpj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WinEd.fpj 21 Dec 2004 00:19:07 -0000 1.1 --- WinEd.fpj 1 Jan 2005 19:52:02 -0000 1.2 *************** *** 3,23 **** SearchPath= .;SRC;SRC\LIB;RES;DEMOS;SRC\CONSOLE;HTM;src\WinEd;src\WinEd\res WinEd,0 ! Modules,16 ! src\WinEd\WinEd.f ! src\WinEd\WinEd_Version.f ! src\WinEd\sub_dirs.f ! src\WinEd\WinED_Statbar.f ! src\WinEd\x_Search.f ! src\WinEd\hyper.f ! src\WinEd\smart-cr.f ! src\WinEd\WinEd_Toolbar.f ! src\WinEd\WinEd_Menu.f SRC\LIB\sub_dirs.f ! src\WinEd\w_search.f ! src\WinEd\HyperLink.f ! SRC\array.f ! src\WinEd\EdFindInFiles.f ! src\WinEd\EdDebug.f ! src\WinEd\EdRemote.f DLLs,0 Forms,0 --- 3,22 ---- SearchPath= .;SRC;SRC\LIB;RES;DEMOS;SRC\CONSOLE;HTM;src\WinEd;src\WinEd\res WinEd,0 ! Modules,15 ! apps\WinEd\WinEd.f ! apps\WinEd\WinEd_Version.f ! apps\WinEd\WinED_Statbar.f ! apps\WinEd\x_Search.f ! apps\WinEd\hyper.f ! apps\WinEd\smart-cr.f ! apps\WinEd\WinEd_Toolbar.f ! apps\WinEd\WinEd_Menu.f SRC\LIB\sub_dirs.f ! apps\WinEd\w_search.f ! SRC\LIB\HyperLink.f ! SRC\LIB\array.f ! apps\WinEd\EdFindInFiles.f ! apps\WinEd\EdDebug.f ! apps\WinEd\EdRemote.f DLLs,0 Forms,0 *************** *** 26,32 **** wined.NDX WinEdColorize.f ! src\WinEd\res\WinEdit.res ! src\WinEd\res\WinEdit.h Resources,1 ! src\WinEd\res\WinEd.bmp Docs,0 --- 25,31 ---- wined.NDX WinEdColorize.f ! apps\WinEd\res\WinEdit.res ! apps\WinEd\res\WinEdit.h Resources,1 ! apps\WinEd\res\WinEd.bmp Docs,0 |
|
From: Jos v.d.V. <jo...@us...> - 2005-01-01 19:30:23
|
Update of /cvsroot/win32forth/win32forth/proj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8333/proj Modified Files: SciEdit.fpj Log Message: - Jos: Adapted for the new directory structure Index: SciEdit.fpj =================================================================== RCS file: /cvsroot/win32forth/win32forth/proj/SciEdit.fpj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SciEdit.fpj 21 Dec 2004 00:19:07 -0000 1.1 --- SciEdit.fpj 1 Jan 2005 19:30:13 -0000 1.2 *************** *** 4,24 **** MDi SciEdit,0 Modules,28 ! demos\MdiEdit\Main.f SRC\LIB\Mdi.f ! SRC\LIB\Accel.f SRC\LIB\HtmlDisplayControl.f ! demos\MdiEdit\ScintillaMDI.f ! demos\MdiEdit\ClassBrowser.f ! demos\MdiEdit\CommandID.f ! demos\MdiEdit\EdAbout.f ! demos\MdiEdit\EdCommand.f ! demos\MdiEdit\EdCompile.f ! demos\MdiEdit\EdDebug.f ! demos\MdiEdit\EdMenu.f ! demos\MdiEdit\EdRemote.f ! demos\MdiEdit\EdStatusbar.f ! demos\MdiEdit\EdToolbar.f ! demos\MdiEdit\ScintillaHyperMDI.f ! demos\MdiEdit\AnsLink.f src\Lib\ScintillaControl.f SRC\LIB\AcceleratorTables.f --- 4,24 ---- MDi SciEdit,0 Modules,28 ! apps\SciEdit\Main.f SRC\LIB\Mdi.f ! DEMOS\ACCELDEMO\Accel.f SRC\LIB\HtmlDisplayControl.f ! apps\SciEdit\ScintillaMDI.f ! apps\SciEdit\ClassBrowser.f ! apps\SciEdit\CommandID.f ! apps\SciEdit\EdAbout.f ! apps\SciEdit\EdCommand.f ! apps\SciEdit\EdCompile.f ! apps\SciEdit\EdDebug.f ! apps\SciEdit\EdMenu.f ! apps\SciEdit\EdRemote.f ! apps\SciEdit\EdStatusbar.f ! apps\SciEdit\EdToolbar.f ! apps\SciEdit\ScintillaHyperMDI.f ! apps\SciEdit\AnsLink.f src\Lib\ScintillaControl.f SRC\LIB\AcceleratorTables.f *************** *** 31,35 **** SRC\LIB\RegistryWindowPos.f SRC\LIB\GetWindowPlacment.f ! SRC\Struct.f DLLs,2 w32fHtmlDisplay.dll --- 31,35 ---- SRC\LIB\RegistryWindowPos.f SRC\LIB\GetWindowPlacment.f ! SRC\LIB\Struct.f DLLs,2 w32fHtmlDisplay.dll *************** *** 38,42 **** Auxiliary Files,0 Resources,1 ! demos\MdiEdit\res\Toolbar.bmp Docs,1 ! htm\SciEdit.htm --- 38,42 ---- Auxiliary Files,0 Resources,1 ! apps\SciEdit\res\Toolbar.bmp Docs,1 ! DOC\SCIEDIT\SciEdit.htm |
|
From: Jos v.d.V. <jo...@us...> - 2005-01-01 17:07:38
|
Update of /cvsroot/win32forth/win32forth/proj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9848/proj Modified Files: ProMgr.fpj Log Message: - Jos: Adapted for the new directory structure Index: ProMgr.fpj =================================================================== RCS file: /cvsroot/win32forth/win32forth/proj/ProMgr.fpj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ProMgr.fpj 21 Dec 2004 00:19:06 -0000 1.1 --- ProMgr.fpj 1 Jan 2005 17:07:22 -0000 1.2 *************** *** 4,11 **** Project Manager,0 Modules,27 ! src\ProMgr\ProjectManager.f SRC\LIB\RegistryWindowPos.f SRC\LIB\GetWindowPlacment.f ! SRC\Struct.f SRC\LIB\BROWSEFLD.F SRC\LIB\linklist.f --- 4,11 ---- Project Manager,0 Modules,27 ! apps\ProMgr\ProjectManager.f SRC\LIB\RegistryWindowPos.f SRC\LIB\GetWindowPlacment.f ! SRC\lib\Struct.f SRC\LIB\BROWSEFLD.F SRC\LIB\linklist.f *************** *** 14,25 **** SRC\LIB\file.f SRC\LIB\bitmap.f ! SRC\fcases.f SRC\LIB\excontrols.f SRC\LIB\sendmessage.f SRC\LIB\toolbar.f ! src\ProMgr\zipper.f SRC\LIB\eStruct.f SRC\LIB\multiopen.f ! src\ProMgr\AboutForm.f SRC\LIB\formutils.f SRC\LIB\ScintillaHyperEdit.f --- 14,25 ---- SRC\LIB\file.f SRC\LIB\bitmap.f ! SRC\LIB\fcases.f SRC\LIB\excontrols.f SRC\LIB\sendmessage.f SRC\LIB\toolbar.f ! apps\ProMgr\zipper.f SRC\LIB\eStruct.f SRC\LIB\multiopen.f ! apps\ProMgr\AboutForm.f SRC\LIB\formutils.f SRC\LIB\ScintillaHyperEdit.f *************** *** 27,31 **** SRC\LIB\ScintillaControl.f SRC\LIB\ScintillaLexer.f ! src\wined\HyperLink.f SRC\LIB\HtmlDisplayWindow.f SRC\LIB\HtmlDisplayControl.f --- 27,31 ---- SRC\LIB\ScintillaControl.f SRC\LIB\ScintillaLexer.f ! SRC\LIB\HyperLink.f SRC\LIB\HtmlDisplayWindow.f SRC\LIB\HtmlDisplayControl.f *************** *** 36,46 **** Auxiliary Files,0 Resources,3 ! src\ProMgr\RES\treeimages.bmp ! src\ProMgr\RES\pbitmaps.BMP ! demos\mdiedit\res\toolbar.bmp Docs,5 ! htm\prjFile Menu.gif ! htm\prjHelp Menu.gif ! htm\prjProject Menu.gif ! htm\prjProject Window.gif ! htm\ProjectManager.htm --- 36,46 ---- Auxiliary Files,0 Resources,3 ! apps\ProMgr\RES\treeimages.bmp ! apps\ProMgr\RES\pbitmaps.BMP ! apps\SciEdit\res\toolbar.bmp Docs,5 ! doc\ProMgr\prjFile Menu.gif ! doc\ProMgr\prjHelp Menu.gif ! doc\ProMgr\prjProject Menu.gif ! doc\ProMgr\prjProject Window.gif ! doc\ProMgr\ProjectManager.htm |
|
From: Jos v.d.V. <jo...@us...> - 2005-01-01 16:32:32
|
Update of /cvsroot/win32forth/win32forth/proj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2757/proj Modified Files: ForthForm.fpj Log Message: - Jos: Adapted for the new directory structure Index: ForthForm.fpj =================================================================== RCS file: /cvsroot/win32forth/win32forth/proj/ForthForm.fpj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ForthForm.fpj 21 Dec 2004 00:19:06 -0000 1.1 --- ForthForm.fpj 1 Jan 2005 16:32:11 -0000 1.2 *************** *** 4,39 **** ForthForm,0 Modules,34 ! src\ForthForm\FORTHFORM.F SRC\LIB\excontrols.f SRC\LIB\sendmessage.f SRC\LIB\linklist.f SRC\LIB\bitmap.f ! src\ForthForm\point.f ! src\ForthForm\rect.f SRC\LIB\file.f SRC\LIB\toolbar.f SRC\LIB\enum.f ! src\ForthForm\imagewindow.f ! src\ForthForm\formcontrols.f ! src\ForthForm\formtoolbar.f ! src\ForthForm\formobject.f ! src\ForthForm\about.f ! src\ForthForm\taborder.f ! src\ForthForm\controlpropertyII.f ! src\ForthForm\formproperty.f ! src\ForthForm\testexample.f SRC\LIB\multiopen.f SRC\LIB\formutils.f ! SRC\FORTHFORM\formpad.f ! SRC\FORTHFORM\CreateToolBar.f SRC\LIB\rebarcontrol.f SRC\LIB\HtmlDisplayControl.f ! SRC\FORTHFORM\SplitterWindow.f ! SRC\fcases.f SRC\LIB\ScintillaControl.f ! SRC\FORTHFORM\FileLister.f SRC\LIB\treeview.f ! SRC\FORTHFORM\CreateMenu.f ! SRC\FORTHFORM\caseEx.f SRC\LIB\mdi.f SRC\LIB\mdidialog.f --- 4,39 ---- ForthForm,0 Modules,34 ! apps\ForthForm\FORTHFORM.F SRC\LIB\excontrols.f SRC\LIB\sendmessage.f SRC\LIB\linklist.f SRC\LIB\bitmap.f ! apps\ForthForm\point.f ! apps\ForthForm\rect.f SRC\LIB\file.f SRC\LIB\toolbar.f SRC\LIB\enum.f ! apps\ForthForm\imagewindow.f ! apps\ForthForm\formcontrols.f ! apps\ForthForm\formtoolbar.f ! apps\ForthForm\formobject.f ! apps\ForthForm\about.f ! apps\ForthForm\taborder.f ! apps\ForthForm\controlpropertyII.f ! apps\ForthForm\formproperty.f ! apps\ForthForm\testexample.f SRC\LIB\multiopen.f SRC\LIB\formutils.f ! apps\ForthForm\formpad.f ! apps\ForthForm\CreateToolBar.f SRC\LIB\rebarcontrol.f SRC\LIB\HtmlDisplayControl.f ! apps\ForthForm\SplitterWindow.f ! SRC\LIB\fcases.f SRC\LIB\ScintillaControl.f ! apps\ForthForm\FileLister.f SRC\LIB\treeview.f ! apps\ForthForm\CreateMenu.f ! apps\ForthForm\caseEx.f SRC\LIB\mdi.f SRC\LIB\mdidialog.f *************** *** 44,111 **** w32fHtmlDisplay.dll Forms,4 ! src\ForthForm\controlpropertyII.frm ! src\ForthForm\preferences.frm ! src\ForthForm\example.frm ! SRC\FORTHFORM\forms.frm Auxiliary Files,10 forthform.exe forthform.cfg ! src\ForthForm\PREFERENCES.ff ! src\ForthForm\CONTROLPROPERTYII.ff ! src\ForthForm\CreateMenuForm.ff ! src\ForthForm\CreateToolBarForm.ff ! src\ForthForm\EXAMPLE.ff ! src\ForthForm\FormPad.ff ! src\ForthForm\FORMPROPERTY.ff ! src\ForthForm\SplitterWindow.ff ! Resources,13 ! src\ForthForm\RES\static.bmp ! src\ForthForm\RES\picture.bmp ! src\ForthForm\RES\ffbitmaps.bmp ! src\ForthForm\RES\scrlup.bmp ! src\ForthForm\RES\scrldown.bmp ! forthform.ico ! src\ForthForm\res\Splitwin-type6.bmp ! src\ForthForm\res\splitwin-type1.bmp ! src\ForthForm\res\splitwin-type2.BMP ! src\ForthForm\res\Splitwin-type3.bmp ! src\ForthForm\res\Splitwin-type4.bmp ! src\ForthForm\res\Splitwin-type5.bmp ! RES\forthform.ico Docs,36 ! htm\FF-History.htm ! htm\FF-Menu Functions.htm ! htm\FF-Overview.htm ! htm\FF-Rebuilding The System.htm ! htm\FF-System Requirements.htm ! htm\FF-Toolbar Functions.htm ! htm\FF-Using Forms.htm ! htm\FF-What's New.htm ! htm\Forthform.gif ! htm\ForthForm.htm ! htm\FF-Creating a Form.htm ! htm\FF-back.gif ! htm\FF-Bitmap Preview Window.gif ! htm\FF-Control Property Window.gif ! htm\FF-ControlMenu.gif ! htm\FF-CreateToolbar Window.gif ! htm\FF-Creating a Toolbar.htm ! htm\FF-Customize Window.gif ! htm\FF-Form Property Window.gif ! htm\FF-FormMenu.gif ! htm\FF-FormPad.htm ! htm\FF-FormPad Window.gif ! htm\FF-Forthform Screen.gif ! htm\FF-HelpMenu.gif ! htm\FF-New Window.gif ! htm\FF-OptionsMenu.gif ! htm\FF-Preferences.gif ! htm\FF-Status Window.gif ! htm\FF-textbutton.gif ! htm\FF-Toolbar.gif ! htm\FF-ToolsMenu.gif ! htm\FF-top.gif ! htm\FF-GroupExample.gif ! htm\FF-GroupAction.gif ! htm\FF-SplitterDialog.gif ! htm\FF-Splitter Windows.htm --- 44,110 ---- w32fHtmlDisplay.dll Forms,4 ! apps\ForthForm\controlpropertyII.frm ! apps\ForthForm\preferences.frm ! apps\ForthForm\example.frm ! apps\ForthForm\forms.frm Auxiliary Files,10 forthform.exe forthform.cfg ! apps\ForthForm\PREFERENCES.ff ! apps\ForthForm\CONTROLPROPERTYII.ff ! apps\ForthForm\CreateMenuForm.ff ! apps\ForthForm\CreateToolBarForm.ff ! apps\ForthForm\EXAMPLE.ff ! apps\ForthForm\FormPad.ff ! apps\ForthForm\FORMPROPERTY.ff ! apps\ForthForm\SplitterWindow.ff ! Resources,12 ! apps\ForthForm\RES\static.bmp ! apps\ForthForm\RES\picture.bmp ! apps\ForthForm\RES\ffbitmaps.bmp ! apps\ForthForm\RES\scrlup.bmp ! apps\ForthForm\RES\scrldown.bmp ! src\res\forthform.ico ! apps\ForthForm\res\Splitwin-type6.bmp ! apps\ForthForm\res\splitwin-type1.bmp ! apps\ForthForm\res\splitwin-type2.BMP ! apps\ForthForm\res\Splitwin-type3.bmp ! apps\ForthForm\res\Splitwin-type4.bmp ! apps\ForthForm\res\Splitwin-type5.bmp Docs,36 ! doc\ForthForm\FF-History.htm ! doc\ForthForm\FF-Menu Functions.htm ! doc\ForthForm\FF-Overview.htm ! doc\ForthForm\FF-Rebuilding The System.htm ! doc\ForthForm\FF-System Requirements.htm ! doc\ForthForm\FF-Toolbar Functions.htm ! doc\ForthForm\FF-Using Forms.htm ! doc\ForthForm\FF-What's New.htm ! doc\ForthForm\Forthform.gif ! doc\ForthForm\ForthForm.htm ! doc\ForthForm\FF-Creating a Form.htm ! doc\ForthForm\FF-back.gif ! doc\ForthForm\FF-Bitmap Preview Window.gif ! doc\ForthForm\FF-Control Property Window.gif ! doc\ForthForm\FF-ControlMenu.gif ! doc\ForthForm\FF-CreateToolbar Window.gif ! doc\ForthForm\FF-Creating a Toolbar.htm ! doc\ForthForm\FF-Customize Window.gif ! doc\ForthForm\FF-Form Property Window.gif ! doc\ForthForm\FF-FormMenu.gif ! doc\ForthForm\FF-FormPad.htm ! doc\ForthForm\FF-FormPad Window.gif ! doc\ForthForm\FF-Forthform Screen.gif ! doc\ForthForm\FF-HelpMenu.gif ! doc\ForthForm\FF-New Window.gif ! doc\ForthForm\FF-OptionsMenu.gif ! doc\ForthForm\FF-Preferences.gif ! doc\ForthForm\FF-Status Window.gif ! doc\ForthForm\FF-textbutton.gif ! doc\ForthForm\FF-Toolbar.gif ! doc\ForthForm\FF-ToolsMenu.gif ! doc\ForthForm\FF-top.gif ! doc\ForthForm\FF-GroupExample.gif ! doc\ForthForm\FF-GroupAction.gif ! doc\ForthForm\FF-SplitterDialog.gif ! doc\ForthForm\FF-Splitter Windows.htm |
|
From: Jos v.d.V. <jo...@us...> - 2005-01-01 13:50:40
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5701/src Modified Files: Extend.f Log Message: - Jos: Adapted to registry.f See .registry Index: Extend.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/Extend.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Extend.f 21 Dec 2004 00:19:08 -0000 1.1 --- Extend.f 1 Jan 2005 13:50:30 -0000 1.2 *************** *** 173,177 **** cr cr .( Extensions Loaded, ) count-words . .( words in dictionary) ! .registry cr --- 173,177 ---- cr cr .( Extensions Loaded, ) count-words . .( words in dictionary) ! \ .registry cr *************** *** 182,184 **** 1 pause-seconds ! |
|
From: Dirk B. <db...@us...> - 2005-01-01 10:23:27
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31440/src Modified Files: REGISTRY.F Log Message: Registry support partly rewritten. Now it's possible to acess the complete registry and not only HKEY_CURRENT_USER Index: REGISTRY.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/REGISTRY.F,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** REGISTRY.F 21 Dec 2004 00:19:08 -0000 1.1 --- REGISTRY.F 1 Jan 2005 10:23:15 -0000 1.2 *************** *** 1,17 **** ! (( registry.f The Registry Interface for Win32Forth by Tom Zimmer ! Andrew implemented the functionality in C, and I translated it ! into Forth ! 2002/08/31 arm (minor) use ANS file words replaceing FXXX-FILE ! 2002/09/24 arm release for testing ! 2002/10/08 arm Consolidation ! 2003/09/08 dbu removed the registry entries 'Directory' and 'Version' ! )) ! cr .( Loading Windows Registry...) ! INTERNAL \ Default registry key. Change this string to put your programs registry --- 1,78 ---- ! \ $Id$ ! \ ! \ registry.f The Registry Interface for Win32Forth by Tom Zimmer ! \ ! \ Andrew implemented the functionality in C, and I translated it ! \ into Forth ! \ ! \ 2002/08/31 arm (minor) use ANS file words replaceing FXXX-FILE ! \ 2002/09/24 arm release for testing ! \ 2002/10/08 arm Consolidation ! \ 2003/09/08 dbu removed the registry entries 'Directory' and 'Version' ! \ Sonntag, Dezember 26 2004 dbu mostly rewritten ! cr .( Loading Windows Registry...) ! \ anew -Registry.f ! INTERNAL ! 5 proc RegOpenKeyEx ! 9 proc RegCreateKeyEx ! 1 proc RegCloseKey ! 6 proc RegQueryValueEx ! 6 proc RegSetValueEx ! \ ************************************************************************************ ! \ Low level Registry words ! \ ! \ With these words the complete registry can be accessed ! \ ************************************************************************************ ! ! external ! ! \ RegOpenKey opens the specified registry key ! : (RegOpenKey) { hKey lpSubKey samDesired \ hkResult -- hkResult } ! &OF hkResult samDesired 0 lpSubKey hKey ! call RegOpenKeyEx ERROR_SUCCESS = ! if hkResult else INVALID_HANDLE_VALUE then ; ! ! \ RegCreateKey creates the specified registry key. ! \ If the key already exists, it is opened. ! : (RegCreateKey) { hKey lpSubKey samDesired \ Class Disposition hkResult -- hkResult } ! 0 to Class ! 0 to Disposition ! ! &OF Disposition \ disposition value buffer ! &OF hkResult \ key handle ! 0 \ inheritance ! samDesired \ desired security access ! REG_OPTION_NON_VOLATILE \ special options ! &OF Class \ class string ! 0 \ reserved ! lpSubKey \ subkey name ! hKey \ handle to open key ! ! call RegCreateKeyEx ERROR_SUCCESS = ! if hkResult else INVALID_HANDLE_VALUE then ; ! ! \ RegCloseKey releases a handle to the specified registry key ! : (RegCloseKey) ( hKey -- f ) ! call RegCloseKey ERROR_SUCCESS = ; ! ! \ RegQueryValue retrieves the type and data for a specified value name ! \ associated with an open registry key ! : (RegQueryValue) { hKey lpValueName rType lpData lpcbData \ -- f } ! lpcbData lpData &OF rType null ! lpValueName hKey call RegQueryValueEx ERROR_SUCCESS = ; ! ! \ RegSetValue sets the data and type of a specified value under a registry key. ! : (RegSetValue) { hKey lpValueName rType lpData cbData \ -- f } ! cbData lpData rType null ! lpValueName hKey call RegSetValueEx ERROR_SUCCESS = ; ! ! \ ************************************************************************************ ! \ High level Registry words... ! \ ************************************************************************************ \ Default registry key. Change this string to put your programs registry *************** *** 20,130 **** \ that will be specific not only to your program, but to the particular \ directory instance of your program that is running. ! EXTERNAL ! ! create PROGREG MAX-PATH allot ! ! : PROGREG-SET-BASE-PATH ( -- ) ! s" Win32Forth " PROGREG place ! version# ((version)) PROGREG +place ! s" \" PROGREG +place ; ! : PROGREG-INIT ( -- ) ! PROGREG-SET-BASE-PATH s" Win32For\" PROGREG +place ; initialization-chain chain-add PROGREG-INIT PROGREG-INIT ! INTERNAL ! create basereg ," SOFTWARE\" ! variable disposition ! variable regkey ! variable regtype ! variable reglen named-new$ ReturnedKey$ ! EXTERNAL ! ! 9 proc RegCreateKeyEx ! 6 proc RegQueryValueEx ! 1 proc RegCloseKey ! 6 proc RegSetValueEx ! ! \ sadr,slen = the registry section to get the key of \ return -1 if we could not get the key ! ! : RegGetKey { sadr slen \ key$ -- regkey | -1 } \ read the key of a section ! MAXSTRING localAlloc: key$ ! basereg count key$ place ! progreg count key$ +place ! sadr slen key$ +place ! key$ +NULL ! disposition rel>abs \ we get it, but don't use it ! regkey rel>abs \ the return value ! NULL ! KEY_ALL_ACCESS ! REG_OPTION_NON_VOLATILE ! NULL ! 0 ! key$ 1+ rel>abs ! HKEY_CURRENT_USER ! Call RegCreateKeyEx ! if -1 ! else regkey @ ! then ; ! \ read registry key value string 'vadr,vlen' \ from section string 'sadr,slen' ! \ return data string 'dadr,dlen' \ sadr,slen = the registry key section string \ vadr,vlen = the registry key value string to read \ dadr,dlen = the registry key data string returned ! ! : RegGetString { vadr vlen sadr slen -- dadr dlen } ReturnedKey$ off \ initially clear return buffer - sadr slen RegGetKey dup -1 = - if drop - ReturnedKey$ count - EXIT \ return on error, empty data - then >r - MAXCOUNTED reglen ! \ init max length of string ! reglen rel>abs ! ReturnedKey$ 1+ rel>abs ! regtype rel>abs ! 0 ! vadr rel>abs ! r@ ! Call RegQueryValueEx ! if ReturnedKey$ off ! else reglen @ 1- 0max ReturnedKey$ c! ! then ReturnedKey$ count ! r> Call RegCloseKey drop ; \ Write to the registry, a key value string 'vadr,vlen' \ in section string 'sadr,slen' \ the data string 'dadr,dlen' - : RegSetString { dadr dlen vadr vlen sadr slen \ val$ khdl -- } ! MAXSTRING localAlloc: val$ \ allocate a dynamic string ! dlen "CLIP" to dlen \ clip key to 255 characters ! sadr slen RegGetKey to khdl ! khdl -1 = ! if EXIT \ just return, ignore error ! then dadr dlen val$ place val$ +NULL ! dlen 1+ \ data length including NULL ! val$ 1+ rel>abs \ null terminated data string ! REG_SZ ! 0 ! vadr rel>abs ! khdl Call RegSetValueEx drop ! khdl Call RegCloseKey drop ; : SetSetting ( a1 n1 a2 n2 -- ) \ a1,n1=value string, a2,n2=key string --- 81,186 ---- \ that will be specific not only to your program, but to the particular \ directory instance of your program that is running. + create BaseReg ," SOFTWARE\" MAXSTRING allot-to + create ProgReg MAXSTRING allot ! : PROGREG-SET-BASE-PATH ( -- ) ! s" Win32Forth " ProgReg place ! version# ((version)) ProgReg +place ! s" \" ProgReg +place ; ! : PROGREG-INIT ( -- ) ! PROGREG-SET-BASE-PATH s" Win32For\" ProgReg +place ; initialization-chain chain-add PROGREG-INIT PROGREG-INIT ! HKEY_CURRENT_USER value regBaseKey ! KEY_ALL_ACCESS value regAccessMask ! INTERNAL + variable regLen named-new$ ReturnedKey$ ! : BuildSection ( sadr slen adr -- adr1 ) ! >R ! BaseReg count r@ place ! ProgReg count r@ +place ! r@ +place ! r@ +NULL ! r> 1+ ; ! \ sadr,slen = the registry section to get the key of (for read accesss) \ return -1 if we could not get the key ! : RegGetKeyRead { sadr slen \ section$ -- regkey } \ read the key of a section ! MAXSTRING 2 + LocalAlloc: section$ ! regBaseKey ! sadr slen section$ BuildSection ! regAccessMask (RegOpenKey) ; ! ! external \ read registry key value string 'vadr,vlen' \ from section string 'sadr,slen' ! \ return data string 'dadr,dlen' \ sadr,slen = the registry key section string \ vadr,vlen = the registry key value string to read \ dadr,dlen = the registry key data string returned ! : RegGetString { vadr vlen sadr slen \ regType -- dadr dlen } ReturnedKey$ off \ initially clear return buffer ! sadr slen RegGetKeyRead dup INVALID_HANDLE_VALUE = ! if drop ReturnedKey$ count ! EXIT \ return on error, empty data ! then ! ! dup ! vadr ! &OF regType \ we get it, but we don't need it ! ReturnedKey$ 1+ ! MAXCOUNTED regLen ! \ init max length of string ! regLen ! (RegQueryValue) ! ! if regLen @ 1- 0max ReturnedKey$ c! \ make counted string ! else ReturnedKey$ off \ return empty data on error ! then (RegCloseKey) drop ! ! ReturnedKey$ count ; ! ! internal ! ! \ sadr,slen = the registry section to get the key of (for write accesss) ! \ return -1 if we could not get the key ! : RegGetKeyWrite { sadr slen \ section$ -- regkey } \ read the key of a section ! MAXSTRING 2 + LocalAlloc: section$ ! regBaseKey ! sadr slen section$ BuildSection ! regAccessMask (RegCreateKey) ; ! ! external \ Write to the registry, a key value string 'vadr,vlen' \ in section string 'sadr,slen' \ the data string 'dadr,dlen' : RegSetString { dadr dlen vadr vlen sadr slen \ val$ khdl -- } ! ! sadr slen RegGetKeyWrite to khdl ! khdl INVALID_HANDLE_VALUE = ! if exit then \ just return, ignore error ! ! dlen 2 + LocalAlloc: val$ \ allocate a dynamic string dadr dlen val$ place val$ +NULL ! ! khdl ! vadr ! REG_SZ \ type ! val$ 1+ \ null terminated data string ! dlen 1+ \ data length including NULL ! (RegSetValue) drop ! ! khdl (RegCloseKey) drop ; : SetSetting ( a1 n1 a2 n2 -- ) \ a1,n1=value string, a2,n2=key string *************** *** 134,147 **** s" Settings" RegGetString ; ! : .registry ( -- ) ! cr ." Console location:" s" Console" GetSetting type ; ! : re-register ( -- ) \ DEPRECATED ! .registry ; INTERNAL ! :noname ( -- ) \ write the current version into the registry ! \ needed by the w32fConsole.dll to find the right \ place to read/write from/into the registry s" Win32Forth" PROGREG place --- 190,203 ---- s" Settings" RegGetString ; ! \ : .registry ( -- ) \ DEPRECATED ! \ cr ." Console location:" s" Console" GetSetting type ; ! \ : re-register ( -- ) \ DEPRECATED ! \ .registry ; INTERNAL ! :noname ( -- ) \ Write the current version into the registry. ! \ Needed by the w32fConsole.dll to find the right \ place to read/write from/into the registry s" Win32Forth" PROGREG place *************** *** 172,173 **** --- 228,230 ---- s" 5,9" s" WindowPosition" SetSetting ; + |
|
From: Jos v. de V. <jo...@wx...> - 2004-12-28 16:47:01
|
confirm 553325 == 4ePost: 15 bytes in mail. Elapsed time to buffer: .000902 sec. |
|
From: Jos v.d.V. <jo...@us...> - 2004-12-28 15:39:53
|
Update of /cvsroot/win32forth/win32forth/apps/Chess In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31584/apps/Chess Removed Files: fcp101.f Log Message: - Jos: fcp101.f is out of date. --- fcp101.f DELETED --- |
|
From: Jos v.d.V. <jo...@us...> - 2004-12-27 22:13:24
|
Update of /cvsroot/win32forth/win32forth/src/lib/fmacro In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12617/src/lib/fmacro Modified Files: FMACRO.F Log Message: - Jos: Removed a bug from begin while repeat Index: FMACRO.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/fmacro/FMACRO.F,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FMACRO.F 21 Dec 2004 00:19:10 -0000 1.1 --- FMACRO.F 27 Dec 2004 22:12:58 -0000 1.2 *************** *** 1,5 **** \ needs optimize.f \ load the optimizer here when you would like to see its effect. ! anew fmacro.f \ March 7th, 2004 by J.v.d.Ven (( --- 1,5 ---- \ needs optimize.f \ load the optimizer here when you would like to see its effect. ! anew fmacro.f \ December 26th, 2004 by J.v.d.Ven (( *************** *** 156,160 **** December 9th, 2004 Added: r_nos_c!, r_nos_!, b_nos_c!, b_nos_!, a_nos_c! and a_nos_! ! to avoid using the parameter stack. )) --- 156,161 ---- December 9th, 2004 Added: r_nos_c!, r_nos_!, b_nos_c!, b_nos_!, a_nos_c! and a_nos_! ! to avoid using the parameter stack. ! December 27th, 2004 Removed a bug from begin while repeat )) *************** *** 207,216 **** 0 value poped_ebx : push_ebx \ push ebx only when it is needed. [ also forth ] ! code-here 1- poped_ebx = if -1 cdp +! \ avoid a sequence like: pop ebx push ebx ! else $53 code-c, \ previous instruction was not pop ebx so push ebx then [ previous ] --- 208,218 ---- 0 value poped_ebx + 0 value opt_pop_adr : push_ebx \ push ebx only when it is needed. [ also forth ] ! code-here 1- poped_ebx = cdp @ opt_pop_adr > and if -1 cdp +! \ avoid a sequence like: pop ebx push ebx ! else $53 code-c, \ previous instruction was not pop ebx so push ebx then [ previous ] *************** *** 242,245 **** --- 244,249 ---- : a@+ ( n -- n+a ) add ebx, ecx a;; + \ : r@a+a! ( r: r - r ) ( a: a - r+a) add ecx, 0 CELLS [ebp] a;; + : a@ ( -- n ) push_ebx *************** *** 477,482 **** push_ebx $C7 code-c, $C3 code-c, code-, - [ previous ] a;; : ass-lit+ ( <lit> - ) [ also forth ] $81 code-c, $C3 code-c, code-, [ previous ] a;; --- 481,486 ---- push_ebx $C7 code-c, $C3 code-c, code-, [ previous ] a;; + : ass-lit+ ( <lit> - ) [ also forth ] $81 code-c, $C3 code-c, code-, [ previous ] a;; *************** *** 687,690 **** --- 691,695 ---- : then \ compiletime: ( adr-to-jmp-part - ) [ also forth ] code-here over - cell- swap ! + code-here to opt_pop_adr [ previous ] a;; *************** *** 718,730 **** [ previous ] add ebp, # 8 \ endloop a;; : begin \ compiletime: ( - adr-at-begin ) ! [ also forth ] code-here [ previous ] ; : while \ compiletime: ( adr-at-begin - put-adr-after-repeat adr-at-begin ) 0= drop ! [ also forth ] $0F code-c, $85 code-c, code-here -1 code-, swap [ previous ] a;; --- 723,740 ---- [ previous ] add ebp, # 8 \ endloop + code-here to opt_pop_adr a;; : begin \ compiletime: ( - adr-at-begin ) ! [ also forth ] code-here ! dup to opt_pop_adr ! [ previous ] ; : while \ compiletime: ( adr-at-begin - put-adr-after-repeat adr-at-begin ) 0= drop ! [ also forth ] $0F code-c, $85 code-c, code-here -1 code-, swap ! code-here to opt_pop_adr ! [ previous ] a;; *************** *** 850,856 **** : dup_b! ( n -- n ) dup b! ; : b@+ ( n -- n+b ) b@ + ; ! : b>r ( Returnstack: -- b ) s" b@ >r" EVALUATE ; IMMEDIATE ! : r>b ( Returnstack: b -- ) s" r> b!" EVALUATE ; IMMEDIATE : @to_b+ ( a - ) @ loc_b +! ; (( >>> Disable or delete this line to run the following BM test --- 860,867 ---- : dup_b! ( n -- n ) dup b! ; : b@+ ( n -- n+b ) b@ + ; ! : b>r ( Returnstack: -- b ) s" b@ >r" EVALUATE ; IMMEDIATE ! : r>b ( Returnstack: b -- ) s" r> b!" EVALUATE ; IMMEDIATE : @to_b+ ( a - ) @ loc_b +! ; + \ : r@a+a! ( r: - r: ) ( a - r+a) s" r@ a@ + a!" EVALUATE ; IMMEDIATE (( >>> Disable or delete this line to run the following BM test *************** *** 938,940 **** \s ! |
|
From: Jos v.d.V. <jo...@us...> - 2004-12-27 22:01:15
|
Update of /cvsroot/win32forth/win32forth/src/lib/fmacro In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10329/src/lib/fmacro Modified Files: mm_fw_fm.f Log Message: - Jos: Updated de results since Win32Forth and fmacro.f were updated Index: mm_fw_fm.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/fmacro/mm_fw_fm.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mm_fw_fm.f 21 Dec 2004 00:19:10 -0000 1.1 --- mm_fw_fm.f 27 Dec 2004 22:01:04 -0000 1.2 *************** *** 7,42 **** \ * March 17th, 2003 J.v.d.Ven: Changed for the updated fmacro.f \ * May 12th, 2003 J.v.d.Ven: Changed DDOT DAXPY do-WARNER() and DO-MAENO. ! \ * \ A changed MM benchmark from: http://home.iae.nl/users/mhx/mm.fw (( - 80x80 mm - normal algorithm 27.30 MFlops, 14.61 ticks/flop, 0.037 s - 80x80 mm - blocking, factor of 20 18.45 MFlops, 21.62 ticks/flop, 0.055 s - 80x80 mm - transposed B matrix 34.96 MFlops, 11.41 ticks/flop, 0.029 s - 80x80 mm - Robert's algorithm 36.67 MFlops, 10.87 ticks/flop, 0.027 s - 80x80 mm - T. Maeno's algorithm, subarray 20x20 11.72 MFlops, 34.01 ticks/flop, 0.087 s - 80x80 mm - D. Warner's algorithm, subarray 20x20 13.73 MFlops, 29.05 ticks/flop, 0.074 s - - ! ! ALL-TESTS \ Using the orginal code and Win32Forth CLK 400 MHz ! 80x80 mm - normal algorithm 5.93 MFlops, 67.36 ticks/flop, 0.172 s ! 80x80 mm - blocking, factor of 20 2.86 MFlops, 139.54 ticks/flop, 0.357 s ! 80x80 mm - transposed B matrix 5.38 MFlops, 74.25 ticks/flop, 0.190 s ! 80x80 mm - Robert's algorithm 5.58 MFlops, 71.58 ticks/flop, 0.183 s ! 80x80 mm - T. Maeno's algorithm, subarray 20x20 2.25 MFlops, 177.50 ticks/flop, 0.454 s ! 80x80 mm - D. Warner's algorithm, subarray 20x20 2.37 MFlops, 168.39 ticks/flop, 0.431 s - ALL-TESTS \ Using Win32Forth, fmacro.f date May 12th, 2003 and FSL-Utilities_1.04 CLK 400 MHz ! 80x80 mm - normal algorithm 27.00 MFlops, 14.81 ticks/flop, 0.037 s ! 80x80 mm - blocking, factor of 20 18.30 MFlops, 21.85 ticks/flop, 0.055 s ! 80x80 mm - transposed B matrix 34.76 MFlops, 11.50 ticks/flop, 0.029 s ! 80x80 mm - Robert's algorithm 36.44 MFlops, 10.97 ticks/flop, 0.028 s ! 80x80 mm - T. Maeno's algorithm, subarray 20x20 10.96 MFlops, 36.47 ticks/flop, 0.093 s ! 80x80 mm - D. Warner's algorithm, subarray 20x20 12.61 MFlops, 31.70 ticks/flop, 0.081 s )) --- 7,34 ---- \ * March 17th, 2003 J.v.d.Ven: Changed for the updated fmacro.f \ * May 12th, 2003 J.v.d.Ven: Changed DDOT DAXPY do-WARNER() and DO-MAENO. ! \ * December 27th, 2004 J.v.d.Ven: Updated de results since Win32Forth and fmacro.f were updated \ A changed MM benchmark from: http://home.iae.nl/users/mhx/mm.fw (( ! ALL-TESTS \ Using the orginal code and Win32Forth Version: 6.09 CLK 400 MHz ! 80x80 mm - normal algorithm 5.36 MFlops, 74.19 ticks/flop, 0.190 s ! 80x80 mm - blocking, factor of 20 3.46 MFlops, 114.85 ticks/flop, 0.295 s ! 80x80 mm - transposed B matrix 5.17 MFlops, 76.83 ticks/flop, 0.197 s ! 80x80 mm - Robert's algorithm 5.04 MFlops, 78.85 ticks/flop, 0.202 s ! 80x80 mm - T. Maeno's algorithm, subarray 20x20 3.19 MFlops, 124.60 ticks/flop, 0.320 s ! 80x80 mm - D. Warner's algorithm, subarray 20x20 2.66 MFlops, 149.06 ticks/flop, 0.383 s ! ! ALL-TESTS \ Using Win32Forth Version: 6.09, fmacro.f date December 27th, 2004 and FSL-Utilities_1.04 CLK 400 MHz ! 80x80 mm - normal algorithm 48.76 MFlops, 8.20 ticks/flop, 0.020 s ! 80x80 mm - blocking, factor of 20 19.22 MFlops, 20.80 ticks/flop, 0.053 s ! 80x80 mm - transposed B matrix 35.08 MFlops, 11.40 ticks/flop, 0.029 s ! 80x80 mm - Robert's algorithm 36.64 MFlops, 10.91 ticks/flop, 0.027 s ! 80x80 mm - T. Maeno's algorithm, subarray 20x20 12.41 MFlops, 32.21 ticks/flop, 0.082 s ! 80x80 mm - D. Warner's algorithm, subarray 20x20 15.25 MFlops, 26.22 ticks/flop, 0.067 s )) |
|
From: Dirk B. <db...@us...> - 2004-12-26 13:11:03
|
Update of /cvsroot/win32forth/win32forth/src/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27674/src/tools Modified Files: HelpSystem.f Added Files: MsdnHelp.f SdkHelp.f Log Message: Help system updated; now you can get help for non ANS words and Windows API functions, too --- NEW FILE: SdkHelp.f --- \ $Id: SdkHelp.f,v 1.1 2004/12/26 13:10:52 dbu_de Exp $ \ \ File: SdkHelp.f \ Author: Dirk Busch \ Created: Mittwoch, November 10 2004 - dbu \ Updated: Sonntag, Dezember 26 2004 - dbu \ \ Interface to the WIN32-SDK Help file anew -SdkHelp.f needs Win32Help.f \ WinHelp access internal \ path to the WIN32-SDK help file create sdk-help$ ," doc\hlp\win32.hlp" MAXSTRING allot-to sdk-help$ +null : sdk-GetFilename ( -- addr len ) sdk-help$ count 2dup IsAbsolutePath? 0= if prepend<home>\ then ; external : sdk-help? ( -- f ) \ returns true if win32.hlp file is avalible sdk-GetFilename FILE-STATUS nip 0= ; : (sdk-help) ( addr len -- ) \ show help for Win32 API function { \ old_help_file$ function$ -- } sdk-help? if MAX_PATH LocalAlloc: old_help_file$ MAX_PATH LocalAlloc: function$ help_file$ count old_help_file$ place \ save current help file sdk-GetFilename help_file$ place \ set help-file to the Win32 SDK help function$ place function$ +null function$ $help \ open the help file for the given function old_help_file$ count help_file$ place \ restore help file else 2drop then ; : sdk-help ( -<word>- -- ) \ show help for Win32 API function bl word count (sdk-help) ; module |
|
From: Dirk B. <db...@us...> - 2004-12-26 13:08:19
|
Update of /cvsroot/win32forth/win32forth/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27232/src/lib Added Files: Win32Help.f Log Message: Added missing file with the WinHelp interface --- NEW FILE: Win32Help.f --- \ $Id: Win32Help.f,v 1.1 2004/12/26 13:08:10 dbu_de Exp $ \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ Win32 Help system interface words \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ cr .( Loading Win32 Help system interface... ) anew -Win32Help.f internal external create help_file$ ," doc\hlp\win32.hlp" MAXSTRING allot-to : $help-file ( a1 -- ) \ set the name of the current help file help_file$ 256 erase \ pre-clear help filename count help_file$ place ; \ lay in new filename : .help ( -- ) \ display the current help file string cr >bold ." HELP file: " >norm help_file$ count type cr ." Use: 'HELP-FILE <filename>' to select another help file. " ; : help-file ( -<filename>- ) \ specify a new help filename /parse-s$ $help-file ; synonym set-help help-file : $help ( a1 -- ) \ help on a string 1+ \ help subject word HELP_PARTIALKEY \ the command to the help system \ pointer to a help file string help_file$ 1+ \ the help file to use conHndl \ tell help its from our window call WinHelp drop ; : #help ( n1 -- ) \ help on a help context index number HELP_CONTEXT \ the command to the help system help_file$ 1+ \ the help file to use conHndl \ tell help its from our window call WinHelp drop ; : help ( -<word>- ) bl word $help ; \ help subject word : help-index ( -- ) 0 HELP_INDEX help_file$ 1+ \ the help file to use conHndl \ tell help its from our window call WinHelp drop ; : help-on-help ( -- ) \ get help on windows help 0 HELP_HELPONHELP help_file$ 1+ \ the help file to use conHndl \ tell help its from our window call WinHelp drop ; INTERNAL : _help-release ( -- ) \ release our marker to help system 0 \ NULL HELP_QUIT \ the command to the help system 0 \ NULL pointer to a help file string conHndl call WinHelp drop ; UNLOAD-CHAIN CHAIN-ADD-BEFORE _HELP-RELEASE \ add to termination chain EXTERNAL MODULE |
1040 messages has been excluded from this view by a project administrator.
