Thread: [Win32forth-cvs] win32forth-stc/src asmwin32.f, 1.1, 1.2 extend.f, 1.1, 1.2 imageman.f, 1.1, 1.2

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/win32forth/win32forth-stc/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17905/src

Modified Files:
	asmwin32.f extend.f imageman.f 
Log Message:
Changes path's from STC to SRC

Index: asmwin32.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth-stc/src/asmwin32.f,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** asmwin32.f	21 Sep 2006 16:26:33 -0000	1.1
--- asmwin32.f	23 Sep 2006 06:00:17 -0000	1.2
***************
*** 33,37 ****
  : (_code) ( start a native code definition )
          code-header hide
!         !csp init-asm 
          0 to ofa ;

--- 33,37 ----
  : (_code) ( start a native code definition )
          code-header hide
!         !csp init-asm
          0 to ofa ;

***************
*** 59,63 ****
  ' end-code alias c;

! fload stc\kernel\gkernext.f     \ load exec/next words

  ' next alias next,
--- 59,63 ----
  ' end-code alias c;

! fload src\kernel\gkernext.f     \ load exec/next words

  ' next alias next,

Index: extend.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth-stc/src/extend.f,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** extend.f	21 Sep 2006 16:26:33 -0000	1.1
--- extend.f	23 Sep 2006 06:00:17 -0000	1.2
***************
*** 4,85 ****
  cr .( -- META EXTEND.F ) cr

! sys-fload stc\primutil.f
! sys-fload stc\module.f      \ scoping support for modules
! sys-fload stc\interpif.f    \ interpretive conditionals
!     fload stc\numconv.f     \ general number conversions

  : nostack1 ; immediate

! sys-fload stc\486asm.f      \ jim's 486 assembler
! sys-fload stc\asmmac.f      \ jim's 486 macros
! sys-fload stc\asmwin32.f    \ next for win32forth
!     fload stc\console.f     \ console i/o extracted from primutil.f
! sys-fload stc\dotwords.f    \ dot support words
! sys-fload stc\imageman.f    \ fsave, application & turnkey words

! sys-FLOAD stc\dis486.f      \ load the disassembler
!     fload stc\callback.f    \ windows callback support
!     fload stc\exception.f   \ utility words to support windows exception handling

  8 constant B/FLOAT          \ default to 8 byte floating point numbers
!     FLOAD stc\float.f       \ floating point support
  .olly

  \s
! \    FLOAD stc\lineedit.f    \ a line editor utility

! \     FLOAD stc\primhash.f    \ primitive hash functions for OOP later  *** to be done ***
! \ sys-FLOAD stc\winlib.f      \ windows proc and memory words           ***  OBSOLETE  ***
! \     FLOAD stc\paths.f       \ multi path support words                *** to be done ***
! \ sys-FLOAD stc\nforget.f     \ forget words                            *** to be done ***
  \     FLOAD src\pointer.f     \ pointer support                         *** depends on nforget
! \ sys-FLOAD stc\dbgsrc1.f     \ source level debugging support part one *** to be done ***

  \s

! \ sys-FLOAD stc\dthread.f     \ display threads
! \ sys-FLOAD stc\order.f       \ vocabulary support
! sys-FLOAD stc\see.f
! \ sys-FLOAD stc\ctype.f       \ 'c' style character typing
! sys-FLOAD stc\res\resforth.h \ load the headerfile with a few constants
! sys-FLOAD stc\debug.f
! sys-FLOAD stc\words.f
!     FLOAD stc\class.f       \ ***** Object Oriented Programming Support *****
! \    FLOAD stc\scrnctrl.f    \ screen control words
!     FLOAD stc\registry.f    \ Win32 Registry support
!     FLOAD stc\ansfile.f     \ ansi file words
!     FLOAD stc\keyboard.f    \ function and special key constants
!     FLOAD stc\mapfile.f     \ Windows32 file into memory mapping words
! sys-FLOAD stc\environ.f     \ environment? support
! \ sys-FLOAD stc\transit.f     \ minimal transient support now an extra file
!     FLOAD stc\Shell.f       \ load SHELL utility words
!     FLOAD stc\utils.f       \ load other misc utility words
! sys-FLOAD stc\dbgsrc2.f     \ source level debugging support part two
  only forth also definitions

  \ ***** Object Oriented Support Continues *****
