Diff for /gforth/engine/threaded.h between versions 1.14 and 1.16

version 1.14, 2002/01/16 10:40:26 version 1.16, 2002/11/24 13:54:02
Line 91 Line 91
   
 */  */
   
 /* CFA_NEXT: if NEXT uses cfa, you have to #define CFA_NEXT, to get  
  * cfa declared in engine.  
  */  
   
 #ifdef DOUBLY_INDIRECT  #ifdef DOUBLY_INDIRECT
 #  define CFA_NEXT  
 #  define NEXT_P0       ({cfa=*ip;})  #  define NEXT_P0       ({cfa=*ip;})
 #  define IP            (ip)  #  define IP            (ip)
 #  define SET_IP(p)     ({ip=(p); NEXT_P0;})  #  define SET_IP(p)     ({ip=(p); NEXT_P0;})
Line 113 Line 110
     fprintf(stderr,"EXEC encountered xt %p at ip=%p, vm_prims=%p, xts=%p\n", cfa, ip, vm_prims, xts); \      fprintf(stderr,"EXEC encountered xt %p at ip=%p, vm_prims=%p, xts=%p\n", cfa, ip, vm_prims, xts); \
  ca=**cfa; goto *ca;})   ca=**cfa; goto *ca;})
   
 #else /* !defined(DOUBLY_INDIRECT) */  #elif defined(NO_IP)
   
 #if defined(DIRECT_THREADED)  #define NEXT_P0
   #define SET_IP(target)  assert(0)
   #define INC_IP(n)       ((void)0)
   #define DEF_CA
   #define NEXT_P1
   #define NEXT_P2         ({goto *next_code;})
   /* set next_code to the return address before performing EXEC */
   #define EXEC(XT)        ({cfa=(XT); goto **cfa;})
   
 /* note that the "cfa dead" versions only work if GETCFA exists and works */  #else  /* !defined(DOUBLY_INDIRECT) && !defined(NO_IP) */
   
   #if defined(DIRECT_THREADED)
   
 #if THREADING_SCHEME==1  #if THREADING_SCHEME==1
 #warning direct threading scheme 1: autoinc, long latency, cfa live  #warning direct threading scheme 1: autoinc, long latency, cfa live
 #  define CFA_NEXT  
 #  define NEXT_P0       ({cfa=*ip++;})  #  define NEXT_P0       ({cfa=*ip++;})
 #  define IP            (ip-1)  #  define IP            (ip-1)
 #  define SET_IP(p)     ({ip=(p); NEXT_P0;})  #  define SET_IP(p)     ({ip=(p); NEXT_P0;})
Line 130 Line 135
 #  define DEF_CA  #  define DEF_CA
 #  define NEXT_P1  #  define NEXT_P1
 #  define NEXT_P2       ({goto *cfa;})  #  define NEXT_P2       ({goto *cfa;})
 #  define EXEC(XT)      ({cfa=(XT); goto *cfa;})  #  define EXEC(XT)      ({cfa=(XT); goto **cfa;})
 #endif  #endif
   
 #if THREADING_SCHEME==2  #if THREADING_SCHEME==2
 #warning direct threading scheme 2: autoinc, long latency, cfa dead  #warning direct threading scheme 2: autoinc, long latency, cfa dead
 #ifndef GETCFA  
 #error GETCFA must be defined for cfa dead threading  
 #endif  
 #  define NEXT_P0       (ip++)  #  define NEXT_P0       (ip++)
 #  define IP            (ip-1)  #  define IP            (ip-1)
 #  define SET_IP(p)     ({ip=(p); NEXT_P0;})  #  define SET_IP(p)     ({ip=(p); NEXT_P0;})
Line 146 Line 148
 #  define DEF_CA  #  define DEF_CA
 #  define NEXT_P1  #  define NEXT_P1
 #  define NEXT_P2       ({goto **(ip-1);})  #  define NEXT_P2       ({goto **(ip-1);})
 #  define EXEC(XT)      ({goto *(XT);})  #  define EXEC(XT)      ({cfa=(XT); goto **cfa;})
 #endif  #endif
   
   
 #if THREADING_SCHEME==3  #if THREADING_SCHEME==3
 #warning direct threading scheme 3: autoinc, low latency, cfa live  #warning direct threading scheme 3: autoinc, low latency, cfa live
 #  define CFA_NEXT  
 #  define NEXT_P0  #  define NEXT_P0
 #  define IP            (ip)  #  define IP            (ip)
 #  define SET_IP(p)     ({ip=(p); NEXT_P0;})  #  define SET_IP(p)     ({ip=(p); NEXT_P0;})
