All the ops that are simply C<return some_other_op();> can be bypassed

in the op dispatch table, and the bodies retired.

p4raw-id: //depot/perl@25940

diff --git a/mathoms.c b/mathoms.c
index 39ff004..894fd93 100644 (file)
--- a/mathoms.c
+++ b/mathoms.c
@@ -667,6 +667,190 @@ PP(pp_mapstart)
     DIE(aTHX_ "panic: mapstart");      /* uses grepstart */
 }
 
+/* These ops all have the same body as pp_null.  */
+PP(pp_scalar)
+{
+    return NORMAL;
+}
+
+PP(pp_regcmaybe)
+{
+    return NORMAL;
+}
+
+PP(pp_lineseq)
+{
+    return NORMAL;
+}
+
+PP(pp_scope)
+{
+    return NORMAL;
+}
+
+/* Ops that are calls to do_kv.  */
+PP(pp_values)
+{
+    return do_kv();
+}
+
+PP(pp_keys)
+{
+    return do_kv();
+}
+
+/* Ops that are simply calls to other ops.  */
+PP(pp_dump)
+{
+    return pp_goto();
+    /*NOTREACHED*/
+}
+
+PP(pp_dofile)
+{
+    return pp_require();
+}
+
+PP(pp_dbmclose)
+{
+    return pp_untie();
+}
+
+PP(pp_read)
+{
+    return pp_sysread();
+}
+
+PP(pp_recv)
+{
+    return pp_sysread();
+}
+
+PP(pp_seek)
+{
+    return pp_sysseek();
+}
+
+PP(pp_fcntl)
+{
+    return pp_ioctl();
+}
+
+PP(pp_gsockopt)
+{
+    return pp_ssockopt();
+}
+
+PP(pp_getsockname)
+{
+    return pp_getpeername();
+}
+
+PP(pp_lstat)
+{
+    return pp_stat();
+}
+
+PP(pp_fteowned)
+{
+    return pp_ftrowned();
+}
+
+PP(pp_ftbinary)
+{
+    return pp_fttext();
+}
+
+PP(pp_localtime)
+{
+    return pp_gmtime();
+}
+
+PP(pp_shmget)
+{
+    return pp_semget();
+}
+
+PP(pp_shmctl)
+{
+    return pp_semctl();
+}
+
+PP(pp_shmread)
+{
+    return pp_shmwrite();
+}
+
+PP(pp_msgget)
+{
+    return pp_semget();
+}
+
+PP(pp_msgctl)
+{
+    return pp_semctl();
+}
+
+PP(pp_ghbyname)
+{
+    return pp_ghostent();
+}
+
+PP(pp_ghbyaddr)
+{
+    return pp_ghostent();
+}
+
+PP(pp_gnbyname)
+{
+    return pp_gnetent();
+}
+
+PP(pp_gnbyaddr)
+{
+    return pp_gnetent();
+}
+
+PP(pp_gpbyname)
+{
+    return pp_gprotoent();
+}
+
+PP(pp_gpbynumber)
+{
+    return pp_gprotoent();
+}
+
+PP(pp_gsbyname)
+{
+    return pp_gservent();
+}
+
+PP(pp_gsbyport)
+{
+    return pp_gservent();
+}
+
+PP(pp_gpwnam)
+{
+    return pp_gpwent();
+}
+
+PP(pp_gpwuid)
+{
+    return pp_gpwent();
+}
+
+PP(pp_ggrnam)
+{
+    return pp_ggrent();
+}
+
+PP(pp_ggrgid)
+{
+    return pp_ggrent();
+}
+
 U8 *
 Perl_uvuni_to_utf8(pTHX_ U8 *d, UV uv)
 {

diff --git a/opcode.h b/opcode.h
index ab72fed..56d6b57 100644 (file)
--- a/opcode.h
+++ b/opcode.h
@@ -768,7 +768,7 @@ EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
 = {
        MEMBER_TO_FPTR(Perl_pp_null),
        MEMBER_TO_FPTR(Perl_pp_stub),
-       MEMBER_TO_FPTR(Perl_pp_scalar),
+       MEMBER_TO_FPTR(Perl_pp_null),   /* Perl_pp_scalar */
        MEMBER_TO_FPTR(Perl_pp_pushmark),
        MEMBER_TO_FPTR(Perl_pp_wantarray),
        MEMBER_TO_FPTR(Perl_pp_const),
@@ -794,7 +794,7 @@ EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
        MEMBER_TO_FPTR(Perl_pp_glob),
        MEMBER_TO_FPTR(Perl_pp_readline),
        MEMBER_TO_FPTR(Perl_pp_rcatline),
-       MEMBER_TO_FPTR(Perl_pp_regcmaybe),
+       MEMBER_TO_FPTR(Perl_pp_null),   /* Perl_pp_regcmaybe */
        MEMBER_TO_FPTR(Perl_pp_regcreset),
        MEMBER_TO_FPTR(Perl_pp_regcomp),
        MEMBER_TO_FPTR(Perl_pp_match),
@@ -939,13 +939,13 @@ EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
        MEMBER_TO_FPTR(Perl_pp_warn),
        MEMBER_TO_FPTR(Perl_pp_die),
        MEMBER_TO_FPTR(Perl_pp_reset),
-       MEMBER_TO_FPTR(Perl_pp_lineseq),
+       MEMBER_TO_FPTR(Perl_pp_null),   /* Perl_pp_lineseq */
        MEMBER_TO_FPTR(Perl_pp_nextstate),
        MEMBER_TO_FPTR(Perl_pp_dbstate),
        MEMBER_TO_FPTR(Perl_pp_unstack),
        MEMBER_TO_FPTR(Perl_pp_enter),
        MEMBER_TO_FPTR(Perl_pp_leave),
-       MEMBER_TO_FPTR(Perl_pp_scope),
+       MEMBER_TO_FPTR(Perl_pp_null),   /* Perl_pp_scope */
        MEMBER_TO_FPTR(Perl_pp_enteriter),
        MEMBER_TO_FPTR(Perl_pp_iter),
        MEMBER_TO_FPTR(Perl_pp_enterloop),
@@ -954,7 +954,7 @@ EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
        MEMBER_TO_FPTR(Perl_pp_last),
        MEMBER_TO_FPTR(Perl_pp_next),
        MEMBER_TO_FPTR(Perl_pp_redo),
-       MEMBER_TO_FPTR(Perl_pp_dump),
+       MEMBER_TO_FPTR(Perl_pp_goto),   /* Perl_pp_dump */
        MEMBER_TO_FPTR(Perl_pp_goto),
        MEMBER_TO_FPTR(Perl_pp_exit),
        MEMBER_TO_FPTR(Perl_pp_open),
@@ -967,11 +967,11 @@ EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
        MEMBER_TO_FPTR(Perl_pp_untie),
        MEMBER_TO_FPTR(Perl_pp_tied),
        MEMBER_TO_FPTR(Perl_pp_dbmopen),
-       MEMBER_TO_FPTR(Perl_pp_dbmclose),
+       MEMBER_TO_FPTR(Perl_pp_untie),  /* Perl_pp_dbmclose */
        MEMBER_TO_FPTR(Perl_pp_sselect),
        MEMBER_TO_FPTR(Perl_pp_select),
        MEMBER_TO_FPTR(Perl_pp_getc),
-       MEMBER_TO_FPTR(Perl_pp_read),
+       MEMBER_TO_FPTR(Perl_pp_sysread),        /* Perl_pp_read */
        MEMBER_TO_FPTR(Perl_pp_enterwrite),
        MEMBER_TO_FPTR(Perl_pp_leavewrite),
        MEMBER_TO_FPTR(Perl_pp_prtf),
@@ -981,12 +981,12 @@ EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
        MEMBER_TO_FPTR(Perl_pp_sysread),
        MEMBER_TO_FPTR(Perl_pp_syswrite),
        MEMBER_TO_FPTR(Perl_pp_send),
-       MEMBER_TO_FPTR(Perl_pp_recv),
+       MEMBER_TO_FPTR(Perl_pp_sysread),        /* Perl_pp_recv */
        MEMBER_TO_FPTR(Perl_pp_eof),
        MEMBER_TO_FPTR(Perl_pp_tell),
-       MEMBER_TO_FPTR(Perl_pp_seek),
+       MEMBER_TO_FPTR(Perl_pp_sysseek),        /* Perl_pp_seek */
        MEMBER_TO_FPTR(Perl_pp_truncate),
-       MEMBER_TO_FPTR(Perl_pp_fcntl),
+       MEMBER_TO_FPTR(Perl_pp_ioctl),  /* Perl_pp_fcntl */
        MEMBER_TO_FPTR(Perl_pp_ioctl),
        MEMBER_TO_FPTR(Perl_pp_flock),
        MEMBER_TO_FPTR(Perl_pp_socket),
@@ -996,11 +996,11 @@ EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
        MEMBER_TO_FPTR(Perl_pp_listen),
        MEMBER_TO_FPTR(Perl_pp_accept),
        MEMBER_TO_FPTR(Perl_pp_shutdown),
-       MEMBER_TO_FPTR(Perl_pp_gsockopt),
+       MEMBER_TO_FPTR(Perl_pp_ssockopt),       /* Perl_pp_gsockopt */
        MEMBER_TO_FPTR(Perl_pp_ssockopt),
-       MEMBER_TO_FPTR(Perl_pp_getsockname),
+       MEMBER_TO_FPTR(Perl_pp_getpeername),    /* Perl_pp_getsockname */
        MEMBER_TO_FPTR(Perl_pp_getpeername),
-       MEMBER_TO_FPTR(Perl_pp_lstat),
+       MEMBER_TO_FPTR(Perl_pp_stat),   /* Perl_pp_lstat */
        MEMBER_TO_FPTR(Perl_pp_stat),
        MEMBER_TO_FPTR(Perl_pp_ftrread),
        MEMBER_TO_FPTR(Perl_pp_ftrwrite),
@@ -1009,7 +1009,7 @@ EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
        MEMBER_TO_FPTR(Perl_pp_ftewrite),
        MEMBER_TO_FPTR(Perl_pp_fteexec),
        MEMBER_TO_FPTR(Perl_pp_ftis),
-       MEMBER_TO_FPTR(Perl_pp_fteowned),
+       MEMBER_TO_FPTR(Perl_pp_ftrowned),       /* Perl_pp_fteowned */
        MEMBER_TO_FPTR(Perl_pp_ftrowned),
        MEMBER_TO_FPTR(Perl_pp_ftzero),
        MEMBER_TO_FPTR(Perl_pp_ftsize),
@@ -1028,7 +1028,7 @@ EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
        MEMBER_TO_FPTR(Perl_pp_ftsvtx),
        MEMBER_TO_FPTR(Perl_pp_fttty),
        MEMBER_TO_FPTR(Perl_pp_fttext),
-       MEMBER_TO_FPTR(Perl_pp_ftbinary),
+       MEMBER_TO_FPTR(Perl_pp_fttext), /* Perl_pp_ftbinary */
        MEMBER_TO_FPTR(Perl_pp_chdir),
        MEMBER_TO_FPTR(Perl_pp_chown),
        MEMBER_TO_FPTR(Perl_pp_chroot),
@@ -1060,38 +1060,38 @@ EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
        MEMBER_TO_FPTR(Perl_pp_setpriority),
        MEMBER_TO_FPTR(Perl_pp_time),
        MEMBER_TO_FPTR(Perl_pp_tms),
-       MEMBER_TO_FPTR(Perl_pp_localtime),
+       MEMBER_TO_FPTR(Perl_pp_gmtime), /* Perl_pp_localtime */
        MEMBER_TO_FPTR(Perl_pp_gmtime),
        MEMBER_TO_FPTR(Perl_pp_alarm),
        MEMBER_TO_FPTR(Perl_pp_sleep),
-       MEMBER_TO_FPTR(Perl_pp_shmget),
-       MEMBER_TO_FPTR(Perl_pp_shmctl),
-       MEMBER_TO_FPTR(Perl_pp_shmread),
+       MEMBER_TO_FPTR(Perl_pp_semget), /* Perl_pp_shmget */
+       MEMBER_TO_FPTR(Perl_pp_semctl), /* Perl_pp_shmctl */
+       MEMBER_TO_FPTR(Perl_pp_shmwrite),       /* Perl_pp_shmread */
        MEMBER_TO_FPTR(Perl_pp_shmwrite),
-       MEMBER_TO_FPTR(Perl_pp_msgget),
-       MEMBER_TO_FPTR(Perl_pp_msgctl),
+       MEMBER_TO_FPTR(Perl_pp_semget), /* Perl_pp_msgget */
+       MEMBER_TO_FPTR(Perl_pp_semctl), /* Perl_pp_msgctl */
        MEMBER_TO_FPTR(Perl_pp_msgsnd),
        MEMBER_TO_FPTR(Perl_pp_msgrcv),
        MEMBER_TO_FPTR(Perl_pp_semget),
        MEMBER_TO_FPTR(Perl_pp_semctl),
        MEMBER_TO_FPTR(Perl_pp_semop),
        MEMBER_TO_FPTR(Perl_pp_require),
-       MEMBER_TO_FPTR(Perl_pp_dofile),
+       MEMBER_TO_FPTR(Perl_pp_require),        /* Perl_pp_dofile */
        MEMBER_TO_FPTR(Perl_pp_entereval),
        MEMBER_TO_FPTR(Perl_pp_leaveeval),
        MEMBER_TO_FPTR(Perl_pp_entertry),
        MEMBER_TO_FPTR(Perl_pp_leavetry),
-       MEMBER_TO_FPTR(Perl_pp_ghbyname),
-       MEMBER_TO_FPTR(Perl_pp_ghbyaddr),
+       MEMBER_TO_FPTR(Perl_pp_ghostent),       /* Perl_pp_ghbyname */
+       MEMBER_TO_FPTR(Perl_pp_ghostent),       /* Perl_pp_ghbyaddr */
        MEMBER_TO_FPTR(Perl_pp_ghostent),
-       MEMBER_TO_FPTR(Perl_pp_gnbyname),
-       MEMBER_TO_FPTR(Perl_pp_gnbyaddr),
+       MEMBER_TO_FPTR(Perl_pp_gnetent),        /* Perl_pp_gnbyname */
+       MEMBER_TO_FPTR(Perl_pp_gnetent),        /* Perl_pp_gnbyaddr */
        MEMBER_TO_FPTR(Perl_pp_gnetent),
-       MEMBER_TO_FPTR(Perl_pp_gpbyname),
-       MEMBER_TO_FPTR(Perl_pp_gpbynumber),
+       MEMBER_TO_FPTR(Perl_pp_gprotoent),      /* Perl_pp_gpbyname */
+       MEMBER_TO_FPTR(Perl_pp_gprotoent),      /* Perl_pp_gpbynumber */
        MEMBER_TO_FPTR(Perl_pp_gprotoent),
-       MEMBER_TO_FPTR(Perl_pp_gsbyname),
-       MEMBER_TO_FPTR(Perl_pp_gsbyport),
+       MEMBER_TO_FPTR(Perl_pp_gservent),       /* Perl_pp_gsbyname */
+       MEMBER_TO_FPTR(Perl_pp_gservent),       /* Perl_pp_gsbyport */
        MEMBER_TO_FPTR(Perl_pp_gservent),
        MEMBER_TO_FPTR(Perl_pp_shostent),
        MEMBER_TO_FPTR(Perl_pp_snetent),
@@ -1101,13 +1101,13 @@ EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
        MEMBER_TO_FPTR(Perl_pp_enetent),
        MEMBER_TO_FPTR(Perl_pp_eprotoent),
        MEMBER_TO_FPTR(Perl_pp_eservent),
-       MEMBER_TO_FPTR(Perl_pp_gpwnam),
-       MEMBER_TO_FPTR(Perl_pp_gpwuid),
+       MEMBER_TO_FPTR(Perl_pp_gpwent), /* Perl_pp_gpwnam */
+       MEMBER_TO_FPTR(Perl_pp_gpwent), /* Perl_pp_gpwuid */
        MEMBER_TO_FPTR(Perl_pp_gpwent),
        MEMBER_TO_FPTR(Perl_pp_spwent),
        MEMBER_TO_FPTR(Perl_pp_epwent),
-       MEMBER_TO_FPTR(Perl_pp_ggrnam),
-       MEMBER_TO_FPTR(Perl_pp_ggrgid),
+       MEMBER_TO_FPTR(Perl_pp_ggrent), /* Perl_pp_ggrnam */
+       MEMBER_TO_FPTR(Perl_pp_ggrent), /* Perl_pp_ggrgid */
        MEMBER_TO_FPTR(Perl_pp_ggrent),
        MEMBER_TO_FPTR(Perl_pp_sgrent),
        MEMBER_TO_FPTR(Perl_pp_egrent),

diff --git a/opcode.pl b/opcode.pl
index e3b9056..6b01294 100755 (executable)
--- a/opcode.pl
+++ b/opcode.pl
@@ -41,7 +41,31 @@ my %alias;
 my @raw_alias = (
                 Perl_do_kv => [qw( keys values )],
                 Perl_unimplemented_op => [qw(padany threadsv mapstart)],
-                );
+                # All the ops with a body of { return NORMAL; }
+                Perl_pp_null => [qw(scalar regcmaybe lineseq scope)],
+
+                Perl_pp_goto => ['dump'],
+                Perl_pp_require => ['dofile'],
+                Perl_pp_untie => ['dbmclose'],
+                Perl_pp_sysread => [qw(read recv)],
+                Perl_pp_sysseek => ['seek'],
+                Perl_pp_ioctl => ['fcntl'],
+                Perl_pp_ssockopt => ['gsockopt'],
+                Perl_pp_getpeername => ['getsockname'],
+                Perl_pp_stat => ['lstat'],
+                Perl_pp_ftrowned => ['fteowned'],
+                Perl_pp_fttext => ['ftbinary'],
+                Perl_pp_gmtime => ['localtime'],
+                Perl_pp_semget => [qw(shmget msgget)],
+                Perl_pp_semctl => [qw(shmctl msgctl)],
+                Perl_pp_shmwrite => ['shmread'],
+                Perl_pp_ghostent => [qw(ghbyname ghbyaddr)],
+                Perl_pp_gnetent => [qw(gnbyname gnbyaddr)],
+                Perl_pp_gprotoent => [qw(gpbyname gpbynumber)],
+                Perl_pp_gservent => [qw(gsbyname gsbyport)],
+                Perl_pp_gpwent => [qw(gpwnam gpwuid)],
+                Perl_pp_ggrent => [qw(ggrnam ggrgid)],
+);
 
 while (my ($func, $names) = splice @raw_alias, 0, 2) {
     $alias{$_} = $func for @$names;

diff --git a/pp.c b/pp.c
index ddffda8..a13c6a6 100644 (file)
--- a/pp.c
+++ b/pp.c
@@ -53,11 +53,6 @@ PP(pp_stub)
     RETURN;
 }
 
-PP(pp_scalar)
-{
-    return NORMAL;
-}
-
 /* Pushy stuff. */
 
 PP(pp_padav)
@@ -3847,16 +3842,6 @@ PP(pp_each)
     RETURN;
 }
 
