[Win32forth-cvs] win32forth/src CALLBACK.f, 1.13, 1.14 Extend.f, 1.27, 1.28 Order.f, 1.6, 1.7 w32fMsg.f, 1.18, 1.19

[George H. <geo...@us...>]

Update of /cvsroot/win32forth/win32forth/src
In directory vz-cvs-4.sog:/tmp/cvs-serv5575

Modified Files:
	CALLBACK.f Extend.f Order.f w32fMsg.f 
Log Message:
Tidy up and added Struct200x

Index: Extend.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/Extend.f,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Extend.f	19 Apr 2011 20:30:04 -0000	1.27
--- Extend.f	25 May 2011 20:48:54 -0000	1.28
***************
*** 45,49 ****
      FLOAD src\mapfile.f          \ Windows32 file into memory mapping words
  sys-FLOAD src\environ.f          \ environment? support
! \ sys-FLOAD src\struct200X.f       \ 200X structure words
  
      FLOAD src\utils.f            \ load other misc utility words
--- 45,49 ----
      FLOAD src\mapfile.f          \ Windows32 file into memory mapping words
  sys-FLOAD src\environ.f          \ environment? support
! sys-FLOAD src\struct200X.f       \ 200X structure words
  
      FLOAD src\utils.f            \ load other misc utility words

Index: Order.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/Order.f,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Order.f	5 Oct 2008 20:29:32 -0000	1.6
--- Order.f	25 May 2011 20:48:54 -0000	1.7
***************
*** 58,67 ****
  
  : ONLY          ( -- )                \ Removes all vocs from search order down to ROOT
!                 CONTEXT #VOCS CELLS ERASE  ROOT ALSO VOC-ALSO ;
  
  : PREVIOUS      ( -- )                \ Removes the topmost vocabulary from the search order
                  CONTEXT DUP CELL+ SWAP  #VOCS CELLS MOVE
                  CONTEXT @ 0=
!                 IF      ROOT
                  THEN    VOC-ALSO ;
  
--- 58,67 ----
  
  : ONLY          ( -- )                \ Removes all vocs from search order down to ROOT
! \in-system-ok   CONTEXT #VOCS CELLS ERASE  ROOT ALSO VOC-ALSO ;
  
  : PREVIOUS      ( -- )                \ Removes the topmost vocabulary from the search order
                  CONTEXT DUP CELL+ SWAP  #VOCS CELLS MOVE
                  CONTEXT @ 0=
! \in-system-ok   IF      ROOT
                  THEN    VOC-ALSO ;
  

Index: w32fMsg.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/w32fMsg.f,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** w32fMsg.f	28 Apr 2011 18:03:58 -0000	1.18
--- w32fMsg.f	25 May 2011 20:48:54 -0000	1.19
***************
*** 545,549 ****
                  else >r [createprocess]              \ launch the w32fapp
                       if   r>drop -1
!                      else 1650  30 time-taken * + ( ms) ProcInfo @      \ give the launched process a..
                            call WaitForInputIdle drop \ ..chance to set its hwnd..
                            CloseThread                \ ..in shared memory
--- 545,549 ----
                  else >r [createprocess]              \ launch the w32fapp
                       if   r>drop -1
!                      else 2000  30 time-taken * + ( ms) ProcInfo @      \ give the launched process a..
                            call WaitForInputIdle drop \ ..chance to set its hwnd..
                            CloseThread                \ ..in shared memory

Index: CALLBACK.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/CALLBACK.f,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CALLBACK.f	11 May 2011 13:58:43 -0000	1.13
--- CALLBACK.f	25 May 2011 20:48:54 -0000	1.14
***************
*** 75,87 ****
                  jnz L$1
                  push    # 0
-                 mov     edx, 0 [esp]
                  mov     ebp, esp
                  sub     esp, # 4096 32 -        \ room for return stack (Not RSTACKSIZE, please!)
                  and     esp, # -16              \ align to 16 byte boundary
! 
                  sub     esp, # 4096             \ room for USER area
                  mov     edx, esp
                  sub     esp, # 32
-                 mov     SP0 [UP]  , esp         \ reset SP0
                  jmp L$2
  L$1:            push    SP0 [UP]                \ save sp0 on stack
--- 75,86 ----
                  jnz L$1
                  push    # 0
                  mov     ebp, esp
                  sub     esp, # 4096 32 -        \ room for return stack (Not RSTACKSIZE, please!)
                  and     esp, # -16              \ align to 16 byte boundary
! \                mov     ebx, 0 [esp]
                  sub     esp, # 4096             \ room for USER area
                  mov     edx, esp
+                 mov     fs: 0x14 , edx
                  sub     esp, # 32
                  jmp L$2
  L$1:            push    SP0 [UP]                \ save sp0 on stack
***************
*** 89,95 ****
                  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
! 
! L$2:            lea     ebx, 7 19 - cells [ebp] [ecx*4] \ adjust ebx
                  neg     ecx                     \ negate ecx
                  lea     ecx, 1234 [ecx] [ecx*2] \ calculate jump offset (4 byte lea version!)
--- 88,93 ----
                  sub     esp, # 4096 32 -        \ room for return stack (Not RSTACKSIZE, please!)
                  and     esp, # -16              \ align to 16 byte boundary
! L$2:            mov     SP0 [UP]  , esp         \ reset SP0
!                 lea     ebx, 7 19 - cells [ebp] [ecx*4] \ adjust ebx
                  neg     ecx                     \ negate ecx
                  lea     ecx, 1234 [ecx] [ecx*2] \ calculate jump offset (4 byte lea version!)