Skip to content

Commit

Permalink
Remove dead code related to the Atari ST port of perl 4.0 patchlevel 19
Browse files Browse the repository at this point in the history
The subdirectory containing the port specific files was purged when 5.000
was released, but changes made to other files were not removed.
  • Loading branch information
nwc10 committed Jul 28, 2012
1 parent 4c21785 commit 7c458fa
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 76 deletions.
8 changes: 3 additions & 5 deletions malloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
#define MIN_BUC_POW2 (sizeof(void*) > 4 ? 3 : 2) /* Allow for 4-byte arena. */
#define MIN_BUCKET (MIN_BUC_POW2 * BUCKETS_PER_POW2)

#if !(defined(I286) || defined(atarist))
#if !(defined(I286))
/* take 2k unless the block is bigger than that */
# define LOG_OF_MIN_ARENA 11
#else
Expand Down Expand Up @@ -376,8 +376,8 @@
*/
#define u_short unsigned short

/* 286 and atarist like big chunks, which gives too much overhead. */
#if (defined(RCHECK) || defined(I286) || defined(atarist)) && defined(PACK_MALLOC)
/* 286 likes big chunks, which gives too much overhead. */
#if (defined(RCHECK) || defined(I286)) && defined(PACK_MALLOC)
# undef PACK_MALLOC
#endif

Expand Down Expand Up @@ -1549,7 +1549,6 @@ getpages(MEM_SIZE needed, int *nblksp, int bucket)
/* Second, check alignment. */
slack = 0;

#if !defined(atarist) /* on the atari we dont have to worry about this */
# ifndef I286 /* The sbrk(0) call on the I286 always returns the next segment */
/* WANTED_ALIGNMENT may be more than NEEDED_ALIGNMENT, but this may
improve performance of memory access. */
Expand All @@ -1558,7 +1557,6 @@ getpages(MEM_SIZE needed, int *nblksp, int bucket)
add += slack;
}
# endif
#endif /* !atarist */

if (add) {
DEBUG_m(PerlIO_printf(Perl_debug_log,
Expand Down
6 changes: 0 additions & 6 deletions miniperlmain.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,6 @@
static void xs_init (pTHX);
static PerlInterpreter *my_perl;

#if defined (atarist)
/* The Atari operating system doesn't have a dynamic stack. The
stack size is determined from this value. */
long _stksize = 64 * 1024;
#endif

#if defined(PERL_GLOBAL_STRUCT_PRIVATE)
/* The static struct perl_vars* may seem counterproductive since the
* whole idea PERL_GLOBAL_STRUCT_PRIVATE was to avoid statics, but note
Expand Down
6 changes: 0 additions & 6 deletions os2/perlrexx.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,6 @@ ULONG PERLEXPORTALL(PCSZ name, LONG rargc, const RXSTRING *rargv, PCSZ queuename
ULONG PERLDROPALL(PCSZ name, LONG rargc, const RXSTRING *rargv, PCSZ queuename, PRXSTRING retstr);
ULONG PERLDROPALLEXIT(PCSZ name, LONG rargc, const RXSTRING *rargv, PCSZ queuename, PRXSTRING retstr);

#if defined (atarist)
/* The Atari operating system doesn't have a dynamic stack. The
stack size is determined from this value. */
long _stksize = 64 * 1024;
#endif

/* Register any extra external extensions */

/* Do not delete this line--writemain depends on it */
Expand Down
4 changes: 0 additions & 4 deletions perl.c
Original file line number Diff line number Diff line change
Expand Up @@ -3432,10 +3432,6 @@ S_minus_v(pTHX)
"\n\nOS/2 port Copyright (c) 1990, 1991, Raymond Chen, Kai Uwe Rommel\n"
"Version 5 port Copyright (c) 1994-2002, Andreas Kaiser, Ilya Zakharevich\n");
#endif
#ifdef atarist
PerlIO_printf(PerlIO_stdout(),
"atariST series port, ++jrb [email protected]\n");
#endif
#ifdef __BEOS__
PerlIO_printf(PerlIO_stdout(),
"BeOS port Copyright Tom Spindler, 1997-1999\n");
Expand Down
2 changes: 1 addition & 1 deletion perl.h
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ register struct op *Perl_op asm(stringify(OP_IN_REGISTER));
*/

/* define this once if either system, instead of cluttering up the src */
#if defined(MSDOS) || defined(atarist) || defined(WIN32) || defined(NETWARE)
#if defined(MSDOS) || defined(WIN32) || defined(NETWARE)
#define DOSISH 1
#endif

Expand Down
12 changes: 0 additions & 12 deletions perlio.c
Original file line number Diff line number Diff line change
Expand Up @@ -141,17 +141,6 @@ perlsio_binmode(FILE *fp, int iotype, int mode)
* This used to be contents of do_binmode in doio.c
*/
#ifdef DOSISH
# if defined(atarist)
PERL_UNUSED_ARG(iotype);
if (!fflush(fp)) {
if (mode & O_BINARY)
((FILE *) fp)->_flag |= _IOBIN;
else
((FILE *) fp)->_flag &= ~_IOBIN;
return 1;
}
return 0;
# else
dTHX;
PERL_UNUSED_ARG(iotype);
#ifdef NETWARE
Expand All @@ -163,7 +152,6 @@ perlsio_binmode(FILE *fp, int iotype, int mode)
}
else
return 0;
# endif
#else
# if defined(USEMYBINMODE)
dTHX;
Expand Down
32 changes: 0 additions & 32 deletions pp_sys.c
Original file line number Diff line number Diff line change
Expand Up @@ -3298,14 +3298,6 @@ PP(pp_fttty)
FT_RETURNNO;
}

