Changeset 4c1fc0 in git

Timestamp:

Jun 19, 2020, 10:55:59 AM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

3d6980be663538ed4efeec213d1769a026246946

Parents:

a02e2d11b6842e0841b4b9ee0908d69811cb330abd4cb060451e0b667bf3d6fd96cd6bfeff53ce4d

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2020-06-19 10:55:59+02:00

git-committer:

GitHub <noreply@github.com>2020-06-19 10:55:59+02:00

Message:

Merge pull request #1009 from fingolfin/mh/sigcontext

Unify access to sigcontext on Linux + x86

Files:

• Singular/cntrlc.cc (modified) (2 diffs)
• factory/FLINTconvert.cc (modified) (1 diff)
• factory/cf_factor.cc (modified) (2 diffs)

Singular/cntrlc.cc

@@ -5 +5 @@
 * ABSTRACT - interupt handling
 */
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
 #include "kernel/mod2.h"
 
@@ -155 +160 @@
 
 /*---------------------------------------------------------------------*/
-#if defined(__linux__) && defined(__i386)
-  #if !defined(HAVE_SIGCONTEXT) && !defined(HAVE_ASM_SIGCONTEXT_H)
-// we need the following structure sigcontext_struct.
-// if configure finds asm/singcontext.h we assume
-// that this file contains the structure and is included
-// via signal.h
-struct sigcontext_struct {
-        unsigned short gs, __gsh;
-        unsigned short fs, __fsh;
-        unsigned short es, __esh;
-        unsigned short ds, __dsh;
-        unsigned long edi;
-        unsigned long esi;
-        unsigned long ebp;
-        unsigned long esp;
-        unsigned long ebx;
-        unsigned long edx;
-        unsigned long ecx;
-        unsigned long eax;
-        unsigned long trapno;
-        unsigned long err;
-        unsigned long eip;
-        unsigned short cs, __csh;
-        unsigned long eflags;
-        unsigned long esp_at_signal;
-        unsigned short ss, __ssh;
-        unsigned long i387;
-        unsigned long oldmask;
-        unsigned long cr2;
-};
-#endif
-#define HAVE_SIGSTRUCT
-typedef struct sigcontext_struct sigcontext;
-#endif
-
-#if defined(__linux__) && defined(__amd64)
-#define HAVE_SIGSTRUCT
-#endif
-
-
-#if defined(HAVE_SIGSTRUCT)
+#if defined(__linux__) && (defined(__i386) || defined(__amd64))
 /*2---------------------------------------------------------------------*/
 /**

factory/FLINTconvert.cc

@@ -303 +303 @@
   CFFList result;
   long i;
+
+  result.append (CFFactor(convertFmpz2CF(&fac->c),1));
 
   for (i = 0; i < fac->num; i++)

factory/cf_factor.cc

@@ -547 +547 @@
       CanonicalForm ic=icontent(fz);
       fz/=ic;
-      #if 0 // #if defined(HAVE_FLINT) && (__FLINT_RELEASE>=20504)
-      // use FLINT
-      fmpz_poly_t f1;
-      convertFacCF2Fmpz_poly_t (f1, fz);
-      fmpz_poly_factor_t result;
-      fmpz_poly_factor_init (result);
-      fmpz_poly_factor_zassenhaus(result, f1);
-      F= convertFLINTfmpz_poly_factor2FacCFFList (result, fz.mvar());
-      fmpz_poly_factor_clear (result);
-      fmpz_poly_clear (f1);
+      if (fz.degree()==1)
+      {
+        F=CFFList(CFFactor(fz,1));
+      }
+      else
+      #if defined(HAVE_FLINT) && (__FLINT_RELEASE>=20504)
+      {
+        // use FLINT
+        fmpz_poly_t f1;
+        convertFacCF2Fmpz_poly_t (f1, fz);
+        fmpz_poly_factor_t result;
+        fmpz_poly_factor_init (result);
+        fmpz_poly_factor(result, f1);
+        F= convertFLINTfmpz_poly_factor2FacCFFList (result, fz.mvar());
+        fmpz_poly_factor_clear (result);
+        fmpz_poly_clear (f1);
+      }
       if ( ! ic.isOne() )
       {
@@ -569 +576 @@
       }
       goto end_char0;
-      #elif defined HAVE_NTL
-      //USE NTL
-      ZZ c;
-      vec_pair_ZZX_long factors;
-      //factorize the converted polynomial
-      factor(c,factors,convertFacCF2NTLZZX(fz));
-
-      //convert the result back to Factory
-      F=convertNTLvec_pair_ZZX_long2FacCFFList(factors,c,fz.mvar());
+      #elif defined(HAVE_NTL)
+      {
+        //USE NTL
+        ZZ c;
+        vec_pair_ZZX_long factors;
+        //factorize the converted polynomial
+        factor(c,factors,convertFacCF2NTLZZX(fz));
+
+        //convert the result back to Factory
+        F=convertNTLvec_pair_ZZX_long2FacCFFList(factors,c,fz.mvar());
+      }
       if ( ! ic.isOne() )
       {