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
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
|
*** sim/cider/common/src/bin/main.c.orig Sat Mar 12 08:20:59 1994
--- sim/cider/common/src/bin/main.c Mon Dec 13 10:16:13 1999
***************
*** 25,30 ****
--- 25,37 ----
#include <pwd.h>
#endif
+ #ifdef HAS_GNUREADLINE
+ /* Added GNU Readline Support 11/3/97 -- Andrew Veliath <veliaa@rpi.edu> */
+ #include <readline/readline.h>
+ #include <readline/history.h>
+ #include "fteinput.h"
+ #endif
+
#ifdef HAS_UNIX_SIGS
#include <signal.h>
#endif
***************
*** 36,41 ****
--- 43,53 ----
#endif
#include "patchlev.h"
+
+ #ifdef __FreeBSD__
+ #include <ieeefp.h>
+ #endif
+
#include "suffix.h"
/* (Virtual) Machine architecture parameters */
***************
*** 53,58 ****
--- 65,75 ----
bool ft_intrpt = false; /* Set by the (void) signal handlers. */
bool ft_setflag = false; /* Don't abort after an interrupt. */
+ #ifdef HAS_GNUREADLINE
+ char gnu_history_file[512];
+ static char *application_name;
+ #endif
+
struct variable *(*if_getparam)( );
#ifdef BATCH
***************
*** 185,190 ****
--- 202,291 ----
#endif
+ #ifdef HAS_GNUREADLINE
+ /* Adapted ../lib/cp/lexical.c:prompt() for GNU Readline -- Andrew Veliath <veliaa@rpi.edu> */
+ static char *
+ prompt()
+ {
+ static char pbuf[128];
+ char *p = pbuf, *s;
+
+ if (cp_interactive == false)
+ return;
+ if (cp_promptstring == NULL)
+ s = "-> ";
+ else
+ s = cp_promptstring;
+ if (cp_altprompt)
+ s = cp_altprompt;
+ while (*s) {
+ switch (strip(*s)) {
+ case '!':
+ p += sprintf(p, "%d", where_history() + 1);
+ break;
+ case '\\':
+ if (*(s + 1))
+ p += sprintf(p, "%c", strip(*++s));
+ default:
+ *p = strip(*s); ++p;
+ break;
+ }
+ s++;
+ }
+ *p = 0;
+ return pbuf;
+ }
+
+ /* Process device events in Readline's hook since there is no where
+ else to do it now - AV */
+ int rl_event_func()
+ {
+ static REQUEST reqst = { checkup_option, 0 };
+ Input(&reqst, NULL);
+ return 0;
+ }
+
+ /* Added GNU Readline Support -- Andrew Veliath <veliaa@rpi.edu> */
+ void app_rl_readlines()
+ {
+ char *line, *expanded_line;
+
+ strcpy(gnu_history_file, getenv("HOME"));
+ strcat(gnu_history_file, "/.");
+ strcat(gnu_history_file, application_name);
+ strcat(gnu_history_file, "_history");
+
+ using_history();
+ read_history(gnu_history_file);
+
+ rl_readline_name = application_name;
+ rl_instream = cp_in;
+ rl_outstream = cp_out;
+ rl_event_hook = rl_event_func;
+
+ while (1) {
+ history_set_pos(history_length);
+ line = readline(prompt());
+ if (line && *line) {
+ int s = history_expand(line, &expanded_line);
+
+ if (s == 2) {
+ fprintf(stderr, "-> %s\n", expanded_line);
+ } else if (s == -1) {
+ fprintf(stderr, "readline: %s\n", expanded_line);
+ } else {
+ cp_evloop(expanded_line);
+ add_history(expanded_line);
+ }
+ free(expanded_line);
+ }
+ if (line) free(line);
+ else if (line == NULL) cp_evloop("quit");
+ }
+ /* History gets written in ../fte/misccoms.c com_quit */
+ }
+ #endif /* HAS_GNUREADLINE */
+
char *hlp_filelist[] = { "spice", "cider", 0 };
void
***************
*** 216,221 ****
--- 317,326 ----
#endif
+ #ifdef __FreeBSD__
+ fpsetmask(fpgetmask() & ~FP_X_INV & ~FP_X_DZ & ~FP_X_OFL);
+ #endif
+
/* MFB tends to jump to 0 on errors. This tends to catch it. */
if (started) {
fprintf(cp_err, "main: Internal Error: jump to zero\n");
***************
*** 236,241 ****
--- 341,353 ----
ARCHsize = 1;
#endif /* PARALLEL_ARCH */
+ #ifdef HAS_GNUREADLINE
+ if (!(application_name = strrchr(av[0],'/')))
+ application_name = av[0];
+ else
+ ++application_name;
+ #endif
+
#ifdef HAS_MAC_ARGCARGV
ac = initmac(&av);
#endif
***************
*** 472,478 ****
--- 584,594 ----
# ifdef HAS_UNIX_SIGS
/* Set up (void) signal handling */
if (!ft_batchmode) {
+ # ifdef HAS_GNUREADLINE
+ (void) signal(SIGINT, SIG_IGN);
+ # else
(void) signal(SIGINT, ft_sigintr);
+ # endif
(void) signal(SIGFPE, sigfloat);
# ifdef SIGTSTP
(void) signal(SIGTSTP, sigstop);
***************
*** 668,674 ****
--- 784,794 ----
} else {
(void) setjmp(jbuf);
cp_interactive = true;
+ #ifdef HAS_GNUREADLINE
+ app_rl_readlines();
+ #else
while (cp_evloop((char *) NULL) == 1) ;
+ #endif /* ifelse HAS_GNUREADLINE */
}
# else /* if BATCH */
***************
*** 708,714 ****
--- 828,838 ----
/* Nutmeg "main" */
(void) setjmp(jbuf);
cp_interactive = true;
+ #ifdef HAS_GNUREADLINE
+ app_rl_readlines();
+ #else
while (cp_evloop((char *) NULL) == 1) ;
+ #endif /* ifelse HAS_GNUREADLINE */
#endif
|
