mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-12 16:20:06 +00:00
1f205a479b
1997-05-21 02:49 Ulrich Drepper <drepper@cygnus.com> * gnu-versions.h (_GNU_OBSTACK_INTERFACE_VERSION): Set to 2 since interface was changed with addition of _obstack_memory_used. Suggested by Ian Taylor <ian@cygnus.com>. * malloc/obstack.c: Include <config.h>. Include <stdlib.h> only if __GNU_LIBRARY__ or HAVE_STDLIB_H is defined. Reported by Ian Taylor <ian@cygnus.com>. * dirent/Makefile (routines): Add versionsort. * dirent/dirent.h: Add prototype for versionsort. * dirent/versionsort.c: New file. * manual/filesys.texi: Add documentation for versionsort. * manual/string.texi: Add documentation for strverscmp. * string/Makefile (routines): Add strverscmp. (tests): Add tst-svc. * string/string.h: Add prototype for strverscmp. * string/strverscmp.c: New file. * string/tst-svc.c: New file. Test for strverscmp. * string/tst-svc.input: New file. Input data for tst-svc. * string/tst-svc.expect: New file. Expected out from tst-svc. * math/Makefile (calls): Add s_signbit. * po/sv.po: Update. * resolv/nss_dns/dns-host.c: Add casts to prevent warnings. * sunrpc/pmap_rmt.c: Likewise. * string/basename.c: Don't use ISO C definition style. Include <config.h> is HAVE_CONFIG_H is defined. * sunrpc/proto.h: Add `const' wherever possible. * sunrpc/rpc_cout.c: Likewise. * sunrpc/rpc_svcout.c: Likewise. * sunrpc/xdr_mem.c: Likewise. * sunrpc/xdr_rec.c: Likewise. * sunrpc/xdr_stdio.c: Likewise. * sunrpc/rpc_parse.c: Delete comma from end of enum definition. * sunrpc/xdr.c: Little code cleanups. * sunrpc/xdr_flaot.c: Likewise. Patches by Matthew Wilcox <matthew.wilcox@chbs.mhs.ciba.com>. * sysdeps/i386/fpu/__math.h (__finite): Fix typo. * sysdeps/unix/sysv/linux/shmdt.c: Add cast to prevent warning. * time/europe: Update from tzdata1997f. * time/zic.c: Update from tzcode1997e. 1997-05-20 19:20 Miguel de Icaza <miguel@athena.nuclecu.unam.mx> * sysdeps/sparc/setjmp.S: Flush windows. Bug found by Richard Henderson. 1997-05-19 12:54 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * misc/efgcvt_r.c (fcvt_r, ecvt_r): Rewritten as to fit the specs. 1997-05-19 18:41 Thorsten Kukuk <kukuk@uni-paderborn.de> * nis/nss_nisplus/nisplus-spwd.c (_nss_nisplus_parse_spent): Use atol instead of atoi. 1997-05-18 00:22 Philip Blundell <pjb27@cam.ac.uk> * inet/Makefile (routines): Add if_index. * sysdeps/unix/sysv/linux/if_index.c: New file. * sysdeps/stub/if_index.c: New file. * sysdeps/unix/sysv/linux/net/if.h: Add prototypes for routines in if_index.c (required by IPv6 basic API). * sysdeps/unix/sysv/linux/netinet/in.h: Add struct ipv6_pktinfo. 1997-05-17 23:29 Philip Blundell <pjb27@cam.ac.uk> * sysdeps/unix/sysv/linux/netinet/in.h: Update IPv6 definitions for new advanced API draft. 1997-05-13 21:33 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * stdio-common/printf_fp.c: Only use the field width for deciding on padding when printing special values. * stdio-common/printf_fphex.c: Likewise. 1997-05-15 13:14 Miles Bader <miles@gnu.ai.mit.edu> Changes by Thomas Bushnell <thomas@gnu.ai.mit.edu>: * hurd/hurdauth.c (_S_msg_add_auth): Implement correctly. 1997-05-12 14:50 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * hurd/hurdsig.c (_hurdsig_init): Double size of sigthread stack; msg_add_auth was overflowing it. 1997-05-12 21:20 Richard Henderson <rth@tamu.edu> * elf/dl-lookup.c (_dl_lookup_symbol_skip): Call _dl_signal_error when we can't find the symbol. 1997-05-12 16:54 Ulrich Drepper <drepper@cygnus.com> * posix/regex.c: Fix handling of 32-bit Windog environments. Patch by Arnold Robbins <arnold@skeeve.atl.ga.us>. 1997-05-10 23:26 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/m68k/syscalls.list: Add cacheflush. 1997-05-10 11:40 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/ldd.bash.in: Remove spurious quote character from version message. 1997-05-10 08:49 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * locale/programs/locale.c (write_charmaps): Don't get stuck in a loop if the file ends in a long line without newline. * locale/programs/charmap.c (charmap_read): Likewise. 1997-05-12 03:47 Ulrich Drepper <drepper@cygnus.com> * sunrpc/rpc/xdr.h: Include more headers to be self-contained. * sunrpc/rpc/svc_auth.h: Likewise. * sunrpc/rpc/svc.h: Likewise. * sunrpc/rpc/rpc_msg.h: Likewise. * sunrpc/rpc/pmap_rmt.h: Likewise. * sunrpc/rpc/pmap_clnt.h: Likewise. * sunrpc/rpc/clnt.h: Likewise. * sunrpc/rpc/auth_unix.h: Likewise. * sysdeps/generic/rpc/auth.h: Likewise. Patches by Michael Deutschmann <ldeutsch@mail.netshop.net>. 1997-05-11 15:29 Philip Blundell <pjb27@cam.ac.uk> * sysdeps/stub/sigaction.c (__sigaction): Correct typo. * sysdeps/standalone/arm/errnos.h: New file. * sysdeps/stub/sys/param.h: Add dummy definition of MAXSYMLINKS. * sysdeps/unix/arm/fork.S: New file. * sysdeps/unix/sysv/linux/arm/sysdep.h: New file. * sysdeps/stub/tempname.c (__stdio_gen_tempname): Add missing `streamptr' argument. * sysdeps/stub/vdprintf.c: Remove second copy of file (!), include <stdarg.h> to get va_list defined, return 0 not NULL. * sysdeps/unix/sysv/linux/statfsbuf.h: Include <gnu/types.h>. * sysdeps/unix/sysv/linux/arm/syscall.S: New file. * sysdeps/stub/direntry.h (struct dirent): Add missing ';'. * sysdeps/stub/seekdir.c (seekdir): Likewise. * sysdeps/stub/dirfd.c (dirfd): Argument dirp is DIR*, not FILE*. * sysdeps/standalone/dirstream.h: Define struct __dirstream not DIR; <dirent.h> provides typedef. * sysdeps/unix/sysv/linux/arm/clone.S: New file. * sysdeps/unix/sysv/linux/arm/socket.S: New file. * sysdeps/stub/sysconf.c (__sysconf): Fix typos. 1997-05-01 06:35 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/powerpc/Dist: New file. * sysdeps/powerpc/Makefile: New file. * sysdeps/powerpc/fclrexcpt.c: New file. * sysdeps/powerpc/fegetenv.c: New file. * sysdeps/powerpc/fegetround.c: New file. * sysdeps/powerpc/feholdexcpt.c: New file. * sysdeps/powerpc/fenvbits.h: New file. * sysdeps/powerpc/fenv_const.c: New file. * sysdeps/powerpc/fenv_libc.h: New file. * sysdeps/powerpc/fesetenv.c: New file. * sysdeps/powerpc/fesetround.c: New file. * sysdeps/powerpc/feupdateenv.c: New file. * sysdeps/powerpc/fgetexcptflg.c: New file. * sysdeps/powerpc/fraiseexcpt.c: New file. * sysdeps/powerpc/fsetexcptflg.c: New file. * sysdeps/powerpc/ftestexcept.c: New file. * sysdeps/powerpc/mathbits.h: New file. * sysdeps/powerpc/dl-machine.h: Wrap in #ifndef dl_machine_h; define elf_machine_lookup_noexec_p, elf_machine_lookup_noplt_p, ELF_MACHINE_RELOC_NOPLT; consequent changes to elf_machine_rela. * sysdeps/powerpc/__math.h: Remove definition for hypot and __sgn. * sysdep/powerpc/fpu_control.h: Correct IEEE default mode. * sysdeps/unix/sysv/linux/powerpc/sysdep.h: Don't use .text, but instead .section ".text". 1997-04-25 05:06 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/powerpc/__longjmp.S: Use symbolic register numbering. * sysdeps/powerpc/bsd-_setjmp.S: Likewise. * sysdeps/powerpc/bsd-setjmp.S: Likewise. * sysdeps/powerpc/setjmp.S: Likewise. * sysdeps/unix/sysv/linux/clone.S: Likewise. * sysdeps/unix/sysv/linux/socket.S: Likewise. * sysdeps/unix/sysv/linux/syscall.S: Likewise. 1997-04-20 04:37 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/powerpc/strchr.s: New file. * sysdeps/powerpc/strcmp.s: New (ugly) file. * sysdeps/powerpc/memset.s: New file. * string/tester.c: Include prototype and _GNU_SOURCE to make standalone compilation possible. Give strcmp a better test. Give memset a better test. 1997-04-05 06:34 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/powerpc/strlen.s: Fixed bugs (how did it ever pass its tests before?). Changed to symbolic register numbering as an experiment. * sysdeps/powerpc/ffs.c: Don't include bstring.h, it doesn't exist. * sysdeps/rs6000/ffs.c: Likewise. 1997-05-12 02:28 Ulrich Drepper <drepper@cygnus.com> * time/sys/time.h: Make second argument of setitimer const. Patch by Michael Deutschmann <ldeutsch@mail.netshop.net>. * sysdeps/stub/setitimer.c: Likewise. * sysdeps/mach/hurd/setitimer.c: Likewise.
704 lines
16 KiB
C
704 lines
16 KiB
C
/*
|
|
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
|
|
* unrestricted use provided that this legend is included on all tape
|
|
* media and as a part of the software program in whole or part. Users
|
|
* may copy or modify Sun RPC without charge, but are not authorized
|
|
* to license or distribute it to anyone else except as part of a product or
|
|
* program developed by the user or with the express written consent of
|
|
* Sun Microsystems, Inc.
|
|
*
|
|
* SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
|
|
* WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
|
|
* PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
|
|
*
|
|
* Sun RPC is provided with no support and without any obligation on the
|
|
* part of Sun Microsystems, Inc. to assist in its use, correction,
|
|
* modification or enhancement.
|
|
*
|
|
* SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
|
|
* INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
|
|
* OR ANY PART THEREOF.
|
|
*
|
|
* In no event will Sun Microsystems, Inc. be liable for any lost revenue
|
|
* or profits or other special, indirect and consequential damages, even if
|
|
* Sun has been advised of the possibility of such damages.
|
|
*
|
|
* Sun Microsystems, Inc.
|
|
* 2550 Garcia Avenue
|
|
* Mountain View, California 94043
|
|
*/
|
|
|
|
/*
|
|
* From: @(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI
|
|
*/
|
|
char cout_rcsid[] =
|
|
"$Id$";
|
|
|
|
/*
|
|
* rpc_cout.c, XDR routine outputter for the RPC protocol compiler
|
|
*/
|
|
#include <ctype.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include "rpc_parse.h"
|
|
#include "rpc_util.h"
|
|
#include "proto.h"
|
|
|
|
static void emit_enum(definition *def);
|
|
static void emit_program(const definition *def);
|
|
static void emit_union(const definition *def);
|
|
static void emit_struct(definition *def);
|
|
static void emit_typedef(const definition *def);
|
|
static int findtype(const definition *def, const char *type);
|
|
static int undefined(const char *type);
|
|
static void print_generic_header(const char *procname, int pointerp);
|
|
static void print_ifopen(int indent, const char *name);
|
|
static void print_ifarg(const char *arg);
|
|
static void print_ifsizeof(const char *prefix, const char *type);
|
|
static void print_ifclose(int indent);
|
|
static void print_ifstat(int indent, const char *prefix, const char *type,
|
|
relation rel, const char *amax,
|
|
const char *objname, const char *name);
|
|
static void print_stat(int indent, const declaration *dec);
|
|
static void print_header(const definition *def);
|
|
static void print_trailer(void);
|
|
static char *upcase(const char *str);
|
|
|
|
/*
|
|
* Emit the C-routine for the given definition
|
|
*/
|
|
void
|
|
emit(definition *def)
|
|
{
|
|
if (def->def_kind == DEF_CONST) {
|
|
return;
|
|
}
|
|
if (def->def_kind == DEF_PROGRAM) {
|
|
emit_program(def);
|
|
return;
|
|
}
|
|
if (def->def_kind == DEF_TYPEDEF)
|
|
{
|
|
/* now we need to handle declarations like
|
|
struct typedef foo foo;
|
|
since we don't want this to be expanded
|
|
into 2 calls to xdr_foo */
|
|
|
|
if (strcmp(def->def.ty.old_type,def->def_name)==0)
|
|
return;
|
|
};
|
|
|
|
print_header(def);
|
|
switch (def->def_kind) {
|
|
case DEF_UNION:
|
|
emit_union(def);
|
|
break;
|
|
case DEF_ENUM:
|
|
emit_enum(def);
|
|
break;
|
|
case DEF_STRUCT:
|
|
emit_struct(def);
|
|
break;
|
|
case DEF_TYPEDEF:
|
|
emit_typedef(def);
|
|
break;
|
|
default:
|
|
/* can't happen */
|
|
break;
|
|
}
|
|
print_trailer();
|
|
}
|
|
|
|
static int
|
|
findtype(const definition *def, const char *type)
|
|
{
|
|
if (def->def_kind == DEF_PROGRAM || def->def_kind == DEF_CONST) {
|
|
return (0);
|
|
} else {
|
|
return (streq(def->def_name, type));
|
|
}
|
|
}
|
|
|
|
static int
|
|
undefined(const char *type)
|
|
{
|
|
definition *def;
|
|
def = (definition *) FINDVAL(defined, type, findtype);
|
|
return (def == NULL);
|
|
}
|
|
|
|
|
|
static void
|
|
print_generic_header(const char *procname, int pointerp)
|
|
{
|
|
f_print(fout, "\n");
|
|
f_print(fout, "bool_t\n");
|
|
if (Cflag) {
|
|
f_print(fout, "xdr_%s(", procname);
|
|
f_print(fout, "XDR *xdrs, ");
|
|
f_print(fout, "%s ", procname);
|
|
if( pointerp )
|
|
f_print(fout, "*");
|
|
f_print(fout, "objp)\n{\n\n");
|
|
} else {
|
|
f_print(fout, "xdr_%s(xdrs, objp)\n", procname);
|
|
f_print(fout, "\tXDR *xdrs;\n");
|
|
f_print(fout, "\t%s ", procname);
|
|
if( pointerp )
|
|
f_print(fout, "*");
|
|
f_print(fout, "objp;\n{\n\n");
|
|
}
|
|
}
|
|
|
|
static void
|
|
print_header(const definition *def)
|
|
{
|
|
print_generic_header(def->def_name,
|
|
def->def_kind != DEF_TYPEDEF ||
|
|
!isvectordef(def->def.ty.old_type,
|
|
def->def.ty.rel));
|
|
|
|
/* Now add Inline support */
|
|
|
|
if(inlineflag == 0 )
|
|
return;
|
|
/*May cause lint to complain. but ... */
|
|
f_print(fout, "\t register long *buf;\n\n");
|
|
}
|
|
|
|
static void
|
|
print_prog_header(const proc_list *plist)
|
|
{
|
|
print_generic_header(plist->args.argname, 1 );
|
|
}
|
|
|
|
static void
|
|
print_trailer(void)
|
|
{
|
|
f_print(fout, "\treturn (TRUE);\n");
|
|
f_print(fout, "}\n");
|
|
}
|
|
|
|
|
|
static void
|
|
print_ifopen(int indent, const char *name)
|
|
{
|
|
tabify(fout, indent);
|
|
f_print(fout, " if (!xdr_%s(xdrs", name);
|
|
}
|
|
|
|
static void
|
|
print_ifarg(const char *arg)
|
|
{
|
|
f_print(fout, ", %s", arg);
|
|
}
|
|
|
|
static void
|
|
print_ifsizeof(const char *prefix, const char *type)
|
|
{
|
|
if (streq(type, "bool")) {
|
|
f_print(fout, ", sizeof(bool_t), (xdrproc_t)xdr_bool");
|
|
}
|
|
else {
|
|
f_print(fout, ", sizeof(");
|
|
if (undefined(type) && prefix) {
|
|
f_print(fout, "%s ", prefix);
|
|
}
|
|
f_print(fout, "%s), (xdrproc_t)xdr_%s", type, type);
|
|
}
|
|
}
|
|
|
|
static void
|
|
print_ifclose(int indent)
|
|
{
|
|
f_print(fout, ")) {\n");
|
|
tabify(fout, indent);
|
|
f_print(fout, "\t return (FALSE);\n");
|
|
tabify(fout, indent);
|
|
f_print(fout, " }\n");
|
|
}
|
|
|
|
static void
|
|
print_ifstat(int indent, const char *prefix, const char *type, relation rel,
|
|
const char *amax, const char *objname, const char *name)
|
|
{
|
|
const char *alt = NULL;
|
|
|
|
switch (rel) {
|
|
case REL_POINTER:
|
|
print_ifopen(indent, "pointer");
|
|
print_ifarg("(char **)");
|
|
f_print(fout, "%s", objname);
|
|
print_ifsizeof(prefix, type);
|
|
break;
|
|
case REL_VECTOR:
|
|
if (streq(type, "string")) {
|
|
alt = "string";
|
|
} else if (streq(type, "opaque")) {
|
|
alt = "opaque";
|
|
}
|
|
if (alt) {
|
|
print_ifopen(indent, alt);
|
|
print_ifarg(objname);
|
|
} else {
|
|
print_ifopen(indent, "vector");
|
|
print_ifarg("(char *)");
|
|
f_print(fout, "%s", objname);
|
|
}
|
|
print_ifarg(amax);
|
|
if (!alt) {
|
|
print_ifsizeof(prefix, type);
|
|
}
|
|
break;
|
|
case REL_ARRAY:
|
|
if (streq(type, "string")) {
|
|
alt = "string";
|
|
} else if (streq(type, "opaque")) {
|
|
alt = "bytes";
|
|
}
|
|
if (streq(type, "string")) {
|
|
print_ifopen(indent, alt);
|
|
print_ifarg(objname);
|
|
} else {
|
|
if (alt) {
|
|
print_ifopen(indent, alt);
|
|
} else {
|
|
print_ifopen(indent, "array");
|
|
}
|
|
print_ifarg("(char **)");
|
|
if (*objname == '&') {
|
|
f_print(fout, "%s.%s_val, (u_int *)%s.%s_len",
|
|
objname, name, objname, name);
|
|
} else {
|
|
f_print(fout, "&%s->%s_val, (u_int *)&%s->%s_len",
|
|
objname, name, objname, name);
|
|
}
|
|
}
|
|
print_ifarg(amax);
|
|
if (!alt) {
|
|
print_ifsizeof(prefix, type);
|
|
}
|
|
break;
|
|
case REL_ALIAS:
|
|
print_ifopen(indent, type);
|
|
print_ifarg(objname);
|
|
break;
|
|
}
|
|
print_ifclose(indent);
|
|
}
|
|
|
|
static void
|
|
emit_enum(definition *def)
|
|
{
|
|
(void)def;
|
|
|
|
print_ifopen(1, "enum");
|
|
print_ifarg("(enum_t *)objp");
|
|
print_ifclose(1);
|
|
}
|
|
|
|
static void
|
|
emit_program(const definition *def)
|
|
{
|
|
decl_list *dl;
|
|
version_list *vlist;
|
|
proc_list *plist;
|
|
|
|
for (vlist = def->def.pr.versions; vlist != NULL;vlist = vlist->next)
|
|
for(plist = vlist->procs; plist != NULL; plist = plist->next) {
|
|
if (!newstyle || plist->arg_num < 2)
|
|
continue; /* old style, or single argument */
|
|
print_prog_header(plist);
|
|
for (dl = plist->args.decls; dl != NULL;
|
|
dl = dl->next)
|
|
print_stat(1,&dl->decl);
|
|
print_trailer();
|
|
}
|
|
}
|
|
|
|
static void
|
|
emit_union(const definition *def)
|
|
{
|
|
declaration *dflt;
|
|
case_list *cl;
|
|
declaration *cs;
|
|
char *object;
|
|
const char *vecformat = "objp->%s_u.%s";
|
|
const char *format = "&objp->%s_u.%s";
|
|
|
|
print_stat(1,&def->def.un.enum_decl);
|
|
f_print(fout, "\tswitch (objp->%s) {\n", def->def.un.enum_decl.name);
|
|
for (cl = def->def.un.cases; cl != NULL; cl = cl->next) {
|
|
|
|
f_print(fout, "\tcase %s:\n", cl->case_name);
|
|
if(cl->contflag == 1) /* a continued case statement */
|
|
continue;
|
|
cs = &cl->case_decl;
|
|
if (!streq(cs->type, "void")) {
|
|
object = alloc(strlen(def->def_name) + strlen(format) +
|
|
strlen(cs->name) + 1);
|
|
if (isvectordef(cs->type, cs->rel)) {
|
|
s_print(object, vecformat, def->def_name,
|
|
cs->name);
|
|
} else {
|
|
s_print(object, format, def->def_name,
|
|
cs->name);
|
|
}
|
|
print_ifstat(2, cs->prefix, cs->type, cs->rel, cs->array_max,
|
|
object, cs->name);
|
|
free(object);
|
|
}
|
|
f_print(fout, "\t\tbreak;\n");
|
|
}
|
|
dflt = def->def.un.default_decl;
|
|
if (dflt != NULL) {
|
|
if (!streq(dflt->type, "void")) {
|
|
f_print(fout, "\tdefault:\n");
|
|
object = alloc(strlen(def->def_name) + strlen(format) +
|
|
strlen(dflt->name) + 1);
|
|
if (isvectordef(dflt->type, dflt->rel)) {
|
|
s_print(object, vecformat, def->def_name,
|
|
dflt->name);
|
|
} else {
|
|
s_print(object, format, def->def_name,
|
|
dflt->name);
|
|
}
|
|
|
|
print_ifstat(2, dflt->prefix, dflt->type, dflt->rel,
|
|
dflt->array_max, object, dflt->name);
|
|
free(object);
|
|
f_print(fout, "\t\tbreak;\n");
|
|
}
|
|
#ifdef __GNU_LIBRARY__
|
|
else {
|
|
f_print(fout, "\tdefault:\n");
|
|
f_print(fout, "\t\tbreak;\n");
|
|
}
|
|
#endif
|
|
} else {
|
|
f_print(fout, "\tdefault:\n");
|
|
f_print(fout, "\t\treturn (FALSE);\n");
|
|
}
|
|
|
|
f_print(fout, "\t}\n");
|
|
}
|
|
|
|
/* this may be const. i haven't traced this one through yet. */
|
|
|
|
static void
|
|
emit_struct(definition *def)
|
|
{
|
|
decl_list *dl;
|
|
int i,j,size,flag;
|
|
decl_list *cur = NULL,*psav;
|
|
bas_type *ptr;
|
|
char *sizestr;
|
|
const char *plus;
|
|
char ptemp[256];
|
|
int can_inline;
|
|
|
|
|
|
if(inlineflag == 0) {
|
|
for (dl = def->def.st.decls; dl != NULL; dl = dl->next)
|
|
print_stat(1,&dl->decl);
|
|
}
|
|
|
|
else {
|
|
|
|
for (dl = def->def.st.decls; dl != NULL; dl = dl->next)
|
|
if(dl->decl.rel == REL_VECTOR){
|
|
f_print(fout,"\t int i;\n");
|
|
break;
|
|
}
|
|
|
|
size=0;can_inline=0;
|
|
for (dl = def->def.st.decls; dl != NULL; dl = dl->next)
|
|
if((dl->decl.prefix == NULL) && ((ptr=find_type(dl->decl.type))!= NULL) && ((dl->decl.rel == REL_ALIAS)||(dl->decl.rel == REL_VECTOR))){
|
|
|
|
if(dl->decl.rel == REL_ALIAS)
|
|
size+=ptr->length;
|
|
else {
|
|
can_inline=1;
|
|
break; /* can be inlined */
|
|
};
|
|
}
|
|
else {
|
|
if(size >= inlineflag){
|
|
can_inline=1;
|
|
break; /* can be inlined */
|
|
}
|
|
size=0;
|
|
}
|
|
if(size > inlineflag)
|
|
can_inline=1;
|
|
|
|
if(can_inline == 0){ /* can not inline, drop back to old mode */
|
|
for (dl = def->def.st.decls; dl != NULL; dl = dl->next)
|
|
print_stat(1,&dl->decl);
|
|
return;
|
|
};
|
|
|
|
flag=PUT;
|
|
for(j=0; j<2; j++){
|
|
|
|
if(flag == PUT)
|
|
f_print(fout,"\n\t if (xdrs->x_op == XDR_ENCODE) {\n");
|
|
else
|
|
f_print(fout,"\n \t return (TRUE);\n\t} else if (xdrs->x_op == XDR_DECODE) {\n");
|
|
|
|
|
|
i=0;
|
|
size=0;
|
|
sizestr=NULL;
|
|
for (dl = def->def.st.decls; dl != NULL; dl = dl->next) { /* xxx */
|
|
|
|
/* now walk down the list and check for basic types */
|
|
if((dl->decl.prefix == NULL) && ((ptr=find_type(dl->decl.type))!= NULL) && ((dl->decl.rel == REL_ALIAS)||(dl->decl.rel == REL_VECTOR))){
|
|
if(i ==0 )
|
|
cur=dl;
|
|
i++;
|
|
|
|
if(dl->decl.rel == REL_ALIAS)
|
|
size+=ptr->length;
|
|
else {
|
|
/* this is required to handle arrays */
|
|
|
|
if(sizestr == NULL)
|
|
plus = " ";
|
|
else
|
|
plus = "+";
|
|
|
|
if(ptr->length != 1)
|
|
s_print(ptemp," %s %s * %d",plus,dl->decl.array_max,ptr->length);
|
|
else
|
|
s_print(ptemp," %s %s ",plus,dl->decl.array_max);
|
|
|
|
/*now concatenate to sizestr !!!! */
|
|
if (sizestr == NULL)
|
|
sizestr=strdup(ptemp);
|
|
else{
|
|
sizestr=realloc(sizestr,strlen(sizestr)+strlen(ptemp)+1);
|
|
if(sizestr == NULL){
|
|
|
|
f_print(stderr, "Fatal error : no memory \n");
|
|
crash();
|
|
};
|
|
sizestr=strcat(sizestr,ptemp); /*build up length of array */
|
|
|
|
}
|
|
}
|
|
|
|
}
|
|
else{
|
|
if(i > 0 )
|
|
if(sizestr == NULL && size < inlineflag){
|
|
/* don't expand into inline code if size < inlineflag */
|
|
while(cur != dl){
|
|
print_stat(1,&cur->decl);
|
|
cur=cur->next;
|
|
}
|
|
}
|
|
else{
|
|
|
|
|
|
|
|
/* were already looking at a xdr_inlineable structure */
|
|
if(sizestr == NULL)
|
|
f_print(fout,"\t buf = XDR_INLINE(xdrs,%d * BYTES_PER_XDR_UNIT);",
|
|
size);
|
|
else
|
|
if(size == 0)
|
|
f_print(fout,
|
|
"\t buf = XDR_INLINE(xdrs,%s * BYTES_PER_XDR_UNIT);",
|
|
sizestr);
|
|
else
|
|
f_print(fout,
|
|
"\t buf = XDR_INLINE(xdrs,(%d + %s)* BYTES_PER_XDR_UNIT);",
|
|
size,sizestr);
|
|
|
|
f_print(fout,"\n\t if (buf == NULL) {\n");
|
|
|
|
psav=cur;
|
|
while(cur != dl){
|
|
print_stat(2,&cur->decl);
|
|
cur=cur->next;
|
|
}
|
|
|
|
f_print(fout,"\n\t }\n\t else {\n");
|
|
|
|
cur=psav;
|
|
while(cur != dl){
|
|
emit_inline(&cur->decl,flag);
|
|
cur=cur->next;
|
|
}
|
|
|
|
f_print(fout,"\t }\n");
|
|
}
|
|
size=0;i=0;sizestr=NULL;
|
|
print_stat(1,&dl->decl);
|
|
}
|
|
|
|
}
|
|
if(i > 0 )
|
|
if(sizestr == NULL && size < inlineflag){
|
|
/* don't expand into inline code if size < inlineflag */
|
|
while(cur != dl){
|
|
print_stat(1,&cur->decl);
|
|
cur=cur->next;
|
|
}
|
|
}
|
|
else{
|
|
|
|
/* were already looking at a xdr_inlineable structure */
|
|
if(sizestr == NULL)
|
|
f_print(fout,"\t\tbuf = XDR_INLINE(xdrs,%d * BYTES_PER_XDR_UNIT);",
|
|
size);
|
|
else
|
|
if(size == 0)
|
|
f_print(fout,
|
|
"\t\tbuf = XDR_INLINE(xdrs,%s * BYTES_PER_XDR_UNIT);",
|
|
sizestr);
|
|
else
|
|
f_print(fout,
|
|
"\t\tbuf = XDR_INLINE(xdrs,(%d + %s)* BYTES_PER_XDR_UNIT);",
|
|
size,sizestr);
|
|
|
|
f_print(fout,"\n\t\tif (buf == NULL) {\n");
|
|
|
|
psav=cur;
|
|
while(cur != NULL){
|
|
print_stat(2,&cur->decl);
|
|
cur=cur->next;
|
|
}
|
|
f_print(fout,"\n\t }\n\t else {\n");
|
|
|
|
cur=psav;
|
|
while(cur != dl){
|
|
emit_inline(&cur->decl,flag);
|
|
cur=cur->next;
|
|
}
|
|
|
|
f_print(fout,"\t }\n");
|
|
|
|
}
|
|
flag=GET;
|
|
}
|
|
f_print(fout,"\t return(TRUE);\n\t}\n\n");
|
|
|
|
/* now take care of XDR_FREE case */
|
|
|
|
for (dl = def->def.st.decls; dl != NULL; dl = dl->next)
|
|
print_stat(1,&dl->decl);
|
|
}
|
|
}
|
|
|
|
|
|
static void
|
|
emit_typedef(const definition *def)
|
|
{
|
|
const char *prefix = def->def.ty.old_prefix;
|
|
const char *type = def->def.ty.old_type;
|
|
const char *amax = def->def.ty.array_max;
|
|
relation rel = def->def.ty.rel;
|
|
|
|
|
|
print_ifstat(1, prefix, type, rel, amax, "objp", def->def_name);
|
|
}
|
|
|
|
static void
|
|
print_stat(int indent, const declaration *dec)
|
|
{
|
|
const char *prefix = dec->prefix;
|
|
const char *type = dec->type;
|
|
const char *amax = dec->array_max;
|
|
relation rel = dec->rel;
|
|
char name[256];
|
|
|
|
if (isvectordef(type, rel)) {
|
|
s_print(name, "objp->%s", dec->name);
|
|
} else {
|
|
s_print(name, "&objp->%s", dec->name);
|
|
}
|
|
print_ifstat(indent, prefix, type, rel, amax, name, dec->name);
|
|
}
|
|
|
|
|
|
void
|
|
emit_inline(declaration *decl, int flag)
|
|
{
|
|
|
|
/*check whether an array or not */
|
|
|
|
switch(decl->rel)
|
|
{
|
|
case REL_ALIAS :
|
|
emit_single_in_line(decl,flag,REL_ALIAS);
|
|
break;
|
|
case REL_VECTOR :
|
|
f_print(fout,"\t\t{ register %s *genp; \n",decl->type);
|
|
f_print(fout,"\t\t for ( i = 0,genp=objp->%s;\n \t\t\ti < %s; i++){\n\t\t",
|
|
decl->name,decl->array_max);
|
|
emit_single_in_line(decl,flag,REL_VECTOR);
|
|
f_print(fout,"\t\t }\n\t\t };\n");
|
|
|
|
default:
|
|
/* ?... do nothing I guess */
|
|
}
|
|
}
|
|
|
|
void
|
|
emit_single_in_line(declaration *decl, int flag, relation rel)
|
|
{
|
|
char *upp_case1;
|
|
const char *upp_case;
|
|
|
|
if (flag == PUT) {
|
|
f_print(fout,"\t\t IXDR_PUT_");
|
|
}
|
|
else {
|
|
if(rel== REL_ALIAS) {
|
|
f_print(fout, "\t\t objp->%s = IXDR_GET_", decl->name);
|
|
}
|
|
else {
|
|
f_print(fout,"\t\t *genp++ = IXDR_GET_");
|
|
}
|
|
}
|
|
|
|
upp_case1 = upcase(decl->type);
|
|
upp_case = upp_case1;
|
|
|
|
/* hack - XX */
|
|
if (!strcmp(upp_case, "INT")) upp_case="LONG";
|
|
if (!strcmp(upp_case, "U_INT")) upp_case="U_LONG";
|
|
|
|
if (flag == PUT) {
|
|
if (rel==REL_ALIAS) {
|
|
f_print(fout,"%s(buf,objp->%s);\n",upp_case,decl->name);
|
|
}
|
|
else {
|
|
f_print(fout,"%s(buf,*genp++);\n",upp_case);
|
|
}
|
|
}
|
|
else {
|
|
f_print(fout,"%s(buf);\n",upp_case);
|
|
}
|
|
|
|
free(upp_case1);
|
|
}
|
|
|
|
|
|
static char *upcase(const char *str) {
|
|
char *ptr, *hptr;
|
|
ptr = malloc(strlen(str));
|
|
if (ptr == NULL) {
|
|
f_print(stderr,"malloc failed\n");
|
|
exit(1);
|
|
}
|
|
hptr=ptr;
|
|
while (*str != 0) {
|
|
*ptr++ = toupper(*str++);
|
|
}
|
|
*ptr=0;
|
|
return hptr;
|
|
}
|