Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove CRAY configuration. #376

Merged
merged 1 commit into from
Mar 7, 2024
Merged

Remove CRAY configuration. #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/ib/appH.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ \chapter{Glossary of Defined Symbols}
ConsoleWindow & U & emulate a console window (graphics, mainly Windows) \\
const & U & disable the const keyword when necessary \\
COpts & IU & C compiler command line options that iconc uses \\
CRAY & IU & build on Cray (gdbm, should delete) \\
CRAY\_STACK & U & legacy CRAY stack linkage structs (delete) \\
{\gr CRAY} & {\gr IU} & {\gr build on Cray (gdbm, should delete)} \\
{\gr CRAY\_STACK} & {\gr U } & {\gr legacy CRAY stack linkage structs (delete)} \\
CStateSize & IU & size of the C state (saved registers) for co-expressions \\
CSuffix & all & extension used for C source files \\
CUsage & IU & iconc usage string \\
Expand Down
9 changes: 9 additions & 0 deletions src/h/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1017,3 +1017,12 @@ Deliberate Syntax Error
sizeof(word) - 1) / sizeof(word))

#endif /* UNICON_CONFIG_H */

/*
* Ensure configurations that are no longer supported cannot be built by accident.
* The date gives a clue to the last commit where the configuration was supported.
*/

#if defined(CRAY) || defined (CRAY_STACK)
#error The CRAY configuration option is no longer supported (since 7 Mar 2024)
#endif /* CRAY */
6 changes: 1 addition & 5 deletions src/h/lexdef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ struct toktab {
int t_flags; /* flags for semicolon insertion */
};

#ifdef CRAY
extern struct toktab toktab[35]; /* compiler bug workaround */
#else /* CRAY */
extern struct toktab toktab[]; /* token table */
#endif /* CRAY */
extern struct toktab toktab[]; /* token table */

extern struct toktab *restab[]; /* reserved word index */

Expand Down
22 changes: 1 addition & 21 deletions src/icont/lcode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,12 +494,7 @@ static void setfile()
fnmtbl = (struct ipc_fname *) trealloc(fnmtbl, &fnmfree,
&fnmsize, sizeof(struct ipc_fname), 1, "file name table");

#ifdef CRAY
fnmfree->ipc_saved = pc/8;
#else /* CRAY */
fnmfree->ipc_saved = pc;
#endif /* CRAY */

fnmfree->fname = getrest();
fnmfree++;
newline();
Expand Down Expand Up @@ -553,12 +548,7 @@ char *name;
labels[lab] = WordSize - pc; /* add to front of reference chain */
}
else /* output relative offset */

#ifdef CRAY
outword((labels[lab] - (pc + WordSize))/8);
#else /* CRAY */
outword(labels[lab] - (pc + WordSize));
#endif /* CRAY */
outword(labels[lab] - (pc + WordSize));
}

static void lemitn(op, n, name)
Expand All @@ -585,12 +575,7 @@ word loc;
char *name;
{
misalign();

#ifdef CRAY
loc = (loc - pc - 16)/8;
#else /* CRAY */
loc -= pc + ((IntBits/ByteBits) + WordSize);
#endif /* CRAY */

#ifdef DeBugLinker
if (Dflag) {
Expand Down Expand Up @@ -1848,12 +1833,7 @@ int lab;
if (p > 0)
quit("multiply defined label in ucode");
while (p < 0) { /* follow reference chain */

#ifdef CRAY
r = (pc - (WordSize - p))/8; /* compute relative offset */
#else /* CRAY */
r = pc - (WordSize - p); /* compute relative offset */
#endif /* CRAY */
q = codep - (pc + p); /* point to word with address */
cp = (char *) &p; /* address of integer p */
cr = (char *) &r; /* address of integer r */
Expand Down
13 changes: 3 additions & 10 deletions src/icont/link.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,10 @@ void setexe (char *fname);
#endif /* MVS */

#if UNIX
#ifdef CRAY
#define word word_fubar
#ifndef XWindows
#include <sys/types.h>
#include <sys/stat.h>
#undef word
#else /* CRAY */
#ifndef XWindows
#include <sys/types.h>
#endif /* XWindows */
#include <sys/stat.h>
#endif /* CRAY */
#endif /* XWindows */
#include <sys/stat.h>
#endif /* UNIX */

/*
Expand Down
6 changes: 1 addition & 5 deletions src/runtime/interp.r
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,11 +827,7 @@ L_areal:
}
else
#endif /* MultiProgram */
#ifdef CRAY
opnd = (word)(strcons + GetWord);
#else /* CRAY */
opnd = (word)strcons + GetWord;
#endif /* CRAY */
opnd = (word)strcons + GetWord;

#ifdef Concurrent
PutInstr(Op_Astr, opnd, 2);
Expand Down
9 changes: 0 additions & 9 deletions src/runtime/rmemmgt.r
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
* garbage collection, dump routines
*/

#ifdef CRAY
#include <malloc.h>
#endif /* CRAY */

/*
* Prototypes
*/
Expand Down Expand Up @@ -894,12 +890,7 @@ dptr dp;
char *newqual;
CURTSTATE();

#ifdef CRAY
if (strbase <= StrLoc(*dp) && StrLoc(*dp) < (strfree + 1)) {
#else /* CRAY */
if (InRange(strbase,StrLoc(*dp),strfree + 1)) {
#endif /* CRAY */

/*
* The string is in the string space. Add it to the string qualifier
* list, but before adding it, expand the string qualifier list if
Expand Down
Loading