! sys-FLOAD stc\classdbg.f
!     FLOAD stc\colors.f
!     FLOAD stc\fonts.f        \ font class
!     fload stc\xfiledlg.f     \ xcall replacements for open dialogs
!     FLOAD stc\PrintSupport.f \ replacement for the w32fPrint.dll
!     FLOAD stc\dc.f           \ device context class
!     FLOAD stc\generic.f      \ generic window class
!     FLOAD stc\window.f
!     FLOAD stc\childwnd.f     \ child windows
!     FLOAD stc\winmsg.f
!     FLOAD stc\control.f
!     FLOAD stc\controls.f
!     FLOAD stc\button.f
!     FLOAD stc\dialog.f
!     FLOAD stc\console\forthdlg.f
!     FLOAD stc\keysave.f
!     FLOAD stc\lib\BROWSEFLD.F \ SHBrowseForFolder() support
!     FLOAD stc\menu.f
!     FLOAD stc\console\ConsoleMenu.f
! sys-FLOAD stc\console\ConsoleStatBar.f \ status bar for the console window
! \ sys-Fload stc\xref.f        \ Cross reference all words used by the word in question

  create config$ ," WIN32FOR.CFG"
--- 4,85 ----
  cr .( -- META EXTEND.F ) cr

! sys-fload src\primutil.f
! sys-fload src\module.f      \ scoping support for modules
! sys-fload src\interpif.f    \ interpretive conditionals
!     fload src\numconv.f     \ general number conversions

  : nostack1 ; immediate

! sys-fload src\486asm.f      \ jim's 486 assembler
! sys-fload src\asmmac.f      \ jim's 486 macros
! sys-fload src\asmwin32.f    \ next for win32forth
!     fload src\console.f     \ console i/o extracted from primutil.f
! sys-fload src\dotwords.f    \ dot support words
! sys-fload src\imageman.f    \ fsave, application & turnkey words

! sys-FLOAD src\dis486.f      \ load the disassembler
!     fload src\callback.f    \ windows callback support
!     fload src\exception.f   \ utility words to support windows exception handling

  8 constant B/FLOAT          \ default to 8 byte floating point numbers
!     FLOAD src\float.f       \ floating point support
  .olly

  \s
! \    FLOAD src\lineedit.f    \ a line editor utility

! \     FLOAD src\primhash.f    \ primitive hash functions for OOP later  *** to be done ***
! \ sys-FLOAD src\winlib.f      \ windows proc and memory words           ***  OBSOLETE  ***
! \     FLOAD src\paths.f       \ multi path support words                *** to be done ***
! \ sys-FLOAD src\nforget.f     \ forget words                            *** to be done ***
  \     FLOAD src\pointer.f     \ pointer support                         *** depends on nforget
! \ sys-FLOAD src\dbgsrc1.f     \ source level debugging support part one *** to be done ***

  \s

! \ sys-FLOAD src\dthread.f     \ display threads
! \ sys-FLOAD src\order.f       \ vocabulary support
! sys-FLOAD src\see.f
! \ sys-FLOAD src\ctype.f       \ 'c' style character typing
! sys-FLOAD src\res\resforth.h \ load the headerfile with a few constants
! sys-FLOAD src\debug.f
! sys-FLOAD src\words.f
!     FLOAD src\class.f       \ ***** Object Oriented Programming Support *****
! \    FLOAD src\scrnctrl.f    \ screen control words
!     FLOAD src\registry.f    \ Win32 Registry support
!     FLOAD src\ansfile.f     \ ansi file words
!     FLOAD src\keyboard.f    \ function and special key constants
!     FLOAD src\mapfile.f     \ Windows32 file into memory mapping words
! sys-FLOAD src\environ.f     \ environment? support
! \ sys-FLOAD src\transit.f     \ minimal transient support now an extra file
!     FLOAD src\Shell.f       \ load SHELL utility words
!     FLOAD src\utils.f       \ load other misc utility words
! sys-FLOAD src\dbgsrc2.f     \ source level debugging support part two
  only forth also definitions

  \ ***** Object Oriented Support Continues *****