-PP(pp_values)
-{
-    return do_kv();
-}
-
-PP(pp_keys)
-{
-    return do_kv();
-}
-
 PP(pp_delete)
 {
     dSP;

diff --git a/pp_ctl.c b/pp_ctl.c
index e8d89d5..8a6c3e5 100644 (file)
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -60,11 +60,6 @@ PP(pp_wantarray)
     }
 }
 
-PP(pp_regcmaybe)
-{
-    return NORMAL;
-}
-
 PP(pp_regcreset)
 {
     /* XXXX Should store the old value to allow for tie/overload - and
@@ -1724,11 +1719,6 @@ PP(pp_reset)
     RETURN;
 }
 
-PP(pp_lineseq)
-{
-    return NORMAL;
-}
-
 /* like pp_nextstate, but used instead when the debugger is active */
 
 PP(pp_dbstate)
@@ -1790,11 +1780,6 @@ PP(pp_dbstate)
        return NORMAL;
 }
 
-PP(pp_scope)
-{
-    return NORMAL;
-}
-
 PP(pp_enteriter)
 {
     dVAR; dSP; dMARK;
@@ -2264,12 +2249,6 @@ S_dofindlabel(pTHX_ OP *o, const char *label, OP **opstack, OP **oplimit)
     return 0;
 }
 
