From: bernhardheld Date: Sat, 28 Jan 2006 10:02:29 +0000 (+0000) Subject: * as/hc08/aslex.c, X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=5e7a815ef82dacf659fdad6451a982842eb255a2;p=fw%2Fsdcc * as/hc08/aslex.c, * as/hc08/aslink.h, * as/hc08/asm.h, * as/hc08/asmain.c, * as/hc08/lkdata.c, * as/hc08/lklex.c, * as/hc08/lkmain.c, * as/mcs51/aslex.c, * as/mcs51/aslink.h, * as/mcs51/asm.h, * as/mcs51/asmain.c, * as/mcs51/lkdata.c, * as/mcs51/lklex.c, * as/mcs51/lkmain.c, * as/z80/aslex.c, * as/z80/asm.h, * as/z80/asmain.c: fixed build on current cygwin: replaced getline() by as_getline() git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4027 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- diff --git a/ChangeLog b/ChangeLog index 48183fe7..0e4e6e48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2006-01-28 Bernhard Held + + * src/ds390/gen.c (unsaveRegisters): fixed literal function pointer + ((void (code *) (void)) 0) (); + * as/hc08/aslex.c, + * as/hc08/aslink.h, + * as/hc08/asm.h, + * as/hc08/asmain.c, + * as/hc08/lkdata.c, + * as/hc08/lklex.c, + * as/hc08/lkmain.c, + * as/mcs51/aslex.c, + * as/mcs51/aslink.h, + * as/mcs51/asm.h, + * as/mcs51/asmain.c, + * as/mcs51/lkdata.c, + * as/mcs51/lklex.c, + * as/mcs51/lkmain.c, + * as/z80/aslex.c, + * as/z80/asm.h, + * as/z80/asmain.c: fixed build on current cygwin: + replaced getline() by as_getline() + 2006-01-27 Bernhard Held * src/SDCC.y: fixed bug #716242, exchanged pointer and function diff --git a/as/hc08/aslex.c b/as/hc08/aslex.c index 4f774c42..42a66ab1 100644 --- a/as/hc08/aslex.c +++ b/as/hc08/aslex.c @@ -26,7 +26,7 @@ * char endline() * char get() * VOID getid(id,c) - * int getline() + * int as_getline() * int getmap() * char getnb() * VOID getst() @@ -352,9 +352,9 @@ getmap(d) return (c); } -/*)Function int getline() +/*)Function int as_getline() * - * The function getline() reads a line of assembler-source text + * The function as_getline() reads a line of assembler-source text * from an assembly source text file or an include file. * Lines of text are processed from assembler-source files until * all files have been read. If an include file is opened then @@ -362,7 +362,7 @@ getmap(d) * include file) until the end of the include file is found. * The input text line is copied into the global string ib[] * and converted to a NULL terminated string. The function - * getline() returns a (1) after succesfully reading a line + * as_getline() returns a (1) after succesfully reading a line * or a (0) if all files have been read. * * local variables: @@ -399,7 +399,7 @@ getmap(d) */ int -getline() +as_getline() { loop: if (incfil >= 0) { if (fgets(ib, sizeof ib, ifp[incfil]) == NULL) { diff --git a/as/hc08/aslink.h b/as/hc08/aslink.h index a2dd2083..7a4dd81d 100644 --- a/as/hc08/aslink.h +++ b/as/hc08/aslink.h @@ -497,7 +497,7 @@ extern char ccase[]; /* an array of characters which extern struct lfile *filep; /* The pointers (lfile *) filep, * (lfile *) cfp, and (FILE *) sfp * are used in conjunction with - * the routine getline() to read + * the routine as_getline() to read * asmlnk commands from * (1) the standard input or * (2) or a command file @@ -679,7 +679,7 @@ extern char get(); extern VOID getfid(); extern VOID getid(); extern VOID getSid(); -extern int getline(); +extern int as_getline(); extern int getmap(); extern char getnb(); extern int more(); diff --git a/as/hc08/asm.h b/as/hc08/asm.h index c7b1b6c7..ad5f1714 100644 --- a/as/hc08/asm.h +++ b/as/hc08/asm.h @@ -592,7 +592,7 @@ extern VOID usage(); extern char endline(); extern char get(); extern VOID getid(); -extern int getline(); +extern int as_getline(); extern int getmap(); extern char getnb(); extern VOID getst(); diff --git a/as/hc08/asmain.c b/as/hc08/asmain.c index 2ed786af..08a5f11a 100644 --- a/as/hc08/asmain.c +++ b/as/hc08/asmain.c @@ -130,7 +130,7 @@ * VOID diag() assubr.c * VOID err() assubr.c * int fprintf() c-library - * int getline() aslex.c + * int as_getline() aslex.c * VOID list() aslist.c * VOID lstsym() aslist.c * VOID minit() ___mch.c @@ -289,7 +289,7 @@ char *argv[]; dot.s_area = &dca; symp = ˙ minit(); - while (getline()) { + while (as_getline()) { cp = cb; cpt = cbt; ep = eb; diff --git a/as/hc08/lkdata.c b/as/hc08/lkdata.c index d6a35175..44e44233 100644 --- a/as/hc08/lkdata.c +++ b/as/hc08/lkdata.c @@ -118,7 +118,7 @@ long code_size=-1; /* code size struct lfile *filep; /* The pointers (lfile *) filep, * (lfile *) cfp, and (FILE *) sfp * are used in conjunction with - * the routine getline() to read + * the routine as_getline() to read * asmlnk commands from * (1) the standard input or * (2) or a command file diff --git a/as/hc08/lklex.c b/as/hc08/lklex.c index f7de6d3c..7c481300 100644 --- a/as/hc08/lklex.c +++ b/as/hc08/lklex.c @@ -24,7 +24,7 @@ * VOID getfid() * VOID getid() * VOID getSid() - * int getline() + * int as_getline() * int getmap() * char getnb() * int more() @@ -425,15 +425,15 @@ getmap(d) return (c); } -/*)Function int getline() +/*)Function int as_getline() * - * The function getline() reads a line of input text from a + * The function as_getline() reads a line of input text from a * .rel source text file, a .lnk command file or from stdin. * Lines of text are processed from a single .lnk file or * multiple .rel files until all files have been read. * The input text line is copied into the global string ib[] * and converted to a NULL terminated string. The function - * getline() returns a (1) after succesfully reading a line + * as_getline() returns a (1) after succesfully reading a line * or a (0) if all files have been read. * This function also opens each input .lst file and output * .rst file as each .rel file is processed. @@ -479,7 +479,7 @@ getmap(d) */ int -getline() +as_getline() { register int ftype; register char *fid; diff --git a/as/hc08/lkmain.c b/as/hc08/lkmain.c index 14003b7e..401916a5 100644 --- a/as/hc08/lkmain.c +++ b/as/hc08/lkmain.c @@ -116,7 +116,7 @@ void Areas51 (void) * * The function main() evaluates the command line arguments to * determine if the linker parameters are to input through 'stdin' - * or read from a command file. The functiond getline() and parse() + * or read from a command file. The functiond as_getline() and parse() * are to input and evaluate the linker parameters. The linking process * proceeds by making the first pass through each .rel file in the order * presented to the linker. At the end of the first pass the setbase(), @@ -170,7 +170,7 @@ void Areas51 (void) * FILE * afile() lkmain.c * int fclose() c_library * int fprintf() c_library - * int getline() lklex.c + * int as_getline() lklex.c * VOID library() lklibr.c * VOID link_main() lkmain.c * VOID lkexit() lkmain.c @@ -252,7 +252,7 @@ char *argv[]; filep = startp; while (1) { ip = ib; - if (getline() == 0) + if (as_getline() == 0) break; if (pflag && sfp != stdin) fprintf(stdout, "%s\n", ip); @@ -287,7 +287,7 @@ char *argv[]; Areas51(); /*JCF: Create the default 8051 areas in the right order*/ - while (getline()) { + while (as_getline()) { ip = ib; /* pass any "magic comments" to NoICE output */ diff --git a/as/mcs51/aslex.c b/as/mcs51/aslex.c index 4f774c42..42a66ab1 100644 --- a/as/mcs51/aslex.c +++ b/as/mcs51/aslex.c @@ -26,7 +26,7 @@ * char endline() * char get() * VOID getid(id,c) - * int getline() + * int as_getline() * int getmap() * char getnb() * VOID getst() @@ -352,9 +352,9 @@ getmap(d) return (c); } -/*)Function int getline() +/*)Function int as_getline() * - * The function getline() reads a line of assembler-source text + * The function as_getline() reads a line of assembler-source text * from an assembly source text file or an include file. * Lines of text are processed from assembler-source files until * all files have been read. If an include file is opened then @@ -362,7 +362,7 @@ getmap(d) * include file) until the end of the include file is found. * The input text line is copied into the global string ib[] * and converted to a NULL terminated string. The function - * getline() returns a (1) after succesfully reading a line + * as_getline() returns a (1) after succesfully reading a line * or a (0) if all files have been read. * * local variables: @@ -399,7 +399,7 @@ getmap(d) */ int -getline() +as_getline() { loop: if (incfil >= 0) { if (fgets(ib, sizeof ib, ifp[incfil]) == NULL) { diff --git a/as/mcs51/aslink.h b/as/mcs51/aslink.h index 1833938e..bcd921d9 100644 --- a/as/mcs51/aslink.h +++ b/as/mcs51/aslink.h @@ -497,7 +497,7 @@ extern char ccase[]; /* an array of characters which extern struct lfile *filep; /* The pointers (lfile *) filep, * (lfile *) cfp, and (FILE *) sfp * are used in conjunction with - * the routine getline() to read + * the routine as_getline() to read * asmlnk commands from * (1) the standard input or * (2) or a command file @@ -683,7 +683,7 @@ extern char get(); extern VOID getfid(); extern VOID getid(); extern VOID getSid(); -extern int getline(); +extern int as_getline(); extern int getmap(); extern char getnb(); extern int more(); diff --git a/as/mcs51/asm.h b/as/mcs51/asm.h index 415250be..3d4cd97e 100644 --- a/as/mcs51/asm.h +++ b/as/mcs51/asm.h @@ -593,7 +593,7 @@ extern VOID usage(); extern char endline(); extern char get(); extern VOID getid(); -extern int getline(); +extern int as_getline(); extern int getmap(); extern char getnb(); extern VOID getst(); diff --git a/as/mcs51/asmain.c b/as/mcs51/asmain.c index cb987f55..3d31bf03 100644 --- a/as/mcs51/asmain.c +++ b/as/mcs51/asmain.c @@ -130,7 +130,7 @@ * VOID diag() assubr.c * VOID err() assubr.c * int fprintf() c-library - * int getline() aslex.c + * int as_getline() aslex.c * VOID list() aslist.c * VOID lstsym() aslist.c * VOID minit() ___mch.c @@ -289,7 +289,7 @@ char *argv[]; dot.s_area = &dca; symp = ˙ minit(); - while (getline()) { + while (as_getline()) { cp = cb; cpt = cbt; ep = eb; diff --git a/as/mcs51/lkdata.c b/as/mcs51/lkdata.c index 5edb74a6..64af18b2 100644 --- a/as/mcs51/lkdata.c +++ b/as/mcs51/lkdata.c @@ -122,7 +122,7 @@ long code_size=-1; /* code size struct lfile *filep; /* The pointers (lfile *) filep, * (lfile *) cfp, and (FILE *) sfp * are used in conjunction with - * the routine getline() to read + * the routine as_getline() to read * asmlnk commands from * (1) the standard input or * (2) or a command file diff --git a/as/mcs51/lklex.c b/as/mcs51/lklex.c index f7de6d3c..7c481300 100644 --- a/as/mcs51/lklex.c +++ b/as/mcs51/lklex.c @@ -24,7 +24,7 @@ * VOID getfid() * VOID getid() * VOID getSid() - * int getline() + * int as_getline() * int getmap() * char getnb() * int more() @@ -425,15 +425,15 @@ getmap(d) return (c); } -/*)Function int getline() +/*)Function int as_getline() * - * The function getline() reads a line of input text from a + * The function as_getline() reads a line of input text from a * .rel source text file, a .lnk command file or from stdin. * Lines of text are processed from a single .lnk file or * multiple .rel files until all files have been read. * The input text line is copied into the global string ib[] * and converted to a NULL terminated string. The function - * getline() returns a (1) after succesfully reading a line + * as_getline() returns a (1) after succesfully reading a line * or a (0) if all files have been read. * This function also opens each input .lst file and output * .rst file as each .rel file is processed. @@ -479,7 +479,7 @@ getmap(d) */ int -getline() +as_getline() { register int ftype; register char *fid; diff --git a/as/mcs51/lkmain.c b/as/mcs51/lkmain.c index 0e96f095..9adbde04 100644 --- a/as/mcs51/lkmain.c +++ b/as/mcs51/lkmain.c @@ -155,7 +155,7 @@ void Areas51 (void) * * The function main() evaluates the command line arguments to * determine if the linker parameters are to input through 'stdin' - * or read from a command file. The functiond getline() and parse() + * or read from a command file. The functiond as_getline() and parse() * are to input and evaluate the linker parameters. The linking process * proceeds by making the first pass through each .rel file in the order * presented to the linker. At the end of the first pass the setbase(), @@ -209,7 +209,7 @@ void Areas51 (void) * FILE * afile() lkmain.c * int fclose() c_library * int fprintf() c_library - * int getline() lklex.c + * int as_getline() lklex.c * VOID library() lklibr.c * VOID link_main() lkmain.c * VOID lkexit() lkmain.c @@ -290,7 +290,7 @@ main(int argc, char *argv[]) filep = startp; while (1) { ip = ib; - if (getline() == 0) + if (as_getline() == 0) break; if (pflag && sfp != stdin) fprintf(stdout, "%s\n", ip); @@ -325,7 +325,7 @@ main(int argc, char *argv[]) Areas51(); /*JCF: Create the default 8051 areas in the right order*/ - while (getline()) { + while (as_getline()) { ip = ib; /* pass any "magic comments" to NoICE output */ diff --git a/as/z80/aslex.c b/as/z80/aslex.c index 41814271..0a4323ec 100644 --- a/as/z80/aslex.c +++ b/as/z80/aslex.c @@ -28,7 +28,7 @@ * char endline() * char get() * VOID getid(id,c) - * int getline() + * int as_getline() * int getmap() * char getnb() * VOID getst() @@ -354,9 +354,9 @@ getmap(d) return (c); } -/*)Function int getline() +/*)Function int as_getline() * - * The function getline() reads a line of assembler-source text + * The function as_getline() reads a line of assembler-source text * from an assembly source text file or an include file. * Lines of text are processed from assembler-source files until * all files have been read. If an include file is opened then @@ -364,7 +364,7 @@ getmap(d) * include file) until the end of the include file is found. * The input text line is copied into the global string ib[] * and converted to a NULL terminated string. The function - * getline() returns a (1) after succesfully reading a line + * as_getline() returns a (1) after succesfully reading a line * or a (0) if all files have been read. * * local variables: @@ -401,7 +401,7 @@ getmap(d) */ int -getline() +as_getline() { register int i; diff --git a/as/z80/asm.h b/as/z80/asm.h index d179177a..30bad906 100644 --- a/as/z80/asm.h +++ b/as/z80/asm.h @@ -524,7 +524,7 @@ extern VOID usage(); extern char endline(); extern char get(); extern VOID getid(); -extern int getline(); +extern int as_getline(); extern int getmap(); extern char getnb(); extern VOID getst(); diff --git a/as/z80/asmain.c b/as/z80/asmain.c index 72c5b989..3972b0df 100644 --- a/as/z80/asmain.c +++ b/as/z80/asmain.c @@ -135,7 +135,7 @@ * VOID diag() assubr.c * VOID err() assubr.c * int fprintf() c-library - * int getline() aslex.c + * int as_getline() aslex.c * VOID list() aslist.c * VOID lstsym() aslist.c * VOID minit() ___mch.c @@ -311,7 +311,7 @@ main(int argc, char **argv) dot.s_area = &dca; symp = ˙ minit(); - while (getline()) { + while (as_getline()) { cp = cb; cpt = cbt; ep = eb;