Diff for /gforth/engine/main.c between versions 1.163 and 1.164

version 1.163, 2006/03/11 22:45:29 version 1.164, 2006/03/11 23:05:09
Line 94  Address gforth_LP; Line 94  Address gforth_LP;
   
 #include <ffi.h>  #include <ffi.h>
   
 void ** clist;  void ** gforth_clist;
 void * ritem;  void * gforth_ritem;
   
 void gforth_callback(ffi_cif * cif, void * resp, void ** args, void * ip)  void gforth_callback(ffi_cif * cif, void * resp, void ** args, void * ip)
 {  {
Line 104  void gforth_callback(ffi_cif * cif, void Line 104  void gforth_callback(ffi_cif * cif, void
   Float *fp = gforth_FP;    Float *fp = gforth_FP;
   Address lp = gforth_LP;    Address lp = gforth_LP;
   
   clist = args;    gforth_clist = args;
   ritem = resp;    gforth_ritem = resp;
   
   engine((Xt *)ip, sp, rp, fp, lp);    gforth_engine((Xt *)ip, sp, rp, fp, lp);
   
   /* restore global variables */    /* restore global variables */
   gforth_RP = rp;    gforth_RP = rp;
Line 665  int gforth_go(Address image, int stack, Line 665  int gforth_go(Address image, int stack,
 #endif /* !defined(GFORTH_DEBUGGING) */  #endif /* !defined(GFORTH_DEBUGGING) */
     /* fprintf(stderr, "rp=$%x\n",rp0);*/      /* fprintf(stderr, "rp=$%x\n",rp0);*/
           
     return((int)(Cell)engine(image_header->throw_entry, signal_data_stack+15,      return((int)(Cell)gforth_engine(image_header->throw_entry, signal_data_stack+15,
                        rp0, signal_fp_stack, 0));                         rp0, signal_fp_stack, 0));
   }    }
 #endif  #endif
   
   return((int)(Cell)engine(ip0,sp0,rp0,fp0,lp0));    return((int)(Cell)gforth_engine(ip0,sp0,rp0,fp0,lp0));
 }  }
   
 #ifndef INCLUDE_IMAGE  #ifndef INCLUDE_IMAGE
Line 867  static void check_prims(Label symbols1[] Line 867  static void check_prims(Label symbols1[]
 #ifndef NO_DYNAMIC  #ifndef NO_DYNAMIC
   if (no_dynamic)    if (no_dynamic)
     return;      return;
   symbols2=engine2(0,0,0,0,0);    symbols2=gforth_engine2(0,0,0,0,0);
 #if NO_IP  #if NO_IP
   symbols3=engine3(0,0,0,0,0);    symbols3=gforth_engine3(0,0,0,0,0);
 #else  #else
   symbols3=symbols1;    symbols3=symbols1;
 #endif  #endif
Line 1712  Address gforth_loader(FILE *imagefile, c Line 1712  Address gforth_loader(FILE *imagefile, c
 #endif  #endif
     ;      ;
   
   vm_prims = engine(0,0,0,0,0);    vm_prims = gforth_engine(0,0,0,0,0);
   check_prims(vm_prims);    check_prims(vm_prims);
   prepare_super_table();    prepare_super_table();
 #ifndef DOUBLY_INDIRECT  #ifndef DOUBLY_INDIRECT
Line 2142  int main(int argc, char **argv, char **e Line 2142  int main(int argc, char **argv, char **e
   set_stack_sizes((ImageHeader *)image);    set_stack_sizes((ImageHeader *)image);
   if(((ImageHeader *)image)->base != image)    if(((ImageHeader *)image)->base != image)
     gforth_relocate(image, reloc_bits, ((ImageHeader *)image)->image_size,      gforth_relocate(image, reloc_bits, ((ImageHeader *)image)->image_size,
                     (Label*)engine(0, 0, 0, 0, 0));                      (Label*)gforth_engine(0, 0, 0, 0, 0));
   alloc_stacks((ImageHeader *)image);    alloc_stacks((ImageHeader *)image);
 #else  #else
   image_file = open_image_file(imagename, path);    image_file = open_image_file(imagename, path);

Removed from v.1.163  
changed lines
  Added in v.1.164


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