-PP(pp_dump)
-{
-    return pp_goto();
-    /*NOTREACHED*/
-}
-
 PP(pp_goto)
 {
     dVAR; dSP;
@@ -3432,11 +3411,6 @@ PP(pp_require)
     return op;
 }
 
-PP(pp_dofile)
-{
-    return pp_require();
-}
-
 PP(pp_entereval)
 {
     dVAR; dSP;

diff --git a/pp_sys.c b/pp_sys.c
index fd3b368..0bf34cb 100644 (file)
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -987,11 +987,6 @@ PP(pp_dbmopen)
     RETURN;
 }
 
-PP(pp_dbmclose)
-{
-    return pp_untie();
-}
-
 PP(pp_sselect)
 {
 #ifdef HAS_SELECT
@@ -1247,11 +1242,6 @@ PP(pp_getc)
     RETURN;
 }
 
-PP(pp_read)
-{
-    return pp_sysread();
-}
-
 STATIC OP *
 S_doform(pTHX_ CV *cv, GV *gv, OP *retop)
 {
@@ -1939,11 +1929,6 @@ PP(pp_send)
     RETPUSHUNDEF;
 }
 
-PP(pp_recv)
-{
-    return pp_sysread();
-}
-
 PP(pp_eof)
 {
     dVAR; dSP;
@@ -2023,11 +2008,6 @@ PP(pp_tell)
     RETURN;
 }
 