! sys-FLOAD src\classdbg.f
!     FLOAD src\colors.f
!     FLOAD src\fonts.f        \ font class
!     fload src\xfiledlg.f     \ xcall replacements for open dialogs
!     FLOAD src\PrintSupport.f \ replacement for the w32fPrint.dll
!     FLOAD src\dc.f           \ device context class
!     FLOAD src\generic.f      \ generic window class
!     FLOAD src\window.f
!     FLOAD src\childwnd.f     \ child windows
!     FLOAD src\winmsg.f
!     FLOAD src\control.f
!     FLOAD src\controls.f
!     FLOAD src\button.f
!     FLOAD src\dialog.f
!     FLOAD src\console\forthdlg.f
!     FLOAD src\keysave.f
!     FLOAD src\lib\BROWSEFLD.F \ SHBrowseForFolder() support
!     FLOAD src\menu.f
!     FLOAD src\console\ConsoleMenu.f
! sys-FLOAD src\console\ConsoleStatBar.f \ status bar for the console window
! \ sys-Fload src\xref.f        \ Cross reference all words used by the word in question

  create config$ ," WIN32FOR.CFG"
***************
*** 194,198 ****
  fsave Win32for        \ save Win32For.EXE
  fload lib\Resources.f
! s" stc\res\Win32For.ico" s" Win32for.exe" AddAppIcon

--- 194,198 ----
  fsave Win32for        \ save Win32For.EXE
  fload lib\Resources.f
! s" src\res\Win32For.ico" s" Win32for.exe" AddAppIcon

Index: imageman.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth-stc/src/imageman.f,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** imageman.f	21 Sep 2006 16:26:33 -0000	1.1
--- imageman.f	23 Sep 2006 06:00:17 -0000	1.2
***************
*** 7,11 ****
  IMAGEMAN builds Windows EXE images.

! For documentation on the PECOFF format, see 
  http://www.microsoft.com/hwdev/hardware/PECOFF.asp. Note: not included because of
  copyright restrictions, but freely downloadable. Also see "Peering Inside the PE: A Tour
--- 7,11 ----
  IMAGEMAN builds Windows EXE images.

! For documentation on the PECOFF format, see
  http://www.microsoft.com/hwdev/hardware/PECOFF.asp. Note: not included because of
  copyright restrictions, but freely downloadable. Also see "Peering Inside the PE: A Tour
***************
*** 35,39 ****

  VIMAGE                   IMAGEMAN has its own dictionary (because of possible name collisions)
!                          so a separate dictionary is used. 
  COMPACT                  Standard file is built with 4096 (4KBYTE) file sections. COMPACT
                           specifies 512 (0x200) file sections, which builds a smaller EXE file
--- 35,39 ----

  VIMAGE                   IMAGEMAN has its own dictionary (because of possible name collisions)
!                          so a separate dictionary is used.
  COMPACT                  Standard file is built with 4096 (4KBYTE) file sections. COMPACT
                           specifies 512 (0x200) file sections, which builds a smaller EXE file
***************
*** 70,74 ****
  ENDBUILD                 Creates the image from the information given above.

! s" name" IMAGE-LOAD      Loads a .IMG file for subsequent conversion. Sets the following 
                           words as a side effect;
                             IMAGE-PTR       pointer to the loaded image
--- 70,74 ----
  ENDBUILD                 Creates the image from the information given above.