Line 161 Line 162
 #  define DEF_CA  #  define DEF_CA
 #  define NEXT_P1       ({cfa=*ip++;})  #  define NEXT_P1       ({cfa=*ip++;})
 #  define NEXT_P2       ({goto *cfa;})  #  define NEXT_P2       ({goto *cfa;})
 #  define EXEC(XT)      ({cfa=(XT); goto *cfa;})  #  define EXEC(XT)      ({cfa=(XT); goto **cfa;})
 #endif  #endif
   
 #if THREADING_SCHEME==4  #if THREADING_SCHEME==4
 #warning direct threading scheme 4: autoinc, low latency, cfa dead  #warning direct threading scheme 4: autoinc, low latency, cfa dead
 #ifndef GETCFA  
 #error GETCFA must be defined for cfa dead threading  
 #endif  
 #  define NEXT_P0  #  define NEXT_P0
 #  define IP            (ip)  #  define IP            (ip)
 #  define SET_IP(p)     ({ip=(p); NEXT_P0;})  #  define SET_IP(p)     ({ip=(p); NEXT_P0;})
Line 177 Line 175
 #  define DEF_CA  #  define DEF_CA
 #  define NEXT_P1  #  define NEXT_P1
 #  define NEXT_P2       ({goto **(ip++);})  #  define NEXT_P2       ({goto **(ip++);})
 #  define EXEC(XT)      ({goto *(XT);})  #  define EXEC(XT)      ({cfa=(XT); goto **cfa;})
 #endif  #endif
   
 #if THREADING_SCHEME==5  #if THREADING_SCHEME==5
 #warning direct threading scheme 5: long latency, cfa live  #warning direct threading scheme 5: long latency, cfa live
 #  define CFA_NEXT  
 #  define NEXT_P0       ({cfa=*ip;})  #  define NEXT_P0       ({cfa=*ip;})
 #  define IP            (ip)  #  define IP            (ip)
 #  define SET_IP(p)     ({ip=(p); NEXT_P0;})  #  define SET_IP(p)     ({ip=(p); NEXT_P0;})
Line 191 Line 188
 #  define DEF_CA  #  define DEF_CA
 #  define NEXT_P1       (ip++)  #  define NEXT_P1       (ip++)
 #  define NEXT_P2       ({goto *cfa;})  #  define NEXT_P2       ({goto *cfa;})
 #  define EXEC(XT)      ({cfa=(XT); goto *cfa;})  #  define EXEC(XT)      ({cfa=(XT); goto **cfa;})
 #endif  #endif
   
 #if THREADING_SCHEME==6  #if THREADING_SCHEME==6
 #warning direct threading scheme 6: long latency, cfa dead  #warning direct threading scheme 6: long latency, cfa dead
 #ifndef GETCFA  
 #error GETCFA must be defined for cfa dead threading  
 #endif  
 #  define NEXT_P0  #  define NEXT_P0
 #  define IP            (ip)  #  define IP            (ip)
 #  define SET_IP(p)     ({ip=(p); NEXT_P0;})  #  define SET_IP(p)     ({ip=(p); NEXT_P0;})
Line 207 Line 201
 #  define DEF_CA  #  define DEF_CA
 #  define NEXT_P1       (ip++)  #  define NEXT_P1       (ip++)
 #  define NEXT_P2       ({goto **(ip-1);})  #  define NEXT_P2       ({goto **(ip-1);})
 #  define EXEC(XT)      ({goto *(XT);})  #  define EXEC(XT)      ({cfa=(XT); goto **cfa;})
 #endif  #endif
   
   
 #if THREADING_SCHEME==7  #if THREADING_SCHEME==7
 #warning direct threading scheme 7: low latency, cfa live  #warning direct threading scheme 7: low latency, cfa live
 #  define CFA_NEXT  
 #  define NEXT_P0  #  define NEXT_P0
 #  define IP            (ip)  #  define IP            (ip)
 #  define SET_IP(p)     ({ip=(p); NEXT_P0;})  #  define SET_IP(p)     ({ip=(p); NEXT_P0;})
