[Win32forth-cvs] win32forth-stc/src asmwin32.f, 1.5, 1.6 dis486.f, 1.15, 1.16

[Alex M. <ale...@us...>]

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

Modified Files:
	asmwin32.f dis486.f 
Log Message:
arm: tidy up asm interface, make DIS visible in forth vocabulary

Index: asmwin32.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth-stc/src/asmwin32.f,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** asmwin32.f	7 Nov 2006 11:04:50 -0000	1.5
--- asmwin32.f	22 Mar 2007 02:08:33 -0000	1.6
***************
*** 22,58 ****
  ( This file version 1.1, first distributed with 486asm, version 1.1 )
  
! only forth also definitions also assembler also asm-hidden
  
! forth ' code-c,     asm-hidden is code-c,     ( x -- )
! forth ' code-w,     asm-hidden is code-w,     ( x -- )
! forth ' code-,      asm-hidden is code-d,     ( x -- )
! forth ' code-here   asm-hidden is code-here   ( -- a )
! forth ' code-align  asm-hidden is code-align  ( -- )
! forth ' header      asm-hidden is code-header ( -- )
  
! : (_code) ( start a native code definition )
!         code-header hide
!         !csp init-asm
!         code-here to ofa
!         0 to tail-call ;
  
! ' (_code) is code
  
! only forth also assembler also asm-hidden definitions also forth
  
! ' _;code is ;code
  
  : (macro[) a; enter-macro ;
  : (]macro) leave-macro a; ;
  
! definitions
  
! : 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
  
  only forth also assembler definitions
--- 22,63 ----
  ( This file version 1.1, first distributed with 486asm, version 1.1 )
  
! only forth definitions also assembler
  
! ' code-c,     also asm-hidden is code-c,     previous    ( x -- )
! ' code-w,     also asm-hidden is code-w,     previous   ( x -- )
! ' code-,      also asm-hidden is code-d,     previous   ( x -- )
! ' code-!      also asm-hidden is code-d!     previous   ( x -- )
! ' code-here   also asm-hidden is code-here   previous   ( -- a )
! ' code-align  also asm-hidden is code-align  previous   ( -- )
! ' header      also asm-hidden is code-header previous   ( -- )
  
! also asm-hidden definitions
  
! : (_end-code)
!         _end-code
! \ *enhance needs work to support standard ;name
! \        ;name
!         ['] (comp-only) is ;
!         ;
!         
! ' (_end-code) is end-code
  
! : (_code) ( start a native code definition )
!         : init-asm postpone [   \ runs in interpreted mode, not compile
!         ['] end-code is ;       \ set the code ; word
!         ;
  
! ' (_code) is code
  
  : (macro[) a; enter-macro ;
  : (]macro) leave-macro a; ;
  
! also forth definitions
  
! : macro[ ( generate code in a definition )
!         also assembler postpone (macro[) ; immediate
  
! : ]macro ( end generating code )
!         postpone (]macro) previous ; immediate
  
  only forth also assembler definitions
***************
*** 60,66 ****
  ' end-code alias c;
  
  fload src\kernel\gkernext.f     \ load exec/next words
  
- ' next alias next,
  ' noop alias ptr immediate
  
--- 65,75 ----
  ' end-code alias c;
  
+ \ Everything below this line was added to support Tom Zimmer
+ \ It was diked out of 486asm.f and put here because it could make it
+ \ difficult to load the assembler as a cross assembler
+ \ 12/21/94 09:45 tjz added for Win32Forth
+ 
  fload src\kernel\gkernext.f     \ load exec/next words
  
  ' noop alias ptr immediate
  
***************
*** 80,97 ****
  macro: [tos],   ( -- ) [eax], endm
  
- \ Everything below this line was added to support Tom Zimmer
- \ It was diked out of 486asm.f and put here because it could make it
- \ difficult to load the assembler as a cross assembler
- \ 12/21/94 09:45 tjz added for Win32Forth
- 
- only forth also assembler definitions also asm-hidden
- 
- : _enter-assembler      ( -- )
-                hide !csp init-asm ( code-here ofa-last code-d! ) ;
- 
- ' _enter-assembler is enter-assembler
- 
- \ exit-assembler is unused      ( -- )
- 
  only forth also definitions
  
--- 89,92 ----

Index: dis486.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth-stc/src/dis486.f,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** dis486.f	15 Mar 2007 17:55:15 -0000	1.15
--- dis486.f	22 Mar 2007 02:08:33 -0000	1.16
***************
*** 105,109 ****
  code (next-seq)                     \ next sequence as counted string
                  2 code-c,
!                 next;
  
  ' (next-seq) value next-seq         \ counted string
--- 105,109 ----
  code (next-seq)                     \ next sequence as counted string
                  2 code-c,
!                 next ;
  
  ' (next-seq) value next-seq         \ counted string
***************
*** 1063,1066 ****
--- 1063,1071 ----
  : .ds   cr ." string " 0x22 emit count 2dup type + 0x22 emit ;
  
+ : desc-stack    ( n -- )
+                 dup 0< if drop ." ? " else . then ;
+ 
+ also forth definitions
+ 
  : dis  ( adr -- )
          begin
***************
*** 1079,1087 ****
          repeat 3drop ;
  
- : desc-stack    ( n -- )
-                 dup 0< if drop ." ? " else . then ;
- 
- also forth definitions
- 
  \ *bug needs to check for :noname type xts
  : describe      ( xt -- )
--- 1084,1087 ----