--- gforth/prims2x.fs 2002/10/12 18:36:25 1.119 +++ gforth/prims2x.fs 2003/01/19 23:35:30 1.128 @@ -1,6 +1,6 @@ \ converts primitives to, e.g., C code -\ Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc. +\ Copyright (C) 1995-2003 Free Software Foundation, Inc. \ This file is part of Gforth. @@ -95,6 +95,9 @@ variable include-skipped-insts \ inline arguments (false) include-skipped-insts off +variable immarg \ values for immediate arguments (to be used in IMM_ARG macros) +$12340000 immarg ! + : th ( addr1 n -- addr2 ) cells + ; @@ -159,6 +162,7 @@ struct% cell% 2* field stack-pointer \ stackpointer name cell% field stack-type \ name for default type of stack items cell% field stack-in-index-xt \ ( in-size item -- in-index ) + cell% field stack-access-transform \ ( nitem -- index ) end-struct stack% struct% @@ -194,7 +198,9 @@ create stacks max-stacks cells allot \ a 1 next-stack-number +! r@ stack-type ! save-mem r@ stack-pointer 2! - ['] stack-in-index r> stack-in-index-xt ! ; + ['] stack-in-index r@ stack-in-index-xt ! + ['] noop r@ stack-access-transform ! + rdrop ; : map-stacks { xt -- } \ perform xt for all stacks @@ -325,19 +331,29 @@ Variable function-number 0 function-numb : complement ( set1 -- set2 ) empty ['] bit-equivalent binary-set-operation ; +\ forward declaration for inst-stream (breaks cycle in definitions) +defer inst-stream-f ( -- stack ) + \ stack access stuff -: normal-stack-access ( n stack -- ) - stack-pointer 2@ type - dup - if - ." [" 0 .r ." ]" +: normal-stack-access0 { n stack -- } + n stack stack-access-transform @ execute ." [" 0 .r ." ]" ; + +: normal-stack-access1 { n stack -- } + stack stack-pointer 2@ type + n if + n stack normal-stack-access0 else - drop ." TOS" + ." TOS" endif ; -\ forward declaration for inst-stream (breaks cycle in definitions) -defer inst-stream-f ( -- stack ) +: normal-stack-access ( n stack -- ) + dup inst-stream-f = if + ." IMM_ARG(" normal-stack-access1 ." ," immarg ? ." )" + 1 immarg +! + else + normal-stack-access1 + endif ; : stack-depth { stack -- n } current-depth stack stack-number @ th @ ; @@ -634,7 +650,7 @@ stack inst-stream IP Cell stack stack-out @ 0<> stack stack-in @ 0= and if ." IF_" stack stack-pointer 2@ 2dup type ." TOS(" - 2dup type ." [0] = " type ." TOS);" cr + 2dup type 0 stack normal-stack-access0 ." = " type ." TOS);" cr endif ; : flush-tos ( -- ) @@ -644,7 +660,7 @@ stack inst-stream IP Cell stack stack-out @ 0= stack stack-in @ 0<> and if ." IF_" stack stack-pointer 2@ 2dup type ." TOS(" - 2dup type ." TOS = " type ." [0]);" cr + 2dup type ." TOS = " type 0 stack normal-stack-access0 ." );" cr endif ; : fill-tos ( -- ) @@ -657,19 +673,21 @@ stack inst-stream IP Cell : fetches ( -- ) prim prim-effect-in prim prim-effect-in-end @ ['] fetch map-items ; -: inst-pointer-update ( -- ) - inst-stream stack-in @ ?dup-if - ." INC_IP(" 0 .r ." );" cr - endif ; +: stack-update-transform ( n1 stack -- n2 ) + \ n2 is the number by which the stack pointer should be + \ incremented to pop n1 items + stack-access-transform @ dup >r execute + 0 r> execute - ; : stack-pointer-update { stack -- } - \ stack grow downwards + \ stacks grow downwards stack stack-diff ?dup-if \ this check is not necessary, gcc would do this for us stack inst-stream = if - inst-pointer-update + ." INC_IP(" 0 .r ." );" cr else - stack stack-pointer 2@ type ." += " 0 .r ." ;" cr + stack stack-pointer 2@ type ." += " + stack stack-update-transform 0 .r ." ;" cr endif endif ; @@ -718,39 +736,43 @@ stack inst-stream IP Cell endif 2drop ; -: output-c-tail1 ( -- ) - \ the final part of the generated C code before stores +: output-nextp2 ( -- ) + ." NEXT_P2;" cr ; + +variable tail-nextp2 \ xt to execute for printing NEXT_P2 in INST_TAIL +' output-nextp2 tail-nextp2 ! + +: output-label2 ( -- ) + ." LABEL2(" prim prim-c-name 2@ type ." )" cr + ." NEXT_P2;" cr ; + +: output-c-tail1 { xt -- } + \ the final part of the generated C code, with xt printing LABEL2 or not. output-super-end print-debug-results - ." NEXT_P1;" cr ; - -: output-c-tail ( -- ) - \ the final part of the generated C code, without LABEL2 - output-c-tail1 + ." NEXT_P1;" cr stores fill-tos - ." NEXT_P2;" ; + xt execute ; -: output-c-tail-no-stores ( -- ) - \ the final part of the generated C code, without LABEL2 - output-c-tail1 +: output-c-tail1-no-stores { xt -- } + \ the final part of the generated C code for combinations + output-super-end + ." NEXT_P1;" cr fill-tos - ." NEXT_P2;" ; + xt execute ; + +: output-c-tail ( -- ) + tail-nextp2 @ output-c-tail1 ; : output-c-tail2 ( -- ) - \ the final part of the generated C code, including LABEL2 - output-c-tail1 - stores - fill-tos - ." LABEL2(" prim prim-c-name 2@ type ." )" cr - ." NEXT_P2;" cr ; + ['] output-label2 output-c-tail1 ; + +: output-c-tail-no-stores ( -- ) + tail-nextp2 @ output-c-tail1-no-stores ; : output-c-tail2-no-stores ( -- ) - \ the final part of the generated C code, including LABEL2 - output-c-tail1 - fill-tos - ." LABEL2(" prim prim-c-name 2@ type ." )" cr - ." NEXT_P2;" cr ; + ['] output-label2 output-c-tail1-no-stores ; : type-c-code ( c-addr u xt -- ) \ like TYPE, but replaces "INST_TAIL;" with tail code produced by xt @@ -918,8 +940,8 @@ stack inst-stream IP Cell : output-alias ( -- ) ( primitive-number @ . ." alias " ) ." Primitive " prim prim-name 2@ type cr ; -: output-prim-num ( -- ) - prim prim-num @ 8 + 4 .r space prim prim-name 2@ type cr ; +: output-c-prim-num ( -- ) + ." #define N_" prim prim-c-name 2@ type prim prim-num @ 8 + 4 .r cr ; : output-forth ( -- ) prim prim-forth-code @ 0= @@ -1162,7 +1184,7 @@ stack inst-stream IP Cell r> in-part ! ; : part-stack-pointer-updates ( -- ) - max-stacks 0 +do + next-stack-number @ 0 +do i part-num @ 1+ s-c-max-depth @ dup i num-combined @ s-c-max-depth @ = \ final depth swap i part-num @ s-c-max-depth @ <> \ just reached now @@ -1414,7 +1436,7 @@ Variable c-flag (( (( ` g || ` G )) {{ start }} nonl ** {{ end forth-flag @ IF ." group " type cr THEN - c-flag @ IF ." GROUP(" type ." )" cr THEN }} + c-flag @ IF ." GROUP(" type ." , " function-number @ 0 .r ." )" cr THEN }} )) <- group-comment (( (( eval-comment || forth-comment || c-comment || else-comment || if-comment || group-comment )) ?? nonl ** )) <- comment-body