-PP(pp_seek)
-{
-    return pp_sysseek();
-}
-
 PP(pp_sysseek)
 {
     dVAR; dSP;
@@ -2176,11 +2156,6 @@ PP(pp_truncate)
     }
 }
 
-PP(pp_fcntl)
-{
-    return pp_ioctl();
-}
-
 PP(pp_ioctl)
 {
     dSP; dTARGET;
@@ -2625,11 +2600,6 @@ nuts:
 #endif
 }
 
-PP(pp_gsockopt)
-{
-    return pp_ssockopt();
-}
-
 PP(pp_ssockopt)
 {
 #ifdef HAS_SOCKET
@@ -2716,11 +2686,6 @@ nuts2:
 #endif
 }
 
-PP(pp_getsockname)
-{
-    return pp_getpeername();
-}
-
 PP(pp_getpeername)
 {
 #ifdef HAS_SOCKET
@@ -2787,11 +2752,6 @@ nuts2:
 
 /* Stat calls. */
 
-PP(pp_lstat)
-{
-    return pp_stat();
-}
-
 PP(pp_stat)
 {
     dSP;
@@ -3095,11 +3055,6 @@ PP(pp_ftis)
     RETPUSHYES;
 }
 
-PP(pp_fteowned)
-{
-    return pp_ftrowned();
-}
-
 PP(pp_ftrowned)
 {
     I32 result;
@@ -3526,11 +3481,6 @@ PP(pp_fttext)
        RETPUSHYES;
 }
 
-PP(pp_ftbinary)
-{
-    return pp_fttext();
-}
-
 /* File calls. */
 
 PP(pp_chdir)
@@ -4538,11 +4488,6 @@ PP(pp_tms)
 #endif /* HAS_TIMES */
 }
 
