Changeset b39d4d in git

Timestamp:

Dec 18, 2000, 4:44:42 PM (22 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

e3dc1cc75eb8813142d38ad4d5b8638f5748228a

Parents:

6a9b5a892f6ba5ac58be777a540985149140afae

Message:

Dec alpha port


git-svn-id: file:///usr/local/Singular/svn/trunk@4933 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• cntrlc.cc (modified) (2 diffs)
• extra.cc (modified) (3 diffs)
• feResource.cc (modified) (1 diff)
• iparith.cc (modified) (3 diffs)
• modulop.h (modified) (2 diffs)
• mpr_complex.cc (modified) (3 diffs)
• mpr_numeric.cc (modified) (3 diffs)
• omSingularConfig.h (modified) (3 diffs)

Singular/cntrlc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: cntrlc.cc,v 1.35 2000-09-18 12:03:56 obachman Exp $ */
+/* $Id: cntrlc.cc,v 1.36 2000-12-18 15:44:39 obachman Exp $ */
 /*
 * ABSTRACT - interupt handling
@@ -26 +26 @@
 
 /* undef, if you don't want GDB to come up on error */
-#define CALL_GDB 
+
+#if !defined(__alpha)
+#define CALL_GDB
+#endif
 
 #if defined(__OPTIMIZE__) && defined(CALL_GDB)

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.152 2000-12-12 08:44:43 obachman Exp $ */
+/* $Id: extra.cc,v 1.153 2000-12-18 15:44:39 obachman Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -8 +8 @@
 
 #include <stdlib.h>
+#if defined(__alpha)
+extern "C"
+{
+  int setenv(const char *name, const char *value, int overwrite);
+}
+#endif
+
 #include <stdio.h>
 #include <string.h>
@@ -346 +353 @@
       if (feOptSpec[opt].type == feOptUntyped)
       {
-        feSetOptValue(opt,NULL);
+        feSetOptValue(opt,0);
         return FALSE;
       }

Singular/feResource.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: feResource.cc,v 1.30 2000-09-18 09:18:55 obachman Exp $ */
+/* $Id: feResource.cc,v 1.31 2000-12-18 15:44:40 obachman Exp $ */
 /*
 * ABSTRACT: management of resources
 */
+
+#include <stdlib.h>
+#if defined(__alpha)
+extern "C"
+{
+  int setenv(const char *name, const char *value, int overwrite);
+};
+#endif
 
 #include <unistd.h>

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.241 2000-12-15 18:49:29 Singular Exp $ */
+/* $Id: iparith.cc,v 1.242 2000-12-18 15:44:40 obachman Exp $ */
 
 /*
@@ -2875 +2875 @@
 static BOOLEAN jjIS_RINGVAR_S(leftv res, leftv v)
 {
-  res->data = (char *)(rIsRingVar((char *)v->Data())+1);
+  res->data = (char *)(r_IsRingVar((char *)v->Data(), currRing)+1);
   return FALSE;
 }
@@ -4983 +4983 @@
 
 #ifndef __MWERKS__
+#if defined(__alpha)
+extern "C"
+{
+  void usleep(unsigned long usec);
+};
+#endif
+
 static BOOLEAN jjSTATUS_M(leftv res, leftv v)
 {

Singular/modulop.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: modulop.h,v 1.13 2000-12-15 18:49:34 Singular Exp $ */
+/* $Id: modulop.h,v 1.14 2000-12-18 15:44:41 obachman Exp $ */
 /*
 * ABSTRACT: numbers modulo p (<=32003)
@@ -11 +11 @@
 
 // define if a*b is with mod instead of tables
+#if defined(i386)
+// seems to be better on i386 processors
 #define HAVE_MULT_MOD
+#endif
 
 extern int npPrimeM;

Singular/mpr_complex.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpr_complex.cc,v 1.28 2000-11-21 15:35:44 Singular Exp $ */
+/* $Id: mpr_complex.cc,v 1.29 2000-12-18 15:44:41 obachman Exp $ */
 
 /*
@@ -63 +63 @@
   gmp_output_digits= digits;
   mpf_set_default_prec( db );
-  mpf_set_prec((mpf_ptr)*(diff.mpfp()),32);
-  mpf_set_prec((mpf_ptr)*gmpRel.mpfp(),32);
-  mpf_set_d((mpf_ptr)*gmpRel.mpfp(),0.1);
-  mpf_pow_ui((mpf_ptr)*gmpRel.mpfp(),(mpf_ptr)*gmpRel.mpfp(),digits);
+  mpf_set_prec(*diff._mpfp(),32);
+  mpf_set_prec(*gmpRel._mpfp(),32);
+  mpf_set_d(*gmpRel._mpfp(),0.1);
+  mpf_pow_ui(*gmpRel._mpfp(),*gmpRel._mpfp(),digits);
 }
 
@@ -706 +706 @@
   gmp_float ai=this->imag();
   if (ar.isZero() || ai.isZero()) return;
-  mpf_abs((mpf_ptr)*ar.mpfp(), (mpf_ptr)*ar.mpfp());
-  mpf_abs((mpf_ptr)*ai.mpfp(), (mpf_ptr)*ai.mpfp());
-  mpf_set_prec((mpf_ptr)*ar.mpfp(), 32);
-  mpf_set_prec((mpf_ptr)*ai.mpfp(), 32);
+  mpf_abs(*ar._mpfp(), *ar._mpfp());
+  mpf_abs(*ai._mpfp(), *ai._mpfp());
+  mpf_set_prec(*ar._mpfp(), 32);
+  mpf_set_prec(*ai._mpfp(), 32);
   if (ar > ai)
   {
-    mpf_div((mpf_ptr)*ai.mpfp(), (mpf_ptr)*ai.mpfp(), (mpf_ptr)*ar.mpfp());
+    mpf_div(*ai._mpfp(), *ai._mpfp(), *ar._mpfp());
     if (ai < gmpRel) this->imag(0.0);
   }
   else
   {
-    mpf_div((mpf_ptr)*ar.mpfp(), (mpf_ptr)*ar.mpfp(), (mpf_ptr)*ai.mpfp());
+    mpf_div(*ar._mpfp(), *ar._mpfp(), *ai._mpfp());
     if (ar < gmpRel) this->real(0.0);
   }

Singular/mpr_numeric.cc

@@ -3 +3 @@
 ****************************************/
 
-/* $Id: mpr_numeric.cc,v 1.11 2000-10-05 15:16:58 Singular Exp $ */
+/* $Id: mpr_numeric.cc,v 1.12 2000-12-18 15:44:42 obachman Exp $ */
 
 /*
@@ -597 +597 @@
     abx_g= abs(*x);
 
+// gcc 2.95.2 on the dec alpha chokes on this
+#if defined(__GNUC__)
+#if ! (defined(__alpha) && __GNUC__ == 2 && __GNUC_MINOR__ == 95)
     for ( j= m-1; j >= 0; j-- )
     {
@@ -631 +634 @@
     if ( iter % MT ) *x= x1;
     else *x -= ( dx * frac_g[ iter / MT ] );
+#endif
+#endif
   }
 
   *its= MAXIT+1;
-
   return;
 }

Singular/omSingularConfig.h

@@ -8 +8 @@
  *  Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: omSingularConfig.h,v 1.2 2000-08-24 14:42:42 obachman Exp $
+ *  Version: $Id: omSingularConfig.h,v 1.3 2000-12-18 15:44:42 obachman Exp $
  *******************************************************************/
 #ifndef OM_SINGULAR_CONFIG_H
@@ -34 +34 @@
 #endif
 
-/* number of bytes for difference to report */
-#define SING_REPORT_THRESHOLD 100*1024 
+/* number of bytes for difference to report: every 1 MByte */
+#define SING_REPORT_THRESHOLD 1000*1024 
 #define OM_SINGULAR_HOOK                                                        \
 do                                                                              \
@@ -48 +48 @@
     if (_diff >= SING_REPORT_THRESHOLD)                                         \
     {                                                                           \
-      fprintf(stdout, "[%dk]", (_current_bytes + 1023)/1024);                   \
+      fprintf(stdout, "[%ldk]", (_current_bytes + 1023)/1024);                   \
       fflush(stdout);                                                           \
       om_sing_last_reported_size = _current_bytes;                              \