#if defined(atarist) /* this will work with atariST. Configure will
make guesses for other systems. */
# define FILE_base(f) ((f)->_base)
# define FILE_ptr(f) ((f)->_ptr)
# define FILE_cnt(f) ((f)->_cnt)
# define FILE_bufsiz(f) ((f)->_cnt + ((f)->_ptr - (f)->_base))
#endif

PP(pp_fttext)
{
dVAR;
Expand Down Expand Up @@ -5511,30 +5503,6 @@ PP(pp_syscall)
case 8:
retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7]);
break;
#ifdef atarist
case 9:
retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7],a[8]);
break;
case 10:
retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7],a[8],a[9]);
break;
case 11:
retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7],a[8],a[9],
a[10]);
break;
case 12:
retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7],a[8],a[9],
a[10],a[11]);
break;
case 13:
retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7],a[8],a[9],
a[10],a[11],a[12]);
break;
case 14:
retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7],a[8],a[9],
a[10],a[11],a[12],a[13]);
break;
#endif /* atarist */
}
SP = ORIGMARK;
PUSHi(retval);
Expand Down
17 changes: 7 additions & 10 deletions util.c
Original file line number Diff line number Diff line change
Expand Up @@ -2759,7 +2759,7 @@ Perl_my_popen(pTHX_ const char *cmd, const char *mode)
return PerlIO_fdopen(p[This], mode);
}
#else
#if defined(atarist) || defined(EPOC)
#if defined(EPOC)
FILE *popen();
PerlIO *
Perl_my_popen(pTHX_ const char *cmd, const char *mode)
Expand Down Expand Up @@ -3221,7 +3221,7 @@ S_pidgone(pTHX_ Pid_t pid, int status)
}
#endif

#if defined(atarist) || defined(OS2) || defined(EPOC)
#if defined(OS2) || defined(EPOC)
int pclose();
#ifdef HAS_FORK
int /* Cannot prototype with I32
Expand Down Expand Up @@ -3338,7 +3338,7 @@ Perl_find_script(pTHX_ const char *scriptname, bool dosearch,
I32 len = 0;
int retval;
char *bufend;
#if defined(DOSISH) && !defined(OS2) && !defined(atarist)
#if defined(DOSISH) && !defined(OS2)
# define SEARCH_EXTS ".bat", ".cmd", NULL
# define MAX_EXT_LEN 4
#endif
Expand Down Expand Up @@ -3461,28 +3461,25 @@ Perl_find_script(pTHX_ const char *scriptname, bool dosearch,

bufend = s + strlen(s);
while (s < bufend) {
#if defined(atarist) || defined(DOSISH)
# ifdef DOSISH
for (len = 0; *s
# ifdef atarist
&& *s != ','
# endif
&& *s != ';'; len++, s++) {
if (len < sizeof tmpbuf)
tmpbuf[len] = *s;
}
if (len < sizeof tmpbuf)
tmpbuf[len] = '\0';
#else /* ! (atarist || DOSISH) */
# else
s = delimcpy(tmpbuf, tmpbuf + sizeof tmpbuf, s, bufend,
':',
&len);
#endif /* ! (atarist || DOSISH) */
# endif
if (s < bufend)
s++;
if (len + 1 + strlen(scriptname) + MAX_EXT_LEN >= sizeof tmpbuf)
continue; /* don't search dir with too-long name */
if (len
# if defined(atarist) || defined(DOSISH)
# ifdef DOSISH
&& tmpbuf[len - 1] != '/'
&& tmpbuf[len - 1] != '\\'
# endif
Expand Down

0 comments on commit 7c458fa

Please sign in to comment.