-PP(pp_localtime)
-{
-    return pp_gmtime();
-}
-
 #ifdef LOCALTIME_EDGECASE_BROKEN
 static struct tm *S_my_localtime (pTHX_ Time_t *tp)
 {
@@ -4682,21 +4627,6 @@ PP(pp_sleep)
 
 /* Shared memory. */
 
-PP(pp_shmget)
-{
-    return pp_semget();
-}
-
-PP(pp_shmctl)
-{
-    return pp_semctl();
-}
-
-PP(pp_shmread)
-{
-    return pp_shmwrite();
-}
-
 PP(pp_shmwrite)
 {
 #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
@@ -4712,16 +4642,6 @@ PP(pp_shmwrite)
 
 /* Message passing. */
 
-PP(pp_msgget)
-{
-    return pp_semget();
-}
-
-PP(pp_msgctl)
-{
-    return pp_semctl();
-}
-
 PP(pp_msgsnd)
 {
 #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
@@ -4800,16 +4720,6 @@ PP(pp_semop)
 
 /* Get system info. */
 
-PP(pp_ghbyname)
-{
-    return pp_ghostent();
-}
-
-PP(pp_ghbyaddr)
-{
-    return pp_ghostent();
-}
-
 PP(pp_ghostent)
 {
 #if defined(HAS_GETHOSTBYNAME) || defined(HAS_GETHOSTBYADDR) || defined(HAS_GETHOSTENT)
@@ -4908,16 +4818,6 @@ PP(pp_ghostent)
 #endif
 }
 
-PP(pp_gnbyname)
-{
-    return pp_gnetent();
-}
-
-PP(pp_gnbyaddr)
-{
-    return pp_gnetent();
-}
-
 PP(pp_gnetent)
 {
 #if defined(HAS_GETNETBYNAME) || defined(HAS_GETNETBYADDR) || defined(HAS_GETNETENT)
@@ -5000,16 +4900,6 @@ PP(pp_gnetent)
 #endif
 }
 
-PP(pp_gpbyname)
-{
-    return pp_gprotoent();
-}
-
-PP(pp_gpbynumber)
-{
-    return pp_gprotoent();
-}
-
 PP(pp_gprotoent)
 {
 #if defined(HAS_GETPROTOBYNAME) || defined(HAS_GETPROTOBYNUMBER) || defined(HAS_GETPROTOENT)
@@ -5078,16 +4968,6 @@ PP(pp_gprotoent)
 #endif
 }
 
-PP(pp_gsbyname)
-{
-    return pp_gservent();
-}
-
-PP(pp_gsbyport)
-{
-    return pp_gservent();
-}
-
 PP(pp_gservent)
 {
 #if defined(HAS_GETSERVBYNAME) || defined(HAS_GETSERVBYPORT) || defined(HAS_GETSERVENT)
@@ -5272,16 +5152,6 @@ PP(pp_eservent)
 #endif
 }
 
-PP(pp_gpwnam)
-{
-    return pp_gpwent();
-}
-
-PP(pp_gpwuid)
-{
-    return pp_gpwent();
-}
-
 PP(pp_gpwent)
 {
 #ifdef HAS_PASSWD
@@ -5540,16 +5410,6 @@ PP(pp_epwent)
 #endif
 }
 
-PP(pp_ggrnam)
-{
-    return pp_ggrent();
-}
-
-PP(pp_ggrgid)
-{
-    return pp_ggrent();
-}
-
 PP(pp_ggrent)
 {
 #ifdef HAS_GROUP