! s" name" IMAGE-LOAD      Loads a .IMG file for subsequent conversion. Sets the following
                           words as a side effect;
                             IMAGE-PTR       pointer to the loaded image
***************
*** 108,112 ****
  The first section always starts on 0x1000. Section #1 will start at 0x1000, and be
  0x1234 bytes padded out to the next 4K boundary (out to 0x2FFF). Section #2 will start
! at 0x3000, be 0x1120 bytes padded out to 0x4FFF, etc. The .idata section should be 
  written last.

--- 108,112 ----
  The first section always starts on 0x1000. Section #1 will start at 0x1000, and be
  0x1234 bytes padded out to the next 4K boundary (out to 0x2FFF). Section #2 will start
! at 0x3000, be 0x1120 bytes padded out to 0x4FFF, etc. The .idata section should be
  written last.

***************
*** 149,153 ****
  BASE @ DECIMAL NOSTACK1

! SYS-FLOAD STC\IMAGEHDS.F                      \ image header file

  \ ---------------- File handling PE image --------------------------
--- 149,153 ----
  BASE @ DECIMAL NOSTACK1

! SYS-FLOAD SRC\IMAGEHDS.F                      \ image header file

  \ ---------------- File handling PE image --------------------------
***************
*** 160,164 ****
                   cr ." File '"
                   PEIMG-NAME count type ." ' : "
!                    WinErrMsg ON GetLastWinErr 
                   then ;

--- 160,164 ----
                   cr ." File '"
                   PEIMG-NAME count type ." ' : "
!                    WinErrMsg ON GetLastWinErr
                   then ;

***************
*** 184,188 ****
                   PEIMG-HNDL FILE-POSITION ?PEIMG-FERROR
                   d>s ;
!                  
  0x1000   CONSTANT 4KBYTE
  0x100000 CONSTANT 1MBYTE
--- 184,188 ----
                   PEIMG-HNDL FILE-POSITION ?PEIMG-FERROR
                   d>s ;
! 
  0x1000   CONSTANT 4KBYTE
  0x100000 CONSTANT 1MBYTE
***************
*** 255,259 ****
                   RES-LOAD                               \ .res name before this
                   RES-PTR RES-LEN ;
!                  
  ))

--- 255,259 ----
                   RES-LOAD                               \ .res name before this
                   RES-PTR RES-LEN ;
! 
  ))

***************
*** 356,360 ****
   "next" pointer points to a list of all functions (IMPORT)
   "func" pointer points to a list of functions in this library (IMPORTs in IMPLIB)
!  
   Uses structure based on BASE-IMPSTR

--- 356,360 ----
   "next" pointer points to a list of all functions (IMPORT)
   "func" pointer points to a list of functions in this library (IMPORTs in IMPLIB)
! 
   Uses structure based on BASE-IMPSTR

***************
*** 407,411 ****

   Add imports a stand-alone section normally called .idata. Section must be declared.
!  
   Steps:

--- 407,411 ----

   Add imports a stand-alone section normally called .idata. Section must be declared.
! 
   Steps:

***************
*** 415,419 ****
   Build the lib names, remember where we put them (write into the linked list at IMP-RVA)
   Build the hint/func names, remember where we put them
!   
   If section isn't big enough, make it larger (we haven't written it yet)

--- 415,419 ----
   Build the lib names, remember where we put them (write into the linked list at IMP-RVA)
   Build the hint/func names, remember where we put them
! 
   If section isn't big enough, make it larger (we haven't written it yet)

***************
*** 433,440 ****
     IID-RVA-IAT ------------------------------------------------------+
   ...
!  
   # of IIDs = IMPLIB-COUNT + 1
   # of ILT entries = IMPLIB-COUNT + IMPFUNC-COUNT (same for IAT)
!  
   IAT is built first, and is the table modified by the loader to contain load addresses.
   Note that the entries are built back-to-front from the declaration order -- the last function
