In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/562aee6bf50bd2244cded74c1addaf1f2a395cbd?hp=4c21785fe645f05e6e1a51824029d1cda897d57c>
- Log ----------------------------------------------------------------- commit 562aee6bf50bd2244cded74c1addaf1f2a395cbd Author: Nicholas Clark <[email protected]> Date: Fri Jul 27 19:17:54 2012 +0200 Remove code for supporting 80286 based systems. The 80286 was released two years before Perl 1, but the support code was added with Perl 3. The chip hasn't been produced for more than 15 years - even the 80386 hasn't been manufactured since 2007. Most of the other memory model code was removed by commit 5869b1f143426909 in Sep 2000, so support for 16 bit systems is long dead. M handy.h M malloc.c M perl.h M x2p/a2p.h commit 7c458fae0a6159ea505d310a91a4ffcf379153a2 Author: Nicholas Clark <[email protected]> Date: Fri Jul 27 17:53:22 2012 +0200 Remove dead code related to the Atari ST port of perl 4.0 patchlevel 19 The subdirectory containing the port specific files was purged when 5.000 was released, but changes made to other files were not removed. M malloc.c M miniperlmain.c M os2/perlrexx.c M perl.c M perl.h M perlio.c M pp_sys.c M util.c ----------------------------------------------------------------------- Summary of changes: handy.h | 4 ---- malloc.c | 18 ++---------------- miniperlmain.c | 6 ------ os2/perlrexx.c | 6 ------ perl.c | 4 ---- perl.h | 6 +----- perlio.c | 12 ------------ pp_sys.c | 32 -------------------------------- util.c | 17 +++++++---------- x2p/a2p.h | 4 ---- 10 files changed, 10 insertions(+), 99 deletions(-) diff --git a/handy.h b/handy.h index e793039..c736120 100644 --- a/handy.h +++ b/handy.h @@ -12,11 +12,7 @@ #ifdef NULL #undef NULL #endif -#ifndef I286 # define NULL 0 -#else -# define NULL 0L -#endif #endif #ifndef PERL_CORE diff --git a/malloc.c b/malloc.c index 13a2f9f..996fa66 100644 --- a/malloc.c +++ b/malloc.c @@ -197,14 +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)) - /* take 2k unless the block is bigger than that */ -# define LOG_OF_MIN_ARENA 11 -#else - /* take 16k unless the block is bigger than that - (80286s like large segments!), probably good on the atari too */ -# define LOG_OF_MIN_ARENA 14 -#endif +#define LOG_OF_MIN_ARENA 11 #if defined(DEBUGGING) && !defined(NO_RCHECK) # define RCHECK @@ -376,8 +369,7 @@ */ #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) +#if defined(RCHECK) && defined(PACK_MALLOC) # undef PACK_MALLOC #endif @@ -1549,16 +1541,12 @@ 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. */ if (PTR2UV(cp) & (WANTED_ALIGNMENT - 1)) { /* Not aligned. */ slack = WANTED_ALIGNMENT - (PTR2UV(cp) & (WANTED_ALIGNMENT - 1)); add += slack; } -# endif -#endif /* !atarist */ if (add) { DEBUG_m(PerlIO_printf(Perl_debug_log, @@ -1619,7 +1607,6 @@ getpages(MEM_SIZE needed, int *nblksp, int bucket) fatalcroak("Misalignment of sbrk()\n"); else # endif -#ifndef I286 /* Again, this should always be ok on an 80286 */ if (PTR2UV(ovp) & (MEM_ALIGNBYTES - 1)) { DEBUG_m(PerlIO_printf(Perl_debug_log, "fixing sbrk(): %d bytes off machine alignment\n", @@ -1632,7 +1619,6 @@ getpages(MEM_SIZE needed, int *nblksp, int bucket) sbrk_slack += (1 << (bucket >> BUCKET_POW2_SHIFT)); # endif } -#endif ; /* Finish "else" */ sbrked_remains = require - needed; last_op = cp; diff --git a/miniperlmain.c b/miniperlmain.c index 12b2f60..7f63a34 100644 --- a/miniperlmain.c +++ b/miniperlmain.c @@ -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 diff --git a/os2/perlrexx.c b/os2/perlrexx.c index 840b117..98a5502 100644 --- a/os2/perlrexx.c +++ b/os2/perlrexx.c @@ -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 */ diff --git a/perl.c b/perl.c index bba4688..d8b8aca 100644 --- a/perl.c +++ b/perl.c @@ -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"); diff --git a/perl.h b/perl.h index c33c191..614f280 100644 --- a/perl.h +++ b/perl.h @@ -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 @@ -3491,10 +3491,6 @@ struct ptr_tbl { struct ptr_tbl_ent *tbl_arena_end; }; -#if defined(iAPX286) || defined(M_I286) || defined(I80286) -# define I286 -#endif - #if defined(htonl) && !defined(HAS_HTONL) #define HAS_HTONL #endif diff --git a/perlio.c b/perlio.c index a593c48..4ad6ada 100644 --- a/perlio.c +++ b/perlio.c @@ -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 @@ -163,7 +152,6 @@ perlsio_binmode(FILE *fp, int iotype, int mode) } else return 0; -# endif #else # if defined(USEMYBINMODE) dTHX; diff --git a/pp_sys.c b/pp_sys.c index 1cb0403..a11eced 100644 --- a/pp_sys.c +++ b/pp_sys.c @@ -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; @@ -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); diff --git a/util.c b/util.c index 94f92b2..e267bbf 100644 --- a/util.c +++ b/util.c @@ -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) @@ -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 @@ -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 @@ -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 diff --git a/x2p/a2p.h b/x2p/a2p.h index 6083b79..bf31b3a 100644 --- a/x2p/a2p.h +++ b/x2p/a2p.h @@ -344,11 +344,7 @@ union u_ops { int ival; char *cval; }; -#if defined(iAPX286) || defined(M_I286) || defined(I80286) /* 80286 hack */ -#define OPSMAX (64000/sizeof(union u_ops)) /* approx. max segment size */ -#else #define OPSMAX 50000 -#endif /* 80286 hack */ EXT union u_ops ops[OPSMAX]; typedef struct string STR; -- Perl5 Master Repository