Line 222 Line 215
 #  define DEF_CA  #  define DEF_CA
 #  define NEXT_P1       ({cfa=*ip++;})  #  define NEXT_P1       ({cfa=*ip++;})
 #  define NEXT_P2       ({goto *cfa;})  #  define NEXT_P2       ({goto *cfa;})
 #  define EXEC(XT)      ({cfa=(XT); goto *cfa;})  #  define EXEC(XT)      ({cfa=(XT); goto **cfa;})
 #endif  #endif
   
 #if THREADING_SCHEME==8  #if THREADING_SCHEME==8
 #warning direct threading scheme 8: cfa dead, i386 hack  #warning direct threading scheme 8: cfa dead, i386 hack
 #ifndef GETCFA  
 #error GETCFA must be defined for cfa dead threading  
 #endif  
 #  define NEXT_P0  #  define NEXT_P0
 #  define IP            (ip)  #  define IP            (ip)
 #  define SET_IP(p)     ({ip=(p); NEXT_P0;})  #  define SET_IP(p)     ({ip=(p); NEXT_P0;})
Line 238 Line 228
 #  define DEF_CA  #  define DEF_CA
 #  define NEXT_P1       (ip++)  #  define NEXT_P1       (ip++)
 #  define NEXT_P2       ({goto **(ip-1);})  #  define NEXT_P2       ({goto **(ip-1);})
 #  define EXEC(XT)      ({goto *(XT);})  #  define EXEC(XT)      ({cfa=(XT); goto **cfa;})
 #endif  #endif
   
 #if THREADING_SCHEME==9  #if THREADING_SCHEME==9
Line 246 Line 236
 /* Power uses a prepare-to-branch instruction, and the latency between  /* Power uses a prepare-to-branch instruction, and the latency between
    this inst and the branch is 5 cycles on a PPC604; so we utilize this     this inst and the branch is 5 cycles on a PPC604; so we utilize this
    to do some prefetching in between */     to do some prefetching in between */
 #  define CFA_NEXT  
 #  define NEXT_P0  #  define NEXT_P0
 #  define IP            ip  #  define IP            ip
 #  define SET_IP(p)     ({ip=(p); next_cfa=*ip; NEXT_P0;})  #  define SET_IP(p)     ({ip=(p); next_cfa=*ip; NEXT_P0;})
Line 255 Line 244
 #  define DEF_CA          #  define DEF_CA        
 #  define NEXT_P1       ({cfa=next_cfa; ip++; next_cfa=*ip;})  #  define NEXT_P1       ({cfa=next_cfa; ip++; next_cfa=*ip;})
 #  define NEXT_P2       ({goto *cfa;})  #  define NEXT_P2       ({goto *cfa;})
 #  define EXEC(XT)      ({cfa=(XT); goto *cfa;})  #  define EXEC(XT)      ({cfa=(XT); goto **cfa;})
 #  define MORE_VARS     Xt next_cfa;  #  define MORE_VARS     Xt next_cfa;
 #endif  #endif
   
 #if THREADING_SCHEME==10  #if THREADING_SCHEME==10
 #warning direct threading scheme 10: plain (no attempt at scheduling)  #warning direct threading scheme 10: plain (no attempt at scheduling)
 #  define CFA_NEXT  
 #  define NEXT_P0  #  define NEXT_P0
 #  define IP            (ip)  #  define IP            (ip)
 #  define SET_IP(p)     ({ip=(p); NEXT_P0;})  #  define SET_IP(p)     ({ip=(p); NEXT_P0;})
Line 270 Line 258
 #  define DEF_CA  #  define DEF_CA
 #  define NEXT_P1  #  define NEXT_P1
 #  define NEXT_P2       ({cfa=*ip++; goto *cfa;})  #  define NEXT_P2       ({cfa=*ip++; goto *cfa;})
 #  define EXEC(XT)      ({cfa=(XT); goto *cfa;})  #  define EXEC(XT)      ({cfa=(XT); goto **cfa;})
 #endif  #endif
   
 /* direct threaded */  /* direct threaded */
Line 279 Line 267
   
 #if THREADING_SCHEME==1  #if THREADING_SCHEME==1
 #warning indirect threading scheme 1: autoinc, long latency, cisc  #warning indirect threading scheme 1: autoinc, long latency, cisc
 #  define CFA_NEXT  
 #  define NEXT_P0       ({cfa=*ip++;})  #  define NEXT_P0       ({cfa=*ip++;})
 #  define IP            (ip-1)  #  define IP            (ip-1)
 #  define SET_IP(p)     ({ip=(p); NEXT_P0;})  #  define SET_IP(p)     ({ip=(p); NEXT_P0;})
