[Win32forth-cvs] win32forth-stc/src/kernel gkernel.f,1.34,1.35

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

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

Modified Files:
	gkernel.f 
Log Message:
arm: minor changes; rename incr, decr ro 1+! 1-!

Index: gkernel.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth-stc/src/kernel/gkernel.f,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** gkernel.f	22 Mar 2007 02:13:56 -0000	1.34
--- gkernel.f	11 Apr 2007 20:18:30 -0000	1.35
***************
*** 488,492 ****
                  mov     ecx, [ebp]
                  mov     ax, cx
!                 next    c;
  
  \ -------------------- Arithmetic Operators ---------------------------------
--- 488,492 ----
                  mov     ecx, [ebp]
                  mov     ax, cx
!                 next;
  
  \ -------------------- Arithmetic Operators ---------------------------------
***************
*** 760,764 ****
                  next;
  
! code incr       ( addr -- )     \ increment the contents of addr
       1 0 in/out
                  add     dword [eax], # 1
--- 760,764 ----
                  next;
  
! code 1+!        ( addr -- )     \ increment the contents of addr
       1 0 in/out
                  add     dword [eax], # 1
***************
*** 766,770 ****
                  next;
  
! code decr       ( addr -- )     \ decrement the contents of addr
       1 0 in/out
                  sub     dword [eax], # 1
--- 766,770 ----
                  next;
  
! code 1-!        ( addr -- )     \ decrement the contents of addr
       1 0 in/out
                  sub     dword [eax], # 1
***************
*** 772,776 ****
                  next;
  
! code cincr      ( addr -- )     \ increment the byte contents of addr
       1 0 in/out
                  add     byte [eax], # 1
--- 772,776 ----
                  next;
  
! code 1+c!       ( addr -- )     \ increment the byte contents of addr
       1 0 in/out
                  add     byte [eax], # 1
***************
*** 778,782 ****
                  next;
  
! code cdecr      ( addr -- )     \ decrement the byte contents of addr
       1 0 in/out
                  sub     byte [eax], # 1
--- 778,782 ----
                  next;
  
! code 1-c!       ( addr -- )     \ decrement the byte contents of addr
       1 0 in/out
                  sub     byte [eax], # 1
***************
*** 995,998 ****
--- 995,1000 ----
              (comp-only) compilation> drop _r>drop (copy-code) ;
              0 0 in/out
+             
+ ' r>drop alias rdrop            
  
  gcode _2>r                                    \ push two items onto the rstack
***************
*** 1502,1506 ****
  code *          ( n1 n2 -- n3 ) \ multiply n1 by n2, return single result n3
       2 1 in/out
!                 imul     dword [ebp]
                  next;
  
--- 1504,1508 ----
  code *          ( n1 n2 -- n3 ) \ multiply n1 by n2, return single result n3
       2 1 in/out
!                 imul    dword [ebp]
                  next;
  
***************
*** 2211,2215 ****
  : ,             ( n -- ) here  ! cell dp +!  ;     \ cell store, incr
  : w,            ( n -- ) here w! 2    dp +!  ;     \ word store, incr
! : c,            ( n -- ) here c!      dp incr ;    \ char store
  
  : mem-free      ( -- n1 ) dp 2 cells+ @ here - ;
--- 2213,2217 ----
  : ,             ( n -- ) here  ! cell dp +!  ;     \ cell store, incr
  : w,            ( n -- ) here w! 2    dp +!  ;     \ word store, incr
! : c,            ( n -- ) here c!      dp 1+! ;     \ char store
  
  : mem-free      ( -- n1 ) dp 2 cells+ @ here - ;
***************
*** 2356,2362 ****
  \   : IF -14 throw
  \     compilation> ...stuff to do IF at compile... ;
! \   ' opt-swap   compiles swap
! \   ' noop       compiles chars
! \   ' opt-inline compiles dup
  \   : x swap ; inline
  
--- 2358,2364 ----
  \   : IF -14 throw
  \     compilation> ...stuff to do IF at compile... ;
! \   ' opt-swap   compiles-for swap
! \   ' noop       compiles-for chars
! \   ' opt-inline compiles-for dup
  \   : x swap ; inline
  
***************
*** 3318,3324 ****
                  cmp     eax, edi
                  jae     short @@3               \ out of base range
!                 xchg    eax, 4 [ebp]            \ high word * base
                  mul     edi
!                 xchg    eax, 8 [ebp]            \ low word * base
                  mul     edi
                  add     eax, 4 [ebp]            \ add
--- 3320,3332 ----
                  cmp     eax, edi
                  jae     short @@3               \ out of base range
! \                xchg    eax, 4 [ebp]            \ high word * base
!                 mov     edx, eax
!                 mov     eax, 4 [ebp]            \ swap eax <-> 4 [ebp]
!                 mov     4 [ebp], edx
                  mul     edi
! \                xchg    eax, 8 [ebp]            \ low word * base
!                 mov     edx, eax
!                 mov     eax, 8 [ebp]            \ swap eax <-> 8 [ebp]
!                 mov     8 [ebp], edx
                  mul     edi
                  add     eax, 4 [ebp]            \ add
***************
*** 3398,3405 ****
                  jbe     short @@1
                  add     al, # 7
! @@1:            add     al, # char 0
                  mov     ecx, hld [up]
                  sub     ecx, # 1
!                 mov     0 [ecx], al
                  mov     hld [up], ecx
                  mov     eax, esi
--- 3406,3413 ----
                  jbe     short @@1
                  add     al, # 7
! @@1:            add     al, # '0'
                  mov     ecx, hld [up]
                  sub     ecx, # 1
!                 mov     [ecx], al
                  mov     hld [up], ecx
                  mov     eax, esi