1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
|
diff -u -x CVS -x work -x core -x *.core -x #* -x *~ -x *.orig -x *.rej -I $Id.*$ -I $.+BSD.*$ fault.c.orig fault.c
--- fault.c.orig Fri Jun 4 02:51:01 2004
+++ fault.c Sat Jun 19 18:42:22 2004
@@ -10,8 +10,54 @@
#include "defs.h"
+BOOL trapnote;
STRING trapcom[MAXTRAP];
+#if defined(SYSIII)
+BOOL trapflg[MAXTRAP] = {
+ 0,
+ 0, /* Hangup */
+ SIGCAUGHT, /* Interrupt */
+ SIGCAUGHT, /* Quit */
+ 0, /* Illegal instruction */
+ 0, /* Trace/BPT trap */
+ 0, /* IOT trap */
+ 0, /* EMT trap */
+ 0, /* Floating exception */
+ 0, /* Killed */
+ 0, /* Bus error */
+ 0, /* Memory fault */
+ 0, /* Bad system call */
+ 0, /* Broken pipe */
+ SIGCAUGHT, /* Alarm call */
+ SIGCAUGHT, /* Terminated */
+ 0, /* Urgent condition */
+ 0, /* Stopped */
+ 0, /* Stopped from terminal */
+ 0, /* Continued */
+ 0, /* Child terminated */
+ 0, /* Stopped on terminal input */
+ 0, /* Stopped on terminal output */
+ 0, /* Asynchronous I/O */
+ 0, /* Exceeded cpu time limit */
+ 0, /* Exceeded file size limit */
+ 0, /* Virtual time alarm */
+ 0, /* Profiling time alarm */
+ 0, /* Window size changed */
+ 0, /* Information request */
+ 0, /* User defined signal 1 */
+ 0, /* User defined signal 2 */
+ 0 /* Thread interrupt */
+};
+#else /* V7 */
BOOL trapflg[MAXTRAP];
+#endif
+#if defined(RENO)
+BOOL trapjmp[MAXTRAP];
+jmp_buf INTbuf;
+#endif
+#if defined(SYSIII)
+BOOL wasintr;
+#endif
/* ======== fault handling routines ======== */
@@ -21,49 +67,77 @@
{
REG INT flag;
+#if defined(V7)
signal(sig,fault);
+#endif
IF sig==MEMF
- THEN IF setbrk(brkincr) == -1
+ THEN IF setbrk(brkincr) == (BYTPTR)-1
THEN error(nospace);
+ /*NOTREACHED*/
FI
ELIF sig==ALARM
THEN IF flags&waiting
THEN done();
+ /*NOTREACHED*/
FI
ELSE flag = (trapcom[sig] ? TRAPSET : SIGSET);
trapnote |= flag;
trapflg[sig] |= flag;
+#if defined(SYSIII)
+ IF sig == INTR THEN wasintr++ FI
+#endif
FI
+#if defined(RENO)
+ IF trapjmp[sig] ANDF sig==INTR
+ THEN trapjmp[sig] = 0;
+ longjmp(INTbuf, 1);
+ FI
+#endif
}
-stdsigs()
+VOID stdsigs()
{
ignsig(QUIT);
getsig(INTR);
+#if defined(SYSIII)
+ signal(MEMF, fault);
+#else /* V7 */
getsig(MEMF);
+#endif
getsig(ALARM);
}
-ignsig(n)
+SIGPTR ignsig(n)
+ INT n;
{
- REG INT s, i;
+ REG INT i;
+ REG SIGPTR s=SIG_DFL; /* GCC */
- IF (s=signal(i=n,1)&01)==0
+#if defined(SYSIII)
+ IF (i=n)==MEMF
+ THEN clrsig(i);
+ failed(badtrap, memfault);
+ /*NOTREACHED*/
+ ELIF (s=signal(i=n,SIG_IGN))==SIG_DFL
+#else /* V7 */
+ IF (s=signal(i=n,SIG_IGN))==SIG_DFL
+#endif
THEN trapflg[i] |= SIGMOD;
FI
return(s);
}
-getsig(n)
+VOID getsig(n)
+ INT n;
{
REG INT i;
- IF trapflg[i=n]&SIGMOD ORF ignsig(i)==0
+ IF trapflg[i=n]&SIGMOD ORF ignsig(i)==SIG_DFL
THEN signal(i,fault);
FI
}
-oldsigs()
+VOID oldsigs()
{
REG INT i;
REG STRING t;
@@ -79,17 +153,24 @@
trapnote=0;
}
-clrsig(i)
+VOID clrsig(i)
INT i;
{
- free(trapcom[i]); trapcom[i]=0;
+ free((BLKPTR) trapcom[i]); trapcom[i]=0;
IF trapflg[i]&SIGMOD
- THEN signal(i,fault);
+#if defined(SYSIII)
+ THEN IF trapflg[i]&SIGCAUGHT
+ THEN signal(i, fault);
+ ELSE signal(i, SIG_DFL);
+ FI
trapflg[i] &= ~SIGMOD;
+#else /* V7 */
+ THEN signal(i,fault);
+#endif
FI
}
-chktrap()
+VOID chktrap()
{
/* check for traps */
REG INT i=MAXTRAP;
@@ -99,7 +180,7 @@
WHILE --i
DO IF trapflg[i]&TRAPSET
THEN trapflg[i] &= ~TRAPSET;
- IF t=trapcom[i]
+ IF (t=trapcom[i])!=NIL /* GCC */
THEN INT savxit=exitval;
execexp(t,0);
exitval=savxit; exitset();
|
