[BACK]Return to ca.h CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / include

Diff for /OpenXM_contrib2/asir2000/include/ca.h between version 1.70 and 1.82

version 1.70, 2008/08/11 16:23:24 version 1.82, 2012/12/17 07:20:45
Line 45 
Line 45 
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *   *
  * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.69 2008/08/08 11:16:34 ohara Exp $   * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.81 2011/06/16 08:17:15 noro Exp $
 */  */
 #include <stdio.h>  #include <stdio.h>
 #include <stdlib.h>  #include <stdlib.h>
Line 57 
Line 57 
   
 #if !defined(VISUAL)  #if !defined(VISUAL)
 #include <unistd.h>  #include <unistd.h>
 #endif  
   
 #if !defined(VISUAL)  
 #include <sys/param.h>  #include <sys/param.h>
 #endif  #endif
   
Line 93  typedef void * pointer;
Line 90  typedef void * pointer;
 #endif  #endif
 #endif  #endif
   
   #define NULLP ((void *)0)
   
 #define TODO            printf("%s: not implemented!\n", __func__)  #define TODO            printf("%s: not implemented!\n", __func__)
   
 #define COPY(a,b) ((b)=(a))  #define COPY(a,b) ((b)=(a))
Line 153  typedef enum {
Line 152  typedef enum {
         A_end=0,A_fnode,A_arf,A_int,A_str,A_internal,A_node,A_notimpl,A_func          A_end=0,A_fnode,A_arf,A_int,A_str,A_internal,A_node,A_notimpl,A_func
 } farg_type;  } farg_type;
   
 #if defined(LONG_IS_32BIT)  #if SIZEOF_LONG == 8
 #if defined(VISUAL)  typedef long L;
 typedef _int64 L;  typedef unsigned long UL;
 typedef unsigned _int64 UL;  #elif defined(HAVE_UNSIGNED_LONG_LONG)
 #else  
 typedef long long L;  typedef long long L;
 typedef unsigned long long UL;  typedef unsigned long long UL;
   #elif defined(_MSC_VER)
   typedef _int64 L;
   typedef unsigned _int64 UL;
 #endif  #endif
 #else  
 typedef long L;  
 typedef unsigned long UL;  
 #endif  
   
 typedef struct oN {  typedef struct oN {
         int p;          int p;
Line 625  struct order_spec {
Line 622  struct order_spec {
         int id;          int id;
         Obj obj;          Obj obj;
         int nv;          int nv;
           int ispot; /* 1 means Position over Term (Pos then Term) */
           int pot_nelim; /* size of positions for pot-elimination order */
         union {          union {
                 int simple;                  int simple;
                 struct {                  struct {
Line 727  typedef unsigned int ModNum;
Line 726  typedef unsigned int ModNum;
   
 /* memory allocators (W_... : uses alloca) */  /* memory allocators (W_... : uses alloca) */
   
 #if 0  
 #define MALLOC(d) Risa_GC_malloc(d)  #define MALLOC(d) Risa_GC_malloc(d)
 #define MALLOC_ATOMIC(d) Risa_GC_malloc_atomic(d)  #define MALLOC_ATOMIC(d) Risa_GC_malloc_atomic(d)
   #define MALLOC_ATOMIC_IGNORE_OFF_PAGE(d) Risa_GC_malloc_atomic_ignore_off_page(d)
 #define REALLOC(p,d) Risa_GC_realloc(p,d)  #define REALLOC(p,d) Risa_GC_realloc(p,d)
 #else  #define GCFREE(p) Risa_GC_free(p)
 #define MALLOC(d) GC_malloc(d)  
 #define MALLOC_ATOMIC(d) GC_malloc_atomic(d)  
 #define REALLOC(p,d) GC_realloc(p,d)  
 #endif  
 #define CALLOC(d,e) MALLOC((d)*(e))  #define CALLOC(d,e) MALLOC((d)*(e))
   
 #if !defined(__CYGWIN__) && (defined(__GNUC__) || defined(vax) || defined(apollo) || defined(alloca) || defined(VISUAL))  #if !defined(__CYGWIN__) && (defined(__GNUC__) || defined(vax) || defined(apollo) || defined(alloca) || defined(VISUAL))
Line 1321  void copyn(N,int,int *);
Line 1316  void copyn(N,int,int *);
 void kmulnmain(N,N,N *);  void kmulnmain(N,N,N *);
 int qcoefp(Obj);  int qcoefp(Obj);
 int qcoefr(Obj);  int qcoefr(Obj);
 long get_allocwords(void);  size_t get_allocwords(void);
 double get_clock(void);  double get_clock(void);
 void get_eg(struct oEGT *);  void get_eg(struct oEGT *);
 void printtime(struct oEGT *,struct oEGT *,double);  void printtime(struct oEGT *,struct oEGT *,double);
Line 1426  LUM LUMALLOC(int, int);
Line 1421  LUM LUMALLOC(int, int);
 BM BMALLOC(int, int);  BM BMALLOC(int, int);
 Obj ToAlg(Num);  Obj ToAlg(Num);
 UM *berlemain(register int, UM, UM *);  UM *berlemain(register int, UM, UM *);
   void Risa_GC_set_adj(int,int);
   void Risa_GC_get_adj(int *,int *);
 void *Risa_GC_malloc(size_t);  void *Risa_GC_malloc(size_t);
 void *Risa_GC_malloc_atomic(size_t);  void *Risa_GC_malloc_atomic(size_t);
 void *Risa_GC_realloc(void *,size_t);  void *Risa_GC_realloc(void *,size_t);
Legend:
Removed from v.1.70  
changed lines
  Added in v.1.82
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>