Line 293 Line 280
   
 #if THREADING_SCHEME==2  #if THREADING_SCHEME==2
 #warning indirect threading scheme 2: autoinc, long latency  #warning indirect threading scheme 2: autoinc, long latency
 #  define CFA_NEXT  
 #  define NEXT_P0       ({cfa=*ip++;})  #  define NEXT_P0       ({cfa=*ip++;})
 #  define IP            (ip-1)  #  define IP            (ip-1)
 #  define SET_IP(p)     ({ip=(p); NEXT_P0;})  #  define SET_IP(p)     ({ip=(p); NEXT_P0;})
Line 308 Line 294
   
 #if THREADING_SCHEME==3  #if THREADING_SCHEME==3
 #warning indirect threading scheme 3: autoinc, low latency, cisc  #warning indirect threading scheme 3: autoinc, low latency, cisc
 #  define CFA_NEXT  
 #  define NEXT_P0  #  define NEXT_P0
 #  define IP            (ip)  #  define IP            (ip)
 #  define SET_IP(p)     ({ip=(p); NEXT_P0;})  #  define SET_IP(p)     ({ip=(p); NEXT_P0;})
Line 322 Line 307
   
 #if THREADING_SCHEME==4  #if THREADING_SCHEME==4
 #warning indirect threading scheme 4: autoinc, low latency  #warning indirect threading scheme 4: autoinc, low latency
 #  define CFA_NEXT  
 #  define NEXT_P0       ({cfa=*ip++;})  #  define NEXT_P0       ({cfa=*ip++;})
 #  define IP            (ip-1)  #  define IP            (ip-1)
 #  define SET_IP(p)     ({ip=(p); NEXT_P0;})  #  define SET_IP(p)     ({ip=(p); NEXT_P0;})
Line 337 Line 321
   
 #if THREADING_SCHEME==5  #if THREADING_SCHEME==5
 #warning indirect threading scheme 5: long latency, cisc  #warning indirect threading scheme 5: long latency, cisc
 #  define CFA_NEXT  
 #  define NEXT_P0       ({cfa=*ip;})  #  define NEXT_P0       ({cfa=*ip;})
 #  define IP            (ip)  #  define IP            (ip)
 #  define SET_IP(p)     ({ip=(p); NEXT_P0;})  #  define SET_IP(p)     ({ip=(p); NEXT_P0;})
Line 351 Line 334
   
 #if THREADING_SCHEME==6  #if THREADING_SCHEME==6
 #warning indirect threading scheme 6: long latency  #warning indirect threading scheme 6: long latency
 #  define CFA_NEXT  
 #  define NEXT_P0       ({cfa=*ip;})  #  define NEXT_P0       ({cfa=*ip;})
 #  define IP            (ip)  #  define IP            (ip)
 #  define SET_IP(p)     ({ip=(p); NEXT_P0;})  #  define SET_IP(p)     ({ip=(p); NEXT_P0;})
Line 365 Line 347
   
 #if THREADING_SCHEME==7  #if THREADING_SCHEME==7
 #warning indirect threading scheme 7: low latency  #warning indirect threading scheme 7: low latency
 #  define CFA_NEXT  
 #  define NEXT_P0       ({cfa=*ip;})  #  define NEXT_P0       ({cfa=*ip;})
 #  define IP            (ip)  #  define IP            (ip)
 #  define SET_IP(p)     ({ip=(p); NEXT_P0;})  #  define SET_IP(p)     ({ip=(p); NEXT_P0;})
Line 379 Line 360
   
 #if THREADING_SCHEME==8  #if THREADING_SCHEME==8
 #warning indirect threading scheme 8: low latency,cisc  #warning indirect threading scheme 8: low latency,cisc
 #  define CFA_NEXT  
 #  define NEXT_P0  #  define NEXT_P0
 #  define IP            (ip)  #  define IP            (ip)
 #  define SET_IP(p)     ({ip=(p); NEXT_P0;})  #  define SET_IP(p)     ({ip=(p); NEXT_P0;})
Line 394 Line 374
 /* indirect threaded */  /* indirect threaded */
 #endif  #endif
   
 #endif /* !defined(DOUBLY_INDIRECT) */  #endif /* !defined(DOUBLY_INDIRECT) && !defined(NO_IP) */
   
 #define NEXT ({DEF_CA NEXT_P1; NEXT_P2;})  #define NEXT ({DEF_CA NEXT_P1; NEXT_P2;})
 #define IPTOS NEXT_INST  #define IPTOS NEXT_INST

Removed from v.1.14  
changed lines
  Added in v.1.16


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>