--- 433,440 ----
     IID-RVA-IAT ------------------------------------------------------+
   ...
! 
   # of IIDs = IMPLIB-COUNT + 1
   # of ILT entries = IMPLIB-COUNT + IMPFUNC-COUNT (same for IAT)
! 
   IAT is built first, and is the table modified by the loader to contain load addresses.
   Note that the entries are built back-to-front from the declaration order -- the last function
***************
*** 473,477 ****
      CURR-IID ->RVA EXED-IMPORT !                      \ point at imports
      LEN-ALLIIDS EXED-IMPORT CELL+ !                   \ length of IIDs
!     
      CURR-IAT ->RVA EXED-IAT !                         \ point at IAT
      LEN-IAT EXED-IAT CELL+ !                          \ length of IAT
--- 473,477 ----
      CURR-IID ->RVA EXED-IMPORT !                      \ point at imports
      LEN-ALLIIDS EXED-IMPORT CELL+ !                   \ length of IIDs
! 
      CURR-IAT ->RVA EXED-IAT !                         \ point at IAT
      LEN-IAT EXED-IAT CELL+ !                          \ length of IAT
***************
*** 494,498 ****
           CELL +TO CURR-ILT CELL +TO CURR-IAT          \ update ILT/IAT pointers
        REPEAT
!       
        CELL +TO CURR-ILT CELL +TO CURR-IAT             \ update ILT/IAT pointers (zero entry)
        LEN-IID +TO CURR-IID                            \ next IID
--- 494,498 ----
           CELL +TO CURR-ILT CELL +TO CURR-IAT          \ update ILT/IAT pointers
        REPEAT
! 
        CELL +TO CURR-ILT CELL +TO CURR-IAT             \ update ILT/IAT pointers (zero entry)
        LEN-IID +TO CURR-IID                            \ next IID
***************
*** 629,637 ****
               SECTINIT
               ;
!              
  : ENDBUILD   ( -- )                                   \ fixup all the missing info
               cr ." Building image " PEIMG-NAME COUNT TYPE
               PEIMG-FCREATE                            \ create the file
!                                      
               FILE-ALIGN  EXEH-FILEALIGN    !          \ n BYTE file align (mult of 512 bytes)
               LEN-HEAD    EXEH-HEADSIZE     !          \ n byte header size (mult of filealign)
--- 629,637 ----
               SECTINIT
               ;
! 
  : ENDBUILD   ( -- )                                   \ fixup all the missing info
               cr ." Building image " PEIMG-NAME COUNT TYPE
               PEIMG-FCREATE                            \ create the file
! 
               FILE-ALIGN  EXEH-FILEALIGN    !          \ n BYTE file align (mult of 512 bytes)
               LEN-HEAD    EXEH-HEADSIZE     !          \ n byte header size (mult of filealign)
***************
*** 656,660 ****

               R> cr ." Built length " dup . ." (" 1 H.R ." h) bytes"
!              
               HEAD-BUFF release                        \ release storage

--- 656,660 ----

               R> cr ." Built length " dup . ." (" 1 H.R ." h) bytes"
! 
               HEAD-BUFF release                        \ release storage

***************
*** 702,706 ****

          s" .kode"                  SECTION
!         STD-DATA S-EXECUTE or      SECTIONTYPE     
          IMAGE-KODEPTR IMAGE-KACTUAL  SECTIONDATA
          IMAGE-KSIZE                  SECTIONSIZE
--- 702,706 ----

          s" .kode"                  SECTION
!         STD-DATA S-EXECUTE or      SECTIONTYPE
          IMAGE-KODEPTR IMAGE-KACTUAL  SECTIONDATA
          IMAGE-KSIZE                  SECTIONSIZE

Thread: [Win32forth-cvs] win32forth-stc/src asmwin32.f, 1.1, 1.2 extend.f, 1.1, 1.2 imageman.f, 1.1, 1.2

win32forth-cvs