Changeset f72aa03 in git

Timestamp:

Oct 4, 2006, 2:37:42 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

28fc7b1bd7ee0ea859055dba375dfb0cbff37018

Parents:

8d73ea3098dd87269fe1b79862de4adec077bcb5

Message:

*hannes: segv handler for x86_64


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

File:

• Singular/cntrlc.cc (modified) (4 diffs)

Singular/cntrlc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: cntrlc.cc,v 1.49 2005-07-27 09:59:26 Singular Exp $ */
+/* $Id: cntrlc.cc,v 1.50 2006-10-04 12:37:42 Singular Exp $ */
 /*
 * ABSTRACT - interupt handling
@@ -157 +157 @@
         unsigned long cr2;
 };
+#define HAVE_SIGSTRUCT
 # endif
 typedef struct sigcontext_struct sigcontext;
-
-
+#endif
+#if defined(linux) && defined(x86_64_Linux)
+struct sigcontext_struct {
+        unsigned long r8;
+        unsigned long r9;
+        unsigned long r10;
+        unsigned long r11;
+        unsigned long r12;
+        unsigned long r13;
+        unsigned long r14;
+        unsigned long r15;
+        unsigned long rdi;
+        unsigned long rsi;
+        unsigned long rbp;
+        unsigned long rbx;
+        unsigned long rdx;
+        unsigned long rax;
+        unsigned long rcx;
+        unsigned long rsp;
+        unsigned long eip /*rip*/;
+        unsigned long eflags;           /* RFLAGS */
+        unsigned short cs;
+        unsigned short gs;
+        unsigned short fs;
+        unsigned short __pad0;
+        unsigned long err;
+        unsigned long trapno;
+        unsigned long oldmask;
+        unsigned long cr2;
+        struct _fpstate __user *fpstate;        /* zero when no FPU context */
+        unsigned long reserved1[8];
+};
+#define HAVE_SIGSTRUCT
+typedef struct sigcontext_struct sigcontext;
+#endif
+
+
+#if defined(linux) && defined(HAVE_SIGSTRUCT)
 /*2---------------------------------------------------------------------*/
 /** 
@@ -176 +213 @@
     fprintf(stderr,"Segment fault/Bus error occurred at %x because of %x (r:%d)\n"
                    "please inform the authors\n",
-                   (int)s.eip,(int)s.cr2,siRandomStart);
+                   (long)s.eip,(long)s.cr2,siRandomStart);
   }
 # ifdef __OPTIMIZE__
@@ -260 +297 @@
   si_set_signal(SIGVTALRM,(si_hdl_typ)sigalarm_handler);
 }
-# endif /* PAGE_TEST */
+#endif /* PAGE_TEST */
 
 /*2