Changeset 28fc7b in git

Timestamp:

Oct 4, 2006, 2:40:58 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

1270db5f01f485ad9468a63f65555465d4ccf057

Parents:

f72aa03de97b3f79074d5677ce1c4649220522ae

Message:

*hannes: segv fix


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

File:

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

Singular/cntrlc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: cntrlc.cc,v 1.50 2006-10-04 12:37:42 Singular Exp $ */
+/* $Id: cntrlc.cc,v 1.51 2006-10-04 12:40:58 Singular Exp $ */
 /*
 * ABSTRACT - interupt handling
@@ -162 +162 @@
 #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
 
@@ -213 +182 @@
     fprintf(stderr,"Segment fault/Bus error occurred at %x because of %x (r:%d)\n"
                    "please inform the authors\n",
-                   (long)s.eip,(long)s.cr2,siRandomStart);
+                   #ifdef __i386__
+                   (long)s.eip,
+                   #else /* x86_64*/
+                   (long)s.rip,
+                   #endif
+                   (long)s.cr2,siRandomStart);
   }
 # ifdef __OPTIMIZE__