diff options
959 files changed, 13154 insertions, 12889 deletions
diff --git a/gnu/games/chess/Makefile b/gnu/games/chess/Makefile index 1fff3a2..a129137 100644 --- a/gnu/games/chess/Makefile +++ b/gnu/games/chess/Makefile @@ -8,7 +8,7 @@ DPADD= ${LIBCURSES} ${LIBTERMCAP} LDADD= -lcurses -ltermcap HIDEGAME=hidegame -beforeinstall: +beforeinstall: install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/gnuchess.book \ ${DESTDIR}/usr/share/games diff --git a/gnu/games/chess/Xchess/Makefile b/gnu/games/chess/Xchess/Makefile index d8892e2..bbf2789 100644 --- a/gnu/games/chess/Xchess/Makefile +++ b/gnu/games/chess/Xchess/Makefile @@ -1,5 +1,5 @@ -# RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:05 $ -# $Source: /a/cvs/386BSD/src/gnu/chess/Xchess/Makefile,v $ +# RCS Info: $Revision: 1.2 $ on $Date: 1994/01/07 11:10:39 $ +# $Source: /home/ncvs/src/gnu/games/chess/Xchess/Makefile,v $ # Copyright (c) 1985 Wayne A. Christopher, U. C. Berkeley CAD Group # # Makefile for xchess. @@ -95,7 +95,7 @@ reopt: all install: all -source: $(SOURCE) +source: $(SOURCE) tags: $(ALLFILES) ctags -w -t *.c *.h > /dev/null 2>&1 @@ -123,7 +123,7 @@ depend: $(SOURCE) echo '$$r makedep' >>eddep echo 'w' >>eddep ed - Makefile < eddep - rm eddep makedep + rm eddep makedep echo '# DEPENDENCIES MUST END AT END OF FILE' >> Makefile echo '# IF YOU PUT STUFF HERE IT WILL GO AWAY' >> Makefile echo '# see make depend above' >> Makefile diff --git a/gnu/games/chess/Xchess/XCircle.c b/gnu/games/chess/Xchess/XCircle.c index d2144bc..3d1b1c8 100644 --- a/gnu/games/chess/Xchess/XCircle.c +++ b/gnu/games/chess/Xchess/XCircle.c @@ -20,8 +20,8 @@ file named COPYING. Among other things, the copyright notice and this notice must be preserved on all copies. */ -/* RCS Info: $Revision: 1.2 $ on $Date: 86/11/23 17:17:04 $ - * $Source: /users/faustus/xchess/RCS/XCircle.c,v $ +/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:12 $ + * $Source: /home/ncvs/src/gnu/games/chess/Xchess/XCircle.c,v $ * Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group * Permission is granted to do anything with this code except sell it * or remove this message. @@ -143,7 +143,7 @@ XCircle(win, x, y, rad, start, end, width, height, pixel, func, planes) verts[0].flags |= VertexStartClosed; verts[j].x = verts[0].x; verts[j].y = verts[0].y; - verts[j].flags = (verts[0].flags & ~VertexStartClosed) | + verts[j].flags = (verts[0].flags & ~VertexStartClosed) | VertexEndClosed; for (i = 0; i < 15; i++) { if (dp) diff --git a/gnu/games/chess/Xchess/board.c b/gnu/games/chess/Xchess/board.c index 4c5b934..fab97d8 100644 --- a/gnu/games/chess/Xchess/board.c +++ b/gnu/games/chess/Xchess/board.c @@ -20,8 +20,8 @@ file named COPYING. Among other things, the copyright notice and this notice must be preserved on all copies. */ -/* RCS Info: $Revision: 1.4 $ on $Date: 86/11/23 17:17:15 $ - * $Source: /users/faustus/xchess/RCS/board.c,v $ +/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:08 $ + * $Source: /home/ncvs/src/gnu/games/chess/Xchess/board.c,v $ * Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group * Permission is granted to do anything with this code except sell it * or remove this message. @@ -164,12 +164,12 @@ board_move(b, m) if (m->piece.color == WHITE) { if (m->fromx == 0) b->white_cant_castle_q = true; - else if (m->fromx == 7) + else if (m->fromx == 7) b->white_cant_castle_k = true; } else { if (m->fromx == 0) b->black_cant_castle_q = true; - else if (m->fromx == 7) + else if (m->fromx == 7) b->black_cant_castle_k = true; } } diff --git a/gnu/games/chess/Xchess/button.c b/gnu/games/chess/Xchess/button.c index 67bf3c8..d91005d 100644 --- a/gnu/games/chess/Xchess/button.c +++ b/gnu/games/chess/Xchess/button.c @@ -20,8 +20,8 @@ file named COPYING. Among other things, the copyright notice and this notice must be preserved on all copies. */ -/* RCS Info: $Revision: 1.4 $ on $Date: 86/11/26 12:09:41 $ - * $Source: /users/faustus/xchess/RCS/button.c,v $ +/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:15 $ + * $Source: /home/ncvs/src/gnu/games/chess/Xchess/button.c,v $ * Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group * Permission is granted to do anything with this code except sell it * or remove this message. @@ -52,7 +52,7 @@ static struct but { { "Reset", 0, 80, 108, 29, RESTART } , { "Save", 109, 80, 108, 29, SAVE } , #define EASY_OFFSET 8 - { "Switch", 219, 80, 108, 29, SWITCH } + { "Switch", 219, 80, 108, 29, SWITCH } /* { "NoEasy", 219, 80, 108, 29, EASY }*/ } ; static int easy = 1; @@ -69,7 +69,7 @@ button_draw(win) XSetLineAttributes(win->display, DefaultGC(win->display, 0), BORDER_WIDTH, LineSolid, CapButt, JoinMiter); - + XDrawLine(win->display, win->buttonwin, DefaultGC(win->display, 0), 0, 29, BUTTON_WIDTH, 29); @@ -85,9 +85,9 @@ button_draw(win) XSetFont(win->display, DefaultGC(win->display, 0), win->large->fid); XSetForeground(win->display, DefaultGC(win->display, 0), - win->textcolor.pixel); + win->textcolor.pixel); XSetBackground(win->display, DefaultGC(win->display, 0), - win->textback.pixel); + win->textback.pixel); for (i = 0; i < numbuts; i++) { x = (buts[i].width - @@ -219,7 +219,7 @@ button_service(win, event) case SAVE: if (saveflag) { - message_add(win, + message_add(win, "Game is already being logged in file '", true); message_add(win, record_file, true); message_add(win, "'.\n", true); @@ -248,12 +248,12 @@ button_service(win, event) return; } } - message_add(win1, + message_add(win1, "Clock stopped.\nHit 'Pause' again to restart.\n", false); if (!oneboard) - message_add(win2, - "Clock stopped.\nHit 'Pause' again to restart.\n", + message_add(win2, + "Clock stopped.\nHit 'Pause' again to restart.\n", false); clock_started = false; } else { @@ -320,7 +320,7 @@ button_service(win, event) win->textcolor.pixel); XSetBackground(win->display, DefaultGC(win->display, 0), - win->textback.pixel); + win->textback.pixel); XDrawImageString(win->display, win->buttonwin, diff --git a/gnu/games/chess/Xchess/clock.c b/gnu/games/chess/Xchess/clock.c index a7b3c32..88228b0 100644 --- a/gnu/games/chess/Xchess/clock.c +++ b/gnu/games/chess/Xchess/clock.c @@ -20,8 +20,8 @@ file named COPYING. Among other things, the copyright notice and this notice must be preserved on all copies. */ -/* RCS Info: $Revision: 1.4 $ on $Date: 86/11/26 12:09:47 $ - * $Source: /users/faustus/xchess/RCS/clock.c,v $ +/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:08 $ + * $Source: /home/ncvs/src/gnu/games/chess/Xchess/clock.c,v $ * Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group * Permission is granted to do anything with this code except sell it * or remove this message. @@ -59,7 +59,7 @@ clock_draw(win, col) Window w = ((col == WHITE) ? win->wclockwin : win->bclockwin); /* Draw a clock face and the hands. */ - XCircle(w, x, y, rad, 0.0, 0.0, 1, 1, win->textcolor.pixel, GXcopy, + XCircle(w, x, y, rad, 0.0, 0.0, 1, 1, win->textcolor.pixel, GXcopy, AllPlanes); rad -= 8; @@ -112,7 +112,7 @@ clock_update() lastwhite = lastblack = now; return; } - + if (white_running) { whiteseconds += now - lastwhite; lastwhite = now; @@ -198,7 +198,7 @@ dohands(win, col) { int cx = CLOCK_WIDTH / 2, cy = CLOCK_WIDTH / 2; double *h = (col == WHITE) ? win->whitehands : win->blackhands; - Window w = (col == WHITE) ? win->wclockwin : win->bclockwin; + Window w = (col == WHITE) ? win->wclockwin : win->bclockwin; long secs = (col == WHITE) ? whiteseconds : blackseconds; int rad, x, y, i; @@ -272,11 +272,11 @@ hilight(win, col, on) BORDER_WIDTH, LineSolid, CapButt, JoinMiter); XSetFont(win->display, DefaultGC(win->display, 0), win->large->fid); - + XDrawLine(win->display, w, DefaultGC(win->display, 0), 0, CLOCK_HEIGHT - 26, CLOCK_WIDTH, CLOCK_HEIGHT - 26); - + XDrawImageString(win->display, w, DefaultGC(win->display, 0), (CLOCK_WIDTH - x) / 2, CLOCK_HEIGHT, s, strlen(s)); diff --git a/gnu/games/chess/Xchess/control.c b/gnu/games/chess/Xchess/control.c index ad2e1d7..7d23a76 100644 --- a/gnu/games/chess/Xchess/control.c +++ b/gnu/games/chess/Xchess/control.c @@ -19,8 +19,8 @@ file named COPYING. Among other things, the copyright notice and this notice must be preserved on all copies. */ -/* RCS Info: $Revision: 1.4 $ on $Date: 86/11/23 17:17:32 $ - * $Source: /users/faustus/xchess/RCS/control.c,v $ +/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:11 $ + * $Source: /home/ncvs/src/gnu/games/chess/Xchess/control.c,v $ * Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group * Permission is granted to do anything with this code except sell it * or remove this message. @@ -154,7 +154,7 @@ button_released(event, win) thismove->type = QCASTLE; else thismove->type = MOVE; - + /* Now check the en-passant case... */ if ((thismove->type == MOVE) && ((thismove->tox == thismove->fromx + 1) || (thismove->tox == thismove->fromx - 1)) && @@ -278,7 +278,7 @@ screen_move(m) win_drawpiece(&m->piece, m->toy, m->tox, BLACK); } break; - + case KCASTLE: if (m->piece.color == WHITE) { win_erasepiece(7, 4, WHITE); diff --git a/gnu/games/chess/Xchess/jail.c b/gnu/games/chess/Xchess/jail.c index e5e6064..b3ed391 100644 --- a/gnu/games/chess/Xchess/jail.c +++ b/gnu/games/chess/Xchess/jail.c @@ -20,8 +20,8 @@ file named COPYING. Among other things, the copyright notice and this notice must be preserved on all copies. */ -/* RCS Info: $Revision: 1.3 $ on $Date: 86/11/26 12:09:54 $ - * $Source: /users/faustus/xchess/RCS/jail.c,v $ +/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:12 $ + * $Source: /home/ncvs/src/gnu/games/chess/Xchess/jail.c,v $ * Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group * Permission is granted to do anything with this code except sell it * or remove this message. @@ -82,7 +82,7 @@ jail_draw(win) win->textcolor.pixel); XSetBackground(win->display, DefaultGC(win->display, 0), win->textback.pixel); - + XDrawImageString(win->display, win->jailwin, DefaultGC(win->display, 0), (JAIL_WIDTH - i) / 2, 20, JAIL_HEADER, @@ -96,7 +96,7 @@ jail_draw(win) FillSolid); XSetFunction(win->display, DefaultGC(win->display, 0), GXcopy); - + for (i = 0; i < 16; i++) if (pos[i]) { p.color = WHITE; @@ -105,7 +105,7 @@ jail_draw(win) tmpPM = XCreateBitmapFromData(win->display, win->jailwin, bits, 32, 32); - + XCopyPlane(win->display, tmpPM, win->jailwin, DefaultGC(win->display, 0), 0, 0, 32, 32, @@ -127,7 +127,7 @@ jail_draw(win) tmpPM = XCreateBitmapFromData(win->display, win->jailwin, bits, 32, 32); - + XCopyPlane(win->display, tmpPM, win->jailwin, DefaultGC(win->display, 0), 0, 0, 32, 32, @@ -151,7 +151,7 @@ jail_add(p) int i = piecepos(p, false); char *bits; Pixmap tmpPM; - + pos[i] = true; bits = bitsget(p); @@ -165,14 +165,14 @@ jail_add(p) tmpPM = XCreateBitmapFromData(win1->display, win1->jailwin, bits, 32, 32); - + XCopyPlane(win1->display, tmpPM, win1->jailwin, DefaultGC(win1->display, 0), 0, 0, 32, 32, 5 + (i % 8) * 32, ((i >= 16) ? 30 : 25) + (i / 8) * 32, 1); XFreePixmap(win1->display, tmpPM); - + if (!oneboard) { XSetState(win2->display, DefaultGC(win2->display, 0), win2->blackpiece.pixel, @@ -184,7 +184,7 @@ jail_add(p) tmpPM = XCreateBitmapFromData(win2->display, win2->jailwin, bits, 32, 32); - + XCopyPlane(win2->display, tmpPM, win2->jailwin, DefaultGC(win2->display, 0), 0, 0, 32, 32, diff --git a/gnu/games/chess/Xchess/message.c b/gnu/games/chess/Xchess/message.c index 8b85e9c..26df739 100644 --- a/gnu/games/chess/Xchess/message.c +++ b/gnu/games/chess/Xchess/message.c @@ -20,8 +20,8 @@ file named COPYING. Among other things, the copyright notice and this notice must be preserved on all copies. */ -/* RCS Info: $Revision: 1.4 $ on $Date: 86/11/26 12:10:22 $ - * $Source: /users/faustus/xchess/RCS/message.c,v $ +/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:14 $ + * $Source: /home/ncvs/src/gnu/games/chess/Xchess/message.c,v $ * Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group * Permission is granted to do anything with this code except sell it * or remove this message. @@ -38,7 +38,7 @@ void message_init(win) windata *win; { - TxtGrab(win->display, win->messagewin, "xchess", win->medium, + TxtGrab(win->display, win->messagewin, "xchess", win->medium, win->textback.pixel, win->textcolor.pixel, win->cursorcolor.pixel); TxtAddFont(win->display, win->messagewin, 1, win->large, win->textcolor.pixel); diff --git a/gnu/games/chess/Xchess/parse.c b/gnu/games/chess/Xchess/parse.c index c66cc38..2dd94ed 100644 --- a/gnu/games/chess/Xchess/parse.c +++ b/gnu/games/chess/Xchess/parse.c @@ -19,8 +19,8 @@ file named COPYING. Among other things, the copyright notice and this notice must be preserved on all copies. */ -/* RCS Info: $Revision: 1.2 $ on $Date: 86/11/23 17:17:59 $ - * $Source: /users/faustus/xchess/RCS/parse.c,v $ +/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:06 $ + * $Source: /home/ncvs/src/gnu/games/chess/Xchess/parse.c,v $ * Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group * Permission is granted to do anything with this code except sell it * or remove this message. @@ -71,7 +71,7 @@ load_game(file) message_add(win1, buf, false); if (!oneboard) message_add(win2, buf, false); - + fgets(buf, BSIZE, fp); if (eq(buf, "\tenglish\n")) eflag = true; @@ -106,7 +106,7 @@ load_game(file) while (fgets(buf, BSIZE, fp)) message_add(win1, buf, false); - + fclose(fp); return; @@ -179,7 +179,7 @@ parse_file(fp, b, english) * name followed by a row number. If the column name is kr, kn, kb, k, q, * qb, qn, or qr, then the row number is according to the english system, * or if it is a-h then it is according to the international system. - * + * *** As of now the spec must include the position. */ @@ -380,7 +380,7 @@ if (debug) fprintf(stderr, "(alg) parsing %s\n", buf); else if ((m->piece.type == KING) && (m->fromy == m->toy) && (m->fromx == 4) && (m->tox == 2)) m->type = QCASTLE; - + return (m); } diff --git a/gnu/games/chess/Xchess/popup.c b/gnu/games/chess/Xchess/popup.c index 2e19ee5..0995638 100644 --- a/gnu/games/chess/Xchess/popup.c +++ b/gnu/games/chess/Xchess/popup.c @@ -20,9 +20,9 @@ file named COPYING. Among other things, the copyright notice and this notice must be preserved on all copies. */ -/* RCS Info: $Revision: 1.2 $ on $Date: 86/11/26 12:10:38 $ - * $Source: /users/faustus/xchess/RCS/popup.c,v $ - * Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group +/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:13 $ + * $Source: /home/ncvs/src/gnu/games/chess/Xchess/popup.c,v $ + * Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group * faustus@cad.berkeley.edu, ucbvax!faustus * Permission is granted to modify and re-distribute this code in any manner * as long as this notice is preserved. All standard disclaimers apply. @@ -75,7 +75,7 @@ pop_question(win, text) XMapRaised(win->display, w); XSetFont(win->display, DefaultGC(win->display, 0), win->medium->fid); - + for (i = 0, s = text; i < nlines - 4; i++) { for (t = s, j = 0; *t && (*t != '\n'); t++, j++) ; diff --git a/gnu/games/chess/Xchess/program.c b/gnu/games/chess/Xchess/program.c index c1ec0ac..e2eb186 100644 --- a/gnu/games/chess/Xchess/program.c +++ b/gnu/games/chess/Xchess/program.c @@ -20,7 +20,7 @@ file named COPYING. Among other things, the copyright notice and this notice must be preserved on all copies. */ -/* RCS Info: $Revision: 1.2 $ on $Date: 1994/01/07 11:10:40 $ +/* RCS Info: $Revision: 1.3 $ on $Date: 1994/11/04 02:11:30 $ * $Source: /home/ncvs/src/gnu/games/chess/Xchess/program.c,v $ * Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group * Permission is granted to do anything with this code except sell it @@ -62,7 +62,7 @@ program_init(name) sprintf (moves, "%d", movesperunit); if (proghost) execl("/usr/ucb/rsh", "rsh", proghost, name, - moves, time, + moves, time, (char *) NULL); else execl(name, name, moves, time, (char *) NULL); diff --git a/gnu/games/chess/Xchess/record.c b/gnu/games/chess/Xchess/record.c index d9459b3..b2fcea1 100644 --- a/gnu/games/chess/Xchess/record.c +++ b/gnu/games/chess/Xchess/record.c @@ -20,8 +20,8 @@ file named COPYING. Among other things, the copyright notice and this notice must be preserved on all copies. */ -/* RCS Info: $Revision: 1.4 $ on $Date: 86/11/23 17:18:20 $ - * $Source: /users/faustus/xchess/RCS/record.c,v $ +/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:09 $ + * $Source: /home/ncvs/src/gnu/games/chess/Xchess/record.c,v $ * Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group * Permission is granted to do anything with this code except sell it * or remove this message. @@ -56,7 +56,7 @@ record_init(win) i = XTextWidth(win->medium, RECORD_HEADER, sizeof(RECORD_HEADER) - 1); i = (40 * win->small->max_bounds.width - i * - win->medium->max_bounds.width) / + win->medium->max_bounds.width) / win->medium->max_bounds.width / 2; TxtGrab(win->display, win->recwin, "xchess", win->small, win->textback.pixel, win->textcolor.pixel, win->cursorcolor.pixel); @@ -64,7 +64,7 @@ record_init(win) for (; i > 0; i++) TxtWriteStr(win->display, win->recwin, " "); TxtWriteStr(win->display, win->recwin, RECORD_HEADER); - + if (saveflag) { if (!(backup = fopen(record_file, "w"))) { perror(record_file); @@ -72,7 +72,7 @@ record_init(win) } else { fprintf(backup, "X Chess -- %s\n", datestring()); if (dispname2) - fprintf(backup, "\tWhite on %s, black on %s\n", + fprintf(backup, "\tWhite on %s, black on %s\n", dispname1, dispname2); else fprintf(backup, "\tGame played on %s\n", @@ -136,7 +136,7 @@ record_save() } fprintf(fp, "X Chess -- %s\n", datestring()); if (dispname2) - fprintf(fp, "\tWhite on %s, black on %s\n", + fprintf(fp, "\tWhite on %s, black on %s\n", dispname1, dispname2); else fprintf(fp, "\tGame played on %s\n", dispname1); @@ -201,7 +201,7 @@ record_back() s = buf; for (i = 0; *s != '\0'; i++) *s++ = ''; /* control H, backspace */ - + TxtWriteStr(win1->display, win1->recwin, buf); if (!oneboard) { TxtWriteStr(win2->display, win2->recwin, buf); @@ -279,9 +279,9 @@ movestring(m) sprintf(buf, "something strange"); break; } - if ((m->piece.type == PAWN) && (((m->piece.color == BLACK) && + if ((m->piece.type == PAWN) && (((m->piece.color == BLACK) && (m->toy == 7)) || ((m->piece.color == WHITE) && - (m->toy == 0)))) + (m->toy == 0)))) strcat(buf, "(Q)"); #ifdef smartass diff --git a/gnu/games/chess/Xchess/scrollText.c b/gnu/games/chess/Xchess/scrollText.c index ace88a7..b8484dd 100644 --- a/gnu/games/chess/Xchess/scrollText.c +++ b/gnu/games/chess/Xchess/scrollText.c @@ -1,7 +1,7 @@ /* * A Scrollable Text Output Window * - * David Harrison + * David Harrison * University of California, Berkeley * 1986 * @@ -204,7 +204,7 @@ int bg, fg, cur; /* Background, foreground, and cursor colors */ XWindowAttributes winInfo; /* Window information */ int index; XGCValues gc_val; - + if (textWindows == (XAssocTable *) 0) { textWindows = XCreateAssocTable(32); if (textWindows == (XAssocTable *) 0) return(0); @@ -259,7 +259,7 @@ int bg, fg, cur; /* Background, foreground, and cursor colors */ winInfo.width - BARSIZE, 0, BARSIZE - (2*BARBORDER), winInfo.height - (2*BARBORDER), - BARBORDER, + BARBORDER, fg, bg); XSelectInput(display, newWin->scrollBar, ExposureMask|ButtonReleaseMask); XMapRaised(display, newWin->scrollBar); @@ -302,7 +302,7 @@ int bg, fg, cur; /* Background, foreground, and cursor colors */ newWin->fontGC[index] = 0; } - + /* Initialize size of first line */ newWin->txtBuffer[0]->lineHeight = newWin->theFonts[0].ascent + newWin->theFonts[0].descent; @@ -391,7 +391,7 @@ struct txtWin *textInfo; /* Text window information */ (startPos > 0) && (textInfo->mainBuffer[startPos] != '\n'); startPos--) /* null loop body */; - + /* Clear out the old line start array */ for (index = 0; index < textInfo->numLines; index++) { InitLine(textInfo->txtBuffer[index]); @@ -411,7 +411,7 @@ struct txtWin *textInfo; /* Text window information */ curfont = 0; for (index = 0; index < textInfo->bufSpot; index++) { theChar = bufptr[index] & CHARMASK; - + if ((bufptr[index] & FONTMASK) != curfont) { int newFontNum, heightDiff; @@ -503,7 +503,7 @@ int newColor; /* Color of font */ struct txtWin *textInfo; int redrawFlag; XGCValues gc_val; - + if ((fontNumber < 0) || (fontNumber >= MAXFONTS)) return 0; if ((textInfo = (struct txtWin *) XLookUpAssoc(display, textWindows, (XID) textWin)) == 0) @@ -518,7 +518,7 @@ int newColor; /* Color of font */ gc_val.plane_mask = AllPlanes; gc_val.graphics_exposures = 1; gc_val.function = GXcopy; - + if (textInfo->fontGC[fontNumber] != 0) { XChangeGC(display, textInfo->fontGC[fontNumber], @@ -532,7 +532,7 @@ int newColor; /* Color of font */ GCFunction | GCPlaneMask | GCGraphicsExposures, - &gc_val); + &gc_val); redrawFlag = (textInfo->theFonts[fontNumber].fid != 0) && @@ -622,7 +622,7 @@ struct txtWin *textInfo; /* Text window information */ if (bottom == textInfo->h-(2*BARBORDER)) bottom--; XFillRectangle(display, textInfo->scrollBar, - textInfo->bgGC, + textInfo->bgGC, 0, 0, BARSIZE, top-1); #ifdef __FreeBSD__ XFillRectangle(display, textInfo->scrollBar, @@ -648,7 +648,7 @@ Display *display; Window w; /* * This routine clears a scrollable text window. It resets the current - * writing position to the upper left hand corner of the screen. + * writing position to the upper left hand corner of the screen. * NOTE: THIS ALSO CLEARS THE CONTENTS OF THE TEXT WINDOW BUFFER AND * RESETS THE SCROLL BAR. Returns 0 if the window is not a text window. * This should be used *instead* of XClear. @@ -674,7 +674,7 @@ Window w; textInfo->endLine = 0; textInfo->curLine = 0; textInfo->curX = 0; - textInfo->curY = YPADDING + textInfo->theFonts[textInfo->curFont].ascent + textInfo->curY = YPADDING + textInfo->theFonts[textInfo->curFont].ascent + textInfo->theFonts[textInfo->curFont].descent; textInfo->bottomSpace = textInfo->h - YPADDING - @@ -1119,7 +1119,7 @@ int ypos; /* Y position for line */ curX += CharSize(textInfo, lineIndex, index); glyph++; } - + /* Flush out the glyphs */ XFillRectangle(display, textInfo->mainWindow, textInfo->bgGC, @@ -1191,7 +1191,7 @@ int flagWord; /* DODISP or nothing */ if ((textInfo->curY + thisLine->lineHeight + heightDiff + INTERLINE) > textInfo->h) { - /* + /* * General approach: "unscroll" the last line up * and then call ScrollDown to do the right thing. */ @@ -1210,7 +1210,7 @@ int flagWord; /* DODISP or nothing */ (textInfo->bottomSpace + INTERLINE + thisLine->lineHeight); } - else + else { /* Just update bottom space */ textInfo->bottomSpace -= heightDiff; @@ -1251,7 +1251,7 @@ register char *str; /* 0 terminated string */ * - A new font can be chosen using the sequence '^F<digit>' where * <digit> is 0-7. The directive will be ignored if * there is no font in the specified slot. - * Returns 0 if something went wrong. + * Returns 0 if something went wrong. */ { register int fontIndex; @@ -1260,7 +1260,7 @@ register char *str; /* 0 terminated string */ if ((textInfo = (struct txtWin *) XLookUpAssoc(display, textWindows, (XID) w)) == 0) return 0; - + /* See if screen needs to be updated */ if (textInfo->flagWord & SCREENWRONG) { TxtRepaint(display, textInfo->mainWindow); @@ -1292,7 +1292,7 @@ register char *str; /* 0 terminated string */ continue; } } - + /* Inline code for handling normal character case */ if ((*str >= LOWCHAR) && (*str <= HIGHCHAR)) { register XFontStruct *thisFont; @@ -1324,21 +1324,21 @@ register char *str; /* 0 terminated string */ HandleNewLine(display, textInfo, DODISP | NONEWLINE); thisLine = textInfo->txtBuffer[textInfo->curLine]; } - + /* Ready to draw character */ XDrawString(display, textInfo->mainWindow, - DEFAULT_GC, + DEFAULT_GC, textInfo->curX += charWidth, - textInfo->curY + thisLine->lineHeight, + textInfo->curY + thisLine->lineHeight, str, 1); - + /* Append character onto main buffer */ if (textInfo->bufSpot >= textInfo->bufAlloc) /* Make room for more characters */ ExpandBuffer(textInfo); textInfo->mainBuffer[(textInfo->bufSpot)++] = (textInfo->curFont << FONTSHIFT) | (*str); - + /* Update the line start array */ thisLine->lineLength += 1; thisLine->lineWidth += charWidth; @@ -1384,7 +1384,7 @@ register char *str; /* NULL terminated string */ if ((textInfo = (struct txtWin *) XLookUpAssoc(display, textWindows, (XID) w) ) == 0) return 0; - + for ( /* str is ok */ ; (*str != 0) ; str++) { /* Check to see if we are waiting on a font */ if (textInfo->flagWord & FONTNUMWAIT) { @@ -1402,7 +1402,7 @@ register char *str; /* NULL terminated string */ register XFontStruct *thisFont; register struct txtLine *thisLine; register int charWidth; - + /* Determine size of character */ thisFont = &(textInfo->theFonts[textInfo->curFont]); @@ -1429,7 +1429,7 @@ register char *str; /* NULL terminated string */ ExpandBuffer(textInfo); textInfo->mainBuffer[(textInfo->bufSpot)++] = (textInfo->curFont << FONTSHIFT) | (*str); - + /* Update the line start array */ thisLine->lineLength += 1; thisLine->lineWidth += charWidth; @@ -1455,7 +1455,7 @@ Display *display; Window w; /* * Repaints the given scrollable text window. The routine repaints - * the entire window. For handling exposure events, the TxtFilter + * the entire window. For handling exposure events, the TxtFilter * routine should be used. */ { @@ -1589,7 +1589,7 @@ struct txtWin *textInfo; /* Text window information */ 0, textInfo->h - textInfo->bottomSpace, textInfo->w, textInfo->bottomSpace); #endif - + UpdateExposures(display, textInfo); UpdateScroll(display, textInfo); @@ -1774,7 +1774,7 @@ XEvent *evt; return 0; if ((textInfo = (struct txtWin *) - XLookUpAssoc(display, textWindows, (XID) w)) == 0) + XLookUpAssoc(display, textWindows, (XID) w)) == 0) return 0; /* Determine whether it's main window or not */ diff --git a/gnu/games/chess/Xchess/scrollText/scrollText.c b/gnu/games/chess/Xchess/scrollText/scrollText.c index 4320710..aefb599 100644 --- a/gnu/games/chess/Xchess/scrollText/scrollText.c +++ b/gnu/games/chess/Xchess/scrollText/scrollText.c @@ -1,7 +1,7 @@ /* * A Scrollable Text Output Window * - * David Harrison + * David Harrison * University of California, Berkeley * 1986 * @@ -204,7 +204,7 @@ int bg, fg, cur; /* Background, foreground, and cursor colors */ XWindowAttributes winInfo; /* Window information */ int index; XGCValues gc_val; - + if (textWindows == (XAssocTable *) 0) { textWindows = XCreateAssocTable(32); if (textWindows == (XAssocTable *) 0) return(0); @@ -259,7 +259,7 @@ int bg, fg, cur; /* Background, foreground, and cursor colors */ winInfo.width - BARSIZE, 0, BARSIZE - (2*BARBORDER), winInfo.height - (2*BARBORDER), - BARBORDER, + BARBORDER, fg, bg); XSelectInput(display, newWin->scrollBar, ExposureMask|ButtonReleaseMask); XMapRaised(display, newWin->scrollBar); @@ -302,7 +302,7 @@ int bg, fg, cur; /* Background, foreground, and cursor colors */ newWin->fontGC[index] = 0; } - + /* Initialize size of first line */ newWin->txtBuffer[0]->lineHeight = newWin->theFonts[0].ascent + newWin->theFonts[0].descent; @@ -391,7 +391,7 @@ struct txtWin *textInfo; /* Text window information */ (startPos > 0) && (textInfo->mainBuffer[startPos] != '\n'); startPos--) /* null loop body */; - + /* Clear out the old line start array */ for (index = 0; index < textInfo->numLines; index++) { InitLine(textInfo->txtBuffer[index]); @@ -411,7 +411,7 @@ struct txtWin *textInfo; /* Text window information */ curfont = 0; for (index = 0; index < textInfo->bufSpot; index++) { theChar = bufptr[index] & CHARMASK; - + if ((bufptr[index] & FONTMASK) != curfont) { int newFontNum, heightDiff; @@ -503,7 +503,7 @@ int newColor; /* Color of font */ struct txtWin *textInfo; int redrawFlag; XGCValues gc_val; - + if ((fontNumber < 0) || (fontNumber >= MAXFONTS)) return 0; if ((textInfo = (struct txtWin *) XLookUpAssoc(display, textWindows, (XID) textWin)) == 0) @@ -518,7 +518,7 @@ int newColor; /* Color of font */ gc_val.plane_mask = AllPlanes; gc_val.graphics_exposures = 1; gc_val.function = GXcopy; - + if (textInfo->fontGC[fontNumber] != 0) { XChangeGC(display, textInfo->fontGC[fontNumber], @@ -532,7 +532,7 @@ int newColor; /* Color of font */ GCFunction | GCPlaneMask | GCGraphicsExposures, - &gc_val); + &gc_val); redrawFlag = (textInfo->theFonts[fontNumber].fid != 0) && @@ -622,7 +622,7 @@ struct txtWin *textInfo; /* Text window information */ if (bottom == textInfo->h-(2*BARBORDER)) bottom--; XFillRectangle(display, textInfo->scrollBar, - textInfo->bgGC, + textInfo->bgGC, 0, 0, BARSIZE, top-1); XFillRectangle(display, textInfo->scrollBar, DEFAULT_GC, top, BARSIZE - (2*BARBORDER) - 2, @@ -642,7 +642,7 @@ Display *display; Window w; /* * This routine clears a scrollable text window. It resets the current - * writing position to the upper left hand corner of the screen. + * writing position to the upper left hand corner of the screen. * NOTE: THIS ALSO CLEARS THE CONTENTS OF THE TEXT WINDOW BUFFER AND * RESETS THE SCROLL BAR. Returns 0 if the window is not a text window. * This should be used *instead* of XClear. @@ -668,7 +668,7 @@ Window w; textInfo->endLine = 0; textInfo->curLine = 0; textInfo->curX = 0; - textInfo->curY = YPADDING + textInfo->theFonts[textInfo->curFont].ascent + textInfo->curY = YPADDING + textInfo->theFonts[textInfo->curFont].ascent + textInfo->theFonts[textInfo->curFont].descent; textInfo->bottomSpace = textInfo->h - YPADDING - @@ -1106,7 +1106,7 @@ int ypos; /* Y position for line */ curX += CharSize(textInfo, lineIndex, index); glyph++; } - + /* Flush out the glyphs */ XFillRectangle(display, textInfo->mainWindow, textInfo->bgGC, @@ -1178,7 +1178,7 @@ int flagWord; /* DODISP or nothing */ if ((textInfo->curY + thisLine->lineHeight + heightDiff + INTERLINE) > textInfo->h) { - /* + /* * General approach: "unscroll" the last line up * and then call ScrollDown to do the right thing. */ @@ -1197,7 +1197,7 @@ int flagWord; /* DODISP or nothing */ (textInfo->bottomSpace + INTERLINE + thisLine->lineHeight); } - else + else { /* Just update bottom space */ textInfo->bottomSpace -= heightDiff; @@ -1238,7 +1238,7 @@ register char *str; /* 0 terminated string */ * - A new font can be chosen using the sequence '^F<digit>' where * <digit> is 0-7. The directive will be ignored if * there is no font in the specified slot. - * Returns 0 if something went wrong. + * Returns 0 if something went wrong. */ { register int fontIndex; @@ -1247,7 +1247,7 @@ register char *str; /* 0 terminated string */ if ((textInfo = (struct txtWin *) XLookUpAssoc(display, textWindows, (XID) w)) == 0) return 0; - + /* See if screen needs to be updated */ if (textInfo->flagWord & SCREENWRONG) { TxtRepaint(display, textInfo->mainWindow); @@ -1279,7 +1279,7 @@ register char *str; /* 0 terminated string */ continue; } } - + /* Inline code for handling normal character case */ if ((*str >= LOWCHAR) && (*str <= HIGHCHAR)) { register XFontStruct *thisFont; @@ -1311,21 +1311,21 @@ register char *str; /* 0 terminated string */ HandleNewLine(display, textInfo, DODISP | NONEWLINE); thisLine = textInfo->txtBuffer[textInfo->curLine]; } - + /* Ready to draw character */ XDrawString(display, textInfo->mainWindow, - DEFAULT_GC, + DEFAULT_GC, textInfo->curX += charWidth, - textInfo->curY + thisLine->lineHeight, + textInfo->curY + thisLine->lineHeight, str, 1); - + /* Append character onto main buffer */ if (textInfo->bufSpot >= textInfo->bufAlloc) /* Make room for more characters */ ExpandBuffer(textInfo); textInfo->mainBuffer[(textInfo->bufSpot)++] = (textInfo->curFont << FONTSHIFT) | (*str); - + /* Update the line start array */ thisLine->lineLength += 1; thisLine->lineWidth += charWidth; @@ -1371,7 +1371,7 @@ register char *str; /* NULL terminated string */ if ((textInfo = (struct txtWin *) XLookUpAssoc(display, textWindows, (XID) w) ) == 0) return 0; - + for ( /* str is ok */ ; (*str != 0) ; str++) { /* Check to see if we are waiting on a font */ if (textInfo->flagWord & FONTNUMWAIT) { @@ -1389,7 +1389,7 @@ register char *str; /* NULL terminated string */ register XFontStruct *thisFont; register struct txtLine *thisLine; register int charWidth; - + /* Determine size of character */ thisFont = &(textInfo->theFonts[textInfo->curFont]); @@ -1416,7 +1416,7 @@ register char *str; /* NULL terminated string */ ExpandBuffer(textInfo); textInfo->mainBuffer[(textInfo->bufSpot)++] = (textInfo->curFont << FONTSHIFT) | (*str); - + /* Update the line start array */ thisLine->lineLength += 1; thisLine->lineWidth += charWidth; @@ -1442,7 +1442,7 @@ Display *display; Window w; /* * Repaints the given scrollable text window. The routine repaints - * the entire window. For handling exposure events, the TxtFilter + * the entire window. For handling exposure events, the TxtFilter * routine should be used. */ { @@ -1570,7 +1570,7 @@ struct txtWin *textInfo; /* Text window information */ XClearArea(display, textInfo->mainWindow, 0, textInfo->h - textInfo->bottomSpace, textInfo->w, textInfo->bottomSpace); - + UpdateExposures(display, textInfo); UpdateScroll(display, textInfo); @@ -1755,7 +1755,7 @@ XEvent *evt; return 0; if ((textInfo = (struct txtWin *) - XLookUpAssoc(display, textWindows, (XID) w)) == 0) + XLookUpAssoc(display, textWindows, (XID) w)) == 0) return 0; /* Determine whether it's main window or not */ diff --git a/gnu/games/chess/Xchess/std.c b/gnu/games/chess/Xchess/std.c index 1aa9e83..2bbd113 100644 --- a/gnu/games/chess/Xchess/std.c +++ b/gnu/games/chess/Xchess/std.c @@ -20,7 +20,7 @@ file named COPYING. Among other things, the copyright notice and this notice must be preserved on all copies. */ -/* RCS Info: $Revision: 1.2 $ on $Date: 1994/01/07 11:10:42 $ +/* RCS Info: $Revision: 1.3 $ on $Date: 1994/11/04 02:11:33 $ * $Source: /home/ncvs/src/gnu/games/chess/Xchess/std.c,v $ * Copyright (c) 1985 Wayne A. Christopher, U. C. Berkeley CAD Group * @@ -62,7 +62,7 @@ copy(str) char *str; { char *p, *tmalloc(); - + p = tmalloc(strlen(str) + 1); strcpy(p, str); return(p); @@ -90,7 +90,7 @@ substring(sub, str) } /* Malloc num bytes and initialize to zero. Fatal error if the space can't - * be malloc'd. + * be malloc'd. */ char * @@ -375,7 +375,7 @@ setenv(name, value) environ = xx; } else xx = environ; - + xx[i] = tmalloc(strlen(name) + strlen(value) + 2); sprintf(xx[i], "%s=%s", name, value); return; diff --git a/gnu/games/chess/Xchess/valid.c b/gnu/games/chess/Xchess/valid.c index 3dcdb00..06d1f29 100644 --- a/gnu/games/chess/Xchess/valid.c +++ b/gnu/games/chess/Xchess/valid.c @@ -20,8 +20,8 @@ file named COPYING. Among other things, the copyright notice and this notice must be preserved on all copies. */ -/* RCS Info: $Revision: 1.3 $ on $Date: 86/11/23 17:18:35 $ - * $Source: /users/faustus/xchess/RCS/valid.c,v $ +/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:08 $ + * $Source: /home/ncvs/src/gnu/games/chess/Xchess/valid.c,v $ * Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group * Permission is granted to do anything with this code except sell it * or remove this message. @@ -49,10 +49,10 @@ valid_move(m, b) board_move(&tb, m); if (ischeck(&tb, m->piece.color)) return (false); - + if (ischeck(&tb, ((m->piece.color == WHITE) ? BLACK : WHITE))) m->check = true; - + return (true); } @@ -66,7 +66,7 @@ couldmove(m, b) switch (m->type) { case KCASTLE: if ((m->piece.color == WHITE) && (b->white_cant_castle_k) || - (m->piece.color == BLACK) && + (m->piece.color == BLACK) && (b->black_cant_castle_k)) return (false); if ((b->square[m->fromy][5].color != NONE) || @@ -78,7 +78,7 @@ couldmove(m, b) case QCASTLE: if ((m->piece.color == WHITE) && (b->white_cant_castle_q) || - (m->piece.color == BLACK) && + (m->piece.color == BLACK) && (b->black_cant_castle_q)) return (false); if ((b->square[m->fromy][1].color != NONE) || @@ -129,7 +129,7 @@ couldmove(m, b) */ if (m->enpassant) { if (b->square[(m->piece.color == WHITE) - ? 3 : 4][m->tox].color == + ? 3 : 4][m->tox].color == ((m->piece.color == WHITE) ? BLACK : WHITE)) break; diff --git a/gnu/games/chess/Xchess/window.c b/gnu/games/chess/Xchess/window.c index 4aae06d..c33ef81 100644 --- a/gnu/games/chess/Xchess/window.c +++ b/gnu/games/chess/Xchess/window.c @@ -19,8 +19,8 @@ file named COPYING. Among other things, the copyright notice and this notice must be preserved on all copies. */ -/* RCS Info: $Revision: 1.5 $ on $Date: 86/11/26 12:11:15 $ - * $Source: /users/faustus/xchess/RCS/window.c,v $ +/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:08 $ + * $Source: /home/ncvs/src/gnu/games/chess/Xchess/window.c,v $ * Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group * Permission is granted to do anything with this code except sell it * or remove this message. @@ -89,7 +89,7 @@ win_setup(disp1, disp2) win2->flipped = true; win_drawboard(win2); } - + return(true); } @@ -199,7 +199,7 @@ win_drawpiece(p, y, x, wnum) XSetState(win->display, DefaultGC(win->display, 0), BlackPixel(win->display, 0), WhitePixel(win->display, 0), GXcopy, AllPlanes); - + tmpPM = XCreateBitmapFromData(win->display, win->boardwin, shade_bits, SQUARE_WIDTH, SQUARE_HEIGHT); @@ -209,7 +209,7 @@ win_drawpiece(p, y, x, wnum) y * (SQUARE_HEIGHT + BORDER_WIDTH), 1); XFreePixmap(win->display, tmpPM); - + XSetFunction(win->display, DefaultGC(win->display, 0), GXandInverted); maskPM = XCreateBitmapFromData(win->display, win->boardwin, @@ -268,16 +268,16 @@ win_drawpiece(p, y, x, wnum) gc.background = win->blacksquare.pixel; gc.font = win->small->fid; - + XChangeGC(win->display, DefaultGC(win->display, 0), GCForeground | GCBackground | GCFont, &gc); - + if (!x) { sprintf(buf, " %d", SIZE - y); XDrawImageString(win->display, win->boardwin, DefaultGC(win->display, 0), - 1, (y + 1) * (SQUARE_HEIGHT + - BORDER_WIDTH) - BORDER_WIDTH + + 1, (y + 1) * (SQUARE_HEIGHT + + BORDER_WIDTH) - BORDER_WIDTH + win->small->max_bounds.ascent - 1, buf, 2); } if (y == SIZE - 1) { @@ -285,7 +285,7 @@ win_drawpiece(p, y, x, wnum) XDrawImageString(win->display, win->boardwin, DefaultGC(win->display, 0), x * (SQUARE_WIDTH + BORDER_WIDTH) + 1, - SIZE * (SQUARE_HEIGHT + BORDER_WIDTH) - BORDER_WIDTH + + SIZE * (SQUARE_HEIGHT + BORDER_WIDTH) - BORDER_WIDTH + win->small->max_bounds.ascent - 1, buf, 1); } } @@ -301,12 +301,12 @@ win_erasepiece(y, x, wnum) char buf[BSIZE]; XGCValues gc; Pixmap tmpPM; - + if (oneboard || (wnum == win1->color)) win = win1; else win = win2; - + if (win->flipped) { y = SIZE - y - 1; x = SIZE - x - 1; @@ -354,16 +354,16 @@ win_erasepiece(y, x, wnum) gc.background = win->blacksquare.pixel; gc.font = win->small->fid; - + XChangeGC(win->display, DefaultGC(win->display, 0), GCForeground | GCBackground | GCFont, &gc); - + if (!x) { sprintf(buf, " %d", SIZE - y); XDrawImageString(win->display, win->boardwin, DefaultGC(win->display, 0), - 1, (y + 1) * (SQUARE_HEIGHT + - BORDER_WIDTH) - BORDER_WIDTH + + 1, (y + 1) * (SQUARE_HEIGHT + + BORDER_WIDTH) - BORDER_WIDTH + win->small->max_bounds.ascent - 1, buf, 2); } if (y == SIZE - 1) { @@ -371,11 +371,11 @@ win_erasepiece(y, x, wnum) XDrawImageString(win->display, win->boardwin, DefaultGC(win->display, 0), x * (SQUARE_WIDTH + BORDER_WIDTH) + 1, - SIZE * (SQUARE_HEIGHT + BORDER_WIDTH) - BORDER_WIDTH + + SIZE * (SQUARE_HEIGHT + BORDER_WIDTH) - BORDER_WIDTH + win->small->max_bounds.ascent - 1, buf, 1); } } - + return; } @@ -392,7 +392,7 @@ win_flash(m, wnum) win = win1; else win = win2; - + if (win->flipped) { sx = SIZE - m->fromx - 1; sy = SIZE - m->fromy - 1; @@ -417,7 +417,7 @@ win_flash(m, wnum) DefaultGC(win->display, 0), sx, sy, ex, ey); } - + XSetFunction(win->display, DefaultGC(win->display, 0), GXcopy); return; } @@ -598,7 +598,7 @@ win_redraw(win, event) x2 = SIZE - x1 - 1; } - for (i = x1; i <= x2; i++) + for (i = x1; i <= x2; i++) for (j = y1; j <= y2; j++) { if (chessboard->square[j][i].color == NONE) win_erasepiece(j, i, WHITE); @@ -613,7 +613,7 @@ win_redraw(win, event) j, i, BLACK); } } - + return; } @@ -627,11 +627,11 @@ setup(dispname, win) Cursor cur; extern char *program, *recfile; XSizeHints xsizes; - + if (!(win->display = XOpenDisplay(dispname))) return (false); - + /* Now get boolean defaults... */ if ((s = XGetDefault(win->display, program, "noisy")) && eq(s, "on")) @@ -646,13 +646,13 @@ setup(dispname, win) quickflag = true; if ((s = XGetDefault(win->display, program, "flash")) && eq(s, "on")) win_flashmove = true; - + /* ... numeric variables ... */ if (s = XGetDefault(win->display, program, "numflashes")) num_flashes = atoi(s); if (s = XGetDefault(win->display, program, "flashsize")) flash_size = atoi(s); - + /* ... and strings. */ if (s = XGetDefault(win->display, program, "progname")) progname = s; @@ -683,7 +683,7 @@ setup(dispname, win) if ((DisplayPlanes(win->display, 0) == 1) || bnwflag) win->bnw = true; - + /* Allocate colors... */ if (win->bnw) { win->blackpiece.pixel = BlackPixel (win->display, 0); @@ -699,64 +699,64 @@ setup(dispname, win) } else { if (!XParseColor(win->display, DefaultColormap(win->display, 0), - black_piece_color, &win->blackpiece) || + black_piece_color, &win->blackpiece) || !XParseColor(win->display, DefaultColormap(win->display, 0), - white_piece_color, &win->whitepiece) || + white_piece_color, &win->whitepiece) || !XParseColor(win->display, DefaultColormap(win->display, 0), - black_square_color, &win->blacksquare) || + black_square_color, &win->blacksquare) || !XParseColor(win->display, DefaultColormap(win->display, 0), - white_square_color, &win->whitesquare) || + white_square_color, &win->whitesquare) || !XParseColor(win->display, DefaultColormap(win->display, 0), - border_color, &win->border) || + border_color, &win->border) || !XParseColor(win->display, DefaultColormap(win->display, 0), - text_color, &win->textcolor) || + text_color, &win->textcolor) || !XParseColor(win->display, DefaultColormap(win->display, 0), - text_back, &win->textback) || + text_back, &win->textback) || !XParseColor(win->display, DefaultColormap(win->display, 0), - error_text, &win->errortext) || + error_text, &win->errortext) || !XParseColor(win->display, DefaultColormap(win->display, 0), - player_text, &win->playertext) || + player_text, &win->playertext) || !XParseColor(win->display, DefaultColormap(win->display, 0), cursor_color, &win->cursorcolor) || !XAllocColor(win->display, DefaultColormap(win->display, 0), - &win->blackpiece) || + &win->blackpiece) || !XAllocColor(win->display, DefaultColormap(win->display, 0), - &win->whitepiece) || + &win->whitepiece) || !XAllocColor(win->display, DefaultColormap(win->display, 0), - &win->blacksquare) || + &win->blacksquare) || !XAllocColor(win->display, DefaultColormap(win->display, 0), - &win->whitesquare) || + &win->whitesquare) || !XAllocColor(win->display, DefaultColormap(win->display, 0), - &win->border) || + &win->border) || !XAllocColor(win->display, DefaultColormap(win->display, 0), - &win->textcolor) || + &win->textcolor) || !XAllocColor(win->display, DefaultColormap(win->display, 0), - &win->textback) || + &win->textback) || !XAllocColor(win->display, DefaultColormap(win->display, 0), - &win->errortext) || + &win->errortext) || !XAllocColor(win->display, DefaultColormap(win->display, 0), - &win->playertext) || + &win->playertext) || !XAllocColor(win->display, DefaultColormap(win->display, 0), - &win->cursorcolor)) + &win->cursorcolor)) fprintf(stderr, "Can't get colors...\n"); } @@ -773,17 +773,17 @@ setup(dispname, win) NULL) fprintf(stderr, "Can't get large font...\n"); - + /* Create the windows... */ win->basewin = XCreateSimpleWindow(win->display,DefaultRootWindow(win->display), - BASE_XPOS, BASE_YPOS, + BASE_XPOS, BASE_YPOS, BASE_WIDTH, BASE_HEIGHT, 0, BlackPixel(win->display, 0), - WhitePixel(win->display, 0)); + WhitePixel(win->display, 0)); win->boardwin = XCreateSimpleWindow(win->display,win->basewin, - BOARD_XPOS, BOARD_YPOS, + BOARD_XPOS, BOARD_YPOS, BOARD_WIDTH, BOARD_HEIGHT, BORDER_WIDTH, win->border.pixel, @@ -819,7 +819,7 @@ setup(dispname, win) BUTTON_WIDTH, BUTTON_HEIGHT, BORDER_WIDTH, win->border.pixel, win->textback.pixel); - + /* Let's define an icon... */ win->iconpixmap = XCreatePixmapFromBitmapData(win->display, win->basewin, icon_bits, @@ -835,7 +835,7 @@ setup(dispname, win) XSetStandardProperties(win->display, win->basewin, program, program, win->iconpixmap, 0, NULL, &xsizes); - + bm = XCreateBitmapFromData(win->display, win->basewin, xchess_bits, xchess_width, xchess_height); @@ -848,7 +848,7 @@ setup(dispname, win) xchess_x_hot, xchess_y_hot); XFreePixmap(win->display, bm); XFreePixmap(win->display, bmask); - + XDefineCursor(win->display,win->basewin, cur); XMapSubwindows(win->display,win->basewin); @@ -866,7 +866,7 @@ setup(dispname, win) ButtonReleaseMask | ExposureMask); XSelectInput(win->display,win->buttonwin, ButtonPressMask | ExposureMask); - + message_init(win); record_init(win); button_draw(win); @@ -900,12 +900,12 @@ drawgrid(win) gc.foreground = win->border.pixel; gc.line_width = 0; gc.line_style = LineSolid; - + XChangeGC(win->display, DefaultGC(win->display, 0), GCFunction | GCPlaneMask | GCForeground | GCLineWidth | GCLineStyle, &gc); - + /* Draw the lines... horizontal, */ for (i = 1; i < SIZE; i++) XDrawLine(win->display, win->boardwin, @@ -923,7 +923,7 @@ drawgrid(win) i * (SQUARE_WIDTH + BORDER_WIDTH) - BORDER_WIDTH / 2, 0, i * (SQUARE_WIDTH + BORDER_WIDTH) - - BORDER_WIDTH / 2, + BORDER_WIDTH / 2, SIZE * (SQUARE_WIDTH + BORDER_WIDTH)); return; } diff --git a/gnu/games/chess/Xchess/xchess.c b/gnu/games/chess/Xchess/xchess.c index 6de6502..74d010f 100644 --- a/gnu/games/chess/Xchess/xchess.c +++ b/gnu/games/chess/Xchess/xchess.c @@ -20,8 +20,8 @@ file named COPYING. Among other things, the copyright notice and this notice must be preserved on all copies. */ -/* RCS Info: $Revision: 1.2 $ on $Date: 89/04/28 08:44:02 $ - * $Source: /usr/local/src/source/X.V11R3/contrib/games/xchess/Xchess/RCS/xchess.c,v $ +/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:09 $ + * $Source: /home/ncvs/src/gnu/games/chess/Xchess/xchess.c,v $ * Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group * Permission is granted to do anything with this code except sell it * or remove this message. @@ -82,7 +82,7 @@ main(ac, av) char *s; program = av[0]; - + #ifdef notdef signal(SIGCHLD, die); #endif @@ -157,7 +157,7 @@ main(ac, av) if (!dispname2) oneboard = true; - + srandom(getpid()); if (!oneboard && randflag && (random() % 2)) { @@ -165,10 +165,10 @@ main(ac, av) dispname1 = dispname2; dispname2 = s; } - + if (!dispname1) dispname1 = getenv("DISPLAY"); - + /* Set up the board. */ board_setup(); diff --git a/gnu/games/chess/gnuchess.c b/gnu/games/chess/gnuchess.c index da56689..20b32c4 100644 --- a/gnu/games/chess/gnuchess.c +++ b/gnu/games/chess/gnuchess.c @@ -1,5 +1,5 @@ /* - C source for CHESS + C source for CHESS Revision: 4-25-88 @@ -44,7 +44,7 @@ #define neutral 2 #define white 0 -#define black 1 +#define black 1 #define no_piece 0 #define pawn 1 #define knight 2 @@ -164,7 +164,7 @@ short unmap[120]= 40,41,42,43,44,45,46,47,-1,-1,-1,-1,-1,-1,-1,-1, 48,49,50,51,52,53,54,55,-1,-1,-1,-1,-1,-1,-1,-1, 56,57,58,59,60,61,62,63}; -short Dcode[120]= +short Dcode[120]= {0,1,1,1,1,1,1,1,0,0,0,0,0,0,0x0E,0x0F, 0x10,0x11,0x12,0,0,0,0,0,0,0,0,0,0,0,0x0F,0x1F, 0x10,0x21,0x11,0,0,0,0,0,0,0,0,0,0,0x0F,0,0, @@ -287,7 +287,7 @@ short PawnAdvance[64]= 12,16,24,32,32,24,16,12, 12,16,24,32,32,24,16,12, 0, 0, 0, 0, 0, 0, 0, 0}; - + main(argc,argv) int argc; char *argv[]; @@ -331,8 +331,8 @@ short iop; unsigned short *mv; /* - Compare the string 's' to the list of legal moves available for the - opponent. If a match is found, make the move on the board. + Compare the string 's' to the list of legal moves available for the + opponent. If a match is found, make the move on the board. */ { @@ -373,7 +373,7 @@ struct leaf *node; if (xnode.flags & epmask) UpdateDisplay(0,0,1,0); else UpdateDisplay(xnode.f,xnode.t,0,xnode.flags & cstlmask); if (xnode.flags & cstlmask) Game50 = GameCnt; - else if (board[xnode.t] == pawn || (xnode.flags & capture)) + else if (board[xnode.t] == pawn || (xnode.flags & capture)) Game50 = GameCnt; GameList[GameCnt].depth = GameList[GameCnt].score = 0; GameList[GameCnt].nodes = 0; @@ -384,7 +384,7 @@ struct leaf *node; *mv = (xnode.f << 8) + xnode.t; algbr(xnode.f,xnode.t,false); return(true); - } + } } if (cnt > 1) ShowMessage("Ambiguous Move!"); return(false); @@ -464,12 +464,12 @@ SelectMove(side,iop) short side,iop; /* - Select a move by calling function search() at progressively deeper - ply until time is up or a mate or draw is reached. An alpha-beta - window of -90 to +90 points is set around the score returned from the - previous iteration. If Sdepth != 0 then the program has correctly - predicted the opponents move and the search will start at a depth of - Sdepth+1 rather than a depth of 1. + Select a move by calling function search() at progressively deeper + ply until time is up or a mate or draw is reached. An alpha-beta + window of -90 to +90 points is set around the score returned from the + previous iteration. If Sdepth != 0 then the program has correctly + predicted the opponents move and the search will start at a depth of + Sdepth+1 rather than a depth of 1. */ { @@ -495,7 +495,7 @@ static short i,alpha,beta,score,tempb,tempc,tempsf,tempst,xside,rpt; ExaminePosition(); ScorePosition(side,&score); ShowSidetomove(); - + if (Sdepth == 0) { ZeroTTable(); @@ -516,7 +516,7 @@ static short i,alpha,beta,score,tempb,tempc,tempsf,tempst,xside,rpt; NodeCnt = ETnodes = EvalNodes = HashCnt = 0; Zscore = 0; zwndw = 20; } - + while (!timeout && Sdepth < MaxSearchDepth) { Sdepth++; @@ -576,7 +576,7 @@ static short i,alpha,beta,score,tempb,tempc,tempsf,tempst,xside,rpt; if (score == -9999 || score == 9998) mate = true; if (mate) hint = 0; if (root->flags & cstlmask) Game50 = GameCnt; - else if (board[root->t] == pawn || (root->flags & capture)) + else if (board[root->t] == pawn || (root->flags & capture)) Game50 = GameCnt; GameList[GameCnt].score = score; GameList[GameCnt].nodes = NodeCnt; @@ -599,13 +599,13 @@ static short i,alpha,beta,score,tempb,tempc,tempsf,tempst,xside,rpt; OpeningBook() /* - Go thru each of the opening lines of play and check for a match with - the current game listing. If a match occurs, generate a random number. - If this number is the largest generated so far then the next move in - this line becomes the current "candidate". After all lines are - checked, the candidate move is put at the top of the Tree[] array and - will be played by the program. Note that the program does not handle - book transpositions. + Go thru each of the opening lines of play and check for a match with + the current game listing. If a match occurs, generate a random number. + If this number is the largest generated so far then the next move in + this line becomes the current "candidate". After all lines are + checked, the candidate move is put at the top of the Tree[] array and + will be played by the program. Note that the program does not handle + book transpositions. */ { @@ -630,7 +630,7 @@ struct BookEntry *p; } p = p->next; } - + for (pnt = TrPnt[1]; pnt < TrPnt[2]; pnt++) if ((Tree[pnt].f<<8) + Tree[pnt].t == m) Tree[pnt].score = 0; pick(TrPnt[1],TrPnt[2]-1); @@ -658,12 +658,12 @@ short side,ply,depth,alpha,beta,*rpt; unsigned short bstline[]; /* - Perform an alpha-beta search to determine the score for the current - board position. If depth <= 0 only capturing moves, pawn promotions - and responses to check are generated and searched, otherwise all - moves are processed. The search depth is modified for check evasions, - certain re-captures and threats. Extensions may continue for up to 11 - ply beyond the nominal search depth. + Perform an alpha-beta search to determine the score for the current + board position. If depth <= 0 only capturing moves, pawn promotions + and responses to check are generated and searched, otherwise all + moves are processed. The search depth is modified for check evasions, + certain re-captures and threats. Extensions may continue for up to 11 + ply beyond the nominal search depth. */ #define prune (cf && score+node->score < alpha) @@ -683,7 +683,7 @@ struct leaf *node,tmp; NodeCnt++; xside = otherside[side]; if (depth < 0) depth = 0; - + if (ply <= Sdepth+3) repetition(rpt); else *rpt = 0; if (*rpt >= 2) return(0); @@ -693,7 +693,7 @@ struct leaf *node,tmp; bstline[ply] = 0; return(score); } - + if (depth > 0) { if (InChk || PawnThreat[ply-1] || ReCapture) ++depth; @@ -704,7 +704,7 @@ struct leaf *node,tmp; (InChk || PawnThreat[ply-1] || Threat[ply-1])) ++depth; else if (score <= beta && MateThreat) ++depth; } - + if (depth > 0 && hashflag && ply > 1) { ProbeTTable(side,depth,&alpha,&beta,&score); @@ -713,21 +713,21 @@ struct leaf *node,tmp; if (beta == -20000) return(score); if (alpha > beta) return(alpha); } - + if (Sdepth == 1) d = 7; else d = 11; if (ply > Sdepth+d || (depth < 1 && score > beta)) return(score); if (ply > 1) if (depth > 0) MoveList(side,ply); else CaptureList(side,xside,ply); - + if (TrPnt[ply] == TrPnt[ply+1]) return(score); - + cf = (depth < 1 && ply > Sdepth+1 && !ChkFlag[ply-2] && !slk); if (depth > 0) best = -12000; else best = score; if (best > alpha) alpha = best; - + for (pnt = pbst = TrPnt[ply]; pnt < TrPnt[ply+1] && best <= beta; pnt++) @@ -736,7 +736,7 @@ struct leaf *node,tmp; node = &Tree[pnt]; mv = (node->f << 8) + node->t; nxtline[ply+1] = 0; - + if (prune) break; if (ply == 1) UpdateSearchStatus; @@ -789,7 +789,7 @@ struct leaf *node,tmp; if (NodeCnt > ETnodes) ElapsedTime(0); if (timeout) return(-Tscore[ply-1]); } - + node = &Tree[pbst]; mv = (node->f<<8) + node->t; if (hashflag && ply <= Sdepth && *rpt == 0 && best == alpha) @@ -815,13 +815,13 @@ evaluate(side,xside,ply,alpha,beta) short side,xside,ply,alpha,beta; /* - Compute an estimate of the score by adding the positional score from - the previous ply to the material difference. If this score falls - inside a window which is 180 points wider than the alpha-beta window - (or within a 50 point window during quiescence search) call - ScorePosition() to determine a score, otherwise return the estimated - score. If one side has only a king and the other either has no pawns - or no pieces then the function ScoreLoneKing() is called. + Compute an estimate of the score by adding the positional score from + the previous ply to the material difference. If this score falls + inside a window which is 180 points wider than the alpha-beta window + (or within a 50 point window during quiescence search) call + ScorePosition() to determine a score, otherwise return the estimated + score. If one side has only a king and the other either has no pawns + or no pieces then the function ScoreLoneKing() is called. */ { @@ -832,14 +832,14 @@ short s,evflag; (mtl[black] == valueK && (pmtl[white] == 0 || emtl[white] == 0))); s = -Pscore[ply-1] + mtl[side] - mtl[xside]; s -= INCscore; - + if (slk) evflag = false; - else evflag = + else evflag = (ply == 1 || ply < Sdepth || ((ply == Sdepth+1 || ply == Sdepth+2) && (s > alpha-xwndw && s < beta+xwndw)) || (ply > Sdepth+2 && s >= alpha-25 && s <= beta+25)); - + if (evflag) { EvalNodes++; @@ -855,7 +855,7 @@ short s,evflag; InChk = SqAtakd(PieceList[side][0],xside); if (slk) ScoreLoneKing(side,&s); } - + Pscore[ply] = s - mtl[side] + mtl[xside]; if (InChk) ChkFlag[ply-1] = Pindex[TOsquare]; else ChkFlag[ply-1] = 0; @@ -867,7 +867,7 @@ short s,evflag; ProbeTTable(side,depth,alpha,beta,score) short side,depth,*alpha,*beta,*score; -/* +/* Look for the current board position in the transposition table. */ @@ -916,7 +916,7 @@ short hindx; ptbl = (ttable + hindx); ptbl->hashbd = hashbd; ptbl->depth = depth; - ptbl->score = score; + ptbl->score = score; ptbl->mv = mv; ptbl->flags = 0; if (score < alpha) ptbl->flags |= upperbound; @@ -941,10 +941,10 @@ MoveList(side,ply) short side,ply; /* - Fill the array Tree[] with all available moves for side to play. Array - TrPnt[ply] contains the index into Tree[] of the first move at a ply. + Fill the array Tree[] with all available moves for side to play. Array + TrPnt[ply] contains the index into Tree[] of the first move at a ply. */ - + { register short i; short xside,f; @@ -979,16 +979,16 @@ GenMoves(ply,sq,side,xside) short ply,sq,side,xside; /* - Generate moves for a piece. The from square is mapped onto a special - board and offsets (taken from array Dir[]) are added to the mapped - location. The newly generated square is tested to see if it falls off - the board by ANDing the square with 88 HEX. Legal moves are linked - into the tree. + Generate moves for a piece. The from square is mapped onto a special + board and offsets (taken from array Dir[]) are added to the mapped + location. The newly generated square is tested to see if it falls off + the board by ANDing the square with 88 HEX. Legal moves are linked + into the tree. */ - + { register short m,u,d; -short i,m0,piece; +short i,m0,piece; piece = board[sq]; m0 = map[sq]; if (sweep[piece]) @@ -1057,7 +1057,7 @@ short ply,f,t,xside; 2. Capture of last moved piece 3. Other captures (major pieces first) 4. Killer moves - 5. "history" killers + 5. "history" killers */ { @@ -1140,7 +1140,7 @@ struct leaf *node; } PL = PieceList[side]; for (i = 0; i <= PieceCnt[side]; i++) - { + { sq = PL[i]; m0 = map[sq]; piece = board[sq]; j1 = Dstart[piece]; j2 = Dstop[piece]; @@ -1176,7 +1176,7 @@ struct leaf *node; } } #endif - + int castle(side,kf,kt,iop) short side,kf,kt,iop; @@ -1244,7 +1244,7 @@ short l; { board[l] = no_piece; color[l] = neutral; } - else + else { board[l] = pawn; color[l] = xside; } @@ -1257,11 +1257,11 @@ short side,*tempc,*tempb,*tempsf,*tempst; struct leaf *node; /* - Update Arrays board[], color[], and Pindex[] to reflect the new board - position obtained after making the move pointed to by node. Also - update miscellaneous stuff that changes when a move is made. + Update Arrays board[], color[], and Pindex[] to reflect the new board + position obtained after making the move pointed to by node. Also + update miscellaneous stuff that changes when a move is made. */ - + { register short f,t; short xside,ct,cf; @@ -1323,7 +1323,7 @@ short xside,ct,cf; UpdateHashbd(side,queen,f,-1); } INCscore -= *tempsf; - } + } if (board[t] == king) ++kingmoved[side]; if (node->flags & epmask) EnPassant(xside,f,t,1); else if (hashflag) UpdateHashbd(side,board[t],f,t); @@ -1363,7 +1363,7 @@ short xside; UpdateHashbd(side,queen,-1,t); UpdateHashbd(side,pawn,-1,t); } - } + } if (*tempc != neutral) { UpdatePieceList(*tempc,t,2); @@ -1388,10 +1388,10 @@ UpdateHashbd(side,piece,f,t) short side,piece,f,t; /* - hashbd contains a 32 bit "signature" of the board position. hashkey - contains a 16 bit code used to address the hash table. When a move is - made, XOR'ing the hashcode of moved piece on the from and to squares - with the hashbd and hashkey values keeps things current. + hashbd contains a 32 bit "signature" of the board position. hashkey + contains a 16 bit code used to address the hash table. When a move is + made, XOR'ing the hashcode of moved piece on the from and to squares + with the hashbd and hashkey values keeps things current. */ { @@ -1412,8 +1412,8 @@ UpdatePieceList(side,sq,iop) short side,sq,iop; /* - Update the PieceList and Pindex arrays when a piece is captured or - when a capture is unmade. + Update the PieceList and Pindex arrays when a piece is captured or + when a capture is unmade. */ { @@ -1439,13 +1439,13 @@ register short i; InitializeStats() /* - Scan thru the board seeing what's on each square. If a piece is found, - update the variables PieceCnt, PawnCnt, Pindex and PieceList. Also - determine the material for each side and set the hashkey and hashbd - variables to represent the current board position. Array - PieceList[side][indx] contains the location of all the pieces of - either side. Array Pindex[sq] contains the indx into PieceList for a - given square. + Scan thru the board seeing what's on each square. If a piece is found, + update the variables PieceCnt, PawnCnt, Pindex and PieceList. Also + determine the material for each side and set the hashkey and hashbd + variables to represent the current board position. Array + PieceList[side][indx] contains the location of all the pieces of + either side. Array Pindex[sq] contains the indx into PieceList for a + given square. */ { @@ -1477,9 +1477,9 @@ register short i,sq; pick(p1,p2) short p1,p2; -/* - Find the best move in the tree between indexes p1 and p2. Swap the - best move into the p1 element. +/* + Find the best move in the tree between indexes p1 and p2. Swap the + best move into the p1 element. */ { @@ -1535,7 +1535,7 @@ short sq,side; /* See if any piece with color 'side' ataks sq. First check for pawns or king, then try other pieces. Array Dcode is used to check for - knight attacks or R,B,Q co-linearity. + knight attacks or R,B,Q co-linearity. */ { @@ -1550,7 +1550,7 @@ short i,m0,m1,loc,piece,*PL; if (!(m & 0x88)) if (board[unmap[m]] == pawn && color[unmap[m]] == side) return(true); if (distance(sq,PieceList[side][0]) == 1) return(true); - + PL = PieceList[side]; for (i = 1; i <= PieceCnt[side]; i++) { @@ -1584,7 +1584,7 @@ short side,*a; { register short u,m; short d,c,j,j1,j2,piece,i,m0,sq,*PL; - + /* memset((char *)a,0,64*sizeof(short)); */ @@ -1626,9 +1626,9 @@ ScorePosition(side,score) short side,*score; /* - Perform normal static evaluation of board position. A score is - generated for each piece and these are summed to get a score for each - side. + Perform normal static evaluation of board position. A score is + generated for each piece and these are summed to get a score for each + side. */ { @@ -1656,17 +1656,17 @@ short i,xside,pscore[3]; } if (hung[side] > 1) pscore[side] += HUNGX; if (hung[xside] > 1) pscore[xside] += HUNGX; - + *score = mtl[side] - mtl[xside] + pscore[side] - pscore[xside] + 10; if (dither) *score += rand() % dither; - + if (*score > 0 && pmtl[side] == 0) if (emtl[side] < valueR) *score = 0; else if (*score < valueR) *score /= 2; if (*score < 0 && pmtl[xside] == 0) if (emtl[xside] < valueR) *score = 0; else if (-*score < valueR) *score /= 2; - + if (mtl[xside] == valueK && emtl[side] > valueB) *score += 200; if (mtl[side] == valueK && emtl[xside] > valueB) *score -= 200; } @@ -1675,7 +1675,7 @@ short i,xside,pscore[3]; ScoreLoneKing(side,score) short side,*score; -/* +/* Static evaluation when loser has only a king and winner has no pawns or no pieces. */ @@ -1687,19 +1687,19 @@ short winner,loser,king1,king2,s,i; if (mtl[white] > mtl[black]) winner = white; else winner = black; loser = otherside[winner]; king1 = PieceList[winner][0]; king2 = PieceList[loser][0]; - + s = 0; - + if (pmtl[winner] > 0) for (i = 1; i <= PieceCnt[winner]; i++) s += ScoreKPK(side,winner,loser,king1,king2,PieceList[winner][i]); - + else if (emtl[winner] == valueB+valueN) s = ScoreKBNK(winner,king1,king2); - + else if (emtl[winner] > valueB) s = 500 + emtl[winner] - DyingKing[king2] - 2*distance(king1,king2); - + if (side == winner) *score = s; else *score = -s; } @@ -1713,7 +1713,7 @@ short side,winner,loser,king1,king2,sq; { short s,r; - + if (PieceCnt[winner] == 1) s = 50; else s = 120; if (winner == white) { @@ -1883,8 +1883,8 @@ short s,piece,a1,a2,in_square,r,mob,e,c; if (PC2[7] == 0) s += KHOPNX; } } - - if (a2 > 0) + + if (a2 > 0) { c = (control[piece] & 0x4FFF); if (a1 == 0 || a2 > c+1) @@ -1977,8 +1977,8 @@ BRscan(sq,s,mob) short sq,*s,*mob; /* - Find Bishop and Rook mobility, XRAY attacks, and pins. Increment the - hung[] array if a pin is found. + Find Bishop and Rook mobility, XRAY attacks, and pins. Increment the + hung[] array if a pin is found. */ { @@ -2077,9 +2077,9 @@ short i,m0; ExaminePosition() /* - This is done one time before the search is started. Set up arrays - Mwpawn, Mbpawn, Mknight, Mbishop, Mking which are used in the - SqValue() function to determine the positional value of each piece. + This is done one time before the search is started. Set up arrays + Mwpawn, Mbpawn, Mknight, Mbishop, Mking which are used in the + SqValue() function to determine the positional value of each piece. */ { @@ -2114,14 +2114,14 @@ short wpadv,bpadv,wstrong,bstrong,z,side,pp,j,val,Pd,fyle,rank; if (!PawnStorm && stage < 5) PawnStorm = ((column[wking] < 3 && column[bking] > 4) || (column[wking] > 4 && column[bking] < 3)); - + CopyBoard(pknight,Mknight[white]); CopyBoard(pknight,Mknight[black]); CopyBoard(pbishop,Mbishop[white]); CopyBoard(pbishop,Mbishop[black]); BlendBoard(KingOpening,KingEnding,Mking[white]); BlendBoard(KingOpening,KingEnding,Mking[black]); - + for (sq = 0; sq < 64; sq++) { fyle = column[sq]; rank = row[sq]; @@ -2159,7 +2159,7 @@ short wpadv,bpadv,wstrong,bstrong,z,side,pp,j,val,Pd,fyle,rank; if ((column[bking] < 4 && fyle > 4) || (column[bking] > 3 && fyle < 3)) Mbpawn[sq] -= 3*rank; } - + Mknight[white][sq] += 5 - distance(sq,bking); Mknight[white][sq] += 5 - distance(sq,wking); Mknight[black][sq] += 5 - distance(sq,wking); @@ -2176,19 +2176,19 @@ short wpadv,bpadv,wstrong,bstrong,z,side,pp,j,val,Pd,fyle,rank; if (bstrong) Mknight[black][sq] += KNIGHTSTRONG; if (wstrong) Mbishop[white][sq] += BISHOPSTRONG; if (bstrong) Mbishop[black][sq] += BISHOPSTRONG; - + if (HasBishop[white] == 2) Mbishop[white][sq] += 8; if (HasBishop[black] == 2) Mbishop[black][sq] += 8; if (HasKnight[white] == 2) Mknight[white][sq] += 5; if (HasKnight[black] == 2) Mknight[black][sq] += 5; - + if (board[sq] == bishop) if (rank % 2 == fyle % 2) KBNKsq = 0; else KBNKsq = 7; - + Kfield[white][sq] = Kfield[black][sq] = 0; if (distance(sq,wking) == 1) Kfield[black][sq] = KATAK; if (distance(sq,bking) == 1) Kfield[white][sq] = KATAK; - + Pd = 0; for (i = 0; i < 64; i++) if (board[i] == pawn) @@ -2221,9 +2221,9 @@ short wpadv,bpadv,wstrong,bstrong,z,side,pp,j,val,Pd,fyle,rank; UpdateWeights() -/* - If material balance has changed, determine the values for the - positional evaluation terms. +/* + If material balance has changed, determine the values for the + positional evaluation terms. */ { @@ -2241,7 +2241,7 @@ short tmtl; if (tmtl > 3600) stage2 = 0; else if (tmtl < 1400) stage2 = 10; else stage2 = (3600-tmtl) / 220; - + PEDRNK2B = -15; /* centre pawn on 2nd rank & blocked */ PBLOK = -4; /* blocked backward pawn */ PDOUBLED = -14; /* doubled pawn */ @@ -2250,27 +2250,27 @@ short tmtl; PADVNCM = 10; /* advanced pawn multiplier */ PADVNCI = 7; /* muliplier for isolated pawn */ PawnBonus = stage; - + KNIGHTPOST = (stage+2)/3; /* knight near enemy pieces */ KNIGHTSTRONG = (stage+6)/2; /* occupies pawn hole */ - + BISHOPSTRONG = (stage+6)/2; /* occupies pawn hole */ BishopBonus = 2*stage; - + RHOPN = 10; /* rook on half open file */ RHOPNX = 4; RookBonus = 6*stage; - + XRAY = 8; /* Xray attack on piece */ PINVAL = 10; /* Pin */ - + KHOPN = (3*stage-30) / 2; /* king on half open file */ KHOPNX = KHOPN / 2; KCASTLD = 10 - stage; KMOVD = -40 / (stage+1); /* king moved before castling */ KATAK = (10-stage) / 2; /* B,R attacks near enemy king */ if (stage < 8) KSFTY = 16-2*stage; else KSFTY = 0; - + ATAKD = -6; /* defender > attacker */ HUNGP = -8; /* each hung piece */ HUNGX = -12; /* extra for >1 hung piece */ diff --git a/gnu/games/chess/gnuchess.h b/gnu/games/chess/gnuchess.h index 6e9c74b..ee6442e 100644 --- a/gnu/games/chess/gnuchess.h +++ b/gnu/games/chess/gnuchess.h @@ -21,11 +21,11 @@ */ -/* Header file for GNU CHESS */ +/* Header file for GNU CHESS */ #define neutral 2 #define white 0 -#define black 1 +#define black 1 #define no_piece 0 #define pawn 1 #define knight 2 diff --git a/gnu/games/chess/move.c b/gnu/games/chess/move.c index 4ce686c..b4b0d42 100644 --- a/gnu/games/chess/move.c +++ b/gnu/games/chess/move.c @@ -161,7 +161,7 @@ short sq,side; u = p[u].nextpos; } else { - if (color[u] == side && + if (color[u] == side && (board[u] == queen || board[u] == bishop)) return(true); u = p[u].nextdir; @@ -175,7 +175,7 @@ short sq,side; u = p[u].nextpos; } else { - if (color[u] == side && + if (color[u] == side && (board[u] == queen || board[u] == rook)) return(true); u = p[u].nextdir; @@ -201,8 +201,8 @@ short sq,side; BRscan(sq,s,mob) short sq,*s,*mob; /* - Find Bishop and Rook mobility, XRAY attacks, and pins. Increment the - hung[] array if a pin is found. + Find Bishop and Rook mobility, XRAY attacks, and pins. Increment the + hung[] array if a pin is found. */ { register short u,piece,pin; @@ -260,7 +260,7 @@ short side,xside,ply; register struct sqdata *p; short i,piece,*PL; struct leaf *node; - + TrPnt[ply+1] = TrPnt[ply]; node = &Tree[TrPnt[ply]]; PL = PieceList[side]; @@ -312,17 +312,17 @@ short side,xside,ply; #if (NEWMOVE > 5) GenMoves(ply,sq,side,xside) short ply,sq,side,xside; - + /* Generate moves for a piece. The moves are taken from the precalulated array posdata. If the board is free, next move is choosen from nextpos else from nextdir. */ - + { register short u,piece; register struct sqdata *p; - + piece = board[sq]; p = posdata[side][piece][sq]; if (piece == pawn) { @@ -339,7 +339,7 @@ GenMoves(ply,sq,side,xside) } u = p[u].nextpos; } - } + } else { u = p[sq].nextpos; while (u != sq) { @@ -352,6 +352,6 @@ GenMoves(ply,sq,side,xside) u = p[u].nextdir; } } - } -} + } +} #endif diff --git a/gnu/games/chess/move.h b/gnu/games/chess/move.h index 2f32830..3294e4a 100644 --- a/gnu/games/chess/move.h +++ b/gnu/games/chess/move.h @@ -11,7 +11,7 @@ extern short taxidata[64][64]; extern void Initialize_dist(); #endif - + #if (NEWMOVE >= 2) struct sqdata { short nextpos; diff --git a/gnu/games/chess/nondsp.c b/gnu/games/chess/nondsp.c index 0b29ad5..bec36d3 100644 --- a/gnu/games/chess/nondsp.c +++ b/gnu/games/chess/nondsp.c @@ -1,8 +1,8 @@ /* UNIX & MSDOS NON-DISPLAY, AND CHESSTOOL interface for Chess - + Revision: 4-25-88 - + Copyright (C) 1986, 1987, 1988 Free Software Foundation, Inc. Copyright (c) 1988 John Stanback @@ -90,12 +90,12 @@ TerminateSearch() InputCommand() /* - Process the users command. If easy mode is OFF (the computer is - thinking on opponents time) and the program is out of book, then make - the 'hint' move on the board and call SelectMove() to find a response. - The user terminates the search by entering ^C (quit siqnal) before - entering a command. If the opponent does not make the hint move, then - set Sdepth to zero. + Process the users command. If easy mode is OFF (the computer is + thinking on opponents time) and the program is out of book, then make + the 'hint' move on the board and call SelectMove() to find a response. + The user terminates the search by entering ^C (quit siqnal) before + entering a command. If the opponent does not make the hint move, then + set Sdepth to zero. */ { @@ -124,7 +124,7 @@ char s[80]; ft = time((long *)0) - time0; epsquare = tmp; } - + #ifndef MSDOS #endif while (!(ok || quit)) @@ -139,7 +139,7 @@ char s[80]; Sdepth = 0; ft = 0; } - + if (strcmp(s,"bd") == 0) { ClrScreen(); @@ -183,7 +183,7 @@ char s[80]; Sdepth = 0; ok = true; } - if (strcmp(s,"white") == 0) + if (strcmp(s,"white") == 0) { computer = white; opponent = black; ok = true; force = false; @@ -196,7 +196,7 @@ char s[80]; Sdepth = 0; } if (strcmp(s,"undo") == 0 && GameCnt >= 0) Undo(); - if (strcmp(s,"remove") == 0 && GameCnt >= 1) + if (strcmp(s,"remove") == 0 && GameCnt >= 1) { Undo(); Undo(); } @@ -221,7 +221,7 @@ char s[80]; printz("cnt= %ld rate= %ld\n",cnt,rate); } } - + ElapsedTime(1); if (force) { @@ -272,7 +272,7 @@ help() printz("Easy mode: "); if (easy) printz("ON\n"); else printz("OFF\n"); printz("Depth: %d\n",MaxSearchDepth); - printz("Random: "); + printz("Random: "); if (dither) printz("ON\n"); else printz("OFF\n"); printz("Transposition table: "); if (hashflag) printz("ON\n"); else printz("OFF\n"); @@ -282,10 +282,10 @@ help() EditBoard() -/* - Set up a board position. Pieces are entered by typing the piece - followed by the location. For example, Nf3 will place a knight on - square f3. +/* + Set up a board position. Pieces are entered by typing the piece + followed by the location. For example, Nf3 will place a knight on + square f3. */ { @@ -297,7 +297,7 @@ char s[80]; printz(". exit to main\n"); printz("# clear board\n"); printz("enter piece & location: \n"); - + a = white; do { @@ -399,12 +399,12 @@ OutputMove() NodeCnt,EvalNodes,HashCnt,evrate); printz("CPU= %.2ld:%.2ld.%.2ld\n\n", cputimer/6000,(cputimer % 6000)/100,cputimer % 100); - + if (root->flags & epmask) UpdateDisplay(0,0,1,0); else UpdateDisplay(root->f,root->t,0,root->flags & cstlmask); printz("My move is: %s\n\n",mvstr1); if (beep) printz("%c",7); - + if (root->flags & draw) printz("Draw game!\n"); else if (root->score == -9999) printz("opponent mates!\n"); else if (root->score == 9998) printz("computer mates!\n"); @@ -417,10 +417,10 @@ OutputMove() ElapsedTime(iop) short iop; -/* - Determine the time that has passed since the search was started. If - the elapsed time exceeds the target (ResponseTime+ExtraTime) then set - timeout to true which will terminate the search. +/* + Determine the time that has passed since the search was started. If + the elapsed time exceeds the target (ResponseTime+ExtraTime) then set + timeout to true which will terminate the search. */ { @@ -508,12 +508,12 @@ short r,c,l; GetOpenings() /* - Read in the Opening Book file and parse the algebraic notation for a - move into an unsigned integer format indicating the from and to - square. Create a linked list of opening lines of play, with - entry->next pointing to the next line and entry->move pointing to a - chunk of memory containing the moves. More Opening lines of up to 256 - half moves may be added to gnuchess.book. + Read in the Opening Book file and parse the algebraic notation for a + move into an unsigned integer format indicating the from and to + square. Create a linked list of opening lines of play, with + entry->next pointing to the next line and entry->move pointing to a + chunk of memory containing the moves. More Opening lines of up to 256 + half moves may be added to gnuchess.book. */ { @@ -542,7 +542,7 @@ unsigned short mv,*mp,tmp[100]; mp = (unsigned short *)malloc((i+1)*sizeof(unsigned short)); entry->mv = mp; entry->next = Book; - Book = entry; + Book = entry; for (j = 1; j <= i; j++) *(mp++) = tmp[j]; *mp = 0; i = 0; side = white; @@ -640,7 +640,7 @@ short sq,i,c; printz("Enter file name: "); scanz("%s",fname); - + if (fname[0] == '\0' || access(fname,W_OK) == -1) strcpy(fname,"chess.000"); fd = fopen(fname,"w"); fprintf(fd,"%d %d %d\n",computer+1,opponent+1,Game50); @@ -687,7 +687,7 @@ short i,f,t; } fprintf(fd,"\n\n"); fclose(fd); -} +} Undo() diff --git a/gnu/games/chess/uxdsp.c b/gnu/games/chess/uxdsp.c index d584738..84034bc 100644 --- a/gnu/games/chess/uxdsp.c +++ b/gnu/games/chess/uxdsp.c @@ -1,8 +1,8 @@ /* ALPHA interface for CHESS - + Revision: 4-25-88 - + Copyright (C) 1986, 1987, 1988 Free Software Foundation, Inc. Copyright (c) 1988 John Stanback @@ -88,12 +88,12 @@ TerminateSearch() InputCommand() /* - Process the users command. If easy mode is OFF (the computer is - thinking on opponents time) and the program is out of book, then make - the 'hint' move on the board and call SelectMove() to find a response. - The user terminates the search by entering ^C (quit siqnal) before - entering a command. If the opponent does not make the hint move, then - set Sdepth to zero. + Process the users command. If easy mode is OFF (the computer is + thinking on opponents time) and the program is out of book, then make + the 'hint' move on the board and call SelectMove() to find a response. + The user terminates the search by entering ^C (quit siqnal) before + entering a command. If the opponent does not make the hint move, then + set Sdepth to zero. */ { @@ -123,7 +123,7 @@ char s[80]; ft = time((time_t *)0) - time0; epsquare = tmp; } - + signal(SIGINT,Die); signal(SIGQUIT,Die); while (!(ok || quit)) { @@ -136,7 +136,7 @@ char s[80]; Sdepth = 0; ft = 0; } - + if (strcmp(s,"bd") == 0) { ClrScreen(); @@ -179,7 +179,7 @@ char s[80]; Sdepth = 0; ok = true; } - if (strcmp(s,"white") == 0) + if (strcmp(s,"white") == 0) { computer = white; opponent = black; ok = true; force = false; @@ -191,7 +191,7 @@ char s[80]; ok = true; force = false; Sdepth = 0; } - if (strcmp(s,"remove") == 0 && GameCnt >= 1) + if (strcmp(s,"remove") == 0 && GameCnt >= 1) { Undo(); Undo(); } @@ -220,7 +220,7 @@ char s[80]; if (strcmp(s,"p") == 0) ShowPostnValues(); if (strcmp(s,"debug") == 0) DoDebug(); } - + ClearMessage(); ElapsedTime(1); if (force) @@ -234,10 +234,10 @@ char s[80]; EditBoard() -/* - Set up a board position. Pieces are entered by typing the piece - followed by the location. For example, Nf3 will place a knight on - square f3. +/* + Set up a board position. Pieces are entered by typing the piece + followed by the location. For example, Nf3 will place a knight on + square f3. */ { @@ -322,7 +322,7 @@ help() gotoXY(10,24); printz("Easy mode: "); if (easy) printz("ON"); else printz("OFF"); gotoXY(40,21); printz("Depth: %d",MaxSearchDepth); - gotoXY(40,22); printz("Random: "); + gotoXY(40,22); printz("Random: "); if (dither) printz("ON"); else printz("OFF"); gotoXY(40,23); printz("Transposition table: "); if (hashflag) printz("ON"); else printz("OFF"); @@ -390,7 +390,7 @@ OutputMove() gotoXY(50,17); printz("My move is: %s",mvstr1); if (beep) putchar(7); ClrEoln(); - + gotoXY(50,24); if (root->flags & draw) printz("Draw game!"); else if (root->score == -9999) printz("opponent mates!"); @@ -398,7 +398,7 @@ OutputMove() else if (root->score < -9000) printz("opponent will soon mate!"); else if (root->score > 9000) printz("computer will soon mate!"); ClrEoln(); - + if (post) { gotoXY(50,22); printz("Nodes= %6ld",NodeCnt); ClrEoln(); @@ -409,10 +409,10 @@ OutputMove() ElapsedTime(iop) -/* - Determine the time that has passed since the search was started. If - the elapsed time exceeds the target (ResponseTime+ExtraTime) then set - timeout to true which will terminate the search. +/* + Determine the time that has passed since the search was started. If + the elapsed time exceeds the target (ResponseTime+ExtraTime) then set + timeout to true which will terminate the search. */ short iop; @@ -515,7 +515,7 @@ short r,c; char x; UpdateDisplay(f,t,flag,iscastle) short f,t,flag,iscastle; { -short i,l,z; +short i,l,z; if (flag) { gotoXY(56,2); printz("CHESS"); @@ -557,12 +557,12 @@ short i,l,z; GetOpenings() /* - Read in the Opening Book file and parse the algebraic notation for a - move into an unsigned integer format indicating the from and to - square. Create a linked list of opening lines of play, with - entry->next pointing to the next line and entry->move pointing to a - chunk of memory containing the moves. More Opening lines of up to 256 - half moves may be added to gnuchess.book. + Read in the Opening Book file and parse the algebraic notation for a + move into an unsigned integer format indicating the from and to + square. Create a linked list of opening lines of play, with + entry->next pointing to the next line and entry->move pointing to a + chunk of memory containing the moves. More Opening lines of up to 256 + half moves may be added to gnuchess.book. */ { @@ -587,7 +587,7 @@ unsigned short mv,*mp,tmp[100]; mp = (unsigned short *)malloc((i+1)*sizeof(unsigned short)); entry->mv = mp; entry->next = Book; - Book = entry; + Book = entry; for (j = 1; j <= i; j++) *(mp++) = tmp[j]; *mp = 0; i = 0; side = white; @@ -690,7 +690,7 @@ short sq,i,c; ShowMessage("File name: "); scanz("%s",fname); - + if (fname[0] == '\0' || access(fname,W_OK) == -1) strcpy(fname,"chess.000"); fd = fopen(fname,"w"); fprintf(fd,"%d %d %d\n",computer+1,opponent+1,Game50); @@ -737,7 +737,7 @@ short i,f,t; } fprintf(fd,"\n\n"); fclose(fd); -} +} Undo() @@ -851,7 +851,7 @@ SelectLevel() gotoXY(20,11); printz(" 8. 1 move in 15 minutes"); gotoXY(20,12); printz(" 9. 1 move in 60 minutes"); gotoXY(20,13); printz("10. 1 move in 600 minutes"); - + OperatorTime = 0; TCmoves = 60; TCminutes = 5; gotoXY(20,17); printz("Enter Level: "); diff --git a/gnu/include/values.h b/gnu/include/values.h index 91f448d..9ba3e23 100644 --- a/gnu/include/values.h +++ b/gnu/include/values.h @@ -2,7 +2,7 @@ #warning "this file includes <values.h> which is obsoleted, use <limits.h> or <float.h> instead" #endif -/* +/* Copyright (C) 1988 Free Software Foundation written by Doug Lea (dl@rocky.oswego.edu) @@ -72,7 +72,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. #define DMAXEXP ((1 << _DEXPLEN - 1) - 1 + _IEEE) #define FMAXEXP ((1 << _FEXPLEN - 1) - 1 + _IEEE) -#elif defined(sony) +#elif defined(sony) #define MAXDOUBLE 1.79769313486231470e+308 #define MAXFLOAT ((float)3.40282346638528860e+38) #define MINDOUBLE 2.2250738585072010e-308 @@ -150,7 +150,7 @@ extern float _maxfloat, _minfloat; /* #elif defined(vax) */ /* use vax versions by default -- they seem to be the most conservative */ -#else +#else #define MAXDOUBLE 1.701411834604692293e+38 #define MINDOUBLE (2.938735877055718770e-39) diff --git a/gnu/lib/libdialog/checklist.c b/gnu/lib/libdialog/checklist.c index 20174ae..0890c00 100644 --- a/gnu/lib/libdialog/checklist.c +++ b/gnu/lib/libdialog/checklist.c @@ -79,7 +79,7 @@ int dialog_checklist(unsigned char *title, unsigned char *prompt, int height, in /* center dialog box on screen */ x = (COLS - width)/2; y = (LINES - height)/2; - + #ifdef HAVE_NCURSES if (use_shadow) draw_shadow(stdscr, y, x, height, width); @@ -156,7 +156,7 @@ int dialog_checklist(unsigned char *title, unsigned char *prompt, int height, in if (key < 0x100 && toupper(key) == toupper(items[(scroll+i)*3][0])) break; - if (i < max_choice || (key >= '1' && key <= MIN('9', '0'+max_choice)) || + if (i < max_choice || (key >= '1' && key <= MIN('9', '0'+max_choice)) || key == KEY_UP || key == KEY_DOWN || key == ' ' || key == '+' || key == '-' ) { if (key >= '1' && key <= MIN('9', '0'+max_choice)) diff --git a/gnu/lib/libdialog/dialog.h b/gnu/lib/libdialog/dialog.h index 31f1e08..6500ef8 100644 --- a/gnu/lib/libdialog/dialog.h +++ b/gnu/lib/libdialog/dialog.h @@ -44,7 +44,7 @@ #endif -/* +/* * Attribute names */ #define screen_attr attributes[0] @@ -115,5 +115,5 @@ void use_helpfile(char *helpfile); void use_helpline(char *helpline); char *get_helpline(void); void restore_helpline(char *helpline); -void dialog_gauge(char *title, char *prompt, int y, int x, +void dialog_gauge(char *title, char *prompt, int y, int x, int height, int width, int perc); diff --git a/gnu/lib/libdialog/dialog.priv.h b/gnu/lib/libdialog/dialog.priv.h index 35e91a2..d84dc39 100644 --- a/gnu/lib/libdialog/dialog.priv.h +++ b/gnu/lib/libdialog/dialog.priv.h @@ -49,7 +49,7 @@ #ifndef ctrl #define ctrl(a) ((a) - 'a' + 1) -#endif +#endif #ifndef HAVE_NCURSES #ifndef ACS_ULCORNER @@ -101,7 +101,7 @@ bool use_shadow = USE_SHADOW; #endif -/* +/* * Attribute values, default is for mono display */ chtype attributes[] = { diff --git a/gnu/lib/libdialog/dir.c b/gnu/lib/libdialog/dir.c index 2fa5835..04a30b2 100644 --- a/gnu/lib/libdialog/dir.c +++ b/gnu/lib/libdialog/dir.c @@ -3,7 +3,7 @@ * * Program: dir.c * Author: Marc van Kempen - * desc: Directory routines, sorting and reading + * desc: Directory routines, sorting and reading * * Copyright (c) 1995, Marc van Kempen * @@ -16,7 +16,7 @@ * responsible for the proper functioning of this software, nor does * the author assume any responsibility for damages incurred with * its use. - * + * ****************************************************************************/ #include <sys/types.h> @@ -71,7 +71,7 @@ static int _showdotfiles = TRUE; * ****************************************************************************/ -int +int dir_select_nd( #if defined __linux__ const struct dirent *d @@ -79,8 +79,8 @@ dir_select_nd( struct dirent *d #endif ) -/* - * desc: allways include a directory entry <d>, except +/* + * desc: allways include a directory entry <d>, except * for the current directory and other dot-files * keep '..' however. * pre: <d> points to a dirent @@ -90,13 +90,13 @@ dir_select_nd( if (strcmp(d->d_name, ".")==0 || (d->d_name[0] == '.' && strlen(d->d_name) > 1 && d->d_name[1] != '.')) { return(FALSE); - } else { + } else { return(TRUE); } }/* dir_select_nd() */ -int +int dir_select( #ifdef __linux__ const struct dirent *d @@ -104,8 +104,8 @@ dir_select( struct dirent *d #endif ) -/* - * desc: allways include a directory entry <d>, except +/* + * desc: allways include a directory entry <d>, except * for the current directory * pre: <d> points to a dirent * post: returns TRUE if d->d_name != "." else FALSE @@ -118,16 +118,16 @@ dir_select( } } /* dir_select() */ -int +int dir_select_root_nd( -#ifdef __linux__ +#ifdef __linux__ const struct dirent *d #else struct dirent *d #endif ) -/* - * desc: allways include a directory entry <d>, except +/* + * desc: allways include a directory entry <d>, except * for the current directory and the parent directory. * Also skip any other dot-files. * pre: <d> points to a dirent @@ -142,22 +142,22 @@ dir_select_root_nd( } /* dir_select_root_nd() */ -int +int dir_select_root( -#ifdef __linux__ +#ifdef __linux__ const struct dirent *d #else struct dirent *d #endif ) -/* - * desc: allways include a directory entry <d>, except +/* + * desc: allways include a directory entry <d>, except * for the current directory and the parent directory * pre: <d> points to a dirent * post: returns TRUE if d->d_name[0] != "." else FALSE */ { - if (strcmp(d->d_name, ".") == 0 || strcmp(d->d_name, "..") == 0) { + if (strcmp(d->d_name, ".") == 0 || strcmp(d->d_name, "..") == 0) { return(FALSE); } else { return(TRUE); @@ -185,7 +185,7 @@ dir_alphasort(const void *d1, const void *d2) * */ { - DirList *f1 = ((DirList *) d1), + DirList *f1 = ((DirList *) d1), *f2 = ((DirList *) d2); struct stat *s1 = &(f1->filestatus); struct stat *s2 = &(f2->filestatus); @@ -197,7 +197,7 @@ dir_alphasort(const void *d1, const void *d2) if (strcmp(((DirList *) d2)->filename, "..") == 0) { return(1); } - + /* put directories first */ if ((s1->st_mode & S_IFDIR) && (s2->st_mode & S_IFDIR)) { return(strcmp(f1->filename, f2->filename)); @@ -212,7 +212,7 @@ dir_alphasort(const void *d1, const void *d2) } /* dir_alphasort() */ - + int dir_sizesort(const void *d1, const void *d2) /* @@ -220,7 +220,7 @@ dir_sizesort(const void *d1, const void *d2) * */ { - DirList *f1 = ((DirList *) d1), + DirList *f1 = ((DirList *) d1), *f2 = ((DirList *) d2); struct stat *s1 = &(f1->filestatus); struct stat *s2 = &(f2->filestatus); @@ -232,12 +232,12 @@ dir_sizesort(const void *d1, const void *d2) if (strcmp(((DirList *) d2)->filename, "..") == 0) { return(1); } - + /* put directories first */ if ((s1->st_mode & S_IFDIR) && (s2->st_mode & S_IFDIR)) { - return(s1->st_size < s2->st_size ? - -1 - : + return(s1->st_size < s2->st_size ? + -1 + : s1->st_size >= s2->st_size); }; if (s1->st_mode & S_IFDIR) { @@ -246,11 +246,11 @@ dir_sizesort(const void *d1, const void *d2) if (s2->st_mode & S_IFDIR) { return(1); } - return(s1->st_size < s2->st_size ? - -1 - : + return(s1->st_size < s2->st_size ? + -1 + : s1->st_size >= s2->st_size); - + } /* dir_sizesort() */ int @@ -259,11 +259,11 @@ dir_datesort(const void *d1, const void *d2) * desc: compare d1 and d2 on date, but put directories always first */ { - DirList *f1 = ((DirList *) d1), + DirList *f1 = ((DirList *) d1), *f2 = ((DirList *) d2); struct stat *s1 = &(f1->filestatus); struct stat *s2 = &(f2->filestatus); - + /* check for '..' */ if (strcmp(((DirList *) d1)->filename, "..") == 0) { @@ -272,12 +272,12 @@ dir_datesort(const void *d1, const void *d2) if (strcmp(((DirList *) d2)->filename, "..") == 0) { return(1); } - + /* put directories first */ if ((s1->st_mode & S_IFDIR) && (s2->st_mode & S_IFDIR)) { - return(s1->st_mtime < s2->st_mtime ? - -1 - : + return(s1->st_mtime < s2->st_mtime ? + -1 + : s1->st_mtime >= s2->st_mtime); }; if (s1->st_mode & S_IFDIR) { @@ -286,13 +286,13 @@ dir_datesort(const void *d1, const void *d2) if (s2->st_mode & S_IFDIR) { return(1); } - return(s1->st_mtime < s2->st_mtime ? - -1 - : + return(s1->st_mtime < s2->st_mtime ? + -1 + : s1->st_mtime >= s2->st_mtime); } /* dir_datesort() */ - + int null_strcmp(char *s1, char *s2) @@ -303,15 +303,15 @@ null_strcmp(char *s1, char *s2) if ((s1 == NULL) && (s2 == NULL)) { return(0); } - if (s1 == NULL) { - return(-1); + if (s1 == NULL) { + return(-1); } if (s2 == NULL) { return(1); } return(strcmp(s1, s2)); } /* null_strcmp() */ - + int dir_extsort(const void *d1, const void *d2) @@ -322,7 +322,7 @@ dir_extsort(const void *d1, const void *d2) * post: see code */ { - DirList *f1 = ((DirList *) d1), + DirList *f1 = ((DirList *) d1), *f2 = ((DirList *) d2); struct stat *s1 = &(f1->filestatus); struct stat *s2 = &(f2->filestatus); @@ -337,10 +337,10 @@ dir_extsort(const void *d1, const void *d2) if (strcmp(((DirList *) d2)->filename, "..") == 0) { return(1); } - + /* find the first extension */ - + ext1 = f1->filename + strlen(f1->filename); extf = FALSE; while (!extf && (ext1 > f1->filename)) { @@ -353,21 +353,21 @@ dir_extsort(const void *d1, const void *d2) } /* ext1 == NULL if there's no "extension" else ext1 points */ /* to the first character of the extension string */ - + /* find the second extension */ - + ext2 = f2->filename + strlen(f2->filename); extf = FALSE; while (!extf && (ext2 > f2->filename)) { extf = (*--ext2 == '.'); - } + } if (!extf) { ext2 = NULL; } else { ext2++; } /* idem as for ext1 */ - + if ((s1->st_mode & S_IFDIR) && (s2->st_mode & S_IFDIR)) { ret = null_strcmp(ext1, ext2); if (ret == 0) { @@ -431,7 +431,7 @@ get_dir(char *dirname, char *fmask, DirList **dir, int *n) /* Solution: */ /* manually insert the parent directory as the only */ /* directory entry, and return. */ - + if (*n == -1) { *n = 1; *dir = (DirList *) malloc(sizeof(DirList)); @@ -440,7 +440,7 @@ get_dir(char *dirname, char *fmask, DirList **dir, int *n) (*dir)[0].filestatus = status; (*dir)[0].link = FALSE; return; - } + } *dir = (DirList *) malloc( *n * sizeof(DirList) ); d = 0; @@ -450,7 +450,7 @@ get_dir(char *dirname, char *fmask, DirList **dir, int *n) lstat(dire[j]->d_name, &status); /* check if this file is to be included */ /* always include directories, the rest is subject to fmask */ - if (S_ISDIR(status.st_mode) + if (S_ISDIR(status.st_mode) || fnmatch(fmask, dire[j]->d_name, FNM_NOESCAPE) != FNM_NOMATCH) { strcpy((*dir)[i].filename, dire[j]->d_name); (*dir)[i].filestatus = status; @@ -478,7 +478,7 @@ get_dir(char *dirname, char *fmask, DirList **dir, int *n) j++; } *n = i; - + /* sort the directory with the directory names on top */ qsort((*dir), *n, sizeof(DirList), _sort_func); @@ -490,13 +490,13 @@ get_dir(char *dirname, char *fmask, DirList **dir, int *n) return; }/* get_dir() */ - + void FreeDir(DirList *d, int n) /* * desc: free the dirlist d - * pre: d != NULL + * pre: d != NULL * post: memory allocated to d has been released */ { diff --git a/gnu/lib/libdialog/dir.h b/gnu/lib/libdialog/dir.h index cc06844..eadc0c5 100644 --- a/gnu/lib/libdialog/dir.h +++ b/gnu/lib/libdialog/dir.h @@ -1,5 +1,5 @@ -/* - * include file for dir.c +/* + * include file for dir.c * * Copyright (c) 1995, Marc van Kempen * @@ -12,7 +12,7 @@ * responsible for the proper functioning of this software, nor does * the author assume any responsibility for damages incurred with * its use. - * + * */ #include <sys/types.h> @@ -25,7 +25,7 @@ typedef struct DirList { /* structure to hold the directory entries int link; /* is it a link ? */ char *linkname; /* the name of the file the link points to */ } DirList; - + #ifndef TRUE #define TRUE (1) #endif diff --git a/gnu/lib/libdialog/fselect.c b/gnu/lib/libdialog/fselect.c index e08849b..4a8d075 100644 --- a/gnu/lib/libdialog/fselect.c +++ b/gnu/lib/libdialog/fselect.c @@ -1,7 +1,7 @@ /* * program: fselect.c * author: Marc van Kempen (wmbfmk@urc.tue.nl) - * Desc: File selection routine + * Desc: File selection routine * * Copyright (c) 1995, Marc van Kempen * @@ -14,7 +14,7 @@ * responsible for the proper functioning of this software, nor does * the author assume any responsibility for damages incurred with * its use. - * + * */ #include <stdlib.h> @@ -31,7 +31,7 @@ char *dialog_dfselect(char *dir, char *fmask, int is_fselect); -/* +/* * Functions */ @@ -60,7 +60,7 @@ get_directories(DirList *d, int n, char ***names, int *nd) void get_filenames(DirList *d, int n, char ***names, int *nf) /* - * Desc: return the filenames in <dir> as an arry in + * Desc: return the filenames in <dir> as an arry in * <names>, the # of entries in <nf>, memory allocated * to *names should be freed when done. */ @@ -78,7 +78,7 @@ get_filenames(DirList *d, int n, char ***names, int *nf) (*names)[i] = (char *) malloc( strlen(d[i+nd].filename) + 1); strcpy((*names)[i], d[i+nd].filename); } - + return; } /* get_filenames() */ @@ -102,8 +102,8 @@ FreeNames(char **names, int n) int dialog_dselect_old(void) /* - * Desc: starting from the current directory, - * choose a new current directory + * Desc: starting from the current directory, + * choose a new current directory */ { DirList *d = NULL; @@ -114,12 +114,12 @@ dialog_dselect_old(void) StringObj *dir_obj; char o_dir[MAXPATHLEN]; struct ComposeObj *obj = NULL; - int n, nd, okbutton, cancelbutton, + int n, nd, okbutton, cancelbutton, quit, cancel, ret; ds_win = newwin(LINES-8, COLS-30, 4, 15); if (ds_win == NULL) { - fprintf(stderr, "\nnewwin(%d,%d,%d,%d) failed, maybe wrong dims\n", + fprintf(stderr, "\nnewwin(%d,%d,%d,%d) failed, maybe wrong dims\n", LINES-8, COLS-30, 4, 15); exit(1); } @@ -137,7 +137,7 @@ dialog_dselect_old(void) /* the list of directories */ get_dir(".", "*", &d, &n); get_directories(d, n, &names, &nd); - dirs_obj = NewListObj(ds_win, "Directories:", names, o_dir, 5, 2, + dirs_obj = NewListObj(ds_win, "Directories:", names, o_dir, 5, 2, LINES-15, COLS-48, nd); AddObj(&obj, LISTOBJ, (void *) dirs_obj); @@ -145,7 +145,7 @@ dialog_dselect_old(void) okbutton = FALSE; okbut = NewButtonObj(ds_win, "Continue", &okbutton, 7, COLS-45); AddObj(&obj, BUTTONOBJ, (void *) okbut); - + /* the Cancel-button */ cancelbutton = FALSE; cancelbut = NewButtonObj(ds_win, "Return", &cancelbutton, 11, COLS-44); @@ -176,7 +176,7 @@ dialog_dselect_old(void) strcpy(old_dir, o_dir); RefreshStringObj(dir_obj); } - } + } get_dir(".", "*", &d, &n); FreeNames(names, nd); get_directories(d, n, &names, &nd); @@ -194,7 +194,7 @@ dialog_dselect_old(void) break; } } - + FreeNames(names, nd); DelObj(obj); delwin(ds_win); @@ -229,7 +229,7 @@ char * dialog_dfselect(char *dir, char *fmask, int is_fselect) /* * Desc: choose a file from the directory <dir>, which - * initially display files with the mask <filemask> + * initially display files with the mask <filemask> * pre: <dir> is the initial directory * only files corresponding to the mask <fmask> are displayed * post: returns NULL if no file was selected @@ -262,7 +262,7 @@ dialog_dfselect(char *dir, char *fmask, int is_fselect) fs_win = newwin(LINES-2, COLS-20, 1, 10); if (fs_win == NULL) { endwin(); - fprintf(stderr, "\nnewwin(%d,%d,%d,%d) failed, maybe wrong dims\n", + fprintf(stderr, "\nnewwin(%d,%d,%d,%d) failed, maybe wrong dims\n", LINES-2, COLS-20, 2, 10); exit(1); } @@ -289,7 +289,7 @@ dialog_dfselect(char *dir, char *fmask, int is_fselect) get_dir(".", fmask, &d, &n); /* read the entire directory */ get_directories(d, n, &dnames, &nd); /* extract the dir-entries */ if (is_fselect) { - dirs_obj = NewListObj(fs_win, "Directories:", dnames, o_dir, 5, 2, + dirs_obj = NewListObj(fs_win, "Directories:", dnames, o_dir, 5, 2, LINES-16, (COLS-20)/2-2, nd); } else { dirs_obj = NewListObj(fs_win, "Directories:", dnames, o_dir, 5, 2, @@ -340,7 +340,7 @@ dialog_dfselect(char *dir, char *fmask, int is_fselect) switch(ret) { case SEL_CR: if (strcmp(old_fmask, o_fm) || strcmp(old_dir, o_dir)) { - /* reread directory and update the listobjects */ + /* reread directory and update the listobjects */ if (strcmp(old_dir, o_dir)) { /* dir entry was changed */ if (chdir(o_dir)) { dialog_notify("Could not change into directory"); diff --git a/gnu/lib/libdialog/gauge.c b/gnu/lib/libdialog/gauge.c index 93f5542..a44f969 100644 --- a/gnu/lib/libdialog/gauge.c +++ b/gnu/lib/libdialog/gauge.c @@ -20,7 +20,7 @@ #include "dialog.h" void -dialog_gauge(char *title, char *prompt, int y, int x, +dialog_gauge(char *title, char *prompt, int y, int x, int height, int width, int perc) /* * Desc: display a progress bar, progress indicated by <perc> @@ -36,7 +36,7 @@ dialog_gauge(char *title, char *prompt, int y, int x, height, width, y, x); exit(-1); } - + draw_box(gw, 0, 0, height, width, dialog_attr, border_attr); draw_shadow(stdscr, y, x, height, width); @@ -69,4 +69,4 @@ dialog_gauge(char *title, char *prompt, int y, int x, return; } /* dialog_gauge() */ - + diff --git a/gnu/lib/libdialog/help.c b/gnu/lib/libdialog/help.c index 51a1826..de49c6a 100644 --- a/gnu/lib/libdialog/help.c +++ b/gnu/lib/libdialog/help.c @@ -1,5 +1,5 @@ /*************************************************************** - * + * * Program: help.c * Author: Marc van Kempen * Desc: get help @@ -16,7 +16,7 @@ * responsible for the proper functioning of this software, nor does * the author assume any responsibility for damages incurred with * its use. - * + * ***************************************************************/ #include <stdlib.h> @@ -111,7 +111,7 @@ display_helpfile(void) return; } /* display_helpfile() */ - + /****************************************************************** * @@ -121,7 +121,7 @@ display_helpfile(void) void use_helpline(char *hline) -/* +/* * desc: set the helpline to printed in dialogs */ { @@ -177,7 +177,7 @@ get_helpline(void) } else { hlp = NULL; } - + return(hlp); } /* get_helpline() */ diff --git a/gnu/lib/libdialog/kernel.c b/gnu/lib/libdialog/kernel.c index f719f79..e9d23b2 100644 --- a/gnu/lib/libdialog/kernel.c +++ b/gnu/lib/libdialog/kernel.c @@ -25,7 +25,7 @@ * 19/12/93 - menu will now scroll if there are more items than can fit * on the screen. * - added 'checklist', a dialog box with a list of options that - * can be turned on or off. A list of options that are on is + * can be turned on or off. A list of options that are on is * returned on exit. * * 20/12/93 - Version 0.15 released. @@ -67,7 +67,7 @@ * 13/01/94 - some changes for easier porting to other Unix systems (tested * on Ultrix, SunOS and HPUX) * - Version 0.3 released. - * + * * 08/06/94 - Patches by Stuart Herbert - S.Herbert@shef.ac.uk * Fixed attr_clear and the textbox stuff to work with ncurses 1.8.5 * Fixed the wordwrap routine - it'll actually wrap properly now diff --git a/gnu/lib/libdialog/menubox.c b/gnu/lib/libdialog/menubox.c index 15324b4..b5aed1f 100644 --- a/gnu/lib/libdialog/menubox.c +++ b/gnu/lib/libdialog/menubox.c @@ -71,7 +71,7 @@ int dialog_menu(unsigned char *title, unsigned char *prompt, int height, int wid /* center dialog box on screen */ x = (COLS - width)/2; y = (LINES - height)/2; - + #ifdef HAVE_NCURSES if (use_shadow) draw_shadow(stdscr, y, x, height, width); @@ -149,7 +149,7 @@ int dialog_menu(unsigned char *title, unsigned char *prompt, int height, int wid if (key < 0x100 && toupper(key) == toupper(items[(scroll+i)*2][0])) break; - if (i < max_choice || (key >= '1' && key <= MIN('9', '0'+max_choice)) || + if (i < max_choice || (key >= '1' && key <= MIN('9', '0'+max_choice)) || key == KEY_UP || key == KEY_DOWN || key == '-' || key == '+') { if (key >= '1' && key <= MIN('9', '0'+max_choice)) i = key - '1'; @@ -245,7 +245,7 @@ int dialog_menu(unsigned char *title, unsigned char *prompt, int height, int wid *ch = choice; if (sc) *sc = scroll; - + switch (key) { case KEY_PPAGE: if (scroll > height-4) { /* can we go up? */ @@ -316,7 +316,7 @@ int dialog_menu(unsigned char *title, unsigned char *prompt, int height, int wid } if (redraw_menu) { for (i = 0; i < max_choice; i++) { - print_item(menu, items[(scroll+i)*2], + print_item(menu, items[(scroll+i)*2], items[(scroll+i)*2 + 1], i, i == choice); } wnoutrefresh(menu); diff --git a/gnu/lib/libdialog/msgbox.c b/gnu/lib/libdialog/msgbox.c index 867f649..75ff399 100644 --- a/gnu/lib/libdialog/msgbox.c +++ b/gnu/lib/libdialog/msgbox.c @@ -226,7 +226,7 @@ dialog_mesgbox(unsigned char *title, unsigned char *prompt, int height, int widt display_helpfile(); break; } - print_page(dialog, theight, width, prompt, startline, hscroll); + print_page(dialog, theight, width, prompt, startline, hscroll); print_perc(dialog, height-3, width-9, (float) (startline+theight)/max_lines); wmove(dialog, height-2, width/2-2); wrefresh(dialog); @@ -284,7 +284,7 @@ getline(unsigned char *buf, int n) if (n<0) { return(NULL); } - + i=0; while (*buf && i<n) { if (*buf == '\n' || *buf == '\r') { @@ -315,7 +315,7 @@ print_page(WINDOW *win, int height, int width, unsigned char *buf, int startline wmove(win, 1+i, 1); for (j=0; j<width-2; j++) waddnstr(win, " ", 1); wmove(win, 1+i, 1); - j = 0; + j = 0; /* scroll to the right */ while (*b && (*b != '\n') && (*b != '\r') && (j<hscroll)) { b++; @@ -336,7 +336,7 @@ print_page(WINDOW *win, int height, int width, unsigned char *buf, int startline if (*b) b++; /* skip over '\n', if it exists */ } } /* print_page() */ - - - - + + + + diff --git a/gnu/lib/libdialog/notify.c b/gnu/lib/libdialog/notify.c index 1000c7b..052ee8f 100644 --- a/gnu/lib/libdialog/notify.c +++ b/gnu/lib/libdialog/notify.c @@ -14,7 +14,7 @@ * responsible for the proper functioning of this software, nor does * the author assume any responsibility for damages incurred with * its use. - * + * */ @@ -23,7 +23,7 @@ void dialog_notify(char *msg) -/* +/* * Desc: display an error message */ { diff --git a/gnu/lib/libdialog/radiolist.c b/gnu/lib/libdialog/radiolist.c index 31495d5..fefcb53 100644 --- a/gnu/lib/libdialog/radiolist.c +++ b/gnu/lib/libdialog/radiolist.c @@ -87,7 +87,7 @@ int dialog_radiolist(unsigned char *title, unsigned char *prompt, int height, in /* center dialog box on screen */ x = (COLS - width)/2; y = (LINES - height)/2; - + #ifdef HAVE_NCURSES if (use_shadow) draw_shadow(stdscr, y, x, height, width); @@ -164,7 +164,7 @@ int dialog_radiolist(unsigned char *title, unsigned char *prompt, int height, in if (toupper(key) == toupper(items[(scroll+i)*3][0])) break; - if (i < max_choice || (key >= '1' && key <= MIN('9', '0'+max_choice)) || + if (i < max_choice || (key >= '1' && key <= MIN('9', '0'+max_choice)) || key == KEY_UP || key == KEY_DOWN || key == ' ' || key == '+' || key == '-' ) { if (key >= '1' && key <= MIN('9', '0'+max_choice)) diff --git a/gnu/lib/libdialog/raw_popen.c b/gnu/lib/libdialog/raw_popen.c index 6393eb1..fabf91e 100644 --- a/gnu/lib/libdialog/raw_popen.c +++ b/gnu/lib/libdialog/raw_popen.c @@ -53,8 +53,8 @@ static struct pid { struct pid *next; FILE *fp; pid_t pid; -} *pidlist; - +} *pidlist; + FILE * raw_popen(const char *program, char * const *argv, const char *type) { @@ -155,6 +155,6 @@ raw_pclose(FILE *iop) else last->next = cur->next; free(cur); - + return (pid == -1 ? -1 : pstat.w_status); } diff --git a/gnu/lib/libdialog/ui_objects.c b/gnu/lib/libdialog/ui_objects.c index efa39dc..c588b94 100644 --- a/gnu/lib/libdialog/ui_objects.c +++ b/gnu/lib/libdialog/ui_objects.c @@ -3,7 +3,7 @@ * Author: Marc van Kempen * Desc: Implementation of UI-objects: * - String input fields - * - List selection + * - List selection * - Buttons * * Copyright (c) 1995, Marc van Kempen @@ -17,7 +17,7 @@ * responsible for the proper functioning of this software, nor does * the author assume any responsibility for damages incurred with * its use. - * + * */ #include <stdlib.h> @@ -79,14 +79,14 @@ FreeObj(ComposeObj *Obj) */ { ComposeObj *o = Obj; - + o = Obj; while (o) { o = Obj->next; free(Obj); Obj = o; } - + return; } /* FreeObj() */ @@ -94,7 +94,7 @@ FreeObj(ComposeObj *Obj) int ReadObj(ComposeObj *Obj) /* - * Desc: navigate through the different objects calling their + * Desc: navigate through the different objects calling their * respective navigation routines as necessary * Pre: Obj != NULL */ @@ -145,7 +145,7 @@ ReadObj(ComposeObj *Obj) } return(ret); - + } /* ReadObj() */ @@ -225,7 +225,7 @@ DelObj(ComposeObj *Obj) FreeObj(o); } /* DelObj() */ - + /*********************************************************************** * * StringObj routines @@ -265,7 +265,7 @@ NewStringObj(WINDOW *win, char *title, char *s, int y, int x, int w, int len) */ { StringObj *so; - + /* Initialize a new object */ so = (StringObj *) malloc( sizeof(StringObj) ); if (!so) { @@ -302,7 +302,7 @@ SelectStringObj(StringObj *so) char tmp[so->len+1]; strcpy(tmp, so->s); - key = line_edit(so->win, so->y+2, so->x+1, + key = line_edit(so->win, so->y+2, so->x+1, so->len, so->w-2, inputbox_attr, TRUE, tmp); if ((key == '\n') || (key == '\r') || (key == '\t') || key == (KEY_BTAB) ) { strcpy(so->s, tmp); @@ -335,7 +335,7 @@ DelStringObj(StringObj *so) return; } - + /*********************************************************************** * * ListObj routines @@ -377,7 +377,7 @@ DrawNames(ListObj *lo) i++; } - return; + return; } /* DrawNames() */ void @@ -401,12 +401,12 @@ RefreshListObj(ListObj *lo) sprintf(perc, "(%3d%%)", MIN(100, (int) (100 * (lo->sel+lo->h-2) / MAX(1, lo->n)))); wmove(lo->win, lo->y + lo->h, lo->x + lo->w - 8); wattrset(lo->win, dialog_attr); - waddstr(lo->win, perc); - - + waddstr(lo->win, perc); + + return; } /* RefreshListObj() */ - + ListObj * NewListObj(WINDOW *win, char *title, char **list, char *listelt, int y, int x, int h, int w, int n) @@ -485,7 +485,7 @@ UpdateListObj(ListObj *lo, char **list, int n) } } else { lo->seld = NULL; - } + } lo->n = n; lo->scroll = 0; lo->sel = 0; @@ -521,7 +521,7 @@ SelectListObj(ListObj *lo) key = wgetch(lo->win); quit = FALSE; - while ((key != '\t') && (key != '\n') && (key != '\r') + while ((key != '\t') && (key != '\n') && (key != '\r') && (key != ESC) && (key != KEY_F(1)) && (key != '?') && !quit) { /* first draw current item in normal video */ wmove(lo->win, sel_y, sel_x); @@ -620,11 +620,11 @@ SelectListObj(ListObj *lo) break; } /* Draw % indication */ - sprintf(perc, "(%3d%%)", MIN(100, (int) + sprintf(perc, "(%3d%%)", MIN(100, (int) (100 * (lo->sel+lo->h - 2) / MAX(1, lo->n)))); wmove(lo->win, lo->y + lo->h, lo->x + lo->w - 8); wattrset(lo->win, dialog_attr); - waddstr(lo->win, perc); + waddstr(lo->win, perc); /* draw current item in inverse */ wmove(lo->win, sel_y, sel_x); @@ -632,8 +632,8 @@ SelectListObj(ListObj *lo) if (strlen(lo->name[lo->sel]) > lo->w - 2) { /* when printing in inverse video show the last characters in the */ /* name that will fit in the window */ - strncpy(tmp, - lo->name[lo->sel] + strlen(lo->name[lo->sel]) - (lo->w - 2), + strncpy(tmp, + lo->name[lo->sel] + strlen(lo->name[lo->sel]) - (lo->w - 2), lo->w - 2); tmp[lo->w - 2] = 0; waddstr(lo->win, tmp); @@ -642,7 +642,7 @@ SelectListObj(ListObj *lo) } if (!quit) key = wgetch(lo->win); } - + if (key == ESC) { return(SEL_ESC); } @@ -674,8 +674,8 @@ DelListObj(ListObj *lo) void MarkCurrentListObj(ListObj *lo) -/* - * Desc: mark the current item for the selection list +/* + * Desc: mark the current item for the selection list */ { lo->seld[lo->sel] = !(lo->seld[lo->sel]); @@ -707,7 +707,7 @@ UnMarkAllListObj(ListObj *lo) */ { int i; - + for (i=0; i<lo->n; i++) { lo->seld[i] = FALSE; } @@ -745,7 +745,7 @@ NewButtonObj(WINDOW *win, char *title, int *pushed, int y, int x) ButtonObj *bo; bo = (ButtonObj *) malloc( sizeof(ButtonObj) ); - + bo->win = win; bo->title = (char *) malloc( strlen(title) + 1); strcpy(bo->title, title); @@ -771,7 +771,7 @@ SelectButtonObj(ButtonObj *bo) print_button(bo->win, bo->title, bo->y+1, bo->x+2, TRUE); wmove(bo->win, bo->y+1, bo->x+(bo->w/2)-1); key = wgetch(bo->win); - print_button(bo->win, bo->title, bo->y+1, bo->x+2, FALSE); + print_button(bo->win, bo->title, bo->y+1, bo->x+2, FALSE); switch(key) { case '\t': return(SEL_TAB); diff --git a/gnu/lib/libdialog/ui_objects.h b/gnu/lib/libdialog/ui_objects.h index 3b0a544..db9a12c 100644 --- a/gnu/lib/libdialog/ui_objects.h +++ b/gnu/lib/libdialog/ui_objects.h @@ -13,7 +13,7 @@ * responsible for the proper functioning of this software, nor does * the author assume any responsibility for damages incurred with * its use. - * + * */ #include "dialog.h" @@ -85,13 +85,13 @@ typedef struct ComposeObj { **********************************************************************/ void RefreshStringObj(StringObj *so); -StringObj *NewStringObj(WINDOW *win, char *title, char *s, +StringObj *NewStringObj(WINDOW *win, char *title, char *s, int y, int x, int w, int len); int SelectStringObj(StringObj *so); void DelStringObj(StringObj *so); void RefreshListObj(ListObj *lo); -ListObj *NewListObj(WINDOW *win, char *title, char **list, +ListObj *NewListObj(WINDOW *win, char *title, char **list, char *listelt, int y, int x, int h, int w, int n); void UpdateListObj(ListObj *lo, char **list, int n); int SelectListObj(ListObj *lo); @@ -101,7 +101,7 @@ void MarkAllListObj(ListObj *lo); void UnMarkAllListObj(ListObj *lo); void RefreshButtonObj(ButtonObj *bo); -ButtonObj *NewButtonObj(WINDOW *win, char *title, int *pushed, +ButtonObj *NewButtonObj(WINDOW *win, char *title, int *pushed, int y, int x); int SelectButtonObj(ButtonObj *bo); void DelButtonObj(ButtonObj *bo); diff --git a/gnu/lib/libdialog/yesno.c b/gnu/lib/libdialog/yesno.c index 14ec47d..67de424 100644 --- a/gnu/lib/libdialog/yesno.c +++ b/gnu/lib/libdialog/yesno.c @@ -52,7 +52,7 @@ int dialog_yesno(unsigned char *title, unsigned char * prompt, int height, int w /* center dialog box on screen */ x = (COLS - width)/2; y = (LINES - height)/2; - + #ifdef HAVE_NCURSES if (use_shadow) draw_shadow(stdscr, y, x, height, width); diff --git a/gnu/lib/libg++/include/ACG.h b/gnu/lib/libg++/include/ACG.h index 8093800..fc16e2a 100644 --- a/gnu/lib/libg++/include/ACG.h +++ b/gnu/lib/libg++/include/ACG.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Dirk Grunwald (grunwald@cs.uiuc.edu) @@ -16,7 +16,7 @@ License along with this library; if not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef _ACG_h -#define _ACG_h 1 +#define _ACG_h 1 #include <RNG.h> #include <math.h> diff --git a/gnu/lib/libg++/include/AllocRing.h b/gnu/lib/libg++/include/AllocRing.h index 15dd161..f2f5db5 100644 --- a/gnu/lib/libg++/include/AllocRing.h +++ b/gnu/lib/libg++/include/AllocRing.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1989 Free Software Foundation written by Doug Lea (dl@rocky.oswego.edu) @@ -25,7 +25,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. /* - An AllocRing holds the last n malloc'ed strings, reallocating/reusing + An AllocRing holds the last n malloc'ed strings, reallocating/reusing one only when the queue wraps around. It thus guarantees that the last n allocations are intact. It is useful for things like I/O formatting where reasonable restrictions may be made about the diff --git a/gnu/lib/libg++/include/Binomial.h b/gnu/lib/libg++/include/Binomial.h index f88dfc3..f02730b 100644 --- a/gnu/lib/libg++/include/Binomial.h +++ b/gnu/lib/libg++/include/Binomial.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Dirk Grunwald (grunwald@cs.uiuc.edu) diff --git a/gnu/lib/libg++/include/BitSet.h b/gnu/lib/libg++/include/BitSet.h index ca1d96f..c80e327 100644 --- a/gnu/lib/libg++/include/BitSet.h +++ b/gnu/lib/libg++/include/BitSet.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Doug Lea (dl@rocky.oswego.edu) @@ -36,11 +36,11 @@ struct BitSetRep unsigned short s[1]; // bits start here }; -extern BitSetRep* BitSetalloc(BitSetRep*, const unsigned short*, +extern BitSetRep* BitSetalloc(BitSetRep*, const unsigned short*, int, int, int); extern BitSetRep* BitSetcopy(BitSetRep*, const BitSetRep*); extern BitSetRep* BitSetresize(BitSetRep*, int); -extern BitSetRep* BitSetop(const BitSetRep*, const BitSetRep*, +extern BitSetRep* BitSetop(const BitSetRep*, const BitSetRep*, BitSetRep*, char); extern BitSetRep* BitSetcmpl(const BitSetRep*, BitSetRep*); @@ -69,7 +69,7 @@ class BitSet protected: BitSetRep* rep; - + public: // constructors @@ -116,7 +116,7 @@ public: int test(int from, int to) const; BitSetBit operator [] (int i); - + // iterators int first(int b = 1) const; @@ -132,13 +132,13 @@ public: int empty() const; int virtual_bit() const; int count(int b = 1) const; - + // convertors & IO - friend BitSet atoBitSet(const char* s, + friend BitSet atoBitSet(const char* s, char f='0', char t='1', char star='*'); // BitSettoa is deprecated; do not use in new programs. - friend const char* BitSettoa(const BitSet& x, + friend const char* BitSettoa(const BitSet& x, char f='0', char t='1', char star='*'); friend BitSet shorttoBitSet(unsigned short w); @@ -193,7 +193,7 @@ inline BitSet::BitSet(const BitSet& x) :rep(BitSetcopy(0, x.rep)) {} inline BitSet::~BitSet() { if (rep != &_nilBitSetRep) delete rep; } inline BitSet& BitSet::operator = (const BitSet& y) -{ +{ rep = BitSetcopy(rep, y.rep); return *this; } @@ -258,27 +258,27 @@ inline BitSet operator ~ (const BitSet& x) return r #else /* NO_NRV */ -inline BitSet operator & (const BitSet& x, const BitSet& y) +inline BitSet operator & (const BitSet& x, const BitSet& y) { BitSet r; and(x, y, r); return r; } -inline BitSet operator | (const BitSet& x, const BitSet& y) +inline BitSet operator | (const BitSet& x, const BitSet& y) { BitSet r; or(x, y, r); return r; } -inline BitSet operator ^ (const BitSet& x, const BitSet& y) +inline BitSet operator ^ (const BitSet& x, const BitSet& y) { BitSet r; xor(x, y, r); return r; } -inline BitSet operator - (const BitSet& x, const BitSet& y) +inline BitSet operator - (const BitSet& x, const BitSet& y) { BitSet r; diff(x, y, r); return r; } -inline BitSet operator ~ (const BitSet& x) +inline BitSet operator ~ (const BitSet& x) { BitSet r; ::complement(x, r); return r; } @@ -329,7 +329,7 @@ inline int BitSet::test(int p) const { if (p < 0) error("Illegal bit index"); int index = BitSet_index(p); - return (index >= rep->len)? rep->virt : + return (index >= rep->len)? rep->virt : ((rep->s[index] & (1 << BitSet_pos(p))) != 0); } diff --git a/gnu/lib/libg++/include/BitString.h b/gnu/lib/libg++/include/BitString.h index b2b92b1..f30b440 100644 --- a/gnu/lib/libg++/include/BitString.h +++ b/gnu/lib/libg++/include/BitString.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Doug Lea (dl@rocky.oswego.edu) @@ -138,7 +138,7 @@ public: friend void complement(const BitString&, BitString&); - friend int lcompare(const BitString&, const BitString&); + friend int lcompare(const BitString&, const BitString&); // assignment-based operators // (constuctive versions decalred inline below @@ -162,7 +162,7 @@ public: void clear(int pos); void clear(int from, int to); - void clear(); + void clear(); void invert(int pos); void invert(int from, int to); @@ -188,7 +188,7 @@ public: // searching & matching - int index(unsigned int bit, int startpos = 0) const ; + int index(unsigned int bit, int startpos = 0) const ; int index(const BitString&, int startpos = 0) const; int index(const BitSubString&, int startpos = 0) const; int index(const BitPattern&, int startpos = 0) const; @@ -208,9 +208,9 @@ public: // BitSubString extraction BitSubString at(int pos, int len); - BitSubString at(const BitString&, int startpos = 0); - BitSubString at(const BitSubString&, int startpos = 0); - BitSubString at(const BitPattern&, int startpos = 0); + BitSubString at(const BitString&, int startpos = 0); + BitSubString at(const BitSubString&, int startpos = 0); + BitSubString at(const BitPattern&, int startpos = 0); BitSubString before(int pos); BitSubString before(const BitString&, int startpos = 0); @@ -224,9 +224,9 @@ public: // other friends & utilities - friend BitString common_prefix(const BitString&, const BitString&, + friend BitString common_prefix(const BitString&, const BitString&, int pos = 0); - friend BitString common_suffix(const BitString&, const BitString&, + friend BitString common_suffix(const BitString&, const BitString&, int pos = -1); friend BitString reverse(const BitString&); @@ -259,7 +259,7 @@ public: friend BitPattern atoBitPattern(const char* s, char f='0',char t='1',char x='X'); - friend const char* BitPatterntoa(const BitPattern& p, + friend const char* BitPatterntoa(const BitPattern& p, char f='0',char t='1',char x='X'); int OK() const; }; @@ -277,7 +277,7 @@ public: ~BitPattern(); - friend const char* BitPatterntoa(const BitPattern& p, + friend const char* BitPatterntoa(const BitPattern& p, char f/*='0'*/,char t/*='1'*/,char x/*='X'*/); void printon(ostream&, char f='0',char t='1',char x='X') const; friend BitPattern atoBitPattern(const char* s, char f,char t, char x); @@ -320,16 +320,16 @@ inline BitString::BitString() :rep(&_nilBitStrRep) {} inline BitString::BitString(const BitString& x) :rep(BStr_copy(0, x.rep)) {} -inline BitString::BitString(const BitSubString& y) +inline BitString::BitString(const BitSubString& y) :rep (BStr_alloc(0, y.S.rep->s, y.pos, y.pos+y.len, y.len)) {} inline BitString::~BitString() -{ +{ if (rep != &_nilBitStrRep) delete rep; } -inline BitString shorttoBitString(unsigned short w) -{ +inline BitString shorttoBitString(unsigned short w) +{ BitString r; _BS_word ww = w; #if _BS_BIGENDIAN @@ -339,8 +339,8 @@ inline BitString shorttoBitString(unsigned short w) return r; } -inline BitString longtoBitString(unsigned long w) -{ +inline BitString longtoBitString(unsigned long w) +{ BitString r; #if 1 _BS_word u = w; @@ -355,13 +355,13 @@ inline BitString longtoBitString(unsigned long w) } inline BitString& BitString::operator = (const BitString& y) -{ +{ rep = BStr_copy(rep, y.rep); return *this; } inline BitString& BitString::operator = (unsigned int b) -{ +{ _BS_word bit = b; rep = BStr_alloc(rep, &bit, 0, 1, 1); return *this; @@ -373,7 +373,7 @@ inline BitString& BitString::operator=(const BitSubString& y) return *this; } -inline BitSubString::BitSubString(const BitSubString& x) +inline BitSubString::BitSubString(const BitSubString& x) :S(x.S), pos(x.pos), len(x.len) {} inline BitSubString::BitSubString(BitString& x, int p, int l) @@ -544,47 +544,47 @@ inline BitString operator ~ (const BitString& x) return r #else /* NO_NRV */ -inline BitString operator & (const BitString& x, const BitString& y) +inline BitString operator & (const BitString& x, const BitString& y) { BitString r; and(x, y, r); return r; } -inline BitString operator | (const BitString& x, const BitString& y) +inline BitString operator | (const BitString& x, const BitString& y) { BitString r; or(x, y, r); return r; } -inline BitString operator ^ (const BitString& x, const BitString& y) +inline BitString operator ^ (const BitString& x, const BitString& y) { BitString r; xor(x, y, r); return r; } -inline BitString operator << (const BitString& x, int y) +inline BitString operator << (const BitString& x, int y) { BitString r; lshift(x, y, r); return r; } -inline BitString operator >> (const BitString& x, int y) +inline BitString operator >> (const BitString& x, int y) { BitString r; rshift(x, y, r); return r; } -inline BitString operator - (const BitString& x, const BitString& y) +inline BitString operator - (const BitString& x, const BitString& y) { BitString r; diff(x, y, r); return r; } -inline BitString operator + (const BitString& x, const BitString& y) +inline BitString operator + (const BitString& x, const BitString& y) { BitString r; cat(x, y, r); return r; } -inline BitString operator + (const BitString& x, unsigned int y) +inline BitString operator + (const BitString& x, unsigned int y) { BitString r; cat(x, y, r); return r; } -inline BitString operator ~ (const BitString& x) +inline BitString operator ~ (const BitString& x) { BitString r; complement(x, r); return r; } @@ -594,32 +594,32 @@ inline BitString operator ~ (const BitString& x) // status, matching inline int BitString::length() const -{ +{ return rep->len; } inline int BitString::empty() const -{ +{ return rep->len == 0; } inline int BitString::index(const BitString& y, int startpos) const -{ +{ return search(startpos, rep->len, y.rep->s, 0, y.rep->len); } inline int BitString::index(const BitSubString& y, int startpos) const -{ +{ return search(startpos, rep->len, y.S.rep->s, y.pos, y.pos+y.len); } inline int BitString::contains(const BitString& y) const -{ +{ return search(0, rep->len, y.rep->s, 0, y.rep->len) >= 0; } inline int BitString::contains(const BitSubString& y) const -{ +{ return search(0, rep->len, y.S.rep->s, y.pos, y.pos+y.len) >= 0; } @@ -664,12 +664,12 @@ inline int BitString::index(const BitPattern& r, int startpos) const } inline int BitSubString::length() const -{ +{ return len; } inline int BitSubString::empty() const -{ +{ return len == 0; } @@ -706,7 +706,7 @@ inline int BitString::index(unsigned int bit, int startpos) const return prev(rep->len + startpos + 1, bit); } -inline void BitString::right_trim(unsigned int b) +inline void BitString::right_trim(unsigned int b) { int nb = (b == 0)? 1 : 0; rep = BStr_resize(rep, prev(rep->len, nb) + 1); @@ -721,7 +721,7 @@ inline void BitString::left_trim(unsigned int b) inline int BitString::test(int i) const { - return ((unsigned)(i) >= rep->len)? 0 : + return ((unsigned)(i) >= rep->len)? 0 : ((rep->s[BitStr_index(i)] & (1 << (BitStr_pos(i)))) != 0); } @@ -754,7 +754,7 @@ inline BitSubString BitString::_substr(int first, int l) { if (first < 0 || l <= 0 || (unsigned)(first + l) > rep->len) return BitSubString(_nil_BitString, 0, 0) ; - else + else return BitSubString(*this, first, l); } diff --git a/gnu/lib/libg++/include/Complex.h b/gnu/lib/libg++/include/Complex.h index 9b7e378..128227bc 100644 --- a/gnu/lib/libg++/include/Complex.h +++ b/gnu/lib/libg++/include/Complex.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Doug Lea (dl@rocky.oswego.edu) @@ -57,8 +57,8 @@ public: Complex& operator *= (const Complex& y); Complex& operator *= (double y); - Complex& operator /= (const Complex& y); - Complex& operator /= (double y); + Complex& operator /= (const Complex& y); + Complex& operator /= (double y); void error(const char* msg) const; }; @@ -83,7 +83,7 @@ Complex pow(const Complex& x, int p); Complex pow(const Complex& x, const Complex& p); Complex pow(const Complex& x, double y); Complex sqrt(const Complex& x); - + istream& operator >> (istream& s, Complex& x); ostream& operator << (ostream& s, const Complex& x); @@ -99,42 +99,42 @@ inline Complex::Complex(double r, double i) :re(r), im(i) {} inline Complex::~Complex() {} -inline Complex& Complex::operator = (const Complex& y) -{ - re = y.real(); im = y.imag(); return *this; -} +inline Complex& Complex::operator = (const Complex& y) +{ + re = y.real(); im = y.imag(); return *this; +} inline Complex& Complex::operator += (const Complex& y) -{ - re += y.real(); im += y.imag(); return *this; +{ + re += y.real(); im += y.imag(); return *this; } inline Complex& Complex::operator += (double y) -{ - re += y; return *this; +{ + re += y; return *this; } inline Complex& Complex::operator -= (const Complex& y) -{ - re -= y.real(); im -= y.imag(); return *this; +{ + re -= y.real(); im -= y.imag(); return *this; } inline Complex& Complex::operator -= (double y) -{ - re -= y; return *this; +{ + re -= y; return *this; } inline Complex& Complex::operator *= (const Complex& y) -{ +{ double r = re * y.real() - im * y.imag(); - im = re * y.imag() + im * y.real(); - re = r; - return *this; + im = re * y.imag() + im * y.real(); + re = r; + return *this; } inline Complex& Complex::operator *= (double y) -{ - re *= y; im *= y; return *this; +{ + re *= y; im *= y; return *this; } @@ -202,7 +202,7 @@ inline Complex operator - (double x, const Complex& y) inline Complex operator * (const Complex& x, const Complex& y) { - return Complex(x.real() * y.real() - x.imag() * y.imag(), + return Complex(x.real() * y.real() - x.imag() * y.imag(), x.real() * y.imag() + x.imag() * y.real()); } diff --git a/gnu/lib/libg++/include/CursesW.h b/gnu/lib/libg++/include/CursesW.h index 1df2e8a..8ac6f3c 100644 --- a/gnu/lib/libg++/include/CursesW.h +++ b/gnu/lib/libg++/include/CursesW.h @@ -1,6 +1,6 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1989 Free Software Foundation written by Eric Newton (newton@rocky.oswego.edu) @@ -237,7 +237,7 @@ inline int (mvinsch)(int y, int x, char c) * */ -class CursesWindow +class CursesWindow { protected: static int count; // count of all active windows: @@ -385,102 +385,102 @@ inline int CursesWindow::width() return maxx() - begx() + 1; } -inline int CursesWindow::box(char vert, char hor) +inline int CursesWindow::box(char vert, char hor) { - return ::box(w, vert, hor); + return ::box(w, vert, hor); } -inline int CursesWindow::overlay(CursesWindow &win) +inline int CursesWindow::overlay(CursesWindow &win) { - return ::overlay(w, win.w); + return ::overlay(w, win.w); } -inline int CursesWindow::overwrite(CursesWindow &win) +inline int CursesWindow::overwrite(CursesWindow &win) { - return ::overwrite(w, win.w); + return ::overwrite(w, win.w); } -inline int CursesWindow::scroll() +inline int CursesWindow::scroll() { - return ::scroll(w); + return ::scroll(w); } -inline int CursesWindow::touchwin() +inline int CursesWindow::touchwin() { - return ::touchwin(w); + return ::touchwin(w); } -inline int CursesWindow::addch(const char ch) +inline int CursesWindow::addch(const char ch) { - return ::waddch(w, ch); + return ::waddch(w, ch); } -inline int CursesWindow::addstr(const char * str) +inline int CursesWindow::addstr(const char * str) { // The (char*) cast is to hack around prototypes in curses.h that // have const missing in the parameter lists. [E.g. SVR4] - return ::waddstr(w, (char*)str); + return ::waddstr(w, (char*)str); } -inline int CursesWindow::clear() +inline int CursesWindow::clear() { - return ::wclear(w); + return ::wclear(w); } -inline int CursesWindow::clrtobot() +inline int CursesWindow::clrtobot() { - return ::wclrtobot(w); + return ::wclrtobot(w); } -inline int CursesWindow::clrtoeol() +inline int CursesWindow::clrtoeol() { - return ::wclrtoeol(w); + return ::wclrtoeol(w); } -inline int CursesWindow::delch() +inline int CursesWindow::delch() { - return ::wdelch(w); + return ::wdelch(w); } -inline int CursesWindow::deleteln() +inline int CursesWindow::deleteln() { - return ::wdeleteln(w); + return ::wdeleteln(w); } -inline int CursesWindow::erase() +inline int CursesWindow::erase() { - return ::werase(w); + return ::werase(w); } -inline int CursesWindow::getch() +inline int CursesWindow::getch() { - return ::wgetch(w); + return ::wgetch(w); } -inline int CursesWindow::getstr(char * str) +inline int CursesWindow::getstr(char * str) { - return ::wgetstr(w, str); + return ::wgetstr(w, str); } -inline int CursesWindow::inch() +inline int CursesWindow::inch() { - return winch(w); + return winch(w); } -inline int CursesWindow::insch(char c) +inline int CursesWindow::insch(char c) { - return ::winsch(w, c); + return ::winsch(w, c); } -inline int CursesWindow::insertln() +inline int CursesWindow::insertln() { - return ::winsertln(w); + return ::winsertln(w); } -inline int CursesWindow::move(int y, int x) +inline int CursesWindow::move(int y, int x) { - return ::wmove(w, y, x); + return ::wmove(w, y, x); } @@ -524,56 +524,56 @@ inline int CursesWindow::mvinsch(int y, int x, char ch) return (::wmove(w, y, x)==ERR) ? ERR : ::winsch(w, ch); } -inline int CursesWindow::refresh() +inline int CursesWindow::refresh() { - return ::wrefresh(w); + return ::wrefresh(w); } -inline int CursesWindow::clearok(int bf) +inline int CursesWindow::clearok(int bf) { - return ::clearok(w,bf); + return ::clearok(w,bf); } -inline int CursesWindow::leaveok(int bf) +inline int CursesWindow::leaveok(int bf) { - return ::leaveok(w,bf); + return ::leaveok(w,bf); } -inline int CursesWindow::scrollok(int bf) +inline int CursesWindow::scrollok(int bf) { - return ::scrollok(w,bf); + return ::scrollok(w,bf); } #ifndef _no_flushok -inline int CursesWindow::flushok(int bf) +inline int CursesWindow::flushok(int bf) { - return ::flushok(w, bf); + return ::flushok(w, bf); } #endif -inline void CursesWindow::getyx(int& y, int& x) +inline void CursesWindow::getyx(int& y, int& x) { - ::getyx(w, y, x); + ::getyx(w, y, x); } -inline int CursesWindow::standout() +inline int CursesWindow::standout() { - return ::wstandout(w); + return ::wstandout(w); } -inline int CursesWindow::standend() +inline int CursesWindow::standend() { - return ::wstandend(w); + return ::wstandend(w); } -inline int CursesWindow::lines() +inline int CursesWindow::lines() { - return LINES; + return LINES; } -inline int CursesWindow::cols() +inline int CursesWindow::cols() { - return COLS; + return COLS; } inline CursesWindow* CursesWindow::child() diff --git a/gnu/lib/libg++/include/DLList.h b/gnu/lib/libg++/include/DLList.h index 36f73bc..ba7ee86 100644 --- a/gnu/lib/libg++/include/DLList.h +++ b/gnu/lib/libg++/include/DLList.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Doug Lea (dl@rocky.oswego.edu) diff --git a/gnu/lib/libg++/include/DiscUnif.h b/gnu/lib/libg++/include/DiscUnif.h index 5f26f90..0cd6a0f 100644 --- a/gnu/lib/libg++/include/DiscUnif.h +++ b/gnu/lib/libg++/include/DiscUnif.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Dirk Grunwald (grunwald@cs.uiuc.edu) @@ -25,7 +25,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. // // The interval [lo..hi) -// +// class DiscreteUniform: public Random { long pLow; diff --git a/gnu/lib/libg++/include/Erlang.h b/gnu/lib/libg++/include/Erlang.h index 9809388..18838fc 100644 --- a/gnu/lib/libg++/include/Erlang.h +++ b/gnu/lib/libg++/include/Erlang.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Dirk Grunwald (grunwald@cs.uiuc.edu) @@ -19,7 +19,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. #ifdef __GNUG__ #pragma interface #endif -#define _Erlang_h 1 +#define _Erlang_h 1 #include <Random.h> diff --git a/gnu/lib/libg++/include/Fix.h b/gnu/lib/libg++/include/Fix.h index df76c94..fab91b8 100644 --- a/gnu/lib/libg++/include/Fix.h +++ b/gnu/lib/libg++/include/Fix.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// Fix.h : variable length fixed point data type +// Fix.h : variable length fixed point data type // #ifndef _Fix_h @@ -124,7 +124,7 @@ public: friend char* Ftoa(const Fix&, int width = default_print_width); void printon(ostream&, int width = default_print_width) const; friend Fix atoF(const char*, int len = default_length); - + friend istream& operator >> (istream&, Fix&); friend ostream& operator << (ostream&, const Fix&); @@ -184,7 +184,7 @@ Fix::mask (Fix::Rep* x) { int n = x->len & 0x0f; if ( n ) - x->s[x->siz - 1] &= 0xffff0000 >> n; + x->s[x->siz - 1] &= 0xffff0000 >> n; } inline Fix::Rep* @@ -269,7 +269,7 @@ Fix::operator = (const Fix& y) if ( rep->len == y.rep->len ) { ++y.rep->ref; if ( --rep->ref <= 0 ) delete rep; - rep = y.rep; + rep = y.rep; } else { unique(); @@ -290,37 +290,37 @@ Fix::operator = (double d) inline int operator == (const Fix& x, const Fix& y) { - return Fix::compare(x.rep, y.rep) == 0; + return Fix::compare(x.rep, y.rep) == 0; } inline int operator != (const Fix& x, const Fix& y) { - return Fix::compare(x.rep, y.rep) != 0; + return Fix::compare(x.rep, y.rep) != 0; } inline int operator < (const Fix& x, const Fix& y) { - return Fix::compare(x.rep, y.rep) < 0; + return Fix::compare(x.rep, y.rep) < 0; } inline int operator <= (const Fix& x, const Fix& y) { - return Fix::compare(x.rep, y.rep) <= 0; + return Fix::compare(x.rep, y.rep) <= 0; } inline int operator > (const Fix& x, const Fix& y) { - return Fix::compare(x.rep, y.rep) > 0; + return Fix::compare(x.rep, y.rep) > 0; } inline int operator >= (const Fix& x, const Fix& y) { - return Fix::compare(x.rep, y.rep) >= 0; + return Fix::compare(x.rep, y.rep) >= 0; } inline Fix& @@ -415,7 +415,7 @@ operator << (const Fix& x, int y) inline Fix operator >> (const Fix& x, int y) -{ +{ Fix::Rep* rep = Fix::shift(x.rep, -y); return rep; } diff --git a/gnu/lib/libg++/include/Fix16.h b/gnu/lib/libg++/include/Fix16.h index e598113..2ab2209 100644 --- a/gnu/lib/libg++/include/Fix16.h +++ b/gnu/lib/libg++/include/Fix16.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Kurt Baudendistel (gt-eedsp!baud@gatech.edu) adapted for libg++ by Doug Lea (dl@rocky.oswego.edu) @@ -58,8 +58,8 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. // consists of a 16-bit mantissa (sign bit & 15 data bits). // -class Fix16 -{ +class Fix16 +{ friend class Fix32; short m; @@ -102,7 +102,7 @@ public: Fix16& operator -= (const Fix16& f); Fix16& operator *= (const Fix16& ); Fix16& operator /= (const Fix16& f); - + Fix16& operator <<=(int b); Fix16& operator >>=(int b); @@ -124,15 +124,15 @@ public: Fix16& operator *= (int g); }; - + // // Fix32 class: 32-bit Fixed point data type // // consists of a 32-bit mantissa (sign bit & 31 data bits). // -class Fix32 -{ +class Fix32 +{ friend class Fix16; _G_int32_t m; @@ -241,141 +241,141 @@ extern void inline Fix16::~Fix16() {} inline short Fix16::round(double d) -{ - return short( (d >= 0)? d + 0.5 : d - 0.5); +{ + return short( (d >= 0)? d + 0.5 : d - 0.5); } -inline Fix16::Fix16(short i) -{ - m = i; +inline Fix16::Fix16(short i) +{ + m = i; } -inline Fix16::Fix16(int i) -{ - m = i; +inline Fix16::Fix16(int i) +{ + m = i; } -inline Fix16::operator double() const -{ - return Fix16_div * m; +inline Fix16::operator double() const +{ + return Fix16_div * m; } -inline Fix16::Fix16() -{ - m = 0; +inline Fix16::Fix16() +{ + m = 0; } -inline Fix16::Fix16(const Fix16& f) -{ - m = f.m; +inline Fix16::Fix16(const Fix16& f) +{ + m = f.m; } -inline Fix16::Fix16(double d) +inline Fix16::Fix16(double d) { m = assign(d); } -inline Fix16& Fix16::operator=(const Fix16& f) -{ - m = f.m; - return *this; +inline Fix16& Fix16::operator=(const Fix16& f) +{ + m = f.m; + return *this; } -inline Fix16& Fix16::operator=(double d) -{ - m = assign(d); - return *this; +inline Fix16& Fix16::operator=(double d) +{ + m = assign(d); + return *this; } -inline Fix32::Fix32() -{ +inline Fix32::Fix32() +{ m = 0; } -inline Fix32::Fix32(_G_int32_t i) -{ +inline Fix32::Fix32(_G_int32_t i) +{ m = i; } -inline Fix32:: operator double() const -{ +inline Fix32:: operator double() const +{ return Fix32_div * m; } -inline Fix32::Fix32(const Fix32& f) -{ +inline Fix32::Fix32(const Fix32& f) +{ m = f.m; } -inline Fix32::Fix32(const Fix16& f) -{ +inline Fix32::Fix32(const Fix16& f) +{ m = _G_int32_t(f.m) << 16; } -inline Fix32::Fix32(double d) -{ +inline Fix32::Fix32(double d) +{ m = assign(d); } -inline Fix16::Fix16(const Fix32& f) -{ - m = f.m >> 16; +inline Fix16::Fix16(const Fix32& f) +{ + m = f.m >> 16; } inline Fix16& Fix16::operator=(const Fix32& f) -{ - m = f.m >> 16; - return *this; +{ + m = f.m >> 16; + return *this; } -inline Fix32& Fix32::operator=(const Fix32& f) -{ +inline Fix32& Fix32::operator=(const Fix32& f) +{ m = f.m; - return *this; + return *this; } -inline Fix32& Fix32::operator=(const Fix16& f) -{ +inline Fix32& Fix32::operator=(const Fix16& f) +{ m = _G_int32_t(f.m) << 16; return *this; } -inline Fix32& Fix32::operator=(double d) -{ +inline Fix32& Fix32::operator=(double d) +{ m = assign(d); - return *this; + return *this; } -inline short& mantissa(Fix16& f) -{ - return f.m; +inline short& mantissa(Fix16& f) +{ + return f.m; } -inline const short& mantissa(const Fix16& f) -{ - return f.m; +inline const short& mantissa(const Fix16& f) +{ + return f.m; } -inline double value(const Fix16& f) -{ - return double(f); +inline double value(const Fix16& f) +{ + return double(f); } -inline Fix16 Fix16::operator+() const -{ - return m; +inline Fix16 Fix16::operator+() const +{ + return m; } -inline Fix16 Fix16::operator-() const -{ - return -m; +inline Fix16 Fix16::operator-() const +{ + return -m; } -inline Fix16 operator+(const Fix16& f, const Fix16& g) +inline Fix16 operator+(const Fix16& f, const Fix16& g) { short sum = f.m + g.m; if ( (f.m ^ sum) & (g.m ^ sum) & Fix16_msb ) @@ -383,7 +383,7 @@ inline Fix16 operator+(const Fix16& f, const Fix16& g) return sum; } -inline Fix16 operator-(const Fix16& f, const Fix16& g) +inline Fix16 operator-(const Fix16& f, const Fix16& g) { short sum = f.m - g.m; if ( (f.m ^ sum) & (-g.m ^ sum) & Fix16_msb ) @@ -392,90 +392,90 @@ inline Fix16 operator-(const Fix16& f, const Fix16& g) } inline Fix32 operator*(const Fix16& f, const Fix16& g) -{ - return Fix32( _G_int32_t( _G_int32_t(f.m) * _G_int32_t(g.m) << 1)); +{ + return Fix32( _G_int32_t( _G_int32_t(f.m) * _G_int32_t(g.m) << 1)); } -inline Fix16 operator<<(const Fix16& a, int b) -{ - return a.m << b; +inline Fix16 operator<<(const Fix16& a, int b) +{ + return a.m << b; } -inline Fix16 operator>>(const Fix16& a, int b) -{ - return a.m >> b; +inline Fix16 operator>>(const Fix16& a, int b) +{ + return a.m >> b; } inline Fix16& Fix16:: operator+=(const Fix16& f) -{ - return *this = *this + f; +{ + return *this = *this + f; } -inline Fix16& Fix16:: operator-=(const Fix16& f) -{ - return *this = *this - f; +inline Fix16& Fix16:: operator-=(const Fix16& f) +{ + return *this = *this - f; } -inline Fix16& Fix16::operator*=(const Fix16& f) -{ - return *this = *this * f; +inline Fix16& Fix16::operator*=(const Fix16& f) +{ + return *this = *this * f; } -inline Fix16& Fix16:: operator/=(const Fix16& f) -{ - return *this = *this / f; +inline Fix16& Fix16:: operator/=(const Fix16& f) +{ + return *this = *this / f; } -inline Fix16& Fix16:: operator<<=(int b) -{ +inline Fix16& Fix16:: operator<<=(int b) +{ return *this = *this << b; } -inline Fix16& Fix16:: operator>>=(int b) -{ +inline Fix16& Fix16:: operator>>=(int b) +{ return *this = *this >> b; } -inline int operator==(const Fix16& f, const Fix16& g) -{ +inline int operator==(const Fix16& f, const Fix16& g) +{ return f.m == g.m; } -inline int operator!=(const Fix16& f, const Fix16& g) -{ +inline int operator!=(const Fix16& f, const Fix16& g) +{ return f.m != g.m; } -inline int operator>=(const Fix16& f, const Fix16& g) -{ +inline int operator>=(const Fix16& f, const Fix16& g) +{ return f.m >= g.m; } -inline int operator<=(const Fix16& f, const Fix16& g) -{ +inline int operator<=(const Fix16& f, const Fix16& g) +{ return f.m <= g.m; } -inline int operator>(const Fix16& f, const Fix16& g) -{ +inline int operator>(const Fix16& f, const Fix16& g) +{ return f.m > g.m; } -inline int operator<(const Fix16& f, const Fix16& g) -{ +inline int operator<(const Fix16& f, const Fix16& g) +{ return f.m < g.m; } inline istream& operator>>(istream& s, Fix16& f) -{ +{ double d; - s >> d; - f = d; - return s; + s >> d; + f = d; + return s; } inline ostream& operator<<(ostream& s, const Fix16& f) -{ +{ return s << double(f); } @@ -499,36 +499,36 @@ inline Fix16& Fix16::operator*=(int g) inline Fix32::~Fix32() {} inline _G_int32_t Fix32::round(double d) -{ +{ return _G_int32_t( (d >= 0)? d + 0.5 : d - 0.5); } -inline _G_int32_t& mantissa(Fix32& f) -{ +inline _G_int32_t& mantissa(Fix32& f) +{ return f.m; } -inline const _G_int32_t& mantissa(const Fix32& f) -{ +inline const _G_int32_t& mantissa(const Fix32& f) +{ return f.m; } -inline double value(const Fix32& f) -{ +inline double value(const Fix32& f) +{ return double(f); } inline Fix32 Fix32::operator+() const -{ +{ return m; } -inline Fix32 Fix32::operator-() const -{ +inline Fix32 Fix32::operator-() const +{ return -m; } -inline Fix32 operator+(const Fix32& f, const Fix32& g) +inline Fix32 operator+(const Fix32& f, const Fix32& g) { _G_int32_t sum = f.m + g.m; if ( (f.m ^ sum) & (g.m ^ sum) & Fix32_msb ) @@ -536,7 +536,7 @@ inline Fix32 operator+(const Fix32& f, const Fix32& g) return sum; } -inline Fix32 operator-(const Fix32& f, const Fix32& g) +inline Fix32 operator-(const Fix32& f, const Fix32& g) { _G_int32_t sum = f.m - g.m; if ( (f.m ^ sum) & (-g.m ^ sum) & Fix32_msb ) @@ -544,87 +544,87 @@ inline Fix32 operator-(const Fix32& f, const Fix32& g) return sum; } -inline Fix32 operator<<(const Fix32& a, int b) -{ +inline Fix32 operator<<(const Fix32& a, int b) +{ return a.m << b; } -inline Fix32 operator>>(const Fix32& a, int b) -{ +inline Fix32 operator>>(const Fix32& a, int b) +{ return a.m >> b; } -inline Fix32& Fix32::operator+=(const Fix32& f) -{ +inline Fix32& Fix32::operator+=(const Fix32& f) +{ return *this = *this + f; } -inline Fix32& Fix32::operator-=(const Fix32& f) -{ +inline Fix32& Fix32::operator-=(const Fix32& f) +{ return *this = *this - f; } -inline Fix32& Fix32::operator*=(const Fix32& f) -{ +inline Fix32& Fix32::operator*=(const Fix32& f) +{ return *this = *this * f; } -inline Fix32& Fix32::operator/=(const Fix32& f) -{ +inline Fix32& Fix32::operator/=(const Fix32& f) +{ return *this = *this / f; } -inline Fix32& Fix32::operator<<=(int b) -{ +inline Fix32& Fix32::operator<<=(int b) +{ return *this = *this << b; } -inline Fix32& Fix32::operator>>=(int b) -{ +inline Fix32& Fix32::operator>>=(int b) +{ return *this = *this >> b; } -inline int operator==(const Fix32& f, const Fix32& g) -{ +inline int operator==(const Fix32& f, const Fix32& g) +{ return f.m == g.m; } -inline int operator!=(const Fix32& f, const Fix32& g) -{ +inline int operator!=(const Fix32& f, const Fix32& g) +{ return f.m != g.m; } -inline int operator>=(const Fix32& f, const Fix32& g) -{ +inline int operator>=(const Fix32& f, const Fix32& g) +{ return f.m >= g.m; } -inline int operator<=(const Fix32& f, const Fix32& g) -{ +inline int operator<=(const Fix32& f, const Fix32& g) +{ return f.m <= g.m; } -inline int operator>(const Fix32& f, const Fix32& g) -{ +inline int operator>(const Fix32& f, const Fix32& g) +{ return f.m > g.m; } -inline int operator<(const Fix32& f, const Fix32& g) -{ +inline int operator<(const Fix32& f, const Fix32& g) +{ return f.m < g.m; } inline istream& operator>>(istream& s, Fix32& f) -{ +{ double d; - s >> d; - f = d; - return s; + s >> d; + f = d; + return s; } inline ostream& operator<<(ostream& s, const Fix32& f) -{ +{ return s << double(f); } diff --git a/gnu/lib/libg++/include/Fix24.h b/gnu/lib/libg++/include/Fix24.h index 5db346e..0f4daea 100644 --- a/gnu/lib/libg++/include/Fix24.h +++ b/gnu/lib/libg++/include/Fix24.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Kurt Baudendistel (gt-eedsp!baud@gatech.edu) adapted for libg++ by Doug Lea (dl@rocky.oswego.edu) @@ -26,7 +26,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. #include <stream.h> #include <std.h> -// extra type definitions +// extra type definitions typedef struct { _G_int32_t u; @@ -37,14 +37,14 @@ typedef struct { static const int Fix24_shift = 31; - + static const double Fix24_fs = 2147483648., // 2^Fix24_shift Fix24_mult = Fix24_fs, Fix24_div = 1./Fix24_fs, Fix24_max = 1. - .5/Fix24_fs, Fix24_min = -1.; - + static const _G_uint32_t Fix24_msb = 0x80000000L, Fix24_lsb = 0x00000100L, @@ -57,21 +57,21 @@ static const double Fix48_min = -1., Fix48_div_u = 1./Fix24_fs, Fix48_div_l = 1./Fix48_fs; - + static const twolongs Fix48_msb = { 0x80000000L, 0L }, Fix48_lsb = { 0L, 0x00000100L }, Fix48_m_max = { 0x7fffff00L, 0xffffff00L }, Fix48_m_min = { 0x80000000L, 0L }; - + // // Fix24 class: 24-bit Fixed point data type // // consists of a 24-bit mantissa (sign bit & 23 data bits). // -class Fix24 -{ +class Fix24 +{ friend class Fix48; _G_int32_t m; @@ -133,15 +133,15 @@ public: void range_error(_G_int32_t&) const; }; - + // // Fix48 class: 48-bit Fixed point data type // // consists of a 48-bit mantissa (sign bit & 47 data bits). // -class Fix48 -{ +class Fix48 +{ friend class Fix24; twolongs m; @@ -242,85 +242,85 @@ extern void inline Fix24::~Fix24() {} -inline Fix24::Fix24(long i) -{ - m = i; +inline Fix24::Fix24(long i) +{ + m = i; } -inline Fix24::Fix24(int i) -{ - m = i; +inline Fix24::Fix24(int i) +{ + m = i; } inline Fix24::operator double() const -{ - return Fix24_div * m; +{ + return Fix24_div * m; } -inline Fix24::Fix24() -{ - m = 0; +inline Fix24::Fix24() +{ + m = 0; } -inline Fix24::Fix24(const Fix24& f) -{ - m = f.m; +inline Fix24::Fix24(const Fix24& f) +{ + m = f.m; } -inline Fix24::Fix24(double d) +inline Fix24::Fix24(double d) { m = assign(d); } -inline Fix24::Fix24(const Fix48& f) -{ +inline Fix24::Fix24(const Fix48& f) +{ m = f.m.u; } -inline Fix24& Fix24::operator=(const Fix24& f) -{ - m = f.m; - return *this; +inline Fix24& Fix24::operator=(const Fix24& f) +{ + m = f.m; + return *this; } -inline Fix24& Fix24::operator=(double d) -{ - m = assign(d); - return *this; +inline Fix24& Fix24::operator=(double d) +{ + m = assign(d); + return *this; } inline Fix24& Fix24::operator=(const Fix48& f) -{ +{ m = f.m.u; - return *this; + return *this; } inline _G_int32_t& mantissa(Fix24& f) -{ - return f.m; +{ + return f.m; } inline const _G_int32_t& mantissa(const Fix24& f) -{ - return f.m; +{ + return f.m; } inline double value(const Fix24& f) -{ - return double(f); +{ + return double(f); } -inline Fix24 Fix24::operator+() const -{ - return m; +inline Fix24 Fix24::operator+() const +{ + return m; } inline Fix24 Fix24::operator-() const -{ - return -m; +{ + return -m; } -inline Fix24 operator+(const Fix24& f, const Fix24& g) +inline Fix24 operator+(const Fix24& f, const Fix24& g) { _G_int32_t sum = f.m + g.m; if ( (f.m ^ sum) & (g.m ^ sum) & Fix24_msb ) @@ -328,7 +328,7 @@ inline Fix24 operator+(const Fix24& f, const Fix24& g) return sum; } -inline Fix24 operator-(const Fix24& f, const Fix24& g) +inline Fix24 operator-(const Fix24& f, const Fix24& g) { _G_int32_t sum = f.m - g.m; if ( (f.m ^ sum) & (-g.m ^ sum) & Fix24_msb ) @@ -336,23 +336,23 @@ inline Fix24 operator-(const Fix24& f, const Fix24& g) return sum; } -inline Fix24 operator*(const Fix24& a, int b) -{ - return a.m * b; +inline Fix24 operator*(const Fix24& a, int b) +{ + return a.m * b; } -inline Fix24 operator*(int b, const Fix24& a) -{ - return a * b; +inline Fix24 operator*(int b, const Fix24& a) +{ + return a * b; } -inline Fix24 operator<<(const Fix24& a, int b) -{ - return a.m << b; +inline Fix24 operator<<(const Fix24& a, int b) +{ + return a.m << b; } -inline Fix24 operator>>(const Fix24& a, int b) -{ +inline Fix24 operator>>(const Fix24& a, int b) +{ return (a.m >> b) & ~0xff; } @@ -361,236 +361,236 @@ inline Fix24& Fix24:: operator+=(const Fix24& f) return *this = *this + f; } -inline Fix24& Fix24:: operator-=(const Fix24& f) -{ - return *this = *this - f; +inline Fix24& Fix24:: operator-=(const Fix24& f) +{ + return *this = *this - f; } -inline Fix24& Fix24::operator*=(const Fix24& f) -{ - return *this = *this * f; +inline Fix24& Fix24::operator*=(const Fix24& f) +{ + return *this = *this * f; } -inline Fix24& Fix24:: operator/=(const Fix24& f) -{ - return *this = *this / f; +inline Fix24& Fix24:: operator/=(const Fix24& f) +{ + return *this = *this / f; } -inline Fix24& Fix24:: operator<<=(int b) -{ +inline Fix24& Fix24:: operator<<=(int b) +{ return *this = *this << b; } -inline Fix24& Fix24:: operator>>=(int b) -{ +inline Fix24& Fix24:: operator>>=(int b) +{ return *this = *this >> b; } inline Fix24& Fix24::operator*=(int b) -{ - return *this = *this * b; +{ + return *this = *this * b; } -inline int operator==(const Fix24& f, const Fix24& g) -{ +inline int operator==(const Fix24& f, const Fix24& g) +{ return f.m == g.m; } -inline int operator!=(const Fix24& f, const Fix24& g) -{ +inline int operator!=(const Fix24& f, const Fix24& g) +{ return f.m != g.m; } -inline int operator>=(const Fix24& f, const Fix24& g) -{ +inline int operator>=(const Fix24& f, const Fix24& g) +{ return f.m >= g.m; } -inline int operator<=(const Fix24& f, const Fix24& g) -{ +inline int operator<=(const Fix24& f, const Fix24& g) +{ return f.m <= g.m; } -inline int operator>(const Fix24& f, const Fix24& g) -{ +inline int operator>(const Fix24& f, const Fix24& g) +{ return f.m > g.m; } -inline int operator<(const Fix24& f, const Fix24& g) -{ +inline int operator<(const Fix24& f, const Fix24& g) +{ return f.m < g.m; } inline istream& operator>>(istream& s, Fix24& f) -{ +{ double d; - s >> d; - f = d; - return s; + s >> d; + f = d; + return s; } inline ostream& operator<<(ostream& s, const Fix24& f) -{ +{ return s << double(f); } inline Fix48::~Fix48() {} -inline Fix48::Fix48(twolongs i) -{ +inline Fix48::Fix48(twolongs i) +{ m = i; } inline Fix48:: operator double() const -{ +{ /* * Note: can't simply do Fix48_div_u * m.u + Fix48_div_l * m.l, because * m.u is signed and m.l is unsigned. */ return (m.u >= 0)? Fix48_div_u * m.u + Fix48_div_l * m.l : - (Fix48_div_u * ((_G_uint32_t)(m.u & 0xffffff00)) + (Fix48_div_u * ((_G_uint32_t)(m.u & 0xffffff00)) + Fix48_div_l * m.l) - 2; } -inline Fix48::Fix48() -{ +inline Fix48::Fix48() +{ m.u = 0; m.l = 0; } -inline Fix48::Fix48(const Fix48& f) -{ +inline Fix48::Fix48(const Fix48& f) +{ m = f.m; } -inline Fix48::Fix48(const Fix24& f) -{ +inline Fix48::Fix48(const Fix24& f) +{ m.u = f.m; m.l = 0; } -inline Fix48::Fix48(double d) -{ +inline Fix48::Fix48(double d) +{ m = assign(d); } -inline Fix48& Fix48::operator=(const Fix48& f) -{ +inline Fix48& Fix48::operator=(const Fix48& f) +{ m = f.m; - return *this; + return *this; } -inline Fix48& Fix48::operator=(const Fix24& f) -{ +inline Fix48& Fix48::operator=(const Fix24& f) +{ m.u = f.m; m.l = 0; return *this; } -inline Fix48& Fix48::operator=(double d) -{ +inline Fix48& Fix48::operator=(double d) +{ m = assign(d); - return *this; + return *this; } -inline twolongs& mantissa(Fix48& f) -{ +inline twolongs& mantissa(Fix48& f) +{ return f.m; } -inline const twolongs& mantissa(const Fix48& f) -{ +inline const twolongs& mantissa(const Fix48& f) +{ return f.m; } inline double value(const Fix48& f) -{ +{ return double(f); } -inline Fix48 Fix48::operator+() const -{ +inline Fix48 Fix48::operator+() const +{ return m; } inline Fix48 Fix48::operator-() const -{ +{ twolongs n; n.l = -m.l; n.u = ~m.u + ((n.l ^ m.l) & Fix24_msb ? 0 : Fix24_lsb); return Fix48(n); } -inline Fix48 operator*(int b, const Fix48& a) -{ - return a * b; +inline Fix48 operator*(int b, const Fix48& a) +{ + return a * b; } -inline Fix48& Fix48::operator+=(const Fix48& f) -{ +inline Fix48& Fix48::operator+=(const Fix48& f) +{ return *this = *this + f; } -inline Fix48& Fix48::operator-=(const Fix48& f) -{ +inline Fix48& Fix48::operator-=(const Fix48& f) +{ return *this = *this - f; } -inline Fix48& Fix48::operator*=(int b) -{ +inline Fix48& Fix48::operator*=(int b) +{ return *this = *this * b; } -inline Fix48& Fix48::operator<<=(int b) -{ +inline Fix48& Fix48::operator<<=(int b) +{ return *this = *this << b; } -inline Fix48& Fix48::operator>>=(int b) -{ +inline Fix48& Fix48::operator>>=(int b) +{ return *this = *this >> b; } -inline int operator==(const Fix48& f, const Fix48& g) -{ +inline int operator==(const Fix48& f, const Fix48& g) +{ return f.m.u == g.m.u && f.m.l == g.m.l; } -inline int operator!=(const Fix48& f, const Fix48& g) -{ +inline int operator!=(const Fix48& f, const Fix48& g) +{ return f.m.u != g.m.u || f.m.l != g.m.l; } -inline int operator>=(const Fix48& f, const Fix48& g) -{ +inline int operator>=(const Fix48& f, const Fix48& g) +{ return f.m.u >= g.m.u || (f.m.u == g.m.u && f.m.l >= g.m.l); } -inline int operator<=(const Fix48& f, const Fix48& g) -{ +inline int operator<=(const Fix48& f, const Fix48& g) +{ return f.m.u <= g.m.u || (f.m.u == g.m.u && f.m.l <= g.m.l); } -inline int operator>(const Fix48& f, const Fix48& g) -{ +inline int operator>(const Fix48& f, const Fix48& g) +{ return f.m.u > g.m.u || (f.m.u == g.m.u && f.m.l > g.m.l); } -inline int operator<(const Fix48& f, const Fix48& g) -{ +inline int operator<(const Fix48& f, const Fix48& g) +{ return f.m.u < g.m.u || (f.m.u == g.m.u && f.m.l < g.m.l); } inline istream& operator>>(istream& s, Fix48& f) -{ +{ double d; - s >> d; - f = d; - return s; + s >> d; + f = d; + return s; } inline ostream& operator<<(ostream& s, const Fix48& f) -{ +{ return s << double(f); } diff --git a/gnu/lib/libg++/include/Geom.h b/gnu/lib/libg++/include/Geom.h index 5cfa39a..7d05b83 100644 --- a/gnu/lib/libg++/include/Geom.h +++ b/gnu/lib/libg++/include/Geom.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Dirk Grunwald (grunwald@cs.uiuc.edu) @@ -19,7 +19,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. #ifdef __GNUG__ #pragma interface #endif -#define _Geometric_h +#define _Geometric_h #include <Random.h> diff --git a/gnu/lib/libg++/include/GetOpt.h b/gnu/lib/libg++/include/GetOpt.h index 66ecf5c..9dfc3c6 100644 --- a/gnu/lib/libg++/include/GetOpt.h +++ b/gnu/lib/libg++/include/GetOpt.h @@ -1,4 +1,4 @@ -/* Getopt for GNU. +/* Getopt for GNU. Copyright (C) 1987, 1989, 1992 Free Software Foundation, Inc. (Modified by Douglas C. Schmidt for use with GNU G++.) @@ -45,51 +45,51 @@ private: /* The next char to be scanned in the option-element in which the last option character we returned was found. This allows us to pick up the scan where we left off. - + If this is zero, or a null string, it means resume the scan by advancing to the next ARGV-element. */ - + static char *nextchar; - - + + /* Describe how to deal with options that follow non-option ARGV-elements. - + UNSPECIFIED means the caller did not specify anything; the default is then REQUIRE_ORDER if the environment variable _OPTIONS_FIRST is defined, PERMUTE otherwise. - + REQUIRE_ORDER means don't recognize them as options. Stop option processing when the first non-option is seen. This is what Unix does. - + PERMUTE is the default. We permute the contents of `argv' as we scan, so that eventually all the options are at the end. This allows options to be given in any order, even with programs that were not written to expect this. - + RETURN_IN_ORDER is an option available to programs that were written to expect options and other ARGV-elements in any order and that care about the ordering of the two. We describe each non-option ARGV-element as if it were the argument of an option with character code zero. Using `-' as the first character of the list of option characters requests this mode of operation. - + The special argument `--' forces an end of option-scanning regardless of the value of `ordering'. In the case of RETURN_IN_ORDER, only `--' can cause `getopt' to return EOF with `optind' != ARGC. */ - + enum OrderingEnum { REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER }; OrderingEnum ordering; /* Handle permutation of arguments. */ - + /* Describe the part of ARGV that contains non-options that have been skipped. `first_nonopt' is the index in ARGV of the first of them; `last_nonopt' is the index after the last of them. */ - + static int first_nonopt; static int last_nonopt; - + void exchange (char **argv); public: /* For communication from `getopt' to the caller. @@ -97,31 +97,31 @@ public: the argument value is returned here. Also, when `ordering' is RETURN_IN_ORDER, each non-option ARGV-element is returned here. */ - + char *optarg; - + /* Index in ARGV of the next element to be scanned. This is used for communication to and from the caller and for communication between successive calls to `getopt'. On entry to `getopt', zero means this is the first call; initialize. - + When `getopt' returns EOF, this is the index of the first of the non-option elements that the caller should itself scan. - + Otherwise, `optind' communicates from one call to the next how much of ARGV has been scanned so far. */ - + int optind; /* Callers store zero here to inhibit the error message for unrecognized options. */ - + int opterr; - + int nargc; char **nargv; const char *noptstring; - + GetOpt (int argc, char **argv, const char *optstring); int operator () (void); }; diff --git a/gnu/lib/libg++/include/HypGeom.h b/gnu/lib/libg++/include/HypGeom.h index e16e655..1864e91 100644 --- a/gnu/lib/libg++/include/HypGeom.h +++ b/gnu/lib/libg++/include/HypGeom.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Dirk Grunwald (grunwald@cs.uiuc.edu) @@ -19,7 +19,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. #ifdef __GNUG__ #pragma interface #endif -#define _HyperGeometric_h +#define _HyperGeometric_h #include <Random.h> diff --git a/gnu/lib/libg++/include/Integer.h b/gnu/lib/libg++/include/Integer.h index 7e67ae5..b5c1768 100644 --- a/gnu/lib/libg++/include/Integer.h +++ b/gnu/lib/libg++/include/Integer.h @@ -1,6 +1,6 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Doug Lea (dl@rocky.oswego.edu) @@ -29,7 +29,7 @@ struct IntRep // internal Integer representations { unsigned short len; // current length unsigned short sz; // allocated space (0 means static). - short sgn; // 1 means >= 0; 0 means < 0 + short sgn; // 1 means >= 0; 0 means < 0 unsigned short s[1]; // represented as ushort array starting here }; @@ -67,7 +67,7 @@ extern int ucompare(const IntRep*, const IntRep*); extern int ucompare(const IntRep*, long); extern char* Itoa(const IntRep* x, int base = 10, int width = 0); extern char* cvtItoa(const IntRep* x, char* fmt, int& fmtlen, int base, - int showbase, int width, int align_right, + int showbase, int width, int align_right, char fillchar, char Xcase, int showpos); extern IntRep* atoIntRep(const char* s, int base = 10); extern long Itolong(const IntRep*); @@ -152,14 +152,14 @@ public: friend void negate(const Integer& x, Integer& dest); friend void complement(const Integer& x, Integer& dest); - friend int compare(const Integer&, const Integer&); - friend int ucompare(const Integer&, const Integer&); + friend int compare(const Integer&, const Integer&); + friend int ucompare(const Integer&, const Integer&); friend void add(const Integer& x, const Integer& y, Integer& dest); friend void sub(const Integer& x, const Integer& y, Integer& dest); friend void mul(const Integer& x, const Integer& y, Integer& dest); friend void div(const Integer& x, const Integer& y, Integer& dest); friend void mod(const Integer& x, const Integer& y, Integer& dest); - friend void divide(const Integer& x, const Integer& y, + friend void divide(const Integer& x, const Integer& y, Integer& q, Integer& r); friend void and(const Integer& x, const Integer& y, Integer& dest); friend void or(const Integer& x, const Integer& y, Integer& dest); @@ -168,8 +168,8 @@ public: friend void rshift(const Integer& x, const Integer& y, Integer& dest); friend void pow(const Integer& x, const Integer& y, Integer& dest); - friend int compare(const Integer&, long); - friend int ucompare(const Integer&, long); + friend int compare(const Integer&, long); + friend int ucompare(const Integer&, long); friend void add(const Integer& x, long y, Integer& dest); friend void sub(const Integer& x, long y, Integer& dest); friend void mul(const Integer& x, long y, Integer& dest); @@ -183,8 +183,8 @@ public: friend void rshift(const Integer& x, long y, Integer& dest); friend void pow(const Integer& x, long y, Integer& dest); - friend int compare(long, const Integer&); - friend int ucompare(long, const Integer&); + friend int compare(long, const Integer&); + friend int ucompare(long, const Integer&); friend void add(long x, const Integer& y, Integer& dest); friend void sub(long x, const Integer& y, Integer& dest); friend void mul(long x, const Integer& y, Integer& dest); @@ -203,7 +203,7 @@ public: friend char* Itoa(const Integer& x, int base = 10, int width = 0); friend Integer atoI(const char* s, int base = 10); void printon(ostream& s, int base = 10, int width = 0) const; - + friend istream& operator >> (istream& s, Integer& y); friend ostream& operator << (ostream& s, const Integer& y); @@ -211,7 +211,7 @@ public: int initialized() const; void error(const char* msg) const; - int OK() const; + int OK() const; }; @@ -263,7 +263,7 @@ public: Integer pow(const Integer& x, const Integer& y); Integer pow(const Integer& x, long y); - Integer Ipow(long x, long y); // x to the y as Integer + Integer Ipow(long x, long y); // x to the y as Integer extern char* dec(const Integer& x, int width = 0); @@ -498,62 +498,62 @@ inline void xor(long x, const Integer& y, Integer& dest) inline int operator == (const Integer& x, const Integer& y) { - return compare(x, y) == 0; + return compare(x, y) == 0; } inline int operator == (const Integer& x, long y) { - return compare(x, y) == 0; + return compare(x, y) == 0; } inline int operator != (const Integer& x, const Integer& y) { - return compare(x, y) != 0; + return compare(x, y) != 0; } inline int operator != (const Integer& x, long y) { - return compare(x, y) != 0; + return compare(x, y) != 0; } inline int operator < (const Integer& x, const Integer& y) { - return compare(x, y) < 0; + return compare(x, y) < 0; } inline int operator < (const Integer& x, long y) { - return compare(x, y) < 0; + return compare(x, y) < 0; } inline int operator <= (const Integer& x, const Integer& y) { - return compare(x, y) <= 0; + return compare(x, y) <= 0; } inline int operator <= (const Integer& x, long y) { - return compare(x, y) <= 0; + return compare(x, y) <= 0; } inline int operator > (const Integer& x, const Integer& y) { - return compare(x, y) > 0; + return compare(x, y) > 0; } inline int operator > (const Integer& x, long y) { - return compare(x, y) > 0; + return compare(x, y) > 0; } inline int operator >= (const Integer& x, const Integer& y) { - return compare(x, y) >= 0; + return compare(x, y) >= 0; } inline int operator >= (const Integer& x, long y) { - return compare(x, y) >= 0; + return compare(x, y) >= 0; } @@ -738,12 +738,12 @@ inline char* Itoa(const Integer& y, int base, int width) -inline long lg(const Integer& x) +inline long lg(const Integer& x) { return lg(x.rep); } -// constructive operations +// constructive operations #if defined(__GNUG__) && !defined(_G_NO_NRV) @@ -926,179 +926,179 @@ inline Integer gcd(const Integer& x, const Integer& y) return r #else /* NO_NRV */ -inline Integer operator + (const Integer& x, const Integer& y) +inline Integer operator + (const Integer& x, const Integer& y) { Integer r; add(x, y, r); return r; } -inline Integer operator + (const Integer& x, long y) +inline Integer operator + (const Integer& x, long y) { Integer r; add(x, y, r); return r; } -inline Integer operator + (long x, const Integer& y) +inline Integer operator + (long x, const Integer& y) { Integer r; add(x, y, r); return r; } -inline Integer operator - (const Integer& x, const Integer& y) +inline Integer operator - (const Integer& x, const Integer& y) { Integer r; sub(x, y, r); return r; } -inline Integer operator - (const Integer& x, long y) +inline Integer operator - (const Integer& x, long y) { Integer r; sub(x, y, r); return r; } -inline Integer operator - (long x, const Integer& y) +inline Integer operator - (long x, const Integer& y) { Integer r; sub(x, y, r); return r; } -inline Integer operator * (const Integer& x, const Integer& y) +inline Integer operator * (const Integer& x, const Integer& y) { Integer r; mul(x, y, r); return r; } -inline Integer operator * (const Integer& x, long y) +inline Integer operator * (const Integer& x, long y) { Integer r; mul(x, y, r); return r; } -inline Integer operator * (long x, const Integer& y) +inline Integer operator * (long x, const Integer& y) { Integer r; mul(x, y, r); return r; } -inline Integer sqr(const Integer& x) +inline Integer sqr(const Integer& x) { Integer r; mul(x, x, r); return r; } -inline Integer operator & (const Integer& x, const Integer& y) +inline Integer operator & (const Integer& x, const Integer& y) { Integer r; and(x, y, r); return r; } -inline Integer operator & (const Integer& x, long y) +inline Integer operator & (const Integer& x, long y) { Integer r; and(x, y, r); return r; } -inline Integer operator & (long x, const Integer& y) +inline Integer operator & (long x, const Integer& y) { Integer r; and(x, y, r); return r; } -inline Integer operator | (const Integer& x, const Integer& y) +inline Integer operator | (const Integer& x, const Integer& y) { Integer r; or(x, y, r); return r; } -inline Integer operator | (const Integer& x, long y) +inline Integer operator | (const Integer& x, long y) { Integer r; or(x, y, r); return r; } -inline Integer operator | (long x, const Integer& y) +inline Integer operator | (long x, const Integer& y) { Integer r; or(x, y, r); return r; } -inline Integer operator ^ (const Integer& x, const Integer& y) +inline Integer operator ^ (const Integer& x, const Integer& y) { Integer r; xor(x, y, r); return r; } -inline Integer operator ^ (const Integer& x, long y) +inline Integer operator ^ (const Integer& x, long y) { Integer r; xor(x, y, r); return r; } -inline Integer operator ^ (long x, const Integer& y) +inline Integer operator ^ (long x, const Integer& y) { Integer r; xor(x, y, r); return r; } -inline Integer operator / (const Integer& x, const Integer& y) +inline Integer operator / (const Integer& x, const Integer& y) { Integer r; div(x, y, r); return r; } -inline Integer operator / (const Integer& x, long y) +inline Integer operator / (const Integer& x, long y) { Integer r; div(x, y, r); return r; } -inline Integer operator % (const Integer& x, const Integer& y) +inline Integer operator % (const Integer& x, const Integer& y) { Integer r; mod(x, y, r); return r; } -inline Integer operator % (const Integer& x, long y) +inline Integer operator % (const Integer& x, long y) { Integer r; mod(x, y, r); return r; } -inline Integer operator << (const Integer& x, const Integer& y) +inline Integer operator << (const Integer& x, const Integer& y) { Integer r; lshift(x, y, r); return r; } -inline Integer operator << (const Integer& x, long y) +inline Integer operator << (const Integer& x, long y) { Integer r; lshift(x, y, r); return r; } -inline Integer operator >> (const Integer& x, const Integer& y) +inline Integer operator >> (const Integer& x, const Integer& y) { Integer r; rshift(x, y, r); return r; } -inline Integer operator >> (const Integer& x, long y) +inline Integer operator >> (const Integer& x, long y) { Integer r; rshift(x, y, r); return r; } -inline Integer pow(const Integer& x, long y) +inline Integer pow(const Integer& x, long y) { Integer r; pow(x, y, r); return r; } -inline Integer Ipow(long x, long y) +inline Integer Ipow(long x, long y) { Integer r(x); pow(r, y, r); return r; } -inline Integer pow(const Integer& x, const Integer& y) +inline Integer pow(const Integer& x, const Integer& y) { Integer r; pow(x, y, r); return r; } -inline Integer abs(const Integer& x) +inline Integer abs(const Integer& x) { Integer r; abs(x, r); return r; } -inline Integer operator - (const Integer& x) +inline Integer operator - (const Integer& x) { Integer r; negate(x, r); return r; } -inline Integer operator ~ (const Integer& x) +inline Integer operator ~ (const Integer& x) { Integer r; complement(x, r); return r; } -inline Integer atoI(const char* s, int base) +inline Integer atoI(const char* s, int base) { Integer r; r.rep = atoIntRep(s, base); return r; } -inline Integer gcd(const Integer& x, const Integer& y) +inline Integer gcd(const Integer& x, const Integer& y) { Integer r; r.rep = gcd(x.rep, y.rep); return r; } diff --git a/gnu/lib/libg++/include/LogNorm.h b/gnu/lib/libg++/include/LogNorm.h index ac98141..b5c4b46 100644 --- a/gnu/lib/libg++/include/LogNorm.h +++ b/gnu/lib/libg++/include/LogNorm.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Dirk Grunwald (grunwald@cs.uiuc.edu) @@ -19,7 +19,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. #ifdef __GNUG__ #pragma interface #endif -#define _LogNormal_h +#define _LogNormal_h #include <Normal.h> @@ -44,7 +44,7 @@ inline void LogNormal::setState() pMean = log(m2 / sqrt(logVariance + m2) ); // from ch@heike.informatik.uni-dortmund.de: // (was pVariance = log((sqrt(logVariance + m2)/m2 )); ) - pStdDev = sqrt(log((logVariance + m2)/m2 )); + pStdDev = sqrt(log((logVariance + m2)/m2 )); } inline LogNormal::LogNormal(double mean, double variance, RNG *gen) diff --git a/gnu/lib/libg++/include/MLCG.h b/gnu/lib/libg++/include/MLCG.h index 8fa08a8..9b288a7 100644 --- a/gnu/lib/libg++/include/MLCG.h +++ b/gnu/lib/libg++/include/MLCG.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Dirk Grunwald (grunwald@cs.uiuc.edu) @@ -16,7 +16,7 @@ License along with this library; if not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef _MLCG_h -#define _MLCG_h 1 +#define _MLCG_h 1 #ifdef __GNUG__ #pragma interface #endif diff --git a/gnu/lib/libg++/include/NegExp.h b/gnu/lib/libg++/include/NegExp.h index b96f913..041e083 100644 --- a/gnu/lib/libg++/include/NegExp.h +++ b/gnu/lib/libg++/include/NegExp.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Dirk Grunwald (grunwald@cs.uiuc.edu) @@ -25,7 +25,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. // // Negative Exponential Random Numbers // -// +// #include <Random.h> diff --git a/gnu/lib/libg++/include/Normal.h b/gnu/lib/libg++/include/Normal.h index 8c8358e..ab80f2a 100644 --- a/gnu/lib/libg++/include/Normal.h +++ b/gnu/lib/libg++/include/Normal.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Dirk Grunwald (grunwald@cs.uiuc.edu) @@ -19,7 +19,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. #ifdef __GNUG__ #pragma interface #endif -#define _Normal_h +#define _Normal_h #include <Random.h> @@ -31,7 +31,7 @@ protected: double pMean; double pVariance; double pStdDev; - + public: Normal(double xmean, double xvariance, RNG *gen); double mean(); diff --git a/gnu/lib/libg++/include/Obstack.h b/gnu/lib/libg++/include/Obstack.h index 384157f..6e353fb 100644 --- a/gnu/lib/libg++/include/Obstack.h +++ b/gnu/lib/libg++/include/Obstack.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Doug Lea (dl@rocky.oswego.edu) @@ -84,127 +84,127 @@ public: inline Obstack::~Obstack() { - _free(0); + _free(0); } inline void* Obstack::base() { - return objectbase; + return objectbase; } inline void* Obstack::next_free() { - return nextfree; + return nextfree; } inline int Obstack::alignment_mask() { - return alignmentmask; + return alignmentmask; } inline int Obstack::chunk_size() { - return chunksize; + return chunksize; } inline int Obstack::size() { - return nextfree - objectbase; + return nextfree - objectbase; } inline int Obstack::room() { - return chunklimit - nextfree; + return chunklimit - nextfree; } inline void Obstack:: grow(const void* data, int size) { - if (nextfree+size > chunklimit) + if (nextfree+size > chunklimit) newchunk(size); memcpy(nextfree, data, size); - nextfree += size; + nextfree += size; } inline void Obstack:: grow(const void* data, int size, char terminator) { - if (nextfree+size+1 > chunklimit) + if (nextfree+size+1 > chunklimit) newchunk(size+1); memcpy(nextfree, data, size); - nextfree += size; - *(nextfree)++ = terminator; + nextfree += size; + *(nextfree)++ = terminator; } inline void Obstack:: grow(const char* s) { - grow((const void*)s, strlen(s), 0); + grow((const void*)s, strlen(s), 0); } inline void Obstack:: grow(char c) { - if (nextfree+1 > chunklimit) - newchunk(1); - *(nextfree)++ = c; + if (nextfree+1 > chunklimit) + newchunk(1); + *(nextfree)++ = c; } inline void Obstack:: blank(int size) { - if (nextfree+size > chunklimit) + if (nextfree+size > chunklimit) newchunk(size); - nextfree += size; + nextfree += size; } inline void* Obstack::finish(char terminator) { - grow(terminator); - return finish(); + grow(terminator); + return finish(); } inline void* Obstack::copy(const void* data, int size) { grow (data, size); - return finish(); + return finish(); } inline void* Obstack::copy(const void* data, int size, char terminator) { - grow(data, size, terminator); - return finish(); + grow(data, size, terminator); + return finish(); } inline void* Obstack::copy(const char* s) { - grow((const void*)s, strlen(s), 0); - return finish(); + grow((const void*)s, strlen(s), 0); + return finish(); } inline void* Obstack::copy(char c) { grow(c); - return finish(); + return finish(); } inline void* Obstack::alloc(int size) { blank(size); - return finish(); + return finish(); } -inline void Obstack:: free(void* obj) +inline void Obstack:: free(void* obj) { if (obj >= (void*)chunk && obj<(void*)chunklimit) nextfree = objectbase = (char *) obj; - else - _free(obj); + else + _free(obj); } inline void Obstack:: grow_fast(char c) { - *(nextfree)++ = c; + *(nextfree)++ = c; } inline void Obstack:: blank_fast(int size) { - nextfree += size; + nextfree += size; } inline void Obstack:: shrink(int size) // from ken@cs.rochester.edu diff --git a/gnu/lib/libg++/include/PlotFile.h b/gnu/lib/libg++/include/PlotFile.h index 91ab6ae..1a401cd 100644 --- a/gnu/lib/libg++/include/PlotFile.h +++ b/gnu/lib/libg++/include/PlotFile.h @@ -22,10 +22,10 @@ the resulting executable to be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License. */ -/* +/* a very simple implementation of a class to output unix "plot" format plotter files. See corresponding unix man pages for - more details. + more details. written by Doug Lea (dl@rocky.oswego.edu) converted to use iostream library by Per Bothner (bothner@cygnus.com) @@ -39,7 +39,7 @@ the executable file might be covered by the GNU General Public License. */ #include <fstream.h> -/* +/* Some plot libraries have the `box' command to draw boxes. Some don't. `box' is included here via moves & lines to allow both possiblilties. */ @@ -51,21 +51,21 @@ protected: PlotFile& cmd(char c); PlotFile& operator << (const int x); PlotFile& operator << (const char *s); - + public: - + PlotFile() : ofstream() { } PlotFile(int fd) : ofstream(fd) { } PlotFile(const char *name, int mode=ios::out, int prot=0664) : ofstream(name, mode, prot) { } - + // PlotFile& remove() { ofstream::remove(); return *this; } - + // int filedesc() { return ofstream::filedesc(); } // const char* name() { return File::name(); } // void setname(const char* newname) { File::setname(newname); } // int iocount() { return File::iocount(); } - + PlotFile& arc(const int xi, const int yi, const int x0, const int y0, const int x1, const int y1); @@ -75,7 +75,7 @@ public: PlotFile& cont(const int xi, const int yi); PlotFile& dot(const int xi, const int yi, const int dx, int n, const int* pat); - PlotFile& erase(); + PlotFile& erase(); PlotFile& label(const char* s); PlotFile& line(const int x0, const int y0, const int x1, const int y1); diff --git a/gnu/lib/libg++/include/Poisson.h b/gnu/lib/libg++/include/Poisson.h index e585145..895b072 100644 --- a/gnu/lib/libg++/include/Poisson.h +++ b/gnu/lib/libg++/include/Poisson.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Dirk Grunwald (grunwald@cs.uiuc.edu) @@ -19,7 +19,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. #ifdef __GNUG__ #pragma interface #endif -#define _Poisson_h +#define _Poisson_h #include <Random.h> diff --git a/gnu/lib/libg++/include/RNG.h b/gnu/lib/libg++/include/RNG.h index b924fb6..81b5e16 100644 --- a/gnu/lib/libg++/include/RNG.h +++ b/gnu/lib/libg++/include/RNG.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Dirk Grunwald (grunwald@cs.uiuc.edu) diff --git a/gnu/lib/libg++/include/Random.h b/gnu/lib/libg++/include/Random.h index 925698f..e3e624a 100644 --- a/gnu/lib/libg++/include/Random.h +++ b/gnu/lib/libg++/include/Random.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Dirk Grunwald (grunwald@cs.uiuc.edu) diff --git a/gnu/lib/libg++/include/Rational.h b/gnu/lib/libg++/include/Rational.h index 131aabc..1f8b76b 100644 --- a/gnu/lib/libg++/include/Rational.h +++ b/gnu/lib/libg++/include/Rational.h @@ -1,6 +1,6 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Doug Lea (dl@rocky.oswego.edu) @@ -171,22 +171,22 @@ inline int operator != (const Rational& x, const Rational& y) inline int operator < (const Rational& x, const Rational& y) { - return compare(x, y) < 0; + return compare(x, y) < 0; } inline int operator <= (const Rational& x, const Rational& y) { - return compare(x, y) <= 0; + return compare(x, y) <= 0; } inline int operator > (const Rational& x, const Rational& y) { - return compare(x, y) > 0; + return compare(x, y) > 0; } inline int operator >= (const Rational& x, const Rational& y) { - return compare(x, y) >= 0; + return compare(x, y) >= 0; } inline int sign(const Rational& x) @@ -200,25 +200,25 @@ inline void Rational::negate() } -inline Rational& Rational::operator += (const Rational& y) +inline Rational& Rational::operator += (const Rational& y) { add(*this, y, *this); return *this; } -inline Rational& Rational::operator -= (const Rational& y) +inline Rational& Rational::operator -= (const Rational& y) { sub(*this, y, *this); return *this; } -inline Rational& Rational::operator *= (const Rational& y) +inline Rational& Rational::operator *= (const Rational& y) { mul(*this, y, *this); return *this; } -inline Rational& Rational::operator /= (const Rational& y) +inline Rational& Rational::operator /= (const Rational& y) { div(*this, y, *this); return *this; @@ -264,7 +264,7 @@ inline Rational operator / (const Rational& x, const Rational& y) return r #else /* NO_NRV */ -inline Rational operator + (const Rational& x, const Rational& y) +inline Rational operator + (const Rational& x, const Rational& y) { Rational r; add(x, y, r); return r; } diff --git a/gnu/lib/libg++/include/Regex.h b/gnu/lib/libg++/include/Regex.h index c8cf731..adc1cea 100644 --- a/gnu/lib/libg++/include/Regex.h +++ b/gnu/lib/libg++/include/Regex.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Doug Lea (dl@rocky.oswego.edu) @@ -44,15 +44,15 @@ protected: re_registers* reg; public: - Regex(const char* t, - int fast = 0, - int bufsize = 40, + Regex(const char* t, + int fast = 0, + int bufsize = 40, const char* transtable = 0); ~Regex(); int match(const char* s, int len, int pos = 0) const; - int search(const char* s, int len, + int search(const char* s, int len, int& matchlen, int startpos = 0) const; int match_info(int& start, int& length, int nth = 0) const; diff --git a/gnu/lib/libg++/include/RndInt.h b/gnu/lib/libg++/include/RndInt.h index b16c7f8..bf0f955 100644 --- a/gnu/lib/libg++/include/RndInt.h +++ b/gnu/lib/libg++/include/RndInt.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1990 Free Software Foundation adapted from a submission from John Reidl <riedl@cs.purdue.edu> @@ -40,13 +40,13 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. // in a specified range. By default the range is 0..1. Since in my // experience random numbers are often needed for a wide variety of // ranges in the same program, this generator accepts a new low or high value -// as an argument to the asLong and operator() methods to temporarily +// as an argument to the asLong and operator() methods to temporarily // override stored values #include <math.h> #include <RNG.h> -class RandomInteger +class RandomInteger { protected: RNG *pGenerator; @@ -90,20 +90,20 @@ class RandomInteger }; -inline RandomInteger::RandomInteger(long low, long high, RNG *gen) +inline RandomInteger::RandomInteger(long low, long high, RNG *gen) : pLow((low < high) ? low : high), pHigh((low < high) ? high : low), pGenerator(gen) {} -inline RandomInteger::RandomInteger(long high, RNG *gen) +inline RandomInteger::RandomInteger(long high, RNG *gen) : pLow((0 < high) ? 0 : high), pHigh((0 < high) ? high : 0), pGenerator(gen) {} - -inline RandomInteger::RandomInteger(RNG *gen) + +inline RandomInteger::RandomInteger(RNG *gen) : pLow(0), pHigh(1), pGenerator(gen) @@ -113,28 +113,28 @@ inline RNG* RandomInteger::generator() const { return pGenerator;} inline long RandomInteger::low() const { return pLow; } inline long RandomInteger::high() const { return pHigh; } -inline RNG* RandomInteger::generator(RNG *gen) +inline RNG* RandomInteger::generator(RNG *gen) { RNG *tmp = pGenerator; pGenerator = gen; return tmp; } -inline long RandomInteger::low(long x) +inline long RandomInteger::low(long x) { long tmp = pLow; pLow = x; return tmp; } -inline long RandomInteger:: high(long x) +inline long RandomInteger:: high(long x) { long tmp = pHigh; pHigh = x; return tmp; } inline long RandomInteger:: _asLong(long low, long high) -{ +{ return (pGenerator->asLong() % (high-low+1)) + low; } -inline long RandomInteger:: asLong() +inline long RandomInteger:: asLong() { return _asLong(pLow, pHigh); } @@ -149,7 +149,7 @@ inline long RandomInteger:: asLong(long low, long high) return _asLong(low, high); } -inline long RandomInteger:: operator () () +inline long RandomInteger:: operator () () { return _asLong(pLow, pHigh); } @@ -167,7 +167,7 @@ inline long RandomInteger:: operator () (long low, long high) -inline int RandomInteger:: asInt() +inline int RandomInteger:: asInt() { return int(asLong()); } diff --git a/gnu/lib/libg++/include/SFile.h b/gnu/lib/libg++/include/SFile.h index 3726844..d4b4c71 100644 --- a/gnu/lib/libg++/include/SFile.h +++ b/gnu/lib/libg++/include/SFile.h @@ -41,10 +41,10 @@ public: SFile(int fd, int size); SFile(const char *name, int size, int mode, int prot=0664); void open(const char *name, int size, int mode, int prot=0664); - + int size() { return sz; } int setsize(int s) { int old = sz; sz = s; return old; } - + SFile& get(void* x); SFile& put(void* x); SFile& operator[](long i); diff --git a/gnu/lib/libg++/include/SLList.h b/gnu/lib/libg++/include/SLList.h index 8c133d7..4be457f 100644 --- a/gnu/lib/libg++/include/SLList.h +++ b/gnu/lib/libg++/include/SLList.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988, 1992 Free Software Foundation written by Doug Lea (dl@rocky.oswego.edu) @@ -104,7 +104,7 @@ public: Pix ins_after(Pix p, const T& item) { return BaseSLList::ins_after(p, &item); } void join(SLList<T>& a) { BaseSLList::join(a); } - + T& front() { if (last == 0) error("front: empty list"); return ((SLNode<T>*)last->tl)->hd; } diff --git a/gnu/lib/libg++/include/SmplHist.h b/gnu/lib/libg++/include/SmplHist.h index a9a7550..54614b9 100644 --- a/gnu/lib/libg++/include/SmplHist.h +++ b/gnu/lib/libg++/include/SmplHist.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Dirk Grunwald (grunwald@cs.uiuc.edu) @@ -28,7 +28,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. extern const int SampleHistogramMinimum; extern const int SampleHistogramMaximum; -class SampleHistogram : public SampleStatistic +class SampleHistogram : public SampleStatistic { protected: short howManyBuckets; @@ -36,7 +36,7 @@ protected: double *bucketLimit; public: - + SampleHistogram(double low, double hi, double bucketWidth = -1.0); ~SampleHistogram(); diff --git a/gnu/lib/libg++/include/SmplStat.h b/gnu/lib/libg++/include/SmplStat.h index 191ec67..2ed5ab9 100644 --- a/gnu/lib/libg++/include/SmplStat.h +++ b/gnu/lib/libg++/include/SmplStat.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Dirk Grunwald (grunwald@cs.uiuc.edu) @@ -34,7 +34,7 @@ protected: SampleStatistic(); virtual ~SampleStatistic(); - virtual void reset(); + virtual void reset(); virtual void operator+=(double); int samples(); @@ -54,7 +54,7 @@ protected: extern void default_SampleStatistic_error_handler(const char*); extern one_arg_error_handler_t SampleStatistic_error_handler; -extern one_arg_error_handler_t +extern one_arg_error_handler_t set_SampleStatistic_error_handler(one_arg_error_handler_t f); inline SampleStatistic:: SampleStatistic(){ reset();} diff --git a/gnu/lib/libg++/include/String.h b/gnu/lib/libg++/include/String.h index 95b2bdf..7a3d82b 100644 --- a/gnu/lib/libg++/include/String.h +++ b/gnu/lib/libg++/include/String.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Doug Lea (dl@rocky.oswego.edu) @@ -28,9 +28,9 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. struct StrRep // internal String representations { - unsigned short len; // string length + unsigned short len; // string length unsigned short sz; // allocated space - char s[1]; // the string starts here + char s[1]; // the string starts here // (at least 1 char for trailing null) // allocated & expanded via non-public fcts }; @@ -89,7 +89,7 @@ public: int matches(const Regex& r) const; -// IO +// IO friend ostream& operator<<(ostream& s, const SubString& x); @@ -99,7 +99,7 @@ public: int empty() const; const char* chars() const; - int OK() const; + int OK() const; }; @@ -140,12 +140,12 @@ public: // concatenation - String& operator += (const String& y); + String& operator += (const String& y); String& operator += (const SubString& y); String& operator += (const char* t); String& operator += (char c); - void prepend(const String& y); + void prepend(const String& y); void prepend(const SubString& y); void prepend(const char* t); void prepend(char c); @@ -169,7 +169,7 @@ public: friend inline void cat(const char*, const char*, String&); friend inline void cat(const char*, char, String&); -// double concatenation, by request. (yes, there are too many versions, +// double concatenation, by request. (yes, there are too many versions, // but if one is supported, then the others should be too...) // Concatenate first 3 args, store in last arg @@ -204,11 +204,11 @@ public: // return position of target in string or -1 for failure - int index(char c, int startpos = 0) const; - int index(const String& y, int startpos = 0) const; - int index(const SubString& y, int startpos = 0) const; - int index(const char* t, int startpos = 0) const; - int index(const Regex& r, int startpos = 0) const; + int index(char c, int startpos = 0) const; + int index(const String& y, int startpos = 0) const; + int index(const SubString& y, int startpos = 0) const; + int index(const char* t, int startpos = 0) const; + int index(const Regex& r, int startpos = 0) const; // return 1 if target appears anyhere in String; else 0 @@ -218,7 +218,7 @@ public: int contains(const char* t) const; int contains(const Regex& r) const; -// return 1 if target appears anywhere after position pos +// return 1 if target appears anywhere after position pos // (or before, if pos is negative) in String; else 0 int contains(char c, int pos) const; @@ -237,7 +237,7 @@ public: // return number of occurences of target in String - int freq(char c) const; + int freq(char c) const; int freq(const String& y) const; int freq(const SubString& y) const; int freq(const char* t) const; @@ -251,11 +251,11 @@ public: SubString at(int pos, int len); SubString operator () (int pos, int len); // synonym for at - SubString at(const String& x, int startpos = 0); - SubString at(const SubString& x, int startpos = 0); + SubString at(const String& x, int startpos = 0); + SubString at(const SubString& x, int startpos = 0); SubString at(const char* t, int startpos = 0); SubString at(char c, int startpos = 0); - SubString at(const Regex& r, int startpos = 0); + SubString at(const Regex& r, int startpos = 0); SubString before(int pos); SubString before(const String& x, int startpos = 0); @@ -311,14 +311,14 @@ public: // split string into array res at separators; return number of elements - friend int split(const String& x, String res[], int maxn, + friend int split(const String& x, String res[], int maxn, const String& sep); - friend int split(const String& x, String res[], int maxn, + friend int split(const String& x, String res[], int maxn, const Regex& sep); - friend String common_prefix(const String& x, const String& y, + friend String common_prefix(const String& x, const String& y, int startpos = 0); - friend String common_suffix(const String& x, const String& y, + friend String common_suffix(const String& x, const String& y, int startpos = -1); friend String replicate(char c, int n); friend String replicate(const String& y, int n); @@ -358,7 +358,7 @@ public: friend ostream& operator<<(ostream& s, const SubString& x); friend istream& operator>>(istream& s, String& x); - friend int readline(istream& s, String& x, + friend int readline(istream& s, String& x, char terminator = '\n', int discard_terminator = 1); @@ -409,17 +409,17 @@ inline const char* SubString::chars() const { return &(S.rep->s[pos]); } // constructors -inline String::String() +inline String::String() : rep(&_nilStrRep) {} -inline String::String(const String& x) +inline String::String(const String& x) : rep(Scopy(0, x.rep)) {} -inline String::String(const char* t) +inline String::String(const char* t) : rep(Salloc(0, t, -1, -1)) {} inline String::String(const char* t, int tlen) : rep(Salloc(0, t, tlen, tlen)) {} inline String::String(const SubString& y) : rep(Salloc(0, y.chars(), y.length(), y.length())) {} -inline String::String(char c) +inline String::String(char c) : rep(Salloc(0, &c, 1, 1)) {} inline String::~String() { if (rep != &_nilStrRep) delete rep; } @@ -434,7 +434,7 @@ inline SubString::~SubString() {} // assignment inline String& String::operator = (const String& y) -{ +{ rep = Scopy(rep, y.rep); return *this; } @@ -773,67 +773,67 @@ inline String operator + (const String& x, const String& y) String r; cat(x, y, r); return r; } -inline String operator + (const String& x, const SubString& y) +inline String operator + (const String& x, const SubString& y) { String r; cat(x, y, r); return r; } -inline String operator + (const String& x, const char* y) +inline String operator + (const String& x, const char* y) { String r; cat(x, y, r); return r; } -inline String operator + (const String& x, char y) +inline String operator + (const String& x, char y) { String r; cat(x, y, r); return r; } -inline String operator + (const SubString& x, const String& y) +inline String operator + (const SubString& x, const String& y) { String r; cat(x, y, r); return r; } -inline String operator + (const SubString& x, const SubString& y) +inline String operator + (const SubString& x, const SubString& y) { String r; cat(x, y, r); return r; } -inline String operator + (const SubString& x, const char* y) +inline String operator + (const SubString& x, const char* y) { String r; cat(x, y, r); return r; } -inline String operator + (const SubString& x, char y) +inline String operator + (const SubString& x, char y) { String r; cat(x, y, r); return r; } -inline String operator + (const char* x, const String& y) +inline String operator + (const char* x, const String& y) { String r; cat(x, y, r); return r; } -inline String operator + (const char* x, const SubString& y) +inline String operator + (const char* x, const SubString& y) { String r; cat(x, y, r); return r; } -inline String reverse(const String& x) +inline String reverse(const String& x) { String r; r.rep = Sreverse(x.rep, r.rep); return r; } -inline String upcase(const String& x) +inline String upcase(const String& x) { String r; r.rep = Supcase(x.rep, r.rep); return r; } -inline String downcase(const String& x) +inline String downcase(const String& x) { String r; r.rep = Sdowncase(x.rep, r.rep); return r; } -inline String capitalize(const String& x) +inline String capitalize(const String& x) { String r; r.rep = Scapitalize(x.rep, r.rep); return r; } @@ -849,12 +849,12 @@ inline void String::prepend(const String& y) inline void String::prepend(const char* y) { - rep = Sprepend(rep, y, -1); + rep = Sprepend(rep, y, -1); } inline void String::prepend(char y) { - rep = Sprepend(rep, &y, 1); + rep = Sprepend(rep, &y, 1); } inline void String::prepend(const SubString& y) @@ -890,31 +890,31 @@ inline void String::capitalize() // element extraction -inline char& String::operator [] (int i) -{ +inline char& String::operator [] (int i) +{ if (((unsigned)i) >= length()) error("invalid index"); return rep->s[i]; } inline const char& String::operator [] (int i) const -{ +{ if (((unsigned)i) >= length()) error("invalid index"); return rep->s[i]; } inline char String::elem (int i) const -{ +{ if (((unsigned)i) >= length()) error("invalid index"); return rep->s[i]; } inline char String::firstchar() const -{ +{ return elem(0); } inline char String::lastchar() const -{ +{ return elem(length() - 1); } @@ -926,17 +926,17 @@ inline int String::index(char c, int startpos) const } inline int String::index(const char* t, int startpos) const -{ +{ return search(startpos, length(), t); } inline int String::index(const String& y, int startpos) const -{ +{ return search(startpos, length(), y.chars(), y.length()); } inline int String::index(const SubString& y, int startpos) const -{ +{ return search(startpos, length(), y.chars(), y.length()); } @@ -951,17 +951,17 @@ inline int String::contains(char c) const } inline int String::contains(const char* t) const -{ +{ return search(0, length(), t) >= 0; } inline int String::contains(const String& y) const -{ +{ return search(0, length(), y.chars(), y.length()) >= 0; } inline int String::contains(const SubString& y) const -{ +{ return search(0, length(), y.chars(), y.length()) >= 0; } @@ -1024,17 +1024,17 @@ inline int String::matches(const Regex& r, int p) const inline int SubString::contains(const char* t) const -{ +{ return S.search(pos, pos+len, t) >= 0; } inline int SubString::contains(const String& y) const -{ +{ return S.search(pos, pos+len, y.chars(), y.length()) >= 0; } inline int SubString::contains(const SubString& y) const -{ +{ return S.search(pos, pos+len, y.chars(), y.length()) >= 0; } @@ -1088,99 +1088,99 @@ inline ostream& operator<<(ostream& s, const String& x) // a zillion comparison operators -inline int operator==(const String& x, const String& y) +inline int operator==(const String& x, const String& y) { - return compare(x, y) == 0; + return compare(x, y) == 0; } inline int operator!=(const String& x, const String& y) { - return compare(x, y) != 0; + return compare(x, y) != 0; } inline int operator>(const String& x, const String& y) { - return compare(x, y) > 0; + return compare(x, y) > 0; } inline int operator>=(const String& x, const String& y) { - return compare(x, y) >= 0; + return compare(x, y) >= 0; } inline int operator<(const String& x, const String& y) { - return compare(x, y) < 0; + return compare(x, y) < 0; } inline int operator<=(const String& x, const String& y) { - return compare(x, y) <= 0; + return compare(x, y) <= 0; } -inline int operator==(const String& x, const SubString& y) +inline int operator==(const String& x, const SubString& y) { - return compare(x, y) == 0; + return compare(x, y) == 0; } inline int operator!=(const String& x, const SubString& y) { - return compare(x, y) != 0; + return compare(x, y) != 0; } -inline int operator>(const String& x, const SubString& y) +inline int operator>(const String& x, const SubString& y) { - return compare(x, y) > 0; + return compare(x, y) > 0; } inline int operator>=(const String& x, const SubString& y) { - return compare(x, y) >= 0; + return compare(x, y) >= 0; } -inline int operator<(const String& x, const SubString& y) +inline int operator<(const String& x, const SubString& y) { - return compare(x, y) < 0; + return compare(x, y) < 0; } inline int operator<=(const String& x, const SubString& y) { - return compare(x, y) <= 0; + return compare(x, y) <= 0; } -inline int operator==(const String& x, const char* t) +inline int operator==(const String& x, const char* t) { - return compare(x, t) == 0; + return compare(x, t) == 0; } -inline int operator!=(const String& x, const char* t) +inline int operator!=(const String& x, const char* t) { - return compare(x, t) != 0; + return compare(x, t) != 0; } -inline int operator>(const String& x, const char* t) +inline int operator>(const String& x, const char* t) { - return compare(x, t) > 0; + return compare(x, t) > 0; } -inline int operator>=(const String& x, const char* t) +inline int operator>=(const String& x, const char* t) { - return compare(x, t) >= 0; + return compare(x, t) >= 0; } -inline int operator<(const String& x, const char* t) +inline int operator<(const String& x, const char* t) { - return compare(x, t) < 0; + return compare(x, t) < 0; } -inline int operator<=(const String& x, const char* t) +inline int operator<=(const String& x, const char* t) { - return compare(x, t) <= 0; + return compare(x, t) <= 0; } -inline int operator==(const SubString& x, const String& y) +inline int operator==(const SubString& x, const String& y) { - return compare(y, x) == 0; + return compare(y, x) == 0; } inline int operator!=(const SubString& x, const String& y) @@ -1188,29 +1188,29 @@ inline int operator!=(const SubString& x, const String& y) return compare(y, x) != 0; } -inline int operator>(const SubString& x, const String& y) +inline int operator>(const SubString& x, const String& y) { return compare(y, x) < 0; } -inline int operator>=(const SubString& x, const String& y) +inline int operator>=(const SubString& x, const String& y) { return compare(y, x) <= 0; } -inline int operator<(const SubString& x, const String& y) +inline int operator<(const SubString& x, const String& y) { return compare(y, x) > 0; } -inline int operator<=(const SubString& x, const String& y) +inline int operator<=(const SubString& x, const String& y) { return compare(y, x) >= 0; } -inline int operator==(const SubString& x, const SubString& y) +inline int operator==(const SubString& x, const SubString& y) { - return compare(x, y) == 0; + return compare(x, y) == 0; } inline int operator!=(const SubString& x, const SubString& y) @@ -1218,7 +1218,7 @@ inline int operator!=(const SubString& x, const SubString& y) return compare(x, y) != 0; } -inline int operator>(const SubString& x, const SubString& y) +inline int operator>(const SubString& x, const SubString& y) { return compare(x, y) > 0; } @@ -1228,7 +1228,7 @@ inline int operator>=(const SubString& x, const SubString& y) return compare(x, y) >= 0; } -inline int operator<(const SubString& x, const SubString& y) +inline int operator<(const SubString& x, const SubString& y) { return compare(x, y) < 0; } @@ -1238,34 +1238,34 @@ inline int operator<=(const SubString& x, const SubString& y) return compare(x, y) <= 0; } -inline int operator==(const SubString& x, const char* t) +inline int operator==(const SubString& x, const char* t) { - return compare(x, t) == 0; + return compare(x, t) == 0; } -inline int operator!=(const SubString& x, const char* t) +inline int operator!=(const SubString& x, const char* t) { return compare(x, t) != 0; } -inline int operator>(const SubString& x, const char* t) +inline int operator>(const SubString& x, const char* t) { - return compare(x, t) > 0; + return compare(x, t) > 0; } -inline int operator>=(const SubString& x, const char* t) +inline int operator>=(const SubString& x, const char* t) { - return compare(x, t) >= 0; + return compare(x, t) >= 0; } -inline int operator<(const SubString& x, const char* t) +inline int operator<(const SubString& x, const char* t) { - return compare(x, t) < 0; + return compare(x, t) < 0; } -inline int operator<=(const SubString& x, const char* t) +inline int operator<=(const SubString& x, const char* t) { - return compare(x, t) <= 0; + return compare(x, t) <= 0; } @@ -1275,7 +1275,7 @@ inline SubString String::_substr(int first, int l) { if (first < 0 || (unsigned)(first + l) > length() ) return SubString(_nilString, 0, 0) ; - else + else return SubString(*this, first, l); } diff --git a/gnu/lib/libg++/include/Uniform.h b/gnu/lib/libg++/include/Uniform.h index 5933f6b..91536eb 100644 --- a/gnu/lib/libg++/include/Uniform.h +++ b/gnu/lib/libg++/include/Uniform.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Dirk Grunwald (grunwald@cs.uiuc.edu) @@ -25,7 +25,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. // // The interval [lo..hi] -// +// class Uniform: public Random { double pLow; diff --git a/gnu/lib/libg++/include/Weibull.h b/gnu/lib/libg++/include/Weibull.h index d03567a..c0360dc 100644 --- a/gnu/lib/libg++/include/Weibull.h +++ b/gnu/lib/libg++/include/Weibull.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Dirk Grunwald (grunwald@cs.uiuc.edu) @@ -19,7 +19,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. #ifdef __GNUG__ #pragma interface #endif -#define _Weibull_h +#define _Weibull_h #include <Random.h> @@ -30,7 +30,7 @@ protected: double pBeta; void setState(); - + public: Weibull(double alpha, double beta, RNG *gen); @@ -47,7 +47,7 @@ public: inline void Weibull::setState() { pInvAlpha = 1.0 / pAlpha; } - + inline Weibull::Weibull(double alpha, double beta, RNG *gen) : Random(gen) { pAlpha = alpha; diff --git a/gnu/lib/libg++/include/_G_config.h b/gnu/lib/libg++/include/_G_config.h index fabb570..cbd1acf 100644 --- a/gnu/lib/libg++/include/_G_config.h +++ b/gnu/lib/libg++/include/_G_config.h @@ -1,4 +1,4 @@ -/* AUTOMATICALLY GENERATED; DO NOT EDIT! */ +/* AUTOMATICALLY GENERATED; DO NOT EDIT! */ #include <sys/types.h> #ifndef _G_config_h #define _G_config_h diff --git a/gnu/lib/libg++/include/builtin.h b/gnu/lib/libg++/include/builtin.h index 73bb431..e2d7bce 100644 --- a/gnu/lib/libg++/include/builtin.h +++ b/gnu/lib/libg++/include/builtin.h @@ -1,6 +1,6 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988, 1992 Free Software Foundation written by Doug Lea (dl@rocky.oswego.edu) @@ -42,7 +42,7 @@ typedef void (*one_arg_error_handler_t)(const char*); typedef void (*two_arg_error_handler_t)(const char*, const char*); long gcd(long, long); -long lg(unsigned long); +long lg(unsigned long); double pow(double, long); long pow(long, long); @@ -60,30 +60,30 @@ extern _VOLATILE_VOID default_two_arg_error_handler(const char*, const char*); extern two_arg_error_handler_t lib_error_handler; -extern two_arg_error_handler_t +extern two_arg_error_handler_t set_lib_error_handler(two_arg_error_handler_t f); #if !defined(IV) #if ! _G_MATH_H_INLINES /* hpux and SCO define this in math.h */ -inline double abs(double arg) +inline double abs(double arg) { return (arg < 0.0)? -arg : arg; } #endif -inline float abs(float arg) +inline float abs(float arg) { return (arg < 0.0)? -arg : arg; } -inline short abs(short arg) +inline short abs(short arg) { return (arg < 0)? -arg : arg; } -inline long abs(long arg) +inline long abs(long arg) { return (arg < 0)? -arg : arg; } diff --git a/gnu/lib/libg++/include/builtinbuf.h b/gnu/lib/libg++/include/builtinbuf.h index fb91e6a..d67629a 100644 --- a/gnu/lib/libg++/include/builtinbuf.h +++ b/gnu/lib/libg++/include/builtinbuf.h @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free diff --git a/gnu/lib/libg++/include/compare.h b/gnu/lib/libg++/include/compare.h index bd13614..aec3c30 100644 --- a/gnu/lib/libg++/include/compare.h +++ b/gnu/lib/libg++/include/compare.h @@ -1,6 +1,6 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988 Free Software Foundation written by Doug Lea (dl@rocky.oswego.edu) diff --git a/gnu/lib/libg++/include/defines.h b/gnu/lib/libg++/include/defines.h index 0f2fb3b..f5056b6 100644 --- a/gnu/lib/libg++/include/defines.h +++ b/gnu/lib/libg++/include/defines.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1994 Free Software Foundation written by Jason Merrill (jason@cygnus.com) diff --git a/gnu/lib/libg++/include/editbuf.h b/gnu/lib/libg++/include/editbuf.h index 8535155..2cac3bb 100644 --- a/gnu/lib/libg++/include/editbuf.h +++ b/gnu/lib/libg++/include/editbuf.h @@ -39,9 +39,9 @@ typedef /*unsigned*/ char buf_char; // Logical pos from start of buffer (does not count gap). typedef long buf_index; - + // Pos from start of buffer, possibly including gap_size. -typedef long buf_offset; +typedef long buf_offset; #if 0 struct buf_cookie { diff --git a/gnu/lib/libg++/include/floatio.h b/gnu/lib/libg++/include/floatio.h index edfe297..880f807 100644 --- a/gnu/lib/libg++/include/floatio.h +++ b/gnu/lib/libg++/include/floatio.h @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free diff --git a/gnu/lib/libg++/include/iomanip.h b/gnu/lib/libg++/include/iomanip.h index bf3d6f4..a87e7bf 100644 --- a/gnu/lib/libg++/include/iomanip.h +++ b/gnu/lib/libg++/include/iomanip.h @@ -42,10 +42,10 @@ template<class TP> class smanip; // TP = Type Param template<class TP> class sapp { ios& (*_f)(ios&, TP); -public: +public: sapp(ios& (*f)(ios&, TP)) : _f(f) {} // - smanip<TP> operator()(TP a) + smanip<TP> operator()(TP a) { return smanip<TP>(_f, a); } }; @@ -55,7 +55,7 @@ template <class TP> class smanip { public: smanip(ios& (*f)(ios&, TP), TP a) : _f(f), _a(a) {} // - friend + friend istream& operator>>(istream& i, const smanip<TP>& m); friend ostream& operator<<(ostream& o, const smanip<TP>& m); @@ -85,11 +85,11 @@ extern template ostream& operator<<(ostream&, const smanip<ios::fmtflags>&); // Input-Stream Manipulators //----------------------------------------------------------------------------- // -template<class TP> class imanip; +template<class TP> class imanip; template<class TP> class iapp { istream& (*_f)(istream&, TP); -public: +public: iapp(istream& (*f)(istream&,TP)) : _f(f) {} // imanip<TP> operator()(TP a) @@ -102,7 +102,7 @@ template <class TP> class imanip { public: imanip(istream& (*f)(istream&, TP), TP a) : _f(f), _a(a) {} // - friend + friend istream& operator>>(istream& i, const imanip<TP>& m) { return (*m._f)( i, m._a); } }; @@ -112,11 +112,11 @@ public: // Output-Stream Manipulators //----------------------------------------------------------------------------- // -template<class TP> class omanip; +template<class TP> class omanip; template<class TP> class oapp { ostream& (*_f)(ostream&, TP); -public: +public: oapp(ostream& (*f)(ostream&,TP)) : _f(f) {} // omanip<TP> operator()(TP a) @@ -141,7 +141,7 @@ public: // // Macro to define an iomanip function, with one argument -// The underlying function is `__iomanip_<name>' +// The underlying function is `__iomanip_<name>' // #define __DEFINE_IOMANIP_FN1(type,param,function) \ extern ios& __iomanip_##function (ios&, param); \ diff --git a/gnu/lib/libg++/include/iostream.h b/gnu/lib/libg++/include/iostream.h index e370be2..4802b37 100644 --- a/gnu/lib/libg++/include/iostream.h +++ b/gnu/lib/libg++/include/iostream.h @@ -1,4 +1,4 @@ -/* This is part of libio/iostream, providing -*- C++ -*- input/output. +/* This is part of libio/iostream, providing -*- C++ -*- input/output. Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free diff --git a/gnu/lib/libg++/include/iostreamP.h b/gnu/lib/libg++/include/iostreamP.h index 720deb3..e24c93f 100644 --- a/gnu/lib/libg++/include/iostreamP.h +++ b/gnu/lib/libg++/include/iostreamP.h @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free diff --git a/gnu/lib/libg++/include/libio.h b/gnu/lib/libg++/include/libio.h index 8a9c25b..f00b730 100644 --- a/gnu/lib/libg++/include/libio.h +++ b/gnu/lib/libg++/include/libio.h @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free @@ -185,21 +185,21 @@ struct _IO_FILE { char *_IO_save_end; /* Pointer to end of non-current get area. */ struct _IO_marker *_markers; - + struct _IO_FILE *_chain; - + struct _IO_jump_t *_jumps; /* Jump table */ - + int _fileno; int _blksize; _IO_off_t _offset; - + #define __HAVE_COLUMN /* temporary */ /* 1+column number of pbase(); 0 is unknown. */ unsigned short _cur_column; char _unused; char _shortbuf[1]; - + /* char* _save_gptr; char* _save_egptr; */ }; diff --git a/gnu/lib/libg++/include/libioP.h b/gnu/lib/libg++/include/libioP.h index ca87047..074b9d7 100644 --- a/gnu/lib/libg++/include/libioP.h +++ b/gnu/lib/libg++/include/libioP.h @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free diff --git a/gnu/lib/libg++/include/parsestream.h b/gnu/lib/libg++/include/parsestream.h index b168707..c0dfce2 100644 --- a/gnu/lib/libg++/include/parsestream.h +++ b/gnu/lib/libg++/include/parsestream.h @@ -67,7 +67,7 @@ class parsebuf : public streambuf { // Length of current line, not counting either '\n'. int line_length() { return _line_length; } - // Current line - not a copy, so file ops may trash it. + // Current line - not a copy, so file ops may trash it. virtual char* current_line(); virtual streampos seekoff(streamoff, _seek_dir, int mode=ios::in|ios::out); virtual streambuf* setbuf(char* p, int len); diff --git a/gnu/lib/libg++/include/rx.h b/gnu/lib/libg++/include/rx.h index 0c9db1e..edb26b4 100644 --- a/gnu/lib/libg++/include/rx.h +++ b/gnu/lib/libg++/include/rx.h @@ -67,7 +67,7 @@ typedef int (*rx_sp_comparer) (void * a, void * b); typedef int (*rx_sp_comparer) (); #endif -struct rx_sp_node +struct rx_sp_node { void * key; void * data; @@ -135,7 +135,7 @@ struct rx_hash_rules /* Matchers decide what to do by examining a series of these. * Instruction types are described below. */ -struct rx_inx +struct rx_inx { void * inx; void * data; @@ -179,7 +179,7 @@ struct rx /* --------- The remaining fields are for internal use only. --------- */ /* --------- But! they should be initialized to 0. --------- */ /* NODEC is the number of nodes in the NFA with non-epsilon - * orx transitions. + * orx transitions. */ int nodec; @@ -196,7 +196,7 @@ struct rx /* A memo for sets of states in the possible_future lists of an nfa: */ struct rx_hash set_list_memo; - /* The instruction table is indexed by the enum of instructions defined in + /* The instruction table is indexed by the enum of instructions defined in * rxrun.h. The values in the table are used to fill in the `inx' * slot of instruction frames (see rxrun.h). */ @@ -213,7 +213,7 @@ struct rx /* An RX NFA may contain epsilon edges labeled with side effects. * These side effects represent match actions that can not normally be * defined in a `pure' NFA; for example, recording the location at - * which a paren is crossed in a register structure. + * which a paren is crossed in a register structure. * * A matcher is supposed to find a particular path * through the NFA (such as leftmost-longest), and then to execute the @@ -222,7 +222,7 @@ struct rx * backtracking. * * As the NFA is manipulated during matching sets of side effects. - * Simple lists are used to hold side effect lists. + * Simple lists are used to hold side effect lists. */ typedef void * rx_side_effect; @@ -287,7 +287,7 @@ struct rexp_node struct rx_nfa_state { - int id; + int id; struct rx_nfa_edge *edges; struct rx_possible_future *futures; unsigned int is_final:1; @@ -333,17 +333,17 @@ struct rx_possible_future enum rx_opcode { - /* + /* * BACKTRACK_POINT is invoked when a transition results in more * than one possible future. * * There is one occurence of this instruction per transition_class - * structure; that occurence is only ever executed if the + * structure; that occurence is only ever executed if the * transition_class contains a list of more than 1 edge. */ rx_backtrack_point = 0, /* data is (struct transition_class *) */ - /* + /* * RX_DO_SIDE_EFFECTS evaluates the side effects of an epsilon path. * There is one occurence of this instruction per rx_distinct_future. * This instruction is skipped if a rx_distinct_future has no side effects. @@ -351,7 +351,7 @@ enum rx_opcode rx_do_side_effects = rx_backtrack_point + 1, /* data is (struct rx_distinct_future *) */ - /* + /* * RX_CACHE_MISS instructions are stored in rx_distinct_futures whose * destination superstate has been reclaimed (or was never built). * It recomputes the destination superstate. @@ -361,9 +361,9 @@ enum rx_opcode rx_cache_miss = rx_do_side_effects + 1, /* data is (struct rx_distinct_future *) */ - /* + /* * RX_NEXT_CHAR is called to consume the next character and take the - * corresponding transition. This is the only instruction that uses + * corresponding transition. This is the only instruction that uses * the DATA field of the instruction frame instead of DATA_2. * (see EXPLORE_FUTURE in regex.c). */ @@ -373,7 +373,7 @@ enum rx_opcode */ rx_backtrack = rx_next_char + 1, /* no data */ - /* + /* * RX_ERROR_INX is stored only in places that should never be executed. */ rx_error_inx = rx_backtrack + 1, /* Not supposed to occur. */ @@ -390,7 +390,7 @@ extern void * rx_id_instruction_table[rx_num_instructions]; /* If the instruction is `rx_next_char' then data is valid. Otherwise it's 0 * and data_2 is valid. */ -struct rx_inx +struct rx_inx { void * inx; void * data; @@ -431,7 +431,7 @@ struct rx_superset /* Every character occurs in at most one super edge per super-state. * But, that edge might have more than one option, indicating a point - * of non-determinism. + * of non-determinism. */ struct rx_super_edge { @@ -447,7 +447,7 @@ struct rx_super_edge * without warning. To protect a superstate, use LOCK_SUPERSTATE. * * Joe Keane thought of calling these superstates and several people - * have commented on what a good name it is for what they do. + * have commented on what a good name it is for what they do. */ struct rx_superstate { @@ -501,7 +501,7 @@ typedef void (*rx_morecore_fn)(struct rx_cache *); typedef void (*rx_morecore_fn)(); #endif -/* You use this to control the allocation of superstate data +/* You use this to control the allocation of superstate data * during matching. Most of it should be initialized to 0. * * A MORECORE function is necessary. It should allocate @@ -512,10 +512,10 @@ typedef void (*rx_morecore_fn)(); * the system will try to allocate. The default is 128. Batch style * applications that are very regexp intensive should use as high a number * as possible without thrashing. - * + * * The LOCAL_CSET_SIZE is the number of characters in a character set. * It is therefore the number of entries in a superstate transition table. - * Generally, it should be 256. If your character set has 16 bits, + * Generally, it should be 256. If your character set has 16 bits, * it is better to translate your regexps into equivalent 8 bit patterns. */ @@ -523,7 +523,7 @@ struct rx_cache { struct rx_hash_rules superset_hash_rules; - /* Objects are allocated by incrementing a pointer that + /* Objects are allocated by incrementing a pointer that * scans across rx_blocklists. */ struct rx_blocklist * memory; @@ -614,7 +614,7 @@ typedef enum rx_get_burst_return (*rx_get_burst_fn) (struct rx_string_position * pos, void * app_closure, int stop); - + #else typedef enum rx_get_burst_return (*rx_get_burst_fn) (); #endif @@ -628,7 +628,7 @@ enum rx_back_check_return rx_back_check_fail }; -/* Back_check should advance the position it is passed +/* Back_check should advance the position it is passed * over rparen - lparen characters and return pass iff * the characters starting at POS match those indexed * by [LPAREN..RPAREN]. @@ -645,7 +645,7 @@ typedef enum rx_back_check_return unsigned char * translate, void * app_closure, int stop); - + #else typedef enum rx_back_check_return (*rx_back_check_fn) (); #endif @@ -683,7 +683,7 @@ enum rx_search_return /* regex.h - * + * * The remaining declarations replace regex.h. */ @@ -707,7 +707,7 @@ typedef enum REG_EESCAPE, /* Trailing backslash. */ REG_ESUBREG, /* Invalid back reference. */ REG_EBRACK, /* Unmatched left bracket. */ - REG_EPAREN, /* Parenthesis imbalance. */ + REG_EPAREN, /* Parenthesis imbalance. */ REG_EBRACE, /* Unmatched \{. */ REG_BADBR, /* Invalid contents of \{\}. */ REG_ERANGE, /* Invalid range end. */ @@ -741,8 +741,8 @@ enum re_side_effects }; /* These hold paramaters for the kinds of side effects that are possible - * in the supported pattern languages. These include things like the - * numeric bounds of {} operators and the index of paren registers for + * in the supported pattern languages. These include things like the + * numeric bounds of {} operators and the index of paren registers for * subexpression measurement or backreferencing. */ struct re_se_params @@ -761,10 +761,10 @@ struct re_pattern_buffer unsigned int no_sub:1; /* If set, don't return register offsets. */ unsigned int not_bol:1; /* If set, the anchors ('^' and '$') don't */ - unsigned int not_eol:1; /* match at the ends of the string. */ + unsigned int not_eol:1; /* match at the ends of the string. */ unsigned int newline_anchor:1;/* If true, an anchor at a newline matches.*/ unsigned int least_subs:1; /* If set, and returning registers, return - * as few values as possible. Only + * as few values as possible. Only * backreferenced groups and group 0 (the whole * match) will be returned. */ @@ -780,18 +780,18 @@ struct re_pattern_buffer unsigned int is_anchored:1; /* Anchorded by ^? */ unsigned int begbuf_only:1; /* Anchored to char position 0? */ - + /* If REGS_UNALLOCATED, allocate space in the `regs' structure * for `max (RE_NREGS, re_nsub + 1)' groups. * If REGS_REALLOCATE, reallocate space if necessary. - * If REGS_FIXED, use what's there. + * If REGS_FIXED, use what's there. */ #define REGS_UNALLOCATED 0 #define REGS_REALLOCATE 1 #define REGS_FIXED 2 unsigned int regs_allocated:2; - + /* Either a translate table to apply to all characters before * comparing them, or zero for no translation. The translation * is applied to a pattern when it is compiled and to a string @@ -799,11 +799,11 @@ struct re_pattern_buffer */ unsigned char * translate; - /* If this is a valid pointer, it tells rx not to store the extents of + /* If this is a valid pointer, it tells rx not to store the extents of * certain subexpressions (those corresponding to non-zero entries). * Passing 0x1 is the same as passing an array of all ones. Passing 0x0 * is the same as passing an array of all zeros. - * The array should contain as many entries as their are subexps in the + * The array should contain as many entries as their are subexps in the * regexp. */ char * syntax_parens; @@ -820,7 +820,7 @@ struct re_pattern_buffer char *fastmap; unsigned int fastmap_accurate:1; /* These three are internal. */ - unsigned int can_match_empty:1; + unsigned int can_match_empty:1; struct rx_nfa_state * start; /* The nfa starting state. */ /* This is the list of iterator bounds for {lo,hi} constructs. @@ -871,7 +871,7 @@ typedef struct #define RE_BACKSLASH_ESCAPE_IN_LISTS (1) /* If this bit is not set, then + and ? are operators, and \+ and \? are - literals. + literals. If set, then \+ and \? are operators and + and ? are literals. */ #define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1) @@ -887,7 +887,7 @@ typedef struct ^ is an anchor if it is at the beginning of a regular expression or after an open-group or an alternation operator; $ is an anchor if it is at the end of a regular expression, or - before a close-group or an alternation operator. + before a close-group or an alternation operator. This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because POSIX draft 11.2 says that * etc. in leading positions is undefined. @@ -898,7 +898,7 @@ typedef struct /* If this bit is set, then special characters are always special regardless of where they are in the pattern. If this bit is not set, then special characters are special only in - some contexts; otherwise they are ordinary. Specifically, + some contexts; otherwise they are ordinary. Specifically, * + ? and intervals are only special when not after the beginning, open-group, or alternation operator. */ #define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1) @@ -920,7 +920,7 @@ typedef struct #define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1) /* If this bit is set, either \{...\} or {...} defines an - interval, depending on RE_NO_BK_BRACES. + interval, depending on RE_NO_BK_BRACES. If not set, \{, \}, {, and } are literals. */ #define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1) @@ -945,7 +945,7 @@ typedef struct If not set, then \<digit> is a back-reference. */ #define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1) -/* If this bit is set, then | is an alternation operator, and \| is literal. +/* If this bit is set, then | is an alternation operator, and \| is literal. If not set, then \| is an alternation operator, and | is literal. */ #define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1) @@ -967,7 +967,7 @@ extern reg_syntax_t re_syntax_options; /* Define combinations of the above bits for the standard possibilities. (The [[[ comments delimit what gets put into the Texinfo file, so - don't delete them!) */ + don't delete them!) */ /* [[[begin syntaxes]]] */ #define RE_SYNTAX_EMACS 0 @@ -1031,7 +1031,7 @@ extern reg_syntax_t re_syntax_options; #ifdef RE_DUP_MAX #undef RE_DUP_MAX #endif -#define RE_DUP_MAX ((1 << 15) - 1) +#define RE_DUP_MAX ((1 << 15) - 1) #if !defined(BSD) || (BSD < 199306) @@ -1044,7 +1044,7 @@ extern reg_syntax_t re_syntax_options; /* If this bit is set, then ignore case when matching. If not set, then case is significant. */ #define REG_ICASE (REG_EXTENDED << 1) - + /* If this bit is set, then anchors do not match at newline characters in the string. If not set, then anchors do match at newlines. */ @@ -1070,7 +1070,7 @@ extern reg_syntax_t re_syntax_options; /* If `regs_allocated' is REGS_UNALLOCATED in the pattern buffer, * `re_match_2' returns information about at least this many registers - * the first time a `regs' structure is passed. + * the first time a `regs' structure is passed. * * Also, this is the greatest number of backreferenced subexpressions * allowed in a pattern being matched without caller-supplied registers. @@ -1087,7 +1087,7 @@ extern char rx_version_string[]; #ifdef RX_WANT_RX_DEFS /* This is decls to the interesting subsystems and lower layers - * of rx. Everything which doesn't have a public counterpart in + * of rx. Everything which doesn't have a public counterpart in * regex.c is declared here. */ @@ -1318,7 +1318,7 @@ struct rx_backtrack_frame { char * counter_stack_sp; - /* A frame is used to save the matchers state when it crosses a + /* A frame is used to save the matchers state when it crosses a * backtracking point. The `stk_' fields correspond to variables * in re_search_2 (just strip off thes `stk_'). They are documented * tere. @@ -1331,7 +1331,7 @@ struct rx_backtrack_frame int stk_test_ret; /* This is the list of options left to explore at the backtrack - * point for which this frame was created. + * point for which this frame was created. */ struct rx_distinct_future * df; struct rx_distinct_future * first_df; @@ -1407,15 +1407,15 @@ struct rx_search_state int * best_lpspace; /* in case the user doesn't want these */ int * best_rpspace; /* values, we still need space to store * them. Normally, this memoryis unused - * and the space pointed to by REGS is + * and the space pointed to by REGS is * used instead. */ - + int last_l; /* Highest index of a valid lparen. */ int last_r; /* It's dual. */ - + int * best_lparen; /* This contains the best known register */ - int * best_rparen; /* assignments. + int * best_rparen; /* assignments. * This may point to the same mem as * best_lpspace, or it might point to memory * passed by the caller. @@ -1424,7 +1424,7 @@ struct rx_search_state int best_last_r; - unsigned char * translate; + unsigned char * translate; struct rx_string_position outer_pos; @@ -1443,7 +1443,7 @@ struct rx_search_state rx_get_burst_fn saved_get_burst; rx_back_check_fn saved_back_check; struct re_registers * saved_regs; - + /** ** state for fastmap **/ @@ -1455,23 +1455,23 @@ struct rx_search_state enum rx_fastmap_entry fastmap_resume_pt; /** - ** state for test_match + ** state for test_match **/ /* The current superNFA position of the matcher. */ struct rx_superstate * super; - + /* The matcher interprets a series of instruction frames. * This is the `instruction counter' for the interpretation. */ struct rx_inx * ifr; - + /* We insert a ghost character in the string to prime * the nfa. test_pos.pos, test_pos.str_half, and test_pos.end_half * keep track of the test-match position and string-half. */ unsigned char c; - + /* Position within the string. */ struct rx_string_position test_pos; @@ -1481,7 +1481,7 @@ struct rx_search_state int chunk_bytes; struct rx_stack_chunk * free_chunks; - /* To return from this function, set test_ret and + /* To return from this function, set test_ret and * `goto test_do_return'. * * Possible return values are: @@ -1501,14 +1501,14 @@ struct rx_search_state int test_ret; int could_have_continued; - + #ifdef RX_DEBUG int backtrack_depth; /* There is a search tree with every node as set of deterministic - * transitions in the super nfa. For every branch of a + * transitions in the super nfa. For every branch of a * backtrack point is an edge in the tree. * This counts up a pre-order of nodes in that tree. - * It's saved on the search stack and printed when debugging. + * It's saved on the search stack and printed when debugging. */ int line_no; int lines_found; @@ -1521,7 +1521,7 @@ struct rx_search_state struct rx_inx * saved_this_tr_table; int saved_reg; struct rx_backtrack_frame * saved_bf; - + }; @@ -1536,7 +1536,7 @@ init_fastmap (rxb, search_state) search_state->fastmap = (rxb->fastmap ? (char *)rxb->fastmap : (char *)rx_slowmap); - /* Update the fastmap now if not correct already. + /* Update the fastmap now if not correct already. * When the regexp was compiled, the fastmap was computed * and stored in a bitset. This expands the bitset into a * character array containing 1s and 0s. @@ -1586,7 +1586,7 @@ fastmap_search (rxb, stop, get_burst, app_closure, search_state) * This sentinal will trap the fastmap loop when it reaches the last * valid character in a string half. * - * This must be reset when the fastmap/search loop crosses a string + * This must be reset when the fastmap/search loop crosses a string * boundry, and before returning to the caller. So sometimes, * the fastmap loop is restarted with `continue', othertimes by * `goto init_fastmap_sentinal'. @@ -1605,7 +1605,7 @@ fastmap_search (rxb, stop, get_burst, app_closure, search_state) search_state->fastmap_chr = -1; search_state->fastmap_val = 0; } - + if (search_state->outer_pos.pos >= search_state->outer_pos.end) goto fastmap_hit_bound; else @@ -1629,7 +1629,7 @@ fastmap_search (rxb, stop, get_burst, app_closure, search_state) ++search_state->outer_pos.pos; if (*search_state->outer_pos.pos != search_state->fastmap_chr) return rx_fastmap_ok; - else + else { ++search_state->outer_pos.pos; if (search_state->outer_pos.pos == search_state->outer_pos.end) @@ -1659,7 +1659,7 @@ fastmap_search (rxb, stop, get_burst, app_closure, search_state) --search_state->outer_pos.pos; if ((*search_state->outer_pos.pos != search_state->fastmap_chr) || search_state->fastmap_val) return rx_fastmap_ok; - else + else { --search_state->outer_pos.pos; if (search_state->outer_pos.pos == bound) @@ -1669,12 +1669,12 @@ fastmap_search (rxb, stop, get_burst, app_closure, search_state) } } } - + case rx_fastmap_string_break: fastmap_hit_bound: { /* If we hit a bound, it may be time to fetch another burst - * of string, or it may be time to return a continuation to + * of string, or it may be time to return a continuation to * the caller, or it might be time to fail. */ @@ -1692,7 +1692,7 @@ fastmap_search (rxb, stop, get_burst, app_closure, search_state) case rx_get_burst_ok: goto init_fastmap_sentinal; case rx_get_burst_no_more: - /* ...not a string split, simply no more string. + /* ...not a string split, simply no more string. * * When searching backward, running out of string * is reason to quit. @@ -1714,7 +1714,7 @@ fastmap_search (rxb, stop, get_burst, app_closure, search_state) #ifdef emacs /* The `emacs' switch turns on certain matching commands - * that make sense only in Emacs. + * that make sense only in Emacs. */ #include "config.h" #include "lisp.h" @@ -1731,7 +1731,7 @@ fastmap_search (rxb, stop, get_burst, app_closure, search_state) #else /* not RX_RX_MEMDBUG */ /* We used to test for `BSTRING' here, but only GCC and Emacs define - * `BSTRING', as far as I know, and neither of them use this code. + * `BSTRING', as far as I know, and neither of them use this code. */ #if HAVE_STRING_H || STDC_HEADERS #include <string.h> @@ -1767,7 +1767,7 @@ char *realloc (); * This must be nonzero for the wordchar and notwordchar pattern * commands in re_match_2. */ -#ifndef Sword +#ifndef Sword #define Sword 1 #endif @@ -1780,7 +1780,7 @@ RX_DECL char re_syntax_table[CHAR_SET_SIZE]; /* Test if at very beginning or at very end of the virtual concatenation - * of `string1' and `string2'. If only one string, it's `string2'. + * of `string1' and `string2'. If only one string, it's `string2'. */ #define AT_STRINGS_BEG() \ @@ -1799,14 +1799,14 @@ RX_DECL char re_syntax_table[CHAR_SET_SIZE]; * the first character in string2; and if before the beginning of * string2, look at the last character in string1. * - * Assumes `string1' exists, so use in conjunction with AT_STRINGS_BEG (). + * Assumes `string1' exists, so use in conjunction with AT_STRINGS_BEG (). */ #define LETTER_P(POS,OFF) \ ( SYNTAX (fetch_char(POS, OFF, app_closure, stop)) \ == Sword) /* Test if the character at D and the one after D differ with respect - * to being word-constituent. + * to being word-constituent. */ #define AT_WORD_BOUNDARY(d) \ (AT_STRINGS_BEG () || AT_STRINGS_END () || LETTER_P (d,0) != LETTER_P (d, 1)) @@ -1948,17 +1948,17 @@ rx_search (rxb, startpos, range, stop, total_size, = search_state.best_lpspace = search_state.best_rpspace = 0); - + /* figure the number of registers we may need for use in backreferences. - * the number here includes an element for register zero. + * the number here includes an element for register zero. */ search_state.num_regs = rxb->re_nsub + 1; - - + + /* check for out-of-range startpos. */ if ((startpos < 0) || (startpos > total_size)) return rx_search_fail; - + /* fix up range if it might eventually take us outside the string. */ { int endpos; @@ -1968,7 +1968,7 @@ rx_search (rxb, startpos, range, stop, total_size, else if (endpos > total_size) range = total_size - startpos; } - + /* if the search isn't to be a backwards one, don't waste time in a * long search for a pattern that says it is anchored. */ @@ -1979,7 +1979,7 @@ rx_search (rxb, startpos, range, stop, total_size, else range = 1; } - + /* decide whether to use internal or user-provided reg buffers. */ if (!regs || rxb->no_sub) { @@ -1991,7 +1991,7 @@ rx_search (rxb, startpos, range, stop, total_size, search_state.best_rparen = search_state.best_rpspace; } else - { + { /* have the register data arrays been allocated? */ if (rxb->regs_allocated == REGS_UNALLOCATED) { /* no. so allocate them with malloc. we need one @@ -2025,7 +2025,7 @@ rx_search (rxb, startpos, range, stop, total_size, } else if (rxb->regs_allocated != REGS_FIXED) return rx_search_error; - + if (regs->num_regs < search_state.num_regs + 1) { search_state.best_lpspace = @@ -2043,38 +2043,38 @@ rx_search (rxb, startpos, range, stop, total_size, search_state.best_rparen = regs->end; } } - + search_state.lparen = (int *) REGEX_ALLOCATE (search_state.num_regs * sizeof(int )); search_state.rparen = (int *) REGEX_ALLOCATE (search_state.num_regs * sizeof(int )); - + if (! ( search_state.best_rparen && search_state.best_lparen && search_state.lparen && search_state.rparen)) return rx_search_error; - + search_state.best_last_l = search_state.best_last_r = -1; - + search_state.translate = (rxb->translate ? rxb->translate : rx_id_translation); - - - + + + /* - * two nfa's were compiled. + * two nfa's were compiled. * `0' is complete. * `1' faster but gets registers wrong and ends too soon. */ search_state.nfa_choice = (regs && !rxb->least_subs) ? '\0' : '\1'; - + /* we have the option to look for the best match or the first * one we can find. if the user isn't asking for register information, * we don't need to find the best match. */ search_state.first_found = !regs; - + if (range >= 0) { search_state.outer_pos.search_end = MIN (total_size, startpos + range) + 1; @@ -2085,20 +2085,20 @@ rx_search (rxb, startpos, range, stop, total_size, search_state.outer_pos.search_end = MAX(-1, startpos + range); search_state.outer_pos.search_direction = -1; } - + /* the vacuous search always turns up nothing. */ if ((search_state.outer_pos.search_direction == 1) ? (startpos > search_state.outer_pos.search_end) : (startpos < search_state.outer_pos.search_end)) return rx_search_fail; - + /* now we build the starting state of the supernfa. */ { struct rx_superset * start_contents; struct rx_nfa_state_set * start_nfa_set; - + /* we presume here that the nfa start state has only one - * possible future with no side effects. + * possible future with no side effects. */ start_nfa_set = rxb->start->futures->destset; if ( rxb->rx.start_set @@ -2110,10 +2110,10 @@ rx_search (rxb, startpos, range, stop, total_size, rx_superstate_eclosure_union (&rxb->rx, rx_superset_cons (&rxb->rx, 0, 0), start_nfa_set); - + if (!start_contents) return rx_search_fail; - + start_contents->starts_for = &rxb->rx; rxb->rx.start_set = start_contents; } @@ -2126,7 +2126,7 @@ rx_search (rxb, startpos, range, stop, total_size, else { rx_protect_superset (&rxb->rx, start_contents); - + search_state.start_super = rx_superstate (&rxb->rx, start_contents); if (!search_state.start_super) return rx_search_fail; @@ -2134,9 +2134,9 @@ rx_search (rxb, startpos, range, stop, total_size, rx_release_superset (&rxb->rx, start_contents); } } - - - + + + ( search_state.outer_pos.string = search_state.outer_pos.end = 0); @@ -2166,8 +2166,8 @@ rx_search (rxb, startpos, range, stop, total_size, break; } } - - /* now the fastmap loop has brought us to a plausible + + /* now the fastmap loop has brought us to a plausible * starting point for a match. so, it's time to run the * nfa and see if a match occured. */ @@ -2225,12 +2225,12 @@ rx_search (rxb, startpos, range, stop, total_size, : (startpos > search_state.outer_pos.search_end)) goto pseudo_do; - + finish: uninit_fastmap (rxb, &search_state); if (search_state.start_super) rx_unlock_superstate (&rxb->rx, search_state.start_super); - + #ifdef regex_malloc if (search_state.lparen) free (search_state.lparen); if (search_state.rparen) free (search_state.rparen); @@ -2255,7 +2255,7 @@ rx_search (rxb, startpos, range, stop, total_size, search_state.lparen[0] = startpos; search_state.super = search_state.start_super; search_state.c = search_state.nfa_choice; - search_state.test_pos.pos = search_state.outer_pos.pos - 1; + search_state.test_pos.pos = search_state.outer_pos.pos - 1; search_state.test_pos.string = search_state.outer_pos.string; search_state.test_pos.end = search_state.outer_pos.end; search_state.test_pos.offset = search_state.outer_pos.offset; @@ -2272,8 +2272,8 @@ rx_search (rxb, startpos, range, stop, total_size, search_state.free_chunks = 0; search_state.test_ret = rx_test_line_finished; search_state.could_have_continued = 0; - } - /* This is while (1)...except that the body of the loop is interrupted + } + /* This is while (1)...except that the body of the loop is interrupted * by some alternative entry points. */ pseudo_while_1: @@ -2288,42 +2288,42 @@ rx_search (rxb, startpos, range, stop, total_size, case rx_test_start: #ifdef RX_DEBUG /* There is a search tree with every node as set of deterministic - * transitions in the super nfa. For every branch of a + * transitions in the super nfa. For every branch of a * backtrack point is an edge in the tree. * This counts up a pre-order of nodes in that tree. - * It's saved on the search stack and printed when debugging. + * It's saved on the search stack and printed when debugging. */ search_state.line_no = 0; search_state.lines_found = 0; #endif - + top_of_cycle: - /* A superstate is basicly a transition table, indexed by - * characters from the string being tested, and containing + /* A superstate is basicly a transition table, indexed by + * characters from the string being tested, and containing * RX_INX (`instruction frame') structures. */ search_state.ifr = &search_state.super->transitions [search_state.c]; - + recurse_test_match: /* This is the point to which control is sent when the * test matcher `recurses'. Before jumping here, some variables * need to be saved on the stack and the next instruction frame * has to be computed. */ - + restart: /* Some instructions don't advance the matcher, but just * carry out some side effects and fetch a new instruction. * To dispatch that new instruction, `goto restart'. */ - + { struct rx_inx * next_tr_table; struct rx_inx * this_tr_table; - /* The fastest route through the loop is when the instruction + /* The fastest route through the loop is when the instruction * is RX_NEXT_CHAR. This case is detected when SEARCH_STATE.IFR->DATA * is non-zero. In that case, it points to the next - * superstate. + * superstate. * * This allows us to not bother fetching the bytecode. */ @@ -2335,19 +2335,19 @@ rx_search (rxb, startpos, range, stop, total_size, if (rx_debug_trace) { struct rx_superset * setp; - + fprintf (stderr, "%d %d>> re_next_char @ %d (%d)", search_state.line_no, search_state.backtrack_depth, (search_state.test_pos.pos - search_state.test_pos.string + search_state.test_pos.offset), search_state.c); - + search_state.super = ((struct rx_superstate *) ((char *)this_tr_table - ((unsigned long) ((struct rx_superstate *)0)->transitions))); - + setp = search_state.super->contents; fprintf (stderr, " superstet (rx=%d, &=%x: ", rxb->rx.rx_id, setp); @@ -2374,22 +2374,22 @@ rx_search (rxb, startpos, range, stop, total_size, search_state.saved_next_tr_table = next_tr_table; test_pc = rx_test_cache_hit_loop; goto test_return_continuation; - + resume_continuation_1: /* Continuation one jumps here to do its work: */ search_state.saved_this_tr_table = this_tr_table; search_state.saved_next_tr_table = next_tr_table; goto try_burst_1; - + case rx_get_burst_ok: /* get_burst succeeded...keep going */ break; - + case rx_get_burst_no_more: search_state.test_ret = rx_test_line_finished; search_state.could_have_continued = 1; goto test_do_return; - + case rx_get_burst_error: /* An error... */ search_state.test_ret = rx_test_internal_error; @@ -2400,8 +2400,8 @@ rx_search (rxb, startpos, range, stop, total_size, search_state.ifr = this_tr_table + search_state.c; next_tr_table = (struct rx_inx *)search_state.ifr->data; } /* Fast loop through cached transition tables */ - - /* Here when we ran out of cached next-char transitions. + + /* Here when we ran out of cached next-char transitions. * So, it will be necessary to do a more expensive * dispatch on the current instruction. The superstate * pointer is allowed to become invalid during next-char @@ -2413,7 +2413,7 @@ rx_search (rxb, startpos, range, stop, total_size, - ((unsigned long) ((struct rx_superstate *)0)->transitions))); } - + /* We've encountered an instruction other than next-char. * Dispatch that instruction: */ @@ -2422,13 +2422,13 @@ rx_search (rxb, startpos, range, stop, total_size, if (rx_debug_trace) { struct rx_superset * setp = search_state.super->contents; - + fprintf (stderr, "%d %d>> %s @ %d (%d)", search_state.line_no, search_state.backtrack_depth, inx_names[inx], (search_state.test_pos.pos - search_state.test_pos.string + (test_pos.half == 0 ? 0 : size1)), search_state.c); - + fprintf (stderr, " superstet (rx=%d, &=%x: ", rxb->rx.rx_id, setp); while (setp) @@ -2442,8 +2442,8 @@ rx_search (rxb, startpos, range, stop, total_size, switch ((enum rx_opcode)inx) { case rx_do_side_effects: - - /* RX_DO_SIDE_EFFECTS occurs when we cross epsilon + + /* RX_DO_SIDE_EFFECTS occurs when we cross epsilon * edges associated with parentheses, backreferencing, etc. */ { @@ -2463,7 +2463,7 @@ rx_search (rxb, startpos, range, stop, total_size, if (rx_debug_trace) { struct rx_superset * setp = search_state.super->contents; - + fprintf (stderr, "....%d %d>> %s\n", search_state.line_no, search_state.backtrack_depth, efnames[-effect]); @@ -2590,7 +2590,7 @@ rx_search (rxb, startpos, range, stop, total_size, else goto test_do_return; } - + case re_se_try: /* This is the first side effect in every * expression. @@ -2598,7 +2598,7 @@ rx_search (rxb, startpos, range, stop, total_size, * FOR NO GOOD REASON...get rid of it... */ break; - + case re_se_pushpos: { int urhere = @@ -2621,7 +2621,7 @@ rx_search (rxb, startpos, range, stop, total_size, cf->cdr = old_cf; break; } - + case re_se_chkpos: { int urhere = @@ -2637,13 +2637,13 @@ rx_search (rxb, startpos, range, stop, total_size, break; } break; - + case re_se_poppos: POP(search_state.counter_stack, sizeof (struct rx_counter_frame)); break; - - + + case re_se_at_dot: case re_se_syntax: case re_se_not_syntax: @@ -2677,10 +2677,10 @@ rx_search (rxb, startpos, range, stop, total_size, switch (rxb->se_params [effect].se) { case re_se_win: - /* This side effect indicates that we've - * found a match, though not necessarily the - * best match. This is a fancy assignment to - * register 0 unless the caller didn't + /* This side effect indicates that we've + * found a match, though not necessarily the + * best match. This is a fancy assignment to + * register 0 unless the caller didn't * care about registers. In which case, * this stops the match. */ @@ -2689,7 +2689,7 @@ rx_search (rxb, startpos, range, stop, total_size, ((int)(search_state.test_pos.pos - search_state.test_pos.string) + search_state.test_pos.offset); - + if ( (search_state.best_last_r < 0) || (urhere + 1 > search_state.best_rparen[0])) { @@ -2705,7 +2705,7 @@ rx_search (rxb, startpos, range, stop, total_size, search_state.best_rparen[0] = urhere + 1; search_state.best_last_r = search_state.last_r; } - /* If we're not reporting the match-length + /* If we're not reporting the match-length * or other register info, we need look no * further. */ @@ -2722,7 +2722,7 @@ rx_search (rxb, startpos, range, stop, total_size, ((int)(search_state.test_pos.pos - search_state.test_pos.string) + search_state.test_pos.offset); - + int reg = rxb->se_params [effect].op1; #if 0 if (reg > search_state.last_l) @@ -2742,7 +2742,7 @@ rx_search (rxb, startpos, range, stop, total_size, } break; } - + case re_se_rparen: { int urhere = @@ -2759,14 +2759,14 @@ rx_search (rxb, startpos, range, stop, total_size, } break; } - + case re_se_backref: { int reg = rxb->se_params [effect].op1; if ( reg > search_state.last_r || search_state.rparen[reg] < 0) goto test_do_return; - + { int backref_status; check_backreference: @@ -2873,7 +2873,7 @@ rx_search (rxb, startpos, range, stop, total_size, search_state.ifr = &df->future_frame; goto restart; } - + case rx_backtrack_point: { /* A backtrack point indicates that we've reached a @@ -2883,18 +2883,18 @@ rx_search (rxb, startpos, range, stop, total_size, * A backtracking strategy is used. We keep track of what * registers are valid so we can erase side effects. * - * First, make sure there is some stack space to hold + * First, make sure there is some stack space to hold * our state. */ - + struct rx_backtrack_frame * bf; - + PUSH(search_state.backtrack_stack, search_state.backtrack_frame_bytes); #ifdef RX_DEBUG ++search_state.backtrack_depth; #endif - + bf = ((struct rx_backtrack_frame *) search_state.backtrack_stack->sp); { @@ -2929,30 +2929,30 @@ rx_search (rxb, startpos, range, stop, total_size, stk[x] = search_state.rparen[x]; } } - + /* Here is a while loop whose body is mainly a function * call and some code to handle a return from that * function. * * From here on for the rest of `case backtrack_point' it - * is unsafe to assume that the search_state copies of + * is unsafe to assume that the search_state copies of * variables saved on the backtracking stack are valid * -- so read their values from the backtracking stack. * * This lets us use one generation fewer stack saves in * the call-graph of a search. */ - + while_non_det_options: #ifdef RX_DEBUG ++search_state.lines_found; if (rx_debug_trace) fprintf (stderr, "@@@ %d calls %d @@@\n", search_state.line_no, search_state.lines_found); - + search_state.line_no = search_state.lines_found; #endif - + if (bf->df->next_same_super_edge[0] == bf->first_df) { /* This is a tail-call optimization -- we don't recurse @@ -2961,7 +2961,7 @@ rx_search (rxb, startpos, range, stop, total_size, search_state.ifr = (bf->df->effects ? &bf->df->side_effects_frame : &bf->df->future_frame); - + rx_unlock_superstate (&rxb->rx, search_state.super); POP(search_state.backtrack_stack, search_state.backtrack_frame_bytes); @@ -2983,14 +2983,14 @@ rx_search (rxb, startpos, range, stop, total_size, cf->val = old_cf->val; cf->inherited_from = old_cf; cf->cdr = 0; - } + } /* `Call' this test-match block */ search_state.ifr = (bf->df->effects ? &bf->df->side_effects_frame : &bf->df->future_frame); goto recurse_test_match; } - + /* Returns in this block are accomplished by * goto test_do_return. There are two cases. * If there is some search-stack left, @@ -2998,9 +2998,9 @@ rx_search (rxb, startpos, range, stop, total_size, * If there is no search-stack left, then * we should return to the fastmap/search loop. */ - + test_do_return: - + if (!search_state.backtrack_stack) { #ifdef RX_DEBUG @@ -3008,18 +3008,18 @@ rx_search (rxb, startpos, range, stop, total_size, fprintf (stderr, "!!! %d bails returning %d !!!\n", search_state.line_no, search_state.test_ret); #endif - + /* No more search-stack -- this test is done. */ if (search_state.test_ret) goto return_from_test_match; else goto error_in_testing_match; } - - /* Returning from a recursive call to + + /* Returning from a recursive call to * the test match block: */ - + bf = ((struct rx_backtrack_frame *) search_state.backtrack_stack->sp); #ifdef RX_DEBUG @@ -3029,7 +3029,7 @@ rx_search (rxb, startpos, range, stop, total_size, search_state.test_ret, bf->stk_search_state.line_no); #endif - + while (search_state.counter_stack && (!bf->counter_stack_sp || (bf->counter_stack_sp @@ -3038,15 +3038,15 @@ rx_search (rxb, startpos, range, stop, total_size, POP(search_state.counter_stack, sizeof (struct rx_counter_frame)); } - + if (search_state.test_ret == rx_test_error) { POP (search_state.backtrack_stack, search_state.backtrack_frame_bytes); goto test_do_return; } - - /* If a non-longest match was found and that is good + + /* If a non-longest match was found and that is good * enough, return immediately. */ if ( (search_state.test_ret == rx_test_found_first) @@ -3057,7 +3057,7 @@ rx_search (rxb, startpos, range, stop, total_size, search_state.backtrack_frame_bytes); goto test_do_return; } - + search_state.test_ret = bf->stk_test_ret; search_state.last_l = bf->stk_last_l; search_state.last_r = bf->stk_last_r; @@ -3067,7 +3067,7 @@ rx_search (rxb, startpos, range, stop, total_size, #ifdef RX_DEBUG search_state.line_no = bf->stk_search_state.line_no; #endif - + if (rxb->match_regs_on_stack) { int x; @@ -3079,7 +3079,7 @@ rx_search (rxb, startpos, range, stop, total_size, for (x = 0; x <= search_state.last_r; ++x) search_state.rparen[x] = stk[x]; } - + { int x; try_burst_2: @@ -3107,8 +3107,8 @@ rx_search (rxb, startpos, range, stop, total_size, search_state.test_pos = bf->stk_test_pos; goto while_non_det_options; } - - + + case rx_cache_miss: /* Because the superstate NFA is lazily constructed, * and in fact may erode from underneath us, we sometimes @@ -3125,14 +3125,14 @@ rx_search (rxb, startpos, range, stop, total_size, goto test_do_return; } goto restart; - + case rx_backtrack: /* RX_BACKTRACK means that we've reached the empty * superstate, indicating that match can't succeed * from this point. */ goto test_do_return; - + case rx_next_char: case rx_error_inx: case rx_num_instructions: @@ -3141,21 +3141,21 @@ rx_search (rxb, startpos, range, stop, total_size, } goto pseudo_while_1; } - - /* Healthy exits from the test-match loop do a - * `goto return_from_test_match' On the other hand, + + /* Healthy exits from the test-match loop do a + * `goto return_from_test_match' On the other hand, * we might end up here. */ error_in_testing_match: test_state = rx_test_error; goto test_returns_to_search; - + /***** fastmap/search loop body * considering the results testing for a match */ - + return_from_test_match: - + if (search_state.best_last_l >= 0) { if (regs && (regs->start != search_state.best_lparen)) @@ -3185,7 +3185,7 @@ rx_search (rxb, startpos, range, stop, total_size, test_state = rx_test_fail; goto test_returns_to_search; } - + test_return_continuation: search_state.test_match_resume_pt = test_pc; test_state = rx_test_continuation; @@ -3203,16 +3203,16 @@ rx_search (rxb, startpos, range, stop, total_size, /* Integers are used to represent side effects. * * Simple side effects are given negative integer names by these enums. - * + * * Non-negative names are reserved for complex effects. * - * Complex effects are those that take arguments. For example, + * Complex effects are those that take arguments. For example, * a register assignment associated with a group is complex because * it requires an argument to tell which group is being matched. - * + * * The integer name of a complex effect is an index into rxb->se_params. */ - + RX_DEF_SE(1, re_se_try, = -1) /* Epsilon from start state */ RX_DEF_SE(0, re_se_pushback, = re_se_try - 1) @@ -3228,15 +3228,15 @@ rx_search (rxb, startpos, range, stop, total_size, RX_DEF_SE(1, re_se_begbuf, = re_se_not_syntax - 1) /* match beginning of buffer */ RX_DEF_SE(1, re_se_hat, = re_se_begbuf - 1) /* match beginning of line */ - RX_DEF_SE(1, re_se_wordbeg, = re_se_hat - 1) + RX_DEF_SE(1, re_se_wordbeg, = re_se_hat - 1) RX_DEF_SE(1, re_se_wordbound, = re_se_wordbeg - 1) RX_DEF_SE(1, re_se_notwordbound, = re_se_wordbound - 1) RX_DEF_SE(1, re_se_wordend, = re_se_notwordbound - 1) RX_DEF_SE(1, re_se_endbuf, = re_se_wordend - 1) - /* This fails except at the end of a line. - * It deserves to go here since it is typicly one of the last steps + /* This fails except at the end of a line. + * It deserves to go here since it is typicly one of the last steps * in a match. */ RX_DEF_SE(1, re_se_dollar, = re_se_endbuf - 1) @@ -3244,7 +3244,7 @@ rx_search (rxb, startpos, range, stop, total_size, /* Simple effects: */ RX_DEF_SE(1, re_se_fail, = re_se_dollar - 1) - /* Complex effects. These are used in the 'se' field of + /* Complex effects. These are used in the 'se' field of * a struct re_se_params. Indexes into the se array * are stored as instructions on nfa edges. */ @@ -3252,7 +3252,7 @@ rx_search (rxb, startpos, range, stop, total_size, RX_DEF_CPLX_SE(1, re_se_lparen, = re_se_win + 1) RX_DEF_CPLX_SE(1, re_se_rparen, = re_se_lparen + 1) RX_DEF_CPLX_SE(0, re_se_backref, = re_se_rparen + 1) - RX_DEF_CPLX_SE(0, re_se_iter, = re_se_backref + 1) + RX_DEF_CPLX_SE(0, re_se_iter, = re_se_backref + 1) RX_DEF_CPLX_SE(0, re_se_end_iter, = re_se_iter + 1) RX_DEF_CPLX_SE(0, re_se_tv, = re_se_end_iter + 1) diff --git a/gnu/lib/libg++/include/std.h b/gnu/lib/libg++/include/std.h index 069b522..dcafc35 100644 --- a/gnu/lib/libg++/include/std.h +++ b/gnu/lib/libg++/include/std.h @@ -1,5 +1,5 @@ // This may look like C code, but it is really -*- C++ -*- -/* +/* Copyright (C) 1988, 1992 Free Software Foundation written by Doug Lea (dl@rocky.oswego.edu) @@ -24,7 +24,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <stdio.h> +#include <stdio.h> #include <errno.h> #include <fcntl.h> @@ -32,4 +32,4 @@ extern "C" { int strcasecmp _G_ARGS((const char*, const char*)); } -#endif +#endif diff --git a/gnu/lib/libg++/include/stream.h b/gnu/lib/libg++/include/stream.h index 488f367..f9569a5 100644 --- a/gnu/lib/libg++/include/stream.h +++ b/gnu/lib/libg++/include/stream.h @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free diff --git a/gnu/lib/libg++/include/streambuf.h b/gnu/lib/libg++/include/streambuf.h index efbab12..7a3df54 100644 --- a/gnu/lib/libg++/include/streambuf.h +++ b/gnu/lib/libg++/include/streambuf.h @@ -314,7 +314,7 @@ struct streambuf : public _IO_FILE { // protected?? void setp(char* p, char* ep) { _IO_write_base=_IO_write_ptr=p; _IO_write_end=ep; } void setg(char* eb, char* g, char *eg) { - if (_IO_file_flags & _IO_IN_BACKUP) _IO_free_backup_area(this); + if (_IO_file_flags & _IO_IN_BACKUP) _IO_free_backup_area(this); _IO_read_base = eb; _IO_read_ptr = g; _IO_read_end = eg; } char *shortbuf() { return _shortbuf; } @@ -336,7 +336,7 @@ struct streambuf : public _IO_FILE { // protected?? void unsave_markers(); // Make all streammarkers !saving(). int put_mode() { return _flags & _IO_CURRENTLY_PUTTING; } int switch_to_get_mode(); - + streambuf(int flags=0); public: static int flush_all(); diff --git a/gnu/lib/libg++/include/strfile.h b/gnu/lib/libg++/include/strfile.h index bff25b1..950f2f5 100644 --- a/gnu/lib/libg++/include/strfile.h +++ b/gnu/lib/libg++/include/strfile.h @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free diff --git a/gnu/lib/libg++/libg++/timer.c b/gnu/lib/libg++/libg++/timer.c index 6e3432b..579cc54 100644 --- a/gnu/lib/libg++/libg++/timer.c +++ b/gnu/lib/libg++/libg++/timer.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1990, 1992 Free Software Foundation written by Doug Lea (dl@rocky.oswego.edu) @@ -22,9 +22,9 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. /* Timing functions from Doug Schmidt... */ /* no such thing as "negative time"! */ -#define TIMER_ERROR_VALUE -1.0 +#define TIMER_ERROR_VALUE -1.0 -/* If this does not work on your system, change this to #if 0, and +/* If this does not work on your system, change this to #if 0, and report the problem. */ #if 1 @@ -73,7 +73,7 @@ return_elapsed_time(Last_Time) { if (!Timer_Set) { return(TIMER_ERROR_VALUE); - } + } else { /* get process time */ #ifdef USE_TIMES @@ -85,8 +85,8 @@ return_elapsed_time(Last_Time) #ifdef USE_TIMES return((double) (New_Time.tms_utime - Old_Time.tms_utime) / HZ); #else - return((New_Time.ru_utime.tv_sec - Old_Time.ru_utime.tv_sec) + - ((New_Time.ru_utime.tv_usec - Old_Time.ru_utime.tv_usec) + return((New_Time.ru_utime.tv_sec - Old_Time.ru_utime.tv_sec) + + ((New_Time.ru_utime.tv_usec - Old_Time.ru_utime.tv_usec) / 1000000.0)); #endif } @@ -94,7 +94,7 @@ return_elapsed_time(Last_Time) #ifdef USE_TIMES return((double) New_Time.tms_utime / HZ - Last_Time); #else - return((New_Time.ru_utime.tv_sec + + return((New_Time.ru_utime.tv_sec + (New_Time.ru_utime.tv_usec / 1000000.0)) - Last_Time); #endif } @@ -115,7 +115,7 @@ getrusage(int dummy,struct rusage* time){ /* we subtract an offset to make sure that the number fits in a long int*/ rtime=rtime/1.0e+7-4.144e+9; time->ru_utime.tv_sec= rtime; - rtime=(rtime-time->ru_utime.tv_sec)*1.0e6; + rtime=(rtime-time->ru_utime.tv_sec)*1.0e6; time->ru_utime.tv_usec= rtime; } #endif diff --git a/gnu/lib/libg++/libiberty/strerror.c b/gnu/lib/libg++/libiberty/strerror.c index 5c0a58d..29a4e4a 100644 --- a/gnu/lib/libg++/libiberty/strerror.c +++ b/gnu/lib/libg++/libiberty/strerror.c @@ -666,7 +666,7 @@ strerror (errnoval) /* In range, and a valid message. Just return the message. */ msg = (char *) sys_errlist[errnoval]; } - + return (msg); } diff --git a/gnu/lib/libg++/libiberty/strsignal.c b/gnu/lib/libg++/libiberty/strsignal.c index 7acb733..815af83 100644 --- a/gnu/lib/libg++/libiberty/strsignal.c +++ b/gnu/lib/libg++/libiberty/strsignal.c @@ -448,7 +448,7 @@ strsignal (signo) /* In range, and a valid message. Just return the message. */ msg = (const char *) sys_siglist[signo]; } - + return (msg); } diff --git a/gnu/lib/libg++/libio/filedoalloc.c b/gnu/lib/libg++/libio/filedoalloc.c index a85b846..92c5105 100644 --- a/gnu/lib/libg++/libio/filedoalloc.c +++ b/gnu/lib/libg++/libio/filedoalloc.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free @@ -74,7 +74,7 @@ _IO_file_doallocate(fp) if (_IO_cleanup_registration_needed) (*_IO_cleanup_registration_needed)(); - + if (fp->_fileno < 0 || fp->_jumps->__stat(fp, &st) < 0) { couldbetty = 0; diff --git a/gnu/lib/libg++/libio/fileops.c b/gnu/lib/libg++/libio/fileops.c index 2bd7c24..332a0da 100644 --- a/gnu/lib/libg++/libio/fileops.c +++ b/gnu/lib/libg++/libio/fileops.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free @@ -68,14 +68,14 @@ extern int errno; (The pointers save_gptr() and save_egptr() are the values of gptr() and egptr() at the time putback mode was entered.) The OS position corresponds to that of save_egptr(). - + LINE BUFFERED OUTPUT: During line buffered output, pbase()==base() && epptr()==base(). However, ptr() may be anywhere between base() and ebuf(). This forces a call to filebuf::overflow(int C) on every put. If there is more space in the buffer, and C is not a '\n', then C is inserted, and pptr() incremented. - + UNBUFFERED STREAMS: If a filebuf is unbuffered(), the _shortbuf[1] is used as the buffer. */ @@ -108,7 +108,7 @@ _IO_file_close_it(fp) _IO_unsave_markers(fp); status = fp->_jumps->__close(fp); - + /* Free buffer. */ _IO_setb(fp, NULL, NULL, 0); _IO_setg(fp, NULL, NULL, NULL); @@ -228,7 +228,7 @@ _IO_do_write(fp, data, to_do) unpredictable. */ fp->_offset = _IO_pos_BAD; else if (fp->_IO_read_end != fp->_IO_write_base) - { + { _IO_pos_t new_pos = fp->_jumps->__seek(fp, fp->_IO_write_base - fp->_IO_read_end, 1); if (new_pos == _IO_pos_BAD) return EOF; @@ -337,7 +337,7 @@ _IO_file_sync(fp) /* char* ptr = cur_ptr(); */ if (fp->_IO_write_ptr > fp->_IO_write_base) if (_IO_do_flush(fp)) return EOF; - delta = fp->_IO_read_ptr - fp->_IO_read_end; + delta = fp->_IO_read_ptr - fp->_IO_read_end; if (delta != 0) { #ifdef TODO @@ -643,7 +643,7 @@ _IO_file_xsputn(f, data, n) if (_IO_do_write(f, s, count) == EOF) return n - to_do; to_do = dont_write; - + /* Now write out the remainder. Normally, this will fit in the buffer, but it's somewhat messier for line-buffered files, so we let _IO_default_xsputn handle the general case. */ @@ -710,7 +710,7 @@ _IO_file_xsgetn(fp, data, n) else fp->_flags |= _IO_ERR_SEEN, count = 0; } - + s += count; more -= count; } diff --git a/gnu/lib/libg++/libio/floatconv.c b/gnu/lib/libg++/libio/floatconv.c index ff300bb..acd6998 100644 --- a/gnu/lib/libg++/libio/floatconv.c +++ b/gnu/lib/libg++/libio/floatconv.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free diff --git a/gnu/lib/libg++/libio/genops.c b/gnu/lib/libg++/libio/genops.c index 469694c..71989a5 100644 --- a/gnu/lib/libg++/libio/genops.c +++ b/gnu/lib/libg++/libio/genops.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free @@ -589,7 +589,7 @@ int _IO_get_column(fp) register _IO_FILE *fp; { - if (fp->_cur_column) + if (fp->_cur_column) return _IO_adjust_column(fp->_cur_column - 1, fp->_IO_write_base, fp->_IO_write_ptr - fp->_IO_write_base); @@ -636,7 +636,7 @@ _IO_cleanup () So it is possible that other static destructord might want to write to cout - and they're supposed to be able to do so. - The following will make the standard streambufs be unbuffered, + The following will make the standard streambufs be unbuffered, which forces any output from late destructors to be written out. */ _IO_unbuffer_all (); } @@ -652,7 +652,7 @@ void _IO_init_marker(marker, fp) marker->_pos = fp->_IO_read_ptr - fp->_IO_read_end; else marker->_pos = fp->_IO_read_ptr - fp->_IO_read_base; - + /* Should perhaps sort the chain? */ marker->_next = fp->_markers; fp->_markers = marker; @@ -776,7 +776,7 @@ _IO_default_pbackfail(fp, c) /* Need to handle a filebuf in write mode (switch to read mode). FIXME!*/ if (_IO_have_backup(fp) && !_IO_in_backup(fp)) _IO_switch_to_backup_area(fp); - + if (!_IO_have_backup(fp)) { /* No backup buffer: allocate one. */ @@ -860,7 +860,7 @@ _IO_default_write(fp, data, n) struct __io_defs { __io_defs() { } ~__io_defs() { _IO_cleanup(); } -}; +}; __io_defs io_defs__; #endif diff --git a/gnu/lib/libg++/libio/iofclose.c b/gnu/lib/libg++/libio/iofclose.c index 03be451..d8ad3a6 100644 --- a/gnu/lib/libg++/libio/iofclose.c +++ b/gnu/lib/libg++/libio/iofclose.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free diff --git a/gnu/lib/libg++/libio/iofgetpos.c b/gnu/lib/libg++/libio/iofgetpos.c index ac417f5..f345463 100644 --- a/gnu/lib/libg++/libio/iofgetpos.c +++ b/gnu/lib/libg++/libio/iofgetpos.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free diff --git a/gnu/lib/libg++/libio/iofread.c b/gnu/lib/libg++/libio/iofread.c index 4bfe717..9cb633e 100644 --- a/gnu/lib/libg++/libio/iofread.c +++ b/gnu/lib/libg++/libio/iofread.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free diff --git a/gnu/lib/libg++/libio/iofscanf.c b/gnu/lib/libg++/libio/iofscanf.c index 5daef91..fc43d7e 100644 --- a/gnu/lib/libg++/libio/iofscanf.c +++ b/gnu/lib/libg++/libio/iofscanf.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free diff --git a/gnu/lib/libg++/libio/iofsetpos.c b/gnu/lib/libg++/libio/iofsetpos.c index 0a6fff2..5f2023b 100644 --- a/gnu/lib/libg++/libio/iofsetpos.c +++ b/gnu/lib/libg++/libio/iofsetpos.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free diff --git a/gnu/lib/libg++/libio/iogetdelim.c b/gnu/lib/libg++/libio/iogetdelim.c index 3dc5cd1..42527ff 100644 --- a/gnu/lib/libg++/libio/iogetdelim.c +++ b/gnu/lib/libg++/libio/iogetdelim.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1994 Free Software Foundation This file is part of the GNU IO Library. This library is free diff --git a/gnu/lib/libg++/libio/iogetline.c b/gnu/lib/libg++/libio/iogetline.c index dcaa4a1..9ca1b70 100644 --- a/gnu/lib/libg++/libio/iogetline.c +++ b/gnu/lib/libg++/libio/iogetline.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free diff --git a/gnu/lib/libg++/libio/ioignore.c b/gnu/lib/libg++/libio/ioignore.c index 1b26503..70479e2 100644 --- a/gnu/lib/libg++/libio/ioignore.c +++ b/gnu/lib/libg++/libio/ioignore.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free diff --git a/gnu/lib/libg++/libio/iopadn.c b/gnu/lib/libg++/libio/iopadn.c index 84dcee6..77b7af7 100644 --- a/gnu/lib/libg++/libio/iopadn.c +++ b/gnu/lib/libg++/libio/iopadn.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free @@ -40,7 +40,7 @@ _IO_padn(fp, pad, count) const char *padptr; register int i; _IO_size_t written = 0, w; - + if (pad == ' ') padptr = blanks; else if (pad == '0') @@ -57,7 +57,7 @@ _IO_padn(fp, pad, count) if (w != PADSIZE) return written; } - + if (i > 0) { w = _IO_sputn(fp, padptr, i); diff --git a/gnu/lib/libg++/libio/iopopen.c b/gnu/lib/libg++/libio/iopopen.c index dfa3482..99a9145 100644 --- a/gnu/lib/libg++/libio/iopopen.c +++ b/gnu/lib/libg++/libio/iopopen.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free @@ -170,7 +170,7 @@ _IO_proc_close(fp) _IO_proc_file **ptr = &proc_file_chain; _IO_pid_t wait_pid; int status = -1; - + /* Unlink from proc_file_chain. */ for ( ; *ptr != NULL; ptr = &(*ptr)->next) { diff --git a/gnu/lib/libg++/libio/ioprims.c b/gnu/lib/libg++/libio/ioprims.c index 4c41ed8..8164ba3 100644 --- a/gnu/lib/libg++/libio/ioprims.c +++ b/gnu/lib/libg++/libio/ioprims.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free diff --git a/gnu/lib/libg++/libio/ioprintf.c b/gnu/lib/libg++/libio/ioprintf.c index 519785a..69dce3e 100644 --- a/gnu/lib/libg++/libio/ioprintf.c +++ b/gnu/lib/libg++/libio/ioprintf.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free diff --git a/gnu/lib/libg++/libio/ioseekoff.c b/gnu/lib/libg++/libio/ioseekoff.c index 7ebf183..c409586 100644 --- a/gnu/lib/libg++/libio/ioseekoff.c +++ b/gnu/lib/libg++/libio/ioseekoff.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free diff --git a/gnu/lib/libg++/libio/ioseekpos.c b/gnu/lib/libg++/libio/ioseekpos.c index a99b703..54a36b2 100644 --- a/gnu/lib/libg++/libio/ioseekpos.c +++ b/gnu/lib/libg++/libio/ioseekpos.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free diff --git a/gnu/lib/libg++/libio/ioungetc.c b/gnu/lib/libg++/libio/ioungetc.c index b52e4a2..0b13e6d 100644 --- a/gnu/lib/libg++/libio/ioungetc.c +++ b/gnu/lib/libg++/libio/ioungetc.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free diff --git a/gnu/lib/libg++/libio/iovfprintf.c b/gnu/lib/libg++/libio/iovfprintf.c index e3fb2da..4ee12e0 100644 --- a/gnu/lib/libg++/libio/iovfprintf.c +++ b/gnu/lib/libg++/libio/iovfprintf.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free @@ -132,7 +132,7 @@ helper_vfprintf(fp, fmt0, ap) hp->_IO_write_end = buf+_IO_BUFSIZ; hp->_IO_file_flags = _IO_MAGIC|_IO_NO_READS; hp->_jumps = &_IO_helper_jumps; - + /* Now print to helper instead. */ result = _IO_vfprintf(hp, fmt0, ap); diff --git a/gnu/lib/libg++/libio/iovfscanf.c b/gnu/lib/libg++/libio/iovfscanf.c index 85168af..909f1ac 100644 --- a/gnu/lib/libg++/libio/iovfscanf.c +++ b/gnu/lib/libg++/libio/iovfscanf.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free diff --git a/gnu/lib/libg++/libio/outfloat.c b/gnu/lib/libg++/libio/outfloat.c index 7f4559b..83101b5 100644 --- a/gnu/lib/libg++/libio/outfloat.c +++ b/gnu/lib/libg++/libio/outfloat.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free @@ -132,7 +132,7 @@ int _IO_outfloat(value, sb, type, width, precision, flags, precision = 0; show_dot = 0; } - + /* dtoa truncates trailing zeroes. Set the variable trailing_zeroes to the number of 0's we have to add (after the decimal point). */ if (skip_zeroes) @@ -146,7 +146,7 @@ int _IO_outfloat(value, sb, type, width, precision, flags, trailing_zeroes = useful_digits <= decpt ? precision - decpt : precision-useful_digits; if (trailing_zeroes < 0) trailing_zeroes = 0; - + if (trailing_zeroes != 0 || useful_digits > decpt) show_dot = 1; if (sign_mode == 0) @@ -155,14 +155,14 @@ int _IO_outfloat(value, sb, type, width, precision, flags, print_sign = sign ? '-' : '+'; else /* if (sign_mode == ' ') */ print_sign = sign ? '-' : ' '; - + /* Calculate the width (before padding). */ unpadded_width = (print_sign != 0) + trailing_zeroes + exponent_size + show_dot + useful_digits + (decpt > useful_digits ? decpt - useful_digits : decpt > 0 ? 0 : 1 - decpt); - + padding = width > unpadded_width ? width - unpadded_width : 0; if (padding > 0 && pad_kind != _IO_LEFT && pad_kind != _IO_INTERNAL) PADN(fill, padding); /* Default (right) adjust */ diff --git a/gnu/lib/libg++/libio/strops.c b/gnu/lib/libg++/libio/strops.c index f507343..1332d0b 100644 --- a/gnu/lib/libg++/libio/strops.c +++ b/gnu/lib/libg++/libio/strops.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 1993 Free Software Foundation This file is part of the GNU IO Library. This library is free @@ -195,7 +195,7 @@ _IO_str_count (fp) if (put_len < ((_IO_strfile*)fp)->_s._len) put_len = ((_IO_strfile*)fp)->_s._len; return put_len; -} +} _IO_pos_t _IO_str_seekoff(fp, offset, mode) diff --git a/gnu/lib/libg++/librx/rx.c b/gnu/lib/libg++/librx/rx.c index 2c7ea03..58add67 100644 --- a/gnu/lib/libg++/librx/rx.c +++ b/gnu/lib/libg++/librx/rx.c @@ -19,9 +19,9 @@ write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA #define _RX_C_ -/* NOTE!!! AIX is so losing it requires this to be the first thing in the - * file. - * Do not put ANYTHING before it! +/* NOTE!!! AIX is so losing it requires this to be the first thing in the + * file. + * Do not put ANYTHING before it! */ #if !defined (__GNUC__) && defined (_AIX) #pragma alloca @@ -77,7 +77,7 @@ typedef char boolean; #ifndef _AIX /* Already did AIX, up at the top. */ char *alloca (); #endif /* not _AIX */ -#endif /* not HAVE_ALLOCA_H */ +#endif /* not HAVE_ALLOCA_H */ #endif /* not __GNUC__ */ #endif /* not alloca */ @@ -102,7 +102,7 @@ char *alloca (); #ifdef RX_WANT_RX_DEFS #define RX_DECL extern -#define RX_DEF_QUAL +#define RX_DEF_QUAL #else #define RX_WANT_RX_DEFS #define RX_DECL static @@ -333,7 +333,7 @@ static char * efnames2[] = "re_se_tv" }; -static char * inx_names[] = +static char * inx_names[] = { "rx_backtrack_point", "rx_do_side_effects", @@ -617,7 +617,7 @@ rx_bitset_hash (size, b) } -RX_DECL RX_subset rx_subset_singletons [RX_subset_bits] = +RX_DECL RX_subset rx_subset_singletons [RX_subset_bits] = { 0x1, 0x2, @@ -689,13 +689,13 @@ static unsigned long rx_hash_masks[4] = /* Hash tables */ #ifdef __STDC__ -RX_DECL struct rx_hash_item * +RX_DECL struct rx_hash_item * rx_hash_find (struct rx_hash * table, unsigned long hash, void * value, struct rx_hash_rules * rules) #else -RX_DECL struct rx_hash_item * +RX_DECL struct rx_hash_item * rx_hash_find (table, hash, value, rules) struct rx_hash * table; unsigned long hash; @@ -749,7 +749,7 @@ rx_hash_store (table, hash, value, rules) long mask = rx_hash_masks[0]; int bucket = (hash & mask) % 13; int depth = 0; - + while (table->children [bucket]) { table = table->children [bucket]; @@ -758,7 +758,7 @@ rx_hash_store (table, hash, value, rules) bucket = (hash & mask) % 13; ++depth; } - + { struct rx_hash_item * it = table->buckets[bucket]; while (it) @@ -767,7 +767,7 @@ rx_hash_store (table, hash, value, rules) else it = it->next_same_hash; } - + { if ( (depth < 3) && (table->bucket_size [bucket] >= 4)) @@ -842,7 +842,7 @@ rx_hash_free (it, rules) : 0); int bucket = (hash & rx_hash_masks [depth]) % 13; struct rx_hash_item ** pos = &table->buckets [bucket]; - + while (*pos != it) pos = &(*pos)->next_same_hash; *pos = it->next_same_hash; @@ -1232,7 +1232,7 @@ rx_free_rexp (rx, node) case r_side_effect: break; - + case r_concat: case r_alternate: case r_2phase_star: @@ -1252,11 +1252,11 @@ rx_free_rexp (rx, node) #ifdef __STDC__ -RX_DECL struct rexp_node * +RX_DECL struct rexp_node * rx_copy_rexp (struct rx *rx, struct rexp_node *node) #else -RX_DECL struct rexp_node * +RX_DECL struct rexp_node * rx_copy_rexp (rx, node) struct rx *rx; struct rexp_node *node; @@ -1349,11 +1349,11 @@ rx_free_nfa_state (n) * assigned after the nfa has been built. */ #ifdef __STDC__ -RX_DECL struct rx_nfa_state * +RX_DECL struct rx_nfa_state * rx_id_to_nfa_state (struct rx * rx, int id) #else -RX_DECL struct rx_nfa_state * +RX_DECL struct rx_nfa_state * rx_id_to_nfa_state (rx, id) struct rx * rx; int id; @@ -1367,18 +1367,18 @@ rx_id_to_nfa_state (rx, id) } -/* This adds an edge between two nodes, but doesn't initialize the +/* This adds an edge between two nodes, but doesn't initialize the * edge label. */ #ifdef __STDC__ -RX_DECL struct rx_nfa_edge * +RX_DECL struct rx_nfa_edge * rx_nfa_edge (struct rx *rx, enum rx_nfa_etype type, struct rx_nfa_state *start, struct rx_nfa_state *dest) #else -RX_DECL struct rx_nfa_edge * +RX_DECL struct rx_nfa_edge * rx_nfa_edge (rx, type, start, dest) struct rx *rx; enum rx_nfa_etype type; @@ -1413,14 +1413,14 @@ rx_free_nfa_edge (e) /* This constructs a POSSIBLE_FUTURE, which is a kind epsilon-closure * of an NFA. These are added to an nfa automaticly by eclose_nfa. - */ + */ #ifdef __STDC__ -static struct rx_possible_future * +static struct rx_possible_future * rx_possible_future (struct rx * rx, struct rx_se_list * effects) #else -static struct rx_possible_future * +static struct rx_possible_future * rx_possible_future (rx, effects) struct rx * rx; struct rx_se_list * effects; @@ -1499,17 +1499,17 @@ rx_free_nfa (rx) -/* This page: translating a pattern expression into an nfa and doing the +/* This page: translating a pattern expression into an nfa and doing the * static part of the nfa->super-nfa translation. */ -/* This is the thompson regexp->nfa algorithm. +/* This is the thompson regexp->nfa algorithm. * It is modified to allow for `side-effect epsilons.' Those are * edges that are taken whenever a similar epsilon edge would be, - * but which imply that some side effect occurs when the edge + * but which imply that some side effect occurs when the edge * is taken. * - * Side effects are used to model parts of the pattern langauge + * Side effects are used to model parts of the pattern langauge * that are not regular (in the formal sense). */ @@ -1566,7 +1566,7 @@ rx_build_nfa (rx, rexp, start, end) return 0; } return 1; - + case r_opt: return (rx_build_nfa (rx, rexp->params.pair.left, start, end) && rx_nfa_edge (rx, ne_epsilon, *start, *end)); @@ -1646,10 +1646,10 @@ rx_build_nfa (rx, rexp, start, end) /* RX_NAME_NFA_STATES identifies all nodes with outgoing non-epsilon - * transitions. Only these nodes can occur in super-states. - * All nodes are given an integer id. + * transitions. Only these nodes can occur in super-states. + * All nodes are given an integer id. * The id is non-negative if the node has non-epsilon out-transitions, negative - * otherwise (this is because we want the non-negative ids to be used as + * otherwise (this is because we want the non-negative ids to be used as * array indexes in a few places). */ @@ -1728,10 +1728,10 @@ rx_name_nfa_states (rx) */ #ifdef __STDC__ -static int +static int se_list_cmp (void * va, void * vb) #else -static int +static int se_list_cmp (va, vb) void * va; void * vb; @@ -1755,10 +1755,10 @@ se_list_cmp (va, vb) #ifdef __STDC__ -static int +static int se_list_equal (void * va, void * vb) #else -static int +static int se_list_equal (va, vb) void * va; void * vb; @@ -1778,11 +1778,11 @@ static struct rx_hash_rules se_list_hash_rules = #ifdef __STDC__ -static struct rx_se_list * +static struct rx_se_list * side_effect_cons (struct rx * rx, void * se, struct rx_se_list * list) #else -static struct rx_se_list * +static struct rx_se_list * side_effect_cons (rx, se, list) struct rx * rx; void * se; @@ -1834,7 +1834,7 @@ hash_cons_se_prog (rx, memo, car, cdr) return (struct rx_se_list *)it->data; } } - + #ifdef __STDC__ static struct rx_se_list * @@ -1859,10 +1859,10 @@ hash_se_prog (rx, memo, prog) } #ifdef __STDC__ -static int +static int nfa_set_cmp (void * va, void * vb) #else -static int +static int nfa_set_cmp (va, vb) void * va; void * vb; @@ -1885,10 +1885,10 @@ nfa_set_cmp (va, vb) } #ifdef __STDC__ -static int +static int nfa_set_equal (void * va, void * vb) #else -static int +static int nfa_set_equal (va, vb) void * va; void * vb; @@ -1908,12 +1908,12 @@ static struct rx_hash_rules nfa_set_hash_rules = #ifdef __STDC__ -static struct rx_nfa_state_set * +static struct rx_nfa_state_set * nfa_set_cons (struct rx * rx, struct rx_hash * memo, struct rx_nfa_state * state, struct rx_nfa_state_set * set) #else -static struct rx_nfa_state_set * +static struct rx_nfa_state_set * nfa_set_cons (rx, memo, state, set) struct rx * rx; struct rx_hash * memo; @@ -1944,12 +1944,12 @@ nfa_set_cons (rx, memo, state, set) #ifdef __STDC__ -static struct rx_nfa_state_set * +static struct rx_nfa_state_set * nfa_set_enjoin (struct rx * rx, struct rx_hash * memo, struct rx_nfa_state * state, struct rx_nfa_state_set * set) #else -static struct rx_nfa_state_set * +static struct rx_nfa_state_set * nfa_set_enjoin (rx, memo, state, set) struct rx * rx; struct rx_hash * memo; @@ -1976,7 +1976,7 @@ nfa_set_enjoin (rx, memo, state, set) /* This page: computing epsilon closures. The closures aren't total. * Each node's closures are partitioned according to the side effects entailed * along the epsilon edges. Return true on success. - */ + */ struct eclose_frame { @@ -1985,11 +1985,11 @@ struct eclose_frame #ifdef __STDC__ -static int +static int eclose_node (struct rx *rx, struct rx_nfa_state *outnode, struct rx_nfa_state *node, struct eclose_frame *frame) #else -static int +static int eclose_node (rx, outnode, node, frame) struct rx *rx; struct rx_nfa_state *outnode; @@ -2054,7 +2054,7 @@ eclose_node (rx, outnode, node, frame) break; case ne_side_effect: { - frame->prog_backwards = side_effect_cons (rx, + frame->prog_backwards = side_effect_cons (rx, e->params.side_effect, frame->prog_backwards); if (!frame->prog_backwards) @@ -2079,10 +2079,10 @@ eclose_node (rx, outnode, node, frame) #ifdef __STDC__ -RX_DECL int +RX_DECL int rx_eclose_nfa (struct rx *rx) #else -RX_DECL int +RX_DECL int rx_eclose_nfa (rx) struct rx *rx; #endif @@ -2090,7 +2090,7 @@ rx_eclose_nfa (rx) struct rx_nfa_state *n = rx->nfa_states; struct eclose_frame frame; static int rx_id = 0; - + frame.prog_backwards = 0; rx->rx_id = rx_id++; bzero (&rx->se_list_memo, sizeof (rx->se_list_memo)); @@ -2113,10 +2113,10 @@ rx_eclose_nfa (rx) */ #ifdef __STDC__ -RX_DECL void +RX_DECL void rx_delete_epsilon_transitions (struct rx *rx) #else -RX_DECL void +RX_DECL void rx_delete_epsilon_transitions (rx) struct rx *rx; #endif @@ -2154,16 +2154,16 @@ rx_delete_epsilon_transitions (rx) */ /* This is for qsort on an array of nfa_states. The order - * is based on state ids and goes + * is based on state ids and goes * [0...MAX][MIN..-1] where (MAX>=0) and (MIN<0) * This way, positive ids double as array indices. */ #ifdef __STDC__ -static int +static int nfacmp (void * va, void * vb) #else -static int +static int nfacmp (va, vb) void * va; void * vb; @@ -2180,10 +2180,10 @@ nfacmp (va, vb) } #ifdef __STDC__ -static int +static int count_hash_nodes (struct rx_hash * st) #else -static int +static int count_hash_nodes (st) struct rx_hash * st; #endif @@ -2194,16 +2194,16 @@ count_hash_nodes (st) count += ((st->children[x]) ? count_hash_nodes (st->children[x]) : st->bucket_size[x]); - + return count; } #ifdef __STDC__ -static void +static void se_memo_freer (struct rx_hash_item * node) #else -static void +static void se_memo_freer (node) struct rx_hash_item * node; #endif @@ -2213,10 +2213,10 @@ se_memo_freer (node) #ifdef __STDC__ -static void +static void nfa_set_freer (struct rx_hash_item * node) #else -static void +static void nfa_set_freer (node) struct rx_hash_item * node; #endif @@ -2231,11 +2231,11 @@ nfa_set_freer (node) */ #ifdef __STDC__ -RX_DECL int +RX_DECL int rx_compactify_nfa (struct rx *rx, void **mem, unsigned long *size) #else -RX_DECL int +RX_DECL int rx_compactify_nfa (rx, mem, size) struct rx *rx; void **mem; @@ -2251,8 +2251,8 @@ rx_compactify_nfa (rx, mem, size) unsigned long total_size; /* This takes place in two stages. First, the total size of the - * nfa is computed, then structures are copied. - */ + * nfa is computed, then structures are copied. + */ n = rx->nfa_states; total_nodec = 0; while (n) @@ -2425,11 +2425,11 @@ rx_compactify_nfa (rx, mem, size) /* The functions in the next several pages define the lazy-NFA-conversion used - * by matchers. The input to this construction is an NFA such as + * by matchers. The input to this construction is an NFA such as * is built by compactify_nfa (rx.c). The output is the superNFA. */ -/* Match engines can use arbitrary values for opcodes. So, the parse tree +/* Match engines can use arbitrary values for opcodes. So, the parse tree * is built using instructions names (enum rx_opcode), but the superstate * nfa is populated with mystery opcodes (void *). * @@ -2502,16 +2502,16 @@ rx_cache_free (cache, freelist, mem) } -/* The partially instantiated superstate graph has a transition +/* The partially instantiated superstate graph has a transition * table at every node. There is one entry for every character. * This fills in the transition for a set. */ #ifdef __STDC__ -static void +static void install_transition (struct rx_superstate *super, - struct rx_inx *answer, rx_Bitset trcset) + struct rx_inx *answer, rx_Bitset trcset) #else -static void +static void install_transition (super, answer, trcset) struct rx_superstate *super; struct rx_inx *answer; @@ -2579,14 +2579,14 @@ check_cache (cache) check_cache (you_fucked_up); } -/* When a superstate is old and neglected, it can enter a +/* When a superstate is old and neglected, it can enter a * semi-free state. A semi-free state is slated to die. * Incoming transitions to a semi-free state are re-written * to cause an (interpreted) fault when they are taken. * The fault handler revives the semi-free state, patches * incoming transitions back to normal, and continues. * - * The idea is basicly to free in two stages, aborting + * The idea is basicly to free in two stages, aborting * between the two if the state turns out to be useful again. * When a free is aborted, the rescued superstate is placed * in the most-favored slot to maximize the time until it @@ -2663,11 +2663,11 @@ semifree_superstate (cache) #ifdef __STDC__ -static void +static void refresh_semifree_superstate (struct rx_cache * cache, struct rx_superstate * super) #else -static void +static void refresh_semifree_superstate (cache, super) struct rx_cache * cache; struct rx_superstate * super; @@ -2677,7 +2677,7 @@ refresh_semifree_superstate (cache, super) if (super->transition_refs) { - super->transition_refs->prev_same_dest->next_same_dest = 0; + super->transition_refs->prev_same_dest->next_same_dest = 0; for (df = super->transition_refs; df; df = df->next_same_dest) { df->future_frame.inx = cache->instruction_table[rx_next_char]; @@ -2745,11 +2745,11 @@ rx_refresh_this_superstate (cache, superstate) } #ifdef __STDC__ -static void +static void release_superset_low (struct rx_cache * cache, struct rx_superset *set) #else -static void +static void release_superset_low (cache, set) struct rx_cache * cache; struct rx_superset *set; @@ -2774,11 +2774,11 @@ release_superset_low (cache, set) } #ifdef __STDC__ -RX_DECL void +RX_DECL void rx_release_superset (struct rx *rx, struct rx_superset *set) #else -RX_DECL void +RX_DECL void rx_release_superset (rx, set) struct rx *rx; struct rx_superset *set; @@ -2888,8 +2888,8 @@ rx_really_free_superstate (cache) { struct rx_distinct_future *dft = df; df = df->next_same_super_edge[0]; - - + + if (dft->future && dft->future->transition_refs == dft) { dft->future->transition_refs = dft->next_same_dest; @@ -2905,7 +2905,7 @@ rx_really_free_superstate (cache) tc = tct; } } - + if (it->contents->superstate == it) it->contents->superstate = 0; release_superset_low (cache, it->contents); @@ -3043,10 +3043,10 @@ superset_allocator (rules, val) } #ifdef __STDC__ -static struct rx_hash * +static struct rx_hash * super_hash_allocator (struct rx_hash_rules * rules) #else -static struct rx_hash * +static struct rx_hash * super_hash_allocator (rules) struct rx_hash_rules * rules; #endif @@ -3133,7 +3133,7 @@ rx_morecore (cache) while (*pos) pos = &(*pos)->next; *pos = ((struct rx_blocklist *) - malloc (size + sizeof (struct rx_blocklist))); + malloc (size + sizeof (struct rx_blocklist))); if (!*pos) return; @@ -3145,7 +3145,7 @@ rx_morecore (cache) } } -static struct rx_cache default_cache = +static struct rx_cache default_cache = { { supersetcmp, @@ -3191,7 +3191,7 @@ static struct rx_cache default_cache = /* This adds an element to a superstate set. These sets are lists, such * that lists with == elements are ==. The empty set is returned by - * superset_cons (rx, 0, 0) and is NOT equivelent to + * superset_cons (rx, 0, 0) and is NOT equivelent to * (struct rx_superset)0. */ @@ -3247,7 +3247,7 @@ rx_superset_cons (rx, car, cdr) #ifdef __STDC__ RX_DECL struct rx_superset * rx_superstate_eclosure_union - (struct rx * rx, struct rx_superset *set, struct rx_nfa_state_set *ecl) + (struct rx * rx, struct rx_superset *set, struct rx_nfa_state_set *ecl) #else RX_DECL struct rx_superset * rx_superstate_eclosure_union (rx, set, ecl) @@ -3304,14 +3304,14 @@ rx_superstate_eclosure_union (rx, set, ecl) * This makes sure that a list of rx_distinct_futures contains * a future for each possible set of side effects in the eclosure * of a given state. This is some of the work of filling in a - * superstate transition. + * superstate transition. */ #ifdef __STDC__ static struct rx_distinct_future * include_futures (struct rx *rx, struct rx_distinct_future *df, struct rx_nfa_state - *state, struct rx_superstate *superstate) + *state, struct rx_superstate *superstate) #else static struct rx_distinct_future * include_futures (rx, df, state, superstate) @@ -3385,7 +3385,7 @@ include_futures (rx, df, state, superstate) -/* This constructs a new superstate from its state set. The only +/* This constructs a new superstate from its state set. The only * complexity here is memory management. */ #ifdef __STDC__ @@ -3520,10 +3520,10 @@ rx_superstate (rx, set) */ #ifdef __STDC__ -static int +static int solve_destination (struct rx *rx, struct rx_distinct_future *df) #else -static int +static int solve_destination (rx, df) struct rx *rx; struct rx_distinct_future *df; @@ -3544,7 +3544,7 @@ solve_destination (rx, df) struct rx_nfa_edge *e; /* Iterate over all edges of each NFA state. */ for (e = nfa_state->car->edges; e; e = e->next) - /* If we find an edge that is labeled with + /* If we find an edge that is labeled with * the characters we are solving for..... */ if (rx_bitset_is_subset (rx->local_cset_size, @@ -3572,7 +3572,7 @@ solve_destination (rx, df) } } } - /* It is possible that the RX_DISTINCT_FUTURE we are working on has + /* It is possible that the RX_DISTINCT_FUTURE we are working on has * the empty set of NFA states as its definition. In that case, this * is a failure point. */ @@ -3617,20 +3617,20 @@ solve_destination (rx, df) /* This takes a superstate and a character, and computes some edges * from the superstate NFA. In particular, this computes all edges - * that lead from SUPERSTATE given CHR. This function also + * that lead from SUPERSTATE given CHR. This function also * computes the set of characters that share this edge set. * This returns 0 on allocation error. - * The character set and list of edges are returned through + * The character set and list of edges are returned through * the paramters CSETOUT and DFOUT. } */ #ifdef __STDC__ -static int +static int compute_super_edge (struct rx *rx, struct rx_distinct_future **dfout, rx_Bitset csetout, struct rx_superstate *superstate, - unsigned char chr) + unsigned char chr) #else -static int +static int compute_super_edge (rx, dfout, csetout, superstate, chr) struct rx *rx; struct rx_distinct_future **dfout; @@ -3641,7 +3641,7 @@ compute_super_edge (rx, dfout, csetout, superstate, chr) { struct rx_superset *stateset = superstate->contents; - /* To compute the set of characters that share edges with CHR, + /* To compute the set of characters that share edges with CHR, * we start with the full character set, and subtract. */ rx_bitset_universe (rx->local_cset_size, csetout); @@ -3712,7 +3712,7 @@ compute_super_edge (rx, dfout, csetout, superstate, chr) static struct rx_super_edge * rx_super_edge (struct rx *rx, struct rx_superstate *super, rx_Bitset cset, - struct rx_distinct_future *df) + struct rx_distinct_future *df) #else static struct rx_super_edge * rx_super_edge (rx, super, cset, df) @@ -3784,7 +3784,7 @@ install_partial_transition (super, answer, set, offset) int end = start + 32; RX_subset pos = 1; struct rx_inx * transitions = super->transitions; - + while (start < end) { if (set & pos) @@ -3798,7 +3798,7 @@ install_partial_transition (super, answer, set, offset) #ifdef __STDC__ RX_DECL struct rx_inx * rx_handle_cache_miss - (struct rx *rx, struct rx_superstate *super, unsigned char chr, void *data) + (struct rx *rx, struct rx_superstate *super, unsigned char chr, void *data) #else RX_DECL struct rx_inx * rx_handle_cache_miss (rx, super, chr, data) @@ -3875,7 +3875,7 @@ rx_handle_cache_miss (rx, super, chr, data) } else if (df->future) /* A cache miss on an edge with a future? Must be * a semi-free destination. */ - { + { if (df->future->is_semifree) refresh_semifree_superstate (rx->cache, df->future); return &df->future_frame; @@ -3927,7 +3927,7 @@ __const__ char *re_error_msg[] = -/* +/* * Macros used while compiling patterns. * * By convention, PEND points just past the end of the uncompiled pattern, @@ -3938,7 +3938,7 @@ __const__ char *re_error_msg[] = /* - * Fetch the next character in the uncompiled pattern---translating it + * Fetch the next character in the uncompiled pattern---translating it * if necessary. *Also cast from a signed character in the constant * string passed to us by the user to an unsigned char that we can use * as an array index (in, e.g., `translate'). @@ -3949,7 +3949,7 @@ __const__ char *re_error_msg[] = c = translate[c]; \ } while (0) -/* +/* * Fetch the next character in the uncompiled pattern, with no * translation. */ @@ -4016,7 +4016,7 @@ typedef struct PATFETCH (c); \ } \ } \ - } + } #define CHAR_CLASS_MAX_LENGTH 6 /* Namely, `xdigit'. */ @@ -4033,7 +4033,7 @@ typedef struct /* P points to just after a ^ in PATTERN. Return true if that ^ comes * after an alternative or a begin-subexpression. We assume there is at - * least one character before the ^. + * least one character before the ^. */ #ifdef __STDC__ @@ -4049,9 +4049,9 @@ at_begline_loc_p (pattern, p, syntax) { __const__ char *prev = p - 2; boolean prev_prev_backslash = ((prev > pattern) && (prev[-1] == '\\')); - + return - + (/* After a subexpression? */ ((*prev == '(') && ((syntax & RE_NO_BK_PARENS) || prev_prev_backslash)) || @@ -4078,7 +4078,7 @@ at_endline_loc_p (p, pend, syntax) __const__ char *next = p; boolean next_backslash = (*next == '\\'); __const__ char *next_next = (p + 1 < pend) ? (p + 1) : 0; - + return ( /* Before a subexpression? */ @@ -4147,7 +4147,7 @@ inverse_translation (rxb, valid, cache, translate, c) #endif { rx_Bitset cs - = cache + c * rx_bitset_numb_subsets (rxb->rx.local_cset_size); + = cache + c * rx_bitset_numb_subsets (rxb->rx.local_cset_size); if (!valid[c]) { @@ -4167,7 +4167,7 @@ inverse_translation (rxb, valid, cache, translate, c) /* More subroutine declarations and macros for regex_compile. */ -/* Returns true if REGNUM is in one of COMPILE_STACK's elements and +/* Returns true if REGNUM is in one of COMPILE_STACK's elements and false if it's not. */ #ifdef __STDC__ @@ -4182,8 +4182,8 @@ group_in_compile_stack (compile_stack, regnum) { int this_element; - for (this_element = compile_stack.avail - 1; - this_element >= 0; + for (this_element = compile_stack.avail - 1; + this_element >= 0; this_element--) if (compile_stack.stack[this_element].regnum == regnum) return true; @@ -4198,11 +4198,11 @@ group_in_compile_stack (compile_stack, regnum) * starting character is in `P[-2]'. (`P[-1]' is the character `-'.) * Then we set the translation of all bits between the starting and * ending characters (inclusive) in the compiled pattern B. - * + * * Return an error code. - * + * * We use these short variable names so we can use the same macros as - * `regex_compile' itself. + * `regex_compile' itself. */ #ifdef __STDC__ @@ -4247,7 +4247,7 @@ compile_range (rxb, cs, p_ptr, pend, translate, syntax, inv_tr, valid_inv_tr) inverse_translation (rxb, valid_inv_tr, inv_tr, translate, this_char); rx_bitset_union (rxb->rx.local_cset_size, cs, it); } - + return REG_NOERROR; } @@ -4383,7 +4383,7 @@ is_anchored (rexp, se) case r_opt: case r_star: return is_anchored (rexp->params.pair.left, se) ? 2 : 0; - + case r_side_effect: return ((rexp->params.side_effect == se) ? 1 : 2); @@ -4397,7 +4397,7 @@ is_anchored (rexp, se) /* This removes register assignments that aren't required by backreferencing. * This can speed up explore_future, especially if it eliminates * non-determinism in the superstate NFA. - * + * * NEEDED is an array of characters, presumably filled in by FIND_BACKREFS. * The non-zero elements of the array indicate which register assignments * can NOT be removed from the expression. @@ -4605,7 +4605,7 @@ static char idempotent_complex_se[] = #define RX_WANT_SE_DEFS 1 #undef RX_DEF_SE #undef RX_DEF_CPLX_SE -#define RX_DEF_SE(IDEM, NAME, VALUE) +#define RX_DEF_SE(IDEM, NAME, VALUE) #define RX_DEF_CPLX_SE(IDEM, NAME, VALUE) IDEM, #include "rx.h" #undef RX_DEF_SE @@ -4621,7 +4621,7 @@ static char idempotent_se[] = #undef RX_DEF_SE #undef RX_DEF_CPLX_SE #define RX_DEF_SE(IDEM, NAME, VALUE) IDEM, -#define RX_DEF_CPLX_SE(IDEM, NAME, VALUE) +#define RX_DEF_CPLX_SE(IDEM, NAME, VALUE) #include "rx.h" #undef RX_DEF_SE #undef RX_DEF_CPLX_SE @@ -4654,7 +4654,7 @@ has_any_se (rx, rexp) case r_side_effect: return 1; - + case r_2phase_star: case r_concat: case r_alternate: @@ -4702,7 +4702,7 @@ has_non_idempotent_epsilon_path (rx, rexp, params) !((long)rexp->params.side_effect > 0 ? idempotent_complex_se [ params [(long)rexp->params.side_effect].se ] : idempotent_se [-(long)rexp->params.side_effect]); - + case r_alternate: return ( has_non_idempotent_epsilon_path (rx, @@ -4729,7 +4729,7 @@ has_non_idempotent_epsilon_path (rx, rexp, params) -/* This computes rougly what it's name suggests. It can (and does) go wrong +/* This computes rougly what it's name suggests. It can (and does) go wrong * in the direction of returning spurious 0 without causing disasters. */ #ifdef __STDC__ @@ -4753,7 +4753,7 @@ begins_with_complex_se (rx, rexp) case r_side_effect: return ((long)rexp->params.side_effect >= 0); - + case r_alternate: return ( begins_with_complex_se (rx, rexp->params.pair.left) @@ -4773,11 +4773,11 @@ begins_with_complex_se (rx, rexp) } -/* This destructively removes some of the re_se_tv side effects from +/* This destructively removes some of the re_se_tv side effects from * a rexp tree. In particular, during parsing re_se_tv was inserted on the - * right half of every | to guarantee that posix path preference could be - * honored. This function removes some which it can be determined aren't - * needed. + * right half of every | to guarantee that posix path preference could be + * honored. This function removes some which it can be determined aren't + * needed. */ #ifdef __STDC__ @@ -4819,7 +4819,7 @@ speed_up_alt (rx, rexp, unposix) speed_up_alt (rx, rexp->params.pair.left, unposix); speed_up_alt (rx, rexp->params.pair.right->params.pair.right, unposix); - + if ( unposix || (begins_with_complex_se (rx, rexp->params.pair.right->params.pair.right)) @@ -4852,7 +4852,7 @@ speed_up_alt (rx, rexp, unposix) `fastmap_accurate' is set to zero; `re_nsub' is set to the number of groups in PATTERN; `not_bol' and `not_eol' are set to zero. - + The `fastmap' and `newline_anchor' fields are neither examined nor set. */ @@ -4862,7 +4862,7 @@ speed_up_alt (rx, rexp, unposix) RX_DECL reg_errcode_t rx_compile (__const__ char *pattern, int size, reg_syntax_t syntax, - struct re_pattern_buffer * rxb) + struct re_pattern_buffer * rxb) #else RX_DECL reg_errcode_t rx_compile (pattern, size, syntax, rxb) @@ -4881,17 +4881,17 @@ rx_compile (pattern, size, syntax, rxb) `char *' (i.e., signed), we declare these variables as unsigned, so they can be reliably used as array indices. */ register unsigned char c, c1; - + /* A random tempory spot in PATTERN. */ __const__ char *p1; - + /* Keeps track of unclosed groups. */ compile_stack_type compile_stack; /* Points to the current (ending) position in the pattern. */ __const__ char *p = pattern; __const__ char *pend = pattern + size; - + /* How to translate the characters in the pattern. */ unsigned char *translate = (rxb->translate ? rxb->translate @@ -4900,7 +4900,7 @@ rx_compile (pattern, size, syntax, rxb) /* When parsing is done, this will hold the expression tree. */ struct rexp_node * rexp = 0; - /* In the midst of compilation, this holds onto the regexp + /* In the midst of compilation, this holds onto the regexp * first parst while rexp goes on to aquire additional constructs. */ struct rexp_node * orig_rexp = 0; @@ -4909,7 +4909,7 @@ rx_compile (pattern, size, syntax, rxb) /* This and top_expression are saved on the compile stack. */ struct rexp_node ** top_expression = &rexp; struct rexp_node ** last_expression = top_expression; - + /* Parameter to `goto append_node' */ struct rexp_node * append; @@ -4919,7 +4919,7 @@ rx_compile (pattern, size, syntax, rxb) regnum_t regnum = 0; /* Place in the uncompiled pattern (i.e., the {) to - * which to go back if the interval is invalid. + * which to go back if the interval is invalid. */ __const__ char *beg_interval; @@ -4947,8 +4947,8 @@ rx_compile (pattern, size, syntax, rxb) rxb->fastmap_accurate = 0; rxb->not_bol = rxb->not_eol = 0; rxb->least_subs = 0; - - /* Always count groups, whether or not rxb->no_sub is set. + + /* Always count groups, whether or not rxb->no_sub is set. * The whole pattern is implicitly group 0, so counting begins * with 1. */ @@ -4991,7 +4991,7 @@ rx_compile (pattern, size, syntax, rxb) case '$': { if ( /* If at end of pattern, it's an operator. */ - p == pend + p == pend /* If context independent, it's an operator. */ || syntax & RE_CONTEXT_INDEP_ANCHORS /* Otherwise, depends on what's next. */ @@ -5158,7 +5158,7 @@ rx_compile (pattern, size, syntax, rxb) goto add_side_effect; } } - /* The old regex.c used to optimize `.*\n'. + /* The old regex.c used to optimize `.*\n'. * Maybe rx should too? */ } @@ -5191,36 +5191,36 @@ rx_compile (pattern, size, syntax, rxb) rx_Bitset cs = rx_cset (&rxb->rx); struct rexp_node * node = rx_mk_r_cset (&rxb->rx, cs); int is_inverted = *p == '^'; - + if (!(node && cs)) return REG_ESPACE; - + /* This branch of the switch is normally exited with *`goto append_node' */ append = node; - + if (is_inverted) p++; - + /* Remember the first position in the bracket expression. */ p1 = p; - + /* Read in characters and ranges, setting map bits. */ for (;;) { if (p == pend) return REG_EBRACK; - + PATFETCH (c); - + /* \ might escape characters inside [...] and [^...]. */ if ((syntax & RE_BACKSLASH_ESCAPE_IN_LISTS) && c == '\\') { if (p == pend) return REG_EESCAPE; - + PATFETCH (c1); { - rx_Bitset it = inverse_translation (rxb, + rx_Bitset it = inverse_translation (rxb, validate_inv_tr, inverse_translate, translate, @@ -5229,24 +5229,24 @@ rx_compile (pattern, size, syntax, rxb) } continue; } - + /* Could be the end of the bracket expression. If it's not (i.e., when the bracket expression is `[]' so far), the ']' character bit gets set way below. */ if (c == ']' && p != p1 + 1) goto finalize_class_and_append; - + /* Look ahead to see if it's a range when the last thing was a character class. */ if (had_char_class && c == '-' && *p != ']') return REG_ERANGE; - + /* Look ahead to see if it's a range when the last thing was a character: if this is a hyphen not at the beginning or the end of a list, then it's the range operator. */ - if (c == '-' - && !(p - 2 >= pattern && p[-2] == '[') + if (c == '-' + && !(p - 2 >= pattern && p[-2] == '[') && !(p - 3 >= pattern && p[-3] == '[' && p[-2] == '^') && *p != ']') { @@ -5255,33 +5255,33 @@ rx_compile (pattern, size, syntax, rxb) inverse_translate, validate_inv_tr); if (ret != REG_NOERROR) return ret; } - + else if (p[0] == '-' && p[1] != ']') { /* This handles ranges made up of characters only. */ reg_errcode_t ret; - + /* Move past the `-'. */ PATFETCH (c1); - + ret = compile_range (rxb, cs, &p, pend, translate, syntax, inverse_translate, validate_inv_tr); if (ret != REG_NOERROR) return ret; } - + /* See if we're at the beginning of a possible character class. */ - + else if ((syntax & RE_CHAR_CLASSES) && (c == '[') && (*p == ':')) { char str[CHAR_CLASS_MAX_LENGTH + 1]; - + PATFETCH (c); c1 = 0; - + /* If pattern is `[[:'. */ if (p == pend) return REG_EBRACK; - + for (;;) { PATFETCH (c); @@ -5291,9 +5291,9 @@ rx_compile (pattern, size, syntax, rxb) str[c1++] = c; } str[c1] = '\0'; - + /* If isn't a word bracketed by `[:' and:`]': - undo the ending character, the letters, and leave + undo the ending character, the letters, and leave the leading `:' and `[' (but set bits for them). */ if (c == ':' && *p == ']') { @@ -5310,15 +5310,15 @@ rx_compile (pattern, size, syntax, rxb) boolean is_space = !strcmp (str, "space"); boolean is_upper = !strcmp (str, "upper"); boolean is_xdigit = !strcmp (str, "xdigit"); - + if (!IS_CHAR_CLASS (str)) return REG_ECTYPE; - + /* Throw away the ] at the end of the character class. */ - PATFETCH (c); - + PATFETCH (c); + if (p == pend) return REG_EBRACK; - + for (ch = 0; ch < 1 << CHARBITS; ch++) { if ( (is_alnum && isalnum (ch)) @@ -5335,7 +5335,7 @@ rx_compile (pattern, size, syntax, rxb) || (is_xdigit && isxdigit (ch))) { rx_Bitset it = - inverse_translation (rxb, + inverse_translation (rxb, validate_inv_tr, inverse_translate, translate, @@ -5349,11 +5349,11 @@ rx_compile (pattern, size, syntax, rxb) else { c1++; - while (c1--) + while (c1--) PATUNFETCH; { rx_Bitset it = - inverse_translation (rxb, + inverse_translation (rxb, validate_inv_tr, inverse_translate, translate, @@ -5363,7 +5363,7 @@ rx_compile (pattern, size, syntax, rxb) } { rx_Bitset it = - inverse_translation (rxb, + inverse_translation (rxb, validate_inv_tr, inverse_translate, translate, @@ -5378,7 +5378,7 @@ rx_compile (pattern, size, syntax, rxb) { had_char_class = false; { - rx_Bitset it = inverse_translation (rxb, + rx_Bitset it = inverse_translation (rxb, validate_inv_tr, inverse_translate, translate, @@ -5453,7 +5453,7 @@ rx_compile (pattern, size, syntax, rxb) rxb->re_nsub++; regnum++; if (COMPILE_STACK_FULL) - { + { ((compile_stack.stack) = (compile_stack_elt_t *) realloc (compile_stack.stack, ( compile_stack.size << 1) * sizeof ( compile_stack_elt_t))); @@ -5474,14 +5474,14 @@ rx_compile (pattern, size, syntax, rxb) /* * These are the values to restore when we hit end of this - * group. + * group. */ COMPILE_STACK_TOP.top_expression = top_expression; COMPILE_STACK_TOP.last_expression = last_expression; COMPILE_STACK_TOP.regnum = regnum; - + compile_stack.avail++; - + top_expression = last_expression; break; @@ -5595,10 +5595,10 @@ rx_compile (pattern, size, syntax, rxb) break; - case '{': + case '{': /* If \{ is a literal. */ if (!(syntax & RE_INTERVALS) - /* If we're at `\{' and it's not the open-interval + /* If we're at `\{' and it's not the open-interval operator. */ || ((syntax & RE_INTERVALS) && (syntax & RE_NO_BK_BRACES)) || (p - 2 == pattern && p == pend)) @@ -5637,11 +5637,11 @@ rx_compile (pattern, size, syntax, rxb) { if (syntax & RE_NO_BK_BRACES) goto unfetch_interval; - else + else return REG_BADBR; } - if (!(syntax & RE_NO_BK_BRACES)) + if (!(syntax & RE_NO_BK_BRACES)) { if (c != '\\') return REG_EBRACE; PATFETCH (c); @@ -5651,7 +5651,7 @@ rx_compile (pattern, size, syntax, rxb) { if (syntax & RE_NO_BK_BRACES) goto unfetch_interval; - else + else return REG_BADBR; } @@ -5747,7 +5747,7 @@ rx_compile (pattern, size, syntax, rxb) beg_interval = NULL; /* normal_char and normal_backslash need `c'. */ - PATFETCH (c); + PATFETCH (c); if (!(syntax & RE_NO_BK_BRACES)) { @@ -5780,7 +5780,7 @@ rx_compile (pattern, size, syntax, rxb) char code = syntax_spec_code (c); for (x = 0; x < 256; ++x) { - + if (SYNTAX (x) & code) { rx_Bitset it = @@ -5819,7 +5819,7 @@ rx_compile (pattern, size, syntax, rxb) /* With a little extra work, some of these side effects could be optimized * away (basicly by looking at what we already know about the surrounding - * chars). + * chars). */ case '<': side = (rx_side_effect)re_se_wordbeg; @@ -5845,7 +5845,7 @@ rx_compile (pattern, size, syntax, rxb) side = (rx_side_effect)re_se_begbuf; goto add_side_effect; break; - + case '\'': side = (rx_side_effect)re_se_endbuf; goto add_side_effect; @@ -5945,7 +5945,7 @@ rx_compile (pattern, size, syntax, rxb) } /* switch (c) */ } /* while p != pend */ - + { int win_se = paramc; params = (params @@ -5972,7 +5972,7 @@ rx_compile (pattern, size, syntax, rxb) /* Through the pattern now. */ - if (!COMPILE_STACK_EMPTY) + if (!COMPILE_STACK_EMPTY) return REG_EPAREN; free (compile_stack.stack); @@ -6023,11 +6023,11 @@ rx_compile (pattern, size, syntax, rxb) } } - /* At least one more optimization would be nice to have here but i ran out - * of time. The idea would be to delay side effects. + /* At least one more optimization would be nice to have here but i ran out + * of time. The idea would be to delay side effects. * For examle, `(abc)' is the same thing as `abc()' except that the * left paren is offset by 3 (which we know at compile time). - * (In this comment, write that second pattern `abc(:3:)' + * (In this comment, write that second pattern `abc(:3:)' * where `(:3:' is a syntactic unit.) * * Trickier: `(abc|defg)' is the same as `(abc(:3:|defg(:4:))' @@ -6041,7 +6041,7 @@ rx_compile (pattern, size, syntax, rxb) /* What we compile is different than what the parser returns. * Suppose the parser returns expression R. - * Let R' be R with unnecessary register assignments removed + * Let R' be R with unnecessary register assignments removed * (see REMOVE_UNECESSARY_SIDE_EFFECTS, above). * * What we will compile is the expression: @@ -6049,8 +6049,8 @@ rx_compile (pattern, size, syntax, rxb) * m{try}R{win}\|s{try}R'{win} * * {try} and {win} denote side effect epsilons (see EXPLORE_FUTURE). - * - * When trying a match, we insert an `m' at the beginning of the + * + * When trying a match, we insert an `m' at the beginning of the * string if the user wants registers to be filled, `s' if not. */ new_rexp = @@ -6105,7 +6105,7 @@ rx_compile (pattern, size, syntax, rxb) else { rx_delete_epsilon_transitions (&rxb->rx); - + /* For compatability reasons, we need to shove the * compiled nfa into one chunk of malloced memory. */ @@ -6136,7 +6136,7 @@ rx_compile (pattern, size, syntax, rxb) rx_bitset_null (rxb->rx.local_cset_size, rxb->fastset); rxb->can_match_empty = compute_fastset (rxb, orig_rexp); rxb->match_regs_on_stack = - registers_on_stack (rxb, orig_rexp, 0, params); + registers_on_stack (rxb, orig_rexp, 0, params); rxb->search_regs_on_stack = registers_on_stack (rxb, fewer_side_effects, 0, params); if (rxb->can_match_empty) @@ -6231,7 +6231,7 @@ rx_blow_up_fastmap (rxb) #define RE_S2_QUAL static #else #define RE_SEARCH_2_FN re_search_2 -#define RE_S2_QUAL +#define RE_S2_QUAL #endif struct re_search_2_closure @@ -6381,7 +6381,7 @@ re_search_2_fetch_char (pos, offset, app_closure, stop) else return *pos->pos; } - + #ifdef __STDC__ RE_S2_QUAL int @@ -6657,10 +6657,10 @@ re_set_registers (bufp, regs, num_regs, starts, ends) #ifdef __STDC__ -static int +static int cplx_se_sublist_len (struct rx_se_list * list) #else -static int +static int cplx_se_sublist_len (list) struct rx_se_list * list; #endif @@ -6679,11 +6679,11 @@ cplx_se_sublist_len (list) /* For rx->se_list_cmp */ #ifdef __STDC__ -static int +static int posix_se_list_order (struct rx * rx, struct rx_se_list * a, struct rx_se_list * b) #else -static int +static int posix_se_list_order (rx, a, b) struct rx * rx; struct rx_se_list * a; @@ -6697,7 +6697,7 @@ posix_se_list_order (rx, a, b) return ((a == b) ? 0 : ((a < b) ? -1 : 1)); - + else if (!al) return -1; @@ -6713,7 +6713,7 @@ posix_se_list_order (rx, a, b) struct rx_se_list * ap = a; struct rx_se_list * bp = b; int ai, bi; - + for (ai = al - 1; ai >= 0; --ai) { while ((long)ap->car < 0) @@ -6782,7 +6782,7 @@ re_compile_pattern (pattern, length, rxb) /* Match anchors at newline. */ rxb->newline_anchor = 1; - + rxb->re_nsub = 0; rxb->start = 0; rxb->se_params = 0; diff --git a/gnu/lib/libmalloc/mem-limits.h b/gnu/lib/libmalloc/mem-limits.h index ab594fc..6ad994f 100644 --- a/gnu/lib/libmalloc/mem-limits.h +++ b/gnu/lib/libmalloc/mem-limits.h @@ -69,12 +69,12 @@ extern char etext; #endif #endif -#else /* Not emacs */ +#else /* Not emacs */ extern char etext; #define start_of_data() &etext #endif /* Not emacs */ - + /* start of data space; can be changed by calling malloc_init */ static POINTER data_space_start; diff --git a/gnu/lib/libmalloc/ralloc.c b/gnu/lib/libmalloc/ralloc.c index 78b9f62..32094d2 100644 --- a/gnu/lib/libmalloc/ralloc.c +++ b/gnu/lib/libmalloc/ralloc.c @@ -1,4 +1,4 @@ -/* Block-relocating memory allocator. +/* Block-relocating memory allocator. Copyright (C) 1993 Free Software Foundation, Inc. @@ -104,7 +104,7 @@ static POINTER page_break_value; /* This is the size of a page. We round memory requests to this boundary. */ static int page_size; -/* Whenever we get memory from the system, get this many extra bytes. This +/* Whenever we get memory from the system, get this many extra bytes. This must be a multiple of page_size. */ static int extra_bytes; @@ -173,7 +173,7 @@ relinquish (size) break_value -= size; new_page_break = (POINTER) ROUNDUP (break_value); excess = (char *) page_break_value - (char *) new_page_break; - + if (excess > extra_bytes * 2) { /* Keep extra_bytes worth of empty space. @@ -286,7 +286,7 @@ relocate_some_blocs (bloc, address) register SIZE offset = address - bloc->data; register SIZE data_size = 0; register bloc_ptr b; - + for (b = bloc; b != NIL_BLOC; b = b->next) { data_size += b->size; @@ -346,7 +346,7 @@ static int use_relocatable_buffers; __morecore hook values - in particular, __default_morecore in the GNU malloc package. */ -POINTER +POINTER r_alloc_sbrk (size) long size; { diff --git a/gnu/lib/libmalloc/vm-limit.c b/gnu/lib/libmalloc/vm-limit.c index a2ac96c..06ea071 100644 --- a/gnu/lib/libmalloc/vm-limit.c +++ b/gnu/lib/libmalloc/vm-limit.c @@ -68,7 +68,7 @@ check_memory_limits () if (warn_function) switch (warnlevel) { - case 0: + case 0: if (data_size > five_percent * 15) { warnlevel++; @@ -76,7 +76,7 @@ check_memory_limits () } break; - case 1: + case 1: if (data_size > five_percent * 17) { warnlevel++; @@ -84,7 +84,7 @@ check_memory_limits () } break; - case 2: + case 2: if (data_size > five_percent * 19) { warnlevel++; diff --git a/gnu/lib/libreadline/complete.c b/gnu/lib/libreadline/complete.c index 8084c38..4726079 100644 --- a/gnu/lib/libreadline/complete.c +++ b/gnu/lib/libreadline/complete.c @@ -334,14 +334,14 @@ print_filename (to_print, full_pathname) PUTX (*s); } return 0; -#else +#else char *s, c, *new_full_pathname; int extension_char = 0, slen, tlen; for (s = to_print; *s; s++) { PUTX (*s); - } + } if (rl_filename_completion_desired && rl_visible_stats) { diff --git a/gnu/lib/libreadline/display.c b/gnu/lib/libreadline/display.c index 07fc909..fcc766c 100644 --- a/gnu/lib/libreadline/display.c +++ b/gnu/lib/libreadline/display.c @@ -166,7 +166,7 @@ static int visible_first_line_len = 0; \002 (^B) end non-visible characters all characters except \001 and \002 (following a \001) are copied to the returned string; all characters except those between \001 and - \002 are assumed to be `visible'. */ + \002 are assumed to be `visible'. */ static char * expand_prompt (pmt, lp) @@ -187,7 +187,7 @@ expand_prompt (pmt, lp) l = strlen (pmt); r = ret = xmalloc (l + 1); - + for (rl = ignoring = 0, p = pmt; p && *p; p++) { /* This code strips the invisible character string markers @@ -377,7 +377,7 @@ rl_redisplay () out += 4; } else - line[out++] = c; + line[out++] = c; } #if defined (DISPLAY_TABS) else if (c == '\t') @@ -693,7 +693,7 @@ update_line (old, new, current_line, omax, nmax, inv_botlin) if (old[0] && new[0]) old[0] = new[0]; } - + /* Find first difference. */ for (ofd = old, nfd = new; (ofd - old < omax) && *ofd && (*ofd == *nfd); diff --git a/gnu/lib/libreadline/examples/Makefile b/gnu/lib/libreadline/examples/Makefile index 55ebffc..3f9659e 100644 --- a/gnu/lib/libreadline/examples/Makefile +++ b/gnu/lib/libreadline/examples/Makefile @@ -9,4 +9,4 @@ fileman: fileman.o $(CC) $(LDFLAGS) -o fileman fileman.o -lreadline -ltermcap fileman.o: fileman.c - + diff --git a/gnu/lib/libreadline/examples/fileman.c b/gnu/lib/libreadline/examples/fileman.c index 3ecb9f1..3256bf3 100644 --- a/gnu/lib/libreadline/examples/fileman.c +++ b/gnu/lib/libreadline/examples/fileman.c @@ -161,7 +161,7 @@ stripwhite (string) for (s = string; whitespace (*s); s++) ; - + if (*s == 0) return (s); diff --git a/gnu/lib/libreadline/examples/manexamp.c b/gnu/lib/libreadline/examples/manexamp.c index 3496efa..051dcbc 100644 --- a/gnu/lib/libreadline/examples/manexamp.c +++ b/gnu/lib/libreadline/examples/manexamp.c @@ -56,7 +56,7 @@ invert_case_line (count, key) } else direction = 1; - + /* Find the end of the range to modify. */ end = start + (count * direction); diff --git a/gnu/lib/libreadline/funmap.c b/gnu/lib/libreadline/funmap.c index 9255974..c37cf39 100644 --- a/gnu/lib/libreadline/funmap.c +++ b/gnu/lib/libreadline/funmap.c @@ -170,7 +170,7 @@ rl_add_funmap_entry (name, function) else funmap = (FUNMAP **)xrealloc (funmap, (funmap_size += 80) * sizeof (FUNMAP *)); - + funmap[funmap_entry] = (FUNMAP *)xmalloc (sizeof (FUNMAP)); funmap[funmap_entry]->name = name; funmap[funmap_entry]->function = function; diff --git a/gnu/lib/libreadline/history.c b/gnu/lib/libreadline/history.c index 410dd6a..a0a2560 100644 --- a/gnu/lib/libreadline/history.c +++ b/gnu/lib/libreadline/history.c @@ -862,7 +862,7 @@ history_set_pos (pos) history_offset = pos; return (1); } - + /* **************************************************************** */ /* */ @@ -996,7 +996,7 @@ get_history_event (string, caller_index, delimiting_quote) { entry = current_history (); history_offset = history_length; - + /* If this was a substring search, then remember the string that we matched for word substitution. */ if (substring_okay) @@ -1259,7 +1259,7 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line) quoted_search_delimiter = string[i - 1]; event = get_history_event (string, &i, quoted_search_delimiter); } - + if (!event) { *ret_string = hist_error (string, start, i, EVENT_NOT_FOUND); @@ -1581,7 +1581,7 @@ history_expand (hstring, output) *output = savestring (hstring); return (0); } - + /* Prepare the buffer for printing error messages. */ result = xmalloc (result_len = 256); result[0] = '\0'; @@ -1650,7 +1650,7 @@ history_expand (hstring, output) } #endif /* SHELL */ } - + if (string[i] != history_expansion_char) { free (result); @@ -1968,7 +1968,7 @@ history_tokenize_internal (string, wind, indp) return (result); start = i; - + if (member (string[i], "()\n")) { i++; diff --git a/gnu/lib/libreadline/history.h b/gnu/lib/libreadline/history.h index 6935efd..d9d4131 100644 --- a/gnu/lib/libreadline/history.h +++ b/gnu/lib/libreadline/history.h @@ -67,7 +67,7 @@ extern HIST_ENTRY **history_list (); /* Returns the number which says what history element we are now looking at. */ extern int where_history (); - + /* Return the history entry at the current position, as determined by history_offset. If there is no entry there, return a NULL pointer. */ HIST_ENTRY *current_history (); diff --git a/gnu/lib/libreadline/posixstat.h b/gnu/lib/libreadline/posixstat.h index 7d1cece..ce123f8 100644 --- a/gnu/lib/libreadline/posixstat.h +++ b/gnu/lib/libreadline/posixstat.h @@ -114,7 +114,7 @@ /* * POSIX 1003.1 5.6.1.2 <sys/stat.h> File Modes */ - + #if !defined (S_IRWXU) # if !defined (S_IREAD) # define S_IREAD 00400 diff --git a/gnu/lib/libreadline/readline.c b/gnu/lib/libreadline/readline.c index 1a27bd4..6d5dac5 100644 --- a/gnu/lib/libreadline/readline.c +++ b/gnu/lib/libreadline/readline.c @@ -216,12 +216,12 @@ int _rl_horizontal_scroll_mode = 0; /* Non-zero means to display an asterisk at the starts of history lines which have been modified. */ -int _rl_mark_modified_lines = 0; +int _rl_mark_modified_lines = 0; /* The style of `bell' notification preferred. This can be set to NO_BELL, AUDIBLE_BELL, or VISIBLE_BELL. */ int _rl_bell_preference = AUDIBLE_BELL; - + /* Line buffer and maintenence. */ char *rl_line_buffer = (char *)NULL; int rl_line_buffer_len = 0; @@ -1003,7 +1003,7 @@ readline_initialize_everything () _rl_convert_meta_chars_to_ascii = 0; _rl_output_meta_chars = 1; } - + /* Read in the init file. */ rl_read_init_file ((char *)NULL); @@ -2110,7 +2110,7 @@ rl_quoted_insert (count, key) int c; c = rl_read_key (); - return (rl_insert (count, c)); + return (rl_insert (count, c)); } /* Insert a tab character. */ @@ -2224,7 +2224,7 @@ rl_delete (count, invoking_key) } else return (rl_delete_text (rl_point, rl_point + 1)); - + } /* Delete all spaces and tabs around point. */ diff --git a/gnu/lib/libreadline/readline.h b/gnu/lib/libreadline/readline.h index 652d8ca..8132843 100644 --- a/gnu/lib/libreadline/readline.h +++ b/gnu/lib/libreadline/readline.h @@ -162,7 +162,7 @@ extern char *rl_basic_word_break_characters; extern char *rl_completer_word_break_characters; /* List of characters which can be used to quote a substring of the line. - Completion occurs on the entire substring, and within the substring + Completion occurs on the entire substring, and within the substring rl_completer_word_break_characters are treated as any other character, unless they also appear within this list. */ extern char *rl_completer_quote_characters; diff --git a/gnu/lib/libreadline/tilde.c b/gnu/lib/libreadline/tilde.c index da75d95..a269351 100644 --- a/gnu/lib/libreadline/tilde.c +++ b/gnu/lib/libreadline/tilde.c @@ -23,7 +23,7 @@ # include <string.h> #else /* !HAVE_STRING_H */ # include <strings.h> -#endif /* !HAVE_STRING_H */ +#endif /* !HAVE_STRING_H */ #if defined (HAVE_STDLIB_H) # include <stdlib.h> diff --git a/gnu/lib/libreadline/vi_mode.c b/gnu/lib/libreadline/vi_mode.c index 66d2d40..b50c707 100644 --- a/gnu/lib/libreadline/vi_mode.c +++ b/gnu/lib/libreadline/vi_mode.c @@ -174,7 +174,7 @@ rl_vi_redo (count, c) return (0); } - + /* Yank the nth arg from the previous line into this line at point. */ rl_vi_yank_arg (count, key) int count, key; @@ -886,7 +886,7 @@ rl_vi_delete (count, key) end = rl_end; rl_kill_text (rl_point, end); - + if (rl_point > 0 && rl_point == rl_end) rl_backward (1); return (0); diff --git a/gnu/lib/libregex/Makefile.gnu b/gnu/lib/libregex/Makefile.gnu index 0976aa8..b8bc209 100644 --- a/gnu/lib/libregex/Makefile.gnu +++ b/gnu/lib/libregex/Makefile.gnu @@ -1,6 +1,6 @@ # Generated automatically from Makefile.in by configure. # Makefile for regex. -# +# # Copyright (C) 1992, 1993 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -27,7 +27,7 @@ version = 0.12 # -DEXTRACT_MACROS to use the macros EXTRACT_* (as opposed to # the corresponding C procedures). If not -DDEBUG, the macros # are used. -CPPFLAGS = +CPPFLAGS = # Likewise, you can override CFLAGS to optimize, use -Wall, etc. CFLAGS = -g @@ -83,7 +83,7 @@ TAGS check:: .NOEXPORT: distfiles = AUTHORS ChangeLog COPYING INSTALL NEWS README \ - *.in configure regex.c regex.h + *.in configure regex.c regex.h distdir = regex-$(version) distargs = version=$(version) distdir=../$(distdir)/$$d dist: TAGS configure diff --git a/gnu/lib/libregex/Makefile.in b/gnu/lib/libregex/Makefile.in index 836e6de..a21f970 100644 --- a/gnu/lib/libregex/Makefile.in +++ b/gnu/lib/libregex/Makefile.in @@ -1,5 +1,5 @@ # Makefile for regex. -# +# # Copyright (C) 1992, 1993 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -26,7 +26,7 @@ version = 0.12 # -DEXTRACT_MACROS to use the macros EXTRACT_* (as opposed to # the corresponding C procedures). If not -DDEBUG, the macros # are used. -CPPFLAGS = +CPPFLAGS = # Likewise, you can override CFLAGS to optimize, use -Wall, etc. CFLAGS = -g @@ -82,7 +82,7 @@ TAGS check:: .NOEXPORT: distfiles = AUTHORS ChangeLog COPYING INSTALL NEWS README \ - *.in configure regex.c regex.h + *.in configure regex.c regex.h distdir = regex-$(version) distargs = version=$(version) distdir=../$(distdir)/$$d dist: TAGS configure diff --git a/gnu/lib/libregex/regex.c b/gnu/lib/libregex/regex.c index 6a36f3d..320b72b 100644 --- a/gnu/lib/libregex/regex.c +++ b/gnu/lib/libregex/regex.c @@ -79,7 +79,7 @@ char *realloc (); /* This must be nonzero for the wordchar and notwordchar pattern commands in re_match_2. */ -#ifndef Sword +#ifndef Sword #define Sword 1 #endif @@ -188,8 +188,8 @@ init_syntax_once () use `alloca' instead of `malloc'. This is because using malloc in re_search* or re_match* could cause memory leaks when C-g is used in Emacs; also, malloc is slower and causes storage fragmentation. On - the other hand, malloc is more portable, and easier to debug. - + the other hand, malloc is more portable, and easier to debug. + Because we sometimes use alloca, some routines have to be macros, not functions -- `alloca'-allocated space disappears at the end of the function it is called in. */ @@ -214,7 +214,7 @@ init_syntax_once () #ifndef _AIX /* Already did AIX, up at the top. */ char *alloca (); #endif /* not _AIX */ -#endif /* not HAVE_ALLOCA_H */ +#endif /* not HAVE_ALLOCA_H */ #endif /* not __GNUC__ */ #endif /* not alloca */ @@ -317,9 +317,9 @@ typedef enum /* Analogously, for end of buffer/string. */ endbuf, - + /* Followed by two byte relative address to which to jump. */ - jump, + jump, /* Same as jump, but marks the end of an alternative. */ jump_past_alt, @@ -327,11 +327,11 @@ typedef enum /* Followed by two-byte relative address of place to resume at in case of failure. */ on_failure_jump, - + /* Like on_failure_jump, but pushes a placeholder instead of the current string position when executed. */ on_failure_keep_string_jump, - + /* Throw away latest failure point and then jump to following two-byte relative address. */ pop_failure_jump, @@ -428,7 +428,7 @@ extract_number (dest, source) int *dest; unsigned char *source; { - int temp = SIGN_EXTEND_CHAR (*(source + 1)); + int temp = SIGN_EXTEND_CHAR (*(source + 1)); *dest = *source & 0377; *dest += temp << 8; } @@ -456,7 +456,7 @@ static void extract_number_and_incr (destination, source) int *destination; unsigned char **source; -{ +{ extract_number (destination, *source); *source += 2; } @@ -505,8 +505,8 @@ print_fastmap (fastmap) char *fastmap; { unsigned was_a_range = 0; - unsigned i = 0; - + unsigned i = 0; + while (i < (1 << BYTEWIDTH)) { if (fastmap[i++]) @@ -525,7 +525,7 @@ print_fastmap (fastmap) } } } - putchar ('\n'); + putchar ('\n'); } @@ -546,7 +546,7 @@ print_partial_compiled_pattern (start, end) printf ("(null)\n"); return; } - + /* Loop over pattern commands. */ while (p < pend) { @@ -595,7 +595,7 @@ print_partial_compiled_pattern (start, end) printf ("/charset [%s", (re_opcode_t) *(p - 1) == charset_not ? "^" : ""); - + assert (p + *p < pend); for (c = 0; c < 256; c++) @@ -614,7 +614,7 @@ print_partial_compiled_pattern (start, end) printchar (last); in_range = 0; } - + if (! in_range) printchar (c); @@ -656,7 +656,7 @@ print_partial_compiled_pattern (start, end) case push_dummy_failure: printf ("/push_dummy_failure"); break; - + case maybe_pop_jump: extract_number_and_incr (&mcnt, &p); printf ("/maybe_pop_jump to %d", p + mcnt - start); @@ -665,36 +665,36 @@ print_partial_compiled_pattern (start, end) case pop_failure_jump: extract_number_and_incr (&mcnt, &p); printf ("/pop_failure_jump to %d", p + mcnt - start); - break; - + break; + case jump_past_alt: extract_number_and_incr (&mcnt, &p); printf ("/jump_past_alt to %d", p + mcnt - start); - break; - + break; + case jump: extract_number_and_incr (&mcnt, &p); printf ("/jump to %d", p + mcnt - start); break; - case succeed_n: + case succeed_n: extract_number_and_incr (&mcnt, &p); extract_number_and_incr (&mcnt2, &p); printf ("/succeed_n to %d, %d times", p + mcnt - start, mcnt2); break; - - case jump_n: + + case jump_n: extract_number_and_incr (&mcnt, &p); extract_number_and_incr (&mcnt2, &p); printf ("/jump_n to %d, %d times", p + mcnt - start, mcnt2); break; - - case set_number_at: + + case set_number_at: extract_number_and_incr (&mcnt, &p); extract_number_and_incr (&mcnt2, &p); printf ("/set_number_at location %d to %d", p + mcnt - start, mcnt2); break; - + case wordbound: printf ("/wordbound"); break; @@ -706,10 +706,10 @@ print_partial_compiled_pattern (start, end) case wordbeg: printf ("/wordbeg"); break; - + case wordend: printf ("/wordend"); - + #ifdef emacs case before_dot: printf ("/before_dot"); @@ -728,7 +728,7 @@ print_partial_compiled_pattern (start, end) mcnt = *p++; printf ("/%d", mcnt); break; - + case notsyntaxspec: printf ("/notsyntaxspec"); mcnt = *p++; @@ -739,7 +739,7 @@ print_partial_compiled_pattern (start, end) case wordchar: printf ("/wordchar"); break; - + case notwordchar: printf ("/notwordchar"); break; @@ -799,7 +799,7 @@ print_double_string (where, string1, size1, string2, size2) int size2; { unsigned this_char; - + if (where == NULL) printf ("(null)"); else @@ -809,7 +809,7 @@ print_double_string (where, string1, size1, string2, size2) for (this_char = where - string1; this_char < size1; this_char++) printchar (string1[this_char]); - where = string2; + where = string2; } for (this_char = where - string2; this_char < size2; this_char++) @@ -850,7 +850,7 @@ re_set_syntax (syntax) reg_syntax_t syntax; { reg_syntax_t ret = re_syntax_options; - + re_syntax_options = syntax; return ret; } @@ -900,7 +900,7 @@ static reg_errcode_t compile_range _RE_ARGS((const char **p_ptr, reg_syntax_t syntax, unsigned char *b)); -/* Fetch the next character in the uncompiled pattern---translating it +/* Fetch the next character in the uncompiled pattern---translating it if necessary. Also cast from a signed character in the constant string passed to us by the user to an unsigned char that we can use as an array index (in, e.g., `translate'). */ @@ -1054,7 +1054,7 @@ typedef struct pattern_offset_t begalt_offset; pattern_offset_t fixup_alt_jump; pattern_offset_t inner_group_offset; - pattern_offset_t laststart_offset; + pattern_offset_t laststart_offset; regnum_t regnum; } compile_stack_elt_t; @@ -1097,7 +1097,7 @@ typedef struct PATFETCH (c); \ } \ } \ - } + } #define CHAR_CLASS_MAX_LENGTH 6 /* Namely, `xdigit'. */ @@ -1127,7 +1127,7 @@ static boolean group_in_compile_stack _RE_ARGS((compile_stack_type `fastmap_accurate' is zero; `re_nsub' is the number of subexpressions in PATTERN; `not_bol' and `not_eol' are zero; - + The `fastmap' and `newline_anchor' fields are neither examined nor set. */ @@ -1142,20 +1142,20 @@ regex_compile (pattern, size, syntax, bufp) `char *' (i.e., signed), we declare these variables as unsigned, so they can be reliably used as array indices. */ register unsigned char c, c1; - + /* A random tempory spot in PATTERN. */ const char *p1; /* Points to the end of the buffer, where we should append. */ register unsigned char *b; - + /* Keeps track of unclosed groups. */ compile_stack_type compile_stack; /* Points to the current (ending) position in the pattern. */ const char *p = pattern; const char *pend = pattern + size; - + /* How to translate the characters in the pattern. */ char *translate = bufp->translate; @@ -1176,7 +1176,7 @@ regex_compile (pattern, size, syntax, bufp) /* Place in the uncompiled pattern (i.e., the {) to which to go back if the interval is invalid. */ const char *beg_interval; - + /* Address of the place where a forward jump should go to the end of the containing expression. Each alternative of an `or' -- except the last -- ends with a forward jump of this sort. */ @@ -1192,7 +1192,7 @@ regex_compile (pattern, size, syntax, bufp) if (debug) { unsigned debug_count; - + for (debug_count = 0; debug_count < size; debug_count++) printchar (pattern[debug_count]); putchar ('\n'); @@ -1216,9 +1216,9 @@ regex_compile (pattern, size, syntax, bufp) printer (for debugging) will think there's no pattern. We reset it at the end. */ bufp->used = 0; - + /* Always count groups, whether or not bufp->no_sub is set. */ - bufp->re_nsub = 0; + bufp->re_nsub = 0; #if !defined (emacs) && !defined (SYNTAX_TABLE) /* Initialize the syntax table. */ @@ -1269,7 +1269,7 @@ regex_compile (pattern, size, syntax, bufp) case '$': { if ( /* If at end of pattern, it's an operator. */ - p == pend + p == pend /* If context independent, it's an operator. */ || syntax & RE_CONTEXT_INDEP_ANCHORS /* Otherwise, depends on what's next. */ @@ -1300,7 +1300,7 @@ regex_compile (pattern, size, syntax, bufp) { /* Are we optimizing this jump? */ boolean keep_string_p = false; - + /* 1 means zero (many) matches is allowed. */ char zero_times_ok = 0, many_times_ok = 0; @@ -1348,7 +1348,7 @@ regex_compile (pattern, size, syntax, bufp) /* Star, etc. applied to an empty pattern is equivalent to an empty pattern. */ - if (!laststart) + if (!laststart) break; /* Now we know whether or not zero matches is allowed @@ -1357,7 +1357,7 @@ regex_compile (pattern, size, syntax, bufp) { /* More than one repetition is allowed, so put in at the end a backward relative jump from `b' to before the next jump we're going to put in below (which jumps from - laststart to after this jump). + laststart to after this jump). But if we are at the `*' in the exact sequence `.*\n', insert an unconditional jump backwards to the ., @@ -1434,7 +1434,7 @@ regex_compile (pattern, size, syntax, bufp) /* We test `*p == '^' twice, instead of using an if statement, so we only need one BUF_PUSH. */ - BUF_PUSH (*p == '^' ? charset_not : charset); + BUF_PUSH (*p == '^' ? charset_not : charset); if (*p == '^') p++; @@ -1484,8 +1484,8 @@ regex_compile (pattern, size, syntax, bufp) was a character: if this is a hyphen not at the beginning or the end of a list, then it's the range operator. */ - if (c == '-' - && !(p - 2 >= pattern && p[-2] == '[') + if (c == '-' + && !(p - 2 >= pattern && p[-2] == '[') && !(p - 3 >= pattern && p[-3] == '[' && p[-2] == '^') && *p != ']') { @@ -1500,7 +1500,7 @@ regex_compile (pattern, size, syntax, bufp) /* Move past the `-'. */ PATFETCH (c1); - + ret = compile_range (&p, pend, translate, syntax, b); if (ret != REG_NOERROR) return ret; } @@ -1529,7 +1529,7 @@ regex_compile (pattern, size, syntax, bufp) str[c1] = '\0'; /* If isn't a word bracketed by `[:' and:`]': - undo the ending character, the letters, and leave + undo the ending character, the letters, and leave the leading `:' and `[' (but set bits for them). */ if (c == ':' && *p == ']') { @@ -1546,12 +1546,12 @@ regex_compile (pattern, size, syntax, bufp) boolean is_space = STREQ (str, "space"); boolean is_upper = STREQ (str, "upper"); boolean is_xdigit = STREQ (str, "xdigit"); - + if (!IS_CHAR_CLASS (str)) return REG_ECTYPE; /* Throw away the ] at the end of the character class. */ - PATFETCH (c); + PATFETCH (c); if (p == pend) return REG_EBRACK; @@ -1576,7 +1576,7 @@ regex_compile (pattern, size, syntax, bufp) else { c1++; - while (c1--) + while (c1--) PATUNFETCH; SET_LIST_BIT ('['); SET_LIST_BIT (':'); @@ -1592,8 +1592,8 @@ regex_compile (pattern, size, syntax, bufp) /* Discard any (non)matching list bytes that are all 0 at the end of the map. Decrease the map-length byte too. */ - while ((int) b[-1] > 0 && b[b[-1] - 1] == 0) - b[-1]--; + while ((int) b[-1] > 0 && b[b[-1] - 1] == 0) + b[-1]--; b += b[-1]; } break; @@ -1653,7 +1653,7 @@ regex_compile (pattern, size, syntax, bufp) regnum++; if (COMPILE_STACK_FULL) - { + { RETALLOC (compile_stack.stack, compile_stack.size << 1, compile_stack_elt_t); if (compile_stack.stack == NULL) return REG_ESPACE; @@ -1666,7 +1666,7 @@ regex_compile (pattern, size, syntax, bufp) whole pattern moves because of realloc, they will still be valid. */ COMPILE_STACK_TOP.begalt_offset = begalt - bufp->buffer; - COMPILE_STACK_TOP.fixup_alt_jump + COMPILE_STACK_TOP.fixup_alt_jump = fixup_alt_jump ? fixup_alt_jump - bufp->buffer + 1 : 0; COMPILE_STACK_TOP.laststart_offset = b - bufp->buffer; COMPILE_STACK_TOP.regnum = regnum; @@ -1680,7 +1680,7 @@ regex_compile (pattern, size, syntax, bufp) COMPILE_STACK_TOP.inner_group_offset = b - bufp->buffer + 2; BUF_PUSH_3 (start_memory, regnum, 0); } - + compile_stack.avail++; fixup_alt_jump = 0; @@ -1709,7 +1709,7 @@ regex_compile (pattern, size, syntax, bufp) `pop_failure_jump' to pop. See comments at `push_dummy_failure' in `re_match_2'. */ BUF_PUSH (push_dummy_failure); - + /* We allocated space for this jump when we assigned to `fixup_alt_jump', in the `handle_alt' case below. */ STORE_JUMP (jump_past_alt, fixup_alt_jump, b - 1); @@ -1731,11 +1731,11 @@ regex_compile (pattern, size, syntax, bufp) as in `(ab)c(de)' -- the second group is #2. */ regnum_t this_group_regnum; - compile_stack.avail--; + compile_stack.avail--; begalt = bufp->buffer + COMPILE_STACK_TOP.begalt_offset; fixup_alt_jump = COMPILE_STACK_TOP.fixup_alt_jump - ? bufp->buffer + COMPILE_STACK_TOP.fixup_alt_jump - 1 + ? bufp->buffer + COMPILE_STACK_TOP.fixup_alt_jump - 1 : 0; laststart = bufp->buffer + COMPILE_STACK_TOP.laststart_offset; this_group_regnum = COMPILE_STACK_TOP.regnum; @@ -1750,7 +1750,7 @@ regex_compile (pattern, size, syntax, bufp) { unsigned char *inner_group_loc = bufp->buffer + COMPILE_STACK_TOP.inner_group_offset; - + *inner_group_loc = regnum - this_group_regnum; BUF_PUSH_3 (stop_memory, this_group_regnum, regnum - this_group_regnum); @@ -1779,10 +1779,10 @@ regex_compile (pattern, size, syntax, bufp) jump (put in below, which in turn will jump to the next (if any) alternative's such jump, etc.). The last such jump jumps to the correct final destination. A picture: - _____ _____ - | | | | - | v | v - a | b | c + _____ _____ + | | | | + | v | v + a | b | c If we are at `b', then fixup_alt_jump right now points to a three-byte space after `a'. We'll put in the jump, set @@ -1804,10 +1804,10 @@ regex_compile (pattern, size, syntax, bufp) break; - case '{': + case '{': /* If \{ is a literal. */ if (!(syntax & RE_INTERVALS) - /* If we're at `\{' and it's not the open-interval + /* If we're at `\{' and it's not the open-interval operator. */ || ((syntax & RE_INTERVALS) && (syntax & RE_NO_BK_BRACES)) || (p - 2 == pattern && p == pend)) @@ -1846,11 +1846,11 @@ regex_compile (pattern, size, syntax, bufp) { if (syntax & RE_NO_BK_BRACES) goto unfetch_interval; - else + else return REG_BADBR; } - if (!(syntax & RE_NO_BK_BRACES)) + if (!(syntax & RE_NO_BK_BRACES)) { if (c != '\\') return REG_EBRACE; @@ -1861,7 +1861,7 @@ regex_compile (pattern, size, syntax, bufp) { if (syntax & RE_NO_BK_BRACES) goto unfetch_interval; - else + else return REG_BADBR; } @@ -1897,7 +1897,7 @@ regex_compile (pattern, size, syntax, bufp) jump_n <succeed_n addr> <jump count> (The upper bound and `jump_n' are omitted if `upper_bound' is 1, though.) */ - else + else { /* If the upper bound is > 1, we need to insert more at the end of the loop. */ unsigned nbytes = 10 + (upper_bound > 1) * 10; @@ -1914,7 +1914,7 @@ regex_compile (pattern, size, syntax, bufp) lower_bound); b += 5; - /* Code to initialize the lower bound. Insert + /* Code to initialize the lower bound. Insert before the `succeed_n'. The `5' is the last two bytes of this `set_number_at', plus 3 bytes of the following `succeed_n'. */ @@ -1925,7 +1925,7 @@ regex_compile (pattern, size, syntax, bufp) { /* More than one repetition is allowed, so append a backward jump to the `succeed_n' that starts this interval. - + When we've reached this during matching, we'll have matched the interval once, so jump back only `upper_bound - 1' times. */ @@ -1943,7 +1943,7 @@ regex_compile (pattern, size, syntax, bufp) so everything is getting moved up by 5. Conclusion: (b - 2) - (laststart + 3) + 5, i.e., b - laststart. - + We insert this at the beginning of the loop so that if we fail during matching, we'll reinitialize the bounds. */ @@ -1964,7 +1964,7 @@ regex_compile (pattern, size, syntax, bufp) beg_interval = NULL; /* normal_char and normal_backslash need `c'. */ - PATFETCH (c); + PATFETCH (c); if (!(syntax & RE_NO_BK_BRACES)) { @@ -1980,7 +1980,7 @@ regex_compile (pattern, size, syntax, bufp) BUF_PUSH (at_dot); break; - case 's': + case 's': laststart = b; PATFETCH (c); BUF_PUSH_2 (syntaxspec, syntax_spec_code[c]); @@ -2087,11 +2087,11 @@ regex_compile (pattern, size, syntax, bufp) /* Expects the character in `c'. */ normal_char: /* If no exactn currently being built. */ - if (!pending_exact + if (!pending_exact /* If last exactn not at current position. */ || pending_exact + *pending_exact + 1 != b - + /* We have only one byte following the exactn for the count. */ || *pending_exact == (1 << BYTEWIDTH) - 1 @@ -2106,26 +2106,26 @@ regex_compile (pattern, size, syntax, bufp) : (p[0] == '\\' && p[1] == '{')))) { /* Start building a new exactn. */ - + laststart = b; BUF_PUSH_2 (exactn, 0); pending_exact = b - 1; } - + BUF_PUSH (c); (*pending_exact)++; break; } /* switch (c) */ } /* while p != pend */ - + /* Through the pattern now. */ - + if (fixup_alt_jump) STORE_JUMP (jump_past_alt, fixup_alt_jump, b); - if (!COMPILE_STACK_EMPTY) + if (!COMPILE_STACK_EMPTY) return REG_EPAREN; free (compile_stack.stack); @@ -2181,14 +2181,14 @@ insert_op1 (op, loc, arg, end) re_opcode_t op; unsigned char *loc; int arg; - unsigned char *end; + unsigned char *end; { register unsigned char *pfrom = end; register unsigned char *pto = end + 3; while (pfrom != loc) *--pto = *--pfrom; - + store_op1 (op, loc, arg); } @@ -2200,14 +2200,14 @@ insert_op2 (op, loc, arg1, arg2, end) re_opcode_t op; unsigned char *loc; int arg1, arg2; - unsigned char *end; + unsigned char *end; { register unsigned char *pfrom = end; register unsigned char *pto = end + 5; while (pfrom != loc) *--pto = *--pfrom; - + store_op2 (op, loc, arg1, arg2); } @@ -2223,7 +2223,7 @@ at_begline_loc_p (pattern, p, syntax) { const char *prev = p - 2; boolean prev_prev_backslash = prev > pattern && prev[-1] == '\\'; - + return /* After a subexpression? */ (*prev == '(' && (syntax & RE_NO_BK_PARENS || prev_prev_backslash)) @@ -2243,7 +2243,7 @@ at_endline_loc_p (p, pend, syntax) const char *next = p; boolean next_backslash = *next == '\\'; const char *next_next = p + 1 < pend ? p + 1 : NULL; - + return /* Before a subexpression? */ (syntax & RE_NO_BK_PARENS ? *next == ')' @@ -2254,7 +2254,7 @@ at_endline_loc_p (p, pend, syntax) } -/* Returns true if REGNUM is in one of COMPILE_STACK's elements and +/* Returns true if REGNUM is in one of COMPILE_STACK's elements and false if it's not. */ static boolean @@ -2264,8 +2264,8 @@ group_in_compile_stack (compile_stack, regnum) { int this_element; - for (this_element = compile_stack.avail - 1; - this_element >= 0; + for (this_element = compile_stack.avail - 1; + this_element >= 0; this_element--) if (compile_stack.stack[this_element].regnum == regnum) return true; @@ -2279,9 +2279,9 @@ group_in_compile_stack (compile_stack, regnum) starting character is in `P[-2]'. (`P[-1]' is the character `-'.) Then we set the translation of all bits between the starting and ending characters (inclusive) in the compiled pattern B. - + Return an error code. - + We use these short variable names so we can use the same macros as `regex_compile' itself. */ @@ -2296,7 +2296,7 @@ compile_range (p_ptr, pend, translate, syntax, b) const char *p = *p_ptr; int range_start, range_end; - + if (p == pend) return REG_ERANGE; @@ -2305,7 +2305,7 @@ compile_range (p_ptr, pend, translate, syntax, b) is set, the range endpoints will be negative if we fetch using a signed char *. - We also want to fetch the endpoints without translating them; the + We also want to fetch the endpoints without translating them; the appropriate translation is done in the bit-setting loop below. */ range_start = ((unsigned char *) p)[-2]; range_end = ((unsigned char *) p)[0]; @@ -2326,14 +2326,14 @@ compile_range (p_ptr, pend, translate, syntax, b) { SET_LIST_BIT (TRANSLATE (this_char)); } - + return REG_NOERROR; } /* Failure stack declarations and macros; both re_compile_fastmap and re_match_2 use a failure stack. These have to be macros because of REGEX_ALLOCATE. */ - + /* Number of failure points for which to initially allocate space when matching. If this number is exceeded, we allocate more @@ -2381,8 +2381,8 @@ typedef struct /* Double the size of FAIL_STACK, up to approximately `re_max_failures' items. Return 1 if succeeds, and 0 if either ran out of memory - allocating space for it or it was already too large. - + allocating space for it or it was already too large. + REGEX_REALLOCATE requires `destination' be declared. */ #define DOUBLE_FAIL_STACK(fail_stack) \ @@ -2399,7 +2399,7 @@ typedef struct 1))) -/* Push PATTERN_OP on FAIL_STACK. +/* Push PATTERN_OP on FAIL_STACK. Return 1 if was able to do so and 0 if ran out of memory allocating space to do so. */ @@ -2430,12 +2430,12 @@ typedef struct /* Push the information about the state we will need - if we ever fail back to it. - + if we ever fail back to it. + Requires variables fail_stack, regstart, regend, reg_info, and num_regs be declared. DOUBLE_FAIL_STACK requires `destination' be declared. - + Does `return FAILURE_CODE' if runs out of memory. */ #define PUSH_FAILURE_POINT(pattern_place, string_place, failure_code) \ @@ -2466,7 +2466,7 @@ typedef struct DEBUG_PRINT2 ("\n Doubled stack; size now: %d\n", \ (fail_stack).size); \ DEBUG_PRINT2 (" slots available: %d\n", REMAINING_AVAIL_SLOTS);\ - } + } #define PUSH_FAILURE_POINT2(pattern_place, string_place, failure_code) \ /* Push the info, starting with the registers. */ \ @@ -2552,7 +2552,7 @@ typedef struct LOW_REG, HIGH_REG -- the highest and lowest active registers. REGSTART, REGEND -- arrays of string positions. REG_INFO -- array of information about each subexpression. - + Also assumes the variables `fail_stack' and (if debugging), `bufp', `pend', `string1', `size1', `string2', and `size2'. */ @@ -2627,7 +2627,7 @@ typedef struct The caller must supply the address of a (1 << BYTEWIDTH)-byte data area as BUFP->fastmap. - + We set the `fastmap', `fastmap_accurate', and `can_be_null' fields in the pattern buffer. @@ -2644,7 +2644,7 @@ re_compile_fastmap (bufp) #endif /* We don't push any register information onto the failure stack. */ unsigned num_regs = 0; - + register char *fastmap = bufp->fastmap; unsigned char *pattern = bufp->buffer; const unsigned char *p = pattern; @@ -2660,27 +2660,27 @@ re_compile_fastmap (bufp) boolean succeed_n_p = false; assert (fastmap != NULL && p != NULL); - + INIT_FAIL_STACK (); bzero (fastmap, 1 << BYTEWIDTH); /* Assume nothing's valid. */ bufp->fastmap_accurate = 1; /* It will be when we're done. */ bufp->can_be_null = 0; - + while (p != pend || !FAIL_STACK_EMPTY ()) { if (p == pend) { bufp->can_be_null |= path_can_be_null; - + /* Reset for next path. */ path_can_be_null = true; - + p = fail_stack.stack[--fail_stack.avail]; } /* We should never be about to go beyond the end of the pattern. */ assert (p < pend); - + #ifdef SWITCH_ENUM_BUG switch ((int) ((re_opcode_t) *p++)) #else @@ -2804,10 +2804,10 @@ re_compile_fastmap (bufp) case jump_past_alt: case dummy_failure_jump: EXTRACT_NUMBER_AND_INCR (j, p); - p += j; + p += j; if (j > 0) continue; - + /* Jump backward implies we just went through the body of a loop and matched nothing. Opcode jumped to should be `on_failure_jump' or `succeed_n'. Just treat it like an @@ -2819,10 +2819,10 @@ re_compile_fastmap (bufp) p++; EXTRACT_NUMBER_AND_INCR (j, p); - p += j; - + p += j; + /* If what's on the stack is where we are now, pop it. */ - if (!FAIL_STACK_EMPTY () + if (!FAIL_STACK_EMPTY () && fail_stack.stack[fail_stack.avail - 1] == p) fail_stack.avail--; @@ -2860,7 +2860,7 @@ re_compile_fastmap (bufp) case succeed_n: /* Get to the number of times to succeed. */ - p += 2; + p += 2; /* Increment p past the n for when k != 0. */ EXTRACT_NUMBER_AND_INCR (k, p); @@ -2951,7 +2951,7 @@ re_search (bufp, string, size, startpos, range, regs) int size, startpos, range; struct re_registers *regs; { - return re_search_2 (bufp, NULL, 0, string, size, startpos, range, + return re_search_2 (bufp, NULL, 0, string, size, startpos, range, regs, size); } @@ -2959,17 +2959,17 @@ re_search (bufp, string, size, startpos, range, regs) /* Using the compiled pattern in BUFP->buffer, first tries to match the virtual concatenation of STRING1 and STRING2, starting first at index STARTPOS, then at STARTPOS + 1, and so on. - + STRING1 and STRING2 have length SIZE1 and SIZE2, respectively. - + RANGE is how far to scan while trying to match. RANGE = 0 means try only at STARTPOS; in general, the last start tried is STARTPOS + RANGE. - + In REGS, return the indices of the virtual concatenation of STRING1 and STRING2 that matched the entire BUFP->buffer and its contained subexpressions. - + Do not consider matching one past the index STOP in the virtual concatenation of STRING1 and STRING2. @@ -2996,7 +2996,7 @@ re_search_2 (bufp, string1, size1, string2, size2, startpos, range, regs, stop) /* Check for out-of-range STARTPOS. */ if (startpos < 0 || startpos > total_size) return -1; - + /* Fix up RANGE if it might eventually take us outside the virtual concatenation of STRING1 and STRING2. */ if (endpos < -1) @@ -3018,10 +3018,10 @@ re_search_2 (bufp, string1, size1, string2, size2, startpos, range, regs, stop) if (fastmap && !bufp->fastmap_accurate) if (re_compile_fastmap (bufp) == -2) return -2; - + /* Loop through the string, looking for a place to start matching. */ for (;;) - { + { /* If a fastmap is supplied, skip quickly over characters that cannot be the start of a match. If the pattern can match the null string, however, we don't need to skip characters; we want @@ -3038,7 +3038,7 @@ re_search_2 (bufp, string1, size1, string2, size2, startpos, range, regs, stop) lim = range - (size1 - startpos); d = (startpos >= size1 ? string2 - size1 : string1) + startpos; - + /* Written out as an if-else to avoid testing `translate' inside the loop. */ if (translate) @@ -3055,7 +3055,7 @@ re_search_2 (bufp, string1, size1, string2, size2, startpos, range, regs, stop) else /* Searching backwards. */ { register char c = (size1 == 0 || startpos >= size1 - ? string2[startpos - size1] + ? string2[startpos - size1] : string1[startpos]); if (!fastmap[(unsigned char) TRANSLATE (c)]) @@ -3072,21 +3072,21 @@ re_search_2 (bufp, string1, size1, string2, size2, startpos, range, regs, stop) startpos, regs, stop); if (val >= 0) return startpos; - + if (val == -2) return -2; advance: - if (!range) + if (!range) break; - else if (range > 0) + else if (range > 0) { - range--; + range--; startpos++; } else { - range++; + range++; startpos--; } } @@ -3098,8 +3098,8 @@ re_search_2 (bufp, string1, size1, string2, size2, startpos, range, regs, stop) onto the failure stack. Other register information, such as the starting and ending positions (which are addresses), and the list of inner groups (which is a bits list) are maintained in separate - variables. - + variables. + We are making a (strictly speaking) nonportable assumption here: that the compiler will pack our bit fields into something that fits into the type of `word', i.e., is something that fits into one item on the @@ -3187,7 +3187,7 @@ static int bcmp_translate _RE_ARGS((const char *s1, const char *s2, /* Test if at very beginning or at very end of the virtual concatenation of `string1' and `string2'. If only one string, it's `string2'. */ #define AT_STRINGS_BEG(d) ((d) == (size1 ? string1 : string2) || !size2) -#define AT_STRINGS_END(d) ((d) == end2) +#define AT_STRINGS_END(d) ((d) == end2) /* Test if D points to a character which is word-constituent. We have @@ -3250,7 +3250,7 @@ re_match (bufp, string, size, pos, regs) int size, pos; struct re_registers *regs; { - return re_match_2 (bufp, NULL, 0, string, size, pos, regs, size); + return re_match_2 (bufp, NULL, 0, string, size, pos, regs, size); } #endif /* not emacs */ @@ -3259,7 +3259,7 @@ re_match (bufp, string, size, pos, regs) the (virtual) concatenation of STRING1 and STRING2 (of length SIZE1 and SIZE2, respectively). We start matching at POS, and stop matching at STOP. - + If REGS is non-null and the `no_sub' field of BUFP is nonzero, we store offsets for the substring each group matched in REGS. See the documentation for exactly how many groups we fill. @@ -3290,7 +3290,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) /* Where we are in the data, and the end of the current string. */ const char *d, *dend; - + /* Where we are in the pattern, and the end of the pattern. */ unsigned char *p = bufp->buffer; register unsigned char *pend = p + bufp->used; @@ -3317,7 +3317,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) return, for use in backreferences. The number here includes an element for register zero. */ size_t num_regs = bufp->re_nsub + 1; - + /* The currently active registers. */ active_reg_t lowest_active_reg = NO_LOWEST_ACTIVE_REG; active_reg_t highest_active_reg = NO_HIGHEST_ACTIVE_REG; @@ -3344,15 +3344,15 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) matched any of the pattern so far this time through the reg_num-th subexpression. These two fields get reset each time through any loop their register is in. */ - register_info_type *reg_info = 0; + register_info_type *reg_info = 0; /* The following record the register info as found in the above - variables when we find a match better than any we've seen before. + variables when we find a match better than any we've seen before. This happens as we backtrack through the failure points, which in turn happens only if we have not yet matched the entire string. */ unsigned best_regs_set = false; const char **best_regstart = 0, **best_regend = 0; - + /* Logically, this is `best_regend[0]'. But we don't want to have to allocate space for that if we're not allocating space for anything else (see below). Also, we never need info about register 0 for @@ -3369,13 +3369,13 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) #ifdef DEBUG /* Counts the total number of registers pushed. */ - unsigned num_regs_pushed = 0; + unsigned num_regs_pushed = 0; #endif DEBUG_PRINT1 ("\n\nEntering re_match_2.\n"); - + INIT_FAIL_STACK (); - + /* Do not bother to initialize all the register variables if there are no groups in the pattern, as it takes a fair amount of time. If there are groups, we include space for register 0 (the whole @@ -3393,8 +3393,8 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) reg_dummy = REGEX_TALLOC (num_regs, const char *); reg_info_dummy = REGEX_TALLOC (num_regs, register_info_type); - if (!(regstart && regend && old_regstart && old_regend && reg_info - && best_regstart && best_regend && reg_dummy && reg_info_dummy)) + if (!(regstart && regend && old_regstart && old_regend && reg_info + && best_regstart && best_regend && reg_dummy && reg_info_dummy)) { FREE_VARIABLES (); return -2; @@ -3417,21 +3417,21 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) FREE_VARIABLES (); return -1; } - + /* Initialize subexpression text positions to -1 to mark ones that no start_memory/stop_memory has been seen for. Also initialize the register information struct. */ for (mcnt = 1; mcnt < num_regs; mcnt++) { - regstart[mcnt] = regend[mcnt] + regstart[mcnt] = regend[mcnt] = old_regstart[mcnt] = old_regend[mcnt] = REG_UNSET_VALUE; - + REG_MATCH_NULL_STRING_P (reg_info[mcnt]) = MATCH_NULL_UNSET_VALUE; IS_ACTIVE (reg_info[mcnt]) = 0; MATCHED_SOMETHING (reg_info[mcnt]) = 0; EVER_MATCHED_SOMETHING (reg_info[mcnt]) = 0; } - + /* We move `string1' into `string2' if the latter's empty -- but not if `string1' is null. */ if (size2 == 0 && string1 != NULL) @@ -3456,7 +3456,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) end_match_2 = string2 + stop - size1; } - /* `p' scans through the pattern as `d' scans through the data. + /* `p' scans through the pattern as `d' scans through the data. `dend' is the end of the input string that `d' points within. `d' is advanced into the following input string whenever necessary, but this happens before fetching; therefore, at the beginning of the @@ -3478,7 +3478,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) DEBUG_PRINT1 ("The string to match is: `"); DEBUG_PRINT_DOUBLE_STRING (d, string1, size1, string2, size2); DEBUG_PRINT1 ("'\n"); - + /* This loops over pattern commands. It exits by returning from the function if the match is complete, or it drops through if the match fails at this starting point in the input data. */ @@ -3489,16 +3489,16 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) if (p == pend) { /* End of pattern means we might have succeeded. */ DEBUG_PRINT1 ("end of pattern ... "); - + /* If we haven't matched the entire string, and we want the longest match, try backtracking. */ if (d != end_match_2) { DEBUG_PRINT1 ("backtracking.\n"); - + if (!FAIL_STACK_EMPTY ()) { /* More failure points to try. */ - boolean same_str_p = (FIRST_STRING_P (match_end) + boolean same_str_p = (FIRST_STRING_P (match_end) == MATCHING_IN_FIRST_STRING); /* If exceeds best match so far, save it. */ @@ -3508,20 +3508,20 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) { best_regs_set = true; match_end = d; - + DEBUG_PRINT1 ("\nSAVING match as best so far.\n"); - + for (mcnt = 1; mcnt < num_regs; mcnt++) { best_regstart[mcnt] = regstart[mcnt]; best_regend[mcnt] = regend[mcnt]; } } - goto fail; + goto fail; } /* If no failure points, don't restore garbage. */ - else if (best_regs_set) + else if (best_regs_set) { restore_best_regs: /* Restore best match. It may happen that `dend == @@ -3530,7 +3530,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) strings `x-' and `y-z-', if the two strings are not consecutive in memory. */ DEBUG_PRINT1 ("Restoring best registers.\n"); - + d = match_end; dend = ((d >= string1 && d <= end1) ? end_match_1 : end_match_2); @@ -3589,7 +3589,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) regs->end[0] = (MATCHING_IN_FIRST_STRING ? d - string1 : d - string2 + size1); } - + /* Go through the first `min (num_regs, regs->num_regs)' registers, since that is all we initialized. */ for (mcnt = 1; mcnt < MIN (num_regs, regs->num_regs); mcnt++) @@ -3602,7 +3602,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) regs->end[mcnt] = POINTER_TO_OFFSET (regend[mcnt]); } } - + /* If the regs structure we return has more elements than were in the pattern, set the extra elements to -1. If we (re)allocated the registers, this is the case, @@ -3618,8 +3618,8 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) nfailure_points_pushed - nfailure_points_popped); DEBUG_PRINT2 ("%u registers pushed.\n", num_regs_pushed); - mcnt = d - pos - (MATCHING_IN_FIRST_STRING - ? string1 + mcnt = d - pos - (MATCHING_IN_FIRST_STRING + ? string1 : string2 - size1); DEBUG_PRINT2 ("Returning %d from re_match_2.\n", mcnt); @@ -3709,7 +3709,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) p += 1 + *p; if (!not) goto fail; - + SET_REGS_MATCHED (); d++; break; @@ -3726,9 +3726,9 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) /* Find out if this group can match the empty string. */ p1 = p; /* To send to group_match_null_string_p. */ - + if (REG_MATCH_NULL_STRING_P (reg_info[*p]) == MATCH_NULL_UNSET_VALUE) - REG_MATCH_NULL_STRING_P (reg_info[*p]) + REG_MATCH_NULL_STRING_P (reg_info[*p]) = group_match_null_string_p (&p1, pend, reg_info); /* Save the position in the string where we were the last time @@ -3739,7 +3739,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) old_regstart[*p] = REG_MATCH_NULL_STRING_P (reg_info[*p]) ? REG_UNSET (regstart[*p]) ? d : regstart[*p] : regstart[*p]; - DEBUG_PRINT2 (" old_regstart: %d\n", + DEBUG_PRINT2 (" old_regstart: %d\n", POINTER_TO_OFFSET (old_regstart[*p])); regstart[*p] = d; @@ -3747,10 +3747,10 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) IS_ACTIVE (reg_info[*p]) = 1; MATCHED_SOMETHING (reg_info[*p]) = 0; - + /* This is the new highest active register. */ highest_active_reg = *p; - + /* If nothing was active before, this is the new lowest active register. */ if (lowest_active_reg == NO_LOWEST_ACTIVE_REG) @@ -3766,7 +3766,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) number, and the number of inner groups. */ case stop_memory: DEBUG_PRINT3 ("EXECUTING stop_memory %d (%d):\n", *p, p[1]); - + /* We need to save the string position the last time we were at this close-group operator in case the group is operated upon by a repetition operator, e.g., with `((a*)*(b*)*)*' @@ -3775,7 +3775,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) old_regend[*p] = REG_MATCH_NULL_STRING_P (reg_info[*p]) ? REG_UNSET (regend[*p]) ? d : regend[*p] : regend[*p]; - DEBUG_PRINT2 (" old_regend: %d\n", + DEBUG_PRINT2 (" old_regend: %d\n", POINTER_TO_OFFSET (old_regend[*p])); regend[*p] = d; @@ -3783,7 +3783,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) /* This register isn't active anymore. */ IS_ACTIVE (reg_info[*p]) = 0; - + /* If this was the only register active, nothing is active anymore. */ if (lowest_active_reg == highest_active_reg) @@ -3799,7 +3799,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) unsigned char r = *p - 1; while (r > 0 && !IS_ACTIVE (reg_info[r])) r--; - + /* If we end up at register zero, that means that we saved the registers as the result of an `on_failure_jump', not a `start_memory', and we jumped to past the innermost @@ -3815,7 +3815,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) else highest_active_reg = r; } - + /* If just failed to match something this time around with a group that's operated on by a repetition operator, try to force exit from the ``loop'', and restore the register @@ -3823,10 +3823,10 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) last match. */ if ((!MATCHED_SOMETHING (reg_info[*p]) || (re_opcode_t) p[-3] == start_memory) - && (p + 2) < pend) + && (p + 2) < pend) { boolean is_a_jump_n = false; - + p1 = p + 2; mcnt = 0; switch ((re_opcode_t) *p1++) @@ -3841,12 +3841,12 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) if (is_a_jump_n) p1 += 2; break; - + default: /* do nothing */ ; } p1 += mcnt; - + /* If the next operation is a jump backwards in the pattern to an on_failure_jump right before the start_memory corresponding to this stop_memory, exit from the loop @@ -3860,17 +3860,17 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) failed match, e.g., with `(a*)*b' against `ab' for regstart[1], and, e.g., with `((a*)*(b*)*)*' against `aba' for regend[3]. - + Also restore the registers for inner groups for, e.g., `((a*)(b*))*' against `aba' (register 3 would otherwise get trashed). */ - + if (EVER_MATCHED_SOMETHING (reg_info[*p])) { - unsigned r; - + unsigned r; + EVER_MATCHED_SOMETHING (reg_info[*p]) = 0; - + /* Restore this and inner groups' (if any) registers. */ for (r = *p; r < *p + *(p + 1); r++) { @@ -3879,7 +3879,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) /* xx why this test? */ if ((s_reg_t) old_regend[r] >= (s_reg_t) regstart[r]) regend[r] = old_regend[r]; - } + } } p1++; EXTRACT_NUMBER_AND_INCR (mcnt, p1); @@ -3889,7 +3889,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) goto fail; } } - + /* Move past the register number and the inner group count. */ p += 2; break; @@ -3906,16 +3906,16 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) /* Can't back reference a group which we've never matched. */ if (REG_UNSET (regstart[regno]) || REG_UNSET (regend[regno])) goto fail; - + /* Where in input to try to start matching. */ d2 = regstart[regno]; - + /* Where to stop matching; if both the place to start and the place to stop matching are in the same string, then set to the place to stop, otherwise, for now have to use the end of the first string. */ - dend2 = ((FIRST_STRING_P (regstart[regno]) + dend2 = ((FIRST_STRING_P (regstart[regno]) == FIRST_STRING_P (regend[regno])) ? regend[regno] : end_match_1); for (;;) @@ -3939,16 +3939,16 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) /* How many characters left in this segment to match. */ mcnt = dend - d; - + /* Want how many consecutive characters we can match in one shot, so, if necessary, adjust the count. */ if (mcnt > dend2 - d2) mcnt = dend2 - d2; - + /* Compare that many; failure if mismatch, else move past them. */ - if (translate - ? bcmp_translate (d, d2, mcnt, translate) + if (translate + ? bcmp_translate (d, d2, mcnt, translate) : bcmp (d, d2, mcnt)) goto fail; d += mcnt, d2 += mcnt; @@ -3962,7 +3962,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) `newline_anchor' is set, after newlines. */ case begline: DEBUG_PRINT1 ("EXECUTING begline.\n"); - + if (AT_STRINGS_BEG (d)) { if (!bufp->not_bol) break; @@ -3983,7 +3983,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) { if (!bufp->not_eol) break; } - + /* We have to ``prefetch'' the next character. */ else if ((d == end1 ? *string2 : *d) == '\n' && bufp->newline_anchor) @@ -4017,7 +4017,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) then the . fails against the \n. But the next thing we want to do is match the \n against the \n; if we restored the string value, we would be back at the foo. - + Because this is used only in specific cases, we don't need to check all the things that `on_failure_jump' does, to make sure the right things get saved on the stack. Hence we don't @@ -4027,7 +4027,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) case; that seems worse than this. */ case on_failure_keep_string_jump: DEBUG_PRINT1 ("EXECUTING on_failure_keep_string_jump"); - + EXTRACT_NUMBER_AND_INCR (mcnt, p); DEBUG_PRINT3 (" %d (to 0x%x):\n", mcnt, p + mcnt); @@ -4037,7 +4037,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) /* Uses of on_failure_jump: - + Each alternative starts with an on_failure_jump that points to the beginning of the next alternative. Each alternative except the last ends with a jump that in effect jumps past @@ -4104,7 +4104,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) would have to backtrack because of (as in, e.g., `a*a') then we can change to pop_failure_jump, because we'll never have to backtrack. - + This is not true in the case of alternatives: in `(a|ab)*' we do need to backtrack to the `ab' alternative (e.g., if the string was `ab'). But instead of trying to @@ -4136,7 +4136,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) p1 = p + mcnt; /* p1[0] ... p1[2] are the `on_failure_jump' corresponding - to the `maybe_finalize_jump' of this case. Examine what + to the `maybe_finalize_jump' of this case. Examine what follows. */ if ((re_opcode_t) p1[3] == exactn && p1[5] != c) { @@ -4144,12 +4144,12 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) DEBUG_PRINT3 (" %c != %c => pop_failure_jump.\n", c, p1[5]); } - + else if ((re_opcode_t) p1[3] == charset || (re_opcode_t) p1[3] == charset_not) { int not = (re_opcode_t) p1[3] == charset_not; - + if (c < (unsigned char) (p1[4] * BYTEWIDTH) && p1[5 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH))) not = !not; @@ -4198,7 +4198,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) } /* Note fall through. */ - + /* Unconditionally jump (without popping any failure points). */ case jump: unconditional_jump: @@ -4208,7 +4208,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) DEBUG_PRINT2 ("(to 0x%x).\n", p); break; - + /* We need this opcode so we can detect where alternatives end in `group_match_null_string_p' et al. */ case jump_past_alt: @@ -4245,7 +4245,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) /* Have to succeed matching what follows at least n times. After that, handle like `on_failure_jump'. */ - case succeed_n: + case succeed_n: EXTRACT_NUMBER (mcnt, p + 2); DEBUG_PRINT2 ("EXECUTING succeed_n %d.\n", mcnt); @@ -4266,8 +4266,8 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) goto on_failure; } break; - - case jump_n: + + case jump_n: EXTRACT_NUMBER (mcnt, p + 2); DEBUG_PRINT2 ("EXECUTING jump_n %d.\n", mcnt); @@ -4276,13 +4276,13 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) { mcnt--; STORE_NUMBER (p + 2, mcnt); - goto unconditional_jump; + goto unconditional_jump; } /* If don't have to jump any more, skip over the rest of command. */ - else - p += 4; + else + p += 4; break; - + case set_number_at: { DEBUG_PRINT1 ("EXECUTING set_number_at.\n"); @@ -4327,13 +4327,13 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) if (PTR_CHAR_POS ((unsigned char *) d) >= point) goto fail; break; - + case at_dot: DEBUG_PRINT1 ("EXECUTING at_dot.\n"); if (PTR_CHAR_POS ((unsigned char *) d) != point) goto fail; break; - + case after_dot: DEBUG_PRINT1 ("EXECUTING after_dot.\n"); if (PTR_CHAR_POS ((unsigned char *) d) <= point) @@ -4386,7 +4386,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) SET_REGS_MATCHED (); d++; break; - + case notwordchar: DEBUG_PRINT1 ("EXECUTING non-Emacs notwordchar.\n"); PREFETCH (); @@ -4396,7 +4396,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) d++; break; #endif /* not emacs */ - + default: abort (); } @@ -4421,7 +4421,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) if (p < pend) { boolean is_a_jump_n = false; - + /* If failed to a backwards jump that's part of a repetition loop, need to pop this failure point and use the next one. */ switch ((re_opcode_t) *p) @@ -4433,7 +4433,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) case jump: p1 = p + 1; EXTRACT_NUMBER_AND_INCR (mcnt, p1); - p1 += mcnt; + p1 += mcnt; if ((is_a_jump_n && (re_opcode_t) *p1 == succeed_n) || (!is_a_jump_n @@ -4464,10 +4464,10 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) /* We are passed P pointing to a register number after a start_memory. - + Return true if the pattern up to the corresponding stop_memory can match the empty string, and false otherwise. - + If we find the matching stop_memory, sets P to point to one past its number. Otherwise, sets P to an undefined byte less than or equal to END. @@ -4481,20 +4481,20 @@ group_match_null_string_p (p, end, reg_info) int mcnt; /* Point to after the args to the start_memory. */ unsigned char *p1 = *p + 2; - + while (p1 < end) { /* Skip over opcodes that can match nothing, and return true or false, as appropriate, when we get to one that can't, or to the matching stop_memory. */ - + switch ((re_opcode_t) *p1) { /* Could be either a loop or a series of alternatives. */ case on_failure_jump: p1++; EXTRACT_NUMBER_AND_INCR (mcnt, p1); - + /* If the next operation is not a jump backwards in the pattern. */ @@ -4508,7 +4508,7 @@ group_match_null_string_p (p, end, reg_info) /on_failure_jump/0/6/exactn/1/a/jump_past_alt/0/6 /on_failure_jump/0/6/exactn/1/b/jump_past_alt/0/3 - /exactn/1/c + /exactn/1/c So, we have to first go through the first (n-1) alternatives and then deal with the last one separately. */ @@ -4524,19 +4524,19 @@ group_match_null_string_p (p, end, reg_info) is, including the ending `jump_past_alt' and its number. */ - if (!alt_match_null_string_p (p1, p1 + mcnt - 3, + if (!alt_match_null_string_p (p1, p1 + mcnt - 3, reg_info)) return false; /* Move to right after this alternative, including the jump_past_alt. */ - p1 += mcnt; + p1 += mcnt; /* Break if it's the beginning of an n-th alternative that doesn't begin with an on_failure_jump. */ if ((re_opcode_t) *p1 != on_failure_jump) break; - + /* Still have to check that it's not an n-th alternative that starts with an on_failure_jump. */ p1++; @@ -4561,14 +4561,14 @@ group_match_null_string_p (p, end, reg_info) } /* if mcnt > 0 */ break; - + case stop_memory: assert (p1[1] == **p); *p = p1 + 2; return true; - - default: + + default: if (!common_op_match_null_string_p (&p1, end, reg_info)) return false; } @@ -4581,7 +4581,7 @@ group_match_null_string_p (p, end, reg_info) /* Similar to group_match_null_string_p, but doesn't deal with alternatives: It expects P to be the first byte of a single alternative and END one byte past the last. The alternative can contain groups. */ - + static boolean alt_match_null_string_p (p, end, reg_info) unsigned char *p, *end; @@ -4589,12 +4589,12 @@ alt_match_null_string_p (p, end, reg_info) { int mcnt; unsigned char *p1 = p; - + while (p1 < end) { - /* Skip over opcodes that can match nothing, and break when we get + /* Skip over opcodes that can match nothing, and break when we get to one that can't. */ - + switch ((re_opcode_t) *p1) { /* It's a loop. */ @@ -4603,8 +4603,8 @@ alt_match_null_string_p (p, end, reg_info) EXTRACT_NUMBER_AND_INCR (mcnt, p1); p1 += mcnt; break; - - default: + + default: if (!common_op_match_null_string_p (&p1, end, reg_info)) return false; } @@ -4615,8 +4615,8 @@ alt_match_null_string_p (p, end, reg_info) /* Deals with the ops common to group_match_null_string_p and - alt_match_null_string_p. - + alt_match_null_string_p. + Sets P to one after the op and its arguments, if any. */ static boolean @@ -4651,7 +4651,7 @@ common_op_match_null_string_p (p, end, reg_info) reg_no = *p1; assert (reg_no > 0 && reg_no <= MAX_REGNUM); ret = group_match_null_string_p (&p1, end, reg_info); - + /* Have to set this here in case we're checking a group which contains a group and a back reference to it. */ @@ -4661,7 +4661,7 @@ common_op_match_null_string_p (p, end, reg_info) if (!ret) return false; break; - + /* If this is an optimized succeed_n for zero times, make the jump. */ case jump: EXTRACT_NUMBER_AND_INCR (mcnt, p1); @@ -4673,7 +4673,7 @@ common_op_match_null_string_p (p, end, reg_info) case succeed_n: /* Get to the number of times to succeed. */ - p1 += 2; + p1 += 2; EXTRACT_NUMBER_AND_INCR (mcnt, p1); if (mcnt == 0) @@ -4686,7 +4686,7 @@ common_op_match_null_string_p (p, end, reg_info) return false; break; - case duplicate: + case duplicate: if (!REG_MATCH_NULL_STRING_P (reg_info[*p1])) return false; break; @@ -4706,7 +4706,7 @@ common_op_match_null_string_p (p, end, reg_info) /* Return zero if TRANSLATE[S1] and TRANSLATE[S2] are identical for LEN bytes; nonzero otherwise. */ - + static int bcmp_translate (s1, s2, len, translate) const char *s1, *s2; @@ -4728,10 +4728,10 @@ bcmp_translate (s1, s2, len, translate) /* re_compile_pattern is the GNU regular expression compiler: it compiles PATTERN (of length SIZE) and puts the result in BUFP. Returns 0 if the pattern was valid, otherwise an error string. - + Assumes the `allocated' (and perhaps `buffer') and `translate' fields are set in BUFP on entry. - + We call regex_compile to do the actual compilation. */ const char * @@ -4741,23 +4741,23 @@ re_compile_pattern (pattern, length, bufp) struct re_pattern_buffer *bufp; { reg_errcode_t ret; - + /* GNU code is written to assume at least RE_NREGS registers will be set (and at least one extra will be -1). */ bufp->regs_allocated = REGS_UNALLOCATED; - + /* And GNU code determines whether or not to get register information by passing null for the REGS argument to re_match, etc., not by setting no_sub. */ bufp->no_sub = 0; - + /* Match anchors at newline. */ bufp->newline_anchor = 1; - + ret = regex_compile (pattern, length, re_syntax_options, bufp); return re_error_msg[(int) ret]; -} +} /* Entry points compatible with 4.2 BSD regex library. We don't define them if this is an Emacs or POSIX compilation. */ @@ -4772,7 +4772,7 @@ re_comp (s) const char *s; { reg_errcode_t ret; - + if (!s) { if (!re_comp_buf.buffer) @@ -4799,7 +4799,7 @@ re_comp (s) re_comp_buf.newline_anchor = 1; ret = regex_compile (s, strlen (s), re_syntax_options, &re_comp_buf); - + /* Yes, we're discarding `const' here. */ return (char *) re_error_msg[(int) ret]; } @@ -4856,7 +4856,7 @@ re_exec (s) int regcomp (preg, pattern, cflags) regex_t *preg; - const char *pattern; + const char *pattern; int cflags; { reg_errcode_t ret; @@ -4868,17 +4868,17 @@ regcomp (preg, pattern, cflags) preg->buffer = 0; preg->allocated = 0; preg->used = 0; - + /* Don't bother to use a fastmap when searching. This simplifies the REG_NEWLINE case: if we used a fastmap, we'd have to put all the characters after newlines into the fastmap. This way, we just try every character. */ preg->fastmap = 0; - + if (cflags & REG_ICASE) { unsigned i; - + preg->translate = (char *) malloc (CHAR_SET_SIZE); if (preg->translate == NULL) return (int) REG_ESPACE; @@ -4903,38 +4903,38 @@ regcomp (preg, pattern, cflags) preg->no_sub = !!(cflags & REG_NOSUB); - /* POSIX says a null character in the pattern terminates it, so we + /* POSIX says a null character in the pattern terminates it, so we can use strlen here in compiling the pattern. */ ret = regex_compile (pattern, strlen (pattern), syntax, preg); - + /* POSIX doesn't distinguish between an unmatched open-group and an unmatched close-group: both are REG_EPAREN. */ if (ret == REG_ERPAREN) ret = REG_EPAREN; - + return (int) ret; } /* regexec searches for a given pattern, specified by PREG, in the string STRING. - + If NMATCH is zero or REG_NOSUB was set in the cflags argument to `regcomp', we ignore PMATCH. Otherwise, we assume PMATCH has at least NMATCH elements, and we set them to the offsets of the corresponding matched substrings. - + EFLAGS specifies `execution flags' which affect matching: if REG_NOTBOL is set, then ^ does not match at the beginning of the string; if REG_NOTEOL is set, then $ does not match at the end. - + We return 0 if we find a match and REG_NOMATCH if not. */ int regexec (preg, string, nmatch, pmatch, eflags) const regex_t *preg; - const char *string; - size_t nmatch; - regmatch_t pmatch[]; + const char *string; + size_t nmatch; + regmatch_t pmatch[]; int eflags; { int ret; @@ -4944,15 +4944,15 @@ regexec (preg, string, nmatch, pmatch, eflags) boolean want_reg_info = !preg->no_sub && nmatch > 0; private_preg = *preg; - + private_preg.not_bol = !!(eflags & REG_NOTBOL); private_preg.not_eol = !!(eflags & REG_NOTEOL); - + /* The user has told us exactly how many registers to return information about, via `nmatch'. We have to pass that on to the matching routines. */ private_preg.regs_allocated = REGS_FIXED; - + if (want_reg_info) { regs.num_regs = nmatch; @@ -4966,7 +4966,7 @@ regexec (preg, string, nmatch, pmatch, eflags) ret = re_search (&private_preg, string, len, /* start: */ 0, /* range: */ len, want_reg_info ? ®s : (struct re_registers *) 0); - + /* Copy the register information to the POSIX structure. */ if (want_reg_info) { @@ -5006,7 +5006,7 @@ regerror (errcode, preg, errbuf, errbuf_size) if (errcode < 0 || errcode >= (sizeof (re_error_msg) / sizeof (re_error_msg[0]))) - /* Only error codes returned by the rest of the code should be passed + /* Only error codes returned by the rest of the code should be passed to this routine. If we are given anything else, or if other regex code generates an invalid error code, then the program has a bug. Dump core so we can fix it. */ @@ -5020,7 +5020,7 @@ regerror (errcode, preg, errbuf, errbuf_size) msg = "Success"; msg_size = strlen (msg) + 1; /* Includes the null. */ - + if (errbuf_size != 0) { if (msg_size > errbuf_size) @@ -5045,7 +5045,7 @@ regfree (preg) if (preg->buffer != NULL) free (preg->buffer); preg->buffer = NULL; - + preg->allocated = 0; preg->used = 0; diff --git a/gnu/lib/libregex/regex.h b/gnu/lib/libregex/regex.h index 757dbac..462d883 100644 --- a/gnu/lib/libregex/regex.h +++ b/gnu/lib/libregex/regex.h @@ -49,7 +49,7 @@ typedef unsigned long reg_syntax_t; #define RE_BACKSLASH_ESCAPE_IN_LISTS (1L) /* If this bit is not set, then + and ? are operators, and \+ and \? are - literals. + literals. If set, then \+ and \? are operators and + and ? are literals. */ #define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1) @@ -65,7 +65,7 @@ typedef unsigned long reg_syntax_t; ^ is an anchor if it is at the beginning of a regular expression or after an open-group or an alternation operator; $ is an anchor if it is at the end of a regular expression, or - before a close-group or an alternation operator. + before a close-group or an alternation operator. This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because POSIX draft 11.2 says that * etc. in leading positions is undefined. @@ -76,7 +76,7 @@ typedef unsigned long reg_syntax_t; /* If this bit is set, then special characters are always special regardless of where they are in the pattern. If this bit is not set, then special characters are special only in - some contexts; otherwise they are ordinary. Specifically, + some contexts; otherwise they are ordinary. Specifically, * + ? and intervals are only special when not after the beginning, open-group, or alternation operator. */ #define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1) @@ -98,7 +98,7 @@ typedef unsigned long reg_syntax_t; #define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1) /* If this bit is set, either \{...\} or {...} defines an - interval, depending on RE_NO_BK_BRACES. + interval, depending on RE_NO_BK_BRACES. If not set, \{, \}, {, and } are literals. */ #define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1) @@ -123,7 +123,7 @@ typedef unsigned long reg_syntax_t; If not set, then \<digit> is a back-reference. */ #define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1) -/* If this bit is set, then | is an alternation operator, and \| is literal. +/* If this bit is set, then | is an alternation operator, and \| is literal. If not set, then \| is an alternation operator, and | is literal. */ #define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1) @@ -149,7 +149,7 @@ extern reg_syntax_t re_syntax_options; /* Define combinations of the above bits for the standard possibilities. (The [[[ comments delimit what gets put into the Texinfo file, so - don't delete them!) */ + don't delete them!) */ /* [[[begin syntaxes]]] */ #define RE_SYNTAX_EMACS 0 @@ -232,7 +232,7 @@ extern reg_syntax_t re_syntax_options; /* If this bit is set, then ignore case when matching. If not set, then case is significant. */ #define REG_ICASE (REG_EXTENDED << 1) - + /* If this bit is set, then anchors do not match at newline characters in the string. If not set, then anchors do match at newlines. */ @@ -271,7 +271,7 @@ typedef enum REG_EESCAPE, /* Trailing backslash. */ REG_ESUBREG, /* Invalid back reference. */ REG_EBRACK, /* Unmatched left bracket. */ - REG_EPAREN, /* Parenthesis imbalance. */ + REG_EPAREN, /* Parenthesis imbalance. */ REG_EBRACE, /* Unmatched \{. */ REG_BADBR, /* Invalid contents of \{\}. */ REG_ERANGE, /* Invalid range end. */ @@ -302,7 +302,7 @@ struct re_pattern_buffer unsigned long allocated; /* Number of bytes actually used in `buffer'. */ - unsigned long used; + unsigned long used; /* Syntax setting with which the pattern was compiled. */ reg_syntax_t syntax; @@ -346,7 +346,7 @@ struct re_pattern_buffer unsigned no_sub : 1; /* If set, a beginning-of-line anchor doesn't match at the - beginning of the string. */ + beginning of the string. */ unsigned not_bol : 1; /* Similarly for an end-of-line anchor. */ @@ -458,7 +458,7 @@ extern int re_match /* Relates to `re_match' as `re_search_2' relates to `re_search'. */ -extern int re_match_2 +extern int re_match_2 _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1, int length1, const char *string2, int length2, int start, struct re_registers *regs, int stop)); diff --git a/gnu/lib/libregex/test/Makefile b/gnu/lib/libregex/test/Makefile index 5a8656a..84ebfcb 100644 --- a/gnu/lib/libregex/test/Makefile +++ b/gnu/lib/libregex/test/Makefile @@ -1,6 +1,6 @@ # Generated automatically from Makefile.in by configure. # Makefile for regex testing. -# +# # Copyright (C) 1992 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -46,7 +46,7 @@ test_o = test.o bsd-interf.o other.o tregress.o psx-basic.o psx-extend.o \ common_o = printchar.o upcase.o xmalloc.o $(malloc) # We have a lot of mallocs we can try when we run afoul of strange bugs. -malloc = +malloc = #malloc = # the libc malloc #malloc = g++malloc.o #malloc = debugmalloc.o @@ -81,7 +81,7 @@ fileregex: $(fileregex_o) cppregex: regexcpp.o $(common_o) $(test_o) main.o $(CC) -o $@ $(LDFLAGS) $^ $(LIBS) -regexcpp.o: regexcpp.c +regexcpp.o: regexcpp.c regexcpp.c: regex.c regexcpp.sed rm -f regexcpp.c @@ -145,25 +145,25 @@ dist: Makefile TAGS ln $(distfiles) $(distdir) # Automatically-generated dependencies below here. -alloca.o : alloca.c -bsd-interf.o : bsd-interf.c -debugmalloc.o : debugmalloc.c -emacsmalloc.o : emacsmalloc.c getpagesize.h -fileregex.o : fileregex.c .././regex.h -g++malloc.o : g++malloc.c //usr/include/stdio.h getpagesize.h -iregex.o : iregex.c .././regex.h -main.o : main.c test.h .././regex.h -malloc-test.o : malloc-test.c -other.o : other.c test.h .././regex.h -printchar.o : printchar.c -psx-basic.o : psx-basic.c test.h .././regex.h -psx-extend.o : psx-extend.c test.h .././regex.h -psx-generic.o : psx-generic.c test.h .././regex.h -psx-group.o : psx-group.c test.h .././regex.h -psx-interf.o : psx-interf.c test.h .././regex.h -psx-interv.o : psx-interv.c test.h .././regex.h -syntax.o : syntax.c .././regex.h -test.o : test.c test.h .././regex.h -tregress.o : tregress.c test.h .././regex.h -upcase.o : upcase.c -xmalloc.o : xmalloc.c +alloca.o : alloca.c +bsd-interf.o : bsd-interf.c +debugmalloc.o : debugmalloc.c +emacsmalloc.o : emacsmalloc.c getpagesize.h +fileregex.o : fileregex.c .././regex.h +g++malloc.o : g++malloc.c //usr/include/stdio.h getpagesize.h +iregex.o : iregex.c .././regex.h +main.o : main.c test.h .././regex.h +malloc-test.o : malloc-test.c +other.o : other.c test.h .././regex.h +printchar.o : printchar.c +psx-basic.o : psx-basic.c test.h .././regex.h +psx-extend.o : psx-extend.c test.h .././regex.h +psx-generic.o : psx-generic.c test.h .././regex.h +psx-group.o : psx-group.c test.h .././regex.h +psx-interf.o : psx-interf.c test.h .././regex.h +psx-interv.o : psx-interv.c test.h .././regex.h +syntax.o : syntax.c .././regex.h +test.o : test.c test.h .././regex.h +tregress.o : tregress.c test.h .././regex.h +upcase.o : upcase.c +xmalloc.o : xmalloc.c diff --git a/gnu/lib/libregex/test/Makefile.in b/gnu/lib/libregex/test/Makefile.in index b6a4133..fea1f10 100644 --- a/gnu/lib/libregex/test/Makefile.in +++ b/gnu/lib/libregex/test/Makefile.in @@ -1,5 +1,5 @@ # Makefile for regex testing. -# +# # Copyright (C) 1992 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -80,7 +80,7 @@ fileregex: $(fileregex_o) cppregex: regexcpp.o $(common_o) $(test_o) main.o $(CC) -o $@ $(LDFLAGS) $^ $(LIBS) -regexcpp.o: regexcpp.c +regexcpp.o: regexcpp.c regexcpp.c: regex.c regexcpp.sed rm -f regexcpp.c @@ -144,25 +144,25 @@ dist: Makefile TAGS ln $(distfiles) $(distdir) # Automatically-generated dependencies below here. -alloca.o : alloca.c -bsd-interf.o : bsd-interf.c -debugmalloc.o : debugmalloc.c -emacsmalloc.o : emacsmalloc.c getpagesize.h -fileregex.o : fileregex.c .././regex.h -g++malloc.o : g++malloc.c //usr/include/stdio.h getpagesize.h -iregex.o : iregex.c .././regex.h -main.o : main.c test.h .././regex.h -malloc-test.o : malloc-test.c -other.o : other.c test.h .././regex.h -printchar.o : printchar.c -psx-basic.o : psx-basic.c test.h .././regex.h -psx-extend.o : psx-extend.c test.h .././regex.h -psx-generic.o : psx-generic.c test.h .././regex.h -psx-group.o : psx-group.c test.h .././regex.h -psx-interf.o : psx-interf.c test.h .././regex.h -psx-interv.o : psx-interv.c test.h .././regex.h -syntax.o : syntax.c .././regex.h -test.o : test.c test.h .././regex.h -tregress.o : tregress.c test.h .././regex.h -upcase.o : upcase.c -xmalloc.o : xmalloc.c +alloca.o : alloca.c +bsd-interf.o : bsd-interf.c +debugmalloc.o : debugmalloc.c +emacsmalloc.o : emacsmalloc.c getpagesize.h +fileregex.o : fileregex.c .././regex.h +g++malloc.o : g++malloc.c //usr/include/stdio.h getpagesize.h +iregex.o : iregex.c .././regex.h +main.o : main.c test.h .././regex.h +malloc-test.o : malloc-test.c +other.o : other.c test.h .././regex.h +printchar.o : printchar.c +psx-basic.o : psx-basic.c test.h .././regex.h +psx-extend.o : psx-extend.c test.h .././regex.h +psx-generic.o : psx-generic.c test.h .././regex.h +psx-group.o : psx-group.c test.h .././regex.h +psx-interf.o : psx-interf.c test.h .././regex.h +psx-interv.o : psx-interv.c test.h .././regex.h +syntax.o : syntax.c .././regex.h +test.o : test.c test.h .././regex.h +tregress.o : tregress.c test.h .././regex.h +upcase.o : upcase.c +xmalloc.o : xmalloc.c diff --git a/gnu/lib/libregex/test/alloca.c b/gnu/lib/libregex/test/alloca.c index c1ff222..d8b6748 100644 --- a/gnu/lib/libregex/test/alloca.c +++ b/gnu/lib/libregex/test/alloca.c @@ -7,7 +7,7 @@ This implementation of the PWB library alloca() function, which is used to allocate space off the run-time stack so - that it is automatically reclaimed upon procedure exit, + that it is automatically reclaimed upon procedure exit, was inspired by discussions with J. Q. Johnson of Cornell. It should work under any C implementation that uses an diff --git a/gnu/lib/libregex/test/bsd-interf.c b/gnu/lib/libregex/test/bsd-interf.c index 56f9e2a..226a513 100644 --- a/gnu/lib/libregex/test/bsd-interf.c +++ b/gnu/lib/libregex/test/bsd-interf.c @@ -10,7 +10,7 @@ test_berk_search (pattern, string) char *string; { const char *return_value = re_comp (pattern); - + if (return_value != 0) { printf ("This didn't compile: `%s'.\n", pattern); diff --git a/gnu/lib/libregex/test/debugmalloc.c b/gnu/lib/libregex/test/debugmalloc.c index 5c468e2..6caeb65 100644 --- a/gnu/lib/libregex/test/debugmalloc.c +++ b/gnu/lib/libregex/test/debugmalloc.c @@ -11,7 +11,7 @@ static unsigned trace = 0; #define TRACE3(s, e1, e2, e3) if (trace) fprintf (stderr, s, e1, e2, e3) #define TRACE4(s, e1, e2, e3, e4) \ if (trace) fprintf (stderr, s, e1, e2, e3, e4) - + typedef char *address; @@ -23,13 +23,13 @@ xsbrk (incr) { extern char *sbrk (); address ret = sbrk (incr); - + if (ret == (address) -1) { perror ("sbrk"); /* Actually, we should return NULL, not quit. */ abort (); } - + return ret; } @@ -40,16 +40,16 @@ typedef struct chunk_struct /* This is the size (in bytes) that has actually been actually allocated, not the size that the user requested. */ unsigned alloc_size; - + /* This is the size the user requested. */ unsigned user_size; - + /* Points to the next block in one of the lists. */ struct chunk_struct *next; - + /* Now comes the user's memory. */ address user_mem; - + /* After the user's memory is a constant. */ } *chunk; @@ -98,10 +98,10 @@ chunk_insert (chunk_list, new_c) chunk new_c; { chunk c = *chunk_list; /* old beginning of list */ - + TRACE3 (" Inserting 0x%x at the beginning of 0x%x, before 0x%x.\n", new_c, chunk_list, c); - + *chunk_list = new_c; new_c->next = c; } @@ -120,7 +120,7 @@ chunk_delete (chunk_list, dead_c) chunk prev_c = NULL; TRACE2 (" Deleting 0x%x from 0x%x:", dead_c, chunk_list); - + while (c != dead_c && c != NULL) { TRACE1 (" 0x%x", c); @@ -133,7 +133,7 @@ chunk_delete (chunk_list, dead_c) fprintf (stderr, "Chunk at 0x%x not found on list.\n", dead_c); abort (); } - + if (prev_c == NULL) { TRACE1 (".\n Setting head to 0x%x.\n", c->next); @@ -154,16 +154,16 @@ validate_list (chunk_list) chunk *chunk_list; { chunk c; - + TRACE1 (" Validating list at 0x%x:", chunk_list); - + for (c = *chunk_list; c != NULL; c = c->next) { assert (c->user_size < c->alloc_size); assert (memcmp (chunk_to_mem (c) + c->user_size, "Karl", 4)); TRACE2 (" 0x%x/%d", c, c->user_size); } - + TRACE (".\n"); } @@ -176,22 +176,22 @@ free_list_available (needed) unsigned needed; { chunk c; - + TRACE1 (" Checking free list for %d bytes:", needed); - + if (free_list == NULL) { return NULL; } - + c = free_list; - + while (c != NULL && USER_ALLOC (c) < needed) { TRACE2 (" 0x%x/%d", c, USER_ALLOC (c)); c = c->next; } - + TRACE1 ("\n Returning 0x%x.\n", c); return c; } @@ -205,14 +205,14 @@ malloc (n) { address new_mem; chunk c; - + TRACE1 ("Mallocing %d bytes.\n", n); validate_list (&free_list); validate_list (&alloc_list); - c = free_list_available (n); - + c = free_list_available (n); + if (c == NULL) { /* Nothing suitable on free list. Allocate a new chunk. */ TRACE (" not on free list.\n"); @@ -232,7 +232,7 @@ malloc (n) new_mem = chunk_to_mem (c); memcpy (new_mem + n, "Karl", 4); chunk_insert (&alloc_list, c); - + TRACE2 ("Malloc returning 0x%x (chunk 0x%x).\n", new_mem, c); return new_mem; } @@ -246,13 +246,13 @@ realloc (mem, n) void free (); chunk c = mem_to_chunk (mem); address new_mem; - + TRACE3 ("Reallocing %d bytes at 0x%x (chunk 0x%x).\n", n, mem, c); new_mem = malloc (n); memcpy (new_mem, mem, c->user_size); free (mem); - + return new_mem; } @@ -262,12 +262,12 @@ free (mem) address mem; { chunk c = mem_to_chunk (mem); - + TRACE2 ("Freeing memory at 0x%x (chunk at 0x%x).\n", mem, c); validate_list (&free_list); validate_list (&alloc_list); - + chunk_delete (&alloc_list, c); chunk_insert (&free_list, c); } diff --git a/gnu/lib/libregex/test/emacsmalloc.c b/gnu/lib/libregex/test/emacsmalloc.c index 6eee1fa..ad7c4da 100644 --- a/gnu/lib/libregex/test/emacsmalloc.c +++ b/gnu/lib/libregex/test/emacsmalloc.c @@ -27,9 +27,9 @@ what you give them. Help stamp out software-hoarding! */ * * Nov 1983, Mike@BRL, Added support for 4.1C/4.2 BSD. * - * This is a very fast storage allocator. It allocates blocks of a small + * This is a very fast storage allocator. It allocates blocks of a small * number of different sizes, and keeps free lists of each size. Blocks - * that don't exactly fit are passed up to the next larger size. In this + * that don't exactly fit are passed up to the next larger size. In this * implementation, the available sizes are (2^n)-4 (or -16) bytes long. * This is designed for use in a program that uses vast quantities of * memory, but bombs when it runs out. To make it a little better, it @@ -297,21 +297,21 @@ morecore (nu) /* ask system for more memory */ if (warnfunction) switch (warnlevel) { - case 0: + case 0: if (siz > (lim_data / 4) * 3) { warnlevel++; (*warnfunction) ("Warning: past 75% of memory limit"); } break; - case 1: + case 1: if (siz > (lim_data / 20) * 17) { warnlevel++; (*warnfunction) ("Warning: past 85% of memory limit"); } break; - case 2: + case 2: if (siz > (lim_data / 20) * 19) { warnlevel++; @@ -691,31 +691,31 @@ malloc_mem_used () int size_used; size_used = 0; - + for (i = 0; i < 30; i++) { int allocation_size = 1 << (i + 3); struct mhead *p; - + size_used += nmalloc[i] * allocation_size; } return size_used; } -int +int malloc_mem_free () { int i; int size_unused; size_unused = 0; - + for (i = 0; i < 30; i++) { int allocation_size = 1 << (i + 3); struct mhead *p; - + for (p = nextf[i]; p ; p = CHAIN (p)) size_unused += allocation_size; } @@ -736,7 +736,7 @@ malloc_mem_free () get_lim_data () { extern long ulimit (); - + #ifdef ULIMIT_BREAK_VALUE lim_data = ULIMIT_BREAK_VALUE; #else diff --git a/gnu/lib/libregex/test/fileregex.c b/gnu/lib/libregex/test/fileregex.c index 2c27a0f..ba81062 100644 --- a/gnu/lib/libregex/test/fileregex.c +++ b/gnu/lib/libregex/test/fileregex.c @@ -21,7 +21,7 @@ main (argc, argv) const char *compile_ret; unsigned lineno = 1; unsigned nfound = 0; - + /* Actually, it might be useful to allow the data file to be standard input, and to specify the pattern on the command line. */ if (argc != 2) @@ -29,7 +29,7 @@ main (argc, argv) fprintf (stderr, "Usage: %s <filename>.\n", argv[0]); exit (1); } - + filename = argv[1]; f = fopen (filename, "r"); if (f == NULL) @@ -41,7 +41,7 @@ main (argc, argv) printf ("Pattern = ", pat); gets (pat); - + if (feof (stdin)) { putchar ('\n'); @@ -61,13 +61,13 @@ main (argc, argv) struct re_registers regs; int search_ret = re_search_2 (&buf, NULL, 0, line, len, 0, len, ®s, len); - + if (search_ret == -2) { fprintf (stderr, "%s:%d: re_search failed.\n", filename, lineno); exit (1); } - + nfound += search_ret != -1; lineno++; } diff --git a/gnu/lib/libregex/test/g++malloc.c b/gnu/lib/libregex/test/g++malloc.c index d55ce45..88c181c5 100644 --- a/gnu/lib/libregex/test/g++malloc.c +++ b/gnu/lib/libregex/test/g++malloc.c @@ -1,6 +1,6 @@ -#define inline +#define inline -/* +/* Copyright (C) 1989 Free Software Foundation written by Doug Lea (dl@oswego.edu) @@ -19,7 +19,7 @@ GNU CC General Public License. A copy of this license is supposed to have been given to you along with GNU CC so you can know your rights and responsibilities. It should be in a file named COPYING. Among other things, the copyright notice -and this notice must be preserved on all copies. +and this notice must be preserved on all copies. */ @@ -92,7 +92,7 @@ and this notice must be preserved on all copies. avoid wasted iterations due to (1). */ -/* +/* A version of malloc/free/realloc tuned for C++ applications. Here's what you probably want to know first: @@ -101,11 +101,11 @@ and this notice must be preserved on all copies. and usually substantially less memory-wasteful than BSD/GNUemacs malloc. Generally, it is slower (by perhaps 20%) than bsd-style malloc - only when bsd malloc would waste a great deal of space in + only when bsd malloc would waste a great deal of space in fragmented blocks, which this malloc recovers; or when, by chance or design, nearly all requests are near the bsd malloc power-of-2 allocation bin boundaries, and as many chunks are - used as are allocated. + used as are allocated. It uses more space than bsd malloc only when, again by chance or design, only bsdmalloc bin-sized requests are malloced, or when @@ -117,8 +117,8 @@ and this notice must be preserved on all copies. deal with bsdmalloc's characteristics. But even here, the performance differences are slight. - - This malloc, like any other, is a compromised design. + + This malloc, like any other, is a compromised design. Chunks of memory are maintained using a `boundary tag' method as @@ -135,7 +135,7 @@ and this notice must be preserved on all copies. Available chunks are kept in doubly linked lists. The lists are maintained in an array of bins using a power-of-two method, except that instead of 32 bins (one for each 1 << i), there are 128: each - power of two is split in quarters. The use of very fine bin sizes + power of two is split in quarters. The use of very fine bin sizes closely approximates the use of one bin per actually used size, without necessitating the overhead of locating such bins. It is especially desirable in common C++ applications where large numbers @@ -169,8 +169,8 @@ and this notice must be preserved on all copies. on fronts of lists. All remaindered or consolidated chunks are placed on the rear. Correspondingly, searching within a bin starts at the front, but finding victims is from the back. All - of this approximates the effect of having 2 kinds of lists per - bin: returned chunks vs unallocated chunks, but without the overhead + of this approximates the effect of having 2 kinds of lists per + bin: returned chunks vs unallocated chunks, but without the overhead of maintaining 2 lists.) Deallocation (free) consists only of placing the chunk on @@ -203,14 +203,14 @@ and this notice must be preserved on all copies. The checks are fast enough to be made non-optional. The overwriting of parts of freed memory with the freelist pointers - can also be very effective (albeit in an annoying way) in helping + can also be very effective (albeit in an annoying way) in helping users track down dangling pointers. User overwriting of freed space will often result in crashes within malloc or free. - + These routines are also tuned to C++ in that free(0) is a noop and - a failed malloc automatically calls (*new_handler)(). + a failed malloc automatically calls (*new_handler)(). malloc(0) returns a pointer to something of the minimum allocatable size. @@ -276,7 +276,7 @@ extern void abort(); /* A good multiple to call sbrk with */ -#define SBRK_UNIT 4096 +#define SBRK_UNIT 4096 @@ -334,13 +334,13 @@ typedef struct malloc_bin* mbinptr; static inline unsigned int request2size(unsigned int request) { - return (request == 0) ? MINSIZE : - ((request + MALLOC_MIN_OVERHEAD + MALLOC_ALIGN_MASK) + return (request == 0) ? MINSIZE : + ((request + MALLOC_MIN_OVERHEAD + MALLOC_ALIGN_MASK) & ~(MALLOC_ALIGN_MASK)); } -static inline int aligned_OK(void* m) +static inline int aligned_OK(void* m) { return ((unsigned int)(m) & (MALLOC_ALIGN_MASK)) == 0; } @@ -355,9 +355,9 @@ static inline int aligned_OK(void* m) #define MAXBIN 120 /* 1 more than needed for 32 bit addresses */ -#define FIRSTBIN (&(av[0])) +#define FIRSTBIN (&(av[0])) -static struct malloc_bin av[MAXBIN] = +static struct malloc_bin av[MAXBIN] = { { { 0, &(av[0].hd), &(av[0].hd) }, 0 }, { { 0, &(av[1].hd), &(av[1].hd) }, 0 }, @@ -545,7 +545,7 @@ static void do_free_stats(const mchunkptr p) { ++n_frees; freed_mem += (p->size & ~(INUSE)); -} +} #endif @@ -557,7 +557,7 @@ static void do_free_stats(const mchunkptr p) static unsigned int gcd(unsigned int a, unsigned int b) { unsigned int tmp; - + if (b > a) { tmp = a; a = b; b = tmp; @@ -591,7 +591,7 @@ static inline unsigned int lcm(unsigned int x, unsigned int y) #define set_inuse(p) ((p)->size |= INUSE) #define clear_inuse(b) ((p)->size &= ~INUSE) - + /* operations on malloc_chunk addresses */ @@ -616,18 +616,18 @@ static inline void set_size(mchunkptr p, unsigned int sz) /* conversion from malloc headers to user pointers, and back */ -static inline void* chunk2mem(mchunkptr p) -{ +static inline void* chunk2mem(mchunkptr p) +{ void *mem; set_inuse(p); -mem = (void*)((char*)(p) + SIZE_SZ); +mem = (void*)((char*)(p) + SIZE_SZ); return mem; } /* xxxx my own */ -mchunkptr sanity_check(void* mem) -{ - mchunkptr p = (mchunkptr)((char*)(mem) - SIZE_SZ); +mchunkptr sanity_check(void* mem) +{ + mchunkptr p = (mchunkptr)((char*)(mem) - SIZE_SZ); /* a quick sanity check */ unsigned int sz = p->size & ~(INUSE); @@ -640,9 +640,9 @@ mchunkptr sanity_check(void* mem) -static inline mchunkptr mem2chunk(void* mem) -{ - mchunkptr p = (mchunkptr)((char*)(mem) - SIZE_SZ); +static inline mchunkptr mem2chunk(void* mem) +{ + mchunkptr p = (mchunkptr)((char*)(mem) - SIZE_SZ); /* a quick sanity check */ unsigned int sz = p->size & ~(INUSE); @@ -691,15 +691,15 @@ static inline void split(mchunkptr p, unsigned int offset) mchunkptr h = &(bn->hd); /* its head */ mchunkptr b = h->bk; /* old back element */ mchunkptr t = (mchunkptr)((char*)(p) + offset); /* remaindered chunk */ - + /* set size */ t->size = *((int*)((char*)(t) + room - SIZE_SZ)) = room; /* link up */ t->bk = b; t->fd = h; h->bk = b->fd = t; - + /* adjust maxbin (h == b means was empty) */ - if (h == b && bn > malloc_maxbin) malloc_maxbin = bn; + if (h == b && bn > malloc_maxbin) malloc_maxbin = bn; /* adjust size of chunk to be returned */ p->size = *((int*)((char*)(p) + offset - SIZE_SZ)) = offset; @@ -721,7 +721,7 @@ static inline void consollink(mchunkptr p) p->bk = b; p->fd = h; h->bk = b->fd = p; - if (h == b && bn > malloc_maxbin) malloc_maxbin = bn; + if (h == b && bn > malloc_maxbin) malloc_maxbin = bn; UPDATE_STATS(++n_avail); } @@ -737,7 +737,7 @@ static inline void frontlink(mchunkptr p) p->bk = h; p->fd = f; f->bk = h->fd = p; - if (h == f && bn > malloc_maxbin) malloc_maxbin = bn; + if (h == f && bn > malloc_maxbin) malloc_maxbin = bn; bn->dirty = 1; @@ -770,11 +770,11 @@ static mchunkptr malloc_from_sys(unsigned nb) mchunkptr p; unsigned int sbrk_size; int* ip; - + /* Minimally, we need to pad with enough space */ /* to place dummy size/use fields to ends if needed */ - sbrk_size = ((nb + SBRK_UNIT - 1 + SIZE_SZ + SIZE_SZ) + sbrk_size = ((nb + SBRK_UNIT - 1 + SIZE_SZ + SIZE_SZ) / SBRK_UNIT) * SBRK_UNIT; ip = (int*)(sbrk(sbrk_size)); @@ -789,8 +789,8 @@ static mchunkptr malloc_from_sys(unsigned nb) UPDATE_STATS ((++n_sbrks, sbrked_mem += sbrk_size)); - if (last_sbrk_end != &ip[-1]) - { + if (last_sbrk_end != &ip[-1]) + { /* It's either first time through or someone else called sbrk. */ /* Arrange end-markers at front & back */ @@ -802,14 +802,14 @@ static mchunkptr malloc_from_sys(unsigned nb) /* Note we can get away with only 1 word, not MINSIZE overhead here */ *ip++ = SIZE_SZ | INUSE; - + p = (mchunkptr)ip; - set_size(p,sbrk_size - (SIZE_SZ + SIZE_SZ)); - + set_size(p,sbrk_size - (SIZE_SZ + SIZE_SZ)); + } - else + else { - mchunkptr l; + mchunkptr l; /* We can safely make the header start at end of prev sbrked chunk. */ /* We will still have space left at the end from a previous call */ @@ -822,7 +822,7 @@ static mchunkptr malloc_from_sys(unsigned nb) /* Even better, maybe we can merge with last fragment: */ l = prev_chunk(p); - if (!inuse(l)) + if (!inuse(l)) { unlink(l); set_size(l, p->size + l->size); @@ -861,7 +861,7 @@ static mchunkptr malloc_find_space(unsigned int nb) /* first, re-adjust max used bin */ - while (malloc_maxbin >= FIRSTBIN && + while (malloc_maxbin >= FIRSTBIN && malloc_maxbin->hd.bk == &(malloc_maxbin->hd)) { malloc_maxbin->dirty = 0; @@ -895,7 +895,7 @@ static mchunkptr malloc_find_space(unsigned int nb) p = t; UPDATE_STATS (++n_consol); } - + while (!inuse(t = next_chunk(p))) /* consolidate forward */ { if (!consolidated) { consolidated = 1; unlink(p); } @@ -957,7 +957,7 @@ void* malloc(unsigned int bytes) { mchunkptr nextp = p->fd; /* save, in case of relinks */ int consolidated = 0; /* only unlink/relink if consolidated */ - + mchunkptr t; while (!inuse(t = prev_chunk(p))) /* consolidate backward */ @@ -969,7 +969,7 @@ void* malloc(unsigned int bytes) p = t; UPDATE_STATS (++n_consol); } - + while (!inuse(t = next_chunk(p))) /* consolidate forward */ { if (!consolidated) { consolidated = 1; unlink(p); } @@ -978,7 +978,7 @@ void* malloc(unsigned int bytes) set_size(p, p->size + t->size); UPDATE_STATS (++n_consol); } - + if (consolidated) { if (p->size >= nb) @@ -1017,7 +1017,7 @@ void* malloc(unsigned int bytes) found: /* Use what we found */ unlink(p); - split(p, nb); + split(p, nb); UPDATE_STATS(do_malloc_stats(p)); return chunk2mem(p); } @@ -1049,7 +1049,7 @@ void cfree(void *mem) { free(mem); } - + unsigned int malloc_usable_size(void* mem) { @@ -1057,7 +1057,7 @@ unsigned int malloc_usable_size(void* mem) return 0; else { - mchunkptr p = (mchunkptr)((char*)(mem) - SIZE_SZ); + mchunkptr p = (mchunkptr)((char*)(mem) - SIZE_SZ); unsigned int sz = p->size & ~(INUSE); if (p->size == sz || sz != *((int*)((char*)(p) + sz - SIZE_SZ))) return 0; @@ -1070,7 +1070,7 @@ unsigned int malloc_usable_size(void* mem) void* realloc(void* mem, unsigned int bytes) { - if (mem == 0) + if (mem == 0) return malloc(bytes); else { @@ -1081,7 +1081,7 @@ void* realloc(void* mem, unsigned int bytes) mchunkptr nxt; UPDATE_STATS((++n_reallocs, requested_mem += bytes-oldsize)); - + /* try to expand (even if already big enough), to clean up chunk */ while (!inuse(nxt = next_chunk(p))) @@ -1160,7 +1160,7 @@ void* memalign(unsigned int alignment, unsigned int bytes) /* and we've malloc'd enough total room */ ap = (mchunkptr)( (int)(ap) + align ); - gap += align; + gap += align; } if (gap + nb > p->size) /* can't happen unless chunk sizes corrupted */ @@ -1179,7 +1179,7 @@ void* memalign(unsigned int alignment, unsigned int bytes) /* also give back spare room at the end */ - split(p, nb); + split(p, nb); UPDATE_STATS(do_malloc_stats(p)); return chunk2mem(p); @@ -1196,7 +1196,7 @@ void* valloc(unsigned int bytes) if (malloc_pagesize == 0) malloc_pagesize = getpagesize(); return memalign (malloc_pagesize, bytes); } - + void malloc_stats() { @@ -1216,23 +1216,23 @@ void malloc_stats() if (n_mallocs != 0) fprintf(stderr, "mallocs = %10u total size = %10u\tave = %10u\n", n_mallocs, malloced_mem, malloced_mem/n_mallocs); - + if (n_frees != 0) fprintf(stderr, "frees = %10u total size = %10u\tave = %10u\n", n_frees, freed_mem, freed_mem/n_frees); - + if (n_mallocs-n_frees != 0) fprintf(stderr, "in use = %10u total size = %10u\tave = %10u\n", - n_mallocs-n_frees, malloced_mem-freed_mem, + n_mallocs-n_frees, malloced_mem-freed_mem, (malloced_mem-freed_mem) / (n_mallocs-n_frees)); if (max_inuse != 0) fprintf(stderr, "max in use= %10u total size = %10u\tave = %10u\n", max_inuse, max_used_mem, max_used_mem / max_inuse); - + if (n_avail != 0) fprintf(stderr, "available = %10u total size = %10u\tave = %10u\n", - n_avail, sbrked_mem - (malloced_mem-freed_mem), + n_avail, sbrked_mem - (malloced_mem-freed_mem), (sbrked_mem - (malloced_mem-freed_mem)) / n_avail); if (n_sbrks != 0) @@ -1246,13 +1246,13 @@ void malloc_stats() if (nm != 0) { - fprintf(stderr, "chunks scanned per malloc = %6.3f\n", + fprintf(stderr, "chunks scanned per malloc = %6.3f\n", n_malloc_chunks / nm); - fprintf(stderr, "bins scanned per malloc = %6.3f\n", + fprintf(stderr, "bins scanned per malloc = %6.3f\n", n_malloc_bins / nm); - fprintf(stderr, "splits per malloc = %6.3f\n", + fprintf(stderr, "splits per malloc = %6.3f\n", n_split / nm); - fprintf(stderr, "consolidations per malloc = %6.3f\n", + fprintf(stderr, "consolidations per malloc = %6.3f\n", n_consol / nm); } @@ -1282,7 +1282,7 @@ void malloc_stats() } } #endif /* MALLOC_STATS */ - + #endif /* NO_LIBGXX_MALLOC */ diff --git a/gnu/lib/libregex/test/iregex.c b/gnu/lib/libregex/test/iregex.c index 2346d44..1ff12b6 100644 --- a/gnu/lib/libregex/test/iregex.c +++ b/gnu/lib/libregex/test/iregex.c @@ -42,7 +42,7 @@ main (argc, argv) /* Some C compilers don't like `char pat[500] = ""'. */ pat[0] = 0; - + printf ("Pattern (%s) = ", pat); gets (pat); scanstring (pat); @@ -71,7 +71,7 @@ main (argc, argv) if (i >= 0) print_regs (regs); putchar ('\n'); - + i = re_search (&buf, str, strlen (str), 0, strlen (str), ®s); printf ("Search value %d.\t", i); if (i >= 0) @@ -144,7 +144,7 @@ print_regs (regs) int i, end; printf ("Registers: "); - + if (regs.num_regs == 0 || regs.start[0] == -1) { printf ("(none)"); diff --git a/gnu/lib/libregex/test/main.c b/gnu/lib/libregex/test/main.c index 28ae315..da4536d 100644 --- a/gnu/lib/libregex/test/main.c +++ b/gnu/lib/libregex/test/main.c @@ -20,27 +20,27 @@ main () test_posix_extended (); test_posix_interface (); break; - + case other_test: test_others (); break; - + case posix_basic_test: test_posix_basic (); break; - + case posix_extended_test: test_posix_extended (); break; - + case posix_interface_test: test_posix_interface (); break; - + case regress_test: test_regress (); break; - + default: fprintf (stderr, "Unknown test %d.\n", t); } diff --git a/gnu/lib/libregex/test/other.c b/gnu/lib/libregex/test/other.c index d2ceb38..1023fc6 100644 --- a/gnu/lib/libregex/test/other.c +++ b/gnu/lib/libregex/test/other.c @@ -6,7 +6,7 @@ void test_others () { struct re_registers regs; - + printf ("\nStarting non-POSIX tests.\n"); t = other_test; @@ -19,17 +19,17 @@ test_others () TEST_REGISTERS ("(a*)*ab", "ab", 0, 2, 0, 0, -1, -1); test_match ("(a*)*", ""); TEST_REGISTERS ("(a*)*ab", "ab", 0, 0, 0, 0, -1, -1); - + /* This tests finding the highest and lowest active registers. */ test_match ("(a(b)c(d(e)f)g)h(i(j)k(l(m)n)o)\\1\\2\\3\\4\\5\\6\\7\\8", "abcdefghijklmnoabcdefgbdefeijklmnojlmnm"); /* Test that \< and \> match at the beginning and end of the string. */ test_match ("\\<abc\\>", "abc"); - + /* May as well test \` and \' while we're at it. */ test_match ("\\`abc\\'", "abc"); - + #if 0 /* Test backreferencing and the fastmap -- which doesn't work. */ test_fastmap ("(a)*\\1", "a", 0, 0); @@ -37,9 +37,9 @@ test_others () /* But at least we shouldn't search improperly. */ test_search_return (-1, "(a)\\1", ""); - + re_set_syntax (RE_SYNTAX_EMACS); - + MATCH_SELF("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); MATCH_SELF ("a^"); MATCH_SELF ("a^b"); @@ -70,7 +70,7 @@ test_others () test_match ("a|{1}", "a"); test_match ("a|{1}", "{1}"); test_match ("({1})", "{1}"); - + test_match ("\\{", "{"); @@ -94,7 +94,7 @@ test_others () /* Test grouping. */ re_set_syntax (RE_NO_BK_PARENS); - + test_match ("()", ""); test_fastmap ("()", "", 0, 0); TEST_REGISTERS ("()", "", 0, 0, 0, 0, -1, -1); @@ -106,22 +106,22 @@ test_others () test_match ("(((((((((())))))))))", ""); test_fastmap ("(((((((((())))))))))", "", 0, 0); - + test_match ("()*", ""); TEST_REGISTERS ("()*", "", 0, 0, 0, 0, -1, -1); /* empty string */ test_match ("(())*", ""); re_set_syntax (RE_CONTEXT_INDEP_OPS); test_match ("*", ""); - + re_set_syntax (RE_INTERVALS | RE_CONTEXT_INDEP_OPS | RE_NO_BK_BRACES); test_match ("{1}", ""); /* Should remain an interval. */ MATCH_SELF ("{1"); /* Not a valid interval. */ - + re_set_syntax (RE_NEWLINE_ALT); test_match ("a\nb", "a"); test_match ("a\nb", "b"); - + re_set_syntax (RE_NO_BK_VBAR | RE_NO_BK_PARENS); test_match ("^a", "a"); test_match ("(^a)", "a"); @@ -129,11 +129,11 @@ test_others () test_match ("a$", "a"); test_match ("(a$)", "a"); test_match ("a$|b", "a"); - + /* You should be able to have empty alternatives if RE_NO_EMPTY_ALTS isn't set. */ re_set_syntax (RE_NO_BK_VBAR | RE_NO_BK_PARENS); - + test_match ("|", ""); test_match ("^|a", ""); test_match ("^|a", "a"); @@ -293,8 +293,8 @@ test_others () test_case_fold ("[!-`]", "A"); test_case_fold ("[!-`]", "a"); - - re_set_syntax (RE_CONTEXT_INDEP_OPS | RE_NO_BK_VBAR | RE_NO_BK_PARENS + + re_set_syntax (RE_CONTEXT_INDEP_OPS | RE_NO_BK_VBAR | RE_NO_BK_PARENS | RE_NO_BK_BRACES | RE_INTERVALS); valid_nonposix_pattern ("()^a"); valid_nonposix_pattern ("()\\1^a"); @@ -319,24 +319,24 @@ test_others () TEST_SEARCH ("^(^a)", "ab", 0, 2); TEST_SEARCH ("(a$)$", "ba", 0, 2); test_match ("a|$b", "$b"); - + /* Mike's curiosity item. */ re_set_syntax (RE_NO_BK_VBAR | RE_NO_BK_PARENS); test_all_registers ("(foo|foobar)(foo|bar)*\\1(foo|bar)*", "foobarfoobar", "", - 0, 12, 0, 3, 3, 6, 9, 12, -1, -1, -1, -1, -1, -1, -1, -1, + 0, 12, 0, 3, 3, 6, 9, 12, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1); /* Another one from Mike. */ test_match ("(foo|foobarfoo)(bar)*", "foobarfoo"); - + /* And another. */ test_match("(foo|foobar)(bar|barfoo)?\\1", "foobarfoobar"); - + re_set_syntax (RE_NO_BK_PARENS | RE_INTERVALS | RE_NO_BK_VBAR | RE_NO_BK_BRACES); /* xx get new ones from ext.*/ test_match ("((a{0,}{0,0}()\\3\\b\\B\\<\\>\\`\\')|b)*", "bb"); - test_all_registers ("((a{0,}{0,0}()\\3\\b\\B\\<\\>\\`\\')|b)*", "", "bb", + test_all_registers ("((a{0,}{0,0}()\\3\\b\\B\\<\\>\\`\\')|b)*", "", "bb", 0, 2, 1, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1); @@ -349,11 +349,11 @@ test_others () /* See generic_test.c and extended_test.c for more search tests. xx Not sure all these tests are represented in the search tests. */ - + re_set_syntax (RE_NO_BK_PARENS | RE_NO_BK_VBAR); - valid_nonposix_pattern + valid_nonposix_pattern ("(((((((((((((((((((((((((((((((((^a)))))))))))))))))))))))))))))))))"); - valid_nonposix_pattern + valid_nonposix_pattern ("(((((((((((((((((((((((((((((((((a$)))))))))))))))))))))))))))))))))"); valid_nonposix_pattern ("\\b\\B\\<\\>\\`\\'^a"); valid_nonposix_pattern ("a$\\b\\B\\<\\>\\`\\'"); @@ -413,7 +413,7 @@ test_others () RE_CONTEXT_INDEP_OPS. */ re_set_syntax (RE_CONTEXT_INDEP_OPS | RE_CONTEXT_INVALID_OPS - | RE_NO_BK_VBAR | RE_NO_BK_PARENS + | RE_NO_BK_VBAR | RE_NO_BK_PARENS | RE_NO_BK_BRACES | RE_INTERVALS); INVALID_PATTERN ("*"); INVALID_PATTERN ("^*"); @@ -440,9 +440,9 @@ test_others () are undefined as of draft 11.2. */ /* You can't have empty alternatives if RE_NO_EMPTY_ALTS is set. */ - + re_set_syntax (RE_NO_BK_VBAR | RE_NO_BK_PARENS | RE_NO_EMPTY_ALTS); - + INVALID_PATTERN ("|"); INVALID_PATTERN ("^|a"); INVALID_PATTERN ("a|"); @@ -463,7 +463,7 @@ test_others () #endif /* Test grouping. */ - test_match ("()", "a"); + test_match ("()", "a"); /* Test backslashed intervals that are CONTEXTly invalid if have nothing on which to operate. */ @@ -476,13 +476,13 @@ test_others () re_set_syntax (RE_BK_PLUS_QM); INVALID_PATTERN ("a*\\"); - + re_set_syntax (0); INVALID_PATTERN ("a*\\"); - + re_set_syntax (RE_BACKSLASH_ESCAPE_IN_LISTS); INVALID_PATTERN ("[\\"); - + #if 0 /* Empty groups are always ok now. (13 Sep 92) */ re_set_syntax (RE_NO_BK_VBAR | RE_NO_BK_PARENS | RE_NO_EMPTY_GROUPS); diff --git a/gnu/lib/libregex/test/psx-basic.c b/gnu/lib/libregex/test/psx-basic.c index 52535b6..487c604 100644 --- a/gnu/lib/libregex/test/psx-basic.c +++ b/gnu/lib/libregex/test/psx-basic.c @@ -9,18 +9,18 @@ test_posix_basic () /* Intervals can only match up to RE_DUP_MAX occurences of anything. */ char dup_max_plus_one[6]; sprintf (dup_max_plus_one, "%d", RE_DUP_MAX + 1); - + printf ("\nStarting POSIX basic tests.\n"); t = posix_basic_test; - re_set_syntax (RE_SYNTAX_POSIX_MINIMAL_BASIC); - + re_set_syntax (RE_SYNTAX_POSIX_MINIMAL_BASIC); + test_posix_generic (); printf ("\nContinuing POSIX basic tests.\n"); /* Grouping tests that are not the same. */ - + test_should_match = false; invalid_pattern (REG_EPAREN, PARENS_TO_OPS ("a)")); @@ -31,7 +31,7 @@ test_posix_basic () test_match ("\\(^*\\)", "*"); test_match ("**", "***"); test_match ("***", "****"); - + MATCH_SELF ("{"); /* of extended... */ MATCH_SELF ("()"); /* also non-Posix. */ MATCH_SELF ("a+"); @@ -82,67 +82,67 @@ test_posix_basic () test_match ("\\(a\\)*\\1", "aa"); TEST_REGISTERS ("\\(a\\)*\\1", "aa", 0, 2, 0, 1, -1, -1); TEST_REGISTERS ("\\(a\\)*\\1", "xaax", 0, 0, -1, -1, -1, -1); - + test_match ("\\(\\(a\\)\\2b\\)*", "aab"); TEST_REGISTERS ("\\(\\(a\\)\\2b\\)*", "aab", 0, 3, 0, 3, 0, 1); TEST_REGISTERS ("\\(\\(a\\)\\2b\\)*", "xaabx", 0, 0, -1, -1, -1, -1); - + test_match ("\\(a*\\)*\\1", ""); test_match ("\\(a*\\)*\\1", "aa"); TEST_REGISTERS ("\\(a*\\)*\\1", "aa", 0, 2, 0, 1, -1, -1); TEST_REGISTERS ("\\(a*\\)*\\1", "xaax", 0, 0, 0, 0, -1, -1); - - test_match ("\\(a*\\)*\\1", ""); - test_match ("\\(a*\\)*\\1", "aa"); - test_match ("\\(\\(a*\\)*\\)*\\1", "aa"); + + test_match ("\\(a*\\)*\\1", ""); + test_match ("\\(a*\\)*\\1", "aa"); + test_match ("\\(\\(a*\\)*\\)*\\1", "aa"); test_match ("\\(ab*\\)*\\1", "abab"); TEST_REGISTERS ("\\(ab*\\)*\\1", "abab", 0, 4, 0, 2, -1, -1); TEST_REGISTERS ("\\(ab*\\)*\\1", "xababx", 0, 0, -1, -1, -1, -1); - test_match ("\\(a*\\)ab\\1", "aaba"); - TEST_REGISTERS ("\\(a*\\)ab\\1", "aaba", 0, 4, 0, 1, -1, -1); - TEST_REGISTERS ("\\(a*\\)ab\\1", "xaabax", 1, 5, 1, 2, -1, -1); + test_match ("\\(a*\\)ab\\1", "aaba"); + TEST_REGISTERS ("\\(a*\\)ab\\1", "aaba", 0, 4, 0, 1, -1, -1); + TEST_REGISTERS ("\\(a*\\)ab\\1", "xaabax", 1, 5, 1, 2, -1, -1); - test_match ("\\(a*\\)*ab\\1", "aaba"); - TEST_REGISTERS ("\\(a*\\)*ab\\1", "aaba", 0, 4, 0, 1, -1, -1); - TEST_REGISTERS ("\\(a*\\)*ab\\1", "xaabax", 1, 5, 1, 2, -1, -1); + test_match ("\\(a*\\)*ab\\1", "aaba"); + TEST_REGISTERS ("\\(a*\\)*ab\\1", "aaba", 0, 4, 0, 1, -1, -1); + TEST_REGISTERS ("\\(a*\\)*ab\\1", "xaabax", 1, 5, 1, 2, -1, -1); - test_match ("\\(\\(a*\\)b\\)*\\2", "abb"); + test_match ("\\(\\(a*\\)b\\)*\\2", "abb"); TEST_REGISTERS ("\\(\\(a*\\)b\\)*\\2", "abb", 0, 3, 2, 3, 2, 2); - TEST_REGISTERS ("\\(\\(a*\\)b\\)*\\2", "xabbx", 0, 0, -1, -1, -1, -1); + TEST_REGISTERS ("\\(\\(a*\\)b\\)*\\2", "xabbx", 0, 0, -1, -1, -1, -1); /* Different from above. */ - test_match ("\\(\\(a*\\)b*\\)*\\2", "aa"); + test_match ("\\(\\(a*\\)b*\\)*\\2", "aa"); TEST_REGISTERS ("\\(\\(a*\\)b*\\)*\\2", "aa", 0, 2, 0, 1, 0, 1); - TEST_REGISTERS ("\\(\\(a*\\)b*\\)*\\2", "xaax", 0, 0, 0, 0, 0, 0); + TEST_REGISTERS ("\\(\\(a*\\)b*\\)*\\2", "xaax", 0, 0, 0, 0, 0, 0); - test_match ("\\(\\(a*\\)b*\\)*\\2", "aba"); + test_match ("\\(\\(a*\\)b*\\)*\\2", "aba"); TEST_REGISTERS ("\\(\\(a*\\)b*\\)*\\2", "aba", 0, 3, 0, 2, 0, 1); - TEST_REGISTERS ("\\(\\(a*\\)b*\\)*\\2", "xabax", 0, 0, 0, 0, 0, 0); + TEST_REGISTERS ("\\(\\(a*\\)b*\\)*\\2", "xabax", 0, 0, 0, 0, 0, 0); test_match ("\\(\\(a*\\)b\\)*\\2", "aababa"); - TEST_REGISTERS ("\\(\\(a*\\)b\\)*\\2", "aababa", 0, 6, 3, 5, 3, 4); - TEST_REGISTERS ("\\(\\(a*\\)b\\)*\\2", "xaababax", 0, 0, -1, -1, -1, -1); + TEST_REGISTERS ("\\(\\(a*\\)b\\)*\\2", "aababa", 0, 6, 3, 5, 3, 4); + TEST_REGISTERS ("\\(\\(a*\\)b\\)*\\2", "xaababax", 0, 0, -1, -1, -1, -1); - test_match ("\\(\\(a*\\)b*\\)*\\2", "aabaa"); + test_match ("\\(\\(a*\\)b*\\)*\\2", "aabaa"); TEST_REGISTERS ("\\(\\(a*\\)b*\\)*\\2", "aabaa", 0, 5, 0, 3, 0, 2); - TEST_REGISTERS ("\\(\\(a*\\)b*\\)*\\2", "xaabaax", 0, 0, 0, 0, 0, 0); + TEST_REGISTERS ("\\(\\(a*\\)b*\\)*\\2", "xaabaax", 0, 0, 0, 0, 0, 0); - test_match ("\\(\\(a*\\)b*\\)*\\2", "aabbaa"); + test_match ("\\(\\(a*\\)b*\\)*\\2", "aabbaa"); TEST_REGISTERS ("\\(\\(a*\\)b*\\)*\\2", "aabbaa", 0, 6, 0, 4, 0, 2); - TEST_REGISTERS ("\\(\\(a*\\)b*\\)*\\2", "xaabbaax", 0, 0, 0, 0, 0, 0); + TEST_REGISTERS ("\\(\\(a*\\)b*\\)*\\2", "xaabbaax", 0, 0, 0, 0, 0, 0); - test_match ("\\(\\(a*\\)b*\\)*\\2", "abaabaa"); + test_match ("\\(\\(a*\\)b*\\)*\\2", "abaabaa"); TEST_REGISTERS ("\\(\\(a*\\)b*\\)*\\2", "abaabaa", 0, 7, 2, 5, 2, 4); - TEST_REGISTERS ("\\(\\(a*\\)b*\\)*\\2", "xaababaax", 0, 0, 0, 0, 0, 0); + TEST_REGISTERS ("\\(\\(a*\\)b*\\)*\\2", "xaababaax", 0, 0, 0, 0, 0, 0); - test_match ("\\(\\(a*\\)b*\\)*a\\2", "aabaaa"); + test_match ("\\(\\(a*\\)b*\\)*a\\2", "aabaaa"); TEST_REGISTERS ("\\(\\(a*\\)b*a\\)*\\2", "aabaaa", 0, 6, 0, 3, 0, 2); - TEST_REGISTERS ("\\(\\(a*\\)b*a\\)*\\2", "xaabaax", 0, 0, -1, -1, -1, -1); + TEST_REGISTERS ("\\(\\(a*\\)b*a\\)*\\2", "xaabaax", 0, 0, -1, -1, -1, -1); - test_match ("\\(\\(a*\\)b*\\)*\\2a", "aabaaa"); + test_match ("\\(\\(a*\\)b*\\)*\\2a", "aabaaa"); TEST_REGISTERS ("\\(\\(a*\\)b*\\)*\\2a", "aabaaa", 0, 6, 0, 3, 0, 2); - TEST_REGISTERS ("\\(\\(a*\\)b*\\)*\\2a", "xaabaaax", 1, 7, 1, 4, 1, 3); + TEST_REGISTERS ("\\(\\(a*\\)b*\\)*\\2a", "xaabaaax", 1, 7, 1, 4, 1, 3); test_match ("\\(\\(a*\\)b\\)*\\2\\1", "abaabaaaab"); TEST_REGISTERS ("\\(\\(a*\\)b\\)*\\2\\1", "abaabaaaab", 0, 10, 2, 5, 2, 4); @@ -152,7 +152,7 @@ test_posix_basic () test_match ("\\(a*b\\)\\1", "abab"); test_match ("\\(a\\)\\1\\1", "aaa"); test_match ("\\(a\\(c\\)d\\)\\1\\2", "acdacdc"); - + test_match ("\\(a\\)\\1*", "aaa"); TEST_REGISTERS ("\\(a\\)\\1*", "aaa", 0, 3, 0, 1, -1, -1); TEST_REGISTERS ("\\(a\\)\\1*", "xaaax", 1, 4, 1, 2, -1, -1); @@ -186,15 +186,15 @@ test_posix_basic () /* Per POSIX D11.1, p. 125, leftmost longest match. */ - + test_match (PARENS_TO_OPS ("(ac*)c*d[ac]*\\1"), "acdacaaa"); - TEST_REGISTERS (PARENS_TO_OPS ("(ac*)c*d[ac]*\\1"), "acdacaaa", + TEST_REGISTERS (PARENS_TO_OPS ("(ac*)c*d[ac]*\\1"), "acdacaaa", 0, 8, 0, 1, -1, -1); /* Anchors become ordinary, sometimes. */ MATCH_SELF ("a^"); - MATCH_SELF ("$a"); - MATCH_SELF ("$^"); + MATCH_SELF ("$a"); + MATCH_SELF ("$^"); test_fastmap ("$a^", "$", 0, 0); test_match ("$^*", "$^^"); test_match ("\\($^\\)", "$^"); diff --git a/gnu/lib/libregex/test/psx-extend.c b/gnu/lib/libregex/test/psx-extend.c index 6f02d67..14b8a5e 100644 --- a/gnu/lib/libregex/test/psx-extend.c +++ b/gnu/lib/libregex/test/psx-extend.c @@ -13,15 +13,15 @@ test_posix_extended () printf ("\nStarting POSIX extended tests.\n"); t = posix_extended_test; - - re_set_syntax (RE_SYNTAX_POSIX_MINIMAL_EXTENDED); + + re_set_syntax (RE_SYNTAX_POSIX_MINIMAL_EXTENDED); test_posix_generic (); printf ("\nContinuing POSIX extended tests.\n"); /* Grouping tests that differ from basic's. */ - + test_should_match = true; MATCH_SELF ("a)"); @@ -74,8 +74,8 @@ test_posix_extended () MATCH_SELF ("a{}"); MATCH_SELF ("a{-1"); MATCH_SELF ("a{-1}"); - MATCH_SELF ("a{0"); - MATCH_SELF ("a{0,"); + MATCH_SELF ("a{0"); + MATCH_SELF ("a{0,"); MATCH_SELF (concat ("a{", dup_max_plus_one)); MATCH_SELF (concat (concat ("a{", dup_max_plus_one), ",")); MATCH_SELF ("a{1,0"); @@ -83,7 +83,7 @@ test_posix_extended () MATCH_SELF ("a{0,1"); test_match ("[a{0,1}]", "}"); test_match ("a{1,3}{-1}", "aaa{-1}"); - test_match (concat ("a{1,3}{", dup_max_plus_one), + test_match (concat ("a{1,3}{", dup_max_plus_one), concat ("aaa{", dup_max_plus_one)); test_match ("a{1,3}{2,1}", "aaa{2,1}"); test_match ("a{1,3}{1,2", "aaa{1,2"); @@ -96,7 +96,7 @@ test_posix_extended () test_match ("a??", "a"); test_match ("a?*", "a"); test_match ("a?+", "a"); - + test_match ("a{2}?", ""); test_match ("a{2}?", "aa"); test_match ("a{2}+", "aa"); @@ -104,21 +104,21 @@ test_posix_extended () test_match ("a{1}?*", ""); test_match ("a{1}?*", "aa"); - - test_match ("(a?){0,3}b", "aaab"); - test_fastmap ("(a?){0,3}b", "ab", 0, 0); - test_match ("(a+){0,3}b", "b"); - test_fastmap ("(a+){0,3}b", "ab", 0, 0); + + test_match ("(a?){0,3}b", "aaab"); + test_fastmap ("(a?){0,3}b", "ab", 0, 0); + test_match ("(a+){0,3}b", "b"); + test_fastmap ("(a+){0,3}b", "ab", 0, 0); test_match ("(a+){0,3}b", "ab"); - test_fastmap ("(a+){0,3}b", "ab", 0, 0); - test_match ("(a+){1,3}b", "aaab"); + test_fastmap ("(a+){0,3}b", "ab", 0, 0); + test_match ("(a+){1,3}b", "aaab"); test_match ("(a?){1,3}b", "aaab"); test_match ("\\\\{1}", "\\"); /* Extended only. */ test_match ("(a?)?", "a"); test_match ("(a?b)?c", "abc"); - test_match ("(a+)*b", "b"); + test_match ("(a+)*b", "b"); /* Alternatives. */ test_match ("a|b", "a"); test_match ("a|b", "b"); @@ -132,7 +132,7 @@ test_posix_extended () test_match ("(a|b|c)", "c"); test_match ("(a|b|c)*", "abccba"); - + test_match ("(a(b*))|c", "a"); /* xx do registers. */ test_match ("(a(b*))|c", "ab"); test_match ("(a(b*))|c", "c"); @@ -140,7 +140,7 @@ test_posix_extended () test_fastmap ("(a+?*|b)", "ab", 0, 0); test_match ("(a+?*|b)", "b"); TEST_REGISTERS ("(a+?*|b)", "b", 0, 1, 0, 1, -1, -1); - + test_fastmap ("(a+?*|b)*", "ab", 0, 0); test_match ("(a+?*|b)*", "bb"); TEST_REGISTERS ("(a+?*|b)*", "bb", 0, 2, 1, 2, -1, -1); @@ -165,7 +165,7 @@ test_posix_extended () test_fastmap ("(a+?*|b)c", "abc", 0, 0); test_match ("(a+?*|b)c", "bc"); TEST_REGISTERS ("(a+?*|b)c", "bc", 0, 2, 0, 1, -1, -1); - + test_fastmap ("(a+?*|b)*c", "abc", 0, 0); test_match ("(a+?*|b)*c", "bbc"); TEST_REGISTERS ("(a+?*|b)*c", "bbc", 0, 3, 1, 2, -1, -1); @@ -189,12 +189,12 @@ test_posix_extended () test_fastmap ("((a{0,}\\b\\<)|b)", "ab", 0, 0); test_match ("((a{0,}\\b\\<)|b)", "b"); - TEST_REGISTERS ("((a{0,}\\b\\<)|b)", "b", + TEST_REGISTERS ("((a{0,}\\b\\<)|b)", "b", 0, 1, 0, 1, 0, 0); test_fastmap ("((a{0,}\\b\\<)|b)*", "ab", 0, 0); test_match ("((a{0,}\\b\\<)|b)*", "b"); - TEST_REGISTERS ("((a{0,}\\b\\<)|b)*", "b", + TEST_REGISTERS ("((a{0,}\\b\\<)|b)*", "b", 0, 1, 0, 1, 0, 0); test_fastmap ("((a+?*{0,1}\\b\\<)|b)", "ab", 0, 0); @@ -251,7 +251,7 @@ test_posix_extended () /* `*' after group. */ - test_match ("(a*|b*)*c", "c"); + test_match ("(a*|b*)*c", "c"); TEST_REGISTERS ("(a*|b*)*c", "c", 0, 1, 0, 0, -1, -1); test_match ("(a*|b*)*c", "ac"); @@ -279,8 +279,8 @@ test_posix_extended () test_match ("(a*|b*)c", "aac"); TEST_REGISTERS ("(a*|b*)c", "aac", 0, 3, 0, 2, -1, -1); - /* Same as above, but with no `*'s in alternatives. - + /* Same as above, but with no `*'s in alternatives. + test_match ("(a|b)*c", "c"); /* `*' after group. */ TEST_REGISTERS ("(a|b)*c", "c", 0, 1, -1, -1, -1, -1); @@ -298,7 +298,7 @@ test_posix_extended () TEST_REGISTERS ("(a*|b*)c", "bbc", 0, 3, 0, 2, -1, -1); /* Complicated second alternative. */ - + test_match ("(a*|(b*)*)*c", "bc"); TEST_REGISTERS ("(a*|(b*)*)*c", "bc", 0, 2, 0, 1, 0, 1); @@ -335,9 +335,9 @@ test_posix_extended () valid_pattern ("(^$)"); /* These are the same (but valid) as those (invalid) in other_test.c. */ - valid_pattern + valid_pattern ("(((((((((((((((((((((((((((((((((a^)))))))))))))))))))))))))))))))))"); - valid_pattern + valid_pattern ("((((((((((((((((((((((((((((((((($a)))))))))))))))))))))))))))))))))"); valid_pattern ("\\(^a\\)"); valid_pattern ("a\\|^b"); @@ -724,7 +724,7 @@ test_posix_extended () valid_pattern ("(^a)(b|^c)|^d"); valid_pattern ("(^a)(b|c^)|^d"); valid_pattern ("(^a)(b|c)^|^d"); - + valid_pattern ("(a)(b$|c$)d$"); valid_pattern ("(a)(b|$c)$|d$"); valid_pattern ("(a)($b|c)$|d$"); @@ -1003,11 +1003,11 @@ test_posix_extended () TEST_SEARCH ("^(a)(b|c)|^d", "abe", 0, 3); TEST_SEARCH ("^(a)(b|c)|^d", "ace", 0, 3); TEST_SEARCH ("^(a)(b|c)|^d", "df", 0, 2); - + TEST_SEARCH ("(^a)(b|c)|^d", "abe", 0, 3); TEST_SEARCH ("(^a)(b|c)|^d", "ace", 0, 3); TEST_SEARCH ("(^a)(b|c)|^d", "df", 0, 2); - + TEST_SEARCH ("(a)(b|c)$|d$", "fab", 0, 3); TEST_SEARCH ("(a)(b|c)$|d$", "fac", 0, 3); TEST_SEARCH ("(a)(b|c)$|d$", "fd", 0, 2); @@ -1027,11 +1027,11 @@ test_posix_extended () TEST_SEARCH ("^d|^(b|c)(a)", "df", 0, 2); TEST_SEARCH ("^d|^(b|c)(a)", "baf", 0, 3); TEST_SEARCH ("^d|^(b|c)(a)", "caf", 0, 3); - + TEST_SEARCH ("^d|(^b|^c)(a)", "df", 0, 2); TEST_SEARCH ("^d|(^b|^c)(a)", "baf", 0, 3); TEST_SEARCH ("^d|(^b|^c)(a)", "caf", 0, 3); - + TEST_SEARCH ("d$|(b|c)(a$)", "fd", 0, 2); TEST_SEARCH ("d$|(b|c)(a$)", "fba", 0, 3); TEST_SEARCH ("d$|(b|c)(a$)", "fca", 0, 3); @@ -1112,13 +1112,13 @@ test_posix_extended () test_match ("(fooq|foo)(qbarx|bar)", "fooqbarx"); /* Take first alternative that does the longest match. */ - test_all_registers ("(fooq|(foo)|(fo))((qbarx)|(oqbarx)|bar)", "fooqbarx", - "", 0, 8, 0, 3, 0, 3, -1, -1, 3, 8, 3, 8, -1, -1, -1, -1, -1, -1, + test_all_registers ("(fooq|(foo)|(fo))((qbarx)|(oqbarx)|bar)", "fooqbarx", + "", 0, 8, 0, 3, 0, 3, -1, -1, 3, 8, 3, 8, -1, -1, -1, -1, -1, -1, -1, -1); test_match ("(fooq|foo)*qbar", "fooqbar"); test_match ("(fooq|foo)*(qbar)", "fooqbar"); - test_match ("(fooq|foo)*(qbar)*", "fooqbar"); + test_match ("(fooq|foo)*(qbar)*", "fooqbar"); test_match ("(fooq|fo|o)*qbar", "fooqbar"); test_match ("(fooq|fo|o)*(qbar)", "fooqbar"); diff --git a/gnu/lib/libregex/test/psx-generic.c b/gnu/lib/libregex/test/psx-generic.c index 340e938..8e97f75 100644 --- a/gnu/lib/libregex/test/psx-generic.c +++ b/gnu/lib/libregex/test/psx-generic.c @@ -12,7 +12,7 @@ test_posix_generic () if (omit_generic_tests) return; /* Tests somewhat in the order of P1003.2. */ - + /* Both posix basic and extended; should match. */ printf ("\nStarting generic POSIX tests.\n"); @@ -29,12 +29,12 @@ test_posix_generic () TEST_REGISTERS ("", "", 0, 0, -1, -1, -1, -1); TEST_SEARCH ("", "", 0, 0); TEST_SEARCH_2 ("", "", "", 0, 1, 0); - - MATCH_SELF ("abc"); - test_fastmap ("abc", "a", 0, 0); + + MATCH_SELF ("abc"); + test_fastmap ("abc", "a", 0, 0); TEST_REGISTERS ("abc", "abc", 0, 3, -1, -1, -1, -1); TEST_REGISTERS ("abc", "xabcx", 1, 4, -1, -1, -1, -1); - + test_match ("\\a","a"); test_match ("\\0", "0"); @@ -44,7 +44,7 @@ test_posix_generic () TEST_SEARCH_2 ("a", "a", "b", 0, 2, 2); TEST_SEARCH_2 ("b", "a", "b", 0, 2, 2); TEST_SEARCH_2 ("a", "a", "b", 1, -2, 2); - + test_match ("\n", "\n"); test_match ("a\n", "a\n"); test_match ("\nb", "\nb"); @@ -55,8 +55,8 @@ test_posix_generic () test_match ("a*", "aa"); test_fastmap ("a*", "a", 0, 0); TEST_REGISTERS ("a*", "aa", 0, 2, -1, -1, -1, -1); - - test_match ("a*b", "aab"); + + test_match ("a*b", "aab"); test_fastmap ("a*b", "ab", 0, 0); test_match ("a*ab", "aab"); @@ -80,9 +80,9 @@ test_posix_generic () test_match (".", "a"); TEST_REGISTERS (".", "a", 0, 1, -1, -1, -1, -1); test_match (".", "\004"); - test_match (".", "\n"); + test_match (".", "\n"); /* Valid bracket expressions. */ - test_match ("[ab]", "a"); + test_match ("[ab]", "a"); test_match ("[ab]", "b"); test_fastmap ("[ab]", "ab", 0, 0); TEST_REGISTERS ("[ab]", "a", 0, 1, -1, -1, -1, -1); @@ -92,7 +92,7 @@ test_posix_generic () test_match ("[^ab]", "c"); test_match ("[^a]", "\n"); - test_match ("[a]*a", "aa"); + test_match ("[a]*a", "aa"); test_match ("[[]", "["); test_match ("[]]", "]"); @@ -115,12 +115,12 @@ test_posix_generic () /* Collating, noncollating, equivalence classes aren't - implemented yet. */ - + implemented yet. */ + /* Character classes. */ - test_match ("[:alpha:]", "p"); - test_match ("[[:alpha:]]", "a"); + test_match ("[:alpha:]", "p"); + test_match ("[[:alpha:]]", "a"); test_match ("[[:alpha:]]", "z"); test_match ("[[:alpha:]]", "A"); test_match ("[[:alpha:]]", "Z"); @@ -172,10 +172,10 @@ test_posix_generic () test_match ("[a-]", "-"); /* Last */ test_match ("[a-]", "a"); test_match ("[--@]", "@"); /* First and starting point. */ - + test_match ("[%--a]", "%"); /* Ending point. */ test_match ("[%--a]", "-"); /* Ditto. */ - + test_match ("[a%--]", "%"); /* Both ending point and last. */ test_match ("[a%--]", "-"); test_match ("[%--a]", "a"); /* Ending point only. */ @@ -186,29 +186,29 @@ test_posix_generic () test_match ("[)-+--/]", "/"); test_match ("[[:digit:]-]", "-"); /* Concatenation ????*/ - test_match ("[ab][cd]", "ac"); + test_match ("[ab][cd]", "ac"); test_fastmap ("[ab][cd]", "ab", 0, 0); TEST_REGISTERS ("[ab][cd]", "ad", 0, 2, -1, -1, -1, -1); TEST_REGISTERS ("[ab][cd]", "xadx", 1, 3, -1, -1, -1, -1); - + /* Valid expression anchoring. */ test_match ("^a", "a"); test_fastmap ("^a", "a", 0, 0); TEST_REGISTERS ("^a", "ax", 0, 1, -1, -1, -1, -1); - + test_match ("^", ""); TEST_REGISTERS ("^", "", 0, 0, -1, -1, -1, -1); test_match ("$", ""); TEST_REGISTERS ("$", "", 0, 0, -1, -1, -1, -1); - + test_match ("a$", "a"); test_fastmap ("a$", "a", 0, 0); TEST_REGISTERS ("a$", "xa", 1, 2, -1, -1, -1, -1); - + test_match ("^ab$", "ab"); test_fastmap ("^ab$", "a", 0, 0); TEST_REGISTERS ("^a$", "a", 0, 1, -1, -1, -1, -1); - + test_fastmap ("^$", "", 0, 0); test_match ("^$", ""); TEST_REGISTERS ("^$", "", 0, 0, -1, -1, -1, -1); @@ -221,7 +221,7 @@ test_posix_generic () /* Two strings. */ test_match_2 ("ab", "a", "b"); TEST_REGISTERS_2 ("ab", "a", "b", 0, 2, -1, -1, -1, -1); - + test_match_2 ("a", "", "a"); test_match_2 ("a", "a", ""); test_match_2 ("ab", "a", "b"); @@ -235,8 +235,8 @@ test_posix_generic () test_should_match = false; /* Ordinary characters. */ - test_match ("abc", "ab"); - + test_match ("abc", "ab"); + TEST_SEARCH ("c", "ab", 0, 2); TEST_SEARCH ("c", "ab", 0, 2); TEST_SEARCH ("c", "ab", 1, -2); @@ -257,8 +257,8 @@ test_posix_generic () /* Invalid period. */ test_match (".", ""); /* Invalid bracket expressions. */ - test_match ("[ab]", "c"); - test_match ("[^b]", "b"); + test_match ("[ab]", "c"); + test_match ("[^b]", "b"); test_match ("[^]]", "]"); invalid_pattern (REG_EBRACK, "["); @@ -267,7 +267,7 @@ test_posix_generic () invalid_pattern (REG_EBRACK, "[]"); invalid_pattern (REG_EBRACK, "[]a"); invalid_pattern (REG_EBRACK, "a[]a"); - + test_match ("[:alpha:]", "q"); /* Character classes. */ test_match ("[[:alpha:]]", "2"); @@ -288,10 +288,10 @@ test_posix_generic () invalid_pattern (REG_ECTYPE, "[[:a:]]"); invalid_pattern (REG_ECTYPE, "[[:alpo:]]"); invalid_pattern (REG_ECTYPE, "[[:a:]"); - + test_match ("[a-z]", "2"); /* Invalid ranges. */ - test_match ("[^-a]", "-"); - test_match ("[^a-]", "-"); + test_match ("[^-a]", "-"); + test_match ("[^a-]", "-"); test_match ("[)-+--/]", "."); invalid_pattern (REG_ERANGE, "[z-a]"); /* Empty */ invalid_pattern (REG_ERANGE, "[a--]"); /* Empty */ diff --git a/gnu/lib/libregex/test/psx-interf.c b/gnu/lib/libregex/test/psx-interf.c index 8312d5e..80498fb 100644 --- a/gnu/lib/libregex/test/psx-interf.c +++ b/gnu/lib/libregex/test/psx-interf.c @@ -7,7 +7,7 @@ #define ERROR_CODE_LENGTH 20 #define TEST_ERRBUF_SIZE 15 - + void test_compile (); @@ -64,50 +64,50 @@ init_pattern_buffer (pattern_buffer_ptr) void -test_compile (valid_pattern, error_code_expected, pattern, +test_compile (valid_pattern, error_code_expected, pattern, pattern_buffer_ptr, cflags) unsigned valid_pattern; int error_code_expected; const char *pattern; regex_t *pattern_buffer_ptr; int cflags; -{ +{ int error_code_returned; boolean error = false; char errbuf[TEST_ERRBUF_SIZE]; - + init_pattern_buffer (pattern_buffer_ptr); error_code_returned = regcomp (pattern_buffer_ptr, pattern, cflags); if (valid_pattern && error_code_returned) { printf ("\nShould have been a valid pattern but wasn't.\n"); - regerror (error_code_returned, pattern_buffer_ptr, errbuf, + regerror (error_code_returned, pattern_buffer_ptr, errbuf, TEST_ERRBUF_SIZE); printf ("%s", errbuf); error = true; } - + if (!valid_pattern && !error_code_returned) { printf ("\n\nInvalid pattern compiled as valid:\n"); error = true; } - + if (error_code_returned != error_code_expected) { char expected_error_string[ERROR_CODE_LENGTH]; char returned_error_string[ERROR_CODE_LENGTH]; - - get_error_string (error_code_expected, expected_error_string), + + get_error_string (error_code_expected, expected_error_string), get_error_string (error_code_returned, returned_error_string); - - printf (" Expected error code %s but got `%s'.\n", + + printf (" Expected error code %s but got `%s'.\n", expected_error_string, returned_error_string); error = true; } - + if (error) print_pattern_info (pattern, pattern_buffer_ptr); } @@ -121,7 +121,7 @@ test_nsub (sub_count, pattern, cflags) { regex_t pattern_buffer; - + test_compile (1, 0, pattern, &pattern_buffer, cflags); if (pattern_buffer.re_nsub != sub_count) @@ -132,7 +132,7 @@ instead.\n", sub_count, pattern_buffer.re_nsub); regfree (&pattern_buffer); } - + static void test_regcomp () @@ -140,9 +140,9 @@ test_regcomp () regex_t pattern_buffer; int cflags = 0; - + printf ("\nStarting regcomp tests.\n"); - + cflags = 0; test_compile (0, REG_ESUBREG, "\\(a\\)\\2", &pattern_buffer, cflags); test_compile (0, REG_EBRACE, "a\\{", &pattern_buffer, cflags); @@ -160,7 +160,7 @@ test_regcomp () test_nsub (1, "(a)", cflags); test_nsub (2, "((a))", cflags); test_nsub (2, "(a)(b)", cflags); - + cflags = REG_EXTENDED | REG_NOSUB; test_nsub (1, "(a)", cflags); @@ -197,13 +197,13 @@ test_pmatch (pattern, string, nmatch, pmatch, correct_pmatch, cflags) unsigned this_match; int error_code_returned; boolean found_nonmatch = false; - + test_compile (1, 0, pattern, &pattern_buffer, cflags); error_code_returned = regexec (&pattern_buffer, string, nmatch, pmatch, 0); - + if (error_code_returned == REG_NOMATCH) printf ("Matching failed in test_pmatch.\n"); - else + else { for (this_match = 0; this_match < nmatch; this_match++) { @@ -213,7 +213,7 @@ test_pmatch (pattern, string, nmatch, pmatch, correct_pmatch, cflags) printf ("\n"); printf ("Pmatch start %d wrong: was %d when should have \ -been %d.\n", this_match, pmatch[this_match].rm_so, +been %d.\n", this_match, pmatch[this_match].rm_so, correct_pmatch[this_match].rm_so); found_nonmatch = true; } @@ -223,7 +223,7 @@ been %d.\n", this_match, pmatch[this_match].rm_so, printf ("\n"); printf ("Pmatch end %d wrong: was %d when should have been \ -%d.\n", this_match, pmatch[this_match].rm_eo, +%d.\n", this_match, pmatch[this_match].rm_eo, correct_pmatch[this_match].rm_eo); found_nonmatch = true; } @@ -258,12 +258,12 @@ test_eflags (must_match_bol, must_match_eol, pattern, string, cflags, eflags) error_code_returned = regexec (&pattern_buffer, string, 0, 0, eflags); if (error_code_returned == REG_NOMATCH) - { + { /* If wasn't true that both 1) the anchored part of the pattern had to match this string and 2) this string was a proper substring... */ - if (!( (must_match_bol && (eflags & REG_NOTBOL)) + if (!( (must_match_bol && (eflags & REG_NOTBOL)) || (must_match_eol && (eflags & REG_NOTEOL)) )) { printf ("\nEflags test failed: didn't match when should have.\n"); @@ -271,7 +271,7 @@ test_eflags (must_match_bol, must_match_eol, pattern, string, cflags, eflags) } } else /* We got a match. */ - { + { /* If wasn't true that either 1) the anchored part of the pattern didn't have to match this string or 2) this string wasn't a proper substring... */ @@ -313,7 +313,7 @@ test_ignore_case (should_match, pattern, string, cflags) error_code_returned = regexec (&pattern_buffer, string, 0, 0, 0); if (should_match && error_code_returned == REG_NOMATCH) - { + { printf ("\nIgnore-case test failed:\n"); printf (" The string to match was: `%s'.\n", string); print_pattern_info (pattern, &pattern_buffer); @@ -340,7 +340,7 @@ test_newline (should_match, pattern, string, cflags) error_code_returned = regexec (&pattern_buffer, string, 0, 0, 0); if (should_match && error_code_returned == REG_NOMATCH) - { + { printf ("\nNewline test failed:\n"); printf (" The string to match was: `%s'.\n", string); print_pattern_info (pattern, &pattern_buffer); @@ -370,12 +370,12 @@ test_posix_match (should_match, pattern, string, cflags) error_code_returned = regexec (&pattern_buffer, string, 0, 0, 0); if (should_match && error_code_returned == REG_NOMATCH) - { + { printf ("\nShould have matched but didn't:\n"); was_error = true; } else if (!should_match && error_code_returned != REG_NOMATCH) - { + { printf ("\nShould not have matched but did:\n"); was_error = true; } @@ -397,23 +397,23 @@ test_regexec () regmatch_t correct_pmatch[3]; int cflags = 0; int eflags = 0; - + printf ("\nStarting regexec tests.\n"); cflags = REG_NOSUB; /* shouldn't look at any of pmatch. */ test_pmatch ("a", "a", 0, pmatch, correct_pmatch, cflags); - + /* Ask for less `pmatch'es than there are pattern subexpressions. (Shouldn't look at pmatch[2]. */ cflags = REG_EXTENDED; fill_pmatch (correct_pmatch, 0, 1, 0, 1, 100, 101); test_pmatch ("((a))", "a", 2, pmatch, correct_pmatch, cflags); - + /* Ask for same number of `pmatch'es as there are pattern subexpressions. */ cflags = REG_EXTENDED; fill_pmatch(correct_pmatch, 0, 1, 0, 1, -1, -1); test_pmatch ("(a)", "a", 2, pmatch, correct_pmatch, cflags); - + /* Ask for more `pmatch'es than there are pattern subexpressions. */ cflags = REG_EXTENDED; fill_pmatch (correct_pmatch, 0, 1, -1, -1, -1, -1); @@ -487,7 +487,7 @@ test_regexec () test_newline (true, "^a", "\na", cflags); test_newline (true, "a$", "a\n", cflags); - + /* Now test normal behavior. */ cflags = REG_EXTENDED; test_newline (true, "\n", "\n", cflags); @@ -508,11 +508,11 @@ test_regexec () /* Test that matches whole string only. */ cflags = 0; test_posix_match (true, "a", "a", cflags); - + /* Tests that match substrings. */ test_posix_match (true, "a", "ab", cflags); test_posix_match (true, "b", "ab", cflags); - + /* Test that doesn't match. */ test_posix_match (false, "a", "b", cflags); @@ -528,8 +528,8 @@ test_error_code_message (error_code, expected_error_message) char returned_error_message[TEST_ERRBUF_SIZE]; char error_code_string[ERROR_CODE_LENGTH]; size_t expected_error_message_length = strlen (expected_error_message) + 1; - size_t returned_error_message_length = regerror (error_code, 0, - returned_error_message, + size_t returned_error_message_length = regerror (error_code, 0, + returned_error_message, TEST_ERRBUF_SIZE); if (returned_error_message_length != expected_error_message_length) @@ -543,14 +543,14 @@ message `%s':\n", expected_error_message); expected_error_message_length, returned_error_message_length); } - if (strncmp (expected_error_message, returned_error_message, + if (strncmp (expected_error_message, returned_error_message, TEST_ERRBUF_SIZE - 1) != 0) { - - get_error_string (error_code, error_code_string), + + get_error_string (error_code, error_code_string), printf ("\n\n With error code %s (%d), expected error message:\n", error_code_string, error_code); - + printf (" `%s'\n", expected_error_message); printf (" but got:\n"); printf (" `%s'\n", returned_error_message); @@ -565,21 +565,21 @@ test_error_code_allocation (error_code, expected_error_message) { char *returned_error_message = NULL; char error_code_string[ERROR_CODE_LENGTH]; - size_t returned_error_message_length = regerror (error_code, 0, - returned_error_message, + size_t returned_error_message_length = regerror (error_code, 0, + returned_error_message, (size_t)0); returned_error_message = xmalloc (returned_error_message_length + 1); - - regerror (error_code, 0, returned_error_message, + + regerror (error_code, 0, returned_error_message, returned_error_message_length); - + if (strcmp (expected_error_message, returned_error_message) != 0) { - get_error_string (error_code, error_code_string), - - printf ("\n\n Testing error code allocation,\n"); - printf ("with error code %s (%d), expected error message:\n", + get_error_string (error_code, error_code_string), + + printf ("\n\n Testing error code allocation,\n"); + printf ("with error code %s (%d), expected error message:\n", error_code_string, error_code); printf (" `%s'\n", expected_error_message); printf (" but got:\n"); @@ -591,18 +591,18 @@ test_error_code_allocation (error_code, expected_error_message) static void test_regerror () { - test_error_code_message (REG_NOMATCH, "No match"); + test_error_code_message (REG_NOMATCH, "No match"); test_error_code_message (REG_BADPAT, "Invalid regular expression"); - test_error_code_message (REG_ECOLLATE, "Invalid collation character"); - test_error_code_message (REG_ECTYPE, "Invalid character class name"); - test_error_code_message (REG_EESCAPE, "Trailing backslash"); - test_error_code_message (REG_ESUBREG, "Invalid back reference"); - test_error_code_message (REG_EBRACK, "Unmatched [ or [^"); - test_error_code_message (REG_EPAREN, "Unmatched ( or \\("); - test_error_code_message (REG_EBRACE, "Unmatched \\{"); - test_error_code_message (REG_BADBR, "Invalid content of \\{\\}"); - test_error_code_message (REG_ERANGE, "Invalid range end"); - test_error_code_message (REG_ESPACE, "Memory exhausted"); + test_error_code_message (REG_ECOLLATE, "Invalid collation character"); + test_error_code_message (REG_ECTYPE, "Invalid character class name"); + test_error_code_message (REG_EESCAPE, "Trailing backslash"); + test_error_code_message (REG_ESUBREG, "Invalid back reference"); + test_error_code_message (REG_EBRACK, "Unmatched [ or [^"); + test_error_code_message (REG_EPAREN, "Unmatched ( or \\("); + test_error_code_message (REG_EBRACE, "Unmatched \\{"); + test_error_code_message (REG_BADBR, "Invalid content of \\{\\}"); + test_error_code_message (REG_ERANGE, "Invalid range end"); + test_error_code_message (REG_ESPACE, "Memory exhausted"); test_error_code_message (REG_BADRPT, "Invalid preceding regular expression"); test_error_code_message (REG_EEND, "Premature end of regular expression"); test_error_code_message (REG_ESIZE, "Regular expression too big"); @@ -615,10 +615,10 @@ test_posix_interface () { printf ("\nStarting POSIX interface tests.\n"); t = posix_interface_test; - + test_regcomp (); test_regexec (); test_regerror (); - + printf ("\nFinished POSIX interface tests.\n"); } diff --git a/gnu/lib/libregex/test/psx-interv.c b/gnu/lib/libregex/test/psx-interv.c index 6725c38..fcdf488 100644 --- a/gnu/lib/libregex/test/psx-interv.c +++ b/gnu/lib/libregex/test/psx-interv.c @@ -27,10 +27,10 @@ test_intervals () test_match (BRACES_TO_OPS ("a{1}"), "a"); test_match (BRACES_TO_OPS ("a{1,}"), "a"); - test_match (BRACES_TO_OPS ("a{1,}"), "aa"); + test_match (BRACES_TO_OPS ("a{1,}"), "aa"); test_match (BRACES_TO_OPS ("a{0,0}"), ""); test_match (BRACES_TO_OPS ("a{0,1}"), ""); - test_match (BRACES_TO_OPS ("a{0,1}"), "a"); + test_match (BRACES_TO_OPS ("a{0,1}"), "a"); test_match (BRACES_TO_OPS ("a{1,3}"), "a"); test_match (BRACES_TO_OPS ("a{1,3}"), "aa"); test_match (BRACES_TO_OPS ("a{1,3}"), "aaa"); @@ -68,7 +68,7 @@ test_intervals () test_match (BRACES_TO_OPS (PARENS_TO_OPS ("(a*){1,1}ab")), "aaaab"); TEST_REGISTERS (BRACES_TO_OPS (PARENS_TO_OPS ("(a*){1,1}ab")), "aaaab", 0, 5, 0, 3, -1, -1); - + test_match (BRACES_TO_OPS (".{0,3}b"), "b"); test_match (BRACES_TO_OPS (".{0,3}b"), "ab"); @@ -98,7 +98,7 @@ test_intervals () test_match (BRACES_TO_OPS ("a{1}*"), ""); test_match (BRACES_TO_OPS ("a{1}*"), "a"); test_match (BRACES_TO_OPS ("a{1}*"), "aa"); - + test_match (BRACES_TO_OPS ("a{1}{1}"), "a"); test_match (BRACES_TO_OPS ("a{1}{1}{1}"), "a"); @@ -108,25 +108,25 @@ test_intervals () test_match (BRACES_TO_OPS ("a{1}{1}*"), "a"); test_match (BRACES_TO_OPS ("a{1}{1}*"), "aa"); test_match (BRACES_TO_OPS ("a{1}{1}*"), "aaa"); - + test_match (BRACES_TO_OPS ("a{1}{2}"), "aa"); test_match (BRACES_TO_OPS ("a{2}{1}"), "aa"); test_should_match = false; - + test_match (BRACES_TO_OPS ("a{0}"), "a"); test_match (BRACES_TO_OPS ("a{0,}"), "b"); - test_match (BRACES_TO_OPS ("a{1}"), ""); + test_match (BRACES_TO_OPS ("a{1}"), ""); test_match (BRACES_TO_OPS ("a{1}"), "aa"); test_match (BRACES_TO_OPS ("a{1,}"), ""); test_match (BRACES_TO_OPS ("a{1,}"), "b"); - test_match (BRACES_TO_OPS ("a{0,0}"), "a"); + test_match (BRACES_TO_OPS ("a{0,0}"), "a"); test_match (BRACES_TO_OPS ("a{0,1}"), "aa"); test_match (BRACES_TO_OPS ("a{0,1}"), "b"); - test_match (BRACES_TO_OPS ("a{1,3}"), ""); + test_match (BRACES_TO_OPS ("a{1,3}"), ""); test_match (BRACES_TO_OPS ("a{1,3}"), "aaaa"); - test_match (BRACES_TO_OPS ("a{1,3}"), "b"); + test_match (BRACES_TO_OPS ("a{1,3}"), "b"); test_match (BRACES_TO_OPS (PARENS_TO_OPS ("(a){1,3}b")), "aaaab"); test_match (BRACES_TO_OPS (PARENS_TO_OPS ("(a*){1,3}b")), "bb"); test_match (BRACES_TO_OPS ("[a]{0,3}"), "aaaa"); diff --git a/gnu/lib/libregex/test/test.c b/gnu/lib/libregex/test/test.c index a8de23e..74b43b2 100644 --- a/gnu/lib/libregex/test/test.c +++ b/gnu/lib/libregex/test/test.c @@ -55,32 +55,32 @@ boolean test_should_match; static void -set_all_registers (start0, end0, start1, end1, +set_all_registers (start0, end0, start1, end1, start2, end2, start3, end3, - start4, end4, start5, end5, + start4, end4, start5, end5, start6, end6, start7, end7, start8, end8, start9, end9, regs) - int start0; int end0; int start1; int end1; + int start0; int end0; int start1; int end1; int start2; int end2; int start3; int end3; - int start4; int end4; int start5; int end5; + int start4; int end4; int start5; int end5; int start6; int end6; int start7; int end7; - int start8; int end8; int start9; int end9; + int start8; int end8; int start9; int end9; struct re_registers *regs; { unsigned r; - - regs->start[0] = start0; regs->end[0] = end0; - regs->start[1] = start1; regs->end[1] = end1; - regs->start[2] = start2; regs->end[2] = end2; - regs->start[3] = start3; regs->end[3] = end3; - regs->start[4] = start4; regs->end[4] = end4; - regs->start[5] = start5; regs->end[5] = end5; - regs->start[6] = start6; regs->end[6] = end6; - regs->start[7] = start7; regs->end[7] = end7; - regs->start[8] = start8; regs->end[8] = end8; - regs->start[9] = start9; regs->end[9] = end9; + + regs->start[0] = start0; regs->end[0] = end0; + regs->start[1] = start1; regs->end[1] = end1; + regs->start[2] = start2; regs->end[2] = end2; + regs->start[3] = start3; regs->end[3] = end3; + regs->start[4] = start4; regs->end[4] = end4; + regs->start[5] = start5; regs->end[5] = end5; + regs->start[6] = start6; regs->end[6] = end6; + regs->start[7] = start7; regs->end[7] = end7; + regs->start[8] = start8; regs->end[8] = end8; + regs->start[9] = start9; regs->end[9] = end9; for (r = 10; r < regs->num_regs; r++) { regs->start[r] = -1; @@ -111,16 +111,16 @@ concat (s1, s2) /* We ignore the `can_be_null' argument. Should just be removed. */ -void +void general_test (pattern_should_be_valid, match_whole_string, pat, str1, str2, start, range, end, correct_fastmap, correct_regs, can_be_null) - unsigned pattern_should_be_valid; + unsigned pattern_should_be_valid; unsigned match_whole_string; const char *pat; char *str1, *str2; - int start, range, end; - char *correct_fastmap; + int start, range, end; + char *correct_fastmap; struct re_registers *correct_regs; int can_be_null; { @@ -138,8 +138,8 @@ general_test (pattern_should_be_valid, match_whole_string, unsigned invalid_pattern = 0; boolean internal_error_1 = false; boolean internal_error_2 = false; - - + + nonconst_buf.allocated = 8; nonconst_buf.buffer = xmalloc (nonconst_buf.allocated); nonconst_buf.fastmap = fastmap; @@ -147,7 +147,7 @@ general_test (pattern_should_be_valid, match_whole_string, assert (pat != NULL); r = re_compile_pattern (pat, strlen (pat), &nonconst_buf); - + /* Kludge: if we are doing POSIX testing, we really should have called regcomp, not re_compile_pattern. As it happens, the only way in which it matters is that re_compile_pattern sets the @@ -156,7 +156,7 @@ general_test (pattern_should_be_valid, match_whole_string, matching. */ if (t == posix_basic_test || t == posix_extended_test) nonconst_buf.newline_anchor = 0; - + invalid_pattern = r != NULL; if (!r) @@ -168,27 +168,27 @@ general_test (pattern_should_be_valid, match_whole_string, else { fastmap_internal_error = (re_compile_fastmap (&nonconst_buf) == -2); - + if (correct_fastmap) - nonconst_buf.fastmap_accurate = + nonconst_buf.fastmap_accurate = memcmp (nonconst_buf.fastmap, correct_fastmap, 1 << BYTEWIDTH) == 0; - + if (OK_TO_SEARCH) { old_buf = nonconst_buf; old_buf.buffer = (unsigned char *) xmalloc (nonconst_buf.used); memcpy (old_buf.buffer, nonconst_buf.buffer, nonconst_buf.used); - + /* If only one string is null, call re_match or re_search, - which is what the user would probably do. */ + which is what the user would probably do. */ if (str1 == NULL && str2 != NULL || str2 == NULL && str1 != NULL) { char *the_str = str1 == NULL ? str2 : str1; - + match_1 - = match_whole_string + = match_whole_string ? (r = re_match (&nonconst_buf, the_str, strlen (the_str), start, ®s)) == strlen (the_str) @@ -200,16 +200,16 @@ general_test (pattern_should_be_valid, match_whole_string, if (r == -2) internal_error_1 = true; } - else + else match_1 = 1; - + /* Also call with re_match_2 or re_search_2, as they might do this. (Also can check calling with either string1 or string2 or both null.) */ if (match_whole_string) { r = re_match_2 (&nonconst_buf, - str1, SAFE_STRLEN (str1), + str1, SAFE_STRLEN (str1), str2, SAFE_STRLEN (str2), start, ®s, end); match_2 = r == SAFE_STRLEN (str1) + SAFE_STRLEN (str2); @@ -217,7 +217,7 @@ general_test (pattern_should_be_valid, match_whole_string, else { r = re_search_2 (&nonconst_buf, - str1, SAFE_STRLEN (str1), + str1, SAFE_STRLEN (str1), str2, SAFE_STRLEN (str2), start, range, ®s, end); match_2 = r >= 0; @@ -225,16 +225,16 @@ general_test (pattern_should_be_valid, match_whole_string, if (r == -2) internal_error_2 = true; - + match = match_1 & match_2; - + if (correct_regs) { unsigned reg; if (regs_correct != NULL) free (regs_correct); - - regs_correct + + regs_correct = (unsigned *) xmalloc (regs.num_regs * sizeof (unsigned)); for (reg = 0; @@ -256,9 +256,9 @@ general_test (pattern_should_be_valid, match_whole_string, || (regs.start[reg] == -1 && regs.end[reg] == -1 && correct_regs->start[reg] == correct_regs->end[reg]) -#endif +#endif ; - + all_regs_correct &= regs_correct[reg]; } } @@ -268,15 +268,15 @@ general_test (pattern_should_be_valid, match_whole_string, if (fastmap_internal_error) printf ("\n\nInternal error in re_compile_fastmap:"); - + if (internal_error_1) { if (!fastmap_internal_error) printf ("\n"); - + printf ("\nInternal error in re_match or re_search:"); } - + if (internal_error_2) { if (!internal_error_1) @@ -285,11 +285,11 @@ general_test (pattern_should_be_valid, match_whole_string, printf ("\nInternal error in re_match_2 or re_search_2:"); } - if ((OK_TO_SEARCH && ((match && !test_should_match) + if ((OK_TO_SEARCH && ((match && !test_should_match) || (!match && test_should_match)) || (correct_regs && !all_regs_correct)) || !nonconst_buf.fastmap_accurate - || invalid_pattern + || invalid_pattern || !pattern_should_be_valid || internal_error_1 || internal_error_2 || verbose) @@ -324,8 +324,8 @@ general_test (pattern_should_be_valid, match_whole_string, if ((!(invalid_pattern && !pattern_should_be_valid)) || verbose) printf (" Pattern: `%s'.\n", pat); - - if (pattern_should_be_valid || verbose + + if (pattern_should_be_valid || verbose || internal_error_1 || internal_error_2) { printf(" Strings: "); @@ -335,7 +335,7 @@ general_test (pattern_should_be_valid, match_whole_string, if ((OK_TO_SEARCH || verbose || internal_error_1 || internal_error_2) && !invalid_pattern) { - if (memcmp (old_buf.buffer, nonconst_buf.buffer, + if (memcmp (old_buf.buffer, nonconst_buf.buffer, nonconst_buf.used) != 0 && !invalid_pattern) { @@ -346,16 +346,16 @@ general_test (pattern_should_be_valid, match_whole_string, } else printf ("\n Compiled pattern: "); - + print_compiled_pattern (&nonconst_buf); } if (correct_fastmap && (!nonconst_buf.fastmap_accurate || verbose)) { - printf ("\n The fastmap should have been: "); + printf ("\n The fastmap should have been: "); print_fastmap (correct_fastmap); - printf ("\n Fastmap: "); + printf ("\n Fastmap: "); print_fastmap (fastmap); printf ("\n Compiled pattern before matching: "); @@ -366,25 +366,25 @@ general_test (pattern_should_be_valid, match_whole_string, { unsigned this_reg; printf ("\n Incorrect registers:"); - + for (this_reg = 0; this_reg < regs.num_regs; this_reg++) { if (!regs_correct[this_reg]) { printf ("\n Register %d's start was %2d. ", this_reg, regs.start[this_reg]); - printf ("\tIt should have been %d.\n", + printf ("\tIt should have been %d.\n", correct_regs->start[this_reg]); printf (" Register %d's end was %2d. ", this_reg, regs.end[this_reg]); - printf ("\tIt should have been %d.\n", + printf ("\tIt should have been %d.\n", correct_regs->end[this_reg]); } } } } } - + if (nonconst_buf.buffer != NULL) free (nonconst_buf.buffer); @@ -396,7 +396,7 @@ general_test (pattern_should_be_valid, match_whole_string, free (regs_correct); } - + nonconst_buf.buffer = old_buf.buffer = NULL; regs_correct = NULL; regs.start = regs.end = NULL; @@ -419,17 +419,17 @@ test_search_return (match_start_wanted, pattern, string) num_times_called++; buf.allocated = 1; buf.buffer = xmalloc (buf.allocated); - + assert (pattern != NULL); buf.translate = 0; compile_return = re_compile_pattern (pattern, strlen (pattern), &buf); - + if (compile_return) { printf ("\n\nInvalid pattern in test_match_start:\n"); printf ("%s\n", compile_return); } - else + else { buf.fastmap = fastmap; match_start = re_search (&buf, string, strlen (string), @@ -453,8 +453,8 @@ test_search_return (match_start_wanted, pattern, string) for (this_char = 0; this_char < strlen (fastmap_string); this_char++)\ correct_fastmap[fastmap_string[this_char]] = !invert; \ correct_fastmap['\n'] = match_newline; \ - } - + } + void test_fastmap (pat, fastmap_string, invert, match_newline) @@ -463,7 +463,7 @@ test_fastmap (pat, fastmap_string, invert, match_newline) unsigned invert; unsigned match_newline; { - char correct_fastmap[(1 << BYTEWIDTH)]; + char correct_fastmap[(1 << BYTEWIDTH)]; SET_FASTMAP (); general_test (1, 0, pat, NULL, NULL, -1, 0, -1, correct_fastmap, 0, -1); @@ -471,25 +471,25 @@ test_fastmap (pat, fastmap_string, invert, match_newline) void -test_fastmap_search (pat, str, fastmap_string, invert, match_newline, +test_fastmap_search (pat, str, fastmap_string, invert, match_newline, can_be_null, start0, end0) - const char *pat; - char *str; + const char *pat; + char *str; char *fastmap_string; - unsigned invert; - unsigned match_newline; - int can_be_null; - int start0; + unsigned invert; + unsigned match_newline; + int can_be_null; + int start0; int end0; { - char correct_fastmap[(1 << BYTEWIDTH)]; + char correct_fastmap[(1 << BYTEWIDTH)]; struct re_registers correct_regs; correct_regs.num_regs = RE_NREGS; correct_regs.start = (int *) xmalloc (RE_NREGS * sizeof (int)); correct_regs.end = (int *) xmalloc (RE_NREGS * sizeof (int)); - - set_all_registers (start0, end0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + + set_all_registers (start0, end0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, &correct_regs); SET_FASTMAP (); general_test (1, 0, pat, str, NULL, 0, SAFE_STRLEN (str), SAFE_STRLEN (str), @@ -503,34 +503,34 @@ test_fastmap_search (pat, str, fastmap_string, invert, match_newline, void -test_all_registers (pat, str1, str2, - start0, end0, start1, end1, - start2, end2, start3, end3, - start4, end4, start5, end5, - start6, end6, start7, end7, +test_all_registers (pat, str1, str2, + start0, end0, start1, end1, + start2, end2, start3, end3, + start4, end4, start5, end5, + start6, end6, start7, end7, start8, end8, start9, end9) - char *pat; char *str1; char *str2; - int start0; int end0; int start1; int end1; - int start2; int end2; int start3; int end3; - int start4; int end4; int start5; int end5; - int start6; int end6; int start7; int end7; + char *pat; char *str1; char *str2; + int start0; int end0; int start1; int end1; + int start2; int end2; int start3; int end3; + int start4; int end4; int start5; int end5; + int start6; int end6; int start7; int end7; int start8; int end8; int start9; int end9; { struct re_registers correct_regs; - + if (omit_register_tests) return; - + correct_regs.num_regs = RE_NREGS; correct_regs.start = (int *) xmalloc (RE_NREGS * sizeof (int)); correct_regs.end = (int *) xmalloc (RE_NREGS * sizeof (int)); - set_all_registers (start0, end0, start1, end1, start2, end2, start3, end3, - start4, end4, start5, end5, start6, end6, start7, end7, + set_all_registers (start0, end0, start1, end1, start2, end2, start3, end3, + start4, end4, start5, end5, start6, end6, start7, end7, start8, end8, start9, end9, &correct_regs); - general_test (1, 0, pat, str1, str2, 0, - SAFE_STRLEN (str1) + SAFE_STRLEN (str2), - SAFE_STRLEN (str1) + SAFE_STRLEN (str2), + general_test (1, 0, pat, str1, str2, 0, + SAFE_STRLEN (str1) + SAFE_STRLEN (str2), + SAFE_STRLEN (str1) + SAFE_STRLEN (str2), NULL, &correct_regs, -1); free (correct_regs.start); @@ -547,8 +547,8 @@ invalid_pattern (error_code_expected, pattern) int cflags = re_syntax_options == RE_SYNTAX_POSIX_EXTENDED || re_syntax_options == RE_SYNTAX_POSIX_MINIMAL_EXTENDED - ? REG_EXTENDED : 0; - + ? REG_EXTENDED : 0; + test_compile (0, error_code_expected, pattern, &pattern_buffer, cflags); } @@ -561,8 +561,8 @@ valid_pattern (pattern) int cflags = re_syntax_options == RE_SYNTAX_POSIX_EXTENDED || re_syntax_options == RE_SYNTAX_POSIX_MINIMAL_EXTENDED - ? REG_EXTENDED : 0; - + ? REG_EXTENDED : 0; + test_compile (1, 0, pattern, &pattern_buffer, cflags); } @@ -578,7 +578,7 @@ delimiters_to_ops (source, left_delimiter, right_delimiter) boolean double_size = false; unsigned source_char; unsigned answer_char = 0; - + assert (source != NULL); switch (left_delimiter) @@ -608,7 +608,7 @@ delimiters_to_ops (source, left_delimiter, right_delimiter) answer = NULL; } - answer = (char *) xmalloc ((double_size + answer = (char *) xmalloc ((double_size ? strlen (source) << 1 : strlen (source)) + 1); @@ -618,7 +618,7 @@ delimiters_to_ops (source, left_delimiter, right_delimiter) { for (source_char = 0; source_char < strlen (source); source_char++) { - if (source[source_char] == left_delimiter + if (source[source_char] == left_delimiter || source[source_char] == right_delimiter) answer[answer_char++] = '\\'; @@ -626,14 +626,14 @@ delimiters_to_ops (source, left_delimiter, right_delimiter) } answer[answer_char] = 0; } - + return answer; } void print_pattern_info (pattern, pattern_buffer_ptr) - const char *pattern; + const char *pattern; regex_t *pattern_buffer_ptr; { printf (" Pattern: `%s'.\n", pattern); @@ -647,13 +647,13 @@ valid_nonposix_pattern (pattern) char *pattern; { struct re_pattern_buffer nonconst_buf; - + nonconst_buf.allocated = 0; nonconst_buf.buffer = NULL; nonconst_buf.translate = NULL; - + assert (pattern != NULL); - + if (re_compile_pattern (pattern, strlen (pattern), &nonconst_buf)) { printf ("Couldn't compile the pattern.\n"); @@ -667,13 +667,13 @@ compile_and_print_pattern (pattern) char *pattern; { struct re_pattern_buffer nonconst_buf; - + nonconst_buf.allocated = 0; nonconst_buf.buffer = NULL; - + if (re_compile_pattern (pattern, strlen (pattern), &nonconst_buf)) printf ("Couldn't compile the pattern.\n"); - + print_pattern_info (pattern, &nonconst_buf); } @@ -691,7 +691,7 @@ test_case_fold (pattern, string) assert (pattern != NULL); ret = re_compile_pattern (pattern, strlen (pattern), &nonconst_buf); - + if (ret) { printf ("\nShould have been a valid pattern but wasn't.\n"); @@ -699,8 +699,8 @@ test_case_fold (pattern, string) } else { - if (test_should_match - && re_match (&nonconst_buf, string, strlen (string), 0, 0) + if (test_should_match + && re_match (&nonconst_buf, string, strlen (string), 0, 0) != strlen (string)) { printf ("Match failed for case fold.\n"); @@ -727,7 +727,7 @@ test_match_n_times (n, pattern, string) buf.translate = 0; assert (pattern != NULL); - + r = re_compile_pattern (pattern, strlen (pattern), &buf); if (r) { @@ -738,14 +738,14 @@ test_match_n_times (n, pattern, string) { for (this_match = 1; this_match <= n; this_match++) match = (re_match (&buf, string, strlen (string), - 0, 0) + 0, 0) == strlen (string)); if (match && !test_should_match) printf ("\n\nMatched but shouldn't have:\n"); else if (!match && test_should_match) printf ("\n\nDidn't match but should have:\n"); - + if ((match && !test_should_match) || (!match && test_should_match)) { printf(" The string to match was: "); @@ -753,7 +753,7 @@ test_match_n_times (n, pattern, string) printf ("`%s' and ", string); else printf ("`'"); - + printf (" Pattern: %s.\n", pattern); printf (" Compiled pattern: %s.\n", pattern); print_compiled_pattern (&buf); @@ -762,17 +762,17 @@ test_match_n_times (n, pattern, string) } -void +void test_match_2 (pat, str1, str2) - const char *pat; - char *str1; + const char *pat; + char *str1; char *str2; { general_test (1, 1, pat, str1, str2, 0, 1, SAFE_STRLEN (str1) + SAFE_STRLEN (str2), NULL, 0, -1); } -void +void test_match (pat, str) const char *pat; char *str; diff --git a/gnu/lib/libregex/test/test.h b/gnu/lib/libregex/test/test.h index fb67126..e367c93 100644 --- a/gnu/lib/libregex/test/test.h +++ b/gnu/lib/libregex/test/test.h @@ -39,21 +39,21 @@ extern test_type t; extern char *concat (char *, char *); -extern void general_test (unsigned pattern_should_be_valid, +extern void general_test (unsigned pattern_should_be_valid, unsigned match_whole_string, const char *pat, char *str1, char *str2, - int start, int range, int end, - char *correct_fastmap, + int start, int range, int end, + char *correct_fastmap, struct re_registers *correct_regs, int can_be_null); extern void init_pattern_buffer (regex_t *pattern_buffer_ptr); -extern void test_compile (unsigned valid_pattern, int error_code_expected, +extern void test_compile (unsigned valid_pattern, int error_code_expected, const char *pattern, regex_t *pattern_buffer_ptr, int cflags); -extern char *delimiter_to_ops (char *source, char left_delimiter, +extern char *delimiter_to_ops (char *source, char left_delimiter, char right_delimiter); @@ -61,18 +61,18 @@ extern void test_search_return (int, const char *, char *); extern void test_berk_search (const char *pattern, char *string); -extern void test_fastmap (const char *pat, char *fastmap_string, unsigned invert, +extern void test_fastmap (const char *pat, char *fastmap_string, unsigned invert, unsigned match_newline); extern void test_fastmap_search (const char *pat, char *str, char *fastmap_string, - unsigned invert, unsigned match_newline, + unsigned invert, unsigned match_newline, int can_be_null, int start0, int end0); -extern void test_all_registers (char *pat, char *str1, char *str2, - int start0, int end0, int start1, int end1, - int start2, int end2, int start3, int end3, - int start4, int end4, int start5, int end5, - int start6, int end6, int start7, int end7, +extern void test_all_registers (char *pat, char *str1, char *str2, + int start0, int end0, int start1, int end1, + int start2, int end2, int start3, int end3, + int start4, int end4, int start5, int end5, + int start6, int end6, int start7, int end7, int start8, int end8, int start9, int end9); extern void print_pattern_info (const char *pattern, regex_t *pattern_buffer_ptr); diff --git a/gnu/lib/libregex/test/tregress.c b/gnu/lib/libregex/test/tregress.c index 7858cac..b6aa560 100644 --- a/gnu/lib/libregex/test/tregress.c +++ b/gnu/lib/libregex/test/tregress.c @@ -11,7 +11,7 @@ itoa (i) int i; { char *a = xmalloc (21); /* sign + 19 digits (enough for 64 bits) + null */ - + sprintf (a, "%d", i); return a; } @@ -29,7 +29,7 @@ simple_fail (routine, pat, buf, str, ret) if (str && *str) fprintf (stderr, " String = %s\n", str); fprintf (stderr, " Pattern = %s\n", pat); print_compiled_pattern (buf); - + if (pause_at_error) { fprintf (stderr, "RET to continue: "); @@ -46,7 +46,7 @@ simple_compile (pat, buf) struct re_pattern_buffer *buf; { const char *ret = re_compile_pattern (pat, strlen (pat), buf); - + if (ret != NULL) simple_fail ("compile", pat, buf, NULL, ret); } @@ -58,13 +58,13 @@ simple_fastmap (pat) struct re_pattern_buffer buf; char fastmap[256]; int ret; - + buf.allocated = 0; buf.buffer = buf.translate = NULL; buf.fastmap = fastmap; - + simple_compile (pat, &buf); - + ret = re_compile_fastmap (&buf); if (ret != 0) simple_fail ("fastmap compile", pat, &buf, NULL, itoa (ret)); @@ -85,13 +85,13 @@ do_match (pat, str, expected) buf.allocated = 0; buf.buffer = buf.translate = buf.fastmap = NULL; - + simple_compile (pat, &buf); len = strlen (str); - + ret = re_match_2 (&buf, NULL, 0, str, len, 0, NULL, len); - + if (ret != expected) simple_fail ("match", pat, &buf, str, itoa (ret)); } @@ -107,13 +107,13 @@ simple_search (pat, str, correct_startpos) buf.allocated = 0; buf.buffer = buf.translate = buf.fastmap = NULL; - + simple_compile (pat, &buf); len = strlen (str); - + ret = re_search_2 (&buf, NULL, 0, str, len, 0, len, NULL, len); - + if (ret != correct_startpos) simple_fail ("match", pat, &buf, str, itoa (ret)); } @@ -128,8 +128,8 @@ test_regress () unsigned len; struct re_registers regs; int ret; - char *fastmap = xmalloc (256); - + char *fastmap = xmalloc (256); + buf.translate = NULL; buf.fastmap = NULL; buf.allocated = 0; @@ -145,10 +145,10 @@ test_regress () buf.translate = upcase; SIMPLE_MATCH ("[A-[]", "A"); buf.translate = NULL; - + /* meyering@cs.utexas.edu Nov 6 22:34:41 1992 */ simple_search ("\\w+", "a", 0); - + /* jimb@occs.cs.oberlin.edu 10 Sep 92 00:42:33 */ buf.translate = upcase; SIMPLE_MATCH ("[\001-\377]", "\001"); @@ -158,13 +158,13 @@ test_regress () /* mike@skinner.cs.uoregon.edu 1 Sep 92 01:45:22 */ SIMPLE_MATCH ("^^$", "^"); - + /* pclink@qld.tne.oz.au Sep 7 22:42:36 1992 */ re_set_syntax (RE_INTERVALS); SIMPLE_MATCH ("^a\\{3\\}$", "aaa"); SIMPLE_NONMATCH ("^a\\{3\\}$", "aa"); re_set_syntax (RE_SYNTAX_EMACS); - + /* pclink@qld.tne.oz.au, 31 Aug 92. (conjecture) */ re_set_syntax (RE_INTERVALS); simple_search ("a\\{1,3\\}b", "aaab", 0); @@ -173,14 +173,14 @@ test_regress () /* trq@dionysos.thphys.ox.ac.uk, 31 Aug 92. (simplified) */ simple_fastmap ("^.*\n[ ]*"); - + /* wind!greg@plains.NoDak.edu, 25 Aug 92. (simplified) */ re_set_syntax (RE_INTERVALS); SIMPLE_MATCH ("[a-zA-Z]*.\\{5\\}", "xN0000"); SIMPLE_MATCH ("[a-zA-Z]*.\\{5\\}$", "systemxN0000"); SIMPLE_MATCH ("\\([a-zA-Z]*\\).\\{5\\}$", "systemxN0000"); re_set_syntax (RE_SYNTAX_EMACS); - + /* jimb, 18 Aug 92. Don't use \000, so `strlen' (in our testing routines) will work. (This still tickles the bug jimb reported.) */ SIMPLE_MATCH ("[\001-\377]", "\001"); @@ -307,7 +307,7 @@ test_regress () /* jla's bug (with string-match), 5 Feb 92. */ TEST_SEARCH ("\\`[ \t\n]*", "jla@challenger (Joseph Arceneaux)", 0, 100); - + /* jwz@lucid.com, 8 March 1992 (re-search-forward). (His is the second.) These are not supposed to match. */ #if 0 @@ -335,7 +335,7 @@ References: <9203080736.AA05869@thalidomide.lucid>\n\ <9203081900.AA24794@titanic.lucid>", 0, 5000); #endif /* 0 [failed searches] */ - + /* macrakis' bugs. */ buf.translate = upcase; /* message of 24 Jan 91 */ if (re_compile_pattern ("[!-`]", 5, &buf) != NULL) @@ -355,7 +355,7 @@ References: <9203080736.AA05869@thalidomide.lucid>\n\ printf ("faofdx test, reg #1 wrong.\n"); if (regs.start[2] != 1 || regs.end[2] != 2) printf ("faofdx test, reg #2 wrong.\n"); - + TEST_REGISTERS ("\\(a\\)*a", "aaa", 0, 3, 1, 2, -1, -1); test_fastmap ("^\\([^ \n]+:\n\\)+\\([^ \n]+:\\)", " \n", 1, 0); @@ -412,7 +412,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:"); /* Dave G. bug: Reference to a subexpression which didn't match. Should fail. */ re_set_syntax (RE_NO_BK_PARENS | RE_NO_BK_VBAR); - test_match ("(ooooooooooone())-annnnnnnnnnnd-(twooooooooooo\\2)", + test_match ("(ooooooooooone())-annnnnnnnnnnd-(twooooooooooo\\2)", "ooooooooooone-annnnnnnnnnnd-twooooooooooo"); test_match ("(o|t)", "o"); test_match ("(o()|t)", "o"); @@ -424,23 +424,23 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:"); test_match ("(o()|t())-a-(t\\2|f\\3)", "o-a-t"); test_match ("(o()|t())-a-(t\\2|f\\3)", "t-a-f"); - test_should_match = 0; + test_should_match = 0; test_match ("(foo(bar)|second)\\2", "second"); test_match ("(o()|t())-a-(t\\2|f\\3)", "t-a-t"); test_match ("(o()|t())-a-(t\\2|f\\3)", "o-a-f"); re_set_syntax (RE_SYNTAX_EMACS); test_match ("\\(foo\\(bar\\)\\|second\\)\\2", "secondbar"); - test_match ("\\(one\\(\\)\\|two\\(\\)\\)-and-\\(three\\2\\|four\\3\\)", + test_match ("\\(one\\(\\)\\|two\\(\\)\\)-and-\\(three\\2\\|four\\3\\)", "one-and-four"); - test_match ("\\(one\\(\\)\\|two\\(\\)\\)-and-\\(three\\2\\|four\\3\\)", + test_match ("\\(one\\(\\)\\|two\\(\\)\\)-and-\\(three\\2\\|four\\3\\)", "two-and-three"); - + test_should_match = 1; re_set_syntax (RE_SYNTAX_EMACS); - test_match ("\\(one\\(\\)\\|two\\(\\)\\)-and-\\(three\\2\\|four\\3\\)", + test_match ("\\(one\\(\\)\\|two\\(\\)\\)-and-\\(three\\2\\|four\\3\\)", "one-and-three"); - test_match ("\\(one\\(\\)\\|two\\(\\)\\)-and-\\(three\\2\\|four\\3\\)", + test_match ("\\(one\\(\\)\\|two\\(\\)\\)-and-\\(three\\2\\|four\\3\\)", "two-and-four"); TEST_REGISTERS (":\\(.*\\)", ":/", 0, 2, 1, 2, -1, -1); diff --git a/gnu/lib/libregex/test/upcase.c b/gnu/lib/libregex/test/upcase.c index 5147b81..a3c0fbc 100644 --- a/gnu/lib/libregex/test/upcase.c +++ b/gnu/lib/libregex/test/upcase.c @@ -1,7 +1,7 @@ /* Indexed by a character, gives the upper case equivalent of the character. */ -char upcase[0400] = +char upcase[0400] = { 000, 001, 002, 003, 004, 005, 006, 007, 010, 011, 012, 013, 014, 015, 016, 017, 020, 021, 022, 023, 024, 025, 026, 027, diff --git a/gnu/lib/libregex/test/xmalloc.c b/gnu/lib/libregex/test/xmalloc.c index 88be1a6..aa1c6c4 100644 --- a/gnu/lib/libregex/test/xmalloc.c +++ b/gnu/lib/libregex/test/xmalloc.c @@ -9,8 +9,8 @@ void * xmalloc (size) unsigned size; { - char *new_mem = malloc (size); - + char *new_mem = malloc (size); + if (new_mem == NULL) { fprintf (stderr, "xmalloc: request for %u bytes failed.\n", size); diff --git a/gnu/libexec/uucp/common_sources/chat.c b/gnu/libexec/uucp/common_sources/chat.c index 2fbea0a..f35e2e0 100644 --- a/gnu/libexec/uucp/common_sources/chat.c +++ b/gnu/libexec/uucp/common_sources/chat.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char chat_rcsid[] = "$Id: chat.c,v 1.42 1994/01/30 21:02:56 ian Rel $"; +const char chat_rcsid[] = "$Id: chat.c,v 1.2 1994/05/07 18:08:33 ache Exp $"; #endif #include <ctype.h> @@ -926,7 +926,7 @@ fcsend (qconn, puuconf, z, qsys, qdial, zphone, ftranslate, fstrip) break; #endif } - + if (fsend) { fquote = fcsend_debug (fquote, (size_t) 1, &bsend); @@ -1190,7 +1190,7 @@ fcprogram (qconn, puuconf, pzprogram, qsys, qdial, zphone, zport, ibaud) *pzarg = zbufcpy (*pz); continue; } - + *pzarg = NULL; zto = NULL; calc = 0; diff --git a/gnu/libexec/uucp/common_sources/conn.c b/gnu/libexec/uucp/common_sources/conn.c index 6598f10..f3ae8e4 100644 --- a/gnu/libexec/uucp/common_sources/conn.c +++ b/gnu/libexec/uucp/common_sources/conn.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char conn_rcsid[] = "$Id: conn.c,v 1.13 1994/03/24 01:41:02 ian Rel $"; +const char conn_rcsid[] = "$Id: conn.c,v 1.2 1994/05/07 18:08:38 ache Exp $"; #endif #include <ctype.h> @@ -234,7 +234,7 @@ fconn_dial (qconn, puuconf, qsys, zphone, qdialer, ptdialerfound) qdialer = &sdialer; if (ptdialerfound == NULL) ptdialerfound = &tfound; - + qdialer->uuconf_zname = NULL; *ptdialerfound = DIALERFOUND_FALSE; diff --git a/gnu/libexec/uucp/common_sources/getopt.h b/gnu/libexec/uucp/common_sources/getopt.h index 1a70e02..d9f87a5 100644 --- a/gnu/libexec/uucp/common_sources/getopt.h +++ b/gnu/libexec/uucp/common_sources/getopt.h @@ -5,12 +5,12 @@ under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. diff --git a/gnu/libexec/uucp/common_sources/log.c b/gnu/libexec/uucp/common_sources/log.c index 1544bc9..261163a 100644 --- a/gnu/libexec/uucp/common_sources/log.c +++ b/gnu/libexec/uucp/common_sources/log.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char log_rcsid[] = "$Id: log.c,v 1.54 1994/04/17 02:28:24 ian Rel $"; +const char log_rcsid[] = "$Id: log.c,v 1.2 1994/05/07 18:08:47 ache Exp $"; #endif #include <ctype.h> @@ -199,7 +199,7 @@ ulog_system (zsystem) { ubuffree (zLsystem); zLsystem = zbufcpy (zsystem); -#if HAVE_HDB_LOGGING +#if HAVE_HDB_LOGGING /* Under HDB logging we now must write to a different log file. */ ulog_close (); #endif /* HAVE_HDB_LOGGING */ @@ -331,7 +331,7 @@ ulog (ttype, zmsg, a, b, c, d, f, g, h, i, j) char *zlower; char *zfile; - /* We want to write to .Log/program/system, e.g. + /* We want to write to .Log/program/system, e.g. .Log/uucico/uunet. The system name may not be set. */ if (zLsystem == NULL) zsys = "ANY"; @@ -633,7 +633,7 @@ ustats (fsucceeded, zuser, zsystem, fsent, cbytes, csecs, cmicros, fmaster) { csecs += cmicros / 10000000L; cmicros = cmicros % 1000000L; - } + } /* On a system which can determine microseconds we might very well have both csecs == 0 and cmicros == 0. */ diff --git a/gnu/libexec/uucp/common_sources/tcp.c b/gnu/libexec/uucp/common_sources/tcp.c index 4efded9..161e5f9e 100644 --- a/gnu/libexec/uucp/common_sources/tcp.c +++ b/gnu/libexec/uucp/common_sources/tcp.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char tcp_rcsid[] = "$Id: tcp.c,v 1.34 1994/01/30 21:01:46 ian Rel $"; +const char tcp_rcsid[] = "$Id: tcp.c,v 1.2 1994/05/07 18:09:01 ache Exp $"; #endif #if HAVE_TCP @@ -308,7 +308,7 @@ ftcp_open (qconn, ibaud, fwait) ulog (LOG_ERROR, "fork: %s", strerror (errno)); _exit (EXIT_FAILURE); } - + if (ipid != 0) _exit (EXIT_SUCCESS); diff --git a/gnu/libexec/uucp/common_sources/tli.c b/gnu/libexec/uucp/common_sources/tli.c index c363998..db3491a 100644 --- a/gnu/libexec/uucp/common_sources/tli.c +++ b/gnu/libexec/uucp/common_sources/tli.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char tli_rcsid[] = "$Id: tli.c,v 1.15 1994/01/30 20:59:40 ian Rel $"; +const char tli_rcsid[] = "$Id: tli.c,v 1.2 1994/05/07 18:09:03 ache Exp $"; #endif #if HAVE_TLI @@ -147,7 +147,7 @@ ztlierror () if (t_errno < 0 || t_errno >= t_nerr) return "Unknown TLI error"; return t_errlist[t_errno]; -} +} /* Initialize a TLI connection. This may be called with qconn->qport NULL, when opening standard input as a TLI connection. */ @@ -230,7 +230,7 @@ ftli_push (qconn) qsysdep->ftli = FALSE; #endif /* defined (I_PUSH) */ - + return TRUE; } @@ -330,7 +330,7 @@ ftli_open (qconn, ibaud, fwait) zservaddr = qconn->qport->uuconf_u.uuconf_stli.uuconf_zservaddr; if (zservaddr == NULL) ulog (LOG_FATAL, "Can't run as TLI server; no server address"); - + zfreeaddr = zbufcpy (zservaddr); qtbind->addr.len = cescape (zfreeaddr); if (qtbind->addr.len > qtbind->addr.maxlen) @@ -364,7 +364,7 @@ ftli_open (qconn, ibaud, fwait) onew = t_open (zdevice, O_RDWR, (struct t_info *) NULL); if (onew < 0) ulog (LOG_FATAL, "t_open (%s): %s", zdevice, ztlierror ()); - + if (fcntl (onew, F_SETFD, fcntl (onew, F_GETFD, 0) | FD_CLOEXEC) < 0) ulog (LOG_FATAL, "fcntl (FD_CLOEXEC): %s", strerror (errno)); @@ -410,7 +410,7 @@ ftli_open (qconn, ibaud, fwait) ulog (LOG_ERROR, "fork: %s", strerror (errno)); _exit (EXIT_FAILURE); } - + if (ipid != 0) _exit (EXIT_SUCCESS); @@ -524,7 +524,7 @@ ftli_dial (qconn, puuconf, qsys, zphone, qdialer, ptdialerfound) pzdialer += 2; } } - + if (zaddr == NULL) { ulog (LOG_ERROR, "No address for TLI connection"); @@ -566,7 +566,7 @@ ftli_dial (qconn, puuconf, qsys, zphone, qdialer, ptdialerfound) /* We've connected to the remote. Push any desired modules. */ if (! ftli_push (qconn)) - return FALSE; + return FALSE; /* Handle the rest of the dialer sequence. */ if (pzdialer != NULL && *pzdialer != NULL) diff --git a/gnu/libexec/uucp/contrib/amiga.c b/gnu/libexec/uucp/contrib/amiga.c index d982364..ef2a5cb 100644 --- a/gnu/libexec/uucp/contrib/amiga.c +++ b/gnu/libexec/uucp/contrib/amiga.c @@ -1,10 +1,10 @@ /* Wrapper code for Taylor UUCP on Amiga Unix (SVR4) for cron invoked UUCP */ /* processes. */ -/* The problem: Cron is not a "licensed" process. any process that grabs a +/* The problem: Cron is not a "licensed" process. any process that grabs a controlling terminal needs to be licensed. Taylor UUCP needs controlling - terminals. Taylor UUCP does relinquish the controlling terminal before - fork(), so the "UUCP" license is appropriate. + terminals. Taylor UUCP does relinquish the controlling terminal before + fork(), so the "UUCP" license is appropriate. This simple program does the "right" thing, but *MUST* be SETUID ROOT */ /* Written by: Lawrence E. Rosenman <ler@lerami.lerctr.org> */ @@ -36,7 +36,7 @@ int main(int argc,char *argv[],char *envp) exit(1); } setgid(pw->pw_gid); /* set gid to uucp */ - setuid(pw->pw_uid); /* set uid to uucp */ + setuid(pw->pw_uid); /* set uid to uucp */ argv[0]=name; /* have PS not lie... */ execv("/usr/local/lib/uucp/uucico",argv); /* go to the real program */ exit(errno); diff --git a/gnu/libexec/uucp/contrib/dialHDB.c b/gnu/libexec/uucp/contrib/dialHDB.c index cb26621..8650ff0 100644 --- a/gnu/libexec/uucp/contrib/dialHDB.c +++ b/gnu/libexec/uucp/contrib/dialHDB.c @@ -86,7 +86,7 @@ main(int argc,char *argv[]) int child; /* pid of child process */ int stat; /* exit status of child process */ char *temp; /* used to get basename of dialer */ - + if(argc!=5) { fprintf(stderr,kUsage,argv[0],argv[0]); @@ -95,9 +95,9 @@ main(int argc,char *argv[]) dialerPath=argv[1]; dialerName= (temp=strrchr(argv[1],'/'))!=NULL ? temp+1 : argv[1]; - + parent=getpid(); - + signal(SIGUSR1,badExec); /* set up for possible failed exec */ if((child=fork())<0) @@ -111,7 +111,7 @@ main(int argc,char *argv[]) signal(SIGHUP,SIG_IGN); signal(SIGINT,SIG_IGN); signal(SIGTERM,SIG_IGN); - + wait(&stat); /* wait for child to exit */ exit(figureStat(stat)); /* figure out our exit code and die */ } @@ -125,7 +125,7 @@ main(int argc,char *argv[]) kill(parent,SIGUSR1); exit(0); } - } + } exit(0); } @@ -136,7 +136,7 @@ int figureStat(int stat) int exit; int errFlag; int error; - + if(WIFSIGNALED(stat)) /* determine if exit was from signal or what */ { fprintf(stderr,"Error: Dialer %s recieved signal %d.\n",dialerName, diff --git a/gnu/libexec/uucp/contrib/uurate.c b/gnu/libexec/uucp/contrib/uurate.c index 1ff9afb..c625d4b 100644 --- a/gnu/libexec/uucp/contrib/uurate.c +++ b/gnu/libexec/uucp/contrib/uurate.c @@ -44,7 +44,7 @@ * - redesigned the printed layout (sticked to those 80 column tubes). * - 'Retry time not ...' and ' ERROR: All matching ports ...' will now be * counted as calls and will raise the failed-call counter. - * - times now shown as hh:mm:ss; the fields may hold up to 999 hrs + * - times now shown as hh:mm:ss; the fields may hold up to 999 hrs * (a month equals 744 hrs at max). Printing will be as follows: * * hrs > 0 hh:mm:ss @@ -52,7 +52,7 @@ * sec > 0 ss * leading zeroes are suppressed. * - * - the bytes xfered will be given in thousands only (we're counting + * - the bytes xfered will be given in thousands only (we're counting * so 1K is 1000 bytes!). Sums up to 9,999,999.9 thousand can be shown. * - dropped the fractions of a byte in columns: bytes/second (avg cps). * - File statistic changed to display in/out in one row instead of 2 @@ -60,7 +60,7 @@ * - eliminated the goto in command report and tightened the code; also * the 'goto usage' has been replaced by a call to void usage() with no * return (exit 1). - * - a totaling is done for all reports now; the total values are held + * - a totaling is done for all reports now; the total values are held * within the structure; after finishing read there will be an alloc * for a site named 'Total' so that the totals line will be printed * more or less automatically. @@ -84,6 +84,9 @@ * get knowledge of */ /* $Log: uurate.c,v $ + * Revision 1.2 1994/05/07 18:09:35 ache + * Upgrade to version 1.05 + * * Revision 1.15 1994/04/07 21:47:11 kdburg * printed 'no data avail' while there was data; layout chnaged * (cosmetic only) @@ -139,7 +142,7 @@ * */ char version[] = "@(#) Taylor UUCP Log File Summary Filter, Version 1.2.2"; -static char rcsid[] = "$Id: uurate.c,v 1.15 1994/04/07 21:47:11 kdburg Rel $"; +static char rcsid[] = "$Id: uurate.c,v 1.2 1994/05/07 18:09:35 ache Exp $"; #include <ctype.h> /* Character Classification */ #include <math.h> #include "uucp.h" @@ -288,7 +291,7 @@ int main(argc, argv) char *argv[]; { FILE *Log = NULL; - int c; + int c; char *p, *s, *stt, *flq = NULL; char Hostname[MAXHOSTNAMELEN]; /* def taken from <sys/param.h> */ char Filename[15]; /* filename to be printed */ @@ -318,7 +321,7 @@ int main(argc, argv) else strcpy(Pgm_name,argv[0]); def_logs[0] = Pgm_name; - + /* * I wish the compiler had the #error directive! */ @@ -345,7 +348,7 @@ int main(argc, argv) Tstat = (char *)getmem(sizeof(STATFILE)); Tlog = LOGFILE; Tstat = STATFILE; - + /* * Process the command line arguments */ @@ -423,8 +426,8 @@ int main(argc, argv) /* * If further args present, Assume rest are logfiles for us to process * which should be given in pairs (log plus stat) otherwise the results may - * not come out as expected! If no further args are present take input from - * Log and Stat files provided in the compilation environment of Taylor UUCP. + * not come out as expected! If no further args are present take input from + * Log and Stat files provided in the compilation environment of Taylor UUCP. * If -i was given, Log already points to stdin and no file args are accepted. */ @@ -454,7 +457,7 @@ int main(argc, argv) else /* Read from current logs */ { def_logs[1] = Tlog; /* prime the */ - def_logs[2] = Tstat; /* file names */ + def_logs[2] = Tstat; /* file names */ if (! be_quiet) printf(" Config for this run: "); @@ -480,7 +483,7 @@ int main(argc, argv) printf("%s\n",noConf); } def_logs[1] = Tlog; /* final setting of */ - def_logs[2] = Tstat; /* file names */ + def_logs[2] = Tstat; /* file names */ argv = def_logs; /* Bash argvec to log/stat files */ argc = sizeof(def_logs) / sizeof(def_logs[0]); } @@ -514,7 +517,7 @@ int main(argc, argv) strncpy(Filename,argv[1],sizeof(Filename)-1); else strncpy(Filename,++flq,sizeof(Filename)-1); - + strcpy(in_date," n/a"); strcpy(in_time," n/a"); p_done = FALSE; /* no info printed yet */ @@ -543,7 +546,7 @@ int main(argc, argv) if (NULL != (stt = strchr(p, '('))) { if (! p_done && ! use_stdin && ! be_quiet) - { + { #if HAVE_TAYLOR_LOGGING sscanf(++stt,"%s%*c%[^.]",in_date,in_time); @@ -586,7 +589,7 @@ int main(argc, argv) * transfer record, determine the direction. If not then * skip the line if it is not interesting. */ - + if ((s = strchr(++s, ')')) == NULL) continue; @@ -596,7 +599,7 @@ int main(argc, argv) if ((s = strchr(++s, ')')) == NULL) continue; /* yes but strange layout */ #endif /* HAVE_V2_LOGGING */ -#endif /* ! HAVE_TAYLOR_LOGGING */ +#endif /* ! HAVE_TAYLOR_LOGGING */ logmsg = s + 2; /* Message is 2 characters after ')' */ if ((0 != strncmp(logmsg, "Call complete", 13)) && @@ -651,8 +654,8 @@ int main(argc, argv) last->next = cur; break; } - } /* while (e != NULL) */ - } /* hosts == NULL */ + } /* while (e != NULL) */ + } /* hosts == NULL */ } /* cur == NULL */ } @@ -768,7 +771,7 @@ int main(argc, argv) /* * Handle end of call. Pick up the connect time. * position is on the closing paren of date/time info - * i.e: ) text.... + * i.e: ) text.... */ if (0 == strncmp(logmsg, "Call complete", 13)) @@ -795,7 +798,7 @@ int main(argc, argv) if (0 == strncmp(logmsg, "failed after ",13)) logmsg += 13; /* the transmission failed for any reason */ /* so advance pointer */ - if (0 == strncmp(logmsg, "sent", 4)) + if (0 == strncmp(logmsg, "sent", 4)) sent = OUT; else if (0 == strncmp(logmsg, "received", 8)) sent = IN; @@ -821,7 +824,7 @@ int main(argc, argv) } /* end of while (fgets(logline...)) */ if (stt != NULL && ! use_stdin && ! be_quiet && ! no_records) - { + { #if HAVE_TAYLOR_LOGGING sscanf(dt_info,"%s%*c%[^.]",in_date,in_time); @@ -848,7 +851,7 @@ int main(argc, argv) { if (! be_quiet && no_records) printf(" %-14s %10s\n",Filename, " is empty "); - } + } } fclose(Log); @@ -895,11 +898,11 @@ int main(argc, argv) tot->call[OUT].flow[IN].files += cur->call[OUT].flow[IN].files; tot->call[IN].flow[OUT].files += cur->call[IN].flow[OUT].files; tot->call[OUT].flow[OUT].files += cur->call[OUT].flow[OUT].files; - tot->call[OUT].succs += cur->call[OUT].succs; - tot->call[OUT].calls += cur->call[OUT].calls; + tot->call[OUT].succs += cur->call[OUT].succs; + tot->call[OUT].calls += cur->call[OUT].calls; tot->call[OUT].connect_time += cur->call[OUT].connect_time; - tot->call[IN].succs += cur->call[IN].succs; - tot->call[IN].calls += cur->call[IN].calls; + tot->call[IN].succs += cur->call[IN].succs; + tot->call[IN].calls += cur->call[IN].calls; tot->call[IN].connect_time += cur->call[IN].connect_time; } } @@ -981,7 +984,7 @@ int main(argc, argv) cur->Hostname, rf, sf, t1, t2, t3, t4, t5, ir, or); - } + } if (! hdr_done) { puts("\n(I) No data found to print Compact summary report"); @@ -1077,7 +1080,7 @@ int main(argc, argv) prot->pr_eorder, prot->pr_ereject); type = NULL; - } + } } } } @@ -1171,7 +1174,7 @@ int main(argc, argv) { char t1[32], t2[32]; double rate = 0, time = 0; - int b = 0; + int b = 0; int lineOut = 0; hdr_done = FALSE; @@ -1179,7 +1182,7 @@ int main(argc, argv) { lineOut = 0; for (sent= IN; sent <= OUT; ++sent) - { + { b = cur->call[IN].flow[sent].bytes + cur->call[OUT].flow[sent].bytes; time = cur->call[IN].flow[sent].time + @@ -1215,7 +1218,7 @@ int main(argc, argv) t1, t2, rate); lineOut = 1; } - } /* end: for (sent ... ) */ + } /* end: for (sent ... ) */ if (lineOut) printf("\n"); } /* end: for (cur= ... ) */ @@ -1263,7 +1266,7 @@ int main(argc, argv) hdr_done = TRUE; } - flow = cur->call[IN].flow[IN].time + + flow = cur->call[IN].flow[IN].time + cur->call[IN].flow[OUT].time + cur->call[OUT].flow[IN].time + cur->call[OUT].flow[OUT].time; @@ -1296,12 +1299,12 @@ int main(argc, argv) */ if (show_commands || show_all) - { + { if (have_commands) { int ncmds, i, match; - /* + /* * layout the header line. The column's header is the command name */ @@ -1331,7 +1334,7 @@ int main(argc, argv) fputs(" ------", stdout); putchar('\n'); - /* + /* * print out the number of executions for each host/command */ @@ -1353,7 +1356,7 @@ int main(argc, argv) for(ec= cur->cmds; ec != NULL; ec= ec->next) { if ( 0 == strcmp(cmd->Commandname, ec->Commandname) ) - { + { printf(" %7d", ec->count); match = TRUE; break; @@ -1366,7 +1369,7 @@ int main(argc, argv) } /* - * print the totals line + * print the totals line */ fputs(" --------", stdout); @@ -1402,7 +1405,7 @@ int main(argc, argv) */ /* ------------------------------------------------------------------ - * display the help + * display the help * ------------------------------------------------------------------ */ @@ -1644,7 +1647,7 @@ int chk_config(char *T_conf,int be_quiet, int type) fprintf(stderr,"%s (C) ended due to errors\n", Pgm_name); return (8); - } + } } } else diff --git a/gnu/libexec/uucp/contrib/uusnap.c b/gnu/libexec/uucp/contrib/uusnap.c index 123741c..f94078b 100644 --- a/gnu/libexec/uucp/contrib/uusnap.c +++ b/gnu/libexec/uucp/contrib/uusnap.c @@ -12,7 +12,7 @@ compile it form the Makefile or: cc -c -g -pipe -O -I. -I. -DNEWCONFIGLIB=\"/usr/local/lib/uucp\" uusnap.c - cc -o uusnap uusnap.o + cc -o uusnap uusnap.o For this, uusnap.[ch] must be in the same directory as uucp.h and so. uusnap must have read access to SPOOLDIR/.Status in order to work. @@ -25,7 +25,7 @@ #include "uucp.h" #if USE_RCS_ID -char uusnap_rcsid[] = "$Id: uusnap.c,v 1.9 92/05/05 22:51:50 hwr Exp Locker: hwr $"; +char uusnap_rcsid[] = "$Id: uusnap.c,v 1.2 1994/05/07 18:09:40 ache Exp $"; #endif #include <ctype.h> @@ -50,7 +50,7 @@ struct sysInfo { int num_retries; /* number of retries */ }; -struct sysInfo Systems[MAXSYS]; +struct sysInfo Systems[MAXSYS]; /* I have extend the system status. If time for the specified system @@ -77,7 +77,7 @@ main() int i; i=get_systems(); display_info(i); - + exit(0); } @@ -115,7 +115,7 @@ get_systems() get_stat_for_system(i); /* now get the system status */ get_inq_num(i,TRUE); /* number of unprocessed files */ get_outq_num(i,TRUE); /* number of files to send */ - i++; + i++; } fclose(fp); } @@ -126,7 +126,7 @@ get_systems() return i; } - + display_info(int numSys) { @@ -144,7 +144,7 @@ display_info(int numSys) fprintf(stderr, "Can't malloc 1024 bytes"); exit(1); } - + while(TRUE) { display_headline(); for (sysnum=0;sysnum<numSys;sysnum++) { @@ -170,21 +170,21 @@ int display_status_line(int sn) { char *time_s; - + int sys_stat,num_retries,wait; int i; time_t last_time; time_t next_time; - + struct sysInfo sys; - + sys = Systems[sn]; printf("%10s ",sys.sysname); get_inq_num(sn); if (sys.in==0) printf(" "); - else + else printf("%3d ",sys.in); get_outq_num(sn); if (sys.out==0) @@ -198,13 +198,13 @@ display_status_line(int sn) time_s = ctime(&sys.next); time_s = time_s + 11; *(time_s+8)='\0'; - if (sys.last == sys.next) + if (sys.last == sys.next) printf(" "); else printf("%8s ",time_s); /* time of next poll */ - if (sys.num_retries==0) + if (sys.num_retries==0) printf(" "); - else + else printf("%2d ",sys.num_retries); if (sys_stat==6) /* system is talking */ printf("\E[7m"); /* reverse video on */ @@ -234,7 +234,7 @@ get_inq_num(int num,char firstTime) char filename[1024]; struct stat stbuf; DIR *dirp; - + strcpy(filename,Systems[num].spooldir); strcat(filename,"/X./."); stat(filename,&stbuf); @@ -263,7 +263,7 @@ get_outq_num(int sys,char firstTime) char filename[1024]; struct stat stbuf; DIR *dirp; - + strcpy(filename,Systems[sys].spooldir); strcat(filename,"/C./."); stat(filename,&stbuf); diff --git a/gnu/libexec/uucp/contrib/xchat.c b/gnu/libexec/uucp/contrib/xchat.c index b44549e..9e87f7c 100644 --- a/gnu/libexec/uucp/contrib/xchat.c +++ b/gnu/libexec/uucp/contrib/xchat.c @@ -21,7 +21,7 @@ * for timed reads. Use Taylor UUCP "conf.h" file to set * configuration for this program. Add defaulting of script * and log file paths. - * + * * Daniel Hagerty - Mon Nov 22 18:17:38 1993 * V1.2 - Added a new opcode to xchat. "expectstr" is a cross between * sendstr and expect, looking for a parameter supplied string. @@ -43,7 +43,7 @@ #include "xc-conf.h" -/* +/* * Pick a timing routine to use, as done in Taylor UUCP. */ #if HAVE_USLEEP || HAVE_NAP || HAVE_NAPMS || HAVE_POLL @@ -279,7 +279,7 @@ extern void *malloc(); * arguments in argc/argv, and stdin/stdout mapped to the * tty device, and stderr mapped to the Taylor logfile, where * anything written to stdout will be logged as an error. - * + * */ int main(argc, argv) int argc; @@ -312,7 +312,7 @@ char *argv[]; /* * If the script file argument begins with '/', then we assume - * it is an absolute pathname, otherwise, we prepend the + * it is an absolute pathname, otherwise, we prepend the * SCRIPT_DIR path. */ *sfname = '\0'; /* Empty name string */ @@ -375,7 +375,7 @@ char *argv[]; exit(stat); } -/* +/* * deal_script - deallocate a script and all strings it points to */ int deal_script(loc) @@ -386,34 +386,34 @@ struct script *loc; */ if (loc == (struct script *)NULL) return SUCCESS; - + /* * Deallocate the rest of the script */ deal_script(loc->next); - + /* * Deallocate the string parameter, if any */ if (loc->strprm != (char *)NULL) free(loc->strprm); - + /* * Deallocate the new state name parameter, if any */ if (loc->newstate != (char *)NULL) free(loc->newstate); - + /* * Deallocate this entry */ free(loc); - + return SUCCESS; } -/* +/* * read_script * * Read & compile a script, return pointer to first entry, or null if bad @@ -428,10 +428,10 @@ struct script *read_script(fd) char inpline[MAX_SCLINE]; char inpcopy[MAX_SCLINE]; char *c, *cln, *opc, *cp; - + /* * MAIN COMPILATION LOOP - */ + */ while ((c = fgets(inpline, (sizeof inpline - 1), fd)) != (char *)NULL) { /* @@ -439,13 +439,13 @@ struct script *read_script(fd) */ if (*c == '#' || *c == '\n') continue; - - /* + + /* * Get rid of the trailing newline, and copy the string */ inpline[strlen(inpline)-1] = '\0'; strcpy(inpcopy, inpline); - + /* * Look for text starting in the first col (a label) */ @@ -467,7 +467,7 @@ struct script *read_script(fd) this->newstate = (char *)NULL; c = cln + 1; } - + /* * Now handle the opcode. Fold it to lower case. */ @@ -477,14 +477,14 @@ struct script *read_script(fd) cp = opc; while(*cp) tolower(*cp++); - - /* + + /* * If we have an opcode but we haven't seen anything * else (like a label) yet, i.e., this is the first - * entry, and there was no label. We need to + * entry, and there was no label. We need to * cobble up a label so that read_script is happy */ - if (first == (struct script *)NULL) + if (first == (struct script *)NULL) { this = (struct script *)malloc (sizeof (struct script)); prev = this; @@ -496,12 +496,12 @@ struct script *read_script(fd) this->intprm = 0; this->newstate = (char *)NULL; } - - /* + + /* * Find opcode - ndex through the opcode definition table */ for (i=1; sc_opdef[i].opcode != SC_END; i++) - if (strcmp(opc, sc_opdef[i].opname) == SAME) + if (strcmp(opc, sc_opdef[i].opname) == SAME) break; if ((sc_opdef[i].opcode) == SC_END) { @@ -509,7 +509,7 @@ struct script *read_script(fd) deal_script(first); return (struct script *)NULL; } - + /* * Found opcode. Allocate a new command node and initialize */ @@ -521,8 +521,8 @@ struct script *read_script(fd) this->strprm = (char *)NULL; this->intprm = 0; this->newstate = (char *)NULL; - - /* + + /* * Pick up new state parameter, if any */ if (sc_opdef[i].newstate == SC_NWST) @@ -540,7 +540,7 @@ struct script *read_script(fd) strcpy(this->newstate, c); } } - + /* * Pick up the string or integer parameter. Handle missing * parameter gracefully. @@ -572,8 +572,8 @@ struct script *read_script(fd) /* * STR/XSTR strings. */ - case SC_STR: - case SC_XSTR: + case SC_STR: + case SC_XSTR: c = strtok((char *)NULL, CTL_DELIM); if (c == (char *)NULL) { @@ -597,9 +597,9 @@ struct script *read_script(fd) /* * For XSTR, Translate the string and store its - * length. Note that, after escape sequences are - * compressed, the resulting string may well be a - * few bytes shorter than the input string (whose + * length. Note that, after escape sequences are + * compressed, the resulting string may well be a + * few bytes shorter than the input string (whose * length was the basis for the malloc above), * but it will never be longer. */ @@ -611,10 +611,10 @@ struct script *read_script(fd) else strcpy(this->strprm, c); break; - + } } - + /* * EOF */ @@ -630,23 +630,23 @@ struct script *read_script(fd) * Called by read_script(), above. * * Returns the actual length of the resulting string. Note that imbedded - * nulls (specified by \000 in the input) ARE allowed in the result. + * nulls (specified by \000 in the input) ARE allowed in the result. */ xlat_str(out, in) char *out, *in; { register int i = 0, j = 0; int byte, k; - - while (in[i]) + + while (in[i]) { - if (in[i] != '\\') + if (in[i] != '\\') { out[j++] = in[i++]; } - else + else { - switch (in[++i]) + switch (in[++i]) { case 'd': /* EOT */ out[j++] = 0x04; @@ -682,11 +682,11 @@ xlat_str(out, in) case '7': byte = in[i] - '0'; k = 0; - - while (3 > ++k) + + while (3 > ++k) if ((in[i+1] < '0') || (in[i+1] > '7')) break; - else + else { byte = (byte<<3) + in[i+1] - '0'; ++i; @@ -698,7 +698,7 @@ xlat_str(out, in) } ++i; } - } + } return j; } @@ -711,9 +711,9 @@ struct script *begin; char *newstate; { struct script *here; - + for (here=begin; here != (struct script *)NULL; here=here->next) { - if (here->opcode == SC_LABEL && + if (here->opcode == SC_LABEL && strcmp(here->strprm, newstate) == SAME) return here; } @@ -721,8 +721,8 @@ char *newstate; } -/* - * do_script() - execute a script +/* + * do_script() - execute a script */ int do_script(begin) struct script *begin; @@ -734,7 +734,7 @@ int do_script(begin) char *c, chr; int prmlen; int dbfd; - + time_t sc_carrtime = 45000; /* time to wf carr after dial */ time_t sc_chrdly = 100; /* delay time for ttoslow */ time_t sc_ptime = 2000; /* time to allow for pause char */ @@ -746,118 +746,118 @@ int do_script(begin) char sc_wchar = 'W'; /* modem wait-for-dialtone character */ time_t sc_begwait; /* time at beg of wait */ time_t sc_secs; /* timeout period */ - + int expcnt; int expin; static char expbuf[MAX_EXPCT]; - + dbgsave = Debug; curstate = begin; - - if (curstate == (struct script *)NULL) + + if (curstate == (struct script *)NULL) return SUCCESS; - + _newstate: - /* + /* * do all of curstate's actions. Enter with curstate pointing * to a label entry */ expin = 0; - + for (curscr = curstate->next; /* point to 1st scr after label */ (curscr != (struct script *)NULL) && /* do until end of scr */ (curscr->opcode != SC_LABEL); /* or next label */ - curscr = curscr->next) + curscr = curscr->next) { expcnt = 0; - switch (curscr->opcode) + switch (curscr->opcode) { case SC_LABEL: logit("Script proc err", curstate->strprm); return FAIL; - + case SC_FLSH: DEBUG(DB_LGII, "Flushing typeahead buffer\n", 0); ttflui(); break; - + case SC_CDLY: sc_chrdly = curscr->intprm; DEBUG(DB_LGII, "Set chrdly to %d\n", sc_chrdly); break; - + case SC_PCHR: sc_pchar = *(curscr->strprm); DEBUG(DB_LGII, "Set pause char to %c\n", sc_pchar); break; - + case SC_PTIM: sc_ptime = curscr->intprm; DEBUG(DB_LGII, "Set pause time to %d\n", sc_ptime); break; - + case SC_WCHR: sc_wchar = *(curscr->strprm); DEBUG(DB_LGII, "Set wait char to %c\n", sc_wchar); break; - + case SC_WTIM: sc_wtime = curscr->intprm; DEBUG(DB_LGII, "Set wait time to %d\n", sc_wtime); break; - + case SC_ZERO: sc_counter = 0; DEBUG(DB_LGII, "Set counter to %d\n", sc_counter); break; - + case SC_INCR: sc_counter++; DEBUG(DB_LGII, "Incr counter to %d\n", sc_counter); break; - + case SC_WAIT: DEBUG(DB_LGII, "Sleeping %d tenth-secs\n", curscr->intprm); msleep(curscr->intprm); break; - + case SC_DTIM: sc_dtime = curscr->intprm; DEBUG(DB_LGII, "Digit time is %d\n", sc_dtime); break; - + case SC_CTIM: sc_carrtime = curscr->intprm; DEBUG(DB_LGII, "Carrier time is %d\n", sc_carrtime); break; - + case SC_EXIT: Debug = dbgsave; DEBUG(DB_LGI, "Script ended successfully\n", 0); return SUCCESS; - + case SC_FAIL: Debug = dbgsave; if (DEBUG_LEVEL(DB_LGI) && dbf != NULL) fprintf(dbf, "Script failed\n"); else if (expin) - charlog(expbuf, expin, DB_LOG, + charlog(expbuf, expin, DB_LOG, "Script failed. Last received data"); return FAIL; - + case SC_LOG: logit(curscr->strprm, ""); break; - + case SC_LOGE: logit("ERROR: ", curscr->strprm); break; - + case SC_DBOF: /* * If the debug file name does not begin with "/", then * we prepend the LOG_DIR to the string. Then CREATE the - * file. This WIPES OUT previous logs. + * file. This WIPES OUT previous logs. */ *dfname = '\0'; /* Zero name string */ if(curscr->strprm[0] != '/') @@ -877,102 +877,102 @@ int do_script(begin) return FAIL; } break; - + case SC_DBG: DEBUG(DB_LGI, "<%s>\n", curscr->strprm); break; - + case SC_DBGE: DEBUG(DB_LGIE, "ERROR: <%s>\n", curscr->strprm); break; - + case SC_DBST: Debug |= curscr->intprm; DEBUG(DB_LGII, "Debug mask set to %04o (octal)\n", Debug); break; - + case SC_DBCL: Debug &= ~(curscr->intprm); DEBUG(DB_LGII, "Debug mask set to %04o (octal)\n", Debug); break; - + case SC_BRK: DEBUG(DB_LGI, "Sending break\n", 0); ttbreak(); break; - + case SC_HANG: DEBUG(DB_LGI, "Dropping DTR\n", 0); tthang(); break; - + case SC_7BIT: DEBUG(DB_LGI, "Enabling 7-bit stripping\n", 0); tt7bit(TRUE); break; - + case SC_8BIT: DEBUG(DB_LGI, "Disabling 7-bit stripping\n", 0); tt7bit(FALSE); break; - + case SC_PNON: DEBUG(DB_LGI, "Setting 8-bit, no parity\n", 0); ttpar(NONE); break; - + case SC_PEVN: DEBUG(DB_LGI, "Setting 7-bit, even parity\n", 0); ttpar(EVEN); break; - + case SC_PODD: DEBUG(DB_LGI, "Setting 7-bit, odd parity\n", 0); ttpar(ODD); break; - + case SC_IFBL: - if (ttblind()) + if (ttblind()) { DEBUG(DB_LGI, "Blind mux,\n", 0); goto _chgstate; } break; - + case SC_IFBG: - if (ttblind() && sc_counter > curscr->intprm) + if (ttblind() && sc_counter > curscr->intprm) { - DEBUG(DB_LGI, "Blind mux & ctr > %d\n", + DEBUG(DB_LGI, "Blind mux & ctr > %d\n", curscr->intprm); goto _chgstate; } break; - + case SC_IFGT: - if (sc_counter > curscr->intprm) + if (sc_counter > curscr->intprm) { DEBUG(DB_LGI, "Counter > %d\n", curscr->intprm); goto _chgstate; } break; - + case SC_GOTO: _chgstate: DEBUG(DB_LGI, "Changing to state %s\n", curscr->newstate); curstate = find_state(begin, curscr->newstate); - if (curstate == NULL) + if (curstate == NULL) { logit("New state not found", curscr->newstate); return FAIL; } goto _newstate; - + case SC_SEND: ttoslow(curscr->strprm, curscr->intprm, sc_chrdly); break; - + case SC_TELN: if (curscr->intprm > paramc - 1) { @@ -983,7 +983,7 @@ int do_script(begin) strcpy(telno, paramv[curscr->intprm]); DEBUG(DB_LGII, "telno set to %s\n", telno); break; - + case SC_SNDP: if (curscr->intprm > paramc - 1) { @@ -994,17 +994,17 @@ int do_script(begin) prmlen = xlat_str(tempstr, paramv[curscr->intprm]); ttoslow(tempstr, prmlen, sc_chrdly); break; - + case SC_IF1P: if (curscr->intprm < paramc) goto _chgstate; break; - + case SC_IF0P: if (curscr->intprm >= paramc) goto _chgstate; break; - + case SC_DIAL: if(telno[0] == '\0') { @@ -1017,17 +1017,17 @@ int do_script(begin) * changed by the script. See the man page xchat(8) for * details. */ - sc_dtmo = (sc_dtime+sc_chrdly)*strlen(telno) + sc_dtmo = (sc_dtime+sc_chrdly)*strlen(telno) + sc_carrtime; c=strcpy(tempstr, telno); - for (; *c!='\0'; c++) + for (; *c!='\0'; c++) { - if (*c == 'W') + if (*c == 'W') { *c = sc_wchar; sc_dtmo += sc_wtime; } - else if (*c == 'P') + else if (*c == 'P') { *c = sc_pchar; sc_dtmo += sc_ptime; @@ -1036,7 +1036,7 @@ int do_script(begin) DEBUG(DB_LGI, "Dialing, default timeout is %d millisecs\n", sc_dtmo); ttoslow(tempstr, 0, sc_chrdly); break; - + case SC_TIMO: /* these are "expects", don't bother */ case SC_XPCT: /* with them yet, other than noting that */ case SC_CARR: /* they exist */ @@ -1044,107 +1044,107 @@ int do_script(begin) expcnt++; break; } - + } - + /* we've done the current state's actions, now do its expects, if any */ - - if (expcnt == 0) + + if (expcnt == 0) { - if (curscr != (struct script *)NULL && - (curscr->opcode == SC_LABEL)) + if (curscr != (struct script *)NULL && + (curscr->opcode == SC_LABEL)) { curstate = curscr; DEBUG(DB_LGI, "Fell through to state %s\n", curstate->strprm); goto _newstate; } - else + else { logit("No way out of state", curstate->strprm); return FAIL; } } - + time(&sc_begwait); /* log time at beg of expect */ DEBUG(DB_LGI, "Doing expects for state %s\n", curstate->strprm); charlog((char *)NULL, 0, DB_LGI, "Received"); - - while (1) + + while (1) { chr = xgetc(1); /* Returns upon char input or 1 sec. tmo */ - + charlog(&chr, 1, DB_LGI, (char *)NULL); - - if (chr != EOF) + + if (chr != EOF) { - if (expin < MAX_EXPCT) + if (expin < MAX_EXPCT) { expbuf[expin++] = chr & 0x7f; } - else + else { strncpy(expbuf, &expbuf[1], MAX_EXPCT-1); expbuf[MAX_EXPCT-1] = chr & 0x7f; } } - + /* for each entry in the current state... */ - - for (curscr = curstate->next; + + for (curscr = curstate->next; (curscr != (struct script *)NULL) && (curscr->opcode != SC_LABEL); - curscr = curscr->next) + curscr = curscr->next) { - - switch (curscr->opcode) + + switch (curscr->opcode) { case SC_TIMO: sc_secs = curscr->intprm; if (sc_secs == 0) sc_secs = sc_dtmo; sc_secs /= 1000; - if (time(NULL)-sc_begwait > sc_secs) + if (time(NULL)-sc_begwait > sc_secs) { DEBUG(DB_LGI, "\nTimed out (%d secs)\n", sc_secs); goto _chgstate; } break; - + case SC_CARR: - if (ttcd()) + if (ttcd()) { DEBUG(DB_LGI, "\nGot carrier\n", 0); goto _chgstate; } break; - + case SC_HUPS: - if (fShangup) + if (fShangup) { DEBUG(DB_LGI, "\nGot data set hangup\n", 0); goto _chgstate; } break; - + case SC_XPCT: if ((expin >= curscr->intprm) && - (strncmp(curscr->strprm, + (strncmp(curscr->strprm, &expbuf[expin - curscr->intprm], - curscr->intprm) == SAME)) + curscr->intprm) == SAME)) { charlog(curscr->strprm, curscr->intprm, DB_LGI, "Matched"); goto _chgstate; } break; - + } } } } - /* New opcode added by hag@eddie.mit.edu for expecting a + /* New opcode added by hag@eddie.mit.edu for expecting a parameter supplied string */ case SC_XPST: if(curscr->intprm >paramc-1) @@ -1194,8 +1194,8 @@ static int uhup(isig) /* * xgetc - get a character with timeout * - * Assumes that stdin is opened on a terminal or TCP socket - * with O_NONBLOCK. + * Assumes that stdin is opened on a terminal or TCP socket + * with O_NONBLOCK. */ static char xgetc(tmo) int tmo; /* Timeout, seconds */ @@ -1218,7 +1218,7 @@ int tmo; /* Timeout, seconds */ return(c); } -/* +/* * Pause for an interval in milliseconds */ void msleep(msec) @@ -1248,7 +1248,7 @@ long msec; if(msec == 0) return; - /* + /* * We need to pass an unused pollfd structure because poll checks * the address before checking the number of elements. */ @@ -1289,7 +1289,7 @@ char *msg1, *msg2; * * SPECIAL CASE: msg=NULL, len=1 and msg[0]='\377' gets logged * when read does its 1 sec. timeout. Log "<1 sec.>" - * so user can see elapsed time + * so user can see elapsed time */ static void charlog(buf, len, mask, msg) char *buf; @@ -1344,21 +1344,21 @@ int sig; return; } -/* +/* * ttoslow() - Send characters with pacing delays */ static void ttoslow(s, len, delay) - char *s; + char *s; int len; - time_t delay; + time_t delay; { int i; - + if (len == 0) len = strlen(s); - + charlog (s, len, DB_LGI, "Sending slowly"); - + for (i = 0; i < len; i++, s++) { write(1, s, 1); diff --git a/gnu/libexec/uucp/cu/cu.c b/gnu/libexec/uucp/cu/cu.c index 54516b6..bc318c6 100644 --- a/gnu/libexec/uucp/cu/cu.c +++ b/gnu/libexec/uucp/cu/cu.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char cu_rcsid[] = "$Id: cu.c,v 1.2 1994/05/07 18:09:54 ache Exp $"; +const char cu_rcsid[] = "$Id: cu.c,v 1.3 1994/10/02 23:10:39 ache Exp $"; #endif #include "cu.h" @@ -1047,7 +1047,7 @@ fcudo_cmd (puuconf, qconn, bcmd) case '|': t = SHELL_STDIN_FROM_PORT; break; case '+': t = SHELL_STDIO_ON_PORT; break; } - + (void) fsysdep_shell (qconn, zline, t); } if (! fsysdep_cu_copy (TRUE) @@ -1098,7 +1098,7 @@ fcudo_cmd (puuconf, qconn, bcmd) ucuabort (); fCurestore_terminal = TRUE; return TRUE; - + case 's': fret = fcuset_var (puuconf, zline); ubuffree (zline); @@ -1883,7 +1883,7 @@ icutake (puuconf, argc, argv, pvar, pinfo) the future. */ afSignal[INDEXSIG_SIGINT] = FALSE; break; - } + } b = breceive_char (qconn, cCuvar_timeout, TRUE); if (b == -2) @@ -2055,7 +2055,7 @@ fcusend_buf (qconn, zbufarg, cbufarg) *zput++ = *zget; } } - + zbuf += csend; cbuf -= csend; diff --git a/gnu/libexec/uucp/libunix/cohtty.c b/gnu/libexec/uucp/libunix/cohtty.c index 5a52df9..5db3fe7 100644 --- a/gnu/libexec/uucp/libunix/cohtty.c +++ b/gnu/libexec/uucp/libunix/cohtty.c @@ -3,7 +3,7 @@ lightly edited by Ian Lance Taylor. */ /* The bottom part of this file is lock.c. - * This is a hacked lock.c. A full lock.c can be found in the libmisc sources + * This is a hacked lock.c. A full lock.c can be found in the libmisc sources * under /usr/src/misc.tar.Z. * * These are for checking for the existence of locks: @@ -146,7 +146,7 @@ char enable_device[16]; /* this will hold our device name return TRUE; }else{ /* device not enabled */ - return TRUE; + return TRUE; } } } @@ -192,7 +192,7 @@ char *buff; { struct stat sbuf; int status; - + if (0 != (status = stat(path, &sbuf))) { /* Can't stat the file. */ return (NULL); diff --git a/gnu/libexec/uucp/libunix/cusub.c b/gnu/libexec/uucp/libunix/cusub.c index bf947a8..3486c71 100644 --- a/gnu/libexec/uucp/libunix/cusub.c +++ b/gnu/libexec/uucp/libunix/cusub.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char cusub_rcsid[] = "$Id: cusub.c,v 1.19 1994/01/30 21:09:20 ian Rel $"; +const char cusub_rcsid[] = "$Id: cusub.c,v 1.2 1994/05/07 18:10:14 ache Exp $"; #endif #include "uudefs.h" @@ -410,7 +410,7 @@ cscu_escape (pbcmd, zlocalname) usysdep_start_catch (); alarm (1); } - + c = 0; while (TRUE) @@ -426,7 +426,7 @@ cscu_escape (pbcmd, zlocalname) b = ']'; write (1, &b, 1); } - + if (c <= 0) c = read (0, pbcmd, 1); if (c >= 0 || errno != EINTR) @@ -437,7 +437,7 @@ cscu_escape (pbcmd, zlocalname) return c; } } -} +} /* A SIGALRM handler which does nothing but send a signal to the child process and schedule another alarm. POSIX.1 permits kill and alarm @@ -715,7 +715,7 @@ uscu_child (qconn, opipe) cwrite -= c; zbuf += c; } - } + } else { /* On some systems apparently read will return 0 until @@ -788,7 +788,7 @@ fsysdep_terminal_raw (flocalecho) } fSterm = TRUE; - + sSterm_new = sSterm_orig; #if HAVE_BSD_TTY @@ -1158,7 +1158,7 @@ fsysdep_shell (qconn, zcmd, tcmd) aidescs[0] = oread; if (tcmd == SHELL_STDOUT_TO_PORT || tcmd == SHELL_STDIO_ON_PORT) aidescs[1] = owrite; - + ipid = ixsspawn (azargs, aidescs, FALSE, TRUE, (const char *) NULL, FALSE, FALSE, (const char *) NULL, (const char *) NULL, (const char *) NULL); diff --git a/gnu/libexec/uucp/libunix/cwd.c b/gnu/libexec/uucp/libunix/cwd.c index 71d05d1..486105a 100644 --- a/gnu/libexec/uucp/libunix/cwd.c +++ b/gnu/libexec/uucp/libunix/cwd.c @@ -37,7 +37,7 @@ zsysdep_local_file_cwd (zfile, zpubdir, pfbadname) return zsysdep_local_file (zfile, zpubdir, pfbadname); else return zsysdep_add_cwd (zfile); -} +} /* Add the current working directory to a remote file name. */ diff --git a/gnu/libexec/uucp/libunix/detach.c b/gnu/libexec/uucp/libunix/detach.c index 9b505af..3a21b8a 100644 --- a/gnu/libexec/uucp/libunix/detach.c +++ b/gnu/libexec/uucp/libunix/detach.c @@ -38,7 +38,7 @@ #ifdef TIOCNOTTY #define HAVE_TIOCNOTTY 1 #else -#define HAVE_TIOCNOTTY 0 +#define HAVE_TIOCNOTTY 0 #endif #if HAVE_FCNTL_H diff --git a/gnu/libexec/uucp/libunix/dup2.c b/gnu/libexec/uucp/libunix/dup2.c index d145420..8446163 100644 --- a/gnu/libexec/uucp/libunix/dup2.c +++ b/gnu/libexec/uucp/libunix/dup2.c @@ -47,7 +47,7 @@ dup2 (oold, onew) if (oold == onew) return onew; (void) close (onew); - + #ifdef F_DUPFD return fcntl (oold, F_DUPFD, onew); #else diff --git a/gnu/libexec/uucp/libunix/epopen.c b/gnu/libexec/uucp/libunix/epopen.c index 8c1f5cd..0ab9725 100644 --- a/gnu/libexec/uucp/libunix/epopen.c +++ b/gnu/libexec/uucp/libunix/epopen.c @@ -78,7 +78,7 @@ espopen (pazargs, frd, pipid) errno = ierr; return NULL; } - + *pipid = ipid; return eret; diff --git a/gnu/libexec/uucp/libunix/filnam.c b/gnu/libexec/uucp/libunix/filnam.c index 0b234c0..7dd6626 100644 --- a/gnu/libexec/uucp/libunix/filnam.c +++ b/gnu/libexec/uucp/libunix/filnam.c @@ -329,7 +329,7 @@ zsysdep_data_file_name (qsys, zlocalname, bgrade, fxqt, ztname, zdname, char *zdname; char *zxname; { - return zsfile_name ('D', qsys->uuconf_zname, zlocalname, bgrade, fxqt, + return zsfile_name ('D', qsys->uuconf_zname, zlocalname, bgrade, fxqt, ztname, zdname, zxname); } diff --git a/gnu/libexec/uucp/libunix/fsusg.c b/gnu/libexec/uucp/libunix/fsusg.c index 50c1553..cee1ff0 100644 --- a/gnu/libexec/uucp/libunix/fsusg.c +++ b/gnu/libexec/uucp/libunix/fsusg.c @@ -188,7 +188,7 @@ get_fs_usage (path, disk, fsp) long cfree_blocks, ctotal_blocks; char *zpath; char *zslash; - + zpath = zbufcpy (path); while ((o = open (zpath, O_RDONLY, 0)) == -1 && errno == ENOENT) @@ -247,7 +247,7 @@ get_fs_usage (path, disk, fsp) fsp->fsu_blocks = ctotal_blocks; fsp->fsu_bfree = cfree_blocks; fsp->fsu_bavail = cfree_blocks; - + /* QNX has no limit on the number of inodes. Most inodes are stored directly in the directory entry. */ fsp->fsu_files = -1; diff --git a/gnu/libexec/uucp/libunix/getcwd.c b/gnu/libexec/uucp/libunix/getcwd.c index d3623bd..da53b56 100644 --- a/gnu/libexec/uucp/libunix/getcwd.c +++ b/gnu/libexec/uucp/libunix/getcwd.c @@ -48,7 +48,7 @@ getcwd (zbuf, cbuf) cread = 0; } } - + if (cread == 0) { errno = ierr; diff --git a/gnu/libexec/uucp/libunix/isfork.c b/gnu/libexec/uucp/libunix/isfork.c index f067d07..f28d65f 100644 --- a/gnu/libexec/uucp/libunix/isfork.c +++ b/gnu/libexec/uucp/libunix/isfork.c @@ -1,4 +1,4 @@ -/* isfork.c +/* isfork.c Retry fork several times before giving up. */ #include "uucp.h" diff --git a/gnu/libexec/uucp/libunix/iswait.c b/gnu/libexec/uucp/libunix/iswait.c index aa85515..361443a 100644 --- a/gnu/libexec/uucp/libunix/iswait.c +++ b/gnu/libexec/uucp/libunix/iswait.c @@ -134,7 +134,7 @@ ixswait (ipid, zreport) } } #endif /* ! HAVE_WAIT4 */ -#endif /* ! HAVE_WAITPID */ +#endif /* ! HAVE_WAITPID */ DEBUG_MESSAGE2 (DEBUG_EXECUTE, "%s %d", WIFEXITED (istat) ? "Exit status" : "Signal", diff --git a/gnu/libexec/uucp/libunix/locfil.c b/gnu/libexec/uucp/libunix/locfil.c index 1c4db66..4e0a5f9 100644 --- a/gnu/libexec/uucp/libunix/locfil.c +++ b/gnu/libexec/uucp/libunix/locfil.c @@ -77,7 +77,7 @@ zsysdep_local_file (zfile, zpubdir, pfbadname) zcopy = zbufalc (cuserlen + 1); memcpy (zcopy, zfile, cuserlen); zcopy[cuserlen] = '\0'; - + q = getpwnam (zcopy); if (q == NULL) { diff --git a/gnu/libexec/uucp/libunix/lock.c b/gnu/libexec/uucp/libunix/lock.c index 73ce976..ad52af8 100644 --- a/gnu/libexec/uucp/libunix/lock.c +++ b/gnu/libexec/uucp/libunix/lock.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char lock_rcsid[] = "$Id: lock.c,v 1.15 1994/01/30 21:09:20 ian Rel $"; +const char lock_rcsid[] = "$Id: lock.c,v 1.2 1994/05/07 18:10:40 ache Exp $"; #endif #include "uudefs.h" @@ -620,7 +620,7 @@ fsqnx_stale (ipid, inme, inid, pferr) /* Use the local pid of the local process manager. */ ivid = PROC_PID; } - + /* Request the process information. */ ifound_pid = qnx_psinfo (ivid /* process manager handling request */, ipid /* get info on this process */, @@ -636,7 +636,7 @@ fsqnx_stale (ipid, inme, inid, pferr) strerror (errno)); errno = isaved_errno; } - + /* If the returned pid matches then the process still holds the lock. */ if ((ifound_pid == ipid) && (spsdata.pid == ipid)) return FALSE; diff --git a/gnu/libexec/uucp/libunix/opensr.c b/gnu/libexec/uucp/libunix/opensr.c index 15cd5cd..c9e531a 100644 --- a/gnu/libexec/uucp/libunix/opensr.c +++ b/gnu/libexec/uucp/libunix/opensr.c @@ -75,7 +75,7 @@ esysdep_open_send (qsys, zfile, fcheck, zuser) struct stat s; openfile_t e; int o; - + if (fsysdep_directory (zfile)) { ulog (LOG_ERROR, "%s: is a directory", zfile); @@ -148,7 +148,7 @@ zsysdep_receive_temp (qsys, zto, ztemp, frestart) return zsappend3 (".Temp", qsys->uuconf_zname, ztemp); else return zstemp_file (qsys); -} +} /* The number of seconds in one week. We must cast to long for this to be calculated correctly on a machine with 16 bit ints. */ diff --git a/gnu/libexec/uucp/libunix/picksb.c b/gnu/libexec/uucp/libunix/picksb.c index 4fbd965..25b1c4e 100644 --- a/gnu/libexec/uucp/libunix/picksb.c +++ b/gnu/libexec/uucp/libunix/picksb.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char picksb_rcsid[] = "$Id: picksb.c,v 1.8 1994/01/30 21:09:20 ian Rel $"; +const char picksb_rcsid[] = "$Id: picksb.c,v 1.2 1994/05/07 18:10:54 ache Exp $"; #endif #include "uudefs.h" @@ -219,7 +219,7 @@ zsysdep_uupick_local_file (zfile, pfbadname) if (zfile[0] != '~' || (zfile[1] != '/' && zfile[1] != '\0')) return zsysdep_local_file_cwd (zfile, (const char *) NULL, pfbadname); - + q = getpwuid (getuid ()); if (q == NULL) { diff --git a/gnu/libexec/uucp/libunix/seq.c b/gnu/libexec/uucp/libunix/seq.c index 5188510..bd2cef8 100644 --- a/gnu/libexec/uucp/libunix/seq.c +++ b/gnu/libexec/uucp/libunix/seq.c @@ -68,7 +68,7 @@ ixsysdep_get_sequence (qsys) ubuffree (zname); return -1; } - + e = fopen (zname, "r+"); if (e == NULL) { diff --git a/gnu/libexec/uucp/libunix/serial.c b/gnu/libexec/uucp/libunix/serial.c index 4bee3bf..ae0a943 100644 --- a/gnu/libexec/uucp/libunix/serial.c +++ b/gnu/libexec/uucp/libunix/serial.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char serial_rcsid[] = "$Id: serial.c,v 1.56 1994/04/13 01:57:05 ian Rel $"; +const char serial_rcsid[] = "$Id: serial.c,v 1.4 1994/05/07 18:11:09 ache Exp $"; #endif #include "uudefs.h" @@ -860,7 +860,7 @@ fsserial_unlock (qconn) } qsysdep->o = -1; } - + if (! fsserial_lockfile (FALSE, qconn)) fret = FALSE; @@ -1748,7 +1748,7 @@ fsmodem_carrier (qconn, fcarrier) return FALSE; #ifdef TIOCNCAR - /* Tell the modem to ignore carrier. */ + /* Tell the modem to ignore carrier. */ if (ioctl (q->o, TIOCNCAR, 0) < 0) { ulog (LOG_ERROR, "ioctl (TIOCNCAR): %s", strerror (errno)); @@ -1782,19 +1782,19 @@ fsmodem_carrier (qconn, fcarrier) ulog (LOG_ERROR, "Can't set CLOCAL: %s", strerror (errno)); return FALSE; } - + #if HAVE_CLOCAL_BUG /* On SCO and AT&T UNIX PC you have to reopen the port. */ { int onew; - + onew = open (q->zdevice, O_RDWR); if (onew < 0) { ulog (LOG_ERROR, "open (%s): %s", q->zdevice, strerror (errno)); return FALSE; } - + if (fcntl (onew, F_SETFD, fcntl (onew, F_GETFD, 0) | FD_CLOEXEC) < 0) { @@ -2001,7 +2001,7 @@ fsysdep_modem_end_dial (qconn, qdial) errors. */ { int onew; - + onew = open (q->zdevice, O_RDWR); if (onew >= 0) { @@ -2039,7 +2039,7 @@ fsysdep_modem_end_dial (qconn, qdial) #endif /* ! defined (TIOCWONLINE) */ } - return TRUE; + return TRUE; } /* Read data from a connection, with a timeout. This routine handles @@ -2768,7 +2768,7 @@ fsysdep_conn_io (qconn, zwrite, pcwrite, zread, pcread) /* We got interrupted by a signal. Log it. */ ulog (LOG_ERROR, (const char *) NULL); } - + if (cdid < 0) { ulog (LOG_ERROR, "write: %s", strerror (errno)); @@ -2937,7 +2937,7 @@ fsserial_set (qconn, tparity, tstrip, txonxoff) /* Not supported. */ break; } - + if (fdo) { if ((q->snew.c_cflag & iset) != iset @@ -2973,7 +2973,7 @@ fsserial_set (qconn, tparity, tstrip, txonxoff) } #endif -#else /* ! HAVE_BSD_TTY */ +#else /* ! HAVE_BSD_TTY */ fdo = FALSE; switch (tstrip) diff --git a/gnu/libexec/uucp/libunix/spawn.c b/gnu/libexec/uucp/libunix/spawn.c index 67b915f..a56fd84 100644 --- a/gnu/libexec/uucp/libunix/spawn.c +++ b/gnu/libexec/uucp/libunix/spawn.c @@ -147,7 +147,7 @@ ixsspawn (pazargs, aidescs, fkeepuid, fkeepenv, zchdir, fnosigs, fshell, zspace = azenv[0] + sizeof "PATH=" - 1; while ((zspace = strchr (zspace, ' ')) != NULL) *zspace = ':'; - + azenv[1] = zbufalc (sizeof "HOME=" + strlen (zSspooldir)); sprintf (azenv[1], "HOME=%s", zSspooldir); @@ -158,7 +158,7 @@ ixsspawn (pazargs, aidescs, fkeepuid, fkeepenv, zchdir, fnosigs, fshell, sprintf (azenv[2], "TERM=%s", zterm); azenv[3] = zbufcpy ("SHELL=/bin/sh"); - + azenv[4] = zbufalc (sizeof "USER=" + strlen (OWNER)); sprintf (azenv[4], "USER=%s", OWNER); @@ -275,7 +275,7 @@ ixsspawn (pazargs, aidescs, fkeepuid, fkeepenv, zchdir, fnosigs, fshell, ierr = errno; ferr = TRUE; break; - } + } } } @@ -406,7 +406,7 @@ ixsspawn (pazargs, aidescs, fkeepuid, fkeepenv, zchdir, fnosigs, fshell, { char *zto; const char *azshargs[4]; - + pazargs[0] = zcmd; zto = zshcmd; for (i = 0; pazargs[i] != NULL; i++) diff --git a/gnu/libexec/uucp/libunix/spool.c b/gnu/libexec/uucp/libunix/spool.c index 2244f03..4eb3702 100644 --- a/gnu/libexec/uucp/libunix/spool.c +++ b/gnu/libexec/uucp/libunix/spool.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char spool_rcsid[] = "$Id: spool.c,v 1.8 1994/01/30 21:09:20 ian Rel $"; +const char spool_rcsid[] = "$Id: spool.c,v 1.2 1994/05/07 18:11:24 ache Exp $"; #endif #include "uudefs.h" @@ -287,7 +287,7 @@ zsfind_file (zsimple, zsystem, bgrade) { size_t c; boolean ftruncated; - + /* D.LOCAL in D.LOCAL/, others in D./. If BSD43, D.LOCALX in D.LOCALX/. */ ftruncated = TRUE; @@ -336,7 +336,7 @@ zsfind_file (zsimple, zsystem, bgrade) char *zfree; const char *zdir; char *zret; - + /* D.LOCALX in D.LOCALX/, D.LOCAL in D.LOCAL/, others in D./. */ ftruncated = TRUE; if (strncmp (zsimple + 2, zSlocalname, strlen (zSlocalname)) == 0) @@ -380,7 +380,7 @@ zsfind_file (zsimple, zsystem, bgrade) zfree = NULL; zdir = "D."; } - + zret = zsappend4 ("sys", (fsultrix_has_spool (zsystem) ? zsystem diff --git a/gnu/libexec/uucp/libunix/srmdir.c b/gnu/libexec/uucp/libunix/srmdir.c index 6110b00..7dcaa07 100644 --- a/gnu/libexec/uucp/libunix/srmdir.c +++ b/gnu/libexec/uucp/libunix/srmdir.c @@ -69,7 +69,7 @@ fsysdep_rmdir (zdir) while (q != NULL) { struct sdirlist *qnext; - + if (rmdir (q->zdir) != 0) { ulog (LOG_ERROR, "rmdir (%s): %s", q->zdir, strerror (errno)); diff --git a/gnu/libexec/uucp/libunix/wldcrd.c b/gnu/libexec/uucp/libunix/wldcrd.c index 13faa29..961ea31 100644 --- a/gnu/libexec/uucp/libunix/wldcrd.c +++ b/gnu/libexec/uucp/libunix/wldcrd.c @@ -167,7 +167,7 @@ zsysdep_wildcard (zfile) zret = zbufcpy (sSglob.gl_pathv[iSglob]); ++iSglob; return zret; - + #else /* ! HAVE_GLOB */ char *zret; diff --git a/gnu/libexec/uucp/libunix/work.c b/gnu/libexec/uucp/libunix/work.c index 0381c20..04a036c 100644 --- a/gnu/libexec/uucp/libunix/work.c +++ b/gnu/libexec/uucp/libunix/work.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char work_rcsid[] = "$Id: work.c,v 1.15 1994/01/30 21:09:20 ian Rel $"; +const char work_rcsid[] = "$Id: work.c,v 1.2 1994/05/07 18:11:41 ache Exp $"; #endif #include "uudefs.h" @@ -506,7 +506,7 @@ fsysdep_get_work (qsys, bgrade, qcmd) } } while (e == NULL); - + qfile = (struct ssfile *) xmalloc (sizeof (struct ssfile)); callocated = CFILELINES; iline = 0; @@ -561,7 +561,7 @@ fsysdep_get_work (qsys, bgrade, qcmd) while (TRUE) { int iline; - + if (qSwork_file->cdid >= qSwork_file->clines) { /* We don't want to free qSwork_file here, since it must @@ -628,7 +628,7 @@ fsysdep_did_work (pseq) struct ssfile *qfile; struct ssline *qline; int i; - + qline = (struct ssline *) pseq; ubuffree (qline->zline); @@ -745,7 +745,7 @@ zsysdep_save_temp_file (pseq) ubuffree (zto); return "Could not move file to preservation directory"; } - + cwant = sizeof "File saved as\n\t/" + strlen (zSspooldir) + strlen (zto); if (cwant > cbuf) { diff --git a/gnu/libexec/uucp/libunix/xqtfil.c b/gnu/libexec/uucp/libunix/xqtfil.c index d0ca757..69e70db 100644 --- a/gnu/libexec/uucp/libunix/xqtfil.c +++ b/gnu/libexec/uucp/libunix/xqtfil.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char xqtfil_rcsid[] = "$Id: xqtfil.c,v 1.7 1994/01/30 21:09:20 ian Rel $"; +const char xqtfil_rcsid[] = "$Id: xqtfil.c,v 1.2 1994/05/07 18:11:42 ache Exp $"; #endif #include "uudefs.h" @@ -220,7 +220,7 @@ zsysdep_get_xqt (pzsystem, pferr) #endif return zret; } - + /* If we've reached the end of the directory, then if we are using subdirectories loop around to read the next one, otherwise we are finished. */ diff --git a/gnu/libexec/uucp/libunix/xqtsub.c b/gnu/libexec/uucp/libunix/xqtsub.c index 62f4e89..df84654 100644 --- a/gnu/libexec/uucp/libunix/xqtsub.c +++ b/gnu/libexec/uucp/libunix/xqtsub.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char xqtsub_rcsid[] = "$Id: xqtsub.c,v 1.14 1994/01/30 21:09:20 ian Rel $"; +const char xqtsub_rcsid[] = "$Id: xqtsub.c,v 1.2 1994/05/07 18:11:43 ache Exp $"; #endif #include "uudefs.h" @@ -263,9 +263,9 @@ fsysdep_execute (qsys, zuser, pazargs, zfullcmd, zinput, zoutput, { ulog (LOG_ERROR, "fcntl (FD_CLOEXEC): %s", strerror (errno)); ferr = TRUE; - } + } } - + if (! ferr && zoutput != NULL) { aidescs[1] = creat ((char *) zoutput, IPRIVATE_FILE_MODE); @@ -280,7 +280,7 @@ fsysdep_execute (qsys, zuser, pazargs, zfullcmd, zinput, zoutput, { ulog (LOG_ERROR, "fcntl (FD_CLOEXEC): %s", strerror (errno)); ferr = TRUE; - } + } } if (! ferr) @@ -312,7 +312,7 @@ fsysdep_execute (qsys, zuser, pazargs, zfullcmd, zinput, zoutput, { ulog (LOG_ERROR, "fcntl (FD_CLOEXEC): %s", strerror (errno)); ferr = TRUE; - } + } } if (iseq == 0) @@ -658,7 +658,7 @@ fsysdep_move_uuxqt_files (cfiles, pzfrom, pzto, fto, iseq, pzinput) if (! fto) { const char *ztemp; - + ztemp = zfrom; zfrom = zto; zto = ztemp; diff --git a/gnu/libexec/uucp/libuuconf/bool.c b/gnu/libexec/uucp/libuuconf/bool.c index 73072a3..f05c0fa 100644 --- a/gnu/libexec/uucp/libuuconf/bool.c +++ b/gnu/libexec/uucp/libuuconf/bool.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_bool_rcsid[] = "$Id: bool.c,v 1.3 1994/01/30 21:14:29 ian Rel $"; +const char _uuconf_bool_rcsid[] = "$Id: bool.c,v 1.2 1994/05/07 18:11:58 ache Exp $"; #endif /* Parse a boolean string into a variable. This is called by @@ -61,4 +61,4 @@ _uuconf_iboolean (qglobal, zval, pi) } return UUCONF_CMDTABRET_CONTINUE; -} +} diff --git a/gnu/libexec/uucp/libuuconf/callin.c b/gnu/libexec/uucp/libuuconf/callin.c index fd58b18..017a0bb 100644 --- a/gnu/libexec/uucp/libuuconf/callin.c +++ b/gnu/libexec/uucp/libuuconf/callin.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_callin_rcsid[] = "$Id: callin.c,v 1.8 1994/03/29 01:18:20 ian Rel $"; +const char _uuconf_callin_rcsid[] = "$Id: callin.c,v 1.2 1994/05/07 18:11:58 ache Exp $"; #endif #include <errno.h> @@ -122,7 +122,7 @@ uuconf_callin (pglobal, pcmpfn, pinfo) zcolon = strchr (zcolon, ':'); if (zcolon != NULL) *zcolon = ' '; - } + } iret = uuconf_cmd_line (pglobal, zline, as, (pointer) &s, ipcheck, 0, (pointer) NULL); if ((iret & UUCONF_CMDTABRET_EXIT) != 0) diff --git a/gnu/libexec/uucp/libuuconf/calout.c b/gnu/libexec/uucp/libuuconf/calout.c index 4f89394..0cfb302 100644 --- a/gnu/libexec/uucp/libuuconf/calout.c +++ b/gnu/libexec/uucp/libuuconf/calout.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_calout_rcsid[] = "$Id: calout.c,v 1.4 1994/01/30 21:14:29 ian Rel $"; +const char _uuconf_calout_rcsid[] = "$Id: calout.c,v 1.2 1994/05/07 18:12:00 ache Exp $"; #endif #include <errno.h> @@ -61,7 +61,7 @@ uuconf_callout (pglobal, qsys, pzlog, pzpass) || (qsys->uuconf_zcall_password != NULL && strcmp (qsys->uuconf_zcall_password, "*") == 0)) return UUCONF_NOT_FOUND; - + if (qsys->uuconf_zcall_login != NULL) { *pzlog = strdup (qsys->uuconf_zcall_login); diff --git a/gnu/libexec/uucp/libuuconf/cmdarg.c b/gnu/libexec/uucp/libuuconf/cmdarg.c index e08c499..ff4a80e 100644 --- a/gnu/libexec/uucp/libuuconf/cmdarg.c +++ b/gnu/libexec/uucp/libuuconf/cmdarg.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_cmdarg_rcsid[] = "$Id: cmdarg.c,v 1.4 1994/01/30 21:14:29 ian Rel $"; +const char _uuconf_cmdarg_rcsid[] = "$Id: cmdarg.c,v 1.2 1994/05/07 18:12:02 ache Exp $"; #endif #include <ctype.h> @@ -141,7 +141,7 @@ uuconf_cmd_args (pglobal, cargs, pzargs, qtab, pinfo, pfiunknown, iflags, { char ***ppz = (char ***) q->uuconf_pvar; int iret; - + *ppz = NULL; iret = _uuconf_iadd_string (qglobal, (char *) NULL, FALSE, FALSE, ppz, pblock); diff --git a/gnu/libexec/uucp/libuuconf/errstr.c b/gnu/libexec/uucp/libuuconf/errstr.c index 40c97e8..94e179e 100644 --- a/gnu/libexec/uucp/libuuconf/errstr.c +++ b/gnu/libexec/uucp/libuuconf/errstr.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_errstr_rcsid[] = "$Id: errstr.c,v 1.3 1994/01/30 21:14:29 ian Rel $"; +const char _uuconf_errstr_rcsid[] = "$Id: errstr.c,v 1.2 1994/05/07 18:12:12 ache Exp $"; #endif static char *zeprint_num P((char *zbuf, size_t cbuf, int ival)); @@ -177,7 +177,7 @@ uuconf_error_string (pglobal, ierr, zbuf, cbuf) --cbuf; } } - + if (cbuf > 0 && cfile > 0) { *zbuf++ = ' '; diff --git a/gnu/libexec/uucp/libuuconf/hdial.c b/gnu/libexec/uucp/libuuconf/hdial.c index 909bdb2..85777d7 100644 --- a/gnu/libexec/uucp/libuuconf/hdial.c +++ b/gnu/libexec/uucp/libuuconf/hdial.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_hdial_rcsid[] = "$Id: hdial.c,v 1.4 1994/01/30 21:14:29 ian Rel $"; +const char _uuconf_hdial_rcsid[] = "$Id: hdial.c,v 1.2 1994/05/07 18:12:20 ache Exp $"; #endif #include <errno.h> @@ -133,7 +133,7 @@ uuconf_hdb_dialer_info (pglobal, zname, qdialer) bnext = *zsubs; while (bnext != '\0') { - if (bnext == '=') + if (bnext == '=') qdialer->uuconf_zdialtone = zsubs + 1; else if (bnext == '-') qdialer->uuconf_zpause = zsubs + 1; diff --git a/gnu/libexec/uucp/libuuconf/hdnams.c b/gnu/libexec/uucp/libuuconf/hdnams.c index 5051a7f..480c50d 100644 --- a/gnu/libexec/uucp/libuuconf/hdnams.c +++ b/gnu/libexec/uucp/libuuconf/hdnams.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_hdnams_rcsid[] = "$Id: hdnams.c,v 1.4 1994/01/30 21:14:29 ian Rel $"; +const char _uuconf_hdnams_rcsid[] = "$Id: hdnams.c,v 1.2 1994/05/07 18:12:21 ache Exp $"; #endif #include <errno.h> @@ -65,7 +65,7 @@ uuconf_hdb_dialer_names (pglobal, ppzdialers) iret = UUCONF_FOPEN_FAILED | UUCONF_ERROR_ERRNO; break; } - + qglobal->ilineno = 0; while (_uuconf_getline (qglobal, &zline, &cline, e) > 0) diff --git a/gnu/libexec/uucp/libuuconf/hinit.c b/gnu/libexec/uucp/libuuconf/hinit.c index 06155d9..5fbb665 100644 --- a/gnu/libexec/uucp/libuuconf/hinit.c +++ b/gnu/libexec/uucp/libuuconf/hinit.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_hinit_rcsid[] = "$Id: hinit.c,v 1.6 1994/01/30 21:14:29 ian Rel $"; +const char _uuconf_hinit_rcsid[] = "$Id: hinit.c,v 1.2 1994/05/07 18:12:23 ache Exp $"; #endif #include <errno.h> @@ -165,7 +165,7 @@ uuconf_hdb_init (ppglobal, zprogram) { char ***ppz; int cfiles, ifile; - + if (strncmp (pzargs[i], "systems=", sizeof "systems=" - 1) == 0) { diff --git a/gnu/libexec/uucp/libuuconf/hsinfo.c b/gnu/libexec/uucp/libuuconf/hsinfo.c index 6c92b3b..d9ad790 100644 --- a/gnu/libexec/uucp/libuuconf/hsinfo.c +++ b/gnu/libexec/uucp/libuuconf/hsinfo.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_hsinfo_rcsid[] = "$Id: hsinfo.c,v 1.10 1994/01/30 21:14:29 ian Rel $"; +const char _uuconf_hsinfo_rcsid[] = "$Id: hsinfo.c,v 1.2 1994/05/07 18:12:27 ache Exp $"; #endif #include <errno.h> @@ -343,7 +343,7 @@ _uuconf_ihdb_system_internal (qglobal, zsystem, qsys) if (iret != UUCONF_SUCCESS) break; } - + (void) fclose (e); if (iret != UUCONF_SUCCESS) diff --git a/gnu/libexec/uucp/libuuconf/hsnams.c b/gnu/libexec/uucp/libuuconf/hsnams.c index 73f3dbb..476835e 100644 --- a/gnu/libexec/uucp/libuuconf/hsnams.c +++ b/gnu/libexec/uucp/libuuconf/hsnams.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_hsnams_rcsid[] = "$Id: hsnams.c,v 1.4 1994/01/30 21:14:29 ian Rel $"; +const char _uuconf_hsnams_rcsid[] = "$Id: hsnams.c,v 1.2 1994/05/07 18:12:28 ache Exp $"; #endif #include <errno.h> @@ -67,7 +67,7 @@ uuconf_hdb_system_names (pglobal, ppzsystems, falias) iret = UUCONF_FOPEN_FAILED | UUCONF_ERROR_ERRNO; break; } - + qglobal->ilineno = 0; while (_uuconf_getline (qglobal, &zline, &cline, e) > 0) diff --git a/gnu/libexec/uucp/libuuconf/rdlocs.c b/gnu/libexec/uucp/libuuconf/rdlocs.c index 4393cc8..cf6e1b0 100644 --- a/gnu/libexec/uucp/libuuconf/rdlocs.c +++ b/gnu/libexec/uucp/libuuconf/rdlocs.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_rdlocs_rcsid[] = "$Id: rdlocs.c,v 1.5 1994/01/30 21:14:29 ian Rel $"; +const char _uuconf_rdlocs_rcsid[] = "$Id: rdlocs.c,v 1.2 1994/05/07 18:12:46 ache Exp $"; #endif #include <errno.h> @@ -174,7 +174,7 @@ _uuconf_iread_locations (qglobal) qglobal->qprocess->qsyslocs = si.qlocs; qglobal->qprocess->qvalidate = si.qvals; qglobal->qprocess->fread_syslocs = TRUE; - } + } return iret; } diff --git a/gnu/libexec/uucp/libuuconf/syssub.c b/gnu/libexec/uucp/libuuconf/syssub.c index 4a209d8..97b5f32 100644 --- a/gnu/libexec/uucp/libuuconf/syssub.c +++ b/gnu/libexec/uucp/libuuconf/syssub.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_syssub_rcsid[] = "$Id: syssub.c,v 1.11 1994/01/30 21:14:29 ian Rel $"; +const char _uuconf_syssub_rcsid[] = "$Id: syssub.c,v 1.2 1994/05/07 18:12:59 ache Exp $"; #endif #include <errno.h> @@ -451,7 +451,7 @@ _uuconf_isystem_basic_default (qglobal, q) qglobal->ierrno = errno; return UUCONF_MALLOC_FAILED | UUCONF_ERROR_ERRNO; } - + memcpy ((pointer) zdup, (pointer) CMDPATH, sizeof CMDPATH); pz = NULL; csplit = 0; diff --git a/gnu/libexec/uucp/libuuconf/tdialc.c b/gnu/libexec/uucp/libuuconf/tdialc.c index 02063b2..bac29e4 100644 --- a/gnu/libexec/uucp/libuuconf/tdialc.c +++ b/gnu/libexec/uucp/libuuconf/tdialc.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_tdialc_rcsid[] = "$Id: tdialc.c,v 1.4 1994/01/30 21:14:29 ian Rel $"; +const char _uuconf_tdialc_rcsid[] = "$Id: tdialc.c,v 1.2 1994/05/07 18:13:02 ache Exp $"; #endif static int idchat P((pointer pglobal, int argc, char **argv, pointer pvar, @@ -157,7 +157,7 @@ iddtr_toggle (pglobal, argc, argv, pvar, pinfo) string into a trivial chat script. */ /*ARGSUSED*/ -static int +static int idcomplete (pglobal, argc, argv, pvar, pinfo) pointer pglobal; int argc; @@ -192,7 +192,7 @@ idproto_param (pglobal, argc, argv, pvar, pinfo) struct uuconf_proto_param **pqparam = (struct uuconf_proto_param **) pvar; struct uuconf_dialer *qdialer = (struct uuconf_dialer *) pinfo; - return _uuconf_iadd_proto_param (qglobal, argc - 1, argv + 1, pqparam, + return _uuconf_iadd_proto_param (qglobal, argc - 1, argv + 1, pqparam, qdialer->uuconf_palloc); } diff --git a/gnu/libexec/uucp/libuuconf/tdnams.c b/gnu/libexec/uucp/libuuconf/tdnams.c index fa55a1f..191e993 100644 --- a/gnu/libexec/uucp/libuuconf/tdnams.c +++ b/gnu/libexec/uucp/libuuconf/tdnams.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_tdnams_rcsid[] = "$Id: tdnams.c,v 1.4 1994/01/30 21:14:29 ian Rel $"; +const char _uuconf_tdnams_rcsid[] = "$Id: tdnams.c,v 1.2 1994/05/07 18:13:03 ache Exp $"; #endif #include <errno.h> @@ -46,7 +46,7 @@ uuconf_taylor_dialer_names (pglobal, ppzdialers) struct uuconf_cmdtab as[2]; char **pz; int iret; - + *ppzdialers = NULL; as[0].uuconf_zcmd = "dialer"; diff --git a/gnu/libexec/uucp/libuuconf/tportc.c b/gnu/libexec/uucp/libuuconf/tportc.c index ec15cdf..0a7b0fb 100644 --- a/gnu/libexec/uucp/libuuconf/tportc.c +++ b/gnu/libexec/uucp/libuuconf/tportc.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_tportc_rcsid[] = "$Id: tportc.c,v 1.12 1994/01/30 21:14:29 ian Rel $"; +const char _uuconf_tportc_rcsid[] = "$Id: tportc.c,v 1.2 1994/05/07 18:13:11 ache Exp $"; #endif #include <errno.h> @@ -249,7 +249,7 @@ _uuconf_iport_cmd (qglobal, argc, argv, qport) if (i >= CPORT_TYPES) return UUCONF_SYNTAX_ERROR; - + ttype = (enum uuconf_porttype) i; } diff --git a/gnu/libexec/uucp/libuuconf/uucnfi.h b/gnu/libexec/uucp/libuuconf/uucnfi.h index 98122794..3bab167 100644 --- a/gnu/libexec/uucp/libuuconf/uucnfi.h +++ b/gnu/libexec/uucp/libuuconf/uucnfi.h @@ -150,7 +150,7 @@ struct sunknown int cargs; /* Arguments. */ char **pzargs; -}; +}; /* This structure is used to hold the locations of systems within the Taylor UUCP sys files. */ diff --git a/gnu/libexec/uucp/libuuconf/vport.c b/gnu/libexec/uucp/libuuconf/vport.c index 5ce2839..5aac382 100644 --- a/gnu/libexec/uucp/libuuconf/vport.c +++ b/gnu/libexec/uucp/libuuconf/vport.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_vport_rcsid[] = "$Id: vport.c,v 1.7 1994/01/30 21:14:29 ian Rel $"; +const char _uuconf_vport_rcsid[] = "$Id: vport.c,v 1.2 1994/05/07 18:13:22 ache Exp $"; #endif #include <errno.h> @@ -100,9 +100,9 @@ uuconf_v2_find_port (pglobal, zname, ibaud, ihighbaud, pifn, pinfo, qport) } /* An entry in L-devices is - + type device dial-device baud dialer - + The type (normally "ACU") is treated as the name. */ /* If there aren't enough entries, ignore the line; this diff --git a/gnu/libexec/uucp/libuuconf/vsinfo.c b/gnu/libexec/uucp/libuuconf/vsinfo.c index ac6d3f2..005efed 100644 --- a/gnu/libexec/uucp/libuuconf/vsinfo.c +++ b/gnu/libexec/uucp/libuuconf/vsinfo.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_vsinfo_rcsid[] = "$Id: vsinfo.c,v 1.10 1994/01/30 21:14:29 ian Rel $"; +const char _uuconf_vsinfo_rcsid[] = "$Id: vsinfo.c,v 1.2 1994/05/07 18:13:23 ache Exp $"; #endif #include <errno.h> @@ -531,7 +531,7 @@ _uuconf_iv2_system_internal (qglobal, zsystem, qsys) qsys->uuconf_pzpath = pznew; zline = NULL; cline = 0; - } + } if (getline (&zline, &cline, e) < 0) { diff --git a/gnu/libexec/uucp/libuucp/crc.c b/gnu/libexec/uucp/libuucp/crc.c index fc9687b..323adcb 100644 --- a/gnu/libexec/uucp/libuucp/crc.c +++ b/gnu/libexec/uucp/libuucp/crc.c @@ -78,14 +78,14 @@ static const unsigned long aicrc32tab[] = { /* CRC polynomial 0xedb88320 */ }; /* - * IUPDC32 macro derived from article Copyright (C) 1986 Stephen Satchell. + * IUPDC32 macro derived from article Copyright (C) 1986 Stephen Satchell. * NOTE: First argument must be in range 0 to 255. * Second argument is referenced twice. - * - * Programmers may incorporate any or all code into their programs, - * giving proper credit within the source. Publication of the - * source routines is permitted so long as proper credit is given - * to Stephen Satchell, Satchell Evaluations and Chuck Forsberg, + * + * Programmers may incorporate any or all code into their programs, + * giving proper credit within the source. Publication of the + * source routines is permitted so long as proper credit is given + * to Stephen Satchell, Satchell Evaluations and Chuck Forsberg, * Omen Technology. */ diff --git a/gnu/libexec/uucp/libuucp/debug.c b/gnu/libexec/uucp/libuucp/debug.c index 16c1b54..e722e2c 100644 --- a/gnu/libexec/uucp/libuucp/debug.c +++ b/gnu/libexec/uucp/libuucp/debug.c @@ -137,7 +137,7 @@ cdebug_char (z, ichar) *z++ = b; *z = '\0'; return 2; -} +} /* Display a buffer when debugging. */ @@ -162,7 +162,7 @@ udebug_buffer (zhdr, zbuf, clen) *z++ = '.'; } *z = '\0'; - + ulog (LOG_DEBUG, "%s %lu \"%s\"", zhdr, (unsigned long) clen, zalc); ubuffree (zalc); diff --git a/gnu/libexec/uucp/libuucp/escape.c b/gnu/libexec/uucp/libuucp/escape.c index 646b787..261accb 100644 --- a/gnu/libexec/uucp/libuucp/escape.c +++ b/gnu/libexec/uucp/libuucp/escape.c @@ -12,7 +12,7 @@ cescape (z) char *z; { char *zto, *zfrom; - + zto = z; zfrom = z; while (*zfrom != '\0') diff --git a/gnu/libexec/uucp/libuucp/getop1.c b/gnu/libexec/uucp/libuucp/getop1.c index c3ebc08b..41b9bb4 100644 --- a/gnu/libexec/uucp/libuucp/getop1.c +++ b/gnu/libexec/uucp/libuucp/getop1.c @@ -5,12 +5,12 @@ under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. @@ -38,7 +38,7 @@ getopt_long (argc, argv, options, long_options, opt_index) but does match a short option, it is parsed as a short option instead. */ -int +int getopt_long_only (argc, argv, options, long_options, opt_index) int argc; char *const *argv; diff --git a/gnu/libexec/uucp/libuucp/getopt.c b/gnu/libexec/uucp/libuucp/getopt.c index f97c64e..8c35f84 100644 --- a/gnu/libexec/uucp/libuucp/getopt.c +++ b/gnu/libexec/uucp/libuucp/getopt.c @@ -9,12 +9,12 @@ under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. diff --git a/gnu/libexec/uucp/libuucp/memchr.c b/gnu/libexec/uucp/libuucp/memchr.c index e1f399a..fd6eb83 100644 --- a/gnu/libexec/uucp/libuucp/memchr.c +++ b/gnu/libexec/uucp/libuucp/memchr.c @@ -53,9 +53,9 @@ memchr (s, c, n) /* Bits 31, 24, 16, and 8 of this number are zero. Call these bits the "holes." Note that there is a hole just to the left of each byte, with an extra at the end: - + bits: 01111110 11111110 11111110 11111111 - bytes: AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD + bytes: AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD The 1-bits make sure that carries propagate to the next 0-bit. The 0-bits provide holes for carries to fall into. */ @@ -108,10 +108,10 @@ memchr (s, c, n) /* Add MAGIC_BITS to LONGWORD. */ if ((((longword + magic_bits) - + /* Set those bits that were unchanged by the addition. */ ^ ~longword) - + /* Look at only the hole bits. If any of the hole bits are unchanged, most likely one of the bytes was a zero. */ diff --git a/gnu/libexec/uucp/libuucp/parse.c b/gnu/libexec/uucp/libuucp/parse.c index d40da80..d829fa9 100644 --- a/gnu/libexec/uucp/libuucp/parse.c +++ b/gnu/libexec/uucp/libuucp/parse.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char parse_rcsid[] = "$Id: parse.c,v 1.6 1994/03/26 04:42:39 ian Rel $"; +const char parse_rcsid[] = "$Id: parse.c,v 1.2 1994/05/07 18:13:33 ache Exp $"; #endif #include "uudefs.h" @@ -104,7 +104,7 @@ fparse_cmd (zcmd, qcmd) if (z == NULL) return FALSE; qcmd->zto = z; - + z = strtok ((char *) NULL, " \t\n"); if (z == NULL) return FALSE; @@ -155,7 +155,7 @@ fparse_cmd (zcmd, qcmd) } return TRUE; - } + } z = strtok ((char *) NULL, " \t\n"); if (z == NULL) @@ -203,7 +203,7 @@ fparse_cmd (zcmd, qcmd) } else if (qcmd->bcmd == 'E') return FALSE; - + if (z != NULL) { z = strtok ((char *) NULL, ""); diff --git a/gnu/libexec/uucp/tstuu.c b/gnu/libexec/uucp/tstuu.c index d411ae6..3f62975 100644 --- a/gnu/libexec/uucp/tstuu.c +++ b/gnu/libexec/uucp/tstuu.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char tstuu_rcsid[] = "$Id: tstuu.c,v 1.81 1994/01/30 20:53:38 ian Rel $"; +const char tstuu_rcsid[] = "$Id: tstuu.c,v 1.2 1994/05/07 18:08:16 ache Exp $"; #endif #include "sysdep.h" @@ -187,7 +187,7 @@ struct sbuf int cend; char ab[BUFCHARS]; }; - + /* Local functions. */ static void umake_file P((const char *zfile, int cextra)); @@ -305,7 +305,7 @@ main (argc, argv) { int om, os; FILE *e; - + sprintf (zptyname, "/dev/pty%c%c", *zpty, "0123456789abcdef"[ipty]); om = open (zptyname, O_RDWR); @@ -755,7 +755,7 @@ umake_file (z, c) FILE *e; e = xfopen (z, "w"); - + for (i = 0; i < 256; i++) { int i2; @@ -1293,7 +1293,7 @@ cpshow (z, ichar) sprintf (z, "%03o", (unsigned int)(ichar & 0xff)); return strlen (z) + 1; } -} +} /* Pick one of two file descriptors which is ready for reading, or return in five seconds. If the argument is ready for reading, @@ -1345,7 +1345,7 @@ uchoose (po1, po2) if ((as[0].revents & POLLIN) == 0) *po1 = -1; - + if ((as[1].revents & POLLIN) == 0) *po2 = -1; @@ -1388,7 +1388,7 @@ cread (o, pqbuf) (*pqbuf)->cstart = 0; (*pqbuf)->cend = 0; } - + cgot = read (o, (*pqbuf)->ab + (*pqbuf)->cend, (sizeof (*pqbuf)->ab) - (*pqbuf)->cend); if (cgot < 0) @@ -1515,7 +1515,7 @@ fsend (o, oslave, pqbuf) uchild (SIGCHLD); } } - + if (cwrote == 0) break; diff --git a/gnu/libexec/uucp/uuchk/uuchk.c b/gnu/libexec/uucp/uuchk/uuchk.c index a1e69e8..8e5c4ff 100644 --- a/gnu/libexec/uucp/uuchk/uuchk.c +++ b/gnu/libexec/uucp/uuchk/uuchk.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char uuchk_rcsid[] = "$Id: uuchk.c,v 1.52 1994/05/02 03:43:02 ian Rel $"; +const char uuchk_rcsid[] = "$Id: uuchk.c,v 1.2 1994/05/07 18:13:37 ache Exp $"; #endif #include "getopt.h" @@ -112,7 +112,7 @@ main (argc, argv) zKprogram, VERSION); exit (EXIT_SUCCESS); /*NOTREACHED*/ - + case 1: /* --help. */ ukhelp (); @@ -279,7 +279,7 @@ ukshow (qsys, puuconf) printf (" Call out"); else printf (" This alternate applies when calling"); - + if (qsys->uuconf_zport != NULL || qsys->uuconf_qport != NULL) { printf (" using "); @@ -514,7 +514,7 @@ ukshow (qsys, puuconf) printf (" %s", *pz); printf ("\n"); } - + if (qsys->uuconf_pzforward_to != NULL) { printf (" May forward to"); @@ -522,7 +522,7 @@ ukshow (qsys, puuconf) printf (" %s", *pz); printf ("\n"); } - + if (qsys->uuconf_zprotocols != NULL) printf (" Will use protocols %s\n", qsys->uuconf_zprotocols); else diff --git a/gnu/libexec/uucp/uucico/prote.c b/gnu/libexec/uucp/uucico/prote.c index adb937b..4cff75b 100644 --- a/gnu/libexec/uucp/uucico/prote.c +++ b/gnu/libexec/uucp/uucico/prote.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char prote_rcsid[] = "$Id: prote.c,v 1.16 1994/01/30 21:01:46 ian Rel $"; +const char prote_rcsid[] = "$Id: prote.c,v 1.2 1994/05/07 18:13:43 ache Exp $"; #endif #include "uudefs.h" @@ -97,7 +97,7 @@ festart (qdaemon, pzlog) /* Stop the protocol. */ /*ARGSUSED*/ -boolean +boolean feshutdown (qdaemon) struct sdaemon *qdaemon; { diff --git a/gnu/libexec/uucp/uucico/protf.c b/gnu/libexec/uucp/uucico/protf.c index a54be9f..c38b9a1 100644 --- a/gnu/libexec/uucp/uucico/protf.c +++ b/gnu/libexec/uucp/uucico/protf.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char protf_rcsid[] = "$Id: protf.c,v 1.31 1994/01/30 21:01:46 ian Rel $"; +const char protf_rcsid[] = "$Id: protf.c,v 1.2 1994/05/07 18:13:45 ache Exp $"; #endif #include <ctype.h> @@ -247,7 +247,7 @@ ffsenddata (qdaemon, zdata, cdata, ilocal, iremote, ipos) char ab[CFBUFSIZE * 2]; char *ze; register unsigned int itmpchk; - + cFsent_data += cdata; ze = ab; @@ -759,7 +759,7 @@ ffawait_cksum (qtrans, qdaemon, zdata, cdata) xfree (qtrans->pinfo); return FALSE; } - + icheck = (unsigned int) strtol ((char *) zdata, (char **) NULL, 16); if (icheck != (iFcheck & 0xffff)) diff --git a/gnu/libexec/uucp/uucico/protg.c b/gnu/libexec/uucp/uucico/protg.c index b18a260..efae85f 100644 --- a/gnu/libexec/uucp/uucico/protg.c +++ b/gnu/libexec/uucp/uucico/protg.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char protg_rcsid[] = "$Id: protg.c,v 1.65 1994/03/26 03:39:05 ian Rel $"; +const char protg_rcsid[] = "$Id: protg.c,v 1.2 1994/05/07 18:13:46 ache Exp $"; #endif #include <ctype.h> @@ -137,7 +137,7 @@ const char protg_rcsid[] = "$Id: protg.c,v 1.65 1994/03/26 03:39:05 ian Rel $"; /* Maximum amount of data in a single packet. This is set by the <k> field in the header; the amount of data in a packet is 2 ** (<k> + 4). <k> ranges from 1 to 8. */ - + #define CMAXDATAINDEX (8) #define CMAXDATA (1 << (CMAXDATAINDEX + 4)) @@ -446,7 +446,7 @@ fgstart (qdaemon, pzlog) iGrequest_packsize, qdaemon->qproto->bname); iseg = 1; } - + if (iGrequest_winsize <= 0 || iGrequest_winsize > 7) { ulog (LOG_ERROR, "Illegal window size %d for '%c' protocol", @@ -561,7 +561,7 @@ fvstart (qdaemon, pzlog) if (iGrequest_packsize == IPACKSIZE) iGrequest_packsize = 1024; return fgstart (qdaemon, pzlog); -} +} /* Exchange initialization messages with the other system. @@ -1140,7 +1140,7 @@ fgwait_for_packet (qdaemon, freturncontrol, ctimeout, cretries) size_t cneed; boolean ffound; size_t crec; - + if (! fgprocess_data (qdaemon, TRUE, freturncontrol, &fexit, &cneed, &ffound)) return FALSE; @@ -1502,7 +1502,7 @@ fgprocess_data (qdaemon, fdoacks, freturncontrol, pfexit, pcneed, pffound) cinbuf -= CFRAMELEN; /* Make sure we have enough data. If we don't, wait for - more. */ + more. */ cwant = (int) CPACKLEN (ab); if (cinbuf < cwant) @@ -1511,7 +1511,7 @@ fgprocess_data (qdaemon, fdoacks, freturncontrol, pfexit, pcneed, pffound) *pcneed = cwant - cinbuf; return TRUE; } - + /* Set up the data pointers and compute the checksum. */ if (iPrecend >= iPrecstart) cfirst = cwant; @@ -1546,7 +1546,7 @@ fgprocess_data (qdaemon, fdoacks, freturncontrol, pfexit, pcneed, pffound) (((0xaaaa - (icheck ^ (ab[IFRAME_CONTROL] & 0xff))) & 0xffff))); } - + ihdrcheck = (unsigned short) (((ab[IFRAME_CHECKHIGH] & 0xff) << 8) | (ab[IFRAME_CHECKLOW] & 0xff)); diff --git a/gnu/libexec/uucp/uucico/proti.c b/gnu/libexec/uucp/uucico/proti.c index 6d9a97a..17b540e 100644 --- a/gnu/libexec/uucp/uucico/proti.c +++ b/gnu/libexec/uucp/uucico/proti.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char proti_rcsid[] = "$Id: proti.c,v 1.29 1994/03/26 03:39:05 ian Rel $"; +const char proti_rcsid[] = "$Id: proti.c,v 1.2 1994/05/07 18:13:48 ache Exp $"; #endif #include <ctype.h> @@ -866,7 +866,7 @@ fisenddata (qdaemon, zdata, cdata, ilocal, iremote, ipos) DEBUG_MESSAGE4 (DEBUG_PROTO, "fisenddata: Sending packet %d size %d local %d remote %d", - iIsendseq, (int) cdata, ilocal, iremote); + iIsendseq, (int) cdata, ilocal, iremote); iIsendseq = INEXTSEQ (iIsendseq); ++cIsent_packets; @@ -1535,7 +1535,7 @@ fiprocess_packet (qdaemon, zhdr, zfirst, cfirst, zsecond, csecond, pfexit) case NAK: /* We must resend the requested packet. */ - { + { int iseq; char *zsend; size_t clen; @@ -1598,7 +1598,7 @@ fiprocess_packet (qdaemon, zhdr, zfirst, cfirst, zsecond, csecond, pfexit) zsend[IHDR_CHECK] = IHDRCHECK_VAL (zsend); iIlocal_ack = iIrecseq; } - + ++cIresent_packets; clen = CHDRCON_GETBYTES (zsend[IHDR_CONTENTS1], diff --git a/gnu/libexec/uucp/uucico/prott.c b/gnu/libexec/uucp/uucico/prott.c index 26bb730..8bf703a 100644 --- a/gnu/libexec/uucp/uucico/prott.c +++ b/gnu/libexec/uucp/uucico/prott.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char prott_rcsid[] = "$Id: prott.c,v 1.27 1994/01/30 21:01:46 ian Rel $"; +const char prott_rcsid[] = "$Id: prott.c,v 1.2 1994/05/07 18:13:51 ache Exp $"; #endif #include "uudefs.h" @@ -96,7 +96,7 @@ ftstart (qdaemon, pzlog) /* Stop the protocol. */ /*ARGSUSED*/ -boolean +boolean ftshutdown (qdaemon) struct sdaemon *qdaemon; { @@ -269,7 +269,7 @@ ftprocess_data (qdaemon, pfexit, pcneed) return FALSE; iPrecstart = (iPrecstart + clen) % CRECBUFLEN; - + if (*pfexit) return TRUE; diff --git a/gnu/libexec/uucp/uucico/protz.c b/gnu/libexec/uucp/uucico/protz.c index 5dd2473..7bcf803 100644 --- a/gnu/libexec/uucp/uucico/protz.c +++ b/gnu/libexec/uucp/uucico/protz.c @@ -8,7 +8,7 @@ * Ian Taylor's UUCP package. * * It was originally developed to establish a uucp link between myself and my - * employer: Ivation Datasystems, Inc. of Ottawa. + * employer: Ivation Datasystems, Inc. of Ottawa. * * My thanks to Ivation for letting me release this to the public. Given that * Zmodem is in the public domain, no additional copyrights have been added. @@ -139,7 +139,7 @@ * ZDATA (ZCRCG, xx bytes) - received ok * ZDATA (ZCRCF, 0 bytes) - corrupted * - * At this point the receiver would like to send back a ZRPOS with a value + * At this point the receiver would like to send back a ZRPOS with a value * of the size of the file. However, it can't because the value is divided * by 32, and it would have to round up to the next multiple of 32. This * seemed a little ugly, so I went with using the entire header to store @@ -148,7 +148,7 @@ ***************************************************************************** * * Source version: - * + * * 1.1,2,3 * Protocol version 0 * Early attempts, completely rewritten later. @@ -181,7 +181,7 @@ #include "uucp.h" #if USE_RCS_ID -const char protz_rcsid[] = "$Id: protz.c,v 1.8 1993/12/20 00:44:49 ian Rel $"; +const char protz_rcsid[] = "$Id: protz.c,v 1.2 1994/05/07 18:13:52 ache Exp $"; #endif #include <errno.h> @@ -1397,14 +1397,14 @@ static unsigned long crc_32_tab[] = { /* CRC polynomial 0xedb88320 */ }; /* - * updcrc macro derived from article Copyright (C) 1986 Stephen Satchell. + * updcrc macro derived from article Copyright (C) 1986 Stephen Satchell. * NOTE: First argument must be in range 0 to 255. * Second argument is referenced twice. - * - * Programmers may incorporate any or all code into their programs, - * giving proper credit within the source. Publication of the - * source routines is permitted so long as proper credit is given - * to Stephen Satchell, Satchell Evaluations and Chuck Forsberg, + * + * Programmers may incorporate any or all code into their programs, + * giving proper credit within the source. Publication of the + * source routines is permitted so long as proper credit is given + * to Stephen Satchell, Satchell Evaluations and Chuck Forsberg, * Omen Technology. */ diff --git a/gnu/libexec/uucp/uucico/rec.c b/gnu/libexec/uucp/uucico/rec.c index d9f907a..08b31a4 100644 --- a/gnu/libexec/uucp/uucico/rec.c +++ b/gnu/libexec/uucp/uucico/rec.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char rec_rcsid[] = "$Id: rec.c,v 1.2 1994/05/07 18:13:55 ache Exp $"; +const char rec_rcsid[] = "$Id: rec.c,v 1.3 1994/11/06 10:17:11 davidg Exp $"; #endif #include <errno.h> @@ -123,7 +123,7 @@ urrec_free (qtrans) } utransfree (qtrans); -} +} /* Set up a request for a file from the remote system. This may be called before the remote system has been called. @@ -569,7 +569,7 @@ fremote_send_file_init (qdaemon, qcmd, iremote) qcmd->zfrom); return fremote_send_fail (qdaemon, qcmd, FAILURE_PERM, iremote); } - + fspool = fspool_file (qcmd->zto); /* We don't accept remote command files. An execution request may @@ -897,7 +897,7 @@ fremote_send_fail_send (qtrans, qdaemon) ab[2] = '\0'; break; } - + ab[3] = '\0'; qinfo->fsent = TRUE; @@ -1063,7 +1063,7 @@ frec_file_end (qtrans, qdaemon, zdata, cdata) imode = 0666; (void) fsysdep_change_mode (qinfo->zfile, imode); } - + zerr = NULL; } diff --git a/gnu/libexec/uucp/uucico/send.c b/gnu/libexec/uucp/uucico/send.c index cf8b5b1..72d0083 100644 --- a/gnu/libexec/uucp/uucico/send.c +++ b/gnu/libexec/uucp/uucico/send.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char send_rcsid[] = "$Id: send.c,v 1.2 1994/05/07 18:13:57 ache Exp $"; +const char send_rcsid[] = "$Id: send.c,v 1.3 1994/11/06 10:17:13 davidg Exp $"; #endif #include <errno.h> @@ -110,7 +110,7 @@ usfree_send (qtrans) } utransfree (qtrans); -} +} /* Set up a local request to send a file. This may be called before we have even tried to call the remote system. @@ -263,7 +263,7 @@ flocal_send_file_init (qdaemon, qcmd) else qdaemon->cmax_ever = c2; } - + if (qdaemon->cmax_ever != -1 && qdaemon->cmax_ever < qcmd->cbytes) return flocal_send_fail ((struct stransfer *) NULL, qcmd, qdaemon, @@ -1056,7 +1056,7 @@ fremote_rec_fail_send (qtrans, qdaemon) z = "RN"; break; } - + xfree (qtrans->pinfo); utransfree (qtrans); fret = (*qdaemon->qproto->pfsendcmd) (qdaemon, z, ilocal, iremote); diff --git a/gnu/libexec/uucp/uucico/trans.c b/gnu/libexec/uucp/uucico/trans.c index 9c6766e..1cb5487 100644 --- a/gnu/libexec/uucp/uucico/trans.c +++ b/gnu/libexec/uucp/uucico/trans.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char trans_rcsid[] = "$Id: trans.c,v 1.31 1994/01/30 20:59:40 ian Rel $"; +const char trans_rcsid[] = "$Id: trans.c,v 1.2 1994/05/07 18:13:59 ache Exp $"; #endif #include <errno.h> @@ -411,8 +411,8 @@ utransfree (q) ubuffree ((char *) q->s.ztemp); ubuffree ((char *) q->s.znotify); ubuffree ((char *) q->s.zcmd); - - utchanfree (q); + + utchanfree (q); if (q->iremote > 0) { aqTremote[q->iremote] = NULL; @@ -488,9 +488,9 @@ ftcharge (qdaemon, qtrans, fsend, fforce) { qother->isecs = inextsecs; qother->imicros = inextmicros; - } + } } - + qcharge->qtrans = qtrans; qcharge->isecs = inextsecs; qcharge->imicros = inextmicros; @@ -612,7 +612,7 @@ fqueue (qdaemon, pfany) break; #endif } - } + } if (pfany != NULL) *pfany = qTlocal != NULL; @@ -926,7 +926,7 @@ floop (qdaemon) TRUE if we just receive data for a file. This routine never sets *pfexit to FALSE. */ -boolean +boolean fgot_data (qdaemon, zfirst, cfirst, zsecond, csecond, ilocal, iremote, ipos, fallacked, pfexit) struct sdaemon *qdaemon; diff --git a/gnu/libexec/uucp/uucico/uucico.c b/gnu/libexec/uucp/uucico/uucico.c index 90cbcce..8183980 100644 --- a/gnu/libexec/uucp/uucico/uucico.c +++ b/gnu/libexec/uucp/uucico/uucico.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char uucico_rcsid[] = "$Id: uucico.c,v 1.2 1994/05/07 18:14:02 ache Exp $"; +const char uucico_rcsid[] = "$Id: uucico.c,v 1.3 1994/05/25 20:14:52 ache Exp $"; #endif #include <ctype.h> @@ -333,7 +333,7 @@ main (argc, argv) else uusage (); break; - + case 's': /* Set system name */ zsystem = optarg; @@ -1339,7 +1339,7 @@ fdo_call (qdaemon, qstat, qdialer, pfcalled, pterr) ulog_uuconf (LOG_ERROR, puuconf, iuuconf); return FALSE; } - } + } zsend = zbufalc (strlen (qdaemon->zlocalname) + 70); if (! qsys->uuconf_fsequence) @@ -1907,7 +1907,7 @@ faccept_call (puuconf, zconfig, fuuxqt, zlogin, qconn, pzsystem) } else qdialer = qport->uuconf_u.uuconf_smodem.uuconf_qdialer; - } + } else if (qport->uuconf_ttype == UUCONF_PORTTYPE_TCP || (qport->uuconf_ttype == UUCONF_PORTTYPE_TLI && (qport->uuconf_ireliable @@ -2195,7 +2195,7 @@ faccept_call (puuconf, zconfig, fuuxqt, zlogin, qconn, pzsystem) getopt, which is distributed with the program anyhow. */ optind = 0; opterr = 0; - + while ((iopt = getopt (pzset - paz, paz, "N::p:Q:RU:v:x:")) != EOF) { @@ -2427,7 +2427,7 @@ faccept_call (puuconf, zconfig, fuuxqt, zlogin, qconn, pzsystem) uaccept_call_cleanup (puuconf, &ssys, qport, &sport, zloc); return FALSE; } - + /* The master will now send back the selected protocol. */ zstr = zget_uucp_cmd (qconn, TRUE); if (zstr == NULL) @@ -2757,7 +2757,7 @@ zget_uucp_cmd (qconn, frequired) while ((ctimeout = (int) (iendtime - ixsysdep_time ((long *) NULL))) > 0) { int b; - + b = breceive_char (qconn, ctimeout, frequired); /* Now b == -1 on timeout, -2 on error. */ if (b < 0) @@ -2873,7 +2873,7 @@ static char * zget_typed_line (qconn) struct sconnection *qconn; { - static boolean flastcr; + static boolean flastcr; char *zalc; size_t calc; size_t cgot; @@ -2897,7 +2897,7 @@ zget_typed_line (qconn) while (TRUE) { int b; - + b = breceive_char (qconn, CTIMEOUT, FALSE); /* Now b == -1 on timeout, -2 on error. */ diff --git a/gnu/libexec/uucp/uuconv/Makefile b/gnu/libexec/uucp/uuconv/Makefile index f83920b..1f9feff 100644 --- a/gnu/libexec/uucp/uuconv/Makefile +++ b/gnu/libexec/uucp/uuconv/Makefile @@ -1,10 +1,10 @@ # Makefile for uuconv -# $Id: Makefile,v 1.3 1994/05/31 05:46:34 ache Exp $ +# $Id: Makefile,v 1.4 1995/05/14 17:01:07 ache Exp $ BINDIR= $(sbindir) PROG= uuconv -SRCS= uuconv.c +SRCS= uuconv.c LDADD+= $(LIBUNIX) $(LIBUUCONF) $(LIBUUCP) DPADD+= $(LIBUNIX) $(LIBUUCONF) $(LIBUUCP) CFLAGS+= -I$(.CURDIR)/../common_sources\ diff --git a/gnu/libexec/uucp/uuconv/uuconv.c b/gnu/libexec/uucp/uuconv/uuconv.c index 1f5d948..3d6ee47 100644 --- a/gnu/libexec/uucp/uuconv/uuconv.c +++ b/gnu/libexec/uucp/uuconv/uuconv.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char uuconv_rcsid[] = "$Id: uuconv.c,v 1.22 1994/03/29 01:09:32 ian Rel $"; +const char uuconv_rcsid[] = "$Id: uuconv.c,v 1.2 1994/05/07 18:14:06 ache Exp $"; #endif #include "getopt.h" @@ -395,7 +395,7 @@ main (argc, argv) piportfn, (pointer) eport, &sport); break; } - + if (iret != UUCONF_NOT_FOUND) uvuuconf_error (pinput, iret); @@ -740,7 +740,7 @@ uvwrite_chat (e, q, qlast, zprefix, fforce) || qlast->uuconf_pzfail != q->uuconf_pzfail)) for (pz = q->uuconf_pzfail; *pz != NULL; pz++) fprintf (e, "%schat-fail %s\n", zprefix, *pz); - + if (qlast == NULL || qlast->uuconf_fstrip != q->uuconf_fstrip) { sprintf (ab, "%schat-strip", zprefix); @@ -924,7 +924,7 @@ uvwrite_taylor_system (e, q) if (CHANGED (uuconf_qproto_params)) uvwrite_proto_params (e, q->uuconf_qproto_params, ""); - + uvwrite_chat (e, &q->uuconf_scalled_chat, (qlast == NULL ? (struct uuconf_chat *) NULL @@ -1064,7 +1064,7 @@ uvwrite_v2_system (e, q) && q->uuconf_zphone != NULL) { char **pzc; - + fprintf (e, " %s", q->uuconf_zphone); pzc = q->uuconf_schat.uuconf_pzchat; if (pzc != (char **) &_uuconf_unset @@ -1142,7 +1142,7 @@ uvwrite_hdb_system (e, qsys) && q->uuconf_zphone != NULL) { char **pzc; - + fprintf (e, " %s", q->uuconf_zphone); pzc = q->uuconf_schat.uuconf_pzchat; if (pzc != (char **) &_uuconf_unset @@ -1312,7 +1312,7 @@ fvperm_array_cmp (pz1, pz2) break; return *pz1 == NULL && *pz2 == NULL; -} +} /* Add a Permissions entry to a global list, combining entries where possible. */ @@ -1502,7 +1502,7 @@ uvwrite_perm_array (e, pzarg, zcmd, pccol) return; c = strlen (zcmd) + 1; - + for (pz = pzarg; *pz != NULL; pz++) c += strlen (*pz) + 1; @@ -2001,7 +2001,7 @@ uvwrite_taylor_dialer (e, qdialer, zprefix) qdialer->uuconf_sabort.uuconf_ctimeout = -1; if (qdialer->uuconf_sabort.uuconf_fstrip) qdialer->uuconf_sabort.uuconf_fstrip = -1; - + uvwrite_chat (e, &qdialer->uuconf_schat, (struct uuconf_chat *) NULL, zprefix, FALSE); if (qdialer->uuconf_zdialtone != NULL diff --git a/gnu/libexec/uucp/uulog/uulog.c b/gnu/libexec/uucp/uulog/uulog.c index 44e3314..fbf6bff 100644 --- a/gnu/libexec/uucp/uulog/uulog.c +++ b/gnu/libexec/uucp/uulog/uulog.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char uulog_rcsid[] = "$Id: uulog.c,v 1.21 1994/01/30 20:59:40 ian Rel $"; +const char uulog_rcsid[] = "$Id: uulog.c,v 1.2 1994/05/07 18:14:12 ache Exp $"; #endif #include <ctype.h> @@ -350,7 +350,7 @@ main (argc, argv) zluser = znext; cluser = strcspn (znext, " \t"); #endif - + /* Skip the first field. */ znext += strcspn (znext, " \t"); znext += strspn (znext, " \t"); diff --git a/gnu/libexec/uucp/uustat/uustat.c b/gnu/libexec/uucp/uustat/uustat.c index 7649dd4..edeccfa 100644 --- a/gnu/libexec/uucp/uustat/uustat.c +++ b/gnu/libexec/uucp/uustat/uustat.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char uustat_rcsid[] = "$Id: uustat.c,v 1.44 1994/01/30 20:59:40 ian Rel $"; +const char uustat_rcsid[] = "$Id: uustat.c,v 1.2 1994/05/07 18:14:24 ache Exp $"; #endif #include <ctype.h> @@ -885,7 +885,7 @@ fsworkfiles (puuconf, icmd, csystems, pazsystems, fnotsystems, cusers, ulog_uuconf (LOG_ERROR, puuconf, iuuconf); return FALSE; } - + for (pz = pznames; *pz != NULL; pz++) { if (csystems > 0) @@ -1281,7 +1281,7 @@ fsworkfile_show (puuconf, icmd, qsys, qcmd, itime, ccommands, pazcommands, else if ((icmd & JOB_KILL) != 0 || (icmd & JOB_REJUVENATE) != 0) fkill_or_rejuv = TRUE; - + if (fkill_or_rejuv && (qlist->s.zuser == NULL || strcmp (zsysdep_login_name (), qlist->s.zuser) != 0) @@ -1466,7 +1466,7 @@ fsexecutions (puuconf, icmd, csystems, pazsystems, fnotsystems, cusers, { ubuffree (zfile); ubuffree (zsystem); - continue; + continue; } if (cusers == 0) @@ -2286,7 +2286,7 @@ fsquery_show (qsys, cwork, ifirstwork, qxqt, inow, zlocalname, usysdep_localtime (sstat.ilast, &stime); - printf (" %02d-%02d %02d:%02d ", + printf (" %02d-%02d %02d:%02d ", stime.tm_mon + 1,stime.tm_mday, stime.tm_hour, stime.tm_min); printf ("%s\n", azStatus[(int) sstat.ttype]); diff --git a/gnu/libexec/uucp/uux/uux.c b/gnu/libexec/uucp/uux/uux.c index ef5c90a..c5e7c20 100644 --- a/gnu/libexec/uucp/uux/uux.c +++ b/gnu/libexec/uucp/uux/uux.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char uux_rcsid[] = "$Id: uux.c,v 1.4 1994/05/07 18:14:35 ache Exp $"; +const char uux_rcsid[] = "$Id: uux.c,v 1.5 1994/10/02 23:09:41 ache Exp $"; #endif #include "uudefs.h" @@ -227,7 +227,7 @@ main (argc, argv) break; case 'I': - /* Configuration file name. */ + /* Configuration file name. */ if (fsysdep_other_config (optarg)) zconfig = optarg; break; @@ -1170,7 +1170,7 @@ main (argc, argv) s.cbytes = -1; s.zcmd = zfullcmd; s.ipos = 0; - + ++cXcmds; pasXcmds = (struct scmd *) xrealloc ((pointer) pasXcmds, cXcmds * sizeof (struct scmd)); diff --git a/gnu/libexec/uucp/uuxqt/uuxqt.c b/gnu/libexec/uucp/uuxqt/uuxqt.c index 890aa43..825f8a5 100644 --- a/gnu/libexec/uucp/uuxqt/uuxqt.c +++ b/gnu/libexec/uucp/uuxqt/uuxqt.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char uuxqt_rcsid[] = "$Id: uuxqt.c,v 1.2 1994/05/07 18:14:43 ache Exp $"; +const char uuxqt_rcsid[] = "$Id: uuxqt.c,v 1.3 1994/10/22 03:51:36 ache Exp $"; #endif #include <errno.h> @@ -658,7 +658,7 @@ iqset (puuconf, argc, argv, pvar, pinfo) int argc; char **argv; pointer pvar; - pointer pinfo; + pointer pinfo; { boolean *pf = (boolean *) pvar; @@ -1161,7 +1161,7 @@ uqdo_xqt_file (puuconf, zfile, zbase, qsys, zlocalname, zcmd, pfprocessed) (const char *) NULL))) { ulog (LOG_ERROR, "Not permitted to read %s", zQinput); - + if (zmail != NULL && ! fQno_ack) { const char *az[20]; @@ -1190,7 +1190,7 @@ uqdo_xqt_file (puuconf, zfile, zbase, qsys, zlocalname, zcmd, pfprocessed) && strcmp (zQoutsys, zlocalname) != 0) { char *zdata; - + /* The output file is destined for some other system, so we must use a temporary file to catch standard output. */ if (strcmp (zQoutsys, qsys->uuconf_zname) == 0) @@ -1240,7 +1240,7 @@ uqdo_xqt_file (puuconf, zfile, zbase, qsys, zlocalname, zcmd, pfprocessed) else { boolean fok; - + qoutsys = NULL; /* If we permitted the standard output to be redirected into @@ -1278,7 +1278,7 @@ uqdo_xqt_file (puuconf, zfile, zbase, qsys, zlocalname, zcmd, pfprocessed) if (! fok) { ulog (LOG_ERROR, "Not permitted to write to %s", zQoutfile); - + if (zmail != NULL && ! fQno_ack) { const char *az[20]; diff --git a/gnu/libexec/ypxfr/yp_xdr.c b/gnu/libexec/ypxfr/yp_xdr.c index 91a3ad8..850d62e 100644 --- a/gnu/libexec/ypxfr/yp_xdr.c +++ b/gnu/libexec/ypxfr/yp_xdr.c @@ -15,40 +15,40 @@ struct { char *data; } *xdr_ypall_callback; -bool_t +bool_t __xdr_ypstat(XDR *xdrs, ypstat *objp) { - + if (!xdr_enum(xdrs, (enum_t *)objp)) { return (FALSE); } return (TRUE); } -bool_t +bool_t __xdr_valdat(XDR *xdrs, valdat *objp) { - + if (!xdr_bytes(xdrs, (char **)&objp->valdat_val, (u_int *)&objp->valdat_len, YPMAXRECORD)) { return (FALSE); } return (TRUE); -} +} -bool_t +bool_t __xdr_keydat(XDR *xdrs, keydat *objp) { - + if (!xdr_bytes(xdrs, (char **)&objp->keydat_val, (u_int *)&objp->keydat_len, YPMAXRECORD)) { return (FALSE); } return (TRUE); -} +} bool_t __xdr_ypresp_key_val(XDR *xdrs, ypresp_key_val *objp) { - + if (!__xdr_ypstat(xdrs, &objp->stat)) { return (FALSE); } @@ -139,7 +139,7 @@ __xdr_ypresp_all(XDR *xdrs, ypresp_all *objp) } } #endif - + return(TRUE); } } diff --git a/gnu/libexec/ypxfr/ypclnt.c b/gnu/libexec/ypxfr/ypclnt.c index 9f8a316..04e58b9 100644 --- a/gnu/libexec/ypxfr/ypclnt.c +++ b/gnu/libexec/ypxfr/ypclnt.c @@ -18,7 +18,7 @@ Modified for use with FreeBSD 2.x by Bill Paul (wpaul@ctr.columbia.edu) - $Id: ypclnt.c,v 1.2 1995/02/06 23:35:48 wpaul Exp $ + $Id: ypclnt.c,v 1.3 1995/03/31 05:45:21 wpaul Exp $ */ #include <stdio.h> @@ -40,7 +40,7 @@ struct dom_binding { void * m; }; #include <rpcsvc/ypclnt.h> - + static struct sockaddr_in ServerAddress; static CLIENT *UdpClient=NULL, *TcpClient=NULL; extern void Perror __P((const char *, ...)); @@ -53,7 +53,7 @@ eachresult( caddr_t resultsp, struct sockaddr_in *raddr) return((bool_t) TRUE); } #endif - + static struct sockaddr_in * __do_ypbind(domainname d) { @@ -73,8 +73,8 @@ __do_ypbind(domainname d) clnt_pcreateerror(""); return NULL; } - - rc=clnt_call(localBindClient, YPBINDPROC_DOMAIN, + + rc=clnt_call(localBindClient, YPBINDPROC_DOMAIN, xdr_domainname, (char *)&d, xdr_ypbind_resp, (char *)&r, t); if (rc) { clnt_perrno(rc); @@ -118,16 +118,16 @@ __yp_unbind(char *DomainName) if (TcpClient) clnt_destroy(TcpClient); TcpClient=NULL; } - + int _yp_bind(struct sockaddr_in *ServerAddress, char *DomainName) { struct sockaddr_in UdpServerAddress, TcpServerAddress; int UdpSockp, TcpSockp; static struct timeval Wait = { 5, 0 }; - + if (UdpClient || TcpClient) __yp_unbind(DomainName); - + bcopy(ServerAddress, &UdpServerAddress, sizeof(*ServerAddress)); UdpServerAddress.sin_port=0; UdpSockp=(RPC_ANYSOCK); @@ -145,9 +145,9 @@ _yp_bind(struct sockaddr_in *ServerAddress, char *DomainName) return(YPERR_RPC); } return(0); - + } - + int __yp_bind(char *DomainName) { @@ -156,7 +156,7 @@ __yp_bind(char *DomainName) static bool_t res; # endif static domainname domain; - + domain=DomainName; # ifndef SOCKSERVER # ifdef YPBROADCAST @@ -189,11 +189,11 @@ __yp_all( char *DomainName, char *MapName, struct ypall_callback *CallBack) ypresp_all *resp; extern struct ypall_callback *xdr_ypall_callback; int Status; - + do { if (TcpClient==NULL) if ((Status=__yp_bind(DomainName))) return(Status); - + req.domain=DomainName; req.map=MapName; xdr_ypall_callback=CallBack; @@ -219,7 +219,7 @@ _yp_clear(char *DomainName) { void *resp; int Status; - + do { if (UdpClient==NULL) if ((Status=yp_bind(DomainName))) return(Status); diff --git a/gnu/libexec/ypxfr/ypxfr.c b/gnu/libexec/ypxfr/ypxfr.c index 2c24550..e3a4734 100644 --- a/gnu/libexec/ypxfr/ypxfr.c +++ b/gnu/libexec/ypxfr/ypxfr.c @@ -18,7 +18,7 @@ Modified for use with FreeBSD 2.x by Bill Paul (wpaul@ctr.columbia.edu) - $Id: ypxfr.c,v 1.2 1995/02/06 23:35:49 wpaul Exp $ + $Id: ypxfr.c,v 1.5 1995/03/31 05:45:23 wpaul Exp $ */ #include <stdio.h> @@ -61,7 +61,7 @@ struct dom_binding { CLIENT *dom_client; u_short dom_local_port; long dom_vers; -}; +}; #define DATUM /* Otherwise ypclnt.h redefines datum */ #include <rpcsvc/ypclnt.h> @@ -133,7 +133,7 @@ ypxfr_foreach(int status, char *key, int keylen, char *val, int vallen, static enum ypxfrstat ypxfr(char *mapName) { - + int localOrderNum=0; int masterOrderNum=0; char *masterName; @@ -264,7 +264,7 @@ ypxfr(char *mapName) { localHost.sin_addr.s_addr=htonl(INADDR_LOOPBACK); if (_yp_bind(&localHost, TargetDomain) || _yp_clear(TargetDomain)) return YPXFR_CLEAR; - } + } return y==0?YPXFR_SUCC:YPXFR_YPERR; } diff --git a/gnu/usr.bin/as/Makefile b/gnu/usr.bin/as/Makefile index 6c45203..c8d73c3 100644 --- a/gnu/usr.bin/as/Makefile +++ b/gnu/usr.bin/as/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 6.1 (Berkeley) 3/3/91 -# $Id: Makefile,v 1.6 1994/12/23 22:35:56 nate Exp $ +# $Id: Makefile,v 1.7 1995/01/16 17:40:57 ache Exp $ .include "config/Makefile.$(MACHINE)" @@ -38,7 +38,7 @@ SUBDIR+= doc beforedepend ${PROG}: ${CONF_HEADERS} -targ-cpu.h: Makefile config/Makefile.$(MACHINE) $(.CURDIR)/config/tc-$(gas_target).h +targ-cpu.h: Makefile config/Makefile.$(MACHINE) $(.CURDIR)/config/tc-$(gas_target).h @cmp -s $(.CURDIR)/config/tc-$(gas_target).h targ-cpu.h || \ ( ${ECHO} "updating ${.TARGET}..." ; /bin/rm -f targ-cpu.h ; \ cp $(.CURDIR)/config/tc-$(gas_target).h targ-cpu.h ) diff --git a/gnu/usr.bin/as/Makefile.in b/gnu/usr.bin/as/Makefile.in index 1497b1f..9e76458 100644 --- a/gnu/usr.bin/as/Makefile.in +++ b/gnu/usr.bin/as/Makefile.in @@ -212,17 +212,17 @@ config.status: app.o : app.c as.h host.h targ-env.h obj-format.h \ targ-cpu.h struc-symbol.h \ - write.h flonum.h bignum.h expr.h frags.h hash.h read.h symbols.h tc.h obj.h + write.h flonum.h bignum.h expr.h frags.h hash.h read.h symbols.h tc.h obj.h as.o : as.c as.h host.h targ-env.h obj-format.h \ targ-cpu.h struc-symbol.h \ - write.h flonum.h bignum.h expr.h frags.h hash.h read.h symbols.h tc.h obj.h + write.h flonum.h bignum.h expr.h frags.h hash.h read.h symbols.h tc.h obj.h atof-generic.o : atof-generic.c as.h host.h targ-env.h obj-format.h \ targ-cpu.h struc-symbol.h \ - write.h flonum.h bignum.h expr.h frags.h hash.h read.h symbols.h tc.h obj.h + write.h flonum.h bignum.h expr.h frags.h hash.h read.h symbols.h tc.h obj.h bignum-copy.o : bignum-copy.c as.h host.h \ targ-env.h obj-format.h \ targ-cpu.h struc-symbol.h \ - write.h flonum.h bignum.h expr.h frags.h hash.h read.h symbols.h tc.h obj.h + write.h flonum.h bignum.h expr.h frags.h hash.h read.h symbols.h tc.h obj.h cond.o : cond.c as.h host.h targ-env.h obj-format.h \ targ-cpu.h struc-symbol.h \ write.h flonum.h bignum.h expr.h frags.h hash.h read.h symbols.h tc.h obj.h @@ -230,72 +230,72 @@ cond.o : cond.c as.h host.h targ-env.h obj-format.h \ debug.o : debug.c as.h host.h targ-env.h obj-format.h \ targ-cpu.h struc-symbol.h \ write.h flonum.h bignum.h expr.h frags.h hash.h read.h symbols.h tc.h obj.h \ - subsegs.h + subsegs.h expr.o : expr.c as.h host.h targ-env.h obj-format.h \ targ-cpu.h struc-symbol.h \ write.h flonum.h bignum.h expr.h frags.h hash.h read.h symbols.h tc.h obj.h -flo-const.o : flo-const.c flonum.h bignum.h +flo-const.o : flo-const.c flonum.h bignum.h flo-copy.o : flo-copy.c as.h host.h targ-env.h obj-format.h \ targ-cpu.h struc-symbol.h \ - write.h flonum.h bignum.h expr.h frags.h hash.h read.h symbols.h tc.h obj.h -flonum-mult.o : flonum-mult.c flonum.h bignum.h + write.h flonum.h bignum.h expr.h frags.h hash.h read.h symbols.h tc.h obj.h +flonum-mult.o : flonum-mult.c flonum.h bignum.h frags.o : frags.c as.h host.h targ-env.h obj-format.h \ targ-cpu.h struc-symbol.h \ write.h flonum.h bignum.h expr.h frags.h hash.h read.h symbols.h tc.h obj.h \ - subsegs.h + subsegs.h hash.o : hash.c as.h host.h targ-env.h obj-format.h \ targ-cpu.h struc-symbol.h \ - write.h flonum.h bignum.h expr.h frags.h hash.h read.h symbols.h tc.h obj.h -hex-value.o : hex-value.c + write.h flonum.h bignum.h expr.h frags.h hash.h read.h symbols.h tc.h obj.h +hex-value.o : hex-value.c input-file.o : input-file.c as.h host.h \ targ-env.h obj-format.h targ-cpu.h \ struc-symbol.h write.h flonum.h bignum.h expr.h \ - frags.h hash.h read.h symbols.h tc.h obj.h input-file.h + frags.h hash.h read.h symbols.h tc.h obj.h input-file.h input-scrub.o : input-scrub.c /usr/include/errno.h /usr/include/sys/errno.h \ as.h host.h targ-env.h obj-format.h \ targ-cpu.h struc-symbol.h \ write.h flonum.h bignum.h expr.h frags.h hash.h read.h symbols.h tc.h obj.h \ - input-file.h + input-file.h listing.o : listing.c as.h host.h targ-env.h flonum.h bignum.h \ listing.h obj-format.h targ-cpu.h struc-symbol.h write.h expr.h \ frags.h hash.h read.h symbols.h tc.h obj.h input-file.h messages.o : messages.c as.h host.h targ-env.h obj-format.h \ targ-cpu.h struc-symbol.h \ write.h flonum.h bignum.h expr.h frags.h hash.h read.h symbols.h tc.h obj.h -obstack.o : obstack.c +obstack.o : obstack.c output-file.o : output-file.c as.h host.h targ-env.h obj-format.h \ targ-cpu.h struc-symbol.h \ write.h flonum.h bignum.h expr.h frags.h hash.h read.h symbols.h tc.h obj.h \ - output-file.h + output-file.h read.o : read.c as.h host.h targ-env.h obj-format.h \ targ-cpu.h struc-symbol.h \ write.h flonum.h bignum.h expr.h frags.h hash.h read.h symbols.h tc.h obj.h -strstr.o : strstr.c +strstr.o : strstr.c subsegs.o : subsegs.c as.h host.h targ-env.h obj-format.h \ targ-cpu.h struc-symbol.h \ write.h flonum.h bignum.h expr.h frags.h hash.h read.h symbols.h tc.h obj.h \ - subsegs.h + subsegs.h symbols.o : symbols.c as.h host.h targ-env.h obj-format.h \ targ-cpu.h struc-symbol.h \ write.h flonum.h bignum.h expr.h frags.h hash.h read.h symbols.h tc.h obj.h \ - subsegs.h -version.o : version.c + subsegs.h +version.o : version.c write.o : write.c as.h host.h targ-env.h obj-format.h \ targ-cpu.h struc-symbol.h \ write.h flonum.h bignum.h expr.h frags.h hash.h read.h symbols.h tc.h obj.h \ - subsegs.h output-file.h + subsegs.h output-file.h xmalloc.o : xmalloc.c -xrealloc.o : xrealloc.c +xrealloc.o : xrealloc.c atof-targ.o : atof-targ.c as.h host.h targ-env.h obj-format.h \ targ-cpu.h struc-symbol.h \ write.h flonum.h bignum.h expr.h frags.h hash.h read.h \ - symbols.h tc.h obj.h + symbols.h tc.h obj.h obj-format.o : obj-format.c as.h host.h targ-env.h obj-format.h \ targ-cpu.h struc-symbol.h \ write.h flonum.h bignum.h expr.h frags.h hash.h read.h \ - symbols.h tc.h obj.h + symbols.h tc.h obj.h targ-cpu.o : targ-cpu.c targ-env.h obj-format.h \ targ-cpu.h struc-symbol.h \ write.h flonum.h bignum.h expr.h frags.h hash.h read.h \ @@ -306,7 +306,7 @@ targ-cpu.o : targ-cpu.c targ-env.h obj-format.h \ doc: $(srcdir)/as.info $(srcdir)/as.info: $(srcdir)/doc/as.texinfo - (cd doc; make as.info; mv as.info $srcdir) + (cd doc; make as.info; mv as.info $srcdir) clean: (cd doc ; $(MAKE) clean) @@ -348,7 +348,7 @@ uninstall: tags TAGS: force etags $(REAL_HEADERS) $(REAL_SOURCES) $(srcdir)/config/*.[hc] $(srcdir)/README $(srcdir)/Makefile.in - + bootstrap: as.new force $(MAKE) stage1 $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage1/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as.new diff --git a/gnu/usr.bin/as/app.c b/gnu/usr.bin/as/app.c index e1c0296..15e88e9 100644 --- a/gnu/usr.bin/as/app.c +++ b/gnu/usr.bin/as/app.c @@ -24,7 +24,7 @@ pair. This needs better error-handling. */ #ifndef lint -static char rcsid[] = "$Id: app.c,v 1.2 1993/11/03 00:51:05 paul Exp $"; +static char rcsid[] = "$Id: app.c,v 1.3 1994/12/23 22:35:59 nate Exp $"; #endif #include <stdio.h> @@ -64,7 +64,7 @@ static int process_escape PARAMS ((int)); built statically at compile time rather than dynamically each and every time the assembler is run. xoxorich. */ -void +void do_scrub_begin () { const char *p; @@ -122,13 +122,13 @@ do_scrub_begin () FILE *scrub_file; -int +int scrub_from_file () { return getc (scrub_file); } -void +void scrub_to_file (ch) int ch; { @@ -138,13 +138,13 @@ scrub_to_file (ch) char *scrub_string; char *scrub_last_string; -int +int scrub_from_string () { return scrub_string == scrub_last_string ? EOF : *scrub_string++; } /* scrub_from_string() */ -void +void scrub_to_string (ch) int ch; { @@ -194,7 +194,7 @@ app_push () return (char *) saved; } -void +void app_pop (arg) char *arg; { @@ -215,7 +215,7 @@ app_pop (arg) /* @@ This assumes that \n &c are the same on host and target. This is not necessarily true. */ -static int +static int process_escape (ch) int ch; { @@ -239,7 +239,7 @@ process_escape (ch) return ch; } } -int +int do_scrub_next_char (get, unget) int (*get) (); void (*unget) (); diff --git a/gnu/usr.bin/as/as.c b/gnu/usr.bin/as/as.c index a9cbb70..920efb7 100644 --- a/gnu/usr.bin/as/as.c +++ b/gnu/usr.bin/as/as.c @@ -1,18 +1,18 @@ /* as.c - GAS main program. Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -32,7 +32,7 @@ * */ #ifndef lint -static char rcsid[] = "$Id: as.c,v 1.3 1993/10/02 20:57:15 pk Exp $"; +static char rcsid[] = "$Id: as.c,v 1.2 1993/11/03 00:51:09 paul Exp $"; #endif #include <stdio.h> @@ -92,18 +92,18 @@ char **argv; char *arg; /* an arg to program */ char a; /* an arg flag (after -) */ static const int sig[] = { SIGHUP, SIGINT, SIGPIPE, SIGTERM, 0}; - + for (a=0;sig[a] != 0;a++) if (signal(sig[a], SIG_IGN) != SIG_IGN) signal(sig[a], got_sig); - + myname=argv[0]; memset(flagseen, '\0', sizeof(flagseen)); /* aint seen nothing yet */ #ifndef OBJ_DEFAULT_OUTPUT_FILE_NAME #define OBJ_DEFAULT_OUTPUT_FILE_NAME "a.out" #endif /* OBJ_DEFAULT_OUTPUT_FILE_NAME */ out_file_name = OBJ_DEFAULT_OUTPUT_FILE_NAME; - + symbol_begin(); /* symbols.c */ subsegs_begin(); /* subsegs.c */ read_begin(); /* read.c */ @@ -127,7 +127,7 @@ char **argv; work_argv = argv+1; /* skip argv[0] */ for (;work_argc--;work_argv++) { arg = * work_argv; /* work_argv points to this argument */ - + if (*arg != '-') /* Filename. We need it later. */ continue; /* Keep scanning args looking for flags. */ if (arg[1] == '-' && arg[2] == 0) { @@ -138,7 +138,7 @@ char **argv; } /* This better be a switch. */ arg ++; /*->letter. */ - + while ((a = * arg) != '\0') {/* scan all the 1-char flags */ arg ++; /* arg->after letter. */ a &= 0x7F; /* ascii only please */ @@ -146,13 +146,13 @@ char **argv; as_tsktsk("%s: Flag option - %c has already been seen.", myname, a); */ flagseen[a] = 1; switch (a) { - - case 'a': + + case 'a': { int loop =1; - + while (loop) { - switch (*arg) + switch (*arg) { case 'l': listing |= LISTING_LISTING; @@ -166,7 +166,7 @@ char **argv; listing |= LISTING_HLL; arg++; break; - + case 'n': listing |= LISTING_NOFORM; arg++; @@ -183,18 +183,18 @@ char **argv; } } } - + break; - - + + case 'f': break; /* -f means fast - no need for "app" preprocessor. */ - + case 'D': /* DEBUG is implemented: it debugs different */ /* things to other people's assemblers. */ break; - + #ifdef DONTDEF case 'G': /* GNU AS switch: include gdbsyms. */ if (*arg) /* Rest of argument is file-name. */ @@ -208,9 +208,9 @@ char **argv; arg = ""; /* Finished with this arg. */ break; #endif - + case 'I': { /* Include file directory */ - + char *temp = NULL; if (*arg) temp = stralloc (arg); @@ -224,15 +224,15 @@ char **argv; arg = ""; /* Finished with this arg. */ break; } - + #if 00000 case 'k': break; #endif - + case 'L': /* -L means keep L* symbols */ break; - + case 'o': if (*arg) /* Rest of argument is object file-name. */ out_file_name = stralloc (arg); @@ -244,11 +244,11 @@ char **argv; as_warn("%s: I expected a filename after -o. \"%s\" assumed.", myname, out_file_name); arg = ""; /* Finished with this arg. */ break; - + case 'R': /* -R means put data into text segment */ break; - + case 'v': #ifdef OBJ_VMS { @@ -262,7 +262,7 @@ char **argv; #endif /* not OBJ_VMS */ while (*arg) arg++; /* Skip the rest */ break; - + case 'W': /* -W means don't warn about things */ case 'X': @@ -270,7 +270,7 @@ char **argv; case 'Z': /* -Z means attempt to generate object file even after errors. */ break; - + default: --arg; if (md_parse_option(&arg,&work_argc,&work_argv) == 0) @@ -302,17 +302,17 @@ char **argv; #endif if (seen_at_least_1_file() && !((had_warnings() && flagseen['Z']) - || had_errors() > 0)) { + || had_errors() > 0)) { write_object_file(); /* relax() addresses then emit object file */ } /* we also check in write_object_file() just before emit. */ - + input_scrub_end(); md_end(); /* MACHINE.c */ - + #ifndef NO_LISTING listing_print(""); #endif - + #ifndef HO_VMS return((had_warnings() && flagseen['Z']) || had_errors() > 0); /* WIN */ @@ -320,7 +320,7 @@ char **argv; return(!((had_warnings() && flagseen['Z']) || had_errors() > 0)); /* WIN */ #endif /* HO_VMS */ - + } /* main() */ @@ -341,11 +341,11 @@ char **argv; { int saw_a_file = 0; need_pass_2 = 0; - + #ifdef MANY_SEGMENTS unsigned int i; - - for (i= SEG_E0; i < SEG_UNKNOWN; i++) + + for (i= SEG_E0; i < SEG_UNKNOWN; i++) { segment_info[i].fix_root = 0; } @@ -356,13 +356,13 @@ char **argv; strcpy(segment_info[SEG_E0].scnhdr.s_name,".text"); strcpy(segment_info[SEG_E1].scnhdr.s_name,".data"); strcpy(segment_info[SEG_E2].scnhdr.s_name,".bss"); - + subseg_new (SEG_E0, 0); #else /* not MANY_SEGMENTS */ text_fix_root = NULL; data_fix_root = NULL; bss_fix_root = NULL; - + subseg_new (SEG_TEXT, 0); #endif /* not MANY_SEGMENTS */ @@ -393,7 +393,7 @@ char * str; { register char * retval; register long len; - + len = strlen (str) + 1; retval = xmalloc (len); (void) strcpy(retval, str); @@ -412,7 +412,7 @@ static SIGTY int sig; { static here_before = 0; - + as_bad("Interrupted by signal %d", sig); if (here_before++) exit(1); diff --git a/gnu/usr.bin/as/as.h b/gnu/usr.bin/as/as.h index 10ea604..2e7243d 100644 --- a/gnu/usr.bin/as/as.h +++ b/gnu/usr.bin/as/as.h @@ -1,24 +1,24 @@ /* as.h - global header file Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: as.h,v 1.2 1993/11/03 00:51:11 paul Exp $ + * $Id: as.h,v 1.3 1994/12/23 22:36:01 nate Exp $ */ #define GAS 1 @@ -206,15 +206,15 @@ typedef enum _relax_state { rs_fill, /* Variable chars to be repeated fr_offset times. Fr_symbol unused. Used with fr_offset == 0 for a constant length frag. */ - + rs_align, /* Align: Fr_offset: power of 2. 1 variable char: fill character. */ - + rs_org, /* Org: Fr_offset, fr_symbol: address. 1 variable char: fill character. */ - + rs_machine_dependent, - + #ifndef WORKING_DOT_WORD rs_broken_word, /* JF: gunpoint */ #endif @@ -242,16 +242,16 @@ typedef unsigned long relax_addressT;/* Enough bits for address. */ * of the 1st char of a frag is generally not known until after relax(). * Many things at assembly time describe an address by {object-file-address * of a particular frag}+offset. - + BUG: it may be smarter to have a single pointer off to various different - notes for different frag kinds. See how code pans + notes for different frag kinds. See how code pans */ struct frag /* a code fragment */ { unsigned long fr_address; /* Object file address. */ struct frag *fr_next; /* Chain forward; ascending address order. */ /* Rooted in frch_root. */ - + long fr_fix; /* (Fixed) number of chars we know we have. */ /* May be 0. */ long fr_var; /* (Variable) number of chars after above. */ diff --git a/gnu/usr.bin/as/atof-generic.c b/gnu/usr.bin/as/atof-generic.c index b4e0971..47a58b1 100644 --- a/gnu/usr.bin/as/atof-generic.c +++ b/gnu/usr.bin/as/atof-generic.c @@ -1,24 +1,24 @@ /* atof_generic.c - turn a string of digits into a Flonum Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef lint -static char rcsid[] = "$Id: atof-generic.c,v 1.3 1993/10/02 20:57:17 pk Exp $"; +static char rcsid[] = "$Id: atof-generic.c,v 1.2 1993/11/03 00:51:14 paul Exp $"; #endif #include <ctype.h> @@ -54,14 +54,14 @@ static char rcsid[] = "$Id: atof-generic.c,v 1.3 1993/10/02 20:57:17 pk Exp $"; \***********************************************************************/ /* - + Syntax: - + <flonum> ::= <optional-sign> <decimal-number> <optional-exponent> <optional-sign> ::= '+' | '-' | {empty} <decimal-number> ::= <integer> - | <integer> <radix-character> - | <integer> <radix-character> <integer> + | <integer> <radix-character> + | <integer> <radix-character> <integer> | <radix-character> <integer> <optional-exponent> ::= {empty} @@ -71,7 +71,7 @@ static char rcsid[] = "$Id: atof-generic.c,v 1.3 1993/10/02 20:57:17 pk Exp $"; <digit> ::= '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' <exponent-character> ::= {one character from "string_of_decimal_exponent_marks"} <radix-character> ::= {one character from "string_of_decimal_marks"} - + */ int /* 0 if OK */ @@ -94,7 +94,7 @@ FLONUM_TYPE *address_of_generic_floating_point_number; long decimal_exponent; int number_of_digits_available; char digits_sign_char; - + /* * Scan the input string, abstracting (1)digits (2)decimal mark (3) exponent. * It would be simpler to modify the string, but we don't; just to be nice @@ -102,20 +102,20 @@ FLONUM_TYPE *address_of_generic_floating_point_number; * We need to know how many digits we have, so we can allocate space for * the digits' value. */ - + char *p; char c; int seen_significant_digit; - + first_digit = *address_of_string_pointer; c = *first_digit; - + if (c == '-' || c == '+') { digits_sign_char = c; first_digit++; } else digits_sign_char = '+'; - + if ((first_digit[0] == 'n' || first_digit[0] == 'N') && (first_digit[1] == 'a' || first_digit[1] == 'A') && (first_digit[2] == 'n' || first_digit[2] == 'N')) { @@ -126,9 +126,9 @@ FLONUM_TYPE *address_of_generic_floating_point_number; *address_of_string_pointer = first_digit + 3; return(0); } - + /* 99e999 is a "special" token to some older, broken compilers. */ - if ((first_digit[0] == 'i' || first_digit[0] == 'I') + if ((first_digit[0] == 'i' || first_digit[0] == 'I') && (first_digit[1] == 'n' || first_digit[1] == 'N') && (first_digit[2] == 'f' || first_digit[2] == 'F')) { address_of_generic_floating_point_number->sign = @@ -136,7 +136,7 @@ FLONUM_TYPE *address_of_generic_floating_point_number; address_of_generic_floating_point_number->exponent = 0; address_of_generic_floating_point_number->leader = address_of_generic_floating_point_number->low; - + if ((first_digit[3] == 'i' || first_digit[3] == 'I') && (first_digit[4] == 'n' || first_digit[4] == 'N') && (first_digit[5] == 'i' || first_digit[5] == 'I') @@ -148,7 +148,7 @@ FLONUM_TYPE *address_of_generic_floating_point_number; } return(0); } - + if (strncmp(first_digit, "99e999", 6) == 0) { address_of_generic_floating_point_number->sign = digits_sign_char == '+' ? 'P' : 'N'; @@ -178,7 +178,7 @@ FLONUM_TYPE *address_of_generic_floating_point_number; break; /* p -> char after pre-decimal digits. */ } } /* For each digit before decimal mark. */ - + #ifndef OLD_FLOAT_READS /* Ignore trailing 0's after the decimal point. The original code here * (ifdef'd out) does not do this, and numbers like @@ -188,7 +188,7 @@ FLONUM_TYPE *address_of_generic_floating_point_number; */ if (c && strchr(string_of_decimal_marks, c)) { int zeros = 0; /* Length of current string of zeros */ - + for (p++; (c = *p) && isdigit(c); p++) { if (c == '0') { zeros++; @@ -216,16 +216,16 @@ FLONUM_TYPE *address_of_generic_floating_point_number; } } /* For each digit after decimal mark. */ } - + while (number_of_digits_after_decimal && first_digit[number_of_digits_before_decimal + number_of_digits_after_decimal] == '0') --number_of_digits_after_decimal; /* last_digit = p; JF unused */ #endif - + if (c && strchr(string_of_decimal_exponent_marks, c) ) { char digits_exponent_sign_char; - + c = *++p; if (c && strchr ("+-",c)) { digits_exponent_sign_char = c; @@ -233,7 +233,7 @@ FLONUM_TYPE *address_of_generic_floating_point_number; } else { digits_exponent_sign_char = '+'; } - + for ( ; (c); c = *++p) { if (isdigit(c)) { decimal_exponent = decimal_exponent * 10 + c - '0'; @@ -244,16 +244,16 @@ FLONUM_TYPE *address_of_generic_floating_point_number; break; } } - + if (digits_exponent_sign_char == '-') { decimal_exponent = -decimal_exponent; } } - + *address_of_string_pointer = p; - + number_of_digits_available = number_of_digits_before_decimal + number_of_digits_after_decimal; return_value = 0; @@ -266,7 +266,7 @@ FLONUM_TYPE *address_of_generic_floating_point_number; } else { int count; /* Number of useful digits left to scan. */ - + LITTLENUM_TYPE *digits_binary_low; int precision; int maximum_useful_digits; @@ -277,33 +277,33 @@ FLONUM_TYPE *address_of_generic_floating_point_number; int size_of_digits_in_chars; FLONUM_TYPE power_of_10_flonum; FLONUM_TYPE digits_flonum; - + precision = (address_of_generic_floating_point_number->high - address_of_generic_floating_point_number->low + 1); /* Number of destination littlenums. */ - + /* Includes guard bits (two littlenums worth) */ maximum_useful_digits = (((double) (precision - 2)) * ((double) (LITTLENUM_NUMBER_OF_BITS)) / (LOG_TO_BASE_2_OF_10)) + 2; /* 2 :: guard digits. */ - + if (number_of_digits_available > maximum_useful_digits) { number_of_digits_to_use = maximum_useful_digits; } else { number_of_digits_to_use = number_of_digits_available; } - + decimal_exponent += number_of_digits_before_decimal - number_of_digits_to_use; - + more_than_enough_bits_for_digits = ((((double)number_of_digits_to_use) * LOG_TO_BASE_2_OF_10) + 1); - + more_than_enough_littlenums_for_digits = (more_than_enough_bits_for_digits / LITTLENUM_NUMBER_OF_BITS) + 2; - + /* * Compute (digits) part. In "12.34E56" this is the "1234" part. * Arithmetic is exact here. If no digits are supplied then @@ -313,18 +313,18 @@ FLONUM_TYPE *address_of_generic_floating_point_number; * Assume no alignment problems => (room for n objects) == * n * (room for 1 object). */ - + size_of_digits_in_littlenums = more_than_enough_littlenums_for_digits; size_of_digits_in_chars = size_of_digits_in_littlenums * sizeof(LITTLENUM_TYPE); - + digits_binary_low = (LITTLENUM_TYPE *) alloca(size_of_digits_in_chars); - + memset((char *)digits_binary_low, '\0', size_of_digits_in_chars); - + /* Digits_binary_low[] is allocated and zeroed. */ - + /* * Parse the decimal digits as if * digits_low was in the units position. * Emit a binary number into digits_binary_low[]. @@ -332,7 +332,7 @@ FLONUM_TYPE *address_of_generic_floating_point_number; * Use a large-precision version of: * (((1st-digit) * 10 + 2nd-digit) * 10 + 3rd-digit ...) * 10 + last-digit */ - + for (p = first_digit, count = number_of_digits_to_use; count; p++, --count) { c = *p; if (isdigit(c)) { @@ -340,11 +340,11 @@ FLONUM_TYPE *address_of_generic_floating_point_number; * Multiply by 10. Assume can never overflow. * Add this digit to digits_binary_low[]. */ - + long carry; LITTLENUM_TYPE *littlenum_pointer; LITTLENUM_TYPE *littlenum_limit; - + littlenum_limit = digits_binary_low + more_than_enough_littlenums_for_digits - 1; @@ -355,7 +355,7 @@ FLONUM_TYPE *address_of_generic_floating_point_number; littlenum_pointer <= littlenum_limit; littlenum_pointer++) { long work; - + work = carry + 10 * (long) (*littlenum_pointer); *littlenum_pointer = work & LITTLENUM_MASK; carry = work >> LITTLENUM_NUMBER_OF_BITS; @@ -372,8 +372,8 @@ FLONUM_TYPE *address_of_generic_floating_point_number; ++ count; /* '.' doesn't alter digits used count. */ } /* if valid digit */ } /* for each digit */ - - + + /* * Digits_binary_low[] properly encodes the value of the digits. * Forget about any high-order littlenums that are 0. @@ -381,7 +381,7 @@ FLONUM_TYPE *address_of_generic_floating_point_number; while (digits_binary_low[size_of_digits_in_littlenums - 1] == 0 && size_of_digits_in_littlenums >= 2) size_of_digits_in_littlenums--; - + digits_flonum.low = digits_binary_low; digits_flonum.high = digits_binary_low + size_of_digits_in_littlenums - 1; digits_flonum.leader = digits_flonum.high; @@ -399,14 +399,14 @@ FLONUM_TYPE *address_of_generic_floating_point_number; * input. */ digits_flonum.sign = '+'; - + { /* * Compute the mantssa (& exponent) of the power of 10. * If sucessful, then multiply the power of 10 by the digits * giving return_binary_mantissa and return_binary_exponent. */ - + LITTLENUM_TYPE *power_binary_low; int decimal_exponent_is_negative; /* This refers to the "-56" in "12.34E-56". */ @@ -416,17 +416,17 @@ FLONUM_TYPE *address_of_generic_floating_point_number; LITTLENUM_TYPE *temporary_binary_low; int size_of_power_in_littlenums; int size_of_power_in_chars; - + size_of_power_in_littlenums = precision; /* Precision has a built-in fudge factor so we get a few guard bits. */ - + decimal_exponent_is_negative = decimal_exponent < 0; if (decimal_exponent_is_negative) { decimal_exponent = -decimal_exponent; } /* From now on: the decimal exponent is > 0. Its sign is seperate. */ - + size_of_power_in_chars = size_of_power_in_littlenums * sizeof(LITTLENUM_TYPE) + 2; @@ -445,7 +445,7 @@ FLONUM_TYPE *address_of_generic_floating_point_number; * (power) == 1. * Space for temporary_flonum allocated. */ - + /* * ... * @@ -461,7 +461,7 @@ FLONUM_TYPE *address_of_generic_floating_point_number; /* flonum_XXXX_powers_of_ten[]. */ int place_number; const FLONUM_TYPE *multiplicand; /* -> 10^(2^n) */ - + place_number_limit = table_size_of_flonum_powers_of_ten; multiplicand = (decimal_exponent_is_negative @@ -505,20 +505,20 @@ FLONUM_TYPE *address_of_generic_floating_point_number; (void) putchar('\n'); #endif } - + } - + /* * power_of_10_flonum is power of ten in binary (mantissa) , (exponent). * It may be the number 1, in which case we don't NEED to multiply. * * Multiply (decimal digits) by power_of_10_flonum. */ - + flonum_multip(&power_of_10_flonum, &digits_flonum, address_of_generic_floating_point_number); /* Assert sign of the number we made is '+'. */ address_of_generic_floating_point_number->sign = digits_sign_char; - + } /* If we had any significant digits. */ return(return_value); } /* atof_generic () */ diff --git a/gnu/usr.bin/as/bignum-copy.c b/gnu/usr.bin/as/bignum-copy.c index 08c92f8..ec90e39 100644 --- a/gnu/usr.bin/as/bignum-copy.c +++ b/gnu/usr.bin/as/bignum-copy.c @@ -1,24 +1,24 @@ /* bignum_copy.c - copy a bignum Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef lint -static char rcsid[] = "$Id: bignum-copy.c,v 1.3 1993/10/02 20:57:18 pk Exp $"; +static char rcsid[] = "$Id: bignum-copy.c,v 1.2 1993/11/03 00:51:16 paul Exp $"; #endif #include "as.h" @@ -43,18 +43,18 @@ register LITTLENUM_TYPE *out; register int out_length; /* in sizeof(littlenum)s */ { int significant_littlenums_dropped; - + if (out_length < in_length) { LITTLENUM_TYPE *p; /* -> most significant (non-zero) input - littlenum. */ - + littlenum. */ + memcpy((void *) out, (void *) in, - out_length << LITTLENUM_SHIFT); + out_length << LITTLENUM_SHIFT); for (p = in + in_length - 1; p >= in; --p) { if (* p) break; } significant_littlenums_dropped = p - in - in_length + 1; - + if (significant_littlenums_dropped < 0) { significant_littlenums_dropped = 0; } @@ -69,7 +69,7 @@ register int out_length; /* in sizeof(littlenum)s */ significant_littlenums_dropped = 0; } - + return(significant_littlenums_dropped); } /* bignum_copy() */ diff --git a/gnu/usr.bin/as/bignum.h b/gnu/usr.bin/as/bignum.h index d95ca9a..64efadc 100644 --- a/gnu/usr.bin/as/bignum.h +++ b/gnu/usr.bin/as/bignum.h @@ -1,24 +1,24 @@ /* bignum.h-arbitrary precision integers Copyright (C) 1987, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: bignum.h,v 1.3 1993/10/02 20:57:19 pk Exp $ + * $Id: bignum.h,v 1.2 1993/11/03 00:51:18 paul Exp $ */ /***********************************************************************\ diff --git a/gnu/usr.bin/as/bit_fix.h b/gnu/usr.bin/as/bit_fix.h index e72d6d6..14988ff 100644 --- a/gnu/usr.bin/as/bit_fix.h +++ b/gnu/usr.bin/as/bit_fix.h @@ -1,37 +1,37 @@ /* write.h Copyright (C) 1987, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: bit_fix.h,v 1.1 1993/10/02 20:57:19 pk Exp $ + * $Id: bit_fix.h,v 1.1 1993/11/03 00:51:19 paul Exp $ */ /* The bit_fix was implemented to support machines that need variables - to be inserted in bitfields other than 1, 2 and 4 bytes. + to be inserted in bitfields other than 1, 2 and 4 bytes. Furthermore it gives us a possibillity to mask in bits in the symbol when it's fixed in the objectcode and check the symbols limits. - + The or-mask is used to set the huffman bits in displacements for the ns32k port. The acbi, addqi, movqi, cmpqi instruction requires an assembler that can handle bitfields. Ie handle an expression, evaluate it and insert - the result in an some bitfield. ( ex: 5 bits in a short field of a opcode) + the result in an some bitfield. ( ex: 5 bits in a short field of a opcode) */ #ifndef __bit_fix_h__ diff --git a/gnu/usr.bin/as/cond.c b/gnu/usr.bin/as/cond.c index 8e2ea43..3eb8db7 100644 --- a/gnu/usr.bin/as/cond.c +++ b/gnu/usr.bin/as/cond.c @@ -18,7 +18,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef lint -static char rcsid[] = "$Id: cond.c,v 1.1 1993/11/03 00:51:20 paul Exp $"; +static char rcsid[] = "$Id: cond.c,v 1.2 1994/12/23 22:36:03 nate Exp $"; #endif #include "as.h" @@ -49,7 +49,7 @@ static void initialize_cframe PARAMS ((struct conditional_frame *cframe)); static struct conditional_frame *current_cframe = NULL; -void +void s_ifdef (arg) int arg; { @@ -79,7 +79,7 @@ s_ifdef (arg) return; } /* s_ifdef() */ -void +void s_if (arg) int arg; { @@ -106,7 +106,7 @@ s_if (arg) return; } /* s_if() */ -void +void s_endif (arg) int arg; { @@ -126,7 +126,7 @@ s_endif (arg) return; } /* s_endif() */ -void +void s_else (arg) int arg; { @@ -161,7 +161,7 @@ s_else (arg) return; } /* s_else() */ -void +void s_ifeqs (arg) int arg; { @@ -170,14 +170,14 @@ s_ifeqs (arg) return; } /* s_ifeqs() */ -void +void s_end (arg) int arg; { return; } /* s_end() */ -int +int ignore_input () { /* We cannot ignore certain pseudo ops. */ @@ -196,7 +196,7 @@ ignore_input () return ((current_cframe != NULL) && (current_cframe->ignoring)); } /* ignore_input() */ -static void +static void initialize_cframe (cframe) struct conditional_frame *cframe; { diff --git a/gnu/usr.bin/as/config/aout.h b/gnu/usr.bin/as/config/aout.h index fcc6a0e..9856cb0 100644 --- a/gnu/usr.bin/as/config/aout.h +++ b/gnu/usr.bin/as/config/aout.h @@ -1,19 +1,19 @@ /* This file is aout.h Copyright (C) 1987-1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -56,10 +56,10 @@ enum reloc_type { RELOC_WDISP19, RELOC_HHI22, RELOC_HLO10, - + /* 29K relocation types */ RELOC_JUMPTARG, RELOC_CONST, RELOC_CONSTH, - + RELOC_WDISP14, RELOC_WDISP21, #endif /* not TC_SPARC */ NO_RELOC, @@ -186,7 +186,7 @@ enum machine_type { #ifndef N_SEGSIZE #define N_SEGSIZE(x) SEGMENT_SIZE #endif - + /* This complexity is for encapsulated COFF support */ #ifndef _N_HDROFF #define _N_HDROFF(x) (N_SEGSIZE(x) - sizeof (struct exec)) @@ -223,7 +223,7 @@ enum machine_type { #ifndef N_TXTADDR #define N_TXTADDR(x) 0 #endif - + #ifndef N_DATADDR #define N_DATADDR(x) \ (N_MAGIC(x) == OMAGIC? (N_TXTADDR(x)+(x).a_text) \ @@ -263,7 +263,7 @@ struct nlist { /* The following type indicates the definition of a symbol as being an indirect reference to another symbol. The other symbol appears as an undefined reference, immediately following this symbol. - + Indirection is asymmetrical. The other symbol's value will be used to satisfy requests for the indirect symbol, but not vice versa. If the other symbol does not have a definition, libraries will @@ -279,7 +279,7 @@ struct nlist { Space is allocated for the set in the text section, and each set element's value is stored into one word of the space. The first word of the space is the length of the set (number of elements). - + The address of the set is made into an N_SETV symbol whose name is the same as the name of the set. This symbol acts like a N_DATA global symbol @@ -308,7 +308,7 @@ struct nlist { /* The following enum and struct were borrowed from SunOS's /usr/include/sun4/a.out.h and extended to handle other machines. It is currently used on SPARC and AMD 29000. - + reloc_ext_bytes is how it looks on disk. reloc_info_extended is how we might process it on a native host. */ @@ -353,7 +353,7 @@ struct reloc_info_extended # define r_symbolnum r_index unsigned r_extern:1; unsigned :2; - /* RS/6000 compiler does not support enum bitfield + /* RS/6000 compiler does not support enum bitfield enum reloc_type r_type:5; */ enum reloc_type r_type; long int r_addend; diff --git a/gnu/usr.bin/as/config/atof-ieee.c b/gnu/usr.bin/as/config/atof-ieee.c index 18941cc..7040f11 100644 --- a/gnu/usr.bin/as/config/atof-ieee.c +++ b/gnu/usr.bin/as/config/atof-ieee.c @@ -1,24 +1,24 @@ /* atof_ieee.c - turn a Flonum into an IEEE floating point number Copyright (C) 1987, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef lint -static char rcsid[] = "$Id: atof-ieee.c,v 1.3 1993/10/02 20:58:25 pk Exp $"; +static char rcsid[] = "$Id: atof-ieee.c,v 1.2 1993/11/03 00:53:04 paul Exp $"; #endif #include "as.h" @@ -86,14 +86,14 @@ static int int number_of_bits; { int return_value; - + if (!littlenums_left) return(0); if (number_of_bits >= bits_left_in_littlenum) { return_value = mask[bits_left_in_littlenum] & *littlenum_pointer; number_of_bits -= bits_left_in_littlenum; return_value <<= number_of_bits; - + if (--littlenums_left) { bits_left_in_littlenum = LITTLENUM_NUMBER_OF_BITS - number_of_bits; --littlenum_pointer; @@ -161,27 +161,27 @@ LITTLENUM_TYPE *words; /* Build the binary here. */ int precision; /* Number of 16-bit words in the format. */ long exponent_bits; FLONUM_TYPE save_gen_flonum; - + /* We have to save the generic_floating_point_number because it contains storage allocation about the array of LITTLENUMs where the value is actually stored. We will allocate our own array of littlenums below, but have to restore the global one on exit. */ save_gen_flonum = generic_floating_point_number; - + return_value = str; generic_floating_point_number.low = bits + MAX_PRECISION; generic_floating_point_number.high = NULL; generic_floating_point_number.leader = NULL; generic_floating_point_number.exponent = NULL; generic_floating_point_number.sign = '\0'; - + /* Use more LittleNums than seems */ /* necessary: the highest flonum may have */ /* 15 leading 0 bits, so could be useless. */ - + memset(bits, '\0', sizeof(LITTLENUM_TYPE) * MAX_PRECISION); - + switch (what_kind) { case 'f': case 'F': @@ -190,7 +190,7 @@ LITTLENUM_TYPE *words; /* Build the binary here. */ precision = F_PRECISION; exponent_bits = 8; break; - + case 'd': case 'D': case 'r': @@ -198,7 +198,7 @@ LITTLENUM_TYPE *words; /* Build the binary here. */ precision = D_PRECISION; exponent_bits = 11; break; - + case 'x': case 'X': case 'e': @@ -206,32 +206,32 @@ LITTLENUM_TYPE *words; /* Build the binary here. */ precision = X_PRECISION; exponent_bits = 15; break; - + case 'p': case 'P': - + precision = P_PRECISION; exponent_bits = -1; break; - + default: make_invalid_floating_point_number(words); return(NULL); } - + generic_floating_point_number.high = generic_floating_point_number.low + precision - 1 + GUARD; - + if (atof_generic(&return_value, ".", EXP_CHARS, &generic_floating_point_number)) { /* as_bad("Error converting floating point number (Exponent overflow?)"); */ make_invalid_floating_point_number(words); return(NULL); } gen_to_words(words, precision, exponent_bits); - + /* Restore the generic_floating_point_number's storage alloc (and everything else). */ generic_floating_point_number = save_gen_flonum; - + return(return_value); } @@ -242,7 +242,7 @@ int precision; long exponent_bits; { int return_value = 0; - + long exponent_1; long exponent_2; long exponent_3; @@ -250,7 +250,7 @@ long exponent_bits; int exponent_skippage; LITTLENUM_TYPE word1; LITTLENUM_TYPE *lp; - + if (generic_floating_point_number.low > generic_floating_point_number.leader) { /* 0.0e0 seen. */ if (generic_floating_point_number.sign == '+') @@ -260,7 +260,7 @@ long exponent_bits; memset(&words[1], '\0', sizeof(LITTLENUM_TYPE) * (precision - 1)); return(return_value); } - + /* NaN: Do the right thing */ if (generic_floating_point_number.sign == 0) { if (precision == F_PRECISION) { @@ -322,23 +322,23 @@ long exponent_bits; /* Forget leading zeros, forget 1st bit. */ exponent_4 = exponent_3 + ((1 << (exponent_bits - 1)) - 2); /* Offset exponent. */ - + lp = words; - + /* Word 1. Sign, exponent and perhaps high bits. */ word1 = (generic_floating_point_number.sign == '+') ? 0 : (1 << (LITTLENUM_NUMBER_OF_BITS - 1)); - + /* Assume 2's complement integers. */ if (exponent_4 < 1 && exponent_4 >= -62) { int prec_bits; int num_bits; - + unget_bits(1); num_bits = -exponent_4; prec_bits = LITTLENUM_NUMBER_OF_BITS * precision - (exponent_bits + 1 + num_bits); if (precision == X_PRECISION && exponent_bits == 15) prec_bits -= LITTLENUM_NUMBER_OF_BITS + 1; - + if (num_bits >= LITTLENUM_NUMBER_OF_BITS - exponent_bits) { /* Bigger than one littlenum */ num_bits -= (LITTLENUM_NUMBER_OF_BITS - 1) - exponent_bits; @@ -378,14 +378,14 @@ long exponent_bits; } while (lp < words + precision) *lp++ = next_bits(LITTLENUM_NUMBER_OF_BITS); - + /* Round the mantissa up, but don't change the number */ if (next_bits(1)) { --lp; if (prec_bits > LITTLENUM_NUMBER_OF_BITS) { int n = 0; int tmp_bits; - + n = 0; tmp_bits = prec_bits; while (tmp_bits > LITTLENUM_NUMBER_OF_BITS) { @@ -396,7 +396,7 @@ long exponent_bits; } if (tmp_bits > LITTLENUM_NUMBER_OF_BITS || (lp[n] & mask[tmp_bits]) != mask[tmp_bits]) { unsigned long carry; - + for (carry = 1; carry && (lp >= words); lp --) { carry = *lp + carry; *lp = carry; @@ -406,13 +406,13 @@ long exponent_bits; } else if ((*lp & mask[prec_bits]) != mask[prec_bits]) lp++; } - + return return_value; } else if (exponent_4 & ~ mask[exponent_bits]) { /* * Exponent overflow. Lose immediately. */ - + /* * We leave return_value alone: admit we read the * number, but return a floating exception @@ -424,20 +424,20 @@ long exponent_bits; word1 |= (exponent_4 << ((LITTLENUM_NUMBER_OF_BITS - 1) - exponent_bits)) | next_bits ((LITTLENUM_NUMBER_OF_BITS - 1) - exponent_bits); } - + *lp++ = word1; - + /* X_PRECISION is special: it has 16 bits of zero in the middle, followed by a 1 bit. */ if (exponent_bits == 15 && precision == X_PRECISION) { *lp++ = 0; *lp++ = 1 << (LITTLENUM_NUMBER_OF_BITS) | next_bits(LITTLENUM_NUMBER_OF_BITS - 1); } - + /* The rest of the words are just mantissa bits. */ while (lp < words + precision) *lp++ = next_bits(LITTLENUM_NUMBER_OF_BITS); - + if (next_bits(1)) { unsigned long carry; /* @@ -448,7 +448,7 @@ long exponent_bits; * highest-order bit of the lowest-order word flips. * Is that clear? */ - + /* #if (sizeof(carry)) < ((sizeof(bits[0]) * BITS_PER_CHAR) + 2) Please allow at least 1 more bit in carry than is in a LITTLENUM. We need that extra bit to hold a carry during a LITTLENUM carry @@ -484,7 +484,7 @@ long x; { char buf[20]; char *bufp; - + sprintf(buf,"%ld",x); bufp = &buf[0]; if (atof_generic(&bufp, ".", EXP_CHARS, &generic_floating_point_number)) @@ -501,7 +501,7 @@ FLONUM_TYPE *gen; double dv; float fv; static char sbuf[40]; - + if (gen) { f = generic_floating_point_number; generic_floating_point_number = *gen; @@ -512,11 +512,11 @@ FLONUM_TYPE *gen; gen_to_words(&arr[0], 2, 8); memcpy(&fv, &arr[0], sizeof(float)); sprintf(sbuf + strlen(sbuf), "%x %x %.12g\n", arr[0], arr[1], fv); - + if (gen) { generic_floating_point_number = f; } - + return(sbuf); } #endif diff --git a/gnu/usr.bin/as/config/atof-tahoe.c b/gnu/usr.bin/as/config/atof-tahoe.c index 6425e93..64d00ea 100644 --- a/gnu/usr.bin/as/config/atof-tahoe.c +++ b/gnu/usr.bin/as/config/atof-tahoe.c @@ -253,7 +253,7 @@ flonum_gen2tahoe (format_letter, f, words) * So we need: number of bits of exponent, number of bits of * mantissa. */ - + bits_left_in_littlenum = LITTLENUM_NUMBER_OF_BITS; littlenum_pointer = f -> leader; littlenum_end = f->low; @@ -271,15 +271,15 @@ flonum_gen2tahoe (format_letter, f, words) /* Forget leading zeros, forget 1st bit. */ exponent_4 = exponent_3 + (1 << (exponent_bits - 1)); /* Offset exponent. */ - + if (exponent_4 & ~ mask [exponent_bits]) { /* * Exponent overflow. Lose immediately. */ - + make_invalid_floating_point_number (words); - + /* * We leave return_value alone: admit we read the * number, but return a floating exception @@ -289,20 +289,20 @@ flonum_gen2tahoe (format_letter, f, words) else { lp = words; - + /* Word 1. Sign, exponent and perhaps high bits. */ /* Assume 2's complement integers. */ word1 = ((exponent_4 & mask [exponent_bits]) << (15 - exponent_bits)) | ((f -> sign == '+') ? 0 : 0x8000) | next_bits (15 - exponent_bits); * lp ++ = word1; - + /* The rest of the words are just mantissa bits. */ for (; lp < words + precision; lp++) { * lp = next_bits (LITTLENUM_NUMBER_OF_BITS); } - + if (next_bits (1)) { /* @@ -313,9 +313,9 @@ flonum_gen2tahoe (format_letter, f, words) * highest-order bit of the lowest-order word flips. * Is that clear? */ - + unsigned long int carry; - + /* #if (sizeof(carry)) < ((sizeof(bits[0]) * BITS_PER_CHAR) + 2) Please allow at least 1 more bit in carry than is in a LITTLENUM. @@ -333,7 +333,7 @@ flonum_gen2tahoe (format_letter, f, words) * lp = carry; carry >>= LITTLENUM_NUMBER_OF_BITS; } - + if ( (word1 ^ *words) & (1 << (LITTLENUM_NUMBER_OF_BITS - 1)) ) { make_invalid_floating_point_number (words); diff --git a/gnu/usr.bin/as/config/atof-vax.c b/gnu/usr.bin/as/config/atof-vax.c index 8a69502..56ad35a 100644 --- a/gnu/usr.bin/as/config/atof-vax.c +++ b/gnu/usr.bin/as/config/atof-vax.c @@ -1,18 +1,18 @@ /* atof_vax.c - turn a Flonum into a VAX floating point number Copyright (C) 1987, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -45,7 +45,7 @@ int /* Number of chars in flonum type 'letter'. */ char letter; { int return_value; - + /* * Permitting uppercase letters is probably a bad idea. * Please use only lower-cased letters in case the upper-cased @@ -57,19 +57,19 @@ char letter; case 'F': return_value = 4; break; - + case 'd': case 'D': case 'g': case 'G': return_value = 8; break; - + case 'h': case 'H': return_value = 16; break; - + default: return_value = 0; break; @@ -124,7 +124,7 @@ static int int number_of_bits; { int return_value; - + if (littlenum_pointer<littlenum_end) return 0; if (number_of_bits >= bits_left_in_littlenum) @@ -159,7 +159,7 @@ int * precisionP; /* Number of 16-bit words in the float. */ long * exponent_bitsP; /* Number of exponent bits. */ { int retval; /* 0: OK. */ - + retval = 0; switch (letter) { @@ -167,22 +167,22 @@ long * exponent_bitsP; /* Number of exponent bits. */ * precisionP = F_PRECISION; * exponent_bitsP = 8; break; - + case 'd': * precisionP = D_PRECISION; * exponent_bitsP = 8; break; - + case 'g': * precisionP = G_PRECISION; * exponent_bitsP = 11; break; - + case 'h': * precisionP = H_PRECISION; * exponent_bitsP = 15; break; - + default: retval = 69; break; @@ -213,14 +213,14 @@ LITTLENUM_TYPE *words; /* Build the binary here. */ char *return_value; int precision; /* Number of 16-bit words in the format. */ long exponent_bits; - + return_value = str; f.low = bits + MAX_PRECISION; f.high = NULL; f.leader = NULL; f.exponent = NULL; f.sign = '\0'; - + if (what_kind_of_float (what_kind, & precision, & exponent_bits)) { return_value = NULL; /* We lost. */ make_invalid_floating_point_number (words); @@ -228,12 +228,12 @@ LITTLENUM_TYPE *words; /* Build the binary here. */ if (return_value) { memset(bits, '\0', sizeof(LITTLENUM_TYPE) * MAX_PRECISION); - + /* Use more LittleNums than seems */ /* necessary: the highest flonum may have */ /* 15 leading 0 bits, so could be useless. */ f.high = f.low + precision - 1 + GUARD; - + if (atof_generic (& return_value, ".", "eE", & f)) { make_invalid_floating_point_number (words); return_value = NULL; /* we lost */ @@ -261,9 +261,9 @@ LITTLENUM_TYPE *words; /* Deliver answer here. */ int precision; long exponent_bits; int return_value; /* 0 == OK. */ - + return_value = what_kind_of_float(format_letter, &precision, &exponent_bits); - + if (return_value != 0) { make_invalid_floating_point_number (words); } else { @@ -277,7 +277,7 @@ memset(words, '\0', sizeof(LITTLENUM_TYPE) * precision); long exponent_4; int exponent_skippage; LITTLENUM_TYPE word1; - + /* JF: Deal with new Nan, +Inf and -Inf codes */ if (f->sign != '-' && f->sign != '+') { make_invalid_floating_point_number(words); @@ -298,7 +298,7 @@ memset(words, '\0', sizeof(LITTLENUM_TYPE) * precision); * So we need: number of bits of exponent, number of bits of * mantissa. */ - + #ifdef NEVER /******* This zeroing seems redundant - Dean 3may86 **********/ /* * No matter how few bits we got back from the atof() @@ -314,7 +314,7 @@ memset(words, '\0', sizeof(LITTLENUM_TYPE) * precision); } } #endif - + bits_left_in_littlenum = LITTLENUM_NUMBER_OF_BITS; littlenum_pointer = f->leader; littlenum_end = f->low; @@ -322,7 +322,7 @@ memset(words, '\0', sizeof(LITTLENUM_TYPE) * precision); for (exponent_skippage = 0; ! next_bits(1); exponent_skippage ++) ;; - + exponent_1 = f->exponent + f->leader + 1 - f->low; /* Radix LITTLENUM_RADIX, point just higher than f->leader. */ exponent_2 = exponent_1 * LITTLENUM_NUMBER_OF_BITS; @@ -331,14 +331,14 @@ memset(words, '\0', sizeof(LITTLENUM_TYPE) * precision); /* Forget leading zeros, forget 1st bit. */ exponent_4 = exponent_3 + (1 << (exponent_bits - 1)); /* Offset exponent. */ - + if (exponent_4 & ~mask[exponent_bits]) { /* * Exponent overflow. Lose immediately. */ - + make_invalid_floating_point_number (words); - + /* * We leave return_value alone: admit we read the * number, but return a floating exception @@ -346,19 +346,19 @@ memset(words, '\0', sizeof(LITTLENUM_TYPE) * precision); */ } else { lp = words; - + /* Word 1. Sign, exponent and perhaps high bits. */ /* Assume 2's complement integers. */ word1 = (((exponent_4 &mask[exponent_bits]) << (15 - exponent_bits)) | ((f->sign == '+') ? 0 : 0x8000) | next_bits(15 - exponent_bits)); *lp++ = word1; - + /* The rest of the words are just mantissa bits. */ for (; lp < words + precision; lp++) { *lp = next_bits(LITTLENUM_NUMBER_OF_BITS); } - + if (next_bits (1)) { /* * Since the NEXT bit is a 1, round UP the mantissa. @@ -368,9 +368,9 @@ memset(words, '\0', sizeof(LITTLENUM_TYPE) * precision); * highest-order bit of the lowest-order word flips. * Is that clear? */ - + unsigned long carry; - + /* #if (sizeof(carry)) < ((sizeof(bits[0]) * BITS_PER_CHAR) + 2) Please allow at least 1 more bit in carry than is in a LITTLENUM. @@ -387,7 +387,7 @@ memset(words, '\0', sizeof(LITTLENUM_TYPE) * precision); *lp = carry; carry >>= LITTLENUM_NUMBER_OF_BITS; } - + if ((word1 ^ *words) & (1 << (LITTLENUM_NUMBER_OF_BITS - 1))) { make_invalid_floating_point_number(words); /* @@ -435,36 +435,36 @@ int * sizeP; register char kind_of_float; register int number_of_chars; register LITTLENUM_TYPE * littlenum_pointer; - + switch (what_statement_type) { case 'F': /* .float */ case 'f': /* .ffloat */ kind_of_float = 'f'; break; - + case 'D': /* .double */ case 'd': /* .dfloat */ kind_of_float = 'd'; break; - + case 'g': /* .gfloat */ kind_of_float = 'g'; break; - + case 'h': /* .hfloat */ kind_of_float = 'h'; break; - + default: kind_of_float = 0; break; }; - + if (kind_of_float) { register LITTLENUM_TYPE * limit; - + input_line_pointer = atof_vax (input_line_pointer, kind_of_float, words); @@ -489,7 +489,7 @@ int * sizeP; { number_of_chars = 0; }; - + * sizeP = number_of_chars; return (kind_of_float ? "" : "Bad call to md_atof()"); } /* md_atof() */ diff --git a/gnu/usr.bin/as/config/coff.h b/gnu/usr.bin/as/config/coff.h index bcbb343..a54f35b 100644 --- a/gnu/usr.bin/as/config/coff.h +++ b/gnu/usr.bin/as/config/coff.h @@ -1,18 +1,18 @@ /* coff.h Copyright (C) 1987, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -69,7 +69,7 @@ struct filehdr { /* * Intel 80960 (I960) processor flags. - * F_I960TYPE == mask for processor type field. + * F_I960TYPE == mask for processor type field. */ #define F_I960TYPE (0xf000) @@ -105,7 +105,7 @@ struct filehdr { # define I386MAGIC 0x14c # define I386BADMAG(x) (((x).f_magic != I386MAGIC)) #endif /* not TE_I386AIX */ - + #define FILHDR struct filehdr #define FILHSZ sizeof(FILHDR) @@ -137,7 +137,7 @@ typedef struct { #define PAGEMAGIC3 (0415) /* (?) like ZMAGIC, but address zero mapped. */ #define A_MAGIC5 (0437) /* (?) "system overlay, separated I&D" */ /* intended for non-unix cross development */ -#define SASMAGIC (010000) /* Single Address Space */ +#define SASMAGIC (010000) /* Single Address Space */ #define MASMAGIC (020000) /* (?) "Multiple (separate I & D) Address Spaces" */ typedef struct aouthdr { @@ -242,7 +242,7 @@ struct scnhdr { unsigned short s_nreloc; /* number of relocation entries */ unsigned short s_nlnno; /* number of line number entries */ long s_flags; /* flags */ - + #ifdef TC_I960 unsigned long s_align; /* section alignment */ #endif /* TC_I960 */ @@ -324,7 +324,7 @@ struct lineno { }; #define LINENO struct lineno -#define LINESZ sizeof(LINENO) +#define LINESZ sizeof(LINENO) /********************** SYMBOLS **********************/ @@ -344,23 +344,23 @@ struct syment { } _n; long n_value; /* value of symbol */ short n_scnum; /* section number */ - + #ifdef TC_I960 /* This isn't yet used on the i960. In some formats this is two bytes of padding. In others, it is missing entirely. */ unsigned short n_flags; /* copy of flags from filhdr */ #endif /* TC_I960 */ - + #ifdef TC_A29K unsigned short n_type; /* type and derived type */ #else /* TC_A29K */ /* at least i960 uses long */ unsigned long n_type; /* type and derived type */ #endif /* TC_A29K */ - + char n_sclass; /* storage class */ char n_numaux; /* number of aux. entries */ - + #ifndef TC_A29K char pad2[2]; /* force alignment */ #endif /* TC_A29K */ @@ -373,12 +373,12 @@ struct syment { #define n_ptr _n._n_nptr[1] #define n_zeroes _n._n_n._n_zeroes #define n_offset _n._n_n._n_offset - + /* * Relocatable symbols have number of the section in which they are defined, * or one of the following: */ - + #define N_SCNUM ((short) 1-65535) /* section num where symbol defined */ #define N_UNDEF ((short)0) /* undefined symbol */ #define N_ABS ((short)-1) /* value of symbol is absolute */ @@ -463,7 +463,7 @@ union auxent { } x_fcnary; unsigned short x_tvndx; /* tv index */ } x_sym; - + /* This was just a struct x_file with x_fname only in a29k. xoxorich. */ union { char x_fname[FILNMLEN]; @@ -472,21 +472,21 @@ union auxent { long x_offset; } x_n; } x_file; - + struct { long x_scnlen; /* section length */ unsigned short x_nreloc; /* # relocation entries */ unsigned short x_nlinno; /* # line numbers */ } x_scn; - + struct { long x_tvfill; /* tv fill value */ unsigned short x_tvlen; /* length of .tv */ - + /* This field was typo'd x_tvrna on a29k. xoxorich. */ unsigned short x_tvran[2]; /* tv range */ } x_tv; /* info about .tv section (in auxent of symbol .tv)) */ - + #ifdef TC_I960 /****************************************** * I960-specific *2nd* aux. entry formats @@ -496,16 +496,16 @@ union auxent { #define x_stdindx x_stindx long x_stindx; /* sys. table entry */ } x_sc; /* system call entry */ - + struct { unsigned long x_balntry; /* BAL entry point */ } x_bal; /* BAL-callable function */ - + struct { unsigned long x_timestamp; /* time stamp */ char x_idstring[20]; /* producer identity string */ } x_ident; /* Producer ident info */ - + char a[sizeof(struct syment)]; /* force auxent/syment sizes to match */ #endif /* TC_I960 */ }; @@ -592,7 +592,7 @@ struct reloc { /* * X86 generic * 8-bit offset reference in 8-bits - * 8-bit offset reference in 16-bits + * 8-bit offset reference in 16-bits * 12-bit segment reference * auxiliary relocation entry */ @@ -625,7 +625,7 @@ struct reloc { #define R_IND24 015 #define R_IND32 016 -/* +/* * XL generics * 10-bit direct reference * 10-bit "relative" reference @@ -646,7 +646,7 @@ struct reloc { * 32-bit direct reference with bytes swapped */ #define R_DIR32S 012 - + #endif /* TC_I386 */ #if defined(TE_I386AIX) @@ -710,7 +710,7 @@ typedef struct ksigmask { struct corehdr { char cd_magic[4]; /* COR_MAGIC = "core" */ - + /* general information about the dump itself */ struct dumpseg { /* table of contents for dump */ long cs_type; /* seg. type; see below */ @@ -718,7 +718,7 @@ struct corehdr { long cs_offset; /* offset (in dump) of segment */ long cs_address; /* address segment had in mem */ } cd_segs[MAX_CORE_SEGS]; - + /* general information about the process */ char cd_comm[CD_NAMELEN]; /* command being run */ char cd_mach[CD_NAMELEN]; /* type of machine it ran on */ @@ -728,24 +728,24 @@ struct corehdr { char cd_dptrsize; /* sizeof(char *) */ char cd_tptrsize; /* sizeof(int (*)()) */ char cd_unused; - + /* user-mode program state */ long cd_regs[NUM_REGS]; /* user-mode general registers */ struct env387 cd_fpregs; /* user-mode floating-point state */ - + /* kernel-mode program state */ int (*cd_sig[NSIG])(); /* disposition of signals */ ksigmask_t cd_sigmask; /* signals to be blocked */ ksigmask_t cd_sigpend; /* signals currently pending */ long cd_cursig; /* signal that caused the dump */ - + long cd_pid; /* process ID of the corpse */ long cd_ppid; /* parent process ID of corpse */ short cd_uid; /* process effective user ID */ short cd_ruid; /* process real user ID */ short cd_gid; /* process effective group ID */ short cd_rgid; /* process real group ID */ - + uinfo_t cd_uinfo; /* buffer of user information */ char cd_locname[32]; /* name of /local */ char cd_uvers[CD_NAMELEN]; /* user version string */ diff --git a/gnu/usr.bin/as/config/cplus-dem.c b/gnu/usr.bin/as/config/cplus-dem.c index e3819bc..79d3279 100644 --- a/gnu/usr.bin/as/config/cplus-dem.c +++ b/gnu/usr.bin/as/config/cplus-dem.c @@ -1,17 +1,17 @@ -/* Demangler for GNU C++ +/* Demangler for GNU C++ Copyright (C) 1989, 1992 Free Software Foundation, Inc. written by James Clark (jjc@jclark.uucp) - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -20,39 +20,39 @@ require changes for any other version. */ /* This file exports one function - + char *cplus_demangle (const char *name) - + If `name' is a mangled function name produced by g++, then a pointer to a malloced string giving a C++ representation of the name will be returned; otherwise NULL will be returned. It is the caller's responsibility to free the string which is returned. - + For example, - + cplus_demangle ("_foo__1Ai") - + returns - + "A::foo(int)" - + This file imports xmalloc and xrealloc, which are like malloc and realloc except that they generate a fatal error if there is no available memory. */ /* #define nounderscore 1 /* define this is names don't start with _ */ - + #include <stdio.h> #include <string.h> #include <ctype.h> - + #if !defined(sequent) && !defined(NeXT) #include <memory.h> #else -#define memcpy(s1, s2, n) strncpy(s1, s2, n) +#define memcpy(s1, s2, n) strncpy(s1, s2, n) #define memcmp(s1, s2, n) strncmp(s1, s2, n) -#define strchr(s, c) index(s, c) +#define strchr(s, c) index(s, c) #endif #if __STDC__ != 1 @@ -170,7 +170,7 @@ const char *type; int const_flag = 0; int i; const char *p; - + if (type == NULL || *type == '\0') return NULL; #ifndef nounderscore @@ -205,9 +205,9 @@ const char *type; } return NULL; } - + string_init (&decl); - + if (p == type) { if (!isdigit (p[2])) @@ -223,7 +223,7 @@ const char *type; munge_function_name (&decl); } p += 2; - + switch (*p) { case 'C': @@ -280,7 +280,7 @@ const char *type; success = do_args (&p, &decl); break; } - + for (i = 0; i < ntypes; i++) if (typevec[i] != NULL) free (typevec[i]); @@ -291,7 +291,7 @@ const char *type; typevec = NULL; typevec_size = 0; } - + if (success) { string_appendn (&decl, "", 1); @@ -318,12 +318,12 @@ int *count; { const char *p = *type; int n = *count; - do + do { n *= 10; n += *p - '0'; p += 1; - } + } while (isdigit (*p)); if (*p == '_') { @@ -347,10 +347,10 @@ string *result; int success; string decl; const char *remembered_type; - + string_init (&decl); string_init (result); - + done = 0; success = 1; while (success && !done) @@ -362,12 +362,12 @@ string *result; *type += 1; string_prepend (&decl, "*"); break; - + case 'R': *type += 1; string_prepend (&decl, "&"); break; - + case 'T': *type += 1; if (!get_count (type, &n) || n >= ntypes) @@ -378,7 +378,7 @@ string *result; type = &remembered_type; } break; - + case 'F': *type += 1; if (!string_empty (&decl) && decl.b[0] == '*') @@ -391,13 +391,13 @@ string *result; else *type += 1; break; - + case 'M': case 'O': { int constp = 0; int volatilep = 0; - + member = **type == 'M'; *type += 1; if (!isdigit (**type)) @@ -411,7 +411,7 @@ string *result; n *= 10; n += **type - '0'; *type += 1; - } + } while (isdigit (**type)); if (strlen (*type) < n) { @@ -465,7 +465,7 @@ string *result; } break; } - + case 'C': if ((*type)[1] == 'P') { @@ -475,14 +475,14 @@ string *result; string_prepend (&decl, "const"); break; } - + /* fall through */ default: done = 1; break; } } - + done = 0; non_empty = 0; while (success && !done) @@ -518,7 +518,7 @@ string *result; break; } } - + if (success) switch (**type) { @@ -613,7 +613,7 @@ string *result; success = 0; break; } - + if (success) { if (!string_empty (&decl)) @@ -643,7 +643,7 @@ string *result; int len; const char *start; const char *end; - + start = *type; if (!do_type (type, result)) return 0; @@ -679,9 +679,9 @@ string *decl; { string arg; int need_comma = 0; - + string_append (decl, "("); - + while (**type != '_' && **type != '\0' && **type != 'e' && **type != 'v') { if (**type == 'N') @@ -714,7 +714,7 @@ string *decl; need_comma = 1; } } - + if (**type == 'v') *type += 1; else if (**type == 'e') @@ -724,7 +724,7 @@ string *decl; string_append (decl, ","); string_append (decl, "..."); } - + string_append (decl, ")"); return 1; } @@ -733,7 +733,7 @@ static void munge_function_name (name) string *name; { - if (!string_empty (name) && name->p - name->b >= 3 + if (!string_empty (name) && name->p - name->b >= 3 && name->b[0] == 'o' && name->b[1] == 'p' && name->b[2] == '$') { int i; @@ -760,7 +760,7 @@ string *name; for (i = 0; i < sizeof (optable)/sizeof (optable[0]); i++) { int len = name->p - name->b - 3; - if (strlen (optable[i].in) == len + if (strlen (optable[i].in) == len && memcmp (optable[i].in, name->b + 3, len) == 0) { string_clear (name); @@ -832,7 +832,7 @@ string *s; s->b = s->p = s->e = NULL; } -static void +static void string_clear (s) string *s; { @@ -914,7 +914,7 @@ const char *s; int n; { char *q; - + if (n == 0) return; string_need (p, n); diff --git a/gnu/usr.bin/as/config/ho-ansi.h b/gnu/usr.bin/as/config/ho-ansi.h index 2af0341..bd2d909 100644 --- a/gnu/usr.bin/as/config/ho-ansi.h +++ b/gnu/usr.bin/as/config/ho-ansi.h @@ -1,18 +1,18 @@ /* ho-ansi.h Host-specific header file for generic ansi environments. Copyright (C) 1987, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/gnu/usr.bin/as/config/ho-decstation.h b/gnu/usr.bin/as/config/ho-decstation.h index 1cab4d5..69a4699 100644 --- a/gnu/usr.bin/as/config/ho-decstation.h +++ b/gnu/usr.bin/as/config/ho-decstation.h @@ -1,18 +1,18 @@ /* ho-pmax.h Host-specific header file for decstation 3100. Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/gnu/usr.bin/as/config/ho-generic.h b/gnu/usr.bin/as/config/ho-generic.h index 493cfc6..7c7129f 100644 --- a/gnu/usr.bin/as/config/ho-generic.h +++ b/gnu/usr.bin/as/config/ho-generic.h @@ -1,18 +1,18 @@ /* ho-generic.h Generic host-specific header file. Copyright 1987, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/gnu/usr.bin/as/config/ho-hpux.h b/gnu/usr.bin/as/config/ho-hpux.h index d5ff31a..ebea9e2 100644 --- a/gnu/usr.bin/as/config/ho-hpux.h +++ b/gnu/usr.bin/as/config/ho-hpux.h @@ -1,18 +1,18 @@ /* ho-hpux.h -- Header to compile the assembler under HP-UX Copyright (C) 1988, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/gnu/usr.bin/as/config/ho-i386.h b/gnu/usr.bin/as/config/ho-i386.h index 6941b7e..04de366 100644 --- a/gnu/usr.bin/as/config/ho-i386.h +++ b/gnu/usr.bin/as/config/ho-i386.h @@ -1,23 +1,23 @@ /* ho-i386.h i386 specific header file. Copyright (C) 1987, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: ho-i386.h,v 1.1 1993/10/02 20:58:36 pk Exp $ + * $Id: ho-i386.h,v 1.1 1993/11/03 00:53:21 paul Exp $ */ diff --git a/gnu/usr.bin/as/config/ho-i386aix.h b/gnu/usr.bin/as/config/ho-i386aix.h index d31b51a..d439f74 100644 --- a/gnu/usr.bin/as/config/ho-i386aix.h +++ b/gnu/usr.bin/as/config/ho-i386aix.h @@ -1,18 +1,18 @@ /* ho-386aix.h AIX PS/2 i386 specific header file. Copyright (C) 1987, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/gnu/usr.bin/as/config/ho-rs6000.h b/gnu/usr.bin/as/config/ho-rs6000.h index fe57e8e..ed49484 100644 --- a/gnu/usr.bin/as/config/ho-rs6000.h +++ b/gnu/usr.bin/as/config/ho-rs6000.h @@ -1,18 +1,18 @@ /* ho-rs6000.h Rs6000 host-specific header file. Copyright (C) 1987, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/gnu/usr.bin/as/config/ho-sunos.h b/gnu/usr.bin/as/config/ho-sunos.h index 1193b1b..9c6cc01 100644 --- a/gnu/usr.bin/as/config/ho-sunos.h +++ b/gnu/usr.bin/as/config/ho-sunos.h @@ -1,18 +1,18 @@ /* This file is ho-sunos.h Copyright (C) 1987-1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/gnu/usr.bin/as/config/ho-sysv.h b/gnu/usr.bin/as/config/ho-sysv.h index 443fe3b..5407e5d 100644 --- a/gnu/usr.bin/as/config/ho-sysv.h +++ b/gnu/usr.bin/as/config/ho-sysv.h @@ -1,18 +1,18 @@ /* ho-sysv.h System V specific header file. Copyright (C) 1987, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/gnu/usr.bin/as/config/ho-vax.h b/gnu/usr.bin/as/config/ho-vax.h index eee0553..ea77e81 100644 --- a/gnu/usr.bin/as/config/ho-vax.h +++ b/gnu/usr.bin/as/config/ho-vax.h @@ -1,18 +1,18 @@ /* ho-vax.h Intended for vax ultrix Copyright (C) 1987, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/gnu/usr.bin/as/config/ho-vms.h b/gnu/usr.bin/as/config/ho-vms.h index 4b6680e..63f448e 100644 --- a/gnu/usr.bin/as/config/ho-vms.h +++ b/gnu/usr.bin/as/config/ho-vms.h @@ -1,18 +1,18 @@ /* ho-vax.h Intended for vax vms Copyright (C) 1987, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/gnu/usr.bin/as/config/obj-aout.c b/gnu/usr.bin/as/config/obj-aout.c index ceca490..146f346 100644 --- a/gnu/usr.bin/as/config/obj-aout.c +++ b/gnu/usr.bin/as/config/obj-aout.c @@ -1,18 +1,18 @@ /* a.out object file format Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -87,7 +87,7 @@ const pseudo_typeS obj_pseudo_table[] = { { "stabn", obj_aout_stab, 'n' }, /* stabs */ { "stabs", obj_aout_stab, 's' }, /* stabs */ #endif /* IGNORE_DEBUG */ - + /* coff debug pseudos (ignored) */ { "def", s_ignore, 0 }, { "dim", s_ignore, 0 }, @@ -101,13 +101,13 @@ const pseudo_typeS obj_pseudo_table[] = { { "type", s_type, 0 }, { "val", s_ignore, 0 }, { "version", s_ignore, 0 }, - + /* stabs-in-coff (?) debug pseudos (ignored) */ { "optim", s_ignore, 0 }, /* For sun386i cc (?) */ - + /* other stuff */ { "ABORT", s_abort, 0 }, - + { NULL} /* end sentinel */ }; /* obj_pseudo_table */ @@ -130,7 +130,7 @@ relax_addressT segment_address_in_file; *where += md_reloc_size; } /* if there is an add symbol */ } /* for each fix */ - + return; } /* obj_emit_relocations() */ @@ -169,7 +169,7 @@ object_headers *headers; md_number_to_chars(*where, headers->header.a_trsize, 4); *where += 4; md_number_to_chars(*where, headers->header.a_drsize, 4); *where += 4; - + #ifdef TE_SEQUENT memset(*where, '\0', 3 * 2 * 4); *where += 3 * 2 * 4; /* global descriptor table? */ md_number_to_chars(*where, 0, 4); *where += 4; /* shdata - length of initialized shared data */ @@ -206,7 +206,7 @@ symbolS *symbolP; md_number_to_chars((char *)&(S_GET_OFFSET(symbolP)), S_GET_OFFSET(symbolP), sizeof(S_GET_OFFSET(symbolP))); md_number_to_chars((char *)&(S_GET_DESC(symbolP)), S_GET_DESC(symbolP), sizeof(S_GET_DESC(symbolP))); md_number_to_chars((char *)&(S_GET_VALUE(symbolP)), S_GET_VALUE(symbolP), sizeof(S_GET_VALUE(symbolP))); - + append(where, (char *)&symbolP->sy_symbol, sizeof(obj_symbol_type)); } /* obj_symbol_to_chars() */ @@ -215,7 +215,7 @@ char **where; symbolS *symbol_rootP; { symbolS * symbolP; - + /* * Emit all symbols left in the symbol chain. */ @@ -223,10 +223,10 @@ symbolS *symbol_rootP; /* Used to save the offset of the name. It is used to point to the string in memory but must be a file offset. */ register char *temp; - + temp = S_GET_NAME(symbolP); S_SET_OFFSET(symbolP, symbolP->sy_name_offset); - + /* * Put aux info in lower four bits of `n_other' field * Do this only now, because things like S_IS_DEFINED() @@ -238,7 +238,7 @@ symbolS *symbol_rootP; /* Any symbol still undefined and is not a dbg symbol is made N_EXT. */ if (!S_IS_DEBUG(symbolP) && !S_IS_DEFINED(symbolP)) S_SET_EXTERNAL(symbolP); - + if (S_GET_TYPE(symbolP) == N_SIZE) { expressionS *exp = (expressionS*)symbolP->sy_sizexp; long size = 0; @@ -320,7 +320,7 @@ int what; int length; int goof; /* TRUE if we have aborted. */ long longint; - + /* * Enter with input_line_pointer pointing past .stabX and any following * whitespace. @@ -337,7 +337,7 @@ int what; } } else string = ""; - + /* * Input_line_pointer->after ','. String->symbol name. */ @@ -352,20 +352,20 @@ int what; S_SET_VALUE(symbolP, obstack_next_free(&frags) - frag_now->fr_literal); symbolP->sy_frag = frag_now; break; - + case 'n': symbolP->sy_frag = &zero_address_frag; break; - + case 's': symbolP->sy_frag = & zero_address_frag; break; - + default: BAD_CASE(what); break; } - + if (get_absolute_expression_and_terminator(&longint) == ',') symbolP->sy_symbol.n_type = saved_type = longint; else { @@ -374,7 +374,7 @@ int what; input_line_pointer --; /* Backup over a non-',' char. */ } } - + if (!goof) { if (get_absolute_expression_and_terminator(&longint) == ',') S_SET_OTHER(symbolP, longint); @@ -384,7 +384,7 @@ int what; input_line_pointer--; /* Backup over a non-',' char. */ } } - + if (!goof) { S_SET_DESC(symbolP, get_absolute_expression()); if (what == 's' || what == 'n') { @@ -396,27 +396,27 @@ int what; } } } - + if ((!goof) && (what == 's' || what == 'n')) { pseudo_set(symbolP); symbolP->sy_symbol.n_type = saved_type; } #ifndef NO_LISTING - if (listing && !goof) + if (listing && !goof) { - if (symbolP->sy_symbol.n_type == N_SLINE) + if (symbolP->sy_symbol.n_type == N_SLINE) { - + listing_source_line(symbolP->sy_symbol.n_desc); } else if (symbolP->sy_symbol.n_type == N_SO - || symbolP->sy_symbol.n_type == N_SOL) + || symbolP->sy_symbol.n_type == N_SOL) { listing_source_file(string); - } + } } -#endif - +#endif + if (goof) ignore_rest_of_line(); else @@ -429,7 +429,7 @@ static void obj_aout_desc() { register char *p; register symbolS *symbolP; register int temp; - + /* * Frob invented at RMS' request. Set the n_desc of a symbol. */ @@ -464,46 +464,46 @@ object_headers *headers; symbolS *symbolP; symbolS **symbolPP; int symbol_number = 0; - + /* JF deal with forward references first... */ for (symbolP = symbol_rootP; symbolP; symbolP = symbol_next(symbolP)) { if (symbolP->sy_forward) { S_SET_VALUE(symbolP, S_GET_VALUE(symbolP) + S_GET_VALUE(symbolP->sy_forward) + symbolP->sy_forward->sy_frag->fr_address); - + symbolP->sy_forward=0; } /* if it has a forward reference */ } /* walk the symbol chain */ - + tc_crawl_symbol_chain(headers); - + symbolPP = &symbol_rootP; /*->last symbol chain link. */ while ((symbolP = *symbolPP) != NULL) { if (flagseen['R'] && (S_GET_SEGMENT(symbolP) == SEG_DATA)) { S_SET_SEGMENT(symbolP, SEG_TEXT); } /* if pusing data into text */ - + S_SET_VALUE(symbolP, S_GET_VALUE(symbolP) + symbolP->sy_frag->fr_address); - + /* OK, here is how we decide which symbols go out into the brave new symtab. Symbols that do are: - + * symbols with no name (stabd's?) * symbols with debug info in their N_TYPE * symbols marked "forceout" (to force out local `L' symbols in PIC code) - + Symbols that don't are: * symbols that are registers * symbols with \1 as their 3rd character (numeric labels) * "local labels" as defined by S_LOCAL_NAME(name) if the -L switch was passed to gas. - + All other symbols are output. We complain if a deleted symbol was marked external. */ - - + + if (!S_IS_REGISTER(symbolP) && (!S_GET_NAME(symbolP) || S_IS_DEBUG(symbolP) @@ -526,7 +526,7 @@ object_headers *headers; #endif ) { symbolP->sy_number = symbol_number++; - + /* The + 1 after strlen account for the \0 at the end of each string */ if (!S_IS_STABD(symbolP)) { @@ -585,14 +585,14 @@ object_headers *headers; ) { as_bad("Local symbol %s never defined.", decode_local_label_name(S_GET_NAME(symbolP))); } /* oops. */ - + /* Unhook it from the chain */ *symbolPP = symbol_next(symbolP); } /* if this symbol should be in the output */ } /* for each symbol */ - + H_SET_SYMBOL_TABLE_SIZE(headers, symbol_number); - + return; } /* obj_crawl_symbol_chain() */ @@ -604,7 +604,7 @@ void obj_emit_strings(where) char **where; { symbolS *symbolP; - + #ifdef CROSS_COMPILE /* Gotta do md_ byte-ordering stuff for string_byte_count first - KWK */ md_number_to_chars(*where, string_byte_count, sizeof(string_byte_count)); @@ -612,13 +612,13 @@ char **where; #else /* CROSS_COMPILE */ append (where, (char *)&string_byte_count, (unsigned long)sizeof(string_byte_count)); #endif /* CROSS_COMPILE */ - + for (symbolP = symbol_rootP; symbolP; symbolP = symbol_next(symbolP)) { if (S_GET_NAME(symbolP)) append(&next_object_file_charP, S_GET_NAME(symbolP), (unsigned long)(strlen (S_GET_NAME(symbolP)) + 1)); } /* walk symbol chain */ - + return; } /* obj_emit_strings() */ @@ -632,7 +632,7 @@ object_headers *headers; AOUT_VERSION); H_SET_ENTRY_POINT(headers, 0); - + tc_aout_pre_write_hook(headers); return; } /* obj_pre_write_hook() */ diff --git a/gnu/usr.bin/as/config/obj-aout.h b/gnu/usr.bin/as/config/obj-aout.h index 3925911..1ac0f5c 100644 --- a/gnu/usr.bin/as/config/obj-aout.h +++ b/gnu/usr.bin/as/config/obj-aout.h @@ -1,23 +1,23 @@ /* obj-aout.h, a.out object file format for gas, the assembler. Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: obj-aout.h,v 1.2 1993/11/30 20:57:40 jkh Exp $ + $Id: obj-aout.h,v 1.3 1994/12/23 22:37:34 nate Exp $ */ @@ -271,7 +271,7 @@ typedef struct nlist obj_symbol_type; /* Symbol table entry */ #define H_SET_ENTRY_POINT(h,v) ((h)->header.a_entry = (v)) #define H_SET_STRING_SIZE(h,v) ((h)->string_table_size = (v)) -/* +/* * Current means for getting the name of a segment. * This will change for infinite-segments support (e.g. COFF). */ diff --git a/gnu/usr.bin/as/config/obj-bfd-sunos.c b/gnu/usr.bin/as/config/obj-bfd-sunos.c index 626516b..6db63de5 100644 --- a/gnu/usr.bin/as/config/obj-bfd-sunos.c +++ b/gnu/usr.bin/as/config/obj-bfd-sunos.c @@ -1,18 +1,18 @@ /* obj-bfd-sunos.c Copyright (C) 1987, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -20,8 +20,8 @@ #include "as.h" -static - +static + const short seg_N_TYPE[] = { N_ABS, N_TEXT, diff --git a/gnu/usr.bin/as/config/obj-bfd-sunos.h b/gnu/usr.bin/as/config/obj-bfd-sunos.h index 958d8a9..122594e 100644 --- a/gnu/usr.bin/as/config/obj-bfd-sunos.h +++ b/gnu/usr.bin/as/config/obj-bfd-sunos.h @@ -1,18 +1,18 @@ /* Copyright (C) 1987, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/gnu/usr.bin/as/config/obj-bout.c b/gnu/usr.bin/as/config/obj-bout.c index f6d9302..734f3a3 100644 --- a/gnu/usr.bin/as/config/obj-bout.c +++ b/gnu/usr.bin/as/config/obj-bout.c @@ -1,18 +1,18 @@ /* b.out object file format Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -74,7 +74,7 @@ const pseudo_typeS obj_pseudo_table[] = { { "stabd", obj_bout_stab, 'd' }, /* stabs */ { "stabn", obj_bout_stab, 'n' }, /* stabs */ { "stabs", obj_bout_stab, 's' }, /* stabs */ - + /* coff debugging directives. Currently ignored silently */ { "def", s_ignore, 0 }, { "dim", s_ignore, 0 }, @@ -85,11 +85,11 @@ const pseudo_typeS obj_pseudo_table[] = { { "tag", s_ignore, 0 }, { "type", s_ignore, 0 }, { "val", s_ignore, 0 }, - + /* other stuff we don't handle */ { "ABORT", s_ignore, 0 }, { "ident", s_ignore, 0 }, - + { NULL} /* end sentinel */ }; /* obj_pseudo_table */ @@ -111,7 +111,7 @@ relax_addressT segment_address_in_file; *where += sizeof(struct relocation_info); } /* if there's a symbol */ } /* for each fixup */ - + } /* emit_relocations() */ /* Aout file generation & utilities */ @@ -122,19 +122,19 @@ char **where; object_headers *headers; { /* Always leave in host byte order */ - + headers->header.a_talign = section_alignment[SEG_TEXT]; - + if (headers->header.a_talign < 2){ headers->header.a_talign = 2; } /* force to at least 2 */ - + headers->header.a_dalign = section_alignment[SEG_DATA]; headers->header.a_balign = section_alignment[SEG_BSS]; - + headers->header.a_tload = 0; headers->header.a_dload = md_section_align(SEG_DATA, H_GET_TEXT_SIZE(headers)); - + append(where, (char *) &headers->header, sizeof(headers->header)); } /* a_header_append() */ @@ -151,7 +151,7 @@ char **where; symbolS *symbol_rootP; { symbolS * symbolP; - + /* * Emit all symbols left in the symbol chain. */ @@ -159,13 +159,13 @@ symbolS *symbol_rootP; /* Used to save the offset of the name. It is used to point to the string in memory but must be a file offset. */ char *temp; - + temp = S_GET_NAME(symbolP); S_SET_OFFSET(symbolP, symbolP->sy_name_offset); - + /* Any symbol still undefined and is not a dbg symbol is made N_EXT. */ if (!S_IS_DEBUG(symbolP) && !S_IS_DEFINED(symbolP)) S_SET_EXTERNAL(symbolP); - + obj_symbol_to_chars(where, symbolP); S_SET_NAME(symbolP,temp); } @@ -215,7 +215,7 @@ int what; int length; int goof; /* TRUE if we have aborted. */ long longint; - + /* * Enter with input_line_pointer pointing past .stabX and any following * whitespace. @@ -232,7 +232,7 @@ int what; } } else string = ""; - + /* * Input_line_pointer->after ','. String->symbol name. */ @@ -248,15 +248,15 @@ int what; frag_now->fr_literal); symbolP->sy_frag = frag_now; break; - + case 'n': symbolP->sy_frag = &zero_address_frag; break; - + case 's': symbolP->sy_frag = & zero_address_frag; break; - + default: BAD_CASE(what); break; @@ -296,20 +296,20 @@ int what; #ifndef NO_LISTING { extern int listing; - + if (listing && !goof) { if (symbolP->sy_symbol.n_type == N_SLINE) { - + listing_source_line(symbolP->sy_symbol.n_desc); } else if (symbolP->sy_symbol.n_type == N_SO || symbolP->sy_symbol.n_type == N_SOL) { listing_source_file(string); - } + } } } - -#endif - + +#endif + if (goof) ignore_rest_of_line (); else @@ -322,7 +322,7 @@ static void obj_bout_desc() { register char *p; register symbolS * symbolP; register int temp; - + /* * Frob invented at RMS' request. Set the n_desc of a symbol. */ @@ -357,44 +357,44 @@ object_headers *headers; symbolS **symbolPP; symbolS *symbolP; int symbol_number = 0; - + /* JF deal with forward references first... */ for (symbolP = symbol_rootP; symbolP; symbolP = symbol_next(symbolP)) { if (symbolP->sy_forward) { S_SET_VALUE(symbolP, S_GET_VALUE(symbolP) + S_GET_VALUE(symbolP->sy_forward) + symbolP->sy_forward->sy_frag->fr_address); - + symbolP->sy_forward=0; } /* if it has a forward reference */ } /* walk the symbol chain */ - + tc_crawl_symbol_chain(headers); - + symbolPP = & symbol_rootP; /*->last symbol chain link. */ while ((symbolP = *symbolPP) != NULL) { if (flagseen['R'] && (S_GET_SEGMENT(symbolP) == SEG_DATA)) { S_SET_SEGMENT(symbolP, SEG_TEXT); } /* if pusing data into text */ - + S_SET_VALUE(symbolP, S_GET_VALUE(symbolP) + symbolP->sy_frag->fr_address); - + /* OK, here is how we decide which symbols go out into the brave new symtab. Symbols that do are: - + * symbols with no name (stabd's?) * symbols with debug info in their N_TYPE - + Symbols that don't are: * symbols that are registers * symbols with \1 as their 3rd character (numeric labels) * "local labels" as defined by S_LOCAL_NAME(name) if the -L switch was passed to gas. - + All other symbols are output. We complain if a deleted symbol was marked external. */ - - + + if (1 && !S_IS_REGISTER(symbolP) && (!S_GET_NAME(symbolP) @@ -406,7 +406,7 @@ object_headers *headers; #endif /* TC_I960 */ || (S_GET_NAME(symbolP)[0] != '\001' && (flagseen['L'] || ! S_LOCAL_NAME(symbolP))))) { symbolP->sy_number = symbol_number++; - + /* The + 1 after strlen account for the \0 at the end of each string */ if (!S_IS_STABD(symbolP)) { @@ -421,14 +421,14 @@ object_headers *headers; if (S_IS_EXTERNAL(symbolP) || !S_IS_DEFINED(symbolP)) { as_bad("Local symbol %s never defined", S_GET_NAME(symbolP)); } /* oops. */ - + /* Unhook it from the chain */ *symbolPP = symbol_next(symbolP); } /* if this symbol should be in the output */ } /* for each symbol */ - + H_SET_SYMBOL_TABLE_SIZE(headers, symbol_number); - + return; } /* obj_crawl_symbol_chain() */ @@ -440,7 +440,7 @@ void obj_emit_strings(where) char **where; { symbolS *symbolP; - + #ifdef CROSS_COMPILE /* Gotta do md_ byte-ordering stuff for string_byte_count first - KWK */ md_number_to_chars(*where, string_byte_count, sizeof(string_byte_count)); @@ -448,12 +448,12 @@ char **where; #else /* CROSS_COMPILE */ append(where, (char *) &string_byte_count, (unsigned long) sizeof(string_byte_count)); #endif /* CROSS_COMPILE */ - + for (symbolP = symbol_rootP; symbolP; symbolP = symbol_next(symbolP)) { if (S_GET_NAME(symbolP)) append(where, S_GET_NAME(symbolP), (unsigned long)(strlen (S_GET_NAME(symbolP)) + 1)); } /* walk symbol chain */ - + return; } /* obj_emit_strings() */ @@ -462,7 +462,7 @@ object_headers *headers; { H_SET_MAGIC_NUMBER(headers, BMAGIC); H_SET_ENTRY_POINT(headers, 0); - + return; } /* obj_pre_write_hook() */ diff --git a/gnu/usr.bin/as/config/obj-bout.h b/gnu/usr.bin/as/config/obj-bout.h index e28d435..6de818a 100644 --- a/gnu/usr.bin/as/config/obj-bout.h +++ b/gnu/usr.bin/as/config/obj-bout.h @@ -1,18 +1,18 @@ /* b.out object file format Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA @@ -94,7 +94,7 @@ struct exec { unsigned long a_entry; /* Runtime start address */ unsigned long a_trsize; /* Length of text relocation info */ unsigned long a_drsize; /* Length of data relocation info */ - + /* Added for i960 */ unsigned long a_tload; /* Text runtime load address */ unsigned long a_dload; /* Data runtime load address */ @@ -277,7 +277,7 @@ struct relocation_info { #define H_SET_VERSION(h,v) ((h)->header.a_version = (v)) #endif /* EXEC_VERSION */ -/* +/* * Current means for getting the name of a segment. * This will change for infinite-segments support (e.g. COFF). */ diff --git a/gnu/usr.bin/as/config/obj-coff.c b/gnu/usr.bin/as/config/obj-coff.c index 238e6c5..b57c6cd 100644 --- a/gnu/usr.bin/as/config/obj-coff.c +++ b/gnu/usr.bin/as/config/obj-coff.c @@ -1,18 +1,18 @@ /* coff object file format Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -132,10 +132,10 @@ const pseudo_typeS obj_pseudo_table[] = { { "type", s_ignore, 0 }, { "val", s_ignore, 0 }, #endif /* ignore debug */ - + { "ident", s_ignore, 0 }, /* we don't yet handle this. */ - - + + /* stabs aka a.out aka b.out directives for debug symbols. Currently ignored silently. Except for .line at which we guess from context. */ @@ -144,12 +144,12 @@ const pseudo_typeS obj_pseudo_table[] = { { "stabd", obj_coff_stab, 'd' }, /* stabs */ { "stabn", obj_coff_stab, 'n' }, /* stabs */ { "stabs", obj_coff_stab, 's' }, /* stabs */ - + /* stabs-in-coff (?) debug pseudos (ignored) */ { "optim", s_ignore, 0 }, /* For sun386i cc (?) */ /* other stuff */ { "ABORT", s_abort, 0 }, - + { NULL} /* end sentinel */ }; /* obj_pseudo_table */ @@ -195,12 +195,12 @@ relax_addressT segment_address_in_file; symbolS *symbolP; int i, count; fixS *p; - + for (count = 0, p = fixP; p ; p = p->fx_next) if (p->fx_addsy) count++; if (!count) return; - + #ifdef BFD_HEADERS ri_table = (struct internal_reloc *) calloc(sizeof(*ri_table),count); #else @@ -208,13 +208,13 @@ relax_addressT segment_address_in_file; #endif if (!ri_table) as_fatal ("obj_emit_relocations: Could not malloc relocation table"); - + #ifdef TC_I960 callj_table = (char *)malloc (sizeof(char)*count); if (!callj_table) as_fatal ("obj_emit_relocations: Could not malloc callj table"); #endif - + for (i = 0; fixP; fixP = fixP->fx_next) { if (symbolP = fixP->fx_addsy) { #if defined(TC_M68K) @@ -242,7 +242,7 @@ relax_addressT segment_address_in_file; callj_table[i] = fixP->fx_callj ? 1 : 0; #elif defined(TC_A29K) ri_table[i].r_type = tc_coff_fix2rtype(fixP); - + #else #error you lose #endif /* TC_M68K || TC_I386 */ @@ -275,19 +275,19 @@ relax_addressT segment_address_in_file; : ((SF_GET_LOCAL(symbolP) ? dot_bss_symbol->sy_number : symbolP->sy_number)))); /* bss or undefined */ - + /* md_ri_to_chars((char *) &ri, ri); */ /* Last step : write md f */ - + i++; } /* if there's a symbol */ } /* for each fixP */ - + /* * AIX ld prefer to have the reloc table with r_vaddr sorted. * But sorting it should not hurt any other ld. */ qsort (ri_table, count, sizeof(*ri_table), reloc_compare); - + for (i = 0; i < count; i++) { #ifdef BFD_HEADERS @@ -300,17 +300,17 @@ relax_addressT segment_address_in_file; if (ri_table[i].r_type == R_IHIHALF) { /* now emit the second bit */ - ri_table[i].r_type = R_IHCONST; + ri_table[i].r_type = R_IHCONST; ri_table[i].r_symndx = fixP->fx_addnumber; *where += bfd_coff_swap_reloc_out(stdoutput, &ri_table[i], *where); } # endif /* TC_A29K */ - + #else /* not BFD_HEADERS */ append(where, (char *) &ri_table[i], RELSZ); #endif /* not BFD_HEADERS */ - + #ifdef TC_I960 if (callj_table[i]) { @@ -324,12 +324,12 @@ relax_addressT segment_address_in_file; } /* if it's a callj, do it again for the opcode */ #endif /* TC_I960 */ } - + free (ri_table); #ifdef TC_I960 free (callj_table); #endif - + return; } /* obj_emit_relocations() */ @@ -348,7 +348,7 @@ object_headers *headers; obj_coff_section_header_append(where, &text_section_header); obj_coff_section_header_append(where, &data_section_header); obj_coff_section_header_append(where, &bss_section_header); - + } #else @@ -358,7 +358,7 @@ char **where; object_headers *headers; { tc_headers_hook(headers); - + #ifdef CROSS_COMPILE /* Eventually swap bytes for cross compilation for file header */ md_number_to_chars(*where, headers->filehdr.f_magic, sizeof(headers->filehdr.f_magic)); @@ -375,7 +375,7 @@ object_headers *headers; *where += sizeof(headers->filehdr.f_opthdr); md_number_to_chars(*where, headers->filehdr.f_flags, sizeof(headers->filehdr.f_flags)); *where += sizeof(headers->filehdr.f_flags); - + #ifndef OBJ_COFF_OMIT_OPTIONAL_HEADER /* Eventually swap bytes for cross compilation for a.out header */ md_number_to_chars(*where, headers->aouthdr.magic, sizeof(headers->aouthdr.magic)); @@ -397,21 +397,21 @@ object_headers *headers; md_number_to_chars(*where, headers->aouthdr.tagentries, sizeof(headers->aouthdr.tagentries)); *where += sizeof(headers->aouthdr.tagentries); #endif /* OBJ_COFF_OMIT_OPTIONAL_HEADER */ - + #else /* CROSS_COMPILE */ - + append(where, (char *) &headers->filehdr, sizeof(headers->filehdr)); #ifndef OBJ_COFF_OMIT_OPTIONAL_HEADER append(where, (char *) &headers->aouthdr, sizeof(headers->aouthdr)); #endif /* OBJ_COFF_OMIT_OPTIONAL_HEADER */ - + #endif /* CROSS_COMPILE */ - + /* Output the section headers */ obj_coff_section_header_append(where, &text_section_header); obj_coff_section_header_append(where, &data_section_header); obj_coff_section_header_append(where, &bss_section_header); - + return; } /* obj_header_append() */ #endif @@ -422,14 +422,14 @@ symbolS *symbolP; #ifdef BFD_HEADERS unsigned int numaux = symbolP->sy_symbol.ost_entry.n_numaux; unsigned int i; - + if (S_GET_SEGMENT(symbolP) == SEG_REGISTER) { S_SET_SEGMENT(symbolP, SEG_ABSOLUTE); } *where += bfd_coff_swap_sym_out(stdoutput, &symbolP->sy_symbol.ost_entry, *where); - - for (i = 0; i < numaux; i++) + + for (i = 0; i < numaux; i++) { *where += bfd_coff_swap_aux_out(stdoutput, &symbolP->sy_symbol.ost_auxent[i], @@ -437,13 +437,13 @@ symbolS *symbolP; S_GET_STORAGE_CLASS(symbolP), *where); } - + #else /* BFD_HEADERS */ SYMENT *syment = &symbolP->sy_symbol.ost_entry; int i; char numaux = syment->n_numaux; unsigned short type = S_GET_DATA_TYPE(symbolP); - + #ifdef CROSS_COMPILE md_number_to_chars(*where, syment->n_value, sizeof(syment->n_value)); *where += sizeof(syment->n_value); @@ -460,12 +460,12 @@ symbolS *symbolP; #else /* CROSS_COMPILE */ append(where, (char *) syment, sizeof(*syment)); #endif /* CROSS_COMPILE */ - + /* Should do the following : if (.file entry) MD(..)... else if (static entry) MD(..) */ if (numaux > OBJ_COFF_MAX_AUXENTRIES) { as_bad("Internal error? too many auxents for symbol"); } /* too many auxents */ - + for (i = 0; i < numaux; ++i) { #ifdef CROSS_COMPILE #if 0 /* This code has never been tested */ @@ -509,9 +509,9 @@ symbolS *symbolP; #else /* CROSS_COMPILE */ append(where, (char *) &symbolP->sy_symbol.ost_auxent[i], sizeof(symbolP->sy_symbol.ost_auxent[i])); #endif /* CROSS_COMPILE */ - + }; /* for each aux in use */ -#endif /* BFD_HEADERS */ +#endif /* BFD_HEADERS */ return; } /* obj_symbol_to_chars() */ @@ -530,45 +530,45 @@ SCNHDR *header; #ifdef CROSS_COMPILE memcpy(*where, header->s_name, sizeof(header->s_name)); *where += sizeof(header->s_name); - + md_number_to_chars(*where, header->s_paddr, sizeof(header->s_paddr)); *where += sizeof(header->s_paddr); - + md_number_to_chars(*where, header->s_vaddr, sizeof(header->s_vaddr)); *where += sizeof(header->s_vaddr); - + md_number_to_chars(*where, header->s_size, sizeof(header->s_size)); *where += sizeof(header->s_size); - + md_number_to_chars(*where, header->s_scnptr, sizeof(header->s_scnptr)); *where += sizeof(header->s_scnptr); - + md_number_to_chars(*where, header->s_relptr, sizeof(header->s_relptr)); *where += sizeof(header->s_relptr); - + md_number_to_chars(*where, header->s_lnnoptr, sizeof(header->s_lnnoptr)); *where += sizeof(header->s_lnnoptr); - + md_number_to_chars(*where, header->s_nreloc, sizeof(header->s_nreloc)); *where += sizeof(header->s_nreloc); - + md_number_to_chars(*where, header->s_nlnno, sizeof(header->s_nlnno)); *where += sizeof(header->s_nlnno); - + md_number_to_chars(*where, header->s_flags, sizeof(header->s_flags)); *where += sizeof(header->s_flags); - + #ifdef TC_I960 md_number_to_chars(*where, header->s_align, sizeof(header->s_align)); *where += sizeof(header->s_align); #endif /* TC_I960 */ - + #else /* CROSS_COMPILE */ - + append(where, (char *) header, sizeof(*header)); - + #endif /* CROSS_COMPILE */ - + return; } /* obj_coff_section_header_append() */ @@ -585,9 +585,9 @@ symbolS *symbol_rootP; /* Used to save the offset of the name. It is used to point to the string in memory but must be a file offset. */ register char * temp; - + tc_coff_symbol_emit_hook(symbolP); - + temp = S_GET_NAME(symbolP); if (SF_GET_STRING(symbolP)) { S_SET_OFFSET(symbolP, symbolP->sy_name_offset); @@ -609,15 +609,15 @@ symbolS *normal; { S_SET_DATA_TYPE(normal, S_GET_DATA_TYPE(debug)); S_SET_STORAGE_CLASS(normal, S_GET_STORAGE_CLASS(debug)); - + if (S_GET_NUMBER_AUXILIARY(debug) > S_GET_NUMBER_AUXILIARY(normal)) { S_SET_NUMBER_AUXILIARY(normal, S_GET_NUMBER_AUXILIARY(debug)); } /* take the most we have */ - + if (S_GET_NUMBER_AUXILIARY(debug) > 0) { memcpy((char*)&normal->sy_symbol.ost_auxent[0], (char*)&debug->sy_symbol.ost_auxent[0], S_GET_NUMBER_AUXILIARY(debug) * AUXESZ); } /* Move all the auxiliary information */ - + /* Move the debug flags. */ SF_SET_DEBUG_FIELD(normal, SF_GET_DEBUG_FIELD(debug)); } /* c_symbol_merge() */ @@ -628,31 +628,31 @@ void c_dot_file_symbol(filename) char *filename; { symbolS* symbolP; - + symbolP = symbol_new(".file", SEG_DEBUG, 0, &zero_address_frag); - + S_SET_STORAGE_CLASS(symbolP, C_FILE); S_SET_NUMBER_AUXILIARY(symbolP, 1); SA_SET_FILE_FNAME(symbolP, filename); SF_SET_DEBUG(symbolP); S_SET_VALUE(symbolP, (long) previous_file_symbol); - + previous_file_symbol = symbolP; - + /* Make sure that the symbol is first on the symbol chain */ if (symbol_rootP != symbolP) { if (symbolP == symbol_lastP) { symbol_lastP = symbol_lastP->sy_previous; } /* if it was the last thing on the list */ - + symbol_remove(symbolP, &symbol_rootP, &symbol_lastP); symbol_insert(symbolP, symbol_rootP, &symbol_rootP, &symbol_lastP); symbol_rootP = symbolP; } /* if not first on the list */ - + } /* c_dot_file_symbol() */ /* * Build a 'section static' symbol. @@ -666,7 +666,7 @@ unsigned short nreloc; unsigned short nlnno; { symbolS *symbolP; - + symbolP = symbol_new(name, (name[1] == 't' ? SEG_TEXT @@ -675,16 +675,16 @@ unsigned short nlnno; : SEG_BSS)), value, &zero_address_frag); - + S_SET_STORAGE_CLASS(symbolP, C_STAT); S_SET_NUMBER_AUXILIARY(symbolP, 1); - + SA_SET_SCN_SCNLEN(symbolP, length); SA_SET_SCN_NRELOC(symbolP, nreloc); SA_SET_SCN_NLINNO(symbolP, nlnno); - + SF_SET_STATICS(symbolP); - + return (char*)symbolP; } /* c_section_symbol() */ @@ -720,7 +720,7 @@ long alignment; header->s_lnnoptr = lineno_ptr; header->s_nreloc = reloc_number; header->s_nlnno = lineno_number; - + #ifdef OBJ_COFF_SECTION_HEADER_HAS_ALIGNMENT #ifdef OBJ_COFF_BROKEN_ALIGNMENT header->s_align = ((name[1] == 'b' || (size > 0)) ? 16 : 0); @@ -730,7 +730,7 @@ long alignment; : (1 << alignment)); #endif /* OBJ_COFF_BROKEN_ALIGNMENT */ #endif /* OBJ_COFF_SECTION_HEADER_HAS_ALIGNMENT */ - + header->s_flags = STYP_REG | (name[1] == 't' ? STYP_TEXT : (name[1] == 'd' @@ -760,12 +760,12 @@ unsigned short line_number; fragS* frag; { lineno* new_line = (lineno*)xmalloc(sizeof(lineno)); - + new_line->line.l_addr.l_paddr = paddr; new_line->line.l_lnno = line_number; new_line->frag = (char*)frag; new_line->next = (lineno*)0; - + if (lineno_rootP == (lineno*)0) lineno_rootP = new_line; else @@ -786,23 +786,23 @@ char *file_start; #endif for (; line; line = line->next) { line_entry = &line->line; - + /* FIXME-SOMEDAY Resolving the sy_number of function linno's used to be done in write_object_file() but their symbols need a fileptr to the lnno, so I moved this resolution check here. xoxorich. */ - + if (line_entry->l_lnno == 0) { /* There is a good chance that the symbol pointed to is not the one that will be emitted and that the sy_number is not accurate. */ /* char *name; */ symbolS *symbolP; - + symbolP = (symbolS *) line_entry->l_addr.l_symndx; - + line_entry->l_addr.l_symndx = symbolP->sy_number; symbolP->sy_symbol.ost_auxent[0].x_sym.x_fcnary.x_fcn.x_lnnoptr = *where - file_start; - + } /* if this is a function linno */ #ifdef BFD_HEADERS *where += bfd_coff_swap_lineno_out(stdoutput, line_entry, *where); @@ -812,23 +812,23 @@ char *file_start; #ifdef CROSS_COMPILE md_number_to_chars(*where, line_entry->l_addr.l_paddr, sizeof(line_entry->l_addr.l_paddr)); *where += sizeof(line_entry->l_addr.l_paddr); - + md_number_to_chars(*where, line_entry->l_lnno, sizeof(line_entry->l_lnno)); *where += sizeof(line_entry->l_lnno); - + #ifdef TC_I960 **where = '0'; ++*where; **where = '0'; ++*where; #endif /* TC_I960 */ - + #else /* CROSS_COMPILE */ append(where, (char *) line_entry, LINESZ); #endif /* CROSS_COMPILE */ #endif /* BFD_HEADERS */ } /* for each line number */ - + return ; } /* obj_emit_lineno() */ @@ -836,7 +836,7 @@ void obj_symbol_new_hook(symbolP) symbolS *symbolP; { char underscore = 0; /* Symbol has leading _ */ - + /* Effective symbol */ /* Store the pointer in the offset. */ S_SET_ZEROES(symbolP, 0L); @@ -847,7 +847,7 @@ symbolS *symbolP; symbolP->sy_symbol.ost_flags = 0; /* Auxiliary entries */ memset((char*) &symbolP->sy_symbol.ost_auxent[0], '\0', AUXESZ); - + #ifdef STRIP_UNDERSCORE /* Remove leading underscore at the beginning of the symbol. * This is to be compatible with the standard librairies. @@ -857,12 +857,12 @@ symbolS *symbolP; S_SET_NAME(symbolP, S_GET_NAME(symbolP) + 1); } /* strip underscore */ #endif /* STRIP_UNDERSCORE */ - + if (S_IS_STRING(symbolP)) SF_SET_STRING(symbolP); if (!underscore && S_IS_LOCAL(symbolP)) SF_SET_LOCAL(symbolP); - + return; } /* obj_symbol_new_hook() */ @@ -872,7 +872,7 @@ unsigned long chunk_size; unsigned long element_size; { stack* st; - + if ((st = (stack*)malloc(sizeof(stack))) == (stack*)0) return (stack*)0; if ((st->data = malloc(chunk_size)) == (char*)0) { @@ -934,11 +934,11 @@ static void obj_coff_ln() { demand_empty_rest_of_line(); return; } /* wrong context */ - + c_line_new(obstack_next_free(&frags) - frag_now->fr_literal, get_absolute_expression(), frag_now); - + demand_empty_rest_of_line(); return; } /* obj_coff_line() */ @@ -972,24 +972,24 @@ int what; /*$char* directiveP;$ */ /* Name of the pseudo opcode */ /*$char directive[MAX_DIRECTIVE];$ */ /* Backup of the directive */ /*$char end = 0;$ */ /* If 1, stop parsing */ - + if (def_symbol_in_progress != NULL) { as_warn(".def pseudo-op used inside of .def/.endef: ignored."); demand_empty_rest_of_line(); return; } /* if not inside .def/.endef */ - + SKIP_WHITESPACES(); - + def_symbol_in_progress = (symbolS *) obstack_alloc(¬es, sizeof(*def_symbol_in_progress)); memset(def_symbol_in_progress, '\0', sizeof(*def_symbol_in_progress)); - + symbol_name = input_line_pointer; name_end = get_symbol_end(); symbol_name_length = strlen(symbol_name); symbol_name_copy = xmalloc(symbol_name_length + 1); strcpy(symbol_name_copy, symbol_name); - + /* Initialize the new symbol */ #ifdef STRIP_UNDERSCORE S_SET_NAME(def_symbol_in_progress, (*symbol_name_copy == '_' @@ -1002,13 +1002,13 @@ int what; def_symbol_in_progress->sy_name_offset = ~0; def_symbol_in_progress->sy_number = ~0; def_symbol_in_progress->sy_frag = &zero_address_frag; - + if (S_IS_STRING(def_symbol_in_progress)) { SF_SET_STRING(def_symbol_in_progress); } /* "long" name */ - + *input_line_pointer = name_end; - + demand_empty_rest_of_line(); return; } /* obj_coff_def() */ @@ -1023,7 +1023,7 @@ static void obj_coff_endef() { demand_empty_rest_of_line(); return; } /* if not inside .def/.endef */ - + /* Set the section number according to storage class. */ switch (S_GET_STORAGE_CLASS(def_symbol_in_progress)) { case C_STRTAG: @@ -1036,7 +1036,7 @@ static void obj_coff_endef() { SF_SET_DEBUG(def_symbol_in_progress); S_SET_SEGMENT(def_symbol_in_progress, SEG_DEBUG); break; - + case C_EFCN: SF_SET_LOCAL(def_symbol_in_progress); /* Do not emit this symbol. */ /* intentional fallthrough */ @@ -1045,7 +1045,7 @@ static void obj_coff_endef() { /* intentional fallthrough */ case C_FCN: S_SET_SEGMENT(def_symbol_in_progress, SEG_TEXT); - + if (def_symbol_in_progress->sy_symbol.ost_entry.n_name[1] == 'b') { /* .bf */ if (function_lineoff < 0) { fprintf(stderr, "`.bf' symbol without preceding function\n"); @@ -1055,7 +1055,7 @@ static void obj_coff_endef() { function_lineoff = -1; } break; - + #ifdef C_AUTOARG case C_AUTOARG: #endif /* C_AUTOARG */ @@ -1071,25 +1071,25 @@ static void obj_coff_endef() { SF_SET_DEBUG(def_symbol_in_progress); S_SET_SEGMENT(def_symbol_in_progress, SEG_ABSOLUTE); break; - + case C_EXT: case C_STAT: - case C_LABEL: + case C_LABEL: /* Valid but set somewhere else (s_comm, s_lcomm, colon) */ break; - + case C_USTATIC: case C_EXTDEF: case C_ULABEL: as_warn("unexpected storage class %d", S_GET_STORAGE_CLASS(def_symbol_in_progress)); break; } /* switch on storage class */ - + /* Now that we have built a debug symbol, try to find if we should merge with an existing symbol or not. If a symbol is C_EFCN or SEG_ABSOLUTE or untagged SEG_DEBUG it never merges. */ - + /* Two cases for functions. Either debug followed by definition or definition followed by debug. For definition first, we will merge the debug @@ -1100,19 +1100,19 @@ static void obj_coff_endef() { symbol into the real symbol. Therefor, let's presume the debug symbol is a real function reference. */ - + /* FIXME-SOON If for some reason the definition label/symbol is never seen, this will probably leave an undefined symbol at link time. */ - + if (S_GET_STORAGE_CLASS(def_symbol_in_progress) == C_EFCN || (S_GET_SEGMENT(def_symbol_in_progress) == SEG_DEBUG && !SF_GET_TAG(def_symbol_in_progress)) || S_GET_SEGMENT(def_symbol_in_progress) == SEG_ABSOLUTE || (symbolP = symbol_find_base(S_GET_NAME(def_symbol_in_progress), DO_NOT_STRIP)) == NULL) { - + symbol_append(def_symbol_in_progress, symbol_lastP, &symbol_rootP, &symbol_lastP); - + } else { /* This symbol already exists, merge the newly created symbol into the old one. @@ -1121,14 +1121,14 @@ static void obj_coff_endef() { guess that it save a *lot* of space if the assembly file defines a lot of symbols. [loic] */ - + /* The debug entry (def_symbol_in_progress) is merged into the previous definition. */ - + c_symbol_merge(def_symbol_in_progress, symbolP); /* FIXME-SOON Should *def_symbol_in_progress be free'd? xoxorich. */ def_symbol_in_progress = symbolP; - + if (SF_GET_FUNCTION(def_symbol_in_progress) || SF_GET_TAG(def_symbol_in_progress)) { /* For functions, and tags, the symbol *must* be where the debug symbol @@ -1140,51 +1140,51 @@ static void obj_coff_endef() { } /* if not already in place */ } /* if function */ } /* normal or mergable */ - + if (SF_GET_TAG(def_symbol_in_progress) && symbol_find_base(S_GET_NAME(def_symbol_in_progress), DO_NOT_STRIP) == NULL) { tag_insert(S_GET_NAME(def_symbol_in_progress), def_symbol_in_progress); } /* If symbol is a {structure,union} tag, associate symbol to its name. */ - + if (SF_GET_FUNCTION(def_symbol_in_progress)) { know(sizeof(def_symbol_in_progress) <= sizeof(long)); function_lineoff = c_line_new((long) def_symbol_in_progress, 0, &zero_address_frag); SF_SET_PROCESS(def_symbol_in_progress); - + if (symbolP == NULL) { /* That is, if this is the first time we've seen the function... */ symbol_table_insert(def_symbol_in_progress); } /* definition follows debug */ } /* Create the line number entry pointing to the function being defined */ - + def_symbol_in_progress = NULL; demand_empty_rest_of_line(); return; } /* obj_coff_endef() */ -static void obj_coff_dim() +static void obj_coff_dim() { register int dim_index; - + if (def_symbol_in_progress == NULL) { as_warn(".dim pseudo-op used outside of .def/.endef: ignored."); demand_empty_rest_of_line(); return; } /* if not inside .def/.endef */ - + S_SET_NUMBER_AUXILIARY(def_symbol_in_progress, 1); - + for (dim_index = 0; dim_index < DIMNUM; dim_index++) { SKIP_WHITESPACES(); SA_SET_SYM_DIMEN(def_symbol_in_progress, dim_index, get_absolute_expression()); - + switch (*input_line_pointer) { - + case ',': input_line_pointer++; break; - + default: as_warn("badly formed .dim directive ignored"); /* intentional fallthrough */ @@ -1194,7 +1194,7 @@ static void obj_coff_dim() break; } /* switch on following character */ } /* for each dimension */ - + demand_empty_rest_of_line(); return; } /* obj_coff_dim() */ @@ -1204,10 +1204,10 @@ static void obj_coff_line() { obj_coff_ln(); return; } /* if it looks like a stabs style line */ - + S_SET_NUMBER_AUXILIARY(def_symbol_in_progress, 1); SA_SET_SYM_LNNO(def_symbol_in_progress, get_absolute_expression()); - + demand_empty_rest_of_line(); return; } /* obj_coff_line() */ @@ -1218,7 +1218,7 @@ static void obj_coff_size() { demand_empty_rest_of_line(); return; } /* if not inside .def/.endef */ - + S_SET_NUMBER_AUXILIARY(def_symbol_in_progress, 1); SA_SET_SYM_SIZE(def_symbol_in_progress, get_absolute_expression()); demand_empty_rest_of_line(); @@ -1231,7 +1231,7 @@ static void obj_coff_scl() { demand_empty_rest_of_line(); return; } /* if not inside .def/.endef */ - + S_SET_STORAGE_CLASS(def_symbol_in_progress, get_absolute_expression()); demand_empty_rest_of_line(); return; @@ -1240,27 +1240,27 @@ static void obj_coff_scl() { static void obj_coff_tag() { char *symbol_name; char name_end; - + if (def_symbol_in_progress == NULL) { as_warn(".tag pseudo-op used outside of .def/.endef ignored."); demand_empty_rest_of_line(); return; } /* if not inside .def/.endef */ - + S_SET_NUMBER_AUXILIARY(def_symbol_in_progress, 1); symbol_name = input_line_pointer; name_end = get_symbol_end(); - + /* Assume that the symbol referred to by .tag is always defined. */ /* This was a bad assumption. I've added find_or_make. xoxorich. */ SA_SET_SYM_TAGNDX(def_symbol_in_progress, (long) tag_find_or_make(symbol_name)); if (SA_GET_SYM_TAGNDX(def_symbol_in_progress) == 0L) { as_warn("tag not found for .tag %s", symbol_name); } /* not defined */ - + SF_SET_TAGGED(def_symbol_in_progress); *input_line_pointer = name_end; - + demand_empty_rest_of_line(); return; } /* obj_coff_tag() */ @@ -1271,14 +1271,14 @@ static void obj_coff_type() { demand_empty_rest_of_line(); return; } /* if not inside .def/.endef */ - + S_SET_DATA_TYPE(def_symbol_in_progress, get_absolute_expression()); - + if (ISFCN(S_GET_DATA_TYPE(def_symbol_in_progress)) && S_GET_STORAGE_CLASS(def_symbol_in_progress) != C_TPDEF) { SF_SET_FUNCTION(def_symbol_in_progress); } /* is a function */ - + demand_empty_rest_of_line(); return; } /* obj_coff_type() */ @@ -1289,18 +1289,18 @@ static void obj_coff_val() { demand_empty_rest_of_line(); return; } /* if not inside .def/.endef */ - + if (is_name_beginner(*input_line_pointer)) { char *symbol_name = input_line_pointer; char name_end = get_symbol_end(); - + if (!strcmp(symbol_name, ".")) { def_symbol_in_progress->sy_frag = frag_now; S_SET_VALUE(def_symbol_in_progress, obstack_next_free(&frags) - frag_now->fr_literal); /* If the .val is != from the .def (e.g. statics) */ } else if (strcmp(S_GET_NAME(def_symbol_in_progress), symbol_name)) { def_symbol_in_progress->sy_forward = symbol_find_or_make(symbol_name); - + /* If the segment is undefined when the forward reference is solved, then copy the segment id from the forward symbol. */ @@ -1311,7 +1311,7 @@ static void obj_coff_val() { } else { S_SET_VALUE(def_symbol_in_progress, get_absolute_expression()); } /* if symbol based */ - + demand_empty_rest_of_line(); return; } /* obj_coff_val() */ @@ -1330,7 +1330,7 @@ char *name; symbolS *symbolP; { register char * error_string; - + if (*(error_string = hash_jam(tag_hash, name, (char *)symbolP))) { as_fatal("Inserting \"%s\" into structure table failed: %s", name, error_string); @@ -1342,17 +1342,17 @@ static symbolS *tag_find_or_make(name) char *name; { symbolS *symbolP; - + if ((symbolP = tag_find(name)) == NULL) { symbolP = symbol_new(name, SEG_UNKNOWN, 0, &zero_address_frag); - + tag_insert(S_GET_NAME(symbolP), symbolP); symbol_table_insert(symbolP); } /* not found */ - + return(symbolP); } /* tag_find_or_make() */ @@ -1372,7 +1372,7 @@ void obj_read_begin_hook() { know(SYMESZ == AUXESZ); #endif tag_init(); - + return; } /* obj_read_begin_hook() */ @@ -1386,18 +1386,18 @@ object_headers *headers; symbolS *symbolP; symbolS *symbol_externP = NULL; symbolS *symbol_extern_lastP = NULL; - + /* Initialize the stack used to keep track of the matching .bb .be */ stack* block_stack = stack_init(512, sizeof(symbolS*)); - + /* JF deal with forward references first... */ for (symbolP = symbol_rootP; symbolP; symbolP = symbol_next(symbolP)) { - + if (symbolP->sy_forward) { S_SET_VALUE(symbolP, (S_GET_VALUE(symbolP) + S_GET_VALUE(symbolP->sy_forward) + symbolP->sy_forward->sy_frag->fr_address)); - + if ( #ifndef TE_I386AIX SF_GET_GET_SEGMENT(symbolP) @@ -1408,13 +1408,13 @@ object_headers *headers; ) { S_SET_SEGMENT(symbolP, S_GET_SEGMENT(symbolP->sy_forward)); } /* forward segment also */ - + symbolP->sy_forward=0; } /* if it has a forward reference */ } /* walk the symbol chain */ - + tc_crawl_symbol_chain(headers); - + /* The symbol list should be ordered according to the following sequence * order : * . .file symbol @@ -1425,13 +1425,13 @@ object_headers *headers; * But this is not mandatory. The only important point is to put the * undefined symbols at the end of the list. */ - + if (symbol_rootP == NULL || S_GET_STORAGE_CLASS(symbol_rootP) != C_FILE) { know(!previous_file_symbol); c_dot_file_symbol("fake"); } /* Is there a .file symbol ? If not insert one at the beginning. */ - + /* * Build up static symbols for .text, .data and .bss */ @@ -1446,7 +1446,7 @@ object_headers *headers; symbol_append(dot_text_symbol, previous_file_symbol, &symbol_rootP, &symbol_lastP); #endif /* TE_I386AIX */ - + dot_data_symbol = (symbolS*) c_section_symbol(".data", H_GET_TEXT_SIZE(headers), @@ -1458,7 +1458,7 @@ object_headers *headers; symbol_append(dot_data_symbol, dot_text_symbol, &symbol_rootP, &symbol_lastP); #endif /* TE_I386AIX */ - + dot_bss_symbol = (symbolS*) c_section_symbol(".bss", H_GET_TEXT_SIZE(headers) + H_GET_DATA_SIZE(headers), @@ -1470,11 +1470,11 @@ object_headers *headers; symbol_append(dot_bss_symbol, dot_data_symbol, &symbol_rootP, &symbol_lastP); #endif /* TE_I386AIX */ - + #if defined(DEBUG) verify_symbol_chain(symbol_rootP, symbol_lastP); #endif /* DEBUG */ - + /* Three traversals of symbol chains here. The first traversal yanks externals into a temporary chain, removing the externals from the global @@ -1488,7 +1488,7 @@ object_headers *headers; reference preceeds a definition as the definition has no number at the time we process the reference. */ - + /* Note that symbolP will be NULL at the end of a loop if an external was at the beginning of the list (it gets moved off the list). Hence the weird check in @@ -1500,7 +1500,7 @@ object_headers *headers; if (!SF_GET_DEBUG(symbolP)) { /* Debug symbols do not need all this rubbish */ symbolS* real_symbolP; - + /* L* and C_EFCN symbols never merge. */ if (!SF_GET_LOCAL(symbolP) && (real_symbolP = symbol_find_base(S_GET_NAME(symbolP), DO_NOT_STRIP)) @@ -1521,13 +1521,13 @@ object_headers *headers; symbol_remove(symbolP, &symbol_rootP, &symbol_lastP); symbolP = real_symbolP; } /* if not local but dup'd */ - + if (flagseen['R'] && (S_GET_SEGMENT(symbolP) == SEG_DATA)) { S_SET_SEGMENT(symbolP, SEG_TEXT); } /* push data into text */ - + S_SET_VALUE(symbolP, S_GET_VALUE(symbolP) + symbolP->sy_frag->fr_address); - + if (!S_IS_DEFINED(symbolP) && !SF_GET_LOCAL(symbolP)) { S_SET_EXTERNAL(symbolP); } else if (S_GET_STORAGE_CLASS(symbolP) == C_NULL) { @@ -1537,7 +1537,7 @@ object_headers *headers; S_SET_STORAGE_CLASS(symbolP, C_STAT); } } /* no storage class yet */ - + /* Mainly to speed up if not -g */ if (SF_GET_PROCESS(symbolP)) { /* Handle the nested blocks auxiliary info. */ @@ -1560,11 +1560,11 @@ object_headers *headers; if (last_functionP == (symbolS*)0 && SF_GET_FUNCTION(symbolP)) { last_functionP = symbolP; - + if (S_GET_NUMBER_AUXILIARY(symbolP) < 1) { S_SET_NUMBER_AUXILIARY(symbolP, 1); } /* make it at least 1 */ - + /* Clobber possible stale .dim information. */ memset(symbolP->sy_symbol.ost_auxent[0].x_sym.x_fcnary.x_ary.x_dimen, '\0', sizeof(symbolP->sy_symbol.ost_auxent[0].x_sym.x_fcnary.x_ary.x_dimen)); @@ -1587,7 +1587,7 @@ object_headers *headers; /* First descriptor of a structure must point to the first slot after the structure description. */ last_tagP = symbolP; - + } else if (S_GET_STORAGE_CLASS(symbolP) == C_EOS) { /* +2 take in account the current symbol */ SA_SET_SYM_ENDNDX(last_tagP, symbol_number + 2); @@ -1597,7 +1597,7 @@ object_headers *headers; S_SET_VALUE(symbolP, 0); } /* no one points at the first .file symbol */ } /* if debug or tag or eos or file */ - + /* We must put the external symbols apart. The loader does not bomb if we do not. But the references in the endndx field for a .bb symbol are not corrected @@ -1608,13 +1608,13 @@ object_headers *headers; [22] .be ld will move the symbol 21 to the end of the list but endndx will still be 22 instead of 21. */ - - + + if (SF_GET_LOCAL(symbolP)) { /* remove C_EFCN and LOCAL (L...) symbols */ /* next pointer remains valid */ symbol_remove(symbolP, &symbol_rootP, &symbol_lastP); - + } else if ( #ifdef TE_I386AIX S_GET_STORAGE_CLASS(symbolP) == C_EXT && !SF_GET_FUNCTION(symbolP) @@ -1624,7 +1624,7 @@ object_headers *headers; ) { /* if external, Remove from the list */ symbolS *hold = symbol_previous(symbolP); - + symbol_remove(symbolP, &symbol_rootP, &symbol_lastP); symbol_clear_list_pointers(symbolP); symbol_append(symbolP, symbol_extern_lastP, &symbol_externP, &symbol_extern_lastP); @@ -1636,19 +1636,19 @@ object_headers *headers; } else { symbolP->sy_name_offset = 0; } /* fix "long" names */ - + symbolP->sy_number = symbol_number; symbol_number += 1 + S_GET_NUMBER_AUXILIARY(symbolP); } /* if local symbol */ } /* traverse the symbol list */ - + for (symbolP = symbol_externP; symbol_externP;) { symbolS *tmp = symbol_externP; - + /* append */ symbol_remove(tmp, &symbol_externP, &symbol_extern_lastP); symbol_append(tmp, symbol_lastP, &symbol_rootP, &symbol_lastP); - + /* and process */ if (SF_GET_STRING(tmp)) { tmp->sy_name_offset = string_byte_count; @@ -1656,31 +1656,31 @@ object_headers *headers; } else { tmp->sy_name_offset = 0; } /* fix "long" names */ - + tmp->sy_number = symbol_number; symbol_number += 1 + S_GET_NUMBER_AUXILIARY(tmp); } /* append the entire extern chain */ - + /* When a tag reference preceeds the tag definition, the definition will not have a number at the time we process the reference during the first traversal. Thus, a second traversal. */ - + for (symbolP = symbol_rootP; symbolP; symbolP = symbol_next(symbolP)) { if (SF_GET_TAGGED(symbolP)) { SA_SET_SYM_TAGNDX(symbolP, ((symbolS*) SA_GET_SYM_TAGNDX(symbolP))->sy_number); } /* If the symbol has a tagndx entry, resolve it */ } /* second traversal */ - + know(symbol_externP == NULL); know(symbol_extern_lastP == NULL); - + /* FIXME-SOMEDAY I'm counting line no's here so we know what to put in the section headers, and I'm resolving the addresses since I'm not sure how to do it later. I am NOT resolving the linno's representing functions. Their symbols need a fileptr pointing to this linno when emitted. Thus, I resolve them on emit. xoxorich. */ - + for (lineP = lineno_rootP; lineP; lineP = lineP->next) { if (lineP->line.l_lnno > 0) { lineP->line.l_addr.l_paddr += ((fragS*)lineP->frag)->fr_address; @@ -1689,9 +1689,9 @@ object_headers *headers; } text_lineno_number++; } /* for each line number */ - + H_SET_SYMBOL_TABLE_SIZE(headers, symbol_number); - + return; } /* obj_crawl_symbol_chain() */ @@ -1703,7 +1703,7 @@ void obj_emit_strings(where) char **where; { symbolS *symbolP; - + #ifdef CROSS_COMPILE /* Gotta do md_ byte-ordering stuff for string_byte_count first - KWK */ md_number_to_chars(*where, string_byte_count, sizeof(string_byte_count)); @@ -1711,13 +1711,13 @@ char **where; #else /* CROSS_COMPILE */ append(where, (char *) &string_byte_count, (unsigned long) sizeof(string_byte_count)); #endif /* CROSS_COMPILE */ - + for (symbolP = symbol_rootP; symbolP; symbolP = symbol_next(symbolP)) { if (SF_GET_STRING(symbolP)) { append(where, S_GET_NAME(symbolP), (unsigned long)(strlen(S_GET_NAME(symbolP)) + 1)); } /* if it has a string */ } /* walk the symbol chain */ - + return; } /* obj_emit_strings() */ @@ -1730,7 +1730,7 @@ object_headers *headers; H_SET_MAGIC_NUMBER(headers, FILE_HEADER_MAGIC); H_SET_ENTRY_POINT(headers, 0); - + /* FIXME-SOMEDAY this should be done at fixup_segment time but I'm going to wait until I do multiple segments. xoxorich. */ @@ -1750,16 +1750,16 @@ object_headers *headers; ++text_relocation_number; } #endif - + } /* if not yet fixed */ } /* for each fix */ - + SA_SET_SCN_NRELOC(dot_text_symbol, text_relocation_number); /* Assign the number of line number entries for the text section */ SA_SET_SCN_NLINNO(dot_text_symbol, text_lineno_number); /* Assign the size of the section */ SA_SET_SCN_SCNLEN(dot_text_symbol, H_GET_TEXT_SIZE(headers)); - + for (fixP = data_fix_root; fixP; fixP = fixP->fx_next) { if (fixP->fx_addsy) { ++data_relocation_number; @@ -1770,28 +1770,28 @@ object_headers *headers; ++data_relocation_number; } #endif - + } /* for each fix */ - - + + SA_SET_SCN_NRELOC(dot_data_symbol, data_relocation_number); /* Assign the size of the section */ SA_SET_SCN_SCNLEN(dot_data_symbol, H_GET_DATA_SIZE(headers)); - + /* Assign the size of the section */ SA_SET_SCN_SCNLEN(dot_bss_symbol, H_GET_BSS_SIZE(headers)); - + /* pre write hook can add relocs (for 960 and 29k coff) so */ headers->relocation_size = text_relocation_number * RELSZ + data_relocation_number *RELSZ; - - - + + + /* Fill in extra coff fields */ - + /* Initialize general line number information. */ H_SET_LINENO_SIZE(headers, text_lineno_number * LINESZ); - + /* filehdr */ H_SET_FILE_MAGIC_NUMBER(headers, FILE_HEADER_MAGIC); H_SET_NUMBER_OF_SECTIONS(headers, 3); /* text+data+bss */ @@ -1812,7 +1812,7 @@ object_headers *headers; #endif /* symbol table size allready set */ H_SET_SIZEOF_OPTIONAL_HEADER(headers, OBJ_COFF_AOUTHDRSZ); - + /* do not added the F_RELFLG for the standard COFF. * The AIX linker complain on file with relocation info striped flag. */ @@ -1823,14 +1823,14 @@ object_headers *headers; H_SET_FLAGS(headers, (text_lineno_number == 0 ? F_LNNO : 0) | ((text_relocation_number + data_relocation_number) ? 0 : F_RELFLG) | BYTE_ORDERING); -#endif +#endif /* aouthdr */ /* magic number allready set */ H_SET_VERSION_STAMP(headers, 0); /* Text, data, bss size; entry point; text_start and data_start are already set */ - + /* Build section headers */ - + c_section_header(&text_section_header, ".text", 0, @@ -1845,7 +1845,7 @@ object_headers *headers; SA_GET_SCN_NRELOC(dot_text_symbol), text_lineno_number, section_alignment[(int) SEG_TEXT]); - + c_section_header(&data_section_header, ".data", H_GET_TEXT_SIZE(headers), @@ -1861,7 +1861,7 @@ object_headers *headers; SA_GET_SCN_NRELOC(dot_data_symbol), 0, /* No line number information */ section_alignment[(int) SEG_DATA]); - + c_section_header(&bss_section_header, ".bss", H_GET_TEXT_SIZE(headers) + H_GET_DATA_SIZE(headers), @@ -1872,7 +1872,7 @@ object_headers *headers; 0, /* No relocation information */ 0, /* No line number information */ section_alignment[(int) SEG_BSS]); - + return; } /* obj_pre_write_hook() */ @@ -1888,11 +1888,11 @@ int what; int saved_type = 0; long longint; symbolS *symbolP = 0; - + if (what == 's') { string = demand_copy_C_string(&length); SKIP_WHITESPACE(); - + if (*input_line_pointer == ',') { input_line_pointer++; } else { @@ -1900,7 +1900,7 @@ int what; goof = 1; } /* better be a comma */ } /* skip the string */ - + /* * Input_line_pointer->after ','. String->symbol name. */ @@ -1911,7 +1911,7 @@ int what; input_line_pointer--; /* Backup over a non-',' char. */ } /* on error */ } /* no error */ - + if (!goof) { if (get_absolute_expression_and_terminator(&longint) != ',') { as_bad("I want a comma after the n_other expression"); @@ -1919,10 +1919,10 @@ int what; input_line_pointer--; /* Backup over a non-',' char. */ } /* on error */ } /* no error */ - + if (!goof) { get_absolute_expression(); - + if (what == 's' || what == 'n') { if (*input_line_pointer != ',') { as_bad("I want a comma after the n_desc expression"); @@ -1932,9 +1932,9 @@ int what; } /* on goof */ } /* not stabd */ } /* no error */ - + expression(&e); - + if (goof) { ignore_rest_of_line(); } else { @@ -1952,7 +1952,7 @@ symbolS *s; void symbol_dump() { symbolS *symbolP; - + for (symbolP = symbol_rootP; symbolP; symbolP = symbol_next(symbolP)) { printf("%3ld: 0x%lx \"%s\" type = %ld, class = %d, segment = %d\n", symbolP->sy_number, @@ -1962,7 +1962,7 @@ void symbol_dump() { S_GET_STORAGE_CLASS(symbolP), (int) S_GET_SEGMENT(symbolP)); } /* traverse symbols */ - + return; } /* symbol_dump() */ #endif /* DEBUG */ diff --git a/gnu/usr.bin/as/config/obj-coff.h b/gnu/usr.bin/as/config/obj-coff.h index 9720d5e..3f1f7ea 100644 --- a/gnu/usr.bin/as/config/obj-coff.h +++ b/gnu/usr.bin/as/config/obj-coff.h @@ -1,18 +1,18 @@ /* coff object file format Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -28,7 +28,7 @@ #include "bfd.h" #include "coff/a29k.h" -/* This internal_lineno crap is to stop namespace pollution from the bfd internal +/* This internal_lineno crap is to stop namespace pollution from the bfd internal coff headerfile. */ #define internal_lineno bfd_internal_lineno @@ -45,7 +45,7 @@ #define SYMENT struct internal_syment #define AUXENT union internal_auxent #define SCNHDR struct internal_scnhdr - #define LINENO struct bfd_internal_lineno + #define LINENO struct bfd_internal_lineno #define AOUTHDR struct internal_aouthdr #define FILHDR struct internal_filehdr #define AOUTHDRSZ sizeof(struct external_aouthdr) @@ -90,12 +90,12 @@ extern bfd *stdoutput; /* Define some processor dependent values according to the processor we are on. */ #ifdef TC_M68K - + #define BYTE_ORDERING F_AR32W /* See filehdr.h for more info. */ #ifndef FILE_HEADER_MAGIC #define FILE_HEADER_MAGIC MC68MAGIC /* ... */ #endif /* FILE_HEADER_MAGIC */ - + #elif defined(TC_I386) #define BYTE_ORDERING F_AR32WR /* See filehdr.h for more info. */ @@ -119,12 +119,12 @@ extern bfd *stdoutput; #else you lose -#endif - +#endif + #ifndef OBJ_COFF_MAX_AUXENTRIES #define OBJ_COFF_MAX_AUXENTRIES 1 #endif /* OBJ_COFF_MAX_AUXENTRIES */ - + extern const short seg_N_TYPE[]; extern const segT N_TYPE_seg[]; @@ -161,7 +161,7 @@ typedef struct { /* Symbol table macros and constants */ -/* Possible and usefull section number in symbol table +/* Possible and usefull section number in symbol table * The values of TEXT, DATA and BSS may not be portable. */ @@ -215,7 +215,7 @@ typedef struct { /* The zeroes if symbol name is longer than 8 chars */ #define S_GET_ZEROES(s) ((s)->sy_symbol.ost_entry.n_zeroes) /* The value of the symbol */ -#define S_GET_VALUE(s) ((unsigned) ((s)->sy_symbol.ost_entry.n_value)) +#define S_GET_VALUE(s) ((unsigned) ((s)->sy_symbol.ost_entry.n_value)) /* The numeric value of the segment */ #define S_GET_SEGMENT(s) (N_TYPE_seg[(s)->sy_symbol.ost_entry.n_scnum+4]) /* The data type */ @@ -546,7 +546,7 @@ void c_section_header( #else SCNHDR *header, #endif - + char *name, long core_address, long size, diff --git a/gnu/usr.bin/as/config/obj-coffbfd.c b/gnu/usr.bin/as/config/obj-coffbfd.c index d69c7a0..352893a 100644 --- a/gnu/usr.bin/as/config/obj-coffbfd.c +++ b/gnu/usr.bin/as/config/obj-coffbfd.c @@ -1,26 +1,26 @@ /* coff object file format with bfd Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - + How does this releate to the rest of GAS ? - + Well, all the other files in gas are more or less a black box. It takes care of opening files, parsing command lines, stripping blanks etc etc. This module gets a chance to register what it wants to do by @@ -28,11 +28,11 @@ change is write_object_file. This runs through all the data structures that gas builds, and outputs the file in the format of our choice. - + Hacked for BFDness by steve chamberlain - + This object module now supports the Hitachi H8/300 and the AMD 29k - + sac@cygnus.com */ @@ -44,7 +44,7 @@ /* This vector is used to turn an internal segment into a section # - suitable for insertion into a coff symbol table + suitable for insertion into a coff symbol table */ const short seg_N_TYPE[] = { /* in: segT out: N_TYPE bits */ @@ -85,7 +85,7 @@ int text_lineno_number = 0; /* Add 4 to the real value to get the index and compensate the negatives. This vector is used by S_GET_SEGMENT to turn a coff - section number into a segment number + section number into a segment number */ static symbolS *previous_file_symbol = NULL; void c_symbol_merge(); @@ -168,42 +168,42 @@ const pseudo_typeS obj_pseudo_table[] = { -/* Section stuff - +/* Section stuff + We allow more than just the standard 3 sections, infact, we allow 10 sections, (though the usual three have to be there). - + This structure performs the mappings for us: - + */ -/* OBS stuff +/* OBS stuff static struct internal_scnhdr bss_section_header; struct internal_scnhdr data_section_header; struct internal_scnhdr text_section_header; - + const segT N_TYPE_seg[32] = { - + }; - + */ #define N_SEG 32 -typedef struct +typedef struct { - segT seg_t; - int i; + segT seg_t; + int i; } seg_info_type; -seg_info_type seg_info_off_by_4[N_SEG] = +seg_info_type seg_info_off_by_4[N_SEG] = { {SEG_PTV, }, {SEG_NTV, }, {SEG_DEBUG, }, {SEG_ABSOLUTE, }, {SEG_UNKNOWN, }, - {SEG_E0}, + {SEG_E0}, {SEG_E1}, {SEG_E2}, {SEG_E3}, @@ -211,7 +211,7 @@ seg_info_type seg_info_off_by_4[N_SEG] = {SEG_E5}, {SEG_E6}, {SEG_E7}, - {SEG_E8}, + {SEG_E8}, {SEG_E9}, {15}, {16}, @@ -228,21 +228,21 @@ seg_info_type seg_info_off_by_4[N_SEG] = #define SEG_INFO_FROM_SEG_NUMBER(x) (seg_info_off_by_4[(x)]) -relax_addressT +relax_addressT DEFUN(relax_align,(address, alignment), register relax_addressT address AND register long alignment ) { relax_addressT mask; relax_addressT new_address; - + mask = ~ ( (~0) << alignment ); new_address = (address + mask) & (~ mask); return (new_address - address); } /* relax_align() */ -segT +segT DEFUN(s_get_segment,(x) , symbolS* x) { @@ -257,11 +257,11 @@ static unsigned int DEFUN(size_section,(abfd, idx), bfd *abfd AND unsigned int idx) { - + unsigned int size = 0; fragS *frag = segment_info[idx].frchainP->frch_root; while (frag) { - if (frag->fr_address != size) { + if (frag->fr_address != size) { printf("Out of step\n"); size = frag->fr_address; } @@ -286,26 +286,26 @@ static unsigned int DEFUN(count_entries_in_chain,(idx), { unsigned int nrelocs; fixS *fixup_ptr; - + /* Count the relocations */ fixup_ptr = segment_info[idx].fix_root; nrelocs = 0; - while (fixup_ptr != (fixS *)NULL) + while (fixup_ptr != (fixS *)NULL) { - if (TC_COUNT_RELOC(fixup_ptr)) + if (TC_COUNT_RELOC(fixup_ptr)) { - + #ifdef TC_A29K - - if (fixup_ptr->fx_r_type == RELOC_CONSTH) + + if (fixup_ptr->fx_r_type == RELOC_CONSTH) nrelocs+=2; - else - nrelocs++; + else + nrelocs++; #else nrelocs++; #endif } - + fixup_ptr = fixup_ptr->fx_next; } return nrelocs; @@ -318,12 +318,12 @@ void DEFUN(do_relocs_for,(abfd, file_cursor), { unsigned int nrelocs; unsigned int idx; - - for (idx = SEG_E0; idx < SEG_E9; idx++) + + for (idx = SEG_E0; idx < SEG_E9; idx++) { - if (segment_info[idx].scnhdr.s_name[0]) + if (segment_info[idx].scnhdr.s_name[0]) { - + struct external_reloc *ext_ptr; struct external_reloc *external_reloc_vec; unsigned int external_reloc_size; @@ -334,82 +334,82 @@ void DEFUN(do_relocs_for,(abfd, file_cursor), external_reloc_size = nrelocs * RELSZ; external_reloc_vec = (struct external_reloc*)malloc(external_reloc_size); - - - + + + ext_ptr = external_reloc_vec; - + /* Fill in the internal coff style reloc struct from the internal fix list */ while (fix_ptr) { symbolS *symbol_ptr; struct internal_reloc intr; - + /* Only output some of the relocations */ if (TC_COUNT_RELOC(fix_ptr)) { #ifdef TC_RELOC_MANGLE TC_RELOC_MANGLE(fix_ptr, &intr, base); - + #else symbolS *dot; symbol_ptr = fix_ptr->fx_addsy; - + intr.r_type = TC_COFF_FIX2RTYPE(fix_ptr); intr.r_vaddr = base + fix_ptr->fx_frag->fr_address + fix_ptr->fx_where ; - + intr.r_offset = fix_ptr->fx_offset; - + intr.r_offset = 0; - + /* Turn the segment of the symbol into an offset */ - if (symbol_ptr) + if (symbol_ptr) { dot = segment_info[S_GET_SEGMENT(symbol_ptr)].dot; if (dot) { intr.r_symndx = dot->sy_number; } - else + else { intr.r_symndx = symbol_ptr->sy_number; } - + } - else + else { intr.r_symndx = -1; - - + + } #endif - + (void)bfd_coff_swap_reloc_out(abfd, &intr, ext_ptr); ext_ptr++; - + #if defined(TC_A29K) /* The 29k has a special kludge for the high 16 bit reloc. Two relocations are emmited, R_IHIHALF, and R_IHCONST. The second one doesn't contain a symbol, but uses the value for offset */ - + if (intr.r_type == R_IHIHALF) { /* now emit the second bit */ - intr.r_type = R_IHCONST; + intr.r_type = R_IHCONST; intr.r_symndx = fix_ptr->fx_addnumber; (void)bfd_coff_swap_reloc_out(abfd,&intr,ext_ptr); ext_ptr++; } #endif } - + fix_ptr = fix_ptr->fx_next; } - + /* Write out the reloc table */ segment_info[idx].scnhdr.s_relptr = *file_cursor; segment_info[idx].scnhdr.s_nreloc = nrelocs; @@ -422,31 +422,31 @@ void DEFUN(do_relocs_for,(abfd, file_cursor), /* run through a frag chain and write out the data to go with it, fill - in the scnhdrs with the info on the file postions + in the scnhdrs with the info on the file postions */ static void DEFUN(fill_section,(abfd, filehdr, file_cursor), bfd *abfd AND struct internal_filehdr *filehdr AND unsigned long *file_cursor) { - + unsigned int i; unsigned int paddr = 0; - - for (i = SEG_E0; i < SEG_UNKNOWN; i++) - { + + for (i = SEG_E0; i < SEG_UNKNOWN; i++) + { unsigned int offset = 0; - + struct internal_scnhdr *s = &( segment_info[i].scnhdr); - - if (s->s_name[0]) + + if (s->s_name[0]) { fragS *frag = segment_info[i].frchainP->frch_root; char *buffer = malloc(s->s_size); s->s_scnptr = *file_cursor; s->s_paddr = paddr; s->s_vaddr = paddr; - + s->s_flags = STYP_REG; if (strcmp(s->s_name,".text") == 0) s->s_flags |= STYP_TEXT; @@ -454,54 +454,54 @@ static void DEFUN(fill_section,(abfd, filehdr, file_cursor), s->s_flags |= STYP_DATA; else if (strcmp(s->s_name,".bss") == 0) s->s_flags |= STYP_BSS | STYP_NOLOAD; - + while (frag) { unsigned int fill_size; switch (frag->fr_type) { - + case rs_fill: case rs_align: case rs_org: - if (frag->fr_fix) + if (frag->fr_fix) { memcpy(buffer + frag->fr_address, frag->fr_literal, frag->fr_fix); offset += frag->fr_fix; } - + fill_size = frag->fr_var; - if (fill_size) + if (fill_size) { unsigned int count ; unsigned int off = frag->fr_fix; - for (count = frag->fr_offset; count; count--) + for (count = frag->fr_offset; count; count--) { memcpy(buffer + frag->fr_address + off, frag->fr_literal + frag->fr_fix, fill_size); off += fill_size; offset += fill_size; - + } - + } break; - default: + default: abort(); } frag = frag->fr_next; } - - + + bfd_write(buffer, s->s_size,1,abfd); free(buffer); - + *file_cursor += s->s_size; paddr += s->s_size; - } + } } - + } @@ -509,7 +509,7 @@ static void DEFUN(fill_section,(abfd, filehdr, file_cursor), /* Coff file generation & utilities */ -static void +static void DEFUN(coff_header_append,(abfd, filehdr, aouthdr), bfd *abfd AND struct internal_filehdr *filehdr AND @@ -518,23 +518,23 @@ static void unsigned int i; char buffer[1000]; char buffero[1000]; - + bfd_seek(abfd, 0, 0); -#if 0 +#if 0 filehdr.f_opthdr = bfd_coff_swap_aouthdr_out(abfd, aouthdr, buffero); #else filehdr->f_opthdr = 0; #endif i = bfd_coff_swap_filehdr_out(abfd, filehdr, buffer); - + bfd_write(buffer, i ,1, abfd); bfd_write(buffero, filehdr->f_opthdr, 1, abfd); - - for (i = SEG_E0; i < SEG_E9; i++) + + for (i = SEG_E0; i < SEG_E9; i++) { - if (segment_info[i].scnhdr.s_name[0]) - { + if (segment_info[i].scnhdr.s_name[0]) + { unsigned int size = bfd_coff_swap_scnhdr_out(abfd, &(segment_info[i].scnhdr), @@ -553,22 +553,22 @@ char * { unsigned int numaux = symbolP->sy_symbol.ost_entry.n_numaux; unsigned int i; - + /* Turn any symbols with register attributes into abs symbols */ - if (S_GET_SEGMENT(symbolP) == SEG_REGISTER) + if (S_GET_SEGMENT(symbolP) == SEG_REGISTER) { S_SET_SEGMENT(symbolP, SEG_ABSOLUTE); } /* At the same time, relocate all symbols to their output value */ - + S_SET_VALUE(symbolP, - segment_info[S_GET_SEGMENT(symbolP)].scnhdr.s_paddr + segment_info[S_GET_SEGMENT(symbolP)].scnhdr.s_paddr + S_GET_VALUE(symbolP)); - + where += bfd_coff_swap_sym_out(abfd, &symbolP->sy_symbol.ost_entry, where); - - for (i = 0; i < numaux; i++) + + for (i = 0; i < numaux; i++) { where += bfd_coff_swap_aux_out(abfd, &symbolP->sy_symbol.ost_auxent[i], @@ -577,8 +577,8 @@ char * where); } return where; - -} + +} @@ -587,7 +587,7 @@ void obj_symbol_new_hook(symbolP) symbolS *symbolP; { char underscore = 0; /* Symbol has leading _ */ - + /* Effective symbol */ /* Store the pointer in the offset. */ S_SET_ZEROES(symbolP, 0L); @@ -598,7 +598,7 @@ symbolS *symbolP; symbolP->sy_symbol.ost_flags = 0; /* Auxiliary entries */ memset((char*) &symbolP->sy_symbol.ost_auxent[0], '\0', AUXESZ); - + #ifdef STRIP_UNDERSCORE /* Remove leading underscore at the beginning of the symbol. * This is to be compatible with the standard librairies. @@ -608,12 +608,12 @@ symbolS *symbolP; S_SET_NAME(symbolP, S_GET_NAME(symbolP) + 1); } /* strip underscore */ #endif /* STRIP_UNDERSCORE */ - + if (S_IS_STRING(symbolP)) SF_SET_STRING(symbolP); if (!underscore && S_IS_LOCAL(symbolP)) SF_SET_LOCAL(symbolP); - + return; } /* obj_symbol_new_hook() */ @@ -623,7 +623,7 @@ unsigned long chunk_size; unsigned long element_size; { stack* st; - + if ((st = (stack*)malloc(sizeof(stack))) == (stack*)0) return (stack*)0; if ((st->data = malloc(chunk_size)) == (char*)0) { @@ -665,7 +665,7 @@ stack* st; st->pointer = 0; return (char*)0; } - + return st->data + st->pointer; } @@ -680,16 +680,16 @@ stack* st; * Handle .ln directives. */ -static void obj_coff_ln() +static void obj_coff_ln() { int l; - + if (def_symbol_in_progress != NULL) { as_warn(".ln pseudo-op inside .def/.endef: ignored."); demand_empty_rest_of_line(); return; } /* wrong context */ - + c_line_new(0, obstack_next_free(&frags) - frag_now->fr_literal, l = get_absolute_expression(), @@ -697,12 +697,12 @@ static void obj_coff_ln() #ifndef NO_LISTING { extern int listing; - - if (listing) + + if (listing) { listing_source_line(l + line_base - 1); } - + } #endif demand_empty_rest_of_line(); @@ -728,7 +728,7 @@ static void obj_coff_ln() *input_line_pointer == '\t') \ input_line_pointer++; -static void +static void DEFUN(obj_coff_def,(what), int what) { @@ -739,24 +739,24 @@ static void /*$char* directiveP;$ */ /* Name of the pseudo opcode */ /*$char directive[MAX_DIRECTIVE];$ */ /* Backup of the directive */ /*$char end = 0;$ */ /* If 1, stop parsing */ - + if (def_symbol_in_progress != NULL) { as_warn(".def pseudo-op used inside of .def/.endef: ignored."); demand_empty_rest_of_line(); return; } /* if not inside .def/.endef */ - + SKIP_WHITESPACES(); - + def_symbol_in_progress = (symbolS *) obstack_alloc(¬es, sizeof(*def_symbol_in_progress)); memset(def_symbol_in_progress, '\0', sizeof(*def_symbol_in_progress)); - + symbol_name = input_line_pointer; name_end = get_symbol_end(); symbol_name_length = strlen(symbol_name); symbol_name_copy = xmalloc(symbol_name_length + 1); strcpy(symbol_name_copy, symbol_name); - + /* Initialize the new symbol */ #ifdef STRIP_UNDERSCORE S_SET_NAME(def_symbol_in_progress, (*symbol_name_copy == '_' @@ -769,20 +769,20 @@ static void def_symbol_in_progress->sy_name_offset = ~0; def_symbol_in_progress->sy_number = ~0; def_symbol_in_progress->sy_frag = &zero_address_frag; - + if (S_IS_STRING(def_symbol_in_progress)) { SF_SET_STRING(def_symbol_in_progress); } /* "long" name */ - + *input_line_pointer = name_end; - + demand_empty_rest_of_line(); return; } /* obj_coff_def() */ unsigned int dim_index; -static void - DEFUN_VOID(obj_coff_endef) +static void + DEFUN_VOID(obj_coff_endef) { symbolS *symbolP = 0; /* DIM BUG FIX sac@cygnus.com */ @@ -792,7 +792,7 @@ static void demand_empty_rest_of_line(); return; } /* if not inside .def/.endef */ - + /* Set the section number according to storage class. */ switch (S_GET_STORAGE_CLASS(def_symbol_in_progress)) { case C_STRTAG: @@ -805,7 +805,7 @@ static void SF_SET_DEBUG(def_symbol_in_progress); S_SET_SEGMENT(def_symbol_in_progress, SEG_DEBUG); break; - + case C_EFCN: SF_SET_LOCAL(def_symbol_in_progress); /* Do not emit this symbol. */ /* intentional fallthrough */ @@ -814,7 +814,7 @@ static void /* intentional fallthrough */ case C_FCN: S_SET_SEGMENT(def_symbol_in_progress, SEG_E0); - + if (def_symbol_in_progress->sy_symbol.ost_entry.n_name[1] == 'b') { /* .bf */ if (function_lineoff < 0) { fprintf(stderr, "`.bf' symbol without preceding function\n"); @@ -824,7 +824,7 @@ static void function_lineoff = -1; } break; - + #ifdef C_AUTOARG case C_AUTOARG: #endif /* C_AUTOARG */ @@ -840,25 +840,25 @@ static void SF_SET_DEBUG(def_symbol_in_progress); S_SET_SEGMENT(def_symbol_in_progress, SEG_ABSOLUTE); break; - + case C_EXT: case C_STAT: - case C_LABEL: + case C_LABEL: /* Valid but set somewhere else (s_comm, s_lcomm, colon) */ break; - + case C_USTATIC: case C_EXTDEF: case C_ULABEL: as_warn("unexpected storage class %d", S_GET_STORAGE_CLASS(def_symbol_in_progress)); break; } /* switch on storage class */ - + /* Now that we have built a debug symbol, try to find if we should merge with an existing symbol or not. If a symbol is C_EFCN or SEG_ABSOLUTE or untagged SEG_DEBUG it never merges. */ - + /* Two cases for functions. Either debug followed by definition or definition followed by debug. For definition first, we will merge the debug @@ -869,19 +869,19 @@ static void symbol into the real symbol. Therefor, let's presume the debug symbol is a real function reference. */ - + /* FIXME-SOON If for some reason the definition label/symbol is never seen, this will probably leave an undefined symbol at link time. */ - + if (S_GET_STORAGE_CLASS(def_symbol_in_progress) == C_EFCN || (S_GET_SEGMENT(def_symbol_in_progress) == SEG_DEBUG && !SF_GET_TAG(def_symbol_in_progress)) || S_GET_SEGMENT(def_symbol_in_progress) == SEG_ABSOLUTE || (symbolP = symbol_find_base(S_GET_NAME(def_symbol_in_progress), DO_NOT_STRIP)) == NULL) { - + symbol_append(def_symbol_in_progress, symbol_lastP, &symbol_rootP, &symbol_lastP); - + } else { /* This symbol already exists, merge the newly created symbol into the old one. @@ -890,14 +890,14 @@ static void guess that it save a *lot* of space if the assembly file defines a lot of symbols. [loic] */ - + /* The debug entry (def_symbol_in_progress) is merged into the previous definition. */ - + c_symbol_merge(def_symbol_in_progress, symbolP); /* FIXME-SOON Should *def_symbol_in_progress be free'd? xoxorich. */ def_symbol_in_progress = symbolP; - + if (SF_GET_FUNCTION(def_symbol_in_progress) || SF_GET_TAG(def_symbol_in_progress)) { /* For functions, and tags, the symbol *must* be where the debug symbol @@ -909,59 +909,59 @@ static void } /* if not already in place */ } /* if function */ } /* normal or mergable */ - + if (SF_GET_TAG(def_symbol_in_progress) && symbol_find_base(S_GET_NAME(def_symbol_in_progress), DO_NOT_STRIP) == NULL) { tag_insert(S_GET_NAME(def_symbol_in_progress), def_symbol_in_progress); } /* If symbol is a {structure,union} tag, associate symbol to its name. */ - + if (SF_GET_FUNCTION(def_symbol_in_progress)) { know(sizeof(def_symbol_in_progress) <= sizeof(long)); - function_lineoff + function_lineoff = c_line_new(def_symbol_in_progress,0, 0, &zero_address_frag); - - - + + + SF_SET_PROCESS(def_symbol_in_progress); - + if (symbolP == NULL) { /* That is, if this is the first time we've seen the function... */ symbol_table_insert(def_symbol_in_progress); } /* definition follows debug */ } /* Create the line number entry pointing to the function being defined */ - + def_symbol_in_progress = NULL; demand_empty_rest_of_line(); return; } /* obj_coff_endef() */ -static void - DEFUN_VOID(obj_coff_dim) +static void + DEFUN_VOID(obj_coff_dim) { register int dim_index; - - if (def_symbol_in_progress == NULL) + + if (def_symbol_in_progress == NULL) { as_warn(".dim pseudo-op used outside of .def/.endef: ignored."); demand_empty_rest_of_line(); return; } /* if not inside .def/.endef */ - + S_SET_NUMBER_AUXILIARY(def_symbol_in_progress, 1); - - for (dim_index = 0; dim_index < DIMNUM; dim_index++) + + for (dim_index = 0; dim_index < DIMNUM; dim_index++) { SKIP_WHITESPACES(); SA_SET_SYM_DIMEN(def_symbol_in_progress, dim_index, get_absolute_expression()); - - switch (*input_line_pointer) + + switch (*input_line_pointer) { - + case ',': input_line_pointer++; break; - + default: as_warn("badly formed .dim directive ignored"); /* intentional fallthrough */ @@ -971,38 +971,38 @@ static void break; } /* switch on following character */ } /* for each dimension */ - + demand_empty_rest_of_line(); return; } /* obj_coff_dim() */ -static void obj_coff_line() +static void obj_coff_line() { int this_base; - + if (def_symbol_in_progress == NULL) { obj_coff_ln(); return; } /* if it looks like a stabs style line */ - + this_base = get_absolute_expression(); - if (this_base > line_base) + if (this_base > line_base) { line_base = this_base; } - - -#ifndef NO_LISTING + + +#ifndef NO_LISTING { extern int listing; if (listing && 0) { listing_source_line(line_base); } - } + } #endif S_SET_NUMBER_AUXILIARY(def_symbol_in_progress, 1); SA_SET_SYM_LNNO(def_symbol_in_progress, line_base); - + demand_empty_rest_of_line(); return; } /* obj_coff_line() */ @@ -1013,7 +1013,7 @@ static void obj_coff_size() { demand_empty_rest_of_line(); return; } /* if not inside .def/.endef */ - + S_SET_NUMBER_AUXILIARY(def_symbol_in_progress, 1); SA_SET_SYM_SIZE(def_symbol_in_progress, get_absolute_expression()); demand_empty_rest_of_line(); @@ -1026,7 +1026,7 @@ static void obj_coff_scl() { demand_empty_rest_of_line(); return; } /* if not inside .def/.endef */ - + S_SET_STORAGE_CLASS(def_symbol_in_progress, get_absolute_expression()); demand_empty_rest_of_line(); return; @@ -1035,27 +1035,27 @@ static void obj_coff_scl() { static void obj_coff_tag() { char *symbol_name; char name_end; - + if (def_symbol_in_progress == NULL) { as_warn(".tag pseudo-op used outside of .def/.endef ignored."); demand_empty_rest_of_line(); return; } /* if not inside .def/.endef */ - + S_SET_NUMBER_AUXILIARY(def_symbol_in_progress, 1); symbol_name = input_line_pointer; name_end = get_symbol_end(); - + /* Assume that the symbol referred to by .tag is always defined. */ /* This was a bad assumption. I've added find_or_make. xoxorich. */ SA_SET_SYM_TAGNDX(def_symbol_in_progress, (long) tag_find_or_make(symbol_name)); if (SA_GET_SYM_TAGNDX(def_symbol_in_progress) == 0L) { as_warn("tag not found for .tag %s", symbol_name); } /* not defined */ - + SF_SET_TAGGED(def_symbol_in_progress); *input_line_pointer = name_end; - + demand_empty_rest_of_line(); return; } /* obj_coff_tag() */ @@ -1066,14 +1066,14 @@ static void obj_coff_type() { demand_empty_rest_of_line(); return; } /* if not inside .def/.endef */ - + S_SET_DATA_TYPE(def_symbol_in_progress, get_absolute_expression()); - + if (ISFCN(S_GET_DATA_TYPE(def_symbol_in_progress)) && S_GET_STORAGE_CLASS(def_symbol_in_progress) != C_TPDEF) { SF_SET_FUNCTION(def_symbol_in_progress); } /* is a function */ - + demand_empty_rest_of_line(); return; } /* obj_coff_type() */ @@ -1084,18 +1084,18 @@ static void obj_coff_val() { demand_empty_rest_of_line(); return; } /* if not inside .def/.endef */ - + if (is_name_beginner(*input_line_pointer)) { char *symbol_name = input_line_pointer; char name_end = get_symbol_end(); - + if (!strcmp(symbol_name, ".")) { def_symbol_in_progress->sy_frag = frag_now; S_SET_VALUE(def_symbol_in_progress, obstack_next_free(&frags) - frag_now->fr_literal); /* If the .val is != from the .def (e.g. statics) */ } else if (strcmp(S_GET_NAME(def_symbol_in_progress), symbol_name)) { def_symbol_in_progress->sy_forward = symbol_find_or_make(symbol_name); - + /* If the segment is undefined when the forward reference is solved, then copy the segment id from the forward symbol. */ @@ -1106,7 +1106,7 @@ static void obj_coff_val() { } else { S_SET_VALUE(def_symbol_in_progress, get_absolute_expression()); } /* if symbol based */ - + demand_empty_rest_of_line(); return; } /* obj_coff_val() */ @@ -1125,7 +1125,7 @@ char *name; symbolS *symbolP; { register char * error_string; - + if (*(error_string = hash_jam(tag_hash, name, (char *)symbolP))) { as_fatal("Inserting \"%s\" into structure table failed: %s", name, error_string); @@ -1137,17 +1137,17 @@ static symbolS *tag_find_or_make(name) char *name; { symbolS *symbolP; - + if ((symbolP = tag_find(name)) == NULL) { symbolP = symbol_new(name, SEG_UNKNOWN, 0, &zero_address_frag); - + tag_insert(S_GET_NAME(symbolP), symbolP); symbol_table_insert(symbolP); } /* not found */ - + return(symbolP); } /* tag_find_or_make() */ @@ -1167,7 +1167,7 @@ void obj_read_begin_hook() { know(SYMESZ == AUXESZ); #endif tag_init(); - + return; } /* obj_read_begin_hook() */ @@ -1187,14 +1187,14 @@ static unsigned int DEFUN_VOID(yank_symbols) { symbolS *symbolP; unsigned int symbol_number =0; - + for (symbolP = symbol_rootP; symbolP; symbolP = symbolP ? symbol_next(symbolP) : symbol_rootP) { if (!SF_GET_DEBUG(symbolP)) { /* Debug symbols do not need all this rubbish */ symbolS* real_symbolP; - + /* L* and C_EFCN symbols never merge. */ if (!SF_GET_LOCAL(symbolP) && (real_symbolP = symbol_find_base(S_GET_NAME(symbolP), DO_NOT_STRIP)) @@ -1216,32 +1216,32 @@ static unsigned int DEFUN_VOID(yank_symbols) symbol_remove(symbolP, &symbol_rootP, &symbol_lastP); symbolP = real_symbolP; } /* if not local but dup'd */ - + if (flagseen['R'] && (S_GET_SEGMENT(symbolP) == SEG_E1)) { S_SET_SEGMENT(symbolP, SEG_E0); } /* push data into text */ - + S_SET_VALUE(symbolP, S_GET_VALUE(symbolP) + symbolP->sy_frag->fr_address); - - if (!S_IS_DEFINED(symbolP) && !SF_GET_LOCAL(symbolP)) + + if (!S_IS_DEFINED(symbolP) && !SF_GET_LOCAL(symbolP)) { S_SET_EXTERNAL(symbolP); - } - else if (S_GET_STORAGE_CLASS(symbolP) == C_NULL) + } + else if (S_GET_STORAGE_CLASS(symbolP) == C_NULL) { if (S_GET_SEGMENT(symbolP) == SEG_E0) { S_SET_STORAGE_CLASS(symbolP, C_LABEL); - } - else + } + else { S_SET_STORAGE_CLASS(symbolP, C_STAT); } - } - + } + /* Mainly to speed up if not -g */ - if (SF_GET_PROCESS(symbolP)) + if (SF_GET_PROCESS(symbolP)) { /* Handle the nested blocks auxiliary info. */ if (S_GET_STORAGE_CLASS(symbolP) == C_BLOCK) { @@ -1263,11 +1263,11 @@ static unsigned int DEFUN_VOID(yank_symbols) if (last_functionP == (symbolS*)0 && SF_GET_FUNCTION(symbolP)) { last_functionP = symbolP; - + if (S_GET_NUMBER_AUXILIARY(symbolP) < 1) { S_SET_NUMBER_AUXILIARY(symbolP, 1); } /* make it at least 1 */ - + /* Clobber possible stale .dim information. */ memset(symbolP->sy_symbol.ost_auxent[0].x_sym.x_fcnary.x_ary.x_dimen, '\0', sizeof(symbolP->sy_symbol.ost_auxent[0].x_sym.x_fcnary.x_ary.x_dimen)); @@ -1290,7 +1290,7 @@ static unsigned int DEFUN_VOID(yank_symbols) /* First descriptor of a structure must point to the first slot after the structure description. */ last_tagP = symbolP; - + } else if (S_GET_STORAGE_CLASS(symbolP) == C_EOS) { /* +2 take in account the current symbol */ SA_SET_SYM_ENDNDX(last_tagP, symbol_number + 2); @@ -1300,7 +1300,7 @@ static unsigned int DEFUN_VOID(yank_symbols) S_SET_VALUE(symbolP, 0); } /* no one points at the first .file symbol */ } /* if debug or tag or eos or file */ - + /* We must put the external symbols apart. The loader does not bomb if we do not. But the references in the endndx field for a .bb symbol are not corrected @@ -1311,22 +1311,22 @@ static unsigned int DEFUN_VOID(yank_symbols) [22] .be ld will move the symbol 21 to the end of the list but endndx will still be 22 instead of 21. */ - - + + if (SF_GET_LOCAL(symbolP)) { /* remove C_EFCN and LOCAL (L...) symbols */ /* next pointer remains valid */ symbol_remove(symbolP, &symbol_rootP, &symbol_lastP); - + } else if (!S_IS_DEFINED(symbolP) - && !S_IS_DEBUG(symbolP) + && !S_IS_DEBUG(symbolP) && !SF_GET_STATICS(symbolP) && S_GET_STORAGE_CLASS(symbolP) == C_EXT) { /* C_EXT && !SF_GET_FUNCTION(symbolP)) */ /* if external, Remove from the list */ symbolS *hold = symbol_previous(symbolP); - + symbol_remove(symbolP, &symbol_rootP, &symbol_lastP); symbol_clear_list_pointers(symbolP); symbol_append(symbolP, symbol_extern_lastP, &symbol_externP, &symbol_extern_lastP); @@ -1338,27 +1338,27 @@ static unsigned int DEFUN_VOID(yank_symbols) } else { symbolP->sy_name_offset = 0; } /* fix "long" names */ - + symbolP->sy_number = symbol_number; symbol_number += 1 + S_GET_NUMBER_AUXILIARY(symbolP); } /* if local symbol */ } /* traverse the symbol list */ return symbol_number; - + } static unsigned int DEFUN_VOID(glue_symbols) { unsigned int symbol_number = 0; - symbolS *symbolP; + symbolS *symbolP; for (symbolP = symbol_externP; symbol_externP;) { symbolS *tmp = symbol_externP; - + /* append */ symbol_remove(tmp, &symbol_externP, &symbol_extern_lastP); symbol_append(tmp, symbol_lastP, &symbol_rootP, &symbol_lastP); - + /* and process */ if (SF_GET_STRING(tmp)) { tmp->sy_name_offset = string_byte_count; @@ -1366,74 +1366,74 @@ static unsigned int DEFUN_VOID(glue_symbols) } else { tmp->sy_name_offset = 0; } /* fix "long" names */ - + tmp->sy_number = symbol_number; symbol_number += 1 + S_GET_NUMBER_AUXILIARY(tmp); } /* append the entire extern chain */ return symbol_number; - + } static unsigned int DEFUN_VOID(tie_tags) { unsigned int symbol_number = 0; - - symbolS*symbolP; + + symbolS*symbolP; for (symbolP = symbol_rootP; symbolP; symbolP = - symbol_next(symbolP)) + symbol_next(symbolP)) { symbolP->sy_number = symbol_number; - - - - if (SF_GET_TAGGED(symbolP)) + + + + if (SF_GET_TAGGED(symbolP)) { SA_SET_SYM_TAGNDX (symbolP, ((symbolS*) SA_GET_SYM_TAGNDX(symbolP))->sy_number); - } - + } + symbol_number += 1 + S_GET_NUMBER_AUXILIARY(symbolP); - } + } return symbol_number; - + } -static void +static void DEFUN(crawl_symbols,(headers, abfd), struct internal_filehdr *headers AND bfd *abfd) { - - unsigned int i; + + unsigned int i; unsigned int ptr = 0; - - + + symbolS *symbolP; - + /* Initialize the stack used to keep track of the matching .bb .be */ - + block_stack = stack_init(512, sizeof(symbolS*)); /* JF deal with forward references first... */ for (symbolP = symbol_rootP; symbolP; - symbolP = symbol_next(symbolP)) + symbolP = symbol_next(symbolP)) { - + if (symbolP->sy_forward) { S_SET_VALUE(symbolP, (S_GET_VALUE(symbolP) + S_GET_VALUE(symbolP->sy_forward) + symbolP->sy_forward->sy_frag->fr_address)); - + if (SF_GET_GET_SEGMENT(symbolP)) { S_SET_SEGMENT(symbolP, S_GET_SEGMENT(symbolP->sy_forward)); } /* forward segment also */ - + symbolP->sy_forward=0; } /* if it has a forward reference */ } /* walk the symbol chain */ - - + + /* The symbol list should be ordered according to the following sequence * order : * . .file symbol @@ -1444,39 +1444,39 @@ static void * But this is not mandatory. The only important point is to put the * undefined symbols at the end of the list. */ - + if (symbol_rootP == NULL || S_GET_STORAGE_CLASS(symbol_rootP) != C_FILE) { c_dot_file_symbol("fake"); } /* Is there a .file symbol ? If not insert one at the beginning. */ - + /* * Build up static symbols for the sections, they are filled in later */ - - - for (i = SEG_E0; i < SEG_E9; i++) + + + for (i = SEG_E0; i < SEG_E9; i++) { if (segment_info[i].scnhdr.s_name[0]) { - segment_info[i].dot = + segment_info[i].dot = c_section_symbol(segment_info[i].scnhdr.s_name, i-SEG_E0+1); - + } } - - + + /* Take all the externals out and put them into another chain */ headers->f_nsyms = yank_symbols(); /* Take the externals and glue them onto the end.*/ headers->f_nsyms += glue_symbols(); - + headers->f_nsyms = tie_tags(); know(symbol_externP == NULL); know(symbol_extern_lastP == NULL); - + return; } @@ -1488,82 +1488,82 @@ void DEFUN(w_strings,(where), char *where) { symbolS *symbolP; - + /* Gotta do md_ byte-ordering stuff for string_byte_count first - KWK */ md_number_to_chars(where, string_byte_count, sizeof(string_byte_count)); where += sizeof(string_byte_count); for (symbolP = symbol_rootP; symbolP; - symbolP = symbol_next(symbolP)) + symbolP = symbol_next(symbolP)) { unsigned int size; - + if (SF_GET_STRING(symbolP)) { size = strlen(S_GET_NAME(symbolP)) + 1; - + memcpy(where, S_GET_NAME(symbolP),size); where += size; - - } - } - + + } + } + } -static void +static void DEFUN(do_linenos_for,(abfd, file_cursor), bfd *abfd AND unsigned long *file_cursor) { unsigned int idx; - - for (idx = SEG_E0; idx < SEG_E9; idx++) + + for (idx = SEG_E0; idx < SEG_E9; idx++) { - segment_info_type *s = segment_info + idx; - - - if (s->scnhdr.s_nlnno != 0) + segment_info_type *s = segment_info + idx; + + + if (s->scnhdr.s_nlnno != 0) { struct lineno_list *line_ptr ; - - struct external_lineno *buffer = + + struct external_lineno *buffer = (struct external_lineno *)xmalloc(s->scnhdr.s_nlnno * LINESZ); - + struct external_lineno *dst= buffer; - + /* Run through the table we've built and turn it into its external form, take this chance to remove duplicates */ - + for (line_ptr = s->lineno_list_head; line_ptr != (struct lineno_list *)NULL; - line_ptr = line_ptr->next) + line_ptr = line_ptr->next) { - - if (line_ptr->line.l_lnno == 0) + + if (line_ptr->line.l_lnno == 0) { /* Turn a pointer to a symbol into the symbols' index */ line_ptr->line.l_addr.l_symndx = ( (symbolS *)line_ptr->line.l_addr.l_symndx)->sy_number; - } - else + } + else { line_ptr->line.l_addr.l_paddr += ((struct frag * )(line_ptr->frag))->fr_address; } - - + + (void) bfd_coff_swap_lineno_out(abfd, &(line_ptr->line), dst); dst++; - + } - + s->scnhdr.s_lnnoptr = *file_cursor; - + bfd_write(buffer, 1, s->scnhdr.s_nlnno* LINESZ, abfd); free(buffer); - + *file_cursor += s->scnhdr.s_nlnno * LINESZ; } } @@ -1576,15 +1576,15 @@ static void static void DEFUN_VOID(remove_subsegs) { - unsigned int i; - + unsigned int i; + for (i = SEG_E0; i < SEG_UNKNOWN; i++) - { + { frchainS *head = segment_info[i].frchainP; fragS dummy; fragS * prev_frag = &dummy; - - while (head && head->frch_seg == i) + + while (head && head->frch_seg == i) { prev_frag->fr_next = head->frch_root; prev_frag = head->frch_last; @@ -1598,35 +1598,35 @@ static void DEFUN_VOID(remove_subsegs) extern void DEFUN_VOID(write_object_file) { int i; - struct frchain *frchain_ptr; - + struct frchain *frchain_ptr; + struct internal_filehdr filehdr; struct internal_aouthdr aouthdr; - unsigned long file_cursor; + unsigned long file_cursor; bfd *abfd; - unsigned int addr = 0; + unsigned int addr = 0; abfd = bfd_openw(out_file_name, TARGET_FORMAT); - - + + if (abfd == 0) { as_perror ("FATAL: Can't create %s", out_file_name); exit(42); } bfd_set_format(abfd, bfd_object); bfd_set_arch_mach(abfd, BFD_ARCH, 0); - - - + + + string_byte_count = 4; - + for (frchain_ptr = frchain_root; - frchain_ptr != (struct frchain *)NULL; + frchain_ptr != (struct frchain *)NULL; frchain_ptr = frchain_ptr->frch_next) { /* Run through all the sub-segments and align them up. Also close any open frags. We tack a .fill onto the end of the frag chain so that any .align's size can be worked by looking at the next frag */ - + subseg_new(frchain_ptr->frch_seg, frchain_ptr->frch_subseg); #define SUB_SEGMENT_ALIGN 1 frag_align(SUB_SEGMENT_ALIGN,0); @@ -1634,27 +1634,27 @@ extern void DEFUN_VOID(write_object_file) frag_now->fr_fix = 0; know( frag_now->fr_next == NULL ); } - - + + remove_subsegs(); - - - for (i = SEG_E0; i < SEG_UNKNOWN; i++) + + + for (i = SEG_E0; i < SEG_UNKNOWN; i++) { relax_segment(segment_info[i].frchainP->frch_root, i); } - - - - - + + + + + filehdr.f_nscns = 0; - + /* Find out how big the sections are */ - for (i = SEG_E0; i < SEG_UNKNOWN; i++) + for (i = SEG_E0; i < SEG_UNKNOWN; i++) { - - if (segment_info[i].scnhdr.s_name[0]) + + if (segment_info[i].scnhdr.s_name[0]) { filehdr.f_nscns++; } @@ -1667,40 +1667,40 @@ extern void DEFUN_VOID(write_object_file) addr += size_section(abfd, i); } } - - - + + + /* Turn the gas native symbol table shape into a coff symbol table */ crawl_symbols(&filehdr, abfd); #ifndef TC_H8300 - for (i = SEG_E0; i < SEG_UNKNOWN; i++) + for (i = SEG_E0; i < SEG_UNKNOWN; i++) { fixup_segment(segment_info[i].fix_root, i); } #endif - + file_cursor = FILHSZ + SCNHSZ * filehdr.f_nscns ; - + bfd_seek(abfd, file_cursor, 0); - - + + do_relocs_for(abfd, &file_cursor); - + do_linenos_for(abfd, &file_cursor); - - + + /* Plant the data */ - + fill_section(abfd,&filehdr, &file_cursor); - + filehdr.f_magic = COFF_MAGIC; filehdr.f_timdat = 0; filehdr.f_flags = 0; - - - + + + { - + unsigned int symtable_size = filehdr.f_nsyms * SYMESZ; char *buffer1 = malloc(symtable_size + string_byte_count + 4); char *ptr = buffer1; @@ -1709,10 +1709,10 @@ extern void DEFUN_VOID(write_object_file) w_strings(buffer1 + symtable_size); bfd_write(buffer1, 1,symtable_size + string_byte_count + 4, abfd); free(buffer1); - + } coff_header_append(abfd, &filehdr, &aouthdr); - + bfd_close_all_done(abfd); } @@ -1722,37 +1722,37 @@ static void DEFUN(change_to_section,(name, len, exp), unsigned int len AND unsigned int exp) { - unsigned int i; + unsigned int i; /* Find out if we've already got a section of this name etc */ - for (i = SEG_E0; i < SEG_E9 && segment_info[i].scnhdr.s_name[0] ; i++) + for (i = SEG_E0; i < SEG_E9 && segment_info[i].scnhdr.s_name[0] ; i++) { - if (strncmp(segment_info[i].scnhdr.s_name, name, len) == 0) + if (strncmp(segment_info[i].scnhdr.s_name, name, len) == 0) { - subseg_new(i, exp); + subseg_new(i, exp); return; - + } } /* No section, add one */ strncpy(segment_info[i].scnhdr.s_name, name, 8); - subseg_new(i, exp); + subseg_new(i, exp); } -static void +static void DEFUN_VOID(obj_coff_section) { /* Strip out the section name */ char *section_name ; char *section_name_end; char c; - + unsigned int len; unsigned int exp; - + section_name = input_line_pointer; c = get_symbol_end(); section_name_end = input_line_pointer; - + len = section_name_end - section_name ; input_line_pointer++; SKIP_WHITESPACE(); @@ -1760,20 +1760,20 @@ static void { exp = get_absolute_expression(); } - else if ( *input_line_pointer == ',') + else if ( *input_line_pointer == ',') { - + input_line_pointer++; - exp = get_absolute_expression(); + exp = get_absolute_expression(); } - else + else { exp = 0; } - + change_to_section(section_name, len,exp); - *section_name_end = c; - + *section_name_end = c; + } @@ -1794,15 +1794,15 @@ symbolS *normal; { S_SET_DATA_TYPE(normal, S_GET_DATA_TYPE(debug)); S_SET_STORAGE_CLASS(normal, S_GET_STORAGE_CLASS(debug)); - + if (S_GET_NUMBER_AUXILIARY(debug) > S_GET_NUMBER_AUXILIARY(normal)) { S_SET_NUMBER_AUXILIARY(normal, S_GET_NUMBER_AUXILIARY(debug)); } /* take the most we have */ - + if (S_GET_NUMBER_AUXILIARY(debug) > 0) { memcpy((char*)&normal->sy_symbol.ost_auxent[0], (char*)&debug->sy_symbol.ost_auxent[0], S_GET_NUMBER_AUXILIARY(debug) * AUXESZ); } /* Move all the auxiliary information */ - + /* Move the debug flags. */ SF_SET_DEBUG_FIELD(normal, SF_GET_DEBUG_FIELD(debug)); } /* c_symbol_merge() */ @@ -1814,30 +1814,30 @@ static int unsigned short line_number AND fragS* frag) { - struct lineno_list* new_line = + struct lineno_list* new_line = (struct lineno_list *)xmalloc(sizeof(struct lineno_list)); - + segment_info_type *s = segment_info + now_seg; new_line->line.l_lnno = line_number; - - if (line_number == 0) + + if (line_number == 0) { new_line->line.l_addr.l_symndx = (long)symbol; } - else + else { new_line->line.l_addr.l_paddr = paddr; - } - + } + new_line->frag = (char*)frag; new_line->next = (struct lineno_list*)NULL; - - - if (s->lineno_list_head == (struct lineno_list *)NULL) + + + if (s->lineno_list_head == (struct lineno_list *)NULL) { s->lineno_list_head = new_line; } - else + else { s->lineno_list_tail->next = new_line; } @@ -1849,42 +1849,42 @@ void c_dot_file_symbol(filename) char *filename; { symbolS* symbolP; - + symbolP = symbol_new(".file", SEG_DEBUG, 0, &zero_address_frag); - + S_SET_STORAGE_CLASS(symbolP, C_FILE); S_SET_NUMBER_AUXILIARY(symbolP, 1); SA_SET_FILE_FNAME(symbolP, filename); #ifndef NO_LISTING { extern int listing; - if (listing) + if (listing) { listing_source_file(filename); } - + } - -#endif + +#endif SF_SET_DEBUG(symbolP); S_SET_VALUE(symbolP, (long) previous_file_symbol); - + previous_file_symbol = symbolP; - + /* Make sure that the symbol is first on the symbol chain */ if (symbol_rootP != symbolP) { if (symbolP == symbol_lastP) { symbol_lastP = symbol_lastP->sy_previous; } /* if it was the last thing on the list */ - + symbol_remove(symbolP, &symbol_rootP, &symbol_lastP); symbol_insert(symbolP, symbol_rootP, &symbol_rootP, &symbol_lastP); symbol_rootP = symbolP; } /* if not first on the list */ - + } /* c_dot_file_symbol() */ /* @@ -1896,20 +1896,20 @@ char *name; int idx; { symbolS *symbolP; - + symbolP = symbol_new(name,idx, 0, &zero_address_frag); - + S_SET_STORAGE_CLASS(symbolP, C_STAT); S_SET_NUMBER_AUXILIARY(symbolP, 1); - + SF_SET_STATICS(symbolP); - + return symbolP; } /* c_section_symbol() */ -static void +static void DEFUN(w_symbols,(abfd, where, symbol_rootP), bfd *abfd AND char *where AND @@ -1917,21 +1917,21 @@ static void { symbolS *symbolP; unsigned int i; - + /* First fill in those values we have only just worked out */ - for (i = SEG_E0; i < SEG_E9; i++) + for (i = SEG_E0; i < SEG_E9; i++) { symbolP = segment_info[i].dot; - if (symbolP) + if (symbolP) { - + SA_SET_SCN_SCNLEN(symbolP, segment_info[i].scnhdr.s_size); SA_SET_SCN_NRELOC(symbolP, segment_info[i].scnhdr.s_nreloc); SA_SET_SCN_NLINNO(symbolP, segment_info[i].scnhdr.s_nlnno); - + } } - + /* * Emit all symbols left in the symbol chain. */ @@ -1939,9 +1939,9 @@ static void /* Used to save the offset of the name. It is used to point to the string in memory but must be a file offset. */ register char * temp; - + tc_coff_symbol_emit_hook(symbolP); - + temp = S_GET_NAME(symbolP); if (SF_GET_STRING(symbolP)) { S_SET_OFFSET(symbolP, symbolP->sy_name_offset); @@ -1953,7 +1953,7 @@ static void where = symbol_to_chars(abfd, where, symbolP); S_SET_NAME(symbolP,temp); } - + } /* w_symbols() */ static void DEFUN_VOID(obj_coff_lcomm) @@ -1964,9 +1964,9 @@ static void DEFUN_VOID(obj_coff_lcomm) char *p; symbolS *symbolP; name = input_line_pointer; - - - + + + c = get_symbol_end(); p = input_line_pointer; *p = c; @@ -2010,9 +2010,9 @@ static void DEFUN(fixup_segment,(fixP, this_segment_type), register char pcrel; register fragS *fragP; register segT add_symbol_segment = SEG_ABSOLUTE; - - - for ( ; fixP; fixP = fixP->fx_next) + + + for ( ; fixP; fixP = fixP->fx_next) { fragP = fixP->fx_frag; know(fragP); @@ -2025,7 +2025,7 @@ static void DEFUN(fixup_segment,(fixP, this_segment_type), /* Relocation should be done via the associated 'bal' entry point symbol. */ - + if (!TC_S_IS_BALNAME(tc_get_bal_of_call(add_symbolP))) { as_bad("No 'bal' entry point for leafproc %s", S_GET_NAME(add_symbolP)); @@ -2037,20 +2037,20 @@ static void DEFUN(fixup_segment,(fixP, this_segment_type), sub_symbolP = fixP->fx_subsy; add_number = fixP->fx_offset; pcrel = fixP->fx_pcrel; - + if (add_symbolP) { add_symbol_segment = S_GET_SEGMENT(add_symbolP); } /* if there is an addend */ - + if (sub_symbolP) { if (!add_symbolP) { /* Its just -sym */ if (S_GET_SEGMENT(sub_symbolP) != SEG_ABSOLUTE) { as_bad("Negative of non-absolute symbol %s", S_GET_NAME(sub_symbolP)); } /* not absolute */ - + add_number -= S_GET_VALUE(sub_symbolP); - + /* if sub_symbol is in the same segment that add_symbol and add_symbol is either in DATA, TEXT, BSS or ABSOLUTE */ } else if ((S_GET_SEGMENT(sub_symbolP) == add_symbol_segment) @@ -2067,15 +2067,15 @@ static void DEFUN(fixup_segment,(fixP, this_segment_type), as_bad("callj to difference of 2 symbols"); } #endif /* TC_I960 */ - add_number += S_GET_VALUE(add_symbolP) - + add_number += S_GET_VALUE(add_symbolP) - S_GET_VALUE(sub_symbolP); - + add_symbolP = NULL; fixP->fx_addsy = NULL; } else { /* Different segments in subtraction. */ know(!(S_IS_EXTERNAL(sub_symbolP) && (S_GET_SEGMENT(sub_symbolP) == SEG_ABSOLUTE))); - + if ((S_GET_SEGMENT(sub_symbolP) == SEG_ABSOLUTE)) { add_number -= S_GET_VALUE(sub_symbolP); } else { @@ -2085,7 +2085,7 @@ static void DEFUN(fixup_segment,(fixP, this_segment_type), } /* if absolute */ } } /* if sub_symbolP */ - + if (add_symbolP) { if (add_symbol_segment == this_segment_type && pcrel) { /* @@ -2101,14 +2101,14 @@ static void DEFUN(fixup_segment,(fixP, this_segment_type), */ reloc_callj(fixP); #endif /* TC_I960 */ - + add_number += S_GET_VALUE(add_symbolP); add_number -= md_pcrel_from (fixP); pcrel = 0; /* Lie. Don't want further pcrel processing. */ fixP->fx_addsy = NULL; /* No relocations please. */ - } else + } else { - switch (add_symbol_segment) + switch (add_symbol_segment) { case SEG_ABSOLUTE: #ifdef TC_I960 @@ -2119,11 +2119,11 @@ static void DEFUN(fixup_segment,(fixP, this_segment_type), add_symbolP = NULL; break; default: - + add_number += S_GET_VALUE(add_symbolP) + segment_info[S_GET_SEGMENT(add_symbolP)].scnhdr.s_paddr ; break; - + case SEG_UNKNOWN: #ifdef TC_I960 if ((int)fixP->fx_bit_fixP == 13) { @@ -2137,23 +2137,23 @@ static void DEFUN(fixup_segment,(fixP, this_segment_type), continue; } /* COBR */ #endif /* TC_I960 */ - - - + + + break; - - + + } /* switch on symbol seg */ } /* if not in local seg */ } /* if there was a + symbol */ - + if (pcrel) { add_number -= md_pcrel_from(fixP); if (add_symbolP == 0) { fixP->fx_addsy = & abs_symbol; } /* if there's an add_symbol */ } /* if pcrel */ - + if (!fixP->fx_bit_fixP) { if ((size == 1 && (add_number & ~0xFF) && (add_number & ~0xFF != (-1 & ~0xFF))) || @@ -2163,13 +2163,13 @@ static void DEFUN(fixup_segment,(fixP, this_segment_type), add_number, size, fragP->fr_address + where); } /* generic error checking */ } /* not a bit fix */ - /* once this fix has been applied, we don't have to output anything + /* once this fix has been applied, we don't have to output anything nothing more need be done -*/ md_apply_fix(fixP, add_number); - + } /* For each fixS in this segment. */ - - + + } /* fixup_segment() */ #endif diff --git a/gnu/usr.bin/as/config/obj-coffbfd.h b/gnu/usr.bin/as/config/obj-coffbfd.h index d1afabb..5ccefab 100644 --- a/gnu/usr.bin/as/config/obj-coffbfd.h +++ b/gnu/usr.bin/as/config/obj-coffbfd.h @@ -1,18 +1,18 @@ /* coff object file format Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -43,7 +43,7 @@ #else help me #endif - + #if 0 /* Define some processor dependent values according to the processor we are on. */ @@ -80,15 +80,15 @@ help me #else you lose -#endif - #endif - + +#endif + #ifndef OBJ_COFF_MAX_AUXENTRIES #define OBJ_COFF_MAX_AUXENTRIES 1 #endif /* OBJ_COFF_MAX_AUXENTRIES */ - - + + extern const segT N_TYPE_seg[]; /* Magic number of paged executable. */ @@ -104,11 +104,11 @@ you lose /* Symbol table entry data type */ -typedef struct +typedef struct { struct internal_syment ost_entry; /* Basic symbol */ union internal_auxent ost_auxent[OBJ_COFF_MAX_AUXENTRIES]; /* Auxiliary entry. */ - + unsigned int ost_flags; /* obj_coff internal use only flags */ } obj_symbol_type; @@ -118,7 +118,7 @@ typedef struct #endif /* Symbol table macros and constants */ -/* Possible and usefull section number in symbol table +/* Possible and usefull section number in symbol table * The values of TEXT, DATA and BSS may not be portable. */ @@ -169,7 +169,7 @@ typedef struct /* The zeroes if symbol name is longer than 8 chars */ #define S_GET_ZEROES(s) ((s)->sy_symbol.ost_entry.n_zeroes) /* The value of the symbol */ -#define S_GET_VALUE(s) ((unsigned) ((s)->sy_symbol.ost_entry.n_value)) +#define S_GET_VALUE(s) ((unsigned) ((s)->sy_symbol.ost_entry.n_value)) /* The numeric value of the segment */ #define S_GET_SEGMENT(s) s_get_segment(s) /* The data type */ @@ -446,7 +446,7 @@ typedef struct { struct lineno_list { - + struct bfd_internal_lineno line; char* frag; /* Frag to which the line number is related */ struct lineno_list* next; /* Forward chain pointer */ @@ -477,7 +477,7 @@ void EXFUN(stack_delete,(stack *st)); void EXFUN(c_section_header,( - + struct internal_scnhdr *header, char *name, long core_address, diff --git a/gnu/usr.bin/as/config/obj-generic.c b/gnu/usr.bin/as/config/obj-generic.c index a91eff9..2f69ce4 100644 --- a/gnu/usr.bin/as/config/obj-generic.c +++ b/gnu/usr.bin/as/config/obj-generic.c @@ -1,20 +1,20 @@ /* This file is obj-generic.c and is intended to be a template for - object format specific source files. + object format specific source files. Copyright (C) 1987-1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/gnu/usr.bin/as/config/obj-generic.h b/gnu/usr.bin/as/config/obj-generic.h index f370722..24a6ace 100644 --- a/gnu/usr.bin/as/config/obj-generic.h +++ b/gnu/usr.bin/as/config/obj-generic.h @@ -1,25 +1,25 @@ /* This file is obj-generic.h Copyright (C) 1987-1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* * This file is obj-generic.h and is intended to be a template for - * object format specific header files. + * object format specific header files. */ /* define an obj specific macro off which target cpu back ends may key. */ @@ -61,7 +61,7 @@ typedef void *object_headers; /* symbols may be external */ #define S_IS_EXTERNAL(s) (0) #define S_SET_EXTERNAL(s) ; - + /* symbols may or may not be defined */ #define S_IS_DEFINED(s) (0) diff --git a/gnu/usr.bin/as/config/obj-ieee.c b/gnu/usr.bin/as/config/obj-ieee.c index 5f74a5f..c190999 100644 --- a/gnu/usr.bin/as/config/obj-ieee.c +++ b/gnu/usr.bin/as/config/obj-ieee.c @@ -1,26 +1,26 @@ /* obj-format for ieee-695 records. Copyright (C) 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* +/* created by - + steve chamberlain steve@cygnus.com */ @@ -44,7 +44,7 @@ register long alignment; /* Alignment (binary). */ { relax_addressT mask; relax_addressT new_address; - + mask = ~ ( (~0) << alignment ); new_address = (address + mask) & (~ mask); return (new_address - address); @@ -60,7 +60,7 @@ static void DEFUN(size_section,(abfd, idx), unsigned int size = 0; fragS *frag = segment_info[idx].frag_root; while (frag) { - if (frag->fr_address != size) { + if (frag->fr_address != size) { printf("Out of step\n"); size = frag->fr_address; } @@ -104,7 +104,7 @@ static void DEFUN(fill_section,(abfd, idx), case rs_fill: case rs_align: case rs_org: - if (frag->fr_fix) + if (frag->fr_fix) { bfd_set_section_contents(abfd, sec, @@ -114,10 +114,10 @@ static void DEFUN(fill_section,(abfd, idx), } offset += frag->fr_fix; fill_size = frag->fr_var; - if (fill_size) + if (fill_size) { unsigned int off = frag->fr_fix; - for (count = frag->fr_offset; count; count--) + for (count = frag->fr_offset; count; count--) { bfd_set_section_contents(abfd, sec, frag->fr_literal + @@ -128,7 +128,7 @@ static void DEFUN(fill_section,(abfd, idx), } } break; - default: + default: abort(); } frag = frag->fr_next; @@ -143,11 +143,11 @@ static unsigned int DEFUN(count_entries_in_chain,(idx), { unsigned int nrelocs; fixS *fixup_ptr; - + /* Count the relocations */ fixup_ptr = segment_info[idx].fix_root; nrelocs = 0; - while (fixup_ptr != (fixS *)NULL) + while (fixup_ptr != (fixS *)NULL) { fixup_ptr = fixup_ptr->fx_next; nrelocs ++ ; @@ -156,7 +156,7 @@ static unsigned int DEFUN(count_entries_in_chain,(idx), } /* output all the relocations for a section */ -void DEFUN(do_relocs_for,(idx), +void DEFUN(do_relocs_for,(idx), unsigned int idx) { unsigned int nrelocs; @@ -168,35 +168,35 @@ void DEFUN(do_relocs_for,(idx), fixS *from; if (section) { nrelocs = count_entries_in_chain(idx); - + reloc_ptr_vector = (arelent**)malloc((nrelocs+1) * sizeof(arelent *)); reloc_vector = (arelent*)malloc(nrelocs * sizeof(arelent)); ptrs = (asymbol **)malloc(nrelocs * sizeof(asymbol *)); from = segment_info[idx].fix_root; - for (i = 0; i < nrelocs; i++) - { + for (i = 0; i < nrelocs; i++) + { arelent *to = reloc_vector + i; asymbol *s ; reloc_ptr_vector[i] = to; to->howto = (reloc_howto_type *)(from->fx_r_type); - + /* We can't represent complicated things in a reloc yet */ /* if (from->fx_addsy == 0 || from->fx_subsy != 0) abort(); */ s = &( from->fx_addsy->sy_symbol.sy); to->address = ((char *)( from->fx_frag->fr_address + - from->fx_where)) + from->fx_where)) - ((char *)(&(from->fx_frag->fr_literal))); to->addend = from->fx_offset ; /* If we know the symbol which we want to relocate to, turn this - reloaction into a section relative. - + reloaction into a section relative. + If this relocation is pcrelative, and we know the destination, we still want to keep the relocation - since the linker might relax some of the bytes, but it stops being pc relative and turns into an absolute relocation. - + */ if (s) { if ((s->flags & BSF_UNDEFINED) == 0) { @@ -212,27 +212,27 @@ void DEFUN(do_relocs_for,(idx), to->section = 0; *ptrs = &(from->fx_addsy->sy_symbol.sy); to->sym_ptr_ptr = ptrs; - + if (to->howto->pcrel_offset) { /* This is a pcrel relocation, the addend should be adjusted */ to->addend -= to->address -1; } } - + } else { to->section = 0; } - + ptrs++; from = from->fx_next; } - + /* attatch to the section */ section->orelocation = reloc_ptr_vector; - section->reloc_count = nrelocs; + section->reloc_count = nrelocs; section->flags |= SEC_LOAD; - } + } } /* do the symbols.. */ @@ -245,13 +245,13 @@ static void DEFUN(do_symbols, (abfd), asymbol *symbol_vec; unsigned int count = 0; unsigned int index; - - + + for (ptr = symbol_rootP; ptr != (symbolS *)NULL; - ptr = ptr->sy_next) + ptr = ptr->sy_next) { - if (SEG_NORMAL(ptr->sy_symbol.seg)) + if (SEG_NORMAL(ptr->sy_symbol.seg)) { ptr->sy_symbol.sy.section = (asection *)(segment_info[ptr->sy_symbol.seg].user_stuff); @@ -277,11 +277,11 @@ static void DEFUN(do_symbols, (abfd), count++; } symbol_ptr_vec = (asymbol **)malloc((count+1) * sizeof(asymbol *)); - + index = 0; for (ptr = symbol_rootP; ptr != (symbolS *)NULL; - ptr = ptr->sy_next) + ptr = ptr->sy_next) { symbol_ptr_vec[index] = &(ptr->sy_symbol.sy); index++; @@ -297,50 +297,50 @@ static void DEFUN(do_symbols, (abfd), void DEFUN_VOID(bfd_as_write_hook) { int i; - + for (i = SEG_E0; i < SEG_UNKNOWN; i++) { size_section(abfd, i); } - - + + for (i = SEG_E0; i < SEG_UNKNOWN; i++) fill_section(abfd,i); - + do_symbols(abfd); - + for (i = SEG_E0; i < SEG_UNKNOWN; i++) do_relocs_for(i); - + } -S_GET_VALUE(x) -symbolS *x; +S_GET_VALUE(x) +symbolS *x; { - return x->sy_symbol.sy.value; + return x->sy_symbol.sy.value; } S_SET_SEGMENT(x,y) symbolS *x ; int y; -{ +{ x->sy_symbol.seg = y; } S_IS_DEFINED(x) symbolS *x; { - if (SEG_NORMAL(x->sy_symbol.seg)) + if (SEG_NORMAL(x->sy_symbol.seg)) { return 1; } - switch (x->sy_symbol.seg) + switch (x->sy_symbol.seg) { case SEG_UNKNOWN: return 0; default: - abort(); + abort(); } } @@ -352,7 +352,7 @@ symbolS *x; { return x->sy_symbol.seg; } S_SET_EXTERNAL(x) -symbolS *x; +symbolS *x; { x->sy_symbol.sy.flags |= BSF_GLOBAL | BSF_EXPORT; } @@ -365,7 +365,7 @@ char *y; { S_SET_VALUE(s,v) symbolS *s; long v; -{ +{ s->sy_symbol.sy.value = v; } @@ -392,7 +392,7 @@ int ignore; if (segment_info[i].hadone){ if (strncmp(segment_info[i].name, s, p-s) == 0) { goto ok; - + } } else break; @@ -401,17 +401,17 @@ int ignore; as_bad("too many sections"); return; } - + segment_info[i].hadone = 1; segment_info[i].name = malloc(p-s + 1); memcpy(segment_info[i].name, s, p-s); - segment_info[i].name[p-s] = 0; + segment_info[i].name[p-s] = 0; ok: subseg_new(i,0); - while (!is_end_of_line[*p]) + while (!is_end_of_line[*p]) p++; input_line_pointer = p; - + } @@ -429,8 +429,8 @@ void s_ignore(); void stringer(); void s_globl(); -const pseudo_typeS obj_pseudo_table[] = -{ +const pseudo_typeS obj_pseudo_table[] = +{ {"section", obj_ieee_section, 0}, {"data.b", cons, 1}, {"data.w", cons, 2}, @@ -441,7 +441,7 @@ const pseudo_typeS obj_pseudo_table[] = {"import", s_ignore, 0}, {"sdata", stringer, 0}, 0, - + }; @@ -460,11 +460,11 @@ symbolS *symbolP; extern void DEFUN_VOID(write_object_file) { int i; - struct frchain *frchain_ptr; + struct frchain *frchain_ptr; struct frag *frag_ptr; - + abfd = bfd_openw(out_file_name, "ieee"); - + if (abfd == 0) { as_perror ("FATAL: Can't create %s", out_file_name); exit(42); @@ -475,13 +475,13 @@ extern void DEFUN_VOID(write_object_file) subseg_new(2,0); subseg_new(3,0); for (frchain_ptr = frchain_root; - frchain_ptr != (struct frchain *)NULL; + frchain_ptr != (struct frchain *)NULL; frchain_ptr = frchain_ptr->frch_next) { /* Run through all the sub-segments and align them up. Also close any open frags. We tack a .fill onto the end of the frag chain so that any .align's size can be worked by looking at the next frag */ - + subseg_new(frchain_ptr->frch_seg, frchain_ptr->frch_subseg); #define SUB_SEGMENT_ALIGN 2 frag_align(SUB_SEGMENT_ALIGN,0); @@ -489,17 +489,17 @@ extern void DEFUN_VOID(write_object_file) frag_now->fr_fix = 0; know( frag_now->fr_next == NULL ); } - + /* Now build one big frag chain for each segment, linked through fr_next. */ for (i = SEG_E0; i < SEG_UNKNOWN; i++) - { - + { + fragS ** prev_frag_ptr_ptr ; struct frchain *next_frchain_ptr; - + /* struct frag **head_ptr = segment_info[i].frag_root;*/ - + segment_info[i].frag_root = segment_info[i].frchainP->frch_root; #if 0 /* Im not sure what this is for */ @@ -510,17 +510,17 @@ extern void DEFUN_VOID(write_object_file) *head_ptr = frchain_ptr; head_ptr = &frchain_ptr->next; } - - + + #endif } - + for (i = SEG_E0; i < SEG_UNKNOWN; i++) { relax_segment(segment_info[i].frag_root, i); } - + /* Now the addresses of the frags are correct within the segment */ - + bfd_as_write_hook(); bfd_close(abfd); } diff --git a/gnu/usr.bin/as/config/obj-ieee.h b/gnu/usr.bin/as/config/obj-ieee.h index 3baa081..b2864bc 100644 --- a/gnu/usr.bin/as/config/obj-ieee.h +++ b/gnu/usr.bin/as/config/obj-ieee.h @@ -1,19 +1,19 @@ /* This file is obj-ieee.h Copyright (C) 1987-1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -22,7 +22,7 @@ #include <bfd.h> -typedef struct +typedef struct { asymbol sy; int seg; diff --git a/gnu/usr.bin/as/config/obj-vms.c b/gnu/usr.bin/as/config/obj-vms.c index 5d12387..2a51ba9 100644 --- a/gnu/usr.bin/as/config/obj-vms.c +++ b/gnu/usr.bin/as/config/obj-vms.c @@ -40,7 +40,7 @@ extern const char version_string[]; char *compiler_version_string; /* Flag that determines how we map names. This takes several values, and - * is set with the -h switch. A value of zero implies names should be + * is set with the -h switch. A value of zero implies names should be * upper case, and the presence of the -h switch inhibits the case hack. * No -h switch at all sets vms_name_mapping to 0, and allows case hacking. * A value of 2 (set with -h2) implies names should be @@ -453,13 +453,13 @@ const pseudo_typeS obj_pseudo_table[] = }; /* obj_pseudo_table */ -void +void obj_read_begin_hook () { return; } /* obj_read_begin_hook() */ -void +void obj_crawl_symbol_chain (headers) object_headers *headers; { @@ -490,16 +490,16 @@ obj_crawl_symbol_chain (headers) /* OK, here is how we decide which symbols go out into the brave new symtab. Symbols that do are: - + * symbols with no name (stabd's?) * symbols with debug info in their N_TYPE - + Symbols that don't are: * symbols that are registers * symbols with \1 as their 3rd character (numeric labels) * "local labels" as defined by S_LOCAL_NAME(name) if the -L switch was passed to gas. - + All other symbols are output. We complain if a deleted symbol was marked external. */ @@ -538,7 +538,7 @@ Create_VMS_Object_File () #if defined(eunice) || !defined(HO_VMS) VMS_Object_File_FD = creat (out_file_name, 0777, "var"); #else /* eunice */ - VMS_Object_File_FD = creat (out_file_name, 0, "rfm=var", + VMS_Object_File_FD = creat (out_file_name, 0, "rfm=var", "mbc=16", "deq=64", "fop=tef", "shr=nil"); #endif /* eunice */ /* @@ -3799,7 +3799,7 @@ VMS_Emit_Globalvalues (text_siz, data_siz, Data_Segment) if (Size > 4) error ("Invalid data type for globalvalue"); globalvalue = 0; - + memcpy (&globalvalue, Data_Segment + S_GET_VALUE (sp) - text_siz, Size); /* Three times for good luck. The linker seems to get confused @@ -4583,12 +4583,12 @@ VMS_write_object_file (text_siz, data_siz, text_frag_root, data_frag_root) 0); } #ifndef gxx_bug_fixed - /* + /* * The g++ compiler does not write out external references to vtables * correctly. Check for this and holler if we see it happening. * If that compiler bug is ever fixed we can remove this. */ - for (sp = symbol_rootP; sp; sp = symbol_next (sp)) + for (sp = symbol_rootP; sp; sp = symbol_next (sp)) { /* * Dispatch on symbol type diff --git a/gnu/usr.bin/as/config/obj-vms.h b/gnu/usr.bin/as/config/obj-vms.h index fec056d..f997535 100644 --- a/gnu/usr.bin/as/config/obj-vms.h +++ b/gnu/usr.bin/as/config/obj-vms.h @@ -201,7 +201,7 @@ typedef struct nlist obj_symbol_type; /* Symbol table entry */ #define H_SET_SYMBOL_TABLE_SIZE(h,v) ((h)->header.a_syms = (v) * \ sizeof(struct nlist)) -/* +/* * Current means for getting the name of a segment. * This will change for infinite-segments support (e.g. COFF). */ diff --git a/gnu/usr.bin/as/config/tc-a29k.c b/gnu/usr.bin/as/config/tc-a29k.c index 84ec97a..3e95db0 100644 --- a/gnu/usr.bin/as/config/tc-a29k.c +++ b/gnu/usr.bin/as/config/tc-a29k.c @@ -1,18 +1,18 @@ /* tc-a29k.c -- Assemble for the AMD 29000. Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -129,14 +129,14 @@ static unsigned char octal[256]; static unsigned char toHex[256]; /* - * anull bit - causes the branch delay slot instructions to not be executed + * anull bit - causes the branch delay slot instructions to not be executed */ #define ANNUL (1 << 29) static void s_use() { - + if (strncmp(input_line_pointer, ".text", 5) == 0) { input_line_pointer += 5; s_text(); @@ -160,7 +160,7 @@ static void demand_empty_rest_of_line(); return; } - + as_bad("Unknown segment type"); demand_empty_rest_of_line(); return; @@ -184,16 +184,16 @@ int regnum; { /* FIXME-SOON, put something in these syms so they won't be output to the symbol table of the resulting object file. */ - + /* Must be large enough to hold the names of the special registers. */ char buf[80]; int i; - + symbol_table_insert(symbol_new(regname, SEG_REGISTER, regnum, &zero_address_frag)); for (i = 0; regname[i]; i++) buf[i] = islower (regname[i]) ? toupper (regname[i]) : regname[i]; buf[i] = '\0'; - + symbol_table_insert(symbol_new(buf, SEG_REGISTER, regnum, &zero_address_frag)); } /* insert_sreg() */ @@ -202,7 +202,7 @@ int regnum; void define_some_regs() { #define SREG 256 - + /* Protected special-purpose register names */ insert_sreg ("vab", SREG+0); insert_sreg ("ops", SREG+1); @@ -219,7 +219,7 @@ void define_some_regs() { insert_sreg ("pc2", SREG+12); insert_sreg ("mmu", SREG+13); insert_sreg ("lru", SREG+14); - + /* Unprotected special-purpose register names */ insert_sreg ("ipc", SREG+128); insert_sreg ("ipa", SREG+129); @@ -246,25 +246,25 @@ void register int skipnext = 0; register unsigned int i; register char *strend, *strend2; - + /* Hash up all the opcodes for fast use later. */ - + op_hash = hash_new(); if (op_hash == NULL) as_fatal("Virtual memory exhausted"); - + for (i = 0; i < num_opcodes; i++) { const char *name = machine_opcodes[i].name; - + if (skipnext) { skipnext = 0; continue; } - + /* Hack to avoid multiple opcode entries. We pre-locate all the variations (b/i field and P/A field) and handle them. */ - + if (!strcmp (name, machine_opcodes[i+1].name)) { if ((machine_opcodes[i].opcode ^ machine_opcodes[i+1].opcode) != 0x01000000) @@ -289,7 +289,7 @@ void fprintf (stderr, "internal error: can't handle opcode %s\n", name); lose = 1; } - + /* OK, this is an i/b or A/P pair. We skip the higher-valued one, and let the code for operand checking handle OR-ing in the bit. */ if (machine_opcodes[i].opcode & 1) @@ -297,7 +297,7 @@ void else skipnext = 1; } - + retval = hash_insert (op_hash, name, &machine_opcodes[i]); if (retval != NULL && *retval != '\0') { @@ -306,10 +306,10 @@ void lose = 1; } } - + if (lose) as_fatal("Broken assembler. No assembly attempted."); - + for (i = '0'; i < '8'; ++i) octal[i] = 1; for (i = '0'; i <= '9'; ++i) @@ -318,7 +318,7 @@ void toHex[i] = i + 10 - 'a'; for (i = 'A'; i <= 'F'; ++i) toHex[i] = i + 10 - 'A'; - + define_some_regs (); } @@ -335,13 +335,13 @@ char *str; { char *toP; /* !!!! int rsd; */ - + know(str); machine_ip(str); toP = frag_more(4); /* put out the opcode */ md_number_to_chars(toP, the_insn.opcode, 4); - + /* put out the symbol-dependent stuff */ if (the_insn.reloc != NO_RELOC) { fix_new( @@ -365,12 +365,12 @@ expressionS *operandp; char *save = input_line_pointer; char *new; segT seg; - + input_line_pointer = s; seg = expr (0, operandp); new = input_line_pointer; input_line_pointer = save; - + switch (seg) { case SEG_ABSOLUTE: case SEG_TEXT: @@ -381,18 +381,18 @@ expressionS *operandp; case SEG_BIG: case SEG_REGISTER: return new; - + case SEG_ABSENT: as_bad("Missing operand"); return new; - + default: as_bad("Don't understand operand of type %s", segment_name (seg)); return new; } } -/* Instruction parsing. Takes a string containing the opcode. +/* Instruction parsing. Takes a string containing the opcode. Operands are at input_line_pointer. Output is in the_insn. Warnings or errors are generated. */ @@ -411,22 +411,22 @@ char *str; expressionS the_operand; expressionS *operand = &the_operand; unsigned int reg; - + /* Must handle `div0' opcode. */ s = str; if (isalpha(*s)) for (; isalnum(*s); ++s) if (isupper (*s)) *s = tolower (*s); - + switch (*s) { case '\0': break; - + case ' ': /* FIXME-SOMEDAY more whitespace */ *s++ = '\0'; break; - + default: as_bad("Unknown opcode: `%s'", str); return; @@ -439,7 +439,7 @@ char *str; opcode = insn->opcode; memset(&the_insn, '\0', sizeof(the_insn)); the_insn.reloc = NO_RELOC; - + /* * Build the opcode, checking as we go to make * sure that the operands match. @@ -449,10 +449,10 @@ char *str; */ if (insn->args[0] != '\0') s = parse_operand (s, operand); /* Prime the pump */ - + for (args = insn->args; ; ++args) { switch (*args) { - + case '\0': /* end of args */ if (*s == '\0') { /* We are truly done. */ @@ -461,21 +461,21 @@ char *str; } as_bad("Too many operands: %s", s); break; - + case ',': /* Must match a comma */ if (*s++ == ',') { s = parse_operand (s, operand); /* Parse next opnd */ continue; } break; - + case 'v': /* Trap numbers (immediate field) */ if (operand->X_seg == SEG_ABSOLUTE) { if (operand->X_add_number < 256) { opcode |= (operand->X_add_number << 16); continue; } else { - as_bad("Immediate value of %d is too large", + as_bad("Immediate value of %d is too large", operand->X_add_number); continue; } @@ -484,21 +484,21 @@ char *str; the_insn.reloc_offset = 1; /* BIG-ENDIAN Byte 1 of insn */ the_insn.exp = *operand; continue; - + case 'b': /* A general register or 8-bit immediate */ case 'i': /* We treat the two cases identically since we mashed them together in the opcode table. */ if (operand->X_seg == SEG_REGISTER) goto general_reg; - + opcode |= IMMEDIATE_BIT; if (operand->X_seg == SEG_ABSOLUTE) { if (operand->X_add_number < 256) { opcode |= operand->X_add_number; continue; } else { - as_bad("Immediate value of %d is too large", + as_bad("Immediate value of %d is too large", operand->X_add_number); continue; } @@ -507,7 +507,7 @@ char *str; the_insn.reloc_offset = 3; /* BIG-ENDIAN Byte 3 of insn */ the_insn.exp = *operand; continue; - + case 'a': /* next operand must be a register */ case 'c': general_reg: @@ -519,7 +519,7 @@ char *str; reg = operand->X_add_number; if (reg >= SREG) break; /* No special registers */ - + /* * Got the register, now figure out where * it goes in the opcode. @@ -528,19 +528,19 @@ char *str; case 'a': opcode |= reg << 8; continue; - + case 'b': case 'i': opcode |= reg; continue; - + case 'c': opcode |= reg << 16; continue; } as_fatal("failed sanity check."); break; - + case 'x': /* 16 bit constant, zero-extended */ case 'X': /* 16 bit constant, one-extended */ if (operand->X_seg == SEG_ABSOLUTE) { @@ -551,7 +551,7 @@ char *str; the_insn.reloc = RELOC_CONST; the_insn.exp = *operand; continue; - + case 'h': if (operand->X_seg == SEG_ABSOLUTE) { opcode |= (operand->X_add_number & 0x00FF0000) >> 16 | @@ -562,7 +562,7 @@ char *str; the_insn.reloc = RELOC_CONSTH; the_insn.exp = *operand; continue; - + case 'P': /* PC-relative jump address */ case 'A': /* Absolute jump address */ /* These two are treated together since we folded the @@ -578,7 +578,7 @@ char *str; the_insn.pcrel = 1; /* Assume PC-relative jump */ /* FIXME-SOON, Do we figure out whether abs later, after know sym val? */ continue; - + case 'e': /* Coprocessor enable bit for LOAD/STORE insn */ if (operand->X_seg == SEG_ABSOLUTE) { if (operand->X_add_number == 0) @@ -589,7 +589,7 @@ char *str; } } break; - + case 'n': /* Control bits for LOAD/STORE instructions */ if (operand->X_seg == SEG_ABSOLUTE && operand->X_add_number < 128) { @@ -597,7 +597,7 @@ char *str; continue; } break; - + case 's': /* Special register number */ if (operand->X_seg != SEG_REGISTER) break; /* Only registers */ @@ -605,7 +605,7 @@ char *str; break; /* Not a special register */ opcode |= (operand->X_add_number & 0xFF) << 8; continue; - + case 'u': /* UI bit of CONVERT */ if (operand->X_seg == SEG_ABSOLUTE) { if (operand->X_add_number == 0) @@ -616,7 +616,7 @@ char *str; } } break; - + case 'r': /* RND bits of CONVERT */ if (operand->X_seg == SEG_ABSOLUTE && operand->X_add_number < 8) { @@ -624,7 +624,7 @@ char *str; continue; } break; - + case 'd': /* FD bits of CONVERT */ if (operand->X_seg == SEG_ABSOLUTE && operand->X_add_number < 4) { @@ -632,8 +632,8 @@ char *str; continue; } break; - - + + case 'f': /* FS bits of CONVERT */ if (operand->X_seg == SEG_ABSOLUTE && operand->X_add_number < 4) { @@ -641,7 +641,7 @@ char *str; continue; } break; - + case 'C': if (operand->X_seg == SEG_ABSOLUTE && operand->X_add_number < 4) { @@ -649,7 +649,7 @@ char *str; continue; } break; - + case 'F': if (operand->X_seg == SEG_ABSOLUTE && operand->X_add_number < 16) { @@ -657,7 +657,7 @@ char *str; continue; } break; - + default: BAD_CASE (*args); } @@ -670,7 +670,7 @@ char *str; /* This is identical to the md_atof in m68k.c. I think this is right, but I'm not sure. - + Turn a string in input_line_pointer into a floating point constant of type type, and store the appropriate bytes in *litP. The number of LITTLENUMS emitted is stored in *sizeP. An error message is returned, or NULL on OK. @@ -689,33 +689,33 @@ int *sizeP; LITTLENUM_TYPE words[MAX_LITTLENUMS]; LITTLENUM_TYPE *wordP; char *t; - + switch (type) { - + case 'f': case 'F': case 's': case 'S': prec = 2; break; - + case 'd': case 'D': case 'r': case 'R': prec = 4; break; - + case 'x': case 'X': prec = 6; break; - + case 'p': case 'P': prec = 6; break; - + default: *sizeP=0; return "Bad call to MD_ATOF()"; @@ -740,9 +740,9 @@ char *buf; long val; int n; { - + switch (n) { - + case 4: *buf++ = val >> 24; *buf++ = val >> 16; @@ -751,7 +751,7 @@ int n; case 1: *buf = val; break; - + default: as_fatal("failed sanity check."); } @@ -763,13 +763,13 @@ fixS *fixP; long val; { char *buf = fixP->fx_where + fixP->fx_frag->fr_literal; - + fixP->fx_addnumber = val; /* Remember value for emit_reloc */ - - + + know(fixP->fx_size == 4); know(fixP->fx_r_type < NO_RELOC); - + /* * This is a hack. There should be a better way to * handle this. @@ -777,20 +777,20 @@ long val; if (fixP->fx_r_type == RELOC_WDISP30 && fixP->fx_addsy) { val += fixP->fx_where + fixP->fx_frag->fr_address; } - + switch (fixP->fx_r_type) { - + case RELOC_32: buf[0] = val >> 24; buf[1] = val >> 16; buf[2] = val >> 8; buf[3] = val; break; - + case RELOC_8: buf[0] = val; break; - + case RELOC_WDISP30: val = (val >>= 2) + 1; buf[0] |= (val >> 24) & 0x3f; @@ -798,23 +798,23 @@ long val; buf[2] = val >> 8; buf[3] = val; break; - + case RELOC_HI22: buf[1] |= (val >> 26) & 0x3f; buf[2] = val >> 18; buf[3] = val >> 10; break; - + case RELOC_LO10: buf[2] |= (val >> 8) & 0x03; buf[3] = val; break; - + case RELOC_BASE13: buf[2] |= (val >> 8) & 0x1f; buf[3] = val; break; - + case RELOC_WDISP22: val = (val >>= 2) + 1; /* FALLTHROUGH */ @@ -823,31 +823,31 @@ long val; buf[2] = val >> 8; buf[3] = val; break; - + #if 0 - case RELOC_PC10: - case RELOC_PC22: + case RELOC_PC10: + case RELOC_PC22: case RELOC_JMP_TBL: case RELOC_SEGOFF16: case RELOC_GLOB_DAT: - case RELOC_JMP_SLOT: + case RELOC_JMP_SLOT: case RELOC_RELATIVE: #endif case RELOC_JUMPTARG: /* 00XX00XX pattern in a word */ buf[1] = val >> 10; /* Holds bits 0003FFFC of address */ buf[3] = val >> 2; break; - + case RELOC_CONST: /* 00XX00XX pattern in a word */ buf[1] = val >> 8; /* Holds bits 0000XXXX */ buf[3] = val; break; - + case RELOC_CONSTH: /* 00XX00XX pattern in a word */ buf[1] = val >> 24; /* Holds bits XXXX0000 */ buf[3] = val >> 16; break; - + case NO_RELOC: default: as_bad("bad relocation type: 0x%02x", fixP->fx_r_type); @@ -860,11 +860,11 @@ long val; short tc_coff_fix2rtype(fixP) fixS *fixP; { - + /* FIXME-NOW: relocation type handling is not yet written for a29k. */ - - + + switch (fixP->fx_r_type) { case RELOC_32: return(R_WORD); case RELOC_8: return(R_BYTE); @@ -874,7 +874,7 @@ fixS *fixP; default: printf("need %o3\n", fixP->fx_r_type); abort(0); } /* switch on type */ - + return(0); } /* tc_coff_fix2rtype() */ #endif /* OBJ_COFF */ @@ -950,7 +950,7 @@ struct machine_it *insn; "RELOC_RELATIVE", "NO_RELOC" }; - + if (insn->error) { fprintf(stderr, "ERROR: %s\n"); } @@ -959,11 +959,11 @@ struct machine_it *insn; fprintf(stderr, "exp = {\n"); fprintf(stderr, "\t\tX_add_symbol = %s\n", insn->exp.X_add_symbol ? - (S_GET_NAME(insn->exp.X_add_symbol) ? + (S_GET_NAME(insn->exp.X_add_symbol) ? S_GET_NAME(insn->exp.X_add_symbol) : "???") : "0"); fprintf(stderr, "\t\tX_sub_symbol = %s\n", insn->exp.X_subtract_symbol ? - (S_GET_NAME(insn->exp.X_subtract_symbol) ? + (S_GET_NAME(insn->exp.X_subtract_symbol) ? S_GET_NAME(insn->exp.X_subtract_symbol) : "???") : "0"); fprintf(stderr, "\t\tX_add_number = %d\n", insn->exp.X_add_number); @@ -973,7 +973,7 @@ struct machine_it *insn; #endif /* Translate internal representation of relocation info to target format. - + On sparc/29k: first 4 bytes are normal unsigned long address, next three bytes are index, most sig. byte first. Byte 7 is broken up with bit 7 as external, bits 6 & 5 unused, and the lower @@ -988,25 +988,25 @@ fixS *fixP; relax_addressT segment_address_in_file; { long r_symbolnum; - + know(fixP->fx_r_type < NO_RELOC); know(fixP->fx_addsy != NULL); - + md_number_to_chars(where, fixP->fx_frag->fr_address + fixP->fx_where - segment_address_in_file, 4); - + r_symbolnum = (S_IS_DEFINED(fixP->fx_addsy) ? S_GET_TYPE(fixP->fx_addsy) : fixP->fx_addsy->sy_number); - + where[4] = (r_symbolnum >> 16) & 0x0ff; where[5] = (r_symbolnum >> 8) & 0x0ff; where[6] = r_symbolnum & 0x0ff; where[7] = (((!S_IS_DEFINED(fixP->fx_addsy)) << 7) & 0x80) | (0 & 0x60) | (fixP->fx_r_type & 0x1F); /* Also easy */ md_number_to_chars(&where[8], fixP->fx_addnumber, 4); - + return; } /* tc_aout_fix_to_chars() */ @@ -1031,7 +1031,7 @@ char *name; { long regnum; char testbuf[5+ /*SLOP*/ 5]; - + if (name[0] == 'g' || name[0] == 'G' || name[0] == 'l' || name[0] == 'L') { /* Perhaps a global or local register name */ @@ -1045,14 +1045,14 @@ char *name; sprintf(testbuf, "%ld", regnum); if (strcmp (testbuf, &name[2]) != 0) return 0; /* gr007 or lr7foo or whatever */ - + /* We have a wiener! Define and return a new symbol for it. */ if (name[0] == 'l' || name[0] == 'L') regnum += 128; return(symbol_new(name, SEG_REGISTER, regnum, &zero_address_frag)); } } - + return 0; } @@ -1061,7 +1061,7 @@ char *name; void md_operand(expressionP) expressionS *expressionP; { - + if (input_line_pointer[0] == '%' && input_line_pointer[1] == '%') { /* We have a numeric register expression. No biggy. */ diff --git a/gnu/usr.bin/as/config/tc-a29k.h b/gnu/usr.bin/as/config/tc-a29k.h index fee1ca2..a362595 100644 --- a/gnu/usr.bin/as/config/tc-a29k.h +++ b/gnu/usr.bin/as/config/tc-a29k.h @@ -1,18 +1,18 @@ /* tc-a29k.h -- Assemble for the AMD 29000. Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -31,7 +31,7 @@ #define BFD_ARCH bfd_arch_a29k #define COFF_MAGIC SIPFBOMAGIC -/* Should the reloc be output ? +/* Should the reloc be output ? on the 29k, this is true only if there is a symbol attatched. on the h8, this is allways true, since no fixup is done */ diff --git a/gnu/usr.bin/as/config/tc-generic.h b/gnu/usr.bin/as/config/tc-generic.h index 181d4aa..7a16dd0 100644 --- a/gnu/usr.bin/as/config/tc-generic.h +++ b/gnu/usr.bin/as/config/tc-generic.h @@ -1,19 +1,19 @@ /* This file is tc-generic.h Copyright (C) 1987-1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/gnu/usr.bin/as/config/tc-h8300.c b/gnu/usr.bin/as/config/tc-h8300.c index db4786b..2ce2f2b 100644 --- a/gnu/usr.bin/as/config/tc-h8300.c +++ b/gnu/usr.bin/as/config/tc-h8300.c @@ -1,24 +1,24 @@ /* tc-h8300.c -- Assemble code for the Hitachi H8/300 Copyright (C) 1991, 1992 Free Software Foundation. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* +/* Written By Steve Chamberlain sac@cygnus.com */ @@ -84,7 +84,7 @@ struct reg_entry char number; }; -struct reg_entry reg_list[] = { +struct reg_entry reg_list[] = { "r0",WORD_REG +0, "r1",WORD_REG +1, "r2",WORD_REG +2, @@ -120,17 +120,17 @@ struct reg_entry reg_list[] = { #endif -void md_begin () +void md_begin () { struct h8_opcode *opcode; const struct reg_entry *reg; char prev_buffer[100]; int idx = 0; - + opcode_hash_control = hash_new(); prev_buffer[0] = 0; - - for (opcode = h8_opcodes; opcode->name; opcode++) + + for (opcode = h8_opcodes; opcode->name; opcode++) { /* Strip off any . part when inserting the opcode and only enter unique codes into the hash table @@ -139,7 +139,7 @@ void md_begin () unsigned int len = strlen(src); char *dst = malloc(len+1); char *buffer = dst; - opcode->size = 0; + opcode->size = 0; while (*src) { if (*src == '.') { *dst++ = 0; @@ -149,15 +149,15 @@ void md_begin () } *dst++ = *src++; } - if (strcmp(buffer, prev_buffer)) + if (strcmp(buffer, prev_buffer)) { hash_insert(opcode_hash_control, buffer, (char *)opcode); strcpy(prev_buffer, buffer); idx++; } opcode->idx = idx; - - + + /* Find the number of operands */ opcode->noperands = 0; while (opcode->args.nib[opcode->noperands] != E) @@ -167,7 +167,7 @@ void md_begin () while (opcode->data.nib[opcode->length*2] != E) opcode->length++; } - + } @@ -176,7 +176,7 @@ struct h8_exp { char *e_end; expressionS e_exp; }; -struct h8_op +struct h8_op { unsigned int dispreg; op_type mode; @@ -187,14 +187,14 @@ struct h8_op /* - parse operands + parse operands WREG r0,r1,r2,r3,r4,r5,r6,r7,fp,sp r0l,r0h,..r7l,r7h @WREG @WREG+ @-WREG #const - + */ op_type r8_sord[] = {RS8, RD8}; @@ -204,42 +204,42 @@ op_type abs_sord[2] = {ABS16SRC, ABS16DST}; op_type disp_sord[] = {DISPSRC, DISPDST}; /* try and parse a reg name, returns number of chars consumed */ -int +int DEFUN(parse_reg,(src, mode, reg, dst), char *src AND op_type *mode AND unsigned int *reg AND int dst) { - if (src[0] == 's' && src[1] == 'p') + if (src[0] == 's' && src[1] == 'p') { *mode = r16_sord[dst]; *reg = 7; return 2; } - if (src[0] == 'c' && src[1] == 'c' && src[2] == 'r') + if (src[0] == 'c' && src[1] == 'c' && src[2] == 'r') { *mode = CCR; *reg = 0; return 3; } - if (src[0] == 'f' && src[1] == 'p') + if (src[0] == 'f' && src[1] == 'p') { *mode = r16_sord[dst]; *reg = 6; return 2; } - if (src[0] == 'r') + if (src[0] == 'r') { - if (src[1] >= '0' && src[1] <= '7') + if (src[1] >= '0' && src[1] <= '7') { - if (src[2] == 'l') + if (src[2] == 'l') { *mode = r8_sord[dst]; *reg = (src[1] - '0') + 8; return 3; } - if (src[2] == 'h') + if (src[2] == 'h') { *mode = r8_sord[dst]; *reg = (src[1] - '0') ; @@ -265,7 +265,7 @@ char * seg = expr(0,op); new = input_line_pointer; input_line_pointer = save; - if (SEG_NORMAL(seg)) + if (SEG_NORMAL(seg)) return new; switch (seg) { case SEG_ABSOLUTE: @@ -291,13 +291,13 @@ static char * ptr++; while (isdigit(*ptr)) ptr++; - + } return ptr; } /* The many forms of operand: - + Rn Register direct @Rn Register indirect @(exp[:16], Rn) Register indirect with displacement @@ -306,17 +306,17 @@ static char * @aa:8 absolute 8 bit @aa:16 absolute 16 bit @aa absolute 16 bit - + #xx[:size] immediate data @(exp:[8], pc) pc rel @@aa[:8] memory indirect - + */ -static void +static void DEFUN(get_operand,(ptr, op, dst), - char **ptr AND - struct h8_op *op AND + char **ptr AND + struct h8_op *op AND unsigned int dst) { char *src = *ptr; @@ -325,48 +325,48 @@ static void unsigned int len; unsigned int size; op->mode = E; - + len = parse_reg(src, &op->mode, &op->reg, dst); if (len) { *ptr = src + len; return ; } - - if (*src == '@') + + if (*src == '@') { src++; - if (*src == '@') + if (*src == '@') { src++; src = parse_exp(src,&op->exp); src = skip_colonthing(src); - + *ptr = src; - + op->mode = MEMIND; return; - + } - - - if (*src == '-') - { + + + if (*src == '-') + { src++; len = parse_reg(src, &mode, &num, dst); - if (len == 0) + if (len == 0) { /* Oops, not a reg after all, must be ordinary exp */ src--; /* must be a symbol */ op->mode = abs_sord[dst]; *ptr = skip_colonthing(parse_exp(src, &op->exp)); - + return; - - + + } - - if (mode != r16_sord[dst]) + + if (mode != r16_sord[dst]) { as_bad("@- needs word register"); } @@ -375,13 +375,13 @@ static void *ptr = src + len; return; } - if (*src == '(' && ')') + if (*src == '(' && ')') { /* Disp */ src++; src = parse_exp(src, &op->exp); - - if (*src == ')') + + if (*src == ')') { src++; op->mode = abs_sord[dst]; @@ -389,8 +389,8 @@ static void return; } src = skip_colonthing(src); - - if (*src != ',') + + if (*src != ',') { as_bad("expected @(exp, reg16)"); } @@ -403,24 +403,24 @@ static void op->mode = disp_sord[dst]; src += len; src = skip_colonthing(src); - - if (*src != ')' && '(') + + if (*src != ')' && '(') { as_bad("expected @(exp, reg16)"); - + } *ptr = src +1; - + return; } len = parse_reg(src, &mode, &num, dst); - + if (len) { src += len; - if (*src == '+') + if (*src == '+') { src++; - if (mode != RS16) + if (mode != RS16) { as_bad("@Rn+ needs src word register"); } @@ -429,7 +429,7 @@ static void *ptr = src; return; } - if (mode != r16_sord[dst]) + if (mode != r16_sord[dst]) { as_bad("@Rn needs word register"); } @@ -438,23 +438,23 @@ static void *ptr = src; return; } - else + else { /* must be a symbol */ op->mode = abs_sord[dst]; *ptr = skip_colonthing(parse_exp(src, &op->exp)); - + return; } } - - + + if (*src == '#') { src++; op->mode = IMM16; src = parse_exp(src, &op->exp); *ptr= skip_colonthing(src); - + return; } else { @@ -469,35 +469,35 @@ static DEFUN(get_operands,(noperands,op_end, operand), unsigned int noperands AND char *op_end AND - struct h8_op *operand) + struct h8_op *operand) { char *ptr = op_end; - switch (noperands) + switch (noperands) { case 0: operand[0].mode = 0; operand[1].mode = 0; break; - - case 1: + + case 1: ptr++; get_operand(& ptr, operand +0,0); operand[1].mode =0; break; - + case 2: ptr++; get_operand(& ptr, operand +0,0); if (*ptr == ',') ptr++; get_operand(& ptr, operand +1, 1); break; - + default: - abort(); + abort(); } - - - return ptr; + + + return ptr; } /* Passed a pointer to a list of opcodes which use different @@ -514,18 +514,18 @@ static struct h8_opcode *this_try = opcode ; int found = 0; unsigned int noperands = opcode->noperands; - + unsigned int dispreg; unsigned int this_index = opcode->idx; - while (this_index == opcode->idx && !found) + while (this_index == opcode->idx && !found) { unsigned int i; - + this_try = opcode ++; - for (i = 0; i < noperands; i++) + for (i = 0; i < noperands; i++) { op_type op = (this_try->args.nib[i]) & ~(B30|B31); - switch (op) + switch (op) { case Hex0: case Hex1: @@ -546,7 +546,7 @@ static break; case DISPSRC: case DISPDST: - operands[0].dispreg = operands[i].reg; + operands[0].dispreg = operands[i].reg; case RD8: case RS8: case RDIND: @@ -571,7 +571,7 @@ static case ABS8SRC: case ABS16OR8SRC: case ABS16ORREL8SRC: - + if (operands[i].mode != ABS16SRC) goto fail; break; case ABS16OR8DST: @@ -584,9 +584,9 @@ static found =1; fail: ; } - if (found) + if (found) return this_try; - else + else return 0; } @@ -596,10 +596,10 @@ static void unsigned int width AND char *string) { - if (operand->exp.X_add_symbol == 0 + if (operand->exp.X_add_symbol == 0 && operand->exp.X_subtract_symbol == 0) { - + /* No symbol involved, let's look at offset, it's dangerous if any of the high bits are not 0 or ff's, find out by oring or anding with the width and seeing if the answer is 0 or all fs*/ @@ -609,19 +609,19 @@ static void as_warn("operand %s0x%x out of range.", string, operand->exp.X_add_number); } } - + } /* Now we know what sort of opcodes it is, lets build the bytes - */ -static void +static void DEFUN (build_bytes,(this_try, operand), struct h8_opcode *this_try AND struct h8_op *operand) { unsigned int i; - + char *output = frag_more(this_try->length); char *output_ptr = output; op_type *nibble_ptr = this_try->data.nib; @@ -630,18 +630,18 @@ static void char high; int nib; top: ; - while (*nibble_ptr != E) + while (*nibble_ptr != E) { int nibble; - for (nibble = 0; nibble <2; nibble++) + for (nibble = 0; nibble <2; nibble++) { c = *nibble_ptr & ~(B30|B31); - switch (c) + switch (c) { default: abort(); case KBIT: - switch (operand[0].exp.X_add_number) + switch (operand[0].exp.X_add_number) { case 1: nib = 0; @@ -659,7 +659,7 @@ static void case 0: case 1: case 2: case 3: case 4: case 5: case 6: - case 7: case 8: case 9: case 10: case 11: + case 7: case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15: nib = c; break; @@ -670,23 +670,23 @@ static void operand[0].mode = IMM8; nib = 0; break; - + case DISPDST: nib = 0; break; - case IMM3: + case IMM3: if (operand[0].exp.X_add_symbol == 0) { operand[0].mode = 0; /* stop it making a fix */ nib = (operand[0].exp.X_add_number); } else as_bad("can't have symbol for bit number"); - if (nib < 0 || nib > 7) + if (nib < 0 || nib > 7) { as_bad("Bit number out of range %d", nib); } - + break; - + case ABS16DST: nib = 0; break; @@ -700,35 +700,35 @@ static void break; case ABS16OR8DST: operand[1].mode = c; - + nib = 0; - + break; - + case ABS16ORREL8SRC: operand[0].mode = c; nib=0; break; - + case ABS16OR8SRC: operand[0].mode = ABS16OR8SRC; nib = 0; break; - case DISPSRC: + case DISPSRC: operand[0].mode = ABS16SRC; nib = 0; break; - + case DISP8: operand[0].mode = DISP8; nib = 0; break; - + case ABS16SRC: case IMM16: case IGNORE: case MEMIND: - + nib=0; break; case RS8: @@ -737,22 +737,22 @@ static void case RSINC: nib = operand[0].reg; break; - + case RD8: case RD16: case RDDEC: case RDIND: nib = operand[1].reg; break; - - case E: + + case E: abort(); break; } if (*nibble_ptr & B31) { nib |=0x8; } - + if (nibble == 0) { *output_ptr = nib << 4; } @@ -762,21 +762,21 @@ static void } nibble_ptr++; } - + } - + /* output any fixes */ - for (i = 0; i < 2; i++) + for (i = 0; i < 2; i++) { switch (operand[i].mode) { case 0: break; - + case DISP8: check_operand(operand+i, 0x7f,"@"); - + fix_new(frag_now, - output - frag_now->fr_literal + 1, + output - frag_now->fr_literal + 1, 1, operand[i].exp.X_add_symbol, operand[i].exp.X_subtract_symbol, @@ -788,14 +788,14 @@ static void check_operand(operand+i, 0xff,"#"); /* If there is nothing else going on we can safely reloc in place */ - if (operand[i].exp.X_add_symbol == 0) + if (operand[i].exp.X_add_symbol == 0) { output[1] = operand[i].exp.X_add_number; } - else + else { fix_new(frag_now, - output - frag_now->fr_literal + 1, + output - frag_now->fr_literal + 1, 1, operand[i].exp.X_add_symbol, operand[i].exp.X_subtract_symbol, @@ -803,12 +803,12 @@ static void 0, R_RELBYTE); } - + break; case MEMIND: check_operand(operand+i, 0xff,"@@"); fix_new(frag_now, - output - frag_now->fr_literal + 1, + output - frag_now->fr_literal + 1, 1, operand[i].exp.X_add_symbol, operand[i].exp.X_subtract_symbol, @@ -820,7 +820,7 @@ static void case ABS8SRC: check_operand(operand+i, 0xff,"@"); fix_new(frag_now, - output - frag_now->fr_literal + 1, + output - frag_now->fr_literal + 1, 1, operand[i].exp.X_add_symbol, operand[i].exp.X_subtract_symbol, @@ -828,13 +828,13 @@ static void 0, R_RELBYTE); break; - - case ABS16OR8SRC: + + case ABS16OR8SRC: case ABS16OR8DST: check_operand(operand+i, 0xffff,"@"); - + fix_new(frag_now, - output - frag_now->fr_literal + 2, + output - frag_now->fr_literal + 2, 2, operand[i].exp.X_add_symbol, operand[i].exp.X_subtract_symbol, @@ -842,12 +842,12 @@ static void 0, R_MOVB1); break; - - case ABS16ORREL8SRC: + + case ABS16ORREL8SRC: check_operand(operand+i, 0xffff,"@"); - + fix_new(frag_now, - output - frag_now->fr_literal + 2, + output - frag_now->fr_literal + 2, 2, operand[i].exp.X_add_symbol, operand[i].exp.X_subtract_symbol, @@ -855,26 +855,26 @@ static void 0, R_JMP1); break; - - + + case ABS16SRC: case ABS16DST: case IMM16: case DISPSRC: case DISPDST: check_operand(operand+i, 0xffff,"@"); - if (operand[i].exp.X_add_symbol == 0) + if (operand[i].exp.X_add_symbol == 0) { /* This should be done with bfd */ - output[3] = operand[i].exp.X_add_number & 0xff; + output[3] = operand[i].exp.X_add_number & 0xff; output[2] = operand[i].exp.X_add_number >> 8; - + } - else + else { - + fix_new(frag_now, - output - frag_now->fr_literal + 2, + output - frag_now->fr_literal + 2, 2, operand[i].exp.X_add_symbol, operand[i].exp.X_subtract_symbol, @@ -882,25 +882,25 @@ static void 0, R_RELWORD); } - + break; case RS8: case RD8: case RS16: case RD16: - case RDDEC: + case RDDEC: case KBIT: case RSINC: case RDIND: case RSIND: case CCR: - + break; default: abort(); } } - + } /* try and give an intelligent error message for common and simple to @@ -913,48 +913,48 @@ static void struct h8_op *operand) { struct h8_opcode *scan = opcode; - - /* Find out if there was more than one possible opccode */ - - if ((opcode+1)->idx != opcode->idx) + + /* Find out if there was more than one possible opccode */ + + if ((opcode+1)->idx != opcode->idx) { unsigned int argn; - + /* Only one opcode of this flavour, try and guess which operand didn't match */ - for (argn = 0; argn < opcode->noperands; argn++) + for (argn = 0; argn < opcode->noperands; argn++) { - switch (opcode->args.nib[argn]) + switch (opcode->args.nib[argn]) { case RD16: - if (operand[argn].mode != RD16) + if (operand[argn].mode != RD16) { - as_bad("destination operand must be 16 bit register"); + as_bad("destination operand must be 16 bit register"); } return; case RS8: - - if (operand[argn].mode != RS8) + + if (operand[argn].mode != RS8) { as_bad("source operand must be 8 bit register"); } return; case ABS16DST: - if (operand[argn].mode != ABS16DST) + if (operand[argn].mode != ABS16DST) { as_bad("destination operand must be 16bit absolute address"); return; } - + case RD8: - if (operand[argn].mode != RD8) + if (operand[argn].mode != RD8) { - as_bad("destination operand must be 8 bit register"); + as_bad("destination operand must be 8 bit register"); } return; - + case ABS16SRC: - if (operand[argn].mode != ABS16SRC) + if (operand[argn].mode != ABS16SRC) { as_bad("source operand must be 16bit absolute address"); return; @@ -972,27 +972,27 @@ static void -void +void DEFUN(md_assemble,(str), char *str) { char *op_start; char *op_end; unsigned int i; - struct h8_op operand[2]; + struct h8_op operand[2]; struct h8_opcode * opcode; struct h8_opcode * prev_opcode; - + char *dot = 0; - char c; + char c; /* Drop leading whitespace */ while (*str == ' ') str++; - + /* find the op code end */ for (op_start = op_end = str; *op_end != 0 && *op_end != ' '; - op_end ++) + op_end ++) { if (*op_end == '.') { dot = op_end+1; @@ -1001,57 +1001,57 @@ void break; } } - + ; - - if (op_end == op_start) + + if (op_end == op_start) { as_bad("can't find opcode "); } c = *op_end; - + *op_end = 0; - + opcode = (struct h8_opcode *) hash_find(opcode_hash_control, op_start); - - if (opcode == NULL) + + if (opcode == NULL) { as_bad("unknown opcode"); return; } - - + + input_line_pointer = get_operands(opcode->noperands, op_end, operand); *op_end = c; prev_opcode = opcode; - + opcode = get_specific(opcode, operand); - - if (opcode == 0) + + if (opcode == 0) { /* Couldn't find an opcode which matched the operands */ char *where =frag_more(2); where[0] = 0x0; where[1] = 0x0; clever_message(prev_opcode, operand); - + return; } - if (opcode->size && dot) + if (opcode->size && dot) { - if (opcode->size != *dot) + if (opcode->size != *dot) { as_warn("mismatch between opcode size and operand size"); } } - + build_bytes(opcode, operand); - + } -void +void DEFUN(tc_crawl_symbol_chain, (headers), object_headers *headers) { @@ -1064,14 +1064,14 @@ symbolS *DEFUN(md_undefined_symbol,(name), return 0; } -void +void DEFUN(tc_headers_hook,(headers), object_headers *headers) { - printf("call to tc_headers_hook \n"); + printf("call to tc_headers_hook \n"); } void - DEFUN_VOID(md_end) + DEFUN_VOID(md_end) { } @@ -1094,7 +1094,7 @@ int *sizeP; LITTLENUM_TYPE *wordP; char *t; char *atof_ieee(); - + switch (type) { case 'f': case 'F': @@ -1102,24 +1102,24 @@ int *sizeP; case 'S': prec = 2; break; - + case 'd': case 'D': case 'r': case 'R': prec = 4; break; - + case 'x': case 'X': prec = 6; break; - + case 'p': case 'P': prec = 6; break; - + default: *sizeP=0; return "Bad call to MD_ATOF()"; @@ -1127,7 +1127,7 @@ int *sizeP; t=atof_ieee(input_line_pointer,type,words); if (t) input_line_pointer=t; - + *sizeP=prec * sizeof(LITTLENUM_TYPE); for (wordP=words;prec--;) { md_number_to_chars(litP,(long)(*wordP++),sizeof(LITTLENUM_TYPE)); @@ -1144,7 +1144,7 @@ char ***vecP; { return 0; - + } int md_short_jump_size; @@ -1184,7 +1184,7 @@ long long size) { return((size + (1 << section_alignment[(int) seg]) - 1) & (-1 << section_alignment[(int) seg])); - + } void @@ -1193,7 +1193,7 @@ fixS *fixP; long val; { char *buf = fixP->fx_where + fixP->fx_frag->fr_literal; - + switch (fixP->fx_size) { case 1: *buf++=val; @@ -1210,11 +1210,11 @@ long val; break; default: abort(); - + } } -void DEFUN(md_operand, (expressionP),expressionS *expressionP) +void DEFUN(md_operand, (expressionP),expressionS *expressionP) { } int md_long_jump_size; @@ -1222,7 +1222,7 @@ int md_estimate_size_before_relax(fragP, segment_type) register fragS *fragP; register segT segment_type; -{ +{ printf("call tomd_estimate_size_before_relax \n"); abort(); } /* Put number into target byte order */ @@ -1241,7 +1241,7 @@ void DEFUN(md_number_to_chars,(ptr, use, nbytes), abort(); } } -long md_pcrel_from(fixP) +long md_pcrel_from(fixP) fixS *fixP; { abort(); } void tc_coff_symbol_emit_hook() { } @@ -1254,17 +1254,17 @@ bfd_vma base; { symbolS *symbol_ptr; - + symbol_ptr = fix_ptr->fx_addsy; - + /* If this relocation is attached to a symbol then it's ok to output it */ if (fix_ptr->fx_r_type == RELOC_32) { /* cons likes to create reloc32's whatever the size of the reloc.. */ - switch (fix_ptr->fx_size) + switch (fix_ptr->fx_size) { - + case 2: intr->r_type = R_RELWORD; break; @@ -1273,23 +1273,23 @@ bfd_vma base; break; default: abort(); - + } - + } - else { + else { intr->r_type = fix_ptr->fx_r_type; } - + intr->r_vaddr = fix_ptr->fx_frag->fr_address + fix_ptr->fx_where +base; intr->r_offset = fix_ptr->fx_offset; - + if (symbol_ptr) intr->r_symndx = symbol_ptr->sy_number; else intr->r_symndx = -1; - - + + } /* end of tc-h8300.c */ diff --git a/gnu/usr.bin/as/config/tc-h8300.h b/gnu/usr.bin/as/config/tc-h8300.h index 6da7896..dc01f6c 100644 --- a/gnu/usr.bin/as/config/tc-h8300.h +++ b/gnu/usr.bin/as/config/tc-h8300.h @@ -1,19 +1,19 @@ /* This file is tc-h8300.h Copyright (C) 1987-1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -23,7 +23,7 @@ /* This macro translates between an internal fix and an coff reloc type */ #define TC_COFF_FIX2RTYPE(fixP) abort(); - + #define BFD_ARCH bfd_arch_h8300 #define COFF_MAGIC 0x8300 #define TC_COUNT_RELOC(x) (1) diff --git a/gnu/usr.bin/as/config/tc-i386.c b/gnu/usr.bin/as/config/tc-i386.c index caadb8a..7aa2174 100644 --- a/gnu/usr.bin/as/config/tc-i386.c +++ b/gnu/usr.bin/as/config/tc-i386.c @@ -1,18 +1,18 @@ /* i386.c -- Assemble code for the Intel 80386 Copyright (C) 1989, 1991, 1992 Free Software Foundation. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -25,7 +25,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: tc-i386.c,v 1.2 1993/11/30 20:57:41 jkh Exp $"; +static char rcsid[] = "$Id: tc-i386.c,v 1.3 1994/12/23 22:37:35 nate Exp $"; #endif #include "as.h" @@ -42,19 +42,19 @@ typedef struct { /* SUFFIX holds the opcode suffix (e.g. 'l' for 'movl') if given. */ char suffix; /* Operands are coded with OPERANDS, TYPES, DISPS, IMMS, and REGS. */ - + /* OPERANDS gives the number of given operands. */ unsigned int operands; - + /* REG_OPERANDS, DISP_OPERANDS, MEM_OPERANDS, IMM_OPERANDS give the number of given register, displacement, memory operands and immediate operands. */ unsigned int reg_operands, disp_operands, mem_operands, imm_operands; - + /* TYPES [i] is the type (see above #defines) which tells us how to search through DISPS [i] & IMMS [i] & REGS [i] for the required operand. */ unsigned int types[MAX_OPERANDS]; - + /* Displacements (if given) for each operand. */ expressionS *disps[MAX_OPERANDS]; @@ -62,32 +62,32 @@ typedef struct { /* Relocation type for operand */ enum reloc_type disp_reloc[MAX_OPERANDS]; #endif - + /* Immediate operands (if given) for each operand. */ expressionS *imms[MAX_OPERANDS]; - + /* Register operands (if given) for each operand. */ reg_entry *regs[MAX_OPERANDS]; - + /* BASE_REG, INDEX_REG, and LOG2_SCALE_FACTOR are used to encode the base index byte below. */ reg_entry *base_reg; reg_entry *index_reg; unsigned int log2_scale_factor; - + /* SEG gives the seg_entry of this insn. It is equal to zero unless an explicit segment override is given. */ const seg_entry *seg; /* segment for memory operands (if given) */ - + /* PREFIX holds all the given prefix opcodes (usually null). PREFIXES is the size of PREFIX. */ /* richfix: really unsigned? */ unsigned char prefix[MAX_PREFIXES]; unsigned int prefixes; - + /* RM and IB are the modrm byte and the base index byte where the addressing modes of this insn are encoded. */ - + modrm_byte rm; base_index_byte bi; @@ -144,7 +144,7 @@ static char save_stack[32]; static char *save_stack_p; /* stack pointer */ #define END_STRING_AND_SAVE(s) *save_stack_p++ = *s; *s = '\0' #define RESTORE_END_STRING(s) *s = *--save_stack_p - + /* The instruction we're assembling. */ static i386_insn i; @@ -188,7 +188,7 @@ const relax_typeS md_relax_table[] = { {1, 1, 0, 0}, {1, 1, 0, 0}, {1, 1, 0, 0}, - + /* For now we don't use word displacement jumps: they may be untrustworthy. */ {127+1, -128+1, 0, ENCODE_RELAX_STATE(COND_JUMP,DWORD) }, @@ -199,7 +199,7 @@ const relax_typeS md_relax_table[] = { 1 opcode prefix; 3 displacement bytes */ {0, 0, 4, 0}, {1, 1, 0, 0}, - + {127+1, -128+1, 0, ENCODE_RELAX_STATE(UNCOND_JUMP,DWORD) }, /* word jmp adds 2 bytes to frag: 1 opcode prefix; 1 displacement bytes */ @@ -208,7 +208,7 @@ const relax_typeS md_relax_table[] = { 0 opcode prefix; 3 displacement bytes */ {0, 0, 3, 0}, {1, 1, 0, 0}, - + }; #if __STDC__ == 1 @@ -283,22 +283,22 @@ static struct hash_control *prefix_hash = (struct hash_control *) 0; void md_begin () { char * hash_err; - + obstack_begin (&o,4096); - + /* initialize op_hash hash table */ op_hash = hash_new(); /* xmalloc handles error */ - + { register const template *optab; register templates *core_optab; char *prev_name; - + optab = i386_optab; /* setup for loop */ prev_name = optab->name; obstack_grow (&o, optab, sizeof(template)); core_optab = (templates *) xmalloc (sizeof (templates)); - + for (optab++; optab < i386_optab_end; optab++) { if (! strcmp (optab->name, prev_name)) { /* same name as before --> append to current template list */ @@ -321,43 +321,43 @@ void md_begin () } } } - + /* initialize reg_hash hash table */ reg_hash = hash_new(); { register const reg_entry *regtab; - + for (regtab = i386_regtab; regtab < i386_regtab_end; regtab++) { hash_err = hash_insert (reg_hash, regtab->reg_name, regtab); if (hash_err && *hash_err) goto hash_error; } } - + esp = (reg_entry *) hash_find (reg_hash, "esp"); ebp = (reg_entry *) hash_find (reg_hash, "ebp"); - + /* initialize reg_hash hash table */ prefix_hash = hash_new(); { register const prefix_entry *prefixtab; - + for (prefixtab = i386_prefixtab; prefixtab < i386_prefixtab_end; prefixtab++) { hash_err = hash_insert (prefix_hash, prefixtab->prefix_name, prefixtab); if (hash_err && *hash_err) goto hash_error; } } - + /* fill in lexical tables: opcode_chars, operand_chars, space_chars */ - { + { register unsigned int c; - + memset(opcode_chars, '\0', sizeof(opcode_chars)); memset(operand_chars, '\0', sizeof(operand_chars)); memset(space_chars, '\0', sizeof(space_chars)); memset(identifier_chars, '\0', sizeof(identifier_chars)); memset(digit_chars, '\0', sizeof(digit_chars)); - + for (c = 0; c < 256; c++) { if (islower(c) || isdigit(c)) { opcode_chars[c] = c; @@ -370,17 +370,17 @@ void md_begin () } else if (c == ')' || c == '(') { register_chars[c] = c; } - + if (isupper(c) || islower(c) || isdigit(c)) operand_chars[c] = c; else if (c && strchr(operand_special_chars, c)) operand_chars[c] = c; - + if (isdigit(c) || c == '-') digit_chars[c] = c; - + if (isalpha(c) || c == '_' || c == '.' || isdigit(c)) identifier_chars[c] = c; - + if (c == ' ' || c == '\t') space_chars[c] = c; } } @@ -401,7 +401,7 @@ i386_insn *x; { register template *p; int i; - + fprintf (stdout, "%s: template ", line); pte (&x->tm); fprintf (stdout, " modrm: mode %x reg %x reg/mem %x", @@ -488,7 +488,7 @@ static void pt (t) unsigned int t; { register struct type_name *ty; - + if (t == Unknown) { fprintf (stdout, "Unknown"); } else { @@ -510,22 +510,22 @@ char *line; { /* Holds temlate once we've found it. */ register template *t; - + /* Possible templates for current insn */ templates *current_templates = (templates *) 0; - + /* Initialize globals. */ memset(&i, '\0', sizeof(i)); memset(disp_expressions, '\0', sizeof(disp_expressions)); memset(im_expressions, '\0', sizeof(im_expressions)); save_stack_p = save_stack; /* reset stack pointer */ - + /* Fist parse an opcode & call i386_operand for the operands. - We assume that the scrubber has arranged it so that line[0] is the valid + We assume that the scrubber has arranged it so that line[0] is the valid start of a (possibly prefixed) opcode. */ { register char *l = line; /* Fast place to put LINE. */ - + /* 1 if operand is pending after ','. */ unsigned int expecting_operand = 0; /* 1 if we found a prefix only acceptable with string insns. */ @@ -533,7 +533,7 @@ char *line; /* Non-zero if operand parens not balenced. */ unsigned int paren_not_balenced; char * token_start = l; - + while (! is_space_char(*l) && *l != END_OF_INSN) { if (! is_opcode_char(*l)) { as_bad("invalid character %s in opcode", output_invalid(*l)); @@ -544,7 +544,7 @@ char *line; } else { /* this opcode's got a prefix */ register unsigned int q; register prefix_entry * prefix; - + if (l == token_start) { as_bad("expecting prefix; got nothing"); return; @@ -578,7 +578,7 @@ char *line; as_bad("expecting opcode; got nothing"); return; } - + /* Lookup insn in hash; try intel & att naming conventions if appropriate; that is: we only use the opcode suffix 'b' 'w' or 'l' if we need to. */ current_templates = (templates *) hash_find (op_hash, token_start); @@ -599,7 +599,7 @@ char *line; } } RESTORE_END_STRING (l); - + /* check for rep/repne without a string instruction */ if (expecting_string_instruction && ! IS_STRING_INSTRUCTION (current_templates-> @@ -607,7 +607,7 @@ char *line; as_bad("expecting string instruction after rep/repne"); return; } - + /* There may be operands to parse. */ if (*l != END_OF_INSN && /* For string instructions, we ignore any operands if given. This @@ -671,7 +671,7 @@ char *line; return; } } - + /* now *l must be either ',' or END_OF_INSN */ if (*l == ',') { if (*++l == END_OF_INSN) { /* just skip it, if it's \n complain */ @@ -682,18 +682,18 @@ char *line; } while (*l != END_OF_INSN); /* until we get end of insn */ } } - + /* Now we've parsed the opcode into a set of templates, and have the operands at hand. Next, we find a template that matches the given insn, making sure the overlap of the given operands types is consistent with the template operand types. */ - + #define MATCH(overlap,given_type) \ (overlap && \ (overlap & (JumpAbsolute|BaseIndex|Mem8)) \ == (given_type & (JumpAbsolute|BaseIndex|Mem8))) - + /* If m0 and m1 are register matches they must be consistent with the expected operand types t0 and t1. That is, if both m0 & m1 are register matches @@ -717,16 +717,16 @@ char *line; expressionS * exp; unsigned int overlap2; unsigned int found_reverse_match; - + overlap0 = overlap1 = overlap2 = found_reverse_match = 0; for (t = current_templates->start; t < current_templates->end; t++) { - + /* must have right number of operands */ if (i.operands != t->operands) continue; else if (!t->operands) break; /* 0 operands always matches */ - + overlap0 = i.types[0] & t->operand_types[0]; switch (t->operands) { case 1: @@ -739,17 +739,17 @@ char *line; ! CONSISTENT_REGISTER_MATCH(overlap0, overlap1, t->operand_types[0], t->operand_types[1])) { - + /* check if other direction is valid ... */ if (! (t->opcode_modifier & COMES_IN_BOTH_DIRECTIONS)) continue; - + /* try reversing direction of operands */ overlap0 = i.types[0] & t->operand_types[1]; overlap1 = i.types[1] & t->operand_types[0]; if (! MATCH (overlap0,i.types[0]) || ! MATCH (overlap1,i.types[1]) || - ! CONSISTENT_REGISTER_MATCH (overlap0, overlap1, + ! CONSISTENT_REGISTER_MATCH (overlap0, overlap1, t->operand_types[0], t->operand_types[1])) { /* does not match either direction */ @@ -766,7 +766,7 @@ char *line; ! CONSISTENT_REGISTER_MATCH (overlap0, overlap2, t->operand_types[0], t->operand_types[2]) || - ! CONSISTENT_REGISTER_MATCH (overlap1, overlap2, + ! CONSISTENT_REGISTER_MATCH (overlap1, overlap2, t->operand_types[1], t->operand_types[2])) continue; @@ -780,11 +780,11 @@ char *line; as_bad("operands given don't match any known 386 instruction"); return; } - + /* Copy the template we found (we may change it!). */ memcpy(&i.tm, t, sizeof(template)); t = &i.tm; /* alter new copy of template */ - + /* If there's no opcode suffix we try to invent one based on register operands. */ if (! i.suffix && i.reg_operands) { @@ -799,7 +799,7 @@ char *line; DWORD_OPCODE_SUFFIX; } } - + /* Make still unresolved immediate matches conform to size of immediate given in i.suffix. Note: overlap2 cannot be an immediate! We assume this. */ @@ -823,32 +823,32 @@ char *line; overlap1 &= (i.suffix == BYTE_OPCODE_SUFFIX ? (Imm8|Imm8S) : (i.suffix == WORD_OPCODE_SUFFIX ? Imm16 : Imm32)); } - + i.types[0] = overlap0; i.types[1] = overlap1; i.types[2] = overlap2; - + if (overlap0 & ImplicitRegister) i.reg_operands--; if (overlap1 & ImplicitRegister) i.reg_operands--; if (overlap2 & ImplicitRegister) i.reg_operands--; if (overlap0 & Imm1) i.imm_operands = 0; /* kludge for shift insns */ - + if (found_reverse_match) { unsigned int save; save = t->operand_types[0]; t->operand_types[0] = t->operand_types[1]; t->operand_types[1] = save; } - + /* Finalize opcode. First, we change the opcode based on the operand size given by i.suffix: we never have to change things for byte insns, or when no opcode suffix is need to size the operands. */ - + if (! i.suffix && (t->opcode_modifier & W)) { as_bad("no opcode suffix given and no register operands; can't size instruction"); return; } - + if (i.suffix && i.suffix != BYTE_OPCODE_SUFFIX) { /* Select between byte and word/dword operations. */ if (t->opcode_modifier & W) @@ -864,17 +864,17 @@ char *line; i.prefix[i.prefixes++] = WORD_PREFIX_OPCODE; } } - + /* For insns with operands there are more diddles to do to the opcode. */ if (i.operands) { /* If we found a reverse match we must alter the opcode direction bit found_reverse_match holds bit to set (different for int & float insns). */ - + if (found_reverse_match) { t->base_opcode |= found_reverse_match; } - + /* The imul $imm, %reg instruction is converted into imul $imm, %reg, %reg. */ @@ -882,7 +882,7 @@ char *line; i.regs[2] = i.regs[1]; /* Pretend we saw the 3 operand case. */ i.reg_operands = 2; } - + /* Certain instructions expect the destination to be in the i.rm.reg field. This is by far the exceptional case. For these instructions, if the source operand is a register, we must reverse the i.rm.reg @@ -895,7 +895,7 @@ char *line; i.regs[first_reg_operand] = i.regs[second_reg_operand]; i.regs[second_reg_operand] = tmp; } - + if (t->opcode_modifier & ShortForm) { /* The register or float register operand is in operand 0 or 1. */ unsigned int o = (i.types[0] & (Reg|FloatReg)) ? 0 : 1; @@ -925,7 +925,7 @@ char *line; be put into the modrm byte. Now, we make the modrm & index base bytes based on all the info we've collected. */ - + /* i.reg_operands MUST be the number of real register operands; implicit registers do not count. */ if (i.reg_operands == 2) { @@ -947,9 +947,9 @@ char *line; if (i.mem_operands) { unsigned int fake_zero_displacement = 0; unsigned int o = (i.types[0] & Mem) ? 0 : ((i.types[1] & Mem) ? 1 : 2); - + /* Encode memory operand into modrm byte and base index byte. */ - + if (i.base_reg == esp && ! i.index_reg) { /* <disp>(%esp) becomes two byte modrm with no index register. */ i.rm.regmem = ESCAPE_TO_TWO_BYTE_ADDRESSING; @@ -1020,12 +1020,12 @@ char *line; exp->X_add_symbol = (symbolS *) 0; exp->X_subtract_symbol = (symbolS *) 0; } - + /* Select the correct segment for the memory operand. */ if (i.seg) { unsigned int seg_index; const seg_entry *default_seg; - + if (i.rm.regmem == ESCAPE_TO_TWO_BYTE_ADDRESSING) { seg_index = (i.rm.mode<<3) | i.bi.base; default_seg = two_byte_segment_defaults[seg_index]; @@ -1045,7 +1045,7 @@ char *line; } } } - + /* Fill in i.rm.reg or i.rm.regmem field with register operand (if any) based on t->extension_opcode. Again, we must be careful to make sure that segment/control/debug/test registers are coded @@ -1059,13 +1059,13 @@ char *line; if (t->extension_opcode != None) i.rm.regmem = i.regs[o]->reg_num; else i.rm.reg = i.regs[o]->reg_num; - + /* Now, if no memory operand has set i.rm.mode = 0, 1, 2 we must set it to 3 to indicate this is a register operand int the regmem field */ if (! i.mem_operands) i.rm.mode = 3; } - + /* Fill in i.rm.reg field with extension opcode (if any). */ if (t->extension_opcode != None) i.rm.reg = t->extension_opcode; @@ -1073,21 +1073,21 @@ char *line; } } } - + /* Handle conversion of 'int $3' --> special int3 insn. */ if (t->base_opcode == INT_OPCODE && i.imms[0]->X_add_number == 3) { t->base_opcode = INT3_OPCODE; i.imm_operands = 0; } - + /* We are ready to output the insn. */ { register char * p; - + /* Output jumps. */ if (t->opcode_modifier & Jump) { int n = i.disps[0]->X_add_number; - + switch (i.disps[0]->X_seg) { case SEG_ABSOLUTE: if (fits_in_signed_byte(n)) { @@ -1145,7 +1145,7 @@ char *line; } else if (t->opcode_modifier & (JumpByte|JumpDword)) { int size = (t->opcode_modifier & JumpByte) ? 1 : 4; int n = i.disps[0]->X_add_number; - + if (fits_in_unsigned_byte(t->base_opcode)) { FRAG_APPEND_1_CHAR (t->base_opcode); } else { @@ -1154,7 +1154,7 @@ char *line; *p++ = (t->base_opcode >> 8) & 0xff; *p = t->base_opcode & 0xff; } - + p = frag_more (size); switch (i.disps[0]->X_seg) { case SEG_ABSOLUTE: @@ -1193,14 +1193,14 @@ char *line; */ int nopbytes = 0; #endif - + /* First the prefix bytes. */ for (q = i.prefix; q < i.prefix + i.prefixes; q++) { p = frag_more (1); nopbytes += 1; md_number_to_chars (p, (unsigned int) *q, 1); } - + /* Now the opcode; be careful about word order here! */ if (fits_in_unsigned_byte(t->base_opcode)) { nopbytes += 1; @@ -1224,7 +1224,7 @@ char *line; *p++ = (t->base_opcode >> 8) & 0xff; *p = (t->base_opcode ) & 0xff; } - + /* Now the modrm byte and base index byte (if present). */ if (t->opcode_modifier & Modrm) { p = frag_more (1); @@ -1240,10 +1240,10 @@ char *line; md_number_to_chars (p,(i.bi.base<<0 | i.bi.index<<3 | i.bi.scale<<6), 1); } } - + if (i.disp_operands) { register unsigned int n; - + for (n = 0; n < i.operands; n++) { if (i.disps[n]) { if (i.disps[n]->X_seg == SEG_ABSOLUTE) { @@ -1274,11 +1274,11 @@ char *line; } } } /* end displacement output */ - + /* output immediate */ if (i.imm_operands) { register unsigned int n; - + for (n = 0; n < i.operands; n++) { if (i.imms[n]) { if (i.imms[n]->X_seg == SEG_ABSOLUTE) { @@ -1317,13 +1317,13 @@ char *line; } } /* end immediate output */ } - + #ifdef DEBUG386 if (flagseen['D']) { pi (line, &i); } #endif /* DEBUG386 */ - + } return; } @@ -1335,21 +1335,21 @@ static int i386_operand (operand_string) char *operand_string; { register char *op_string = operand_string; - + /* Address of '\0' at end of operand_string. */ char * end_of_operand_string = operand_string + strlen(operand_string); - + /* Start and end of displacement string expression (if found). */ char *displacement_string_start = NULL; char *displacement_string_end = NULL; - + /* We check for an absolute prefix (differentiating, for example, 'jmp pc_relative_label' from 'jmp *absolute_label'. */ if (*op_string == ABSOLUTE_PREFIX) { op_string++; i.types[this_operand] |= JumpAbsolute; } - + /* Check if operand is a register. */ if (*op_string == REGISTER_PREFIX) { register reg_entry *r; @@ -1451,14 +1451,14 @@ char *operand_string; /* This is a memory reference of some sort. */ register char * base_string; unsigned int found_base_index_form; - + do_memory_reference: if (i.mem_operands == MAX_MEMORY_OPERANDS) { as_bad("more than 1 memory reference in instruction"); return 0; } i.mem_operands++; - + /* Determine type of memory operand from opcode_suffix; no opcode suffix implies general memory references. */ switch (i.suffix) { @@ -1472,7 +1472,7 @@ char *operand_string; default: i.types[this_operand] |= Mem32; } - + /* Check for base index form. We detect the base index form by looking for an ')' at the end of the operand, searching for the '(' matching it, and finding a REGISTER_PREFIX or ',' @@ -1492,7 +1492,7 @@ char *operand_string; if (*base_string == REGISTER_PREFIX || *base_string == ',') found_base_index_form = 1; } - + /* If we can't parse a base index register expression, we've found a pure displacement expression. We set up displacement_string_start and displacement_string_end for the code below. */ @@ -1502,15 +1502,15 @@ char *operand_string; } else { char *base_reg_name, *index_reg_name, *num_string; int num; - + i.types[this_operand] |= BaseIndex; - + /* If there is a displacement set-up for it to be parsed later. */ if (base_string != op_string + 1) { displacement_string_start = op_string; displacement_string_end = base_string - 1; } - + /* Find base register (if any). */ if (*base_string != ',') { base_reg_name = base_string++; @@ -1528,7 +1528,7 @@ char *operand_string; } RESTORE_END_STRING (base_string); } - + /* Now check seperator; must be ',' ==> index reg OR num ==> no index reg. just scale factor OR ')' ==> end. (scale factor = 1) */ @@ -1537,7 +1537,7 @@ char *operand_string; operand_string); return 0; } - + /* There may index reg here; and there may be a scale factor. */ if (*base_string == ',' && *(base_string+1) == REGISTER_PREFIX) { index_reg_name = ++base_string; @@ -1549,7 +1549,7 @@ char *operand_string; } RESTORE_END_STRING (base_string); } - + /* Check for scale factor. */ if (*base_string == ',' && isdigit(*(base_string+1))) { num_string = ++base_string; @@ -1582,7 +1582,7 @@ char *operand_string; } } } - + /* If there's an expression begining the operand, parse it, assuming displacement_string_start and displacement_string_end are meaningful. */ @@ -1689,7 +1689,7 @@ char *operand_string; goto seg_unimplemented; } } - + /* Make sure the memory operand we've been dealt is valid. */ if (i.base_reg && i.index_reg && ! (i.base_reg->reg_type & i.index_reg->reg_type & Reg)) { @@ -1740,7 +1740,7 @@ register segT segment; { register unsigned char * opcode; register int old_fr_fix; - + old_fr_fix = fragP->fr_fix; opcode = (unsigned char *) fragP->fr_opcode; /* We've already got fragP->fr_subtype right; all we have to do is check @@ -1764,7 +1764,7 @@ register segT segment; #endif NO_RELOC, (symbolS *)0); break; - + default: /* This changes the byte-displacement jump 0x7N --> the dword-displacement jump 0x0f8N */ @@ -1809,18 +1809,18 @@ register fragS * fragP; unsigned int opcode_address; unsigned int extension = 0; int displacement_from_opcode_start; - + opcode = (unsigned char *) fragP->fr_opcode; - + /* Address we want to reach in file space. */ target_address = S_GET_VALUE(fragP->fr_symbol) + fragP->fr_offset; - + /* Address opcode resides at in file space. */ opcode_address = fragP->fr_address + fragP->fr_fix; - + /* Displacement from opcode start to fill into instruction. */ displacement_from_opcode_start = target_address - opcode_address; - + switch (fragP->fr_subtype) { case ENCODE_RELAX_STATE (COND_JUMP, BYTE): case ENCODE_RELAX_STATE (UNCOND_JUMP, BYTE): @@ -1828,7 +1828,7 @@ register fragS * fragP; extension = 1; /* 1 opcode + 1 displacement */ where_to_put_displacement = &opcode[1]; break; - + case ENCODE_RELAX_STATE (COND_JUMP, WORD): opcode[1] = TWO_BYTE_OPCODE_ESCAPE; opcode[2] = opcode[0] + 0x10; @@ -1836,27 +1836,27 @@ register fragS * fragP; extension = 4; /* 3 opcode + 2 displacement */ where_to_put_displacement = &opcode[3]; break; - + case ENCODE_RELAX_STATE (UNCOND_JUMP, WORD): opcode[1] = 0xe9; opcode[0] = WORD_PREFIX_OPCODE; extension = 3; /* 2 opcode + 2 displacement */ where_to_put_displacement = &opcode[2]; break; - + case ENCODE_RELAX_STATE (COND_JUMP, DWORD): opcode[1] = opcode[0] + 0x10; opcode[0] = TWO_BYTE_OPCODE_ESCAPE; extension = 5; /* 2 opcode + 4 displacement */ where_to_put_displacement = &opcode[2]; break; - + case ENCODE_RELAX_STATE (UNCOND_JUMP, DWORD): opcode[0] = 0xe9; extension = 4; /* 1 opcode + 4 displacement */ where_to_put_displacement = &opcode[1]; break; - + default: BAD_CASE(fragP->fr_subtype); break; @@ -1880,7 +1880,7 @@ fragS *frag; symbolS *to_symbol; { long offset; - + offset = to_addr - (from_addr + 2); md_number_to_chars (ptr, (long) 0xeb, 1); /* opcode for byte-disp jump */ md_number_to_chars (ptr + 1, offset, 1); @@ -1893,7 +1893,7 @@ fragS *frag; symbolS *to_symbol; { long offset; - + if (flagseen['m']) { offset = to_addr - S_GET_VALUE(to_symbol); md_number_to_chars (ptr, 0xe9, 1); /* opcode for long jmp */ @@ -1944,7 +1944,7 @@ long value; /* The value of the bits. */ int nbytes; /* Number of bytes in the output. */ { register char * p = con; - + switch (nbytes) { case 1: p[0] = value & 0xff; @@ -1966,8 +1966,8 @@ int nbytes; /* Number of bytes in the output. */ /* Apply a fixup (fixS) to segment data, once it has been determined - by our caller that we have all the info we need to fix it up. - + by our caller that we have all the info we need to fix it up. + On the 386, immediates, displacements, and data pointers are all in the same (little-endian) format, so we don't need to care about which we are handling. */ @@ -1978,7 +1978,7 @@ fixS * fixP; /* The fix we're to put in */ long value; /* The value of the bits. */ { register char * p = fixP->fx_where + fixP->fx_frag->fr_literal; - + switch (fixP->fx_size) { case 1: *p = value; @@ -2012,7 +2012,7 @@ int nbytes; /* Number of bytes in the input. */ return retval; } -/* Not needed for coff since relocation structure does not +/* Not needed for coff since relocation structure does not contain bitfields. */ #if defined(OBJ_AOUT) | defined(OBJ_BOUT) #ifdef comment @@ -2028,8 +2028,8 @@ struct reloc_info_generic *ri; the_bytes[6] = (ri->r_symbolnum >> 16) & 0x0ff; the_bytes[5] = (ri->r_symbolnum >> 8) & 0x0ff; the_bytes[4] = ri->r_symbolnum & 0x0ff; - the_bytes[7] = (((ri->r_extern << 3) & 0x08) | ((ri->r_length << 1) & 0x06) | - ((ri->r_pcrel << 0) & 0x01)) & 0x0F; + the_bytes[7] = (((ri->r_extern << 3) & 0x08) | ((ri->r_length << 1) & 0x06) | + ((ri->r_pcrel << 0) & 0x01)) & 0x0F; } #endif /* comment */ @@ -2042,20 +2042,20 @@ relax_addressT segment_address_in_file; * In: length of relocation (or of address) in chars: 1, 2 or 4. * Out: GNU LD relocation length code: 0, 1, or 2. */ - + static unsigned char nbytes_r_length[] = { 42, 0, 1, 42, 2 }; long r_symbolnum; - + know(fixP->fx_addsy != NULL); - + md_number_to_chars(where, fixP->fx_frag->fr_address + fixP->fx_where - segment_address_in_file, 4); - + r_symbolnum = (S_IS_DEFINED(fixP->fx_addsy) ? S_GET_TYPE(fixP->fx_addsy) : fixP->fx_addsy->sy_number); - + #ifdef PIC { int extra_bits = 0; @@ -2113,7 +2113,7 @@ relax_addressT segment_address_in_file; | ((nbytes_r_length[fixP->fx_size] << 1) & 0x06) | (((fixP->fx_pcrel << 0) & 0x01) & 0x0f)); #endif - + return; } /* tc_aout_fix_to_chars() */ @@ -2136,23 +2136,23 @@ int *sizeP; LITTLENUM_TYPE words[MAX_LITTLENUMS]; LITTLENUM_TYPE *wordP; char *t; - + switch (type) { case 'f': case 'F': prec = 2; break; - + case 'd': case 'D': prec = 4; break; - + case 'x': case 'X': prec = 5; break; - + default: *sizeP=0; return "Bad call to md_atof ()"; @@ -2160,7 +2160,7 @@ int *sizeP; t = atof_ieee (input_line_pointer,type,words); if (t) input_line_pointer=t; - + *sizeP = prec * sizeof(LITTLENUM_TYPE); /* this loops outputs the LITTLENUMs in REVERSE order; in accord with the bigendian 386 */ @@ -2187,7 +2187,7 @@ char *reg_string; /* reg_string starts *before* REGISTER_PREFIX */ register char *s = reg_string; register char *p; char reg_name_given[MAX_REG_NAME_SIZE]; - + s++; /* skip REGISTER_PREFIX */ for (p = reg_name_given; is_register_char (*s); p++, s++) { *p = register_chars[*s]; @@ -2219,7 +2219,7 @@ char *name; return 0; } -/* Parse an operand that is machine-specific. +/* Parse an operand that is machine-specific. We just return without modifying the expression if we have nothing to do. */ @@ -2328,7 +2328,7 @@ static void s_bss() subseg_new (SEG_BSS, (subsegT)temp); demand_empty_rest_of_line(); } - + /* * Local Variables: * comment-column: 0 diff --git a/gnu/usr.bin/as/config/tc-i386.h b/gnu/usr.bin/as/config/tc-i386.h index 1369d2b..fd4d335 100644 --- a/gnu/usr.bin/as/config/tc-i386.h +++ b/gnu/usr.bin/as/config/tc-i386.h @@ -1,24 +1,24 @@ /* tc-i386.h -- Header file for tc-i386.c Copyright (C) 1989, 1992 Free Software Foundation. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: tc-i386.h,v 1.1 1993/11/03 00:54:25 paul Exp $ + * $Id: tc-i386.h,v 1.2 1994/12/23 22:37:36 nate Exp $ */ #ifndef TC_I386 @@ -62,19 +62,19 @@ /* register numbers */ #define EBP_REG_NUM 5 #define ESP_REG_NUM 4 - + /* modrm_byte.regmem for twobyte escape */ #define ESCAPE_TO_TWO_BYTE_ADDRESSING ESP_REG_NUM /* index_base_byte.index for no index register addressing */ #define NO_INDEX_REGISTER ESP_REG_NUM /* index_base_byte.base for no base register addressing */ #define NO_BASE_REGISTER EBP_REG_NUM - + /* these are the att as opcode suffixes, making movl --> mov, for example */ #define DWORD_OPCODE_SUFFIX 'l' #define WORD_OPCODE_SUFFIX 'w' #define BYTE_OPCODE_SUFFIX 'b' - + /* modrm.mode = REGMEM_FIELD_HAS_REG when a register is in there */ #define REGMEM_FIELD_HAS_REG 0x3 /* always = 0x3 */ #define REGMEM_FIELD_HAS_MEM (~REGMEM_FIELD_HAS_REG) @@ -145,23 +145,23 @@ typedef struct { /* instruction name sans width suffix ("mov" for movl insns) */ char *name; - + /* how many operands */ unsigned int operands; - + /* base_opcode is the fundamental opcode byte with a optional prefix(es). */ unsigned int base_opcode; - + /* extension_opcode is the 3 bit extension for group <n> insns. If this template has no extension opcode (the usual case) use None */ unsigned char extension_opcode; #define None 0xff /* If no extension_opcode is possible. */ - + /* the bits in opcode_modifier are used to generate the final opcode from the base_opcode. These bits also are used to detect alternate forms of the same instruction */ unsigned int opcode_modifier; - + /* opcode_modifier bits: */ #define W 0x1 /* set if operands are words or dwords */ #define D 0x2 /* D = 0 if Reg --> Regmem; D = 1 if Regmem --> Reg */ @@ -183,18 +183,18 @@ typedef struct { #define JumpByte 0x4000 #define JumpDword 0x8000 #define ReverseRegRegmem 0x10000 - + /* (opcode_modifier & COMES_IN_ALL_SIZES) is true if the instuction comes in byte, word, and dword sizes and is encoded into machine code in the canonical way. */ #define COMES_IN_ALL_SIZES (W) - + /* (opcode_modifier & COMES_IN_BOTH_DIRECTIONS) indicates that the source and destination operands can be reversed by setting either the D (for integer insns) or the FloatD (for floating insns) bit in base_opcode. */ #define COMES_IN_BOTH_DIRECTIONS (D|FloatD) - + /* operand_types[i] describes the type of operand i. This is made by OR'ing together all of the possible type masks. (e.g. 'operand_types[i] = Reg|Imm' specifies that operand i can be diff --git a/gnu/usr.bin/as/config/tc-i860.c b/gnu/usr.bin/as/config/tc-i860.c index 0123138..4907990 100644 --- a/gnu/usr.bin/as/config/tc-i860.c +++ b/gnu/usr.bin/as/config/tc-i860.c @@ -1,18 +1,18 @@ /* tc-i860.c -- Assemble for the I860 Copyright (C) 1989, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -173,11 +173,11 @@ void register char *retval = NULL; int lose = 0; register unsigned int i = 0; - + op_hash = hash_new(); if (op_hash == NULL) as_fatal("Virtual memory exhausted"); - + while (i < NUMOPCODES) { const char *name = i860_opcodes[i].name; @@ -200,10 +200,10 @@ void } while (i < NUMOPCODES && !strcmp(i860_opcodes[i].name, name)); } - + if (lose) as_fatal("Broken assembler. No assembly attempted."); - + for (i = '0'; i < '8'; ++i) octal[i] = 1; for (i = '0'; i <= '9'; ++i) @@ -229,21 +229,21 @@ char *str; int no_opcodes = 1; int i; struct i860_it pseudo[3]; - + assert(str); i860_ip(str); - + /* check for expandable flag to produce pseudo-instructions */ if (the_insn.expand != 0 && the_insn.highlow == NO_SPEC) { for (i = 0; i < 3; i++) pseudo[i] = the_insn; - + switch (the_insn.expand) { - + case E_DELAY: no_opcodes = 1; break; - + case E_MOV: if (the_insn.exp.X_add_symbol == NULL && the_insn.exp.X_subtract_symbol == NULL && @@ -259,7 +259,7 @@ char *str; pseudo[1].highlow = HIGH; no_opcodes = 2; break; - + case E_ADDR: if (the_insn.exp.X_add_symbol == NULL && the_insn.exp.X_subtract_symbol == NULL) @@ -273,7 +273,7 @@ char *str; pseudo[1].highlow = PAIR; no_opcodes = 2; break; - + case E_U32: /* 2nd version emulates Intel as, not doc. */ if (the_insn.exp.X_add_symbol == NULL && the_insn.exp.X_subtract_symbol == NULL && @@ -295,7 +295,7 @@ char *str; pseudo[1].highlow = PAIR; no_opcodes = 2; break; - + case E_AND: /* 2nd version emulates Intel as, not doc. */ if (the_insn.exp.X_add_symbol == NULL && the_insn.exp.X_subtract_symbol == NULL && @@ -319,7 +319,7 @@ char *str; pseudo[1].exp.X_add_number = -1 - the_insn.exp.X_add_number; no_opcodes = 2; break; - + case E_S32: if (the_insn.exp.X_add_symbol == NULL && the_insn.exp.X_subtract_symbol == NULL && @@ -337,11 +337,11 @@ char *str; pseudo[2].reloc = NO_RELOC; no_opcodes = 3; break; - + default: as_fatal("failed sanity check."); } - + the_insn = pseudo[0]; /* check for expanded opcode after branch or in dual */ if (no_opcodes > 1 && last_expand == 1) @@ -349,16 +349,16 @@ char *str; if (no_opcodes > 1 && dual_mode != DUAL_OFF) as_warn("Expanded opcode in dual mode: `%s'", str); } - + i = 0; do { /* always produce at least one opcode */ toP = frag_more(4); /* put out the opcode */ md_number_to_chars(toP, the_insn.opcode, 4); - + /* check for expanded opcode after branch or in dual */ last_expand = the_insn.pcrel; - + /* put out the symbol-dependent stuff */ if (the_insn.reloc != NO_RELOC) { fix_new(frag_now, /* which frag */ @@ -373,7 +373,7 @@ char *str; } the_insn = pseudo[++i]; } while (--no_opcodes > 0); - + } static void @@ -390,29 +390,29 @@ char *str; unsigned int mask; int match = 0; int comma = 0; - - + + for (s = str; islower(*s) || *s == '.' || *s == '3'; ++s) ; switch (*s) { - + case '\0': break; - + case ',': comma = 1; - + /*FALLTHROUGH*/ - + case ' ': *s++ = '\0'; break; - + default: as_bad("Unknown opcode: `%s'", str); exit(1); } - + if (strncmp(str, "d.", 2) == 0) { /* check for d. opcode prefix */ if (dual_mode == DUAL_ON) dual_mode = DUAL_ONDDOT; @@ -420,7 +420,7 @@ char *str; dual_mode = DUAL_DDOT; str += 2; } - + if ((insn = (struct i860_opcode *) hash_find(op_hash, str)) == NULL) { if (dual_mode == DUAL_DDOT || dual_mode == DUAL_ONDDOT) str -= 2; @@ -435,20 +435,20 @@ char *str; opcode = insn->match; memset(&the_insn, '\0', sizeof(the_insn)); the_insn.reloc = NO_RELOC; - + /* * Build the opcode, checking as we go to make * sure that the operands match */ for (args = insn->args; ; ++args) { switch (*args) { - + case '\0': /* end of args */ if (*s == '\0') { match = 1; } break; - + case '+': case '(': /* these must match exactly */ case ')': @@ -457,7 +457,7 @@ char *str; if (*s++ == *args) continue; break; - + case '#': /* must be at least one digit */ if (isdigit(*s++)) { while (isdigit(*s)) { @@ -466,12 +466,12 @@ char *str; continue; } break; - + case '1': /* next operand must be a register */ case '2': case 'd': switch (*s) { - + case 'f': /* frame pointer */ s++; if (*s++ == 'p') { @@ -479,7 +479,7 @@ char *str; break; } goto error; - + case 's': /* stack pointer */ s++; if (*s++ == 'p') { @@ -487,7 +487,7 @@ char *str; break; } goto error; - + case 'r': /* any register */ s++; if (!isdigit(c = *s++)) { @@ -502,7 +502,7 @@ char *str; } mask= c; break; - + default: /* not this opcode */ goto error; } @@ -511,22 +511,22 @@ char *str; * it goes in the opcode. */ switch (*args) { - + case '1': opcode |= mask << 11; continue; - + case '2': opcode |= mask << 21; continue; - + case 'd': opcode |= mask << 16; continue; - + } break; - + case 'e': /* next operand is a floating point register */ case 'f': case 'g': @@ -541,15 +541,15 @@ char *str; mask -= '0'; } switch (*args) { - + case 'e': opcode |= mask << 11; continue; - + case 'f': opcode |= mask << 21; continue; - + case 'g': opcode |= mask << 16; if (dual_mode != DUAL_OFF) @@ -564,7 +564,7 @@ char *str; } } break; - + case 'c': /* next operand must be a control register */ if (strncmp(s, "fir", 3) == 0) { opcode |= 0x0 << 21; @@ -597,7 +597,7 @@ char *str; continue; } break; - + case '5': /* 5 bit immediate in src1 */ memset(&the_insn, '\0', sizeof(the_insn)); if ( !getExpression(s)) { @@ -610,18 +610,18 @@ char *str; continue; } break; - + case 'l': /* 26 bit immediate, relative branch */ the_insn.reloc = BRADDR; the_insn.pcrel = 1; goto immediate; - + case 's': /* 16 bit immediate, split relative branch */ /* upper 5 bits of offset in dest field */ the_insn.pcrel = 1; the_insn.reloc = SPLIT0; goto immediate; - + case 'S': /* 16 bit immediate, split (st), aligned */ if (opcode & (1 << 28)) if (opcode & 0x1) @@ -631,7 +631,7 @@ char *str; else the_insn.reloc = SPLIT0; goto immediate; - + case 'I': /* 16 bit immediate, aligned */ if (opcode & (1 << 28)) if (opcode & 0x1) @@ -641,12 +641,12 @@ char *str; else the_insn.reloc = LOW0; goto immediate; - + case 'i': /* 16 bit immediate */ the_insn.reloc = LOW0; - + /*FALLTHROUGH*/ - + immediate: if (*s == ' ') s++; @@ -660,19 +660,19 @@ char *str; the_insn.highlow = PAIR; s += 2; } - the_insn.expand = insn->expand; - + the_insn.expand = insn->expand; + /* Note that if the getExpression() fails, we will still have created U entries in the symbol table for the 'symbols' in the input string. Try not to create U symbols for registers, etc. */ - + if ( !getExpression(s)) { s = expr_end; continue; } break; - + default: as_fatal("failed sanity check."); } @@ -697,7 +697,7 @@ char *str; } break; } - + the_insn.opcode = opcode; return; } @@ -708,11 +708,11 @@ char *str; { char *save_in; segT seg; - + save_in = input_line_pointer; input_line_pointer = str; switch (seg = expression(&the_insn.exp)) { - + case SEG_ABSOLUTE: case SEG_TEXT: case SEG_DATA: @@ -722,7 +722,7 @@ char *str; case SEG_BIG: case SEG_ABSENT: break; - + default: the_insn.error = "bad segment"; expr_end = input_line_pointer; @@ -738,7 +738,7 @@ char *str; /* This is identical to the md_atof in m68k.c. I think this is right, but I'm not sure. - + Turn a string in input_line_pointer into a floating point constant of type type, and store the appropriate bytes in *litP. The number of LITTLENUMS emitted is stored in *sizeP. An error message is returned, or NULL on OK. @@ -758,33 +758,33 @@ int *sizeP; LITTLENUM_TYPE *wordP; char *t; char *atof_ieee(); - + switch (type) { - + case 'f': case 'F': case 's': case 'S': prec = 2; break; - + case 'd': case 'D': case 'r': case 'R': prec = 4; break; - + case 'x': case 'X': prec = 6; break; - + case 'p': case 'P': prec = 6; break; - + default: *sizeP=0; return "Bad call to MD_ATOF()"; @@ -810,7 +810,7 @@ long val; int n; { switch (n) { - + case 4: *buf++ = val >> 24; *buf++ = val >> 16; @@ -819,7 +819,7 @@ int n; case 1: *buf = val; break; - + default: as_fatal("failed sanity check."); } @@ -834,37 +834,37 @@ fixS *fixP; { enum reloc_type reloc = fixP->fx_r_type & 0xf; enum highlow_type highlow = (fixP->fx_r_type >> 4) & 0x3; - + assert(buf); assert(n == 4); /* always on i860 */ - + switch (highlow) { - + case HIGHADJ: /* adjusts the high-order 16-bits */ if (val & (1 << 15)) val += (1 << 16); - + /*FALLTHROUGH*/ - + case HIGH: /* selects the high-order 16-bits */ val >>= 16; break; - + case PAIR: /* selects the low-order 16-bits */ val = val & 0xffff; break; - + default: break; } - + switch (reloc) { - + case BRADDR: /* br, call, bc, bc.t, bnc, bnc.t w/26-bit immediate */ if (fixP->fx_pcrel != 1) as_bad("26-bit branch w/o pc relative set: 0x%08x", val); val >>= 2; /* align pcrel offset, see manual */ - + if (val >= (1 << 25) || val < -(1 << 25)) /* check for overflow */ as_bad("26-bit branch offset overflow: 0x%08x", val); buf[0] = (buf[0] & 0xfc) | ((val >> 24) & 0x3); @@ -872,7 +872,7 @@ fixS *fixP; buf[2] = val >> 8; buf[3] = val; break; - + case SPLIT2: /* 16 bit immediate, 4-byte aligned */ if (val & 0x3) as_bad("16-bit immediate 4-byte alignment error: 0x%08x", val); @@ -891,9 +891,9 @@ fixS *fixP; as_bad("16-bit branch offset overflow: 0x%08x", val); buf[1] = (buf[1] & ~0x1f) | ((val >> 11) & 0x1f); buf[2] = (buf[2] & ~0x7) | ((val >> 8) & 0x7); - buf[3] |= val; /* perserve bottom opcode bits */ + buf[3] |= val; /* perserve bottom opcode bits */ break; - + case LOW4: /* fld,pfld,pst,flush 16-byte aligned */ if (val & 0xf) as_bad("16-bit immediate 16-byte alignment error: 0x%08x", val); @@ -919,9 +919,9 @@ fixS *fixP; if (highlow != PAIR && (val >= (1 << 16) || val < -(1 << 15))) as_bad("16-bit immediate overflow: 0x%08x", val); buf[2] = val >> 8; - buf[3] |= val; /* perserve bottom opcode bits */ + buf[3] |= val; /* perserve bottom opcode bits */ break; - + case RELOC_32: md_number_to_chars(buf, val, 4); break; @@ -965,7 +965,7 @@ void *fix; as_fatal("i860_number_to_field\n"); } -/* the bit-field entries in the relocation_info struct plays hell +/* the bit-field entries in the relocation_info struct plays hell with the byte-order problems of cross-assembly. So as a hack, I added this mach. dependent ri twiddler. Ugly, but it gets you there. -KWK */ @@ -980,7 +980,7 @@ struct relocation_info *ri_p, ri; { #if 0 unsigned char the_bytes[sizeof(*ri_p)]; - + /* this is easy */ md_number_to_chars(the_bytes, ri.r_address, sizeof(ri.r_address)); /* now the fun stuff */ @@ -1030,22 +1030,22 @@ segT segtype; /* for debugging only, must match enum reloc_type */ static char *Reloc[] = { "NO_RELOC", - "BRADDR", - "LOW0", - "LOW1", - "LOW2", - "LOW3", - "LOW4", - "SPLIT0", - "SPLIT1", - "SPLIT2", - "RELOC_32", + "BRADDR", + "LOW0", + "LOW1", + "LOW2", + "LOW3", + "LOW4", + "SPLIT0", + "SPLIT1", + "SPLIT2", + "RELOC_32", }; static char *Highlow[] = { "NO_SPEC", - "PAIR", - "HIGH", - "HIGHADJ", + "PAIR", + "HIGH", + "HIGHADJ", }; static void @@ -1062,11 +1062,11 @@ struct i860_it *insn; fprintf(stderr, "exp = {\n"); fprintf(stderr, "\t\tX_add_symbol = %s\n", insn->exp.X_add_symbol ? - (S_GET_NAME(insn->exp.X_add_symbol) ? + (S_GET_NAME(insn->exp.X_add_symbol) ? S_GET_NAME(insn->exp.X_add_symbol) : "???") : "0"); fprintf(stderr, "\t\tX_sub_symbol = %s\n", insn->exp.X_subtract_symbol ? - (S_GET_NAME(insn->exp.X_subtract_symbol) ? + (S_GET_NAME(insn->exp.X_subtract_symbol) ? S_GET_NAME(insn->exp.X_subtract_symbol) : "???") : "0"); fprintf(stderr, "\t\tX_add_number = %d\n", insn->exp.X_add_number); @@ -1098,16 +1098,16 @@ relax_addressT segment_address_in_file; register symbolS *symbolP; extern char *next_object_file_charP; long add_number; - + memset((char *) &ri, '\0', sizeof(ri)); for (; fixP; fixP = fixP->fx_next) { - + if (fixP->fx_r_type & ~0x3f) { as_fatal("fixP->fx_r_type = %d\n", fixP->fx_r_type); } ri.r_pcrel = fixP->fx_pcrel; ri.r_type = fixP->fx_r_type; - + if ((symbolP = fixP->fx_addsy) != NULL) { ri.r_address = fixP->fx_frag->fr_address + fixP->fx_where - segment_address_in_file; @@ -1128,7 +1128,7 @@ relax_addressT segment_address_in_file; } else { ri.r_addend = fixP->fx_addnumber; } - + md_ri_to_chars((char *) &ri, ri); append(&next_object_file_charP, (char *)& ri, sizeof(ri)); } @@ -1168,7 +1168,7 @@ relax_addressT segment_address_in_file; long r_extern; long r_addend = 0; long r_address; - + know(fixP->fx_addsy); know(!(fixP->fx_r_type & ~0x3f)); @@ -1179,22 +1179,22 @@ relax_addressT segment_address_in_file; r_extern = 0; r_index = S_GET_TYPE(fixP->fx_addsy); } - + md_number_to_chars(where, r_address = fixP->fx_frag->fr_address + fixP->fx_where - segment_address_in_file, 4); - + where[4] = (r_index >> 16) & 0x0ff; where[5] = (r_index >> 8) & 0x0ff; where[6] = r_index & 0x0ff; where[7] = (((fixP->fx_pcrel << 7) & 0x80) | ((r_extern << 6) & 0x40) | (fixP->fx_r_type & 0x3F)); - + if (fixP->fx_addsy->sy_frag) { r_addend = fixP->fx_addsy->sy_frag->fr_address; } - + if (fixP->fx_pcrel) { /* preserve actual offset vs. pc + 4 */ r_addend -= (r_address + 4); @@ -1209,7 +1209,7 @@ relax_addressT segment_address_in_file; #endif /* OBJ_AOUT */ -/* Parse an operand that is machine-specific. +/* Parse an operand that is machine-specific. We just return without modifying the expression if we have nothing to do. */ @@ -1259,7 +1259,7 @@ long val; /* fixme-soon: looks to me like i860 never has bit fixes. Let's see. xoxorich. */ know(fixP->fx_bit_fixP == NULL); if (!fixP->fx_bit_fixP) { - + /* fixme-soon: also looks like fx_im_disp is always 0. Let's see. xoxorich. */ know(fixP->fx_im_disp == 0); switch (fixP->fx_im_disp) { @@ -1281,7 +1281,7 @@ long val; } else { md_number_to_field(place, val, fixP->fx_bit_fixP); } - + return; } /* md_apply_fix() */ diff --git a/gnu/usr.bin/as/config/tc-i960.c b/gnu/usr.bin/as/config/tc-i960.c index 8f9091c..37089c3 100644 --- a/gnu/usr.bin/as/config/tc-i960.c +++ b/gnu/usr.bin/as/config/tc-i960.c @@ -1,18 +1,18 @@ /* tc-i960.c - All the i80960-specific stuff Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -188,15 +188,15 @@ const relax_typeS const pseudo_typeS md_pseudo_table[] = { - + { "bss", s_lcomm, 1 }, { "extended", float_cons, 't' }, { "leafproc", parse_po, S_LEAFPROC }, { "sysproc", parse_po, S_SYSPROC }, - + { "word", cons, 4 }, { "quad", big_cons, 16 }, - + { 0, 0, 0 } }; @@ -205,14 +205,14 @@ const pseudo_typeS #define subs(e) e.X_subtract_symbol #define offs(e) e.X_add_number #define segs(e) e.X_seg - - + + /* Branch-prediction bits for CTRL/COBR format opcodes */ #define BP_MASK 0x00000002 /* Mask for branch-prediction bit */ #define BP_TAKEN 0x00000000 /* Value to OR in to predict branch */ #define BP_NOT_TAKEN 0x00000002 /* Value to OR in to predict no branch */ - - + + /* Some instruction opcodes that we need explicitly */ #define BE 0x12000000 #define BG 0x11000000 @@ -225,24 +225,24 @@ const pseudo_typeS #define CHKBIT 0x5a002700 #define CMPI 0x5a002080 #define CMPO 0x5a002000 - + #define B 0x08000000 #define BAL 0x0b000000 #define CALL 0x09000000 #define CALLS 0x66003800 #define RET 0x0a000000 - - + + /* These masks are used to build up a set of MEMB mode bits. */ #define A_BIT 0x0400 #define I_BIT 0x0800 #define MEMB_BIT 0x1000 #define D_BIT 0x2000 - - + + /* Mask for the only mode bit in a MEMA instruction (if set, abase reg is used) */ #define MEMA_ABASE 0x2000 - + /* Info from which a MEMA or MEMB format instruction can be generated */ typedef struct { long opcode; /* (First) 32 bits of instruction */ @@ -274,12 +274,12 @@ static struct { { "g4", 20 }, { "g5", 21 }, { "g6", 22 }, { "g7", 23 }, { "g8", 24 }, { "g9", 25 }, { "g10", 26 }, { "g11", 27 }, { "g12", 28 }, { "g13", 29 }, { "g14", 30 }, { "fp", 31 }, - + /* Numbers for special-function registers are for assembler internal * use only: they are scaled back to range [0-31] for binary output. */ # define SF0 32 - + { "sf0", 32 }, { "sf1", 33 }, { "sf2", 34 }, { "sf3", 35 }, { "sf4", 36 }, { "sf5", 37 }, { "sf6", 38 }, { "sf7", 39 }, { "sf8", 40 }, { "sf9", 41 }, { "sf10",42 }, { "sf11",43 }, @@ -288,14 +288,14 @@ static struct { { "sf20",52 }, { "sf21",53 }, { "sf22",54 }, { "sf23",55 }, { "sf24",56 }, { "sf25",57 }, { "sf26",58 }, { "sf27",59 }, { "sf28",60 }, { "sf29",61 }, { "sf30",62 }, { "sf31",63 }, - + /* Numbers for floating point registers are for assembler internal use * only: they are scaled back to [0-3] for binary output. */ # define FP0 64 - + { "fp0", 64 }, { "fp1", 65 }, { "fp2", 66 }, { "fp3", 67 }, - + { NULL, 0 }, /* END OF LIST */ }; @@ -318,13 +318,13 @@ static struct { { "(g4)", 20 }, { "(g5)", 21 }, { "(g6)", 22 }, { "(g7)", 23 }, { "(g8)", 24 }, { "(g9)", 25 }, { "(g10)", 26 }, { "(g11)", 27 }, { "(g12)", 28 }, { "(g13)", 29 }, { "(g14)", 30 }, { "(fp)", 31 }, - + # define IPREL 32 /* for assembler internal use only: this number never appears in binary * output. */ { "(ip)", IPREL }, - + { NULL, 0 }, /* END OF LIST */ }; @@ -417,32 +417,32 @@ void int i; /* Loop counter */ const struct i960_opcode *oP; /* Pointer into opcode table */ char *retval; /* Value returned by hash functions */ - + if (((op_hash = hash_new()) == 0) || ((reg_hash = hash_new()) == 0) || ((areg_hash = hash_new()) == 0)) { as_fatal("virtual memory exceeded"); } - + retval = ""; /* For some reason, the base assembler uses an empty * string for "no error message", instead of a NULL * pointer. */ - + for (oP=i960_opcodes; oP->name && !*retval; oP++) { retval = hash_insert(op_hash, oP->name, oP); } - + for (i=0; regnames[i].reg_name && !*retval; i++) { retval = hash_insert(reg_hash, regnames[i].reg_name, ®names[i].reg_num); } - + for (i=0; aregs[i].areg_name && !*retval; i++){ retval = hash_insert(areg_hash, aregs[i].areg_name, &aregs[i].areg_num); } - + if (*retval) { as_fatal("Hashing returned \"%s\".", retval); } @@ -479,7 +479,7 @@ char *textP; /* Source text of instruction */ * replaced by decimal numbers */ int n_ops; /* Number of instruction operands */ - + struct i960_opcode *oP; /* Pointer to instruction description */ int branch_predict; @@ -491,17 +491,17 @@ char *textP; /* Source text of instruction */ * instructions. */ int n; /* Offset of last character in opcode mnemonic */ - + static const char bp_error_msg[] = "branch prediction invalid on this opcode"; - - + + /* Parse instruction into opcode and operands */ memset(args, '\0', sizeof(args)); n_ops = i_scan(textP, args); if (n_ops == -1){ return; /* Error message already issued */ } - + /* Do "macro substitution" (sort of) on 'ldconst' pseudo-instruction */ if (!strcmp(args[0],"ldconst")){ n_ops = parse_ldconst(args); @@ -509,7 +509,7 @@ char *textP; /* Source text of instruction */ return; } } - + /* Check for branch-prediction suffix on opcode mnemonic, strip it off */ n = strlen(args[0]) - 1; branch_predict = 0; @@ -523,7 +523,7 @@ char *textP; /* Source text of instruction */ bp_bits = (args[0][n] == 't') ? BP_TAKEN : BP_NOT_TAKEN; args[0][n-1] = '\0'; /* Strip suffix from opcode mnemonic */ } - + /* Look up opcode mnemonic in table and check number of operands. * Check that opcode is legal for the target architecture. * If all looks good, assemble instruction. @@ -531,10 +531,10 @@ char *textP; /* Source text of instruction */ oP = (struct i960_opcode *) hash_find(op_hash, args[0]); if (!oP || !targ_has_iclass(oP->iclass)) { as_bad("invalid opcode, \"%s\".", args[0]); - + } else if (n_ops != oP->num_ops) { as_bad("improper number of operands. expecting %d, got %d", oP->num_ops, n_ops); - + } else { switch (oP->format){ case FBRA: @@ -599,12 +599,12 @@ int n; /* Number of bytes to output (significant bytes *buf++ = value; value >>= 8; } - + /* XXX line number probably botched for this warning message. */ if (value != 0 && value != -1){ as_bad("Displacement too long for instruction field length."); } - + return; } /* md_number_to_chars() */ @@ -618,7 +618,7 @@ unsigned char *val; /* Value in target byte order */ int n; /* Number of bytes in the input */ { int retval; - + for (retval=0; n--;){ retval <<= 8; retval |= val[n]; @@ -652,47 +652,47 @@ int *sizeP; int prec; char *t; char *atof_ieee(); - + switch (type) { case 'f': case 'F': prec = 2; break; - + case 'd': case 'D': prec = 4; break; - + case 't': case 'T': prec = 5; type = 'x'; /* That's what atof_ieee() understands */ break; - + default: *sizeP=0; return "Bad call to md_atof()"; } - + t = atof_ieee(input_line_pointer, type, words); if (t){ input_line_pointer = t; } - + *sizeP = prec * LNUM_SIZE; - + /* Output the LITTLENUMs in REVERSE order in accord with i80960 * word-order. (Dunno why atof_ieee doesn't do it in the right * order in the first place -- probably because it's a hack of * atof_m68k.) */ - + for (wordP = words + prec - 1; prec--;){ md_number_to_chars(litP, (long) (*wordP--), LNUM_SIZE); litP += sizeof(LITTLENUM_TYPE); } - + return ""; /* Someone should teach Dean about null pointers */ } @@ -740,11 +740,11 @@ bit_fixS *bfixP; /* Description of bit field to be fixed up */ int numbits; /* Length of bit field to be fixed */ long instr; /* 32-bit instruction to be fixed-up */ long sign; /* 0 or -1, according to sign bit of 'val' */ - + /* Convert instruction back to host byte order */ instr = md_chars_to_number(instrP, 4); - + /* Surprise! -- we stored the number of bits * to be modified rather than a pointer to a structure. */ @@ -753,9 +753,9 @@ bit_fixS *bfixP; /* Description of bit field to be fixed up */ /* This is a no-op, stuck here by reloc_callj() */ return; } - + know ((numbits == 13) || (numbits == 24)); - + /* Propagate sign bit of 'val' for the given number of bits. * Result should be all 0 or all 1 */ @@ -833,22 +833,22 @@ char ***vecP; NULL, 0 }; struct tabentry *tp; - + if (!strcmp(*argP,"norelax")){ norelax = 1; - + } else if (**argP == 'b'){ instrument_branches = 1; - + } else if (**argP == 'A'){ p = (*argP) + 1; - + for (tp = arch_tab; tp->flag != NULL; tp++){ if (!strcmp(p,tp->flag)){ break; } } - + if (tp->flag == NULL){ as_bad("unknown architecture: %s", p); } else { @@ -882,7 +882,7 @@ object_headers *headers; fragS * fragP; { fixS *fixP; /* Structure describing needed address fix */ - + switch (fragP->fr_subtype){ case 1: /* LEAVE SINGLE COBR INSTRUCTION */ @@ -894,7 +894,7 @@ fragS * fragP; fragP->fr_offset, 1, 0); - + fixP->fx_bit_fixP = (bit_fixS *) 13; /* size of bit field */ break; case 2: @@ -1009,7 +1009,7 @@ static char * brlab_next() { static char buf[20]; - + sprintf(buf, "%s%d", BR_LABEL_BASE, br_cnt++); return buf; } @@ -1039,18 +1039,18 @@ void char buf[20]; char *p; /* Where the binary was output to */ fixS *fixP; /*->description of deferred address fixup */ - + if (!instrument_branches){ return; } - + subseg_new(SEG_DATA,0); /* .data */ frag_align(2,0); /* .align 2 */ record_alignment(now_seg,2); colon(BR_TAB_NAME); /* BR_TAB_NAME: */ emit(0); /* .word 0 #link to next table */ emit(br_cnt); /* .word n #length of table */ - + for (i=0; i<br_cnt; i++){ sprintf(buf, "%s%d", BR_LABEL_BASE, i); p = emit(0); @@ -1087,10 +1087,10 @@ struct i960_opcode *oP; * be emitted; 0 if an address fix * should be emitted. */ - + instr = opcode; n = oP->num_ops; - + if (n >= 1) { /* First operand (if any) of a COBR is always a register * operand. Parse it. @@ -1105,17 +1105,17 @@ struct i960_opcode *oP; parse_regop(®op, arg[2], oP->operand[1]); instr |= (regop.n << 14) | regop.special; } - - + + if (n < 3){ emit(instr); - + } else { if (instrument_branches){ brcnt_emit(); colon(brlab_next()); } - + /* A third operand to a COBR is always a displacement. * Parse it; if it's relaxable (a cobr "j" directive, or any * cobr other than bbs/bbc when the "-norelax" option is not in @@ -1124,7 +1124,7 @@ struct i960_opcode *oP; */ var_frag = !norelax || (oP->format == COJ); /* TRUE or FALSE */ get_cdisp(arg[3], "COBR", instr, 13, var_frag, 0); - + if (instrument_branches){ brcnt_emit(); } @@ -1146,30 +1146,30 @@ int num_ops; /* Number of operands */ int instrument; /* TRUE iff we should add instrumentation to track * how often the branch is taken */ - - + + if (num_ops == 0){ emit(opcode); /* Output opcode */ } else { - + instrument = instrument_branches && (opcode != CALL) && (opcode != B) && (opcode != RET) && (opcode != BAL); - + if (instrument){ brcnt_emit(); colon(brlab_next()); } - + /* The operand MUST be an ip-relative displacment. Parse it * and set up address fix for the instruction we just output. */ get_cdisp(targP, "CTRL", opcode, 24, 0, 0); - + if (instrument){ brcnt_emit(); } } - + } @@ -1186,7 +1186,7 @@ static long instr; /* Word to be output, host byte order */ { char *toP; /* Where to output it */ - + toP = frag_more(4); /* Allocate storage */ md_number_to_chars(toP, instr, 4); /* Convert to target byte order */ return toP; @@ -1220,31 +1220,31 @@ char *args[]; /* Output arg: pointers to operands placed in args[1-3]. register char *to; /* char buf[4]; */ /* int len; */ - - + + /* Skip lead white space */ while (*p == ' '){ p++; } - + if (*p == '\0'){ return 0; } - + n = 1; args[1] = p; - + /* Squeze blanks out by moving non-blanks toward start of string. * Isolate operands, whenever comma is found. */ to = p; while (*p != '\0'){ - + if (*p == ' '){ p++; - + } else if (*p == ','){ - + /* Start of operand */ if (n == 3){ as_bad("too many operands"); @@ -1253,7 +1253,7 @@ char *args[]; /* Output arg: pointers to operands placed in args[1-3]. *to++ = '\0'; /* Terminate argument */ args[++n] = to; /* Start next argument */ p++; - + } else { *to++ = *p++; } @@ -1292,15 +1292,15 @@ int callj; /* 1 if callj relocation should be done; else 0 */ expressionS e; /* Parsed expression */ fixS *fixP; /* Structure describing needed address fix */ char *outP; /* Where instruction binary is output to */ - + fixP = NULL; - + switch (parse_expr(dispP,&e)) { - + case SEG_GOOF: as_bad("expression syntax error"); break; - + case SEG_TEXT: case SEG_UNKNOWN: if (var_frag) { @@ -1321,9 +1321,9 @@ int callj; /* 1 if callj relocation should be done; else 0 */ offs(e), 1, 0); - + fixP->fx_callj = callj; - + /* We want to modify a bit field when the address is * known. But we don't need all the garbage in the * bit_fix structure. So we're going to lie and store @@ -1332,12 +1332,12 @@ int callj; /* 1 if callj relocation should be done; else 0 */ fixP->fx_bit_fixP = (bit_fixS *) numbits; } break; - + case SEG_DATA: case SEG_BSS: as_bad("attempt to branch into different segment"); break; - + default: as_bad("target of %s instruction must be a label", ifmtP); break; @@ -1362,21 +1362,21 @@ char *textP; /*->memory operand from source instruction, no white space */ { char *start; /*->start of index specification */ char *end; /*->end of index specification */ - + /* Find opening square bracket, if any */ start = strchr(textP, '['); - + if (start != NULL){ - + /* Eliminate '[', detach from rest of operand */ *start++ = '\0'; - + end = strchr(start, ']'); - + if (end == NULL){ as_bad("unmatched '['"); - + } else { /* Eliminate ']' and make sure it was the last thing * in the string. @@ -1403,7 +1403,7 @@ static char *regname; /* Suspected register name */ { int *rP; - + rP = (int *) hash_find(reg_hash, regname); return (rP == NULL) ? -1 : *rP; } @@ -1433,7 +1433,7 @@ char *args[]; /* Output arg: pointers to opcode and operands placed * here. MUST ACCOMMODATE 4 ENTRIES. */ { - + /* Isolate opcode */ if (*(iP) == ' ') { iP++; @@ -1470,14 +1470,14 @@ struct i960_opcode *oP; /* Pointer to description of instruction */ char *outP; /* Where the binary was output to */ expressionS expr; /* Parsed expression */ fixS *fixP; /*->description of deferred address fixup */ - + memset(&instr, '\0', sizeof(memS)); instr.opcode = oP->opcode; - + /* Process operands. */ for (i = 1; i <= oP->num_ops; i++){ opdesc = oP->operand[i-1]; - + if (MEMOP(opdesc)){ parse_memop(&instr, args[i], oP->format); } else { @@ -1485,21 +1485,21 @@ struct i960_opcode *oP; /* Pointer to description of instruction */ instr.opcode |= regop.n << 19; } } - + /* Output opcode */ outP = emit(instr.opcode); - + if (instr.disp == 0){ return; } - + /* Parse and process the displacement */ switch (parse_expr(instr.e,&expr)){ - + case SEG_GOOF: as_bad("expression syntax error"); break; - + case SEG_ABSOLUTE: if (instr.disp == 32){ (void) emit(offs(expr)); /* Output displacement */ @@ -1521,7 +1521,7 @@ struct i960_opcode *oP; /* Pointer to description of instruction */ } } break; - + case SEG_DIFFERENCE: case SEG_TEXT: case SEG_DATA: @@ -1534,7 +1534,7 @@ struct i960_opcode *oP; /* Pointer to description of instruction */ */ mema_to_memb(outP); } - + /* Output 0 displacement and set up address fixup for when * this symbol's value becomes known. */ @@ -1549,7 +1549,7 @@ struct i960_opcode *oP; /* Pointer to description of instruction */ 0); fixP->fx_im_disp = 2; /* 32-bit displacement fix */ break; - + default: BAD_CASE(segs(expr)); break; @@ -1572,18 +1572,18 @@ char *opcodeP; /* Where to find the opcode, in target byte order */ { long opcode; /* Opcode in host byte order */ long mode; /* Mode bits for MEMB instruction */ - + opcode = md_chars_to_number(opcodeP, 4); know(!(opcode & MEMB_BIT)); - + mode = MEMB_BIT | D_BIT; if (opcode & MEMA_ABASE){ mode |= A_BIT; } - + opcode &= 0xffffc000; /* Clear MEMA offset and mode bits */ opcode |= mode; /* Set MEMB mode bits */ - + md_number_to_chars(opcodeP, opcode, 4); } /* mema_to_memb() */ @@ -1611,19 +1611,19 @@ expressionS *expP; /* Where to put the results of parsing */ char *save_in; /* Save global here */ segT seg; /* Segment to which expression evaluates */ symbolS *symP; - + know(textP); - + if (*textP == '\0') { /* Treat empty string as absolute 0 */ expP->X_add_symbol = expP->X_subtract_symbol = NULL; expP->X_add_number = 0; seg = expP->X_seg = SEG_ABSOLUTE; - + } else { save_in = input_line_pointer; /* Save global */ input_line_pointer = textP; /* Make parser work for us */ - + seg = expression(expP); if (input_line_pointer - textP != strlen(textP)) { /* Did not consume all of the input */ @@ -1634,7 +1634,7 @@ expressionS *expP; /* Where to put the results of parsing */ /* Register name in an expression */ seg = SEG_GOOF; } - + input_line_pointer = save_in; /* Restore global */ } return seg; @@ -1666,12 +1666,12 @@ char *arg[]; /* See above */ static char buf[5]; /* Literal for first operand */ static char buf2[5]; /* Literal for second operand */ expressionS e; /* Parsed expression */ - - + + arg[3] = NULL; /* So we can tell at the end if it got used or not */ - + switch (parse_expr(arg[1],&e)){ - + case SEG_TEXT: case SEG_DATA: case SEG_BSS: @@ -1680,7 +1680,7 @@ char *arg[]; /* See above */ /* We're dependent on one or more symbols -- use "lda" */ arg[0] = "lda"; break; - + case SEG_ABSOLUTE: /* Try the following mappings: * ldconst 0,<reg> ->mov 0,<reg> @@ -1697,21 +1697,21 @@ char *arg[]; /* See above */ n = offs(e); if ((0 <= n) && (n <= 31)){ arg[0] = "mov"; - + } else if ((-31 <= n) && (n <= -1)){ arg[0] = "subo"; arg[3] = arg[2]; sprintf(buf, "%d", -n); arg[1] = buf; arg[2] = "0"; - + } else if ((32 <= n) && (n <= 62)){ arg[0] = "addo"; arg[3] = arg[2]; arg[1] = "31"; sprintf(buf, "%d", n-31); arg[2] = buf; - + } else if ((shift = shift_ok(n)) != 0){ arg[0] = "shlo"; arg[3] = arg[2]; @@ -1719,12 +1719,12 @@ char *arg[]; /* See above */ arg[1] = buf; sprintf(buf2, "%d", n >> shift); arg[2] = buf2; - + } else { arg[0] = "lda"; } break; - + default: as_bad("invalid constant"); return -1; @@ -1780,7 +1780,7 @@ int optype; /* MEM1, MEM2, MEM4, MEM8, MEM12, or MEM16 */ */ int mode; /* MEMB mode bits */ int *intP; /* Pointer to register number */ - + /* The following table contains the default scale factors for each * type of memory instruction. It is accessed using (optype-MEM1) * as an index -- thus it assumes the 'optype' constants are assigned @@ -1794,10 +1794,10 @@ int optype; /* MEM1, MEM2, MEM4, MEM8, MEM12, or MEM16 */ -1, /* MEM12 -- no valid default */ 16 /* MEM16 */ }; - - + + iprel_flag = mode = 0; - + /* Any index present? */ indexP = get_ispec(argP); if (indexP) { @@ -1809,11 +1809,11 @@ int optype; /* MEM1, MEM2, MEM4, MEM8, MEM12, or MEM16 */ scale = def_scale[ optype - MEM1 ]; } else { *p++ = '\0'; /* Eliminate '*' */ - + /* Now indexP->a '\0'-terminated register name, * and p->a scale factor. */ - + if (!strcmp(p,"16")){ scale = 16; } else if (strchr("1248",*p) && (p[1] == '\0')){ @@ -1822,13 +1822,13 @@ int optype; /* MEM1, MEM2, MEM4, MEM8, MEM12, or MEM16 */ scale = -1; } } - + regnum = get_regnum(indexP); /* Get index reg. # */ if (!IS_RG_REG(regnum)){ as_bad("invalid index register"); return; } - + /* Convert scale to its binary encoding */ switch (scale){ case 1: scale = 0 << 7; break; @@ -1838,11 +1838,11 @@ int optype; /* MEM1, MEM2, MEM4, MEM8, MEM12, or MEM16 */ case 16: scale = 4 << 7; break; default: as_bad("invalid scale factor"); return; }; - + memP->opcode |= scale | regnum; /* Set index bits in opcode */ mode |= I_BIT; /* Found a valid index spec */ } - + /* Any abase (Register Indirect) specification present? */ if ((p = strrchr(argP,'(')) != NULL) { /* "(" is there -- does it start a legal abase spec? @@ -1862,13 +1862,13 @@ int optype; /* MEM1, MEM2, MEM4, MEM8, MEM12, or MEM16 */ } } } - + /* Any expression present? */ memP->e = argP; if (*argP != '\0'){ mode |= D_BIT; } - + /* Special-case ip-relative addressing */ if (iprel_flag){ if (mode & I_BIT){ @@ -1879,7 +1879,7 @@ int optype; /* MEM1, MEM2, MEM4, MEM8, MEM12, or MEM16 */ } return; } - + /* Handle all other modes */ switch (mode){ case D_BIT | A_BIT: @@ -1891,14 +1891,14 @@ int optype; /* MEM1, MEM2, MEM4, MEM8, MEM12, or MEM16 */ memP->opcode |= MEMA_ABASE; memP->disp = 12; break; - + case D_BIT: /* Go with MEMA instruction format for now (grow to MEMB later * if 12 bits is not enough for the displacement). */ memP->disp = 12; break; - + case A_BIT: /* For some reason, the bit string for this mode is not * consistent: it should be 0 (exclusive of the MEMB bit), @@ -1906,12 +1906,12 @@ int optype; /* MEM1, MEM2, MEM4, MEM8, MEM12, or MEM16 */ */ memP->opcode |= MEMB_BIT; break; - + case A_BIT | I_BIT: /* set MEMB bit in mode, and OR in mode bits */ memP->opcode |= mode | MEMB_BIT; break; - + case I_BIT: /* Treat missing displacement as displacement of 0 */ mode |= D_BIT; @@ -1924,7 +1924,7 @@ int optype; /* MEM1, MEM2, MEM4, MEM8, MEM12, or MEM16 */ memP->opcode |= mode | MEMB_BIT; memP->disp = 32; break; - + default: syntax(); break; @@ -1950,9 +1950,9 @@ int po_num; /* Pseudo-op number: currently S_LEAFPROC or S_SYSPROC */ int n_ops; /* Number of operands */ char *p; /* Pointer to beginning of unparsed argument string */ char eol; /* Character that indicated end of line */ - + extern char is_end_of_line[]; - + /* Advance input pointer to end of line. */ p = input_line_pointer; while (!is_end_of_line[ *input_line_pointer ]){ @@ -1960,20 +1960,20 @@ int po_num; /* Pseudo-op number: currently S_LEAFPROC or S_SYSPROC */ } eol = *input_line_pointer; /* Save end-of-line char */ *input_line_pointer = '\0'; /* Terminate argument list */ - + /* Parse out operands */ n_ops = get_args(p, args); if (n_ops == -1){ return; } - + /* Dispatch to correct handler */ switch (po_num){ case S_SYSPROC: s_sysproc(n_ops, args); break; case S_LEAFPROC: s_leafproc(n_ops, args); break; default: BAD_CASE(po_num); break; } - + /* Restore eol, so line numbers get updated correctly. Base assembler * assumes we leave input pointer pointing at char following the eol. */ @@ -1995,7 +1995,7 @@ char opdesc; /* Descriptor byte: what's legal for this operand */ { int n; /* Register number */ expressionS e; /* Parsed expression */ - + /* See if operand is a register */ n = get_regnum(optext); if (n >= 0){ @@ -2037,7 +2037,7 @@ char opdesc; /* Descriptor byte: what's legal for this operand */ && (optext[1] <= 'f') ){ optext += 2; } - + if (!strcmp(optext,"0.0") || !strcmp(optext,"0") ){ regopP->n = 0x10; return; @@ -2046,7 +2046,7 @@ char opdesc; /* Descriptor byte: what's legal for this operand */ regopP->n = 0x16; return; } - + } else { /* fixed point literal acceptable */ if ((parse_expr(optext,&e) != SEG_ABSOLUTE) || (offs(e) < 0) || (offs(e) > 31)){ @@ -2057,7 +2057,7 @@ char opdesc; /* Descriptor byte: what's legal for this operand */ return; } } - + /* Nothing worked */ syntax(); regopP->mode = 0; /* Register r0 is always a good one */ @@ -2076,14 +2076,14 @@ struct i960_opcode *oP; /* Pointer to description of instruction */ long instr; /* Binary to be output */ struct regop regop; /* Description of register operand */ int n_ops; /* Number of operands */ - - + + instr = oP->opcode; n_ops = oP->num_ops; - + if (n_ops >= 1){ parse_regop(®op, args[1], oP->operand[0]); - + if ((n_ops == 1) && !(instr & M3)){ /* 1-operand instruction in which the dst field should * be used (instead of src1). @@ -2101,10 +2101,10 @@ struct i960_opcode *oP; /* Pointer to description of instruction */ } instr |= regop.n | regop.mode | regop.special; } - + if (n_ops >= 2) { parse_regop(®op, args[2], oP->operand[1]); - + if ((n_ops == 2) && !(instr & M3)){ /* 2-operand instruction in which the dst field should * be used instead of src2). @@ -2181,7 +2181,7 @@ register fragS *fragP; /* fragP->fr_opcode is assumed to point to long instr; /* A single i960 instruction */ char *iP; /*->instruction to be replaced */ fixS *fixP; /* Relocation that can be done at assembly time */ - + /* PICK UP & PARSE COBR INSTRUCTION */ iP = fragP->fr_opcode; instr = md_chars_to_number(iP, 4); @@ -2191,15 +2191,15 @@ register fragS *fragP; /* fragP->fr_opcode is assumed to point to s2 = instr & 1; src2 = (instr >> 14) & 0x1f; bp_bits= instr & BP_MASK; - + /* GENERATE AND OUTPUT COMPARE INSTRUCTION */ instr = coj[opcode].compare | src1 | (m1 << 11) | (s2 << 6) | (src2 << 14); md_number_to_chars(iP, instr, 4); - + /* OUTPUT BRANCH INSTRUCTION */ md_number_to_chars(iP+4, coj[opcode].branch | bp_bits, 4); - + /* SET UP ADDRESS FIXUP/RELOCATION */ fixP = fix_new(fragP, iP+4 - fragP->fr_literal, @@ -2209,9 +2209,9 @@ register fragS *fragP; /* fragP->fr_opcode is assumed to point to fragP->fr_offset, 1, 0); - + fixP->fx_bit_fixP = (bit_fixS *) 24; /* Store size of bit field */ - + fragP->fr_fix += 4; frag_wane(fragP); } @@ -2241,28 +2241,28 @@ void reloc_callj(fixP) fixS *fixP; /* Relocation that can be done at assembly time */ { char *where; /*->the binary for the instruction being relocated */ - + if (!fixP->fx_callj) { return; } /* This wasn't a callj instruction in the first place */ - + where = fixP->fx_frag->fr_literal + fixP->fx_where; - + if (TC_S_IS_SYSPROC(fixP->fx_addsy)) { /* Symbol is a .sysproc: replace 'call' with 'calls'. * System procedure number is (other-1). */ md_number_to_chars(where, CALLS|TC_S_GET_SYSPROC(fixP->fx_addsy), 4); - + /* Nothing else needs to be done for this instruction. * Make sure 'md_number_to_field()' will perform a no-op. */ fixP->fx_bit_fixP = (bit_fixS *) 1; - + } else if (TC_S_IS_CALLNAME(fixP->fx_addsy)) { /* Should not happen: see block comment above */ as_fatal("Trying to 'bal' to %s", S_GET_NAME(fixP->fx_addsy)); - + } else if (TC_S_IS_BALNAME(fixP->fx_addsy)) { /* Replace 'call' with 'bal'; both instructions have * the same format, so calling code should complete @@ -2272,9 +2272,9 @@ fixS *fixP; /* Relocation that can be done at assembly time */ } else if (TC_S_IS_BADPROC(fixP->fx_addsy)) { as_bad("Looks like a proc, but can't tell what kind.\n"); } /* switch on proc type */ - + /* else Symbol is neither a sysproc nor a leafproc */ - + return; } /* reloc_callj() */ @@ -2300,38 +2300,38 @@ char *args[]; /* args[1]->1st operand, args[2]->2nd operand */ { symbolS *callP; /* Pointer to leafproc 'call' entry point symbol */ symbolS *balP; /* Pointer to leafproc 'bal' entry point symbol */ - + if ((n_ops != 1) && (n_ops != 2)) { as_bad("should have 1 or 2 operands"); return; } /* Check number of arguments */ - + /* Find or create symbol for 'call' entry point. */ callP = symbol_find_or_make(args[1]); - + if (TC_S_IS_CALLNAME(callP)) { as_warn("Redefining leafproc %s", S_GET_NAME(callP)); } /* is leafproc */ - + /* If that was the only argument, use it as the 'bal' entry point. * Otherwise, mark it as the 'call' entry point and find or create * another symbol for the 'bal' entry point. */ if ((n_ops == 1) || !strcmp(args[1],args[2])) { TC_S_FORCE_TO_BALNAME(callP); - + } else { TC_S_FORCE_TO_CALLNAME(callP); - + balP = symbol_find_or_make(args[2]); if (TC_S_IS_CALLNAME(balP)) { as_warn("Redefining leafproc %s", S_GET_NAME(balP)); } TC_S_FORCE_TO_BALNAME(balP); - + tc_set_bal_of_call(callP, balP); } /* if only one arg, or the args are the same */ - + return; } /* s_leafproc() */ @@ -2354,12 +2354,12 @@ char *args[]; /* args[1]->1st operand, args[2]->2nd operand */ { expressionS exp; symbolS *symP; - + if (n_ops != 2) { as_bad("should have two operands"); return; } /* bad arg count */ - + /* Parse "entry_num" argument and check it for validity. */ if ((parse_expr(args[2],&exp) != SEG_ABSOLUTE) || (offs(exp) < 0) @@ -2367,17 +2367,17 @@ char *args[]; /* args[1]->1st operand, args[2]->2nd operand */ as_bad("'entry_num' must be absolute number in [0,31]"); return; } - + /* Find/make symbol and stick entry number (biased by +1) into it */ symP = symbol_find_or_make(args[1]); - + if (TC_S_IS_SYSPROC(symP)) { as_warn("Redefining entrynum for sysproc %s", S_GET_NAME(symP)); } /* redefining */ - + TC_S_SET_SYSPROC(symP, offs(exp)); /* encode entry number */ TC_S_FORCE_TO_SYSPROC(symP); - + return; } /* s_sysproc() */ @@ -2398,17 +2398,17 @@ static int n; /* The constant of interest */ { int shift; /* The shift count */ - + if (n <= 0){ /* Can't do it for negative numbers */ return 0; } - + /* Shift 'n' right until a 1 is about to be lost */ for (shift = 0; (n & 1) == 0; shift++){ n >>= 1; } - + if (n >= 32){ return 0; } @@ -2514,9 +2514,9 @@ fixS *fixP; long val; { char *place = fixP->fx_where + fixP->fx_frag->fr_literal; - + if (!fixP->fx_bit_fixP) { - + switch (fixP->fx_im_disp) { case 0: fixP->fx_addnumber = val; @@ -2536,7 +2536,7 @@ long val; } else { md_number_to_field(place, val, fixP->fx_bit_fixP); } - + return; } /* md_apply_fix() */ @@ -2549,19 +2549,19 @@ relax_addressT segment_address_in_file; static unsigned char nbytes_r_length[] = { 42, 0, 1, 42, 2 }; struct relocation_info ri; symbolS *symbolP; - + /* JF this is for paranoia */ memset((char *)&ri, '\0', sizeof(ri)); - + know((symbolP = fixP->fx_addsy) != 0); - + /* These two 'cuz of NS32K */ ri.r_callj = fixP->fx_callj; - + ri.r_length = nbytes_r_length[fixP->fx_size]; ri.r_pcrel = fixP->fx_pcrel; ri.r_address = fixP->fx_frag->fr_address + fixP->fx_where - segment_address_in_file; - + if (!S_IS_DEFINED(symbolP)) { ri.r_extern = 1; ri.r_index = symbolP->sy_number; @@ -2569,10 +2569,10 @@ relax_addressT segment_address_in_file; ri.r_extern = 0; ri.r_index = S_GET_TYPE(symbolP); } - + /* Output the relocation information in machine-dependent form. */ md_ri_to_chars(where, &ri); - + return; } /* tc_bout_fix_to_chars() */ @@ -2592,7 +2592,7 @@ void tc_headers_hook(headers) object_headers *headers; { /* FIXME: remove this line */ /* unsigned short arch_flag = 0; */ - + if ((iclasses_seen == I_BASE) || (iclasses_seen == 0)) { headers->filehdr.f_flags |= F_I960CORE; } else if (iclasses_seen & I_CX){ @@ -2604,7 +2604,7 @@ object_headers *headers; } else { headers->filehdr.f_flags |= F_I960KA; } /* set arch flag */ - + if (flagseen['R']) { headers->filehdr.f_magic = I960RWMAGIC; headers->aouthdr.magic = OMAGIC; @@ -2612,7 +2612,7 @@ object_headers *headers; headers->filehdr.f_magic = I960ROMAGIC; headers->aouthdr.magic = NMAGIC; } /* set magic numbers */ - + return; } /* tc_headers_hook() */ #endif /* OBJ_COFF */ @@ -2640,7 +2640,7 @@ void tc_crawl_symbol_chain(headers) object_headers *headers; { symbolS *symbolP; - + for (symbolP = symbol_rootP; symbolP; symbolP = symbol_next(symbolP)) { #ifdef OBJ_COFF if (TC_S_IS_SYSPROC(symbolP)) { @@ -2651,15 +2651,15 @@ object_headers *headers; continue; } /* rewrite sysproc */ #endif /* OBJ_COFF */ - + if (!TC_S_IS_BALNAME(symbolP) && !TC_S_IS_CALLNAME(symbolP)) { continue; } /* Not a leafproc symbol */ - + if (!S_IS_DEFINED(symbolP)) { as_bad("leafproc symbol '%s' undefined", S_GET_NAME(symbolP)); } /* undefined leaf */ - + if (TC_S_IS_CALLNAME(symbolP)) { symbolS *balP = tc_get_bal_of_call(symbolP); if (S_IS_EXTERNAL(symbolP) != S_IS_EXTERNAL(balP)) { @@ -2670,7 +2670,7 @@ object_headers *headers; } /* externality mismatch */ } /* if callname */ } /* walk the symbol chain */ - + return; } /* tc_crawl_symbol_chain() */ @@ -2687,14 +2687,14 @@ symbolS *balP; { know(TC_S_IS_CALLNAME(callP)); know(TC_S_IS_BALNAME(balP)); - + #ifdef OBJ_COFF - + callP->sy_symbol.ost_auxent[1].x_bal.x_balntry = (int) balP; S_SET_NUMBER_AUXILIARY(callP,2); - + #elif defined(OBJ_AOUT) || defined(OBJ_BOUT) - + /* If the 'bal' entry doesn't immediately follow the 'call' * symbol, unlink it from the symbol list and re-insert it. */ @@ -2702,11 +2702,11 @@ symbolS *balP; symbol_remove(balP, &symbol_rootP, &symbol_lastP); symbol_append(balP, callP, &symbol_rootP, &symbol_lastP); } /* if not in order */ - + #else (as yet unwritten.); #endif /* switch on OBJ_FORMAT */ - + return; } /* tc_set_bal_of_call() */ @@ -2714,9 +2714,9 @@ char *_tc_get_bal_of_call(callP) symbolS *callP; { symbolS *retval; - + know(TC_S_IS_CALLNAME(callP)); - + #ifdef OBJ_COFF retval = (symbolS *) (callP->sy_symbol.ost_auxent[1].x_bal.x_balntry); #elif defined(OBJ_AOUT) || defined(OBJ_BOUT) @@ -2724,7 +2724,7 @@ symbolS *callP; #else (as yet unwritten.); #endif /* switch on OBJ_FORMAT */ - + know(TC_S_IS_BALNAME(retval)); return((char *) retval); } /* _tc_get_bal_of_call() */ @@ -2735,7 +2735,7 @@ symbolS *symbolP; if (TC_S_IS_CALLNAME(symbolP)) { #ifdef OBJ_COFF symbolS *balP = tc_get_bal_of_call(symbolP); - + /* second aux entry contains the bal entry point */ /* S_SET_NUMBER_AUXILIARY(symbolP, 2); */ symbolP->sy_symbol.ost_auxent[1].x_bal.x_balntry = S_GET_VALUE(balP); @@ -2745,7 +2745,7 @@ symbolS *symbolP; S_SET_STORAGE_CLASS(balP, C_LABEL); #endif /* OBJ_COFF */ } /* only on calls */ - + return; } /* tc_coff_symbol_emit_hook() */ diff --git a/gnu/usr.bin/as/config/tc-i960.h b/gnu/usr.bin/as/config/tc-i960.h index caad4d6..236c9b1 100644 --- a/gnu/usr.bin/as/config/tc-i960.h +++ b/gnu/usr.bin/as/config/tc-i960.h @@ -1,18 +1,18 @@ /* tc-i960.h - Basic 80960 instruction formats. Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -39,7 +39,7 @@ * the instruction generated (a CTRL-format 'call') should have its relocation * specially flagged for link-time replacement with a 'bal' or 'calls' if * appropriate. - */ + */ /* tailor gas */ #define SYMBOLS_NEED_BACKPOINTERS @@ -69,7 +69,7 @@ #define M2 0x1000 #define M3 0x2000 -/* Generate the 12-bit opcode for a REG format instruction by placing the +/* Generate the 12-bit opcode for a REG format instruction by placing the * high 8 bits in instruction bits 24-31, the low 4 bits in instruction bits * 7-10. */ @@ -179,7 +179,7 @@ * 'bal' entry point to the procedure (see following). These * entries come from '.leafproc' directives in which two different * symbols are specified (the first one is represented here). - * + * * * n_other == N_BALNAME * the symbol is the 'bal' entry point to a leaf procedure. @@ -252,9 +252,9 @@ struct relocation_info { #else /* switch on OBJ */ you lose #endif /* witch on OBJ */ - + #if __STDC__ == 1 - + void brtab_emit(void); void reloc_callj(); /* this is really reloc_callj(fixS *fixP) but I don't want to change header inclusion order. */ void tc_set_bal_of_call(); /* this is really tc_set_bal_of_call(symbolS *callP, symbolS *balP) */ diff --git a/gnu/usr.bin/as/config/tc-m68851.h b/gnu/usr.bin/as/config/tc-m68851.h index 5f70e42..8e69702 100644 --- a/gnu/usr.bin/as/config/tc-m68851.h +++ b/gnu/usr.bin/as/config/tc-m68851.h @@ -1,19 +1,19 @@ /* This file is tc-m68851.h Copyright (C) 1987-1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -26,16 +26,16 @@ to us as part of the changes for the m68851 Memory Management Unit */ /* Copyright (C) 1987 Free Software Foundation, Inc. - + This file is part of Gas, the GNU Assembler. - + The GNU assembler is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY. No author or distributor accepts responsibility to anyone for the consequences of using it or for whether it serves any particular purpose or works at all, unless he says so in writing. Refer to the GNU Assembler General Public License for full details. - + Everyone is granted permission to copy, modify and redistribute the GNU Assembler, but only under the conditions described in the GNU Assembler General Public License. A copy of this license is @@ -47,10 +47,10 @@ #ifdef m68851 /* - I didn't use much imagination in choosing the + I didn't use much imagination in choosing the following codes, so many of them aren't very mnemonic. -rab - + P pmmu register Possible values: 000 TC Translation Control reg @@ -58,28 +58,28 @@ 101 VAL Validate Access Level 110 SCC Stack Change Control 111 AC Access Control - + W wide pmmu registers Possible values: 001 DRP Dma Root Pointer 010 SRP Supervisor Root Pointer 011 CRP Cpu Root Pointer - + f function code register 0 SFC 1 DFC - + V VAL register only - + X BADx, BACx 100 BAD Breakpoint Acknowledge Data 101 BAC Breakpoint Acknowledge Control - + Y PSR Z PCSR - + | memory (modes 2-6, 7.*) - + */ /* @@ -136,8 +136,8 @@ {"pbwcw", one(0xf089), one(0xffbf), "Bc"}, {"pbws", one(0xf0c8), one(0xffbf), "Bc"}, {"pbwsw", one(0xf088), one(0xffbf), "Bc"}, - - + + {"pdbac", two(0xf048, 0x0007), two(0xfff8, 0xffff), "DsBw"}, {"pdbas", two(0xf048, 0x0006), two(0xfff8, 0xffff), "DsBw"}, {"pdbbc", two(0xf048, 0x0001), two(0xfff8, 0xffff), "DsBw"}, @@ -154,53 +154,53 @@ {"pdbss", two(0xf048, 0x0004), two(0xfff8, 0xffff), "DsBw"}, {"pdbwc", two(0xf048, 0x0009), two(0xfff8, 0xffff), "DsBw"}, {"pdbws", two(0xf048, 0x0008), two(0xfff8, 0xffff), "DsBw"}, - + {"pflusha", two(0xf000, 0x2400), two(0xffff, 0xffff), "" }, - + {"pflush", two(0xf000, 0x3010), two(0xffc0, 0xfe10), "T3T9" }, {"pflush", two(0xf000, 0x3810), two(0xffc0, 0xfe10), "T3T9&s" }, {"pflush", two(0xf000, 0x3008), two(0xffc0, 0xfe18), "D3T9" }, {"pflush", two(0xf000, 0x3808), two(0xffc0, 0xfe18), "D3T9&s" }, {"pflush", two(0xf000, 0x3000), two(0xffc0, 0xfe1e), "f3T9" }, {"pflush", two(0xf000, 0x3800), two(0xffc0, 0xfe1e), "f3T9&s" }, - + {"pflushs", two(0xf000, 0x3410), two(0xfff8, 0xfe10), "T3T9" }, {"pflushs", two(0xf000, 0x3c00), two(0xfff8, 0xfe00), "T3T9&s" }, {"pflushs", two(0xf000, 0x3408), two(0xfff8, 0xfe18), "D3T9" }, {"pflushs", two(0xf000, 0x3c08), two(0xfff8, 0xfe18), "D3T9&s" }, {"pflushs", two(0xf000, 0x3400), two(0xfff8, 0xfe1e), "f3T9" }, {"pflushs", two(0xf000, 0x3c00), two(0xfff8, 0xfe1e), "f3T9&s"}, - + {"pflushr", two(0xf000, 0xa000), two(0xffc0, 0xffff), "|s" }, - + {"ploadr", two(0xf000, 0x2210), two(0xffc0, 0xfff0), "T3&s" }, {"ploadr", two(0xf000, 0x2208), two(0xffc0, 0xfff8), "D3&s" }, {"ploadr", two(0xf000, 0x2200), two(0xffc0, 0xfffe), "f3&s" }, {"ploadw", two(0xf000, 0x2010), two(0xffc0, 0xfff0), "T3&s" }, {"ploadw", two(0xf000, 0x2008), two(0xffc0, 0xfff8), "D3&s" }, {"ploadw", two(0xf000, 0x2000), two(0xffc0, 0xfffe), "f3&s" }, - + /* TC, CRP, DRP, SRP, CAL, VAL, SCC, AC */ {"pmove", two(0xf000, 0x4000), two(0xffc0, 0xe3ff), "*sP8" }, {"pmove", two(0xf000, 0x4200), two(0xffc0, 0xe3ff), "P8%s" }, {"pmove", two(0xf000, 0x4000), two(0xffc0, 0xe3ff), "|sW8" }, {"pmove", two(0xf000, 0x4200), two(0xffc0, 0xe3ff), "W8~s" }, - + /* BADx, BACx */ {"pmove", two(0xf000, 0x6200), two(0xffc0, 0xe3e3), "*sX3" }, {"pmove", two(0xf000, 0x6000), two(0xffc0, 0xe3e3), "X3%s" }, - + /* PSR, PCSR */ /* {"pmove", two(0xf000, 0x6100), two(oxffc0, oxffff), "*sZ8" }, */ {"pmove", two(0xf000, 0x6000), two(0xffc0, 0xffff), "*sY8" }, {"pmove", two(0xf000, 0x6200), two(0xffc0, 0xffff), "Y8%s" }, {"pmove", two(0xf000, 0x6600), two(0xffc0, 0xffff), "Z8%s" }, - + {"prestore", one(0xf140), one(0xffc0), "&s"}, {"prestore", one(0xf158), one(0xfff8), "+s"}, {"psave", one(0xf100), one(0xffc0), "&s"}, {"psave", one(0xf100), one(0xffc0), "+s"}, - + {"psac", two(0xf040, 0x0007), two(0xffc0, 0xffff), "@s"}, {"psas", two(0xf040, 0x0006), two(0xffc0, 0xffff), "@s"}, {"psbc", two(0xf040, 0x0001), two(0xffc0, 0xffff), "@s"}, @@ -217,88 +217,88 @@ {"psss", two(0xf040, 0x0004), two(0xffc0, 0xffff), "@s"}, {"pswc", two(0xf040, 0x0009), two(0xffc0, 0xffff), "@s"}, {"psws", two(0xf040, 0x0008), two(0xffc0, 0xffff), "@s"}, - + {"ptestr", two(0xf000, 0x8210), two(0xffc0, 0xe3f0), "T3&sQ8" }, {"ptestr", two(0xf000, 0x8310), two(0xffc0, 0xe310), "T3&sQ8A9" }, {"ptestr", two(0xf000, 0x8208), two(0xffc0, 0xe3f8), "D3&sQ8" }, {"ptestr", two(0xf000, 0x8308), two(0xffc0, 0xe318), "D3&sQ8A9" }, {"ptestr", two(0xf000, 0x8200), two(0xffc0, 0xe3fe), "f3&sQ8" }, {"ptestr", two(0xf000, 0x8300), two(0xffc0, 0xe31e), "f3&sQ8A9" }, - + {"ptestw", two(0xf000, 0x8010), two(0xffc0, 0xe3f0), "T3&sQ8" }, {"ptestw", two(0xf000, 0x8110), two(0xffc0, 0xe310), "T3&sQ8A9" }, {"ptestw", two(0xf000, 0x8008), two(0xffc0, 0xe3f8), "D3&sQ8" }, {"ptestw", two(0xf000, 0x8108), two(0xffc0, 0xe318), "D3&sQ8A9" }, {"ptestw", two(0xf000, 0x8000), two(0xffc0, 0xe3fe), "f3&sQ8" }, {"ptestw", two(0xf000, 0x8100), two(0xffc0, 0xe31e), "f3&sQ8A9" }, - + {"ptrapacw", two(0xf07a, 0x0007), two(0xffff, 0xffff), "#w"}, {"ptrapacl", two(0xf07b, 0x0007), two(0xffff, 0xffff), "#l"}, {"ptrapac", two(0xf07c, 0x0007), two(0xffff, 0xffff), ""}, - + {"ptrapasw", two(0xf07a, 0x0006), two(0xffff, 0xffff), "#w"}, {"ptrapasl", two(0xf07b, 0x0006), two(0xffff, 0xffff), "#l"}, {"ptrapas", two(0xf07c, 0x0006), two(0xffff, 0xffff), ""}, - + {"ptrapbcw", two(0xf07a, 0x0001), two(0xffff, 0xffff), "#w"}, {"ptrapbcl", two(0xf07b, 0x0001), two(0xffff, 0xffff), "#l"}, {"ptrapbc", two(0xf07c, 0x0001), two(0xffff, 0xffff), ""}, - + {"ptrapbsw", two(0xf07a, 0x0000), two(0xffff, 0xffff), "#w"}, {"ptrapbsl", two(0xf07b, 0x0000), two(0xffff, 0xffff), "#l"}, {"ptrapbs", two(0xf07c, 0x0000), two(0xffff, 0xffff), ""}, - + {"ptrapccw", two(0xf07a, 0x000f), two(0xffff, 0xffff), "#w"}, {"ptrapccl", two(0xf07b, 0x000f), two(0xffff, 0xffff), "#l"}, {"ptrapcc", two(0xf07c, 0x000f), two(0xffff, 0xffff), ""}, - + {"ptrapcsw", two(0xf07a, 0x000e), two(0xffff, 0xffff), "#w"}, {"ptrapcsl", two(0xf07b, 0x000e), two(0xffff, 0xffff), "#l"}, {"ptrapcs", two(0xf07c, 0x000e), two(0xffff, 0xffff), ""}, - + {"ptrapgcw", two(0xf07a, 0x000d), two(0xffff, 0xffff), "#w"}, {"ptrapgcl", two(0xf07b, 0x000d), two(0xffff, 0xffff), "#l"}, {"ptrapgc", two(0xf07c, 0x000d), two(0xffff, 0xffff), ""}, - + {"ptrapgsw", two(0xf07a, 0x000c), two(0xffff, 0xffff), "#w"}, {"ptrapgsl", two(0xf07b, 0x000c), two(0xffff, 0xffff), "#l"}, {"ptrapgs", two(0xf07c, 0x000c), two(0xffff, 0xffff), ""}, - + {"ptrapicw", two(0xf07a, 0x000b), two(0xffff, 0xffff), "#w"}, {"ptrapicl", two(0xf07b, 0x000b), two(0xffff, 0xffff), "#l"}, {"ptrapic", two(0xf07c, 0x000b), two(0xffff, 0xffff), ""}, - + {"ptrapisw", two(0xf07a, 0x000a), two(0xffff, 0xffff), "#w"}, {"ptrapisl", two(0xf07b, 0x000a), two(0xffff, 0xffff), "#l"}, {"ptrapis", two(0xf07c, 0x000a), two(0xffff, 0xffff), ""}, - + {"ptraplcw", two(0xf07a, 0x0003), two(0xffff, 0xffff), "#w"}, {"ptraplcl", two(0xf07b, 0x0003), two(0xffff, 0xffff), "#l"}, {"ptraplc", two(0xf07c, 0x0003), two(0xffff, 0xffff), ""}, - + {"ptraplsw", two(0xf07a, 0x0002), two(0xffff, 0xffff), "#w"}, {"ptraplsl", two(0xf07b, 0x0002), two(0xffff, 0xffff), "#l"}, {"ptrapls", two(0xf07c, 0x0002), two(0xffff, 0xffff), ""}, - + {"ptrapscw", two(0xf07a, 0x0005), two(0xffff, 0xffff), "#w"}, {"ptrapscl", two(0xf07b, 0x0005), two(0xffff, 0xffff), "#l"}, {"ptrapsc", two(0xf07c, 0x0005), two(0xffff, 0xffff), ""}, - + {"ptrapssw", two(0xf07a, 0x0004), two(0xffff, 0xffff), "#w"}, {"ptrapssl", two(0xf07b, 0x0004), two(0xffff, 0xffff), "#l"}, {"ptrapss", two(0xf07c, 0x0004), two(0xffff, 0xffff), ""}, - + {"ptrapwcw", two(0xf07a, 0x0009), two(0xffff, 0xffff), "#w"}, {"ptrapwcl", two(0xf07b, 0x0009), two(0xffff, 0xffff), "#l"}, {"ptrapwc", two(0xf07c, 0x0009), two(0xffff, 0xffff), ""}, - + {"ptrapwsw", two(0xf07a, 0x0008), two(0xffff, 0xffff), "#w"}, {"ptrapwsl", two(0xf07b, 0x0008), two(0xffff, 0xffff), "#l"}, {"ptrapws", two(0xf07c, 0x0008), two(0xffff, 0xffff), ""}, - + {"pvalid", two(0xf000, 0x2800), two(0xffc0, 0xffff), "Vs&s"}, {"pvalid", two(0xf000, 0x2c00), two(0xffc0, 0xfff8), "A3&s" }, - + #endif /* m68851 */ /* end of tc-m68851.h */ diff --git a/gnu/usr.bin/as/config/tc-m68k.c b/gnu/usr.bin/as/config/tc-m68k.c index 1aed016..2872103 100644 --- a/gnu/usr.bin/as/config/tc-m68k.c +++ b/gnu/usr.bin/as/config/tc-m68k.c @@ -1,20 +1,20 @@ /* tc-m68k.c All the m68020 specific stuff in one convenient, huge, slow to compile, easy to find file. - + Copyright (C) 1987, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -85,7 +85,7 @@ static struct obstack robyn; #define PCLEA 6 /* Operands we can parse: (And associated modes) - + numb: 8 bit num numw: 16 bit num numl: 32 bit num @@ -97,7 +97,7 @@ static struct obstack robyn; num2: like num sz: w or l if omitted, l assumed scale: 1 2 4 or 8 if omitted, 1 assumed - + 7.4 IMMED #num --> NUM 0.? DREG dreg --> dreg 1.? AREG areg --> areg @@ -117,7 +117,7 @@ static struct obstack robyn; *** MSCR otherreg --> Magic With -l option 5.? AOFF apc@(num) --> *(apc+num) -- empty string and ZPC not allowed here still - + examples: #foo #0x35 #12 d2 @@ -129,11 +129,11 @@ static struct obstack robyn; a1@(5,d2:w:1) @(45,d6:l:4) pc@(a2) @(d4) etc... - - + + #name@(numw) -->turn into PC rel mode apc@(num8,reg:sz:scale) --> *(apc+num8+reg*scale) - + */ enum operand_type { @@ -174,7 +174,7 @@ enum _register { DATA5, DATA6, DATA7, - + ADDR, ADDR0 = ADDR, ADDR1, @@ -184,12 +184,12 @@ enum _register { ADDR5, ADDR6, ADDR7, - + /* Note that COPNUM == processor #1 -- COPNUM+7 == #8, which stores as 000 */ /* I think... */ - + SP = ADDR7, - + FPREG, /* Eight FP registers */ FP0 = FPREG, FP1, @@ -212,7 +212,7 @@ enum _register { ZPC, /* Hack for Program space, but 0 addressing */ SR, /* Status Reg */ CCR, /* Condition code Reg */ - + /* These have to be in order for the movec instruction to work. */ USP, /* User Stack Pointer */ ISP, /* Interrupt stack pointer */ @@ -231,11 +231,11 @@ enum _register { SRP, URP, /* end of movec ordering constraints */ - + FPI, FPS, FPC, - + DRP, CRP, CAL, @@ -262,12 +262,12 @@ enum _register { BAC7, PSR, PCSR, - + IC, /* instruction cache token */ DC, /* data cache token */ NC, /* no cache token */ BC, /* both caches token */ - + }; /* Internal form of an operand. */ @@ -287,15 +287,15 @@ struct m68k_it { char *error; char *args; /* list of opcode info */ int numargs; - + int numo; /* Number of shorts in opcode */ short opcode[11]; - + struct m68k_op operands[6]; - + int nexp; /* number of exprs in use */ struct m68k_exp exprs[4]; - + int nfrag; /* Number of frags we have to produce */ struct { int fragoff; /* Where in the current opcode[] the frag ends */ @@ -303,7 +303,7 @@ struct m68k_it { long foff; int fragty; } fragb[4]; - + int nrel; /* Num of reloc strucs in use */ struct { int n; @@ -444,37 +444,37 @@ const relax_typeS { 1, 1, 0, 0 }, /* For no good reason except */ { 1, 1, 0, 0 }, /* that the VAX doesn't either */ { 1, 1, 0, 0 }, - + { (127), (-128), 0, TAB(BRANCH,SHORT)}, { (32767), (-32768), 2, TAB(BRANCH,LONG) }, { 0, 0, 4, 0 }, { 1, 1, 0, 0 }, - + { 1, 1, 0, 0 }, /* FBRANCH doesn't come BYTE */ { (32767), (-32768), 2, TAB(FBRANCH,LONG)}, { 0, 0, 4, 0 }, { 1, 1, 0, 0 }, - + { 1, 1, 0, 0 }, /* PCREL doesn't come BYTE */ { (32767), (-32768), 2, TAB(PCREL,LONG)}, { 0, 0, 4, 0 }, { 1, 1, 0, 0 }, - + { (127), (-128), 0, TAB(BCC68000,SHORT)}, { (32767), (-32768), 2, TAB(BCC68000,LONG) }, { 0, 0, 6, 0 }, /* jmp long space */ { 1, 1, 0, 0 }, - + { 1, 1, 0, 0 }, /* DBCC doesn't come BYTE */ { (32767), (-32768), 2, TAB(DBCC,LONG) }, { 0, 0, 10, 0 }, /* bra/jmp long space */ { 1, 1, 0, 0 }, - + { 1, 1, 0, 0 }, /* PCLEA doesn't come BYTE */ { 32767, -32768, 2, TAB(PCLEA,LONG) }, { 0, 0, 6, 0 }, { 1, 1, 0, 0 }, - + }; /* These are the machine dependent pseudo-ops. These are included so @@ -559,14 +559,14 @@ register char **ccp; char *p, *q; register int n = 0, ret = FAIL; - + c[0] = mklower(ccp[0][0]); #ifdef REGISTER_PREFIX if (c[0] != REGISTER_PREFIX) { return(FAIL); } /* need prefix */ #endif - + for (p = c, q = ccp[0]; p < c + MAX_REG_NAME_LEN; ++p, ++q) { if (*q == 0) @@ -577,7 +577,7 @@ register char **ccp; else *p = mklower(*q); } /* downcase */ - + switch (c[0]) { case 'a': if (c[1] >= '0' && c[1] <= '7') { @@ -733,7 +733,7 @@ register char **ccp; if (c[1] == 'c' && c[2] == 'c') { n = 3; ret = (SCC); - } else + } else #endif if (c[1] == 'r') { if (c[2] == 'p') { @@ -806,7 +806,7 @@ register char **ccp; * m68k_ip_op := '#' + <anything> * | <register> + range_sep + get_regs * ; - * + * * range_sep := '/' | '-' ; * * SKIP_WHITE := <empty> | ' ' ; @@ -821,34 +821,34 @@ register struct m68k_op *opP; char *strend; long i; char *parse_index(); - + if (*str == ' ') { str++; } /* Find the beginning of the string */ - + if (!*str) { opP->error="Missing operand"; return FAIL; } /* Out of gas */ - + for (strend = str; *strend; strend++) ;; - + --strend; - + if (*str == '#') { str++; opP->con1=add_exp(str,strend); opP->mode=IMMED; return OK; } /* Guess what: A constant. Shar and enjoy */ - + i = m68k_reg_parse(&str); - + /* is a register, is exactly a register, and is followed by '@' */ - + if ((i == FAIL || *str != '\0') && *str != '@') { char *stmp; - + if (i != FAIL && (*str == '/' || *str == '-')) { opP->mode=REGLST; return(get_regs(i,str,opP)); @@ -859,11 +859,11 @@ register struct m68k_op *opP; opP->mode=AINDX; return(OK); } - + if ((current_architecture & m68020up) == 0) { return(FAIL); } /* if target is not a '20 or better */ - + stmp++; if (*stmp++ != '(' || *strend-- != ')') { opP->error="Malformed operand"; @@ -871,7 +871,7 @@ register struct m68k_op *opP; } i=try_index(&stmp,opP); opP->con2=add_exp(stmp,strend); - + if (i == FAIL) { opP->mode=AMIND; } else { @@ -883,9 +883,9 @@ register struct m68k_op *opP; opP->con1 = add_exp(str,strend); return(OK); } /* not a register, not exactly a register, or no '@' */ - + opP->reg=i; - + if (*str == '\0') { if (i >= DATA+0 && i <= DATA+7) opP->mode=DREG; @@ -895,13 +895,13 @@ register struct m68k_op *opP; opP->mode=MSCR; return OK; } - + if ((i<ADDR+0 || i>ADDR+7) && i != PC && i != ZPC && i != FAIL) { /* Can't indirect off non address regs */ opP->error="Invalid indirect register"; return FAIL; } know(*str == '@'); - + str++; switch (*str) { case '\0': @@ -925,7 +925,7 @@ register struct m68k_op *opP; /* Didn't start with an index reg, maybe its offset or offset,reg */ if (i == FAIL) { char *beg_str; - + beg_str=str; for (i=1;i;) { switch (*str++) { @@ -939,7 +939,7 @@ register struct m68k_op *opP; } /* if (str[-3] == ':') { int siz; - + switch (str[-2]) { case 'b': case 'B': @@ -971,7 +971,7 @@ register struct m68k_op *opP; } } /* We've now got offset) offset,reg) or reg) */ - + if (*str == '\0') { /* Th-the-thats all folks */ if (opP->reg == FAIL) opP->mode = AINDX; /* Other form of indirect */ @@ -984,16 +984,16 @@ register struct m68k_op *opP; opP->error = "junk after indirect"; return(FAIL); } - + if ((current_architecture & m68020up) == 0) { return(FAIL); } /* if target is not a '20 or better */ - + str+=2; - + if (opP->ireg != FAIL) { opP->mode = APRDX; - + i = try_index(&str, opP); if (i != FAIL) { opP->error = "Two index registers! not allowed!"; @@ -1002,12 +1002,12 @@ register struct m68k_op *opP; } else { i = try_index(&str, opP); } - + if (i == FAIL) { char *beg_str; - + beg_str = str; - + for (i = 1; i; ) { switch (*str++) { case '\0': @@ -1018,22 +1018,22 @@ register struct m68k_op *opP; case ')': --i; break; } } - + opP->con2=add_exp(beg_str,str-2); - + if (str[-1] == ',') { if (opP->ireg != FAIL) { opP->error = "Can't have two index regs"; return(FAIL); } - + i = try_index(&str, opP); - + if (i == FAIL) { opP->error = "malformed index reg"; return(FAIL); } - + opP->mode = APODX; } else if (opP->ireg != FAIL) { opP->mode = APRDX; @@ -1043,7 +1043,7 @@ register struct m68k_op *opP; } else { opP->mode = APODX; } - + if (*str != '\0') { opP->error="Junk after indirect"; return FAIL; @@ -1052,7 +1052,7 @@ register struct m68k_op *opP; } /* m68k_ip_op() */ /* - * + * * try_index := data_or_address_register + ')' + SKIP_W * | data_or_address_register + ':' + SKIP_W + size_spec + SKIP_W + multiplier + ')' + SKIP_W * @@ -1075,7 +1075,7 @@ struct m68k_op *opP; register int i; char *ss; #define SKIP_W() { ss++; if (*ss == ' ') ss++;} - + ss= *s; /* SKIP_W(); */ i=m68k_reg_parse(&ss); @@ -1144,7 +1144,7 @@ main() { char buf[128]; struct m68k_op thark; - + for (;;) { if (!gets(buf)) break; @@ -1216,80 +1216,80 @@ char *instring; char *crack_operand(); LITTLENUM_TYPE words[6]; LITTLENUM_TYPE *wordp; - + if (*instring == ' ') instring++; /* skip leading whitespace */ - + /* Scan up to end of operation-code, which MUST end in end-of-string or exactly 1 space. */ for (p = instring; *p != '\0'; p++) if (*p == ' ') break; - - + + if (p == instring) { the_ins.error = "No operator"; the_ins.opcode[0] = NULL; /* the_ins.numo=1; */ return; } - + /* p now points to the end of the opcode name, probably whitespace. make sure the name is null terminated by clobbering the whitespace, - look it up in the hash table, then fix it back. */ + look it up in the hash table, then fix it back. */ c = *p; *p = '\0'; opcode = (struct m68k_incant *)hash_find (op_hash, instring); *p = c; - + if (opcode == NULL) { the_ins.error = "Unknown operator"; the_ins.opcode[0] = NULL; /* the_ins.numo=1; */ return; } - + /* found a legitimate opcode, start matching operands */ while (*p == ' ') ++p; - + for (opP = &the_ins.operands[0]; *p; opP++) { - + p = crack_operand(p, opP); - + if (opP->error) { the_ins.error=opP->error; return; } } - + opsfound = opP - &the_ins.operands[0]; - + /* This ugly hack is to support the floating pt opcodes in their standard form */ /* Essentially, we fake a first enty of type COP#1 */ if (opcode->m_operands[0] == 'I') { int n; - + for (n=opsfound;n>0;--n) the_ins.operands[n]=the_ins.operands[n-1]; - + /* memcpy((char *)(&the_ins.operands[1]), (char *)(&the_ins.operands[0]), opsfound*sizeof(the_ins.operands[0])); */ memset((char *)(&the_ins.operands[0]), '\0', sizeof(the_ins.operands[0])); the_ins.operands[0].mode=MSCR; the_ins.operands[0].reg=COPNUM; /* COP #1 */ opsfound++; } - + /* We've got the operands. Find an opcode that'll accept them */ for (losing = 0; ; ) { /* if we didn't get the right number of ops, or we have no common model with this pattern then reject this pattern. */ - + if (opsfound != opcode->m_opnum || ((opcode->m_arch & current_architecture) == 0)) { - + ++losing; - + } else { for (s=opcode->m_operands, opP = &the_ins.operands[0]; *s && !losing; s += 2, opP++) { /* Warning: this switch is huge! */ @@ -1314,13 +1314,13 @@ char *instring; || opP->mode == REGLST) losing++; break; - + case '#': if (opP->mode != IMMED) losing++; else { long t; - + t=get_num(opP->con1,80); if (s[1] == 'b' && !isbyte(t)) losing++; @@ -1328,78 +1328,78 @@ char *instring; losing++; } break; - + case '^': case 'T': if (opP->mode != IMMED) losing++; break; - + case '$': if (opP->mode == MSCR || opP->mode == AREG || opP->mode == IMMED || opP->reg == PC || opP->reg == ZPC || opP->mode == REGLST) losing++; break; - + case '%': if (opP->mode == MSCR || opP->reg == PC || opP->reg == ZPC || opP->mode == REGLST) losing++; break; - - + + case '&': if (opP->mode == MSCR || opP->mode == DREG || opP->mode == AREG || opP->mode == IMMED || opP->reg == PC || opP->reg == ZPC || opP->mode == AINC || opP->mode == ADEC || opP->mode == REGLST) losing++; break; - + case '*': if (opP->mode == MSCR || opP->mode == REGLST) losing++; break; - + case '+': if (opP->mode != AINC) losing++; break; - + case '-': if (opP->mode != ADEC) losing++; break; - + case '/': if (opP->mode == MSCR || opP->mode == AREG || opP->mode == AINC || opP->mode == ADEC || opP->mode == IMMED || opP->mode == REGLST) losing++; break; - + case ';': if (opP->mode == MSCR || opP->mode == AREG || opP->mode == REGLST) losing++; break; - + case '?': if (opP->mode == MSCR || opP->mode == AREG || opP->mode == AINC || opP->mode == ADEC || opP->mode == IMMED || opP->reg == PC || opP->reg == ZPC || opP->mode == REGLST) losing++; break; - + case '@': if (opP->mode == MSCR || opP->mode == AREG || opP->mode == IMMED || opP->mode == REGLST) losing++; break; - + case '~': /* For now! (JF FOO is this right?) */ if (opP->mode == MSCR || opP->mode == DREG || opP->mode == AREG || opP->mode == IMMED || opP->reg == PC || opP->reg == ZPC || opP->mode == REGLST) losing++; break; - + case 'A': if (opP->mode != AREG) losing++; @@ -1416,34 +1416,34 @@ char *instring; && instring[3] == 'r')) losing++; break; - + case 'C': if (opP->mode != MSCR || opP->reg != CCR) losing++; break; - + case 'd': /* FOO This mode is a KLUDGE!! */ if (opP->mode != AOFF && (opP->mode != ABSL || opP->con1->e_beg[0] != '(' || opP->con1->e_end[0] != ')')) losing++; break; - + case 'D': if (opP->mode != DREG) losing++; break; - + case 'F': if (opP->mode != MSCR || opP->reg<(FPREG+0) || opP->reg>(FPREG+7)) losing++; break; - + case 'I': if (opP->mode != MSCR || opP->reg<COPNUM || opP->reg >= COPNUM+7) losing++; break; - + case 'J': if (opP->mode != MSCR || opP->reg < USP @@ -1468,12 +1468,12 @@ char *instring; losing++; } /* doesn't cut it */ break; - + case 'k': if (opP->mode != IMMED) losing++; break; - + case 'l': case 'L': if (opP->mode == DREG || opP->mode == AREG || opP->mode == FPREG) { @@ -1490,56 +1490,56 @@ char *instring; else if (s[1] == '3' && opP->reg&0x7000000) losing++; break; - + case 'M': if (opP->mode != IMMED) losing++; else { long t; - + t=get_num(opP->con1,80); if (!issbyte(t) || isvar(opP->con1)) losing++; } break; - + case 'O': if (opP->mode != DREG && opP->mode != IMMED) losing++; break; - + case 'Q': if (opP->mode != IMMED) losing++; else { long t; - + t=get_num(opP->con1,80); if (t<1 || t>8 || isvar(opP->con1)) losing++; } break; - + case 'R': if (opP->mode != DREG && opP->mode != AREG) losing++; break; - + case 's': if (opP->mode != MSCR || !(opP->reg == FPI || opP->reg == FPS || opP->reg == FPC)) losing++; break; - + case 'S': if (opP->mode != MSCR || opP->reg != SR) losing++; break; - + case 'U': if (opP->mode != MSCR || opP->reg != USP) losing++; break; - + /* JF these are out of order. We could put them in order if we were willing to put up with bunches of #ifdef m68851s in the code */ @@ -1550,41 +1550,41 @@ char *instring; opP->mode == AREG || opP->mode == REGLST) losing++; break; - + case 'f': if (opP->mode != MSCR || (opP->reg != SFC && opP->reg != DFC)) losing++; break; - + case 'P': if (opP->mode != MSCR || (opP->reg != TC && opP->reg != CAL && opP->reg != VAL && opP->reg != SCC && opP->reg != AC)) losing++; break; - + case 'V': if (opP->reg != VAL) losing++; break; - + case 'W': if (opP->mode != MSCR || (opP->reg != DRP && opP->reg != SRP && opP->reg != CRP)) losing++; break; - + case 'X': if (opP->mode != MSCR || (!(opP->reg >= BAD && opP->reg <= BAD+7) && !(opP->reg >= BAC && opP->reg <= BAC+7))) losing++; break; - + case 'Y': if (opP->reg != PSR) losing++; break; - + case 'Z': if (opP->reg != PCSR) losing++; @@ -1598,7 +1598,7 @@ char *instring; losing++; } /* not a cache specifier. */ break; - + case '_': if (opP->mode != ABSL) { ++losing; @@ -1609,38 +1609,38 @@ char *instring; as_fatal("Internal error: Operand mode %c unknown in line %s of file \"%s\"", *s, __LINE__, __FILE__); } /* switch on type of operand */ - + if (losing) break; } /* for each operand */ } /* if immediately wrong */ - + if (!losing) { break; } /* got it. */ - + opcode = opcode->m_next; - + if (!opcode) { the_ins.error = "instruction/operands mismatch"; return; } /* Fell off the end */ - + losing = 0; } - + /* now assemble it */ - + the_ins.args=opcode->m_operands; the_ins.numargs=opcode->m_opnum; the_ins.numo=opcode->m_codenum; the_ins.opcode[0]=getone(opcode); the_ins.opcode[1]=gettwo(opcode); - + for (s = the_ins.args, opP = &the_ins.operands[0]; *s; s += 2, opP++) { /* This switch is a doozy. Watch the first step; its a big one! */ switch (s[0]) { - + #ifdef PIC case ' ': /* this operand is just here to indicate a jump-table branch */ @@ -1712,7 +1712,7 @@ char *instring; addword(nextword); baseo=0; break; - + case 'f': baseo=2; outro=8; @@ -1735,7 +1735,7 @@ char *instring; } if (!baseo) break; - + if (literal) { if (seg(opP->con1) == SEG_BIG) goto bignum; @@ -1747,7 +1747,7 @@ char *instring; addword(nextword); break; } - + /* We gotta put out some float */ if (seg(opP->con1) != SEG_BIG) { int_to_gen(nextword); @@ -1790,10 +1790,10 @@ char *instring; tmpreg=0x18+opP->reg-ADDR; /* 3.areg */ break; case AOFF: - + nextword=get_num(opP->con1,80); /* Force into index mode. Hope this works */ - + /* We do the first bit for 32-bit displacements, and the second bit for 16 bit ones. It is possible that we should make the default be @@ -1801,13 +1801,13 @@ char *instring; break GCC, so we put up with a little inefficiency for the sake of working output. */ - + if ( !issword(nextword) || ( isvar(opP->con1) && ((opP->con1->e_siz == 0 && flagseen['l'] == 0) || opP->con1->e_siz == 3))) { - + if (opP->reg == PC) tmpreg=0x3B; /* 7.3 */ else @@ -1830,7 +1830,7 @@ char *instring; tmpreg=0x3A; /* 7.2 */ else tmpreg=0x28+opP->reg-ADDR; /* 5.areg */ - + if (isvar(opP->con1)) { if (opP->reg == PC) { add_fix('w',opP->con1,1,NO_RELOC); @@ -1840,7 +1840,7 @@ char *instring; } addword(nextword); break; - + case APODX: case AMIND: case APRDX: @@ -1860,14 +1860,14 @@ char *instring; nextword|=0x80; tmpreg=0x30; /* 6.garbage */ } else tmpreg=0x30+opP->reg-ADDR; /* 6.areg */ - + siz1= (opP->con1) ? opP->con1->e_siz : 0; siz2= (opP->con2) ? opP->con2->e_siz : 0; - + /* Index register stuff */ if (opP->ireg >= DATA+0 && opP->ireg <= ADDR+7) { nextword|=(opP->ireg-DATA)<<12; - + if (opP->isiz == 0 || opP->isiz == 3) nextword|=0x800; switch (opP->imul) { @@ -1879,7 +1879,7 @@ char *instring; } /* IF its simple, GET US OUT OF HERE! */ - + /* Must be INDEX, with an index register. Address register cannot be ZERO-PC, and either @@ -1899,7 +1899,7 @@ char *instring; } } else nextword|=0x40; /* No index reg */ - + /* It aint simple */ nextword|=0x100; /* If the guy specified a width, we assume that @@ -1912,7 +1912,7 @@ char *instring; nextword|=0x30; } else if (baseo == 0) nextword|=0x10; - else { + else { nextword|=0x20; siz1=2; } @@ -1926,7 +1926,7 @@ char *instring; nextword|=0x30; break; } - + /* Figure out innner displacement stuff */ if (opP->mode != AINDX) { switch (siz2) { @@ -1936,7 +1936,7 @@ char *instring; nextword|=0x3; } else if (outro == 0) nextword|=0x1; - else { + else { nextword|=0x2; siz2=2; } @@ -1954,7 +1954,7 @@ char *instring; else if (opP->mode == AMIND) nextword|=0x40; } addword(nextword); - + if (isvar(opP->con1)) { if (opP->reg == PC || opP->reg == ZPC) { add_fix(siz1 == 3 ? 'l' : 'w',opP->con1,1,NO_RELOC); @@ -1966,7 +1966,7 @@ char *instring; addword(baseo>>16); if (siz1) addword(baseo); - + if (isvar(opP->con2)) { if (opP->reg == PC || opP->reg == ZPC) { add_fix(siz2 == 3 ? 'l' : 'w',opP->con2,1,NO_RELOC); @@ -1978,9 +1978,9 @@ char *instring; addword(outro>>16); if (siz2) addword(outro); - + break; - + case ABSL: nextword=get_num(opP->con1,80); switch (opP->con1->e_siz) { @@ -2010,16 +2010,16 @@ char *instring; case 3: /* Fall through into long */ if (isvar(opP->con1)) add_fix('l',opP->con1,0,NO_RELOC); - + tmpreg=0x39; /* 7.1 mode */ addword(nextword>>16); addword(nextword); break; - + case 2: /* Word */ if (isvar(opP->con1)) add_fix('w',opP->con1,0,NO_RELOC); - + tmpreg=0x38; /* 7.0 mode */ addword(nextword); break; @@ -2032,7 +2032,7 @@ char *instring; } install_gen_operand(s[1],tmpreg); break; - + case '#': case '^': switch (s[1]) { /* JF: I hate floating point! */ @@ -2086,14 +2086,14 @@ char *instring; as_fatal("Internal error: Unknown mode #%c in line %s of file \"%s\"", s[1], __LINE__, __FILE__); } break; - + case '+': case '-': case 'A': case 'a': install_operand(s[1], opP->reg - ADDR); break; - + case 'B': tmpreg = get_num(opP->con1, 80); switch (s[1]) { @@ -2129,7 +2129,7 @@ char *instring; #endif /* PIC */ if (subs(opP->con1)) /* We can't relax it */ goto long_branch; - + /* This could either be a symbol, or an absolute address. No matter, the frag hacking will finger it out. @@ -2155,7 +2155,7 @@ char *instring; add_frag(adds(opP->con1),offs(opP->con1),TAB(DBCC,SZ_UNDEF)); break; } - + /* Don't ask! */ opP->con1->e_exp.X_add_number+=2; add_fix('w',opP->con1,1,NO_RELOC); @@ -2191,16 +2191,16 @@ char *instring; s[1], __LINE__, __FILE__); } break; - + case 'C': /* Ignore it */ break; - + case 'd': /* JF this is a kludge */ if (opP->mode == AOFF) { install_operand('s',opP->reg-ADDR); } else { char *tmpP; - + tmpP=opP->con1->e_end-2; opP->con1->e_beg++; opP->con1->e_end-=4; /* point to the , */ @@ -2218,22 +2218,22 @@ char *instring; } addword(tmpreg); break; - + case 'D': install_operand(s[1],opP->reg-DATA); break; - + case 'F': install_operand(s[1],opP->reg-FPREG); break; - + case 'I': tmpreg=1+opP->reg-COPNUM; if (tmpreg == 8) tmpreg=0; install_operand(s[1],tmpreg); break; - + case 'J': /* JF foo */ switch (opP->reg) { case SFC: tmpreg=0x000; break; @@ -2244,7 +2244,7 @@ char *instring; case ITT1: tmpreg=0x005; break; case DTT0: tmpreg=0x006; break; case DTT1: tmpreg=0x007; break; - + case USP: tmpreg=0x800; break; case VBR: tmpreg=0x801; break; case CAAR: tmpreg=0x802; break; @@ -2258,12 +2258,12 @@ char *instring; } install_operand(s[1],tmpreg); break; - + case 'k': tmpreg=get_num(opP->con1,55); install_operand(s[1],tmpreg&0x7f); break; - + case 'l': tmpreg=opP->reg; if (s[1] == 'w') { @@ -2276,7 +2276,7 @@ char *instring; install_operand(s[1],reverse_8_bits(tmpreg>>16)); } break; - + case 'L': tmpreg=opP->reg; if (s[1] == 'w') { @@ -2294,32 +2294,32 @@ char *instring; install_operand(s[1],tmpreg>>16); } break; - + case 'M': install_operand(s[1],get_num(opP->con1,60)); break; - + case 'O': tmpreg= (opP->mode == DREG) ? 0x20+opP->reg-DATA : (get_num(opP->con1,40)&0x1F); install_operand(s[1],tmpreg); break; - + case 'Q': tmpreg=get_num(opP->con1,10); if (tmpreg == 8) tmpreg=0; install_operand(s[1],tmpreg); break; - + case 'R': /* This depends on the fact that ADDR registers are eight more than their corresponding DATA regs, so the result will have the ADDR_REG bit set */ install_operand(s[1],opP->reg-DATA); break; - + case 's': if (opP->reg == FPI) tmpreg=0x1; else if (opP->reg == FPS) tmpreg=0x2; @@ -2327,17 +2327,17 @@ char *instring; else as_fatal("failed sanity check."); install_operand(s[1],tmpreg); break; - + case 'S': /* Ignore it */ break; - + case 'T': install_operand(s[1],get_num(opP->con1,30)); break; - + case 'U': /* Ignore it */ break; - + case 'c': switch (opP->reg) { case NC: tmpreg = 0; break; @@ -2364,7 +2364,7 @@ char *instring; } install_operand(s[1],tmpreg); break; - + case 'P': switch (opP->reg) { case TC: @@ -2387,15 +2387,15 @@ char *instring; } install_operand(s[1],tmpreg); break; - + case 'V': if (opP->reg == VAL) break; as_fatal("failed sanity check."); - + case 'W': switch (opP->reg) { - + case DRP: tmpreg=1; break; @@ -2410,19 +2410,19 @@ char *instring; } install_operand(s[1],tmpreg); break; - + case 'X': switch (opP->reg) { case BAD: case BAD+1: case BAD+2: case BAD+3: case BAD+4: case BAD+5: case BAD+6: case BAD+7: tmpreg = (4 << 10) | ((opP->reg - BAD) << 2); break; - + case BAC: case BAC+1: case BAC+2: case BAC+3: case BAC+4: case BAC+5: case BAC+6: case BAC+7: tmpreg = (5 << 10) | ((opP->reg - BAC) << 2); break; - + default: as_fatal("failed sanity check."); } @@ -2454,12 +2454,12 @@ char *instring; * | <empty> * ; * - + * The idea here must be to scan in a set of registers but I don't * understand it. Looks awfully sloppy to me but I don't have any doc on * this format so... - - * + + * * */ @@ -2473,12 +2473,12 @@ char *str; unsigned long cur_regs = 0; int reg1, reg2; - + #define ADD_REG(x) { if (x == FPI) cur_regs|=(1<<24);\ else if (x == FPS) cur_regs|=(1<<25);\ else if (x == FPC) cur_regs|=(1<<26);\ else cur_regs|=(1<<(x-1)); } - + reg1=i; for (;;) { if (*str == '/') { @@ -2522,7 +2522,7 @@ int in; { int out=0; int n; - + static int mask[16] = { 0x0001,0x0002,0x0004,0x0008,0x0010,0x0020,0x0040,0x0080, 0x0100,0x0200,0x0400,0x0800,0x1000,0x2000,0x4000,0x8000 @@ -2539,11 +2539,11 @@ int in; { int out=0; int n; - + static int mask[8] = { 0x0001,0x0002,0x0004,0x0008,0x0010,0x0020,0x0040,0x0080, }; - + for (n=0;n<8;n++) { if (in&mask[n]) out|=mask[7-n]; @@ -2594,7 +2594,7 @@ int val; the_ins.opcode[1]|=val<<5; break; #endif - + case 't': the_ins.opcode[1]|=(val<<10)|(val<<7); break; @@ -2673,7 +2673,7 @@ register struct m68k_op *opP; register int parens; register int c; register char *beg_str; - + if (!str) { return str; } @@ -2782,8 +2782,8 @@ char *str; int m,n = 0; char *to_beg_P; int shorts_this_frag; - - + + if (current_architecture == 0) { current_architecture = (m68020 #ifndef NO_68881 @@ -2794,7 +2794,7 @@ char *str; #endif ); } /* default current_architecture */ - + memset((char *)(&the_ins), '\0', sizeof(the_ins)); /* JF for paranoia sake */ m68k_ip(str); er=the_ins.error; @@ -2809,7 +2809,7 @@ char *str; as_bad("\"%s\" -- Statement '%s' ignored",er,str); return; } - + if (the_ins.nfrag == 0) { /* No frag hacking involved; just put it out */ toP=frag_more(2*the_ins.numo); fromP= &the_ins.opcode[0]; @@ -2824,11 +2824,11 @@ char *str; } return; } - + /* There's some frag hacking */ for (n=0,fromP= &the_ins.opcode[0];n<the_ins.nfrag;n++) { int wid; - + if (n == 0) wid=2*the_ins.fragb[n].fragoff; else wid=2*(the_ins.numo-the_ins.fragb[n-1].fragoff); toP=frag_more(wid); @@ -2888,17 +2888,17 @@ void at compile time. Or even just xstr the table and use it as-is. But my lord ghod hath spoken, so we do it this way. Excuse the ugly var names. */ - + register const struct m68k_opcode *ins; register struct m68k_incant *hack, *slak; register char *retval = 0; /* empty string, or error msg text */ register unsigned int i; register char c; - + if ((op_hash = hash_new()) == NULL) as_fatal("Virtual memory exhausted"); - + obstack_begin(&robyn,4000); for (ins = m68k_opcodes; ins < endop; ins++) { hack=slak=(struct m68k_incant *)obstack_alloc(&robyn,sizeof(struct m68k_incant)); @@ -2919,16 +2919,16 @@ void slak->m_next=0; slak=slak->m_next; } while (slak); - + retval = hash_insert (op_hash, ins->name,(char *)hack); /* Didn't his mommy tell him about null pointers? */ if (retval && *retval) as_fatal("Internal Error: Can't hash %s: %s",ins->name,retval); } - + for (i = 0; i < sizeof(mklower_table) ; i++) mklower_table[i] = (isupper(c = (char) i)) ? tolower(c) : c; - + for (i = 0 ; i < sizeof(notend_table) ; i++) { notend_table[i] = 0; alt_notend_table[i] = 0; @@ -2980,7 +2980,7 @@ int *sizeP; LITTLENUM_TYPE *wordP; char *t; char *atof_ieee(); - + switch (type) { case 'f': case 'F': @@ -2988,24 +2988,24 @@ int *sizeP; case 'S': prec = 2; break; - + case 'd': case 'D': case 'r': case 'R': prec = 4; break; - + case 'x': case 'X': prec = 6; break; - + case 'p': case 'P': prec = 6; break; - + default: *sizeP=0; return "Bad call to MD_ATOF()"; @@ -3013,7 +3013,7 @@ int *sizeP; t=atof_ieee(input_line_pointer,type,words); if (t) input_line_pointer=t; - + *sizeP=prec * sizeof(LITTLENUM_TYPE); for (wordP=words;prec--;) { md_number_to_chars(litP,(long)(*wordP++),sizeof(LITTLENUM_TYPE)); @@ -3060,7 +3060,7 @@ fixS *fixP; long val; { char *buf = fixP->fx_where + fixP->fx_frag->fr_literal; - + switch (fixP->fx_size) { case 1: *buf++ = val; @@ -3092,10 +3092,10 @@ register fragS *fragP; { long disp; long ext = 0; - + /* Address in object code of the displacement. */ register int object_address = fragP->fr_fix + fragP->fr_address; - + #ifdef IBM_COMPILER_SUX /* This is wrong but it convinces the native rs6000 compiler to generate the code we want. */ @@ -3105,13 +3105,13 @@ register fragS *fragP; /* Address in gas core of the place to store the displacement. */ register char *buffer_address = fragP->fr_fix + fragP->fr_literal; #endif /* IBM_COMPILER_SUX */ - + /* No longer true: know(fragP->fr_symbol); */ - + /* The displacement of the address, from current location. */ disp = fragP->fr_symbol ? S_GET_VALUE(fragP->fr_symbol) : 0; disp = (disp + fragP->fr_offset) - object_address; - + switch (fragP->fr_subtype) { case TAB(BCC68000,BYTE): case TAB(BRANCH,BYTE): @@ -3137,7 +3137,7 @@ register fragS *fragP; fragP->fr_opcode[0]= 0x4E; fragP->fr_opcode[1]= 0xB9; /* JBSR with ABSL LONG offset */ subseg_change(SEG_TEXT, 0); - + fix_new(fragP, fragP->fr_fix, 4, @@ -3146,7 +3146,7 @@ register fragS *fragP; fragP->fr_offset, 0, FIX_NO_RELOC); - + fragP->fr_fix+=4; ext=0; } else if (fragP->fr_opcode[0] == 0x60) { @@ -3170,15 +3170,15 @@ register fragS *fragP; /* change bcc into b!cc/jmp absl long */ fragP->fr_opcode[0] ^= 0x01; /* invert bcc */ fragP->fr_opcode[1] = 0x6; /* branch offset = 6 */ - + /* JF: these used to be fr_opcode[2,3], but they may be in a different frag, in which case refering to them is a no-no. Only fr_opcode[0,1] are guaranteed to work. */ - *buffer_address++ = 0x4e; /* put in jmp long (0x4ef9) */ - *buffer_address++ = 0xf9; + *buffer_address++ = 0x4e; /* put in jmp long (0x4ef9) */ + *buffer_address++ = 0xf9; fragP->fr_fix += 2; /* account for jmp instruction */ subseg_change(SEG_TEXT,0); - fix_new(fragP, fragP->fr_fix, 4, fragP->fr_symbol, 0, + fix_new(fragP, fragP->fr_fix, 4, fragP->fr_symbol, 0, fragP->fr_offset,0, FIX_NO_RELOC); fragP->fr_fix += 4; @@ -3189,15 +3189,15 @@ register fragS *fragP; /* change dbcc into dbcc/jmp absl long */ /* JF: these used to be fr_opcode[2-7], but that's wrong */ *buffer_address++ = 0x00; /* branch offset = 4 */ - *buffer_address++ = 0x04; - *buffer_address++ = 0x60; /* put in bra pc+6 */ - *buffer_address++ = 0x06; - *buffer_address++ = 0x4e; /* put in jmp long (0x4ef9) */ - *buffer_address++ = 0xf9; - + *buffer_address++ = 0x04; + *buffer_address++ = 0x60; /* put in bra pc+6 */ + *buffer_address++ = 0x06; + *buffer_address++ = 0x4e; /* put in jmp long (0x4ef9) */ + *buffer_address++ = 0xf9; + fragP->fr_fix += 6; /* account for bra/jmp instructions */ subseg_change(SEG_TEXT,0); - fix_new(fragP, fragP->fr_fix, 4, fragP->fr_symbol, 0, + fix_new(fragP, fragP->fr_fix, 4, fragP->fr_symbol, 0, fragP->fr_offset,0, FIX_NO_RELOC); fragP->fr_fix += 4; @@ -3247,15 +3247,15 @@ register fragS *fragP; /* buffer_address+=2; */ ext=4; break; - + } /* switch on subtype */ - + if (ext) { md_number_to_chars(buffer_address, (long) disp, (int) ext); fragP->fr_fix += ext; /* H_SET_TEXT_SIZE(headers, H_GET_TEXT_SIZE(headers) + ext); */ } /* if extending */ - + return; } /* md_convert_frag() */ @@ -3268,12 +3268,12 @@ segT segment; { int old_fix; register char *buffer_address = fragP->fr_fix + fragP->fr_literal; - + old_fix = fragP->fr_fix; - + /* handle SZ_UNDEF first, it can be changed to BYTE or SHORT */ switch (fragP->fr_subtype) { - + case TAB(BRANCH,SZ_UNDEF): { if ((fragP->fr_symbol != NULL) /* Not absolute */ && S_GET_SEGMENT(fragP->fr_symbol) == segment) { @@ -3286,7 +3286,7 @@ segT segment; fragP->fr_opcode[0]= 0x4E; fragP->fr_opcode[1]= 0xB9; /* JSR with ABSL LONG offset */ subseg_change(SEG_TEXT, 0); - fix_new(fragP, fragP->fr_fix, 4, + fix_new(fragP, fragP->fr_fix, 4, fragP->fr_symbol, 0, fragP->fr_offset, 0, FIX_NO_RELOC); fragP->fr_fix+=4; frag_wane(fragP); @@ -3294,7 +3294,7 @@ segT segment; fragP->fr_opcode[0]= 0x4E; fragP->fr_opcode[1]= 0xF9; /* JMP with ABSL LONG offset */ subseg_change(SEG_TEXT, 0); - fix_new(fragP, fragP->fr_fix, 4, + fix_new(fragP, fragP->fr_fix, 4, fragP->fr_symbol, 0, fragP->fr_offset, 0, FIX_NO_RELOC); fragP->fr_fix+=4; frag_wane(fragP); @@ -3322,10 +3322,10 @@ segT segment; frag_wane(fragP); break; } - + break; } /* case TAB(BRANCH,SZ_UNDEF) */ - + case TAB(FBRANCH,SZ_UNDEF): { if (S_GET_SEGMENT(fragP->fr_symbol) == segment || flagseen['l']) { fragP->fr_subtype = TAB(FBRANCH,SHORT); @@ -3336,7 +3336,7 @@ segT segment; } break; } /* TAB(FBRANCH,SZ_UNDEF) */ - + case TAB(PCREL,SZ_UNDEF): { if (S_GET_SEGMENT(fragP->fr_symbol) == segment || flagseen['l']) { fragP->fr_subtype = TAB(PCREL,SHORT); @@ -3347,7 +3347,7 @@ segT segment; } break; } /* TAB(PCREL,SZ_UNDEF) */ - + case TAB(BCC68000,SZ_UNDEF): { if ((fragP->fr_symbol != NULL) && S_GET_SEGMENT(fragP->fr_symbol) == segment) { @@ -3360,28 +3360,28 @@ segT segment; if (flagseen['l']) { fragP->fr_opcode[1] = 0x04; /* branch offset = 6 */ /* JF: these were fr_opcode[2,3] */ - buffer_address[0] = 0x4e; /* put in jmp long (0x4ef9) */ + buffer_address[0] = 0x4e; /* put in jmp long (0x4ef9) */ buffer_address[1] = 0xf8; fragP->fr_fix += 2; /* account for jmp instruction */ subseg_change(SEG_TEXT,0); - fix_new(fragP, fragP->fr_fix, 2, fragP->fr_symbol, 0, + fix_new(fragP, fragP->fr_fix, 2, fragP->fr_symbol, 0, fragP->fr_offset, 0, FIX_NO_RELOC); fragP->fr_fix += 2; } else { fragP->fr_opcode[1] = 0x06; /* branch offset = 6 */ /* JF: these were fr_opcode[2,3] */ - buffer_address[2] = 0x4e; /* put in jmp long (0x4ef9) */ + buffer_address[2] = 0x4e; /* put in jmp long (0x4ef9) */ buffer_address[3] = 0xf9; fragP->fr_fix += 2; /* account for jmp instruction */ subseg_change(SEG_TEXT,0); - fix_new(fragP, fragP->fr_fix, 4, fragP->fr_symbol, 0, + fix_new(fragP, fragP->fr_fix, 4, fragP->fr_symbol, 0, fragP->fr_offset, 0, FIX_NO_RELOC); fragP->fr_fix += 4; } frag_wane(fragP); break; } /* case TAB(BCC68000,SZ_UNDEF) */ - + case TAB(DBCC,SZ_UNDEF): { if (fragP->fr_symbol != NULL && S_GET_SEGMENT(fragP->fr_symbol) == segment) { fragP->fr_subtype=TAB(DBCC,SHORT); @@ -3392,9 +3392,9 @@ segT segment; /* change dbcc into dbcc/jmp absl long */ /* JF: these used to be fr_opcode[2-4], which is wrong. */ buffer_address[0] = 0x00; /* branch offset = 4 */ - buffer_address[1] = 0x04; + buffer_address[1] = 0x04; buffer_address[2] = 0x60; /* put in bra pc + ... */ - + if (flagseen['l']) { /* JF: these were fr_opcode[5-7] */ buffer_address[3] = 0x04; /* plus 4 */ @@ -3402,25 +3402,25 @@ segT segment; buffer_address[5] = 0xf8; fragP->fr_fix += 6; /* account for bra/jmp instruction */ subseg_change(SEG_TEXT,0); - fix_new(fragP, fragP->fr_fix, 2, fragP->fr_symbol, 0, + fix_new(fragP, fragP->fr_fix, 2, fragP->fr_symbol, 0, fragP->fr_offset, 0, FIX_NO_RELOC); fragP->fr_fix += 2; } else { /* JF: these were fr_opcode[5-7] */ buffer_address[3] = 0x06; /* Plus 6 */ - buffer_address[4] = 0x4e; /* put in jmp long (0x4ef9) */ - buffer_address[5] = 0xf9; + buffer_address[4] = 0x4e; /* put in jmp long (0x4ef9) */ + buffer_address[5] = 0xf9; fragP->fr_fix += 6; /* account for bra/jmp instruction */ subseg_change(SEG_TEXT,0); - fix_new(fragP, fragP->fr_fix, 4, fragP->fr_symbol, 0, + fix_new(fragP, fragP->fr_fix, 4, fragP->fr_symbol, 0, fragP->fr_offset, 0, FIX_NO_RELOC); fragP->fr_fix += 4; } - + frag_wane(fragP); break; } /* case TAB(DBCC,SZ_UNDEF) */ - + case TAB(PCLEA,SZ_UNDEF): { if ((S_GET_SEGMENT(fragP->fr_symbol)) == segment || flagseen['l']) { fragP->fr_subtype=TAB(PCLEA,SHORT); @@ -3431,12 +3431,12 @@ segT segment; } break; } /* TAB(PCLEA,SZ_UNDEF) */ - + default: break; - + } /* switch on subtype looking for SZ_UNDEF's. */ - + /* now that SZ_UNDEF are taken care of, check others */ switch (fragP->fr_subtype) { case TAB(BCC68000,BYTE): @@ -3456,7 +3456,7 @@ segT segment; } #if defined(OBJ_AOUT) | defined(OBJ_BOUT) -/* the bit-field entries in the relocation_info struct plays hell +/* the bit-field entries in the relocation_info struct plays hell with the byte-order problems of cross-assembly. So as a hack, I added this mach. dependent ri twiddler. Ugly, but it gets you there. -KWK */ @@ -3478,8 +3478,8 @@ struct reloc_info_generic *ri; the_bytes[4] = (ri->r_symbolnum >> 16) & 0x0ff; the_bytes[5] = (ri->r_symbolnum >> 8) & 0x0ff; the_bytes[6] = ri->r_symbolnum & 0x0ff; - the_bytes[7] = (((ri->r_pcrel << 7) & 0x80) | ((ri->r_length << 5) & 0x60) | - ((ri->r_extern << 4) & 0x10)); + the_bytes[7] = (((ri->r_pcrel << 7) & 0x80) | ((ri->r_length << 5) & 0x60) | + ((ri->r_extern << 4) & 0x10)); } #endif /* comment */ @@ -3498,11 +3498,11 @@ relax_addressT segment_address_in_file; int r_flags; know(fixP->fx_addsy != NULL); - + md_number_to_chars(where, fixP->fx_frag->fr_address + fixP->fx_where - segment_address_in_file, 4); - + r_symbolnum = (S_IS_DEFINED(fixP->fx_addsy) ? S_GET_TYPE(fixP->fx_addsy) : fixP->fx_addsy->sy_number); @@ -3535,12 +3535,12 @@ relax_addressT segment_address_in_file; break; } #endif /* PIC */ - + where[4] = (r_symbolnum >> 16) & 0x0ff; where[5] = (r_symbolnum >> 8) & 0x0ff; where[6] = r_symbolnum & 0x0ff; where[7] = r_flags; - + return; } /* tc_aout_fix_to_chars() */ @@ -3559,9 +3559,9 @@ fragS *frag; symbolS *to_symbol; { long offset; - + offset = to_addr - (from_addr+2); - + md_number_to_chars(ptr ,(long)0x6000,2); md_number_to_chars(ptr+2,(long)offset,2); } @@ -3575,7 +3575,7 @@ fragS *frag; symbolS *to_symbol; { long offset; - + if (cpu_of_arch(current_architecture) < m68020) { offset=to_addr-S_GET_VALUE(to_symbol); md_number_to_chars(ptr ,(long)0x4EF9,2); @@ -3591,7 +3591,7 @@ symbolS *to_symbol; #endif /* Different values of OK tell what its OK to return. Things that aren't OK are an error (what a shock, no?) - + 0: Everything is OK 10: Absolute 1:8 only 20: Absolute 0:7 only @@ -3602,7 +3602,7 @@ symbolS *to_symbol; 60: absolute -128:127 only 70: absolute 0:4095 only 80: No bignums - + */ static int get_num(exp,ok) @@ -3611,7 +3611,7 @@ int ok; { #ifdef TEST2 long l = 0; - + if (!exp->e_beg) return 0; if (*exp->e_beg == '0') { @@ -3625,7 +3625,7 @@ int ok; #else char *save_in; char c_save; - + if (!exp) { /* Can't do anything */ return 0; @@ -3638,7 +3638,7 @@ int ok; as_warn("Null expression defaults to %ld",offs(exp)); return 0; } - + exp->e_siz=0; if (/* ok != 80 && */exp->e_end[-1] == ':' && (exp->e_end-exp->e_beg) >= 2) { switch (exp->e_end[0]) { @@ -3673,7 +3673,7 @@ int ok; offs(exp)= (ok == 10) ? 1 : 0; as_warn("Unknown expression: '%s' defaulting to %d",exp->e_beg,offs(exp)); break; - + case SEG_ABSENT: /* Do the same thing the VAX asm does */ seg(exp)=SEG_ABSOLUTE; @@ -3744,7 +3744,7 @@ int ok; case SEG_BIG: if (ok == 80 && offs(exp)<0) { /* HACK! Turn it into a long */ LITTLENUM_TYPE words[6]; - + gen_to_words(words,2,8L);/* These numbers are magic! */ seg(exp)=SEG_ABSOLUTE; adds(exp)=0; @@ -3804,7 +3804,7 @@ static void s_bss() { static void s_even() { register int temp; register long temp_fill; - + temp = 1; /* JF should be 2? */ temp_fill = get_absolute_expression (); if ( ! need_pass_2 ) /* Never make frag if expect extra pass. */ @@ -3851,20 +3851,20 @@ char ***vecP; case 'l': /* -l means keep external to 2 bit offset rather than 16 bit one */ break; - + case 'S': /* -S means that jbsr's always turn into jsr's. */ break; - + case 'A': (*argP)++; /* intentional fall-through */ case 'm': (*argP)++; - + if (**argP == 'c') { (*argP)++; } /* allow an optional "c" */ - + if (!strcmp(*argP, "68000") || !strcmp(*argP, "68008")) { current_architecture |= m68000; @@ -3873,37 +3873,37 @@ char ***vecP; omagic= 1<<16|OMAGIC; #endif current_architecture |= m68010; - - } else if (!strcmp(*argP, "68020")) { + + } else if (!strcmp(*argP, "68020")) { current_architecture |= m68020 | MAYBE_FLOAT_TOO; - - } else if (!strcmp(*argP, "68030")) { + + } else if (!strcmp(*argP, "68030")) { current_architecture |= m68030 | MAYBE_FLOAT_TOO; - - } else if (!strcmp(*argP, "68040")) { + + } else if (!strcmp(*argP, "68040")) { current_architecture |= m68040 | MAYBE_FLOAT_TOO; - + #ifndef NO_68881 } else if (!strcmp(*argP, "68881")) { current_architecture |= m68881; - + } else if (!strcmp(*argP, "68882")) { current_architecture |= m68882; - + #endif /* NO_68881 */ #ifndef NO_68851 - } else if (!strcmp(*argP,"68851")) { + } else if (!strcmp(*argP,"68851")) { current_architecture |= m68851; - + #endif /* NO_68851 */ } else { as_warn("Unknown architecture, \"%s\". option ignored", *argP); } /* switch on architecture */ - + while (**argP) (*argP)++; - + break; - + case 'p': if (!strcmp(*argP,"pic")) { (*argP) += 3; @@ -3911,7 +3911,7 @@ char ***vecP; } else { return(0); } /* pic or not */ - + #ifdef PIC case 'k': /* Predefine GOT symbol */ @@ -3937,7 +3937,7 @@ main() char buf[120]; char *cp; int n; - + m68k_ip_begin(); for (;;) { if (!gets(buf) || !*buf) @@ -3994,20 +3994,20 @@ char *str; #endif /* Possible states for relaxation: - + 0 0 branch offset byte (bra, etc) 0 1 word 0 2 long - + 1 0 indexed offsets byte a0@(32,d4:w:1) etc 1 1 word 1 2 long - + 2 0 two-offset index word-word a0@(32,d4)@(45) etc 2 1 word-long 2 2 long-word 2 3 long-long - + */ @@ -4023,7 +4023,7 @@ print_frags() { fragS *fragP; extern fragS *text_frag_root; - + for (fragP=text_frag_root;fragP;fragP=fragP->fr_next) { printf("addr %lu next 0x%x fix %ld var %ld symbol 0x%x offset %ld\n", fragP->fr_address,fragP->fr_next,fragP->fr_fix,fragP->fr_var,fragP->fr_symbol,fragP->fr_offset); @@ -4045,7 +4045,7 @@ char *name; return 0; } -/* Parse an operand that is machine-specific. +/* Parse an operand that is machine-specific. We just return without modifying the expression if we have nothing to do. */ diff --git a/gnu/usr.bin/as/config/tc-m68k.h b/gnu/usr.bin/as/config/tc-m68k.h index 4ea7482..33d8d96 100644 --- a/gnu/usr.bin/as/config/tc-m68k.h +++ b/gnu/usr.bin/as/config/tc-m68k.h @@ -1,26 +1,26 @@ /* This file is tc-m68k.h Copyright (C) 1987-1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* * This file is tp-generic.h and is intended to be a template for - * target processor specific header files. + * target processor specific header files. */ #define MID_M68K 135 @@ -35,7 +35,7 @@ #define AOUT_MACHTYPE MID_MACHINE #define LOCAL_LABELS_FB - + #define tc_crawl_symbol_chain(a) {;} /* not used */ #define tc_headers_hook(a) {;} /* not used */ #define tc_aout_pre_write_hook(x) {;} /* not used */ diff --git a/gnu/usr.bin/as/config/tc-m68kmote.h b/gnu/usr.bin/as/config/tc-m68kmote.h index 8d98baf..70afae3 100644 --- a/gnu/usr.bin/as/config/tc-m68kmote.h +++ b/gnu/usr.bin/as/config/tc-m68kmote.h @@ -1,26 +1,26 @@ /* This file is tc-m68kmote.h Copyright (C) 1987-1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* * This file is tp-generic.h and is intended to be a template for - * target processor specific header files. + * target processor specific header files. */ #define TC_M68K 1 @@ -32,11 +32,11 @@ #define DEFAULT_MAGIC_NUMBER_FOR_OBJECT_FILE (2<<16|OMAGIC); /* Magic byte for file header */ #endif /* TE_SUN3 */ - + #define AOUT_MACHTYPE 0x2 #define REVERSE_SORT_RELOCS /* FIXME-NOW: this line can be removed. */ #define LOCAL_LABELS_FB - + #define tc_crawl_symbol_chain(a) {;} /* not used */ #define tc_headers_hook(a) {;} /* not used */ #define tc_aout_pre_write_hook(x) {;} /* not used */ @@ -52,7 +52,7 @@ if (aim == 0 && this_state == 4) { /* hard encoded from tc-m68k.c */ \ aim=this_type->rlx_forward+1; /* Force relaxation into word mode */ \ } -#define MRI +#define MRI /* * Local Variables: diff --git a/gnu/usr.bin/as/config/tc-m88k.c b/gnu/usr.bin/as/config/tc-m88k.c index fd7dd86..34c6ba3 100644 --- a/gnu/usr.bin/as/config/tc-m88k.c +++ b/gnu/usr.bin/as/config/tc-m88k.c @@ -4,17 +4,17 @@ Copyright (C) 1989-1992 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -861,7 +861,7 @@ get_vec9 (param, valp) return param; } - + #define hexval(z) \ (isdigit (z) ? (z) - '0' : \ islower (z) ? (z) - 'a' + 10 : \ @@ -1018,33 +1018,33 @@ fixS *fixP; long val; { char *buf = fixP->fx_where + fixP->fx_frag->fr_literal; - + fixP->fx_addnumber = val; - - + + switch (fixP->fx_r_type) { - + case RELOC_IW16: buf[2] = val >> 8; buf[3] = val; break; - + case RELOC_LO16: buf[0] = val >> 8; buf[1] = val; break; - + case RELOC_HI16: buf[0] = val >> 24; buf[1] = val >> 16; break; - + case RELOC_PC16: val += 4; buf[0] = val >> 10; buf[1] = val >> 2; break; - + case RELOC_PC26: val += 4; buf[0] |= (val >> 26) & 0x03; @@ -1052,14 +1052,14 @@ long val; buf[2] = val >> 10; buf[3] = val >> 2; break; - + case RELOC_32: buf[0] = val >> 24; buf[1] = val >> 16; buf[2] = val >> 8; buf[3] = val; break; - + case NO_RELOC: switch (fixP->fx_size) { case 4: @@ -1070,16 +1070,16 @@ long val; case 1: *buf = val; break; - + default: abort (); } - + default: as_bad("bad relocation type: 0x%02x", fixP->fx_r_type); break; } - + return; } /* md_apply_fix() */ @@ -1267,7 +1267,7 @@ emit_relocations (fixP, segment_address_in_file) ri.r_type = fixP->fx_r_type; if (fixP->fx_pcrel) { /* ri.r_addend -= fixP->fx_where; */ - ri.r_addend -= ri.r_address; + ri.r_addend -= ri.r_address; } else { ri.r_addend = fixP->fx_addnumber; } @@ -1281,7 +1281,7 @@ emit_relocations (fixP, segment_address_in_file) #endif /* comment */ /* Translate internal representation of relocation info to target format. - + On m88k: first 4 bytes are normal unsigned long address, next three bytes are index, most sig. byte first. Byte 7 is broken up with bit 7 as external, @@ -1298,9 +1298,9 @@ relax_addressT segment_address_in_file; long r_extern; long r_addend = 0; long r_address; - + know(fixP->fx_addsy); - + if (!S_IS_DEFINED(fixP->fx_addsy)) { r_extern = 1; r_index = fixP->fx_addsy->sy_number; @@ -1308,31 +1308,31 @@ relax_addressT segment_address_in_file; r_extern = 0; r_index = S_GET_TYPE(fixP->fx_addsy); } - + /* this is easy */ md_number_to_chars(where, r_address = fixP->fx_frag->fr_address + fixP->fx_where - segment_address_in_file, 4); - + /* now the fun stuff */ where[4] = (r_index >> 16) & 0x0ff; where[5] = (r_index >> 8) & 0x0ff; where[6] = r_index & 0x0ff; where[7] = ((r_extern << 7) & 0x80) | (0 & 0x70) | (fixP->fx_r_type & 0xf); - + /* Also easy */ if (fixP->fx_addsy->sy_frag) { r_addend = fixP->fx_addsy->sy_frag->fr_address; } - + if (fixP->fx_pcrel) { r_addend -= r_address; } else { r_addend = fixP->fx_addnumber; } - + md_number_to_chars(&where[8], r_addend, 4); - + return; } /* tc_aout_fix_to_chars() */ diff --git a/gnu/usr.bin/as/config/tc-m88k.h b/gnu/usr.bin/as/config/tc-m88k.h index d5960d1..f518085 100644 --- a/gnu/usr.bin/as/config/tc-m88k.h +++ b/gnu/usr.bin/as/config/tc-m88k.h @@ -4,17 +4,17 @@ Copyright (C) 1989-1992 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/gnu/usr.bin/as/config/tc-ns32k.c b/gnu/usr.bin/as/config/tc-ns32k.c index 5843fe5..33fceb5 100644 --- a/gnu/usr.bin/as/config/tc-ns32k.c +++ b/gnu/usr.bin/as/config/tc-ns32k.c @@ -1,18 +1,18 @@ /* ns32k.c -- Assemble on the National Semiconductor 32k series Copyright (C) 1987, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -33,7 +33,7 @@ #include "obstack.h" /* Macros */ -#define IIF_ENTRIES 13 /* number of entries in iif */ +#define IIF_ENTRIES 13 /* number of entries in iif */ #define PRIVATE_SIZE 256 /* size of my garbage memory */ #define MAX_ARGS 4 #define DEFAULT -1 /* addr_mode returns this value when plain constant or label is encountered */ @@ -91,7 +91,7 @@ addr_modeS addr_modeP; char EXP_CHARS[] = "eE"; char FLT_CHARS[] = "fd"; /* we don't want to support lowercase, do we */ -/* UPPERCASE denotes live names +/* UPPERCASE denotes live names * when an instruction is built, IIF is used as an intermidiate form to store * the actual parts of the instruction. A ns32k machine instruction can * be divided into a couple of sub PARTs. When an instruction is assembled @@ -116,7 +116,7 @@ typedef struct { displacement */ int im_disp; /* True if the object is a displacement */ relax_substateT relax_substate; /* Initial relaxsubstate */ - bit_fixS *bit_fixP; /* Pointer at bit_fix struct */ + bit_fixS *bit_fixP; /* Pointer at bit_fix struct */ int addr_mode; /* What addrmode do we associate with this iif-entry */ char bsr; /* Sequent hack */ }iif_entryT; /* Internal Instruction Format */ @@ -128,7 +128,7 @@ struct int_ins_form { struct int_ins_form iif; expressionS exprP; char *input_line_pointer; -/* description of the PARTs in IIF +/* description of the PARTs in IIF *object[n]: * 0 total length in bytes of entries in iif * 1 opcode @@ -142,7 +142,7 @@ char *input_line_pointer; * 9 imm_b * 10 implied1 * 11 implied2 - * + * * For every entry there is a datalength in bytes. This is stored in size[n]. * 0, the objectlength is not explicitly given by the instruction * and the operand is undefined. This is a case for relaxation. @@ -309,12 +309,12 @@ const pseudo_typeS md_pseudo_table[]={ /* so far empty */ #define IND(x,y) (((x)<<2)+(y)) -/* those are index's to relax groups in md_relax_table +/* those are index's to relax groups in md_relax_table ie it must be multiplied by 4 to point at a group start. Viz IND(x,y) Se function relax_segment in write.c for more info */ #define BRANCH 1 -#define PCREL 2 +#define PCREL 2 /* those are index's to entries in a relax group */ @@ -337,7 +337,7 @@ const relax_typeS md_relax_table[] = { { 1, 1, 0, 0 }, { 1, 1, 0, 0 }, { 1, 1, 0, 0 }, - + { (63), (-64), 1, IND(BRANCH,WORD) }, { (8191), (-8192), 2, IND(BRANCH,DOUBLE) }, { 0, 0, 4, 0 }, @@ -381,12 +381,12 @@ static void md_number_to_imm(); #endif /* not __STDC__ */ -/* Parses a general operand into an addressingmode struct - +/* Parses a general operand into an addressingmode struct + in: pointer at operand in ascii form pointer at addr_mode struct for result the level of recursion. (always 0 or 1) - + out: data in addr_mode struct */ int addr_mode(operand,addr_modeP,recursive_level) @@ -412,7 +412,7 @@ int recursive_level; addr_modeP->disp[1]=NULL; str=operand; if (str[0] == 0) {return (0);} /* we don't want this */ - strl=strlen(str); + strl=strlen(str); switch (str[0]) { /* the following three case statements controls the mode-chars this is the place to ed if you want to change them */ @@ -469,7 +469,7 @@ int recursive_level; break; default:; } - strl=strlen(str); + strl=strlen(str); switch (strl) { case 2: switch (str[0]) { @@ -642,7 +642,7 @@ addr_modeS *addr_modeP; register int i; register char *toP; register char *fromP; - + addr_modeP->pcrel=0; if (disp_test[addr_modeP->mode]) { /* there is a displacement */ if (addr_modeP->mode == 27 || addr_modeP->scaled_mode == 27) { /* do we have pcrel. mode */ @@ -699,7 +699,7 @@ unsigned long *default_map; /* default pattern and output */ register int i,j,k,strlen1,strlen2; register char *patternP,*strP; strlen1=strlen(str); - if (strlen1<1) { + if (strlen1<1) { as_fatal("Very short instr to option, ie you can't do it on a NULLstr"); } for (i = 0; optionP[i].pattern != 0; i++) { @@ -717,7 +717,7 @@ unsigned long *default_map; /* default pattern and output */ } } } -/* search struct for symbols +/* search struct for symbols This function is used to get the short integer form of reg names in the instructions lmr, smr, lpr, spr return true if str is found in list */ @@ -787,8 +787,8 @@ char opcode_bit_ptr; get_addr_mode(argv[i],&addr_modeP); iif.instr_size+=addr_modeP.am_size; if (opcode_bit_ptr == desc->opcode_size) b = 4; else b = 6; - for (j=b;j<(b+2);j++) { - if (addr_modeP.disp[j-b]) { + for (j=b;j<(b+2);j++) { + if (addr_modeP.disp[j-b]) { IIF(j, 2, addr_modeP.disp_suffix[j-b], @@ -805,7 +805,7 @@ char opcode_bit_ptr; } opcode_bit_ptr-=5; iif.iifP[1].object|=((long)addr_modeP.mode)<<opcode_bit_ptr; - if (addr_modeP.scaled_reg) { + if (addr_modeP.scaled_reg) { j=b/2; IIF(j,1,1, (unsigned long)addr_modeP.index_byte,0,0,0,0,0, NULL,-1,0); } @@ -920,7 +920,7 @@ int recursive_level; char sqr,sep; char suffix[MAX_ARGS],*argv[MAX_ARGS];/* no more than 4 operands */ if (recursive_level <= 0) { /* called from md_assemble */ - for (lineptr=line; (*lineptr) != '\0' && (*lineptr) != ' '; lineptr++); + for (lineptr=line; (*lineptr) != '\0' && (*lineptr) != ' '; lineptr++); c = *lineptr; *lineptr = '\0'; desc = (struct ns32k_opcode*) hash_find(inst_hash_handle,line); @@ -1001,16 +1001,16 @@ int recursive_level; } else { as_fatal("Wrong number of operands"); } - + } for (i = 0; i < IIF_ENTRIES; i++) { iif.iifP[i].type = 0; /* mark all entries as void*/ } - + /* build opcode iif-entry */ iif.instr_size = desc->opcode_size / 8; IIF(1,1,iif.instr_size,desc->opcode_seed,0,0,0,0,0,0,-1,0); - + /* this call encodes operands to iif format */ if (argc) { encode_operand(argc, @@ -1064,7 +1064,7 @@ void convert_iif() { evaluate_expr(&exprP, (char *)iif.iifP[i].object); if (exprP.X_add_symbol || exprP.X_subtract_symbol) pcrel_symbols++; - } + } } for (i=0;i<IIF_ENTRIES;i++) { if (type=iif.iifP[i].type) { /* the object exist, so handle it */ @@ -1129,7 +1129,7 @@ void convert_iif() { } } else { /* flonum */ LITTLENUM_TYPE words[4]; - + switch (size) { case 4: gen_to_words(words,2,8); @@ -1168,7 +1168,7 @@ void convert_iif() { bit_fixP, iif.iifP[i].bsr, /* sequent hack */ reloc_mode); - + } else { /* good, just put them bytes out */ switch (iif.iifP[i].im_disp) { case 0: @@ -1218,7 +1218,7 @@ void convert_iif() { rem_size-=4; break; /* exit this absolute hack */ } - + if (exprP.X_add_symbol || exprP.X_subtract_symbol) { /* frag it */ if (exprP.X_subtract_symbol) { /* We cant relax this case */ as_fatal("Can't relax difference"); @@ -1231,7 +1231,7 @@ void convert_iif() { obstack_blank_fast(&frags,temp); /* we rewind none, some or all of the requested size we requested by the first frag_more for this iif chunk. - Note: that we allocate 4 bytes to an object we NOT YET + Note: that we allocate 4 bytes to an object we NOT YET know the size of, thus rem_size-4. */ (void) frag_variant(rs_machine_dependent, @@ -1339,12 +1339,12 @@ int *sizeP; LITTLENUM_TYPE *wordP; extern char *atof_ns32k(); char *t; - + switch (type) { case 'f': prec = 2; break; - + case 'd': prec = 4; break; @@ -1355,7 +1355,7 @@ int *sizeP; t = atof_ns32k(input_line_pointer, type, words); if (t) input_line_pointer=t; - + *sizeP = prec * sizeof(LITTLENUM_TYPE); for (wordP = words +prec; prec--;) { md_number_to_chars(litP, (long)(*--wordP), sizeof(LITTLENUM_TYPE)); @@ -1386,19 +1386,19 @@ int nbytes; is the fact that ns32k uses Huffman coded displacements. This implies that the bit order is reversed in displacements and that they are prefixed with a size-tag. - + binary: msb->lsb 0xxxxxxx byte 10xxxxxx xxxxxxxx word 11xxxxxx xxxxxxxx xxxxxxxx xxxxxxxx double word - - This must be taken care of and we do it here! + + This must be taken care of and we do it here! */ static void md_number_to_disp(buf, val, n) char *buf; long val; char n; -{ +{ switch (n) { case 1: if (val < -64 || val > 63) @@ -1464,7 +1464,7 @@ static void md_number_to_imm(buf,val,n) char *buf; long val; char n; -{ +{ switch (n) { case 1: #ifdef SHOW_NUM @@ -1506,13 +1506,13 @@ char n; } /* Translate internal representation of relocation info into target format. - + OVE: on a ns32k the twiddling continues at an even deeper level here we have to distinguish between displacements and immediates. - + The sequent has a bit for this. It also has a bit for relocobjects that points at the target for a bsr (BranchSubRoutine) !?!?!?! - + This md_ri.... is tailored for sequent. */ @@ -1521,7 +1521,7 @@ void md_ri_to_chars(the_bytes, ri) char *the_bytes; struct reloc_info_generic *ri; -{ +{ if (ri->r_bsr) { ri->r_pcrel = 0; } /* sequent seems to want this */ md_number_to_chars(the_bytes, ri->r_address, sizeof(ri->r_address)); md_number_to_chars(the_bytes+4, ((long)(ri->r_symbolnum ) @@ -1551,11 +1551,11 @@ relax_addressT segment_address_in_file; int r_flags; know(fixP->fx_addsy != NULL); - + md_number_to_chars(where, fixP->fx_frag->fr_address + fixP->fx_where - segment_address_in_file, 4); - + r_symbolnum = (S_IS_DEFINED(fixP->fx_addsy) ? S_GET_TYPE(fixP->fx_addsy) : fixP->fx_addsy->sy_number); @@ -1597,12 +1597,12 @@ relax_addressT segment_address_in_file; break; } #endif /* PIC */ - + where[4] = r_symbolnum & 0x0ff; where[5] = (r_symbolnum >> 8) & 0x0ff; where[6] = (r_symbolnum >> 16) & 0x0ff; where[7] = r_flags; - + return; } /* tc_aout_fix_to_chars() */ @@ -1645,7 +1645,7 @@ static void register char *buf; register long val; register bit_fixS *field_ptr; -{ +{ register unsigned long object; register unsigned long mask; /* define ENDIAN on a ns32k machine */ @@ -1706,9 +1706,9 @@ register bit_fixS *field_ptr; /* Apply a fixS (fixup of an instruction or data that we didn't have enough info to complete immediately) to the data in a frag. - + On the ns32k, everything is in a different format, so we have broken - out separate functions for each kind of thing we could be fixing. + out separate functions for each kind of thing we could be fixing. They all get called from here. */ void @@ -1717,21 +1717,21 @@ fixS *fixP; long val; { char *buf = fixP->fx_where + fixP->fx_frag->fr_literal; - + if (fixP->fx_bit_fixP) { /* Bitfields to fix, sigh */ md_number_to_field (buf, val, fixP->fx_bit_fixP); } else switch (fixP->fx_im_disp) { - + case 0: /* Immediate field */ md_number_to_imm (buf, val, fixP->fx_size); break; - + case 1: /* Displacement field */ - md_number_to_disp (buf, + md_number_to_disp (buf, fixP->fx_pcrel? val + fixP->fx_pcrel_adjust: val, fixP->fx_size); break; - + case 2: /* Pointer in a data object */ md_number_to_chars (buf, val, fixP->fx_size); break; @@ -1747,18 +1747,18 @@ register fragS *fragP; { long disp; long ext = 0; - + /* Address in gas core of the place to store the displacement. */ register char *buffer_address = fragP->fr_fix + fragP->fr_literal; /* Address in object code of the displacement. */ register int object_address = fragP->fr_fix + fragP->fr_address; - + know(fragP->fr_symbol); - + /* The displacement of the address, from current location. */ disp = (S_GET_VALUE(fragP->fr_symbol) + fragP->fr_offset) - object_address; disp += fragP->fr_pcrel_adjust; - + switch (fragP->fr_subtype) { case IND(BRANCH,BYTE): ext = 1; @@ -1835,7 +1835,7 @@ fragS *frag; symbolS *to_symbol; { long offset; - + offset = to_addr - from_addr; md_number_to_chars(ptr, (long)0xEA ,1); md_number_to_disp(ptr+1,(long)offset,2); @@ -1850,7 +1850,7 @@ fragS *frag; symbolS *to_symbol; { long offset; - + offset= to_addr - from_addr; md_number_to_chars(ptr, (long)0xEA, 2); md_number_to_disp(ptr+2,(long)offset,4); @@ -1866,7 +1866,7 @@ char ***vecP; switch (**argP) { case 'm': (*argP)++; - + if (!strcmp(*argP,"32032")) { cpureg = cpureg_032; mmureg = mmureg_032; @@ -1875,7 +1875,7 @@ char ***vecP; mmureg = mmureg_532; } else as_warn("Unknown -m option ignored"); - + while (**argP) (*argP)++; break; @@ -1912,9 +1912,9 @@ long max; /* Signextended max for bitfield */ long add; /* Add mask, used for huffman prefix */ { register bit_fixS * bit_fixP; - + bit_fixP = (bit_fixS *)obstack_alloc(¬es,sizeof(bit_fixS)); - + bit_fixP->fx_bit_size = size; bit_fixP->fx_bit_offset = offset; bit_fixP->fx_bit_base = base_type; @@ -1922,7 +1922,7 @@ long add; /* Add mask, used for huffman prefix */ bit_fixP->fx_bit_max = max; bit_fixP->fx_bit_min = min; bit_fixP->fx_bit_add = add; - + return(bit_fixP); } @@ -1969,7 +1969,7 @@ char *name; return 0; } -/* Parse an operand that is machine-specific. +/* Parse an operand that is machine-specific. We just return without modifying the expression if we have nothing to do. */ diff --git a/gnu/usr.bin/as/config/tc-ns32k.h b/gnu/usr.bin/as/config/tc-ns32k.h index e66c21f..8f97304 100644 --- a/gnu/usr.bin/as/config/tc-ns32k.h +++ b/gnu/usr.bin/as/config/tc-ns32k.h @@ -1,18 +1,18 @@ /* tc-ns32k.h -- Opcode table for National Semi 32k processor Copyright (C) 1987, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/gnu/usr.bin/as/config/tc-sparc.c b/gnu/usr.bin/as/config/tc-sparc.c index c503ab0..238e5f7 100644 --- a/gnu/usr.bin/as/config/tc-sparc.c +++ b/gnu/usr.bin/as/config/tc-sparc.c @@ -1,24 +1,24 @@ /* tc-sparc.c -- Assemble for the SPARC Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef lint -static char rcsid[] = "$Id: tc-sparc.c,v 1.2 1993/12/12 17:02:13 jkh Exp $"; +static char rcsid[] = "$Id: tc-sparc.c,v 1.3 1994/12/23 22:37:40 nate Exp $"; #endif #define cypress 1234 @@ -182,48 +182,48 @@ static void s_reserve() { int size; int temp; symbolS *symbolP; - + name = input_line_pointer; c = get_symbol_end(); p = input_line_pointer; *p = c; SKIP_WHITESPACE(); - + if (*input_line_pointer != ',') { as_bad("Expected comma after name"); ignore_rest_of_line(); return; } - + ++input_line_pointer; - + if ((size = get_absolute_expression()) < 0) { as_bad("BSS length (%d.) <0! Ignored.", size); ignore_rest_of_line(); return; } /* bad length */ - + *p = 0; symbolP = symbol_find_or_make(name); *p = c; - + if (strncmp(input_line_pointer, ",\"bss\"", 6) != 0) { as_bad("bad .reserve segment: `%s'", input_line_pointer); return; } /* if not bss */ - + input_line_pointer += 6; SKIP_WHITESPACE(); - + if (*input_line_pointer == ',') { ++input_line_pointer; - + SKIP_WHITESPACE(); if (*input_line_pointer == '\n') { as_bad("Missing alignment"); return; } - + align = get_absolute_expression(); if (align > max_alignment){ align = max_alignment; @@ -238,23 +238,23 @@ static void s_reserve() { #else record_alignment(SEG_BSS, align); #endif - + /* convert to a power of 2 alignment */ for (temp = 0; (align & 1) == 0; align >>= 1, ++temp) ;; - + if (align != 1) { as_bad("Alignment not a power of 2"); ignore_rest_of_line(); return; } /* not a power of two */ - + align = temp; - + /* Align */ align = ~((~0) << align); /* Convert to a mask */ local_bss_counter = (local_bss_counter + align) & (~align); } /* if has optional alignment */ - + if (S_GET_OTHER(symbolP) == 0 && S_GET_DESC(symbolP) == 0 && ((S_GET_SEGMENT(symbolP) == SEG_BSS @@ -268,7 +268,7 @@ static void s_reserve() { as_warn("Ignoring attempt to re-define symbol from %d. to %d.", S_GET_VALUE(symbolP), local_bss_counter); } /* if not redefining */ - + demand_empty_rest_of_line(); return; } /* s_reserve() */ @@ -279,7 +279,7 @@ static void s_common() { register char *p; register int temp; register symbolS * symbolP; - + name = input_line_pointer; c = get_symbol_end(); /* just after name is now '\0' */ @@ -332,7 +332,7 @@ static void s_common() { } /* s_common() */ static void s_seg() { - + if (strncmp(input_line_pointer, "\"text\"", 6) == 0) { input_line_pointer += 6; s_text(); @@ -369,7 +369,7 @@ static void s_data1() { static void s_proc() { extern char is_end_of_line[]; - + while (!is_end_of_line[*input_line_pointer]) { ++input_line_pointer; } @@ -390,18 +390,18 @@ s_empty() demand_empty_rest_of_line(); return; } /* s_empty() */ - + /* This function is called once, at assembler startup time. It should set up all the tables, etc. that the MD part of the assembler will need. */ void md_begin() { register char *retval = NULL; int lose = 0; register unsigned int i = 0; - + op_hash = hash_new(); if (op_hash == NULL) as_fatal("Virtual memory exhausted"); - + while (i < NUMOPCODES) { const char *name = sparc_opcodes[i].name; retval = hash_insert(op_hash, name, &sparc_opcodes[i]); @@ -421,10 +421,10 @@ void md_begin() { } while (i < NUMOPCODES && !strcmp(sparc_opcodes[i].name, name)); } - + if (lose) as_fatal("Broken assembler. No assembly attempted."); - + for (i = '0'; i < '8'; ++i) octal[i] = 1; for (i = '0'; i <= '9'; ++i) @@ -449,10 +449,10 @@ char *str; { char *toP; int rsd; - + know(str); sparc_ip(str); - + /* See if "set" operand is absolute and small; skip sethi if so. */ if (special_case == SPECIAL_CASE_SET && the_insn.exp.X_seg == SEG_ABSOLUTE) { if (the_insn.exp.X_add_number >= -(1<<12) @@ -464,11 +464,11 @@ char *str; the_insn.reloc = NO_RELOC; /* No longer relocated */ } } - + toP = frag_more(4); /* put out the opcode */ md_number_to_chars(toP, the_insn.opcode, 4); - + /* put out the symbol-dependent stuff */ if (the_insn.reloc != NO_RELOC) { fix_new(frag_now, /* which frag */ @@ -482,7 +482,7 @@ char *str; the_insn.exp.X_got_symbol); } switch (special_case) { - + case SPECIAL_CASE_SET: special_case = 0; know(the_insn.reloc == RELOC_HI22 || @@ -505,7 +505,7 @@ char *str; the_insn.reloc==RELOC_BASE22?RELOC_BASE10:RELOC_LO10, the_insn.exp.X_got_symbol); return; - + case SPECIAL_CASE_FDIV: /* According to information leaked from Sun, the "fdiv" instructions on early SPARC machines would produce incorrect results sometimes. @@ -519,10 +519,10 @@ char *str; the_insn.opcode = 0x81A00020 | (rsd << 25) | rsd; /* fmovs dest,dest */ md_number_to_chars(toP, the_insn.opcode, 4); return; - + case 0: return; - + default: as_fatal("md_assemble: failed sanity check."); } @@ -541,23 +541,23 @@ char *str; unsigned int mask = 0; int match = 0; int comma = 0; - + for (s = str; islower(*s) || (*s >= '0' && *s <= '3'); ++s) ; switch (*s) { - + case '\0': break; - + case ',': comma = 1; - + /*FALLTHROUGH */ - + case ' ': *s++ = '\0'; break; - + default: as_bad("Unknown opcode: `%s'", str); exit(1); @@ -574,49 +574,49 @@ char *str; opcode = insn->match; memset(&the_insn, '\0', sizeof(the_insn)); the_insn.reloc = NO_RELOC; - + /* * Build the opcode, checking as we go to make * sure that the operands match */ for (args = insn->args; ; ++args) { switch (*args) { - + case 'M': case 'm': if (strncmp(s, "%asr", 4) == 0) { s += 4; - + if (isdigit(*s)) { long num = 0; - + while (isdigit(*s)) { num = num*10 + *s-'0'; ++s; } - + if (num < 16 || 31 < num) { error_message = ": asr number must be between 15 and 31"; goto error; } /* out of range */ - + opcode |= (*args == 'M' ? RS1(num) : RD(num)); continue; } else { error_message = ": expecting %asrN"; goto error; } /* if %asr followed by a number. */ - + } /* if %asr */ break; - - + + case '\0': /* end of args */ if (*s == '\0') { match = 1; } break; - + case '+': if (*s == '+') { ++s; @@ -626,7 +626,7 @@ char *str; continue; } break; - + case '[': /* these must match exactly */ case ']': case ',': @@ -634,7 +634,7 @@ char *str; if (*s++ == *args) continue; break; - + case '#': /* must be at least one digit */ if (isdigit(*s++)) { while (isdigit(*s)) { @@ -643,14 +643,14 @@ char *str; continue; } break; - + case 'C': /* coprocessor state register */ if (strncmp(s, "%csr", 4) == 0) { s += 4; continue; } break; - + case 'b': /* next operand is a coprocessor register */ case 'c': case 'D': @@ -665,22 +665,22 @@ char *str; mask -= '0'; } switch (*args) { - + case 'b': opcode |= mask << 14; continue; - + case 'c': opcode |= mask; continue; - + case 'D': opcode |= mask << 25; continue; } } break; - + case 'r': /* next operand must be a register */ case 's': case '1': @@ -689,49 +689,49 @@ char *str; case 'x': if (*s++ == '%') { switch (c = *s++) { - + case 'f': /* frame pointer */ if (*s++ == 'p') { mask = 0x1e; break; } goto error; - + case 'g': /* global register */ if (isoctal(c = *s++)) { mask = c - '0'; break; } goto error; - + case 'i': /* in register */ if (isoctal(c = *s++)) { mask = c - '0' + 24; break; } goto error; - + case 'l': /* local register */ if (isoctal(c = *s++)) { mask= (c - '0' + 16) ; break; } goto error; - + case 'o': /* out register */ if (isoctal(c = *s++)) { mask= (c - '0' + 8) ; break; } goto error; - + case 's': /* stack pointer */ if (*s++ == 'p') { mask= 0xe; break; } goto error; - + case 'r': /* any register */ if (!isdigit(c = *s++)) { goto error; @@ -748,7 +748,7 @@ char *str; } mask= c; break; - + case 'x': opcode |= (mask << 25) | mask; continue; @@ -761,19 +761,19 @@ char *str; * it goes in the opcode. */ switch (*args) { - + case '1': opcode |= mask << 14; continue; - + case '2': opcode |= mask; continue; - + case 'd': opcode |= mask << 25; continue; - + case 'r': opcode |= (mask << 25) | (mask << 14); continue; @@ -783,32 +783,32 @@ char *str; } } break; - + case 'e': /* next operand is a floating point register */ case 'v': case 'V': - + case 'f': case 'B': case 'R': - + case 'g': case 'H': case 'J': { char format; - + if (*s++ == '%' - + && ((format = *s) == 'f') - + && isdigit(*++s)) { - - - + + + for (mask = 0; isdigit(*s); ++s) { mask = 10 * mask + (*s - '0'); } /* read the number */ - + if ((*args == 'u' || *args == 'v' || *args == 'B' @@ -816,7 +816,7 @@ char *str; && (mask & 1)) { break; } /* register must be even numbered */ - + if ((*args == 'U' || *args == 'V' || *args == 'R' @@ -824,7 +824,7 @@ char *str; && (mask & 3)) { break; } /* register must be multiple of 4 */ - + if (format == 'f') { if (mask >= 32) { error_message = ": There are only 32 f registers; [0-31]"; @@ -832,40 +832,40 @@ char *str; } /* on error */ } /* if not an 'f' register. */ } /* on error */ - + switch (*args) { - + case 'v': case 'V': case 'e': opcode |= RS1(mask); continue; - - + + case 'f': case 'B': case 'R': opcode |= RS2(mask); continue; - + case 'g': case 'H': case 'J': opcode |= RD(mask); continue; } /* pack it in. */ - + know(0); break; } /* float arg */ - + case 'F': if (strncmp(s, "%fsr", 4) == 0) { s += 4; continue; } break; - + case 'h': /* high 22 bits */ /* * In the case of a `set' pseudo instruction @@ -876,12 +876,12 @@ char *str; else the_insn.reloc = RELOC_22; goto immediate; - + case 'l': /* 22 bit PC relative immediate */ the_insn.reloc = RELOC_WDISP22; the_insn.pcrel = 1; goto immediate; - + case 'L': /* 30 bit immediate */ the_insn.reloc = #ifdef PIC @@ -890,16 +890,16 @@ char *str; RELOC_WDISP30; the_insn.pcrel = 1; goto immediate; - + case 'n': /* 22 bit immediate */ the_insn.reloc = RELOC_22; goto immediate; - + case 'i': /* 13 bit immediate */ the_insn.reloc = RELOC_13; - + /*FALLTHROUGH */ - + immediate: if (*s == ' ') s++; @@ -920,18 +920,18 @@ char *str; will still have created U entries in the symbol table for the 'symbols' in the input string. Try not to create U symbols for - registers, etc. */ + registers, etc. */ { /* This stuff checks to see if the expression ends in +%reg If it does, it removes the register from the expression, and re-sets 's' to point to the right place */ - + char *s1; - + for (s1 = s; *s1 && *s1 != ',' && *s1 != ']'; s1++) ;; - + if (s1 != s && isdigit(s1[-1])) { if (s1[-2] == '%' && s1[-3] == '+') { s1 -= 3; @@ -990,51 +990,51 @@ char *str; #endif s = expr_end; continue; - + case 'a': if (*s++ == 'a') { opcode |= ANNUL; continue; } break; - + case 'A': { char *push = input_line_pointer; expressionS e; - + input_line_pointer = s; - + if (expression(&e) == SEG_ABSOLUTE) { opcode |= e.X_add_number << 5; s = input_line_pointer; input_line_pointer = push; continue; } /* if absolute */ - + break; } /* alternate space */ - + case 'p': if (strncmp(s, "%psr", 4) == 0) { s += 4; continue; } break; - + case 'q': /* floating point queue */ if (strncmp(s, "%fq", 3) == 0) { s += 3; continue; } break; - + case 'Q': /* coprocessor queue */ if (strncmp(s, "%cq", 3) == 0) { s += 3; continue; } break; - + case 'S': if (strcmp(str, "set") == 0) { special_case = SPECIAL_CASE_SET; @@ -1044,25 +1044,25 @@ char *str; continue; } break; - + case 't': if (strncmp(s, "%tbr", 4) != 0) break; s += 4; continue; - + case 'w': if (strncmp(s, "%wim", 4) != 0) break; s += 4; continue; - + case 'y': if (strncmp(s, "%y", 2) != 0) break; s += 2; continue; - + default: as_fatal("sparc_ip: failed sanity check."); } /* switch on arg code */ @@ -1083,14 +1083,14 @@ char *str; } else { if (insn->architecture > current_architecture) { if (!architecture_requested || warn_on_bump) { - + if (warn_on_bump) { as_warn("architecture bumped from \"%s\" to \"%s\" on \"%s\"", architecture_pname[current_architecture], architecture_pname[insn->architecture], str); } /* if warning */ - + current_architecture = insn->architecture; } else { as_bad("architecture mismatch on \"%s\" (\"%s\"). current architecture is \"%s\"", @@ -1101,10 +1101,10 @@ char *str; } /* if bump ok else error */ } /* if architecture higher */ } /* if no match */ - + break; } /* forever looking for a match */ - + the_insn.opcode = opcode; #if DEBUG_SPARC if (flagseen['D']) @@ -1118,11 +1118,11 @@ char *str; { char *save_in; segT seg; - + save_in = input_line_pointer; input_line_pointer = str; switch (seg = expression(&the_insn.exp)) { - + case SEG_ABSOLUTE: case SEG_TEXT: case SEG_DATA: @@ -1132,7 +1132,7 @@ char *str; case SEG_BIG: case SEG_ABSENT: break; - + default: the_insn.error = "bad segment"; expr_end = input_line_pointer; @@ -1149,7 +1149,7 @@ char *str; /* This is identical to the md_atof in m68k.c. I think this is right, but I'm not sure. - + Turn a string in input_line_pointer into a floating point constant of type type, and store the appropriate bytes in *litP. The number of LITTLENUMS emitted is stored in *sizeP. An error message is returned, or NULL on OK. @@ -1168,33 +1168,33 @@ int *sizeP; LITTLENUM_TYPE *wordP; char *t; char *atof_ieee(); - + switch (type) { - + case 'f': case 'F': case 's': case 'S': prec = 2; break; - + case 'd': case 'D': case 'r': case 'R': prec = 4; break; - + case 'x': case 'X': prec = 6; break; - + case 'p': case 'P': prec = 6; break; - + default: *sizeP=0; return "Bad call to MD_ATOF()"; @@ -1218,9 +1218,9 @@ char *buf; long val; int n; { - + switch (n) { - + case 4: *buf++ = val >> 24; *buf++ = val >> 16; @@ -1229,7 +1229,7 @@ int n; case 1: *buf = val; break; - + default: as_fatal("md_number_to_chars: failed sanity check."); } @@ -1292,9 +1292,9 @@ long val; assert(fixP->fx_size == 4); assert(fixP->fx_r_type < NO_RELOC); - + fixP->fx_addnumber = val; /* Remember value for emit_reloc */ - + /* * This is a hack. There should be a better way to * handle this. @@ -1302,7 +1302,7 @@ long val; if (fixP->fx_r_type == RELOC_WDISP30 && fixP->fx_addsy) { val += fixP->fx_where + fixP->fx_frag->fr_address; } - + switch (fixP->fx_r_type) { /* Michael Bloom <mb@ttidca.tti.com> says... [This] change was @@ -1330,7 +1330,7 @@ long val; buf[3] = 0; } break; - + case RELOC_JMP_TBL: if (!fixP->fx_addsy) { val = (val >>= 2) + 1; @@ -1346,13 +1346,13 @@ long val; case RELOC_WDISP30: val = (val >>= 2) + 1; reloc_check(val, 30, fixP); - + buf[0] |= (val >> 24) & 0x3f; buf[1]= (val >> 16); buf[2] = val >> 8; buf[3] = val; break; - + case RELOC_WDISP22: val = (val >>= 2) + 1; reloc_check(val, 22, fixP); @@ -1439,7 +1439,7 @@ long val; case RELOC_JMP_SLOT: case RELOC_RELATIVE: #endif - + case NO_RELOC: default: as_bad("bad relocation type: 0x%02x", fixP->fx_r_type); @@ -1459,7 +1459,7 @@ symbolS *to_symbol; } /* md_create_short_jump() */ /* Translate internal representation of relocation info to target format. - + On sparc: first 4 bytes are normal unsigned long address, next three bytes are index, most sig. byte first. Byte 7 is broken up with bit 7 as external, bits 6 & 5 unused, and the lower @@ -1477,9 +1477,9 @@ relax_addressT segment_address_in_file; #ifdef PIC int kflag = 0; #endif - + know(fixP->fx_addsy); - + if (!S_IS_DEFINED(fixP->fx_addsy)) { r_extern = 1; r_index = fixP->fx_addsy->sy_number; @@ -1511,23 +1511,23 @@ relax_addressT segment_address_in_file; } #endif } - + /* this is easy */ md_number_to_chars(where, r_address = fixP->fx_frag->fr_address + fixP->fx_where - segment_address_in_file, 4); - + /* now the fun stuff */ where[4] = (r_index >> 16) & 0x0ff; where[5] = (r_index >> 8) & 0x0ff; where[6] = r_index & 0x0ff; where[7] = ((r_extern << 7) & 0x80) | (0 & 0x60) | (fixP->fx_r_type & 0x1F); - + /* Also easy */ if (fixP->fx_addsy->sy_frag) { r_addend = fixP->fx_addsy->sy_frag->fr_address; } - + if (fixP->fx_pcrel) { #ifdef PIC if (fixP->fx_gotsy) { @@ -1544,9 +1544,9 @@ relax_addressT segment_address_in_file; #endif r_addend = fixP->fx_addnumber; } - + md_number_to_chars(&where[8], r_addend, 4); - + return; } /* tc_aout_fix_to_chars() */ @@ -1582,7 +1582,7 @@ segT segtype; static void print_insn(insn) struct sparc_it *insn; { - + if (insn->error) { fprintf(stderr, "ERROR: %s\n", insn->error); } @@ -1634,14 +1634,14 @@ relax_addressT segment_address_in_file; register symbolS *symbolP; extern char *next_object_file_charP; /* long add_number; */ - + memset((char *) &ri, '\0', sizeof(ri)); for (; fixP; fixP = fixP->fx_next) { - + if (fixP->fx_r_type >= NO_RELOC) { as_fatal("fixP->fx_r_type = %d\n", fixP->fx_r_type); } - + if ((symbolP = fixP->fx_addsy) != NULL) { ri.r_address = fixP->fx_frag->fr_address + fixP->fx_where - segment_address_in_file; @@ -1662,7 +1662,7 @@ relax_addressT segment_address_in_file; } else { ri.r_addend = fixP->fx_addnumber; } - + md_ri_to_chars(next_object_file_charP, &ri); next_object_file_charP += md_reloc_size; } @@ -1692,7 +1692,7 @@ relax_addressT segment_address_in_file; * * If an architecture is specified, all instructions must match * that architecture. Any higher level instructions are flagged - * as errors. + * as errors. * * if both an architecture and -bump are specified, the * architecture starts at the specified level, but bumps are @@ -1706,19 +1706,19 @@ char ***vecP; { char *p; const char **arch; - + if (!strcmp(*argP,"bump")){ warn_on_bump = 1; - + } else if (**argP == 'A'){ p = (*argP) + 1; - + for (arch = architecture_pname; *arch != NULL; ++arch){ if (strcmp(p, *arch) == 0){ break; } /* found a match */ } /* walk the pname table */ - + if (*arch == NULL){ as_bad("unknown architecture: %s", p); } else { diff --git a/gnu/usr.bin/as/config/tc-sparc.h b/gnu/usr.bin/as/config/tc-sparc.h index f21baf1..c6dfa31 100644 --- a/gnu/usr.bin/as/config/tc-sparc.h +++ b/gnu/usr.bin/as/config/tc-sparc.h @@ -1,24 +1,24 @@ /* tc-sparc.h - Macros and type defines for the sparc. Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: tc-sparc.h,v 1.1 1993/11/03 00:54:54 paul Exp $ + * $Id: tc-sparc.h,v 1.2 1994/12/23 22:37:41 nate Exp $ */ #define TC_SPARC 1 diff --git a/gnu/usr.bin/as/config/tc-tahoe.c b/gnu/usr.bin/as/config/tc-tahoe.c index 68dc5b9..4cd1a82 100644 --- a/gnu/usr.bin/as/config/tc-tahoe.c +++ b/gnu/usr.bin/as/config/tc-tahoe.c @@ -162,7 +162,7 @@ States for Tahoe address relaxing. Always, 1 byte opcode, then displacement/absolute. If word or longword, change opcode to brw or jmp. - + 2. TAHOE_WIDTH_CONDITIONAL_JUMP (?) J<cond> where <cond> is a simple flag test. Format: "b?" @@ -355,7 +355,7 @@ md_begin() struct tot *tP; char *errorval = ""; int synthetic_too = 1; /* If 0, just use real opcodes. */ - + if ((op_hash = hash_new())){ for (tP= totstrs; *tP->name && !*errorval; tP++){ errorval = hash_insert (op_hash, tP->name, &tP->detail); @@ -389,7 +389,7 @@ md_parse_option (argP, cntP, vecP) switch (**argP){ case 'a': as_warn("The -a option doesn't exits. (Dispite what the man page says!"); - + case 'J': as_warn("JUMPIFY (-J) not implemented, use psuedo ops instead."); break; @@ -517,7 +517,7 @@ md_ri_to_chars (ri_p, ri) /* This is easy */ md_number_to_chars (the_bytes, ri.r_address, sizeof(ri.r_address)); - + /* now the fun stuff */ the_bytes[4] = (ri.r_symbolnum >> 16) & 0x0ff; the_bytes[5] = (ri.r_symbolnum >> 8) & 0x0ff; @@ -546,20 +546,20 @@ relax_addressT segment_address_in_file; * In: length of relocation (or of address) in chars: 1, 2 or 4. * Out: GNU LD relocation length code: 0, 1, or 2. */ - + static unsigned char nbytes_r_length[] = { 42, 0, 1, 42, 2 }; long r_symbolnum; - + know(fixP->fx_addsy != NULL); - + md_number_to_chars(where, fixP->fx_frag->fr_address + fixP->fx_where - segment_address_in_file, 4); - + r_symbolnum = (S_IS_DEFINED(fixP->fx_addsy) ? S_GET_TYPE(fixP->fx_addsy) : fixP->fx_addsy->sy_number); - + where[4] = (r_symbolnum >> 16) & 0x0ff; where[5] = (r_symbolnum >> 8) & 0x0ff; where[6] = r_symbolnum & 0x0ff; @@ -741,7 +741,7 @@ object_headers *headers; register char *addressP; /* -> _var to change. */ register char *opcodeP; /* -> opcode char(s) to change. */ register short int length_code; /* 2=long 1=word 0=byte */ - register short int extension = 0; /* Size of relaxed address. + register short int extension = 0; /* Size of relaxed address. Added to fr_fix: incl. ALL var chars. */ register symbolS *symbolP; register long int where; @@ -788,7 +788,7 @@ object_headers *headers; *addressP = target_address - (address_of_var + 1); extension = 1; break; - + case ENCODE_RELAX (STATE_CONDITIONAL_BRANCH, STATE_WORD): *opcodeP ^= 0x10; /* Reverse sense of test. */ *addressP++ = 3; /* Jump over word branch */ @@ -796,7 +796,7 @@ object_headers *headers; md_number_to_chars (addressP, target_address - (address_of_var + 4), 2); extension = 4; break; - + case ENCODE_RELAX (STATE_CONDITIONAL_BRANCH, STATE_LONG): *opcodeP ^= 0x10; /* Reverse sense of test. */ *addressP++ = 6; @@ -810,13 +810,13 @@ object_headers *headers; *addressP = target_address - (address_of_var + 1); extension = 1; break; - + case ENCODE_RELAX (STATE_ALWAYS_BRANCH, STATE_WORD): *opcodeP = TAHOE_BRW; md_number_to_chars (addressP, target_address - (address_of_var + 2), 2); extension = 2; break; - + case ENCODE_RELAX (STATE_ALWAYS_BRANCH, STATE_LONG): *opcodeP = TAHOE_JMP; *addressP++ = TAHOE_PC_REL_LONG; @@ -828,7 +828,7 @@ object_headers *headers; md_number_to_chars (addressP, target_address - (address_of_var + 2), 2); extension = 2; break; - + case ENCODE_RELAX (STATE_BIG_REV_BRANCH, STATE_LONG): *opcodeP ^= 0x10; *addressP++ = 0; @@ -843,7 +843,7 @@ object_headers *headers; md_number_to_chars (addressP, target_address - (address_of_var + 2), 2); extension = 2; break; - + case ENCODE_RELAX (STATE_BIG_NON_REV_BRANCH, STATE_LONG): *addressP++ = 0; *addressP++ = 2; @@ -1034,7 +1034,7 @@ tip_op (optex,topP) com_width = (width == 'b' ? 1 : (width == 'w' ? 2 : (width == 'l' ? 4 : 0))); - + *optex = '\0'; /* This is kind of a back stop for all the searches to fail on if needed.*/ if (*point == '*') { /* A dereference? */ @@ -1052,7 +1052,7 @@ tip_op (optex,topP) * The default is 'w' as an offset, so that's what I use. * Stick with `, it does the same, and isn't ambig. */ - + if (*point != '\0' && ((point[1] == '^') || (point[1] == '`'))) switch(*point){ case 'b': @@ -1088,18 +1088,18 @@ tip_op (optex,topP) if(end != point) /* Null string? */ end--; - + if (end > point && *end == ' ' && end[-1] != '\'') end--; /* Hop white space */ - + /* Is this an index reg. */ if ((*end == ']') && (end[-1] != '\'')){ temp = end; - + /* Find opening brace. */ for(--end;(*end != '[' && end != point);end--) ; - + /* If I found the opening brace, get the index register number. */ if (*end == '['){ tp = end + 1; /* tp should point to the start of a reg. */ @@ -1129,11 +1129,11 @@ tip_op (optex,topP) /* register in parens? */ if ((*end == ')') && (end[-1] != '\'')){ temp = end; - + /* Find opening paren. */ for(--end;(*end != '(' && end != point);end--) ; - + /* If I found the opening paren, get the register number. */ if (*end == '('){ tp = end + 1; @@ -1150,7 +1150,7 @@ tip_op (optex,topP) end = point; /* Force all the rest of the tests to fail. */ } } - + /* Pre decrement? */ if (*end == '-'){ if (dec_inc != ' '){ @@ -1167,7 +1167,7 @@ tip_op (optex,topP) * Everything between point and end is the 'expression', unless it's * a register name. */ - + c = end[1]; end[1] = '\0'; @@ -1179,7 +1179,7 @@ tip_op (optex,topP) point = tp; imreg = -1; } - + if (imreg != -1 && reg != -1) op_bad = "I parsed 2 registers in this operand."; @@ -1257,7 +1257,7 @@ tip_op (optex,topP) } end[1] = c; - + /* I'm done, so restore optex */ *optex = segfault; @@ -1304,15 +1304,15 @@ tip_op (optex,topP) op_bad = "For quad access, the register must be even and < 14."; else if (call_width) op_bad = "You can't cast a direct register."; - + if (*op_bad == '\0'){ /* No errors, check for warnings */ if (width == 'q' && imreg == 12) as_warn("Using reg 14 for quadwords can tromp the FP register."); - + reg = imreg; } - + /* We know: imm = -1 */ }else if (dec_inc == '-'){ /* -(SP) */ @@ -1401,7 +1401,7 @@ tip_op (optex,topP) } } } - + /* * At this point, all the errors we can do have be checked for. * We can build the 'top'. */ @@ -1563,7 +1563,7 @@ md_assemble (instruction_string) /* Decode the operand. */ tip(&t, instruction_string); - + /* * Check to see if this operand decode properly. * Notice that we haven't made any frags yet. @@ -1589,7 +1589,7 @@ md_assemble (instruction_string) Legality of indexed mode already checked: it is OK */ FRAG_APPEND_1_CHAR(0x40 + operandP->top_ndx); } /* if(top_ndx>=0) */ - + /* Here to make main operand frag(s). */ this_add_number = expP->X_add_number; this_add_symbol = expP->X_add_symbol; @@ -1663,12 +1663,12 @@ md_assemble (instruction_string) /* to_seg != now_seg && to_seg != seg_unknown (still in branch) In other words, I'm jumping out of my segment so extend the branches to jumps, and let GAS fix them. */ - + /* These are "branches" what will always be branches around a jump to the correct addresss in real life. If to_seg is SEG_ABSOLUTE, just encode the branch in, else let GAS fix the address. */ - + switch (operandP->top_width){ /* The theory: For SEG_ABSOLUTE, then mode is ABSOLUTE_ADDR, jump @@ -1764,14 +1764,14 @@ md_assemble (instruction_string) case TAHOE_AUTO_INC_DEFERRED: FRAG_APPEND_1_CHAR(operandP->top_mode); break; - + /* Numbered Register only access. Only thing needed is the mode + Register number */ case TAHOE_DIRECT_REG: case TAHOE_REG_DEFERRED: FRAG_APPEND_1_CHAR(operandP->top_mode + operandP->top_reg); break; - + /* An absolute address. It's size is always 5 bytes. (mode_type + 4 byte address). */ case TAHOE_ABSOLUTE_ADDR: @@ -1780,7 +1780,7 @@ md_assemble (instruction_string) *p = TAHOE_ABSOLUTE_ADDR; md_number_to_chars(p+1,this_add_number,4); break; - + /* Immediate data. If the size isn't known, then it's an address + and offset, which is 4 bytes big. */ case TAHOE_IMMEDIATE: @@ -1814,7 +1814,7 @@ md_assemble (instruction_string) } } break; - + /* Distance from the PC. If the size isn't known, we have to relax into it. The difference between this and disp(sp) is that this offset is pc_rel, and disp(sp) isn't. @@ -1824,7 +1824,7 @@ md_assemble (instruction_string) case TAHOE_DISP_REL_DEFERRED: operandP->top_reg = PC_REG; pc_rel = 1; - + /* Register, plus a displacement mode. Save the register number, and weather its deffered or not, and relax the size if it isn't known. */ @@ -1844,7 +1844,7 @@ md_assemble (instruction_string) if ((dispsize == 0 && !pc_rel) || (to_seg != now_seg && !is_undefined && to_seg != SEG_ABSOLUTE)) dispsize = 4; - + if (dispsize == 0){ /* * We have a SEG_UNKNOWN symbol, or the size isn't cast. diff --git a/gnu/usr.bin/as/config/tc-tahoe.h b/gnu/usr.bin/as/config/tc-tahoe.h index e63cb63..4593a76 100644 --- a/gnu/usr.bin/as/config/tc-tahoe.h +++ b/gnu/usr.bin/as/config/tc-tahoe.h @@ -1,19 +1,19 @@ /* This file is tc-tahoe.h Copyright (C) 1987-1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/gnu/usr.bin/as/config/tc-vax.c b/gnu/usr.bin/as/config/tc-vax.c index 9133c84..2b1970a 100644 --- a/gnu/usr.bin/as/config/tc-vax.c +++ b/gnu/usr.bin/as/config/tc-vax.c @@ -1,18 +1,18 @@ /* tc-vax.c - vax-specific - Copyright (C) 1987, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -77,12 +77,12 @@ FLONUM_TYPE float_operand[VIT_MAX_OPERANDS]; * The "how long" refers merely to the displacement length. * The address usually has some constant bytes in it as well. * - + groups for VAX address relaxing. - + 1. "foo" pc-relative. length of byte, word, long - + 2a. J<cond> where <cond> is a simple flag test. length of byte, word, long. VAX opcodes are: (Hex) @@ -100,7 +100,7 @@ FLONUM_TYPE float_operand[VIT_MAX_OPERANDS]; blssu/bcs 1f Always, you complement 0th bit to reverse condition. Always, 1-byte opcode, then 1-byte displacement. - + 2b. J<cond> where cond tests a memory bit. length of byte, word, long. Vax opcodes are: (Hex) @@ -114,7 +114,7 @@ FLONUM_TYPE float_operand[VIT_MAX_OPERANDS]; bbcci e7 Always, you complement 0th bit to reverse condition. Always, 1-byte opcde, longword-address, byte-address, 1-byte-displacement - + 2c. J<cond> where cond tests low-order memory bit length of byte,word,long. Vax opcodes are: (Hex) @@ -122,7 +122,7 @@ FLONUM_TYPE float_operand[VIT_MAX_OPERANDS]; blbc e9 Always, you complement 0th bit to reverse condition. Always, 1-byte opcode, longword-address, 1-byte displacement. - + 3. Jbs/Jbr. length of byte,word,long. Vax opcodes are: (Hex) @@ -130,7 +130,7 @@ FLONUM_TYPE float_operand[VIT_MAX_OPERANDS]; brb 11 These are like (2) but there is no condition to reverse. Always, 1 byte opcode, then displacement/absolute. - + 4a. JacbX length of word, long. Vax opcodes are: (Hex) @@ -146,7 +146,7 @@ FLONUM_TYPE float_operand[VIT_MAX_OPERANDS]; The double-byte op-codes don't hurt: we never want to modify the opcode, so we don't care how many bytes are between the opcode and the operand. - + 4b. JXobXXX length of long, long, byte. Vax opcodes are: (Hex) @@ -156,14 +156,14 @@ FLONUM_TYPE float_operand[VIT_MAX_OPERANDS]; sobgtr f5 Always, we cannot reverse the sense of the branch; we have a byte displacement. - + The only time we need to modify the opcode is for class 2 instructions. After relax() we may complement the lowest order bit of such instruction to reverse sense of branch. - + For class 2 instructions, we store context of "where is the opcode literal". We can change an opcode's lowest order bit without breaking anything else. - + We sometimes store context in the operand literal. This way we can figure out after relax() what the original addressing mode was. */ @@ -263,11 +263,11 @@ void char *errtxt; FLONUM_TYPE *fP; int i; - + if (*(errtxt = vip_begin (1, "$", "*", "`"))) { as_fatal("VIP_BEGIN error:%s", errtxt); } - + for (i = 0, fP = float_operand; fP < float_operand + VIT_MAX_OPERANDS; i++, fP++) { @@ -290,7 +290,7 @@ int nbytes; /* Number of bytes in the output. */ { int n; long v; - + n = nbytes; v = value; while (nbytes--) { @@ -312,7 +312,7 @@ long value; /* The value of the bits. */ { char *buf = fixP->fx_where + fixP->fx_frag->fr_literal; int nbytes; /* Number of bytes in the output. */ - + nbytes = fixP->fx_size; while (nbytes--) { *buf++ = value; /* Lint wants & MASK_CHAR. */ @@ -343,7 +343,7 @@ char *instruction_string; /* A string: assemble 1 instruction. */ int is_undefined; /* 1 if operand expression's */ /* segment not known yet. */ int length_code; - + char *p; register struct vop *operandP;/* An operand. Scans all operands. */ char *save_input_line_pointer; @@ -354,13 +354,13 @@ char *instruction_string; /* A string: assemble 1 instruction. */ register struct vop *end_operandP; /* -> slot just after last operand */ /* Limit of the for (each operand). */ register expressionS *expP; /* -> expression values for this operand */ - + /* These refer to an instruction operand expression. */ segT to_seg; /* Target segment of the address. */ register valueT this_add_number; register struct symbol *this_add_symbol; /* +ve (minuend) symbol. */ register struct symbol *this_subtract_symbol; /* -ve(subtrahend) symbol. */ - + long opcode_as_number; /* As a number. */ char *opcode_as_chars; /* Least significant byte 1st. */ /* As an array of characters. */ @@ -374,7 +374,7 @@ char *instruction_string; /* A string: assemble 1 instruction. */ char *vip (); LITTLENUM_TYPE literal_float[8]; /* Big enough for any floating point literal. */ - + if (*(p = vip (&v, instruction_string))) { as_fatal("vax_assemble\"%s\" in=\"%s\"", p, instruction_string); } @@ -397,16 +397,16 @@ char *instruction_string; /* A string: assemble 1 instruction. */ expP = exp_of_operand, floatP = float_operand, end_operandP = v.vit_operand + v.vit_operands; - + operandP < end_operandP; - + operandP++, expP++, floatP++) { /* for each operand */ if (*(operandP->vop_error)) { as_warn ("Ignoring statement because \"%s\"", (operandP->vop_error)); goofed = 1; } else { /* statement has no syntax goofs: lets sniff the expression */ int can_be_short = 0; /* 1 if a bignum can be reduced to a short literal. */ - + input_line_pointer = operandP->vop_expr_begin; c_save = operandP->vop_expr_end[1]; operandP->vop_expr_end[1] = '\0'; @@ -428,7 +428,7 @@ char *instruction_string; /* A string: assemble 1 instruction. */ case SEG_ABSOLUTE: case SEG_UNKNOWN: break; - + case SEG_DIFFERENCE: case SEG_PASS1: /* @@ -447,7 +447,7 @@ char *instruction_string; /* A string: assemble 1 instruction. */ need_pass_2 = 1; as_warn("Can't relocate expression"); break; - + case SEG_BIG: /* Preserve the bits. */ if (expP->X_add_number > 0) { @@ -465,7 +465,7 @@ char *instruction_string; /* A string: assemble 1 instruction. */ (literal_float[0] & 0xFC0F) == 0x4000 && literal_float[1] == 0; break; - + case 'd': can_be_short = (literal_float[0] & 0xFC0F) == 0x4000 @@ -473,7 +473,7 @@ char *instruction_string; /* A string: assemble 1 instruction. */ && literal_float[2] == 0 && literal_float[3] == 0; break; - + case 'g': can_be_short = (literal_float[0] & 0xFF81) == 0x4000 @@ -481,7 +481,7 @@ char *instruction_string; /* A string: assemble 1 instruction. */ && literal_float[2] == 0 && literal_float[3] == 0; break; - + case 'h': can_be_short = ((literal_float[0] & 0xFFF8) == 0x4000 && (literal_float[1] & 0xE000) == 0 @@ -492,14 +492,14 @@ char *instruction_string; /* A string: assemble 1 instruction. */ && literal_float[6] == 0 && literal_float[7] == 0); break; - + default: BAD_CASE(-expP->X_add_number); break; } /* switch (float type) */ } /* if (could want to become S^#...) */ } /* bignum or flonum ? */ - + if (operandP->vop_short == 's' || operandP->vop_short == 'i' || (operandP->vop_short == ' ' @@ -543,27 +543,27 @@ char *instruction_string; /* A string: assemble 1 instruction. */ operandP->vop_reg = 0xF; /* VAX PC. */ } else { /* Encode short literal now. */ int temp = 0; - + switch (-expP->X_add_number) { case 'f': case 'd': temp = literal_float[0] >> 4; break; - + case 'g': temp = literal_float[0] >> 1; break; - + case 'h': temp = ((literal_float[0] << 3) & 070) | ((literal_float[1] >> 13) & 07); break; - + default: BAD_CASE(-expP->X_add_number); break; } - + floatP->low[0] = temp & 077; floatP->low[1] = 0; } /* if can be short literal float */ @@ -592,7 +592,7 @@ char *instruction_string; /* A string: assemble 1 instruction. */ * 32 bits of the number to X_add_number. */ break; - + default: BAD_CASE (to_seg); break; @@ -604,14 +604,14 @@ char *instruction_string; /* A string: assemble 1 instruction. */ operandP->vop_expr_end[1] = c_save; } } /* for (each operand) */ - + input_line_pointer = save_input_line_pointer; - + if (need_pass_2 || goofed) { return; } - + /* Emit op-code. */ /* Remember where it is, in case we want to modify the op-code later. */ opcode_low_byteP = frag_more (v.vit_opcode_nbytes); @@ -621,9 +621,9 @@ char *instruction_string; /* A string: assemble 1 instruction. */ expP = exp_of_operand, floatP = float_operand, end_operandP = v.vit_operand + v.vit_operands; - + operandP < end_operandP; - + operandP++, floatP++, expP++) { /* for each operand */ @@ -632,7 +632,7 @@ char *instruction_string; /* A string: assemble 1 instruction. */ /* Legality of indexed mode already checked: it is OK */ FRAG_APPEND_1_CHAR (0x40 + operandP->vop_ndx); } /* if (vop_ndx >= 0) */ - + /* Here to make main operand frag(s). */ this_add_number = expP->X_add_number; this_add_symbol = expP->X_add_symbol; @@ -973,7 +973,7 @@ char *instruction_string; /* A string: assemble 1 instruction. */ * We stored our constant as LITTLENUMs, not bytes. */ LITTLENUM_TYPE *lP; - + lP = floatP->low; if (nbytes & 1) { know(nbytes == 1); @@ -997,12 +997,12 @@ char *instruction_string; /* A string: assemble 1 instruction. */ if (length == 0) { if (to_seg == SEG_ABSOLUTE) { register long test; - + test = this_add_number; - + if (test < 0) test = ~test; - + length = test & 0xffff8000 ? 4 : test & 0xffffff80 ? 2 : 1; @@ -1047,7 +1047,7 @@ register segT segment; { register char *p; register int old_fr_fix; - + old_fr_fix = fragP->fr_fix; switch (fragP->fr_subtype) { case ENCODE_RELAX (STATE_PC_RELATIVE, STATE_UNDF): @@ -1062,7 +1062,7 @@ register segT segment; frag_wane(fragP); } break; - + case ENCODE_RELAX (STATE_CONDITIONAL_BRANCH, STATE_UNDF): if (S_GET_SEGMENT(fragP->fr_symbol) == segment) { fragP->fr_subtype = ENCODE_RELAX (STATE_CONDITIONAL_BRANCH, STATE_BYTE); @@ -1078,7 +1078,7 @@ register segT segment; frag_wane(fragP); } break; - + case ENCODE_RELAX (STATE_COMPLEX_BRANCH, STATE_UNDF): if (S_GET_SEGMENT(fragP->fr_symbol) == segment) { fragP->fr_subtype = ENCODE_RELAX (STATE_COMPLEX_BRANCH, STATE_WORD); @@ -1096,7 +1096,7 @@ register segT segment; frag_wane(fragP); } break; - + case ENCODE_RELAX (STATE_COMPLEX_HOP, STATE_UNDF): if (S_GET_SEGMENT(fragP->fr_symbol) == segment) { fragP->fr_subtype = ENCODE_RELAX (STATE_COMPLEX_HOP, STATE_BYTE); @@ -1113,7 +1113,7 @@ register segT segment; frag_wane(fragP); } break; - + case ENCODE_RELAX (STATE_ALWAYS_BRANCH, STATE_UNDF): if (S_GET_SEGMENT(fragP->fr_symbol) == segment) { fragP->fr_subtype = ENCODE_RELAX (STATE_ALWAYS_BRANCH, STATE_BYTE); @@ -1127,7 +1127,7 @@ register segT segment; frag_wane(fragP); } break; - + default: break; } @@ -1161,7 +1161,7 @@ register fragS *fragP; /* Where, in file space, is _var of *fragP? */ long target_address = 0; /* Where, in file space, does addr point? */ - + know(fragP->fr_type == rs_machine_dependent); length_code = fragP->fr_subtype & 3; /* depends on ENCODE_RELAX() */ know(length_code >= 0 && length_code < 3); @@ -1174,33 +1174,33 @@ register fragS *fragP; address_of_var = fragP->fr_address + where; switch (fragP->fr_subtype) { - + case ENCODE_RELAX(STATE_PC_RELATIVE, STATE_BYTE): know(*addressP == 0 || *addressP == 0x10); /* '@' bit. */ addressP[0] |= 0xAF; /* Byte displacement. */ addressP[1] = target_address - (address_of_var + 2); extension = 2; break; - + case ENCODE_RELAX(STATE_PC_RELATIVE, STATE_WORD): know(*addressP == 0 || *addressP == 0x10); /* '@' bit. */ addressP[0] |= 0xCF; /* Word displacement. */ md_number_to_chars(addressP + 1, target_address - (address_of_var + 3), 2); extension = 3; break; - + case ENCODE_RELAX(STATE_PC_RELATIVE, STATE_LONG): know(*addressP == 0 || *addressP == 0x10); /* '@' bit. */ addressP[0] |= 0xEF; /* Long word displacement. */ md_number_to_chars(addressP + 1, target_address - (address_of_var + 5), 4); extension = 5; break; - + case ENCODE_RELAX(STATE_CONDITIONAL_BRANCH, STATE_BYTE): addressP[0] = target_address - (address_of_var + 1); extension = 1; break; - + case ENCODE_RELAX(STATE_CONDITIONAL_BRANCH, STATE_WORD): opcodeP[0] ^= 1; /* Reverse sense of test. */ addressP[0] = 3; @@ -1208,7 +1208,7 @@ register fragS *fragP; md_number_to_chars(addressP + 2, target_address - (address_of_var + 4), 2); extension = 4; break; - + case ENCODE_RELAX(STATE_CONDITIONAL_BRANCH, STATE_LONG): opcodeP[0] ^= 1; /* Reverse sense of test. */ addressP[0] = 6; @@ -1217,30 +1217,30 @@ register fragS *fragP; md_number_to_chars(addressP + 3, target_address, 4); extension = 7; break; - + case ENCODE_RELAX(STATE_ALWAYS_BRANCH, STATE_BYTE): addressP[0] = target_address - (address_of_var + 1); extension = 1; break; - + case ENCODE_RELAX(STATE_ALWAYS_BRANCH, STATE_WORD): opcodeP[0] += VAX_WIDEN_WORD; /* brb -> brw, bsbb -> bsbw */ md_number_to_chars(addressP, target_address - (address_of_var + 2), 2); extension = 2; break; - + case ENCODE_RELAX(STATE_ALWAYS_BRANCH, STATE_LONG): opcodeP[0] += VAX_WIDEN_LONG; /* brb -> jmp, bsbb -> jsb */ addressP[0] = VAX_PC_RELATIVE_MODE; md_number_to_chars(addressP + 1, target_address - (address_of_var + 5), 4); extension = 5; break; - + case ENCODE_RELAX(STATE_COMPLEX_BRANCH, STATE_WORD): md_number_to_chars(addressP, target_address - (address_of_var + 2), 2); extension = 2; break; - + case ENCODE_RELAX(STATE_COMPLEX_BRANCH, STATE_LONG): addressP[0] = 2; addressP[1] = 0; @@ -1251,12 +1251,12 @@ register fragS *fragP; md_number_to_chars(addressP + 6, target_address, 4); extension = 10; break; - + case ENCODE_RELAX(STATE_COMPLEX_HOP, STATE_BYTE): addressP[0] = target_address - (address_of_var + 1); extension = 1; break; - + case ENCODE_RELAX(STATE_COMPLEX_HOP, STATE_WORD): addressP[0] = 2; addressP[1] = VAX_BRB; @@ -1265,7 +1265,7 @@ register fragS *fragP; md_number_to_chars(addressP + 4, target_address - (address_of_var + 6), 2); extension = 6; break; - + case ENCODE_RELAX(STATE_COMPLEX_HOP, STATE_LONG): addressP[0] = 2; addressP[1] = VAX_BRB; @@ -1275,7 +1275,7 @@ register fragS *fragP; md_number_to_chars(addressP + 5, target_address, 4); extension = 9; break; - + default: BAD_CASE(fragP->fr_subtype); break; @@ -1284,13 +1284,13 @@ register fragS *fragP; } /* md_convert_frag() */ /* Translate internal format of relocation info into target format. - + On vax: first 4 bytes are normal unsigned long, next three bytes are symbolnum, least sig. byte first. Last byte is broken up with the upper nibble as nuthin, bit 3 as extern, bits 2 & 1 as length, and bit 0 as pcrel. */ #ifdef comment -void +void md_ri_to_chars (the_bytes, ri) char *the_bytes; struct reloc_info_generic ri; @@ -1315,27 +1315,27 @@ relax_addressT segment_address_in_file; * In: length of relocation (or of address) in chars: 1, 2 or 4. * Out: GNU LD relocation length code: 0, 1, or 2. */ - + static unsigned char nbytes_r_length[] = { 42, 0, 1, 42, 2 }; long r_symbolnum; - + know(fixP->fx_addsy != NULL); - + md_number_to_chars(where, fixP->fx_frag->fr_address + fixP->fx_where - segment_address_in_file, 4); - + r_symbolnum = (S_IS_DEFINED(fixP->fx_addsy) ? S_GET_TYPE(fixP->fx_addsy) : fixP->fx_addsy->sy_number); - + where[6] = (r_symbolnum >> 16) & 0x0ff; where[5] = (r_symbolnum >> 8) & 0x0ff; where[4] = r_symbolnum & 0x0ff; where[7] = ((((!S_IS_DEFINED(fixP->fx_addsy)) << 3) & 0x08) | ((nbytes_r_length[fixP->fx_size] << 1) & 0x06) | (((fixP->fx_pcrel << 0) & 0x01) & 0x0f)); - + return; } /* tc_aout_fix_to_chars() */ /* @@ -1418,7 +1418,7 @@ static struct hash_control *op_hash = NULL; /* handle of the OPCODE hash table * static const short int vax_operand_width_size[256] = { - + #define _ 0 _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, @@ -1489,12 +1489,12 @@ static const short int vax_operand_width_size[256] = You have just broken the encoding below, which assumes the sign bit means 'I am an imaginary instruction'. #endif - + #if (VIT_OPCODE_SPECIAL != 0x40000000) You have just broken the encoding below, which assumes the 0x40 M bit means 'I am not to be "optimised" the way normal branches are'. #endif - + static const struct vot synthetic_votstrs[] = { @@ -1519,7 +1519,7 @@ You have just broken the encoding below, which assumes the 0x40 M bit means {"jcc", {"b?", 0x8000001e}}, {"jlssu", {"b?", 0x8000001f}}, {"jcs", {"b?", 0x8000001f}}, - + {"jacbw", {"rwrwmwb!", 0xC000003d}}, {"jacbf", {"rfrfmfb!", 0xC000004f}}, {"jacbd", {"rdrdmdb!", 0xC000006f}}, @@ -1527,7 +1527,7 @@ You have just broken the encoding below, which assumes the 0x40 M bit means {"jacbl", {"rlrlmlb!", 0xC00000f1}}, {"jacbg", {"rgrgmgb!", 0xC0004ffd}}, {"jacbh", {"rhrhmhb!", 0xC0006ffd}}, - + {"jbs", {"rlvbb?", 0x800000e0}}, {"jbc", {"rlvbb?", 0x800000e1}}, {"jbss", {"rlvbb?", 0x800000e2}}, @@ -1538,17 +1538,17 @@ You have just broken the encoding below, which assumes the 0x40 M bit means {"jbcci", {"rlvbb?", 0x800000e7}}, {"jlbs", {"rlb?", 0x800000e8}}, /* JF changed from rlvbb? */ {"jlbc", {"rlb?", 0x800000e9}}, /* JF changed from rlvbb? */ - + {"jaoblss", {"rlmlb:", 0xC00000f2}}, {"jaobleq", {"rlmlb:", 0xC00000f3}}, {"jsobgeq", {"mlb:", 0xC00000f4}}, /* JF was rlmlb: */ {"jsobgtr", {"mlb:", 0xC00000f5}}, /* JF was rlmlb: */ - + /* CASEx has no branch addresses in our conception of it. */ /* You should use ".word ..." statements after the "case ...". */ - + {"", ""} /* empty is end sentinel */ - + }; /* synthetic_votstrs */ /* @@ -1569,7 +1569,7 @@ char *immediate, *indirect, *displen; { const struct vot *vP; /* scan votstrs */ char *retval; /* error text */ - + if ((op_hash = hash_new())) { retval = ""; /* OK so far */ for (vP = votstrs; *vP->vot_name && !*retval; vP++) { @@ -1586,7 +1586,7 @@ char *immediate, *indirect, *displen; #ifndef CONST_TABLE vip_op_defaults(immediate, indirect, displen); #endif - + return (retval); } @@ -1642,9 +1642,9 @@ char *instring; /* Text of a vax instruction: we modify. */ register char c; /* Remember char, (we clobber it */ /* with '\0' temporarily). */ register vax_opcodeT oc; /* Op-code of this instruction. */ - + char *vip_op (); - + bug = ""; if (*instring == ' ') ++instring; /* Skip leading whitespace. */ @@ -1754,7 +1754,7 @@ main () { char *p; char *vip_begin (); - + printf ("0 means no synthetic instructions. "); printf ("Value for vip_begin? "); gets (answer); @@ -1865,9 +1865,9 @@ int /* return -1 or 0:15 */ char c1, c2, c3; /* c3 == 0 if 2-character reg name */ { register int retval; /* return -1:15 */ - + retval = -1; - + if (isupper (c1)) c1 = tolower (c1); if (isupper (c2)) @@ -2041,7 +2041,7 @@ static const char _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _/*P Q R S T U V W X Y Z [ \ ] ^ _*/ D _ _ _ _ _ _ _ _ _ _ _ _ _ _ _/*` a b c d e f g h i j k l m n o*/ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _/*p q r s t u v w x y z { | } ~ ^?*/ - + _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ @@ -2070,7 +2070,7 @@ int bit; char *syms; { unsigned char t; - + while (t= *syms++) vip_metacharacters[t]|=bit; } @@ -2191,26 +2191,26 @@ struct vop *vopP; /* In: vop_access, vop_width. */ */ char access; /* vop_access. */ char width; /* vop_width. */ - + int vax_reg_parse (); /* returns 0:15 or -1 if not a register */ - + access = vopP->vop_access; width = vopP->vop_width; bug = /* none of our code bugs (yet) */ err = /* no user text errors */ wrn = ""; /* no warnings even */ - + p = optext; - + if (*p == ' ') /* Expect all whitespace reduced to ' '. */ p++; /* skip over whitespace */ - + if (at = INDIRECTP (*p)) { /* 1 if *p == '@'(or '*' for Un*x) */ p++; /* at is determined */ if (*p == ' ') /* Expect all whitespace reduced to ' '. */ p++; /* skip over whitespace */ } - + /* * This code is subtle. It tries to detect all legal (letter)'^' * but it doesn't waste time explicitly testing for premature '\0' because @@ -2218,7 +2218,7 @@ struct vop *vopP; /* In: vop_access, vop_width. */ */ { register char c; - + c = *p; if (isupper (c)) c = tolower (c); @@ -2227,13 +2227,13 @@ struct vop *vopP; /* In: vop_access, vop_width. */ else /* no (letter) '^' seen */ len = ' '; /* len is determined */ } - + if (*p == ' ') /* Expect all whitespace reduced to ' '. */ p++; /* skip over whitespace */ - + if (hash = IMMEDIATEP (*p)) /* 1 if *p == '#' ('$' for Un*x) */ p++; /* hash is determined */ - + /* * p points to what may be the beginning of an expression. * We have peeled off the front all that is peelable. @@ -2241,7 +2241,7 @@ struct vop *vopP; /* In: vop_access, vop_width. */ * * Lets point q at the end of the text and parse that (backwards). */ - + for (q = p; *q; q++) ; q--; /* now q points at last char of text */ @@ -2250,7 +2250,7 @@ struct vop *vopP; /* In: vop_access, vop_width. */ q--; /* reverse over whitespace, but don't */ /* run back over *p */ - + /* * As a matter of policy here, we look for [Rn], although both Rn and S^# * forbid [Rn]. This is because it is easy, and because only a sick @@ -2289,7 +2289,7 @@ struct vop *vopP; /* In: vop_access, vop_width. */ } } else ndx = -1; /* no ']', so no iNDeX register */ - + /* * If err = "..." then we lost: run away. * Otherwise ndx == -1 if there was no "[...]". @@ -2302,12 +2302,12 @@ struct vop *vopP; /* In: vop_access, vop_width. */ /* run back over *p */ if (!*err) { sign = 0; /* no ()+ or -() seen yet */ - + if (q > p + 3 && *q == '+' && q[-1] == ')') { sign = 1; /* we saw a ")+" */ q--; /* q points to ')' */ } - + if (*q == ')' && q > p + 2) { paren = 1; /* assume we have "(...)" */ while (q >= p && *q != '(') @@ -2403,7 +2403,7 @@ struct vop *vopP; /* In: vop_access, vop_width. */ /* * have reg. -1:absent; else 0:15 */ - + /* * We have: err, at, len, hash, ndx, sign, paren, reg. * Also, any remaining expression is from *p through *q inclusive. @@ -2416,7 +2416,7 @@ struct vop *vopP; /* In: vop_access, vop_width. */ * We want: len, mode, reg, ndx, err, p, q, wrn, bug. * We will deliver a 4-bit reg, and a 4-bit mode. */ - + /* * Case of branch operand. Different. No L^B^W^I^S^ allowed for instance. * @@ -2588,7 +2588,7 @@ struct vop *vopP; /* In: vop_access, vop_width. */ at = 1; paren = 0; } - + /* * Case of (Rn)+, which is slightly different. * @@ -2654,11 +2654,11 @@ struct vop *vopP; /* In: vop_access, vop_width. */ reg = -1; /* no register any more */ } err = " "; /* win */ - + /* JF a bugfix, I think! */ if (at && access == 'a') vopP->vop_nbytes=4; - + mode = (at ? 9 : 8); reg = PC; if ((access == 'm' || access == 'w') && !at) @@ -2750,7 +2750,7 @@ struct vop *vopP; /* In: vop_access, vop_width. */ break; } } - + /* * here with completely specified mode * len @@ -2758,10 +2758,10 @@ struct vop *vopP; /* In: vop_access, vop_width. */ * expression p,q * ndx */ - + if (*err == ' ') err = ""; /* " " is no longer an error */ - + vopP->vop_mode = mode; vopP->vop_reg = reg; vopP->vop_short = len; @@ -2771,13 +2771,13 @@ struct vop *vopP; /* In: vop_access, vop_width. */ vopP->vop_error = err; vopP->vop_warn = wrn; return (bug); - + } /* vip_op() */ /* - + Summary of vip_op outputs. - + mode reg len ndx (Rn) => @Rn {@}Rn 5+@ n ' ' optional @@ -2787,7 +2787,7 @@ struct vop *vopP; /* In: vop_access, vop_width. */ {@}(Rn)+ 8+@ n ' ' optional {@}#foo, no S^ 8+@ PC " i" optional {@}{q^}{(Rn)} 10+@+q option " bwl" optional - + */ #ifdef TEST /* #Define to use this testbed. */ @@ -2821,7 +2821,7 @@ char my_displen[200]; main () { char *vip_op (); /* make cc happy */ - + printf ("enter immediate symbols eg enter # "); gets (my_immediate); printf ("enter indirect symbols eg enter @ "); @@ -2870,7 +2870,7 @@ main () case '-': my_operand_length = 0; break; - + default: my_operand_length = 2; printf ("I dn't understand access width %c\n", mywidth); @@ -2929,7 +2929,7 @@ fragS *frag; symbolS *to_symbol; { long offset; - + offset = to_addr - (from_addr + 1); *ptr++ = 0x31; md_number_to_chars(ptr, offset, 2); @@ -2943,7 +2943,7 @@ fragS *frag; symbolS *to_symbol; { long offset; - + offset = to_addr - S_GET_VALUE(to_symbol); *ptr++ = 0x17; *ptr++ = 0x9F; @@ -2963,20 +2963,20 @@ char ***vecP; { char *temp_name; /* name for -t or -d options */ char opt; - + switch (**argP) { case 'J': /* as_warn ("I can do better than -J!"); */ break; - + case 'S': as_warn ("SYMBOL TABLE not implemented"); break; /* SYMBOL TABLE not implemented */ - + case 'T': as_warn ("TOKEN TRACE not implemented"); break; /* TOKEN TRACE not implemented */ - + case 'd': case 't': opt= **argP; @@ -2994,38 +2994,38 @@ char ***vecP; as_warn ("I expected a filename after -%c.",opt); temp_name = "{absent}"; } - + if (opt == 'd') as_warn ("Displacement length %s ignored!", temp_name); else as_warn ("I don't need or use temp. file \"%s\".", temp_name); break; - + case 'V': as_warn ("I don't use an interpass file! -V ignored"); break; - + #ifdef OBJ_VMS case '+': /* For g++ */ break; - + case '1': /* For backward compatibility */ break; - + case 'h': /* No hashing of mixed-case names */ vms_name_mapping = 0; (*argP)++; if (**argP) vms_name_mapping = *((*argP)++) - '0'; (*argP)--; break; - + case 'H': /* Show new symbol after hash truncation */ break; #endif - + default: return 0; - + } return 1; } @@ -3040,7 +3040,7 @@ char *name; return 0; } -/* Parse an operand that is machine-specific. +/* Parse an operand that is machine-specific. We just return without modifying the expression if we have nothing to do. */ diff --git a/gnu/usr.bin/as/config/te-ic960.h b/gnu/usr.bin/as/config/te-ic960.h index 4858c7d..7a9dbe7 100644 --- a/gnu/usr.bin/as/config/te-ic960.h +++ b/gnu/usr.bin/as/config/te-ic960.h @@ -1,19 +1,19 @@ /* This file is twe-ic960.h Copyright (C) 1987-1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/gnu/usr.bin/as/config/te-sun3.h b/gnu/usr.bin/as/config/te-sun3.h index e559f28..ec4d29a 100644 --- a/gnu/usr.bin/as/config/te-sun3.h +++ b/gnu/usr.bin/as/config/te-sun3.h @@ -1,18 +1,18 @@ /* te-sun3.h -- Sun-3 target environment declarations. Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -20,14 +20,14 @@ /* This header file contains the #defines specific to SUN computer SUN 3 series computers. (The only kind we have around here, unfortunatly.) - + Rumor has it that this file will work on the Sun-2 if the assembler is called with -m68010 This is not tested. */ /* Could also be : #define S_LOCAL_NAME(s) (S_GET_NAME(s)[0] == '.' && - S_GET_NAME(s)[1] == 'L' || + S_GET_NAME(s)[1] == 'L' || S_GET_NAME(s)[1] == '.') */ @@ -36,7 +36,7 @@ of an old-style 68000 file */ #define DEFAULT_MAGIC_NUMBER_FOR_OBJECT_FILE (2<<16|OMAGIC) /* Magic byte for file header */ - + #include "obj-format.h" /* diff --git a/gnu/usr.bin/as/config/vax-inst.h b/gnu/usr.bin/as/config/vax-inst.h index 1c10191..47c5ef0 100644 --- a/gnu/usr.bin/as/config/vax-inst.h +++ b/gnu/usr.bin/as/config/vax-inst.h @@ -1,18 +1,18 @@ /* vax-inst.h - GNU - Part of vax.c Copyright (C) 1987, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/gnu/usr.bin/as/debug.c b/gnu/usr.bin/as/debug.c index 30717ff..d0a0c2d 100644 --- a/gnu/usr.bin/as/debug.c +++ b/gnu/usr.bin/as/debug.c @@ -1,19 +1,19 @@ /* This file is debug.c Copyright (C) 1987-1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -21,7 +21,7 @@ /* Routines for debug use only. */ #ifndef lint -static char rcsid[] = "$Id: debug.c,v 1.1 1993/10/02 20:57:24 pk Exp $"; +static char rcsid[] = "$Id: debug.c,v 1.1 1993/11/03 00:51:26 paul Exp $"; #endif #include "as.h" @@ -31,7 +31,7 @@ dmp_frags() { frchainS *chp; char *p; - + for ( chp=frchain_root; chp; chp = chp->frch_next ){ switch ( chp->frch_seg ){ case SEG_DATA: @@ -95,7 +95,7 @@ var_chars( fp, n ) int n; { unsigned char *p; - + for ( p=(unsigned char*)fp->fr_literal; n; n-- , p++ ){ printf("%02x ", *p ); } diff --git a/gnu/usr.bin/as/expr.c b/gnu/usr.bin/as/expr.c index 413917d..b504a4b 100644 --- a/gnu/usr.bin/as/expr.c +++ b/gnu/usr.bin/as/expr.c @@ -1,18 +1,18 @@ /* expr.c -operands, expressions- Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -25,7 +25,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: expr.c,v 1.3 1993/10/02 20:57:26 pk Exp $"; +static char rcsid[] = "$Id: expr.c,v 1.2 1993/11/03 00:51:28 paul Exp $"; #endif #include <ctype.h> @@ -91,9 +91,9 @@ register expressionS * expressionP; register char c; register char *name; /* points to name of symbol */ register symbolS * symbolP; /* Points to symbol */ - + extern const char hex_value[]; /* In hex_value.c */ - + #ifdef PIC /* XXX */ expressionP->X_got_symbol = 0; #endif @@ -113,8 +113,8 @@ register expressionS * expressionP; /* digits, assume it is a bignum. */ register char * digit_2; /*->2nd digit of number. */ int small; /* TRUE if fits in 32 bits. */ - - + + if (c == 'H' || c == '0') { /* non-decimal radix */ if ((c = *input_line_pointer ++) == 'x' || c == 'X' || c == '\'') { c = *input_line_pointer ++; /* read past "0x" or "0X" or H' */ @@ -132,17 +132,17 @@ register expressionS * expressionP; too_many_digits = 11; c = '0'; input_line_pointer -= 2; - + } else if (c == 'b' || c == 'B') { c = *input_line_pointer++; maxdig = radix = 2; too_many_digits = 33; - + } else if (c && strchr(FLT_CHARS,c)) { radix = 0; /* Start of floating-point constant. */ /* input_line_pointer->1st char of number. */ expressionP->X_add_number = -(isupper(c) ? tolower(c) : c); - + } else { /* By elimination, assume octal radix. */ radix = maxdig = 8; too_many_digits = 11; @@ -152,7 +152,7 @@ register expressionS * expressionP; maxdig = radix = 10; too_many_digits = 11; } /* if operand starts with a zero */ - + if (radix) { /* Fixed-point integer constant. */ /* May be bignum, or may fit in 32 bits. */ /* @@ -186,7 +186,7 @@ register expressionS * expressionP; LITTLENUM_TYPE *leader; /*->high order littlenum of the bignum. */ LITTLENUM_TYPE *pointer; /*->littlenum we are frobbing now. */ long carry; - + leader = generic_bignum; generic_bignum[0] = 0; generic_bignum[1] = 0; @@ -200,7 +200,7 @@ register expressionS * expressionP; pointer++) { long work; - + work = carry + radix * *pointer; *pointer = work & LITTLENUM_MASK; carry = work >> LITTLENUM_NUMBER_OF_BITS; @@ -262,7 +262,7 @@ register expressionS * expressionP; { /* Expected path: symbol defined. */ /* Local labels are never absolute. Don't waste time checking absoluteness. */ know(SEG_NORMAL(S_GET_SEGMENT(symbolP))); - + expressionP->X_add_symbol = symbolP; expressionP->X_add_number = 0; expressionP->X_seg = S_GET_SEGMENT(symbolP); @@ -333,11 +333,11 @@ register expressionS * expressionP; { /* input_line_pointer->*/ /* floating-point constant. */ int error_code; - + error_code = atof_generic (& input_line_pointer, ".", EXP_CHARS, & generic_floating_point_number); - + if (error_code) { if (error_code == ERROR_EXPONENT_OVERFLOW) @@ -357,7 +357,7 @@ register expressionS * expressionP; } else if (c == '.' && !is_part_of_name(*input_line_pointer)) { extern struct obstack frags; - + /* JF: '.' is pseudo symbol with value of current location in current segment... @@ -366,13 +366,13 @@ register expressionS * expressionP; now_seg, (valueT)(obstack_next_free(&frags)-frag_now->fr_literal), frag_now); - + expressionP->X_add_number=0; expressionP->X_add_symbol=symbolP; expressionP->X_seg = now_seg; - + } else if (is_name_beginner(c)) { /* here if did not begin with a digit */ - + /* * Identifier begins here. * This is kludged for speed, so code is repeated. @@ -390,7 +390,7 @@ register expressionS * expressionP; case SEG_REGISTER: expressionP->X_add_number = S_GET_VALUE(symbolP); break; - + default: expressionP->X_add_number = 0; #ifdef PIC @@ -429,9 +429,9 @@ register expressionS * expressionP; know(0); } /* switch on unary operator */ break; - + default: /* unary on non-absolute is unsuported */ - if (!SEG_NORMAL(operand(expressionP))) + if (!SEG_NORMAL(operand(expressionP))) { as_bad("Unary operator %c ignored because bad operand follows", c); break; @@ -499,17 +499,17 @@ register expressionS *expressionP; expressionP->X_subtract_symbol = NULL; expressionP->X_add_number = 0; break; - + case SEG_BIG: case SEG_ABSOLUTE: expressionP->X_subtract_symbol = NULL; expressionP->X_add_symbol = NULL; break; - + case SEG_UNKNOWN: expressionP->X_subtract_symbol = NULL; break; - + case SEG_DIFFERENCE: /* * It does not hurt to 'cancel' NULL == NULL @@ -527,12 +527,12 @@ register expressionS *expressionP; expressionP->X_seg = SEG_ABSOLUTE; } break; - + case SEG_REGISTER: expressionP->X_add_symbol = NULL; expressionP->X_subtract_symbol = NULL; break; - + default: if (SEG_NORMAL(expressionP->X_seg)) { expressionP->X_subtract_symbol = NULL; @@ -673,7 +673,7 @@ expressionS *e; typedef enum { O_illegal, /* (0) what we get for illegal op */ - + O_multiply, /* (1) * */ O_divide, /* (2) / */ O_modulus, /* (3) % */ @@ -691,10 +691,10 @@ operatorT; #define __ O_illegal static const operatorT op_encoding[256] = { /* maps ASCII->operators */ - + __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, - + __, O_bit_or_not, __, __, __, O_modulus, O_bit_and, __, __, __, O_multiply, O_add, __, O_subtract, __, O_divide, __, __, __, __, __, __, __, __, @@ -707,7 +707,7 @@ static const operatorT op_encoding[256] = { /* maps ASCII->operators */ __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, O_bit_inclusive_or, __, __, __, - + __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, @@ -739,7 +739,7 @@ segT expr(rank, resultP) register char c_left; /* 1st operator character. */ register operatorT op_right; register char c_right; - + know(rank >= 0); (void) operand(resultP); know(*input_line_pointer != ' '); /* Operand() gobbles spaces. */ @@ -800,9 +800,9 @@ segT expr(rank, resultP) * but then it can't be subtracted either. This trick * does not cause any further inaccuracy. */ - + register symbolS * symbolP; - + right.X_add_number = - right.X_add_number; symbolP = right.X_add_symbol; right.X_add_symbol = right.X_subtract_symbol; @@ -812,7 +812,7 @@ segT expr(rank, resultP) } op_left = O_add; } - + if (op_left == O_add) { segT seg1; segT seg2; @@ -834,7 +834,7 @@ segT expr(rank, resultP) #endif clean_up_expression(& right); clean_up_expression(resultP); - + #ifdef PIC /* XXX - kludge here to accomodate "_GLOBAL_OFFSET_TABLE + (x - y)" * expressions: this only works for this special case, the @@ -879,7 +879,7 @@ segT expr(rank, resultP) /* Clean_up_expression() will do the rest. */ } else resultP->X_seg = SEG_DIFFERENCE; - + resultP->X_add_number += right.X_add_number; clean_up_expression(resultP); } else { /* Not +. */ @@ -900,7 +900,7 @@ segT expr(rank, resultP) case O_bit_inclusive_or: resultP->X_add_number |= right.X_add_number; break; - + case O_modulus: if (right.X_add_number) { resultP->X_add_number %= right.X_add_number; @@ -909,15 +909,15 @@ segT expr(rank, resultP) resultP->X_add_number = 0; } break; - + case O_bit_and: resultP->X_add_number &= right.X_add_number; break; - + case O_multiply: resultP->X_add_number *= right.X_add_number; break; - + case O_divide: if (right.X_add_number) { resultP->X_add_number /= right.X_add_number; @@ -926,23 +926,23 @@ segT expr(rank, resultP) resultP->X_add_number = 0; } break; - + case O_left_shift: resultP->X_add_number <<= right.X_add_number; break; - + case O_right_shift: resultP->X_add_number >>= right.X_add_number; break; - + case O_bit_exclusive_or: resultP->X_add_number ^= right.X_add_number; break; - + case O_bit_or_not: resultP->X_add_number |= ~ right.X_add_number; break; - + default: BAD_CASE(op_left); break; @@ -976,7 +976,7 @@ char get_symbol_end() { register char c; - + while (is_part_of_name(c = *input_line_pointer++)) ;; *--input_line_pointer = 0; return (c); @@ -988,7 +988,7 @@ unsigned int get_single_number() expressionS exp; operand(&exp); return exp.X_add_number; - + } /* * Local Variables: diff --git a/gnu/usr.bin/as/expr.h b/gnu/usr.bin/as/expr.h index 2706d4d..d0b68a5 100644 --- a/gnu/usr.bin/as/expr.h +++ b/gnu/usr.bin/as/expr.h @@ -1,23 +1,23 @@ /* expr.h -> header file for expr.c Copyright (C) 1987, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: expr.h,v 1.3 1993/10/02 20:57:27 pk Exp $ + * $Id: expr.h,v 1.2 1993/11/03 00:51:31 paul Exp $ */ diff --git a/gnu/usr.bin/as/flo-const.c b/gnu/usr.bin/as/flo-const.c index 28d8008..90f0af1 100644 --- a/gnu/usr.bin/as/flo-const.c +++ b/gnu/usr.bin/as/flo-const.c @@ -1,24 +1,24 @@ /* flonum_const.c - Useful Flonum constants Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef lint -static char rcsid[] = "$Id: flo-const.c,v 1.1 1993/10/02 20:57:28 pk Exp $"; +static char rcsid[] = "$Id: flo-const.c,v 1.1 1993/11/03 00:51:32 paul Exp $"; #endif #include "flonum.h" diff --git a/gnu/usr.bin/as/flo-copy.c b/gnu/usr.bin/as/flo-copy.c index 8fcdb52..6e1b306 100644 --- a/gnu/usr.bin/as/flo-copy.c +++ b/gnu/usr.bin/as/flo-copy.c @@ -1,24 +1,24 @@ /* flonum_copy.c - copy a flonum Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef lint -static char rcsid[] = "$Id: flo-copy.c,v 1.1 1993/10/02 20:57:29 pk Exp $"; +static char rcsid[] = "$Id: flo-copy.c,v 1.1 1993/11/03 00:51:34 paul Exp $"; #endif #include "as.h" @@ -30,10 +30,10 @@ FLONUM_TYPE *out; { int in_length; /* 0 origin */ int out_length; /* 0 origin */ - + out->sign = in->sign; in_length = in->leader - in->low; - + if (in_length < 0) { out->leader = out->low - 1; /* 0.0 case */ } else { @@ -57,7 +57,7 @@ memset((char *)(out->low + in_length + 1), '\0', out_length - in_length); out->leader = in->leader - in->low + out->low; } else { int shorten; /* 1-origin. Number of littlenums we drop. */ - + shorten = in_length - out_length; /* Assume out_length >= 0 ! */ memcpy((void *)( out->low), (void *)(in->low + shorten), (int)((out_length + 1) * sizeof(LITTLENUM_TYPE))); diff --git a/gnu/usr.bin/as/flonum-mult.c b/gnu/usr.bin/as/flonum-mult.c index 41e90bd..4fe8f38 100644 --- a/gnu/usr.bin/as/flonum-mult.c +++ b/gnu/usr.bin/as/flonum-mult.c @@ -1,15 +1,15 @@ /* flonum_mult.c - multiply two flonums Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of Gas, the GNU Assembler. - + The GNU assembler is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY. No author or distributor accepts responsibility to anyone for the consequences of using it or for whether it serves any particular purpose or works at all, unless he says so in writing. Refer to the GNU Assembler General Public License for full details. - + Everyone is granted permission to copy, modify and redistribute the GNU Assembler, but only under the conditions described in the GNU Assembler General Public License. A copy of this license is @@ -19,31 +19,31 @@ notice and this notice must be preserved on all copies. */ #ifndef lint -static char rcsid[] = "$Id: flonum-mult.c,v 1.3 1993/10/02 20:57:30 pk Exp $"; +static char rcsid[] = "$Id: flonum-mult.c,v 1.2 1993/11/03 00:51:36 paul Exp $"; #endif #include "flonum.h" /* plan for a . b => p(roduct) - - + + +-------+-------+-/ /-+-------+-------+ | a | a | ... | a | a | | A | A-1 | | 1 | 0 | +-------+-------+-/ /-+-------+-------+ - - + + +-------+-------+-/ /-+-------+-------+ | b | b | ... | b | b | | B | B-1 | | 1 | 0 | +-------+-------+-/ /-+-------+-------+ - - + + +-------+-------+-/ /-+-------+-/ /-+-------+-------+ | p | p | ... | p | ... | p | p | | A+B+1| A+B | | N | | 1 | 0 | +-------+-------+-/ /-+-------+-/ /-+-------+-------+ - + /^\ (carry) a .b ... | ... a .b a .b A B | 0 1 0 0 @@ -59,17 +59,17 @@ static char rcsid[] = "$Id: flonum-mult.c,v 1.3 1993/10/02 20:57:30 pk Exp $"; | \ +----- P = > a .b N /__ i j - + N = 0 ... A+B - + for all i,j where i+j=N [i,j integers > 0] - + a[], b[], p[] may not intersect. Zero length factors signify 0 significant bits: treat as 0.0. 0.0 factors do the right thing. Zero length product OK. - + I chose the ForTran accent "foo[bar]" instead of the C accent "*garply" because I felt the ForTran way was more intuitive. The C way would probably yield better code on most C compilers. Dean Elsner. @@ -96,7 +96,7 @@ FLONUM_TYPE *product; int N; /* As in sum above. */ int A; /* Which [] of a? */ int B; /* Which [] of b? */ - + if ((a->sign != '-' && a->sign != '+') || (b->sign != '-' && b->sign != '+')) { /* ... Got to fail somehow. Any suggestions? */ diff --git a/gnu/usr.bin/as/flonum.h b/gnu/usr.bin/as/flonum.h index a1a8f08..cc05dbf 100644 --- a/gnu/usr.bin/as/flonum.h +++ b/gnu/usr.bin/as/flonum.h @@ -1,24 +1,24 @@ /* flonum.h - Floating point package Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: flonum.h,v 1.3 1993/10/02 20:57:31 pk Exp $ + * $Id: flonum.h,v 1.2 1993/11/03 00:51:37 paul Exp $ */ diff --git a/gnu/usr.bin/as/frags.c b/gnu/usr.bin/as/frags.c index 208aa7d..71f4669 100644 --- a/gnu/usr.bin/as/frags.c +++ b/gnu/usr.bin/as/frags.c @@ -1,25 +1,25 @@ /* frags.c - manage frags - Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef lint -static char rcsid[] = "$Id: frags.c,v 1.3 1993/10/02 20:57:31 pk Exp $"; +static char rcsid[] = "$Id: frags.c,v 1.2 1993/11/03 00:51:39 paul Exp $"; #endif #include "as.h" @@ -74,7 +74,7 @@ unsigned int nchars; if (obstack_room (&frags) < nchars) { unsigned int n,oldn; long oldc; - + frag_wane(frag_now); frag_new(0); oldn=(unsigned)-1; @@ -117,11 +117,11 @@ int old_frags_var_max_size; /* Number of chars (already allocated on /* char *throw_away_pointer; JF unused */ register frchainS * frchP; long tmp; /* JF */ - + frag_now->fr_fix = (char *) (obstack_next_free (&frags)) - (frag_now->fr_literal) - old_frags_var_max_size; /* Fix up old frag's fr_fix. */ - + obstack_finish (&frags); /* This will align the obstack so the */ /* next struct we allocate on it will */ @@ -141,10 +141,10 @@ int old_frags_var_max_size; /* Number of chars (already allocated on aligned, we Lose Big */ frag_now=(fragS *)obstack_finish(&frags); obstack_alignment_mask(&frags)=tmp; /* Restore alignment */ - + /* Just in case we don't get zero'd bytes */ memset(frag_now, '\0', SIZEOF_STRUCT_FRAG); - + /* obstack_unaligned_done (&frags, &frag_now); */ /* know (frags.obstack_c_next_free == frag_now->fr_literal); */ /* Generally, frag_now->points to an */ @@ -155,14 +155,14 @@ int old_frags_var_max_size; /* Number of chars (already allocated on /* alignment address. */ former_last_fragP->fr_next = frag_now; frchP->frch_last = frag_now; - + #ifndef NO_LISTING { extern struct list_info_struct *listing_tail; frag_now->line = listing_tail; } #endif - + frag_now->fr_next = NULL; } /* frag_new() */ @@ -180,7 +180,7 @@ char *frag_more (nchars) int nchars; { register char *retval; - + frag_grow (nchars); retval = obstack_next_free (&frags); obstack_blank_fast (&frags, nchars); @@ -208,7 +208,7 @@ long offset; char *opcode; { register char *retval; - + frag_grow (max_chars); retval = obstack_next_free (&frags); obstack_blank_fast (&frags, max_chars); @@ -246,7 +246,7 @@ int pcrel_adjust; char bsr; { register char *retval; - + /* frag_grow (max_chars); */ retval = obstack_next_free (&frags); /* obstack_blank_fast (&frags, max_chars); */ /* OVE: so far the only diff */ diff --git a/gnu/usr.bin/as/frags.h b/gnu/usr.bin/as/frags.h index 4532dda..0e82c65 100644 --- a/gnu/usr.bin/as/frags.h +++ b/gnu/usr.bin/as/frags.h @@ -1,24 +1,24 @@ /* frags.h - Header file for the frag concept. Copyright (C) 1987, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: frags.h,v 1.3 1993/10/02 20:57:32 pk Exp $ + * $Id: frags.h,v 1.2 1993/11/03 00:51:40 paul Exp $ */ diff --git a/gnu/usr.bin/as/hash.c b/gnu/usr.bin/as/hash.c index 68a5f14..b9cc1bc 100644 --- a/gnu/usr.bin/as/hash.c +++ b/gnu/usr.bin/as/hash.c @@ -1,18 +1,18 @@ /* hash.c - hash table lookup strings - Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -123,7 +123,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: hash.c,v 1.3 1993/10/02 20:57:34 pk Exp $"; +static char rcsid[] = "$Id: hash.c,v 1.2 1993/11/03 00:51:44 paul Exp $"; #endif #include <stdio.h> @@ -162,10 +162,10 @@ static char rcsid[] = "$Id: hash.c,v 1.3 1993/10/02 20:57:34 pk Exp $"; #if STATLENGTH != HASH_STATLENGTH Panic! Please make #include "stat.h" agree with previous definitions! #endif - + /* #define SUSPECT to do runtime checks */ /* #define TEST to be a test jig for hash...() */ - + #ifdef TEST /* TEST: use smaller hash table */ #undef START_POWER #define START_POWER (3) @@ -176,7 +176,7 @@ Panic! Please make #include "stat.h" agree with previous definitions! #endif /*------------------ plan ---------------------------------- i = internal - + struct hash_control * c; struct hash_entry * e; i int b[z]; buffer for statistics @@ -186,51 +186,51 @@ Panic! Please make #include "stat.h" agree with previous definitions! boolean f; TRUE if we found s in hash table i char * t; error string; "" means OK int a; access type [0...n) i - + c=hash_new () create new hash_control - + hash_die (c) destroy hash_control (and hash table) table should be empty. doesn't check if table is empty. c has no meaning after this. - + hash_say (c,b,z) report statistics of hash_control. also report number of available statistics. - + v=hash_delete (c,s) delete symbol, return old value if any. ask() NULL means no old value. f - + v=hash_replace (c,s,v) replace old value of s with v. ask() NULL means no old value: no table change. f - + t=hash_insert (c,s,v) insert (s,v) in c. ask() return error string. f it is an error to insert if s is already in table. if any error, c is unchanged. - + t=hash_jam (c,s,v) assert that new value of s will be v. i ask() it may decide to GROW the table. i f i grow() i t=hash_grow (c) grow the hash table. i jam() will invoke JAM. i - + ?=hash_apply (c,y) apply y() to every symbol in c. y evtries visited in 'unspecified' order. - + v=hash_find (c,s) return value of s, or NULL if s not in c. ask() f - + f,e=hash_ask() (c,s,a) return slot where s SHOULD live. i code() maintain collision stats in c. i - + .=hash_code (c,s) compute hash-code for s, i from parameters of c. i - + */ static char hash_found; /* returned by hash_ask() to stop extra */ @@ -261,7 +261,7 @@ struct hash_control * register struct hash_entry * entry; register int * ip; /* scan stats block of struct hash_control */ register int * nd; /* limit of stats block */ - + if (( room = (struct hash_entry *) malloc( sizeof(struct hash_entry)*((1<<START_POWER) + 1) ) ) != NULL) /* +1 for the wall entry */ @@ -274,7 +274,7 @@ struct hash_control * { *ip = 0; } - + retval->hash_stat[STAT_SIZE] = 1<<START_POWER; retval->hash_mask = (1<<START_POWER) - 1; retval->hash_sizelog = START_POWER; @@ -335,7 +335,7 @@ register int bufsiz; { register int * nd; /* limit of statistics block */ register int * ip; /* scan statistics */ - + ip = handle->hash_stat; nd = ip + min(bufsiz-1,STATLENGTH); if (bufsiz>0) /* trust nothing! bufsiz <= 0 is dangerous */ @@ -365,7 +365,7 @@ register char * string; { register char * retval; /* NULL if string not in table */ register struct hash_entry * entry; /* NULL or entry of this symbol */ - + entry = hash_ask(handle,string,STAT__WRITE); if (hash_found) { @@ -402,7 +402,7 @@ register char * value; { register struct hash_entry * entry; register char * retval; - + entry = hash_ask(handle,string,STAT__WRITE); if (hash_found) { @@ -433,7 +433,7 @@ register char * value; { register struct hash_entry * entry; register char * retval; - + retval = ""; if (handle->hash_stat[STAT_USED] > handle->hash_full) { @@ -478,7 +478,7 @@ register char * value; { register char * retval; register struct hash_entry * entry; - + retval = ""; if (handle->hash_stat[STAT_USED] > handle->hash_full) { @@ -525,7 +525,7 @@ struct hash_control * handle; #ifdef SUSPECT int oldused; #endif - + /* * capture info about old hash table */ @@ -657,7 +657,7 @@ char* (*function)(); { register struct hash_entry * entry; register struct hash_entry * wall; - + wall = handle->hash_wall; for (entry = handle->hash_where; entry < wall; entry++) { @@ -682,7 +682,7 @@ char * string; { register struct hash_entry * entry; register char * retval; - + entry = hash_ask(handle,string,STAT__READ); if (hash_found) { @@ -715,7 +715,7 @@ int access; /* access type */ register int c; register struct hash_entry * slot; register int collision; /* count collisions */ - + slot = handle->hash_where + hash_code(handle,string); /* start looking here */ handle->hash_stat[STAT_ACCESS+access] += 1; collision = 0; @@ -787,7 +787,7 @@ register char * string; register long h; /* hash code built here */ register long c; /* each character lands here */ register int n; /* Amount to shift h by */ - + n = (handle->hash_sizelog - 3); h = 0; while ((c = *string++) != 0) @@ -830,7 +830,7 @@ main() struct hash_control * hash_new(); char * hash_replace(); int * ip; - + number = 0; h = 0; printf("type h <RETURN> for help\n"); @@ -927,7 +927,7 @@ char * description; { char * retval; char * malloc(); - + printf(" %s : ",description); gets(answer); /* will one day clean up answer here */ @@ -963,7 +963,7 @@ char * value; whattable() /* determine number: what hash table to use */ /* also determine h: points to hash_control */ { - + for (;;) { printf(" what hash table (%d:%d) ? ",0,TABLES-1); diff --git a/gnu/usr.bin/as/hash.h b/gnu/usr.bin/as/hash.h index 6918561..034c2aa 100644 --- a/gnu/usr.bin/as/hash.h +++ b/gnu/usr.bin/as/hash.h @@ -1,23 +1,23 @@ /* hash.h - for hash.c Copyright (C) 1987, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: hash.h,v 1.3 1993/10/02 20:57:35 pk Exp $ + * $Id: hash.h,v 1.2 1993/11/03 00:51:46 paul Exp $ */ diff --git a/gnu/usr.bin/as/hex-value.c b/gnu/usr.bin/as/hex-value.c index d27d4b3..432aa02 100644 --- a/gnu/usr.bin/as/hex-value.c +++ b/gnu/usr.bin/as/hex-value.c @@ -1,18 +1,18 @@ /* hex_value.c - char=>radix-value - Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -23,7 +23,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: hex-value.c,v 1.3 1993/10/02 20:57:36 pk Exp $"; +static char rcsid[] = "$Id: hex-value.c,v 1.2 1993/11/03 00:51:47 paul Exp $"; #endif #define __ (42) /* blatently illegal digit value */ diff --git a/gnu/usr.bin/as/input-file.c b/gnu/usr.bin/as/input-file.c index 3b124cc..39e19ac 100644 --- a/gnu/usr.bin/as/input-file.c +++ b/gnu/usr.bin/as/input-file.c @@ -1,18 +1,18 @@ /* input_file.c - Deal with Input Files - Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -25,7 +25,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: input-file.c,v 1.3 1993/10/02 20:57:37 pk Exp $"; +static char rcsid[] = "$Id: input-file.c,v 1.2 1993/11/03 00:51:48 paul Exp $"; #endif #ifdef USG @@ -90,17 +90,17 @@ int input_file_is_open() { can be restored with input_file_pop (). */ char *input_file_push () { register struct saved_file *saved; - + saved = (struct saved_file *)xmalloc (sizeof *saved); - + saved->f_in = f_in; saved->file_name = file_name; saved->preprocess = preprocess; if (preprocess) saved->app_save = app_push (); - + input_file_begin (); /* Initialize for new file */ - + return (char *)saved; } @@ -109,15 +109,15 @@ void char *arg; { register struct saved_file *saved = (struct saved_file *)arg; - + input_file_end (); /* Close out old file */ - + f_in = saved->f_in; file_name = saved->file_name; preprocess = saved->preprocess; if (preprocess) app_pop (saved->app_save); - + free(arg); } @@ -152,7 +152,7 @@ int debugging; /* TRUE if we are debugging assembler. */ char temporary_file_name[12]; int fd; union wait status; - + (void)strcpy (temporary_file_name, "#appXXXXXX"); (void)mktemp (temporary_file_name); pid = vfork (); @@ -204,9 +204,9 @@ int pre; { int c; char buf[80]; - + preprocess = pre; - + assert( filename != 0 ); /* Filename may not be NULL. */ if (filename[0]) { /* We have a file name. Suck it and see. */ f_in=fopen(filename,"r"); @@ -219,13 +219,13 @@ int pre; as_perror ("Can't open %s for reading", file_name); return; } - + #ifndef HO_VMS /* Ask stdio to buffer our input at BUFFER_SIZE, with a dynamically allocated buffer. */ setvbuf(f_in, (char *)NULL, _IOFBF, BUFFER_SIZE); #endif /* HO_VMS */ - + c = getc(f_in); if (c == '#') { /* Begins with comment, may not want to preprocess */ c = getc(f_in); @@ -243,18 +243,18 @@ int pre; ungetc('#',f_in); } else ungetc(c,f_in); - + #ifdef DONTDEF if ( preprocess ) { char temporary_file_name[17]; FILE *f_out; - + (void)strcpy (temporary_file_name, "/tmp/#appXXXXXX"); (void)mktemp (temporary_file_name); f_out=fopen(temporary_file_name,"w+"); if (f_out == (FILE *)0) as_perror("Can't open temp file %s",temporary_file_name); - + /* JF this will have to be moved on any system that does not support removal of open files. */ (void)unlink(temporary_file_name);/* JF do it NOW */ @@ -281,7 +281,7 @@ char * where; /* Where to place 1st character of new buffer. */ { char * return_value; /* -> Last char of what we read, + 1. */ register int size; - + if (f_in == (FILE *)0) return 0; /* @@ -295,10 +295,10 @@ char * where; /* Where to place 1st character of new buffer. */ int n; int ch; extern FILE *scrub_file; - + scrub_file=f_in; for (p = where, n = BUFFER_SIZE; n; --n) { - + ch = do_scrub_next_char(scrub_from_file, scrub_to_file); if (ch == EOF) break; diff --git a/gnu/usr.bin/as/input-file.h b/gnu/usr.bin/as/input-file.h index 5c88c7c..0c6da7d 100644 --- a/gnu/usr.bin/as/input-file.h +++ b/gnu/usr.bin/as/input-file.h @@ -1,18 +1,18 @@ /* input_file.h header for input-file.c Copyright (C) 1987, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -20,7 +20,7 @@ /*"input_file.c":Operating-system dependant functions to read source files.*/ /* - * $Id: input-file.h,v 1.3 1993/10/02 20:57:38 pk Exp $ + * $Id: input-file.h,v 1.2 1993/11/03 00:51:50 paul Exp $ */ diff --git a/gnu/usr.bin/as/input-scrub.c b/gnu/usr.bin/as/input-scrub.c index f914665..0e0a179 100644 --- a/gnu/usr.bin/as/input-scrub.c +++ b/gnu/usr.bin/as/input-scrub.c @@ -18,7 +18,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef lint -static char rcsid[] = "$Id: input-scrub.c,v 1.2 1993/11/03 00:51:51 paul Exp $"; +static char rcsid[] = "$Id: input-scrub.c,v 1.3 1994/12/23 22:36:05 nate Exp $"; #endif #include <errno.h> /* Need this to make errno declaration right */ @@ -321,7 +321,7 @@ bump_line_counters () * do_scrub_next_char). * If the fname is NULL, we don't change the current logical file name. */ -void +void new_logical_line (fname, line_number) char *fname; /* DON'T destroy it! We point to it! */ int line_number; @@ -344,7 +344,7 @@ new_logical_line (fname, line_number) * namep should be char * const *, but there are compilers which screw * up declarations like that, and it's easier to avoid it. */ -void +void as_where (namep, linep) char **namep; unsigned int *linep; @@ -399,7 +399,7 @@ as_howmuch (stream) } } -static void +static void as_1_char (c, stream) unsigned int c; FILE *stream; diff --git a/gnu/usr.bin/as/listing.c b/gnu/usr.bin/as/listing.c index df14a5e..f79a8b4 100644 --- a/gnu/usr.bin/as/listing.c +++ b/gnu/usr.bin/as/listing.c @@ -92,7 +92,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ */ #ifndef lint -static char rcsid[] = "$Id: listing.c,v 1.1 1993/11/03 00:51:54 paul Exp $"; +static char rcsid[] = "$Id: listing.c,v 1.2 1994/12/23 22:36:08 nate Exp $"; #endif #include <ctype.h> @@ -1021,28 +1021,28 @@ listing_flags (ignore) s_ignore (0); } -void +void listing_list (on) int on; { s_ignore (0); } -void +void listing_eject (ignore) int ignore; { s_ignore (0); } -void +void listing_psize (ignore) int ignore; { s_ignore (0); } -void +void listing_title (depth) int depth; { @@ -1056,20 +1056,20 @@ listing_file (name) } -void +void listing_newline (name) char *name; { } -void +void listing_source_line (n) unsigned int n; { } -void +void listing_source_file (n) const char *n; { diff --git a/gnu/usr.bin/as/messages.c b/gnu/usr.bin/as/messages.c index 84ce61a..55e97d9 100644 --- a/gnu/usr.bin/as/messages.c +++ b/gnu/usr.bin/as/messages.c @@ -18,7 +18,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef lint -static char rcsid[] = "$Id: messages.c,v 1.2 1993/11/03 00:52:01 paul Exp $"; +static char rcsid[] = "$Id: messages.c,v 1.3 1994/12/23 22:36:12 nate Exp $"; #endif #include <stdio.h> @@ -104,7 +104,7 @@ identify (file) static int warning_count; /* Count of number of warnings issued */ -int +int had_warnings () { return (warning_count); @@ -115,7 +115,7 @@ had_warnings () static int error_count; -int +int had_errors () { return (error_count); @@ -141,7 +141,7 @@ as_show_where () * Like perror(3), but with more info. */ -void +void as_perror (gripe, filename) const char *gripe; /* Unpunctuated error theme. */ const char *filename; @@ -172,7 +172,7 @@ as_perror (gripe, filename) */ #ifndef NO_STDARG -void +void as_tsktsk (const char *format,...) { va_list args; @@ -186,7 +186,7 @@ as_tsktsk (const char *format,...) #else #ifndef NO_VARARGS -void +void as_tsktsk (format, va_alist) char *format; va_dcl @@ -249,7 +249,7 @@ as_warn_internal (file, line, buffer) #endif #ifndef NO_STDARG -void +void as_warn (const char *format,...) { va_list args; @@ -266,7 +266,7 @@ as_warn (const char *format,...) #else #ifndef NO_VARARGS -void +void as_warn (format, va_alist) char *format; va_dcl @@ -306,7 +306,7 @@ as_warn (format, args) to handle the varargs correctly and portably. */ #ifndef NO_STDARG -void +void as_warn_where (char *file, unsigned int line, const char *format,...) { va_list args; @@ -323,7 +323,7 @@ as_warn_where (char *file, unsigned int line, const char *format,...) #else #ifndef NO_VARARGS -void +void as_warn_where (file, line, format, va_alist) char *file; unsigned int line; @@ -394,7 +394,7 @@ as_bad_internal (file, line, buffer) */ #ifndef NO_STDARG -void +void as_bad (const char *format,...) { va_list args; @@ -409,7 +409,7 @@ as_bad (const char *format,...) #else #ifndef NO_VARARGS -void +void as_bad (format, va_alist) char *format; va_dcl @@ -445,7 +445,7 @@ as_bad (format, args) to handle the varargs correctly and portably. */ #ifndef NO_STDARG -void +void as_bad_where (char *file, unsigned int line, const char *format,...) { va_list args; @@ -460,7 +460,7 @@ as_bad_where (char *file, unsigned int line, const char *format,...) #else #ifndef NO_VARARGS -void +void as_bad_where (file, line, format, va_alist) char *file; unsigned int line; @@ -505,7 +505,7 @@ as_bad_where (file, line, format, args) */ #ifndef NO_STDARG -void +void as_fatal (const char *format,...) { va_list args; @@ -521,7 +521,7 @@ as_fatal (const char *format,...) #else #ifndef NO_VARARGS -void +void as_fatal (format, va_alist) char *format; va_dcl diff --git a/gnu/usr.bin/as/obj.h b/gnu/usr.bin/as/obj.h index ac5b158..a621941 100644 --- a/gnu/usr.bin/as/obj.h +++ b/gnu/usr.bin/as/obj.h @@ -1,25 +1,25 @@ /* obj.h - defines the object dependent hooks for all object format backends. - + Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: obj.h,v 1.1 1993/10/02 20:57:45 pk Exp $ + * $Id: obj.h,v 1.1 1993/11/03 00:52:03 paul Exp $ */ diff --git a/gnu/usr.bin/as/obstack.h b/gnu/usr.bin/as/obstack.h index 880015f..c29bb1f 100644 --- a/gnu/usr.bin/as/obstack.h +++ b/gnu/usr.bin/as/obstack.h @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: obstack.h,v 1.3 1993/10/02 20:57:48 pk Exp $ + * $Id: obstack.h,v 1.2 1993/11/03 00:52:06 paul Exp $ */ @@ -286,7 +286,7 @@ __extension__ \ /* These assume that the obstack alignment is good enough for pointers or ints, and that the data added so far to the current object shares that much alignment. */ - + #define obstack_ptr_grow(OBSTACK,datum) \ __extension__ \ ({ struct obstack *__o = (OBSTACK); \ diff --git a/gnu/usr.bin/as/opcode/h8300.h b/gnu/usr.bin/as/opcode/h8300.h index f4702a8..59dea0d 100644 --- a/gnu/usr.bin/as/opcode/h8300.h +++ b/gnu/usr.bin/as/opcode/h8300.h @@ -69,17 +69,17 @@ typedef int op_type; -struct code +struct code { op_type nib[9]; } ; -struct arg +struct arg { op_type nib[3]; } ; -struct h8_opcode +struct h8_opcode { char *name; struct arg args; @@ -88,7 +88,7 @@ struct h8_opcode char noperands; char idx; char size; - + }; @@ -113,13 +113,13 @@ struct h8_opcode { name,{DISP8,E}, { Hex4, op, DISP8,IGNORE,E }} #define SOP(name) \ -{ name +{ name #define EOP } #define TWOOP(name, op1, op2,op3) \ { name, {IMM8, RD8,E}, { op1, RD8, IMM8,IGNORE,E}},\ -{ name, {RS8, RD8, E}, { op2, op3, RS8, RD8 ,E}} +{ name, {RS8, RD8, E}, { op2, op3, RS8, RD8 ,E}} #define UNOP(name, op1, op2) \ { name, {RS8, E}, { op1, op2, 0, RS8, E}} @@ -127,8 +127,8 @@ struct h8_opcode #define UNOP3(name, op1, op2, op3) \ { name , {RS8, E}, {op1, op2, op3, RS8, E}} -struct h8_opcode h8_opcodes[] -= +struct h8_opcode h8_opcodes[] += { TWOOP("add.b", Hex8, Hex0,Hex8), WTWOP("add.w", Hex0, Hex9), @@ -253,7 +253,7 @@ SOP("sub.b"), {RS8,RD8,E}, { Hex1, Hex8, RS8, RD8,E} EOP, SOP("sub.w"), {RS16|B30, RD16|B30,E}, {Hex1, Hex9, RS16|B30,RD16|B30,E} EOP, SOP("subs"), {KBIT,RD16|B30,E}, { Hex1, HexB, KBIT, RD16|B30,E} EOP, TWOOP("subx",HexB, Hex1, HexE), - TWOOP("xor", HexD, Hex1, Hex5), + TWOOP("xor", HexD, Hex1, Hex5), SOP("xorc"), {IMM8, CCR,E}, { Hex0, Hex5, IMM8,IGNORE,E} EOP, 0 }; diff --git a/gnu/usr.bin/as/opcode/i386.h b/gnu/usr.bin/as/opcode/i386.h index 0f7d8a0..0c66357 100644 --- a/gnu/usr.bin/as/opcode/i386.h +++ b/gnu/usr.bin/as/opcode/i386.h @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ - -/* $Id: i386.h,v 1.1 1993/11/03 00:55:51 paul Exp $ */ + +/* $Id: i386.h,v 1.2 1994/12/11 20:46:55 sef Exp $ */ static const template i386_optab[] = { @@ -501,7 +501,7 @@ static const template i386_optab[] = { /* comparison (without pop) */ {"fcom", 1, 0xd8d0, _, ShortForm, FloatReg, 0, 0}, {"fcoms", 1, 0xd8, 2, Modrm, Mem, 0, 0}, /* compare %st0, mem float */ -{"ficoml", 1, 0xda, 2, Modrm, Mem, 0, 0}, /* compare %st0, mem word */ +{"ficoml", 1, 0xda, 2, Modrm, Mem, 0, 0}, /* compare %st0, mem word */ {"fcoml", 1, 0xdc, 2, Modrm, Mem, 0, 0}, /* compare %st0, mem double */ {"fcoml", 1, 0xd8d0, _, ShortForm, FloatReg, 0, 0}, {"ficoms", 1, 0xde, 2, Modrm, Mem, 0, 0}, /* compare %st0, mem dword */ @@ -509,7 +509,7 @@ static const template i386_optab[] = { /* comparison (with pop) */ {"fcomp", 1, 0xd8d8, _, ShortForm, FloatReg, 0, 0}, {"fcomps", 1, 0xd8, 3, Modrm, Mem, 0, 0}, /* compare %st0, mem float */ -{"ficompl", 1, 0xda, 3, Modrm, Mem, 0, 0}, /* compare %st0, mem word */ +{"ficompl", 1, 0xda, 3, Modrm, Mem, 0, 0}, /* compare %st0, mem word */ {"fcompl", 1, 0xdc, 3, Modrm, Mem, 0, 0}, /* compare %st0, mem double */ {"fcompl", 1, 0xd8d8, _, ShortForm, FloatReg, 0, 0}, {"ficomps", 1, 0xde, 3, Modrm, Mem, 0, 0}, /* compare %st0, mem dword */ @@ -736,7 +736,7 @@ static const template i386_optab[] = { }; #undef _ -static const template *i386_optab_end +static const template *i386_optab_end = i386_optab + sizeof (i386_optab)/sizeof(i386_optab[0]); /* 386 register table */ @@ -765,8 +765,8 @@ static const reg_entry i386_regtab[] = { /* float registers */ {"st(0)", FloatReg|FloatAcc, 0}, {"st", FloatReg|FloatAcc, 0}, - {"st(1)", FloatReg, 1}, {"st(2)", FloatReg, 2}, - {"st(3)", FloatReg, 3}, {"st(4)", FloatReg, 4}, {"st(5)", FloatReg, 5}, + {"st(1)", FloatReg, 1}, {"st(2)", FloatReg, 2}, + {"st(3)", FloatReg, 3}, {"st(4)", FloatReg, 4}, {"st(5)", FloatReg, 5}, {"st(6)", FloatReg, 6}, {"st(7)", FloatReg, 7} }; diff --git a/gnu/usr.bin/as/opcode/i860.h b/gnu/usr.bin/as/opcode/i860.h index 0842786..b429a22 100644 --- a/gnu/usr.bin/as/opcode/i860.h +++ b/gnu/usr.bin/as/opcode/i860.h @@ -82,7 +82,7 @@ Kinds of operands: */ /* The order of the opcodes in this table is significant: - + * The assembler requires that all instances of the same mnemonic must be consecutive. If they aren't, the assembler will bomb at runtime. diff --git a/gnu/usr.bin/as/opcode/i960.h b/gnu/usr.bin/as/opcode/i960.h index e9c8cb4..6a6ad42 100644 --- a/gnu/usr.bin/as/opcode/i960.h +++ b/gnu/usr.bin/as/opcode/i960.h @@ -16,9 +16,9 @@ * the instruction generated (a CTRL-format 'call') should have its relocation * specially flagged for link-time replacement with a 'bal' or 'calls' if * appropriate. - */ + */ -/* $Id: i960.h,v 1.1 1993/10/02 21:00:44 pk Exp $ */ +/* $Id: i960.h,v 1.1 1993/11/03 00:55:56 paul Exp $ */ #define CTRL 0 #define COBR 1 @@ -38,7 +38,7 @@ #define M2 0x1000 #define M3 0x2000 -/* Generate the 12-bit opcode for a REG format instruction by placing the +/* Generate the 12-bit opcode for a REG format instruction by placing the * high 8 bits in instruction bits 24-31, the low 4 bits in instruction bits * 7-10. */ diff --git a/gnu/usr.bin/as/opcode/m68k.h b/gnu/usr.bin/as/opcode/m68k.h index 86ee7a9..65825fb 100644 --- a/gnu/usr.bin/as/opcode/m68k.h +++ b/gnu/usr.bin/as/opcode/m68k.h @@ -157,7 +157,7 @@ struct m68k_opcode { /* JF: for the 68851 */ /* - I didn't use much imagination in choosing the + I didn't use much imagination in choosing the following codes, so many of them aren't very mnemonic. -rab @@ -981,7 +981,7 @@ struct m68k_opcode m68k_opcodes[] = {"fmovem", two(0xF018, 0xD000), two(0xF1F8, 0xFF00), "Id+s#3", mfloat }, /* from autoincrement, static and dynamic: */ {"fmovem", two(0xF018, 0xD800), two(0xF1F8, 0xFF8F), "Ii+sDk", mfloat }, /* from autoincrement, static and dynamic: */ - + {"fmovem", two(0xF000, 0xD000), two(0xF1C0, 0xFF00), "Id&s#3", mfloat }, /* from control, static and dynamic: */ {"fmovem", two(0xF000, 0xD800), two(0xF1C0, 0xFF8F), "Ii&sDk", mfloat }, /* from control, static and dynamic: */ @@ -1287,7 +1287,7 @@ struct m68k_opcode m68k_opcodes[] = {"ftrapule", two(0xF07C, 0x000D), two(0xF1FF, 0xFFFF), "Ii", mfloat }, {"ftrapult", two(0xF07C, 0x000C), two(0xF1FF, 0xFFFF), "Ii", mfloat }, {"ftrapun", two(0xF07C, 0x0008), two(0xF1FF, 0xFFFF), "Ii", mfloat }, - + {"ftrapeqw", two(0xF07A, 0x0001), two(0xF1FF, 0xFFFF), "Ii^w", mfloat }, {"ftrapfw", two(0xF07A, 0x0000), two(0xF1FF, 0xFFFF), "Ii^w", mfloat }, {"ftrapgew", two(0xF07A, 0x0013), two(0xF1FF, 0xFFFF), "Ii^w", mfloat }, @@ -1840,7 +1840,7 @@ struct m68k_opcode m68k_opcodes[] = {"subxw", one(0110510), one(0170770), "-s-d", m68000up }, {"swap", one(0044100), one(0177770), "Ds", m68000up }, - + {"tas", one(0045300), one(0177700), "$s", m68000up }, {"trap", one(0047100), one(0177760), "Ts", m68000up }, diff --git a/gnu/usr.bin/as/opcode/mips.h b/gnu/usr.bin/as/opcode/mips.h index a65678a..796ed47 100644 --- a/gnu/usr.bin/as/opcode/mips.h +++ b/gnu/usr.bin/as/opcode/mips.h @@ -122,7 +122,7 @@ struct mips_opcode #define op_o16(x, y) ((x << 26) | (y << 16)) #define op_bc(x, y, z) ((x << 26) | (y << 21) | (z << 16)) -struct mips_opcode mips_opcodes[] = +struct mips_opcode mips_opcodes[] = { /* These first opcodes are special cases of the ones in the comments */ {"nop", 0, 0xffffffff, /*li*/ "", 0}, diff --git a/gnu/usr.bin/as/opcode/ns32k.h b/gnu/usr.bin/as/opcode/ns32k.h index 2a7621a..e513e64 100644 --- a/gnu/usr.bin/as/opcode/ns32k.h +++ b/gnu/usr.bin/as/opcode/ns32k.h @@ -37,7 +37,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ the opcode or the addition of data to the opcode. The operands in the source instruction are checked for inconsistent semantics. - + F : 32 bit float general form L : 64 bit float " B : byte " @@ -115,7 +115,7 @@ struct not /* ns32k opcode text */ }; /* Instructions look like this: - + basic instruction--1, 2, or 3 bytes index byte for operand A, if operand A is indexed--1 byte index byte for operand B, if operand B is indexed--1 byte @@ -129,7 +129,7 @@ struct not /* ns32k opcode text */ The implied operands are associated with operands other than A and B. Each operand has a digit and a letter. - + The digit gives the position in the assembly language. The letter, one of the following, tells us what kind of operand it is. */ diff --git a/gnu/usr.bin/as/opcode/pyr.h b/gnu/usr.bin/as/opcode/pyr.h index 06632b8..ea5d84a 100644 --- a/gnu/usr.bin/as/opcode/pyr.h +++ b/gnu/usr.bin/as/opcode/pyr.h @@ -20,7 +20,7 @@ typedef struct pyr_insn_format { unsigned int operand_1 :6; unsigned int operand_2:6; } pyr_insn_format; - + /* We store four bytes of opcode for all opcodes. Pyramid is sufficiently RISCy that: @@ -29,7 +29,7 @@ typedef struct pyr_insn_format { the insn. (ie, if there are zero, one, or two words of immediate operand/offset). - + The args component is a string containing two characters for each operand of the instruction. The first specifies the kind of operand; the second, the place it is stored. */ @@ -44,11 +44,11 @@ typedef struct pyr_insn_format { 0x0010: movw I(Rn),Rn offset register indirect to register movw I(Rn)[x],Rn offset register indirect, indexed, to register - 0x0020: movw Rn,(Rn) register to register indirect - 0x0040: movw K,(Rn) quick immediate to register indirect - 0x0080: movw I,(Rn) long immediate to register indirect - 0x0100: movw (Rn),(Rn) register indirect to-register indirect - 0x0100: movw (Rn),(Rn) register indirect to-register indirect + 0x0020: movw Rn,(Rn) register to register indirect + 0x0040: movw K,(Rn) quick immediate to register indirect + 0x0080: movw I,(Rn) long immediate to register indirect + 0x0100: movw (Rn),(Rn) register indirect to-register indirect + 0x0100: movw (Rn),(Rn) register indirect to-register indirect 0x0200: movw I(Rn),(Rn) register indirect+offset to register indirect 0x0200: movw I(Rn),(Rn) register indirect+offset to register indirect @@ -59,7 +59,7 @@ typedef struct pyr_insn_format { 0x1000: movw I(Rn),I(Rn) register indirect+offset to register indirect +offset 0x0000: (irregular) ??? - + Each insn has a four-bit field encoding the type(s) of its operands. */ @@ -228,7 +228,7 @@ struct pyr_opcode pyr_opcodes[] = would not be surprising. They are unlikely to be a packed bcd string: 64 bits of long give is only 15 digits+sign, which isn't enough for COBOL. - */ + */ #if 0 {"wcsp", { 2, "", UNKNOWN, 0x00} }, /*write csp?*/ /* The OSx Operating System Porting Guide claims SSL does things diff --git a/gnu/usr.bin/as/opcode/sparc.h b/gnu/usr.bin/as/opcode/sparc.h index a7dbafb..7921cf5 100644 --- a/gnu/usr.bin/as/opcode/sparc.h +++ b/gnu/usr.bin/as/opcode/sparc.h @@ -20,7 +20,7 @@ along with GAS or GDB; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: sparc.h,v 1.1 1993/11/03 00:56:11 paul Exp $ + * $Id: sparc.h,v 1.2 1994/12/23 22:37:45 nate Exp $ */ /* FIXME-someday: perhaps the ,a's and such should be embedded in the @@ -115,7 +115,7 @@ The following chars are unused: (note: ,[] are used as punctuation) */ /* The order of the opcodes in this table is significant: - + * The assembler requires that all instances of the same mnemonic must be consecutive. If they aren't, the assembler will bomb at runtime. @@ -868,7 +868,7 @@ condfc("fbule", "cb013", 0xe, 0), { "cpop1", F3(2, 0x36, 0), F3(~2, ~0x36, ~1), "[1+2],d", 0, v6 }, { "cpop2", F3(2, 0x37, 0), F3(~2, ~0x37, ~1), "[1+2],d", 0, v6 }, - + }; diff --git a/gnu/usr.bin/as/opcode/tahoe.h b/gnu/usr.bin/as/opcode/tahoe.h index 27099a4..72b0082 100644 --- a/gnu/usr.bin/as/opcode/tahoe.h +++ b/gnu/usr.bin/as/opcode/tahoe.h @@ -41,7 +41,7 @@ totstrs[] = { "lnd", {"rq", 0x17 } }, { "addb3", {"rbrbwb", 0x18 } }, /* cmpb is wrong in the "offical" (what a joke!) text. It's not "rbwb" */ -{ "cmpb", {"rbrb", 0x19 } }, +{ "cmpb", {"rbrb", 0x19 } }, { "addw3", {"rwrwww", 0x1a } }, /* cmpw is wrong in the "offical" text. It's not "rwww" */ { "cmpw", {"rwrw", 0x1b } }, diff --git a/gnu/usr.bin/as/output-file.c b/gnu/usr.bin/as/output-file.c index 7439e86..1a8683b 100644 --- a/gnu/usr.bin/as/output-file.c +++ b/gnu/usr.bin/as/output-file.c @@ -1,18 +1,18 @@ /* output-file.c - Deal with the output file Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -27,7 +27,7 @@ /* note that we do need config info. xoxorich. */ #ifndef lint -static char rcsid[] = "$Id: output-file.c,v 1.3 1993/10/02 20:57:49 pk Exp $"; +static char rcsid[] = "$Id: output-file.c,v 1.2 1993/11/03 00:52:08 paul Exp $"; #endif #include <stdio.h> @@ -50,7 +50,7 @@ char *name; exit(42); } bfd_set_format(stdoutput, bfd_object); -} +} /* output_file_create() */ @@ -72,7 +72,7 @@ long length; char *filename; { abort(); /* Never do this */ -} +} #else @@ -106,7 +106,7 @@ char *where; long length; char *filename; { - + for (; length; length--, where++) { (void) putc(*where, stdoutput); if (ferror(stdoutput)) diff --git a/gnu/usr.bin/as/output-file.h b/gnu/usr.bin/as/output-file.h index e7d7b97..37878ab 100644 --- a/gnu/usr.bin/as/output-file.h +++ b/gnu/usr.bin/as/output-file.h @@ -1,24 +1,24 @@ /* This file is output-file.h Copyright (C) 1987-1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: output-file.h,v 1.1 1993/10/02 20:57:49 pk Exp $ + * $Id: output-file.h,v 1.1 1993/11/03 00:52:10 paul Exp $ */ diff --git a/gnu/usr.bin/as/read.c b/gnu/usr.bin/as/read.c index c23719b..c9bcbca 100644 --- a/gnu/usr.bin/as/read.c +++ b/gnu/usr.bin/as/read.c @@ -1,25 +1,25 @@ /* read.c - read a source file - Copyright (C) 1986, 1987, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef lint -static char rcsid[] = "$Id: read.c,v 1.4 1993/12/12 17:01:16 jkh Exp $"; +static char rcsid[] = "$Id: read.c,v 1.5 1994/12/23 22:36:15 nate Exp $"; #endif #define MASK_CHAR (0xFF) /* If your chars aren't 8 bits, you will @@ -51,7 +51,7 @@ char *input_line_pointer; /*->next char of source file to parse. */ The following table is indexed by [ (char) ] and will break if a char does not have exactly 256 states (hopefully 0:255!) ! #endif - + #ifdef ALLOW_ATSIGN #define AT 2 #else @@ -165,17 +165,17 @@ void read_begin() { const char *p; - + pobegin(); obj_read_begin_hook(); - + obstack_begin(¬es, 5000); obstack_begin(&cond_obstack, 960); - + #define BIGNUM_BEGIN_SIZE (16) bignum_low = xmalloc((long)BIGNUM_BEGIN_SIZE); bignum_limit = bignum_low + BIGNUM_BEGIN_SIZE; - + /* Use machine dependent syntax */ for (p = line_separator_chars; *p; p++) is_end_of_line[*p] = 1; @@ -285,9 +285,9 @@ static const pseudo_typeS static void pobegin() { char *errtxt; /* error text */ const pseudo_typeS * pop; - + po_hash = hash_new(); - + /* Do the target-specific pseudo ops. */ for (pop = md_pseudo_table; pop->poc_name; pop++) { errtxt = hash_insert(po_hash, pop->poc_name, (char *)pop); @@ -295,7 +295,7 @@ static void pobegin() { as_fatal("error constructing md pseudo-op table"); } /* on error */ } /* for each op */ - + /* Now object specific. Skip any that were in the target table. */ for (pop = obj_pseudo_table; pop->poc_name; pop++) { errtxt = hash_insert(po_hash, pop->poc_name, (char *) pop); @@ -310,7 +310,7 @@ static void pobegin() { } /* if overridden */ } /* on error */ } /* for each op */ - + /* Now portable ones. Skip any that we've seen already. */ for (pop = potable; pop->poc_name; pop++) { errtxt = hash_insert(po_hash, pop->poc_name, (char *) pop); @@ -325,7 +325,7 @@ static void pobegin() { } /* if overridden */ } /* on error */ } /* for each op */ - + return; } /* pobegin() */ @@ -351,18 +351,18 @@ char *name; register char * s; /* string of symbol, '\0' appended */ register int temp; pseudo_typeS *pop = NULL; - + buffer = input_scrub_new_file(name); - + listing_file(name); listing_newline(""); - + while ((buffer_limit = input_scrub_next_buffer(&input_line_pointer)) != 0) { /* We have another line to parse. */ know(buffer_limit[-1] == '\n'); /* Must have a sentinel. */ contin: /* JF this goto is my fault I admit it. Someone brave please re-write the whole input section here? Pleeze??? */ while (input_line_pointer < buffer_limit) { /* We have more of this buffer to parse. */ - + /* * We now have input_line_pointer->1st char of next line. * If input_line_pointer[-1] == '\n' then we just @@ -371,9 +371,9 @@ char *name; if (input_line_pointer[-1] == '\n') { bump_line_counters(); } /* just passed a newline */ - - - + + + /* * We are at the begining of a line, or similar place. * We expect a well-formed assembler statement. @@ -399,7 +399,7 @@ char *name; */ if (is_name_beginner(c)) { /* want user-defined label or pseudo/opcode */ HANDLE_CONDITIONAL_ASSEMBLY(); - + s = input_line_pointer - 1; c = get_symbol_end(); /* name's delimiter */ /* @@ -414,8 +414,8 @@ char *name; * input_line_pointer ++ = ':'; /* Put ':' back for error messages' sake. */ /* Input_line_pointer->after ':'. */ SKIP_WHITESPACE(); - - + + } else if (c == '=' || input_line_pointer[1] == '=') { /* JF deal with FOO=BAR */ equals(s); demand_empty_rest_of_line(); @@ -432,12 +432,12 @@ char *name; * We lookup the pseudo-op table with s+1 because we * already know that the pseudo-op begins with a '.'. */ - + #ifdef NO_DOT_PSEUDOS if (*s == '.') #endif pop = (pseudo_typeS *) hash_find(po_hash, s+1); - + /* Print the error msg now, while we still can */ if (!pop) { as_bad("Unknown pseudo-op: `%s'",s); @@ -445,7 +445,7 @@ char *name; s_ignore(0); break; } - + /* Put it back for error messages etc. */ *input_line_pointer = c; /* The following skip of whitespace is compulsory. */ @@ -477,20 +477,20 @@ char *name; *input_line_pointer++ = c; /* We resume loop AFTER the end-of-line from this instruction */ } /* if (*s == '.') */ - + } /* if c == ':' */ continue; } /* if (is_name_beginner(c) */ - - + + if (is_end_of_line[c]) { continue; } /* empty statement */ - - + + if (isdigit(c)) { /* local label ("4:") */ HANDLE_CONDITIONAL_ASSEMBLY (); - + temp = c - '0'; #ifdef LOCAL_LABELS_DOLLAR if (*input_line_pointer == '$') @@ -505,7 +505,7 @@ char *name; } continue; } /* local label ("4:") */ - + if (c && strchr(line_comment_chars, c)) { /* Its a comment. Better say APP or NO_APP */ char *ends; char *new_buf; @@ -513,19 +513,19 @@ char *name; int new_length; char *tmp_buf = 0; extern char *scrub_string, *scrub_last_string; - + bump_line_counters(); s = input_line_pointer; if (strncmp(s,"APP\n",4)) continue; /* We ignore it */ s += 4; - + ends = strstr(s,"#NO_APP\n"); - + if (!ends) { int tmp_len; int num; - + /* The end of the #APP wasn't in this buffer. We keep reading in buffers until we find the #NO_APP that goes with this #APP There is one. The specs @@ -545,29 +545,29 @@ char *name; num = ends - buffer; else num = buffer_limit - buffer; - + tmp_buf = xrealloc(tmp_buf, tmp_len + num); memcpy(tmp_buf + tmp_len, buffer, num); tmp_len += num; } while (!ends); - + input_line_pointer = ends ? ends + 8 : NULL; - + s = tmp_buf; ends = s + tmp_len; - + } else { input_line_pointer = ends + 8; } new_buf=xmalloc(100); new_length=100; new_tmp=new_buf; - + scrub_string = s; scrub_last_string = ends; for (;;) { int ch; - + ch = do_scrub_next_char(scrub_from_string, scrub_to_string); if (ch == EOF) break; *new_tmp++ = ch; @@ -577,7 +577,7 @@ char *name; new_length += 100; } } - + if (tmp_buf) free(tmp_buf); old_buffer = buffer; @@ -588,9 +588,9 @@ char *name; buffer_limit = new_tmp; continue; } - + HANDLE_CONDITIONAL_ASSEMBLY(); - + /* as_warn("Junk character %d.",c); Now done by ignore_rest */ input_line_pointer--; /* Report unknown char as ignored. */ ignore_rest_of_line(); @@ -607,7 +607,7 @@ char *name; } } /* while (more buffers to scan) */ input_scrub_close(); /* Close the input file */ - + } /* read_a_source_file() */ void s_abort() { @@ -622,16 +622,16 @@ int arg; register long temp_fill; unsigned int i = 0; unsigned long max_alignment = 1 << 15; - + if (is_end_of_line[*input_line_pointer]) temp = arg; /* Default value from pseudo-op table */ else temp = get_absolute_expression(); - + if (temp > max_alignment) { as_bad("Alignment too large: %d. assumed.", temp = max_alignment); } - + /* * For the sparc, `.align (1<<n)' actually means `.align n' * so we have to convert it. @@ -642,7 +642,7 @@ int arg; } if (temp != 1) as_bad("Alignment not a power of 2"); - + temp = i; if (*input_line_pointer == ',') { input_line_pointer ++; @@ -653,7 +653,7 @@ int arg; /* Only make a frag if we HAVE to... */ if (temp && ! need_pass_2) frag_align(temp, (int)temp_fill); - + demand_empty_rest_of_line(); } /* s_align_bytes() */ @@ -662,7 +662,7 @@ void s_align_ptwo() { register int temp; register long temp_fill; long max_alignment = 15; - + temp = get_absolute_expression(); if (temp > max_alignment) as_bad("Alignment too large: %d. assumed.", temp = max_alignment); @@ -678,9 +678,9 @@ void s_align_ptwo() { /* Only make a frag if we HAVE to... */ if (temp && ! need_pass_2) frag_align (temp, (int)temp_fill); - + record_alignment(now_seg, temp); - + demand_empty_rest_of_line(); } /* s_align_ptwo() */ @@ -690,7 +690,7 @@ void s_comm() { register char *p; register int temp; register symbolS *symbolP; - + name = input_line_pointer; c = get_symbol_end(); /* just after name is now '\0' */ @@ -738,14 +738,14 @@ void s_data() { register int temp; - + temp = get_absolute_expression(); #ifdef MANY_SEGMENTS subseg_new (SEG_E1, (subsegT)temp); #else subseg_new (SEG_DATA, (subsegT)temp); #endif - + #ifdef OBJ_VMS const_flag = 0; #endif /* not OBJ_VMS */ @@ -764,7 +764,7 @@ void s_app_file(appfile) { register char *s; int length; - + /* Some assemblers tolerate immediately following '"' */ if ((s = demand_copy_string(&length)) != 0) { /* If this is a fake .appfile, a fake newline was inserted @@ -809,7 +809,7 @@ void s_fill() { long temp_size; register long temp_fill; char *p; - + if (get_absolute_expression_and_terminator(& temp_repeat) != ',') { input_line_pointer --; /* Backup over what was not a ','. */ as_bad("Expect comma after rep-size in .fill:"); @@ -861,7 +861,7 @@ void s_globl() { register char *name; register int c; register symbolS * symbolP; - + do { name = input_line_pointer; c = get_symbol_end(); @@ -892,7 +892,7 @@ int needs_align; /* 1 if this was a ".bss" directive, which may require register symbolS * symbolP; const int max_alignment = 15; int align = 0; - + name = input_line_pointer; c = get_symbol_end(); p = input_line_pointer; @@ -903,20 +903,20 @@ int needs_align; /* 1 if this was a ".bss" directive, which may require ignore_rest_of_line(); return; } - + ++input_line_pointer; - + if (*input_line_pointer == '\n') { as_bad("Missing size expression"); return; } - + if ((temp = get_absolute_expression()) < 0) { as_warn("BSS length (%d.) <0! Ignored.", temp); ignore_rest_of_line(); return; } - + if (needs_align) { align = 0; SKIP_WHITESPACE(); @@ -946,11 +946,11 @@ int needs_align; /* 1 if this was a ".bss" directive, which may require record_alignment(SEG_BSS, align); #endif } /* if needs align */ - + *p = 0; symbolP = symbol_find_or_make(name); *p = c; - + if ( #if defined(OBJ_AOUT) | defined(OBJ_BOUT) S_GET_OTHER(symbolP) == 0 && @@ -964,7 +964,7 @@ int needs_align; /* 1 if this was a ".bss" directive, which may require local_bss_counter = (local_bss_counter + align) & (~align); } - + S_SET_VALUE(symbolP, local_bss_counter); S_SET_SEGMENT(symbolP, SEG_BSS); #ifdef OBJ_COFF @@ -983,7 +983,7 @@ int needs_align; /* 1 if this was a ".bss" directive, which may require S_GET_VALUE(symbolP), local_bss_counter); } demand_empty_rest_of_line(); - + return; } /* s_lcomm() */ @@ -1006,7 +1006,7 @@ void s_lsym() { register segT segment; expressionS exp; register symbolS *symbolP; - + /* we permit ANY defined expression: BSD4.2 demands constants */ name = input_line_pointer; c = get_symbol_end(); @@ -1037,7 +1037,7 @@ void s_lsym() { } *p = 0; symbolP = symbol_find_or_make(name); - + /* FIXME-SOON I pulled a (&& symbolP->sy_other == 0 && symbolP->sy_desc == 0) out of this test because coff doesn't have those fields, and I @@ -1045,7 +1045,7 @@ void s_lsym() { think I understand why they were here so I may have introduced a bug. As recently as 1.37 didn't have this test anyway. xoxorich. */ - + if (S_GET_SEGMENT(symbolP) == SEG_UNKNOWN && S_GET_VALUE(symbolP) == 0) { /* The name might be an undefined .global symbol; be @@ -1101,7 +1101,7 @@ void s_set() { register char delim; register char *end_name; register symbolS *symbolP; - + /* * Especial apologies for the random logic: * this just grew, and could be parsed much more simply! @@ -1112,7 +1112,7 @@ void s_set() { end_name = input_line_pointer; *end_name = delim; SKIP_WHITESPACE(); - + if (*input_line_pointer != ',') { *end_name = 0; as_bad("Expected comma after name \"%s\"", name); @@ -1120,18 +1120,18 @@ void s_set() { ignore_rest_of_line(); return; } - + input_line_pointer ++; *end_name = 0; - + if (name[0] == '.' && name[1] == '\0') { /* Turn '. = mumble' into a .org mumble */ register segT segment; expressionS exp; register char *ptr; - + segment = get_known_segmented_expression(& exp); - + if (!need_pass_2) { if (segment != now_seg && segment != SEG_ABSOLUTE) as_bad("Invalid segment \"%s\". Segment \"%s\" assumed.", @@ -1141,11 +1141,11 @@ void s_set() { exp.X_add_number, (char *)0); *ptr= 0; } /* if (ok to make frag) */ - + *end_name = delim; return; } - + if ((symbolP = symbol_find(name)) == NULL && (symbolP = md_undefined_symbol(name)) == NULL) { symbolP = symbol_new(name, @@ -1156,11 +1156,11 @@ void s_set() { /* "set" symbols are local unless otherwise specified. */ SF_SET_LOCAL(symbolP); #endif /* OBJ_COFF */ - + } /* make a new symbol */ - + symbol_table_insert(symbolP); - + *end_name = delim; pseudo_set(symbolP); demand_empty_rest_of_line(); @@ -1174,7 +1174,7 @@ void s_size() { register symbolS *symbolP; expressionS *exp; segT seg; - + SKIP_WHITESPACE(); name = input_line_pointer; c = get_symbol_end(); @@ -1226,7 +1226,7 @@ void s_type() { register char *p; register symbolS *symbolP; int aux; - + SKIP_WHITESPACE(); name = input_line_pointer; c = get_symbol_end(); @@ -1278,7 +1278,7 @@ void s_space() { long temp_repeat; register long temp_fill; register char *p; - + /* Just like .fill, but temp_size = 1 */ if (get_absolute_expression_and_terminator(& temp_repeat) == ',') { temp_fill = get_absolute_expression(); @@ -1303,7 +1303,7 @@ void s_text() { register int temp; - + temp = get_absolute_expression(); #ifdef MANY_SEGMENTS subseg_new (SEG_E0, (subsegT)temp); @@ -1367,19 +1367,19 @@ symbolS * symbolP; #if defined(OBJ_AOUT) | defined(OBJ_BOUT) int ext; #endif /* OBJ_AOUT or OBJ_BOUT */ - + know(symbolP); /* NULL pointer is logic error. */ #if defined(OBJ_AOUT) | defined(OBJ_BOUT) ext=S_IS_EXTERNAL(symbolP); #endif /* OBJ_AOUT or OBJ_BOUT */ - + if ((segment = expression(& exp)) == SEG_ABSENT) { as_bad("Missing expression: absolute 0 assumed"); exp.X_seg = SEG_ABSOLUTE; exp.X_add_number = 0; } - + switch (segment) { case SEG_BIG: @@ -1393,7 +1393,7 @@ symbolS * symbolP; S_SET_VALUE(symbolP, 0); symbolP->sy_frag = & zero_address_frag; break; - + case SEG_ABSENT: as_warn("No expression: Using absolute 0"); S_SET_SEGMENT(symbolP, SEG_ABSOLUTE); @@ -1404,10 +1404,10 @@ symbolS * symbolP; S_SET_VALUE(symbolP, 0); symbolP->sy_frag = & zero_address_frag; break; - + case SEG_DIFFERENCE: if (exp.X_add_symbol && exp.X_subtract_symbol - && (S_GET_SEGMENT(exp.X_add_symbol) == + && (S_GET_SEGMENT(exp.X_add_symbol) == S_GET_SEGMENT(exp.X_subtract_symbol))) { if (exp.X_add_symbol->sy_frag != exp.X_subtract_symbol->sy_frag) { as_bad("Unknown expression: symbols %s and %s are in different frags.", @@ -1427,7 +1427,7 @@ symbolS * symbolP; S_SET_VALUE(symbolP, exp.X_add_number); symbolP->sy_frag = & zero_address_frag; break; - + default: #ifdef MANY_SEGMENTS S_SET_SEGMENT(symbolP, segment); @@ -1446,25 +1446,25 @@ symbolS * symbolP; S_CLEAR_EXTERNAL(symbolP); } /* if external */ #endif /* OBJ_AOUT or OBJ_BOUT */ - + S_SET_VALUE(symbolP, exp.X_add_number + S_GET_VALUE(exp.X_add_symbol)); symbolP->sy_frag = exp.X_add_symbol->sy_frag; break; - + case SEG_PASS1: /* Not an error. Just try another pass. */ symbolP->sy_forward=exp.X_add_symbol; as_bad("Unknown expression"); know(need_pass_2 == 1); break; - + case SEG_UNKNOWN: symbolP->sy_forward=exp.X_add_symbol; /* as_warn("unknown symbol"); */ /* need_pass_2 = 1; */ break; - - - + + + } } @@ -1498,27 +1498,27 @@ register unsigned int nbytes; /* 1=.byte, 2=.word, 4=.long */ register char * p; register segT segment; expressionS exp; - + /* * Input_line_pointer->1st char after pseudo-op-code and could legally * be a end-of-line. (Or, less legally an eof - which we cope with.) */ /* JF << of >= number of bits in the object is undefined. In particular SPARC (Sun 4) has problems */ - + if (nbytes >= sizeof(long)) { mask = 0; } else { mask = ~0 << (BITS_PER_CHAR * nbytes); /* Don't store these bits. */ } /* bigger than a long */ - + unmask = ~mask; /* Do store these bits. */ - + #ifdef NEVER "Do this mod if you want every overflow check to assume SIGNED 2's complement data."; mask = ~ (unmask >> 1); /* Includes sign bit now. */ #endif - + /* * The following awkward logic is to parse ZERO or more expressions, * comma seperated. Recall an expression includes its leading & @@ -1531,7 +1531,7 @@ register unsigned int nbytes; /* 1=.byte, 2=.word, 4=.long */ } else { c = ','; } /* if the end else fake it */ - + /* Do loop. */ while (c == ',') { #ifdef WANT_BITFIELDS @@ -1539,10 +1539,10 @@ register unsigned int nbytes; /* 1=.byte, 2=.word, 4=.long */ /* used for error messages and rescanning */ char *hold = input_line_pointer; #endif /* WANT_BITFIELDS */ - + /* At least scan over the expression. */ segment = expression(&exp); - + #ifdef WANT_BITFIELDS /* Some other assemblers, (eg, asm960), allow bitfields after ".byte" as w:x,y:z, where w and @@ -1551,28 +1551,28 @@ register unsigned int nbytes; /* 1=.byte, 2=.word, 4=.long */ better in that we allow them in words, longs, etc. and we'll pack them in target byte order for you. - + The rules are: pack least significat bit first, if a field doesn't entirely fit, put it in the next unit. Overflowing the bitfield is explicitly *not* even a warning. The bitwidth should be considered a "mask". - + FIXME-SOMEDAY: If this is considered generally useful, this logic should probably be reworked. xoxorich. */ - + if (*input_line_pointer == ':') { /* bitfields */ long value = 0; - + for (;;) { unsigned long width; - + if (*input_line_pointer != ':') { input_line_pointer = hold; break; } /* next piece is not a bitfield */ - + /* In the general case, we can't allow full expressions with symbol differences and such. The relocation @@ -1581,7 +1581,7 @@ register unsigned int nbytes; /* 1=.byte, 2=.word, 4=.long */ widths, positions, and masks which most of our current object formats don't support. - + In the specific case where a symbol *is* defined in this assembly, we *could* build fixups and track it, but @@ -1590,13 +1590,13 @@ register unsigned int nbytes; /* 1=.byte, 2=.word, 4=.long */ SEG_ABSOLUTE. I think that means that you can use a previous .set or .equ type symbol. xoxorich. */ - + if (segment == SEG_ABSENT) { as_warn("Using a bit field width of zero."); exp.X_add_number = 0; segment = SEG_ABSOLUTE; } /* implied zero width bitfield */ - + if (segment != SEG_ABSOLUTE) { *input_line_pointer = '\0'; as_bad("Field width \"%s\" too complex for a bitfield.\n", hold); @@ -1604,13 +1604,13 @@ register unsigned int nbytes; /* 1=.byte, 2=.word, 4=.long */ demand_empty_rest_of_line(); return; } /* too complex */ - + if ((width = exp.X_add_number) > (BITS_PER_CHAR * nbytes)) { as_warn("Field width %d too big to fit in %d bytes: truncated to %d bits.", width, nbytes, (BITS_PER_CHAR * nbytes)); width = BITS_PER_CHAR * nbytes; } /* too big */ - + if (width > bits_available) { /* FIXME-SOMEDAY: backing up and reparsing is wasteful */ @@ -1618,42 +1618,42 @@ register unsigned int nbytes; /* 1=.byte, 2=.word, 4=.long */ exp.X_add_number = value; break; } /* won't fit */ - + hold = ++input_line_pointer; /* skip ':' */ - + if ((segment = expression(&exp)) != SEG_ABSOLUTE) { char cache = *input_line_pointer; - + *input_line_pointer = '\0'; as_bad("Field value \"%s\" too complex for a bitfield.\n", hold); *input_line_pointer = cache; demand_empty_rest_of_line(); return; } /* too complex */ - + value |= (~(-1 << width) & exp.X_add_number) << ((BITS_PER_CHAR * nbytes) - bits_available); - + if ((bits_available -= width) == 0 || is_it_end_of_statement() || *input_line_pointer != ',') { break; } /* all the bitfields we're gonna get */ - + hold = ++input_line_pointer; segment = expression(&exp); } /* forever loop */ - + exp.X_add_number = value; segment = SEG_ABSOLUTE; } /* if looks like a bitfield */ #endif /* WANT_BITFIELDS */ - + if (!need_pass_2) { /* Still worthwhile making frags. */ - + /* Don't call this if we are going to junk this pass anyway! */ know(segment != SEG_PASS1); - + if (segment == SEG_DIFFERENCE && exp.X_add_symbol == NULL) { as_bad("Subtracting symbol \"%s\"(segment\"%s\") is too hard. Absolute segment assumed.", S_GET_NAME(exp.X_subtract_symbol), @@ -1670,7 +1670,7 @@ register unsigned int nbytes; /* 1=.byte, 2=.word, 4=.long */ exp.X_add_number > 0 ? "Bignum" : "Floating-Point"); md_number_to_chars (p, (long)0, nbytes); break; - + case SEG_ABSENT: as_warn("0 assumed for missing expression"); exp.X_add_number = 0; @@ -1685,12 +1685,12 @@ register unsigned int nbytes; /* 1=.byte, 2=.word, 4=.long */ } md_number_to_chars (p, use, nbytes); /* put bytes in right order. */ break; - + case SEG_DIFFERENCE: #ifndef WORKING_DOT_WORD if (nbytes == 2) { struct broken_word *x; - + x = (struct broken_word *) xmalloc(sizeof(struct broken_word)); x->next_broken_word = broken_words; broken_words = x; @@ -1768,7 +1768,7 @@ register int nbytes; register int carry; /* For multi-precision arithmetic. */ register int work; /* For multi-precision arithmetic. */ register char * p; /* For multi-precision arithmetic. */ - + extern const char hex_value[]; /* In hex_value.c. */ /* @@ -1843,7 +1843,7 @@ register int nbytes; else { register long leading_zeroes; - + for (leading_zeroes = nbytes - length; leading_zeroes; leading_zeroes --) @@ -1868,7 +1868,7 @@ register int nbytes; /* Extend bignum by 1 char. */ static void grow_bignum() { register long length; - + bignum_high ++; if (bignum_high >= bignum_limit) { @@ -1909,7 +1909,7 @@ register int float_type; /* 'f':.ffloat ... 'F':.float ... */ int length; /* Number of chars in an object. */ register char * err; /* Error from scanning floating literal. */ char temp[MAXIMUM_NUMBER_OF_CHARS_FOR_FLOAT]; - + /* * The following awkward logic is to parse ZERO or more strings, * comma seperated. Recall an expression includes its leading & @@ -1933,10 +1933,10 @@ register int float_type; /* 'f':.ffloat ... 'F':.float ... */ * has no use for such information. Lusers beware: you get * diagnostics if your input is ill-conditioned. */ - + if (input_line_pointer[0] == '0' && isalpha(input_line_pointer[1])) input_line_pointer+=2; - + err = md_atof (float_type, temp, &length); know(length <= MAXIMUM_NUMBER_OF_CHARS_FOR_FLOAT); know(length > 0); @@ -1972,7 +1972,7 @@ void stringer(append_zero) int append_zero; /* 0: don't append '\0', else 1 */ { unsigned int c; - + /* * The following awkward logic is to parse ZERO or more strings, * comma seperated. Recall a string expression includes spaces @@ -1987,7 +1987,7 @@ int append_zero; /* 0: don't append '\0', else 1 */ } else { c = ','; /* Do loop. */ } - + while (c == ',' || c == '<' || c == '"' || ('0' <= c && c <= '9')) { int i; @@ -2027,7 +2027,7 @@ int append_zero; /* 0: don't append '\0', else 1 */ SKIP_WHITESPACE(); c = *input_line_pointer; } - + demand_empty_rest_of_line(); } /* stringer() */ @@ -2038,45 +2038,45 @@ int append_zero; /* 0: don't append '\0', else 1 */ unsigned int next_char_of_string() { register unsigned int c; - + c = *input_line_pointer++ & CHAR_MASK; switch (c) { case '\"': c = NOT_A_CHAR; break; - + case '\\': switch (c = *input_line_pointer++) { case 'b': c = '\b'; break; - + case 'f': c = '\f'; break; - + case 'n': c = '\n'; break; - + case 'r': c = '\r'; break; - + case 't': c = '\t'; break; - + #ifdef BACKSLASH_V case 'v': c = '\013'; break; #endif - + case '\\': case '"': break; /* As itself. */ - + case '0': case '1': case '2': @@ -2088,7 +2088,7 @@ unsigned int next_char_of_string() { case '8': case '9': { long number; - + for (number = 0; isdigit(c); c = *input_line_pointer++) { number = number * 8 + c - '0'; } @@ -2096,24 +2096,24 @@ unsigned int next_char_of_string() { } --input_line_pointer; break; - + case '\n': /* To be compatible with BSD 4.2 as: give the luser a linefeed!! */ as_warn("Unterminated string: Newline inserted."); c = '\n'; break; - + default: - + #ifdef ONLY_STANDARD_ESCAPES as_bad("Bad escaped character in string, '?' assumed"); c = '?'; #endif /* ONLY_STANDARD_ESCAPES */ - + break; } /* switch on escaped char */ break; - + default: break; } /* switch on char */ @@ -2125,7 +2125,7 @@ static segT register expressionS * expP; { register segT retval; - + if ((retval = expression(expP)) == SEG_PASS1 || retval == SEG_ABSENT || retval == SEG_BIG) { as_bad("Expected address expression: absolute 0 assumed"); @@ -2142,7 +2142,7 @@ register expressionS *expP; register segT retval; register char * name1; register char * name2; - + if ((retval = get_segmented_expression (expP)) == SEG_UNKNOWN) { name1 = expP->X_add_symbol ? S_GET_NAME(expP->X_add_symbol) : ""; @@ -2167,7 +2167,7 @@ register expressionS *expP; know(retval == SEG_ABSOLUTE || retval == SEG_DATA || retval == SEG_TEXT || retval == SEG_BSS || retval == SEG_DIFFERENCE); #endif return (retval); - + } /* get_known_segmented_expression() */ @@ -2177,7 +2177,7 @@ register expressionS *expP; { expressionS exp; register segT s; - + if ((s = expression(&exp)) != SEG_ABSOLUTE) { if (s != SEG_ABSENT) { as_bad("Bad Absolute Expression, absolute 0 assumed."); @@ -2206,10 +2206,10 @@ char * int *len_pointer; { register char *s; - + if ((s = demand_copy_string(len_pointer)) != 0) { register int len; - + for (len = *len_pointer; len > 0; len--) { @@ -2236,12 +2236,12 @@ int *lenP; register unsigned int c; register int len; char *retval; - + len = 0; SKIP_WHITESPACE(); if (*input_line_pointer == '\"') { input_line_pointer++; /* Skip opening quote. */ - + while (is_a_char(c = next_char_of_string())) { obstack_1grow(¬es, c); len ++; @@ -2277,20 +2277,20 @@ void equals(sym_name) char *sym_name; { register symbolS *symbolP; /* symbol we are working with */ - + input_line_pointer++; if (*input_line_pointer == '=') input_line_pointer++; - + while (*input_line_pointer == ' ' || *input_line_pointer == '\t') input_line_pointer++; - + if (sym_name[0] == '.' && sym_name[1] == '\0') { /* Turn '. = mumble' into a .org mumble */ register segT segment; expressionS exp; register char *p; - + segment = get_known_segmented_expression(& exp); if (! need_pass_2) { if (segment != now_seg && segment != SEG_ABSOLUTE) @@ -2318,7 +2318,7 @@ int arg; int i; FILE *try; char *path; - + filename = demand_copy_string(&i); demand_empty_rest_of_line(); path = xmalloc(i + include_dir_maxlen + 5 /* slop */); @@ -2344,7 +2344,7 @@ void add_include_dir(path) char *path; { int i; - + if (include_dir_count == 0) { include_dirs = (char **)xmalloc (2 * sizeof (*include_dirs)); @@ -2357,9 +2357,9 @@ char *path; include_dirs = (char **) realloc(include_dirs, include_dir_count*sizeof (*include_dirs)); } - + include_dirs[include_dir_count-1] = path; /* New one */ - + i = strlen (path); if (i > include_dir_maxlen) include_dir_maxlen = i; @@ -2372,7 +2372,7 @@ int arg; ++input_line_pointer; } ++input_line_pointer; - + return; } /* s_ignore() */ diff --git a/gnu/usr.bin/as/read.h b/gnu/usr.bin/as/read.h index fb77b3c..9b29582 100644 --- a/gnu/usr.bin/as/read.h +++ b/gnu/usr.bin/as/read.h @@ -1,24 +1,24 @@ /* read.h - of read.c Copyright (C) 1986, 1990, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: read.h,v 1.3 1993/11/30 20:55:45 jkh Exp $ + * $Id: read.h,v 1.4 1994/12/23 22:36:17 nate Exp $ */ @@ -37,8 +37,8 @@ extern char *input_line_pointer; /* -> char we are parsing now. */ #endif -#define LEX_NAME (1) /* may continue a name */ -#define LEX_BEGIN_NAME (2) /* may begin a name */ +#define LEX_NAME (1) /* may continue a name */ +#define LEX_BEGIN_NAME (2) /* may begin a name */ #define is_name_beginner(c) ( lex_type[c] & LEX_BEGIN_NAME ) #define is_part_of_name(c) ( lex_type[c] & LEX_NAME ) @@ -61,7 +61,7 @@ extern char is_end_of_line[]; extern const char comment_chars[]; extern const char line_comment_chars[]; extern const char line_separator_chars[]; - + #if __STDC__ == 1 char *demand_copy_C_string(int *len_pointer); diff --git a/gnu/usr.bin/as/struc-symbol.h b/gnu/usr.bin/as/struc-symbol.h index 5ef4b3a..5c405e4 100644 --- a/gnu/usr.bin/as/struc-symbol.h +++ b/gnu/usr.bin/as/struc-symbol.h @@ -1,23 +1,23 @@ /* struct_symbol.h - Internal symbol structure Copyright (C) 1987, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + oYou should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: struc-symbol.h,v 1.3 1993/11/30 20:55:46 jkh Exp $ + * $Id: struc-symbol.h,v 1.4 1994/12/23 22:36:20 nate Exp $ */ diff --git a/gnu/usr.bin/as/subsegs.c b/gnu/usr.bin/as/subsegs.c index 6e9481f..2089809 100644 --- a/gnu/usr.bin/as/subsegs.c +++ b/gnu/usr.bin/as/subsegs.c @@ -1,18 +1,18 @@ /* subsegs.c - subsegments - Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -22,7 +22,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: subsegs.c,v 1.2 1993/11/03 00:52:19 paul Exp $"; +static char rcsid[] = "$Id: subsegs.c,v 1.3 1995/03/02 20:29:18 nate Exp $"; #endif #include "as.h" @@ -89,7 +89,7 @@ void know(SEG_MAXIMUM_ORDINAL == SEG_REGISTER ); /* know(segment_name(SEG_MAXIMUM_ORDINAL + 1)[0] == 0);*/ #endif - + obstack_begin(&frags, 5000); frchain_root = NULL; frchain_now = NULL; /* Warn new_subseg() that we are booting. */ @@ -97,7 +97,7 @@ void /* It won't be used=> is ok if obstack... */ /* pads the end of it for alignment. */ frag_now=(fragS *)obstack_alloc(&frags,SIZEOF_STRUCT_FRAG); - memset(frag_now, SIZEOF_STRUCT_FRAG, 0); + memset(frag_now, SIZEOF_STRUCT_FRAG, 0); /* This 1st frag will not be in any frchain. */ /* We simply give subseg_new somewhere to scribble. */ now_subseg = 42; /* Lie for 1st call to subseg_new. */ @@ -113,7 +113,7 @@ void subseg_new(SEG_DATA, 0); /* .data 0 */ data0_frchainP = frchain_now; #endif - + } /* @@ -183,7 +183,7 @@ register subsegT subseg; frchainS *newP; /* address of new frchain */ register fragS *former_last_fragP; register fragS *new_fragP; - + if (frag_now) /* If not bootstrapping. */ { frag_now->fr_fix = obstack_next_free(& frags) - frag_now->fr_literal; @@ -194,7 +194,7 @@ register subsegT subseg; * subsegments a lot. Hence we would have much fewer frag_wanes(). */ { - + obstack_finish( &frags); /* * If we don't do the above, the next object we put on obstack frags @@ -252,7 +252,7 @@ register subsegT subseg; * This should be the only code that creates a frchainS. */ newP=(frchainS *)obstack_alloc(&frags,sizeof(frchainS)); - memset(newP, sizeof(frchainS), 0); + memset(newP, sizeof(frchainS), 0); /* This begines on a good boundary */ /* because a obstack_done() preceeded it. */ /* It implies an obstack_done(), so we */ diff --git a/gnu/usr.bin/as/subsegs.h b/gnu/usr.bin/as/subsegs.h index 4b8e3ce..9d1482a 100644 --- a/gnu/usr.bin/as/subsegs.h +++ b/gnu/usr.bin/as/subsegs.h @@ -1,24 +1,24 @@ /* subsegs.h -> subsegs.c Copyright (C) 1987, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: subsegs.h,v 1.3 1993/10/02 20:57:55 pk Exp $ + * $Id: subsegs.h,v 1.2 1993/11/03 00:52:20 paul Exp $ */ @@ -63,7 +63,7 @@ extern frchainS * frchain_now; #ifdef MANY_SEGMENTS -typedef struct +typedef struct { frchainS *frchainP; int hadone; @@ -74,10 +74,10 @@ typedef struct fixS *fix_tail; struct internal_scnhdr scnhdr; symbolS *dot; - - struct lineno_list *lineno_list_head; - struct lineno_list *lineno_list_tail; - + + struct lineno_list *lineno_list_head; + struct lineno_list *lineno_list_tail; + } segment_info_type; segment_info_type segment_info[]; #else diff --git a/gnu/usr.bin/as/symbols.c b/gnu/usr.bin/as/symbols.c index 066f54e..44c71d4 100644 --- a/gnu/usr.bin/as/symbols.c +++ b/gnu/usr.bin/as/symbols.c @@ -1,25 +1,25 @@ /* symbols.c -symbol table- Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef lint -static char rcsid[] = "$Id: symbols.c,v 1.3 1993/10/02 20:57:56 pk Exp $"; +static char rcsid[] = "$Id: symbols.c,v 1.2 1993/11/03 00:52:22 paul Exp $"; #endif #include "as.h" @@ -106,7 +106,7 @@ register int augend; /* 0 for nb, 1 for n:, nf */ register char * p; register char * q; char symbol_name_temporary[10]; /* build up a number, BACKWARDS */ - + know( n >= 0 ); know( augend == 0 || augend == 1 ); p = symbol_name_build; @@ -128,7 +128,7 @@ register int augend; /* 0 for nb, 1 for n:, nf */ n /= 10; } while (( * p ++ = * -- q ) != '\0') ;; - + /* The label, as a '\0' ended string, starts at symbol_name_build. */ return(symbol_name_build); } /* local_label_name() */ @@ -170,15 +170,15 @@ fragS *frag; /* Associated fragment */ unsigned int name_length; char *preserved_copy_of_name; symbolS *symbolP; - + name_length = strlen(name) + 1; /* +1 for \0 */ obstack_grow(¬es, name, name_length); preserved_copy_of_name = obstack_finish(¬es); symbolP = (symbolS *) obstack_alloc(¬es, sizeof(symbolS)); - + /* symbol must be born in some fixed state. This seems as good as any. */ memset(symbolP, 0, sizeof(symbolS)); - + #ifdef STRIP_UNDERSCORE S_SET_NAME(symbolP, (*preserved_copy_of_name == '_' ? preserved_copy_of_name + 1 @@ -186,28 +186,28 @@ fragS *frag; /* Associated fragment */ #else /* STRIP_UNDERSCORE */ S_SET_NAME(symbolP, preserved_copy_of_name); #endif /* STRIP_UNDERSCORE */ - + S_SET_SEGMENT(symbolP, segment); S_SET_VALUE(symbolP, value); /* symbol_clear_list_pointers(symbolP); uneeded if symbol is born zeroed. */ - + symbolP->sy_frag = frag; /* krm: uneeded if symbol is born zeroed. symbolP->sy_forward = NULL; */ /* JF */ symbolP->sy_number = ~0; symbolP->sy_name_offset = ~0; - + /* * Link to end of symbol chain. */ symbol_append(symbolP, symbol_lastP, &symbol_rootP, &symbol_lastP); - + obj_symbol_new_hook(symbolP); - + #ifdef DEBUG /* verify_symbol_chain(symbol_rootP, symbol_lastP); */ #endif /* DEBUG */ - + return(symbolP); } /* symbol_new() */ @@ -226,25 +226,25 @@ register char * sym_name; /* symbol name, as a cannonical string */ /* We copy this string: OK to alter later. */ { register symbolS * symbolP; /* symbol we are working with */ - + #ifdef LOCAL_LABELS_DOLLAR /* Sun local labels go out of scope whenever a non-local symbol is defined. */ - + if (*sym_name != 'L') memset((void *) local_label_defined, '\0', sizeof(local_label_defined)); #endif - + #ifndef WORKING_DOT_WORD if (new_broken_words) { struct broken_word *a; int possible_bytes; fragS *frag_tmp; char *frag_opcode; - + extern const md_short_jump_size; extern const md_long_jump_size; possible_bytes=md_short_jump_size + new_broken_words * md_long_jump_size; - + frag_tmp=frag_now; frag_opcode=frag_var(rs_broken_word, possible_bytes, @@ -253,7 +253,7 @@ register char * sym_name; /* symbol name, as a cannonical string */ (symbolS *) broken_words, 0L, NULL); - + /* We want to store the pointer to where to insert the jump table in the fr_opcode of the rs_broken_word frag. This requires a little hackery */ while (frag_tmp && (frag_tmp->fr_type != rs_broken_word || frag_tmp->fr_opcode)) @@ -261,7 +261,7 @@ register char * sym_name; /* symbol name, as a cannonical string */ know(frag_tmp); frag_tmp->fr_opcode=frag_opcode; new_broken_words = 0; - + for (a=broken_words;a && a->dispfrag == 0;a=a->next_broken_word) a->dispfrag=frag_tmp; } @@ -284,7 +284,7 @@ register char * sym_name; /* symbol name, as a cannonical string */ symbolP->sy_frag = frag_now; S_GET_OTHER(symbolP) = const_flag; S_SET_VALUE(symbolP, obstack_next_free(& frags) - frag_now->fr_literal); - symbolP->sy_symbol.n_type |= + symbolP->sy_symbol.n_type |= SEGMENT_TO_SYMBOL_TYPE((int) now_seg); /* keep N_EXT bit */ return; } @@ -303,7 +303,7 @@ register char * sym_name; /* symbol name, as a cannonical string */ #ifdef N_UNDF know(N_UNDF == 0); #endif /* if we have one, it better be zero. */ - + } else { /* * There are still several cases to check: @@ -320,7 +320,7 @@ register char * sym_name; /* symbol name, as a cannonical string */ #define SEG_BSS SEG_E2 #define SEG_DATA SEG_E1 #endif - + if (((!S_IS_DEBUG(symbolP) && !S_IS_DEFINED(symbolP) && S_IS_EXTERNAL(symbolP)) || (S_GET_SEGMENT(symbolP) == SEG_BSS)) && ((now_seg == SEG_DATA) @@ -337,7 +337,7 @@ register char * sym_name; /* symbol name, as a cannonical string */ */ if (S_GET_VALUE(symbolP) < ((unsigned) (obstack_next_free(& frags) - frag_now->fr_literal))) { - S_SET_VALUE(symbolP, + S_SET_VALUE(symbolP, obstack_next_free(& frags) - frag_now->fr_literal); } @@ -368,7 +368,7 @@ register char * sym_name; /* symbol name, as a cannonical string */ #endif /* OBJ_COFF */ } } /* if the undefined symbol has no value */ - } else + } else { /* Don't blow up if the definition is the same */ if (!(frag_now == symbolP->sy_frag @@ -376,19 +376,19 @@ register char * sym_name; /* symbol name, as a cannonical string */ && S_GET_SEGMENT(symbolP) == now_seg) ) as_fatal("Symbol %s already defined.", sym_name); } /* if this symbol is not yet defined */ - + } else { symbolP = symbol_new(sym_name, - now_seg, + now_seg, (valueT)(obstack_next_free(&frags)-frag_now->fr_literal), frag_now); #ifdef OBJ_VMS S_SET_OTHER(symbolP, const_flag); #endif /* OBJ_VMS */ - + symbol_table_insert(symbolP); } /* if we have seen this symbol before */ - + return; } /* colon() */ @@ -404,10 +404,10 @@ void symbol_table_insert(symbolP) symbolS *symbolP; { register char *error_string; - + know(symbolP); know(S_GET_NAME(symbolP)); - + if (*(error_string = hash_jam(sy_hash, S_GET_NAME(symbolP), (char *)symbolP))) { as_fatal("Inserting \"%s\" into symbol table failed: %s", S_GET_NAME(symbolP), error_string); @@ -424,15 +424,15 @@ symbolS *symbol_find_or_make(name) char *name; { register symbolS *symbolP; - + symbolP = symbol_find(name); - + if (symbolP == NULL) { symbolP = symbol_make(name); - + symbol_table_insert(symbolP); } /* if symbol wasn't found */ - + return(symbolP); } /* symbol_find_or_make() */ @@ -440,23 +440,23 @@ symbolS *symbol_make(name) char *name; { symbolS *symbolP; - + /* Let the machine description default it, e.g. for register names. */ symbolP = md_undefined_symbol(name); - + if (!symbolP) { symbolP = symbol_new(name, SEG_UNKNOWN, 0, &zero_address_frag); } /* if md didn't build us a symbol */ - + return(symbolP); } /* symbol_make() */ /* * symbol_find() - * + * * Implement symbol table lookup. * In: A symbol's name as a string: '\0' can't be part of a symbol name. * Out: NULL if the name was not in the symbol table, else the address @@ -503,7 +503,7 @@ symbolS **lastPP; *lastPP = addme; return; } /* if the list is empty */ - + if (target->sy_next != NULL) { #ifdef SYMBOLS_NEED_BACKPOINTERS target->sy_next->sy_previous = addme; @@ -512,18 +512,18 @@ symbolS **lastPP; know(*lastPP == target); *lastPP = addme; } /* if we have a next */ - + addme->sy_next = target->sy_next; target->sy_next = addme; - + #ifdef SYMBOLS_NEED_BACKPOINTERS addme->sy_previous = target; #endif /* SYMBOLS_NEED_BACKPOINTERS */ - + #ifdef DEBUG /* verify_symbol_chain(*rootPP, *lastPP); */ #endif /* DEBUG */ - + return; } /* symbol_append() */ @@ -537,23 +537,23 @@ symbolS **lastPP; if (symbolP == *rootPP) { *rootPP = symbolP->sy_next; } /* if it was the root */ - + if (symbolP == *lastPP) { *lastPP = symbolP->sy_previous; } /* if it was the tail */ - + if (symbolP->sy_next != NULL) { symbolP->sy_next->sy_previous = symbolP->sy_previous; } /* if not last */ - + if (symbolP->sy_previous != NULL) { symbolP->sy_previous->sy_next = symbolP->sy_next; } /* if not first */ - + #ifdef DEBUG verify_symbol_chain(*rootPP, *lastPP); #endif /* DEBUG */ - + return; } /* symbol_remove() */ @@ -578,15 +578,15 @@ symbolS **lastPP; know(*rootPP == target); *rootPP = addme; } /* if not first */ - + addme->sy_previous = target->sy_previous; target->sy_previous = addme; addme->sy_next = target; - + #ifdef DEBUG verify_symbol_chain(*rootPP, *lastPP); #endif /* DEBUG */ - + return; } /* symbol_insert() */ #endif /* SYMBOLS_NEED_BACKPOINTERS */ @@ -596,11 +596,11 @@ symbolS *rootP; symbolS *lastP; { symbolS *symbolP = rootP; - + if (symbolP == NULL) { return; } /* empty chain */ - + for ( ; symbol_next(symbolP) != NULL; symbolP = symbol_next(symbolP)) { #ifdef SYMBOLS_NEED_BACKPOINTERS /*$if (symbolP->sy_previous) { @@ -613,9 +613,9 @@ symbolS *lastP; ; #endif /* SYMBOLS_NEED_BACKPOINTERS */ } /* verify pointers */ - + know(lastP == symbolP); - + return; } /* verify_symbol_chain() */ @@ -633,17 +633,17 @@ char *s; int label_number; /* int label_version; */ char *message_format = "\"%d\" (instance number %s of a local label)"; - + if (s[0] != 'L' || s[2] != 1) { return(s); } /* not a local_label_name() generated name. */ - + label_number = s[1] - '0'; - + (void) sprintf(symbol_decode = obstack_alloc(¬es, strlen(s + 3) + strlen(message_format) + 10), message_format, label_number, s + 3); - + return(symbol_decode); } /* decode_local_label_name() */ diff --git a/gnu/usr.bin/as/symbols.h b/gnu/usr.bin/as/symbols.h index 535933f..0906e9d 100644 --- a/gnu/usr.bin/as/symbols.h +++ b/gnu/usr.bin/as/symbols.h @@ -1,24 +1,24 @@ /* symbols.h - Copyright (C) 1987, 1990, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: symbols.h,v 1.3 1993/10/02 20:57:57 pk Exp $ + * $Id: symbols.h,v 1.2 1993/11/03 00:52:23 paul Exp $ */ diff --git a/gnu/usr.bin/as/tc.h b/gnu/usr.bin/as/tc.h index f36629c..b75b0e2 100644 --- a/gnu/usr.bin/as/tc.h +++ b/gnu/usr.bin/as/tc.h @@ -1,24 +1,24 @@ /* tc.h - target cpu dependent Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: tc.h,v 1.1 1993/10/02 20:57:58 pk Exp $ + * $Id: tc.h,v 1.1 1993/11/03 00:52:25 paul Exp $ */ diff --git a/gnu/usr.bin/as/version.c b/gnu/usr.bin/as/version.c index b3711c4..c18109a 100644 --- a/gnu/usr.bin/as/version.c +++ b/gnu/usr.bin/as/version.c @@ -3,23 +3,23 @@ const #endif /* DO NOT PUT COMMENTS ABOUT CHANGES IN THIS FILE. - + This file exists only to define `version_string'. - + Log changes in ChangeLog. The easiest way to do this is with the Emacs command `add-change-log-entry'. If you don't use Emacs, add entries of the form: - + Thu Jan 1 00:00:00 1970 Dennis Ritchie (dmr at alice) - + universe.c (temporal_reality): Began Time. */ #ifndef lint -static char rcsid[] = "$Id: version.c,v 1.2 1993/11/03 00:52:27 paul Exp $"; +static char rcsid[] = "$Id: version.c,v 1.3 1994/02/14 21:18:05 nate Exp $"; #endif -char version_string[] = "GNU assembler version 1.92.3, FreeBSD $Revision: 1.2 $\n"; +char version_string[] = "GNU assembler version 1.92.3, FreeBSD $Revision: 1.3 $\n"; #ifdef HO_VMS dummy3() diff --git a/gnu/usr.bin/as/write.c b/gnu/usr.bin/as/write.c index 33cc8d2..66906b0 100644 --- a/gnu/usr.bin/as/write.c +++ b/gnu/usr.bin/as/write.c @@ -1,19 +1,19 @@ /* write.c - emit .o file Copyright (C) 1986, 1987, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -21,7 +21,7 @@ /* This thing should be set up to do byteordering correctly. But... */ #ifndef lint -static char rcsid[] = "$Id: write.c,v 1.5 1994/02/20 16:06:12 rgrimes Exp $"; +static char rcsid[] = "$Id: write.c,v 1.6 1994/12/23 22:36:22 nate Exp $"; #endif #include "as.h" @@ -100,9 +100,9 @@ int pcrel; /* TRUE if PC-relative relocation. */ enum reloc_type r_type; /* Relocation type */ { fixS *fixP; - + fixP = (fixS *) obstack_alloc(¬es, sizeof(fixS)); - + fixP->fx_frag = frag; fixP->fx_where = where; fixP->fx_size = size; @@ -116,41 +116,41 @@ enum reloc_type r_type; /* Relocation type */ fixP->fx_offset = offset; fixP->fx_pcrel = pcrel; fixP->fx_r_type = r_type; - + /* JF these 'cuz of the NS32K stuff */ fixP->fx_im_disp = 0; fixP->fx_pcrel_adjust = 0; fixP->fx_bsr = 0; fixP->fx_bit_fixP = 0; - + /* usually, we want relocs sorted numerically, but while comparing to older versions of gas that have relocs reverse sorted, it is convenient to have this compile time option. xoxorich. */ - + #ifdef REVERSE_SORT_RELOCS - + fixP->fx_next = *seg_fix_rootP; *seg_fix_rootP = fixP; - + #else /* REVERSE_SORT_RELOCS */ - + fixP->fx_next = NULL; - + if (*seg_fix_tailP) (*seg_fix_tailP)->fx_next = fixP; else *seg_fix_rootP = fixP; *seg_fix_tailP = fixP; - + #endif /* REVERSE_SORT_RELOCS */ - + fixP->fx_callj = 0; return(fixP); } /* fix_new() */ #ifndef BFD -void write_object_file() +void write_object_file() { register struct frchain * frchainP; /* Track along all frchains. */ register fragS * fragP; /* Track along all frags. */ @@ -161,9 +161,9 @@ void write_object_file() /* register symbolS ** symbolPP; */ /* register fixS * fixP; JF unused */ unsigned int data_siz; - + long object_file_size; - + #ifdef OBJ_VMS /* * Under VMS we try to be compatible with VAX-11 "C". Thus, we @@ -207,7 +207,7 @@ void write_object_file() /* know(frags.obstack_c_base == frags.obstack_c_next_free); */ /* Above shows we haven't left a half-completed object on obstack. */ } /* walk the frag chain */ - + /* * From now on, we don't care about sub-segments. * Build one frag chain for each segment. Linked thru fr_next. @@ -218,7 +218,7 @@ void write_object_file() know( frchainP->frch_root ); *prev_fragPP = frchainP->frch_root; prev_fragPP = & frchainP->frch_last->fr_next; - + if (((next_frchainP = frchainP->frch_next) == NULL) || next_frchainP == data0_frchainP) { prev_fragPP = &data_frag_root; @@ -229,7 +229,7 @@ void write_object_file() } } } /* walk the frag chain */ - + /* * We have two segments. If user gave -R flag, then we must put the * data frags into the text segment. Do this before relaxing so @@ -237,7 +237,7 @@ void write_object_file() */ if (flagseen[ 'R' ]) { fixS *tmp; - + text_last_frag->fr_next = data_frag_root; text_last_frag = data_last_frag; data_last_frag = NULL; @@ -249,17 +249,17 @@ void write_object_file() text_fix_root = data_fix_root; data_fix_root = NULL; } - + relax_segment(text_frag_root, SEG_TEXT); relax_segment(data_frag_root, SEG_DATA); /* * Now the addresses of frags are correct within the segment. */ - + know(text_last_frag->fr_type == rs_fill && text_last_frag->fr_offset == 0); H_SET_TEXT_SIZE(&headers, text_last_frag->fr_address); text_last_frag->fr_address = H_GET_TEXT_SIZE(&headers); - + /* * Join the 2 segments into 1 huge segment. * To do this, re-compute every rn_address in the SEG_DATA frags. @@ -269,29 +269,29 @@ void write_object_file() */ if (data_frag_root) { register relax_addressT slide; - + know((text_last_frag->fr_type == rs_fill) && (text_last_frag->fr_offset == 0)); - + H_SET_DATA_SIZE(&headers, data_last_frag->fr_address); data_last_frag->fr_address = H_GET_DATA_SIZE(&headers); slide = H_GET_TEXT_SIZE(&headers); /* & in file of the data segment. */ - + for (fragP = data_frag_root; fragP; fragP = fragP->fr_next) { fragP->fr_address += slide; } /* for each data frag */ - + know(text_last_frag != 0); text_last_frag->fr_next = data_frag_root; } else { H_SET_DATA_SIZE(&headers,0); data_siz = 0; } - - bss_address_frag.fr_address = (H_GET_TEXT_SIZE(&headers) + + + bss_address_frag.fr_address = (H_GET_TEXT_SIZE(&headers) + H_GET_DATA_SIZE(&headers)); - + H_SET_BSS_SIZE(&headers,local_bss_counter); - + /* * * Crawl the symbol chain. @@ -315,15 +315,15 @@ void write_object_file() */ know(zero_address_frag.fr_address == 0); string_byte_count = sizeof(string_byte_count); - + obj_crawl_symbol_chain(&headers); - + if (string_byte_count == sizeof(string_byte_count)) { string_byte_count = 0; } /* if no strings, then no count. */ - + H_SET_STRING_SIZE(&headers, string_byte_count); - + /* * Addresses of frags now reflect addresses we use in the object file. * Symbol values are correct. @@ -331,7 +331,7 @@ void write_object_file() * Also converting any machine-dependent frags using md_convert_frag(); */ subseg_change(SEG_TEXT, 0); - + for (fragP = text_frag_root; fragP; fragP = fragP->fr_next) { switch (fragP->fr_type) { case rs_align: @@ -339,20 +339,20 @@ void write_object_file() fragP->fr_type = rs_fill; know(fragP->fr_var == 1); know(fragP->fr_next != NULL); - + fragP->fr_offset = (fragP->fr_next->fr_address - fragP->fr_address - fragP->fr_fix); break; - + case rs_fill: break; - + case rs_machine_dependent: md_convert_frag(&headers, fragP); - + know((fragP->fr_next == NULL) || ((fragP->fr_next->fr_address - fragP->fr_address) == fragP->fr_fix)); - + /* * After md_convert_frag, we make the frag into a ".space 0". * Md_convert_frag() should set up any fixSs and constants @@ -360,11 +360,11 @@ void write_object_file() */ frag_wane(fragP); break; - + #ifndef WORKING_DOT_WORD case rs_broken_word: { struct broken_word *lie; - + if (fragP->fr_subtype) { fragP->fr_fix+=md_short_jump_size; for (lie=(struct broken_word *)(fragP->fr_symbol);lie && lie->dispfrag == fragP;lie=lie->next_broken_word) @@ -375,22 +375,22 @@ void write_object_file() } break; #endif - + default: BAD_CASE( fragP->fr_type ); break; } /* switch (fr_type) */ - + know((fragP->fr_next == NULL) || ((fragP->fr_next->fr_address - fragP->fr_address) == (fragP->fr_fix + (fragP->fr_offset * fragP->fr_var)))); } /* for each frag. */ - + #ifndef WORKING_DOT_WORD { struct broken_word *lie; struct broken_word **prevP; - + prevP = &broken_words; for (lie = broken_words; lie; lie = lie->next_broken_word) if (!lie->added) { @@ -423,7 +423,7 @@ void write_object_file() *prevP = lie->next_broken_word; } else prevP = &(lie->next_broken_word); - + for (lie = broken_words; lie;) { struct broken_word *untruth; char *table_ptr; @@ -432,15 +432,15 @@ void write_object_file() to_addr; int n, m; - + fragP = lie->dispfrag; - + /* Find out how many broken_words go here */ n=0; for (untruth = lie; untruth && untruth->dispfrag == fragP; untruth = untruth->next_broken_word) if (untruth->added == 1) n++; - + table_ptr = lie->dispfrag->fr_opcode; table_addr = lie->dispfrag->fr_address + (table_ptr - lie->dispfrag->fr_literal); /* Create the jump around the long jumps */ @@ -450,7 +450,7 @@ void write_object_file() md_create_short_jump(table_ptr, from_addr, to_addr, lie->dispfrag, lie->add); table_ptr += md_short_jump_size; table_addr += md_short_jump_size; - + for (m = 0; lie && lie->dispfrag == fragP; m++, lie = lie->next_broken_word) { if (lie->added == 2) continue; @@ -465,7 +465,7 @@ void write_object_file() if (untruth->use_jump == lie) md_number_to_chars(untruth->word_goes_here, to_addr, 2); } - + /* Install the long jump */ /* this is a long jump from table_ptr+0 to the final target */ from_addr = table_addr; @@ -477,19 +477,19 @@ void write_object_file() } } #endif /* not WORKING_DOT_WORD */ - + #ifndef OBJ_VMS { /* not vms */ /* * Scan every FixS performing fixups. We had to wait until now to do * this because md_convert_frag() may have made some fixSs. */ - + H_SET_RELOCATION_SIZE(&headers, md_reloc_size * fixup_segment(text_fix_root, SEG_TEXT), md_reloc_size * fixup_segment(data_fix_root, SEG_DATA)); - - + + obj_pre_write_hook(&headers); if ((had_warnings() && flagseen['Z']) @@ -504,16 +504,16 @@ void write_object_file() had_warnings(), had_warnings() == 1 ? "" : "s"); } /* on want output */ } /* on error condition */ - + object_file_size = H_GET_FILE_SIZE(&headers); next_object_file_charP = the_object_file = xmalloc(object_file_size); - + output_file_create(out_file_name); - + obj_header_append(&next_object_file_charP, &headers); - + know((next_object_file_charP - the_object_file) == H_GET_HEADER_SIZE(&headers)); - + /* * Emit code. */ @@ -521,21 +521,21 @@ void write_object_file() register long count; register char *fill_literal; register long fill_size; - + know(fragP->fr_type == rs_fill); append(&next_object_file_charP, fragP->fr_literal, (unsigned long) fragP->fr_fix); fill_literal = fragP->fr_literal + fragP->fr_fix; fill_size = fragP->fr_var; know(fragP->fr_offset >= 0); - + for (count = fragP->fr_offset; count; count--) { append(&next_object_file_charP, fill_literal, (unsigned long) fill_size); } /* for each */ - + } /* for each code frag. */ - + know((next_object_file_charP - the_object_file) == (H_GET_HEADER_SIZE(&headers) + H_GET_TEXT_SIZE(&headers) + H_GET_DATA_SIZE(&headers))); - + /* * Emit relocations. */ @@ -550,42 +550,42 @@ void write_object_file() #else /* TC_I960 */ obj_emit_relocations(&next_object_file_charP, data_fix_root, text_last_frag->fr_address); #endif /* TC_I960 */ - + know((next_object_file_charP - the_object_file) == (H_GET_HEADER_SIZE(&headers) + H_GET_TEXT_SIZE(&headers) + H_GET_DATA_SIZE(&headers) + H_GET_TEXT_RELOCATION_SIZE(&headers) + H_GET_DATA_RELOCATION_SIZE(&headers))); - + /* * Emit line number entries. */ OBJ_EMIT_LINENO(&next_object_file_charP, lineno_rootP, the_object_file); know((next_object_file_charP - the_object_file) == (H_GET_HEADER_SIZE(&headers) + H_GET_TEXT_SIZE(&headers) + H_GET_DATA_SIZE(&headers) + H_GET_TEXT_RELOCATION_SIZE(&headers) + H_GET_DATA_RELOCATION_SIZE(&headers) + H_GET_LINENO_SIZE(&headers))); - + /* * Emit symbols. */ obj_emit_symbols(&next_object_file_charP, symbol_rootP); know((next_object_file_charP - the_object_file) == (H_GET_HEADER_SIZE(&headers) + H_GET_TEXT_SIZE(&headers) + H_GET_DATA_SIZE(&headers) + H_GET_TEXT_RELOCATION_SIZE(&headers) + H_GET_DATA_RELOCATION_SIZE(&headers) + H_GET_LINENO_SIZE(&headers) + H_GET_SYMBOL_TABLE_SIZE(&headers))); - + /* * Emit strings. */ - + if (string_byte_count > 0) { obj_emit_strings(&next_object_file_charP); } /* only if we have a string table */ - + /* know((next_object_file_charP - the_object_file) == (H_GET_HEADER_SIZE(&headers) + H_GET_TEXT_SIZE(&headers) + H_GET_DATA_SIZE(&headers) + H_GET_TEXT_RELOCATION_SIZE(&headers) + H_GET_DATA_RELOCATION_SIZE(&headers) + H_GET_LINENO_SIZE(&headers) + H_GET_SYMBOL_TABLE_SIZE(&headers) + H_GET_STRING_SIZE(&headers))); */ /* know(next_object_file_charP == the_object_file + object_file_size);*/ - + #ifdef BFD_HEADERS bfd_seek(stdoutput, 0, 0); bfd_write(the_object_file, 1, object_file_size, stdoutput); #else - + /* Write the data to the file */ output_file_append(the_object_file, object_file_size, out_file_name); #endif - + output_file_close(out_file_name); } /* non vms output */ #else /* OBJ_VMS */ @@ -622,12 +622,12 @@ segT segment; /* SEG_DATA or SEG_TEXT */ register relax_addressT address; /* register relax_addressT old_address; JF unused */ /* register relax_addressT new_address; JF unused */ -#ifndef MANY_SEGMENTS +#ifndef MANY_SEGMENTS know(segment == SEG_DATA || segment == SEG_TEXT); #endif /* In case md_estimate_size_before_relax() wants to make fixSs. */ subseg_change(segment, 0); - + /* * For each frag in segment: count and store (a 1st guess of) fr_address. */ @@ -635,38 +635,38 @@ segT segment; /* SEG_DATA or SEG_TEXT */ for (fragP = segment_frag_root; fragP; fragP = fragP->fr_next) { fragP->fr_address = address; address += fragP->fr_fix; - + switch (fragP->fr_type) { case rs_fill: address += fragP->fr_offset * fragP->fr_var ; break; - + case rs_align: address += relax_align(address, fragP->fr_offset); break; - + case rs_org: /* * Assume .org is nugatory. It will grow with 1st relax. */ break; - + case rs_machine_dependent: address += md_estimate_size_before_relax(fragP, segment); break; - + #ifndef WORKING_DOT_WORD /* Broken words don't concern us yet */ case rs_broken_word: break; #endif - + default: BAD_CASE(fragP->fr_type); break; } /* switch (fr_type) */ } /* for each frag in the segment */ - + /* * Do relax(). */ @@ -680,7 +680,7 @@ segT segment; /* SEG_DATA or SEG_TEXT */ in fact some piece of code grew, and another shrank. If a branch instruction doesn't fit anymore, we could be scrod */ - + do { stretch = stretched = 0; for (fragP = segment_frag_root; fragP; fragP = fragP->fr_next) { @@ -691,17 +691,17 @@ segT segment; /* SEG_DATA or SEG_TEXT */ register long target; register long after; register long aim; - + was_address = fragP->fr_address; address = fragP->fr_address += stretch; symbolP = fragP->fr_symbol; offset = fragP->fr_offset; - + switch (fragP->fr_type) { case rs_fill: /* .fill never relaxes. */ growth = 0; break; - + #ifndef WORKING_DOT_WORD /* JF: This is RMS's idea. I do *NOT* want to be blamed for it I do not want to write it. I do not want to have @@ -710,7 +710,7 @@ segT segment; /* SEG_DATA or SEG_TEXT */ case rs_broken_word: { struct broken_word *lie; struct broken_word *untruth; - + /* Yes this is ugly (storing the broken_word pointer in the symbol slot). Still, this whole chunk of code is ugly, and I don't feel like doing anything @@ -719,10 +719,10 @@ segT segment; /* SEG_DATA or SEG_TEXT */ for (lie=(struct broken_word *)(fragP->fr_symbol); lie && lie->dispfrag == fragP; lie=lie->next_broken_word) { - + if (lie->added) continue; - + offset = lie->add->sy_frag->fr_address+ S_GET_VALUE(lie->add) + lie->addnum - (lie->sub->sy_frag->fr_address+ S_GET_VALUE(lie->sub)); if (offset <= -32768 || offset >= 32767) { @@ -745,7 +745,7 @@ segT segment; /* SEG_DATA or SEG_TEXT */ growth += md_long_jump_size; } } - + break; } /* case rs_broken_word */ #endif @@ -753,10 +753,10 @@ segT segment; /* SEG_DATA or SEG_TEXT */ growth = relax_align((relax_addressT) (address + fragP->fr_fix), offset) - relax_align((relax_addressT) (was_address + fragP->fr_fix), offset); break; - + case rs_org: target = offset; - + if (symbolP) { #ifdef MANY_SEGMENTS #else @@ -767,26 +767,26 @@ segT segment; /* SEG_DATA or SEG_TEXT */ target += S_GET_VALUE(symbolP) + symbolP->sy_frag->fr_address; } /* if we have a symbol */ - + know(fragP->fr_next); after = fragP->fr_next->fr_address; growth = ((target - after ) > 0) ? (target - after) : 0; /* Growth may be -ve, but variable part */ /* of frag cannot have < 0 chars. */ /* That is, we can't .org backwards. */ - + growth -= stretch; /* This is an absolute growth factor */ break; - + case rs_machine_dependent: { register const relax_typeS * this_type; register const relax_typeS * start_type; register relax_substateT next_state; register relax_substateT this_state; - + start_type = this_type = md_relax_table + (this_state = fragP->fr_subtype); target = offset; - + if (symbolP) { #ifndef MANY_SEGMENTS know((S_GET_SEGMENT(symbolP) == SEG_ABSOLUTE) || (S_GET_SEGMENT(symbolP) == SEG_DATA) || (S_GET_SEGMENT(symbolP) == SEG_TEXT)); @@ -796,12 +796,12 @@ segT segment; /* SEG_DATA or SEG_TEXT */ target += S_GET_VALUE(symbolP) + symbolP->sy_frag->fr_address; - + /* If frag has yet to be reached on this pass, assume it will move by STRETCH just as we did. If this is not so, it will be because some frag between grows, and that will force another pass. */ - + /* JF was just address */ /* JF also added is_dnrange hack */ /* There's gotta be a better/faster/etc way @@ -823,14 +823,14 @@ segT segment; /* SEG_DATA or SEG_TEXT */ assembled on other machines, which is how I found it. You might want to think about what other places have trouble with zero length frags... */ - + if (symbolP->sy_frag->fr_address >= was_address && is_dnrange(fragP,symbolP->sy_frag)) { target += stretch; } /* */ - + } /* if there's a symbol attached */ - + aim = target - address - fragP->fr_fix; /* The displacement is affected by the instruction size * for the 32k architecture. I think we ought to be able @@ -841,7 +841,7 @@ segT segment; /* SEG_DATA or SEG_TEXT */ #ifdef TC_NS32K aim += fragP->fr_pcrel_adjust; #endif /* TC_NS32K */ - + if (aim < 0) { /* Look backwards. */ for (next_state = this_type->rlx_more; next_state; ) { @@ -874,13 +874,13 @@ segT segment; /* SEG_DATA or SEG_TEXT */ } } } - + if ((growth = this_type->rlx_length - start_type->rlx_length) != 0) fragP->fr_subtype = this_state; - + break; } /* case rs_machine_dependent */ - + default: BAD_CASE( fragP->fr_type ); break; @@ -892,11 +892,11 @@ segT segment; /* SEG_DATA or SEG_TEXT */ } /* For each frag in the segment. */ } while (stretched); /* Until nothing further to relax. */ } /* do_relax */ - + /* * We now have valid fr_address'es for each frag. */ - + /* * All fr_address's are correct, relative to their own segment. * We have made all the fixS we will ever make. @@ -915,19 +915,19 @@ register long alignment; /* Alignment (binary). */ { relax_addressT mask; relax_addressT new_address; - + mask = ~ ( (~0) << alignment ); new_address = (address + mask) & (~ mask); return (new_address - address); } /* relax_align() */ /* fixup_segment() - + Go through all the fixS's in a segment and see which ones can be handled now. (These consist of fixS where we have since discovered the value of a symbol, or the address of the frag involved.) For each one, call md_apply_fix to put the fix into the frag data. - + Result is a count of how many relocation structs will be needed to handle the remaining fixS's that we couldn't completely handle here. These will be output later by emit_relocations(). */ @@ -946,10 +946,10 @@ segT this_segment_type; /* N_TYPE bits for segment. */ register char pcrel; register fragS *fragP; register segT add_symbol_segment = SEG_ABSOLUTE; - + /* FIXME: remove this line */ /* fixS *orig = fixP; */ seg_reloc_count = 0; - + for ( ; fixP; fixP = fixP->fx_next) { fragP = fixP->fx_frag; know(fragP); @@ -962,7 +962,7 @@ segT this_segment_type; /* N_TYPE bits for segment. */ /* Relocation should be done via the associated 'bal' entry point symbol. */ - + if (!TC_S_IS_BALNAME(tc_get_bal_of_call(add_symbolP))) { as_bad("No 'bal' entry point for leafproc %s", S_GET_NAME(add_symbolP)); @@ -974,20 +974,20 @@ segT this_segment_type; /* N_TYPE bits for segment. */ sub_symbolP = fixP->fx_subsy; add_number = fixP->fx_offset; pcrel = fixP->fx_pcrel; - + if (add_symbolP) { add_symbol_segment = S_GET_SEGMENT(add_symbolP); } /* if there is an addend */ - + if (sub_symbolP) { if (!add_symbolP) { /* Its just -sym */ if (S_GET_SEGMENT(sub_symbolP) != SEG_ABSOLUTE) { as_bad("Negative of non-absolute symbol %s", S_GET_NAME(sub_symbolP)); } /* not absolute */ - + add_number -= S_GET_VALUE(sub_symbolP); - + /* if sub_symbol is in the same segment that add_symbol and add_symbol is either in DATA, TEXT, BSS or ABSOLUTE */ } else if ((S_GET_SEGMENT(sub_symbolP) == add_symbol_segment) @@ -1010,15 +1010,15 @@ segT this_segment_type; /* N_TYPE bits for segment. */ as_bad("Can't reduce difference of external symbols in PIC code"); } #endif - add_number += S_GET_VALUE(add_symbolP) - + add_number += S_GET_VALUE(add_symbolP) - S_GET_VALUE(sub_symbolP); - + add_symbolP = NULL; fixP->fx_addsy = NULL; } else { /* Different segments in subtraction. */ know(!(S_IS_EXTERNAL(sub_symbolP) && (S_GET_SEGMENT(sub_symbolP) == SEG_ABSOLUTE))); - + if ((S_GET_SEGMENT(sub_symbolP) == SEG_ABSOLUTE)) { add_number -= S_GET_VALUE(sub_symbolP); } else { @@ -1028,7 +1028,7 @@ segT this_segment_type; /* N_TYPE bits for segment. */ } /* if absolute */ } } /* if sub_symbolP */ - + #ifdef PIC /* * Bring _GLOBAL_OFFSET_TABLE_ forward, now we've had the @@ -1036,7 +1036,7 @@ segT this_segment_type; /* N_TYPE bits for segment. */ * This is the sequel of the hack in expr.c to parse operands * of the form `_GLOBAL_OFFSET_TABLE_+(L1-L2)'. Note that * _GLOBAL_OFFSET_TABLE_ can only be an "add symbol". - */ + */ if (add_symbolP == NULL && fixP->fx_gotsy != NULL) { add_symbolP = fixP->fx_addsy = fixP->fx_gotsy; add_symbol_segment = S_GET_SEGMENT(add_symbolP); @@ -1058,7 +1058,7 @@ segT this_segment_type; /* N_TYPE bits for segment. */ */ reloc_callj(fixP); #endif /* TC_I960 */ - + add_number += S_GET_VALUE(add_symbolP); add_number -= md_pcrel_from(fixP); pcrel = 0; /* Lie. Don't want further pcrel processing. */ @@ -1095,7 +1095,7 @@ segT this_segment_type; /* N_TYPE bits for segment. */ #endif add_number += S_GET_VALUE(add_symbolP); break; - + case SEG_UNKNOWN: #ifdef TC_I960 if ((int)fixP->fx_bit_fixP == 13) { @@ -1117,14 +1117,14 @@ segT this_segment_type; /* N_TYPE bits for segment. */ #endif /* TE_I386AIX */ #endif /* OBJ_COFF */ ++seg_reloc_count; - + break; - - + + } /* switch on symbol seg */ } /* if not in local seg */ } /* if there was a + symbol */ - + if (pcrel) { add_number -= md_pcrel_from(fixP); if (add_symbolP == 0) { @@ -1132,7 +1132,7 @@ segT this_segment_type; /* N_TYPE bits for segment. */ ++seg_reloc_count; } /* if there's an add_symbol */ } /* if pcrel */ - + if (!fixP->fx_bit_fixP) { if ((size == 1 && (add_number& ~0xFF) && (add_number & ~0xFF != (-1 & ~0xFF))) || @@ -1142,15 +1142,15 @@ segT this_segment_type; /* N_TYPE bits for segment. */ add_number, size, fragP->fr_address + where); } /* generic error checking */ } /* not a bit fix */ - + md_apply_fix(fixP, add_number); } /* For each fixS in this segment. */ - + #ifdef OBJ_COFF #ifdef TC_I960 { fixS *topP = fixP; - + /* two relocs per callj under coff. */ for (fixP = topP; fixP; fixP = fixP->fx_next) { if (fixP->fx_callj && fixP->fx_addsy != 0) { @@ -1159,7 +1159,7 @@ segT this_segment_type; /* N_TYPE bits for segment. */ } /* for each fix */ } #endif /* TC_I960 */ - + #endif /* OBJ_COFF */ return(seg_reloc_count); } /* fixup_segment() */ @@ -1204,11 +1204,11 @@ int align; /* Alignment, as a power of 2 * (e.g., 1 => 2-byte boundary, 2 => 4-byte boundary, etc.) */ { - + if ( align > section_alignment[(int) seg] ){ section_alignment[(int) seg] = align; } /* if highest yet */ - + return; } /* record_alignment() */ diff --git a/gnu/usr.bin/as/write.h b/gnu/usr.bin/as/write.h index 01e7272..8b51880 100644 --- a/gnu/usr.bin/as/write.h +++ b/gnu/usr.bin/as/write.h @@ -1,19 +1,19 @@ /* write.h Copyright (C) 1987, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -59,7 +59,7 @@ struct fix { char fx_pcrel; /* TRUE: pc-relative. */ char fx_pcrel_adjust; /* pc-relative offset adjust */ char fx_im_disp; /* TRUE: value is a displacement */ - bit_fixS *fx_bit_fixP; /* IF NULL no bitfix's to do */ + bit_fixS *fx_bit_fixP; /* IF NULL no bitfix's to do */ char fx_bsr; /* sequent-hack */ enum reloc_type fx_r_type; /* Sparc hacks */ char fx_callj; /* TRUE if target is a 'callj' (used by i960) */ diff --git a/gnu/usr.bin/as/xmalloc.c b/gnu/usr.bin/as/xmalloc.c index 6962484..4ecb289 100644 --- a/gnu/usr.bin/as/xmalloc.c +++ b/gnu/usr.bin/as/xmalloc.c @@ -1,19 +1,19 @@ /* xmalloc.c - get memory or bust Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -23,26 +23,26 @@ xmalloc() - get memory or bust INDEX xmalloc() uses malloc() - + SYNOPSIS char * my_memory; - + my_memory = xmalloc(42); / * my_memory gets address of 42 chars * / - + DESCRIPTION - + Use xmalloc() as an "error-free" malloc(). It does almost the same job. When it cannot honour your request for memory it BOMBS your program with a "virtual memory exceeded" message. Malloc() returns NULL and does not bomb your program. - + SEE ALSO malloc() - + */ #ifndef lint -static char rcsid[] = "$Id: xmalloc.c,v 1.3 1993/10/02 20:58:02 pk Exp $"; +static char rcsid[] = "$Id: xmalloc.c,v 1.2 1993/11/03 00:52:32 paul Exp $"; #endif #include <stdio.h> @@ -64,7 +64,7 @@ long n; { char * retval; void error(); - + if ((retval = malloc ((unsigned)n)) == NULL) { error("virtual memory exceeded"); diff --git a/gnu/usr.bin/as/xrealloc.c b/gnu/usr.bin/as/xrealloc.c index 1b26f43..8b2db16 100644 --- a/gnu/usr.bin/as/xrealloc.c +++ b/gnu/usr.bin/as/xrealloc.c @@ -1,49 +1,49 @@ /* xrealloc.c - new memory or bust Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. - + This file is part of GAS, the GNU Assembler. - + GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GAS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* - +/* + NAME xrealloc () - get more memory or bust INDEX xrealloc () uses realloc () SYNOPSIS char *my_memory; - + my_memory = xrealloc (my_memory, 42); / * my_memory gets (perhaps new) address of 42 chars * / - + DESCRIPTION - + Use xrealloc () as an "error-free" realloc ().It does almost the same job. When it cannot honour your request for memory it BOMBS your program with a "virtual memory exceeded" message. Realloc() returns NULL and does not bomb your program. - + SEE ALSO realloc () */ #ifndef lint -static char rcsid[] = "$Id: xrealloc.c,v 1.3 1993/10/02 20:58:03 pk Exp $"; +static char rcsid[] = "$Id: xrealloc.c,v 1.2 1993/11/03 00:52:34 paul Exp $"; #endif @@ -65,7 +65,7 @@ register char *ptr; long n; { void error(); - + if ((ptr = realloc (ptr, (unsigned)n)) == 0) error ("virtual memory exceeded"); return (ptr); diff --git a/gnu/usr.bin/awk/array.c b/gnu/usr.bin/awk/array.c index d42f9a6..9166c4e 100644 --- a/gnu/usr.bin/awk/array.c +++ b/gnu/usr.bin/awk/array.c @@ -2,22 +2,22 @@ * array.c - routines for associative arrays. */ -/* +/* * Copyright (C) 1986, 1988, 1989, 1991, 1992, 1993 the Free Software Foundation, Inc. - * + * * This file is part of GAWK, the GNU implementation of the * AWK Progamming Language. - * + * * GAWK is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * GAWK is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GAWK; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -161,7 +161,7 @@ unsigned long hsize; h = 0; #if defined(VAXC) -/* +/* * [This was an implementation of "Duff's Device", but it has been * redone, separating the switch for extra iterations from the loop. * This is necessary because the DEC VAX-C compiler is STOOPID.] @@ -251,7 +251,7 @@ int hash1; } /* - * test whether the array element symbol[subs] exists or not + * test whether the array element symbol[subs] exists or not */ int in_array(symbol, subs) @@ -276,10 +276,10 @@ NODE *symbol, *subs; /* * SYMBOL is the address of the node (or other pointer) being dereferenced. - * SUBS is a number or string used as the subscript. + * SUBS is a number or string used as the subscript. * * Find SYMBOL[SUBS] in the assoc array. Install it with value "" if it - * isn't there. Returns a pointer ala get_lhs to where its value is stored + * isn't there. Returns a pointer ala get_lhs to where its value is stored */ NODE ** assoc_lookup(symbol, subs) @@ -402,7 +402,7 @@ assoc_next(lookat) struct search *lookat; { register NODE *symbol = lookat->sym; - + if (symbol == NULL) fatal("null symbol in assoc_next"); if (symbol->var_array == NULL || lookat->idx > symbol->array_size) { diff --git a/gnu/usr.bin/awk/awk.h b/gnu/usr.bin/awk/awk.h index 1f0e2c1..453a724 100644 --- a/gnu/usr.bin/awk/awk.h +++ b/gnu/usr.bin/awk/awk.h @@ -1,23 +1,23 @@ /* - * awk.h -- Definitions for gawk. + * awk.h -- Definitions for gawk. */ -/* +/* * Copyright (C) 1986, 1988, 1989, 1991, 1992, 1993 the Free Software Foundation, Inc. - * + * * This file is part of GAWK, the GNU implementation of the * AWK Progamming Language. - * + * * GAWK is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * GAWK is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GAWK; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -306,7 +306,7 @@ typedef enum { /* * boolean test of membership in array lnode is string-valued - * expression rnode is array name + * expression rnode is array name */ Node_in_array, @@ -523,7 +523,7 @@ struct src { #ifndef LONG_MIN #define LONG_MIN (-LONG_MAX - 1) #endif -#define HUGE INT_MAX +#define HUGE INT_MAX /* -------------------------- External variables -------------------------- */ /* gawk builtin variables */ diff --git a/gnu/usr.bin/awk/builtin.c b/gnu/usr.bin/awk/builtin.c index 96411de..a9267cb 100644 --- a/gnu/usr.bin/awk/builtin.c +++ b/gnu/usr.bin/awk/builtin.c @@ -1,23 +1,23 @@ /* - * builtin.c - Builtin functions and various utility procedures + * builtin.c - Builtin functions and various utility procedures */ -/* +/* * Copyright (C) 1986, 1988, 1989, 1991, 1992, 1993 the Free Software Foundation, Inc. - * + * * This file is part of GAWK, the GNU implementation of the * AWK Progamming Language. - * + * * GAWK is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * GAWK is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GAWK; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -293,7 +293,7 @@ register NODE *carg; /* * Get the next arg to be formatted. If we've run out of args, - * return "" (Null string) + * return "" (Null string) */ #define parse_next_arg() {\ if(!carg) { toofew = 1; break; }\ @@ -413,7 +413,7 @@ check_pos: case ' ': /* print ' ' or '-' */ /* 'space' flag is ignored */ /* if '+' already present */ - if (signchar != 0) + if (signchar != 0) goto check_pos; /* FALL THROUGH */ case '+': /* print '+' or '-' */ @@ -447,7 +447,7 @@ check_pos: parse_next_arg(); if (arg->flags & NUMBER) { #ifdef sun386 - tmp_uval = arg->numbr; + tmp_uval = arg->numbr; uval= (unsigned long) tmp_uval; #else uval = (unsigned long) arg->numbr; @@ -769,7 +769,7 @@ NODE *tree; * From: David Trueman <emory!cs.dal.ca!david> * To: arnold@cc.gatech.edu (Arnold Robbins) * Date: Wed, 3 Nov 1993 12:49:41 -0400 - * + * * It may not be necessary to save the character, but * I'm not sure. It would normally be the field * separator. If the parse has not yet gone beyond @@ -793,7 +793,7 @@ NODE *tree; extern NODE **fmt_list; /* declared in eval.c */ -void +void do_print(tree) register NODE *tree; { @@ -1090,7 +1090,7 @@ int global; /* * create the result, copying in parts of the original - * string + * string */ len = matchstart - text + repllen + ampersands * (matchend - matchstart); diff --git a/gnu/usr.bin/awk/config.h b/gnu/usr.bin/awk/config.h index 0b3cca1..601f483 100644 --- a/gnu/usr.bin/awk/config.h +++ b/gnu/usr.bin/awk/config.h @@ -4,22 +4,22 @@ * For generic 4.4 alpha */ -/* +/* * Copyright (C) 1991, 1992, 1993 the Free Software Foundation, Inc. - * + * * This file is part of GAWK, the GNU implementation of the * AWK Progamming Language. - * + * * GAWK is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2, or (at your option) * any later version. - * + * * GAWK is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GAWK; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. diff --git a/gnu/usr.bin/awk/dfa.c b/gnu/usr.bin/awk/dfa.c index ffa161a..397027f 100644 --- a/gnu/usr.bin/awk/dfa.c +++ b/gnu/usr.bin/awk/dfa.c @@ -614,7 +614,7 @@ lex() notset(ccl); laststart = 0; return lasttok = CSET + charclass_index(ccl); - + case '[': if (backslash) goto normal_char; @@ -1969,7 +1969,7 @@ dfacomp(s, len, d, searchflag) lcopy = malloc(len); if (!lcopy) dfaerror("out of memory"); - + /* This is a kludge. */ case_fold = 0; for (i = 0; i < len; ++i) @@ -2059,9 +2059,9 @@ dfafree(d) Type left right is in ---- ---- ----- -- -- char c # c # c # c # c - + CSET ZERO ZERO ZERO ZERO - + STAR ZERO ZERO ZERO ZERO QMARK ZERO ZERO ZERO ZERO @@ -2072,12 +2072,12 @@ dfafree(d) p->left : q->right : q->is!=ZERO) ? q->in plus p->is##q->left p->right##q->is p->is##q->is : p->right##q->left ZERO - + OR longest common longest common (do p->is and substrings common to leading trailing q->is have same p->in and q->in - (sub)sequence (sub)sequence length and - of p->left of p->right content) ? - and q->left and q->right p->is : NULL + (sub)sequence (sub)sequence length and + of p->left of p->right content) ? + and q->left and q->right p->is : NULL If there's anything else we recognize in the tree, all four sequences get set to zero-length sequences. If there's something we don't recognize in the tree, @@ -2104,7 +2104,7 @@ dfafree(d) Does optimization actually accomplish anything, or is the automaton you get from "psi|epsilon" (for example) the same as the one you get from "psi" (for example)? - + Are optimizable r.e.'s likely to be used in real-life situations (something like 'ab*' is probably unlikely; something like is 'psi|epsilon' is likelier)? */ diff --git a/gnu/usr.bin/awk/eval.c b/gnu/usr.bin/awk/eval.c index 18f67fd..ccf4671 100644 --- a/gnu/usr.bin/awk/eval.c +++ b/gnu/usr.bin/awk/eval.c @@ -1,23 +1,23 @@ /* - * eval.c - gawk parse tree interpreter + * eval.c - gawk parse tree interpreter */ -/* +/* * Copyright (C) 1986, 1988, 1989, 1991, 1992, 1993 the Free Software Foundation, Inc. - * + * * This file is part of GAWK, the GNU implementation of the * AWK Progamming Language. - * + * * GAWK is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * GAWK is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GAWK; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -122,7 +122,7 @@ char casetable[] = { /* * Tree is a bunch of rules to run. Returns zero if it hit an exit() - * statement + * statement */ int interpret(tree) @@ -363,7 +363,7 @@ register NODE *volatile tree; default: /* * Appears to be an expression statement. Throw away the - * value. + * value. */ if (do_lint && tree->type == Node_var) warning("statement has no effect"); @@ -685,7 +685,7 @@ register NODE *tree; * of a Node_cond_pair; whether we evaluate the lnode of that * node or the rnode depends on the triggered word. More * precisely: if we are not yet triggered, we tree_eval the - * lnode; if that returns true, we set the triggered word. + * lnode; if that returns true, we set the triggered word. * If we are triggered (not ELSE IF, note), we tree_eval the * rnode, clear triggered if it succeeds, and perform our * action (regardless of success or failure). We want to be @@ -705,7 +705,7 @@ register NODE *tree; /* * Could just be J.random expression. in which case, null and 0 are - * false, anything else is true + * false, anything else is true */ t1 = tree_eval(tree); @@ -1016,7 +1016,7 @@ NODE *arg_list; /* Node_expression_list of calling args. */ /* * This returns a POINTER to a node pointer. get_lhs(ptr) is the current - * value of the var, or where to store the var's new value + * value of the var, or where to store the var's new value */ NODE ** diff --git a/gnu/usr.bin/awk/field.c b/gnu/usr.bin/awk/field.c index 17dce9b..b1a709e 100644 --- a/gnu/usr.bin/awk/field.c +++ b/gnu/usr.bin/awk/field.c @@ -2,22 +2,22 @@ * field.c - routines for dealing with fields and record parsing */ -/* +/* * Copyright (C) 1986, 1988, 1989, 1991, 1992, 1993 the Free Software Foundation, Inc. - * + * * This file is part of GAWK, the GNU implementation of the * AWK Progamming Language. - * + * * GAWK is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * GAWK is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GAWK; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -305,7 +305,7 @@ NODE *n; *end = ' '; /* sentinel character */ for (; nf < up_to; scan++) { /* - * special case: fs is single space, strip leading whitespace + * special case: fs is single space, strip leading whitespace */ while (scan < end && (*scan == ' ' || *scan == '\t')) scan++; @@ -466,7 +466,7 @@ Func_ptr *assign; /* this field is on the LHS of an assign */ save_FS, FS_regexp, set_field, (NODE *)NULL); /* - * if we reached the end of the record, set NF to the number of + * if we reached the end of the record, set NF to the number of * fields so far. Note that requested might actually refer to * a field that is beyond the end of the record, but we won't * set NF to that value at this point, since this is only a diff --git a/gnu/usr.bin/awk/io.c b/gnu/usr.bin/awk/io.c index 93cc3ae..7f92556 100644 --- a/gnu/usr.bin/awk/io.c +++ b/gnu/usr.bin/awk/io.c @@ -2,22 +2,22 @@ * io.c --- routines for dealing with input and output and records */ -/* +/* * Copyright (C) 1986, 1988, 1989, 1991, 1992, 1993 the Free Software Foundation, Inc. - * + * * This file is part of GAWK, the GNU implementation of the * AWK Progamming Language. - * + * * GAWK is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * GAWK is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GAWK; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -240,7 +240,7 @@ IOBUF *iop; if ((fields_arr[0]->stptr >= iop->buf) && (fields_arr[0]->stptr < iop->end)) { NODE *t; - + t = make_string(fields_arr[0]->stptr, fields_arr[0]->stlen); unref(fields_arr[0]); @@ -463,7 +463,7 @@ close_one() } if (rp == NULL) /* surely this is the only reason ??? */ - fatal("too many pipes or input files open"); + fatal("too many pipes or input files open"); } NODE * @@ -516,7 +516,7 @@ int exitwarn; what = (rp->flag & RED_PIPE) ? "pipe" : "file"; - if (exitwarn) + if (exitwarn) warning("no explicit close of %s \"%s\" provided", what, rp->value); @@ -666,7 +666,7 @@ const char *name, *mode; openfd = fileno(stdin); else if (STREQN(name, "/dev/", 5) && stat((char *) name, &buf) == -1) { cp = name + 5; - + if (STREQ(cp, "stdin") && (flag & O_RDONLY) == O_RDONLY) openfd = fileno(stdin); else if (STREQ(cp, "stdout") && (flag & O_WRONLY) == O_WRONLY) @@ -684,7 +684,7 @@ const char *name, *mode; strictopen: if (openfd == INVALID_HANDLE) openfd = open(name, flag, 0666); - if (openfd != INVALID_HANDLE && fstat(openfd, &buf) > 0) + if (openfd != INVALID_HANDLE && fstat(openfd, &buf) > 0) if (S_ISDIR(buf.st_mode)) fatal("file `%s' is a directory", name); return openfd; @@ -897,7 +897,7 @@ const char *name, *mode; strictopen: if (openfd == INVALID_HANDLE) openfd = open(name, flag, 0666); - if (openfd != INVALID_HANDLE && fstat(openfd, &buf) > 0) + if (openfd != INVALID_HANDLE && fstat(openfd, &buf) > 0) if ((buf.st_mode & S_IFMT) == S_IFDIR) fatal("file `%s' is a directory", name); iop = iop_alloc(openfd); diff --git a/gnu/usr.bin/awk/iop.c b/gnu/usr.bin/awk/iop.c index 897daef..6b6a03b 100644 --- a/gnu/usr.bin/awk/iop.c +++ b/gnu/usr.bin/awk/iop.c @@ -2,22 +2,22 @@ * iop.c - do i/o related things. */ -/* +/* * Copyright (C) 1986, 1988, 1989, 1991, 1992, 1993 the Free Software Foundation, Inc. - * + * * This file is part of GAWK, the GNU implementation of the * AWK Progamming Language. - * + * * GAWK is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * GAWK is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GAWK; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. diff --git a/gnu/usr.bin/awk/main.c b/gnu/usr.bin/awk/main.c index a14efff..ff9426e 100644 --- a/gnu/usr.bin/awk/main.c +++ b/gnu/usr.bin/awk/main.c @@ -1,23 +1,23 @@ /* - * main.c -- Expression tree constructors and main program for gawk. + * main.c -- Expression tree constructors and main program for gawk. */ -/* +/* * Copyright (C) 1986, 1988, 1989, 1991, 1992, 1993 the Free Software Foundation, Inc. - * + * * This file is part of GAWK, the GNU implementation of the * AWK Progamming Language. - * + * * GAWK is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * GAWK is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GAWK; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -67,7 +67,7 @@ char *CONVFMT; /* * The parse tree and field nodes are stored here. Parse_end is a dummy item - * used to free up unneeded fields without freeing the program being run + * used to free up unneeded fields without freeing the program being run */ int errcount = 0; /* error counter, used by yyerror() */ @@ -176,7 +176,7 @@ char **argv; /* Set up the special variables */ /* * Note that this must be done BEFORE arg parsing else -F - * breaks horribly + * breaks horribly */ init_vars(); @@ -553,7 +553,7 @@ load_environ() NODE **aptr; register int i; - ENVIRON_node = install("ENVIRON", + ENVIRON_node = install("ENVIRON", node(Nnull_string, Node_var, (NODE *) NULL)); for (i = 0; environ[i]; i++) { static char nullstr[] = ""; @@ -782,7 +782,7 @@ gawk_name(filespec) char *filespec; { char *p; - + #ifdef VMS /* "device:[root.][directory.subdir]GAWK.EXE;n" -> "GAWK" */ char *q; diff --git a/gnu/usr.bin/awk/msg.c b/gnu/usr.bin/awk/msg.c index 4bd9f90..4244fd3 100644 --- a/gnu/usr.bin/awk/msg.c +++ b/gnu/usr.bin/awk/msg.c @@ -2,22 +2,22 @@ * msg.c - routines for error messages */ -/* +/* * Copyright (C) 1986, 1988, 1989, 1991, 1992, 1993 the Free Software Foundation, Inc. - * + * * This file is part of GAWK, the GNU implementation of the * AWK Progamming Language. - * + * * GAWK is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2, or (at your option) * any later version. - * + * * GAWK is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GAWK; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. diff --git a/gnu/usr.bin/awk/node.c b/gnu/usr.bin/awk/node.c index dca4ad1..748028b 100644 --- a/gnu/usr.bin/awk/node.c +++ b/gnu/usr.bin/awk/node.c @@ -2,22 +2,22 @@ * node.c -- routines for node management */ -/* +/* * Copyright (C) 1986, 1988, 1989, 1991, 1992, 1993 the Free Software Foundation, Inc. - * + * * This file is part of GAWK, the GNU implementation of the * AWK Progamming Language. - * + * * GAWK is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * GAWK is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GAWK; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -99,7 +99,7 @@ register NODE *n; /* * the following lookup table is used as an optimization in force_string - * (more complicated) variations on this theme didn't seem to pay off, but + * (more complicated) variations on this theme didn't seem to pay off, but * systematic testing might be in order at some point */ static const char *values[] = { @@ -260,7 +260,7 @@ int flags; memcpy(r->stptr, s, len); } r->stptr[len] = '\0'; - + if (flags & SCAN) { /* scan for escape sequences */ char *pf; register char *ptm; @@ -368,16 +368,16 @@ register NODE *tmp; /* * Parse a C escape sequence. STRING_PTR points to a variable containing a * pointer to the string to parse. That pointer is updated past the - * characters we use. The value of the escape sequence is returned. + * characters we use. The value of the escape sequence is returned. * * A negative value means the sequence \ newline was seen, which is supposed to - * be equivalent to nothing at all. + * be equivalent to nothing at all. * * If \ is followed by a null character, we return a negative value and leave - * the string pointer pointing at the null character. + * the string pointer pointing at the null character. * * If \ is followed by 000, we return 0 and leave the string pointer after the - * zeros. A value of 0 does not mean end of string. + * zeros. A value of 0 does not mean end of string. * * Posix doesn't allow \x. */ diff --git a/gnu/usr.bin/awk/protos.h b/gnu/usr.bin/awk/protos.h index 1d4ac99..62e933a 100644 --- a/gnu/usr.bin/awk/protos.h +++ b/gnu/usr.bin/awk/protos.h @@ -2,22 +2,22 @@ * protos.h -- function prototypes for when the headers don't have them. */ -/* +/* * Copyright (C) 1991, 1992, 1993 the Free Software Foundation, Inc. - * + * * This file is part of GAWK, the GNU implementation of the * AWK Progamming Language. - * + * * GAWK is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * GAWK is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GAWK; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. diff --git a/gnu/usr.bin/awk/re.c b/gnu/usr.bin/awk/re.c index 4ea22c2..5ee1c43 100644 --- a/gnu/usr.bin/awk/re.c +++ b/gnu/usr.bin/awk/re.c @@ -2,22 +2,22 @@ * re.c - compile regular expressions. */ -/* +/* * Copyright (C) 1991, 1992, 1993 the Free Software Foundation, Inc. - * + * * This file is part of GAWK, the GNU implementation of the * AWK Progamming Language. - * + * * GAWK is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * GAWK is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GAWK; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -46,7 +46,7 @@ int dfa; /* Build a copy of the string (in dest) with the escaped characters translated, and generate the regex - from that. + from that. */ emalloc(dest, char *, len + 2, "make_regexp"); temp = dest; diff --git a/gnu/usr.bin/awk/version.c b/gnu/usr.bin/awk/version.c index 89b6cc0..ffcd8e1 100644 --- a/gnu/usr.bin/awk/version.c +++ b/gnu/usr.bin/awk/version.c @@ -7,11 +7,11 @@ char *version_string = "@(#)Gnu Awk (gawk) 2.15"; the split char is ' '. Added -v option to print version number - + Fixed bug that caused rounding when printing large numbers */ /* 2.00beta Incorporated the functionality of the "new" awk as described - the book (reference not handy). Extensively tested, but no + the book (reference not handy). Extensively tested, but no doubt still buggy. Badly needs tuning and cleanup, in particular in memory management which is currently almost non-existent. */ diff --git a/gnu/usr.bin/bc/bc.c b/gnu/usr.bin/bc/bc.c index 923215e..b6308d0 100644 --- a/gnu/usr.bin/bc/bc.c +++ b/gnu/usr.bin/bc/bc.c @@ -29,7 +29,7 @@ static char yysccsid[] = "@(#)yaccpar 1.8 (Berkeley) 01/20/90"; Computer Science Department, 9062 Western Washington University Bellingham, WA 98226-9062 - + *************************************************************************/ #include "bcdefs.h" @@ -736,7 +736,7 @@ case 20: warn ("comparison in expression"); if (yyvsp[0].i_value & 1) generate ("W"); - else + else generate ("p"); } break; @@ -793,7 +793,7 @@ break; case 28: #line 194 "bc.y" { - yyvsp[0].i_value = break_label; + yyvsp[0].i_value = break_label; break_label = next_label++; } break; @@ -857,7 +857,7 @@ break; case 34: #line 246 "bc.y" { - sprintf (genstr, "N%1d:", if_label); + sprintf (genstr, "N%1d:", if_label); generate (genstr); if_label = yyvsp[-4].i_value; } @@ -873,7 +873,7 @@ break; case 36: #line 258 "bc.y" { - yyvsp[0].i_value = break_label; + yyvsp[0].i_value = break_label; break_label = next_label++; sprintf (genstr, "Z%1d:", break_label); generate (genstr); @@ -912,7 +912,7 @@ case 46: { warn ("else clause in if statement"); yyvsp[0].i_value = next_label++; - sprintf (genstr, "J%d:N%1d:", yyvsp[0].i_value, if_label); + sprintf (genstr, "J%d:N%1d:", yyvsp[0].i_value, if_label); generate (genstr); if_label = yyvsp[0].i_value; } @@ -922,7 +922,7 @@ case 48: { /* Check auto list against parameter list? */ check_params (yyvsp[-4].a_value,yyvsp[0].a_value); - sprintf (genstr, "F%d,%s.%s[", lookup(yyvsp[-6].s_value,FUNCT), + sprintf (genstr, "F%d,%s.%s[", lookup(yyvsp[-6].s_value,FUNCT), arg_str (yyvsp[-4].a_value,TRUE), arg_str (yyvsp[0].a_value,TRUE)); generate (genstr); free_args (yyvsp[-4].a_value); @@ -1205,7 +1205,7 @@ case 85: { yyval.i_value = 1; if (yyvsp[-1].a_value != NULL) - { + { sprintf (genstr, "C%d,%s:", lookup (yyvsp[-3].s_value,FUNCT), arg_str (yyvsp[-1].a_value,FALSE)); @@ -1246,7 +1246,7 @@ case 87: if (yyvsp[-1].i_value < 0) { sprintf (genstr, "DL%d:x", -yyvsp[-1].i_value); - generate (genstr); + generate (genstr); if (yyvsp[0].c_value == '+') sprintf (genstr, "A%d:", -yyvsp[-1].i_value); else diff --git a/gnu/usr.bin/bc/bcdefs.h b/gnu/usr.bin/bc/bcdefs.h index a9d2176..0f2c5e1 100644 --- a/gnu/usr.bin/bc/bcdefs.h +++ b/gnu/usr.bin/bc/bcdefs.h @@ -23,7 +23,7 @@ Computer Science Department, 9062 Western Washington University Bellingham, WA 98226-9062 - + *************************************************************************/ /* Include the configuration file. */ @@ -74,7 +74,7 @@ typedef struct arg_list struct arg_list *next; } arg_list; -typedef struct +typedef struct { char f_defined; /* Is this function defined yet. */ char *f_body[BC_MAX_SEGS]; diff --git a/gnu/usr.bin/bc/const.h b/gnu/usr.bin/bc/const.h index ea91eaf..a4ab2ac 100644 --- a/gnu/usr.bin/bc/const.h +++ b/gnu/usr.bin/bc/const.h @@ -23,7 +23,7 @@ Computer Science Department, 9062 Western Washington University Bellingham, WA 98226-9062 - + *************************************************************************/ diff --git a/gnu/usr.bin/bc/execute.c b/gnu/usr.bin/bc/execute.c index a7bc9c7..a2f0e00 100644 --- a/gnu/usr.bin/bc/execute.c +++ b/gnu/usr.bin/bc/execute.c @@ -23,7 +23,7 @@ Computer Science Department, 9062 Western Washington University Bellingham, WA 98226-9062 - + *************************************************************************/ #include "bcdefs.h" @@ -53,7 +53,7 @@ byte (pc) program_counter *pc; { int seg, offset; - + seg = pc->pc_addr >> BC_SEG_LOG; offset = pc->pc_addr++ % BC_SEG_SIZE; return (functions[pc->pc_func].f_body[seg][offset]); @@ -67,7 +67,7 @@ execute () { int label_num, l_gp, l_off; bc_label_group *gp; - + char inst, ch; int new_func; int var_name; @@ -89,7 +89,7 @@ execute () signal (SIGINT, stop_execution); had_sigint = FALSE; } - + while (pc.pc_addr < functions[pc.pc_func].f_code_size && !runtime_error) { inst = byte(&pc); @@ -97,7 +97,7 @@ execute () #if DEBUG > 3 { /* Print out address and the stack before each instruction.*/ int depth; estack_rec *temp = ex_stack; - + printf ("func=%d addr=%d inst=%c\n",pc.pc_func, pc.pc_addr, inst); if (temp == NULL) printf ("empty stack.\n", inst); else @@ -144,7 +144,7 @@ execute () case 'C' : /* Call a function. */ /* Get the function number. */ new_func = byte(&pc); - if ((new_func & 0x80) != 0) + if ((new_func & 0x80) != 0) new_func = ((new_func << 8) & 0x7f) + byte(&pc); /* Check to make sure it is defined. */ @@ -179,7 +179,7 @@ execute () case 'K' : /* Push a constant */ /* Get the input base and convert it to a bc number. */ - if (pc.pc_func == 0) + if (pc.pc_func == 0) const_base = i_base; else const_base = fn_stack->s_val; @@ -275,8 +275,8 @@ execute () int2num (&ex_stack->s_num, ex_stack->s_num->n_len + ex_stack->s_num->n_scale); break; - - case 'S': /* Scale function. */ + + case 'S': /* Scale function. */ int2num (&ex_stack->s_num, ex_stack->s_num->n_scale); break; @@ -297,7 +297,7 @@ execute () var_name = ((var_name << 8) & 0x7f) + byte(&pc); decr_var (var_name); break; - + case 'h' : /* Halt the machine. */ exit (0); @@ -334,7 +334,7 @@ execute () while ((ch = byte(&pc)) != '"') out_char (ch); if (interactive) fflush (stdout); break; - + case 'x' : /* Exchange Top of Stack with the one under the tos. */ if (check_stack(2)) { bc_num temp = ex_stack->s_num; @@ -532,7 +532,7 @@ execute () pc.pc_func = fpop (); } - /* Clean up the execution stack. */ + /* Clean up the execution stack. */ while (ex_stack != NULL) pop(); /* Clean up the interrupt stuff. */ @@ -562,7 +562,7 @@ char input_char () { char in_ch; - + /* Get a character from the standard input for the read function. */ in_ch = getchar(); @@ -585,7 +585,7 @@ input_char () return (in_ch); if (in_ch <= ' ') return (' '); - + return (':'); } @@ -613,7 +613,7 @@ push_constant (in_char, conv_base) /* The conversion base. */ int2num (&mult, conv_base); - + /* Get things ready. */ in_ch = in_char(); while (in_ch == ' ') @@ -669,7 +669,7 @@ push_constant (in_char, conv_base) bc_divide (result, divisor, &result, digits); bc_add (build, result, &build); } - + /* Final work. */ if (negative) bc_sub (_zero_, build, &build); @@ -695,7 +695,7 @@ push_b10_const (pc) int kdigits, kscale; char inchar; char *ptr; - + /* Count the digits and get things ready. */ look_pc = *pc; kdigits = 0; @@ -718,7 +718,7 @@ push_b10_const (pc) /* Get the first character again and move the pc. */ inchar = byte(pc); - + /* Secial cases of 0, 1, and A-F single inputs. */ if (kdigits == 1 && kscale == 0) { diff --git a/gnu/usr.bin/bc/global.c b/gnu/usr.bin/bc/global.c index 1e7dc1c..b00a989 100644 --- a/gnu/usr.bin/bc/global.c +++ b/gnu/usr.bin/bc/global.c @@ -23,7 +23,7 @@ Computer Science Department, 9062 Western Washington University Bellingham, WA 98226-9062 - + *************************************************************************/ #include "bcdefs.h" @@ -36,7 +36,7 @@ #include "global.h" #ifndef BC_MATH_FILE -CONST char libmath[] = +CONST char libmath[] = #include "math.h" ; -#endif +#endif diff --git a/gnu/usr.bin/bc/global.h b/gnu/usr.bin/bc/global.h index e2b6007..550afb1 100644 --- a/gnu/usr.bin/bc/global.h +++ b/gnu/usr.bin/bc/global.h @@ -23,7 +23,7 @@ Computer Science Department, 9062 Western Washington University Bellingham, WA 98226-9062 - + *************************************************************************/ diff --git a/gnu/usr.bin/bc/load.c b/gnu/usr.bin/bc/load.c index be4ab3a..144ae0e 100644 --- a/gnu/usr.bin/bc/load.c +++ b/gnu/usr.bin/bc/load.c @@ -23,7 +23,7 @@ Computer Science Department, 9062 Western Washington University Bellingham, WA 98226-9062 - + *************************************************************************/ #include "bcdefs.h" @@ -85,16 +85,16 @@ def_label (lab) { bc_label_group *temp; int group, offset, func; - + /* Get things ready. */ group = lab >> BC_LABEL_LOG; offset = lab % BC_LABEL_GROUP; func = load_adr.pc_func; - + /* Make sure there is at least one label group. */ if (functions[func].f_label == NULL) { - functions[func].f_label = + functions[func].f_label = (bc_label_group *) bc_malloc (sizeof(bc_label_group)); functions[func].f_label->l_next = NULL; } @@ -132,7 +132,7 @@ long_val (str) neg = TRUE; (*str)++; } - while (isdigit(**str)) + while (isdigit(**str)) val = val*10 + *(*str)++ - '0'; if (neg) @@ -157,7 +157,7 @@ load_code (code) /* Initialize. */ str = code; - + /* Scan the code. */ while (*str != 0) { @@ -172,7 +172,7 @@ load_code (code) else if (load_const) { - if (*str == '\n') + if (*str == '\n') str++; else { @@ -239,7 +239,7 @@ load_code (code) #if DEBUG > 2 printf ("parameter number %d\n", ap_name); #endif - functions[(int)func].f_params = + functions[(int)func].f_params = nextarg (functions[(int)func].f_params, ap_name); } @@ -251,14 +251,14 @@ load_code (code) #if DEBUG > 2 printf ("auto number %d\n", ap_name); #endif - functions[(int)func].f_autos = + functions[(int)func].f_autos = nextarg (functions[(int)func].f_autos, ap_name); } save_adr = load_adr; load_adr.pc_func = func; load_adr.pc_addr = 0; break; - + case ']': /* A function end */ functions[load_adr.pc_func].f_defined = TRUE; load_adr = save_adr; @@ -279,7 +279,7 @@ load_code (code) addbyte (*str++); addbyte (':'); break; - + case 'c': /* Call a special function. */ addbyte (*str++); addbyte (*str); @@ -318,14 +318,14 @@ load_code (code) case 'r': execute (); break; - } + } break; case '\n': /* Ignore the newlines */ break; - + default: /* Anything else */ - addbyte (*str); + addbyte (*str); } str++; } diff --git a/gnu/usr.bin/bc/main.c b/gnu/usr.bin/bc/main.c index 33827cc..ed8643a 100644 --- a/gnu/usr.bin/bc/main.c +++ b/gnu/usr.bin/bc/main.c @@ -23,7 +23,7 @@ Computer Science Department, 9062 Western Washington University Bellingham, WA 98226-9062 - + *************************************************************************/ #include "bcdefs.h" @@ -42,14 +42,14 @@ main (argc, argv) int argc; char *argv[]; { - int ch; - + int ch; + /* Initialize many variables. */ compile_only = FALSE; use_math = FALSE; warn_not_std = FALSE; std_only = FALSE; - if (isatty(0) && isatty(1)) + if (isatty(0) && isatty(1)) interactive = TRUE; else interactive = FALSE; @@ -111,7 +111,7 @@ main (argc, argv) } -/* This is the function that opens all the files. +/* This is the function that opens all the files. It returns TRUE if the file was opened, otherwise it returns FALSE. */ @@ -137,7 +137,7 @@ open_new_file () { new_yy_file (new_file); return TRUE; - } + } else { fprintf (stderr, "Math Library unavailable.\n"); @@ -159,7 +159,7 @@ open_new_file () load_code (libmath); #endif } - + /* One of the argv values. */ while (optind < g_argc) { @@ -173,7 +173,7 @@ open_new_file () fprintf (stderr, "File %s is unavailable.\n", g_argv[optind++]); exit (1); } - + /* If we fall through to here, we should return stdin. */ new_yy_file (stdin); is_std_in = TRUE; diff --git a/gnu/usr.bin/bc/number.c b/gnu/usr.bin/bc/number.c index 346b44a..336ad11 100644 --- a/gnu/usr.bin/bc/number.c +++ b/gnu/usr.bin/bc/number.c @@ -23,7 +23,7 @@ Computer Science Department, 9062 Western Washington University Bellingham, WA 98226-9062 - + *************************************************************************/ #include "bcdefs.h" @@ -43,7 +43,7 @@ free_num (num) bc_num *num; { if (*num == NULL) return; - (*num)->n_refs--; + (*num)->n_refs--; if ((*num)->n_refs == 0) free(*num); *num = NULL; } @@ -113,19 +113,19 @@ int2num (num, val) char *bptr, *vptr; int ix = 1; char neg = 0; - + /* Sign. */ if (val < 0) { neg = 1; val = -val; } - + /* Get things going. */ bptr = buffer; *bptr++ = val % 10; val = val / 10; - + /* Extract remaining digits. */ while (val != 0) { @@ -133,12 +133,12 @@ int2num (num, val) val = val / 10; ix++; /* Count the digits. */ } - + /* Make the number. */ free_num (num); *num = new_num (ix, 0); if (neg) (*num)->n_sign = MINUS; - + /* Assign the digits. */ vptr = (*num)->n_value; while (ix-- > 0) @@ -146,7 +146,7 @@ int2num (num, val) } -/* Convert a number NUM to a long. The function returns only the integer +/* Convert a number NUM to a long. The function returns only the integer part of the number. For numbers that are too large to represent as a long, this function returns a zero. This can be detected by checking the NUM for zero after having a zero returned. */ @@ -164,11 +164,11 @@ num2long (num) nptr = num->n_value; for (index=num->n_len; (index>0) && (val<=(LONG_MAX/10)); index--) val = val*10 + *nptr++; - + /* Check for overflow. If overflow, return zero. */ if (index>0) val = 0; if (val < 0) val = 0; - + /* Return the value. */ if (num->n_sign == PLUS) return (val); @@ -200,7 +200,7 @@ _do_compare (n1, n2, use_sign, ignore_last) { char *n1ptr, *n2ptr; int count; - + /* First, compare signs. */ if (use_sign && n1->n_sign != n2->n_sign) { @@ -209,7 +209,7 @@ _do_compare (n1, n2, use_sign, ignore_last) else return (-1); /* Negative N1 < Positive N1 */ } - + /* Now compare the magnitude. */ if (n1->n_len != n2->n_len) { @@ -266,7 +266,7 @@ _do_compare (n1, n2, use_sign, ignore_last) } /* They are equal up to the last part of the equal part of the fraction. */ - if (n1->n_scale != n2->n_scale) + if (n1->n_scale != n2->n_scale) if (n1->n_scale > n2->n_scale) { for (count = n1->n_scale-n2->n_scale; count>0; count--) @@ -291,7 +291,7 @@ _do_compare (n1, n2, use_sign, ignore_last) return (1); } } - + /* They must be equal! */ return (0); } @@ -328,7 +328,7 @@ is_zero (num) if (count != 0) return FALSE; - else + else return TRUE; } @@ -366,7 +366,7 @@ _rm_leading_zeros (num) bytes += num->n_scale; dst = num->n_value; while (bytes-- > 0) *dst++ = *src++; - + } @@ -443,10 +443,10 @@ _do_add (n1, n2) /* Set final carry. */ if (carry == 1) *sumptr += 1; - + /* Adjust sum and return. */ _rm_leading_zeros (sum); - return sum; + return sum; } @@ -478,7 +478,7 @@ _do_sub (n1, n2) /* Subtract the numbers. */ borrow = 0; - + /* Take care of the longer scaled number. */ if (n1->n_scale != min_scale) { @@ -502,9 +502,9 @@ _do_sub (n1, n2) *diffptr-- = val; } } - + /* Now do the equal length scale and integer parts. */ - + for (count = 0; count < min_len + min_scale; count++) { val = *n1ptr-- - *n2ptr-- - borrow; @@ -569,7 +569,7 @@ bc_add ( n1, n2, result) break; case 0: /* They are equal! return zero! */ - sum = copy_num (_zero_); + sum = copy_num (_zero_); break; case 1: /* n2 is less than n1, subtract n2 from n1. */ @@ -612,7 +612,7 @@ bc_sub ( n1, n2, result) break; case 0: /* They are equal! return zero! */ - diff = copy_num (_zero_); + diff = copy_num (_zero_); break; case 1: /* n2 is less than n1, subtract n2 from n1. */ @@ -621,7 +621,7 @@ bc_sub ( n1, n2, result) break; } } - + /* Clean up and return. */ free_num (result); *result = diff; @@ -685,7 +685,7 @@ bc_multiply (n1, n2, prod, scale) free_num (prod); *prod = pval; _rm_leading_zeros (*prod); - if (is_zero (*prod)) + if (is_zero (*prod)) (*prod)->n_sign = PLUS; } @@ -723,7 +723,7 @@ _one_mult (num, size, digit, result) *rptr-- = value % 10; carry = value / 10; } - + if (carry != 0) *rptr = carry; } } @@ -739,7 +739,7 @@ int bc_divide (n1, n2, quot, scale) bc_num n1, n2, *quot; int scale; -{ +{ bc_num qval; unsigned char *num1, *num2; unsigned char *ptr1, *ptr2, *n2ptr, *qptr; @@ -767,7 +767,7 @@ bc_divide (n1, n2, quot, scale) *quot = qval; } } - + /* Set up the divide. Move the decimal point on n1 by n2's scale. Remember, zeros on the end of num2 are wasted effort for dividing. */ scale2 = n2->n_scale; @@ -859,7 +859,7 @@ bc_divide (n1, n2, quot, scale) + num1[qdig+2]) qguess--; } - + /* Multiply and subtract. */ borrow = 0; if (qguess != 0) @@ -903,7 +903,7 @@ bc_divide (n1, n2, quot, scale) } if (carry == 1) *ptr1 = (*ptr1 + 1) % 10; } - + /* We now know the quotient digit. */ *qptr++ = qguess; qdig++; @@ -943,7 +943,7 @@ bc_modulo (num1, num2, result, scale) /* Calculate final scale. */ rscale = MAX (num1->n_scale, num2->n_scale+scale); init_num (&temp); - + /* Calculate it. */ bc_divide (num1, num2, &temp, scale); bc_multiply (temp, num2, &temp, rscale); @@ -1001,12 +1001,12 @@ bc_raise (num1, num2, result, scale) /* Do the calculation. */ while (exponent != 0) { - if (exponent & 1 != 0) + if (exponent & 1 != 0) bc_multiply (temp, power, &temp, rscale); bc_multiply (power, power, &power, rscale); exponent = exponent >> 1; } - + /* Assign the value. */ if (neg) { @@ -1025,7 +1025,7 @@ bc_raise (num1, num2, result, scale) /* Take the square root NUM and return it in NUM with SCALE digits after the decimal place. */ -int +int bc_sqrt (num, scale) bc_num *num; int scale; @@ -1062,8 +1062,8 @@ bc_sqrt (num, scale) init_num (&guess1); point5 = new_num (1,1); point5->n_value[1] = 5; - - + + /* Calculate the initial guess. */ if (cmp_res < 0) /* The number is between 0 and 1. Guess should start at 1. */ @@ -1078,7 +1078,7 @@ bc_sqrt (num, scale) bc_raise (guess, guess1, &guess, rscale); free_num (&guess1); } - + /* Find the square root using Newton's algorithm. */ done = FALSE; while (!done) @@ -1091,7 +1091,7 @@ bc_sqrt (num, scale) cmp_res = _do_compare (guess,guess1,FALSE,TRUE); if (cmp_res == 0) done = TRUE; } - + /* Assign the number and clean up. */ free_num (num); bc_divide (guess,_one_,num,rscale); @@ -1179,7 +1179,7 @@ out_num (num, o_base, out_char) (*out_char) (BCD_CHAR(*nptr++)); else nptr++; - + /* Now the fraction. */ if (num->n_scale > 0) { @@ -1223,7 +1223,7 @@ out_num (num, o_base, out_char) { temp = digits; digits = digits->next; - if (o_base <= 16) + if (o_base <= 16) (*out_char) (ref_str[ (int) temp->digit]); else out_long (temp->digit, max_o_digit->n_len, 1, out_char); @@ -1251,7 +1251,7 @@ out_num (num, o_base, out_char) bc_multiply (t_num, base, &t_num, 0); } } - + /* Clean up. */ free_num (&int_part); free_num (&frac_part); @@ -1353,7 +1353,7 @@ str2num (num, str, scale) for (;digits > 0; digits--) *nptr++ = CH_VAL(*ptr++); - + /* Build the fractional part. */ if (strscale > 0) { diff --git a/gnu/usr.bin/bc/number.h b/gnu/usr.bin/bc/number.h index 9938515..79a340f 100644 --- a/gnu/usr.bin/bc/number.h +++ b/gnu/usr.bin/bc/number.h @@ -23,7 +23,7 @@ Computer Science Department, 9062 Western Washington University Bellingham, WA 98226-9062 - + *************************************************************************/ @@ -35,7 +35,7 @@ typedef struct int n_len; /* The number of digits before the decimal point. */ int n_scale; /* The number of digits after the decimal point. */ int n_refs; /* The number of pointers to this number. */ - char n_value[1]; /* The storage. Not zero char terminated. It is + char n_value[1]; /* The storage. Not zero char terminated. It is allocated with all other fields. */ } bc_struct; diff --git a/gnu/usr.bin/bc/proto.h b/gnu/usr.bin/bc/proto.h index fea9405..f2aa490 100644 --- a/gnu/usr.bin/bc/proto.h +++ b/gnu/usr.bin/bc/proto.h @@ -23,7 +23,7 @@ Computer Science Department, 9062 Western Washington University Bellingham, WA 98226-9062 - + *************************************************************************/ /* For the pc version using k&r ACK. (minix1.5 and earlier.) */ @@ -158,7 +158,7 @@ _PROTOTYPE(void process_params, (program_counter *pc, int func )); /* For the scanner and parser.... */ _PROTOTYPE(int yyparse, (void)); -_PROTOTYPE(int yylex, (void)); +_PROTOTYPE(int yylex, (void)); /* Other things... */ _PROTOTYPE (int getopt, (int, char *[], CONST char *)); diff --git a/gnu/usr.bin/bc/scan.c b/gnu/usr.bin/bc/scan.c index 59aa6e5..6bff451 100644 --- a/gnu/usr.bin/bc/scan.c +++ b/gnu/usr.bin/bc/scan.c @@ -1,7 +1,7 @@ /* A lexical scanner generated by flex */ /* scanner skeleton version: - * $Header: /usr/fsys/odin/a/vern/flex/RCS/flex.skel,v 2.16 90/08/03 14:09:36 vern Exp $ + * $Header: /home/ncvs/src/gnu/usr.bin/bc/scan.c,v 1.1.1.1 1993/06/19 00:26:18 paul Exp $ */ #define FLEX_SCANNER @@ -150,7 +150,7 @@ int read(); /* default declaration of generated scanner - a define so the user can * easily add parameters */ -#define YY_DECL int yylex YY_PROTO(( void )) +#define YY_DECL int yylex YY_PROTO(( void )) /* code executed at the end of each rule */ #define YY_BREAK break; @@ -192,7 +192,7 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; Computer Science Department, 9062 Western Washington University Bellingham, WA 98226-9062 - + *************************************************************************/ #include "bcdefs.h" @@ -260,7 +260,7 @@ struct yy_buffer_state YY_CHAR *yy_buf_pos; /* current position in input buffer */ /* size of input buffer in bytes, not including room for EOB characters*/ - int yy_buf_size; + int yy_buf_size; /* number of characters read into yy_ch_buf, not including EOB characters */ int yy_n_chars; @@ -683,7 +683,7 @@ return(Limits); YY_BREAK case 22: # line 82 "scan.l" -{ yylval.c_value = yytext[0]; +{ yylval.c_value = yytext[0]; return((int)yytext[0]); } YY_BREAK case 23: @@ -708,7 +708,7 @@ case 27: YY_BREAK case 28: # line 89 "scan.l" -{ +{ #ifdef OLD_EQ_OP char warn_save; warn_save = warn_not_std; @@ -750,7 +750,7 @@ case 34: for (;;) { - while ( ((c=input()) != '*') && (c != EOF)) + while ( ((c=input()) != '*') && (c != EOF)) /* eat it */ if (c == '\n') line_no++; if (c == '*') @@ -812,7 +812,7 @@ case 37: *dst++ = *src++; } *dst = 0; - yylval.s_value = strcopyof(yytext); + yylval.s_value = strcopyof(yytext); return(NUMBER); } YY_BREAK @@ -952,9 +952,9 @@ case YY_STATE_EOF(INITIAL): * * synopsis * int yy_get_next_buffer(); - * + * * returns a code representing an action - * EOB_ACT_LAST_MATCH - + * EOB_ACT_LAST_MATCH - * EOB_ACT_CONTINUE_SCAN - continue scanning from current position * EOB_ACT_END_OF_FILE - end of file */ diff --git a/gnu/usr.bin/bc/storage.c b/gnu/usr.bin/bc/storage.c index 1edd6e2..18ddb93 100644 --- a/gnu/usr.bin/bc/storage.c +++ b/gnu/usr.bin/bc/storage.c @@ -23,7 +23,7 @@ Computer Science Department, 9062 Western Washington University Bellingham, WA 98226-9062 - + *************************************************************************/ #include "bcdefs.h" @@ -45,7 +45,7 @@ init_storage () /* Variables. */ v_count = 0; more_variables (); - + /* Arrays. */ a_count = 0; more_arrays (); @@ -231,7 +231,7 @@ fpop() { fstack_rec *temp; int retval; - + if (fn_stack != NULL) { temp = fn_stack; @@ -250,7 +250,7 @@ fpush (val) int val; { fstack_rec *temp; - + temp = (fstack_rec *) bc_malloc (sizeof (fstack_rec)); temp->s_next = fn_stack; temp->s_val = val; @@ -264,7 +264,7 @@ void pop () { estack_rec *temp; - + if (ex_stack != NULL) { temp = ex_stack; @@ -397,7 +397,7 @@ get_array_num (var_index, index) ix >>= NODE_SHIFT; log++; } - + /* Build any tree that is necessary. */ while (log > a_var->a_depth) { @@ -416,7 +416,7 @@ get_array_num (var_index, index) a_var->a_tree = temp; a_var->a_depth++; } - + /* Find the indexed variable. */ temp = a_var->a_tree; while ( log-- > 1) @@ -437,13 +437,13 @@ get_array_num (var_index, index) else temp = temp->n_items.n_down[ix1]; } - + /* Return the address of the indexed variable. */ return &(temp->n_items.n_num[sub[0]]); } -/* Store the top of the execution stack into VAR_NAME. +/* Store the top of the execution stack into VAR_NAME. This includes the special variables ibase, obase, and scale. */ void @@ -541,7 +541,7 @@ store_var (var_name) } -/* Store the top of the execution stack into array VAR_NAME. +/* Store the top of the execution stack into array VAR_NAME. VAR_NAME is the name of an array, and the next to the top of stack for the index into the array. */ @@ -555,7 +555,7 @@ store_array (var_name) if (!check_stack(2)) return; index = num2long (ex_stack->s_next->s_num); if (index < 0 || index > BC_DIM_MAX || - (index == 0 && !is_zero(ex_stack->s_next->s_num))) + (index == 0 && !is_zero(ex_stack->s_next->s_num))) rt_error ("Array %s subscript out of bounds.", a_names[var_name]); else { @@ -627,7 +627,7 @@ load_array (var_name) if (!check_stack(1)) return; index = num2long (ex_stack->s_num); if (index < 0 || index > BC_DIM_MAX || - (index == 0 && !is_zero(ex_stack->s_num))) + (index == 0 && !is_zero(ex_stack->s_num))) rt_error ("Array %s subscript out of bounds.", a_names[var_name]); else { @@ -659,7 +659,7 @@ decr_var (var_name) else rt_warn ("ibase too small in --"); break; - + case 1: /* obase */ if (o_base > 2) o_base--; @@ -696,7 +696,7 @@ decr_array (var_name) if (!check_stack (1)) return; index = num2long (ex_stack->s_num); if (index < 0 || index > BC_DIM_MAX || - (index == 0 && !is_zero (ex_stack->s_num))) + (index == 0 && !is_zero (ex_stack->s_num))) rt_error ("Array %s subscript out of bounds.", a_names[var_name]); else { @@ -765,7 +765,7 @@ incr_array (var_name) if (!check_stack (1)) return; index = num2long (ex_stack->s_num); if (index < 0 || index > BC_DIM_MAX || - (index == 0 && !is_zero (ex_stack->s_num))) + (index == 0 && !is_zero (ex_stack->s_num))) rt_error ("Array %s subscript out of bounds.", a_names[var_name]); else { @@ -809,7 +809,7 @@ auto_var (name) a_temp->a_value = NULL; a_temp->a_param = FALSE; arrays[ix] = a_temp; - } + } } @@ -877,7 +877,7 @@ pop_vars (list) } free (a_temp); } - } + } list = list->next; } } @@ -900,7 +900,7 @@ process_params (pc, func) bc_var *v_temp; bc_var_array *a_src, *a_dest; bc_num *n_temp; - + /* Get the parameter names from the function. */ params = functions[func].f_params; @@ -922,17 +922,17 @@ process_params (pc, func) if ((ch == '1') && (params->av_name < 0)) { /* The variables is an array variable. */ - + /* Compute source index and make sure some structure exists. */ ix = (int) num2long (ex_stack->s_num); - n_temp = get_array_num (ix, 0); - + n_temp = get_array_num (ix, 0); + /* Push a new array and Compute Destination index */ - auto_var (params->av_name); + auto_var (params->av_name); ix1 = -params->av_name; /* Set up the correct pointers in the structure. */ - if (ix == ix1) + if (ix == ix1) a_src = arrays[ix]->a_next; else a_src = arrays[ix]; @@ -962,6 +962,6 @@ process_params (pc, func) } params = params->next; } - if (params != NULL) + if (params != NULL) rt_error ("Parameter number mismatch"); } diff --git a/gnu/usr.bin/bc/util.c b/gnu/usr.bin/bc/util.c index 954c719..5a01803 100644 --- a/gnu/usr.bin/bc/util.c +++ b/gnu/usr.bin/bc/util.c @@ -23,7 +23,7 @@ Computer Science Department, 9062 Western Washington University Bellingham, WA 98226-9062 - + *************************************************************************/ @@ -62,7 +62,7 @@ nextarg (args, val) temp = (arg_list *) bc_malloc (sizeof (arg_list)); temp->av_name = val; temp->next = args; - + return (temp); } @@ -102,7 +102,7 @@ make_arg_str (args, len, commas) } /* Add the current number to the end of the string. */ - if (len != 1 && commas) + if (len != 1 && commas) sprintf (sval, "%d,", args->av_name); else sprintf (sval, "%d", args->av_name); @@ -115,7 +115,7 @@ arg_str (args, commas) arg_list *args; int commas; { - if (arglist2 != NULL) + if (arglist2 != NULL) free (arglist2); arglist2 = arglist1; arglist1 = make_arg_str (args, 1, commas); @@ -128,9 +128,9 @@ arg_str (args, commas) void free_args (args) arg_list *args; -{ +{ arg_list *temp; - + temp = args; while (temp != NULL) { @@ -160,7 +160,7 @@ check_params ( params, autos ) tmp2 = tmp1->next; while (tmp2 != NULL) { - if (tmp2->av_name == tmp1->av_name) + if (tmp2->av_name == tmp1->av_name) yyerror ("duplicate parameter names"); tmp2 = tmp2->next; } @@ -179,7 +179,7 @@ check_params ( params, autos ) tmp2 = tmp1->next; while (tmp2 != NULL) { - if (tmp2->av_name == tmp1->av_name) + if (tmp2->av_name == tmp1->av_name) yyerror ("duplicate auto variable names"); tmp2 = tmp2->next; } @@ -196,7 +196,7 @@ check_params ( params, autos ) tmp2 = autos; while (tmp2 != NULL) { - if (tmp2->av_name == tmp1->av_name) + if (tmp2->av_name == tmp1->av_name) yyerror ("variable in both parameter and auto lists"); tmp2 = tmp2->next; } @@ -216,7 +216,7 @@ init_gen () continue_label = 0; next_label = 1; out_count = 2; - if (compile_only) + if (compile_only) printf ("@i"); else init_load (); @@ -257,7 +257,7 @@ run_code() { if (compile_only) { - printf ("@r\n"); + printf ("@r\n"); out_count = 0; } else @@ -310,7 +310,7 @@ find_id (tree, id) char *id; { int cmp_result; - + /* Check for an empty tree. */ if (tree == NULL) return NULL; @@ -322,7 +322,7 @@ find_id (tree, id) else if (cmp_result < 0) return find_id (tree->left, id); else - return find_id (tree->right, id); + return find_id (tree->right, id); } @@ -355,7 +355,7 @@ int insert_id_rec (root, new_id) { /* The height increased. */ (*root)->balance --; - + switch ((*root)->balance) { case 0: /* no height increase. */ @@ -399,8 +399,8 @@ int insert_id_rec (root, new_id) } (*root)->balance = 0; } - } - } + } + } } else { @@ -452,10 +452,10 @@ int insert_id_rec (root, new_id) } (*root)->balance = 0; } - } - } + } + } } - + /* If we fall through to here, the tree did not grow in height. */ return (FALSE); } @@ -502,7 +502,7 @@ lookup (name, namekind) /* Return the correct value. */ switch (namekind) { - + case ARRAY: /* ARRAY variable numbers are returned as negative numbers. */ if (id->a_name != 0) @@ -560,7 +560,7 @@ lookup (name, namekind) /* Print the welcome banner. */ -void +void welcome() { printf ("This is free software with ABSOLUTELY NO WARRANTY.\n"); @@ -570,7 +570,7 @@ welcome() /* Print out the warranty information. */ -void +void warranty(prefix) char *prefix; { @@ -604,7 +604,7 @@ limits() printf ("Number of vars = %ld\n", (long) MAX_STORE); #ifdef OLD_EQ_OP printf ("Old assignment operatiors are valid. (=-, =+, ...)\n"); -#endif +#endif } /* bc_malloc will check the return value so all other places do not @@ -657,7 +657,7 @@ yyerror (str, va_alist) char *name; va_list args; -#ifndef VARARGS +#ifndef VARARGS va_start (args, str); #else va_start (args); @@ -679,7 +679,7 @@ yyerror (str, va_alist) #ifndef VARARGS #ifdef __STDC__ -void +void warn (char *mesg, ...) #else void @@ -695,7 +695,7 @@ warn (mesg, va_alist) char *name; va_list args; -#ifndef VARARGS +#ifndef VARARGS va_start (args, mesg); #else va_start (args); @@ -745,14 +745,14 @@ rt_error (mesg, va_alist) va_list args; char error_mesg [255]; -#ifndef VARARGS +#ifndef VARARGS va_start (args, mesg); #else va_start (args); #endif vsprintf (error_mesg, mesg, args); va_end (args); - + fprintf (stderr, "Runtime error (func=%s, adr=%d): %s\n", f_names[pc.pc_func], pc.pc_addr, error_mesg); runtime_error = TRUE; @@ -781,7 +781,7 @@ rt_warn (mesg, va_alist) va_list args; char error_mesg [255]; -#ifndef VARARGS +#ifndef VARARGS va_start (args, mesg); #else va_start (args); diff --git a/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c b/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c index ef7a98a..90b3236 100644 --- a/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c +++ b/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: freebsd-nat.c,v 1.5 1995/04/26 01:01:07 jkh Exp $ + $Id: freebsd-nat.c,v 1.6 1995/05/09 13:59:22 rgrimes Exp $ */ #include <sys/types.h> @@ -32,7 +32,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. /* this table must line up with REGISTER_NAMES in tm-i386v.h */ /* symbols like 'tEAX' come from <machine/reg.h> */ -static int tregmap[] = +static int tregmap[] = { tEAX, tECX, tEDX, tEBX, tESP, tEBP, tESI, tEDI, @@ -64,7 +64,7 @@ i387_to_double (from, to) /* push extended mode on 387 stack, then pop in double mode * * first, set exception masks so no error is generated - - * number will be rounded to inf or 0, if necessary + * number will be rounded to inf or 0, if necessary */ asm ("pushl %eax"); /* grab a stack slot */ asm ("fstcw (%esp)"); /* get 387 control word */ @@ -72,14 +72,14 @@ i387_to_double (from, to) asm ("orl $0x3f,%eax"); /* mask all exceptions */ asm ("pushl %eax"); asm ("fldcw (%esp)"); /* load new value into 387 */ - + asm ("movl 8(%ebp),%eax"); asm ("fldt (%eax)"); /* push extended number on 387 stack */ asm ("fwait"); asm ("movl 12(%ebp),%eax"); asm ("fstpl (%eax)"); /* pop double */ asm ("fwait"); - + asm ("popl %eax"); /* flush modified control word */ asm ("fnclex"); /* clear exceptions */ asm ("fldcw (%esp)"); /* restore original control word */ @@ -105,7 +105,7 @@ double_to_i387 (from, to) } #endif -struct env387 +struct env387 { unsigned short control; unsigned short r0; @@ -128,7 +128,7 @@ unsigned int control; { printf ("control 0x%04x: ", control); printf ("compute to "); - switch ((control >> 8) & 3) + switch ((control >> 8) & 3) { case 0: printf ("24 bits; "); break; case 1: printf ("(bad); "); break; @@ -136,14 +136,14 @@ unsigned int control; case 3: printf ("64 bits; "); break; } printf ("round "); - switch ((control >> 10) & 3) + switch ((control >> 10) & 3) { case 0: printf ("NEAREST; "); break; case 1: printf ("DOWN; "); break; case 2: printf ("UP; "); break; case 3: printf ("CHOP; "); break; } - if (control & 0x3f) + if (control & 0x3f) { printf ("mask:"); if (control & 0x0001) printf (" INVALID"); @@ -164,7 +164,7 @@ print_387_status_word (status) unsigned int status; { printf ("status 0x%04x: ", status); - if (status & 0xff) + if (status & 0xff) { printf ("exceptions:"); if (status & 0x0001) printf (" INVALID"); @@ -181,7 +181,7 @@ print_387_status_word (status) (status & 0x0400) != 0, (status & 0x0200) != 0, (status & 0x0100) != 0); - + printf ("top %d\n", (status >> 11) & 7); } @@ -195,43 +195,43 @@ print_387_status (status, ep) int top; int fpreg; unsigned char *p; - + bothstatus = ((status != 0) && (ep->status != 0)); - if (status != 0) + if (status != 0) { if (bothstatus) printf ("u: "); print_387_status_word ((unsigned int)status); } - - if (ep->status != 0) + + if (ep->status != 0) { if (bothstatus) printf ("e: "); print_387_status_word ((unsigned int)ep->status); } - + print_387_control_word ((unsigned int)ep->control); printf ("opcode 0x%x; ", ep->opcode); printf ("pc 0x%x:0x%x; ", ep->code_seg, ep->eip); printf ("operand 0x%x:0x%x\n", ep->operand_seg, ep->operand); - + top = (ep->status >> 11) & 7; - + printf (" regno tag msb lsb value\n"); - for (fpreg = 7; fpreg >= 0; fpreg--) + for (fpreg = 7; fpreg >= 0; fpreg--) { int st_regno; double val; - + /* The physical regno `fpreg' is only relevant as an index into the * tag word. Logical `%st' numbers are required for indexing ep->regs. */ st_regno = (fpreg + 8 - top) & 7; printf ("%%st(%d) %s ", st_regno, fpreg == top ? "=>" : " "); - - switch ((ep->tag >> (fpreg * 2)) & 3) + + switch ((ep->tag >> (fpreg * 2)) & 3) { case 0: printf ("valid "); break; case 1: printf ("zero "); break; @@ -240,7 +240,7 @@ print_387_status (status, ep) } for (i = 9; i >= 0; i--) printf ("%02x", ep->regs[st_regno][i]); - + i387_to_double (ep->regs[st_regno], (char *)&val); printf (" %g\n", val); } @@ -261,25 +261,25 @@ i386_float_info () /*extern int corechan;*/ int skip; extern int inferior_pid; - + uaddr = (char *)&U_FPSTATE(u) - (char *)&u; - if (inferior_pid) + if (inferior_pid) { int *ip; - + rounded_addr = uaddr & -sizeof (int); rounded_size = (((uaddr + sizeof (struct fpstate)) - uaddr) + sizeof (int) - 1) / sizeof (int); skip = uaddr - rounded_addr; - + ip = (int *)buf; - for (i = 0; i < rounded_size; i++) + for (i = 0; i < rounded_size; i++) { *ip++ = ptrace (PT_READ_U, inferior_pid, (caddr_t)rounded_addr, 0); rounded_addr += sizeof (int); } - } - else + } + else { #if 1 printf("float info: can't do a core file (yet)\n"); @@ -287,12 +287,12 @@ i386_float_info () #else if (lseek (corechan, uaddr, 0) < 0) perror_with_name ("seek on core file"); - if (myread (corechan, buf, sizeof (struct fpstate)) < 0) + if (myread (corechan, buf, sizeof (struct fpstate)) < 0) perror_with_name ("read from core file"); skip = 0; #endif } - + fpstatep = (struct fpstate *)(buf + skip); print_387_status (fpstatep->sv_ex_sw, (struct env387 *)fpstatep); } @@ -582,7 +582,7 @@ CORE_ADDR uaddr; } /* - * read len bytes from kernel virtual address 'addr' into local + * read len bytes from kernel virtual address 'addr' into local * buffer 'buf'. Return numbert of bytes if read ok, 0 otherwise. On read * errors, portion of buffer not read is zeroed. */ diff --git a/gnu/usr.bin/cc/c++/g++.c b/gnu/usr.bin/cc/c++/g++.c index c8e205c..0991b35 100644 --- a/gnu/usr.bin/cc/c++/g++.c +++ b/gnu/usr.bin/cc/c++/g++.c @@ -258,7 +258,7 @@ choose_temp_base () base = choose_temp_base_try ("/usr/tmp", base); base = choose_temp_base_try ("/tmp", base); - /* If all else fails, use the current directory! */ + /* If all else fails, use the current directory! */ if (base == (char *)0) base = "./"; @@ -325,7 +325,7 @@ run_dos (program, argv) i = system (scmd); remove (rf); - + if (i == -1) perror_exec (program); } @@ -425,7 +425,7 @@ main (argc, argv) if (argc == 2) { /* If they only gave us `-v', don't try to link - in libg++. */ + in libg++. */ added--; library = NULL; } @@ -451,7 +451,7 @@ main (argc, argv) } else { - int len; + int len; if (saw_speclang) { diff --git a/gnu/usr.bin/cc/cc/gcc.c b/gnu/usr.bin/cc/cc/gcc.c index fe452d1..152c579 100644 --- a/gnu/usr.bin/cc/cc/gcc.c +++ b/gnu/usr.bin/cc/cc/gcc.c @@ -1597,16 +1597,16 @@ choose_temp_base () base = choose_temp_base_try (P_tmpdir, base); #endif - base = choose_temp_base_try (concat4 (dir_separator_str, "usr", - dir_separator_str, "tmp"), + base = choose_temp_base_try (concat4 (dir_separator_str, "usr", + dir_separator_str, "tmp"), base); base = choose_temp_base_try (concat (dir_separator_str, "tmp"), base); - - /* If all else fails, use the current directory! */ + + /* If all else fails, use the current directory! */ if (base == (char *)0) base = concat(".", dir_separator_str); len = strlen (base); - temp_filename = xmalloc (len + strlen (concat (dir_separator_str, + temp_filename = xmalloc (len + strlen (concat (dir_separator_str, "ccXXXXXX")) + 1); strcpy (temp_filename, base); if (len > 0 && temp_filename[len-1] != '/' @@ -1699,7 +1699,7 @@ putenv_from_prefixes (paths, env_var) { if (!first_time) obstack_1grow (&collect_obstack, PATH_SEPARATOR); - + first_time = FALSE; obstack_grow (&collect_obstack, pprefix->prefix, len); obstack_grow (&collect_obstack, machine_suffix, suffix_len); @@ -1711,7 +1711,7 @@ putenv_from_prefixes (paths, env_var) { if (!first_time) obstack_1grow (&collect_obstack, PATH_SEPARATOR); - + first_time = FALSE; obstack_grow (&collect_obstack, pprefix->prefix, len); obstack_grow (&collect_obstack, just_machine_suffix, @@ -2016,7 +2016,7 @@ pexecute (search_flag, program, argv, not_last) remove (rf); #endif - + if (i == -1) { perror_exec (program); @@ -2737,7 +2737,7 @@ process_command (argc, argv) add_prefix (&exec_prefixes, "/usr/libexec/", 0, 0, NULL_PTR); add_prefix (&exec_prefixes, "/usr/bin/", 0, 0, NULL_PTR); - tooldir_prefix = concat3 (tooldir_base_prefix, spec_machine, + tooldir_prefix = concat3 (tooldir_base_prefix, spec_machine, dir_separator_str); /* If tooldir is relative, base it on exec_prefixes. A relative @@ -2756,17 +2756,17 @@ process_command (argc, argv) spec_version, dir_separator_str, tooldir_prefix); add_prefix (&exec_prefixes, - concat3 (gcc_exec_tooldir_prefix, "bin", + concat3 (gcc_exec_tooldir_prefix, "bin", dir_separator_str), 0, 0, NULL_PTR); add_prefix (&startfile_prefixes, - concat3 (gcc_exec_tooldir_prefix, "lib", + concat3 (gcc_exec_tooldir_prefix, "lib", dir_separator_str), 0, 0, NULL_PTR); } tooldir_prefix = concat6 (standard_exec_prefix, spec_machine, - dir_separator_str, spec_version, + dir_separator_str, spec_version, dir_separator_str, tooldir_prefix); } @@ -4178,11 +4178,11 @@ is_directory (path1, path2, linker) /* Exclude directories that the linker is known to search. */ if (linker && ((cp - path == 6 - && strcmp (path, concat4 (dir_separator_str, "lib", + && strcmp (path, concat4 (dir_separator_str, "lib", dir_separator_str, ".")) == 0) || (cp - path == 10 - && strcmp (path, concat6 (dir_separator_str, "usr", - dir_separator_str, "lib", + && strcmp (path, concat6 (dir_separator_str, "usr", + dir_separator_str, "lib", dir_separator_str, ".")) == 0))) return 0; @@ -4309,7 +4309,7 @@ main (argc, argv) machine_suffix, standard_startfile_prefix), 0, 0, NULL_PTR); - } + } } @@ -5024,7 +5024,7 @@ set_multilib_dir () } ++p; - } + } } /* Print out the multiple library subdirectory selection diff --git a/gnu/usr.bin/cc/cc1/c-aux-info.c b/gnu/usr.bin/cc/cc1/c-aux-info.c index 0e7df9b..669e39f 100644 --- a/gnu/usr.bin/cc/cc1/c-aux-info.c +++ b/gnu/usr.bin/cc/cc1/c-aux-info.c @@ -474,7 +474,7 @@ gen_type (ret_val, t, style) case TYPE_DECL: data_type = IDENTIFIER_POINTER (DECL_NAME (t)); break; - + case INTEGER_TYPE: data_type = IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (t))); /* Normally, `unsigned' is part of the deal. Not so if it comes diff --git a/gnu/usr.bin/cc/cc1/c-decl.c b/gnu/usr.bin/cc/cc1/c-decl.c index 427ff3a..afdd1d6 100644 --- a/gnu/usr.bin/cc/cc1/c-decl.c +++ b/gnu/usr.bin/cc/cc1/c-decl.c @@ -348,7 +348,7 @@ struct binding_level /* Nonzero means make a BLOCK if this level has any subblocks. */ char keep_if_subblocks; - /* Number of decls in `names' that have incomplete + /* Number of decls in `names' that have incomplete structure or union types. */ int n_incomplete; @@ -359,7 +359,7 @@ struct binding_level }; #define NULL_BINDING_LEVEL (struct binding_level *) NULL - + /* The binding level currently in effect. */ static struct binding_level *current_binding_level; @@ -388,7 +388,7 @@ static int keep_next_level_flag; if it has subblocks. */ static int keep_next_if_subblocks; - + /* The chain of outer levels of label scopes. This uses the same data structure used for binding levels, but it works differently: each link in the chain records @@ -540,7 +540,7 @@ int dollars_in_ident = DOLLARS_IN_IDENTIFIERS > 1; /* Decode the string P as a language-specific option for C. Return 1 if it is recognized (and handle it); return 0 if not recognized. */ - + int c_decode_option (p) char *p; @@ -756,7 +756,7 @@ print_lang_identifier (file, node, indent) /* Hook called at end of compilation to assume 1 elt for a top-level array decl that wasn't complete before. */ - + void finish_incomplete_decl (decl) tree decl; @@ -1212,7 +1212,7 @@ pop_label_level () DECL_NAME (TREE_VALUE (link))); } else if (warn_unused && !TREE_USED (TREE_VALUE (link))) - warning_with_decl (TREE_VALUE (link), + warning_with_decl (TREE_VALUE (link), "label `%s' defined but not used"); IDENTIFIER_LABEL_VALUE (DECL_NAME (TREE_VALUE (link))) = 0; @@ -1395,7 +1395,7 @@ duplicate_decls (newdecl, olddecl) tree newtype = build_function_type (newreturntype, TYPE_ARG_TYPES (TREE_TYPE (olddecl))); - + types_match = comptypes (TREE_TYPE (newdecl), newtype); if (types_match) TREE_TYPE (olddecl) = newtype; @@ -1414,10 +1414,10 @@ duplicate_decls (newdecl, olddecl) the return type of olddecl's function type. */ tree newtype = build_function_type (TREE_TYPE (TREE_TYPE (olddecl)), - tree_cons (NULL_TREE, + tree_cons (NULL_TREE, TREE_VALUE (TYPE_ARG_TYPES (TREE_TYPE (newdecl))), TREE_CHAIN (TYPE_ARG_TYPES (TREE_TYPE (olddecl))))); - + types_match = comptypes (TREE_TYPE (newdecl), newtype); if (types_match) TREE_TYPE (olddecl) = newtype; @@ -1656,7 +1656,7 @@ duplicate_decls (newdecl, olddecl) push_obstacks_nochange (); end_temporary_allocation (); } - + /* Merge the data types specified in the two decls. */ if (TREE_CODE (newdecl) != FUNCTION_DECL || !DECL_BUILT_IN (olddecl)) TREE_TYPE (newdecl) @@ -2043,7 +2043,7 @@ pushdecl (x) if (b == global_binding_level) { /* Install a global value. */ - + /* If the first global decl has external linkage, warn if we later see static one. */ if (IDENTIFIER_GLOBAL_VALUE (name) == 0 && TREE_PUBLIC (x)) @@ -2452,7 +2452,7 @@ shadow_label (name) for (dup = named_labels; dup; dup = TREE_CHAIN (dup)) if (TREE_VALUE (dup) == decl) { - error ("duplicate label declaration `%s'", + error ("duplicate label declaration `%s'", IDENTIFIER_POINTER (name)); error_with_decl (TREE_VALUE (dup), "this is a previous declaration"); @@ -2993,14 +2993,14 @@ init_decl_processing () BUILT_IN_CONSTANT_P, NULL_PTR); builtin_function ("__builtin_return_address", - build_function_type (ptr_type_node, + build_function_type (ptr_type_node, tree_cons (NULL_TREE, unsigned_type_node, endlink)), BUILT_IN_RETURN_ADDRESS, NULL_PTR); builtin_function ("__builtin_frame_address", - build_function_type (ptr_type_node, + build_function_type (ptr_type_node, tree_cons (NULL_TREE, unsigned_type_node, endlink)), @@ -3099,11 +3099,11 @@ init_decl_processing () BUILT_IN_STRCPY, "strcpy"); builtin_function ("__builtin_strlen", strlen_ftype, BUILT_IN_STRLEN, "strlen"); - builtin_function ("__builtin_fsqrt", double_ftype_double, + builtin_function ("__builtin_fsqrt", double_ftype_double, BUILT_IN_FSQRT, "sqrt"); - builtin_function ("__builtin_sin", double_ftype_double, + builtin_function ("__builtin_sin", double_ftype_double, BUILT_IN_SIN, "sin"); - builtin_function ("__builtin_cos", double_ftype_double, + builtin_function ("__builtin_cos", double_ftype_double, BUILT_IN_COS, "cos"); /* In an ANSI C program, it is okay to supply built-in meanings @@ -4515,7 +4515,7 @@ grokdeclarator (declarator, declspecs, decl_context, initialized) /* Omit the arg types if -traditional, since the arg types and the list links might not be permanent. */ type = build_function_type (type, - flag_traditional + flag_traditional ? NULL_TREE : arg_types); #endif /* ANSI seems to say that `const int foo ();' @@ -5459,7 +5459,7 @@ finish_struct (t, fieldlist) else { register tree y = fieldlist; - + while (1) { if (DECL_NAME (y) == DECL_NAME (TREE_CHAIN (x))) @@ -6577,7 +6577,7 @@ combine_parm_decls (specparms, parmlist, void_at_end) types = saveable_tree_cons (NULL_TREE, TREE_TYPE (parm), types); } } - + if (void_at_end) return saveable_tree_cons (parmdecls, nonparms, nreverse (saveable_tree_cons (NULL_TREE, void_type_node, types))); diff --git a/gnu/usr.bin/cc/cc1/c-iterate.c b/gnu/usr.bin/cc/cc1/c-iterate.c index 99f9a79..14d4bab 100644 --- a/gnu/usr.bin/cc/cc1/c-iterate.c +++ b/gnu/usr.bin/cc/cc1/c-iterate.c @@ -67,7 +67,7 @@ static char *ixp_firstobj; The sublevel list is not changed at this point. -- On "})" the list for the current level is appended to the sublevel - list. + list. -- On ";" sublevel lists are appended to the current level lists. The reason is this: if they have not been superseded by the @@ -155,7 +155,7 @@ iterator_expand (stmt) } -static void +static void expand_stmt_with_iterators_1 (stmt, iter_list) tree stmt, iter_list; { @@ -254,7 +254,7 @@ collect_iterators (exp, list) case RTL_EXPR: return list; } - + for (i = 0; i < num_args; i++) list = collect_iterators (TREE_OPERAND (exp, i), list); return list; @@ -363,7 +363,7 @@ static void isn_append (x, y) struct iter_stack_node *x, *y; { - if (x->first == 0) + if (x->first == 0) return; if (y->first == 0) @@ -408,7 +408,7 @@ void push_iterator_stack () { struct iter_stack_node *new_top - = (struct iter_stack_node*) + = (struct iter_stack_node*) obstack_alloc (&ixp_obstack, sizeof (struct iter_stack_node)); new_top->first = 0; @@ -442,7 +442,7 @@ add_ixpansion (idecl, pro_start, pro_end, epi_start, epi_end) rtx pro_start, pro_end, epi_start, epi_end; { struct ixpansion* newix; - + /* Do nothing if we are not inside "({...})", as in that case this expansion can't need subsequent RTL modification. */ if (iter_stack == 0) @@ -490,18 +490,18 @@ delete_ixpansion (idecl) for (insn = NEXT_INSN (ix->ixprologue_start); insn != ix->ixprologue_end; - insn = NEXT_INSN (insn)) + insn = NEXT_INSN (insn)) delete_insn (insn); for (insn = NEXT_INSN (ix->ixepilogue_start); insn != ix->ixepilogue_end; - insn = NEXT_INSN (insn)) + insn = NEXT_INSN (insn)) delete_insn (insn); } /* Delete this ixpansion from sublevel_ixpansions. */ if (previx) previx->next = ix->next; - else + else sublevel_ixpansions.first = ix->next; if (sublevel_ixpansions.last == ix) sublevel_ixpansions.last = previx; @@ -563,7 +563,7 @@ pixl (head) fprintf (stderr, "> "); if (head == 0) fprintf (stderr, "(empty)"); - + for (current=head; current; current = next) { tree node = current->ixdecl; diff --git a/gnu/usr.bin/cc/cc1/c-lang.c b/gnu/usr.bin/cc/cc1/c-lang.c index 8b46b3c..eb3ce7b 100644 --- a/gnu/usr.bin/cc/cc1/c-lang.c +++ b/gnu/usr.bin/cc/cc1/c-lang.c @@ -25,7 +25,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* Each of the functions defined here is an alternative to a function in objc-actions.c. */ - + int lang_decode_option (p) char *p; diff --git a/gnu/usr.bin/cc/cc1/c-lex.c b/gnu/usr.bin/cc/cc1/c-lex.c index 17d50be..6806b6f 100644 --- a/gnu/usr.bin/cc/cc1/c-lex.c +++ b/gnu/usr.bin/cc/cc1/c-lex.c @@ -137,7 +137,7 @@ remember_protocol_qualifiers () else if (wordlist[i].rid == RID_BYCOPY) wordlist[i].name = "bycopy"; else if (wordlist[i].rid == RID_ONEWAY) - wordlist[i].name = "oneway"; + wordlist[i].name = "oneway"; } void @@ -878,7 +878,7 @@ struct try_type char long_long_flag; }; -struct try_type type_sequence[] = +struct try_type type_sequence[] = { { &integer_type_node, 0, 0, 0}, { &unsigned_type_node, 1, 0, 0}, @@ -1073,7 +1073,7 @@ yylex () && TREE_CODE (DECL_INITIAL (lastiddecl)) == STRING_CST) { tree stringval = DECL_INITIAL (lastiddecl); - + /* Copy the string value so that we won't clobber anything if we put something in the TREE_CHAIN of this one. */ yylval.ttype = build_string (TREE_STRING_LENGTH (stringval), @@ -1525,7 +1525,7 @@ yylex () << (i * HOST_BITS_PER_CHAR)); low |= (HOST_WIDE_INT) parts[i] << (i * HOST_BITS_PER_CHAR); } - + yylval.ttype = build_int_2 (low, high); TREE_TYPE (yylval.ttype) = long_long_unsigned_type_node; diff --git a/gnu/usr.bin/cc/cc1/c-parse.c b/gnu/usr.bin/cc/cc1/c-parse.c index 8a6465c..19b7718 100644 --- a/gnu/usr.bin/cc/cc1/c-parse.c +++ b/gnu/usr.bin/cc/cc1/c-parse.c @@ -2940,7 +2940,7 @@ case 308: break;} case 309: #line 1550 "c-parse.y" -{ +{ /* Start the loop. Doing this after parsing all the expressions ensures we will end the loop. */ expand_start_loop_continue_elsewhere (1); @@ -3072,7 +3072,7 @@ case 325: #line 1665 "c-parse.y" { /* The value returned by this action is */ - /* 1 if everything is OK */ + /* 1 if everything is OK */ /* 0 in case of error or already bound iterator */ yyval.itype = 0; diff --git a/gnu/usr.bin/cc/cc1/c-typeck.c b/gnu/usr.bin/cc/cc1/c-typeck.c index c40d08a..edb9ae4 100644 --- a/gnu/usr.bin/cc/cc1/c-typeck.c +++ b/gnu/usr.bin/cc/cc1/c-typeck.c @@ -210,7 +210,7 @@ common_type (t1, t2) { /* Pick the longest list, and hang on the other list. */ - + if (list_length (a1) < list_length (a2)) attributes = a2, a2 = a1; @@ -387,7 +387,7 @@ common_type (t1, t2) TREE_VALUE (n) = TREE_VALUE (p1); goto parm_done; } - + /* Given wait (union {union wait *u; int *i} *) and wait (union wait *), prefer union wait * as type of parm. */ @@ -450,7 +450,7 @@ comptypes (type1, type2) if (t1 == t2 || TREE_CODE (t1) == ERROR_MARK || TREE_CODE (t2) == ERROR_MARK) return 1; - /* Treat an enum type as the integer type of the same width and + /* Treat an enum type as the integer type of the same width and signedness. */ if (TREE_CODE (t1) == ENUMERAL_TYPE) @@ -566,7 +566,7 @@ comp_target_types (ttl, ttr) /* Return 1 if two function types F1 and F2 are compatible. If either type specifies no argument types, the other must specify a fixed number of self-promoting arg types. - Otherwise, if one type specifies only the number of arguments, + Otherwise, if one type specifies only the number of arguments, the other must specify that number of self-promoting arg types. Otherwise, the argument types must match. */ @@ -791,13 +791,13 @@ signed_or_unsigned_type (unsignedp, type) return type; if (TYPE_PRECISION (type) == TYPE_PRECISION (signed_char_type_node)) return unsignedp ? unsigned_char_type_node : signed_char_type_node; - if (TYPE_PRECISION (type) == TYPE_PRECISION (integer_type_node)) + if (TYPE_PRECISION (type) == TYPE_PRECISION (integer_type_node)) return unsignedp ? unsigned_type_node : integer_type_node; - if (TYPE_PRECISION (type) == TYPE_PRECISION (short_integer_type_node)) + if (TYPE_PRECISION (type) == TYPE_PRECISION (short_integer_type_node)) return unsignedp ? short_unsigned_type_node : short_integer_type_node; - if (TYPE_PRECISION (type) == TYPE_PRECISION (long_integer_type_node)) + if (TYPE_PRECISION (type) == TYPE_PRECISION (long_integer_type_node)) return unsignedp ? long_unsigned_type_node : long_integer_type_node; - if (TYPE_PRECISION (type) == TYPE_PRECISION (long_long_integer_type_node)) + if (TYPE_PRECISION (type) == TYPE_PRECISION (long_long_integer_type_node)) return (unsignedp ? long_long_unsigned_type_node : long_long_integer_type_node); return type; @@ -833,7 +833,7 @@ c_sizeof (type) } /* Convert in case a char is more than one unit. */ - t = size_binop (CEIL_DIV_EXPR, TYPE_SIZE (type), + t = size_binop (CEIL_DIV_EXPR, TYPE_SIZE (type), size_int (TYPE_PRECISION (char_type_node))); /* size_binop does not put the constant in range, so do it now. */ if (TREE_CODE (t) == INTEGER_CST && force_fit_type (t, 0)) @@ -856,7 +856,7 @@ c_sizeof_nowarn (type) return size_int (0); /* Convert in case a char is more than one unit. */ - t = size_binop (CEIL_DIV_EXPR, TYPE_SIZE (type), + t = size_binop (CEIL_DIV_EXPR, TYPE_SIZE (type), size_int (TYPE_PRECISION (char_type_node))); force_fit_type (t, 0); return t; @@ -884,7 +884,7 @@ c_size_in_bytes (type) } /* Convert in case a char is more than one unit. */ - t = size_binop (CEIL_DIV_EXPR, TYPE_SIZE (type), + t = size_binop (CEIL_DIV_EXPR, TYPE_SIZE (type), size_int (BITS_PER_UNIT)); force_fit_type (t, 0); return t; @@ -919,7 +919,7 @@ c_alignof_expr (expr) { if (TREE_CODE (expr) == VAR_DECL) return size_int (DECL_ALIGN (expr) / BITS_PER_UNIT); - + if (TREE_CODE (expr) == COMPONENT_REF && DECL_BIT_FIELD (TREE_OPERAND (expr, 1))) { @@ -929,13 +929,13 @@ c_alignof_expr (expr) else if (TREE_CODE (expr) == COMPONENT_REF && TREE_CODE (TREE_OPERAND (expr, 1)) == FIELD_DECL) return size_int (DECL_ALIGN (TREE_OPERAND (expr, 1)) / BITS_PER_UNIT); - + if (TREE_CODE (expr) == INDIRECT_REF) { tree t = TREE_OPERAND (expr, 0); tree best = t; int bestalign = TYPE_ALIGN (TREE_TYPE (TREE_TYPE (t))); - + while (TREE_CODE (t) == NOP_EXPR && TREE_CODE (TREE_TYPE (TREE_OPERAND (t, 0))) == POINTER_TYPE) { @@ -1112,7 +1112,7 @@ default_conversion (exp) If this component name is found indirectly within an anonymous union, store in *INDIRECT the component which directly contains that anonymous union. Otherwise, set *INDIRECT to 0. */ - + static tree lookup_field (type, component, indirect) tree type, component; @@ -1438,7 +1438,7 @@ build_array_ref (array, index) TREE_THIS_VOLATILE (rval) |= (TYPE_VOLATILE (TREE_TYPE (TREE_TYPE (array))) /* This was added by rms on 16 Nov 91. - It fixes vol struct foo *a; a->elts[1] + It fixes vol struct foo *a; a->elts[1] in an inline function. Hope it doesn't break something else. */ | TREE_THIS_VOLATILE (array)); @@ -1717,10 +1717,10 @@ convert_arguments (typelist, values, name, fundecl) } } - parmval = convert_for_assignment (type, val, + parmval = convert_for_assignment (type, val, (char *)0, /* arg passing */ fundecl, name, parmnum + 1); - + #ifdef PROMOTE_PROTOTYPES if ((TREE_CODE (type) == INTEGER_TYPE || TREE_CODE (type) == ENUMERAL_TYPE) @@ -2234,7 +2234,7 @@ build_binary_op (code, orig_op0, orig_op1, convert_p) { if (! comp_target_types (type0, type1)) pedwarn ("comparison of distinct pointer types lacks a cast"); - else if (pedantic + else if (pedantic && TREE_CODE (TREE_TYPE (type0)) == FUNCTION_TYPE) pedwarn ("ANSI C forbids ordered comparisons of pointers to functions"); result_type = common_type (type0, type1); @@ -2255,7 +2255,7 @@ build_binary_op (code, orig_op0, orig_op1, convert_p) else if ((TYPE_SIZE (TREE_TYPE (type0)) != 0) != (TYPE_SIZE (TREE_TYPE (type1)) != 0)) pedwarn ("comparison of complete and incomplete pointers"); - else if (pedantic + else if (pedantic && TREE_CODE (TREE_TYPE (type0)) == FUNCTION_TYPE) pedwarn ("ANSI C forbids ordered comparisons of pointers to functions"); result_type = integer_type_node; @@ -2424,7 +2424,7 @@ build_binary_op (code, orig_op0, orig_op1, convert_p) pass the copies by reference, then copy them back afterward. */ tree xop0 = op0, xop1 = op1, xresult_type = result_type; enum tree_code xresultcode = resultcode; - tree val + tree val = shorten_compare (&xop0, &xop1, &xresult_type, &xresultcode); if (val != 0) return val; @@ -2437,7 +2437,7 @@ build_binary_op (code, orig_op0, orig_op1, convert_p) tree op1_type = TREE_TYPE (orig_op1); int op0_unsigned = TREE_UNSIGNED (op0_type); int op1_unsigned = TREE_UNSIGNED (op1_type); - + /* Give warnings for comparisons between signed and unsigned quantities that will fail. Do not warn if the signed quantity is an unsuffixed integer literal (or some static constant @@ -2484,9 +2484,9 @@ build_binary_op (code, orig_op0, orig_op1, convert_p) if (! converted) { if (TREE_TYPE (op0) != result_type) - op0 = convert (result_type, op0); + op0 = convert (result_type, op0); if (TREE_TYPE (op1) != result_type) - op1 = convert (result_type, op1); + op1 = convert (result_type, op1); } { @@ -2730,7 +2730,7 @@ build_unary_op (code, xarg, noconvert) return fold (build1 (IMAGPART_EXPR, TREE_TYPE (TREE_TYPE (arg)), arg)); else return convert (TREE_TYPE (arg), integer_zero_node); - + case PREINCREMENT_EXPR: case POSTINCREMENT_EXPR: case PREDECREMENT_EXPR: @@ -2853,7 +2853,7 @@ build_unary_op (code, xarg, noconvert) /* Report a read-only lvalue. */ if (TREE_READONLY (arg)) - readonly_warning (arg, + readonly_warning (arg, ((code == PREINCREMENT_EXPR || code == POSTINCREMENT_EXPR) ? "increment" : "decrement")); @@ -3078,7 +3078,7 @@ lvalue_or_else (ref, string) but which we can accept as lvalues. If ARG is not a kind of expression we can handle, return zero. */ - + static tree unary_complex_lvalue (code, arg) enum tree_code code; @@ -3292,7 +3292,7 @@ build_conditional_expr (ifexp, op1, op2) code1 = TREE_CODE (type1); type2 = TREE_TYPE (op2); code2 = TREE_CODE (type2); - + /* Quickly detect the usual case where op1 and op2 have the same type after promotion. */ if (TYPE_MAIN_VARIANT (type1) == TYPE_MAIN_VARIANT (type2)) @@ -3391,7 +3391,7 @@ build_conditional_expr (ifexp, op1, op2) op1 = convert_and_check (result_type, op1); if (result_type != TREE_TYPE (op2)) op2 = convert_and_check (result_type, op2); - + #if 0 if (code1 == RECORD_TYPE || code1 == UNION_TYPE) { @@ -3428,7 +3428,7 @@ build_conditional_expr (ifexp, op1, op2) } } #endif /* 0 */ - + if (TREE_CODE (ifexp) == INTEGER_CST) return pedantic_non_lvalue (integer_zerop (ifexp) ? op2 : op1); @@ -3494,7 +3494,7 @@ build_c_cast (type, expr) tree expr; { register tree value = expr; - + if (type == error_mark_node || expr == error_mark_node) return error_mark_node; type = TYPE_MAIN_VARIANT (type); @@ -3692,7 +3692,7 @@ build_modify_expr (lhs, modifycode, rhs) return error_mark_node; return build (COMPOUND_EXPR, lhstype, TREE_OPERAND (lhs, 0), newrhs); - + /* Handle (a ? b : c) used as an "lvalue". */ case COND_EXPR: pedantic_lvalue_warning (COND_EXPR); @@ -4053,7 +4053,7 @@ convert_for_assignment (type, rhs, errtype, fundecl, funname, parmnum) if (funname) { tree selector = maybe_building_objc_message_expr (); - + if (selector && parmnum > 2) error ("incompatible type for argument %d of `%s'", parmnum - 2, IDENTIFIER_POINTER (selector)); @@ -4090,7 +4090,7 @@ warn_for_assignment (msg, opname, function, argnum) if (opname == 0) { tree selector = maybe_building_objc_message_expr (); - + if (selector && argnum > 2) { function = selector; @@ -4136,7 +4136,7 @@ initializer_constant_valid_p (value, endtype) return initializer_constant_valid_p (TREE_VALUE (CONSTRUCTOR_ELTS (value)), endtype); - + return TREE_STATIC (value) ? null_pointer_node : 0; case INTEGER_CST: @@ -4407,7 +4407,7 @@ push_string (string) static void push_member_name (decl) tree decl; - + { char *string = DECL_NAME (decl) ? IDENTIFIER_POINTER (DECL_NAME (decl)) : "<anonymous>"; @@ -5331,7 +5331,7 @@ check_init_type_bitfields (type) check_init_type_bitfields (TREE_TYPE (type)); } -/* At the end of an implicit or explicit brace level, +/* At the end of an implicit or explicit brace level, finish up that level of constructor. If we were outputting the elements as they are read, return 0 from inner levels (process_init_element ignores that), @@ -5373,7 +5373,7 @@ pop_init_level (implicit) #endif /* Pad out the end of the structure. */ - + if (p->replacement_value) { /* If this closes a superfluous brace pair, @@ -5520,7 +5520,7 @@ pop_init_level (implicit) resume_momentary (momentary); } - + constructor_type = p->type; constructor_fields = p->fields; constructor_index = p->index; @@ -5829,7 +5829,7 @@ output_pending_init_elements (all) If we find an element that should be output now, output it. Otherwise, set NEXT to the element that comes first among those still pending. */ - + next = 0; for (tail = constructor_pending_elts; tail; tail = TREE_CHAIN (tail)) diff --git a/gnu/usr.bin/cc/cc1plus/call.c b/gnu/usr.bin/cc/cc1plus/call.c index 6b3b821..54fb184 100644 --- a/gnu/usr.bin/cc/cc1plus/call.c +++ b/gnu/usr.bin/cc/cc1plus/call.c @@ -331,7 +331,7 @@ convert_harshness (type, parmtype, parm) } else h.code = STD_CODE; - + return h; } else if (coder == REAL_TYPE) @@ -351,7 +351,7 @@ convert_harshness (type, parmtype, parm) h.code = PROMO_CODE; else h.code = STD_CODE; - + return h; } else if (INTEGRAL_CODE_P (coder)) @@ -729,7 +729,7 @@ compute_conversion_costs (function, tta_in, cp, arglen) break; if (type_unknown_p (TREE_VALUE (tta))) - { + { /* Must perform some instantiation here. */ tree rhs = TREE_VALUE (tta); tree lhstype = TREE_VALUE (ttf); @@ -1342,7 +1342,7 @@ resolve_scope_to_name (outer_type, inner_stuff) /* We first try to look for a nesting in our current class context, then try any enclosing classes. */ tree type = current_class_type; - + while (type && (TREE_CODE (type) == RECORD_TYPE || TREE_CODE (type) == UNION_TYPE)) { @@ -1415,7 +1415,7 @@ build_scoped_method_call (exp, scopes, name, parms) a pointer to a base class to be `stolen', we need not protect the derived->base conversion that happens here. - + @@ But we do have to check access privileges later. */ tree basename = resolve_scope_to_name (NULL_TREE, scopes); tree basetype, binfo, decl; @@ -1480,7 +1480,7 @@ build_scoped_method_call (exp, scopes, name, parms) } if (! TYPE_HAS_DESTRUCTOR (TREE_TYPE (decl))) return convert (void_type_node, exp); - + return build_delete (TREE_TYPE (decl), decl, integer_two_node, LOOKUP_NORMAL|LOOKUP_NONVIRTUAL|LOOKUP_DESTRUCTOR, 0); @@ -1637,7 +1637,7 @@ build_method_call (instance, name, parms, basetype_path, flags) { char *xref_name; - + /* Initialize name for error reporting. */ if (IDENTIFIER_OPNAME_P (name) && ! IDENTIFIER_TYPENAME_P (name)) { @@ -1997,18 +1997,18 @@ build_method_call (instance, name, parms, basetype_path, flags) tmp = TYPE_BINFO (basetype); else tmp = get_binfo (IDENTIFIER_TYPE_VALUE (name), basetype, 0); - + if (tmp != NULL_TREE) { name_kind = "constructor"; - + if (TYPE_USES_VIRTUAL_BASECLASSES (basetype) && ! (flags & LOOKUP_HAS_IN_CHARGE)) { /* Constructors called for initialization only are never in charge. */ tree tmplist; - + flags |= LOOKUP_HAS_IN_CHARGE; tmplist = tree_cons (NULL_TREE, integer_zero_node, TREE_CHAIN (parms)); @@ -2023,7 +2023,7 @@ build_method_call (instance, name, parms, basetype_path, flags) } else name_kind = "method"; - + if (basetype_path == NULL_TREE || BINFO_TYPE (basetype_path) != TYPE_MAIN_VARIANT (basetype)) basetype_path = TYPE_BINFO (basetype); @@ -2125,7 +2125,7 @@ build_method_call (instance, name, parms, basetype_path, flags) match any methods. Since we have verified that the is some method vaguely matching this one (in name at least), silently return. - + Don't stop for friends, however. */ basetype_path = TREE_PURPOSE (baselink); @@ -2246,7 +2246,7 @@ build_method_call (instance, name, parms, basetype_path, flags) if ((flags & (LOOKUP_SPECULATIVELY|LOOKUP_COMPLAIN)) == LOOKUP_SPECULATIVELY) return NULL_TREE; - + TREE_CHAIN (last) = void_list_node; if (flags & LOOKUP_GLOBAL) cp_error ("no global or member function `%D(%A)' defined", @@ -2392,7 +2392,7 @@ build_method_call (instance, name, parms, basetype_path, flags) { if (flags & LOOKUP_COMPLAIN) { - cp_error_at ("%s `%+#D' is %s", name_kind, function, + cp_error_at ("%s `%+#D' is %s", name_kind, function, TREE_PRIVATE (function) ? "private" : "from private base class"); error ("within this context"); @@ -2616,7 +2616,7 @@ build_method_call (instance, name, parms, basetype_path, flags) { int is_constructor; - + if (TREE_CODE (function) == FUNCTION_DECL) { is_constructor = DECL_CONSTRUCTOR_P (function); @@ -2729,7 +2729,7 @@ build_overload_call_real (fnname, parms, flags, final_cp, buildxxx) else if (TREE_CODE (fnname) == FUNCTION_DECL) fnname = DECL_NAME (functions); } - else + else functions = lookup_name_nonclass (fnname); if (functions == NULL_TREE) @@ -2762,7 +2762,7 @@ build_overload_call_real (fnname, parms, flags, final_cp, buildxxx) { if (flags & LOOKUP_SPECULATIVELY) return NULL_TREE; - + if (flags & LOOKUP_COMPLAIN) cp_error ("function `%D' declared overloaded, but no instances of that function declared", TREE_PURPOSE (functions)); @@ -2772,7 +2772,7 @@ build_overload_call_real (fnname, parms, flags, final_cp, buildxxx) } length = count_functions (functions); - + if (final_cp) candidates = final_cp; else @@ -2923,7 +2923,7 @@ build_overload_call_real (fnname, parms, flags, final_cp, buildxxx) if (flags & LOOKUP_SPECULATIVELY) return NULL_TREE; - + if (flags & LOOKUP_COMPLAIN) report_type_mismatch (cp, parms, "function", decl_as_string (cp->function, 1)); diff --git a/gnu/usr.bin/cc/cc1plus/class.c b/gnu/usr.bin/cc/cc1plus/class.c index a3bcb26..b0d815b 100644 --- a/gnu/usr.bin/cc/cc1plus/class.c +++ b/gnu/usr.bin/cc/cc1plus/class.c @@ -136,7 +136,7 @@ complete_type_p (expr) expr = TREE_OPERAND (expr, 0); continue; - case CALL_EXPR: + case CALL_EXPR: if (! TREE_HAS_CONSTRUCTOR (expr)) break; /* fall through... */ @@ -479,7 +479,7 @@ build_vfn_ref (ptr_to_instptr, instance, idx) aref = build_array_ref (vtbl, idx); /* Save the intermediate result in a SAVE_EXPR so we don't have to - compute each component of the virtual function pointer twice. */ + compute each component of the virtual function pointer twice. */ if (!building_cleanup && TREE_CODE (aref) == INDIRECT_REF) TREE_OPERAND (aref, 0) = save_expr (TREE_OPERAND (aref, 0)); @@ -1571,7 +1571,7 @@ finish_base_struct (t, b, t_binfo) b->cant_synth_copy_ctor = 1; } } - } + } { tree vfields; @@ -1815,7 +1815,7 @@ finish_struct_methods (t, fn_fields, nonprivate_method) { tree parmtypes = FUNCTION_ARG_CHAIN (fn_fields); tree parmtype = parmtypes ? TREE_VALUE (parmtypes) : void_type_node; - + if (TREE_CODE (parmtype) == REFERENCE_TYPE && TYPE_MAIN_VARIANT (TREE_TYPE (parmtype)) == t) { @@ -2040,14 +2040,14 @@ duplicate_tag_error (t) * This used to be in finish_struct, but it turns out that the * TREE_CHAIN is used by dbxout_type_methods and perhaps some other things... */ - if (CLASSTYPE_METHOD_VEC(t)) + if (CLASSTYPE_METHOD_VEC(t)) { tree tv = CLASSTYPE_METHOD_VEC(t); int i, len = TREE_VEC_LENGTH (tv); for (i = 0; i < len; i++) { tree unchain = TREE_VEC_ELT (tv, i); - while (unchain != NULL_TREE) + while (unchain != NULL_TREE) { TREE_CHAIN (unchain) = NULL_TREE; unchain = DECL_CHAIN(unchain); @@ -2189,7 +2189,7 @@ get_class_offset_1 (parent, binfo, context, t, fndecl) } rval = nrval; } - + if (rval && BINFO_TYPE (binfo) == context) { my_friendly_assert (rval == error_mark_node @@ -2240,7 +2240,7 @@ modify_one_vtable (binfo, t, fndecl, pfn) { tree virtuals = BINFO_VIRTUALS (binfo); unsigned HOST_WIDE_INT n; - + n = 0; /* Skip initial vtable length field and RTTI fake object. */ for (; virtuals && n < 1 + flag_dossier; n++) @@ -2344,7 +2344,7 @@ fixup_vtable_deltas (binfo, t) { tree virtuals = BINFO_VIRTUALS (binfo); unsigned HOST_WIDE_INT n; - + n = 0; /* Skip initial vtable length field and RTTI fake object. */ for (; virtuals && n < 1 + flag_dossier; n++) @@ -2452,7 +2452,7 @@ modify_all_vtables (t, fndecl, vfn) /* Here, we already know that they match in every respect. All we have to check is where they had their declarations. */ -static int +static int strictly_overrides (fndecl1, fndecl2) tree fndecl1, fndecl2; { @@ -2551,7 +2551,7 @@ override_one_vtable (binfo, old, t) else if (choose == NEITHER) { TREE_VALUE (virtuals) = TREE_VALUE (old_virtuals); - } + } } else { @@ -2577,7 +2577,7 @@ override_one_vtable (binfo, old, t) vfn = build1 (ADDR_EXPR, vfunc_ptr_type_node, fndecl); TREE_CONSTANT (vfn) = 1; - + /* We can use integer_zero_node, as we will will core dump if this is used anyway. */ TREE_VALUE (virtuals) = build_vtable_entry (integer_zero_node, vfn); @@ -2740,7 +2740,7 @@ finish_struct (t, list_of_fieldlists, warn_anon) #endif { extern int lineno; - + DECL_SOURCE_FILE (name) = input_filename; /* For TYPE_DECL that are not typedefs (those marked with a line number of zero, we don't want to mark them as real typedefs. @@ -3020,7 +3020,7 @@ finish_struct (t, list_of_fieldlists, warn_anon) if (TREE_TYPE (x) == error_mark_node) continue; - + if (! fields) fields = x; last_x = x; @@ -3038,7 +3038,7 @@ finish_struct (t, list_of_fieldlists, warn_anon) if (TREE_CODE (t) == UNION_TYPE) /* Unions cannot have static members. */ cp_error_at ("field `%D' declared static in union", x); - + continue; } @@ -3196,11 +3196,11 @@ finish_struct (t, list_of_fieldlists, warn_anon) make it through without complaint. */ if (CLASSTYPE_ABSTRACT_VIRTUALS (type)) abstract_virtuals_error (x, type); - + /* Don't let signatures make it through either. */ if (IS_SIGNATURE (type)) signature_error (x, type); - + if (code == UNION_TYPE) { char *fie = NULL; @@ -3407,7 +3407,7 @@ finish_struct (t, list_of_fieldlists, warn_anon) { int n_methods = method_vec ? TREE_VEC_LENGTH (method_vec) : 0; - + for (access_decls = nreverse (access_decls); access_decls; access_decls = TREE_CHAIN (access_decls)) { @@ -3438,7 +3438,7 @@ finish_struct (t, list_of_fieldlists, warn_anon) if (! fdecl) continue; - + for (tmp = fields; tmp; tmp = TREE_CHAIN (tmp)) if (DECL_NAME (tmp) == name) { @@ -3450,7 +3450,7 @@ finish_struct (t, list_of_fieldlists, warn_anon) if (!fdecl) continue; - + /* Make type T see field decl FDECL with access ACCESS.*/ if (flist) { @@ -3465,7 +3465,7 @@ finish_struct (t, list_of_fieldlists, warn_anon) else alter_access (t, fdecl, access); } - + } if (vfield == NULL_TREE && has_virtual) @@ -3746,7 +3746,7 @@ finish_struct (t, list_of_fieldlists, warn_anon) = size_binop (PLUS_EXPR, offset, DECL_FIELD_BITPOS (vfield)); CLASSTYPE_VFIELD (t) = vfield; } - + #ifdef NOTQUITE cp_warning ("Doing hard virtuals for %T...", t); #endif @@ -4373,7 +4373,7 @@ pushclass (type, modify) if (flag_cadillac) cadillac_push_class (type); } - + /* Get out of the current class scope. If we were in a class scope previously, that is the one popped to. The flag MODIFY tells whether the current scope declarations needs to be modified as a result of @@ -4493,7 +4493,7 @@ push_nested_class (type, modify) if (type == error_mark_node || ! IS_AGGR_TYPE (type)) return; - + context = DECL_CONTEXT (TYPE_NAME (type)); if (context && TREE_CODE (context) == RECORD_TYPE) @@ -4547,7 +4547,7 @@ push_lang_context (name) if (flag_cadillac) cadillac_push_lang (name); } - + /* Get out of the current language scope. */ void pop_lang_context () @@ -4962,7 +4962,7 @@ instantiate_type (lhstype, rhs, complain) TREE_TYPE (rhs) = lhstype; return rhs; - + case ADDR_EXPR: if (TYPE_PTRMEMFUNC_P (lhstype)) lhstype = TYPE_PTRMEMFUNC_FN_TYPE (lhstype); diff --git a/gnu/usr.bin/cc/cc1plus/cp-tree.h b/gnu/usr.bin/cc/cc1plus/cp-tree.h index 13c21dc..5e3ccbc 100644 --- a/gnu/usr.bin/cc/cc1plus/cp-tree.h +++ b/gnu/usr.bin/cc/cc1plus/cp-tree.h @@ -778,7 +778,7 @@ struct lang_type #define TYPE_HAS_DEFAULT_CONSTRUCTOR(NODE) (TYPE_LANG_SPECIFIC(NODE)->type_flags.has_default_ctor) /* Nonzero means the type declared a ctor as private or protected. We - use this to make sure we don't try to generate a copy ctor for a + use this to make sure we don't try to generate a copy ctor for a class that has a member of type NODE. */ #define TYPE_HAS_NONPUBLIC_CTOR(NODE) (TYPE_LANG_SPECIFIC(NODE)->type_flags.has_nonpublic_ctor) @@ -1014,7 +1014,7 @@ struct lang_decl #define SHARED_MEMBER_P(NODE) \ (TREE_CODE (NODE) == VAR_DECL || TREE_CODE (NODE) == TYPE_DECL \ || TREE_CODE (NODE) == CONST_DECL) - + /* Nonzero for FUNCTION_DECL means that this decl is a member function (static or non-static). */ #define DECL_FUNCTION_MEMBER_P(NODE) \ @@ -1631,7 +1631,7 @@ extern int current_function_parms_stored; #define VPTR_NAME_P(ID_NODE) (IDENTIFIER_POINTER (ID_NODE)[0] == JOINER \ && IDENTIFIER_POINTER (ID_NODE)[1] == 'v') #define DESTRUCTOR_NAME_P(ID_NODE) (IDENTIFIER_POINTER (ID_NODE)[1] == JOINER \ - && IDENTIFIER_POINTER (ID_NODE)[2] == '_') + && IDENTIFIER_POINTER (ID_NODE)[2] == '_') #define VTABLE_NAME_P(ID_NODE) (IDENTIFIER_POINTER (ID_NODE)[1] == 'v' \ && IDENTIFIER_POINTER (ID_NODE)[2] == 't' \ diff --git a/gnu/usr.bin/cc/cc1plus/cvt.c b/gnu/usr.bin/cc/cc1plus/cvt.c index a156f20..444ba27 100644 --- a/gnu/usr.bin/cc/cc1plus/cvt.c +++ b/gnu/usr.bin/cc/cc1plus/cvt.c @@ -112,7 +112,7 @@ cp_convert_to_pointer (type, expr) { register tree intype = TREE_TYPE (expr); register enum tree_code form = TREE_CODE (intype); - + if (form == POINTER_TYPE) { intype = TYPE_MAIN_VARIANT (intype); @@ -214,7 +214,7 @@ convert_to_pointer_force (type, expr) { register tree intype = TREE_TYPE (expr); register enum tree_code form = TREE_CODE (intype); - + if (integer_zerop (expr)) { if (type == TREE_TYPE (null_pointer_node)) @@ -429,7 +429,7 @@ build_up_reference (type, arg, flags, checkconst) if (targ == current_class_decl) { error ("address of `this' not available"); -/* #if 0 */ +/* #if 0 */ /* This code makes the following core dump the compiler on a sun4, if the code below is used. @@ -468,7 +468,7 @@ build_up_reference (type, arg, flags, checkconst) break; /* #else */ return error_mark_node; -/* #endif */ +/* #endif */ } #endif /* Fall through. */ @@ -629,7 +629,7 @@ convert_to_reference (reftype, expr, convtype, flags, decl) { tree ttl = TREE_TYPE (reftype); tree ttr; - + if (form == REFERENCE_TYPE) ttr = TREE_TYPE (TREE_TYPE (expr)); else @@ -700,7 +700,7 @@ convert_to_reference (reftype, expr, convtype, flags, decl) && (comptypes (TREE_TYPE (intype), type, -1))) cp_warning ("casting `%T' to `%T' does not dereference pointer", intype, reftype); - + rval = build_unary_op (ADDR_EXPR, expr, 0); if (rval != error_mark_node) rval = convert_force (build_pointer_type (TREE_TYPE (reftype)), rval); @@ -711,7 +711,7 @@ convert_to_reference (reftype, expr, convtype, flags, decl) { tree rval_as_conversion = NULL_TREE; tree rval_as_ctor = NULL_TREE; - + if (IS_AGGR_TYPE (intype) && (rval = build_type_conversion (CONVERT_EXPR, type, expr, 1))) { @@ -720,7 +720,7 @@ convert_to_reference (reftype, expr, convtype, flags, decl) rval_as_conversion = build_up_reference (reftype, rval, flags, 1); } - + /* Definitely need to go through a constructor here. */ if (TYPE_HAS_CONSTRUCTOR (type) && ! CLASSTYPE_ABSTRACT_VIRTUALS (type) @@ -778,7 +778,7 @@ convert_to_reference (reftype, expr, convtype, flags, decl) rval = convert (type, expr); if (rval == error_mark_node) return error_mark_node; - + rval = build_up_reference (reftype, rval, flags, 1); } @@ -1190,7 +1190,7 @@ cp_convert (type, expr, convtype, flags) /* Trivial conversion: cv-qualifiers do not matter on rvalues. */ if (TYPE_MAIN_VARIANT (type) == TYPE_MAIN_VARIANT (TREE_TYPE (e))) return fold (build1 (NOP_EXPR, type, e)); - + if (code == VOID_TYPE && (convtype & CONV_STATIC)) return build1 (CONVERT_EXPR, type, e); @@ -1342,7 +1342,7 @@ cp_convert (type, expr, convtype, flags) cp_error ("in conversion to type `%T'", type); return error_mark_node; } - + if (conversion && ctor) { error ("both constructor and type conversion operator apply"); @@ -1370,15 +1370,15 @@ cp_convert (type, expr, convtype, flags) particular instance of a template class with a call to a constructor of the given instance, as in: - + TMPL<int> object = TMPL<int>(); - + Curiously, the assertion does not fail if we do the same thing for a static member of a non-template class, as in: - + T object = T(); - + I can't see why we should care here whether or not the initializer expression involves a call to `new', so for the time being, it seems best to diff --git a/gnu/usr.bin/cc/cc1plus/decl.c b/gnu/usr.bin/cc/cc1plus/decl.c index 4dcba6c..2df750e 100644 --- a/gnu/usr.bin/cc/cc1plus/decl.c +++ b/gnu/usr.bin/cc/cc1plus/decl.c @@ -50,7 +50,7 @@ extern int current_class_depth; extern tree cleanups_this_call; /* Stack of places to restore the search obstack back to. */ - + /* Obstack used for remembering local class declarations (like enums and static (const) members. */ #include "stack.h" @@ -127,7 +127,7 @@ static tree lookup_nested_type PROTO((tree, tree)); static char *redeclaration_error_message PROTO((tree, tree)); static void grok_op_properties PROTO((tree, int, int)); -tree define_function +tree define_function PROTO((char *, tree, enum built_in_function, void (*)(), char *)); /* a node which has tree code ERROR_MARK, and whose type is itself. @@ -484,7 +484,7 @@ push_decl_level (stack, obstack) * Off to the side, may be the class_binding_level. This exists * only to catch class-local declarations. It is otherwise * nonexistent. - * + * * Also there may be binding levels that catch cleanups that * must be run when exceptions occur. */ @@ -534,7 +534,7 @@ struct binding_level /* The binding level which this one is contained in (inherits from). */ struct binding_level *level_chain; - /* Number of decls in `names' that have incomplete + /* Number of decls in `names' that have incomplete structure or union types. */ unsigned short n_incomplete; @@ -575,7 +575,7 @@ struct binding_level }; #define NULL_BINDING_LEVEL ((struct binding_level *) NULL) - + /* The (non-class) binding level currently in effect. */ static struct binding_level *current_binding_level; @@ -1205,7 +1205,7 @@ poplevel_class (force) tree shadowed; my_friendly_assert (level != 0, 354); - + decl_stack = pop_stack_level (decl_stack); for (shadowed = level->shadowed; shadowed; shadowed = TREE_CHAIN (shadowed)) IDENTIFIER_LOCAL_VALUE (TREE_PURPOSE (shadowed)) = TREE_VALUE (shadowed); @@ -1275,7 +1275,7 @@ print_binding_level (lvl) /* We can probably fit 3 names to a line? */ for (t = lvl->names; t; t = TREE_CHAIN (t)) { - if (no_print_functions && (TREE_CODE(t) == FUNCTION_DECL)) + if (no_print_functions && (TREE_CODE(t) == FUNCTION_DECL)) continue; if (no_print_builtins && (TREE_CODE(t) == TYPE_DECL) @@ -1452,7 +1452,7 @@ push_to_top_level () if (b == global_binding_level) continue; - + for (t = b->names; t; t = TREE_CHAIN (t)) { tree binding, t1, t2 = t; @@ -1466,7 +1466,7 @@ push_to_top_level () for (t1 = old_bindings; t1; t1 = TREE_CHAIN (t1)) if (TREE_VEC_ELT (t1, 0) == id) goto skip_it; - + binding = make_tree_vec (4); if (id) { @@ -1572,7 +1572,7 @@ pop_from_top_level () } /* Push a definition of struct, union or enum tag "name". - into binding_level "b". "type" should be the type node, + into binding_level "b". "type" should be the type node, We assume that the tag "name" is not already defined. Note that the definition may really be just a forward reference. @@ -1727,7 +1727,7 @@ pushtag (name, type, globalize) /* Record the identifier as the type's name if it has none. */ if (TYPE_NAME (type) == NULL_TREE) TYPE_NAME (type) = name; - + /* Do C++ gratuitous typedefing. */ if (IDENTIFIER_TYPE_VALUE (name) != type && (TREE_CODE (type) != RECORD_TYPE @@ -1736,7 +1736,7 @@ pushtag (name, type, globalize) { register tree d; int newdecl = 0; - + if (b->parm_flag != 2 || TYPE_SIZE (current_class_type) != NULL_TREE) { @@ -1987,7 +1987,7 @@ decls_match (newdecl, olddecl) if (TREE_VEC_LENGTH (oldargs) != len) return 0; - + for (i = 0; i < len; i++) { tree newarg = TREE_VALUE (TREE_VEC_ELT (newargs, i)); @@ -2162,7 +2162,7 @@ duplicate_decls (newdecl, olddecl) && TREE_CODE (newdecl) == TEMPLATE_DECL && ! DECL_TEMPLATE_IS_CLASS (newdecl))) return 0; - + cp_error ("`%#D' redeclared as different kind of symbol", newdecl); if (TREE_CODE (olddecl) == TREE_LIST) olddecl = TREE_VALUE (olddecl); @@ -2538,7 +2538,7 @@ duplicate_decls (newdecl, olddecl) if (DECL_CHAIN (newdecl) == NULL_TREE) DECL_CHAIN (newdecl) = DECL_CHAIN (olddecl); } - + /* Now preserve various other info from the definition. */ TREE_ADDRESSABLE (newdecl) = TREE_ADDRESSABLE (olddecl); TREE_ASM_WRITTEN (newdecl) = TREE_ASM_WRITTEN (olddecl); @@ -2800,7 +2800,7 @@ pushdecl (x) We get warnings about inline functions where they are defined. We get warnings about other functions from push_overloaded_decl. - + Avoid duplicate warnings where they are used. */ if (TREE_PUBLIC (x) && TREE_CODE (x) != FUNCTION_DECL) { @@ -3273,7 +3273,7 @@ push_overloaded_decl (decl, forgettable) else if (is_overloaded_fn (old)) { tree tmp; - + for (tmp = get_first_fn (old); tmp; tmp = DECL_CHAIN (tmp)) if (decl == tmp || duplicate_decls (decl, tmp)) return tmp; @@ -3399,7 +3399,7 @@ redeclaration_error_message (newdecl, olddecl) if (TREE_CODE (TREE_TYPE (newdecl)) == METHOD_TYPE) t1 = TREE_CHAIN (t1), t2 = TREE_CHAIN (t2); - + for (; t1; t1 = TREE_CHAIN (t1), t2 = TREE_CHAIN (t2)) if (TREE_PURPOSE (t1) && TREE_PURPOSE (t2)) return "duplicate default arguments given for `%#D'"; @@ -3711,7 +3711,7 @@ lookup_tag (form, name, binding_level, thislevel_only) && !(form != ENUMERAL_TYPE && (code == TEMPLATE_DECL || code == UNINSTANTIATED_P_TYPE))) - + { /* Definition isn't the kind we were looking for. */ cp_error ("`%#D' redeclared as %C", TREE_VALUE (tail), @@ -3907,7 +3907,7 @@ lookup_name_real (name, prefer_type, nonclass) yylex = 1; prefer_type = looking_for_typename; - + if (got_scope != NULL_TREE) { if (got_scope == error_mark_node) @@ -3955,7 +3955,7 @@ lookup_name_real (name, prefer_type, nonclass) goto done; } } - + if (current_binding_level != global_binding_level && IDENTIFIER_LOCAL_VALUE (name)) val = IDENTIFIER_LOCAL_VALUE (name); @@ -4104,7 +4104,7 @@ record_builtin_type (rid_index, name, type) tname = get_identifier (name); TYPE_BUILT_IN (type) = 1; - + if (tname) { #if 0 /* not yet, should get fixed properly later */ @@ -4540,14 +4540,14 @@ init_decl_processing () builtin_return_address_fndecl = builtin_function ("__builtin_return_address", - build_function_type (ptr_type_node, + build_function_type (ptr_type_node, tree_cons (NULL_TREE, unsigned_type_node, endlink)), BUILT_IN_RETURN_ADDRESS, NULL_PTR); builtin_function ("__builtin_frame_address", - build_function_type (ptr_type_node, + build_function_type (ptr_type_node, tree_cons (NULL_TREE, unsigned_type_node, endlink)), @@ -4594,9 +4594,9 @@ init_decl_processing () BUILT_IN_FFS, NULL_PTR); builtin_function ("__builtin_fsqrt", double_ftype_double, BUILT_IN_FSQRT, NULL_PTR); - builtin_function ("__builtin_sin", double_ftype_double, + builtin_function ("__builtin_sin", double_ftype_double, BUILT_IN_SIN, "sin"); - builtin_function ("__builtin_cos", double_ftype_double, + builtin_function ("__builtin_cos", double_ftype_double, BUILT_IN_COS, "cos"); builtin_function ("__builtin_saveregs", build_function_type (ptr_type_node, NULL_TREE), @@ -5238,7 +5238,7 @@ start_decl (declarator, declspecs, initialized, raises) if (TREE_CODE (TREE_TYPE (decl)) == METHOD_TYPE) { tree t = TREE_TYPE (decl); - + t = TYPE_METHOD_BASETYPE (t); /* type method belongs to */ if (TREE_CODE (t) != UNINSTANTIATED_P_TYPE) { @@ -5370,7 +5370,7 @@ start_decl (declarator, declspecs, initialized, raises) else if (duplicate_decls (decl, field)) decl = field; } - + /* If it was not explicitly declared `extern', revoke any previous claims of DECL_EXTERNAL. */ if (DECL_THIS_EXTERN (decl) == 0) @@ -5383,14 +5383,14 @@ start_decl (declarator, declspecs, initialized, raises) /* Add this decl to the current binding level, but not if it comes from another scope, e.g. a static member variable. TEM may equal DECL or it may be a previous decl of the same name. */ - + if ((TREE_CODE (decl) != PARM_DECL && DECL_CONTEXT (decl) != NULL_TREE) || (TREE_CODE (decl) == TEMPLATE_DECL && !global_bindings_p ()) || TREE_CODE (type) == LANG_TYPE) tem = decl; else tem = pushdecl (decl); - + /* Tell the back-end to use or not use .common as appropriate. If we say -fconserve-space, we want this to save space, at the expense of wrong semantics. If we say -fno-conserve-space, we want this to produce @@ -5438,7 +5438,7 @@ start_decl (declarator, declspecs, initialized, raises) { #if 0 tree tmpl = UPT_TEMPLATE (type); - + fprintf (stderr, "%s:%d: adding ", __FILE__, __LINE__); print_node_brief (stderr, "", DECL_NAME (tem), 0); fprintf (stderr, " to class %s\n", @@ -5805,7 +5805,7 @@ finish_decl (decl, init, asmspec_tree, need_pop) { /* This must override the asm specifier which was placed by grokclassfn. Lay this out fresh. - + @@ Should emit an error if this redefines an asm-specified @@ name, or if we have already used the function's name. */ DECL_RTL (TREE_TYPE (decl)) = NULL_RTX; @@ -6234,7 +6234,7 @@ finish_decl (decl, init, asmspec_tree, need_pop) while (parmtypes && parmtypes != void_list_node) { /* The default value for the parameter in parmtypes is - stored in the TREE_PURPOSE of the TREE_LIST. */ + stored in the TREE_PURPOSE of the TREE_LIST. */ if (TREE_PURPOSE (parmtypes)) { tree fnname, fndecl; @@ -7694,10 +7694,10 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, raises) register tree scanner; register tree previous_declspec; tree loc_typedecl; - + if (initialized) error ("typedef declaration includes an initializer"); - + /* To process a class-local typedef declaration, we descend down the chain of declspecs looking for the `typedef' spec. When we find it, we replace it with `static', and then recursively @@ -7727,29 +7727,29 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, raises) whether we are working on a signature-local typedef. */ if (IS_SIGNATURE (current_class_type)) SIGNATURE_GROKKING_TYPEDEF (current_class_type) = 1; - + loc_typedecl = grokdeclarator (declarator, declspecs, FIELD, 0, NULL_TREE); if (previous_declspec) TREE_CHAIN (previous_declspec) = scanner; - + if (loc_typedecl != error_mark_node) { register int i = sizeof (struct lang_decl_flags) / sizeof (int); register int *pi; - + TREE_SET_CODE (loc_typedecl, TYPE_DECL); /* This is the same field as DECL_ARGUMENTS, which is set for function typedefs by the above grokdeclarator. */ DECL_NESTED_TYPENAME (loc_typedecl) = 0; - + pi = (int *) permalloc (sizeof (struct lang_decl_flags)); while (i > 0) pi[--i] = 0; DECL_LANG_SPECIFIC (loc_typedecl) = (struct lang_decl *) pi; } - + if (IS_SIGNATURE (current_class_type)) { SIGNATURE_GROKKING_TYPEDEF (current_class_type) = 0; @@ -8141,7 +8141,7 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, raises) { error ("constructor not allowed in signature"); return void_type_node; - } + } else if (decl_context == FIELD) { if (! member_function_or_else (ctype, current_class_type, @@ -8625,7 +8625,7 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, raises) if (constp || volatilep) if (IS_SIGNATURE (type)) error ("`const' or `volatile' specified with signature type"); - else + else type = cp_build_type_variant (type, constp, volatilep); /* Special case: "friend class foo" looks like a TYPENAME context. */ @@ -8841,7 +8841,7 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, raises) && TREE_TYPE (TREE_VALUE (declspecs)) == type) error (" in instantiation of template `%s'", TYPE_NAME_STRING (current_class_type)); - + type = error_mark_node; decl = NULL_TREE; } @@ -8869,7 +8869,7 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, raises) last_function_parms, flags, quals); if (t && funcdef_flag) return t; - + return void_type_node; } } @@ -8963,7 +8963,7 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, raises) else pedwarn ("storage class `inline' invalid for function `%s' declared out of global scope", name); } - + if (ctype == NULL_TREE) { if (virtualp) @@ -9558,7 +9558,7 @@ grok_op_properties (decl, virtualp, friendp) doesn't look at the class declaration to find out if it's static. */ if (methodp) revert_static_member_fn (&decl, NULL, NULL); - + /* Take care of function decl if we had syntax errors. */ if (argtypes == NULL_TREE) TREE_TYPE (decl) = @@ -9573,7 +9573,7 @@ grok_op_properties (decl, virtualp, friendp) { if (methodp) revert_static_member_fn (&decl, NULL, NULL); - + if (argtypes == NULL_TREE) TREE_TYPE (decl) = build_function_type (void_type_node, @@ -9629,7 +9629,7 @@ grok_op_properties (decl, virtualp, friendp) ; } } - + if (name == ansi_opname[(int) CALL_EXPR] || name == ansi_opname[(int) METHOD_CALL_EXPR]) return; /* no restrictions on args */ @@ -9688,7 +9688,7 @@ grok_op_properties (decl, virtualp, friendp) pedwarn ("ANSI C++ prohibits overloading operator ?:"); if (list_length (argtypes) != 4) cp_error ("`%D' must take exactly three arguments", decl); - } + } else if (ambi_op_p (name)) { if (list_length (argtypes) == 2) @@ -9794,10 +9794,10 @@ xref_defn_tag (code_type_node, name, binfo) n1 = DECL_NESTED_TYPENAME(n1); else n1 = current_class_name; - + buf = (char *) alloca (4 + IDENTIFIER_LENGTH (n1) + IDENTIFIER_LENGTH (name)); - + sprintf (buf, "%s::%s", IDENTIFIER_POINTER (n1), IDENTIFIER_POINTER (name)); ncp = get_identifier (buf); @@ -10095,11 +10095,11 @@ xref_tag (code_type_node, name, binfo, globalize) derived classes. (Each BINFO record describing an individual inheritance contains flags which say what the `accessibility' of that particular inheritance is.) */ - + base_binfo = make_binfo (integer_zero_node, basetype, TYPE_BINFO_VTABLE (basetype), TYPE_BINFO_VIRTUALS (basetype), NULL_TREE); - + TREE_VEC_ELT (binfos, i) = base_binfo; TREE_VIA_PUBLIC (base_binfo) = via_public; TREE_VIA_PROTECTED (base_binfo) = via_protected; @@ -10247,13 +10247,13 @@ finish_enum (enumtype, values) { register tree pair; register tree value = DECL_INITIAL (TREE_VALUE (values)); - + /* Speed up the main loop by performing some precalculations */ TREE_TYPE (TREE_VALUE (values)) = enumtype; TREE_TYPE (value) = enumtype; TREE_VALUE (values) = value; minnode = maxnode = value; - + for (pair = TREE_CHAIN (values); pair; pair = TREE_CHAIN (pair)) { value = DECL_INITIAL (TREE_VALUE (pair)); @@ -10282,12 +10282,12 @@ finish_enum (enumtype, values) /* - * The following code is unnecessary since the function - * type_promotes_to deals correctly with promotion of enums of + * The following code is unnecessary since the function + * type_promotes_to deals correctly with promotion of enums of * underlying unsigned types to signed integer types. * Moreover, it causes an enum bitfield to require one more bit of * storage than defined by the ANSI/ISO C++ resolution section r.7.2 - * which defines the range of an enum. + * which defines the range of an enum. */ #if 0 /* Unlike the C frontend, we prefer signed types. */ @@ -10308,7 +10308,7 @@ finish_enum (enumtype, values) { register tree tem; - + /* Fix up all variant types of this enum type. */ for (tem = TYPE_MAIN_VARIANT (enumtype); tem; tem = TYPE_NEXT_VARIANT (tem)) @@ -10430,7 +10430,7 @@ build_enumerator (name, value) enum_next_value = build_binary_op_nodefault (PLUS_EXPR, value, integer_one_node, PLUS_EXPR); enum_overflow = tree_int_cst_lt (enum_next_value, value); - + if (enum_next_value == integer_one_node) enum_next_value = copy_node (enum_next_value); @@ -10443,10 +10443,10 @@ grok_enum_decls (type, decl) tree type, decl; { tree d = current_local_enum; - + if (d == NULL_TREE) return decl; - + while (1) { TREE_TYPE (d) = type; @@ -10460,7 +10460,7 @@ grok_enum_decls (type, decl) decl = current_local_enum; current_local_enum = NULL_TREE; - + return decl; } @@ -10888,7 +10888,7 @@ store_parm_decls () A parameter is assumed not to have any side effects. If this should change for any reason, then this will have to wrap the bashed reference type in a save_expr. - + Also, if the parameter type is declared to be an X and there is an X(X&) constructor, we cannot lay it into the stack (any more), so we make this parameter @@ -11675,7 +11675,7 @@ start_method (declspecs, declarator, raises) /* Make a place for the parms */ pushlevel (0); current_binding_level->parm_flag = 1; - + DECL_IN_AGGR_P (fndecl) = 1; return fndecl; } @@ -11926,7 +11926,7 @@ finish_stmt () { extern struct nesting *cond_stack, *loop_stack, *case_stack; - + if (current_function_assigns_this || ! current_function_just_assigned_this) return; diff --git a/gnu/usr.bin/cc/cc1plus/decl2.c b/gnu/usr.bin/cc/cc1plus/decl2.c index a50b7bc..0feef74 100644 --- a/gnu/usr.bin/cc/cc1plus/decl2.c +++ b/gnu/usr.bin/cc/cc1plus/decl2.c @@ -240,7 +240,7 @@ int flag_labels_ok; and to print them when we are done. */ int flag_detailed_statistics; -/* C++ specific flags. */ +/* C++ specific flags. */ /* Nonzero for -fall-virtual: make every member function (except constructors) lay down in the virtual function table. Calls can then either go through the virtual function table or not, @@ -383,7 +383,7 @@ static struct { char *string; int *variable; int on_value;} lang_f_options[] = Return 1 if it is recognized (and handle it); return 0 if not recognized. */ -int +int lang_decode_option (p) char *p; { @@ -709,7 +709,7 @@ grok_x_components (specs, components) tcode = signature_type_node; else if (CLASSTYPE_DECLARED_EXCEPTION(t)) tcode = exception_type_node; - + t = xref_defn_tag(tcode, TYPE_IDENTIFIER(t), NULL_TREE); if (TYPE_CONTEXT(t)) CLASSTYPE_NO_GLOBALIZE(t) = 1; @@ -1100,7 +1100,7 @@ delete_sanity (exp, size, doing_vec, use_global_delete) /* If the type has no destructor, then we should build a regular delete, instead of a vector delete. Otherwise, we would end up passing a bogus offset into __builtin_delete, which is - not expecting it. */ + not expecting it. */ if (doing_vec && TREE_CODE (type) == POINTER_TYPE && !TYPE_HAS_DESTRUCTOR (TREE_TYPE (type))) @@ -1290,7 +1290,7 @@ grokfield (declarator, declspecs, raises, init, asmspec_tree) else init = digest_init (TREE_TYPE (value), init, (tree *)0); } - + if (TREE_CODE (init) == CONST_DECL) init = DECL_INITIAL (init); else if (TREE_READONLY_DECL_P (init)) @@ -1670,21 +1670,21 @@ grokoptypename (declspecs, declarator) virtual void f () = 0; int g (); }; - + class D1 : B { public: int d1; // error, no f (); }; - + class D2 : B { public: int d2; void f (); }; - + class D3 : B { public: @@ -1729,7 +1729,7 @@ grok_function_init (decl, init) /* Mark this function as being "defined". */ DECL_INITIAL (decl) = error_mark_node; /* pure virtual destructors must be defined. */ - /* pure virtual needs to be defined (as abort) only when put in + /* pure virtual needs to be defined (as abort) only when put in vtbl. For wellformed call, it should be itself. pr4737 */ if (!DESTRUCTOR_NAME_P (DECL_ASSEMBLER_NAME (decl))) { @@ -2405,7 +2405,7 @@ import_export_template (type) CLASSTYPE_VTABLE_NEEDS_WRITING (type) = 0; } } - + static void finish_vtable_vardecl (prev, vars) tree prev, vars; @@ -2588,7 +2588,7 @@ import_export_inline (decl) } } } - + extern int parse_time, varconst_time; #define TIMEVAR(VAR, BODY) \ @@ -3004,7 +3004,7 @@ reparse_absdcl_as_casts (decl, expr) tree decl, expr; { tree type; - + if (TREE_CODE (expr) == CONSTRUCTOR) { type = groktypename (TREE_VALUE (TREE_OPERAND (decl, 1))); @@ -3088,7 +3088,7 @@ finish_decl_parsing (decl) tree decl; { extern int current_class_depth; - + switch (TREE_CODE (decl)) { case IDENTIFIER_NODE: diff --git a/gnu/usr.bin/cc/cc1plus/edsel.c b/gnu/usr.bin/cc/cc1plus/edsel.c index 78b2637..aacb443 100644 --- a/gnu/usr.bin/cc/cc1plus/edsel.c +++ b/gnu/usr.bin/cc/cc1plus/edsel.c @@ -198,7 +198,7 @@ init_cadillac () case EWOULDBLOCK: sleep (5); return; - + case 0: fatal ("init_cadillac: EOF on connection to kernel, exiting\n"); break; diff --git a/gnu/usr.bin/cc/cc1plus/errfn.c b/gnu/usr.bin/cc/cc1plus/errfn.c index 2f78164..0a5d1e5 100644 --- a/gnu/usr.bin/cc/cc1plus/errfn.c +++ b/gnu/usr.bin/cc/cc1plus/errfn.c @@ -17,7 +17,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU CC; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ - + #include "config.h" #include "tree.h" #include <ctype.h> @@ -64,13 +64,13 @@ cp_thing (errfn, atarg1, format, arglist) ARGSINIT fmt = STRDUP(format); - + for (f = fmt, arg = 0; *f; ++f) { cp_printer * function; int alternate; int maybe_here; - + /* ignore text */ if (*f != '%') continue; @@ -124,7 +124,7 @@ cp_thing (errfn, atarg1, format, arglist) char *p; if (arg >= NARGS) abort (); - + if (maybe_here && atarg1) atarg = args[arg]; diff --git a/gnu/usr.bin/cc/cc1plus/error.c b/gnu/usr.bin/cc/cc1plus/error.c index b826283..cf48533 100644 --- a/gnu/usr.bin/cc/cc1plus/error.c +++ b/gnu/usr.bin/cc/cc1plus/error.c @@ -37,7 +37,7 @@ typedef char* cp_printer (); #define _ (cp_printer *) 0 cp_printer * cp_printers[256] = -{ +{ /*0 1 2 3 4 5 6 7 8 9 A B C D E F */ _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, /* 0x00 */ _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, /* 0x10 */ @@ -124,7 +124,7 @@ dump_type (t, v) { if (t == NULL_TREE) return; - + if (TYPE_PTRMEMFUNC_P (t)) goto offset_type; @@ -265,7 +265,7 @@ dump_aggr_type (t, v) OB_PUTCP (variety); OB_PUTC (' '); } - + name = TYPE_NAME (t); if (DECL_CONTEXT (name)) @@ -314,13 +314,13 @@ dump_type_prefix (t, v) t = TYPE_PTRMEMFUNC_FN_TYPE (t); goto offset_type; } - + switch (TREE_CODE (t)) { case POINTER_TYPE: { tree sub = TREE_TYPE (t); - + dump_type_prefix (sub, v); /* A tree for a member pointer looks like pointer to offset, so let the OFFSET_TYPE case handle it. */ @@ -332,7 +332,7 @@ dump_type_prefix (t, v) case FUNCTION_TYPE: case METHOD_TYPE: break; - + case ARRAY_TYPE: OB_PUTC2 (' ', '('); break; @@ -342,7 +342,7 @@ dump_type_prefix (t, v) if (! (TYPE_READONLY (sub) || TYPE_VOLATILE (sub))) break; /* But we do want "char *const *" */ - + default: OB_PUTC (' '); } @@ -425,7 +425,7 @@ dump_type_prefix (t, v) case VOID_TYPE: dump_type (t, v); break; - + default: sorry ("`%s' not supported by dump_type_prefix", tree_code_name[(int) TREE_CODE (t)]); @@ -479,7 +479,7 @@ dump_type_suffix (t, v) OB_PUTC (']'); dump_type_suffix (TREE_TYPE (t), v); break; - + case ENUMERAL_TYPE: case ERROR_MARK: case IDENTIFIER_NODE: @@ -547,7 +547,7 @@ dump_global_iord (t) OB_PUTS ("destructors"); else my_friendly_abort (352); - + OB_PUTS (" for "); OB_PUTCP (input_filename); OB_PUTC (')'); @@ -583,7 +583,7 @@ dump_decl (t, v) OB_PUTS ("typedef "); goto general; break; - + case VAR_DECL: if (VTABLE_NAME_P (DECL_NAME (t))) { @@ -689,7 +689,7 @@ dump_decl (t, v) OB_PUTS (" = "); dump_decl (defval, 1); } - + OB_PUTC2 (',', ' '); } if (len != 0) @@ -753,12 +753,12 @@ dump_function_decl (t, v) cname = TREE_TYPE (TREE_VALUE (parmtypes)); v = (v > 0); - + if (v) { if (DECL_STATIC_FUNCTION_P (t)) OB_PUTS ("static "); - + if (! IDENTIFIER_TYPENAME_P (name) && ! DECL_CONSTRUCTOR_P (t) && ! DESTRUCTOR_NAME_P (name)) @@ -781,9 +781,9 @@ dump_function_decl (t, v) if (DESTRUCTOR_NAME_P (name)) parmtypes = TREE_CHAIN (parmtypes); - + dump_function_name (t); - + OB_PUTC ('('); if (parmtypes) @@ -1033,7 +1033,7 @@ dump_expr (t, nop) { tree fn = TREE_OPERAND (t, 0); tree args = TREE_OPERAND (t, 1); - + if (TREE_CODE (fn) == ADDR_EXPR) fn = TREE_OPERAND (fn, 0); @@ -1192,7 +1192,7 @@ dump_expr (t, nop) while (TREE_CODE (next) == POINTER_TYPE) next = TREE_TYPE (next); - + if (TREE_CODE (next) == FUNCTION_TYPE) { if (!nop) OB_PUTC ('('); @@ -1238,7 +1238,7 @@ dump_expr (t, nop) OB_PUTID (DECL_NAME (TREE_VALUE (t))); break; } - /* else fall through */ + /* else fall through */ /* This list is incomplete, but should suffice for now. It is very important that `sorry' does not call @@ -1422,7 +1422,7 @@ op_as_string (p, v) if (p == 0) return "{unknown}"; - + strcpy (buf + 9, opname_tab [p]); return buf; } diff --git a/gnu/usr.bin/cc/cc1plus/except.c b/gnu/usr.bin/cc/cc1plus/except.c index 9821471..ce875a6 100644 --- a/gnu/usr.bin/cc/cc1plus/except.c +++ b/gnu/usr.bin/cc/cc1plus/except.c @@ -180,7 +180,7 @@ output_exception_table_entry (file, start_label, end_label, eh_label) assemble_integer (eh_label, BITS_PER_WORD/BITS_PER_UNIT, 1); putc ('\n', file); /* blank line */ } - + static void easy_expand_asm (str) char *str; @@ -369,7 +369,7 @@ exception_section () popped and set to be the last insn, and the first and last insns of the catch block just generated can be enqueue'd for output at a later time. - + Next we must insure that when the catch block is executed, all finalizations for the matching try block have been completed. If any of those finalizations throw an exception, we must call @@ -385,7 +385,7 @@ exception_section () the catch block which basically wraps all the "catch (...) {...}" statements in a big if/then/else construct that matches the correct block to call. - + ===================================================================== */ extern rtx emit_insn PROTO((rtx)); @@ -592,7 +592,7 @@ push_rtl_perm () { extern struct obstack permanent_obstack; extern struct obstack *rtl_obstack; - + saved_rtl_obstack = rtl_obstack; rtl_obstack = &permanent_obstack; } @@ -603,7 +603,7 @@ pop_rtl_from_perm () { extern struct obstack permanent_obstack; extern struct obstack *rtl_obstack; - + rtl_obstack = saved_rtl_obstack; } @@ -854,7 +854,7 @@ start_protect () emit_label (push_eh_entry (&ehstack)); } } - + /* call this to end a block of unwind protection. the finalization tree is the finalization which needs to be run in order to cleanly unwind through this level of protection. (ie: call this when a scope is exited)*/ @@ -942,7 +942,7 @@ expand_start_all_catch () label = gen_label_rtx (); /* The label for the exception handling block we will save. */ emit_label (label); - + push_label_entry (&caught_return_label_stack, label); /* Remember where we started. */ @@ -973,7 +973,7 @@ expand_start_all_catch () label = gen_label_rtx (); emit_jump (label); #endif - + /* All this should be out of line, and saved back in the exception handler block area. */ #if 1 @@ -1025,7 +1025,7 @@ expand_end_all_catch () pop_label_entry (&caught_return_label_stack); push_except_stmts (&exceptstack, catchstart, catchend); - + /* Here we fall through into the continuation code. */ } @@ -1120,7 +1120,7 @@ expand_start_catch_block (declspecs, declarator) init_type = build_reference_type (init_type); init = convert_from_reference (save_expr (make_tree (init_type, saved_throw_value))); - + /* Do we need the below two lines? */ /* Let `finish_decl' know that this initializer is ok. */ DECL_INITIAL (decl) = init; @@ -1220,7 +1220,7 @@ void expand_end_catch_block () /* Cleanup the EH paramater. */ expand_end_bindings (decls = getdecls (), decls != NULL_TREE, 0); - + /* label we emit to jump to if this catch block didn't match. */ emit_label (end_protect_label_rtx = pop_label_entry (&false_label_stack)); diff --git a/gnu/usr.bin/cc/cc1plus/expr.c b/gnu/usr.bin/cc/cc1plus/expr.c index 3b4f65d..1d9054b 100644 --- a/gnu/usr.bin/cc/cc1plus/expr.c +++ b/gnu/usr.bin/cc/cc1plus/expr.c @@ -99,7 +99,7 @@ cplus_expand_expr (exp, target, tmode, modifier) as is building the call which will perform the initialization. It is left here to show the choices that exist for C++. */ - + if (TREE_CODE (func) == ADDR_EXPR && TREE_CODE (TREE_OPERAND (func, 0)) == FUNCTION_DECL && DECL_CONSTRUCTOR_P (TREE_OPERAND (func, 0))) diff --git a/gnu/usr.bin/cc/cc1plus/gc.c b/gnu/usr.bin/cc/cc1plus/gc.c index 9db4d62..a9087fc 100644 --- a/gnu/usr.bin/cc/cc1plus/gc.c +++ b/gnu/usr.bin/cc/cc1plus/gc.c @@ -117,7 +117,7 @@ type_needs_gc_entry (type) } /* Predicate that returns non-zero iff FROM is safe from the GC. - + If TO is nonzero, it means we know that FROM is being stored in TO, which make make it safe. */ int @@ -290,7 +290,7 @@ build_static_gc_entry (decl, type) else { /* Not yet implemented. - + Cons up a static variable that holds address and length info and add that to ___ARR_LIST__. */ my_friendly_abort (43); @@ -432,7 +432,7 @@ build_typeid (exp) return error_mark_node; type = TREE_TYPE (exp); - + /* if b is an instance of B, typeid(b) == typeid(B). Do this before reference trickiness. */ if (TREE_CODE (exp) == VAR_DECL && TREE_CODE (type) == RECORD_TYPE) @@ -446,7 +446,7 @@ build_typeid (exp) if (TREE_CODE (type) == REFERENCE_TYPE && TYPE_VIRTUAL_P (TREE_TYPE (type))) { /* build reference to Type_info from vtable. */ - + sorry ("finding Type_info for an object"); return error_mark_node; } @@ -462,12 +462,12 @@ get_typeid (type) { if (type == error_mark_node) return error_mark_node; - + /* Is it useful (and/or correct) to have different typeids for `T &' and `T'? */ if (TREE_CODE (type) == REFERENCE_TYPE) type = TREE_TYPE (type); - + /* build reference to static Type_info */ #if 1 sorry ("finding Type_info for a type"); @@ -480,7 +480,7 @@ get_typeid (type) /* ... */ -#endif +#endif } /* Execute a dynamic cast, as described in section 5.2.6 of the 9/93 working @@ -496,7 +496,7 @@ build_dynamic_cast (type, expr) if (type == error_mark_node || expr == error_mark_node) return error_mark_node; - + switch (tc) { case POINTER_TYPE: @@ -520,7 +520,7 @@ build_dynamic_cast (type, expr) exprtype = build_reference_type (exprtype); ec = REFERENCE_TYPE; } - + /* the TREE_CODE of exprtype must match that of type. */ if (ec != tc) { @@ -583,15 +583,15 @@ build_dynamic_cast (type, expr) { cp_warning ("dynamic_cast of `%E' to `%#T' can never succeed", expr, type); - retval = build_int_2 (0, 0); - TREE_TYPE (retval) = type; + retval = build_int_2 (0, 0); + TREE_TYPE (retval) = type; return retval; } } /* Build run-time conversion. */ sorry ("run-time type conversion"); - retval = build_int_2 (0, 0); - TREE_TYPE (retval) = type; + retval = build_int_2 (0, 0); + TREE_TYPE (retval) = type; return retval; } } diff --git a/gnu/usr.bin/cc/cc1plus/hash.h b/gnu/usr.bin/cc/cc1plus/hash.h index 8453c4b..8b55696 100644 --- a/gnu/usr.bin/cc/cc1plus/hash.h +++ b/gnu/usr.bin/cc/cc1plus/hash.h @@ -63,29 +63,29 @@ is_reserved_word (str, len) { static struct resword wordlist[] = { - {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"else", ELSE, NORID,}, - {"",}, + {"",}, {"delete", DELETE, NORID,}, {"double", TYPESPEC, RID_DOUBLE,}, {"true", CXX_TRUE, NORID,}, {"__asm__", GCC_ASM_KEYWORD, NORID}, {"typeid", TYPEID, NORID,}, - {"",}, + {"",}, {"this", THIS, NORID,}, - {"",}, + {"",}, {"try", TRY, NORID,}, - {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"do", DO, NORID,}, - {"",}, + {"",}, {"static_cast", STATIC_CAST, NORID,}, {"template", TEMPLATE, RID_TEMPLATE,}, {"protected", VISSPEC, RID_PROTECTED,}, - {"",}, + {"",}, {"__classof__", CLASSOF, NORID}, - {"",}, + {"",}, {"__headof__", HEADOF, NORID}, - {"",}, + {"",}, {"bool", TYPESPEC, RID_BOOL,}, {"__const__", TYPE_QUAL, RID_CONST}, {"__volatile", TYPE_QUAL, RID_VOLATILE}, @@ -98,7 +98,7 @@ is_reserved_word (str, len) {"sizeof", SIZEOF, NORID,}, {"short", TYPESPEC, RID_SHORT,}, {"typeof", TYPEOF, NORID,}, - {"",}, + {"",}, {"int", TYPESPEC, RID_INT,}, {"__signed", TYPESPEC, RID_SIGNED}, {"private", VISSPEC, RID_PRIVATE,}, @@ -116,17 +116,17 @@ is_reserved_word (str, len) {"switch", SWITCH, NORID,}, {"__label__", LABEL, NORID}, {"__extension__", EXTENSION, NORID}, - {"",}, + {"",}, {"__asm", GCC_ASM_KEYWORD, NORID}, {"for", FOR, NORID,}, {"__typeof", TYPEOF, NORID}, {"__alignof__", ALIGNOF, NORID}, - {"",}, + {"",}, {"case", CASE, NORID,}, {"virtual", SCSPEC, RID_VIRTUAL,}, {"if", IF, NORID,}, {"while", WHILE, NORID,}, - {"",}, + {"",}, {"class", AGGR, RID_CLASS,}, {"typedef", SCSPEC, RID_TYPEDEF,}, {"const", TYPE_QUAL, RID_CONST,}, @@ -136,11 +136,11 @@ is_reserved_word (str, len) {"inline", SCSPEC, RID_INLINE,}, {"throw", THROW, NORID,}, {"unsigned", TYPESPEC, RID_UNSIGNED,}, - {"",}, + {"",}, {"headof", HEADOF, NORID,}, - {"",}, + {"",}, {"goto", GOTO, NORID,}, - {"",}, {"",}, + {"",}, {"",}, {"public", VISSPEC, RID_PUBLIC,}, {"signature", AGGR, RID_SIGNATURE /* Extension */,}, {"volatile", TYPE_QUAL, RID_VOLATILE,}, @@ -149,35 +149,35 @@ is_reserved_word (str, len) {"__inline__", SCSPEC, RID_INLINE}, {"__alignof", ALIGNOF, NORID}, {"asm", ASM_KEYWORD, NORID,}, - {"",}, + {"",}, {"new", NEW, NORID,}, - {"",}, + {"",}, {"mutable", SCSPEC, RID_MUTABLE,}, {"union", AGGR, RID_UNION,}, {"operator", OPERATOR, NORID,}, {"register", SCSPEC, RID_REGISTER,}, - {"",}, {"",}, + {"",}, {"",}, {"__wchar_t", TYPESPEC, RID_WCHAR /* Unique to ANSI C++ */,}, - {"",}, + {"",}, {"long", TYPESPEC, RID_LONG,}, - {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"continue", CONTINUE, NORID,}, {"return", RETURN, NORID,}, {"enum", ENUM, NORID,}, - {"",}, {"",}, + {"",}, {"",}, {"dynamic_cast", DYNAMIC_CAST, NORID,}, - {"",}, {"",}, + {"",}, {"",}, {"reinterpret_cast", REINTERPRET_CAST, NORID,}, - {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"char", TYPESPEC, RID_CHAR,}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"classof", CLASSOF, NORID,}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"const_cast", CONST_CAST, NORID,}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"catch", CATCH, NORID,}, }; diff --git a/gnu/usr.bin/cc/cc1plus/init.c b/gnu/usr.bin/cc/cc1plus/init.c index e0905c6..afc3831 100644 --- a/gnu/usr.bin/cc/cc1plus/init.c +++ b/gnu/usr.bin/cc/cc1plus/init.c @@ -372,7 +372,7 @@ sort_member_init (t) Note that emit_base_init does *not* initialize virtual base classes. That is done specially, elsewhere. */ - + void emit_base_init (t, immediately) tree t; @@ -839,7 +839,7 @@ do_member_init (s_id, name, init) TYPE is the type for which the initialization is being performed. FIELD must be a member of TYPE, or the base type from which FIELD comes must not need a constructor. - + MEMBER_NAME is the name of the member. */ static int @@ -1810,7 +1810,7 @@ get_type_value (name) else return NULL_TREE; } - + /* This code could just as well go in `class.c', but is placed here for modularity. */ @@ -2264,7 +2264,7 @@ resolve_offset_ref (exp) basetype = DECL_CONTEXT (member); base = current_class_decl; - + if (get_base_distance (basetype, TREE_TYPE (TREE_TYPE (base)), 0, &basetype_path) < 0) { error_not_base_type (basetype, TREE_TYPE (TREE_TYPE (base))); @@ -2419,12 +2419,12 @@ is_friend (type, supplicant) { if (type == supplicant) return 1; - + list = CLASSTYPE_FRIEND_CLASSES (TREE_TYPE (TYPE_NAME (type))); for (; list ; list = TREE_CHAIN (list)) if (supplicant == TREE_VALUE (list)) return 1; - } + } { tree context = declp ? DECL_CLASS_CONTEXT (supplicant) @@ -3014,7 +3014,7 @@ build_new (placement, decl, init, use_global_new) pedwarn ("const and volatile types cannot be created with operator new"); type = true_type = TYPE_MAIN_VARIANT (type); } - + /* If our base type is an array, then make sure we know how many elements it has. */ while (TREE_CODE (true_type) == ARRAY_TYPE) @@ -3158,14 +3158,14 @@ build_new (placement, decl, init, use_global_new) { tree tmp = rval; - + if (TREE_CODE (TREE_TYPE (tmp)) == POINTER_TYPE) tmp = build_indirect_ref (tmp, NULL_PTR); - + newrval = build_method_call (tmp, constructor_name_full (true_type), init, NULL_TREE, flags); } - + if (newrval) { rval = newrval; diff --git a/gnu/usr.bin/cc/cc1plus/lex.c b/gnu/usr.bin/cc/cc1plus/lex.c index 44c78f0..c3189f7 100644 --- a/gnu/usr.bin/cc/cc1plus/lex.c +++ b/gnu/usr.bin/cc/cc1plus/lex.c @@ -172,7 +172,7 @@ make_pointer_declarator (type_quals, target) We return an ADDR_EXPR whose "contents" are TARGET and whose type is the modifier list. */ - + tree make_reference_declarator (type_quals, target) tree type_quals, target; @@ -913,7 +913,7 @@ print_parse_statistics () int i; int maxlen = REDUCE_LENGTH; unsigned *sorted; - + if (reduce_count[-1] == 0) return; @@ -1006,7 +1006,7 @@ extract_interface_info () if (flag_alt_external_templates) { struct tinst_level *til = tinst_for_decl (); - + if (til) fileinfo = get_time_identifier (til->file); } @@ -1158,7 +1158,7 @@ do_pending_inlines () if (t == 0) return; - + /* Now start processing the first inline function. */ my_friendly_assert ((t->parm_vec == NULL_TREE) == (t->bindings == NULL_TREE), 226); @@ -1481,7 +1481,7 @@ store_pending_inline (decl, t) char *free_to = t->buf; t->buf = (char *) obstack_copy (&permanent_obstack, t->buf, t->len + 1); - t = (struct pending_inline *) obstack_copy (&permanent_obstack, + t = (struct pending_inline *) obstack_copy (&permanent_obstack, (char *)t, sizeof (*t)); obstack_free (&inline_text_obstack, free_to); } @@ -1591,7 +1591,7 @@ reinit_parse_for_block (yychar, obstackp, is_template) } else c = getch (); - + while (c != EOF) { int this_lineno = lineno; @@ -1770,10 +1770,10 @@ cons_up_default_function (type, name, kind) tree declarator = build_parse_node (CALL_EXPR, name, args, NULL_TREE); if (retref) declarator = build_parse_node (ADDR_EXPR, declarator); - + fn = grokfield (declarator, declspecs, NULL_TREE, NULL_TREE, NULL_TREE); } - + if (fn == void_type_node) return fn; @@ -1815,7 +1815,7 @@ cons_up_default_function (type, name, kind) /* Show that this function was generated by the compiler. */ SET_DECL_ARTIFICIAL (fn); - + return fn; } @@ -1902,7 +1902,7 @@ default_assign_ref_body (bufp, lenp, type, fields) } else tbuf = "{}"; - + *lenp = strlen (tbuf); *bufp = obstack_alloc (&inline_text_obstack, *lenp + 1); strcpy (*bufp, tbuf); @@ -2751,7 +2751,7 @@ linenum: strcpy (input_filename, TREE_STRING_POINTER (yylval.ttype)); lineno = l; GNU_xref_file (input_filename); - + if (main_input_filename == 0) { struct impl_files *ifiles = impl_file_chain; @@ -3158,7 +3158,7 @@ do_identifier (token) && TYPE_BEING_DEFINED (current_class_type) && ! IDENTIFIER_CLASS_VALUE (token)) pushdecl_class_level (id); - + if (!id || id == error_mark_node) { if (id == error_mark_node && current_class_type != NULL_TREE) @@ -3254,7 +3254,7 @@ struct try_type char long_long_flag; }; -struct try_type type_sequence[] = +struct try_type type_sequence[] = { { &integer_type_node, 0, 0, 0}, { &unsigned_type_node, 1, 0, 0}, @@ -3441,7 +3441,7 @@ real_yylex () { /* We are looking at a string. Complain if the token before the string is no `extern'. - + Could cheat some memory by placing this string on the temporary_, instead of the saveable_ obstack. */ @@ -3955,8 +3955,8 @@ real_yylex () << (i * HOST_BITS_PER_CHAR)); low |= (HOST_WIDE_INT) parts[i] << (i * HOST_BITS_PER_CHAR); } - - + + yylval.ttype = build_int_2 (low, high); TREE_TYPE (yylval.ttype) = long_long_unsigned_type_node; @@ -3983,7 +3983,7 @@ real_yylex () if (flag_traditional && type == long_unsigned_type_node && !spec_unsigned) type = long_integer_type_node; - + if (type == 0) { type = long_long_integer_type_node; @@ -4018,7 +4018,7 @@ real_yylex () if (!flag_traditional && type == long_unsigned_type_node && !spec_unsigned) type = long_integer_type_node; - + if (other_type != 0 && other_type != type) { if (flag_traditional) diff --git a/gnu/usr.bin/cc/cc1plus/method.c b/gnu/usr.bin/cc/cc1plus/method.c index 9484969..e7fbdad 100644 --- a/gnu/usr.bin/cc/cc1plus/method.c +++ b/gnu/usr.bin/cc/cc1plus/method.c @@ -4,7 +4,7 @@ Contributed by Michael Tiemann (tiemann@cygnus.com) This file is part of GNU CC. - + GNU CC is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) @@ -837,7 +837,7 @@ build_static_name (basetype, name) + strlen (basename)); sprintf (buf, STATIC_NAME_FORMAT, basename, IDENTIFIER_POINTER (name)); return get_identifier (buf); -} +} /* Generate an identifier that encodes the (ANSI) exception TYPE. */ @@ -1865,10 +1865,10 @@ emit_thunk (thunk_fndecl) else entry_parm = gen_rtx (MEM, TYPE_MODE (passed_type), gen_rtx (PLUS, Pmode, - internal_arg_pointer, + internal_arg_pointer, offset_rtx)); } - + this_rtx = entry_parm; } @@ -2037,12 +2037,12 @@ build_copy_constructor (fndecl) current_base_init_list = tree_cons (TYPE_NESTED_NAME (basetype), p, current_base_init_list); } - + for (i = 0; i < n_bases; ++i) { tree p, basetype = TREE_VEC_ELT (binfos, i); if (TREE_VIA_VIRTUAL (basetype)) - continue; + continue; basetype = BINFO_TYPE (basetype); p = convert (build_reference_type (basetype), parm); diff --git a/gnu/usr.bin/cc/cc1plus/parse.c b/gnu/usr.bin/cc/cc1plus/parse.c index 68c7a38..3f717b8 100644 --- a/gnu/usr.bin/cc/cc1plus/parse.c +++ b/gnu/usr.bin/cc/cc1plus/parse.c @@ -3709,7 +3709,7 @@ case 25: break;} case 26: #line 379 "parse.y" -{ +{ yyval.ttype = build_tree_list (yyvsp[0].ttype, NULL_TREE); ttpa: if (TREE_PURPOSE (yyval.ttype) == signature_type_node) @@ -4290,7 +4290,7 @@ case 135: break;} case 136: #line 898 "parse.y" -{ yyval.ttype = build1 (CLEANUP_POINT_EXPR, bool_type_node, +{ yyval.ttype = build1 (CLEANUP_POINT_EXPR, bool_type_node, bool_truthvalue_conversion (yyvsp[-1].ttype)); ; break;} case 137: @@ -4301,7 +4301,7 @@ case 137: break;} case 138: #line 908 "parse.y" -{ yyval.ttype = build1 (CLEANUP_POINT_EXPR, bool_type_node, +{ yyval.ttype = build1 (CLEANUP_POINT_EXPR, bool_type_node, bool_truthvalue_conversion (yyvsp[-1].ttype)); ; break;} case 139: @@ -4310,7 +4310,7 @@ case 139: break;} case 140: #line 916 "parse.y" -{ yyval.ttype = build1 (CLEANUP_POINT_EXPR, bool_type_node, +{ yyval.ttype = build1 (CLEANUP_POINT_EXPR, bool_type_node, bool_truthvalue_conversion (yyval.ttype)); ; break;} case 141: @@ -4338,12 +4338,12 @@ case 142: break;} case 143: #line 941 "parse.y" -{ +{ finish_decl (yyvsp[-1].ttype, yyvsp[0].ttype, yyvsp[-3].ttype, 0); resume_momentary (yyvsp[-2].itype); - yyval.ttype = yyvsp[-1].ttype; + yyval.ttype = yyvsp[-1].ttype; if (TREE_CODE (TREE_TYPE (yyval.ttype)) == ARRAY_TYPE) - cp_error ("definition of array `%#D' in condition", yyval.ttype); + cp_error ("definition of array `%#D' in condition", yyval.ttype); ; break;} case 145: @@ -4360,12 +4360,12 @@ case 147: break;} case 149: #line 964 "parse.y" -{ yyval.ttype = tree_cons (NULL_TREE, yyval.ttype, +{ yyval.ttype = tree_cons (NULL_TREE, yyval.ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ; break;} case 150: #line 967 "parse.y" -{ yyval.ttype = tree_cons (NULL_TREE, yyval.ttype, +{ yyval.ttype = tree_cons (NULL_TREE, yyval.ttype, build_tree_list (NULL_TREE, error_mark_node)); ; break;} case 151: @@ -4522,7 +4522,7 @@ case 178: case 179: #line 1083 "parse.y" { - yyval.ttype = yyvsp[-1].ttype; + yyval.ttype = yyvsp[-1].ttype; pedwarn ("old style placement syntax, use () instead"); ; break;} @@ -4553,7 +4553,7 @@ case 184: #line 1113 "parse.y" { yyvsp[-1].ttype = tree_cons (NULL_TREE, yyvsp[-1].ttype, void_list_node); TREE_PARMLIST (yyvsp[-1].ttype) = 1; - yyval.ttype = build_parse_node (CALL_EXPR, NULL_TREE, yyvsp[-1].ttype, + yyval.ttype = build_parse_node (CALL_EXPR, NULL_TREE, yyvsp[-1].ttype, NULL_TREE); ; break;} case 185: @@ -4568,9 +4568,9 @@ case 187: break;} case 188: #line 1128 "parse.y" -{ +{ tree init = build_nt (CONSTRUCTOR, NULL_TREE, - nreverse (yyvsp[-2].ttype)); + nreverse (yyvsp[-2].ttype)); if (flag_ansi) pedwarn ("ANSI C++ forbids constructor-expressions"); /* Indicate that this was a GNU C constructor expression. */ @@ -4791,7 +4791,7 @@ case 238: case 239: #line 1322 "parse.y" { /* [eichin:19911016.1902EST] */ - yyval.ttype = build_x_function_call (yyvsp[-3].ttype, yyvsp[-1].ttype, current_class_decl); + yyval.ttype = build_x_function_call (yyvsp[-3].ttype, yyvsp[-1].ttype, current_class_decl); /* here we instantiate_class_template as needed... */ do_pending_templates (); ; @@ -5068,8 +5068,8 @@ case 264: break;} case 265: #line 1551 "parse.y" -{ - if (TREE_CODE (TREE_TYPE (yyvsp[-3].ttype)) +{ + if (TREE_CODE (TREE_TYPE (yyvsp[-3].ttype)) != TREE_CODE (TREE_TYPE (IDENTIFIER_GLOBAL_VALUE (yyvsp[-1].ttype)))) cp_error ("`%E' is not of type `%T'", yyvsp[-3].ttype, yyvsp[-1].ttype); yyval.ttype = convert (void_type_node, yyvsp[-3].ttype); @@ -5077,7 +5077,7 @@ case 265: break;} case 266: #line 1558 "parse.y" -{ +{ if (yyvsp[-4].ttype != yyvsp[-1].ttype) cp_error ("destructor specifier `%T::~%T()' must have matching names", yyvsp[-4].ttype, yyvsp[-1].ttype); if (TREE_CODE (TREE_TYPE (yyvsp[-5].ttype)) @@ -5190,7 +5190,7 @@ case 287: break;} case 288: #line 1707 "parse.y" -{ yyval.ttype = build_parse_node (CALL_EXPR, yyval.ttype, empty_parms (), +{ yyval.ttype = build_parse_node (CALL_EXPR, yyval.ttype, empty_parms (), NULL_TREE); ; break;} case 289: @@ -5231,7 +5231,7 @@ case 299: break;} case 300: #line 1743 "parse.y" -{ yyval.ttype = decl_tree_cons (NULL_TREE, yyvsp[-2].ttype, +{ yyval.ttype = decl_tree_cons (NULL_TREE, yyvsp[-2].ttype, chainon (yyvsp[-1].ttype, chainon (yyvsp[0].ttype, yyval.ttype))); ; break;} case 301: @@ -5357,7 +5357,7 @@ case 332: if (have_extern_spec && !used_extern_spec) { current_declspecs = decl_tree_cons - (NULL_TREE, get_identifier ("extern"), + (NULL_TREE, get_identifier ("extern"), current_declspecs); used_extern_spec = 1; } @@ -5379,7 +5379,7 @@ case 334: if (have_extern_spec && !used_extern_spec) { current_declspecs = decl_tree_cons - (NULL_TREE, get_identifier ("extern"), + (NULL_TREE, get_identifier ("extern"), current_declspecs); used_extern_spec = 1; } @@ -5674,8 +5674,8 @@ case 391: break;} case 392: #line 2178 "parse.y" -{ - yyungetc (';', 1); current_aggr = yyval.ttype; yyval.ttype = yyvsp[-1].ttype; +{ + yyungetc (';', 1); current_aggr = yyval.ttype; yyval.ttype = yyvsp[-1].ttype; if (yyvsp[-3].ttype == ridpointers[(int) RID_TEMPLATE]) instantiate_class_template (yyval.ttype, 2); ; @@ -6003,7 +6003,7 @@ case 425: break;} case 426: #line 2498 "parse.y" -{ if (yyval.ttype == void_type_node) yyval.ttype = NULL_TREE; +{ if (yyval.ttype == void_type_node) yyval.ttype = NULL_TREE; ; break;} case 427: @@ -6042,7 +6042,7 @@ case 433: break;} case 434: #line 2538 "parse.y" -{ +{ yyval.ttype = grok_x_components (yyval.ttype, yyvsp[0].ttype); ; break;} @@ -7119,7 +7119,7 @@ case 671: case 672: #line 3543 "parse.y" { - yyval.ttype = build_tree_list (NULL_TREE, yyval.ttype); + yyval.ttype = build_tree_list (NULL_TREE, yyval.ttype); TREE_PARMLIST (yyval.ttype) = 1; ; break;} diff --git a/gnu/usr.bin/cc/cc1plus/pt.c b/gnu/usr.bin/cc/cc1plus/pt.c index cb6b0e4..73c34f5 100644 --- a/gnu/usr.bin/cc/cc1plus/pt.c +++ b/gnu/usr.bin/cc/cc1plus/pt.c @@ -275,7 +275,7 @@ end_template_decl (d1, d2, is_class, defn) /* So that duplicate_decls can do the right thing. */ if (defn) DECL_INITIAL (decl) = error_mark_node; - + /* If context of decl is non-null (i.e., method template), add it to the appropriate class template, and pop the binding levels. */ if (! is_class && DECL_CONTEXT (DECL_TEMPLATE_RESULT (decl)) != NULL_TREE) @@ -347,16 +347,16 @@ grok_template_type (tvec, type) case FUNCTION_TYPE: { tree p; - + /* take care of function's return type first */ grok_template_type (tvec, &TREE_TYPE (*type)); - + /* take care of function's arguments */ for (p = TYPE_ARG_TYPES (*type); p; p = TREE_CHAIN (p)) grok_template_type (tvec, &TREE_VALUE (p)); return; } - default: + default: break; } return; @@ -1110,7 +1110,7 @@ list_eq (t1, t2) return list_eq (TREE_CHAIN (t1), TREE_CHAIN (t2)); } -static tree +static tree lookup_nested_type_by_name (ctype, name) tree ctype, name; { @@ -1166,7 +1166,7 @@ tsubst (t, args, nargs, in_decl) if (TYPE_PTRMEMFUNC_P (t)) return build_ptrmemfunc_type (tsubst (TYPE_PTRMEMFUNC_FN_TYPE (t), args, nargs, in_decl)); - + /* else fall through */ case ERROR_MARK: @@ -1208,7 +1208,7 @@ tsubst (t, args, nargs, in_decl) { tree r; tree fnargs, result; - + if (type == TREE_TYPE (t) && (DECL_CONTEXT (t) == NULL_TREE || TREE_CODE_CLASS (TREE_CODE (DECL_CONTEXT (t))) != 't')) @@ -1604,7 +1604,7 @@ tsubst (t, args, nargs, in_decl) rt = IDENTIFIER_TYPE_VALUE (id); /* kung: this part handles nested type in template definition */ - + if ( !ANON_AGGRNAME_P (DECL_NAME(TYPE_NAME(t)))) { rt = search_nested_type_in_tmpl (rt, t); @@ -1689,7 +1689,7 @@ instantiate_template (tmpl, targ_ptr) DECL_ARGUMENTS (olddecl) = TREE_CHAIN (DECL_ARGUMENTS (olddecl)); DECL_ARGUMENTS (fndecl) = TREE_CHAIN (DECL_ARGUMENTS (fndecl)); } - + t = DECL_TEMPLATE_INFO (tmpl); /* If we have a preexisting version of this function, don't expand @@ -1718,7 +1718,7 @@ instantiate_template (tmpl, targ_ptr) input_filename = p->filename = t->filename; extract_interface_info (); - + if (interface_unknown && flag_external_templates && ! DECL_IN_SYSTEM_HEADER (tmpl)) warn_if_unknown_interface (); if (interface_unknown || !flag_external_templates) @@ -2375,7 +2375,7 @@ void do_pending_templates () { struct pending_template* t; - + for ( t = pending_templates; t; t = t->next) { instantiate_class_template (t->id, 1); @@ -2393,7 +2393,7 @@ add_pending_template (pt) tree pt; { struct pending_template *p; - + p = (struct pending_template *) malloc (sizeof (struct pending_template)); p->next = pending_templates; pending_templates = p; @@ -2506,7 +2506,7 @@ do_type_instantiation (name, storage) rest_of_type_compilation (t, 1); } } - + { tree tmp; /* Classes nested in template classes currently don't have an diff --git a/gnu/usr.bin/cc/cc1plus/search.c b/gnu/usr.bin/cc/cc1plus/search.c index 7f6af72..38d3f64 100644 --- a/gnu/usr.bin/cc/cc1plus/search.c +++ b/gnu/usr.bin/cc/cc1plus/search.c @@ -424,7 +424,7 @@ get_binfo (parent, binfo, protect) tree type; int dist; tree rval = NULL_TREE; - + if (TREE_CODE (parent) == TREE_VEC) parent = BINFO_TYPE (parent); /* unions cannot participate in inheritance relationships */ @@ -441,7 +441,7 @@ get_binfo (parent, binfo, protect) return NULL_TREE; else my_friendly_abort (90); - + dist = get_base_distance (parent, binfo, protect, &rval); if (dist == -3) @@ -486,7 +486,7 @@ get_base_distance_recursive (binfo, depth, is_private, basetype_path, rval, int same_object = (tree_int_cst_equal (BINFO_OFFSET (*new_binfo_ptr), BINFO_OFFSET (binfo)) && *via_virtual_ptr && via_virtual); - + if (*via_virtual_ptr && via_virtual==0) { *rval_private_ptr = is_private; @@ -799,7 +799,7 @@ compute_access (basetype_path, field) #endif previous_scope = current_scope (); - + context = DECL_CLASS_CONTEXT (field); if (context == NULL_TREE) context = DECL_CONTEXT (field); @@ -2026,7 +2026,7 @@ get_abstract_virtuals (type) /* First get all from non-virtual bases. */ abstract_virtuals = get_abstract_virtuals_1 (TYPE_BINFO (type), 1, abstract_virtuals); - + for (vbases = CLASSTYPE_VBASECLASSES (type); vbases; vbases = TREE_CHAIN (vbases)) { if (! BINFO_VIRTUALS (vbases)) @@ -2931,7 +2931,7 @@ dfs_pushdecls (binfo) TREE_OVERLOADED (tmp) = DECL_OVERLOADED (*methods); #endif TREE_NONLOCAL_FLAG (tmp) = 1; - + /* Put the new contents in our envelope. */ TREE_PURPOSE (class_value) = tmp; } @@ -2946,7 +2946,7 @@ dfs_pushdecls (binfo) TREE_OVERLOADED (tmp) = DECL_OVERLOADED (*methods); #endif TREE_NONLOCAL_FLAG (tmp) = 1; - + /* See comment above for a description of envelopes. */ closed_envelopes = tree_cons (tmp, class_value, closed_envelopes); diff --git a/gnu/usr.bin/cc/cc1plus/sig.c b/gnu/usr.bin/cc/cc1plus/sig.c index 65938b3..71a9705 100644 --- a/gnu/usr.bin/cc/cc1plus/sig.c +++ b/gnu/usr.bin/cc/cc1plus/sig.c @@ -178,7 +178,7 @@ build_signature_pointer_or_reference_type (to_type, constp, volatilep, refp) else { tree sig_tbl_type = cp_build_type_variant (to_type, 1, 0); - + sptr = build_lang_field_decl (FIELD_DECL, get_identifier (SIGNATURE_SPTR_NAME), build_pointer_type (sig_tbl_type)); @@ -308,7 +308,7 @@ build_member_function_pointer (member) int namlen = IDENTIFIER_LENGTH (DECL_ASSEMBLER_NAME (member)); char *name; tree entry; - + name = (char *) alloca (namlen + sizeof (SIGNATURE_FIELD_NAME) + 2); sprintf (name, SIGNATURE_FIELD_NAME_FORMAT, namstr); @@ -348,7 +348,7 @@ append_signature_fields (list_of_fieldlists) tree mfptr; tree last_mfptr; tree mfptr_list = NULL_TREE; - + /* For signatures it should actually be only a list with one element. */ for (l = list_of_fieldlists; l; l = TREE_CHAIN (l)) { @@ -563,7 +563,7 @@ build_signature_table_constructor (sig_ty, rhs) last_rhs_field = rhs_field; else offset_p = 0; - + tbl_entry = build_component_ref (rhs, DECL_NAME (rhs_field), NULL_TREE, 1); } @@ -923,7 +923,7 @@ build_signature_method_call (basetype, instance, function, parms) NULL_TREE, 1); pfn = build_component_ref (tbl_entry, get_identifier (SIGTABLE_PFN_NAME), NULL_TREE, 1); - TREE_TYPE (pfn) = build_pointer_type (TREE_TYPE (function)); + TREE_TYPE (pfn) = build_pointer_type (TREE_TYPE (function)); if (IS_DEFAULT_IMPLEMENTATION (function)) { diff --git a/gnu/usr.bin/cc/cc1plus/spew.c b/gnu/usr.bin/cc/cc1plus/spew.c index c28e2c1..6931ede 100644 --- a/gnu/usr.bin/cc/cc1plus/spew.c +++ b/gnu/usr.bin/cc/cc1plus/spew.c @@ -59,7 +59,7 @@ extern int end_of_file; struct obstack token_obstack; int first_token; - + #ifdef SPEW_DEBUG int spew_debug = 0; static unsigned int yylex_ctr = 0; @@ -228,7 +228,7 @@ probe_obstack (h, obj, nlevels) nlevels -= 1) { plp = lp->prev; - lp = plp; + lp = plp; } return nlevels != 0 && lp != 0; } @@ -290,7 +290,7 @@ yylex() case EMPTY: /* This is a lexical no-op. */ consume_token (); -#ifdef SPEW_DEBUG +#ifdef SPEW_DEBUG if (spew_debug) debug_yychar (tmp_token.yychar); #endif @@ -366,7 +366,7 @@ yylex() yylval = tmp_token.yylval; yychar = tmp_token.yychar; end_of_file = tmp_token.end_of_file; -#ifdef SPEW_DEBUG +#ifdef SPEW_DEBUG if (spew_debug) debug_yychar(yychar); #endif @@ -383,7 +383,7 @@ static int do_aggr () { int yc1, yc2; - + scan_tokens (2); yc1 = nth_token (1)->yychar; if (yc1 != TYPENAME && yc1 != IDENTIFIER && yc1 != PTYPENAME) @@ -414,9 +414,9 @@ do_aggr () my_friendly_abort (102); } return 0; -} - -#ifdef SPEW_DEBUG +} + +#ifdef SPEW_DEBUG /* debug_yychar takes a yychar (token number) value and prints its name. */ static int debug_yychar (yy) @@ -424,9 +424,9 @@ debug_yychar (yy) { /* In parse.y: */ extern char *debug_yytranslate (); - + int i; - + if(yy<256) { fprintf (stderr, "<%d: %c >\n", yy, yy); return 0; diff --git a/gnu/usr.bin/cc/cc1plus/tree.c b/gnu/usr.bin/cc/cc1plus/tree.c index 5db4a66..b0607f8 100644 --- a/gnu/usr.bin/cc/cc1plus/tree.c +++ b/gnu/usr.bin/cc/cc1plus/tree.c @@ -37,7 +37,7 @@ lvalue_p (ref) { if (! language_lvalue_valid (ref)) return 0; - + if (TREE_CODE (TREE_TYPE (ref)) == REFERENCE_TYPE) return 1; @@ -763,7 +763,7 @@ layout_basetypes (rec, binfos) #if 0 /* bpk: Disabled this check until someone is willing to claim it as theirs and explain exactly what circumstances - warrant the warning. */ + warrant the warning. */ if (warn_nonvdtor && TYPE_HAS_DESTRUCTOR (basetype) && DECL_VINDEX (TREE_VEC_ELT (CLASSTYPE_METHOD_VEC (basetype), 0)) == NULL_TREE) { @@ -1147,7 +1147,7 @@ make_binfo (offset, binfo, vtable, virtuals, chain) BINFO_VPTR_FIELD (new_binfo) = NULL_TREE; if (binfo && BINFO_BASETYPES (binfo) != NULL_TREE) - BINFO_BASETYPES (new_binfo) = copy_node (BINFO_BASETYPES (binfo)); + BINFO_BASETYPES (new_binfo) = copy_node (BINFO_BASETYPES (binfo)); return new_binfo; } @@ -1330,7 +1330,7 @@ is_overloaded_fn (x) int really_overloaded_fn (x) tree x; -{ +{ if (TREE_CODE (x) == TREE_LIST && (TREE_CODE (TREE_VALUE (x)) == FUNCTION_DECL || TREE_CODE (TREE_VALUE (x)) == TEMPLATE_DECL)) @@ -1347,7 +1347,7 @@ get_first_fn (from) return from; my_friendly_assert (TREE_CODE (from) == TREE_LIST, 9); - + return TREE_VALUE (from); } @@ -1687,7 +1687,7 @@ make_deep_copy (t) return build_ptrmemfunc_type (make_deep_copy (TYPE_PTRMEMFUNC_FN_TYPE (t))); /* else fall through */ - + /* This list is incomplete, but should suffice for now. It is very important that `sorry' does not call `report_error_function'. That could cause an infinite loop. */ diff --git a/gnu/usr.bin/cc/cc1plus/typeck.c b/gnu/usr.bin/cc/cc1plus/typeck.c index c215c57..1c7b4f2 100644 --- a/gnu/usr.bin/cc/cc1plus/typeck.c +++ b/gnu/usr.bin/cc/cc1plus/typeck.c @@ -289,7 +289,7 @@ common_type (t1, t2) { /* Pick the longest list, and hang on the other list. */ - + if (list_length (a1) < list_length (a2)) attributes = a2, a2 = a1; @@ -333,7 +333,7 @@ common_type (t1, t2) return build_type_attribute_variant (t2, attributes); /* Same precision. Prefer longs to ints even when same size. */ - + if (TYPE_MAIN_VARIANT (t1) == long_unsigned_type_node || TYPE_MAIN_VARIANT (t2) == long_unsigned_type_node) return build_type_attribute_variant (long_unsigned_type_node, @@ -1117,13 +1117,13 @@ signed_or_unsigned_type (unsignedp, type) return type; if (TYPE_PRECISION (type) == TYPE_PRECISION (signed_char_type_node)) return unsignedp ? unsigned_char_type_node : signed_char_type_node; - if (TYPE_PRECISION (type) == TYPE_PRECISION (integer_type_node)) + if (TYPE_PRECISION (type) == TYPE_PRECISION (integer_type_node)) return unsignedp ? unsigned_type_node : integer_type_node; - if (TYPE_PRECISION (type) == TYPE_PRECISION (short_integer_type_node)) + if (TYPE_PRECISION (type) == TYPE_PRECISION (short_integer_type_node)) return unsignedp ? short_unsigned_type_node : short_integer_type_node; - if (TYPE_PRECISION (type) == TYPE_PRECISION (long_integer_type_node)) + if (TYPE_PRECISION (type) == TYPE_PRECISION (long_integer_type_node)) return unsignedp ? long_unsigned_type_node : long_integer_type_node; - if (TYPE_PRECISION (type) == TYPE_PRECISION (long_long_integer_type_node)) + if (TYPE_PRECISION (type) == TYPE_PRECISION (long_long_integer_type_node)) return (unsignedp ? long_long_unsigned_type_node : long_long_integer_type_node); return type; @@ -1187,7 +1187,7 @@ c_sizeof (type) } /* Convert in case a char is more than one unit. */ - t = size_binop (CEIL_DIV_EXPR, TYPE_SIZE (type), + t = size_binop (CEIL_DIV_EXPR, TYPE_SIZE (type), size_int (TYPE_PRECISION (char_type_node))); /* size_binop does not put the constant in range, so do it now. */ if (TREE_CODE (t) == INTEGER_CST && force_fit_type (t, 0)) @@ -1221,7 +1221,7 @@ c_sizeof_nowarn (type) } /* Convert in case a char is more than one unit. */ - t = size_binop (CEIL_DIV_EXPR, TYPE_SIZE (type), + t = size_binop (CEIL_DIV_EXPR, TYPE_SIZE (type), size_int (TYPE_PRECISION (char_type_node))); force_fit_type (t, 0); return t; @@ -1919,7 +1919,7 @@ build_array_ref (array, idx) TREE_THIS_VOLATILE (rval) |= (TYPE_VOLATILE (TREE_TYPE (TREE_TYPE (array))) /* This was added by rms on 16 Nov 91. - It fixes vol struct foo *a; a->elts[1] + It fixes vol struct foo *a; a->elts[1] in an inline function. Hope it doesn't break something else. */ | TREE_THIS_VOLATILE (array)); @@ -2217,10 +2217,10 @@ get_member_function_from_ptrfunc (instance_ptrptr, instance, function) aref = save_expr (aref); /* Save the intermediate result in a SAVE_EXPR so we don't have to - compute each component of the virtual function pointer twice. */ + compute each component of the virtual function pointer twice. */ if (/* !building_cleanup && */ TREE_CODE (aref) == INDIRECT_REF) TREE_OPERAND (aref, 0) = save_expr (TREE_OPERAND (aref, 0)); - + delta = build (PLUS_EXPR, integer_type_node, build_conditional_expr (e1, build_component_ref (aref, delta_identifier, 0, 0), integer_zero_node), delta); @@ -2365,7 +2365,7 @@ build_function_call_real (function, params, require_complete, flags) /* C++ */ value_type = TREE_TYPE (fntype) ? TREE_TYPE (fntype) : void_type_node; { - register tree result = + register tree result = build (CALL_EXPR, value_type, function, coerced_params, NULL_TREE); @@ -2386,7 +2386,7 @@ build_function_call (function, params) { return build_function_call_real (function, params, 1, LOOKUP_NORMAL); } - + tree build_function_call_maybe (function, params) tree function, params; @@ -2409,7 +2409,7 @@ build_function_call_maybe (function, params) NAME is an IDENTIFIER_NODE or 0. It is used only for error messages. This is also where warnings about wrong number of args are generated. - + Return a list of expressions for the parameters as converted. Both VALUES and the returned value are chains of TREE_LIST nodes @@ -2745,7 +2745,7 @@ build_binary_op (code, arg1, arg2, convert_p) int convert_index = IS_AGGR_TYPE (type2); /* Avoid being tripped up by things like (ARG1 != 0). */ tree types[2], try; - + types[0] = type1; types[1] = type2; if (code == TRUTH_ANDIF_EXPR || code == TRUTH_ORIF_EXPR) try = build_type_conversion (code, bool_type_node, @@ -2754,7 +2754,7 @@ build_binary_op (code, arg1, arg2, convert_p) { try = build_type_conversion (code, types[convert_index ^ 1], args[convert_index], 1); - + if (try == 0 && args[1] == integer_zero_node && (code == NE_EXPR || code == EQ_EXPR)) @@ -2908,7 +2908,7 @@ build_binary_op_nodefault (code, orig_op0, orig_op1, error_code) cp_warning ("division by zero in `%E / 0'", op0); else if (TREE_CODE (op1) == REAL_CST && real_zerop (op1)) cp_warning ("division by zero in `%E / 0.'", op0); - + if (!(code0 == INTEGER_TYPE && code1 == INTEGER_TYPE)) resultcode = RDIV_EXPR; else @@ -2963,7 +2963,7 @@ build_binary_op_nodefault (code, orig_op0, orig_op1, error_code) cp_warning ("division by zero in `%E % 0'", op0); else if (code1 == REAL_TYPE && real_zerop (op1)) cp_warning ("division by zero in `%E % 0.'", op0); - + if (code0 == INTEGER_TYPE && code1 == INTEGER_TYPE) { /* Although it would be tempting to shorten always here, that loses @@ -3274,7 +3274,7 @@ build_binary_op_nodefault (code, orig_op0, orig_op1, error_code) TYPE_SIZE (TREE_TYPE (type0)) == 0 ? "in" : "", TYPE_SIZE (TREE_TYPE (type1)) == 0 ? "in" : "", type0, type1); - else if (pedantic + else if (pedantic && TREE_CODE (TREE_TYPE (type0)) == FUNCTION_TYPE) pedwarn ("ANSI C++ forbids ordered comparisons of pointers to functions"); } @@ -3438,7 +3438,7 @@ build_binary_op_nodefault (code, orig_op0, orig_op1, error_code) pass the copies by reference, then copy them back afterward. */ tree xop0 = op0, xop1 = op1, xresult_type = result_type; enum tree_code xresultcode = resultcode; - tree val + tree val = shorten_compare (&xop0, &xop1, &xresult_type, &xresultcode); if (val != 0) return convert (bool_type_node, val); @@ -3477,7 +3477,7 @@ build_binary_op_nodefault (code, orig_op0, orig_op1, error_code) primop0 = get_narrower (TREE_OPERAND (op0, 0), &unsignedp0); if (TREE_CODE (primop1) == BIT_NOT_EXPR) primop1 = get_narrower (TREE_OPERAND (op1, 0), &unsignedp1); - + if (TREE_CODE (primop0) == INTEGER_CST || TREE_CODE (primop1) == INTEGER_CST) { @@ -3533,9 +3533,9 @@ build_binary_op_nodefault (code, orig_op0, orig_op1, error_code) if (! converted) { if (TREE_TYPE (op0) != result_type) - op0 = convert (result_type, op0); + op0 = convert (result_type, op0); if (TREE_TYPE (op1) != result_type) - op1 = convert (result_type, op1); + op1 = convert (result_type, op1); } { @@ -3744,7 +3744,7 @@ build_component_addr (arg, argtype, msg) } return rval; } - + /* Construct and perhaps optimize a tree representation for a unary operation. CODE, a tree_code, specifies the operation and XARG is the operand. */ @@ -3900,7 +3900,7 @@ build_unary_op (code, xarg, noconvert) case NOP_EXPR: break; - + case PREINCREMENT_EXPR: case POSTINCREMENT_EXPR: case PREDECREMENT_EXPR: @@ -3955,7 +3955,7 @@ build_unary_op (code, xarg, noconvert) pedwarn ("ANSI C++ forbids %sing an enum", (code == PREINCREMENT_EXPR || code == POSTINCREMENT_EXPR) ? "increment" : "decrement"); - + /* Compute the increment. */ if (typecode == POINTER_TYPE) @@ -4223,7 +4223,7 @@ convert_sequence (conversions, arg) but which we can accept as lvalues. If ARG is not a kind of expression we can handle, return zero. */ - + tree unary_complex_lvalue (code, arg) enum tree_code code; @@ -4308,7 +4308,7 @@ unary_complex_lvalue (code, arg) } return convert (build_pointer_type (TREE_TYPE (arg)), - size_binop (EASY_DIV_EXPR, + size_binop (EASY_DIV_EXPR, DECL_FIELD_BITPOS (t), size_int (BITS_PER_UNIT))); } @@ -4476,7 +4476,7 @@ build_x_conditional_expr (ifexp, op1, op2) rval = build_opfncall (COND_EXPR, LOOKUP_SPECULATIVELY, ifexp, op1, op2); if (rval) return build_opfncall (COND_EXPR, LOOKUP_NORMAL, ifexp, op1, op2); - + return build_conditional_expr (ifexp, op1, op2); } @@ -5684,7 +5684,7 @@ build_modify_expr (lhs, modifycode, rhs) tree vbases = CLASSTYPE_VBASECLASSES (lhstype); tree lhs_addr = build_unary_op (ADDR_EXPR, lhs, 0); tree rhs_addr; - + /* Memberwise assignment would cause NEWRHS to be evaluated for every member that gets assigned. By wrapping side-effecting exprs in a SAVE_EXPR, @@ -5700,7 +5700,7 @@ build_modify_expr (lhs, modifycode, rhs) will result in expand_expr expanding the call without knowing that it should run the cleanup. */ newrhs = save_expr (break_out_cleanups (newrhs)); - + if (TREE_CODE (newrhs) == COND_EXPR) rhs_addr = rationalize_conditional_expr (ADDR_EXPR, newrhs); else @@ -5764,7 +5764,7 @@ build_modify_expr (lhs, modifycode, rhs) if (TREE_CODE (lhstype) == ARRAY_TYPE) { int from_array; - + /* Allow array assignment in compiler-generated code. */ if ((pedantic || flag_ansi) && ! DECL_ARTIFICIAL (current_function_decl)) @@ -5956,7 +5956,7 @@ get_delta_difference (from, to, force) { tree delta = integer_zero_node; tree binfo; - + if (to == from) return delta; @@ -6062,7 +6062,7 @@ build_ptrmemfunc (type, pfn, force) delta = fold (size_binop (PLUS_EXPR, delta, ndelta)); delta2 = fold (size_binop (PLUS_EXPR, ndelta2, delta2)); e1 = fold (build (GT_EXPR, integer_type_node, index, integer_zero_node)); - + u = build_nt (CONSTRUCTOR, 0, tree_cons (delta2_identifier, delta2, NULL_TREE)); u = build_nt (CONSTRUCTOR, 0, tree_cons (NULL_TREE, delta, tree_cons (NULL_TREE, index, @@ -6690,7 +6690,7 @@ convert_for_initialization (exp, type, rhs, flags, errtype, fndecl, parmnum) /* We accept references to incomplete types, so we can return here before checking if RHS is of complete type. */ - + if (codel == REFERENCE_TYPE) { /* This should eventually happen in convert_arguments. */ @@ -6709,7 +6709,7 @@ convert_for_initialization (exp, type, rhs, flags, errtype, fndecl, parmnum) cp_error_at ("in passing argument %P of `%+D'", parmnum, fndecl); } return rhs; - } + } rhs = require_complete_type (rhs); if (rhs == error_mark_node) @@ -7011,7 +7011,7 @@ c_expand_return (retval) && !TREE_STATIC (whats_returned)) cp_warning_at ("address of local variable `%D' returned", whats_returned); } - + /* Now deal with possible C++ hair: (1) Compute the return value. (2) If there are aggregate values with destructors which diff --git a/gnu/usr.bin/cc/cc1plus/typeck2.c b/gnu/usr.bin/cc/cc1plus/typeck2.c index 5d3322d..ee722dd 100644 --- a/gnu/usr.bin/cc/cc1plus/typeck2.c +++ b/gnu/usr.bin/cc/cc1plus/typeck2.c @@ -141,7 +141,7 @@ readonly_error (arg, string, soft) else if (TREE_CODE (arg) == RESULT_DECL) (*fn) ("%s of read-only named return value `%s'", string, lang_printable_name (arg)); - else + else (*fn) ("%s of read-only location", string); } @@ -292,7 +292,7 @@ ack (s, v, v2) HOST_WIDE_INT v2; { extern char * progname; - + if (input_filename) fprintf (stderr, "%s:%d: ", input_filename, lineno); else @@ -301,7 +301,7 @@ ack (s, v, v2) fprintf (stderr, s, v, v2); fprintf (stderr, "\n"); } - + /* There are times when the compiler can get very confused, confused to the point of giving up by aborting, simply because of previous input errors. It is much better to have the user go back and @@ -354,7 +354,7 @@ my_friendly_abort (i) } else error ("confused by earlier errors, bailing out"); - + exit (34); } ++abortcount; @@ -560,7 +560,7 @@ store_init_value (decl, init) else { /* We get here with code like `int a (2);' */ - + if (TREE_CHAIN (init) != NULL_TREE) { pedwarn ("initializer list being treated as compound expression"); @@ -1278,7 +1278,7 @@ build_x_arrow (datum) types_memoized); } last_rval = rval; - } + } if (TREE_CODE (TREE_TYPE (last_rval)) == REFERENCE_TYPE) last_rval = convert_from_reference (last_rval); } @@ -1350,7 +1350,7 @@ build_m_component_ref (datum, component) cp_error ("which is of non-aggregate type `%T'", objtype); return error_mark_node; } - + if (! comptypes (TYPE_METHOD_BASETYPE (type), objtype, 0)) { cp_error ("member type `%T::' incompatible with object type `%T'", @@ -1408,9 +1408,9 @@ build_functional_cast (exp, parms) /* Prepare to evaluate as a call to a constructor. If this expression is actually used, for example, - + return X (arg1, arg2, ...); - + then the slot being initialized will be filled in. */ if (name == NULL_TREE) @@ -1461,14 +1461,14 @@ build_functional_cast (exp, parms) /* The following assertion fails in cases where we are initializing a static member variable of a particular instance of a template class with a call to a constructor of the given instance, as in: - + TMPL<int> object = TMPL<int>(); - + Curiously, the assertion does not fail if we do the same thing for a static member of a non-template class, as in: - + T object = T(); - + I can't see why we should care here whether or not the initializer expression involves a call to `new', so for the time being, it seems best to just avoid doing this assertion. */ @@ -1510,7 +1510,7 @@ enum_name_string (value, type) #if 0 /* Print out a language-specific error message for (Pascal) case or (C) switch statements. - CODE tells what sort of message to print. + CODE tells what sort of message to print. TYPE is the type of the switch index expression. NEW is the new value that we were trying to add. OLD is the old value that stopped us from adding it. */ diff --git a/gnu/usr.bin/cc/cc_int/aux-output.c b/gnu/usr.bin/cc/cc_int/aux-output.c index 17dd9db..d828f4e 100644 --- a/gnu/usr.bin/cc/cc_int/aux-output.c +++ b/gnu/usr.bin/cc/cc_int/aux-output.c @@ -66,7 +66,7 @@ enum reg_class regclass_map[FIRST_PSEUDO_REGISTER] = SIREG, DIREG, INDEX_REGS, GENERAL_REGS, /* FP registers */ FP_TOP_REG, FP_SECOND_REG, FLOAT_REGS, FLOAT_REGS, - FLOAT_REGS, FLOAT_REGS, FLOAT_REGS, FLOAT_REGS, + FLOAT_REGS, FLOAT_REGS, FLOAT_REGS, FLOAT_REGS, /* arg pointer */ INDEX_REGS }; @@ -528,7 +528,7 @@ output_move_double (operands) middlehalf[0] = operands[0]; latehalf[0] = operands[0]; } - + if (optype1 == REGOP) { middlehalf[1] = gen_rtx (REG, SImode, REGNO (operands[1]) + 1); @@ -2084,7 +2084,7 @@ print_operand (file, x, code) REAL_VALUE_TO_DECIMAL (r, "%.22e", dstr); fprintf (file, "%s", dstr); } - else + else { if (code != 'P') { diff --git a/gnu/usr.bin/cc/cc_int/bc-emit.c b/gnu/usr.bin/cc/cc_int/bc-emit.c index c8d50bb..296fdd9 100644 --- a/gnu/usr.bin/cc/cc_int/bc-emit.c +++ b/gnu/usr.bin/cc/cc_int/bc-emit.c @@ -971,7 +971,7 @@ bc_emit_trampoline (callinfo) static int n; sprintf (mylab, "*LB%d", n++); - + BC_EMIT_TRAMPOLINE (trampoline, callinfo); seg_defsym (bytecode, mylab); diff --git a/gnu/usr.bin/cc/cc_int/bc-optab.c b/gnu/usr.bin/cc/cc_int/bc-optab.c index b8ac57d..447e32c 100644 --- a/gnu/usr.bin/cc/cc_int/bc-optab.c +++ b/gnu/usr.bin/cc/cc_int/bc-optab.c @@ -634,7 +634,7 @@ bc_init_mode_to_code_map () for (mode = 0; mode < MAX_MACHINE_MODE + 1; mode++) { - signed_mode_to_code_map[mode] = + signed_mode_to_code_map[mode] = unsigned_mode_to_code_map[mode] = LAST_AND_UNUSED_TYPECODE; } @@ -699,7 +699,7 @@ bc_expand_binary_operation (optab, resulttype, arg0, arg1) { int i, besti, cost, bestcost; enum typecode resultcode, arg0code, arg1code; - + resultcode = preferred_typecode (TYPE_MODE (resulttype), TREE_UNSIGNED (resulttype)); arg0code = preferred_typecode (TYPE_MODE (TREE_TYPE (arg0)), TREE_UNSIGNED (resulttype)); arg1code = preferred_typecode (TYPE_MODE (TREE_TYPE (arg1)), TREE_UNSIGNED (resulttype)); @@ -740,7 +740,7 @@ bc_expand_unary_operation (optab, resulttype, arg0) { int i, besti, cost, bestcost; enum typecode resultcode, arg0code; - + resultcode = preferred_typecode (TYPE_MODE (resulttype), TREE_UNSIGNED (resulttype)); arg0code = preferred_typecode (TYPE_MODE (TREE_TYPE (arg0)), TREE_UNSIGNED (TREE_TYPE (arg0))); diff --git a/gnu/usr.bin/cc/cc_int/c-common.c b/gnu/usr.bin/cc/cc_int/c-common.c index f3844e2..563c171 100644 --- a/gnu/usr.bin/cc/cc_int/c-common.c +++ b/gnu/usr.bin/cc/cc_int/c-common.c @@ -174,7 +174,7 @@ combine_strings (strings) wide_flag = 1; } - /* Compute the number of elements, for the array type. */ + /* Compute the number of elements, for the array type. */ nchars = wide_flag ? length / wchar_bytes : length; /* Create the array type for the string constant. @@ -235,7 +235,7 @@ decl_attributes (decl, attributes) TREE_THIS_VOLATILE (decl) = 1; else if (TREE_CODE (type) == POINTER_TYPE && TREE_CODE (TREE_TYPE (type)) == FUNCTION_TYPE) - TREE_TYPE (decl) = type + TREE_TYPE (decl) = type = build_pointer_type (build_type_variant (TREE_TYPE (type), TREE_READONLY (TREE_TYPE (type)), 1)); @@ -275,7 +275,7 @@ decl_attributes (decl, attributes) { #ifdef VALID_MACHINE_ATTRIBUTE if (VALID_MACHINE_ATTRIBUTE (type, new_attr, name)) - { + { register tree atlist; for (atlist = new_attr; atlist; atlist = TREE_CHAIN (atlist)) @@ -369,7 +369,7 @@ found_attr:; } align = TREE_INT_CST_LOW (align_expr) * BITS_PER_UNIT; - + if (exact_log2 (align) == -1) error_with_decl (decl, "requested alignment of `%s' is not a power of 2"); @@ -395,14 +395,14 @@ found_attr:; int is_scan; tree argument; int arg_num; - + if (TREE_CODE (decl) != FUNCTION_DECL) { error_with_decl (decl, "argument format specified for non-function `%s'"); continue; } - + if (!strcmp (IDENTIFIER_POINTER (format_type), "printf") || !strcmp (IDENTIFIER_POINTER (format_type), "__printf__")) is_scan = 0; @@ -414,7 +414,7 @@ found_attr:; error_with_decl (decl, "unrecognized format specifier for `%s'"); continue; } - + /* Strip any conversions from the string index and first arg number and verify they are constants. */ while (TREE_CODE (format_num_expr) == NOP_EXPR @@ -548,7 +548,7 @@ static format_char_info print_char_table[] = { static format_char_info scan_char_table[] = { { "di", 1, T_I, T_S, T_L, T_LL, T_LL, "*" }, - { "ouxX", 1, T_UI, T_US, T_UL, T_ULL, T_ULL, "*" }, + { "ouxX", 1, T_UI, T_US, T_UL, T_ULL, T_ULL, "*" }, { "efgEG", 1, T_F, NULL, T_D, NULL, T_LD, "*" }, { "sc", 1, T_C, NULL, T_W, NULL, NULL, "*a" }, { "[", 1, T_C, NULL, NULL, NULL, NULL, "*a" }, @@ -812,7 +812,7 @@ check_format_info (info, params) flag_chars[i++] = *format_chars++; flag_chars[i] = 0; } - /* "If the space and + flags both appear, + /* "If the space and + flags both appear, the space flag will be ignored." */ if (index (flag_chars, ' ') != 0 && index (flag_chars, '+') != 0) @@ -1084,7 +1084,7 @@ check_format_info (info, params) { register char *this; register char *that; - + this = IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (wanted_type))); that = 0; if (TREE_CODE (cur_type) != ERROR_MARK @@ -1898,7 +1898,7 @@ truthvalue_conversion (expr) truthvalue_conversion (TREE_OPERAND (expr, 0))); else return truthvalue_conversion (TREE_OPERAND (expr, 0)); - + case COND_EXPR: /* Distribute the conversion into the arms of a COND_EXPR. */ return fold (build (COND_EXPR, integer_type_node, TREE_OPERAND (expr, 0), diff --git a/gnu/usr.bin/cc/cc_int/caller-save.c b/gnu/usr.bin/cc/cc_int/caller-save.c index 5b09606..bcfe3c8 100644 --- a/gnu/usr.bin/cc/cc_int/caller-save.c +++ b/gnu/usr.bin/cc/cc_int/caller-save.c @@ -41,13 +41,13 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ register because it is live we first try to save in multi-register modes. If that is not possible the save is done one register at a time. */ -static enum machine_mode +static enum machine_mode regno_save_mode[FIRST_PSEUDO_REGISTER][MAX_MOVE_MAX / MAX_UNITS_PER_WORD + 1]; /* For each hard register, a place on the stack where it can be saved, if needed. */ -static rtx +static rtx regno_save_mem[FIRST_PSEUDO_REGISTER][MAX_MOVE_MAX / MAX_UNITS_PER_WORD + 1]; /* We will only make a register eligible for caller-save if it can be @@ -56,9 +56,9 @@ static rtx when we emit them, the addresses might not be valid, so they might not be recognized. */ -static enum insn_code +static enum insn_code reg_save_code[FIRST_PSEUDO_REGISTER][MAX_MOVE_MAX / MAX_UNITS_PER_WORD + 1]; -static enum insn_code +static enum insn_code reg_restore_code[FIRST_PSEUDO_REGISTER][MAX_MOVE_MAX / MAX_UNITS_PER_WORD + 1]; /* Set of hard regs currently live (during scan of all insns). */ @@ -88,7 +88,7 @@ static int insert_save_restore PROTO((rtx, int, int, Look at all the hard registers that are used by a call and for which regclass.c has not already excluded from being used across a call. - Ensure that we can find a mode to save the register and that there is a + Ensure that we can find a mode to save the register and that there is a simple insn to save and restore the register. This latter check avoids problems that would occur if we tried to save the MQ register of some machines directly into memory. */ @@ -230,18 +230,18 @@ init_save_areas () We assume that our caller has set up the elimination table to the worst (largest) possible offsets. - Set *PCHANGED to 1 if we had to allocate some memory for the save area. + Set *PCHANGED to 1 if we had to allocate some memory for the save area. Future work: In the fallback case we should iterate backwards across all possible - modes for the save, choosing the largest available one instead of + modes for the save, choosing the largest available one instead of falling back to the smallest mode immediately. (eg TF -> DF -> SF). We do not try to use "move multiple" instructions that exist - on some machines (such as the 68k moveml). It could be a win to try + on some machines (such as the 68k moveml). It could be a win to try and use them when possible. The hard part is doing it in a way that is - machine independent since they might be saving non-consecutive + machine independent since they might be saving non-consecutive registers. (imagine caller-saving d0,d1,a0,a1 on the 68k) */ int @@ -263,13 +263,13 @@ setup_save_areas (pchanged) if (reg_renumber[i] >= 0 && reg_n_calls_crossed[i] > 0) { int regno = reg_renumber[i]; - int endregno + int endregno = regno + HARD_REGNO_NREGS (regno, GET_MODE (regno_reg_rtx[i])); int nregs = endregno - regno; for (j = 0; j < nregs; j++) { - if (call_used_regs[regno+j]) + if (call_used_regs[regno+j]) SET_HARD_REG_BIT (hard_regs_used, regno+j); } } @@ -319,10 +319,10 @@ setup_save_areas (pchanged) { /* This should not depend on WORDS_BIG_ENDIAN. The order of words in regs is the same as in memory. */ - rtx temp = gen_rtx (MEM, regno_save_mode[i+k][1], + rtx temp = gen_rtx (MEM, regno_save_mode[i+k][1], XEXP (regno_save_mem[i][j], 0)); - regno_save_mem[i+k][1] + regno_save_mem[i+k][1] = adj_offsettable_operand (temp, k * UNITS_PER_WORD); } *pchanged = 1; @@ -425,7 +425,7 @@ save_call_clobbered_regs (insn_mode) test at this point because registers that die in a CALL_INSN are not live across the call and likewise for registers that are born in the CALL_INSN. - + If registers are filled with parameters for this function, and some of these are also being set by this function, then they will not appear to die (no REG_DEAD note for them), @@ -457,7 +457,7 @@ save_call_clobbered_regs (insn_mode) /* It must not be set by this instruction. */ && ! TEST_HARD_REG_BIT (this_call_sets, regno) && ! TEST_HARD_REG_BIT (hard_regs_saved, regno)) - regno += insert_save_restore (insn, 1, regno, + regno += insert_save_restore (insn, 1, regno, insn_mode, 0); /* Put the information for this CALL_INSN on top of what @@ -555,7 +555,7 @@ clear_reg_live (reg) CLEAR_HARD_REG_BIT (hard_regs_need_restore, i); CLEAR_HARD_REG_BIT (hard_regs_saved, i); } -} +} /* If any register currently residing in the save area is referenced in X, which is part of INSN, emit code to restore the register in front of INSN. @@ -608,7 +608,7 @@ restore_referenced_regs (x, insn, insn_mode) return; } - + fmt = GET_RTX_FORMAT (code); for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--) { @@ -674,7 +674,7 @@ insert_save_restore (insn, save_p, regno, insn_mode, maxrestore) int i, j, k; int ok; - /* See if we can save several registers with a single instruction. + /* See if we can save several registers with a single instruction. Work backwards to the single register case. */ for (i = MOVE_MAX / UNITS_PER_WORD; i > 0; i--) { @@ -687,7 +687,7 @@ insert_save_restore (insn, save_p, regno, insn_mode, maxrestore) || TEST_HARD_REG_BIT (hard_regs_saved, regno + j)) ok = 0; } - else + else continue; /* Must do this one save at a time */ @@ -732,10 +732,10 @@ insert_save_restore (insn, save_p, regno, insn_mode, maxrestore) /* Must do this one restore at a time */ if (! ok) continue; - + pat = gen_rtx (SET, VOIDmode, - gen_rtx (REG, GET_MODE (regno_save_mem[regno][i]), - regno), + gen_rtx (REG, GET_MODE (regno_save_mem[regno][i]), + regno), regno_save_mem[regno][i]); code = reg_restore_code[regno][i]; diff --git a/gnu/usr.bin/cc/cc_int/calls.c b/gnu/usr.bin/cc/cc_int/calls.c index b168e85..f567982 100644 --- a/gnu/usr.bin/cc/cc_int/calls.c +++ b/gnu/usr.bin/cc/cc_int/calls.c @@ -527,7 +527,7 @@ expand_call (exp, target, ignore) /* Nonzero if this is an indirect function call. */ int current_call_is_indirect = 0; - /* Nonzero if we must avoid push-insns in the args for this call. + /* Nonzero if we must avoid push-insns in the args for this call. If stack space is allocated for register parameters, but not by the caller, then it is preallocated in the fixed part of the stack frame. So the entire argument block must then be preallocated (i.e., we @@ -622,7 +622,7 @@ expand_call (exp, target, ignore) } } - /* If we don't have specific function to call, see if we have a + /* If we don't have specific function to call, see if we have a constant or `noreturn' function from the type. */ if (fndecl == 0) { @@ -1137,7 +1137,7 @@ expand_call (exp, target, ignore) / (PARM_BOUNDARY / BITS_PER_UNIT) * (PARM_BOUNDARY / BITS_PER_UNIT)); #endif - + /* Update ARGS_SIZE, the total stack space for args so far. */ args_size.constant += args[i].size.constant; @@ -1169,7 +1169,7 @@ expand_call (exp, target, ignore) reg_parm_stack_space = FINAL_REG_PARM_STACK_SPACE (args_size.constant, args_size.var); #endif - + /* Compute the actual size of the argument block required. The variable and constant sizes must be combined, the size may have to be rounded, and there may be a minimum required size. */ @@ -1316,7 +1316,7 @@ expand_call (exp, target, ignore) if (TYPE_MODE (TREE_TYPE (args[i].tree_value)) != args[i].mode) args[i].value - = convert_modes (args[i].mode, + = convert_modes (args[i].mode, TYPE_MODE (TREE_TYPE (args[i].tree_value)), args[i].value, args[i].unsignedp); @@ -1379,7 +1379,7 @@ expand_call (exp, target, ignore) Therefore, we save any area of the stack that was already written and that we are using. Here we set up to do this by making a new stack usage map from the old one. The actual save will be done - by store_one_arg. + by store_one_arg. Another approach might be to try to reorder the argument evaluations to avoid this conflicting stack usage. */ @@ -1490,7 +1490,7 @@ expand_call (exp, target, ignore) /* If we preallocated stack space, compute the address of each argument. - We need not ensure it is a valid memory address here; it will be + We need not ensure it is a valid memory address here; it will be validized when it is used. */ if (argblock) { @@ -1529,7 +1529,7 @@ expand_call (exp, target, ignore) args[i].stack_slot = gen_rtx (MEM, args[i].mode, addr); } } - + #ifdef PUSH_ARGS_REVERSED #ifdef STACK_BOUNDARY /* If we push args individually in reverse order, perform stack alignment @@ -1610,7 +1610,7 @@ expand_call (exp, target, ignore) TYPE_MODE (TREE_TYPE (args[i].tree_value)), args[i].value, args[i].unsignedp); - /* If the value is expensive, and we are inside an appropriately + /* If the value is expensive, and we are inside an appropriately short loop, put the value into a pseudo and then put the pseudo into the hard reg. @@ -1669,7 +1669,7 @@ expand_call (exp, target, ignore) stack_area = gen_rtx (MEM, save_mode, memory_address (save_mode, - + #ifdef ARGS_GROW_DOWNWARD plus_constant (argblock, - high_to_save) @@ -1692,7 +1692,7 @@ expand_call (exp, target, ignore) } } #endif - + /* Now store (and compute if necessary) all non-register parms. These come before register parms, since they can require block-moves, @@ -1809,7 +1809,7 @@ expand_call (exp, target, ignore) /* Now do the register loads required for any wholly-register parms or any parms which are passed both on the stack and in a register. Their - expressions were already evaluated. + expressions were already evaluated. Mark all register-parms as living through the call, putting these USE insns in the CALL_INSN_FUNCTION_USAGE field. */ @@ -2072,7 +2072,7 @@ expand_call (exp, target, ignore) PARM_BOUNDARY / BITS_PER_UNIT); } #endif - + /* If we saved any argument areas, restore them. */ for (i = 0; i < num_actuals; i++) if (args[i].save_area) @@ -2096,7 +2096,7 @@ expand_call (exp, target, ignore) } #endif - /* If this was alloca, record the new stack level for nonlocal gotos. + /* If this was alloca, record the new stack level for nonlocal gotos. Check for the handler slots since we might not have a save area for non-local gotos. */ @@ -2820,7 +2820,7 @@ target_for_arg (type, size, args_addr, offset) or 0 on a machine where arguments are pushed individually. MAY_BE_ALLOCA nonzero says this could be a call to `alloca' - so must be careful about how the stack is used. + so must be careful about how the stack is used. VARIABLE_SIZE nonzero says that this was a variable-sized outgoing argument stack. This is used if ACCUMULATE_OUTGOING_ARGS to indicate @@ -2927,7 +2927,7 @@ store_one_arg (arg, argblock, may_be_alloca, variable_size, fndecl, if (arg->n_aligned_regs != 0) reg = 0; #endif - + /* If this is being partially passed in a register, but multiple locations are specified, we assume that the one partially used is the one that is listed first. */ @@ -2994,7 +2994,7 @@ store_one_arg (arg, argblock, may_be_alloca, variable_size, fndecl, /* Argument is a scalar, not entirely passed in registers. (If part is passed in registers, arg->partial says how much and emit_push_insn will take care of putting it there.) - + Push it, and if its size is less than the amount of space allocated to it, also bump stack pointer by the additional space. @@ -3058,7 +3058,7 @@ store_one_arg (arg, argblock, may_be_alloca, variable_size, fndecl, /* Unless this is a partially-in-register argument, the argument is now - in the stack. + in the stack. ??? Note that this can change arg->value from arg->stack to arg->stack_slot and it matters when they are not the same. diff --git a/gnu/usr.bin/cc/cc_int/combine.c b/gnu/usr.bin/cc/cc_int/combine.c index c388c2c..268434e 100644 --- a/gnu/usr.bin/cc/cc_int/combine.c +++ b/gnu/usr.bin/cc/cc_int/combine.c @@ -57,7 +57,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ - there are extremely rare cases (see distribute_regnotes) when a REG_DEAD note is lost - a LOG_LINKS entry that refers to an insn with multiple SETs may be - removed because there is no way to know which register it was + removed because there is no way to know which register it was linking To simplify substitution, we combine only when the earlier insn(s) @@ -190,7 +190,7 @@ static HARD_REG_SET newpat_used_regs; static rtx added_links_insn; -/* This is the value of undobuf.num_undo when we started processing this +/* This is the value of undobuf.num_undo when we started processing this substitution. This will prevent gen_rtx_combine from re-used a piece from the previous expression. Doing so can produce circular rtl structures. */ @@ -498,7 +498,7 @@ combine_instructions (f, nregs) /* Compute the mapping from uids to cuids. Cuids are numbers assigned to insns, like uids, - except that cuids increase monotonically through the code. + except that cuids increase monotonically through the code. Scan all SETs and see if we can deduce anything about what bits are known to be zero for some registers and how many copies @@ -690,14 +690,14 @@ setup_incoming_promotions () /* Called via note_stores. If X is a pseudo that is used in more than one basic block, is narrower that HOST_BITS_PER_WIDE_INT, and is being set, record what bits are known zero. If we are clobbering X, - ignore this "set" because the clobbered value won't be used. + ignore this "set" because the clobbered value won't be used. If we are setting only a portion of X and we can't figure out what portion, assume all bits will be used since we don't know what will be happening. Similarly, set how many bits of X are known to be copies of the sign bit - at all locations in the function. This is the smallest number implied + at all locations in the function. This is the smallest number implied by any set of X. */ static void @@ -744,7 +744,7 @@ set_nonzero_bits_and_sign_copies (x, set) constant that would appear negative in the mode of X, sign-extend it for use in reg_nonzero_bits because some machines (maybe most) will actually do the sign-extension - and this is the conservative approach. + and this is the conservative approach. ??? For 2.5, try to tighten up the MD files in this regard instead of this kludge. */ @@ -781,7 +781,7 @@ set_nonzero_bits_and_sign_copies (x, set) Return 0 if the combination is not allowed for any reason. - If the combination is allowed, *PDEST will be set to the single + If the combination is allowed, *PDEST will be set to the single destination of INSN and *PSRC to the single source, and this function will return 1. */ @@ -800,20 +800,20 @@ can_combine_p (insn, i3, pred, succ, pdest, psrc) : next_active_insn (insn) == i3); /* Can combine only if previous insn is a SET of a REG, a SUBREG or CC0. - or a PARALLEL consisting of such a SET and CLOBBERs. + or a PARALLEL consisting of such a SET and CLOBBERs. If INSN has CLOBBER parallel parts, ignore them for our processing. By definition, these happen during the execution of the insn. When it is merged with another insn, all bets are off. If they are, in fact, needed and aren't also supplied in I3, they may be added by - recog_for_combine. Otherwise, it won't match. + recog_for_combine. Otherwise, it won't match. We can also ignore a SET whose SET_DEST is mentioned in a REG_UNUSED note. - Get the source and destination of INSN. If more than one, can't + Get the source and destination of INSN. If more than one, can't combine. */ - + if (GET_CODE (PATTERN (insn)) == SET) set = PATTERN (insn); else if (GET_CODE (PATTERN (insn)) == PARALLEL @@ -1032,7 +1032,7 @@ can_combine_p (insn, i3, pred, succ, pdest, psrc) (set (reg:DI 101) (reg:DI 100))]) Not only does this modify 100 (in which case it might still be valid - if 100 were dead in I2), it sets 101 to the ORIGINAL value of 100. + if 100 were dead in I2), it sets 101 to the ORIGINAL value of 100. We can also run into a problem if I2 sets a register that I1 uses and I1 gets directly substituted into I3 (not via I2). In that @@ -1124,7 +1124,7 @@ combinable_i3pat (i3, loc, i2dest, i1dest, i1_not_in_src, pi3dest_killed) return 0; /* If DEST is used in I3, it is being killed in this insn, - so record that for later. + so record that for later. Never add REG_DEAD notes for the FRAME_POINTER_REGNUM or the STACK_POINTER_REGNUM, since these are always considered to be live. Similarly for ARG_POINTER_REGNUM if it is fixed. */ @@ -1163,13 +1163,13 @@ combinable_i3pat (i3, loc, i2dest, i1dest, i1_not_in_src, pi3dest_killed) /* Try to combine the insns I1 and I2 into I3. Here I1 and I2 appear earlier than I3. I1 can be zero; then we combine just I2 into I3. - + It we are combining three insns and the resulting insn is not recognized, try splitting it into two insns. If that happens, I2 and I3 are retained and I1 is pseudo-deleted by turning it into a NOTE. Otherwise, I1 and I2 are pseudo-deleted. - Return 0 if the combination does not work. Then nothing is changed. + Return 0 if the combination does not work. Then nothing is changed. If we did the combination, return the insn at which combine should resume scanning. */ @@ -1308,7 +1308,7 @@ try_combine (i3, i2, i1) /* Replace the dest in I2 with our dest and make the resulting insn the new pattern for I3. Then skip to where we validate the pattern. Everything was set up above. */ - SUBST (SET_DEST (XVECEXP (p2, 0, i)), + SUBST (SET_DEST (XVECEXP (p2, 0, i)), SET_DEST (PATTERN (i3))); newpat = p2; @@ -1556,7 +1556,7 @@ try_combine (i3, i2, i1) else undobuf.other_insn = 0; } -#endif +#endif } else #endif @@ -1710,7 +1710,7 @@ try_combine (i3, i2, i1) /* If we were combining three insns and the result is a simple SET with no ASM_OPERANDS that wasn't recognized, try to split it into two - insns. There are two ways to do this. It can be split using a + insns. There are two ways to do this. It can be split using a machine-specific method (like when you have an addition of a large constant) or by combine in the function find_split_point. */ @@ -1960,7 +1960,7 @@ try_combine (i3, i2, i1) } } } - + /* Similarly, check for a case where we have a PARALLEL of two independent SETs but we started with three insns. In this case, we can do the sets as two separate insns. This case occurs when some SET allows two @@ -2048,7 +2048,7 @@ try_combine (i3, i2, i1) undobuf.other_insn, NULL_RTX, NULL_RTX, NULL_RTX); } - /* We now know that we can do this combination. Merge the insns and + /* We now know that we can do this combination. Merge the insns and update the status of registers and LOG_LINKS. */ { @@ -2179,7 +2179,7 @@ try_combine (i3, i2, i1) /* Distribute any notes added to I2 or I3 by recog_for_combine. We know these are REG_UNUSED and want them to go to the desired insn, - so we always pass it as i3. We have not counted the notes in + so we always pass it as i3. We have not counted the notes in reg_n_deaths yet, so we need to do so now. */ if (newi2pat && new_i2_notes) @@ -2187,7 +2187,7 @@ try_combine (i3, i2, i1) for (temp = new_i2_notes; temp; temp = XEXP (temp, 1)) if (GET_CODE (XEXP (temp, 0)) == REG) reg_n_deaths[REGNO (XEXP (temp, 0))]++; - + distribute_notes (new_i2_notes, i2, i2, NULL_RTX, NULL_RTX, NULL_RTX); } @@ -2196,7 +2196,7 @@ try_combine (i3, i2, i1) for (temp = new_i3_notes; temp; temp = XEXP (temp, 1)) if (GET_CODE (XEXP (temp, 0)) == REG) reg_n_deaths[REGNO (XEXP (temp, 0))]++; - + distribute_notes (new_i3_notes, i3, i3, NULL_RTX, NULL_RTX, NULL_RTX); } @@ -2259,7 +2259,7 @@ try_combine (i3, i2, i1) /* The insn that used to set this register doesn't exist, and this life of the register may not exist either. See if one of - I3's links points to an insn that sets I2DEST. If it does, + I3's links points to an insn that sets I2DEST. If it does, that is now the last known value for I2DEST. If we don't update this and I2 set the register to a value that depended on its old contents, we will get confused. If this insn is used, thing @@ -2315,7 +2315,7 @@ try_combine (i3, i2, i1) if (newi2pat) note_stores (newi2pat, set_nonzero_bits_and_sign_copies); - /* If I3 is now an unconditional jump, ensure that it has a + /* If I3 is now an unconditional jump, ensure that it has a BARRIER following it since it may have initially been a conditional jump. It may also be the last nonnote insn. */ @@ -2349,7 +2349,7 @@ undo_all () *undobuf.undo[i].where.i = undobuf.undo[i].old_contents.i; else *undobuf.undo[i].where.r = undobuf.undo[i].old_contents.r; - + } obfree (undobuf.storage); @@ -2453,7 +2453,7 @@ find_split_point (loc, insn) return split; } } - + /* If that didn't work, perhaps the first operand is complex and needs to be computed separately, so make a split point there. This will occur on machines that just support REG + CONST @@ -2518,7 +2518,7 @@ find_split_point (loc, insn) else SUBST (SET_SRC (x), gen_binary (IOR, mode, - gen_binary (AND, mode, dest, + gen_binary (AND, mode, dest, GEN_INT (~ (mask << pos) & GET_MODE_MASK (mode))), GEN_INT (src << pos))); @@ -2728,7 +2728,7 @@ find_split_point (loc, insn) the caller can tell whether the result is valid. `n_occurrences' is incremented each time FROM is replaced. - + IN_DEST is non-zero if we are processing the SET_DEST of a SET. UNIQUE_COPY is non-zero if each substitution must be unique. We do this @@ -2762,7 +2762,7 @@ subst (x, from, to, in_dest, unique_copy) } /* If X and FROM are the same register but different modes, they will - not have been seen as equal above. However, flow.c will make a + not have been seen as equal above. However, flow.c will make a LOG_LINKS entry for that case. If we do nothing, we will try to rerecognize our original insn and, when it succeeds, we will delete the feeding insn, which is incorrect. @@ -2861,7 +2861,7 @@ subst (x, from, to, in_dest, unique_copy) have gone inside a MEM, in which case we want to simplify the address. We assume here that things that are actually part of the destination have their inner - parts in the first expression. This is true for SUBREG, + parts in the first expression. This is true for SUBREG, STRICT_LOW_PART, and ZERO_EXTRACT, which are the only things aside from REG and MEM that should appear in a SET_DEST. */ @@ -2985,7 +2985,7 @@ simplify_rtx (x, op0_mode, last, in_dest) SUBST (XEXP (x, 0), gen_binary (PLUS, mode, new, temp)); } - /* If this is a simple operation applied to an IF_THEN_ELSE, try + /* If this is a simple operation applied to an IF_THEN_ELSE, try applying it to the arms of the IF_THEN_ELSE. This often simplifies things. Check for cases where both arms are testing the same condition. @@ -3016,7 +3016,7 @@ simplify_rtx (x, op0_mode, last, in_dest) rtx cop1 = const0_rtx; enum rtx_code cond_code = simplify_comparison (NE, &cond, &cop1); - /* Simplify the alternative arms; this may collapse the true and + /* Simplify the alternative arms; this may collapse the true and false arms to store-flag values. */ true = subst (true, pc_rtx, pc_rtx, 0, 0); false = subst (false, pc_rtx, pc_rtx, 0, 0); @@ -3042,7 +3042,7 @@ simplify_rtx (x, op0_mode, last, in_dest) && INTVAL (false) == - STORE_FLAG_VALUE && true == const0_rtx) x = gen_unary (NEG, mode, mode, - gen_binary (reverse_condition (cond_code), + gen_binary (reverse_condition (cond_code), mode, cond, cop1)); else return gen_rtx (IF_THEN_ELSE, mode, @@ -3108,7 +3108,7 @@ simplify_rtx (x, op0_mode, last, in_dest) rtx inner_op0 = XEXP (XEXP (x, 0), 1); rtx inner_op1 = XEXP (x, 1); rtx inner; - + /* Make sure we pass the constant operand if any as the second one if this is a commutative operation. */ if (CONSTANT_P (inner_op0) && GET_RTX_CLASS (code) == 'c') @@ -3239,7 +3239,7 @@ simplify_rtx (x, op0_mode, last, in_dest) if (temp) return temp; } - + /* If we want a subreg of a constant, at offset 0, take the low bits. On a little-endian machine, that's always valid. On a big-endian machine, it's valid @@ -3282,7 +3282,7 @@ simplify_rtx (x, op0_mode, last, in_dest) XEXP (XEXP (x, 0), 1), mode)) != 0) return gen_binary (XOR, mode, XEXP (XEXP (x, 0), 0), temp); - + /* (not (ashift 1 X)) is (rotate ~1 X). We used to do this for operands other than 1, but that is not valid. We could do a similar simplification for (not (lshiftrt C X)) where C is just the sign bit, @@ -3291,7 +3291,7 @@ simplify_rtx (x, op0_mode, last, in_dest) && XEXP (XEXP (x, 0), 0) == const1_rtx) return gen_rtx (ROTATE, mode, gen_unary (NOT, mode, mode, const1_rtx), XEXP (XEXP (x, 0), 1)); - + if (GET_CODE (XEXP (x, 0)) == SUBREG && subreg_lowpart_p (XEXP (x, 0)) && (GET_MODE_SIZE (GET_MODE (XEXP (x, 0))) @@ -3306,7 +3306,7 @@ simplify_rtx (x, op0_mode, last, in_dest) XEXP (SUBREG_REG (XEXP (x, 0)), 1)); return gen_lowpart_for_combine (mode, x); } - + #if STORE_FLAG_VALUE == -1 /* (not (comparison foo bar)) can be done by reversing the comparison code if valid. */ @@ -3357,7 +3357,7 @@ simplify_rtx (x, op0_mode, last, in_dest) return gen_rtx_combine (GET_CODE (XEXP (x, 0)) == IOR ? AND : IOR, mode, in1, in2); - } + } break; case NEG: @@ -3460,7 +3460,7 @@ simplify_rtx (x, op0_mode, last, in_dest) && subreg_lowpart_p (XEXP (x, 0)) && GET_CODE (SUBREG_REG (XEXP (x, 0))) == FLOAT_TRUNCATE) return SUBREG_REG (XEXP (x, 0)); - break; + break; #ifdef HAVE_cc0 case COMPARE: @@ -3773,13 +3773,13 @@ simplify_rtx (x, op0_mode, last, in_dest) if (new_code != code) return gen_rtx_combine (new_code, mode, op0, op1); - /* Otherwise, keep this operation, but maybe change its operands. + /* Otherwise, keep this operation, but maybe change its operands. This also converts (ne (compare FOO BAR) 0) to (ne FOO BAR). */ SUBST (XEXP (x, 0), op0); SUBST (XEXP (x, 1), op1); } break; - + case IF_THEN_ELSE: return simplify_if_then_else (x); @@ -3843,14 +3843,14 @@ simplify_rtx (x, op0_mode, last, in_dest) case ROTATERT: /* If this is a shift by a constant amount, simplify it. */ if (GET_CODE (XEXP (x, 1)) == CONST_INT) - return simplify_shift_const (x, code, mode, XEXP (x, 0), + return simplify_shift_const (x, code, mode, XEXP (x, 0), INTVAL (XEXP (x, 1))); #ifdef SHIFT_COUNT_TRUNCATED else if (SHIFT_COUNT_TRUNCATED && GET_CODE (XEXP (x, 1)) != REG) SUBST (XEXP (x, 1), force_to_mode (XEXP (x, 1), GET_MODE (x), - ((HOST_WIDE_INT) 1 + ((HOST_WIDE_INT) 1 << exact_log2 (GET_MODE_BITSIZE (GET_MODE (x)))) - 1, NULL_RTX, 0)); @@ -3880,7 +3880,7 @@ simplify_if_then_else (x) /* Simplify storing of the truth value. */ if (comparison_p && true == const_true_rtx && false == const0_rtx) return gen_binary (true_code, mode, XEXP (cond, 0), XEXP (cond, 1)); - + /* Also when the truth value has to be reversed. */ if (comparison_p && reversible_comparison_p (cond) && true == const0_rtx && false == const_true_rtx) @@ -3946,7 +3946,7 @@ simplify_if_then_else (x) the false arm is more complicated than the true arm. */ if (comparison_p && reversible_comparison_p (cond) - && (true == pc_rtx + && (true == pc_rtx || (CONSTANT_P (true) && GET_CODE (false) != CONST_INT && false != pc_rtx) || true == const0_rtx @@ -4014,7 +4014,7 @@ simplify_if_then_else (x) case LTU: return gen_binary (UMIN, mode, true, false); } - + #if STORE_FLAG_VALUE == 1 || STORE_FLAG_VALUE == -1 /* If we have (if_then_else COND (OP Z C1) Z) and OP is an identity when its @@ -4117,7 +4117,7 @@ simplify_if_then_else (x) extend_op = ZERO_EXTEND; m = GET_MODE (XEXP (t, 0)); } - + if (z) { temp = subst (gen_binary (true_code, m, cond_op0, cond_op1), @@ -4312,7 +4312,7 @@ simplify_set (x) /* If we have (set x (subreg:m1 (op:m2 ...) 0)) with OP being some operation, and X being a REG or (subreg (reg)), we may be able to convert this to - (set (subreg:m2 x) (op)). + (set (subreg:m2 x) (op)). We can always do this if M1 is narrower than M2 because that means that we only care about the low bits of the result. @@ -4321,7 +4321,7 @@ simplify_set (x) perform a narrower operation that requested since the high-order bits will be undefined. On machine where it is defined, this transformation is safe as long as M1 and M2 have the same number of words. */ - + if (GET_CODE (src) == SUBREG && subreg_lowpart_p (src) && GET_RTX_CLASS (GET_CODE (SUBREG_REG (src))) != 'o' && (((GET_MODE_SIZE (GET_MODE (src)) + (UNITS_PER_WORD - 1)) @@ -4507,7 +4507,7 @@ simplify_logical (x, last) For example, (and (ior A B) (not B)) can occur as the result of expanding a bit field assignment. When we apply the distributive law to this, we get (ior (and (A (not B))) (and (B (not B)))), - which then simplifies to (and (A (not B))). + which then simplifies to (and (A (not B))). If we have (and (ior A B) C), apply the distributive law and then the inverse distributive law to see if things simplify. */ @@ -4536,7 +4536,7 @@ simplify_logical (x, last) (gen_binary (XOR, mode, gen_binary (IOR, mode, XEXP (op0, 0), XEXP (op1, 0)), gen_binary (IOR, mode, XEXP (op0, 0), XEXP (op1, 1)))); - + else if (GET_CODE (op1) == NOT && GET_CODE (op0) == XOR) return apply_distributive_law (gen_binary (XOR, mode, @@ -4703,7 +4703,7 @@ simplify_logical (x, last) an AND operation, which is simpler, though only one operation. The function expand_compound_operation is called with an rtx expression - and will convert it to the appropriate shifts and AND operations, + and will convert it to the appropriate shifts and AND operations, simplifying at each stage. The function make_compound_operation is called to convert an expression @@ -4743,7 +4743,7 @@ expand_compound_operation (x) Reject MODEs bigger than a word, because we might not be able to reference a two-register group starting with an arbitrary register (and currently gen_lowpart might crash for a SUBREG). */ - + if (GET_MODE_SIZE (GET_MODE (XEXP (x, 0))) > UNITS_PER_WORD) return x; @@ -4797,7 +4797,7 @@ expand_compound_operation (x) We must check for the case where the left shift would have a negative count. This can happen in a case like (x >> 31) & 255 on machines that can't shift by a constant. On those machines, we would first - combine the shift with the AND to produce a variable-position + combine the shift with the AND to produce a variable-position extraction. Then the constant of 31 would be substituted in to produce a such a position. */ @@ -4820,7 +4820,7 @@ expand_compound_operation (x) else /* Any other cases we can't handle. */ return x; - + /* If we couldn't do this for some reason, return the original expression. */ @@ -4951,7 +4951,7 @@ expand_field_assignment (x) code that understands the USE is this routine. If it is not removed, it will cause the resulting insn not to match. - UNSIGNEDP is non-zero for an unsigned reference and zero for a + UNSIGNEDP is non-zero for an unsigned reference and zero for a signed reference. IN_DEST is non-zero if this is a reference in the destination of a @@ -5045,7 +5045,7 @@ make_extraction (mode, inner, pos, pos_rtx, len, { /* If INNER is a MEM, make a new MEM that encompasses just the desired field. If the original and current mode are the same, we need not - adjust the offset. Otherwise, we do if bytes big endian. + adjust the offset. Otherwise, we do if bytes big endian. If INNER is not a MEM, get a piece consisting of the just the field of interest (in this case POS must be 0). */ @@ -5086,7 +5086,7 @@ make_extraction (mode, inner, pos, pos_rtx, len, : ((HOST_WIDE_INT) 1 << len) - 1, NULL_RTX, 0); - /* If this extraction is going into the destination of a SET, + /* If this extraction is going into the destination of a SET, make a STRICT_LOW_PART unless we made a MEM. */ if (in_dest) @@ -5199,7 +5199,7 @@ make_extraction (mode, inner, pos, pos_rtx, len, /* The computations below will be correct if the machine is big endian in both bits and bytes or little endian in bits and bytes. If it is mixed, we must adjust. */ - + /* If bytes are big endian and we had a paradoxical SUBREG, we must adjust OFFSET to compensate. */ #if BYTES_BIG_ENDIAN @@ -5303,7 +5303,7 @@ extract_left_shift (x, count) if (GET_CODE (XEXP (x,1)) == CONST_INT && (INTVAL (XEXP (x, 1)) & (((HOST_WIDE_INT) 1 << count)) - 1) == 0 && (tem = extract_left_shift (XEXP (x, 0), count)) != 0) - return gen_binary (code, mode, tem, + return gen_binary (code, mode, tem, GEN_INT (INTVAL (XEXP (x, 1)) >> count)); break; @@ -5515,7 +5515,7 @@ make_compound_operation (x, in_code) If so, try to merge the shifts into a SIGN_EXTEND. We could also do this for some cases of SIGN_EXTRACT, but it doesn't seem worth the effort; the case checked for occurs on Alpha. */ - + if (GET_RTX_CLASS (GET_CODE (lhs)) != 'o' && ! (GET_CODE (lhs) == SUBREG && (GET_RTX_CLASS (GET_CODE (SUBREG_REG (lhs))) == 'o')) @@ -5525,7 +5525,7 @@ make_compound_operation (x, in_code) new = make_extraction (mode, make_compound_operation (new, next_code), 0, NULL_RTX, mode_width - INTVAL (rhs), code == LSHIFTRT, 0, in_code == COMPARE); - + break; case SUBREG: @@ -5605,7 +5605,7 @@ get_pos_from_mask (m, plen) Return a possibly simplified expression, but always convert X to MODE. If X is a CONST_INT, AND the CONST_INT with MASK. - Also, if REG is non-zero and X is a register equal in value to REG, + Also, if REG is non-zero and X is a register equal in value to REG, replace X with REG. If JUST_SELECT is nonzero, don't optimize by noticing that bits in MASK @@ -5679,7 +5679,7 @@ force_to_mode (x, mode, mask, reg, just_select) if (width > 0 && width < HOST_BITS_PER_WIDE_INT && (cval & ((HOST_WIDE_INT) 1 << (width - 1))) != 0) cval |= (HOST_WIDE_INT) -1 << width; - + return GEN_INT (cval); } @@ -5853,7 +5853,7 @@ force_to_mode (x, mode, mask, reg, just_select) if (GET_CODE (op1) == CONST_INT && (code == IOR || code == XOR) && (INTVAL (op1) & mask) != 0) op1 = GEN_INT (INTVAL (op1) & mask); - + if (op_mode != GET_MODE (x) || op0 != XEXP (x, 0) || op1 != XEXP (x, 1)) x = gen_binary (code, op_mode, op0, op1); break; @@ -5872,7 +5872,7 @@ force_to_mode (x, mode, mask, reg, just_select) && (nonzero_bits (XEXP (x, 1), GET_MODE (XEXP (x, 1))) < (unsigned HOST_WIDE_INT) GET_MODE_BITSIZE (mode)))) break; - + /* If the shift count is a constant and we can do arithmetic in the mode of the shift, refine which bits we need. Otherwise, use the conservative form of the mask. */ @@ -6011,7 +6011,7 @@ force_to_mode (x, mode, mask, reg, just_select) INTVAL (temp), reg, next_select)); } break; - + case NEG: /* If we just want the low-order bit, the NEG isn't needed since it won't change the low-order bit. */ @@ -6158,8 +6158,8 @@ if_then_else_cond (x, ptrue, pfalse) && ! side_effects_p (x)) { *ptrue = gen_binary (MULT, mode, op0, const_true_rtx); - *pfalse = gen_binary (MULT, mode, - (code == MINUS + *pfalse = gen_binary (MULT, mode, + (code == MINUS ? gen_unary (NEG, mode, mode, op1) : op1), const_true_rtx); return cond0; @@ -6232,7 +6232,7 @@ if_then_else_cond (x, ptrue, pfalse) || ((cond0 = get_last_value (x)) != 0 && CONSTANT_P (cond0))) ; - /* If X is known to be either 0 or -1, those are the true and + /* If X is known to be either 0 or -1, those are the true and false values when testing X. */ else if (num_sign_bit_copies (x, mode) == size) { @@ -6379,7 +6379,7 @@ make_field_assignment (x) else if (GET_CODE (src) == AND && GET_CODE (XEXP (src, 0)) == SUBREG && subreg_lowpart_p (XEXP (src, 0)) - && (GET_MODE_SIZE (GET_MODE (XEXP (src, 0))) + && (GET_MODE_SIZE (GET_MODE (XEXP (src, 0))) < GET_MODE_SIZE (GET_MODE (SUBREG_REG (XEXP (src, 0))))) && GET_CODE (SUBREG_REG (XEXP (src, 0))) == ROTATE && INTVAL (XEXP (SUBREG_REG (XEXP (src, 0)), 0)) == -2 @@ -6440,7 +6440,7 @@ make_field_assignment (x) /* The mode to use for the source is the mode of the assignment, or of what is inside a possible STRICT_LOW_PART. */ - mode = (GET_CODE (assign) == STRICT_LOW_PART + mode = (GET_CODE (assign) == STRICT_LOW_PART ? GET_MODE (XEXP (assign, 0)) : GET_MODE (assign)); /* Shift OTHER right POS places and make it the source, restricting it @@ -6626,7 +6626,7 @@ simplify_and_const_int (x, mode, varop, constop) if (GET_CODE (varop) == NEG && nonzero_bits (XEXP (varop, 0), mode) == 1 && (i = exact_log2 (constop)) >= 0) return simplify_shift_const (NULL_RTX, ASHIFT, mode, XEXP (varop, 0), i); - + /* If VAROP is an IOR or XOR, apply the AND to both branches of the IOR or XOR, then try to apply the distributive law. This may eliminate operations if either branch can be simplified because of the AND. @@ -6713,7 +6713,7 @@ nonzero_bits (x, mode) #ifndef WORD_REGISTER_OPERATIONS /* If MODE is wider than X, but both are a single word for both the host - and target machines, we can compute this from which bits of the + and target machines, we can compute this from which bits of the object might be nonzero in its own mode, taking into account the fact that on many CISC machines, accessing an object in a wider mode causes the high-order bits to become undefined. So they are @@ -6773,7 +6773,7 @@ nonzero_bits (x, mode) constant that would appear negative in the mode of X, sign-extend it for use in reg_nonzero_bits because some machines (maybe most) will actually do the sign-extension - and this is the conservative approach. + and this is the conservative approach. ??? For 2.5, try to tighten up the MD files in this regard instead of this kludge. */ @@ -7074,7 +7074,7 @@ num_sign_bit_copies (x, mode) if (bitwidth < GET_MODE_BITSIZE (GET_MODE (x))) return MAX (1, (num_sign_bit_copies (x, GET_MODE (x)) - (GET_MODE_BITSIZE (GET_MODE (x)) - bitwidth))); - + #ifndef WORD_REGISTER_OPERATIONS /* If this machine does not do all register operations on the entire register and MODE is wider than the mode of X, we can say nothing @@ -7155,7 +7155,7 @@ num_sign_bit_copies (x, mode) return MAX (1, bitwidth - INTVAL (XEXP (x, 1))); break; - case SIGN_EXTEND: + case SIGN_EXTEND: return (bitwidth - GET_MODE_BITSIZE (GET_MODE (XEXP (x, 0))) + num_sign_bit_copies (XEXP (x, 0), VOIDmode)); @@ -7224,7 +7224,7 @@ num_sign_bit_copies (x, mode) num0 = num_sign_bit_copies (XEXP (x, 0), mode); num1 = num_sign_bit_copies (XEXP (x, 1), mode); return MAX (1, MIN (num0, num1) - 1); - + case MULT: /* The number of bits of the product is the sum of the number of bits of both terms. However, unless one of the terms if known @@ -7355,7 +7355,7 @@ extended_count (x, mode, unsignedp) (with *POP0 being done last). Return 1 if we can do the operation and update *POP0 and *PCONST0 with - the resulting operation. *PCOMP_P is set to 1 if we would need to + the resulting operation. *PCOMP_P is set to 1 if we would need to complement the innermost operand, otherwise it is unchanged. MODE is the mode in which the operation will be done. No bits outside @@ -7549,7 +7549,7 @@ simplify_shift_const (x, code, result_mode, varop, count) Since these shifts are being produced by the compiler by combining multiple operations, each of which are defined, we know what the result is supposed to be. */ - + if (count > GET_MODE_BITSIZE (shift_mode) - 1) { if (code == ASHIFTRT) @@ -7658,7 +7658,7 @@ simplify_shift_const (x, code, result_mode, varop, count) new = XEXP (varop, 0); #else new = copy_rtx (XEXP (varop, 0)); - SUBST (XEXP (new, 0), + SUBST (XEXP (new, 0), plus_constant (XEXP (new, 0), count / BITS_PER_UNIT)); #endif @@ -7713,7 +7713,7 @@ simplify_shift_const (x, code, result_mode, varop, count) break; case ASHIFTRT: - /* If we are extracting just the sign bit of an arithmetic right + /* If we are extracting just the sign bit of an arithmetic right shift, that shift is not needed. */ if (code == LSHIFTRT && count == GET_MODE_BITSIZE (result_mode) - 1) { @@ -7751,7 +7751,7 @@ simplify_shift_const (x, code, result_mode, varop, count) - GET_MODE_BITSIZE (GET_MODE (varop))) == count) { /* C3 has the low-order C1 bits zero. */ - + mask = (GET_MODE_MASK (mode) & ~ (((HOST_WIDE_INT) 1 << first_count) - 1)); @@ -7763,11 +7763,11 @@ simplify_shift_const (x, code, result_mode, varop, count) code = ASHIFTRT; continue; } - + /* If this was (ashiftrt (ashift foo C1) C2) and FOO has more than C1 high-order bits equal to the sign bit, we can convert this to either an ASHIFT or a ASHIFTRT depending on the - two counts. + two counts. We cannot do this if VAROP's mode is not SHIFT_MODE. */ @@ -7818,7 +7818,7 @@ simplify_shift_const (x, code, result_mode, varop, count) break; /* To compute the mask to apply after the shift, shift the - nonzero bits of the inner shift the same way the + nonzero bits of the inner shift the same way the outer shift will. */ mask_rtx = GEN_INT (nonzero_bits (varop, GET_MODE (varop))); @@ -7826,7 +7826,7 @@ simplify_shift_const (x, code, result_mode, varop, count) mask_rtx = simplify_binary_operation (code, result_mode, mask_rtx, GEN_INT (count)); - + /* Give up if we can't compute an outer operation to use. */ if (mask_rtx == 0 || GET_CODE (mask_rtx) != CONST_INT @@ -7843,7 +7843,7 @@ simplify_shift_const (x, code, result_mode, varop, count) else count -= first_count; - /* If COUNT is positive, the new shift is usually CODE, + /* If COUNT is positive, the new shift is usually CODE, except for the two exceptions below, in which case it is FIRST_CODE. If the count is negative, FIRST_CODE should always be used */ @@ -8139,7 +8139,7 @@ simplify_shift_const (x, code, result_mode, varop, count) if (orig_code == LSHIFTRT && result_mode != shift_mode) x = simplify_and_const_int (NULL_RTX, shift_mode, x, GET_MODE_MASK (result_mode) >> orig_count); - + /* Do the remainder of the processing in RESULT_MODE. */ x = gen_lowpart_for_combine (result_mode, x); @@ -8166,7 +8166,7 @@ simplify_shift_const (x, code, result_mode, varop, count) } return x; -} +} /* Like recog, but we receive the address of a pointer to a new pattern. We try to match the rtx that the pointer points to. @@ -8455,11 +8455,11 @@ gen_binary (code, mode, op0, op1) || (CONSTANT_P (op0) && GET_CODE (op1) != CONST_INT))) tem = op0, op0 = op1, op1 = tem; - if (GET_RTX_CLASS (code) == '<') + if (GET_RTX_CLASS (code) == '<') { enum machine_mode op_mode = GET_MODE (op0); - /* Strip the COMPARE from (REL_OP (compare X Y) 0) to get + /* Strip the COMPARE from (REL_OP (compare X Y) 0) to get just (REL_OP X Y). */ if (GET_CODE (op0) == COMPARE && op1 == const0_rtx) { @@ -8614,7 +8614,7 @@ simplify_comparison (code, pop0, pop1) HOST_WIDE_INT c0 = INTVAL (XEXP (op0, 1)); HOST_WIDE_INT c1 = INTVAL (XEXP (op1, 1)); int changed = 0; - + if (GET_CODE (inner_op0) == SUBREG && GET_CODE (inner_op1) == SUBREG && (GET_MODE_SIZE (GET_MODE (inner_op0)) > GET_MODE_SIZE (GET_MODE (SUBREG_REG (inner_op0)))) @@ -8665,7 +8665,7 @@ simplify_comparison (code, pop0, pop1) else break; } - + /* If the first operand is a constant, swap the operands and adjust the comparison code appropriately. */ if (CONSTANT_P (op0)) @@ -8734,7 +8734,7 @@ simplify_comparison (code, pop0, pop1) } /* Do some canonicalizations based on the comparison code. We prefer - comparisons against zero and then prefer equality comparisons. + comparisons against zero and then prefer equality comparisons. If we can reduce the size of a constant, we will do that too. */ switch (code) @@ -8891,7 +8891,7 @@ simplify_comparison (code, pop0, pop1) case ZERO_EXTRACT: /* If we are extracting a single bit from a variable position in a constant that has only a single bit set and are comparing it - with zero, we can convert this into an equality comparison + with zero, we can convert this into an equality comparison between the position and the location of the single bit. We can't do this if bit endian and we don't have an extzv since we then can't know what mode to use for the endianness adjustment. */ @@ -9023,11 +9023,11 @@ simplify_comparison (code, pop0, pop1) continue; } break; - + case SIGN_EXTEND: /* Can simplify (compare (zero/sign_extend FOO) CONST) - to (compare FOO CONST) if CONST fits in FOO's mode and we + to (compare FOO CONST) if CONST fits in FOO's mode and we are either testing inequality or have an unsigned comparison with ZERO_EXTEND or a signed comparison with SIGN_EXTEND. */ if (! unsigned_comparison_p @@ -9555,7 +9555,7 @@ update_table_tick (x) return; } - + for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--) /* Note that we can't have an "E" in values stored; see get_last_value_validate. */ @@ -9588,7 +9588,7 @@ record_value_for_reg (reg, insn, value) /* Set things up so get_last_value is allowed to see anything set up to our insn. */ subst_low_cuid = INSN_CUID (insn); - tem = get_last_value (reg); + tem = get_last_value (reg); if (tem) value = replace_rtx (copy_rtx (value), reg, tem); @@ -9900,7 +9900,7 @@ use_crosses_set_p (x, from_cuid) register int regno = REGNO (x); int endreg = regno + (regno < FIRST_PSEUDO_REGISTER ? HARD_REGNO_NREGS (regno, GET_MODE (x)) : 1); - + #ifdef PUSH_ROUNDING /* Don't allow uses of the stack pointer to be moved, because we don't know whether the move crosses a push insn. */ @@ -9943,7 +9943,7 @@ static int reg_dead_flag; /* Function called via note_stores from reg_dead_at_p. - If DEST is within [reg_dead_rengno, reg_dead_endregno), set + If DEST is within [reg_dead_rengno, reg_dead_endregno), set reg_dead_flag to 1 if X is a CLOBBER and to -1 it is a SET. */ static void @@ -9957,7 +9957,7 @@ reg_dead_at_p_1 (dest, x) return; regno = REGNO (dest); - endregno = regno + (regno < FIRST_PSEUDO_REGISTER + endregno = regno + (regno < FIRST_PSEUDO_REGISTER ? HARD_REGNO_NREGS (regno, GET_MODE (dest)) : 1); if (reg_dead_endregno > regno && reg_dead_regno < endregno) @@ -10153,7 +10153,7 @@ remove_death (regno, insn) /* For each register (hardware or pseudo) used within expression X, if its death is in an instruction with cuid between FROM_CUID (inclusive) and TO_INSN (exclusive), put a REG_DEAD note for that register in the - list headed by PNOTES. + list headed by PNOTES. This is done when X is being merged by combination into TO_INSN. These notes will then be distributed as needed. */ @@ -10322,7 +10322,7 @@ reg_bitfield_target_p (x, body) return 1; return 0; -} +} /* Given a chain of REG_NOTES originally from FROM_INSN, try to place them as appropriate. I3 and I2 are the insns resulting from the combination @@ -10496,11 +10496,11 @@ distribute_notes (notes, from_insn, i3, i2, elim_i2, elim_i1) if (XEXP (note, 0) == elim_i2 || XEXP (note, 0) == elim_i1) break; - /* If the register is used in both I2 and I3 and it dies in I3, + /* If the register is used in both I2 and I3 and it dies in I3, we might have added another reference to it. If reg_n_refs - was 2, bump it to 3. This has to be correct since the + was 2, bump it to 3. This has to be correct since the register must have been set somewhere. The reason this is - done is because local-alloc.c treats 2 references as a + done is because local-alloc.c treats 2 references as a special case. */ if (place == i3 && i2 != 0 && GET_CODE (XEXP (note, 0)) == REG @@ -10528,7 +10528,7 @@ distribute_notes (notes, from_insn, i3, i2, elim_i2, elim_i1) && rtx_equal_p (XEXP (note, 0), SET_DEST (set))) { /* Move the notes and links of TEM elsewhere. - This might delete other dead insns recursively. + This might delete other dead insns recursively. First set the pattern to something that won't use any register. */ @@ -10564,13 +10564,13 @@ distribute_notes (notes, from_insn, i3, i2, elim_i2, elim_i1) } /* If the register is set or already dead at PLACE, we needn't do - anything with this note if it is still a REG_DEAD note. + anything with this note if it is still a REG_DEAD note. Note that we cannot use just `dead_or_set_p' here since we can convert an assignment to a register into a bit-field assignment. - Therefore, we must also omit the note if the register is the + Therefore, we must also omit the note if the register is the target of a bitfield assignment. */ - + if (place && REG_NOTE_KIND (note) == REG_DEAD) { int regno = REGNO (XEXP (note, 0)); @@ -10727,7 +10727,7 @@ distribute_links (links) /* If the insn that this link points to is a NOTE or isn't a single set, ignore it. In the latter case, it isn't clear what we - can do other than ignore the link, since we can't tell which + can do other than ignore the link, since we can't tell which register it was for. Such links wouldn't be used by combine anyway. @@ -10791,7 +10791,7 @@ distribute_links (links) /* Set added_links_insn to the earliest insn we added a link to. */ - if (added_links_insn == 0 + if (added_links_insn == 0 || INSN_CUID (added_links_insn) > INSN_CUID (place)) added_links_insn = place; } diff --git a/gnu/usr.bin/cc/cc_int/convert.c b/gnu/usr.bin/cc/cc_int/convert.c index 2cb5990..900f9c5 100644 --- a/gnu/usr.bin/cc/cc_int/convert.c +++ b/gnu/usr.bin/cc/cc_int/convert.c @@ -37,7 +37,7 @@ convert_to_pointer (type, expr) { register tree intype = TREE_TYPE (expr); register enum tree_code form = TREE_CODE (intype); - + if (integer_zerop (expr)) { if (type == TREE_TYPE (null_pointer_node)) @@ -381,7 +381,7 @@ convert_to_integer (type, expr) to push the narrowing down through the conditional. */ return fold (build (COND_EXPR, type, TREE_OPERAND (expr, 0), - convert (type, TREE_OPERAND (expr, 1)), + convert (type, TREE_OPERAND (expr, 1)), convert (type, TREE_OPERAND (expr, 2)))); } } @@ -415,7 +415,7 @@ convert_to_complex (type, expr) { register enum tree_code form = TREE_CODE (TREE_TYPE (expr)); tree subtype = TREE_TYPE (type); - + if (form == REAL_TYPE || form == INTEGER_TYPE || form == ENUMERAL_TYPE) { expr = convert (subtype, expr); @@ -453,7 +453,7 @@ convert_to_complex (type, expr) error ("pointer value used where a complex was expected"); else error ("aggregate value used where a complex was expected"); - + return build (COMPLEX_EXPR, type, convert (subtype, integer_zero_node), convert (subtype, integer_zero_node)); diff --git a/gnu/usr.bin/cc/cc_int/cse.c b/gnu/usr.bin/cc/cc_int/cse.c index 75c2fb9..89643e0 100644 --- a/gnu/usr.bin/cc/cc_int/cse.c +++ b/gnu/usr.bin/cc/cc_int/cse.c @@ -59,7 +59,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ is to keep it in a hash table. Registers and "quantity numbers": - + At the start of each basic block, all of the (hardware and pseudo) registers used in the function are given distinct quantity numbers to indicate their contents. During scan, when the code @@ -91,7 +91,7 @@ Registers and "quantity numbers": any mode, two REG expressions might be equivalent in the hash table but not have the same quantity number if the quantity number of one of the registers is not the same mode as those expressions. - + Constants and quantity numbers When a quantity has a known constant value, that value is stored @@ -186,7 +186,7 @@ Related expressions: is also entered. These are made to point at each other so that it is possible to find out if there exists any register equivalent to an expression related to a given expression. */ - + /* One plus largest register number used in this function. */ static int max_reg; @@ -201,7 +201,7 @@ static int max_qty; static int next_qty; -/* Indexed by quantity number, gives the first (or last) (pseudo) register +/* Indexed by quantity number, gives the first (or last) (pseudo) register in the chain of registers that currently contain this quantity. */ static int *qty_first_reg; @@ -296,7 +296,7 @@ static int *reg_tick; static int *reg_in_table; -/* A HARD_REG_SET containing all the hard registers for which there is +/* A HARD_REG_SET containing all the hard registers for which there is currently a REG expression in the hash table. Note the difference from the above variables, which indicate if the REG is mentioned in some expression in the table. */ @@ -500,7 +500,7 @@ static int n_elements_made; static int max_elements_made; -/* Surviving equivalence class when two equivalence classes are merged +/* Surviving equivalence class when two equivalence classes are merged by recording the effects of a jump in the last insn. Zero if the last insn was not a conditional jump. */ @@ -735,7 +735,7 @@ rtx_cost (x, outer_code) return 2; #ifdef RTX_COSTS RTX_COSTS (x, code, outer_code); -#endif +#endif CONST_COSTS (x, code, outer_code); } @@ -1096,7 +1096,7 @@ remove_from_table (elt, hash) elt->first_same_value = 0; /* Remove the table element from its equivalence class. */ - + { register struct table_elt *prev = elt->prev_same_value; register struct table_elt *next = elt->next_same_value; @@ -1231,7 +1231,7 @@ lookup_as_function (x, code) && exp_equiv_p (p->exp, p->exp, 1, 0)) return p->exp; } - + return 0; } @@ -1459,10 +1459,10 @@ merge_equiv_classes (class1, class2) hash_arg_in_memory = 0; hash_arg_in_struct = 0; hash = HASH (exp, mode); - + if (GET_CODE (exp) == REG) delete_reg_equiv (REGNO (exp)); - + remove_from_table (elt, hash); if (insert_regs (exp, class1, 0)) @@ -2374,7 +2374,7 @@ refers_to_mem_p (x, base, start, end) &mybase, &mystart, &myend); - /* refers_to_mem_p is never called with varying addresses. + /* refers_to_mem_p is never called with varying addresses. If the base addresses are not equal, there is no chance of the memory addresses conflicting. */ if (! rtx_equal_p (mybase, base)) @@ -2587,7 +2587,7 @@ find_best_addr (insn, loc) if (GET_CODE (addr) != REG && validate_change (insn, loc, fold_rtx (addr, insn), 0)) addr = *loc; - + /* If this address is not in the hash table, we can't look for equivalences of the whole address. Also, ignore if volatile. */ @@ -2633,7 +2633,7 @@ find_best_addr (insn, loc) { int best_addr_cost = ADDRESS_COST (*loc); int best_rtx_cost = (elt->cost + 1) >> 1; - struct table_elt *best_elt = elt; + struct table_elt *best_elt = elt; found_better = 0; for (p = elt->first_same_value; p; p = p->next_same_value) @@ -2701,7 +2701,7 @@ find_best_addr (insn, loc) { int best_addr_cost = ADDRESS_COST (*loc); int best_rtx_cost = (COST (*loc) + 1) >> 1; - struct table_elt *best_elt = elt; + struct table_elt *best_elt = elt; rtx best_rtx = *loc; int count; @@ -3589,7 +3589,7 @@ simplify_binary_operation (code, mode, op0, op1) } /* If one of the operands is a PLUS or a MINUS, see if we can - simplify this by the associative law. + simplify this by the associative law. Don't use the associative law for floating point. The inaccuracy makes it nonassociative, and subtle programs can break if operations are associated. */ @@ -3617,7 +3617,7 @@ simplify_binary_operation (code, mode, op0, op1) /* Do nothing here. */ #endif break; - + case MINUS: /* None of these optimizations can be done for IEEE floating point. */ @@ -3704,7 +3704,7 @@ simplify_binary_operation (code, mode, op0, op1) return cse_gen_binary (PLUS, mode, op0, XEXP (op1, 0)); /* If one of the operands is a PLUS or a MINUS, see if we can - simplify this by the associative law. + simplify this by the associative law. Don't use the associative law for floating point. The inaccuracy makes it nonassociative, and subtle programs can break if operations are associated. */ @@ -3853,10 +3853,10 @@ simplify_binary_operation (code, mode, op0, op1) { #if defined (REAL_ARITHMETIC) REAL_ARITHMETIC (d, rtx_to_tree_code (DIV), dconst1, d); - return gen_rtx (MULT, mode, op0, + return gen_rtx (MULT, mode, op0, CONST_DOUBLE_FROM_REAL_VALUE (d, mode)); #else - return gen_rtx (MULT, mode, op0, + return gen_rtx (MULT, mode, op0, CONST_DOUBLE_FROM_REAL_VALUE (1./d, mode)); #endif } @@ -3898,14 +3898,14 @@ simplify_binary_operation (code, mode, op0, op1) break; case SMIN: - if (width <= HOST_BITS_PER_WIDE_INT && GET_CODE (op1) == CONST_INT + if (width <= HOST_BITS_PER_WIDE_INT && GET_CODE (op1) == CONST_INT && INTVAL (op1) == (HOST_WIDE_INT) 1 << (width -1) && ! side_effects_p (op0)) return op1; else if (rtx_equal_p (op0, op1) && ! side_effects_p (op0)) return op0; break; - + case SMAX: if (width <= HOST_BITS_PER_WIDE_INT && GET_CODE (op1) == CONST_INT && (INTVAL (op1) @@ -3922,7 +3922,7 @@ simplify_binary_operation (code, mode, op0, op1) else if (rtx_equal_p (op0, op1) && ! side_effects_p (op0)) return op0; break; - + case UMAX: if (op1 == constm1_rtx && ! side_effects_p (op0)) return op1; @@ -3933,7 +3933,7 @@ simplify_binary_operation (code, mode, op0, op1) default: abort (); } - + return 0; } @@ -4134,7 +4134,7 @@ simplify_plus_minus (code, mode, op0, op1) int i, j; bzero ((char *) ops, sizeof ops); - + /* Set up the two operands and then expand them until nothing has been changed. If we run out of room in our array, give up; this should almost never happen. */ @@ -4287,7 +4287,7 @@ simplify_plus_minus (code, mode, op0, op1) return negate ? gen_rtx (NEG, mode, result) : result; } -/* Make a binary operation by properly ordering the operands and +/* Make a binary operation by properly ordering the operands and seeing if the expression folds. */ static rtx @@ -4394,7 +4394,7 @@ simplify_relational_operation (code, mode, op0, op1) { REAL_VALUE_TYPE d0, d1; jmp_buf handler; - + if (setjmp (handler)) return 0; @@ -4428,7 +4428,7 @@ simplify_relational_operation (code, mode, op0, op1) l0u = l0s = INTVAL (op0); h0u = 0, h0s = l0s < 0 ? -1 : 0; } - + if (GET_CODE (op1) == CONST_DOUBLE) { l1u = l1s = CONST_DOUBLE_LOW (op1); @@ -4637,7 +4637,7 @@ simplify_ternary_operation (code, mode, op0_mode, op0, op1, op2) static rtx fold_rtx (x, insn) rtx x; - rtx insn; + rtx insn; { register enum rtx_code code; register enum machine_mode mode; @@ -4773,7 +4773,7 @@ fold_rtx (x, insn) extra bits will be. But we can find an equivalence for this SUBREG by folding that operation is the narrow mode. This allows us to fold arithmetic in narrow modes when the machine only supports - word-sized arithmetic. + word-sized arithmetic. Also look for a case where we have a SUBREG whose operand is the same as our result. If both modes are smaller than a word, we @@ -4846,7 +4846,7 @@ fold_rtx (x, insn) if (op1) op1 = equiv_constant (op1); - /* If we are looking for the low SImode part of + /* If we are looking for the low SImode part of (ashift:DI c (const_int 32)), it doesn't work to compute that in SImode, because a 32-bit shift in SImode is unpredictable. We know the value is 0. */ @@ -4856,7 +4856,7 @@ fold_rtx (x, insn) && INTVAL (op1) >= GET_MODE_BITSIZE (mode)) { if (INTVAL (op1) < GET_MODE_BITSIZE (GET_MODE (elt->exp))) - + /* If the count fits in the inner mode's width, but exceeds the outer mode's width, the value will get truncated to 0 @@ -4973,7 +4973,7 @@ fold_rtx (x, insn) { rtx label = XEXP (base, 0); rtx table_insn = NEXT_INSN (label); - + if (table_insn && GET_CODE (table_insn) == JUMP_INSN && GET_CODE (PATTERN (table_insn)) == ADDR_VEC) { @@ -5001,7 +5001,7 @@ fold_rtx (x, insn) if (GET_MODE (table) != Pmode) new = gen_rtx (TRUNCATE, GET_MODE (table), new); - /* Indicate this is a constant. This isn't a + /* Indicate this is a constant. This isn't a valid form of CONST, but it will only be used to fold the next insns and then discarded, so it should be safe. */ @@ -5199,7 +5199,7 @@ fold_rtx (x, insn) new = gen_rtx (CONST, mode, new); } break; - + case '<': /* See what items are actually being compared and set FOLDED_ARG[01] to those values and CODE to the actual comparison code. If any are @@ -5604,7 +5604,7 @@ equiv_constant (x) /* Assuming that X is an rtx (e.g., MEM, REG or SUBREG) for a fixed-point number, return an rtx (MEM, SUBREG, or CONST_INT) that refers to the least-significant part of X. - MODE specifies how big a part of X to return. + MODE specifies how big a part of X to return. If the requested operation cannot be done, 0 is returned. @@ -5651,7 +5651,7 @@ gen_lowpart_if_possible (mode, x) branch. It will be zero if not. In certain cases, this can cause us to add an equivalence. For example, - if we are following the taken case of + if we are following the taken case of if (i == 2) we can add the fact that `i' and '2' are now equivalent. @@ -5747,7 +5747,7 @@ record_jump_cond (code, mode, op0, op1, reversed_nonequality) reversed_nonequality); } - /* Similarly, if this is an NE comparison, and either is a SUBREG + /* Similarly, if this is an NE comparison, and either is a SUBREG making a smaller mode, we know the whole thing is also NE. */ /* Note that GET_MODE (op0) may not equal MODE; @@ -5798,7 +5798,7 @@ record_jump_cond (code, mode, op0, op1, reversed_nonequality) op1_hash = HASH (op1, mode); op1_in_memory = hash_arg_in_memory; op1_in_struct = hash_arg_in_struct; - + if (do_not_record) return; @@ -5922,7 +5922,7 @@ record_jump_cond (code, mode, op0, op1, reversed_nonequality) First simplify sources and addresses of all assignments in the instruction, using previously-computed equivalents values. Then install the new sources and destinations in the table - of available values. + of available values. If IN_LIBCALL_BLOCK is nonzero, don't record any equivalence made in the insn. */ @@ -5945,9 +5945,9 @@ struct set rtx inner_dest; /* Place where the pointer to the INNER_DEST was found. */ rtx *inner_dest_loc; - /* Nonzero if the SET_SRC is in memory. */ + /* Nonzero if the SET_SRC is in memory. */ char src_in_memory; - /* Nonzero if the SET_SRC is in a structure. */ + /* Nonzero if the SET_SRC is in a structure. */ char src_in_struct; /* Nonzero if the SET_SRC contains something whose value cannot be predicted and understood. */ @@ -6067,7 +6067,7 @@ cse_insn (insn, in_libcall_block) invalidate (XEXP (clobbered, 0), GET_MODE (clobbered)); } } - + for (i = 0; i < lim; i++) { register rtx y = XVECEXP (x, 0, i); @@ -6191,7 +6191,7 @@ cse_insn (insn, in_libcall_block) group and see if they all work. Note that this will cause some canonicalizations that would have worked individually not to be applied because some other canonicalization didn't work, but this should not - occur often. + occur often. The result of apply_change_group can be ignored; see canon_reg. */ @@ -6359,7 +6359,7 @@ cse_insn (insn, in_libcall_block) if (src_const == 0 && (CONSTANT_P (src_folded) - /* Consider (minus (label_ref L1) (label_ref L2)) as + /* Consider (minus (label_ref L1) (label_ref L2)) as "constant" here so we will record it. This allows us to fold switch statements when an ADDR_DIFF_VEC is used. */ || (GET_CODE (src_folded) == MINUS @@ -6404,7 +6404,7 @@ cse_insn (insn, in_libcall_block) { if (elt->first_same_value != src_related_elt->first_same_value) - /* This can occur when we previously saw a CONST + /* This can occur when we previously saw a CONST involving a SYMBOL_REF and then see the SYMBOL_REF twice. Merge the involved classes. */ merge_equiv_classes (elt, src_related_elt); @@ -6496,7 +6496,7 @@ cse_insn (insn, in_libcall_block) if it has, we can use a subreg of that. Many CISC machines also have such operations, but this is only likely to be beneficial these machines. */ - + if (flag_expensive_optimizations && src_related == 0 && (GET_MODE_SIZE (mode) < UNITS_PER_WORD) && GET_MODE_CLASS (mode) == MODE_INT @@ -6504,39 +6504,39 @@ cse_insn (insn, in_libcall_block) && LOAD_EXTEND_OP (mode) != NIL) { enum machine_mode tmode; - + /* Set what we are trying to extend and the operation it might have been extended with. */ PUT_CODE (memory_extend_rtx, LOAD_EXTEND_OP (mode)); XEXP (memory_extend_rtx, 0) = src; - + for (tmode = GET_MODE_WIDER_MODE (mode); GET_MODE_SIZE (tmode) <= UNITS_PER_WORD; tmode = GET_MODE_WIDER_MODE (tmode)) { struct table_elt *larger_elt; - + PUT_MODE (memory_extend_rtx, tmode); - larger_elt = lookup (memory_extend_rtx, + larger_elt = lookup (memory_extend_rtx, HASH (memory_extend_rtx, tmode), tmode); if (larger_elt == 0) continue; - + for (larger_elt = larger_elt->first_same_value; larger_elt; larger_elt = larger_elt->next_same_value) if (GET_CODE (larger_elt->exp) == REG) { - src_related = gen_lowpart_if_possible (mode, + src_related = gen_lowpart_if_possible (mode, larger_elt->exp); break; } - + if (src_related) break; } } #endif /* LOAD_EXTEND_OP */ - + if (src == src_folded) src_folded = 0; @@ -6624,7 +6624,7 @@ cse_insn (insn, in_libcall_block) cheaper even though it looks more expensive. */ if (dest == pc_rtx && src_const && GET_CODE (src_const) == LABEL_REF) src_folded = src_const, src_folded_cost = -1; - + /* Terminate loop when replacement made. This must terminate since the current contents will be tested and will always be valid. */ while (1) @@ -6634,8 +6634,8 @@ cse_insn (insn, in_libcall_block) /* Skip invalid entries. */ while (elt && GET_CODE (elt->exp) != REG && ! exp_equiv_p (elt->exp, elt->exp, 1, 0)) - elt = elt->next_same_value; - + elt = elt->next_same_value; + if (elt) src_elt_cost = elt->cost; /* Find cheapest and skip it for the next time. For items @@ -6696,7 +6696,7 @@ cse_insn (insn, in_libcall_block) cse_jumps_altered = 1; break; } - + /* Look for a substitution that makes a valid insn. */ else if (validate_change (insn, &SET_SRC (sets[i].rtl), trial, 0)) { @@ -6710,7 +6710,7 @@ cse_insn (insn, in_libcall_block) break; } - /* If we previously found constant pool entries for + /* If we previously found constant pool entries for constants and this is a constant, try making a pool entry. Put it in src_folded unless we already have done this since that is where it likely came from. */ @@ -6787,7 +6787,7 @@ cse_insn (insn, in_libcall_block) && GET_CODE (src_const) != REG) { tem = find_reg_note (insn, REG_EQUAL, NULL_RTX); - + /* Record the actual constant value in a REG_EQUAL note, making a new one if one does not already exist. */ if (tem) @@ -7098,7 +7098,7 @@ cse_insn (insn, in_libcall_block) invalidate_from_clobbers (&writes_memory, x); - /* Some registers are invalidated by subroutine calls. Memory is + /* Some registers are invalidated by subroutine calls. Memory is invalidated by non-constant calls. */ if (GET_CODE (insn) == CALL_INSN) @@ -7238,7 +7238,7 @@ cse_insn (insn, in_libcall_block) However, BAR may have equivalences for which gen_lowpart_if_possible will produce a simpler value than gen_lowpart_if_possible applied to BAR (e.g., if BAR was ZERO_EXTENDed from M2), so we will scan all - BAR's equivalences. If we don't get a simplified form, make + BAR's equivalences. If we don't get a simplified form, make the SUBREG. It will not be used in an equivalence, but will cause two similar assignments to be detected. @@ -7289,7 +7289,7 @@ cse_insn (insn, in_libcall_block) src_elt->in_struct = elt->in_struct; } else if (classp && classp != src_elt->first_same_value) - /* Show that two things that we've seen before are + /* Show that two things that we've seen before are actually the same. */ merge_equiv_classes (src_elt, classp); @@ -7300,7 +7300,7 @@ cse_insn (insn, in_libcall_block) /* Special handling for (set REG0 REG1) where REG0 is the "cheapest", cheaper than REG1. - After cse, REG1 will probably not be used in the sequel, + After cse, REG1 will probably not be used in the sequel, so (if easily done) change this insn to (set REG1 REG0) and replace REG1 with REG0 in the previous insn that computed their value. Then REG1 will become a dead store and won't cloud the situation @@ -7924,7 +7924,7 @@ cse_end_of_basic_block (insn, data, follow_jumps, after_loop, skip_blocks) nsets += XVECLEN (PATTERN (p), 0); else if (GET_CODE (p) != NOTE) nsets += 1; - + /* Ignore insns made by CSE; they cannot affect the boundaries of the basic block. */ @@ -7939,7 +7939,7 @@ cse_end_of_basic_block (insn, data, follow_jumps, after_loop, skip_blocks) { if (data->path[path_entry].status != NOT_TAKEN) p = JUMP_LABEL (p); - + /* Point to next entry in path, if any. */ path_entry++; } @@ -8024,7 +8024,7 @@ cse_end_of_basic_block (insn, data, follow_jumps, after_loop, skip_blocks) for (tmp = NEXT_INSN (p); tmp && tmp != q; tmp = NEXT_INSN (tmp)) if (GET_CODE (tmp) == CODE_LABEL) break; - + if (tmp == q) { data->path[path_entry].branch = p; @@ -8192,7 +8192,7 @@ cse_main (f, nregs, after_loop, file) cse_basic_block_start = val.low_cuid; cse_basic_block_end = val.high_cuid; max_qty = val.nsets * 2; - + if (file) fprintf (file, ";; Processing block from %d to %d, %d sets.\n", INSN_UID (insn), val.last ? INSN_UID (val.last) : 0, @@ -8313,7 +8313,7 @@ cse_basic_block (from, to, next_branch, around_loop) continue; } } - + code = GET_CODE (insn); if (GET_MODE (insn) == QImode) PUT_MODE (insn, VOIDmode); @@ -8356,7 +8356,7 @@ cse_basic_block (from, to, next_branch, around_loop) /* Maybe TO was deleted because the jump is unconditional. If so, there is nothing left in this basic block. */ /* ??? Perhaps it would be smarter to set TO - to whatever follows this insn, + to whatever follows this insn, and pretend the basic block had always ended here. */ if (INSN_DELETED_P (to)) break; @@ -8436,9 +8436,9 @@ cse_basic_block (from, to, next_branch, around_loop) /* Count the number of times registers are used (not set) in X. COUNTS is an array in which we accumulate the count, INCR is how much - we count each register usage. + we count each register usage. - Don't count a usage of DEST, which is the SET_DEST of a SET which + Don't count a usage of DEST, which is the SET_DEST of a SET which contains X in its SET_SRC. This is because such a SET does not modify the liveness of DEST. */ diff --git a/gnu/usr.bin/cc/cc_int/dbxout.c b/gnu/usr.bin/cc/cc_int/dbxout.c index f09d52c..86f614c 100644 --- a/gnu/usr.bin/cc/cc_int/dbxout.c +++ b/gnu/usr.bin/cc/cc_int/dbxout.c @@ -440,7 +440,7 @@ dbxout_init (asm_file, input_file_name, syms) /* Used to put `Ltext:' before the reference, but that loses on sun 4. */ fprintf (asmfile, "%s ", ASM_STABS_OP); output_quoted_string (asmfile, input_file_name); - fprintf (asmfile, ",%d,0,0,%s\n", + fprintf (asmfile, ",%d,0,0,%s\n", N_SO, <ext_label_name[1]); text_section (); ASM_OUTPUT_INTERNAL_LABEL (asmfile, "Ltext", 0); @@ -526,7 +526,7 @@ dbxout_source_file (file, filename) } } -/* Output a line number symbol entry into output stream FILE, +/* Output a line number symbol entry into output stream FILE, for source file FILENAME and line number LINENO. */ void @@ -889,12 +889,12 @@ dbxout_range_type (type) fprintf (asmfile, "%d", TYPE_SYMTAB_ADDRESS (integer_type_node)); } if (TREE_CODE (TYPE_MIN_VALUE (type)) == INTEGER_CST) - fprintf (asmfile, ";%d", + fprintf (asmfile, ";%d", TREE_INT_CST_LOW (TYPE_MIN_VALUE (type))); else fprintf (asmfile, ";0"); if (TREE_CODE (TYPE_MAX_VALUE (type)) == INTEGER_CST) - fprintf (asmfile, ";%d;", + fprintf (asmfile, ";%d;", TREE_INT_CST_LOW (TYPE_MAX_VALUE (type))); else fprintf (asmfile, ";-1;"); @@ -1615,7 +1615,7 @@ dbxout_symbol (decl, local) && !TREE_ASM_WRITTEN (TYPE_NAME (type)) /* Distinguish the implicit typedefs of C++ from explicit ones that might be found in C. */ - && (!strcmp (lang_identify (), "cplusplus") + && (!strcmp (lang_identify (), "cplusplus") /* The following line maybe unnecessary; in 2.6, try removing it. */ || DECL_SOURCE_LINE (decl) == 0)) @@ -1665,7 +1665,7 @@ dbxout_symbol (decl, local) } /* Don't output a tag if this is an incomplete type (TYPE_SIZE is - zero). This prevents the sun4 Sun OS 4.x dbx from crashing. */ + zero). This prevents the sun4 Sun OS 4.x dbx from crashing. */ if (tag_needed && TYPE_NAME (type) != 0 && TYPE_SIZE (type) != 0 && !TREE_ASM_WRITTEN (TYPE_NAME (type))) @@ -1787,7 +1787,7 @@ dbxout_symbol_location (decl, type, suffix, home) /* Don't mention a variable at all if it was completely optimized into nothingness. - + If the decl was from an inline function, then it's rtl is not identically the rtl that was used in this particular compilation. */ diff --git a/gnu/usr.bin/cc/cc_int/dwarfout.c b/gnu/usr.bin/cc/cc_int/dwarfout.c index ccf436b..c16f204 100644 --- a/gnu/usr.bin/cc/cc_int/dwarfout.c +++ b/gnu/usr.bin/cc/cc_int/dwarfout.c @@ -4006,7 +4006,7 @@ output_type (type, containing_scope) end_sibling_chain (); break; - case ARRAY_TYPE: + case ARRAY_TYPE: if (TYPE_STRING_FLAG (type) && TREE_CODE(TREE_TYPE(type)) == CHAR_TYPE) { output_type (TREE_TYPE (type), containing_scope); @@ -4843,7 +4843,7 @@ dwarfout_file_scope_decl (decl, set_finalizing) ASM_OUTPUT_PUSH_SECTION (asm_out_file, ARANGES_SECTION); ASM_OUTPUT_DWARF_ADDR (asm_out_file, IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl))); - ASM_OUTPUT_DWARF_DATA4 (asm_out_file, + ASM_OUTPUT_DWARF_DATA4 (asm_out_file, (unsigned) int_size_in_bytes (TREE_TYPE (decl))); ASM_OUTPUT_POP_SECTION (asm_out_file); } @@ -5363,7 +5363,7 @@ dwarfout_init (asm_out_file, main_input_filename) /* Output a starting label and an initial (compilation directory) entry for the .debug_sfnames section. The starting label will be referenced by the initial entry in the .debug_srcinfo section. */ - + fputc ('\n', asm_out_file); ASM_OUTPUT_PUSH_SECTION (asm_out_file, SFNAMES_SECTION); ASM_OUTPUT_LABEL (asm_out_file, SFNAMES_BEGIN_LABEL); @@ -5377,20 +5377,20 @@ dwarfout_init (asm_out_file, main_input_filename) pfatal_with_name ("getpwd"); len = strlen (pwd); dirname = (char *) xmalloc (len + 2); - + strcpy (dirname, pwd); strcpy (dirname + len, "/"); ASM_OUTPUT_DWARF_STRING (asm_out_file, dirname); free (dirname); } ASM_OUTPUT_POP_SECTION (asm_out_file); - + if (debug_info_level >= DINFO_LEVEL_VERBOSE) { /* Output a starting label for the .debug_macinfo section. This label will be referenced by the AT_mac_info attribute in the TAG_compile_unit DIE. */ - + fputc ('\n', asm_out_file); ASM_OUTPUT_PUSH_SECTION (asm_out_file, MACINFO_SECTION); ASM_OUTPUT_LABEL (asm_out_file, MACINFO_BEGIN_LABEL); @@ -5398,16 +5398,16 @@ dwarfout_init (asm_out_file, main_input_filename) } /* Generate the initial entry for the .line section. */ - + fputc ('\n', asm_out_file); ASM_OUTPUT_PUSH_SECTION (asm_out_file, LINE_SECTION); ASM_OUTPUT_LABEL (asm_out_file, LINE_BEGIN_LABEL); ASM_OUTPUT_DWARF_DELTA4 (asm_out_file, LINE_END_LABEL, LINE_BEGIN_LABEL); ASM_OUTPUT_DWARF_ADDR (asm_out_file, TEXT_BEGIN_LABEL); ASM_OUTPUT_POP_SECTION (asm_out_file); - + /* Generate the initial entry for the .debug_srcinfo section. */ - + fputc ('\n', asm_out_file); ASM_OUTPUT_PUSH_SECTION (asm_out_file, SRCINFO_SECTION); ASM_OUTPUT_LABEL (asm_out_file, SRCINFO_BEGIN_LABEL); @@ -5421,16 +5421,16 @@ dwarfout_init (asm_out_file, main_input_filename) ASM_OUTPUT_DWARF_DATA4 (asm_out_file, -1); #endif ASM_OUTPUT_POP_SECTION (asm_out_file); - + /* Generate the initial entry for the .debug_pubnames section. */ - + fputc ('\n', asm_out_file); ASM_OUTPUT_PUSH_SECTION (asm_out_file, PUBNAMES_SECTION); ASM_OUTPUT_DWARF_ADDR (asm_out_file, DEBUG_BEGIN_LABEL); ASM_OUTPUT_POP_SECTION (asm_out_file); - + /* Generate the initial entry for the .debug_aranges section. */ - + fputc ('\n', asm_out_file); ASM_OUTPUT_PUSH_SECTION (asm_out_file, ARANGES_SECTION); ASM_OUTPUT_DWARF_ADDR (asm_out_file, DEBUG_BEGIN_LABEL); @@ -5548,7 +5548,7 @@ dwarfout_finish () if (debug_info_level >= DINFO_LEVEL_NORMAL) { /* Output a terminating entry for the .line section. */ - + fputc ('\n', asm_out_file); ASM_OUTPUT_PUSH_SECTION (asm_out_file, LINE_SECTION); ASM_OUTPUT_LABEL (asm_out_file, LINE_LAST_ENTRY_LABEL); @@ -5557,9 +5557,9 @@ dwarfout_finish () ASM_OUTPUT_DWARF_DELTA4 (asm_out_file, TEXT_END_LABEL, TEXT_BEGIN_LABEL); ASM_OUTPUT_LABEL (asm_out_file, LINE_END_LABEL); ASM_OUTPUT_POP_SECTION (asm_out_file); - + /* Output a terminating entry for the .debug_srcinfo section. */ - + fputc ('\n', asm_out_file); ASM_OUTPUT_PUSH_SECTION (asm_out_file, SRCINFO_SECTION); ASM_OUTPUT_DWARF_DELTA4 (asm_out_file, @@ -5570,7 +5570,7 @@ dwarfout_finish () if (debug_info_level >= DINFO_LEVEL_VERBOSE) { /* Output terminating entries for the .debug_macinfo section. */ - + dwarfout_resume_previous_source_file (0); fputc ('\n', asm_out_file); @@ -5579,15 +5579,15 @@ dwarfout_finish () ASM_OUTPUT_DWARF_STRING (asm_out_file, ""); ASM_OUTPUT_POP_SECTION (asm_out_file); } - + /* Generate the terminating entry for the .debug_pubnames section. */ - + fputc ('\n', asm_out_file); ASM_OUTPUT_PUSH_SECTION (asm_out_file, PUBNAMES_SECTION); ASM_OUTPUT_DWARF_DATA4 (asm_out_file, 0); ASM_OUTPUT_DWARF_STRING (asm_out_file, ""); ASM_OUTPUT_POP_SECTION (asm_out_file); - + /* Generate the terminating entries for the .debug_aranges section. Note that we want to do this only *after* we have output the end @@ -5601,7 +5601,7 @@ dwarfout_finish () entries at this late point in the assembly output, we skirt the issue simply by avoiding forward-references. */ - + fputc ('\n', asm_out_file); ASM_OUTPUT_PUSH_SECTION (asm_out_file, ARANGES_SECTION); diff --git a/gnu/usr.bin/cc/cc_int/emit-rtl.c b/gnu/usr.bin/cc/cc_int/emit-rtl.c index 6671e4c..9de163c 100644 --- a/gnu/usr.bin/cc/cc_int/emit-rtl.c +++ b/gnu/usr.bin/cc/cc_int/emit-rtl.c @@ -140,7 +140,7 @@ REAL_VALUE_TYPE dconstm1; When to use frame_pointer_rtx and hard_frame_pointer_rtx is a little tricky: until register elimination has taken place hard_frame_pointer_rtx - should be used if it is being set, and frame_pointer_rtx otherwise. After + should be used if it is being set, and frame_pointer_rtx otherwise. After register elimination hard_frame_pointer_rtx should always be used. On machines where the two registers are same (most) then these are the same. @@ -173,7 +173,7 @@ static rtx const_int_rtx[MAX_SAVED_CONST_INT * 2 + 1]; /* The ends of the doubly-linked chain of rtl for the current function. Both are reset to null at the start of rtl generation for the function. - + start_sequence saves both of these on `sequence_stack' along with `sequence_rtl_expr' and then starts a new, nested sequence of insns. */ @@ -552,7 +552,7 @@ get_first_label_num () /* Return a value representing some low-order bits of X, where the number of low-order bits is given by MODE. Note that no conversion is done - between floating-point and fixed-point values, rather, the bit + between floating-point and fixed-point values, rather, the bit representation is returned. This function handles the cases in common between gen_lowpart, below, @@ -611,7 +611,7 @@ gen_lowpart_common (mode, x) else if (GET_CODE (x) == REG) { /* If the register is not valid for MODE, return 0. If we don't - do this, there is no way to fix up the resulting REG later. + do this, there is no way to fix up the resulting REG later. But we do do this if the current REG is not valid for its mode. This latter is a kludge, but is required due to the way that parameters are passed on some machines, most @@ -676,7 +676,7 @@ gen_lowpart_common (mode, x) /* If X is an integral constant but we want it in floating-point, it must be the case that we have a union of an integer and a floating-point value. If the machine-parameters allow it, simulate that union here - and return the result. The two-word and single-word cases are + and return the result. The two-word and single-word cases are different. */ else if (((HOST_FLOAT_FORMAT == TARGET_FLOAT_FORMAT @@ -875,7 +875,7 @@ gen_lowpart (mode, x) abort (); } -/* Like `gen_lowpart', but refer to the most significant part. +/* Like `gen_lowpart', but refer to the most significant part. This is used to access the imaginary part of a complex number. */ rtx @@ -1162,10 +1162,10 @@ operand_subword (op, i, validate_address, mode) return GEN_INT (u.i); } #endif /* no REAL_ARITHMETIC */ - + /* The only remaining cases that we can handle are integers. Convert to proper endianness now since these cases need it. - At this point, i == 0 means the low-order word. + At this point, i == 0 means the low-order word. We do not want to handle the case when BITS_PER_WORD <= HOST_BITS_PER_INT in general. However, if OP is (const_int 0), we can just return @@ -1202,7 +1202,7 @@ operand_subword (op, i, validate_address, mode) the required subword, put OP into a register and try again. If that fails, abort. We always validate the address in this case. It is not valid to call this function after reload; it is mostly meant for RTL - generation. + generation. MODE is the mode of OP, in case it is CONST_INT. */ @@ -1289,7 +1289,7 @@ change_address (memref, mode, addr) } else addr = memory_address (mode, addr); - + new = gen_rtx (MEM, mode, addr); MEM_VOLATILE_P (new) = MEM_VOLATILE_P (memref); RTX_UNCHANGING_P (new) = RTX_UNCHANGING_P (memref); @@ -2914,7 +2914,7 @@ start_sequence () last_insn = 0; } -/* Similarly, but indicate that this sequence will be placed in +/* Similarly, but indicate that this sequence will be placed in T, an RTL_EXPR. */ void @@ -3095,7 +3095,7 @@ restore_reg_data (first) /* Don't duplicate the uids already in use. */ cur_insn_uid = max_uid + 1; - /* If any regs are missing, make them up. + /* If any regs are missing, make them up. ??? word_mode is not necessarily the right mode. Most likely these REGs are never used. At some point this should be checked. */ @@ -3221,11 +3221,11 @@ init_emit () regno_pointer_flag_length = LAST_VIRTUAL_REGISTER + 101; - regno_pointer_flag + regno_pointer_flag = (char *) oballoc (regno_pointer_flag_length); bzero (regno_pointer_flag, regno_pointer_flag_length); - regno_reg_rtx + regno_reg_rtx = (rtx *) oballoc (regno_pointer_flag_length * sizeof (rtx)); bzero ((char *) regno_reg_rtx, regno_pointer_flag_length * sizeof (rtx)); @@ -3351,7 +3351,7 @@ init_emit_once (line_numbers) hard_frame_pointer_rtx = frame_pointer_rtx; else hard_frame_pointer_rtx = gen_rtx (REG, Pmode, HARD_FRAME_POINTER_REGNUM); - + if (FRAME_POINTER_REGNUM == ARG_POINTER_REGNUM) arg_pointer_rtx = frame_pointer_rtx; else if (HARD_FRAME_POINTER_REGNUM == ARG_POINTER_REGNUM) diff --git a/gnu/usr.bin/cc/cc_int/explow.c b/gnu/usr.bin/cc/cc_int/explow.c index b72e468..f32c5ad 100644 --- a/gnu/usr.bin/cc/cc_int/explow.c +++ b/gnu/usr.bin/cc/cc_int/explow.c @@ -101,7 +101,7 @@ plus_constant_wide (x, c) Look for constant term in the sum and combine with C. For an integer constant term, we make a combined integer. For a constant term that is not an explicit integer, - we cannot really combine, but group them together anyway. + we cannot really combine, but group them together anyway. Use a recursive call in case the remaining operand is something that we handle specially, such as a SYMBOL_REF. */ @@ -521,12 +521,12 @@ copy_to_reg (x) rtx x; { register rtx temp = gen_reg_rtx (GET_MODE (x)); - + /* If not an operand, must be an address with PLUS and MULT so - do the computation. */ + do the computation. */ if (! general_operand (x, VOIDmode)) x = force_operand (x, temp); - + if (x != temp) emit_move_insn (temp, x); @@ -552,9 +552,9 @@ copy_to_mode_reg (mode, x) rtx x; { register rtx temp = gen_reg_rtx (mode); - + /* If not an operand, must be an address with PLUS and MULT so - do the computation. */ + do the computation. */ if (! general_operand (x, VOIDmode)) x = force_operand (x, temp); @@ -851,9 +851,9 @@ emit_stack_save (save_level, psave, after) } /* Restore the stack pointer for the purpose in SAVE_LEVEL. SA is the save - area made by emit_stack_save. If it is zero, we have nothing to do. + area made by emit_stack_save. If it is zero, we have nothing to do. - Put any emitted insns after insn AFTER, if nonzero, otherwise at + Put any emitted insns after insn AFTER, if nonzero, otherwise at current position. */ void @@ -938,7 +938,7 @@ allocate_dynamic_stack_space (size, target, known_align) /* We will need to ensure that the address we return is aligned to BIGGEST_ALIGNMENT. If STACK_DYNAMIC_OFFSET is defined, we don't - always know its final value at this point in the compilation (it + always know its final value at this point in the compilation (it might depend on the size of the outgoing parameter lists, for example), so we must align the value to be returned in that case. (Note that STACK_DYNAMIC_OFFSET will have a default non-zero value if @@ -1074,7 +1074,7 @@ allocate_dynamic_stack_space (size, target, known_align) NULL_RTX, 1); } #endif - + /* Some systems require a particular insn to refer to the stack to make the pages exist. */ #ifdef HAVE_probe diff --git a/gnu/usr.bin/cc/cc_int/expmed.c b/gnu/usr.bin/cc/cc_int/expmed.c index eca928a..1b20377 100644 --- a/gnu/usr.bin/cc/cc_int/expmed.c +++ b/gnu/usr.bin/cc/cc_int/expmed.c @@ -43,7 +43,7 @@ static rtx extract_split_bit_field PROTO((rtx, int, int, int, int)); #define CEIL(x,y) (((x) + (y) - 1) / (y)) /* Non-zero means divides or modulus operations are relatively cheap for - powers of two, so don't use branches; emit the operation instead. + powers of two, so don't use branches; emit the operation instead. Usually, this will mean that the MD file will emit non-branch sequences. */ @@ -421,7 +421,7 @@ store_bit_field (str_rtx, bitsize, bitnum, fieldmode, value, align, total_size) /* Compute offset as multiple of this unit, counting in bytes. */ offset = (bitnum / unit) * GET_MODE_SIZE (bestmode); bitpos = bitnum % unit; - op0 = change_address (op0, bestmode, + op0 = change_address (op0, bestmode, plus_constant (XEXP (op0, 0), offset)); /* Fetch that unit, store the bitfield in it, then store the unit. */ @@ -849,7 +849,7 @@ extract_bit_field (str_rtx, bitsize, bitnum, unsignedp, offset += SUBREG_WORD (op0); op0 = SUBREG_REG (op0); } - + #if BYTES_BIG_ENDIAN /* If OP0 is a register, BITPOS must count within a word. But as we have it, it counts within whatever size OP0 now has. @@ -896,7 +896,7 @@ extract_bit_field (str_rtx, bitsize, bitnum, unsignedp, } /* Handle fields bigger than a word. */ - + if (bitsize > BITS_PER_WORD) { /* Here we transfer the words of the field @@ -943,7 +943,7 @@ extract_bit_field (str_rtx, bitsize, bitnum, unsignedp, build_int_2 (GET_MODE_BITSIZE (mode) - bitsize, 0), NULL_RTX, 0); } - + /* From here on we know the desired field is smaller than a word so we can assume it is an integer. So we can safely extract it as one size of integer, if necessary, and then truncate or extend @@ -1238,7 +1238,7 @@ extract_bit_field (str_rtx, bitsize, bitnum, unsignedp, target = extract_fixed_bit_field (tmode, op0, offset, bitsize, bitpos, target, 0, align); } - } + } else extv_loses: #endif @@ -1422,7 +1422,7 @@ extract_fixed_bit_field (tmode, op0, offset, bitsize, bitpos, } return expand_shift (RSHIFT_EXPR, mode, op0, - build_int_2 (GET_MODE_BITSIZE (mode) - bitsize, 0), + build_int_2 (GET_MODE_BITSIZE (mode) - bitsize, 0), target, 0); } @@ -1446,7 +1446,7 @@ mask_rtx (mode, bitpos, bitsize, complement) if (bitpos + bitsize < HOST_BITS_PER_WIDE_INT) masklow &= ((unsigned HOST_WIDE_INT) -1 >> (HOST_BITS_PER_WIDE_INT - bitpos - bitsize)); - + if (bitpos <= HOST_BITS_PER_WIDE_INT) maskhigh = -1; else @@ -1728,7 +1728,7 @@ expand_shift (code, mode, shifted, amount, target, unsignedp) && INTVAL (op1) > 0 && INTVAL (op1) < GET_MODE_BITSIZE (mode)) temp = expand_binop (mode, left ? rotr_optab : rotl_optab, - shifted, + shifted, GEN_INT (GET_MODE_BITSIZE (mode) - INTVAL (op1)), target, unsignedp, methods); @@ -1759,7 +1759,7 @@ expand_shift (code, mode, shifted, amount, target, unsignedp) } /* We used to try extzv here for logical right shifts, but that was - only useful for one machine, the VAX, and caused poor code + only useful for one machine, the VAX, and caused poor code generation there for lshrdi3, so the code was deleted and a define_expand for lshrsi3 was added to vax.md. */ } @@ -2155,7 +2155,7 @@ expand_mult (mode, op0, op1, target, unsignedp) = (opno == alg.ops - 1 && target != 0 && variant != add_variant ? target : 0); rtx accum_target = preserve ? 0 : accum; - + switch (alg.op[opno]) { case alg_shift: @@ -2876,7 +2876,7 @@ expand_divmod (rem_flag, code, mode, op0, op1, target, unsignedp) rtx t1; t1 = copy_to_mode_reg (compute_mode, op0); - emit_cmp_insn (t1, const0_rtx, GE, + emit_cmp_insn (t1, const0_rtx, GE, NULL_RTX, compute_mode, 0, 0); emit_jump_insn (gen_bge (label)); expand_inc (t1, GEN_INT (abs_d - 1)); @@ -3580,39 +3580,39 @@ make_tree (type, x) } return t; - + case PLUS: return fold (build (PLUS_EXPR, type, make_tree (type, XEXP (x, 0)), make_tree (type, XEXP (x, 1)))); - + case MINUS: return fold (build (MINUS_EXPR, type, make_tree (type, XEXP (x, 0)), make_tree (type, XEXP (x, 1)))); - + case NEG: return fold (build1 (NEGATE_EXPR, type, make_tree (type, XEXP (x, 0)))); case MULT: return fold (build (MULT_EXPR, type, make_tree (type, XEXP (x, 0)), make_tree (type, XEXP (x, 1)))); - + case ASHIFT: return fold (build (LSHIFT_EXPR, type, make_tree (type, XEXP (x, 0)), make_tree (type, XEXP (x, 1)))); - + case LSHIFTRT: return fold (convert (type, build (RSHIFT_EXPR, unsigned_type (type), make_tree (unsigned_type (type), XEXP (x, 0)), make_tree (type, XEXP (x, 1))))); - + case ASHIFTRT: return fold (convert (type, build (RSHIFT_EXPR, signed_type (type), make_tree (signed_type (type), XEXP (x, 0)), make_tree (type, XEXP (x, 1))))); - + case DIV: if (TREE_CODE (type) != REAL_TYPE) t = signed_type (type); @@ -3702,7 +3702,7 @@ expand_and (op0, op1, target) Return 0 if that cannot be done. MODE is the mode to use for OP0 and OP1 should they be CONST_INTs. If - it is VOIDmode, they cannot both be CONST_INT. + it is VOIDmode, they cannot both be CONST_INT. UNSIGNEDP is for the case where we have to widen the operands to perform the operation. It says to use zero-extension. @@ -3744,7 +3744,7 @@ emit_store_flag (target, code, op0, op1, mode, unsignedp, normalizep) code = swap_condition (code); } - /* For some comparisons with 1 and -1, we can convert this to + /* For some comparisons with 1 and -1, we can convert this to comparisons with zero. This will often produce more opportunities for store-flag insns. */ @@ -3785,7 +3785,7 @@ emit_store_flag (target, code, op0, op1, mode, unsignedp, normalizep) && GET_MODE_CLASS (mode) == MODE_INT && (normalizep || STORE_FLAG_VALUE == 1 || (GET_MODE_BITSIZE (mode) <= HOST_BITS_PER_WIDE_INT - && (STORE_FLAG_VALUE + && (STORE_FLAG_VALUE == (HOST_WIDE_INT) 1 << (GET_MODE_BITSIZE (mode) - 1))))) { subtarget = target; @@ -3840,7 +3840,7 @@ emit_store_flag (target, code, op0, op1, mode, unsignedp, normalizep) : const_true_rtx); /* If the code of COMPARISON doesn't match CODE, something is - wrong; we can no longer be sure that we have the operation. + wrong; we can no longer be sure that we have the operation. We could handle this case, but it should not happen. */ if (GET_CODE (comparison) != code) @@ -3912,7 +3912,7 @@ emit_store_flag (target, code, op0, op1, mode, unsignedp, normalizep) else abort (); - /* If we were converting to a smaller mode, do the + /* If we were converting to a smaller mode, do the conversion now. */ if (target_mode != compare_mode) { @@ -3954,7 +3954,7 @@ emit_store_flag (target, code, op0, op1, mode, unsignedp, normalizep) return tem; } - /* Some other cases we can do are EQ, NE, LE, and GT comparisons with + /* Some other cases we can do are EQ, NE, LE, and GT comparisons with the constant zero. Reject all other comparisons at this point. Only do LE and GT if branches are expensive since they are expensive on 2-operand machines. */ @@ -4016,14 +4016,14 @@ emit_store_flag (target, code, op0, op1, mode, unsignedp, normalizep) tem = expand_binop (mode, sub_optab, tem, op0, subtarget, 0, OPTAB_WIDEN); } - + if (code == EQ || code == NE) { /* For EQ or NE, one way to do the comparison is to apply an operation that converts the operand into a positive number if it is non-zero or zero if it was originally zero. Then, for EQ, we subtract 1 and for NE we negate. This puts the result in the sign bit. Then we - normalize with a shift, if needed. + normalize with a shift, if needed. Two operations that can do the above actions are ABS and FFS, so try them. If that doesn't work, and MODE is smaller than a full word, diff --git a/gnu/usr.bin/cc/cc_int/expr.c b/gnu/usr.bin/cc/cc_int/expr.c index 7809553..70678c5 100644 --- a/gnu/usr.bin/cc/cc_int/expr.c +++ b/gnu/usr.bin/cc/cc_int/expr.c @@ -242,7 +242,7 @@ bc_init_mode_to_opcode_maps () mode_to_const_map[mode] = mode_to_load_map[mode] = mode_to_store_map[mode] = neverneverland; - + #define DEF_MODEMAP(SYM, CODE, UCODE, CONST, LOAD, STORE) \ mode_to_const_map[(int) SYM] = CONST; \ mode_to_load_map[(int) SYM] = LOAD; \ @@ -318,7 +318,7 @@ init_expr_once () end_sequence (); } - + /* This is run at the start of compiling a function. */ void @@ -1125,7 +1125,7 @@ convert_move (to, from, unsignedp) } } - /* Support special truncate insns for certain modes. */ + /* Support special truncate insns for certain modes. */ if (from_mode == DImode && to_mode == SImode) { @@ -1321,7 +1321,7 @@ convert_modes (mode, oldmode, x, unsignedp) if (GET_MODE (x) != VOIDmode) oldmode = GET_MODE (x); - + if (mode == oldmode) return x; @@ -1965,7 +1965,7 @@ emit_move_insn_1 (x, y) { rtx last_insn = 0; rtx insns; - + #ifdef PUSH_ROUNDING /* If X is a push on the stack, do the push now and replace @@ -1976,7 +1976,7 @@ emit_move_insn_1 (x, y) x = change_address (x, VOIDmode, stack_pointer_rtx); } #endif - + for (i = 0; i < (GET_MODE_SIZE (mode) + (UNITS_PER_WORD - 1)) / UNITS_PER_WORD; i++) @@ -2132,7 +2132,7 @@ emit_push_insn (x, mode, type, size, align, partial, reg, extra, int used = partial * UNITS_PER_WORD; int offset = used % (PARM_BOUNDARY / BITS_PER_UNIT); int skip; - + if (size == 0) abort (); @@ -2903,7 +2903,7 @@ store_expr (exp, target, want_value) && ! (GET_CODE (target) == REG && REGNO (target) < FIRST_PSEUDO_REGISTER)) return copy_to_reg (target); - + else return target; } @@ -3326,7 +3326,7 @@ get_inner_reference (exp, pbitsize, pbitpos, poffset, pmode, *pbitsize = GET_MODE_BITSIZE (mode); *punsignedp = TREE_UNSIGNED (TREE_TYPE (exp)); } - + if (size_tree) { if (TREE_CODE (size_tree) != INTEGER_CST) @@ -3518,7 +3518,7 @@ force_operand (value, target) force_operand (XEXP (XEXP (value, 0), 1), 0), target, 0, OPTAB_LIB_WIDEN); } - + tmp = force_operand (XEXP (value, 0), subtarget); return expand_binop (GET_MODE (value), binoptab, tmp, force_operand (op2, NULL_RTX), @@ -4039,8 +4039,8 @@ expand_expr (exp, target, tmode, modifier) case REAL_CST: /* If optimized, generate immediate CONST_DOUBLE - which will be turned into memory by reload if necessary. - + which will be turned into memory by reload if necessary. + We used to force a register so that loop.c could see it. But this does not allow gen_* patterns to perform optimizations with the constants. It also produces two insns in cases like "x = 1.0;". @@ -4470,7 +4470,7 @@ expand_expr (exp, target, tmode, modifier) tmode, modifier); } } - + else if (optimize >= 1 && TREE_READONLY (array) && ! TREE_SIDE_EFFECTS (array) && TREE_CODE (array) == VAR_DECL && DECL_INITIAL (array) @@ -5016,7 +5016,7 @@ expand_expr (exp, target, tmode, modifier) op0 = eliminate_constant_term (op0, &constant_term); /* CONSTANT_TERM and XEXP (op1, 1) are known to be constant, so - their sum should be a constant. Form it into OP1, since the + their sum should be a constant. Form it into OP1, since the result we want will then be OP0 + OP1. */ temp = simplify_binary_operation (PLUS, mode, constant_term, @@ -5485,7 +5485,7 @@ expand_expr (exp, target, tmode, modifier) /* If we are not to produce a result, we have no target. Otherwise, if a target was specified use it; it will not be used as an - intermediate target unless it is safe. If no target, use a + intermediate target unless it is safe. If no target, use a temporary. */ if (ignore) @@ -5578,7 +5578,7 @@ expand_expr (exp, target, tmode, modifier) TREE_OPERAND (exp, 0) = invert_truthvalue (TREE_OPERAND (exp, 0)); } - + NO_DEFER_POP; op0 = gen_label_rtx (); @@ -5628,7 +5628,7 @@ expand_expr (exp, target, tmode, modifier) #if 0 /* This is now done in jump.c and is better done there because it produces shorter register lifetimes. */ - + /* Check for both possibilities either constants or variables in registers (but not the same as the target!). If so, can save branches by assigning one, branching, and assigning the @@ -5871,7 +5871,7 @@ expand_expr (exp, target, tmode, modifier) if (need_exception_region) (*interim_eh_hook) (NULL_TREE); - + return temp; } @@ -6035,7 +6035,7 @@ expand_expr (exp, target, tmode, modifier) if (GET_CODE (op0) != MEM) abort (); - + if (modifier == EXPAND_SUM || modifier == EXPAND_INITIALIZER) return XEXP (op0, 0); @@ -6095,7 +6095,7 @@ expand_expr (exp, target, tmode, modifier) case REALPART_EXPR: op0 = expand_expr (TREE_OPERAND (exp, 0), 0, VOIDmode, 0); return gen_realpart (mode, op0); - + case IMAGPART_EXPR: op0 = expand_expr (TREE_OPERAND (exp, 0), 0, VOIDmode, 0); return gen_imagpart (mode, op0); @@ -6105,12 +6105,12 @@ expand_expr (exp, target, tmode, modifier) enum machine_mode partmode = TYPE_MODE (TREE_TYPE (TREE_TYPE (exp))); rtx imag_t; rtx insns; - + op0 = expand_expr (TREE_OPERAND (exp, 0), 0, VOIDmode, 0); if (! target) target = gen_reg_rtx (mode); - + start_sequence (); /* Store the realpart and the negated imagpart to target. */ @@ -6126,7 +6126,7 @@ expand_expr (exp, target, tmode, modifier) insns = get_insns (); end_sequence (); - /* Conjugate should appear as a single unit + /* Conjugate should appear as a single unit If TARGET is a CONCAT, we got insns like RD = RS, ID = - IS, each with a separate pseudo as destination. It's not correct for flow to treat them as a unit. */ @@ -6178,30 +6178,30 @@ bc_expand_expr (exp) struct increment_operator *incroptab; struct bc_label *lab, *lab1; enum bytecode_opcode opcode; - - + + code = TREE_CODE (exp); - + switch (code) { case PARM_DECL: - + if (DECL_RTL (exp) == 0) { error_with_decl (exp, "prior parameter's size depends on `%s'"); return; } - + bc_load_parmaddr (DECL_RTL (exp)); bc_load_memory (TREE_TYPE (exp), exp); - + return; - + case VAR_DECL: - + if (DECL_RTL (exp) == 0) abort (); - + #if 0 if (BYTECODE_LABEL (DECL_RTL (exp))) bc_load_externaddr (DECL_RTL (exp)); @@ -6213,12 +6213,12 @@ bc_expand_expr (exp) BYTECODE_BC_LABEL (DECL_RTL (exp))->offset); else bc_load_localaddr (DECL_RTL (exp)); - + bc_load_memory (TREE_TYPE (exp), exp); return; - + case INTEGER_CST: - + #ifdef DEBUG_PRINT_CODE fprintf (stderr, " [%x]\n", TREE_INT_CST_LOW (exp)); #endif @@ -6227,9 +6227,9 @@ bc_expand_expr (exp) : TYPE_MODE (TREE_TYPE (exp)))], (HOST_WIDE_INT) TREE_INT_CST_LOW (exp)); return; - + case REAL_CST: - + #if 0 #ifdef DEBUG_PRINT_CODE fprintf (stderr, " [%g]\n", (double) TREE_INT_CST_LOW (exp)); @@ -6242,9 +6242,9 @@ bc_expand_expr (exp) #endif return; - + case CALL_EXPR: - + /* We build a call description vector describing the type of the return value and of the arguments; this call vector, together with a pointer to a location for the return value @@ -6256,18 +6256,18 @@ bc_expand_expr (exp) tree calldesc = 0, arg; int nargs = 0, i; rtx retval; - + /* Push the evaluated args on the evaluation stack in reverse order. Also make an entry for each arg in the calldesc vector while we're at it. */ - + TREE_OPERAND (exp, 1) = nreverse (TREE_OPERAND (exp, 1)); - + for (arg = TREE_OPERAND (exp, 1); arg; arg = TREE_CHAIN (arg)) { ++nargs; bc_expand_expr (TREE_VALUE (arg)); - + calldesc = tree_cons ((tree) 0, size_in_bytes (TREE_TYPE (TREE_VALUE (arg))), calldesc); @@ -6275,50 +6275,50 @@ bc_expand_expr (exp) bc_runtime_type_code (TREE_TYPE (TREE_VALUE (arg))), calldesc); } - + TREE_OPERAND (exp, 1) = nreverse (TREE_OPERAND (exp, 1)); - + /* Allocate a location for the return value and push its address on the evaluation stack. Also make an entry at the front of the calldesc for the return value type. */ - + type = TREE_TYPE (TREE_TYPE (TREE_TYPE (TREE_OPERAND (exp, 0)))); retval = bc_allocate_local (int_size_in_bytes (type), TYPE_ALIGN (type)); bc_load_localaddr (retval); - + calldesc = tree_cons ((tree) 0, size_in_bytes (type), calldesc); calldesc = tree_cons ((tree) 0, bc_runtime_type_code (type), calldesc); - + /* Prepend the argument count. */ calldesc = tree_cons ((tree) 0, build_int_2 (nargs, 0), calldesc); - + /* Push the address of the call description vector on the stack. */ calldesc = build_nt (CONSTRUCTOR, (tree) 0, calldesc); TREE_TYPE (calldesc) = build_array_type (integer_type_node, build_index_type (build_int_2 (nargs * 2, 0))); r = output_constant_def (calldesc); bc_load_externaddr (r); - + /* Push the address of the function to be called. */ bc_expand_expr (TREE_OPERAND (exp, 0)); - + /* Call the function, popping its address and the calldesc vector address off the evaluation stack in the process. */ bc_emit_instruction (call); - + /* Pop the arguments off the stack. */ bc_adjust_stack (nargs); - + /* Load the return value onto the stack. */ bc_load_localaddr (retval); bc_load_memory (type, TREE_OPERAND (exp, 0)); } return; - + case SAVE_EXPR: - + if (!SAVE_EXPR_RTL (exp)) { /* First time around: copy to local variable */ @@ -6326,7 +6326,7 @@ bc_expand_expr (exp) TYPE_ALIGN (TREE_TYPE(exp))); bc_expand_expr (TREE_OPERAND (exp, 0)); bc_emit_instruction (duplicate); - + bc_load_localaddr (SAVE_EXPR_RTL (exp)); bc_store_memory (TREE_TYPE (exp), TREE_OPERAND (exp, 0)); } @@ -6337,68 +6337,68 @@ bc_expand_expr (exp) bc_load_memory (TREE_TYPE (exp), TREE_OPERAND (exp, 0)); } return; - + #if 0 /* FIXME: the XXXX_STMT codes have been removed in GCC2, but how are they handled instead? */ case LET_STMT: - + TREE_USED (exp) = 1; bc_expand_expr (STMT_BODY (exp)); return; #endif - + case NOP_EXPR: case CONVERT_EXPR: - + bc_expand_expr (TREE_OPERAND (exp, 0)); bc_expand_conversion (TREE_TYPE (TREE_OPERAND (exp, 0)), TREE_TYPE (exp)); return; - + case MODIFY_EXPR: - + expand_assignment (TREE_OPERAND (exp, 0), TREE_OPERAND (exp, 1), 0, 0); return; - + case ADDR_EXPR: - + bc_expand_address (TREE_OPERAND (exp, 0)); return; - + case INDIRECT_REF: - + bc_expand_expr (TREE_OPERAND (exp, 0)); bc_load_memory (TREE_TYPE (exp), TREE_OPERAND (exp, 0)); return; - + case ARRAY_REF: - + bc_expand_expr (bc_canonicalize_array_ref (exp)); return; - + case COMPONENT_REF: - + bc_expand_component_address (exp); - + /* If we have a bitfield, generate a proper load */ bc_load_memory (TREE_TYPE (TREE_OPERAND (exp, 1)), TREE_OPERAND (exp, 1)); return; - + case COMPOUND_EXPR: - + bc_expand_expr (TREE_OPERAND (exp, 0)); bc_emit_instruction (drop); bc_expand_expr (TREE_OPERAND (exp, 1)); return; - + case COND_EXPR: - + bc_expand_expr (TREE_OPERAND (exp, 0)); bc_expand_truth_conversion (TREE_TYPE (TREE_OPERAND (exp, 0))); lab = bc_get_bytecode_label (); bc_emit_bytecode (xjumpifnot); bc_emit_bytecode_labelref (lab); - + #ifdef DEBUG_PRINT_CODE fputc ('\n', stderr); #endif @@ -6406,63 +6406,63 @@ bc_expand_expr (exp) lab1 = bc_get_bytecode_label (); bc_emit_bytecode (jump); bc_emit_bytecode_labelref (lab1); - + #ifdef DEBUG_PRINT_CODE fputc ('\n', stderr); #endif - + bc_emit_bytecode_labeldef (lab); bc_expand_expr (TREE_OPERAND (exp, 2)); bc_emit_bytecode_labeldef (lab1); return; - + case TRUTH_ANDIF_EXPR: - + opcode = xjumpifnot; goto andorif; - + case TRUTH_ORIF_EXPR: - + opcode = xjumpif; goto andorif; - + case PLUS_EXPR: - + binoptab = optab_plus_expr; goto binop; - + case MINUS_EXPR: - + binoptab = optab_minus_expr; goto binop; - + case MULT_EXPR: - + binoptab = optab_mult_expr; goto binop; - + case TRUNC_DIV_EXPR: case FLOOR_DIV_EXPR: case CEIL_DIV_EXPR: case ROUND_DIV_EXPR: case EXACT_DIV_EXPR: - + binoptab = optab_trunc_div_expr; goto binop; - + case TRUNC_MOD_EXPR: case FLOOR_MOD_EXPR: case CEIL_MOD_EXPR: case ROUND_MOD_EXPR: - + binoptab = optab_trunc_mod_expr; goto binop; - + case FIX_ROUND_EXPR: case FIX_FLOOR_EXPR: case FIX_CEIL_EXPR: abort (); /* Not used for C. */ - + case FIX_TRUNC_EXPR: case FLOAT_EXPR: case MAX_EXPR: @@ -6471,135 +6471,135 @@ bc_expand_expr (exp) case LROTATE_EXPR: case RROTATE_EXPR: abort (); /* FIXME */ - + case RDIV_EXPR: - + binoptab = optab_rdiv_expr; goto binop; - + case BIT_AND_EXPR: - + binoptab = optab_bit_and_expr; goto binop; - + case BIT_IOR_EXPR: - + binoptab = optab_bit_ior_expr; goto binop; - + case BIT_XOR_EXPR: - + binoptab = optab_bit_xor_expr; goto binop; - + case LSHIFT_EXPR: - + binoptab = optab_lshift_expr; goto binop; - + case RSHIFT_EXPR: - + binoptab = optab_rshift_expr; goto binop; - + case TRUTH_AND_EXPR: - + binoptab = optab_truth_and_expr; goto binop; - + case TRUTH_OR_EXPR: - + binoptab = optab_truth_or_expr; goto binop; - + case LT_EXPR: - + binoptab = optab_lt_expr; goto binop; - + case LE_EXPR: - + binoptab = optab_le_expr; goto binop; - + case GE_EXPR: - + binoptab = optab_ge_expr; goto binop; - + case GT_EXPR: - + binoptab = optab_gt_expr; goto binop; - + case EQ_EXPR: - + binoptab = optab_eq_expr; goto binop; - + case NE_EXPR: - + binoptab = optab_ne_expr; goto binop; - + case NEGATE_EXPR: - + unoptab = optab_negate_expr; goto unop; - + case BIT_NOT_EXPR: - + unoptab = optab_bit_not_expr; goto unop; - + case TRUTH_NOT_EXPR: - + unoptab = optab_truth_not_expr; goto unop; - + case PREDECREMENT_EXPR: - + incroptab = optab_predecrement_expr; goto increment; - + case PREINCREMENT_EXPR: - + incroptab = optab_preincrement_expr; goto increment; - + case POSTDECREMENT_EXPR: - + incroptab = optab_postdecrement_expr; goto increment; - + case POSTINCREMENT_EXPR: - + incroptab = optab_postincrement_expr; goto increment; - + case CONSTRUCTOR: - + bc_expand_constructor (exp); return; - + case ERROR_MARK: case RTL_EXPR: - + return; - + case BIND_EXPR: { tree vars = TREE_OPERAND (exp, 0); int vars_need_expansion = 0; - + /* Need to open a binding contour here because if there are any cleanups they most be contained here. */ expand_start_bindings (0); - + /* Mark the corresponding BLOCK for output. */ if (TREE_OPERAND (exp, 2) != 0) TREE_USED (TREE_OPERAND (exp, 2)) = 1; - + /* If VARS have not yet been expanded, expand them now. */ while (vars) { @@ -6611,65 +6611,65 @@ bc_expand_expr (exp) expand_decl_init (vars); vars = TREE_CHAIN (vars); } - + bc_expand_expr (TREE_OPERAND (exp, 1)); - + expand_end_bindings (TREE_OPERAND (exp, 0), 0, 0); - + return; } } - + abort (); - + binop: - + bc_expand_binary_operation (binoptab, TREE_TYPE (exp), TREE_OPERAND (exp, 0), TREE_OPERAND (exp, 1)); return; - - + + unop: - + bc_expand_unary_operation (unoptab, TREE_TYPE (exp), TREE_OPERAND (exp, 0)); return; - - + + andorif: - + bc_expand_expr (TREE_OPERAND (exp, 0)); bc_expand_truth_conversion (TREE_TYPE (TREE_OPERAND (exp, 0))); lab = bc_get_bytecode_label (); - + bc_emit_instruction (duplicate); bc_emit_bytecode (opcode); bc_emit_bytecode_labelref (lab); - + #ifdef DEBUG_PRINT_CODE fputc ('\n', stderr); #endif - + bc_emit_instruction (drop); - + bc_expand_expr (TREE_OPERAND (exp, 1)); bc_expand_truth_conversion (TREE_TYPE (TREE_OPERAND (exp, 1))); bc_emit_bytecode_labeldef (lab); return; - - + + increment: - + type = TREE_TYPE (TREE_OPERAND (exp, 0)); - + /* Push the quantum. */ bc_expand_expr (TREE_OPERAND (exp, 1)); - + /* Convert it to the lvalue's type. */ bc_expand_conversion (TREE_TYPE (TREE_OPERAND (exp, 1)), type); - + /* Push the address of the lvalue */ bc_expand_expr (build1 (ADDR_EXPR, TYPE_POINTER_TO (type), TREE_OPERAND (exp, 0))); - + /* Perform actual increment */ bc_expand_increment (incroptab, type); return; @@ -6984,7 +6984,7 @@ expand_builtin (exp, target, subtarget, mode, ignore) insns = get_insns (); end_sequence (); emit_insns (insns); - + return target; /* __builtin_apply_args returns block of memory allocated on @@ -7284,7 +7284,7 @@ expand_builtin (exp, target, subtarget, mode, ignore) } else { - int count = TREE_INT_CST_LOW (TREE_VALUE (arglist)); + int count = TREE_INT_CST_LOW (TREE_VALUE (arglist)); rtx tem = frame_pointer_rtx; int i; @@ -7641,7 +7641,7 @@ expand_builtin (exp, target, subtarget, mode, ignore) } else return convert_to_mode (mode, result, 0); - } + } #else case BUILT_IN_STRCMP: case BUILT_IN_MEMCMP: @@ -7681,11 +7681,11 @@ static enum machine_mode apply_result_mode[FIRST_PSEUDO_REGISTER]; used for calling a function. */ static int apply_args_reg_offset[FIRST_PSEUDO_REGISTER]; -/* Return the offset of register REGNO into the block returned by +/* Return the offset of register REGNO into the block returned by __builtin_apply_args. This is not declared static, since it is needed in objc-act.c. */ -int +int apply_args_register_offset (regno) int regno; { @@ -7836,7 +7836,7 @@ result_vector (savep, result) enum machine_mode mode; rtx reg, mem; rtx *savevec = (rtx *) alloca (FIRST_PSEUDO_REGISTER * sizeof (rtx)); - + size = nelts = 0; for (regno = 0; regno < FIRST_PSEUDO_REGISTER; regno++) if ((mode = apply_result_mode[regno]) != VOIDmode) @@ -8427,7 +8427,7 @@ defer_cleanups_to (old_cleanups) (*interim_eh_hook) (TREE_VALUE (cleanups_this_call)); last = cleanups_this_call; cleanups_this_call = TREE_CHAIN (cleanups_this_call); - } + } if (last) { @@ -8795,7 +8795,7 @@ do_jump (exp, if_false_label, if_true_label) do_jump (TREE_OPERAND (exp, 0), if_true_label, if_false_label); else if (((GET_MODE_CLASS (TYPE_MODE (TREE_TYPE (TREE_OPERAND (exp, 0)))) == MODE_INT) - && + && !can_compare_p (TYPE_MODE (TREE_TYPE (TREE_OPERAND (exp, 0))))) || GET_MODE_CLASS (TYPE_MODE (TREE_TYPE (TREE_OPERAND (exp, 0)))) == MODE_COMPLEX_FLOAT || GET_MODE_CLASS (TYPE_MODE (TREE_TYPE (TREE_OPERAND (exp, 0)))) == MODE_COMPLEX_INT) @@ -8809,7 +8809,7 @@ do_jump (exp, if_false_label, if_true_label) do_jump (TREE_OPERAND (exp, 0), if_false_label, if_true_label); else if (((GET_MODE_CLASS (TYPE_MODE (TREE_TYPE (TREE_OPERAND (exp, 0)))) == MODE_INT) - && + && !can_compare_p (TYPE_MODE (TREE_TYPE (TREE_OPERAND (exp, 0))))) || GET_MODE_CLASS (TYPE_MODE (TREE_TYPE (TREE_OPERAND (exp, 0)))) == MODE_COMPLEX_FLOAT || GET_MODE_CLASS (TYPE_MODE (TREE_TYPE (TREE_OPERAND (exp, 0)))) == MODE_COMPLEX_INT) @@ -9274,7 +9274,7 @@ compare_from_rtx (op0, op1, code, unsignedp, mode, size, align) unsignedp = 1; } #endif - + emit_cmp_insn (op0, op1, code, size, mode, unsignedp, align); return gen_rtx (code, VOIDmode, cc0_rtx, const0_rtx); @@ -9478,7 +9478,7 @@ do_store_flag (exp, target, mode, only_cheap) else return 0; } - + preexpand_calls (exp); if (subtarget == 0 || GET_CODE (subtarget) != REG || GET_MODE (subtarget) != operand_mode @@ -9621,12 +9621,12 @@ bc_load_memory (type, decl) tree type, decl; { enum bytecode_opcode opcode; - - + + /* Bit fields are special. We only know about signed and unsigned ints, and enums. The latter are treated as signed integers. */ - + if (DECL_BIT_FIELD (decl)) if (TREE_CODE (type) == ENUMERAL_TYPE || TREE_CODE (type) == INTEGER_TYPE) @@ -9643,9 +9643,9 @@ bc_load_memory (type, decl) if (opcode == neverneverland) abort (); - + bc_emit_bytecode (opcode); - + #ifdef DEBUG_PRINT_CODE fputc ('\n', stderr); #endif @@ -9661,8 +9661,8 @@ bc_store_memory (type, decl) tree type, decl; { enum bytecode_opcode opcode; - - + + if (DECL_BIT_FIELD (decl)) { if (TREE_CODE (type) == ENUMERAL_TYPE @@ -9681,7 +9681,7 @@ bc_store_memory (type, decl) are already on the stack; so we just put the size on level 1. For some other languages, the size may be variable, this is why we don't encode it as a storeBLK literal, but rather treat it as a full-fledged expression. */ - + bc_expand_expr (TYPE_SIZE (type)); opcode = storeBLK; } @@ -9692,7 +9692,7 @@ bc_store_memory (type, decl) abort (); bc_emit_bytecode (opcode); - + #ifdef DEBUG_PRINT_CODE fputc ('\n', stderr); #endif @@ -9956,7 +9956,7 @@ bc_expand_address (exp) /* If packed, also return offset and size */ if (DECL_BIT_FIELD (TREE_OPERAND (exp, 0))) - + bc_push_offset_and_size (TREE_INT_CST_LOW (DECL_FIELD_BITPOS (TREE_OPERAND (exp, 0))), TREE_INT_CST_LOW (DECL_SIZE (TREE_OPERAND (exp, 0)))); @@ -10011,13 +10011,13 @@ bc_expand_address (exp) if (DECL_BIT_FIELD (exp)) bc_push_offset_and_size (TREE_INT_CST_LOW (DECL_FIELD_BITPOS (exp)), TREE_INT_CST_LOW (DECL_SIZE (exp))); - + break; case STRING_CST: { rtx r; - + bc_emit_bytecode (constP); r = output_constant_def (exp); bc_emit_code_labelref (BYTECODE_LABEL (r), BYTECODE_BC_LABEL (r)->offset); @@ -10103,11 +10103,11 @@ bc_expand_constructor (constr) HOST_WIDE_INT ptroffs; rtx constr_rtx; - + /* Literal constructors are handled as constants, whereas non-literals are evaluated and stored element by element into the data segment. */ - + /* Allocate space in proper segment and push pointer to space on stack. */ @@ -10128,7 +10128,7 @@ bc_expand_constructor (constr) bc_output_data_constructor (constr); } - + /* Add reference to pointer table and recall pointer to stack; this code is common for both types of constructors: literals and non-literals. */ @@ -10143,15 +10143,15 @@ bc_expand_constructor (constr) /* At this point, we have the pointer to the structure on top of the stack. Generate sequences of store_memory calls for the constructor. */ - + /* constructor type is structure */ if (TREE_CODE (TREE_TYPE (constr)) == RECORD_TYPE) { register tree elt; - + /* If the constructor has fewer fields than the structure, clear the whole structure first. */ - + if (list_length (CONSTRUCTOR_ELTS (constr)) != list_length (TYPE_FIELDS (TREE_TYPE (constr)))) { @@ -10159,10 +10159,10 @@ bc_expand_constructor (constr) bc_emit_instruction (constSI, (HOST_WIDE_INT) int_size_in_bytes (TREE_TYPE (constr))); bc_emit_instruction (clearBLK); } - + /* Store each element of the constructor into the corresponding field of TARGET. */ - + for (elt = CONSTRUCTOR_ELTS (constr); elt; elt = TREE_CHAIN (elt)) { register tree field = TREE_PURPOSE (elt); @@ -10170,13 +10170,13 @@ bc_expand_constructor (constr) int bitsize; int bitpos; int unsignedp; - + bitsize = TREE_INT_CST_LOW (DECL_SIZE (field)) /* * DECL_SIZE_UNIT (field) */; mode = DECL_MODE (field); unsignedp = TREE_UNSIGNED (field); bitpos = TREE_INT_CST_LOW (DECL_FIELD_BITPOS (field)); - + bc_store_field (elt, bitsize, bitpos, mode, TREE_VALUE (elt), TREE_TYPE (TREE_VALUE (elt)), /* The alignment of TARGET is at least what its type requires. */ @@ -10186,7 +10186,7 @@ bc_expand_constructor (constr) } } else - + /* Constructor type is array */ if (TREE_CODE (TREE_TYPE (constr)) == ARRAY_TYPE) { @@ -10196,21 +10196,21 @@ bc_expand_constructor (constr) int minelt = TREE_INT_CST_LOW (TYPE_MIN_VALUE (domain)); int maxelt = TREE_INT_CST_LOW (TYPE_MAX_VALUE (domain)); tree elttype = TREE_TYPE (TREE_TYPE (constr)); - + /* If the constructor has fewer fields than the structure, clear the whole structure first. */ - + if (list_length (CONSTRUCTOR_ELTS (constr)) < maxelt - minelt + 1) { bc_emit_instruction (duplicate); bc_emit_instruction (constSI, (HOST_WIDE_INT) int_size_in_bytes (TREE_TYPE (constr))); bc_emit_instruction (clearBLK); } - - + + /* Store each element of the constructor into the corresponding element of TARGET, determined by counting the elements. */ - + for (elt = CONSTRUCTOR_ELTS (constr), i = 0; elt; elt = TREE_CHAIN (elt), i++) @@ -10219,14 +10219,14 @@ bc_expand_constructor (constr) int bitsize; int bitpos; int unsignedp; - + mode = TYPE_MODE (elttype); bitsize = GET_MODE_BITSIZE (mode); unsignedp = TREE_UNSIGNED (elttype); - + bitpos = (i * TREE_INT_CST_LOW (TYPE_SIZE (elttype)) /* * TYPE_SIZE_UNIT (elttype) */ ); - + bc_store_field (elt, bitsize, bitpos, mode, TREE_VALUE (elt), TREE_TYPE (TREE_VALUE (elt)), /* The alignment of TARGET is @@ -10235,7 +10235,7 @@ bc_expand_constructor (constr) TYPE_ALIGN (TREE_TYPE (constr)) / BITS_PER_UNIT, int_size_in_bytes (TREE_TYPE (constr))); } - + } } @@ -10311,7 +10311,7 @@ bc_load_bit_field (offset, size, unsignedp) /* Load: sign-extend if signed, else zero-extend */ bc_emit_instruction (unsignedp ? zxloadBI : sxloadBI); -} +} /* Adjust interpreter stack by NLEVELS. Positive means drop NLEVELS @@ -10327,16 +10327,16 @@ bc_adjust_stack (nlevels) { case 0: break; - + case 2: bc_emit_instruction (drop); - + case 1: bc_emit_instruction (drop); break; - + default: - + bc_emit_instruction (adjstackSI, (HOST_WIDE_INT) nlevels); stack_depth -= nlevels; } diff --git a/gnu/usr.bin/cc/cc_int/final.c b/gnu/usr.bin/cc/cc_int/final.c index 157510a..0bfc892 100644 --- a/gnu/usr.bin/cc/cc_int/final.c +++ b/gnu/usr.bin/cc/cc_int/final.c @@ -110,7 +110,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #define IS_ASM_LOGICAL_LINE_SEPARATOR(C) ((C) == ';') #endif -/* Nonzero means this function is a leaf function, with no function calls. +/* Nonzero means this function is a leaf function, with no function calls. This variable exists to be examined in FUNCTION_PROLOGUE and FUNCTION_EPILOGUE. Always zero, unless set by some action. */ int leaf_function; @@ -520,7 +520,7 @@ app_disable () } } -/* Return the number of slots filled in the current +/* Return the number of slots filled in the current delayed branch sequence (we don't count the insn needing the delay slot). Zero if not in a delayed branch sequence. */ @@ -663,7 +663,7 @@ shorten_branches (first) insn_addresses[uid] = insn_current_address; insn_lengths[uid] = 0; varying_length[uid] = 0; - + if (GET_CODE (insn) == NOTE || GET_CODE (insn) == BARRIER || GET_CODE (insn) == CODE_LABEL) continue; @@ -711,7 +711,7 @@ shorten_branches (first) * insn_default_length (inner_insn)); else inner_length = insn_default_length (inner_insn); - + insn_lengths[inner_uid] = inner_length; if (const_delay_slots) { @@ -762,7 +762,7 @@ shorten_branches (first) if (GET_CODE (insn) == INSN && GET_CODE (PATTERN (insn)) == SEQUENCE) { int i; - + body = PATTERN (insn); new_length = 0; for (i = 0; i < XVECLEN (body, 0); i++) @@ -872,7 +872,7 @@ final_start_function (first, file, optimize) regs_ever_live[i] = 1; } #endif - + /* Initial line number is supposed to be output before the function's prologue and label so that the function's address will not appear to be @@ -892,7 +892,7 @@ final_start_function (first, file, optimize) last_linenum = NOTE_LINE_NUMBER (first); xcoffout_output_first_source_line (file, last_linenum); } -#endif +#endif else output_source_line (file, first); } @@ -1468,7 +1468,7 @@ final_scan_insn (insn, file, optimize, prescan, nopeepholes) #ifdef ASM_OUTPUT_ALIGN_CODE /* Don't litter the assembler output with needless alignments. A BARRIER will be placed at the end of every function if HAVE_epilogue - is true. */ + is true. */ if (NEXT_INSN (insn)) ASM_OUTPUT_ALIGN_CODE (file); #endif @@ -1982,11 +1982,11 @@ final_scan_insn (insn, file, optimize, prescan, nopeepholes) /* If we didn't split the insn, go away. */ if (new == insn && PATTERN (new) == body) abort (); - + new_block = 0; return new; } - + if (prescan > 0) break; @@ -2431,7 +2431,7 @@ output_asm_insn (template, operands) } else output_operand (operands[c], letter); - + while ((c = *p) >= '0' && c <= '9') p++; } /* % followed by a digit outputs an operand the default way. */ @@ -2466,7 +2466,7 @@ output_asm_insn (template, operands) if (debug_insn) { register int num = INSN_CODE (debug_insn); - fprintf (asm_out_file, " %s %d %s", + fprintf (asm_out_file, " %s %d %s", ASM_COMMENT_START, INSN_UID (debug_insn), insn_name[num]); if (insn_n_alternatives[num] > 1) fprintf (asm_out_file, "/%d", which_alternative + 1); diff --git a/gnu/usr.bin/cc/cc_int/flow.c b/gnu/usr.bin/cc/cc_int/flow.c index 2127a07..09067de 100644 --- a/gnu/usr.bin/cc/cc_int/flow.c +++ b/gnu/usr.bin/cc/cc_int/flow.c @@ -57,7 +57,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ register. The bit is 1 if the register is live at the beginning of the basic block. - Two types of elements can be added to an insn's REG_NOTES. + Two types of elements can be added to an insn's REG_NOTES. A REG_DEAD note is added to an insn's REG_NOTES for any register that meets both of two conditions: The value in the register is not needed in subsequent insns and the insn does not replace the value in @@ -291,7 +291,7 @@ static void mark_label_ref PROTO((rtx, rtx, int)); static void life_analysis PROTO((rtx, int)); void allocate_for_life_analysis PROTO((void)); static void init_regset_vector PROTO((regset *, regset, int, int)); -static void propagate_block PROTO((regset, rtx, rtx, int, +static void propagate_block PROTO((regset, rtx, rtx, int, regset, int)); static int insn_dead_p PROTO((rtx, regset, int)); static int libcall_dead_p PROTO((rtx, regset, rtx, rtx)); @@ -549,7 +549,7 @@ find_basic_blocks (f, nonlocal_label_list) && SET_DEST (pat) == pc_rtx && uses_reg_or_mem (SET_SRC (pat))) computed_jump = 1; - + if (computed_jump) { for (x = label_value_list; x; x = XEXP (x, 1)) @@ -894,14 +894,14 @@ life_analysis (f, nregs) if (GET_CODE (tem) == USE || GET_CODE (tem) == CLOBBER) continue; - + if (GET_CODE (tem) != SET || GET_CODE (SET_DEST (tem)) != REG || GET_CODE (SET_SRC (tem)) != REG || REGNO (SET_DEST (tem)) != REGNO (SET_SRC (tem))) break; } - + if (i == XVECLEN (PATTERN (insn), 0) /* Insns carrying these notes are useful later on. */ && ! find_reg_note (insn, REG_EQUAL, NULL_RTX)) @@ -971,7 +971,7 @@ life_analysis (f, nregs) [HARD_FRAME_POINTER_REGNUM / REGSET_ELT_BITS] |= (REGSET_ELT_TYPE) 1 << (HARD_FRAME_POINTER_REGNUM % REGSET_ELT_BITS); -#endif +#endif } /* Mark all global registers as being live at the end of the function @@ -1363,7 +1363,7 @@ propagate_block (old, first, last, final, significant, bnum) && NOTE_LINE_NUMBER (insn) == NOTE_INSN_LOOP_BEG) loop_depth--; - /* If we have LOOP_DEPTH == 0, there has been a bookkeeping error. + /* If we have LOOP_DEPTH == 0, there has been a bookkeeping error. Abort now rather than setting register status incorrectly. */ if (loop_depth == 0) abort (); @@ -1394,7 +1394,7 @@ propagate_block (old, first, last, final, significant, bnum) = (insn_dead_p (PATTERN (insn), old, 0) /* Don't delete something that refers to volatile storage! */ && ! INSN_VOLATILE (insn)); - int libcall_is_dead + int libcall_is_dead = (insn_is_dead && note != 0 && libcall_dead_p (PATTERN (insn), old, note, insn)); @@ -1490,7 +1490,7 @@ propagate_block (old, first, last, final, significant, bnum) mark_set_regs (old, dead, PATTERN (insn), final ? insn : NULL_RTX, significant); - /* If an insn doesn't use CC0, it becomes dead since we + /* If an insn doesn't use CC0, it becomes dead since we assume that every insn clobbers it. So show it dead here; mark_used_regs will set it live if it is referenced. */ cc0_live = 0; @@ -1637,7 +1637,7 @@ insn_dead_p (x, needed, call_ok) if (GET_CODE (r) == CC0) return ! cc0_live; #endif - + if (GET_CODE (r) == MEM && last_mem_set && ! MEM_VOLATILE_P (r) && rtx_equal_p (r, last_mem_set)) return 1; @@ -1880,9 +1880,9 @@ mark_set_1 (needed, dead, x, insn, significant) || (GET_CODE (reg) == REG && last_mem_set != 0 && reg_overlap_mentioned_p (reg, last_mem_set))) last_mem_set = 0; - + if (GET_CODE (reg) == MEM && ! side_effects_p (reg) - /* There are no REG_INC notes for SP, so we can't assume we'll see + /* There are no REG_INC notes for SP, so we can't assume we'll see everything that invalidates it. To be safe, don't eliminate any stores though SP; none of them should be redundant anyway. */ && ! reg_mentioned_p (stack_pointer_rtx, reg)) @@ -1975,7 +1975,7 @@ mark_set_1 (needed, dead, x, insn, significant) reg_n_sets[regno]++; reg_n_refs[regno] += loop_depth; - + /* The insns where a reg is live are normally counted elsewhere, but we want the count to include the insn where the reg is set, and the normal counting mechanism @@ -2167,7 +2167,7 @@ find_auto_inc (needed, x, insn) /* INCR will become a NOTE and INSN won't contain a use of ADDR. If a use of ADDR was just placed in - the insn before INSN, make that the next use. + the insn before INSN, make that the next use. Otherwise, invalidate it. */ if (GET_CODE (PREV_INSN (insn)) == INSN && GET_CODE (PATTERN (PREV_INSN (insn))) == SET @@ -2478,7 +2478,7 @@ mark_used_regs (needed, live, x, final, insn) mark_used_regs (needed, live, SET_SRC (x), final, insn); return; } - + /* Storing in STRICT_LOW_PART is like storing in a reg in that this SET might be dead, so ignore it in TESTREG. but in some other ways it is like using the reg. @@ -2550,7 +2550,7 @@ mark_used_regs (needed, live, x, final, insn) { register char *fmt = GET_RTX_FORMAT (code); register int i; - + for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--) { if (fmt[i] == 'e') diff --git a/gnu/usr.bin/cc/cc_int/fold-const.c b/gnu/usr.bin/cc/cc_int/fold-const.c index e729cdf..10093f5 100644 --- a/gnu/usr.bin/cc/cc_int/fold-const.c +++ b/gnu/usr.bin/cc/cc_int/fold-const.c @@ -36,7 +36,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ size_int takes an integer value, and creates a tree constant with type from `sizetype'. */ - + #include <stdio.h> #include <setjmp.h> #include "config.h" @@ -334,7 +334,7 @@ lshift_double (l1, h1, count, prec, lv, hv, arith) rshift_double (l1, h1, - count, prec, lv, hv, arith); return; } - + if (count >= prec) count = (unsigned HOST_WIDE_INT) count & prec; @@ -496,7 +496,7 @@ div_and_round_double (code, uns, abort (); /* calculate quotient sign and convert operands to unsigned. */ - if (!uns) + if (!uns) { if (hnum < 0) { @@ -505,7 +505,7 @@ div_and_round_double (code, uns, if (neg_double (lnum, hnum, &lnum, &hnum) && (lden & hden) == -1) overflow = 1; } - if (hden < 0) + if (hden < 0) { quo_neg = ~ quo_neg; neg_double (lden, hden, &lden, &hden); @@ -534,7 +534,7 @@ div_and_round_double (code, uns, bzero ((char *) num, sizeof num); /* to zero 9th element */ bzero ((char *) den, sizeof den); - encode (num, lnum, hnum); + encode (num, lnum, hnum); encode (den, lden, hden); /* Special code for when the divisor < BASE. */ @@ -677,7 +677,7 @@ div_and_round_double (code, uns, } else return overflow; break; - + case ROUND_DIV_EXPR: case ROUND_MOD_EXPR: /* round to closest integer */ { @@ -760,7 +760,7 @@ target_isinf (x) unsigned mantissa1 : 20; unsigned exponent : 11; unsigned sign : 1; - } big_endian; + } big_endian; } u; u.d = dconstm1; @@ -800,7 +800,7 @@ target_isnan (x) unsigned mantissa1 : 20; unsigned exponent : 11; unsigned sign : 1; - } big_endian; + } big_endian; } u; u.d = dconstm1; @@ -840,7 +840,7 @@ target_negative (x) unsigned mantissa1 : 20; unsigned exponent : 11; unsigned sign : 1; - } big_endian; + } big_endian; } u; u.d = dconstm1; @@ -1104,7 +1104,7 @@ const_binop (code, arg1, arg2, notrunc) int1l += int2l-1; return size_int (int1l / int2l); } - case ROUND_DIV_EXPR: + case ROUND_DIV_EXPR: if (int2h == 0 && int2l == 1) { t = build_int_2 (int1l, int1h); @@ -1123,7 +1123,7 @@ const_binop (code, arg1, arg2, notrunc) t = build_int_2 (low, hi); break; - case TRUNC_MOD_EXPR: case ROUND_MOD_EXPR: + case TRUNC_MOD_EXPR: case ROUND_MOD_EXPR: case FLOOR_MOD_EXPR: case CEIL_MOD_EXPR: overflow = div_and_round_double (code, uns, int1l, int1h, int2l, int2h, @@ -1748,11 +1748,11 @@ operand_equal_p (arg0, arg1, only_const) } /* Similar to operand_equal_p, but see if ARG0 might have been made by - shorten_compare from ARG1 when ARG1 was being compared with OTHER. + shorten_compare from ARG1 when ARG1 was being compared with OTHER. When in doubt, return 0. */ -static int +static int operand_equal_for_comparison_p (arg0, arg1, other) tree arg0, arg1; tree other; @@ -1861,7 +1861,7 @@ twoval_comparison_p (arg, cval1, cval2, save_p) && twoval_comparison_p (TREE_OPERAND (arg, 2), cval1, cval2, save_p)); return 0; - + case '<': /* First see if we can handle the first operand, then the second. For the second operand, we know *CVAL1 can't be zero. It must be that @@ -2247,13 +2247,13 @@ optimize_bit_field_compare (code, compare_type, lhs, rhs) if (! const_p) { - rnmode = get_best_mode (rbitsize, rbitpos, + rnmode = get_best_mode (rbitsize, rbitpos, TYPE_ALIGN (TREE_TYPE (rinner)), word_mode, rvolatilep); if (rnmode == VOIDmode) return 0; } - + /* Compute the bit position and size for the new reference and our offset within it. If the new reference is the same size as the original, we won't optimize anything, so return zero. */ @@ -2304,7 +2304,7 @@ optimize_bit_field_compare (code, compare_type, lhs, rhs) error case below. If we didn't, we might generate wrong code. For unsigned fields, the constant shifted right by the field length should - be all zero. For signed fields, the high-order bits should agree with + be all zero. For signed fields, the high-order bits should agree with the sign bit. */ if (lunsignedp) @@ -2397,7 +2397,7 @@ decode_field_reference (exp, pbitsize, pbitpos, pmode, punsignedp, tree unsigned_type; int precision; - /* All the optimizations using this function assume integer fields. + /* All the optimizations using this function assume integer fields. There are problems with FP fields since the type_for_size call below can fail for, e.g., XFmode. */ if (! INTEGRAL_TYPE_P (TREE_TYPE (exp))) @@ -2422,7 +2422,7 @@ decode_field_reference (exp, pbitsize, pbitpos, pmode, punsignedp, punsignedp, pvolatilep); if (inner == exp || *pbitsize < 0 || offset != 0) return 0; - + /* Compute the mask to access the bitfield. */ unsigned_type = type_for_size (*pbitsize, 1); precision = TYPE_PRECISION (unsigned_type); @@ -2458,7 +2458,7 @@ all_ones_mask_p (mask, size) TREE_TYPE (tmask) = signed_type (type); force_fit_type (tmask, 0); return - operand_equal_p (mask, + operand_equal_p (mask, const_binop (RSHIFT_EXPR, const_binop (LSHIFT_EXPR, tmask, size_int (precision - size), 0), @@ -2469,7 +2469,7 @@ all_ones_mask_p (mask, size) /* Subroutine for fold_truthop: determine if an operand is simple enough to be evaluated unconditionally. */ -static int +static int simple_operand_p (exp) tree exp; { @@ -2650,7 +2650,7 @@ fold_truthop (code, truth_type, lhs, rhs) { /* If this is the "or" of two comparisons, we can do something if we the comparisons are NE_EXPR. If this is the "and", we can do something - if the comparisons are EQ_EXPR. I.e., + if the comparisons are EQ_EXPR. I.e., (a->b == 2 && a->c == 4) can become (a->new == NEW). WANTED_CODE is this operation code. For single bit fields, we can @@ -2703,7 +2703,7 @@ fold_truthop (code, truth_type, lhs, rhs) lr_arg = TREE_OPERAND (lhs, 1); rl_arg = TREE_OPERAND (rhs, 0); rr_arg = TREE_OPERAND (rhs, 1); - + if (TREE_CODE (lr_arg) == INTEGER_CST && TREE_CODE (rr_arg) == INTEGER_CST && operand_equal_p (ll_arg, rl_arg, 0)) @@ -3005,7 +3005,7 @@ strip_compound_expr (t, s) but we can constant-fold them if they have constant operands. */ tree -fold (expr) +fold (expr) tree expr; { register tree t = expr; @@ -3033,7 +3033,7 @@ fold (expr) return DECL_INITIAL (t); return t; } - + kind = TREE_CODE_CLASS (code); if (code == NOP_EXPR || code == FLOAT_EXPR || code == CONVERT_EXPR) { @@ -3085,7 +3085,7 @@ fold (expr) /* Strip any conversions that don't change the mode. */ STRIP_NOPS (op); } - + if (TREE_CODE (op) == COMPLEX_CST) subop = TREE_REALPART (op); else @@ -3136,7 +3136,7 @@ fold (expr) one of the operands is a comparison and the other is a comparison, a BIT_AND_EXPR with the constant 1, or a truth value. In that case, the code below would make the expression more complex. Change it to a - TRUTH_{AND,OR}_EXPR. Likewise, convert a similar NE_EXPR to + TRUTH_{AND,OR}_EXPR. Likewise, convert a similar NE_EXPR to TRUTH_XOR_EXPR and an EQ_EXPR to the inversion of a TRUTH_XOR_EXPR. */ if ((code == BIT_AND_EXPR || code == BIT_IOR_EXPR @@ -3192,7 +3192,7 @@ fold (expr) TREE_OPERAND (TREE_OPERAND (t, 2), 0))); return t; } - else if (TREE_CODE_CLASS (TREE_CODE (arg0)) == '<') + else if (TREE_CODE_CLASS (TREE_CODE (arg0)) == '<') return fold (build (COND_EXPR, type, arg0, fold (build1 (code, type, integer_one_node)), fold (build1 (code, type, integer_zero_node)))); @@ -3311,7 +3311,7 @@ fold (expr) && TREE_CODE (arg1) == COMPOUND_EXPR) return build (COMPOUND_EXPR, type, TREE_OPERAND (arg1, 0), fold (build (code, type, arg0, TREE_OPERAND (arg1, 1)))); - + switch (code) { case INTEGER_CST: @@ -3330,7 +3330,7 @@ fold (expr) case FIX_TRUNC_EXPR: /* Other kinds of FIX are not handled properly by fold_convert. */ - /* In addition to the cases of two conversions in a row + /* In addition to the cases of two conversions in a row handled below, if we are converting something to its own type via an object of identical or wider precision, neither conversion is needed. */ @@ -3351,7 +3351,7 @@ fold (expr) and the outermost type is wider than the intermediate, or - the initial type is a pointer type and the precisions of the intermediate and final types differ, or - - the final type is a pointer type and the precisions of the + - the final type is a pointer type and the precisions of the initial and intermediate types differ. */ if ((TREE_CODE (TREE_OPERAND (t, 0)) == NOP_EXPR || TREE_CODE (TREE_OPERAND (t, 0)) == CONVERT_EXPR) @@ -3610,7 +3610,7 @@ fold (expr) /* If it is + and VAR==ARG1, return just CONST. */ if (code == PLUS_EXPR && operand_equal_p (var, arg1, 0)) return convert (TREE_TYPE (t), con); - + /* If ARG0 is a constant, don't change things around; instead keep all the constant computations together. */ @@ -3629,7 +3629,7 @@ fold (expr) /* If it is - and VAR==ARG1, return just CONST. */ if (code == MINUS_EXPR && operand_equal_p (var, arg1, 0)) return convert (TREE_TYPE (t), con); - + /* If ARG0 is a constant, don't change things around; instead keep all the constant computations together. */ @@ -3741,7 +3741,7 @@ fold (expr) return non_lvalue (convert (type, arg0)); } - /* Fold &x - &x. This can happen from &x.foo - &x. + /* Fold &x - &x. This can happen from &x.foo - &x. This is unsafe for certain floats even in non-IEEE formats. In IEEE, it is unsafe because it does wrong for NaNs. Also note that operand_equal_p is always false if an operand @@ -3994,7 +3994,7 @@ fold (expr) C3/C1 at the end of the operation. */ if (tree_int_cst_lt (c1, c3)) outer_div = const_binop (code, c3, c1, 0), c3 = c1; - + /* The result is A * (C1/C3) + (C2/C3). */ t = fold (build (PLUS_EXPR, type, fold (build (MULT_EXPR, type, @@ -4364,7 +4364,7 @@ fold (expr) && TREE_UNSIGNED (TREE_TYPE (arg0)) && TREE_CODE (arg1) == LSHIFT_EXPR && integer_onep (TREE_OPERAND (arg1, 0))) - return build (code == LT_EXPR ? EQ_EXPR : NE_EXPR, type, + return build (code == LT_EXPR ? EQ_EXPR : NE_EXPR, type, build (RSHIFT_EXPR, TREE_TYPE (arg0), arg0, TREE_OPERAND (arg1, 1)), convert (TREE_TYPE (arg0), integer_zero_node)); @@ -4829,7 +4829,7 @@ fold (expr) if (integer_onep (TREE_OPERAND (t, 1)) && integer_zerop (TREE_OPERAND (t, 2)) /* If we try to convert TREE_OPERAND (t, 0) to our type, the - call to fold will try to move the conversion inside + call to fold will try to move the conversion inside a COND, which will recurse. In that case, the COND_EXPR is probably the best choice, so leave it alone. */ && type == TREE_TYPE (arg0)) diff --git a/gnu/usr.bin/cc/cc_int/function.c b/gnu/usr.bin/cc/cc_int/function.c index 844af83..2718f6d 100644 --- a/gnu/usr.bin/cc/cc_int/function.c +++ b/gnu/usr.bin/cc/cc_int/function.c @@ -407,7 +407,7 @@ struct fixup_replacement rtx new; struct fixup_replacement *next; }; - + /* Forward declarations. */ static struct temp_slot *find_temp_slot_from_address PROTO((rtx)); @@ -637,7 +637,7 @@ get_frame_size () /* Allocate a stack slot of SIZE bytes and return a MEM rtx for it with machine mode MODE. - + ALIGN controls the amount of alignment for the address of the slot: 0 means according to MODE, -1 means use BIGGEST_ALIGNMENT and round size to multiple of that, @@ -852,7 +852,7 @@ assign_stack_temp (mode, size, keep) p = best_p; } - + /* If we still didn't find one, make a new temporary. */ if (p == 0) { @@ -940,7 +940,7 @@ combine_temp_slots () prev_p = p; } - /* Free all the RTL made by plus_constant. */ + /* Free all the RTL made by plus_constant. */ rtx_free (free_pointer); } @@ -969,7 +969,7 @@ find_temp_slot_from_address (x) return 0; } - + /* Indicate that NEW is an alternate way of refering to the temp slot that previous was known by OLD. */ @@ -1185,7 +1185,7 @@ put_var_into_stack (decl) if (output_bytecode) return; - + context = decl_function_context (decl); /* Get the current rtl used for this object and it's original mode. */ @@ -1478,7 +1478,7 @@ fixup_var_refs_insns (var, promoted_mode, unsignedp, insn, toplevel) PATTERN (insn) = replace_rtx (PATTERN (insn), call_dest, temp); } - + if (GET_CODE (insn) == CALL_INSN && GET_CODE (PATTERN (insn)) == SET) call_dest = SET_DEST (PATTERN (insn)); @@ -1497,7 +1497,7 @@ fixup_var_refs_insns (var, promoted_mode, unsignedp, insn, toplevel) a list of struct fixup_replacements. If fixup_var_refs_1 needs to allocate pseudos or replacement MEMs (for SUBREGs), it will record them in this list. - + If it allocated a pseudo for any replacement, we copy into it here. */ @@ -1564,7 +1564,7 @@ fixup_var_refs_insns (var, promoted_mode, unsignedp, insn, toplevel) } /* VAR is a MEM that used to be a pseudo register with mode PROMOTED_MODE. - See if the rtx expression at *LOC in INSN needs to be changed. + See if the rtx expression at *LOC in INSN needs to be changed. REPLACEMENTS is a pointer to a list head that starts out zero, but may contain a list of original rtx's and replacements. If we find that we need @@ -1594,7 +1594,7 @@ fixup_var_refs_1 (var, promoted_mode, loc, insn, replacements) case MEM: if (var == x) { - /* If we already have a replacement, use it. Otherwise, + /* If we already have a replacement, use it. Otherwise, try to fix up this address in case it is invalid. */ replacement = find_fixup_replacement (replacements, var); @@ -1608,7 +1608,7 @@ fixup_var_refs_1 (var, promoted_mode, loc, insn, replacements) /* Unless we are forcing memory to register or we changed the mode, we can leave things the way they are if the insn is valid. */ - + INSN_CODE (insn) = -1; if (! flag_force_mem && GET_MODE (x) == promoted_mode && recog_memoized (insn) >= 0) @@ -1729,7 +1729,7 @@ fixup_var_refs_1 (var, promoted_mode, loc, insn, replacements) return; } break; - + case SUBREG: if (SUBREG_REG (x) == var) { @@ -1746,7 +1746,7 @@ fixup_var_refs_1 (var, promoted_mode, loc, insn, replacements) } /* If this SUBREG makes VAR wider, it has become a paradoxical - SUBREG with VAR in memory, but these aren't allowed at this + SUBREG with VAR in memory, but these aren't allowed at this stage of the compilation. So load VAR into a pseudo and take a SUBREG of that pseudo. */ if (GET_MODE_SIZE (GET_MODE (x)) > GET_MODE_SIZE (GET_MODE (var))) @@ -1768,7 +1768,7 @@ fixup_var_refs_1 (var, promoted_mode, loc, insn, replacements) *loc = replacement->new; return; } - + replacement->new = *loc = fixup_memory_subreg (x, insn, 0); INSN_CODE (insn) = -1; @@ -1802,7 +1802,7 @@ fixup_var_refs_1 (var, promoted_mode, loc, insn, replacements) insn); break; } - + { rtx dest = SET_DEST (x); rtx src = SET_SRC (x); @@ -1883,10 +1883,10 @@ fixup_var_refs_1 (var, promoted_mode, loc, insn, replacements) INSN_CODE (insn) = -1; XEXP (outerdest, 0) = newmem; XEXP (outerdest, 2) = GEN_INT (pos); - + if (recog_memoized (insn) >= 0) return; - + /* Otherwise, restore old position. XEXP (x, 0) will be restored later. */ XEXP (outerdest, 2) = old_pos; @@ -1950,7 +1950,7 @@ fixup_var_refs_1 (var, promoted_mode, loc, insn, replacements) copy SET_SRC (x) to SET_DEST (x) in some way. So we generate the move and see whether it requires more than one insn. If it does, we emit those insns and - delete INSN. Otherwise, we an just replace the pattern + delete INSN. Otherwise, we an just replace the pattern of INSN; we have already verified above that INSN has no other function that to do X. */ @@ -2098,7 +2098,7 @@ fixup_memory_subreg (x, insn, uncritical) If X itself is a (SUBREG (MEM ...) ...), return the replacement expression. Otherwise return X, with its contents possibly altered. - If any insns must be emitted to compute NEWADDR, put them before INSN. + If any insns must be emitted to compute NEWADDR, put them before INSN. UNCRITICAL is as in fixup_memory_subreg. */ @@ -2381,7 +2381,7 @@ static int out_arg_offset; /* The bottom of the stack points to the actual arguments. If REG_PARM_STACK_SPACE is defined, this includes the space for the register parameters. However, if OUTGOING_REG_PARM_STACK space is not defined, - stack space for register parameters is not pushed by the caller, but + stack space for register parameters is not pushed by the caller, but rather part of the fixed stack areas and hence not included in `current_function_outgoing_args_size'. Nevertheless, we must allow for it when allocating stack dynamic objects. */ @@ -2469,7 +2469,7 @@ instantiate_decls (fndecl, valid_only) for (decl = DECL_ARGUMENTS (fndecl); decl; decl = TREE_CHAIN (decl)) { instantiate_decl (DECL_RTL (decl), int_size_in_bytes (TREE_TYPE (decl)), - valid_only); + valid_only); instantiate_decl (DECL_INCOMING_RTL (decl), int_size_in_bytes (TREE_TYPE (decl)), valid_only); } @@ -2578,7 +2578,7 @@ instantiate_decl (x, size, valid_only) is not valid. Return 1 if we either had nothing to do or if we were able to do the - needed replacement. Return 0 otherwise; we only return zero if + needed replacement. Return 0 otherwise; we only return zero if EXTRA_INSNS is zero. We first try some simple transformations to avoid the creation of extra @@ -2790,12 +2790,12 @@ instantiate_virtual_regs_1 (loc, object, extra_insns) /* Most cases of MEM that convert to valid addresses have already been handled by our scan of regno_reg_rtx. The only special handling we need here is to make a copy of the rtx to ensure it isn't being - shared if we have to change it to a pseudo. + shared if we have to change it to a pseudo. If the rtx is a simple reference to an address via a virtual register, it can potentially be shared. In such cases, first try to make it a valid address, which can also be shared. Otherwise, copy it and - proceed normally. + proceed normally. First check for common cases that need no processing. These are usually due to instantiation already being done on a previous instance @@ -3104,7 +3104,7 @@ assign_parms (fndecl, second_time) tree fnargs = DECL_ARGUMENTS (fndecl); /* This is used for the arg pointer when referring to stack args. */ rtx internal_arg_pointer; - /* This is a dummy PARM_DECL that we used for the function result if + /* This is a dummy PARM_DECL that we used for the function result if the function returns a structure. */ tree function_result_decl = 0; int nparmregs = list_length (fnargs) + LAST_VIRTUAL_REGISTER + 1; @@ -3165,7 +3165,7 @@ assign_parms (fndecl, second_time) TREE_CHAIN (function_result_decl) = fnargs; fnargs = function_result_decl; } - + parm_reg_stack_loc = (rtx *) oballoc (nparmregs * sizeof (rtx)); bzero ((char *) parm_reg_stack_loc, nparmregs * sizeof (rtx)); @@ -3645,7 +3645,7 @@ assign_parms (fndecl, second_time) #endif /* FUNCTION_ARG_CALLEE_COPIES */ /* In any case, record the parm's desired stack location - in case we later discover it must live in the stack. + in case we later discover it must live in the stack. If it is a COMPLEX value, store the stack location for both halves. */ @@ -3782,7 +3782,7 @@ assign_parms (fndecl, second_time) DECL_RTL (parm) = stack_parm; } - + /* If this "parameter" was the place where we are receiving the function's incoming structure pointer, set up the result. */ if (parm == function_result_decl) @@ -3827,13 +3827,13 @@ assign_parms (fndecl, second_time) current_function_args_size = ((current_function_args_size + STACK_BYTES - 1) / STACK_BYTES) * STACK_BYTES; -#endif +#endif #ifdef ARGS_GROW_DOWNWARD current_function_arg_offset_rtx = (stack_args_size.var == 0 ? GEN_INT (-stack_args_size.constant) - : expand_expr (size_binop (MINUS_EXPR, stack_args_size.var, - size_int (-stack_args_size.constant)), + : expand_expr (size_binop (MINUS_EXPR, stack_args_size.var, + size_int (-stack_args_size.constant)), NULL_RTX, VOIDmode, 0)); #else current_function_arg_offset_rtx = ARGS_SIZE_RTX (stack_args_size); @@ -3922,7 +3922,7 @@ promoted_input_arg (regno, pmode, punsignedp) initial offset is not affected by this rounding, while the size always is and the starting offset may be. */ -/* offset_ptr will be negative for ARGS_GROW_DOWNWARD case; +/* offset_ptr will be negative for ARGS_GROW_DOWNWARD case; initial_offset_ptr is positive because locate_and_pad_parm's callers pass in the total size of args so far as initial_offset_ptr. arg_size_ptr is always positive.*/ @@ -4003,7 +4003,7 @@ locate_and_pad_parm (passed_mode, type, in_regs, fndecl, else { arg_size_ptr->constant = (- initial_offset_ptr->constant - - offset_ptr->constant); + offset_ptr->constant); } #else /* !ARGS_GROW_DOWNWARD */ pad_to_arg_alignment (initial_offset_ptr, boundary); @@ -4036,14 +4036,14 @@ pad_to_arg_alignment (offset_ptr, boundary) int boundary; { int boundary_in_bytes = boundary / BITS_PER_UNIT; - + if (boundary > BITS_PER_UNIT) { if (offset_ptr->var) { offset_ptr->var = #ifdef ARGS_GROW_DOWNWARD - round_down + round_down #else round_up #endif @@ -4216,7 +4216,7 @@ lookup_static_chain (decl) if (context == 0) return 0; - + /* We treat inline_function_decl as an alias for the current function because that is the inline function whose vars, types, etc. are being merged into the current function. @@ -4505,7 +4505,7 @@ reorder_blocks (block_vector, top_block, insns) block = copy_node (block); BLOCK_SUBBLOCKS (block) = 0; TREE_ASM_WRITTEN (block) = 1; - BLOCK_SUPERCONTEXT (block) = current_block; + BLOCK_SUPERCONTEXT (block) = current_block; BLOCK_CHAIN (block) = BLOCK_SUBBLOCKS (current_block); BLOCK_SUBBLOCKS (current_block) = block; current_block = block; @@ -4549,7 +4549,7 @@ all_blocks (block, vector) tree *vector; { int n_blocks = 1; - tree subblocks; + tree subblocks; TREE_ASM_WRITTEN (block) = 0; /* Record this block. */ @@ -5111,7 +5111,7 @@ expand_function_start (subr, parms_have_cleanups) } /* Generate RTL for the end of the current function. - FILENAME and LINE are the current position in the source file. + FILENAME and LINE are the current position in the source file. It is up to language-specific callers to do cleanups for parameters-- or else, supply 1 for END_BINDINGS and we will call expand_end_bindings. */ diff --git a/gnu/usr.bin/cc/cc_int/global.c b/gnu/usr.bin/cc/cc_int/global.c index ff86fec..650fb5f 100644 --- a/gnu/usr.bin/cc/cc_int/global.c +++ b/gnu/usr.bin/cc/cc_int/global.c @@ -43,7 +43,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ 1. count the pseudo-registers still needing allocation and assign allocation-numbers (allocnos) to them. - Set up tables reg_allocno and allocno_reg to map + Set up tables reg_allocno and allocno_reg to map reg numbers to allocnos and vice versa. max_allocno gets the number of allocnos in use. @@ -457,7 +457,7 @@ global_alloc (file) for (j = regno; j < lim; j++) local_reg_n_refs[j] = 0; } - + /* Allocate the space for the conflict and preference tables and initialize them. */ @@ -468,17 +468,17 @@ global_alloc (file) hard_reg_preferences = (HARD_REG_SET *) alloca (max_allocno * sizeof (HARD_REG_SET)); bzero ((char *) hard_reg_preferences, max_allocno * sizeof (HARD_REG_SET)); - + hard_reg_copy_preferences = (HARD_REG_SET *) alloca (max_allocno * sizeof (HARD_REG_SET)); bzero ((char *) hard_reg_copy_preferences, max_allocno * sizeof (HARD_REG_SET)); - + hard_reg_full_preferences = (HARD_REG_SET *) alloca (max_allocno * sizeof (HARD_REG_SET)); bzero ((char *) hard_reg_full_preferences, max_allocno * sizeof (HARD_REG_SET)); - + regs_someone_prefers = (HARD_REG_SET *) alloca (max_allocno * sizeof (HARD_REG_SET)); bzero ((char *) regs_someone_prefers, max_allocno * sizeof (HARD_REG_SET)); @@ -543,7 +543,7 @@ global_alloc (file) } qsort (allocno_order, max_allocno, sizeof (int), allocno_compare); - + prune_preferences (); if (file) @@ -824,17 +824,17 @@ expand_preferences () /* Prune the preferences for global registers to exclude registers that cannot be used. - + Compute `regs_someone_prefers', which is a bitmask of the hard registers that are preferred by conflicting registers of lower priority. If possible, we will avoid using these registers. */ - + static void prune_preferences () { int i, j; int allocno; - + /* Scan least most important to most important. For each allocno, remove from preferences registers that cannot be used, either because of conflicts or register type. Then compute all registers @@ -875,7 +875,7 @@ prune_preferences () if (allocno_size[allocno_order[j]] <= allocno_size[allocno]) AND_COMPL_HARD_REG_SET (temp, hard_reg_full_preferences[allocno]); - + IOR_HARD_REG_SET (regs_someone_prefers[allocno], temp); } } @@ -950,7 +950,7 @@ find_reg (allocno, losers, alt_regs_p, accept_call_clobbered, retrying) COPY_HARD_REG_SET (used, used1); IOR_COMPL_HARD_REG_SET (used, regs_used_so_far); IOR_HARD_REG_SET (used, regs_someone_prefers[allocno]); - + best_reg = -1; for (i = FIRST_PSEUDO_REGISTER, pass = 0; pass <= 1 && i >= FIRST_PSEUDO_REGISTER; @@ -992,7 +992,7 @@ find_reg (allocno, losers, alt_regs_p, accept_call_clobbered, retrying) Remove from the preferred registers and conflicting registers. Note that additional conflicts may have been added after `prune_preferences' was - called. + called. First do this for those register with copy preferences, then all preferred registers. */ @@ -1069,7 +1069,7 @@ find_reg (allocno, losers, alt_regs_p, accept_call_clobbered, retrying) } no_prefs: - /* If we haven't succeeded yet, try with caller-saves. + /* If we haven't succeeded yet, try with caller-saves. We need not check to see if the current function has nonlocal labels because we don't put any pseudos that are live over calls in registers in that case. */ @@ -1126,7 +1126,7 @@ find_reg (allocno, losers, alt_regs_p, accept_call_clobbered, retrying) /* We explicitly evaluate the divide results into temporary variables so as to avoid excess precision problems that occur on a i386-unknown-sysv4.2 (unixware) host. */ - + double tmp1 = ((double) local_reg_n_refs[regno] / local_reg_live_length[regno]); double tmp2 = ((double) allocno_n_refs[allocno] @@ -1310,7 +1310,7 @@ record_conflicts (allocno_vec, len) SETTER is 0 if this register was modified by an auto-increment (i.e., a REG_INC note was found for it). - CLOBBERs are processed here by calling mark_reg_clobber. */ + CLOBBERs are processed here by calling mark_reg_clobber. */ static void mark_reg_store (orig_reg, setter) @@ -1526,7 +1526,7 @@ mark_reg_live_nc (regno, mode) that SRC is a register. If SRC or the first operand of SRC is a register, try to set a preference. If one of the two is a hard register and the other is a pseudo-register, mark the preference. - + Note that we are not as aggressive as local-alloc in trying to tie a pseudo-register to a hard register. */ @@ -1695,7 +1695,7 @@ dump_global_regs (file) FILE *file; { register int i, j; - + fprintf (file, ";; Register dispositions:\n"); for (i = FIRST_PSEUDO_REGISTER, j = 0; i < max_regno; i++) if (reg_renumber[i] >= 0) diff --git a/gnu/usr.bin/cc/cc_int/insn-output.c b/gnu/usr.bin/cc/cc_int/insn-output.c index 7186712..65b0ec5 100644 --- a/gnu/usr.bin/cc/cc_int/insn-output.c +++ b/gnu/usr.bin/cc/cc_int/insn-output.c @@ -454,7 +454,7 @@ output_55 (operands, insn) if (REG_P (operands[0]) && operands[1] == const0_rtx) return AS2 (xor%L0,%k0,%k0); - if (REG_P (operands[0]) && operands[1] == const1_rtx + if (REG_P (operands[0]) && operands[1] == const1_rtx && (link = find_reg_note (insn, REG_WAS_0, 0)) /* Make sure the insn that stored the 0 is still present. */ && ! INSN_DELETED_P (XEXP (link, 0)) @@ -2958,7 +2958,7 @@ output_239 (operands, insn) rtx *operands; rtx insn; { - return "seta %0"; + return "seta %0"; } static char * @@ -2980,7 +2980,7 @@ output_243 (operands, insn) rtx *operands; rtx insn; { - return "setb %0"; + return "setb %0"; } static char * @@ -3002,7 +3002,7 @@ output_247 (operands, insn) rtx *operands; rtx insn; { - return "setae %0"; + return "setae %0"; } static char * @@ -3024,7 +3024,7 @@ output_251 (operands, insn) rtx *operands; rtx insn; { - return "setbe %0"; + return "setbe %0"; } static char * diff --git a/gnu/usr.bin/cc/cc_int/insn-recog.c b/gnu/usr.bin/cc/cc_int/insn-recog.c index c3406b7..c1179c4 100644 --- a/gnu/usr.bin/cc/cc_int/insn-recog.c +++ b/gnu/usr.bin/cc/cc_int/insn-recog.c @@ -3034,7 +3034,7 @@ recog_4 (x0, insn, pnum_clobbers) if (register_operand (x2, SFmode)) { ro[1] = x2; - if (! TARGET_NO_FANCY_MATH_387 && TARGET_80387 + if (! TARGET_NO_FANCY_MATH_387 && TARGET_80387 && (TARGET_IEEE_FP || flag_fast_math) ) return 194; } @@ -3046,7 +3046,7 @@ recog_4 (x0, insn, pnum_clobbers) if (register_operand (x2, SFmode)) { ro[1] = x2; - if (! TARGET_NO_FANCY_MATH_387 && TARGET_80387 + if (! TARGET_NO_FANCY_MATH_387 && TARGET_80387 && (TARGET_IEEE_FP || flag_fast_math) ) return 197; } @@ -3245,7 +3245,7 @@ recog_4 (x0, insn, pnum_clobbers) if (general_operand (x3, SFmode)) { ro[1] = x3; - if (! TARGET_NO_FANCY_MATH_387 && TARGET_80387 + if (! TARGET_NO_FANCY_MATH_387 && TARGET_80387 && (TARGET_IEEE_FP || flag_fast_math) ) return 189; } @@ -3264,7 +3264,7 @@ recog_4 (x0, insn, pnum_clobbers) if (register_operand (x2, DFmode)) { ro[1] = x2; - if (! TARGET_NO_FANCY_MATH_387 && TARGET_80387 + if (! TARGET_NO_FANCY_MATH_387 && TARGET_80387 && (TARGET_IEEE_FP || flag_fast_math) ) return 193; } @@ -3276,7 +3276,7 @@ recog_4 (x0, insn, pnum_clobbers) if (register_operand (x3, SFmode)) { ro[1] = x3; - if (! TARGET_NO_FANCY_MATH_387 && TARGET_80387 + if (! TARGET_NO_FANCY_MATH_387 && TARGET_80387 && (TARGET_IEEE_FP || flag_fast_math) ) return 195; } @@ -3295,7 +3295,7 @@ recog_4 (x0, insn, pnum_clobbers) if (register_operand (x2, DFmode)) { ro[1] = x2; - if (! TARGET_NO_FANCY_MATH_387 && TARGET_80387 + if (! TARGET_NO_FANCY_MATH_387 && TARGET_80387 && (TARGET_IEEE_FP || flag_fast_math) ) return 196; } @@ -3307,7 +3307,7 @@ recog_4 (x0, insn, pnum_clobbers) if (register_operand (x3, SFmode)) { ro[1] = x3; - if (! TARGET_NO_FANCY_MATH_387 && TARGET_80387 + if (! TARGET_NO_FANCY_MATH_387 && TARGET_80387 && (TARGET_IEEE_FP || flag_fast_math) ) return 198; } @@ -3471,7 +3471,7 @@ recog_4 (x0, insn, pnum_clobbers) if (general_operand (x2, XFmode)) { ro[1] = x2; - if (! TARGET_NO_FANCY_MATH_387 && TARGET_80387 + if (! TARGET_NO_FANCY_MATH_387 && TARGET_80387 && (TARGET_IEEE_FP || flag_fast_math) ) return 190; } @@ -3483,7 +3483,7 @@ recog_4 (x0, insn, pnum_clobbers) if (general_operand (x3, DFmode)) { ro[1] = x3; - if (! TARGET_NO_FANCY_MATH_387 && TARGET_80387 + if (! TARGET_NO_FANCY_MATH_387 && TARGET_80387 && (TARGET_IEEE_FP || flag_fast_math) ) return 191; } @@ -3491,7 +3491,7 @@ recog_4 (x0, insn, pnum_clobbers) if (general_operand (x3, SFmode)) { ro[1] = x3; - if (! TARGET_NO_FANCY_MATH_387 && TARGET_80387 + if (! TARGET_NO_FANCY_MATH_387 && TARGET_80387 && (TARGET_IEEE_FP || flag_fast_math) ) return 192; } diff --git a/gnu/usr.bin/cc/cc_int/integrate.c b/gnu/usr.bin/cc/cc_int/integrate.c index 2355508..7e9c2d5 100644 --- a/gnu/usr.bin/cc/cc_int/integrate.c +++ b/gnu/usr.bin/cc/cc_int/integrate.c @@ -219,7 +219,7 @@ static int in_nonparm_insns; /* Subroutine for `save_for_inline{copying,nocopy}'. Performs initialization needed to save FNDECL's insns and info for future inline expansion. */ - + static rtx initialize_for_inline (fndecl, min_labelno, max_labelno, max_reg, copy) tree fndecl; @@ -327,7 +327,7 @@ initialize_for_inline (fndecl, min_labelno, max_labelno, max_reg, copy) /* Subroutine for `save_for_inline{copying,nocopy}'. Finishes up the things that must be done to make FNDECL expandable as an inline function. HEAD contains the chain of insns to which FNDECL will expand. */ - + static void finish_inline (fndecl, head) tree fndecl; @@ -386,7 +386,7 @@ save_for_inline_copying (fndecl) int max_uid; rtx first_nonparm_insn; - /* Make and emit a return-label if we have not already done so. + /* Make and emit a return-label if we have not already done so. Do this before recording the bounds on label numbers. */ if (return_label == 0) @@ -796,7 +796,7 @@ save_constants (px) again: x = *px; - /* If this is a CONST_DOUBLE, don't try to fix things up in + /* If this is a CONST_DOUBLE, don't try to fix things up in CONST_DOUBLE_MEM, because this is an infinite recursion. */ if (GET_CODE (x) == CONST_DOUBLE) return; @@ -808,7 +808,7 @@ save_constants (px) RTX_INTEGRATED_P (new) = 1; /* If the MEM was in a different mode than the constant (perhaps we - were only looking at the low-order part), surround it with a + were only looking at the low-order part), surround it with a SUBREG so we can save both modes. */ if (GET_MODE (x) != const_mode) @@ -981,7 +981,7 @@ copy_for_inline (orig) it is possible for unshare_all_rtl to copy the address, into memory that won't be saved. Although the MEM can safely be shared, and won't be copied there, the address itself cannot be shared, and may - need to be copied. + need to be copied. There are also two exceptions with constants: The first is if the constant is a LABEL_REF or the sum of the LABEL_REF @@ -1310,7 +1310,7 @@ expand_inline_function (fndecl, parms, target, ignore, type, structure_value_add || (GET_CODE (arg_vals[i]) == SUBREG))) arg_vals[i] = copy_to_mode_reg (GET_MODE (loc), arg_vals[i]); } - + /* Allocate the structures we use to remap things. */ map = (struct inline_remap *) alloca (sizeof (struct inline_remap)); @@ -1554,7 +1554,7 @@ expand_inline_function (fndecl, parms, target, ignore, type, structure_value_add { if (! structure_value_addr || ! aggregate_value_p (DECL_RESULT (fndecl))) abort (); - + /* Pass the function the address in which to return a structure value. Note that a constructor can cause someone to call us with STRUCTURE_VALUE_ADDR, but the initialization takes place @@ -1950,7 +1950,7 @@ integrate_decl_tree (let, level, map) if (level > 0) pushlevel (0); - + for (t = BLOCK_VARS (let); t; t = TREE_CHAIN (t)) { tree d; @@ -2088,7 +2088,7 @@ copy_rtx_and_substitute (orig, map) start_sequence (); loc = assign_stack_temp (BLKmode, size, 1); loc = XEXP (loc, 0); - /* When arguments grow downward, the virtual incoming + /* When arguments grow downward, the virtual incoming args pointer points to the top of the argument block, so the remapped location better do the same. */ #ifdef ARGS_GROW_DOWNWARD @@ -2198,7 +2198,7 @@ copy_rtx_and_substitute (orig, map) { rtx constant = get_pool_constant (orig); if (GET_CODE (constant) == LABEL_REF) - return XEXP (force_const_mem (Pmode, + return XEXP (force_const_mem (Pmode, copy_rtx_and_substitute (constant, map)), 0); @@ -2535,7 +2535,7 @@ subst_constants (loc, insn, map) /* We can't call subst_constants on &SUBREG_REG (x) because any constant or SUBREG wouldn't be valid inside our SUBEG. Instead, see what is inside, try to form the new SUBREG and see if that is - valid. We handle two cases: extracting a full word in an + valid. We handle two cases: extracting a full word in an integral mode and extracting the low part. */ subst_constants (&inner, NULL_RTX, map); @@ -2638,7 +2638,7 @@ subst_constants (loc, insn, map) } format_ptr = GET_RTX_FORMAT (code); - + /* If the first operand is an expression, save its mode for later. */ if (*format_ptr == 'e') op0_mode = GET_MODE (XEXP (x, 0)); diff --git a/gnu/usr.bin/cc/cc_int/jump.c b/gnu/usr.bin/cc/cc_int/jump.c index 28d25e5..23c51bf 100644 --- a/gnu/usr.bin/cc/cc_int/jump.c +++ b/gnu/usr.bin/cc/cc_int/jump.c @@ -512,7 +512,7 @@ jump_optimize (f, cross_jump, noop_moves, after_regscan) || dreg != sreg) break; } - + if (i < 0) delete_insn (insn); } @@ -548,7 +548,7 @@ jump_optimize (f, cross_jump, noop_moves, after_regscan) && regno_first_uid[REGNO (SET_DEST (set))] == INSN_UID (insn) /* We use regno_last_note_uid so as not to delete the setting of a reg that's used in notes. A subsequent optimization - might arrange to use that reg for real. */ + might arrange to use that reg for real. */ && regno_last_note_uid[REGNO (SET_DEST (set))] == INSN_UID (insn) && ! side_effects_p (SET_SRC (set)) && ! find_reg_note (insn, REG_RETVAL, 0)) @@ -712,7 +712,7 @@ jump_optimize (f, cross_jump, noop_moves, after_regscan) the insn if the only note is a REG_EQUAL or REG_EQUIV whose value is the same as "b". - INSN is the branch over the `else' part. + INSN is the branch over the `else' part. We set: @@ -876,7 +876,7 @@ jump_optimize (f, cross_jump, noop_moves, after_regscan) if (validate_change (temp, &SET_DEST (temp1), new, 0)) { next = emit_insn_after (gen_move_insn (temp2, new), insn); - emit_insn_after_with_line_notes (PATTERN (temp), + emit_insn_after_with_line_notes (PATTERN (temp), PREV_INSN (insn), temp); delete_insn (temp); reallabelprev = prev_active_insn (JUMP_LABEL (insn)); @@ -931,7 +931,7 @@ jump_optimize (f, cross_jump, noop_moves, after_regscan) } } - /* Finally, handle the case where two insns are used to + /* Finally, handle the case where two insns are used to compute EXP but a temporary register is used. Here we must ensure that the temporary register is not used anywhere else. */ @@ -1027,7 +1027,7 @@ jump_optimize (f, cross_jump, noop_moves, after_regscan) && (GET_CODE (temp2 = SET_SRC (PATTERN (temp))) == REG || GET_CODE (temp2) == SUBREG || GET_CODE (temp2) == CONST_INT) - /* Allow either form, but prefer the former if both apply. + /* Allow either form, but prefer the former if both apply. There is no point in using the old value of TEMP1 if it is a register, since cse will alias them. It can lose if the old value were a hard register since CSE @@ -1123,7 +1123,7 @@ jump_optimize (f, cross_jump, noop_moves, after_regscan) target = emit_store_flag (gen_reg_rtx (GET_MODE (var)), code, XEXP (temp4, 0), XEXP (temp4, 1), VOIDmode, - (code == LTU || code == LEU + (code == LTU || code == LEU || code == GEU || code == GTU), normalizep); if (target) @@ -1133,7 +1133,7 @@ jump_optimize (f, cross_jump, noop_moves, after_regscan) /* Put the store-flag insns in front of the first insn used to compute the condition to ensure that we - use the same values of them as the current + use the same values of them as the current comparison. However, the remainder of the insns we generate will be placed directly in front of the jump insn, in case any of the pseudos we use @@ -1193,7 +1193,7 @@ jump_optimize (f, cross_jump, noop_moves, after_regscan) && ! preserve_subexpressions_p () ? target : NULL_RTX)); } - + emit_move_insn (var, target); seq = get_insns (); end_sequence (); @@ -1221,7 +1221,7 @@ jump_optimize (f, cross_jump, noop_moves, after_regscan) /* If branches are expensive, convert if (foo) bar++; to bar += (foo != 0); - and similarly for "bar--;" + and similarly for "bar--;" INSN is the conditional branch around the arithmetic. We set: @@ -1435,7 +1435,7 @@ jump_optimize (f, cross_jump, noop_moves, after_regscan) of the first jump. In some cases, the second jump must be rewritten also. - For example, + For example, < == converts to > == < != converts to == > etc. @@ -1807,7 +1807,7 @@ jump_optimize (f, cross_jump, noop_moves, after_regscan) = rangenext; PREV_INSN (rangenext) = PREV_INSN (range2after); - PREV_INSN (range2after) + PREV_INSN (range2after) = PREV_INSN (range1beg); NEXT_INSN (range2after) = range1beg; NEXT_INSN (PREV_INSN (range1beg)) @@ -2170,7 +2170,7 @@ duplicate_loop_exit_test (loop_start) if (reg_map) replace_regs (REG_NOTES (copy), reg_map, max_reg, 1); } - + /* If this is a simple jump, add it to the jump chain. */ if (INSN_UID (copy) < max_jump_chain && JUMP_LABEL (copy) @@ -2315,7 +2315,7 @@ find_cross_jump (e1, e2, minimum, f1, f2) p1 = PATTERN (i1); p2 = PATTERN (i2); - + /* If this is a CALL_INSN, compare register usage information. If we don't check this on stack register machines, the two CALL_INSNs might be merged leaving reg-stack.c with mismatching @@ -2598,7 +2598,7 @@ can_reverse_comparison_p (comparison, insn) arg0 = XEXP (comparison, 0); /* Make sure ARG0 is one of the actual objects being compared. If we - can't do this, we can't be sure the comparison can be reversed. + can't do this, we can't be sure the comparison can be reversed. Handle cc0 and a MODE_CC register. */ if ((GET_CODE (arg0) == REG && GET_MODE_CLASS (GET_MODE (arg0)) == MODE_CC) @@ -2631,7 +2631,7 @@ can_reverse_comparison_p (comparison, insn) for the negated comparison. WATCH OUT! reverse_condition is not safe to use on a jump that might be acting on the results of an IEEE floating point comparison, - because of the special treatment of non-signaling nans in comparisons. + because of the special treatment of non-signaling nans in comparisons. Use can_reverse_comparison_p to be sure. */ enum rtx_code @@ -3495,7 +3495,7 @@ invert_jump (jump, nlabel) return 0; } -/* Invert the jump condition of rtx X contained in jump insn, INSN. +/* Invert the jump condition of rtx X contained in jump insn, INSN. Return 1 if we can do so, 0 if we cannot find a way to do so that matches a pattern. */ @@ -3527,7 +3527,7 @@ invert_exp (x, insn) GET_MODE (comp), XEXP (comp, 0), XEXP (comp, 1)), 0)) return 1; - + tem = XEXP (x, 1); validate_change (insn, &XEXP (x, 1), XEXP (x, 2), 1); validate_change (insn, &XEXP (x, 2), tem, 1); @@ -3785,7 +3785,7 @@ rtx_renumbered_equal_p (x, y) register int i; register RTX_CODE code = GET_CODE (x); register char *fmt; - + if (x == y) return 1; @@ -3845,7 +3845,7 @@ rtx_renumbered_equal_p (x, y) return reg_x >= 0 && reg_x == reg_y && word_x == word_y; } - /* Now we have disposed of all the cases + /* Now we have disposed of all the cases in which different rtx codes can match. */ if (code != GET_CODE (y)) return 0; @@ -3989,7 +3989,7 @@ true_regnum (x) In general, if the first test fails, the program can branch directly to `foo' and skip the second try which is doomed to fail. We run this after loop optimization and before flow analysis. */ - + /* When comparing the insn patterns, we track the fact that different pseudo-register numbers may have been used in each computation. The following array stores an equivalence -- same_regs[I] == J means @@ -4011,7 +4011,7 @@ static char *modified_regs; static int modified_mem; -/* Called via note_stores on each insn between the target of the first +/* Called via note_stores on each insn between the target of the first branch and the second branch. It marks any changed registers. */ static void @@ -4039,7 +4039,7 @@ mark_modified_reg (dest, x) } /* F is the first insn in the chain of insns. */ - + void thread_jumps (f, max_reg, flag_before_loop) rtx f; @@ -4055,7 +4055,7 @@ thread_jumps (f, max_reg, flag_before_loop) will either always succeed or always fail depending on the relative senses of the two branches. So adjust the first branch accordingly in this case. */ - + rtx label, b1, b2, t1, t2; enum rtx_code code1, code2; rtx b1op0, b1op1, b2op0, b2op1; @@ -4069,7 +4069,7 @@ thread_jumps (f, max_reg, flag_before_loop) all_reset = (int *) alloca (max_reg * sizeof (int)); for (i = 0; i < max_reg; i++) all_reset[i] = -1; - + while (changed) { changed = 0; @@ -4166,7 +4166,7 @@ thread_jumps (f, max_reg, flag_before_loop) { t1 = prev_nonnote_insn (b1); t2 = prev_nonnote_insn (b2); - + while (t1 != 0 && t2 != 0) { if (t2 == label) @@ -4203,7 +4203,7 @@ thread_jumps (f, max_reg, flag_before_loop) } break; } - + /* If either of these is not a normal insn (it might be a JUMP_INSN, CALL_INSN, or CODE_LABEL) we fail. (NOTEs have already been skipped above.) Similarly, fail @@ -4213,7 +4213,7 @@ thread_jumps (f, max_reg, flag_before_loop) || ! rtx_equal_for_thread_p (PATTERN (t1), PATTERN (t2), t2)) break; - + t1 = prev_nonnote_insn (t1); t2 = prev_nonnote_insn (t2); } @@ -4225,7 +4225,7 @@ thread_jumps (f, max_reg, flag_before_loop) /* This is like RTX_EQUAL_P except that it knows about our handling of possibly equivalent registers and knows to consider volatile and modified objects as not equal. - + YINSN is the insn containing Y. */ int @@ -4282,7 +4282,7 @@ rtx_equal_for_thread_p (x, y, yinsn) num_same_regs++; /* If this is the first time we are seeing a register on the `Y' - side, see if it is the last use. If not, we can't thread the + side, see if it is the last use. If not, we can't thread the jump, so mark it as not equivalent. */ if (regno_last_uid[REGNO (y)] != INSN_UID (yinsn)) return 0; diff --git a/gnu/usr.bin/cc/cc_int/local-alloc.c b/gnu/usr.bin/cc/cc_int/local-alloc.c index fc5cdb4..932f3b6 100644 --- a/gnu/usr.bin/cc/cc_int/local-alloc.c +++ b/gnu/usr.bin/cc/cc_int/local-alloc.c @@ -47,7 +47,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ Tying is represented with "quantity numbers". A non-tied register is given a new quantity number. Tied registers have the same quantity number. - + We have provision to exempt registers, even when they are contained within the block, that can be tied to others that are not contained in it. This is so that global_alloc could process them both and tie them then. @@ -335,7 +335,7 @@ alloc_qty_for_scratch (scratch, n, insn, insn_code_num, insn_number) { case '=': case '+': case '?': case '#': case '&': case '!': - case '*': case '%': + case '*': case '%': case '0': case '1': case '2': case '3': case '4': case 'm': case '<': case '>': case 'V': case 'o': case 'E': case 'F': case 'G': case 'H': @@ -370,7 +370,7 @@ alloc_qty_for_scratch (scratch, n, insn, insn_code_num, insn_number) class = GENERAL_REGS; #endif - + qty = next_qty++; @@ -689,7 +689,7 @@ memref_used_between_p (memref, start, end) Search forward to see if SRC dies before either it or DEST is modified, but don't scan past the end of a basic block. If so, we can replace SRC - with DEST and let SRC die in INSN. + with DEST and let SRC die in INSN. This will reduce the number of registers live in that range and may enable DEST to be tied to SRC, thus often saving one register in addition to a @@ -933,7 +933,7 @@ optimize_reg_copy_2 (insn, dest, src) break; } } - + /* Find registers that are equivalent to a single value throughout the compilation (either because they can be referenced in memory or are set once from a single constant). Lower their priority for a register. @@ -1044,7 +1044,7 @@ update_equiv_regs () a register used only in one basic block from a MEM. If so, and the MEM remains unchanged for the life of the register, add a REG_EQUIV note. */ - + note = find_reg_note (insn, REG_EQUIV, NULL_RTX); if (note == 0 && reg_basic_block[regno] >= 0 @@ -1252,7 +1252,7 @@ block_alloc (b) continue; /* Likewise if each alternative has some operand that - must match operand zero. In that case, skip any + must match operand zero. In that case, skip any operand that doesn't list operand 0 since we know that the operand always conflicts with operand 0. We ignore commutatity in this case to keep things simple. */ @@ -1289,7 +1289,7 @@ block_alloc (b) || (r1 == recog_operand[i] && must_match_0 >= 0) #endif ); - + if (GET_CODE (r1) == REG || GET_CODE (r1) == SUBREG) win = combine_regs (r1, r0, may_save_copy, insn_number, insn, 0); @@ -1397,7 +1397,7 @@ block_alloc (b) alloc_qty_for_scratch (recog_operand[i], i, insn, insn_code_number, insn_number); - /* If this is an insn that has a REG_RETVAL note pointing at a + /* If this is an insn that has a REG_RETVAL note pointing at a CLOBBER insn, we have reached the end of a REG_NO_CONFLICT block, so clear any register number that combined within it. */ if ((note = find_reg_note (insn, REG_RETVAL, NULL_RTX)) != 0 @@ -1421,7 +1421,7 @@ block_alloc (b) /* Now every register that is local to this basic block should have been given a quantity, or else -1 meaning ignore it. - Every quantity should have a known birth and death. + Every quantity should have a known birth and death. Order the qtys so we assign them registers in order of the number of suggested registers they need so we allocate those with @@ -1473,8 +1473,8 @@ block_alloc (b) qty_phys_reg[q] = -1; } - /* Order the qtys so we assign them registers in order of - decreasing length of life. Normally call qsort, but if we + /* Order the qtys so we assign them registers in order of + decreasing length of life. Normally call qsort, but if we have only a very small number of quantities, sort them ourselves. */ for (i = 0; i < next_qty; i++) @@ -1521,7 +1521,7 @@ block_alloc (b) { if (N_REG_CLASSES > 1) { - qty_phys_reg[q] = find_free_reg (qty_min_class[q], + qty_phys_reg[q] = find_free_reg (qty_min_class[q], qty_mode[q], q, 0, 0, qty_birth[q], qty_death[q]); if (qty_phys_reg[q] >= 0) @@ -1651,7 +1651,7 @@ qty_sugg_compare (q1, q2) if (sugg1 != sugg2) return sugg1 - sugg2; - + return pri2 - pri1; } @@ -1683,7 +1683,7 @@ qty_sugg_compare_1 (q1, q2) if (sugg1 != sugg2) return sugg1 - sugg2; - + if (pri1 != pri2) return pri2 - pri1; @@ -1711,10 +1711,10 @@ qty_sugg_compare_1 (q1, q2) MAY_SAVE_COPYCOPY is non-zero if this insn is simply copying USEDREG to SETREG or if the input and output must share a register. In that case, we record a hard reg suggestion in QTY_PHYS_COPY_SUGG. - + There are elaborate checks for the validity of combining. */ - + static int combine_regs (usedreg, setreg, may_save_copy, insn_number, insn, already_dead) rtx usedreg, setreg; @@ -1975,7 +1975,7 @@ reg_is_born (reg, birth) int birth; { register int regno; - + if (GET_CODE (reg) == SUBREG) regno = REGNO (SUBREG_REG (reg)) + SUBREG_WORD (reg); else @@ -2053,7 +2053,7 @@ wipe_dead_reg (reg, output_p) (but actually we test only the first of the block for holding MODE) and still free between insn BORN_INDEX and insn DEAD_INDEX, and return the number of the first of them. - Return -1 if such a block cannot be found. + Return -1 if such a block cannot be found. If QTY crosses calls, insist on a register preserved by calls, unless ACCEPT_CALL_CLOBBERED is nonzero. @@ -2177,7 +2177,7 @@ find_free_reg (class, mode, qty, accept_call_clobbered, just_try_suggested, /* If we are just trying suggested register, we have just tried copy- suggested registers, and there are arithmetic-suggested registers, try them. */ - + /* If it would be profitable to allocate a call-clobbered register and save and restore it around calls, do that. */ if (just_try_suggested && qty_phys_num_copy_sugg[qty] != 0 @@ -2298,7 +2298,7 @@ no_conflict_p (insn, r0, r1) && ! find_reg_note (p, REG_NO_CONFLICT, r1)) return 0; } - + return ok; } diff --git a/gnu/usr.bin/cc/cc_int/loop.c b/gnu/usr.bin/cc/cc_int/loop.c index 123c013..73037ae 100644 --- a/gnu/usr.bin/cc/cc_int/loop.c +++ b/gnu/usr.bin/cc/cc_int/loop.c @@ -20,7 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* This is the loop optimization pass of the compiler. It finds invariant computations within loops and moves them - to the beginning of the loop. Then it identifies basic and + to the beginning of the loop. Then it identifies basic and general induction variables. Strength reduction is applied to the general induction variables, and induction variable elimination is applied to the basic induction variables. @@ -205,7 +205,7 @@ struct movable rtx set_dest; /* The destination of this SET. */ rtx dependencies; /* When INSN is libcall, this is an EXPR_LIST of any registers used within the LIBCALL. */ - int consec; /* Number of consecutive following insns + int consec; /* Number of consecutive following insns that must be moved with this one. */ int regno; /* The register it sets */ short lifetime; /* lifetime of that register; @@ -221,7 +221,7 @@ struct movable that the reg is live outside the range from where it is set to the following label. */ unsigned int done : 1; /* 1 inhibits further processing of this */ - + unsigned int partial : 1; /* 1 means this reg is used for zero-extending. In particular, moving it does not make it invariant. */ @@ -506,7 +506,7 @@ scan_loop (loop_start, end, nregs) Note that if we mistakenly think that a loop is entered at the top when, in fact, it is entered at the exit test, the only effect will be slightly poorer optimization. Making the opposite error can generate - incorrect code. Since very few loops now start with a jump to the + incorrect code. Since very few loops now start with a jump to the exit test, the code here to detect that case is very conservative. */ for (p = NEXT_INSN (loop_start); @@ -553,7 +553,7 @@ scan_loop (loop_start, end, nregs) /* If SCAN_START was an insn created by loop, we don't know its luid as required by loop_reg_used_before_p. So skip such loops. (This - test may never be true, but it's best to play it safe.) + test may never be true, but it's best to play it safe.) Also, skip loops where we do not start scanning at a label. This test also rejects loops starting with a JUMP_INSN that failed the @@ -658,7 +658,7 @@ scan_loop (loop_start, end, nregs) temp = find_reg_note (p, REG_EQUIV, NULL_RTX); if (temp) src = XEXP (temp, 0), move_insn = 1; - else + else { temp = find_reg_note (p, REG_EQUAL, NULL_RTX); if (temp && CONSTANT_P (XEXP (temp, 0))) @@ -715,12 +715,12 @@ scan_loop (loop_start, end, nregs) can be combined as long as they are both in the loop, but we move one of them outside the loop. For large loops, this can lose. The most common case of this is the address - of a function being called. + of a function being called. Therefore, if this register is marked as being used exactly once if we are in a loop with calls (a "large loop"), see if we can replace the usage of this register with the source - of this SET. If we can, delete this insn. + of this SET. If we can, delete this insn. Don't do this if P has a REG_RETVAL note or if we have SMALL_REGISTER_CLASSES and SET_SRC is a hard register. */ @@ -750,7 +750,7 @@ scan_loop (loop_start, end, nregs) REG_NOTES (reg_single_usage[regno]) = replace_rtx (REG_NOTES (reg_single_usage[regno]), SET_DEST (set), SET_SRC (set)); - + PUT_CODE (p, NOTE); NOTE_LINE_NUMBER (p) = NOTE_INSN_DELETED; NOTE_SOURCE_FILE (p) = 0; @@ -950,7 +950,7 @@ scan_loop (loop_start, end, nregs) all together as the priority of the first. */ combine_movables (movables, nregs); - + /* Now consider each movable insn to decide whether it is worth moving. Store 0 in n_times_set for each reg that is moved. */ @@ -1049,7 +1049,7 @@ libcall_other_reg (insn, equiv) /* Return 1 if all uses of REG are between INSN and the end of the basic block. */ -static int +static int reg_in_basic_block_p (insn, reg) rtx insn, reg; { @@ -1130,7 +1130,7 @@ skip_consec_insns (insn, count) rtx temp; /* If first insn of libcall sequence, skip to end. */ - /* Do this at start of loop, since INSN is guaranteed to + /* Do this at start of loop, since INSN is guaranteed to be an insn here. */ if (GET_CODE (insn) != NOTE && (temp = find_reg_note (insn, REG_LIBCALL, NULL_RTX))) @@ -1173,7 +1173,7 @@ ignore_some_movables (movables) m1->done = 1; } } -} +} /* For each movable insn, see if the reg that it loads leads when it dies right into another conditionally movable insn. @@ -1716,7 +1716,7 @@ move_movables (movables, threshold, insn_count, loop_start, end, nregs) rtx i1, temp; /* If first insn of libcall sequence, skip to end. */ - /* Do this at start of loop, since p is guaranteed to + /* Do this at start of loop, since p is guaranteed to be an insn here. */ if (GET_CODE (p) != NOTE && (temp = find_reg_note (p, REG_LIBCALL, NULL_RTX))) @@ -1753,7 +1753,7 @@ move_movables (movables, threshold, insn_count, loop_start, end, nregs) && GET_CODE (PATTERN (next)) == USE) && GET_CODE (next) != NOTE) break; - + /* If that is the call, this may be the insn that loads the function address. @@ -1815,7 +1815,7 @@ move_movables (movables, threshold, insn_count, loop_start, end, nregs) rtx reg = m->set_dest; rtx sequence; rtx tem; - + start_sequence (); tem = expand_binop (GET_MODE (reg), and_optab, reg, @@ -1851,7 +1851,7 @@ move_movables (movables, threshold, insn_count, loop_start, end, nregs) cause problems with later optimization passes. It is possible for cse to create such notes like this as a result of record_jump_cond. */ - + if ((temp = find_reg_note (i1, REG_EQUAL, NULL_RTX)) && ! invariant_p (XEXP (temp, 0))) remove_note (i1, temp); @@ -1938,7 +1938,7 @@ move_movables (movables, threshold, insn_count, loop_start, end, nregs) reg_map[m1->regno] = gen_lowpart_common (GET_MODE (m1->set_dest), m->set_dest); - + /* Get rid of the matching insn and prevent further processing of it. */ m1->done = 1; @@ -2288,7 +2288,7 @@ find_and_verify_loops (f) anywhere. Also look for blocks of code ending in an unconditional branch that - exits the loop. If such a block is surrounded by a conditional + exits the loop. If such a block is surrounded by a conditional branch around the block, move the block elsewhere (see below) and invert the jump to point to the code block. This may eliminate a label in our loop and will simplify processing by both us and a @@ -2534,7 +2534,7 @@ mark_loop_jump (x, loop_num) fprintf (loop_dump_stream, "\nLoop at %d ignored due to multiple entry points.\n", INSN_UID (loop_number_loop_starts[dest_loop])); - + loop_invalid[dest_loop] = 1; } return; @@ -2889,7 +2889,7 @@ find_single_use_in_loop (insn, x, usage) { /* Don't count SET_DEST if it is a REG; otherwise count things in SET_DEST because if a register is partially modified, it won't - show up as a potential movable so we don't care how USAGE is set + show up as a potential movable so we don't care how USAGE is set for it. */ if (GET_CODE (SET_DEST (x)) != REG) find_single_use_in_loop (insn, SET_DEST (x), usage); @@ -3200,9 +3200,9 @@ strength_reduce (scan_start, end, loop_top, insn_count, /* Save insn immediately after the loop_end. Insns inserted after loop_end must be put before this insn, so that they will appear in the right - order (i.e. loop order). + order (i.e. loop order). - If loop_end is the end of the current function, then emit a + If loop_end is the end of the current function, then emit a NOTE_INSN_DELETED after loop_end and set end_insert_before to the dummy note insn. */ if (NEXT_INSN (loop_end) != 0) @@ -3360,7 +3360,7 @@ strength_reduce (scan_start, end, loop_top, insn_count, ? "not induction variable" : (! bl->incremented ? "never incremented" : "count error"))); - + reg_iv_type[bl->regno] = NOT_BASIC_INDUCT; *backbl = bl->next; } @@ -3820,7 +3820,7 @@ strength_reduce (scan_start, end, loop_top, insn_count, /* Rescan all givs. If a giv is the same as a giv not reduced, mark it as not reduced. - + For each giv register that can be reduced now: if replaceable, substitute reduced reg wherever the old giv occurs; else add new move insn "giv_reg = reduced_reg". @@ -3957,11 +3957,11 @@ strength_reduce (scan_start, end, loop_top, insn_count, We have to be careful that we didn't initially think we could eliminate this biv because of a giv that we now think may be dead and shouldn't - be used as a biv replacement. + be used as a biv replacement. Also, there is the possibility that we may have a giv that looks like it can be used to eliminate a biv, but the resulting insn - isn't valid. This can happen, for example, on the 88k, where a + isn't valid. This can happen, for example, on the 88k, where a JUMP_INSN can compare a register only with zero. Attempts to replace it with a compare with a constant will fail. @@ -4037,7 +4037,7 @@ strength_reduce (scan_start, end, loop_top, insn_count, /* Unroll loops from within strength reduction so that we can use the induction variable information that strength_reduce has already collected. */ - + if (flag_unroll_loops) unroll_loop (loop_end, insn_count, loop_start, end_insert_before, 1); @@ -4391,7 +4391,7 @@ record_giv (v, insn, src_reg, dest_reg, mult_val, add_val, benefit, /* Check each biv update, and fail if any are between the first and last use of the giv. - + If this loop contains an inner loop that was unrolled, then the insn modifying the biv may have been emitted by the loop unrolling code, and hence does not have a valid luid. Just @@ -4599,7 +4599,7 @@ check_final_value (v, loop_start, loop_end) last_giv_use = p; } } - + /* Now that the lifetime of the giv is known, check for branches from within the lifetime to outside the lifetime if it is still replaceable. */ @@ -4774,7 +4774,7 @@ update_giv_derive (p) Note that treating the entire pseudo as a BIV will result in making simple increments to any GIVs based on it. However, if the variable overflows in its declared mode but not its promoted mode, the result will - be incorrect. This is acceptable if the variable is signed, since + be incorrect. This is acceptable if the variable is signed, since overflows in such cases are undefined, but not if it is unsigned, since those overflows are defined. So we only check for SIGN_EXTEND and not ZERO_EXTEND. @@ -5017,7 +5017,7 @@ general_induction_var (x, src_reg, add_val, mult_val) returns 0. For a non-zero return, the result will have a code of CONST_INT, USE, - REG (for a BIV), PLUS, or MULT. No other codes will occur. + REG (for a BIV), PLUS, or MULT. No other codes will occur. *BENEFIT will be incremented by the benefit of any sub-giv encountered. */ @@ -5301,7 +5301,7 @@ consec_sets_giv (first_benefit, p, src_reg, dest_reg, rtx set; /* Indicate that this is a giv so that we can update the value produced in - each insn of the multi-insn sequence. + each insn of the multi-insn sequence. This induction structure will be used only by the call to general_induction_var below, so we can allocate it on our stack. @@ -5371,7 +5371,7 @@ consec_sets_giv (first_benefit, p, src_reg, dest_reg, /* Return an rtx, if any, that expresses giv G2 as a function of the register represented by G1. If no such expression can be found, or it is clear that - it cannot possibly be a valid address, 0 is returned. + it cannot possibly be a valid address, 0 is returned. To perform the computation, we note that G1 = a * v + b and @@ -5832,7 +5832,7 @@ check_dbra_loop (loop_end, insn_count, loop_start) p = emit_insn_before (gen_add2_insn (reg, new_add_val), bl->biv->insn); delete_insn (bl->biv->insn); - + /* Update biv info to reflect its new status. */ bl->biv->insn = p; bl->initial_value = start_value; @@ -6118,7 +6118,7 @@ maybe_eliminate_biv_1 (x, insn, bl, eliminate_p, where) /* If that failed, put back the change we made above. */ XEXP (x, 1-arg_operand) = reg; } - + /* Look for giv with positive constant mult_val and nonconst add_val. Insert insns to calculate new compare value. */ @@ -6244,7 +6244,7 @@ maybe_eliminate_biv_1 (x, insn, bl, eliminate_p, where) switch (fmt[i]) { case 'e': - if (! maybe_eliminate_biv_1 (XEXP (x, i), insn, bl, + if (! maybe_eliminate_biv_1 (XEXP (x, i), insn, bl, eliminate_p, where)) return 0; break; @@ -6259,7 +6259,7 @@ maybe_eliminate_biv_1 (x, insn, bl, eliminate_p, where) } return 1; -} +} /* Return nonzero if the last use of REG is in an insn following INSN in the same basic block. */ diff --git a/gnu/usr.bin/cc/cc_int/optabs.c b/gnu/usr.bin/cc/cc_int/optabs.c index 4b32d24..ac7230e 100644 --- a/gnu/usr.bin/cc/cc_int/optabs.c +++ b/gnu/usr.bin/cc/cc_int/optabs.c @@ -281,7 +281,7 @@ add_equal_note (seq, target, code, op0, op1) /* Widen OP to MODE and return the rtx for the widened operand. UNSIGNEDP says whether OP is signed or unsigned. NO_EXTEND is nonzero if we need - not actually do a sign-extend or zero-extend, but can leave the + not actually do a sign-extend or zero-extend, but can leave the higher-order bits of the result rtx undefined, for example, in the case of logical operations, but not right shifts. */ @@ -709,7 +709,7 @@ expand_binop (mode, binoptab, op0, op1, target, unsignedp, methods) if (inter != 0) inter = expand_binop (word_mode, binoptab, outof_input, op1, outof_target, unsignedp, next_methods); - + if (inter != 0 && inter != outof_target) emit_move_insn (outof_target, inter); } @@ -945,7 +945,7 @@ expand_binop (mode, binoptab, op0, op1, target, unsignedp, methods) } carry_in = carry_out; - } + } if (i == GET_MODE_BITSIZE (mode) / BITS_PER_WORD) { @@ -965,7 +965,7 @@ expand_binop (mode, binoptab, op0, op1, target, unsignedp, methods) /* If we want to multiply two two-word values and have normal and widening multiplies of single-word values, we can do this with three smaller multiplications. Note that we do not make a REG_NO_CONFLICT block here - because we are not operating on one word at a time. + because we are not operating on one word at a time. The multiplication proceeds as follows: _______________________ @@ -1115,7 +1115,7 @@ expand_binop (mode, binoptab, op0, op1, target, unsignedp, methods) emit_move_insn (product_high, temp); if (temp != 0) - temp = expand_binop (word_mode, binoptab, op1_low, op0_xhigh, + temp = expand_binop (word_mode, binoptab, op1_low, op0_xhigh, NULL_RTX, 0, OPTAB_DIRECT); if (temp != 0) @@ -1310,7 +1310,7 @@ expand_binop (mode, binoptab, op0, op1, target, unsignedp, methods) case DIV: /* (a+ib) / (c+id) = ((ac+bd)/(cc+dd)) + i((bc-ad)/(cc+dd)) */ - + if (imag1 == 0) { /* (a+ib) / (c+i0) = (a/c) + i(b/c) */ @@ -1353,7 +1353,7 @@ expand_binop (mode, binoptab, op0, op1, target, unsignedp, methods) rtx real_t, imag_t; rtx lhs, rhs; rtx temp1, temp2; - + /* Don't fetch these from memory more than once. */ real0 = force_reg (submode, real0); real1 = force_reg (submode, real1); @@ -1386,7 +1386,7 @@ expand_binop (mode, binoptab, op0, op1, target, unsignedp, methods) /* Calculate the dividend */ real_t = expand_binop (submode, smul_optab, real0, real1, NULL_RTX, unsignedp, methods); - + imag_t = expand_binop (submode, smul_optab, real0, imag1, NULL_RTX, unsignedp, methods); @@ -1411,7 +1411,7 @@ expand_binop (mode, binoptab, op0, op1, target, unsignedp, methods) real_t = expand_binop (submode, add_optab, temp1, temp2, NULL_RTX, unsignedp, methods); - + temp1 = expand_binop (submode, smul_optab, imag0, real1, NULL_RTX, unsignedp, methods); @@ -1455,7 +1455,7 @@ expand_binop (mode, binoptab, op0, op1, target, unsignedp, methods) ok = 1; } break; - + default: abort (); } @@ -1470,9 +1470,9 @@ expand_binop (mode, binoptab, op0, op1, target, unsignedp, methods) = gen_rtx (binoptab->code, mode, copy_rtx (op0), copy_rtx (op1)); else equiv_value = 0; - + emit_no_conflict_block (seq, target, op0, op1, equiv_value); - + return target; } } @@ -1736,7 +1736,7 @@ expand_twoval_binop (binoptab, op0, op1, targ0, targ1, unsignedp) if (! (*insn_operand_predicate[icode][0]) (targ0, mode) || ! (*insn_operand_predicate[icode][3]) (targ1, mode)) abort (); - + pat = GEN_FCN (icode) (targ0, xop0, xop1, targ1); if (pat) { @@ -1852,7 +1852,7 @@ expand_unop (mode, unoptab, op0, target, unsignedp) } emit_insn (pat); - + return temp; } else @@ -1877,7 +1877,7 @@ expand_unop (mode, unoptab, op0, target, unsignedp) (unoptab == neg_optab || unoptab == one_cmpl_optab) && class == MODE_INT); - + temp = expand_unop (wider_mode, unoptab, xop0, NULL_RTX, unsignedp); @@ -1950,7 +1950,7 @@ expand_unop (mode, unoptab, op0, target, unsignedp) if (target == 0) target = gen_reg_rtx (mode); - + start_sequence (); target_piece = gen_imagpart (submode, target); @@ -2019,7 +2019,7 @@ expand_unop (mode, unoptab, op0, target, unsignedp) (unoptab == neg_optab || unoptab == one_cmpl_optab) && class == MODE_INT); - + temp = expand_unop (wider_mode, unoptab, xop0, NULL_RTX, unsignedp); @@ -2103,7 +2103,7 @@ expand_abs (mode, op0, target, unsignedp, safe) /* If this mode is an integer too wide to compare properly, compare word by word. Rely on CSE to optimize constant cases. */ if (GET_MODE_CLASS (mode) == MODE_INT && ! can_compare_p (mode)) - do_jump_by_parts_greater_rtx (mode, 0, target, const0_rtx, + do_jump_by_parts_greater_rtx (mode, 0, target, const0_rtx, NULL_RTX, op1); else { @@ -2206,7 +2206,7 @@ expand_complex_abs (mode, op0, target, unsignedp) } emit_insn (pat); - + return temp; } else @@ -2363,7 +2363,7 @@ emit_unop_insn (icode, target, op0, code) if (GET_CODE (pat) == SEQUENCE && code != UNKNOWN) add_equal_note (pat, temp, code, op0, NULL_RTX); - + emit_insn (pat); if (temp != target) @@ -2384,7 +2384,7 @@ emit_unop_insn (icode, target, op0, code) INSNS is a block of code generated to perform the operation, not including the CLOBBER and final copy. All insns that compute intermediate values - are first emitted, followed by the block as described above. + are first emitted, followed by the block as described above. TARGET, OP0, and OP1 are the output and inputs of the operations, respectively. OP1 may be zero for a unary operation. @@ -3048,7 +3048,7 @@ rtx gen_add2_insn (x, y) rtx x, y; { - int icode = (int) add_optab->handlers[(int) GET_MODE (x)].insn_code; + int icode = (int) add_optab->handlers[(int) GET_MODE (x)].insn_code; if (! (*insn_operand_predicate[icode][0]) (x, insn_operand_mode[icode][0]) || ! (*insn_operand_predicate[icode][1]) (x, insn_operand_mode[icode][1]) @@ -3071,7 +3071,7 @@ rtx gen_sub2_insn (x, y) rtx x, y; { - int icode = (int) sub_optab->handlers[(int) GET_MODE (x)].insn_code; + int icode = (int) sub_optab->handlers[(int) GET_MODE (x)].insn_code; if (! (*insn_operand_predicate[icode][0]) (x, insn_operand_mode[icode][0]) || ! (*insn_operand_predicate[icode][1]) (x, insn_operand_mode[icode][1]) @@ -3100,7 +3100,7 @@ gen_move_insn (x, y) rtx seq; if (mode == VOIDmode) - mode = GET_MODE (y); + mode = GET_MODE (y); insn_code = mov_optab->handlers[(int) mode].insn_code; @@ -3159,7 +3159,7 @@ gen_move_insn (x, y) x = gen_lowpart (tmode, x); y = gen_lowpart (tmode, y); } - + insn_code = mov_optab->handlers[(int) tmode].insn_code; return (GEN_FCN (insn_code) (x, y)); } @@ -3325,7 +3325,7 @@ expand_float (to, from, unsignedp) rtx temp1; rtx neglabel = gen_label_rtx (); - /* Don't use TARGET if it isn't a register, is a hard register, + /* Don't use TARGET if it isn't a register, is a hard register, or is the wrong mode. */ if (GET_CODE (target) != REG || REGNO (target) < FIRST_PSEUDO_REGISTER @@ -3353,7 +3353,7 @@ expand_float (to, from, unsignedp) NULL_RTX, 1, OPTAB_LIB_WIDEN); temp1 = expand_shift (RSHIFT_EXPR, imode, from, integer_one_node, NULL_RTX, 1); - temp = expand_binop (imode, ior_optab, temp, temp1, temp, 1, + temp = expand_binop (imode, ior_optab, temp, temp1, temp, 1, OPTAB_LIB_WIDEN); expand_float (target, temp, 0); @@ -3706,7 +3706,7 @@ expand_fix (to, from, unsignedp) gen_rtx (unsignedp ? UNSIGNED_FIX : FIX, GET_MODE (to), from)); } - + if (GET_MODE (to) == GET_MODE (target)) emit_move_insn (to, target); else @@ -3838,17 +3838,17 @@ init_optabs () /* Start by initializing all tables to contain CODE_FOR_nothing. */ for (p = fixtab[0][0]; - p < fixtab[0][0] + sizeof fixtab / sizeof (fixtab[0][0][0]); + p < fixtab[0][0] + sizeof fixtab / sizeof (fixtab[0][0][0]); p++) *p = CODE_FOR_nothing; for (p = fixtrunctab[0][0]; - p < fixtrunctab[0][0] + sizeof fixtrunctab / sizeof (fixtrunctab[0][0][0]); + p < fixtrunctab[0][0] + sizeof fixtrunctab / sizeof (fixtrunctab[0][0][0]); p++) *p = CODE_FOR_nothing; for (p = floattab[0][0]; - p < floattab[0][0] + sizeof floattab / sizeof (floattab[0][0][0]); + p < floattab[0][0] + sizeof floattab / sizeof (floattab[0][0][0]); p++) *p = CODE_FOR_nothing; diff --git a/gnu/usr.bin/cc/cc_int/real.c b/gnu/usr.bin/cc/cc_int/real.c index f3e22a7..6a15925 100644 --- a/gnu/usr.bin/cc/cc_int/real.c +++ b/gnu/usr.bin/cc/cc_int/real.c @@ -86,7 +86,7 @@ research.att.com: netlib/cephes/ldouble.shar.Z */ both mean DFmode. In this case, the software floating-point support available here is activated by writing #define REAL_ARITHMETIC - in tm.h. + in tm.h. The case LONG_DOUBLE_TYPE_SIZE = 128 activates TFmode support and may deactivate XFmode since `long double' is used to refer @@ -428,7 +428,7 @@ static void esqrt PROTO((unsigned EMUSHORT *, unsigned EMUSHORT *)); swapping ends if required, into output array of longs. The result is normally passed to fprintf by the ASM_OUTPUT_ macros. */ -static void +static void endian (e, x, mode) unsigned EMUSHORT e[]; long x[]; @@ -534,7 +534,7 @@ endian (e, x, mode) /* This is the implementation of the REAL_ARITHMETIC macro. */ -void +void earith (value, icode, r1, r2) REAL_VALUE_TYPE *value; int icode; @@ -613,7 +613,7 @@ PUT_REAL (v, value); /* Truncate REAL_VALUE_TYPE toward zero to signed HOST_WIDE_INT. implements REAL_VALUE_RNDZINT (x) (etrunci (x)). */ -REAL_VALUE_TYPE +REAL_VALUE_TYPE etrunci (x) REAL_VALUE_TYPE x; { @@ -636,7 +636,7 @@ etrunci (x) /* Truncate REAL_VALUE_TYPE toward zero to unsigned HOST_WIDE_INT; implements REAL_VALUE_UNSIGNED_RNDZINT (x) (etruncui (x)). */ -REAL_VALUE_TYPE +REAL_VALUE_TYPE etruncui (x) REAL_VALUE_TYPE x; { @@ -660,7 +660,7 @@ etruncui (x) binary, rounding off as indicated by the machine_mode argument. Then it promotes the rounded value to REAL_VALUE_TYPE. */ -REAL_VALUE_TYPE +REAL_VALUE_TYPE ereal_atof (s, t) char *s; enum machine_mode t; @@ -697,7 +697,7 @@ ereal_atof (s, t) /* Expansion of REAL_NEGATE. */ -REAL_VALUE_TYPE +REAL_VALUE_TYPE ereal_negate (x) REAL_VALUE_TYPE x; { @@ -759,7 +759,7 @@ efixui (x) /* REAL_VALUE_FROM_INT macro. */ -void +void ereal_from_int (d, i, j) REAL_VALUE_TYPE *d; HOST_WIDE_INT i, j; @@ -793,7 +793,7 @@ ereal_from_int (d, i, j) /* REAL_VALUE_FROM_UNSIGNED_INT macro. */ -void +void ereal_from_uint (d, i, j) REAL_VALUE_TYPE *d; unsigned HOST_WIDE_INT i, j; @@ -814,7 +814,7 @@ ereal_from_uint (d, i, j) /* REAL_VALUE_TO_INT macro. */ -void +void ereal_to_int (low, high, rr) HOST_WIDE_INT *low, *high; REAL_VALUE_TYPE rr; @@ -993,7 +993,7 @@ debug_real (r) REAL_VALUE_TO_DECIMAL (r, "%.20g", dstr); fprintf (stderr, "%s", dstr); -} +} /* Target values are arrays of host longs. A long is guaranteed @@ -1001,7 +1001,7 @@ debug_real (r) /* 128-bit long double */ -void +void etartdouble (r, l) REAL_VALUE_TYPE r; long l[]; @@ -1015,7 +1015,7 @@ etartdouble (r, l) /* 80-bit long double */ -void +void etarldouble (r, l) REAL_VALUE_TYPE r; long l[]; @@ -1027,7 +1027,7 @@ etarldouble (r, l) endian (e, l, XFmode); } -void +void etardouble (r, l) REAL_VALUE_TYPE r; long l[]; @@ -1112,11 +1112,11 @@ ereal_isneg (x) most significant word first, most significant bit is set) ei[NI-1] low guard word (0x8000 bit is rounding place) - - - + + + Routines for external format numbers - + asctoe (string, e) ASCII string to extended double e type asctoe64 (string, &d) ASCII string to long double asctoe53 (string, &d) ASCII string to double @@ -1157,10 +1157,10 @@ ereal_isneg (x) eisinf (e) 1 if e has maximum exponent (non-IEEE) or is infinite (IEEE) eisnan (e) 1 if e is a NaN - + Routines for internal format numbers - + eaddm (ai, bi) add significands, bi = bi + ai ecleaz (ei) ei = 0 ecleazs (ei) set ei = 0 but leave its sign alone @@ -1190,13 +1190,13 @@ ereal_isneg (x) after each arithmetic operation. Exception flags are NOT fully supported. - + Signaling NaN's are NOT supported; they are treated the same as quiet NaN's. - + Define INFINITY for support of infinity; otherwise a saturation arithmetic is implemented. - + Define NANS for support of Not-a-Number items; otherwise the arithmetic will never produce a NaN output, and might be confused by a NaN input. @@ -1204,7 +1204,7 @@ ereal_isneg (x) either a or b is a NaN. This means asking `if (ecmp (a,b) < 0)' may not be legitimate. Use `if (ecmp (a,b) == -1)' for `less than' if in doubt. - + Denormals are always supported here where appropriate (e.g., not for conversion to DEC numbers). */ @@ -1217,26 +1217,26 @@ ereal_isneg (x) mode, most floating point constants are given as arrays of octal integers to eliminate decimal to binary conversion errors that might be introduced by the compiler. - + For computers, such as IBM PC, that follow the IEEE Standard for Binary Floating Point Arithmetic (ANSI/IEEE Std 754-1985), the symbol IBMPC or MIEEE should be defined. These numbers have 53-bit significands. In this mode, constants are provided as arrays of hexadecimal 16 bit integers. - + To accommodate other types of computer arithmetic, all constants are also provided in a normal decimal radix which one can hope are correctly converted to a suitable format by the available C language compiler. To invoke this mode, the symbol UNK is defined. - + An important difference among these modes is a predefined set of machine arithmetic constants for each. The numbers MACHEP (the machine roundoff error), MAXNUM (largest number represented), and several other parameters are preset by the configuration symbol. Check the file const.c to ensure that these values are correct for your computer. - + For ANSI C compatibility, define ANSIC equal to 1. Currently this affects only the atan2 function and others that use it. */ @@ -1331,7 +1331,7 @@ extern int rndprc; /* Clear out entire external format number. */ -static void +static void eclear (x) register unsigned EMUSHORT *x; { @@ -1345,7 +1345,7 @@ eclear (x) /* Move external format number from a to b. */ -static void +static void emov (a, b) register unsigned EMUSHORT *a, *b; { @@ -1358,17 +1358,17 @@ emov (a, b) /* Absolute value of external format number. */ -static void +static void eabs (x) unsigned EMUSHORT x[]; { /* sign is top bit of last word of external format */ - x[NE - 1] &= 0x7fff; + x[NE - 1] &= 0x7fff; } /* Negate external format number. */ -static void +static void eneg (x) unsigned EMUSHORT x[]; { @@ -1380,7 +1380,7 @@ eneg (x) /* Return 1 if sign bit of external format number is nonzero, else zero. */ -static int +static int eisneg (x) unsigned EMUSHORT x[]; { @@ -1394,7 +1394,7 @@ eisneg (x) /* Return 1 if external format number is infinity, else return zero. */ -static int +static int eisinf (x) unsigned EMUSHORT x[]; { @@ -1413,7 +1413,7 @@ eisinf (x) /* Check if e-type number is not a number. The bit pattern is one that we defined, so we know for sure how to detect it. */ -static int +static int eisnan (x) unsigned EMUSHORT x[]; { @@ -1437,7 +1437,7 @@ eisnan (x) /* Fill external format number with infinity pattern (IEEE) or largest possible number (non-IEEE). */ -static void +static void einfin (x) register unsigned EMUSHORT *x; { @@ -1481,7 +1481,7 @@ einfin (x) This generates Intel's quiet NaN pattern for extended real. The exponent is 7fff, the leading mantissa word is c000. */ -static void +static void enan (x, sign) register unsigned EMUSHORT *x; int sign; @@ -1497,7 +1497,7 @@ enan (x, sign) /* Move in external format number, converting it to internal format. */ -static void +static void emovi (a, b) unsigned EMUSHORT *a, *b; { @@ -1545,7 +1545,7 @@ emovi (a, b) /* Move internal format number out, converting it to external format. */ -static void +static void emovo (a, b) unsigned EMUSHORT *a, *b; { @@ -1584,7 +1584,7 @@ emovo (a, b) /* Clear out internal format number. */ -static void +static void ecleaz (xi) register unsigned EMUSHORT *xi; { @@ -1597,7 +1597,7 @@ ecleaz (xi) /* Same, but don't touch the sign. */ -static void +static void ecleazs (xi) register unsigned EMUSHORT *xi; { @@ -1612,7 +1612,7 @@ ecleazs (xi) /* Move internal format number from a to b. */ -static void +static void emovz (a, b) register unsigned EMUSHORT *a, *b; { @@ -1640,7 +1640,7 @@ einan (x) /* Return nonzero if internal format number is a NaN. */ -static int +static int eiisnan (x) unsigned EMUSHORT x[]; { @@ -1659,7 +1659,7 @@ eiisnan (x) /* Return nonzero if sign of internal format number is nonzero. */ -static int +static int eiisneg (x) unsigned EMUSHORT x[]; { @@ -1681,7 +1681,7 @@ eiinfin (x) /* Return nonzero if internal format number is infinite. */ -static int +static int eiisinf (x) unsigned EMUSHORT x[]; { @@ -1728,7 +1728,7 @@ ecmpm (a, b) /* Shift significand down by 1 bit. */ -static void +static void eshdn1 (x) register unsigned EMUSHORT *x; { @@ -1754,7 +1754,7 @@ eshdn1 (x) /* Shift significand up by 1 bit. */ -static void +static void eshup1 (x) register unsigned EMUSHORT *x; { @@ -1779,7 +1779,7 @@ eshup1 (x) /* Shift significand down by 8 bits. */ -static void +static void eshdn8 (x) register unsigned EMUSHORT *x; { @@ -1800,7 +1800,7 @@ eshdn8 (x) /* Shift significand up by 8 bits. */ -static void +static void eshup8 (x) register unsigned EMUSHORT *x; { @@ -1822,7 +1822,7 @@ eshup8 (x) /* Shift significand up by 16 bits. */ -static void +static void eshup6 (x) register unsigned EMUSHORT *x; { @@ -1840,7 +1840,7 @@ eshup6 (x) /* Shift significand down by 16 bits. */ -static void +static void eshdn6 (x) register unsigned EMUSHORT *x; { @@ -1858,7 +1858,7 @@ eshdn6 (x) /* Add significands. x + y replaces y. */ -static void +static void eaddm (x, y) unsigned EMUSHORT *x, *y; { @@ -1884,7 +1884,7 @@ eaddm (x, y) /* Subtract significands. y - x replaces y. */ -static void +static void esubm (x, y) unsigned EMUSHORT *x, *y; { @@ -1918,7 +1918,7 @@ static unsigned EMUSHORT equot[NI]; /* Divide significands */ -int +int edivm (den, num) unsigned EMUSHORT den[], num[]; { @@ -2015,7 +2015,7 @@ edivm (den, num) /* Multiply significands */ -int +int emulm (a, b) unsigned EMUSHORT a[], b[]; { @@ -2224,15 +2224,15 @@ emulm (a, b) The internal format number to be rounded is "s". Input "lost" indicates whether or not the number is exact. This is the so-called sticky bit. - + Input "subflg" indicates whether the number was obtained by a subtraction operation. In that case if lost is nonzero then the number is slightly smaller than indicated. - + Input "exp" is the biased exponent, which may be negative. the exponent field of "s" is ignored but is replaced by "exp" as adjusted by normalization and rounding. - + Input "rcntrl" is the rounding control. For future reference: In order for emdnorm to round off denormal @@ -2240,7 +2240,7 @@ emulm (a, b) adjusted to be the actual value it would have after conversion to the final floating point type. This adjustment has been implemented for all type conversions (etoe53, etc.) and decimal - conversions, but not for the arithmetic functions (eadd, etc.). + conversions, but not for the arithmetic functions (eadd, etc.). Data types having standard 15-bit exponents are not affected by this, but SFmode and DFmode are affected. For example, ediv with rndprc = 24 will not round correctly to 24-bit precision if the @@ -2254,7 +2254,7 @@ static unsigned EMUSHORT rebit = 0; static int re = 0; static unsigned EMUSHORT rbit[NI]; -static void +static void emdnorm (s, lost, subflg, exp, rcntrl) unsigned EMUSHORT s[]; int lost; @@ -2452,7 +2452,7 @@ emdnorm (s, lost, subflg, exp, rcntrl) static int subflg = 0; -static void +static void esub (a, b, c) unsigned EMUSHORT *a, *b, *c; { @@ -2485,7 +2485,7 @@ esub (a, b, c) /* Add. */ -static void +static void eadd (a, b, c) unsigned EMUSHORT *a, *b, *c; { @@ -2516,7 +2516,7 @@ eadd (a, b, c) eadd1 (a, b, c); } -static void +static void eadd1 (a, b, c) unsigned EMUSHORT *a, *b, *c; { @@ -2622,7 +2622,7 @@ eadd1 (a, b, c) /* Divide. */ -static void +static void ediv (a, b, c) unsigned EMUSHORT *a, *b, *c; { @@ -2726,7 +2726,7 @@ ediv (a, b, c) /* Multiply. */ -static void +static void emul (a, b, c) unsigned EMUSHORT *a, *b, *c; { @@ -2913,7 +2913,7 @@ e53toe (pe, y) #endif /* not DEC */ } -static void +static void e64toe (pe, y) unsigned EMUSHORT *pe, *y; { @@ -2986,7 +2986,7 @@ e64toe (pe, y) } -static void +static void e113toe (pe, y) unsigned EMUSHORT *pe, *y; { @@ -3064,7 +3064,7 @@ e113toe (pe, y) /* Convert IEEE single precision to e type. */ -static void +static void e24toe (pe, y) unsigned EMUSHORT *pe, *y; { @@ -3152,7 +3152,7 @@ e24toe (pe, y) } -static void +static void etoe113 (x, e) unsigned EMUSHORT *x, *e; { @@ -3184,7 +3184,7 @@ etoe113 (x, e) /* Move out internal format to ieee long double */ -static void +static void toe113 (a, b) unsigned EMUSHORT *a, *b; { @@ -3235,7 +3235,7 @@ toe113 (a, b) #endif } -static void +static void etoe64 (x, e) unsigned EMUSHORT *x, *e; { @@ -3269,7 +3269,7 @@ etoe64 (x, e) /* Move out internal format to ieee long double. */ -static void +static void toe64 (a, b) unsigned EMUSHORT *a, *b; { @@ -3325,14 +3325,14 @@ toe64 (a, b) #ifdef DEC -static void +static void etoe53 (x, e) unsigned EMUSHORT *x, *e; { etodec (x, e); /* see etodec.c */ } -static void +static void toe53 (x, y) unsigned EMUSHORT *x, *y; { @@ -3342,14 +3342,14 @@ toe53 (x, y) #else #ifdef IBM -static void +static void etoe53 (x, e) unsigned EMUSHORT *x, *e; { etoibm (x, e, DFmode); } -static void +static void toe53 (x, y) unsigned EMUSHORT *x, *y; { @@ -3358,7 +3358,7 @@ toe53 (x, y) #else /* it's neither DEC nor IBM */ -static void +static void etoe53 (x, e) unsigned EMUSHORT *x, *e; { @@ -3390,7 +3390,7 @@ etoe53 (x, e) } -static void +static void toe53 (x, y) unsigned EMUSHORT *x, *y; { @@ -3477,14 +3477,14 @@ toe53 (x, y) #ifdef IBM -static void +static void etoe24 (x, e) unsigned EMUSHORT *x, *e; { etoibm (x, e, SFmode); } -static void +static void toe24 (x, y) unsigned EMUSHORT *x, *y; { @@ -3493,7 +3493,7 @@ toe24 (x, y) #else -static void +static void etoe24 (x, e) unsigned EMUSHORT *x, *e; { @@ -3524,7 +3524,7 @@ etoe24 (x, e) toe24 (xi, e); } -static void +static void toe24 (x, y) unsigned EMUSHORT *x, *y; { @@ -3607,13 +3607,13 @@ toe24 (x, y) } #endif /* not IBM */ -/* Compare two e type numbers. +/* Compare two e type numbers. Return +1 if a > b 0 if a == b -1 if a < b -2 if either a or b is a NaN. */ -static int +static int ecmp (a, b) unsigned EMUSHORT *a, *b; { @@ -3680,7 +3680,7 @@ ecmp (a, b) /* Find nearest integer to x = floor (x + 0.5). */ -static void +static void eround (x, y) unsigned EMUSHORT *x, *y; { @@ -3693,7 +3693,7 @@ eround (x, y) /* Convert HOST_WIDE_INT to e type. */ -static void +static void ltoe (lp, y) HOST_WIDE_INT *lp; unsigned EMUSHORT *y; @@ -3735,7 +3735,7 @@ ltoe (lp, y) /* Convert unsigned HOST_WIDE_INT to e type. */ -static void +static void ultoe (lp, y) unsigned HOST_WIDE_INT *lp; unsigned EMUSHORT *y; @@ -3775,7 +3775,7 @@ ultoe (lp, y) The output e-type fraction FRAC is the positive fractional part of abs (X). */ -static void +static void eifrac (x, i, frac) unsigned EMUSHORT *x; HOST_WIDE_INT *i; @@ -3858,7 +3858,7 @@ eifrac (x, i, frac) A negative e type input yields integer output = 0 but correct fraction. */ -static void +static void euifrac (x, i, frac) unsigned EMUSHORT *x; unsigned HOST_WIDE_INT *i; @@ -3929,7 +3929,7 @@ euifrac (x, i, frac) /* Shift significand area up or down by the number of bits given by SC. */ -static int +static int eshift (x, sc) unsigned EMUSHORT *x; int sc; @@ -3997,7 +3997,7 @@ eshift (x, sc) /* Shift normalize the significand area pointed to by argument. Shift count (up = positive) is returned. */ -static int +static int enormlz (x) unsigned EMUSHORT x[]; { @@ -4169,7 +4169,7 @@ static unsigned EMUSHORT emtens[NTEN + 1][NE] = }; #endif -static void +static void e24toasc (x, string, ndigs) unsigned EMUSHORT x[]; char *string; @@ -4182,7 +4182,7 @@ e24toasc (x, string, ndigs) } -static void +static void e53toasc (x, string, ndigs) unsigned EMUSHORT x[]; char *string; @@ -4195,7 +4195,7 @@ e53toasc (x, string, ndigs) } -static void +static void e64toasc (x, string, ndigs) unsigned EMUSHORT x[]; char *string; @@ -4207,7 +4207,7 @@ e64toasc (x, string, ndigs) etoasc (w, string, ndigs); } -static void +static void e113toasc (x, string, ndigs) unsigned EMUSHORT x[]; char *string; @@ -4222,7 +4222,7 @@ e113toasc (x, string, ndigs) static char wstring[80]; /* working storage for ASCII output */ -static void +static void etoasc (x, string, ndigs) unsigned EMUSHORT x[]; char *string; @@ -4539,7 +4539,7 @@ etoasc (x, string, ndigs) /* ASCII to single */ -static void +static void asctoe24 (s, y) char *s; unsigned EMUSHORT *y; @@ -4550,7 +4550,7 @@ asctoe24 (s, y) /* ASCII to double */ -static void +static void asctoe53 (s, y) char *s; unsigned EMUSHORT *y; @@ -4565,7 +4565,7 @@ asctoe53 (s, y) /* ASCII to long double */ -static void +static void asctoe64 (s, y) char *s; unsigned EMUSHORT *y; @@ -4575,7 +4575,7 @@ asctoe64 (s, y) /* ASCII to 128-bit long double */ -static void +static void asctoe113 (s, y) char *s; unsigned EMUSHORT *y; @@ -4585,7 +4585,7 @@ asctoe113 (s, y) /* ASCII to super double */ -static void +static void asctoe (s, y) char *s; unsigned EMUSHORT *y; @@ -4596,7 +4596,7 @@ asctoe (s, y) /* ASCII to e type, with specified rounding precision = oprec. */ -static void +static void asctoeg (ss, y, oprec) char *ss; unsigned EMUSHORT *y; @@ -4932,7 +4932,7 @@ static unsigned EMUSHORT bmask[] = 0x0000, }; -static void +static void efloor (x, y) unsigned EMUSHORT x[], y[]; { @@ -4983,7 +4983,7 @@ efloor (x, y) For example, 1.1 = 0.55 * 2**1 Handles denormalized numbers properly using long integer exp. */ -static void +static void efrexp (x, exp, s) unsigned EMUSHORT x[]; int *exp; @@ -5008,7 +5008,7 @@ efrexp (x, exp, s) /* Return y = x * 2**pwr2. */ -static void +static void eldexp (x, pwr2, y) unsigned EMUSHORT x[]; int pwr2; @@ -5030,7 +5030,7 @@ eldexp (x, pwr2, y) /* c = remainder after dividing b by a Least significant integer quotient bits left in equot[]. */ -static void +static void eremain (a, b, c) unsigned EMUSHORT a[], b[], c[]; { @@ -5063,7 +5063,7 @@ eremain (a, b, c) emovo (num, c); } -static void +static void eiremain (den, num) unsigned EMUSHORT den[], num[]; { @@ -5098,7 +5098,7 @@ eiremain (den, num) error conditions (in the include file mconf.h). Mnemonic Value Significance - + DOMAIN 1 argument domain error SING 2 function singularity OVERFLOW 3 overflow range error @@ -5108,7 +5108,7 @@ eiremain (den, num) INVALID 7 NaN - producing operation EDOM 33 Unix domain error code ERANGE 34 Unix range error code - + The default version of the file prints the function name, passed to it by the pointer fctnam, followed by the error condition. The display is directed to the standard @@ -5116,7 +5116,7 @@ eiremain (den, num) program. Users may wish to modify the program to abort by calling exit under severe error conditions such as domain errors. - + Since all error conditions pass control to this function, the display may be easily changed, eliminated, or directed to an error logging device. */ @@ -5140,7 +5140,7 @@ static char *ermsg[NMSGS] = int merror = 0; extern int merror; -static void +static void mtherr (name, code) char *name; int code; @@ -5164,7 +5164,7 @@ mtherr (name, code) #ifdef DEC /* Convert DEC double precision to e type. */ -static void +static void dectoe (d, e) unsigned EMUSHORT *d; unsigned EMUSHORT *e; @@ -5211,7 +5211,7 @@ dectoe (d, e) ; etodec (e, &d); */ -static void +static void etodec (x, d) unsigned EMUSHORT *x, *d; { @@ -5229,7 +5229,7 @@ etodec (x, d) todec (xi, d); } -static void +static void todec (x, y) unsigned EMUSHORT *x, *y; { @@ -5275,7 +5275,7 @@ todec (x, y) #ifdef IBM /* Convert IBM single/double precision to e type. */ -static void +static void ibmtoe (d, e, mode) unsigned EMUSHORT *d; unsigned EMUSHORT *e; @@ -5319,7 +5319,7 @@ ibmtoe (d, e, mode) /* Convert e type to IBM single/double precision. */ -static void +static void etoibm (x, d, mode) unsigned EMUSHORT *x, *d; enum machine_mode mode; @@ -5338,7 +5338,7 @@ etoibm (x, d, mode) toibm (xi, d, mode); } -static void +static void toibm (x, y, mode) unsigned EMUSHORT *x, *y; enum machine_mode mode; @@ -5643,7 +5643,7 @@ ditoe (di, e) /* Convert e-type to unsigned 64-bit int. */ -static void +static void etoudi (x, i) unsigned EMUSHORT *x; unsigned EMUSHORT *i; @@ -5723,7 +5723,7 @@ noshift: /* Convert e-type to signed 64-bit int. */ -static void +static void etodi (x, i) unsigned EMUSHORT *x; unsigned EMUSHORT *i; @@ -5824,7 +5824,7 @@ etodi (x, i) static int esqinited = 0; static unsigned short sqrndbit[NI]; -static void +static void esqrt (x, y) unsigned EMUSHORT *x, *y; { diff --git a/gnu/usr.bin/cc/cc_int/recog.c b/gnu/usr.bin/cc/cc_int/recog.c index a09a1d9..f4aac50 100644 --- a/gnu/usr.bin/cc/cc_int/recog.c +++ b/gnu/usr.bin/cc/cc_int/recog.c @@ -259,7 +259,7 @@ apply_change_group () { int j; - newpat = gen_rtx (PARALLEL, VOIDmode, + newpat = gen_rtx (PARALLEL, VOIDmode, gen_rtvec (XVECLEN (pat, 0) - 1)); for (j = 0; j < XVECLEN (newpat, 0); j++) XVECEXP (newpat, 0, j) = XVECEXP (pat, 0, j); @@ -379,10 +379,10 @@ validate_replace_rtx_1 (loc, from, to, object) /* If we have have a PLUS whose second operand is now a CONST_INT, use plus_constant to try to simplify it. */ if (GET_CODE (XEXP (x, 1)) == CONST_INT && XEXP (x, 1) == to) - validate_change (object, loc, + validate_change (object, loc, plus_constant (XEXP (x, 0), INTVAL (XEXP (x, 1))), 1); return; - + case ZERO_EXTEND: case SIGN_EXTEND: /* In these cases, the operation to be performed depends on the mode @@ -405,7 +405,7 @@ validate_replace_rtx_1 (loc, from, to, object) return; } break; - + case SUBREG: /* If we have a SUBREG of a register that we are replacing and we are replacing it with a MEM, make a new MEM and try replacing the @@ -494,7 +494,7 @@ validate_replace_rtx_1 (loc, from, to, object) break; } - + fmt = GET_RTX_FORMAT (code); for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--) { @@ -1283,7 +1283,7 @@ decode_asm_operands (body, operands, operand_locs, constraints, modes) { if (GET_CODE (XVECEXP (body, 0, i)) == CLOBBER) break; /* Past last SET */ - + if (operands) operands[i] = SET_DEST (XVECEXP (body, 0, i)); if (operand_locs) @@ -1529,7 +1529,7 @@ adj_offsettable_operand (op, offset) { register enum rtx_code code = GET_CODE (op); - if (code == MEM) + if (code == MEM) { register rtx y = XEXP (op, 0); register rtx new; diff --git a/gnu/usr.bin/cc/cc_int/reg-stack.c b/gnu/usr.bin/cc/cc_int/reg-stack.c index df45dd4..900b413 100644 --- a/gnu/usr.bin/cc/cc_int/reg-stack.c +++ b/gnu/usr.bin/cc/cc_int/reg-stack.c @@ -765,7 +765,7 @@ record_asm_reg_life (insn, regstack, operands, constraints, int *operand_matches = (int *) alloca (n_operands * sizeof (int *)); - enum reg_class *operand_class + enum reg_class *operand_class = (enum reg_class *) alloca (n_operands * sizeof (enum reg_class *)); int reg_used_as_output[FIRST_PSEUDO_REGISTER]; @@ -1257,7 +1257,7 @@ find_blocks (first) && SET_DEST (pat) == pc_rtx && uses_reg_or_mem (SET_SRC (pat))) computed_jump = 1; - + if (computed_jump) { for (x = label_value_list; x; x = XEXP (x, 1)) @@ -2243,7 +2243,7 @@ subst_asm_stack_regs (insn, regstack, operands, operands_loc, constraints, rtx body = PATTERN (insn); int *operand_matches = (int *) alloca (n_operands * sizeof (int *)); - enum reg_class *operand_class + enum reg_class *operand_class = (enum reg_class *) alloca (n_operands * sizeof (enum reg_class *)); rtx *note_reg; /* Array of note contents */ diff --git a/gnu/usr.bin/cc/cc_int/regclass.c b/gnu/usr.bin/cc/cc_int/regclass.c index d4636d5..33097aa 100644 --- a/gnu/usr.bin/cc/cc_int/regclass.c +++ b/gnu/usr.bin/cc/cc_int/regclass.c @@ -83,7 +83,7 @@ HARD_REG_SET call_used_reg_set; /* Data for initializing the above. */ static char initial_call_used_regs[] = CALL_USED_REGISTERS; - + /* Indexed by hard register number, contains 1 for registers that are fixed use -- i.e. in fixed_regs -- or a function value return register or STRUCT_VALUE_REGNUM or STATIC_CHAIN_REGNUM. These are the @@ -106,7 +106,7 @@ int n_non_fixed_regs; and are also considered fixed. */ char global_regs[FIRST_PSEUDO_REGISTER]; - + /* Table of register numbers in the order in which to try to use them. */ #ifdef REG_ALLOC_ORDER int reg_alloc_order[FIRST_PSEUDO_REGISTER] = REG_ALLOC_ORDER; @@ -123,7 +123,7 @@ HARD_REG_SET reg_class_contents[N_REG_CLASSES]; #define N_REG_INTS \ ((FIRST_PSEUDO_REGISTER + (HOST_BITS_PER_INT - 1)) / HOST_BITS_PER_INT) -static unsigned int_reg_class_contents[N_REG_CLASSES][N_REG_INTS] +static unsigned int_reg_class_contents[N_REG_CLASSES][N_REG_INTS] = REG_CLASS_CONTENTS; /* For each reg class, number of regs it contains. */ @@ -567,7 +567,7 @@ static char *prefclass; It might appear to be more general to have a bitmask of classes here, but since it is recommended that there be a class corresponding to the - union of most major pair of classes, that generality is not required. + union of most major pair of classes, that generality is not required. This is available after `regclass' is run. */ @@ -584,7 +584,7 @@ static int loop_cost; static void record_reg_classes PROTO((int, int, rtx *, enum machine_mode *, char **, rtx)); -static int copy_cost PROTO((rtx, enum machine_mode, +static int copy_cost PROTO((rtx, enum machine_mode, enum reg_class, int)); static void record_address_regs PROTO((rtx, enum reg_class, int)); static auto_inc_dec_reg_p PROTO((rtx, enum machine_mode)); @@ -777,7 +777,7 @@ regclass (f, nregs) BASE_REG_CLASS, loop_cost * 2); continue; } - + /* Improve handling of two-address insns such as (set X (ashift CONST Y)) where CONST must be made to match X. Change it into two insns: (set X CONST) @@ -848,7 +848,7 @@ regclass (f, nregs) Then handle any address registers. Finally record the desired classes for any pseudos, doing it twice if some pair of operands are commutative. */ - + for (i = 0; i < noperands; i++) { op_costs[i] = init_cost; @@ -867,7 +867,7 @@ regclass (f, nregs) /* Check for commutative in a separate loop so everything will have been initialized. We must do this even if one operand is a constant--see addsi3 in m68k.md. */ - + for (i = 0; i < noperands - 1; i++) if (constraints[i][0] == '%') { @@ -911,7 +911,7 @@ regclass (f, nregs) and find which class is preferred. Store that in `prefclass[REGNO]'. Record in `altclass[REGNO]' the largest register class any of whose registers is better than memory. */ - + if (pass == 0) { prefclass = (char *) oballoc (nregs); @@ -964,7 +964,7 @@ regclass (f, nregs) #endif ) alt = reg_class_subunion[(int) alt][class]; - + /* If we don't add any classes, nothing to try. */ if (alt == best) alt = (int) NO_REGS; @@ -996,7 +996,7 @@ regclass (f, nregs) This procedure works alternative by alternative. For each alternative we assume that we will be able to allocate all pseudos to their ideal register class and calculate the cost of using that alternative. Then - we compute for each operand that is a pseudo-register, the cost of + we compute for each operand that is a pseudo-register, the cost of having the pseudo allocated to each register class and using it in that alternative. To this cost is added the cost of the alternative. @@ -1041,7 +1041,7 @@ record_reg_classes (n_alts, n_ops, ops, modes, constraints, insn) int win = 0; char c; - /* If this operand has no constraints at all, we can conclude + /* If this operand has no constraints at all, we can conclude nothing about it since anything is valid. */ if (*p == 0) @@ -1082,7 +1082,7 @@ record_reg_classes (n_alts, n_ops, ops, modes, constraints, insn) || REGNO (ops[j]) < FIRST_PSEUDO_REGISTER) { /* This op is a pseudo but the one it matches is not. */ - + /* If we can't put the other operand into a register, this alternative can't be used. */ @@ -1375,7 +1375,7 @@ copy_cost (x, mode, class, to_p) class = PREFERRED_RELOAD_CLASS (x, class); #ifdef HAVE_SECONDARY_RELOADS - /* If we need a secondary reload (we assume here that we are using + /* If we need a secondary reload (we assume here that we are using the secondary reload as an intermediate, not a scratch register), the cost is that to load the input into the intermediate register, then to copy them. We use a special value of TO_P to avoid recursion. */ @@ -1470,7 +1470,7 @@ record_address_regs (x, class, scale) /* If index and base registers are the same on this machine, just record registers in any non-constant operands. We assume here, - as well as in the tests below, that all addresses are in + as well as in the tests below, that all addresses are in canonical form. */ else if (INDEX_REG_CLASS == BASE_REG_CLASS) @@ -1492,7 +1492,7 @@ record_address_regs (x, class, scale) else if (code1 == SYMBOL_REF || code1 == CONST || code1 == LABEL_REF) record_address_regs (arg0, INDEX_REG_CLASS, scale); - /* If this the sum of two registers where the first is known to be a + /* If this the sum of two registers where the first is known to be a pointer, it must be a base register with the second an index. */ else if (code0 == REG && code1 == REG @@ -1573,7 +1573,7 @@ record_address_regs (x, class, scale) /* Return 1 if REG is valid as an auto-increment memory reference to an object of MODE. */ -static +static auto_inc_dec_reg_p (reg, mode) rtx reg; enum machine_mode mode; @@ -1753,7 +1753,7 @@ reg_scan_mark_refs (x, insn, note_flag) Likewise if it is setting the destination from an address or from a value equivalent to an address or to the sum of an address and something else. - + But don't do any of this if the pseudo corresponds to a user variable since it should have already been set as a pointer based on the type. */ diff --git a/gnu/usr.bin/cc/cc_int/reload.c b/gnu/usr.bin/cc/cc_int/reload.c index aed06e4..92a617b 100644 --- a/gnu/usr.bin/cc/cc_int/reload.c +++ b/gnu/usr.bin/cc/cc_int/reload.c @@ -225,9 +225,9 @@ static int n_memlocs; #ifdef SECONDARY_MEMORY_NEEDED /* Save MEMs needed to copy from one class of registers to another. One MEM - is used per mode, but normally only one or two modes are ever used. + is used per mode, but normally only one or two modes are ever used. - We keep two versions, before and after register elimination. The one + We keep two versions, before and after register elimination. The one after register elimination is record separately for each operand. This is done in case the address is not valid to be sure that we separately reload each. */ @@ -398,7 +398,7 @@ push_secondary_reload (in_p, x, opnum, optional, reload_class, reload_mode, if (icode != CODE_FOR_nothing) { - /* If IN_P is non-zero, the reload register will be the output in + /* If IN_P is non-zero, the reload register will be the output in operand 0. If IN_P is zero, the reload register will be the input in operand 1. Outputs should have an initial "=", which we must skip. */ @@ -565,7 +565,7 @@ push_secondary_reload (in_p, x, opnum, optional, reload_class, reload_mode, reload_when_needed[s_reload] = secondary_type; reload_secondary_in_reload[s_reload] = in_p ? t_reload : -1; reload_secondary_out_reload[s_reload] = ! in_p ? t_reload : -1; - reload_secondary_in_icode[s_reload] = in_p ? t_icode : CODE_FOR_nothing; + reload_secondary_in_icode[s_reload] = in_p ? t_icode : CODE_FOR_nothing; reload_secondary_out_icode[s_reload] = ! in_p ? t_icode : CODE_FOR_nothing; reload_secondary_p[s_reload] = 1; @@ -593,7 +593,7 @@ push_secondary_reload (in_p, x, opnum, optional, reload_class, reload_mode, #ifdef SECONDARY_MEMORY_NEEDED -/* Return a memory location that will be used to copy X in mode MODE. +/* Return a memory location that will be used to copy X in mode MODE. If we haven't already made a location for this mode in this insn, call find_reloads_address on the location being returned. */ @@ -623,7 +623,7 @@ get_secondary_mem (x, mode, opnum, type) if (secondary_memlocs_elim[(int) mode][opnum] != 0) return secondary_memlocs_elim[(int) mode][opnum]; - /* If this is the first time we've tried to get a MEM for this mode, + /* If this is the first time we've tried to get a MEM for this mode, allocate a new one. `something_changed' in reload will get set by noticing that the frame size has changed. */ @@ -735,7 +735,7 @@ push_reload (in, out, inloc, outloc, class, if (outmode == VOIDmode && out != 0) outmode = GET_MODE (out); - /* If IN is a pseudo register everywhere-equivalent to a constant, and + /* If IN is a pseudo register everywhere-equivalent to a constant, and it is not in a hard register, reload straight from the constant, since we want to get rid of such pseudo registers. Often this is done earlier, but not always in find_reloads_address. */ @@ -934,7 +934,7 @@ push_reload (in, out, inloc, outloc, class, { out_subreg_loc = outloc; outloc = &SUBREG_REG (out); - out = *outloc; + out = *outloc; #ifndef LOAD_EXTEND_OP if (GET_CODE (out) == MEM && GET_MODE_SIZE (GET_MODE (out)) > GET_MODE_SIZE (outmode)) @@ -1035,7 +1035,7 @@ push_reload (in, out, inloc, outloc, class, /* We can use an existing reload if the class is right and at least one of IN and OUT is a match and the other is at worst neutral. - (A zero compared against anything is neutral.) + (A zero compared against anything is neutral.) If SMALL_REGISTER_CLASSES, don't use existing reloads unless they are for the same thing since that can cause us to need more reload registers @@ -1778,7 +1778,7 @@ operands_match_p (x, y) register RTX_CODE code = GET_CODE (x); register char *fmt; int success_2; - + if (x == y) return 1; if ((code == REG || (code == SUBREG && GET_CODE (SUBREG_REG (x)) == REG)) @@ -1837,7 +1837,7 @@ operands_match_p (x, y) slow: - /* Now we have disposed of all the cases + /* Now we have disposed of all the cases in which different rtx codes can match. */ if (code != GET_CODE (y)) return 0; @@ -1908,11 +1908,11 @@ n_occurrences (c, s) } /* Describe the range of registers or memory referenced by X. - If X is a register, set REG_FLAG and put the first register + If X is a register, set REG_FLAG and put the first register number into START and the last plus one into END. - If X is a memory reference, put a base address into BASE + If X is a memory reference, put a base address into BASE and a range of integer offsets into START and END. - If X is pushing on the stack, we can assume it causes no trouble, + If X is pushing on the stack, we can assume it causes no trouble, so we set the SAFE field. */ static struct decomposition @@ -1962,7 +1962,7 @@ decompose (x) { base = addr; offset = const0_rtx; - } + } if (GET_CODE (offset) == CONST) offset = XEXP (offset, 0); if (GET_CODE (offset) == PLUS) @@ -2003,7 +2003,7 @@ decompose (x) else if (GET_CODE (x) == REG) { val.reg_flag = 1; - val.start = true_regnum (x); + val.start = true_regnum (x); if (val.start < 0) { /* A pseudo with no hard reg. */ @@ -2020,7 +2020,7 @@ decompose (x) /* This could be more precise, but it's good enough. */ return decompose (SUBREG_REG (x)); val.reg_flag = 1; - val.start = true_regnum (x); + val.start = true_regnum (x); if (val.start < 0) return decompose (SUBREG_REG (x)); else @@ -2192,7 +2192,7 @@ find_reloads (insn, replace, ind_levels, live_known, reload_reg_p) if (reg_set_p (cc0_rtx, PATTERN (insn))) no_output_reloads = 1; #endif - + #ifdef SECONDARY_MEMORY_NEEDED /* The eliminated forms of any secondary memory locations are per-insn, so clear them out here. */ @@ -2306,7 +2306,7 @@ find_reloads (insn, replace, ind_levels, live_known, reload_reg_p) modified[i] = RELOAD_READ; - /* Scan this operand's constraint to see if it is an output operand, + /* Scan this operand's constraint to see if it is an output operand, an in-out operand, is commutative, or should match another. */ while (c = *p++) @@ -2373,7 +2373,7 @@ find_reloads (insn, replace, ind_levels, live_known, reload_reg_p) and reload parts of the addresses into index registers. Also here any references to pseudo regs that didn't get hard regs but are equivalent to constants get replaced in the insn itself - with those constants. Nobody will ever see them again. + with those constants. Nobody will ever see them again. Finally, set up the preferred classes of each operand. */ @@ -2451,7 +2451,7 @@ find_reloads (insn, replace, ind_levels, live_known, reload_reg_p) address = copy_rtx (address); /* If this is an output operand, we must output a CLOBBER - after INSN so find_equiv_reg knows REGNO is being written. + after INSN so find_equiv_reg knows REGNO is being written. Mark this insn specially, do we can put our output reloads after it. */ @@ -2526,7 +2526,7 @@ find_reloads (insn, replace, ind_levels, live_known, reload_reg_p) /* REJECT is a count of how undesirable this alternative says it is if any reloading is required. If the alternative matches exactly then REJECT is ignored, but otherwise it gets this much - counted against it in addition to the reloading needed. Each + counted against it in addition to the reloading needed. Each ? counts three times here since we want the disparaging caused by a bad register class to only count 1/3 as much. */ int reject = 0; @@ -2578,7 +2578,7 @@ find_reloads (insn, replace, ind_levels, live_known, reload_reg_p) made assumptions about the behavior of the machine in such register access. If the data is, in fact, in memory we must always load using the size assumed to be in the - register and let the insn do the different-sized + register and let the insn do the different-sized accesses. */ || ((GET_CODE (operand) == MEM || (GET_CODE (operand)== REG @@ -2891,8 +2891,8 @@ find_reloads (insn, replace, ind_levels, live_known, reload_reg_p) /* A SCRATCH is not a valid operand. */ && GET_CODE (operand) != SCRATCH #ifdef LEGITIMATE_PIC_OPERAND_P - && (! CONSTANT_P (operand) - || ! flag_pic + && (! CONSTANT_P (operand) + || ! flag_pic || LEGITIMATE_PIC_OPERAND_P (operand)) #endif && (GENERAL_REGS == ALL_REGS @@ -2917,11 +2917,11 @@ find_reloads (insn, replace, ind_levels, live_known, reload_reg_p) win = 1; break; #endif - + default: this_alternative[i] = (int) reg_class_subunion[this_alternative[i]][(int) REG_CLASS_FROM_LETTER (c)]; - + reg: if (GET_MODE (operand) == BLKmode) break; @@ -2973,7 +2973,7 @@ find_reloads (insn, replace, ind_levels, live_known, reload_reg_p) reload. This is consistent with other code and is required to avoid chosing another alternative when the constant is moved into memory by this function on - an early reload pass. Note that the test here is + an early reload pass. Note that the test here is precisely the same as in the code below that calls force_const_mem. */ if (CONSTANT_P (operand) @@ -3004,7 +3004,7 @@ find_reloads (insn, replace, ind_levels, live_known, reload_reg_p) /* We prefer to reload pseudos over reloading other things, since such reloads may be able to be eliminated later. If we are reloading a SCRATCH, we won't be generating any - insns, just using a register, so it is also preferred. + insns, just using a register, so it is also preferred. So bump REJECT in other cases. Don't do this in the case where we are forcing a constant into memory and it will then win since we don't want to have a different @@ -3016,7 +3016,7 @@ find_reloads (insn, replace, ind_levels, live_known, reload_reg_p) reject++; } - /* If this operand is a pseudo register that didn't get a hard + /* If this operand is a pseudo register that didn't get a hard reg and this alternative accepts some register, see if the class that we want is a subset of the preferred class for this register. If not, but it intersects that class, use the @@ -3047,7 +3047,7 @@ find_reloads (insn, replace, ind_levels, live_known, reload_reg_p) { /* Since we don't have a way of forming the intersection, we just do something special if the preferred class - is a subset of the class we have; that's the most + is a subset of the class we have; that's the most common case anyway. */ if (reg_class_subset_p (preferred_class[i], this_alternative[i])) @@ -3066,7 +3066,7 @@ find_reloads (insn, replace, ind_levels, live_known, reload_reg_p) if (this_alternative_earlyclobber[i] && this_alternative_win[i]) { - struct decomposition early_data; + struct decomposition early_data; early_data = decompose (recog_operand[i]); @@ -3079,7 +3079,7 @@ find_reloads (insn, replace, ind_levels, live_known, reload_reg_p) abort (); continue; } - + if (this_alternative[i] == NO_REGS) { this_alternative_earlyclobber[i] = 0; @@ -3301,9 +3301,9 @@ find_reloads (insn, replace, ind_levels, live_known, reload_reg_p) One special case that is worth checking is when we have an output that is earlyclobber but isn't used past the insn (typically - a SCRATCH). In this case, we only need have the reload live + a SCRATCH). In this case, we only need have the reload live through the insn itself, but not for any of our input or output - reloads. + reloads. In any case, anything needed to address this operand can remain however they were previously categorized. */ @@ -3439,7 +3439,7 @@ find_reloads (insn, replace, ind_levels, live_known, reload_reg_p) && goal_alternative_matches[i] < 0 && optimize) { - /* For each non-matching operand that's a MEM or a pseudo-register + /* For each non-matching operand that's a MEM or a pseudo-register that didn't get a hard register, make an optional reload. This may get done even if the insn needs no reloads otherwise. */ @@ -3502,7 +3502,7 @@ find_reloads (insn, replace, ind_levels, live_known, reload_reg_p) operand_mode[i], 0, 1, goal_alternative_matches[i], RELOAD_OTHER); } - + /* If this insn pattern contains any MATCH_DUP's, make sure that they will be substituted if the operands they match are substituted. Also do now any substitutions we already did on the operands. @@ -3584,7 +3584,7 @@ find_reloads (insn, replace, ind_levels, live_known, reload_reg_p) } } - /* Scan all the reloads and update their type. + /* Scan all the reloads and update their type. If a reload is for the address of an operand and we didn't reload that operand, change the type. Similarly, change the operand number of a reload when two operands match. If a reload is optional, treat it @@ -3620,13 +3620,13 @@ find_reloads (insn, replace, ind_levels, live_known, reload_reg_p) { int secondary_in_reload = reload_secondary_in_reload[i]; - reload_when_needed[secondary_in_reload] = + reload_when_needed[secondary_in_reload] = RELOAD_FOR_OPADDR_ADDR; /* If there's a tertiary reload we have to change it also. */ if (secondary_in_reload > 0 && reload_secondary_in_reload[secondary_in_reload] != -1) - reload_when_needed[reload_secondary_in_reload[secondary_in_reload]] + reload_when_needed[reload_secondary_in_reload[secondary_in_reload]] = RELOAD_FOR_OPADDR_ADDR; } @@ -3635,13 +3635,13 @@ find_reloads (insn, replace, ind_levels, live_known, reload_reg_p) { int secondary_out_reload = reload_secondary_out_reload[i]; - reload_when_needed[secondary_out_reload] = + reload_when_needed[secondary_out_reload] = RELOAD_FOR_OPADDR_ADDR; /* If there's a tertiary reload we have to change it also. */ if (secondary_out_reload && reload_secondary_out_reload[secondary_out_reload] != -1) - reload_when_needed[reload_secondary_out_reload[secondary_out_reload]] + reload_when_needed[reload_secondary_out_reload[secondary_out_reload]] = RELOAD_FOR_OPADDR_ADDR; } reload_when_needed[i] = RELOAD_FOR_OPERAND_ADDRESS; @@ -3649,7 +3649,7 @@ find_reloads (insn, replace, ind_levels, live_known, reload_reg_p) if (reload_when_needed[i] == RELOAD_FOR_INPUT_ADDRESS && operand_reloadnum[reload_opnum[i]] >= 0 - && (reload_when_needed[operand_reloadnum[reload_opnum[i]]] + && (reload_when_needed[operand_reloadnum[reload_opnum[i]]] == RELOAD_OTHER)) reload_when_needed[i] = RELOAD_FOR_OTHER_ADDRESS; @@ -3875,7 +3875,7 @@ find_reloads_toplev (x, opnum, type, ind_levels, is_set_dest) if (code == SUBREG && GET_CODE (SUBREG_REG (x)) == REG) { - /* Check for SUBREG containing a REG that's equivalent to a constant. + /* Check for SUBREG containing a REG that's equivalent to a constant. If the constant has a known value, truncate it right now. Similarly if we are extracting a single-word of a multi-word constant. If the constant is symbolic, allow it to be substituted @@ -3927,7 +3927,7 @@ find_reloads_toplev (x, opnum, type, ind_levels, is_set_dest) #endif && (reg_equiv_address[regno] != 0 || (reg_equiv_mem[regno] != 0 - && (! strict_memory_address_p (GET_MODE (x), + && (! strict_memory_address_p (GET_MODE (x), XEXP (reg_equiv_mem[regno], 0)) || ! offsettable_memref_p (reg_equiv_mem[regno]))))) { @@ -4194,7 +4194,7 @@ find_reloads_address (mode, memrefloc, ad, loc, opnum, type, ind_levels) /* If we have an indexed stack slot, there are three possible reasons why it might be invalid: The index might need to be reloaded, the address might have been made by frame pointer elimination and hence have a - constant out of range, or both reasons might apply. + constant out of range, or both reasons might apply. We can easily check for an index needing reload, but even if that is the case, we might also have an invalid constant. To avoid making the @@ -4242,7 +4242,7 @@ find_reloads_address (mode, memrefloc, ad, loc, opnum, type, ind_levels) return 1; } - + else if (GET_CODE (ad) == PLUS && GET_CODE (XEXP (ad, 1)) == CONST_INT && GET_CODE (XEXP (ad, 0)) == PLUS && (XEXP (XEXP (ad, 0), 1) == frame_pointer_rtx @@ -4265,7 +4265,7 @@ find_reloads_address (mode, memrefloc, ad, loc, opnum, type, ind_levels) return 1; } - + /* See if address becomes valid when an eliminable register in a sum is replaced. */ @@ -4558,7 +4558,7 @@ find_reloads_address_1 (x, context, loc, opnum, type, ind_levels) && REG_OK_FOR_BASE_P (op0)) return 0; else if (REG_OK_FOR_BASE_P (op1)) - find_reloads_address_1 (orig_op0, 1, &XEXP (x, 0), opnum, type, + find_reloads_address_1 (orig_op0, 1, &XEXP (x, 0), opnum, type, ind_levels); else if (REG_OK_FOR_BASE_P (op0)) find_reloads_address_1 (orig_op1, 1, &XEXP (x, 1), opnum, type, @@ -4727,7 +4727,7 @@ find_reloads_address_1 (x, context, loc, opnum, type, ind_levels) if (reg_equiv_constant[regno] != 0) { - find_reloads_address_part (reg_equiv_constant[regno], loc, + find_reloads_address_part (reg_equiv_constant[regno], loc, (context ? INDEX_REG_CLASS : BASE_REG_CLASS), GET_MODE (x), opnum, type, ind_levels); @@ -5043,7 +5043,7 @@ refers_to_regno_for_reload_p (regno, endregno, x, loc) } return (endregno > i - && regno < i + (i < FIRST_PSEUDO_REGISTER + && regno < i + (i < FIRST_PSEUDO_REGISTER ? HARD_REGNO_NREGS (i, GET_MODE (x)) : 1)); @@ -5123,7 +5123,7 @@ refers_to_regno_for_reload_p (regno, endregno, x, loc) we check if any register number in X conflicts with the relevant register numbers. If X is a constant, return 0. If X is a MEM, return 1 iff IN contains a MEM (we don't bother checking for memory addresses that can't - conflict because we expect this to be a rare case. + conflict because we expect this to be a rare case. This function is similar to reg_overlap_mention_p in rtlanal.c except that we look at equivalences for pseudos that didn't get hard registers. */ @@ -5188,14 +5188,14 @@ refers_to_mem_for_reload_p (x) if (GET_CODE (x) == REG) return (REGNO (x) >= FIRST_PSEUDO_REGISTER && reg_equiv_memory_loc[REGNO (x)]); - + fmt = GET_RTX_FORMAT (GET_CODE (x)); for (i = GET_RTX_LENGTH (GET_CODE (x)) - 1; i >= 0; i--) if (fmt[i] == 'e' && (GET_CODE (XEXP (x, i)) == MEM || refers_to_mem_for_reload_p (XEXP (x, i)))) return 1; - + return 0; } @@ -5281,12 +5281,12 @@ find_equiv_reg (goal, insn, class, other, reload_reg_p, goalreg, mode) /* On some machines, certain regs must always be rejected because they don't behave the way ordinary registers do. */ - + #ifdef OVERLAPPING_REGNO_P if (regno >= 0 && regno < FIRST_PSEUDO_REGISTER && OVERLAPPING_REGNO_P (regno)) return 0; -#endif +#endif /* Scan insns back from INSN, looking for one that copies a value into or out of GOAL. @@ -5425,11 +5425,11 @@ find_equiv_reg (goal, insn, class, other, reload_reg_p, goalreg, mode) /* On some machines, certain regs must always be rejected because they don't behave the way ordinary registers do. */ - + #ifdef OVERLAPPING_REGNO_P if (OVERLAPPING_REGNO_P (valueno)) return 0; -#endif +#endif nregs = HARD_REGNO_NREGS (regno, mode); valuenregs = HARD_REGNO_NREGS (valueno, mode); @@ -5674,14 +5674,14 @@ regno_clobbered_p (regno, insn) static char *reload_when_needed_name[] = { - "RELOAD_FOR_INPUT", - "RELOAD_FOR_OUTPUT", + "RELOAD_FOR_INPUT", + "RELOAD_FOR_OUTPUT", "RELOAD_FOR_INSN", - "RELOAD_FOR_INPUT_ADDRESS", + "RELOAD_FOR_INPUT_ADDRESS", "RELOAD_FOR_OUTPUT_ADDRESS", - "RELOAD_FOR_OPERAND_ADDRESS", + "RELOAD_FOR_OPERAND_ADDRESS", "RELOAD_FOR_OPADDR_ADDR", - "RELOAD_OTHER", + "RELOAD_OTHER", "RELOAD_FOR_OTHER_ADDRESS" }; diff --git a/gnu/usr.bin/cc/cc_int/reload1.c b/gnu/usr.bin/cc/cc_int/reload1.c index 49a1811..8eb4908d 100644 --- a/gnu/usr.bin/cc/cc_int/reload1.c +++ b/gnu/usr.bin/cc/cc_int/reload1.c @@ -914,10 +914,10 @@ reload (first, global, dumpfile) rtx old_notes = REG_NOTES (insn); int did_elimination = 0; - /* To compute the number of reload registers of each class + /* To compute the number of reload registers of each class needed for an insn, we must similate what choose_reload_regs can do. We do this by splitting an insn into an "input" and - an "output" part. RELOAD_OTHER reloads are used in both. + an "output" part. RELOAD_OTHER reloads are used in both. The input part uses those reloads, RELOAD_FOR_INPUT reloads, which must be live over the entire input section of reloads, and the maximum of all the RELOAD_FOR_INPUT_ADDRESS and @@ -1279,10 +1279,10 @@ reload (first, global, dumpfile) break; } - caller_save_needs + caller_save_needs = (caller_save_group_size > 1 ? insn_needs.other.groups - : insn_needs.other.regs[nongroup_need]); + : insn_needs.other.regs[nongroup_need]); if (caller_save_needs[(int) caller_save_spill_class] == 0) { @@ -1428,7 +1428,7 @@ reload (first, global, dumpfile) mode_name[(int) group_mode[i]], reg_class_names[i], INSN_UID (max_groups_insn[i])); } - + /* If we have caller-saves, set up the save areas and see if caller-save will need a spill register. */ @@ -1542,8 +1542,8 @@ reload (first, global, dumpfile) were in a block that didn't need any spill registers of a conflicting class. We used to try to mark off the need for those registers, but doing so properly is very complex and reallocating them is the - simpler approach. First, "pack" potential_reload_regs by pushing - any nonnegative entries towards the end. That will leave room + simpler approach. First, "pack" potential_reload_regs by pushing + any nonnegative entries towards the end. That will leave room for the registers we already spilled. Also, undo the marking of the spill registers from the last time @@ -2766,7 +2766,7 @@ eliminate_regs (x, mem_mode, insn) return x; case MULT: - /* If this is the product of an eliminable register and a + /* If this is the product of an eliminable register and a constant, apply the distribute law and move the constant out so that we have (plus (mult ..) ..). This is needed in order to keep load-address insns valid. This case is pathalogical. @@ -3254,7 +3254,7 @@ eliminate_regs_in_insn (insn, replace) old_asm_operands_vec = 0; /* Replace the body of this insn with a substituted form. If we changed - something, return non-zero. + something, return non-zero. If we are replacing a body that was a (set X (plus Y Z)), try to re-recognize the insn. We do this in case we had a simple addition @@ -3505,7 +3505,7 @@ spill_hard_reg (regno, global, dumpfile, cant_eliminate) return something_changed; } -/* Find all paradoxical subregs within X and update reg_max_ref_width. +/* Find all paradoxical subregs within X and update reg_max_ref_width. Also mark any hard registers used to store user variables as forbidden from being used for spill registers. */ @@ -3866,7 +3866,7 @@ reload_as_needed (first, live_known) choose_reload_regs (insn, avoid_return_reg); #ifdef SMALL_REGISTER_CLASSES - /* Merge any reloads that we didn't combine for fear of + /* Merge any reloads that we didn't combine for fear of increasing the number of spill registers needed but now discover can be safely merged. */ merge_assigned_reloads (insn); @@ -4398,7 +4398,7 @@ reload_reg_free_before_p (regno, opnum, type) return (! TEST_HARD_REG_BIT (reload_reg_used_in_other_addr, regno) && ! TEST_HARD_REG_BIT (reload_reg_used_in_insn, regno) && ! TEST_HARD_REG_BIT (reload_reg_used_in_op_addr, regno)); - + case RELOAD_FOR_OUTPUT: /* This can't be used in the output address for this operand and anything that can't be used for it, except that we've already @@ -4479,7 +4479,7 @@ reload_reg_reaches_end_p (regno, opnum, type) return 1; /* If this use is for part of the insn, - its value reaches if no subsequent part uses the same register. + its value reaches if no subsequent part uses the same register. Just like the above function, don't try to do this with lots of fallthroughs. */ @@ -4525,7 +4525,7 @@ reload_reg_reaches_end_p (regno, opnum, type) case RELOAD_FOR_INPUT: /* Similar to input address, except we start at the next operand for - both input and input address and we do not check for + both input and input address and we do not check for RELOAD_FOR_OPERAND_ADDRESS and RELOAD_FOR_INSN since these would conflict. */ @@ -4592,7 +4592,7 @@ reloads_conflict (r1, r2) int r2_opnum = reload_opnum[r2]; /* RELOAD_OTHER conflicts with everything except RELOAD_FOR_OTHER_ADDRESS. */ - + if (r2_type == RELOAD_OTHER && r1_type != RELOAD_FOR_OTHER_ADDRESS) return 1; @@ -4601,7 +4601,7 @@ reloads_conflict (r1, r2) switch (r1_type) { case RELOAD_FOR_INPUT: - return (r2_type == RELOAD_FOR_INSN + return (r2_type == RELOAD_FOR_INSN || r2_type == RELOAD_FOR_OPERAND_ADDRESS || r2_type == RELOAD_FOR_OPADDR_ADDR || r2_type == RELOAD_FOR_INPUT @@ -4620,7 +4620,7 @@ reloads_conflict (r1, r2) || r2_type == RELOAD_FOR_OPERAND_ADDRESS); case RELOAD_FOR_OPADDR_ADDR: - return (r2_type == RELOAD_FOR_INPUT + return (r2_type == RELOAD_FOR_INPUT || r2_type == RELOAD_FOR_OPADDR_ADDR); case RELOAD_FOR_OUTPUT: @@ -4726,7 +4726,7 @@ allocate_reload_reg (r, insn, last_reload, noerror) of leapfrogging each other. Don't do this, however, when we have group needs and failure would be fatal; if we only have a relatively small number of spill registers, and more than one of them has - group needs, then by starting in the middle, we may end up + group needs, then by starting in the middle, we may end up allocating the first one in such a way that we are not left with sufficient groups to handle the rest. */ @@ -4734,7 +4734,7 @@ allocate_reload_reg (r, insn, last_reload, noerror) i = last_spill_reg; else i = -1; - + for (count = 0; count < n_spills; count++) { int class = (int) reload_reg_class[r]; @@ -4811,7 +4811,7 @@ allocate_reload_reg (r, insn, last_reload, noerror) if (new == 0 || GET_MODE (new) != reload_mode[r]) spill_reg_rtx[i] = new = gen_rtx (REG, reload_mode[r], spill_regs[i]); - + regno = true_regnum (new); /* Detect when the reload reg can't hold the reload mode. @@ -5525,7 +5525,7 @@ choose_reload_regs (insn, avoid_return_reg) /* If SMALL_REGISTER_CLASSES are defined, we may not have merged two reloads of the same item for fear that we might not have enough reload registers. However, normally they will get the same reload register - and hence actually need not be loaded twice. + and hence actually need not be loaded twice. Here we check for the most common case of this phenomenon: when we have a number of reloads for the same object, each of which were allocated @@ -5608,7 +5608,7 @@ merge_assigned_reloads (insn) ? RELOAD_FOR_OTHER_ADDRESS : RELOAD_OTHER; } } -} +} #endif /* SMALL_RELOAD_CLASSES */ /* Output insns to reload values in and out of the chosen reload regs. */ @@ -6001,7 +6001,7 @@ emit_reload_insns (insn) to see if it is being used as a scratch or intermediate register and generate code appropriately. If we need a scratch register, use REAL_OLDEQUIV since the form of - the insn may depend on the actual address if it is + the insn may depend on the actual address if it is a MEM. */ if (second_reload_reg) @@ -6520,7 +6520,7 @@ emit_reload_insns (insn) reg_last_reload_reg[nregno] = reload_reg_rtx[r]; /* If NREGNO is a hard register, it may occupy more than - one register. If it does, say what is in the + one register. If it does, say what is in the rest of the registers assuming that both registers agree on how many words the object takes. If not, invalidate the subsequent registers. */ @@ -6612,7 +6612,7 @@ emit_reload_insns (insn) /* Emit code to perform a reload from IN (which may be a reload register) to OUT (which may also be a reload register). IN or OUT is from operand - OPNUM with reload type TYPE. + OPNUM with reload type TYPE. Returns first insn emitted. */ @@ -6938,7 +6938,7 @@ inc_for_reload (reloadreg, value, inc_amount) add_insn = emit_insn (gen_rtx (SET, VOIDmode, incloc, gen_rtx (PLUS, GET_MODE (incloc), incloc, inc))); - + code = recog_memoized (add_insn); if (code >= 0) { diff --git a/gnu/usr.bin/cc/cc_int/reorg.c b/gnu/usr.bin/cc/cc_int/reorg.c index c90c055..d977404 100644 --- a/gnu/usr.bin/cc/cc_int/reorg.c +++ b/gnu/usr.bin/cc/cc_int/reorg.c @@ -54,7 +54,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ is taken. The HP-PA always has a branch delay slot. For unconditional branches - its effects can be annulled when the branch is taken. The effects + its effects can be annulled when the branch is taken. The effects of the delay slot in a conditional branch can be nullified for forward taken branches, or for untaken backward branches. This means we can hoist insns from the fall-through path for forward branches or @@ -335,7 +335,7 @@ mark_referenced_resources (x, res, include_delayed_effects) We can not just fall through here since then we would be confused by the ASM_INPUT rtx inside ASM_OPERANDS, which do not indicate traditional asms unlike their normal usage. */ - + for (i = 0; i < ASM_OPERANDS_INPUT_LENGTH (x); i++) mark_referenced_resources (ASM_OPERANDS_INPUT (x, i), res, 0); return; @@ -576,7 +576,7 @@ mark_set_resources (x, res, in_dest, include_delayed_effects) case CLOBBER: mark_set_resources (XEXP (x, 0), res, 1, 0); return; - + case SEQUENCE: for (i = 0; i < XVECLEN (x, 0); i++) if (! (INSN_ANNULLED_BRANCH_P (XVECEXP (x, 0, 0)) @@ -773,7 +773,7 @@ find_end_label () || GET_CODE (PATTERN (insn)) == CLOBBER))) insn = PREV_INSN (insn); - /* When a target threads its epilogue we might already have a + /* When a target threads its epilogue we might already have a suitable return insn. If so put a label before it for the end_of_function_label. */ if (GET_CODE (insn) == BARRIER @@ -852,7 +852,7 @@ emit_delay_sequence (insn, list, length, avail) rtx delay_insn = copy_rtx (insn); /* If INSN is followed by a BARRIER, delete the BARRIER since it will only - confuse further processing. Update LAST in case it was the last insn. + confuse further processing. Update LAST in case it was the last insn. We will put the BARRIER back in later. */ if (NEXT_INSN (insn) && GET_CODE (NEXT_INSN (insn)) == BARRIER) { @@ -914,7 +914,7 @@ emit_delay_sequence (insn, list, length, avail) if (NEXT_INSN (seq_insn) && GET_CODE (NEXT_INSN (seq_insn)) == INSN && GET_CODE (PATTERN (NEXT_INSN (seq_insn))) == SEQUENCE) PREV_INSN (XVECEXP (PATTERN (NEXT_INSN (seq_insn)), 0, 0)) = seq_insn; - + /* If there used to be a BARRIER, put it back. */ if (had_barrier) emit_barrier_after (seq_insn); @@ -940,7 +940,7 @@ add_to_delay_list (insn, delay_list) if (delay_list == 0) { struct target_info *tinfo; - + for (tinfo = target_hash_table[INSN_UID (insn) % TARGET_HASH_PRIME]; tinfo; tinfo = tinfo->next) if (tinfo->uid == INSN_UID (insn)) @@ -957,7 +957,7 @@ add_to_delay_list (insn, delay_list) XEXP (delay_list, 1) = add_to_delay_list (insn, XEXP (delay_list, 1)); return delay_list; -} +} /* Delete INSN from the the delay slot of the insn that it is in. This may produce an insn without anything in its delay slots. */ @@ -1215,15 +1215,15 @@ get_jump_flags (insn, label) && INSN_UID (insn) <= max_uid && label != 0 && INSN_UID (label) <= max_uid) - flags + flags = (uid_to_ruid[INSN_UID (label)] > uid_to_ruid[INSN_UID (insn)]) ? ATTR_FLAG_forward : ATTR_FLAG_backward; /* No valid direction information. */ else flags = 0; - + /* If insn is a conditional branch call mostly_true_jump to get - determine the branch prediction. + determine the branch prediction. Non conditional branches are predicted as very likely taken. */ if (GET_CODE (insn) == JUMP_INSN @@ -1281,7 +1281,7 @@ rare_destination (insn) case CODE_LABEL: return 0; case BARRIER: - /* A BARRIER can either be after a JUMP_INSN or a CALL_INSN. We + /* A BARRIER can either be after a JUMP_INSN or a CALL_INSN. We don't scan past JUMP_INSNs, so any barrier we find here must have been after a CALL_INSN and hence mean the call doesn't return. */ @@ -1333,7 +1333,7 @@ mostly_true_jump (jump_insn, condition) { /* If this is the test of a loop, it is very likely true. We scan backwards from the target label. If we find a NOTE_INSN_LOOP_BEG - before the next real insn, we assume the branch is to the top of + before the next real insn, we assume the branch is to the top of the loop. */ for (insn = PREV_INSN (target_label); insn && GET_CODE (insn) == NOTE; @@ -1369,7 +1369,7 @@ mostly_true_jump (jump_insn, condition) return 2; } - /* If we couldn't figure out what this jump was, assume it won't be + /* If we couldn't figure out what this jump was, assume it won't be taken. This should be rare. */ if (condition == 0) return 0; @@ -1419,7 +1419,7 @@ get_branch_condition (insn, target) { rtx pat = PATTERN (insn); rtx src; - + if (condjump_in_parallel_p (insn)) pat = XVECEXP (pat, 0, 0); @@ -1665,13 +1665,13 @@ steal_delay_list_from_target (insn, condition, seq, delay_list, return delay_list; } -/* Similar to steal_delay_list_from_target except that SEQ is on the +/* Similar to steal_delay_list_from_target except that SEQ is on the fallthrough path of INSN. Here we only do something if the delay insn of SEQ is an unconditional branch. In that case we steal its delay slot for INSN since unconditional branches are much easier to fill. */ static rtx -steal_delay_list_from_fallthrough (insn, condition, seq, +steal_delay_list_from_fallthrough (insn, condition, seq, delay_list, sets, needed, other_needed, slots_to_fill, pslots_filled, pannul_p) rtx insn, condition; @@ -1956,17 +1956,17 @@ redundant_insn_p (insn, target, delay_list) return 0; /* Stop for an INSN or JUMP_INSN with delayed effects and its delay - slots because it is difficult to track its resource needs + slots because it is difficult to track its resource needs correctly. */ #ifdef INSN_SETS_ARE_DELAYED if (INSN_SETS_ARE_DELAYED (XVECEXP (pat, 0, 0))) - return 0; + return 0; #endif #ifdef INSN_REFERENCES_ARE_DELAYED if (INSN_REFERENCES_ARE_DELAYED (XVECEXP (pat, 0, 0))) - return 0; + return 0; #endif /* See if any of the insns in the delay slot match, updating @@ -2058,12 +2058,12 @@ redundant_insn_p (insn, target, delay_list) #ifdef INSN_SETS_ARE_DELAYED if (INSN_SETS_ARE_DELAYED (XVECEXP (pat, 0, 0))) - return 0; + return 0; #endif #ifdef INSN_REFERENCES_ARE_DELAYED if (INSN_REFERENCES_ARE_DELAYED (XVECEXP (pat, 0, 0))) - return 0; + return 0; #endif /* See if any of the insns in the delay slot match, updating @@ -2092,7 +2092,7 @@ redundant_insn_p (insn, target, delay_list) } - /* If the insn requiring the delay slot conflicts with INSN, we + /* If the insn requiring the delay slot conflicts with INSN, we must stop. */ if (insn_sets_resource_p (XVECEXP (pat, 0, 0), &needed, 1)) return 0; @@ -2210,7 +2210,7 @@ update_block (insn, where) { int b; - /* Ignore if this was in a delay slot and it came from the target of + /* Ignore if this was in a delay slot and it came from the target of a branch. */ if (INSN_FROM_TARGET_P (insn)) return; @@ -2466,7 +2466,7 @@ mark_target_live_regs (target, res) } else { - /* Allocate a place to put our results and chain it into the + /* Allocate a place to put our results and chain it into the hash table. */ tinfo = (struct target_info *) oballoc (sizeof (struct target_info)); tinfo->uid = INSN_UID (target); @@ -2593,7 +2593,7 @@ mark_target_live_regs (target, res) = (first_regno + HARD_REGNO_NREGS (first_regno, GET_MODE (XEXP (link, 0)))); - + for (i = first_regno; i < last_regno; i++) SET_HARD_REG_BIT (pending_dead_regs, i); } @@ -2612,7 +2612,7 @@ mark_target_live_regs (target, res) = (first_regno + HARD_REGNO_NREGS (first_regno, GET_MODE (XEXP (link, 0)))); - + for (i = first_regno; i < last_regno; i++) CLEAR_HARD_REG_BIT (current_live_regs, i); } @@ -2795,7 +2795,7 @@ fill_simple_delay_slots (first, non_jumps_p) || (GET_CODE (insn) == JUMP_INSN && non_jumps_p) || (GET_CODE (insn) != JUMP_INSN && ! non_jumps_p)) continue; - + if (GET_CODE (insn) == JUMP_INSN) flags = get_jump_flags (insn, JUMP_LABEL (insn)); else @@ -2819,7 +2819,7 @@ fill_simple_delay_slots (first, non_jumps_p) insn must exist when it is subsequently scanned. This is tried on each insn with delay slots as some machines - have insns which perform calls, but are not represented as + have insns which perform calls, but are not represented as CALL_INSNs. */ slots_filled = 0; @@ -2854,7 +2854,7 @@ fill_simple_delay_slots (first, non_jumps_p) forward in execution sequence), it must not need or set any resources that were set by later insns and must not set any resources that are needed for those insns. - + The delay slot insn itself sets resources unless it is a call (in which case the called routine, not the insn itself, is doing the setting). */ @@ -2878,7 +2878,7 @@ fill_simple_delay_slots (first, non_jumps_p) if (GET_CODE (pat) == USE || GET_CODE (pat) == CLOBBER) continue; - /* Check for resource conflict first, to avoid unnecessary + /* Check for resource conflict first, to avoid unnecessary splitting. */ if (! insn_references_resource_p (trial, &set, 1) && ! insn_sets_resource_p (trial, &set, 1) @@ -2921,7 +2921,7 @@ fill_simple_delay_slots (first, non_jumps_p) #if defined(ANNUL_IFFALSE_SLOTS) || defined(ANNUL_IFTRUE_SLOTS) if (slots_filled != slots_to_fill && delay_list == 0 - && GET_CODE (insn) == JUMP_INSN + && GET_CODE (insn) == JUMP_INSN && (condjump_p (insn) || condjump_in_parallel_p (insn))) { delay_list = optimize_skip (insn); @@ -2966,7 +2966,7 @@ fill_simple_delay_slots (first, non_jumps_p) mark_referenced_resources (insn, &needed, 1); maybe_never = 1; } - else + else { mark_set_resources (insn, &set, 0, 1); mark_referenced_resources (insn, &needed, 1); @@ -2977,7 +2977,7 @@ fill_simple_delay_slots (first, non_jumps_p) target = JUMP_LABEL (insn); target_uses = LABEL_NUSES (target) - 1; } - + } for (trial = next_nonnote_insn (insn); trial; trial = next_trial) @@ -3110,7 +3110,7 @@ fill_simple_delay_slots (first, non_jumps_p) else new_label = find_end_label (); - delay_list + delay_list = add_to_delay_list (copy_rtx (next_trial), delay_list); slots_filled++; reorg_redirect_jump (trial, new_label); @@ -3135,7 +3135,7 @@ fill_simple_delay_slots (first, non_jumps_p) #ifdef DELAY_SLOTS_FOR_EPILOGUE /* See if the epilogue needs any delay slots. Try to fill them if so. - The only thing we can do is scan backwards from the end of the + The only thing we can do is scan backwards from the end of the function. If we did this in a previous pass, it is incorrect to do it again. */ if (current_function_epilogue_delay_list) @@ -3783,7 +3783,7 @@ relax_delay_slots (first) continue; } } - + /* If this is an unconditional jump and the previous insn is a conditional jump, try reversing the condition of the previous insn and swapping our targets. The next pass might be able to @@ -3851,7 +3851,7 @@ relax_delay_slots (first) if (trial == 0 && target_label != 0) trial = find_end_label (); - if (trial != target_label + if (trial != target_label && redirect_with_delay_slots_safe_p (delay_insn, trial, insn)) { reorg_redirect_jump (delay_insn, trial); @@ -3887,7 +3887,7 @@ relax_delay_slots (first) if (target_label == 0) target_label = find_end_label (); - if (redirect_with_delay_slots_safe_p (delay_insn, target_label, + if (redirect_with_delay_slots_safe_p (delay_insn, target_label, insn)) { reorg_redirect_jump (delay_insn, target_label); @@ -4032,7 +4032,7 @@ make_return_insns (first) real_return_label = get_label_before (insn); break; } - + /* Show an extra usage of REAL_RETURN_LABEL so it won't go away if it was equal to END_OF_FUNCTION_LABEL. */ LABEL_NUSES (real_return_label)++; @@ -4154,7 +4154,7 @@ dbr_schedule (first, file) flag_no_peephole = old_flag_no_peephole; #endif - /* If the current function has no insns other than the prologue and + /* If the current function has no insns other than the prologue and epilogue, then do not try to fill any delay slots. */ if (n_basic_blocks == 0) return; @@ -4173,7 +4173,7 @@ dbr_schedule (first, file) uid_to_ruid = (int *) alloca ((max_uid + 1) * sizeof (int *)); for (i = 0, insn = first; insn; i++, insn = NEXT_INSN (insn)) uid_to_ruid[INSN_UID (insn)] = i; - + /* Initialize the list of insns that need filling. */ if (unfilled_firstobj == 0) { @@ -4193,12 +4193,12 @@ dbr_schedule (first, file) && (GET_CODE (PATTERN (insn)) == ADDR_VEC || GET_CODE (PATTERN (insn)) == ADDR_DIFF_VEC)) continue; - + if (num_delay_slots (insn) > 0) obstack_ptr_grow (&unfilled_slots_obstack, insn); /* Ensure all jumps go to the last of a set of consecutive labels. */ - if (GET_CODE (insn) == JUMP_INSN + if (GET_CODE (insn) == JUMP_INSN && (condjump_p (insn) || condjump_in_parallel_p (insn)) && JUMP_LABEL (insn) != 0 && ((target = prev_label (next_active_insn (JUMP_LABEL (insn)))) diff --git a/gnu/usr.bin/cc/cc_int/rtl.c b/gnu/usr.bin/cc/cc_int/rtl.c index 6f29f7f..4131c89 100644 --- a/gnu/usr.bin/cc/cc_int/rtl.c +++ b/gnu/usr.bin/cc/cc_int/rtl.c @@ -158,7 +158,7 @@ char *rtx_format[] = { that rtx code. See rtl.def for documentation on the defined classes. */ char rtx_class[] = { -#define DEF_RTL_EXPR(ENUM, NAME, FORMAT, CLASS) CLASS, +#define DEF_RTL_EXPR(ENUM, NAME, FORMAT, CLASS) CLASS, #include "rtl.def" /* rtl expressions are defined here */ #undef DEF_RTL_EXPR }; @@ -301,7 +301,7 @@ copy_rtx (orig) copy->volatil = orig->volatil; copy->unchanging = orig->unchanging; copy->integrated = orig->integrated; - + format_ptr = GET_RTX_FORMAT (GET_CODE (copy)); for (i = 0; i < GET_RTX_LENGTH (GET_CODE (copy)); i++) @@ -387,7 +387,7 @@ copy_most_rtx (orig, may_share) copy->volatil = orig->volatil; copy->unchanging = orig->unchanging; copy->integrated = orig->integrated; - + format_ptr = GET_RTX_FORMAT (GET_CODE (copy)); for (i = 0; i < GET_RTX_LENGTH (GET_CODE (copy)); i++) @@ -490,7 +490,7 @@ read_skip_spaces (infile) c = getc (infile); if (c != '*') dump_and_abort ('*', c, infile); - + prevc = 0; while (c = getc (infile)) { @@ -643,7 +643,7 @@ read_rtx (infile) break; } /* Now process the vector. */ - + case 'E': { register struct rtx_list *next_rtx, *rtx_list_link; diff --git a/gnu/usr.bin/cc/cc_int/rtlanal.c b/gnu/usr.bin/cc/cc_int/rtlanal.c index d52bd64..6a45cdf 100644 --- a/gnu/usr.bin/cc/cc_int/rtlanal.c +++ b/gnu/usr.bin/cc/cc_int/rtlanal.c @@ -154,7 +154,7 @@ rtx_addr_can_trap_p (x) return 1; } -/* Return 1 if X refers to a memory location whose address +/* Return 1 if X refers to a memory location whose address cannot be compared reliably with constant addresses, or if X refers to a BLKmode memory object. */ @@ -260,7 +260,7 @@ reg_mentioned_p (reg, in) case CONST_INT: return GET_CODE (reg) == CONST_INT && INTVAL (in) == INTVAL (reg); - + case CONST_DOUBLE: /* These are kept unique for a given value. */ return 0; @@ -586,13 +586,13 @@ single_set (insn) { rtx set; int i; - + if (GET_RTX_CLASS (GET_CODE (insn)) != 'i') return 0; if (GET_CODE (PATTERN (insn)) == SET) return PATTERN (insn); - + else if (GET_CODE (PATTERN (insn)) == PARALLEL) { for (i = 0, set = 0; i < XVECLEN (PATTERN (insn), 0); i++) @@ -608,7 +608,7 @@ single_set (insn) } return set; } - + return 0; } @@ -649,14 +649,14 @@ find_last_value (x, pinsn, valid_to) return src; } } - + /* If set in non-simple way, we don't have a value. */ if (reg_set_p (x, p)) break; } return x; -} +} /* Return nonzero if register in range [REGNO, ENDREGNO) appears either explicitly or implicitly in X @@ -700,7 +700,7 @@ refers_to_regno_p (regno, endregno, x, loc) return 1; return (endregno > i - && regno < i + (i < FIRST_PSEUDO_REGISTER + && regno < i + (i < FIRST_PSEUDO_REGISTER ? HARD_REGNO_NREGS (i, GET_MODE (x)) : 1)); @@ -1029,7 +1029,7 @@ rtx_equal_p (x, y) If the item being stored in or clobbered is a SUBREG of a hard register, the SUBREG will be passed. */ - + void note_stores (x, fun) register rtx x; @@ -1146,7 +1146,7 @@ dead_or_set_regno_p (insn, test_regno) if (GET_CODE (PATTERN (insn)) == SET) { rtx dest = SET_DEST (PATTERN (insn)); - + /* A value is totally replaced if it is the destination or the destination is a SUBREG of REGNO that does not change the number of words in it. */ @@ -1401,7 +1401,7 @@ volatile_insn_p (x) { register char *fmt = GET_RTX_FORMAT (code); register int i; - + for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--) { if (fmt[i] == 'e') @@ -1464,7 +1464,7 @@ volatile_refs_p (x) { register char *fmt = GET_RTX_FORMAT (code); register int i; - + for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--) { if (fmt[i] == 'e') @@ -1536,7 +1536,7 @@ side_effects_p (x) { register char *fmt = GET_RTX_FORMAT (code); register int i; - + for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--) { if (fmt[i] == 'e') @@ -1685,7 +1685,7 @@ inequality_comparisons_p (x) return 1; } } - + return 0; } @@ -1719,12 +1719,12 @@ replace_rtx (x, from, to) } return x; -} +} /* Throughout the rtx X, replace many registers according to REG_MAP. Return the replacement for X (which may be X with altered contents). REG_MAP[R] is the replacement for register R, or 0 for don't replace. - NREGS is the length of REG_MAP; regs >= NREGS are not mapped. + NREGS is the length of REG_MAP; regs >= NREGS are not mapped. We only support REG_MAP entries of REG or SUBREG. Also, hard registers should not be mapped to pseudos or vice versa since validate_change diff --git a/gnu/usr.bin/cc/cc_int/sched.c b/gnu/usr.bin/cc/cc_int/sched.c index 0f08b65..ef089ba 100644 --- a/gnu/usr.bin/cc/cc_int/sched.c +++ b/gnu/usr.bin/cc/cc_int/sched.c @@ -791,7 +791,7 @@ memrefs_conflict_p (xsize, x, ysize, y, c) If both memory references are volatile, then there must always be a dependence between the two references, since their order can not be changed. A volatile and non-volatile reference can be interchanged - though. + though. A MEM_IN_STRUCT reference at a non-QImode varying address can never conflict with a non-MEM_IN_STRUCT reference at a fixed address. We must @@ -2331,7 +2331,7 @@ sched_note_set (b, x, death) { offset = (regno + j) / REGSET_ELT_BITS; bit = (REGSET_ELT_TYPE) 1 << ((regno + j) % REGSET_ELT_BITS); - + bb_live_regs[offset] &= ~bit; bb_dead_regs[offset] |= bit; } @@ -2352,7 +2352,7 @@ sched_note_set (b, x, death) { offset = (regno + j) / REGSET_ELT_BITS; bit = (REGSET_ELT_TYPE) 1 << ((regno + j) % REGSET_ELT_BITS); - + bb_live_regs[offset] |= bit; bb_dead_regs[offset] &= ~bit; } @@ -2710,13 +2710,13 @@ create_reg_dead_note (reg, insn) rtx reg, insn; { rtx link; - + /* The number of registers killed after scheduling must be the same as the number of registers killed before scheduling. The number of REG_DEAD notes may not be conserved, i.e. two SImode hard register REG_DEAD notes might become one DImode hard register REG_DEAD note, but the number of registers killed will be conserved. - + We carefully remove REG_DEAD notes from the dead_notes list, so that there will be none left at the end. If we run out early, then there is a bug somewhere in flow, combine and/or sched. */ @@ -2841,7 +2841,7 @@ attach_deaths (x, insn, set_p) because we may have to execute this code several times, e.g. once for a clobber (which doesn't add a note) and later for a use (which does add a note). - + Always make the register live. We must do this even if it was live before, because this may be an insn which sets and uses the same register, in which case the register has already been @@ -3756,7 +3756,7 @@ schedule_block (b, file) || GET_CODE (XVECEXP (PATTERN (insn), 0, j)) == CLOBBER) sched_note_set (b, XVECEXP (PATTERN (insn), 0, j), 1); } - + /* This code keeps life analysis information up to date. */ if (GET_CODE (insn) == CALL_INSN) { @@ -4221,16 +4221,16 @@ update_n_sets (x, inc) while (GET_CODE (dest) == STRICT_LOW_PART || GET_CODE (dest) == SUBREG || GET_CODE (dest) == ZERO_EXTRACT || GET_CODE (dest) == SIGN_EXTRACT) dest = SUBREG_REG (dest); - + if (GET_CODE (dest) == REG) { int regno = REGNO (dest); - + if (regno < FIRST_PSEUDO_REGISTER) { register int i; int endregno = regno + HARD_REGNO_NREGS (regno, GET_MODE (dest)); - + for (i = regno; i < endregno; i++) reg_n_sets[i] += inc; } @@ -4718,7 +4718,7 @@ schedule_insns (dump_file) This must be computed and saved now, because after a basic block's predecessor has been scheduled, it is impossible to accurately determine the correct line number for the first insn of the block. */ - + for (b = 0; b < n_basic_blocks; b++) for (line = basic_block_head[b]; line; line = PREV_INSN (line)) if (GET_CODE (line) == NOTE && NOTE_LINE_NUMBER (line) > 0) diff --git a/gnu/usr.bin/cc/cc_int/sdbout.c b/gnu/usr.bin/cc/cc_int/sdbout.c index 4426457..cd73964 100644 --- a/gnu/usr.bin/cc/cc_int/sdbout.c +++ b/gnu/usr.bin/cc/cc_int/sdbout.c @@ -291,7 +291,7 @@ sdbout_init (asm_file, input_file_name, syms) if (DECL_NAME (t) && IDENTIFIER_POINTER (DECL_NAME (t)) != 0 && !strcmp (IDENTIFIER_POINTER (DECL_NAME (t)), "__vtbl_ptr_type")) sdbout_symbol (t, 0); -#endif +#endif #if 0 /* Nothing need be output for the predefined types. */ /* Get all permanent types that have typedef names, diff --git a/gnu/usr.bin/cc/cc_int/stmt.c b/gnu/usr.bin/cc/cc_int/stmt.c index c845d30..2b5f06c 100644 --- a/gnu/usr.bin/cc/cc_int/stmt.c +++ b/gnu/usr.bin/cc/cc_int/stmt.c @@ -735,7 +735,7 @@ expand_goto (label) addr = copy_rtx (p->nonlocal_goto_handler_slot); temp = copy_to_reg (replace_rtx (addr, virtual_stack_vars_rtx, hard_frame_pointer_rtx)); - + /* Restore the stack pointer. Note this uses fp just restored. */ addr = p->nonlocal_goto_stack_level; if (addr) @@ -892,11 +892,11 @@ bc_expand_goto_internal (opcode, label, body) if (body && DECL_BIT_FIELD (body)) error ("jump to `%s' invalidly jumps into binding contour", IDENTIFIER_POINTER (DECL_NAME (body))); - + /* Emit immediate jump */ bc_emit_bytecode (opcode); bc_emit_bytecode_labelref (label); - + #ifdef DEBUG_PRINT_CODE fputc ('\n', stderr); #endif @@ -1601,7 +1601,7 @@ expand_expr_stmt (exp) /* Restore stack depth */ if (stack_depth < org_stack_depth) abort (); - + bc_emit_instruction (drop); last_expr_type = TREE_TYPE (exp); @@ -1640,7 +1640,7 @@ expand_expr_stmt (exp) else { rtx lab = gen_label_rtx (); - + /* Compare the value with itself to reference it. */ emit_cmp_insn (last_expr_value, last_expr_value, EQ, expand_expr (TYPE_SIZE (last_expr_type), @@ -1801,8 +1801,8 @@ expand_end_stmt_expr (t) { int i; tree t; - - + + /* At this point, all expressions have been evaluated in order. However, all expression values have been popped when evaluated, which means we have to recover the last expression value. This is @@ -1811,20 +1811,20 @@ expand_end_stmt_expr (t) is here recovered by undoing the `drop'. Since `drop' is equivalent to `adjustackSI [1]', it can be undone with `adjstackSI [-1]'. */ - + bc_adjust_stack (-1); - + if (!last_expr_type) last_expr_type = void_type_node; - + t = make_node (RTL_EXPR); TREE_TYPE (t) = last_expr_type; RTL_EXPR_RTL (t) = NULL; RTL_EXPR_SEQUENCE (t) = NULL; - + /* Don't consider deleting this expr or containing exprs at tree level. */ TREE_THIS_VOLATILE (t) = 1; - + last_expr_type = 0; return t; } @@ -2123,7 +2123,7 @@ expand_end_loop () register rtx start_label; rtx last_test_insn = 0; int num_insns = 0; - + if (output_bytecode) { bc_expand_end_loop (); @@ -2502,7 +2502,7 @@ expand_return (retval) bc_emit_instruction (ret); return; } - + /* If function wants no value, give it none. */ if (TREE_CODE (TREE_TYPE (TREE_TYPE (current_function_decl))) == VOID_TYPE) { @@ -3472,7 +3472,7 @@ bc_expand_decl_init (decl) bc_adjust_stack (stack_depth - org_stack_depth); } - + /* CLEANUP is an expression to be executed at exit from this binding contour; for example, in C++, it might call the destructor for this variable. @@ -4158,7 +4158,7 @@ all_cases_count (type, spareness) } prev = TREE_VALUE (t); } - + } } return count; @@ -4260,7 +4260,7 @@ mark_seen_cases (type, cases_seen, count, sparseness) TREE_INT_CST_LOW (val), TREE_INT_CST_HIGH (val), &xlo, &xhi); } - + if (xhi == 0 && xlo >= 0 && xlo < count) BITARRAY_SET (cases_seen, xlo); } @@ -4684,7 +4684,7 @@ expand_end_case (orig_index) use_cost_table = (TREE_CODE (TREE_TYPE (orig_index)) != ENUMERAL_TYPE && estimate_case_costs (thiscase->data.case_stmt.case_list)); - balance_case_nodes (&thiscase->data.case_stmt.case_list, + balance_case_nodes (&thiscase->data.case_stmt.case_list, NULL_PTR); emit_case_nodes (index, thiscase->data.case_stmt.case_list, default_label, index_type); @@ -4921,7 +4921,7 @@ bc_expand_end_case (expr) /* Bad mode */ abort (); - + bc_emit_bytecode_labeldef (BYTECODE_BC_LABEL (thiscase->exit_label)); /* Possibly issue enumeration warnings. */ @@ -4943,7 +4943,7 @@ bc_expand_end_case (expr) /* Return unique bytecode ID. */ -int +int bc_new_uid () { static int bc_uid = 0; diff --git a/gnu/usr.bin/cc/cc_int/stor-layout.c b/gnu/usr.bin/cc/cc_int/stor-layout.c index 834e96d..3da5cc2 100644 --- a/gnu/usr.bin/cc/cc_int/stor-layout.c +++ b/gnu/usr.bin/cc/cc_int/stor-layout.c @@ -105,7 +105,7 @@ variable_size (size) } if (immediate_size_expand) - /* NULL_RTX is not defined; neither is the rtx type. + /* NULL_RTX is not defined; neither is the rtx type. Also, we would like to pass const0_rtx here, but don't have it. */ expand_expr (size, expand_expr (integer_zero_node, NULL_PTR, VOIDmode, 0), VOIDmode, 0); @@ -974,7 +974,7 @@ layout_type (type) TYPE_MODE (variant) = mode; } } - + pop_obstacks (); resume_momentary (old); } diff --git a/gnu/usr.bin/cc/cc_int/stupid.c b/gnu/usr.bin/cc/cc_int/stupid.c index e10f2dc..3317feb 100644 --- a/gnu/usr.bin/cc/cc_int/stupid.c +++ b/gnu/usr.bin/cc/cc_int/stupid.c @@ -258,7 +258,7 @@ stupid_life_analysis (f, nregs, file) /* Now find the best hard-register class for this pseudo register */ if (N_REG_CLASSES > 1) - reg_renumber[r] = stupid_find_reg (reg_n_calls_crossed[r], + reg_renumber[r] = stupid_find_reg (reg_n_calls_crossed[r], reg_preferred_class (r), PSEUDO_REGNO_MODE (r), reg_where_born[r], diff --git a/gnu/usr.bin/cc/cc_int/toplev.c b/gnu/usr.bin/cc/cc_int/toplev.c index 28114c8..30b027a8 100644 --- a/gnu/usr.bin/cc/cc_int/toplev.c +++ b/gnu/usr.bin/cc/cc_int/toplev.c @@ -487,7 +487,7 @@ int flag_schedule_insns = 0; int flag_schedule_insns_after_reload = 0; /* -finhibit-size-directive inhibits output of .size for ELF. - This is used only for compiling crtstuff.c, + This is used only for compiling crtstuff.c, and it may be extended to other effects needed for crtstuff.c on other systems. */ int flag_inhibit_size_directive = 0; @@ -779,7 +779,7 @@ unsigned id_clash_len; /* Nonzero means warn about any objects definitions whose size is larger than N bytes. Also want about function definitions whose returned values are larger than N bytes. The value N is in `larger_than_size'. */ - + int warn_larger_than; unsigned larger_than_size; @@ -1189,7 +1189,7 @@ v_message_with_decl (decl, prefix, s, ap) { char fmt[sizeof "%.255s"]; long width = p - s; - + if (width > 255L) width = 255L; /* arbitrary */ sprintf (fmt, "%%.%lds", width); fprintf (stderr, fmt, s); @@ -2246,7 +2246,7 @@ compile_file (name) Therefore, I took out that change. In future versions we should find another way to solve that dbx problem. -- rms, 23 May 93. */ - + /* Don't let the first function fall at the same address as gcc_compiled., if profiling. */ if (profile_flag || profile_block_flag) @@ -2414,7 +2414,7 @@ compile_file (name) && DECL_EXTERNAL (decl) && ! TREE_PUBLIC (decl)) { - pedwarn_with_decl (decl, + pedwarn_with_decl (decl, "`%s' declared `static' but never defined"); /* This symbol is effectively an "extern" declaration now. */ TREE_PUBLIC (decl) = 1; @@ -3758,7 +3758,7 @@ You Lose! You must define PREFERRED_DEBUGGING_TYPE! else if (!strncmp (str, "gstabs+", len)) write_symbols = DBX_DEBUG; - /* Always enable extensions for -ggdb or -gstabs+, + /* Always enable extensions for -ggdb or -gstabs+, always disable for -gstabs. For plain -g, use system-specific default. */ if (write_symbols == DBX_DEBUG && !strncmp (str, "ggdb", len) @@ -3783,7 +3783,7 @@ You Lose! You must define PREFERRED_DEBUGGING_TYPE! else if (!strncmp (str, "gdwarf", len)) write_symbols = DWARF_DEBUG; - /* Always enable extensions for -ggdb or -gdwarf+, + /* Always enable extensions for -ggdb or -gdwarf+, always disable for -gdwarf. For plain -g, use system-specific default. */ if (write_symbols == DWARF_DEBUG && !strncmp (str, "ggdb", len) @@ -3830,7 +3830,7 @@ You Lose! You must define PREFERRED_DEBUGGING_TYPE! use_gnu_debug_info_extensions = 0; else use_gnu_debug_info_extensions = DEFAULT_GDB_EXTENSIONS; -#endif +#endif if (write_symbols == NO_DEBUG) warning ("`-%s' option not supported on this version of GCC", str); else if (level == 0) @@ -4049,7 +4049,7 @@ print_single_switch (type, name) line_position = 8; } } - + /* Print default target switches for -version. */ static void diff --git a/gnu/usr.bin/cc/cc_int/tree.c b/gnu/usr.bin/cc/cc_int/tree.c index d63a7a5..a790574 100644 --- a/gnu/usr.bin/cc/cc_int/tree.c +++ b/gnu/usr.bin/cc/cc_int/tree.c @@ -141,7 +141,7 @@ char *momentary_function_firstobj; int all_types_permanent; /* Stack of places to restore the momentary obstack back to. */ - + struct momentary_level { /* Pointer back to previous such level. */ @@ -869,7 +869,7 @@ make_node (code) PARM_DECLs of top-level functions do not have this problem. However, we allocate them where we put the FUNCTION_DECL for languauges such as Ada that need to consult some flags in the PARM_DECLs of the function - when calling it. + when calling it. See comment in restore_tree_status for why we can't put this in function_obstack. */ @@ -1165,7 +1165,7 @@ get_identifier (text) hi &= (1 << HASHBITS) - 1; hi %= MAX_HASH_TABLE; - + /* Search table for identifier */ for (idp = hash_table[hi]; idp; idp = TREE_CHAIN (idp)) if (IDENTIFIER_LENGTH (idp) == len @@ -1224,7 +1224,7 @@ set_identifier_size (size) /* Return a newly constructed INTEGER_CST node whose constant value is specified by the two ints LOW and HI. - The TREE_TYPE is set to `int'. + The TREE_TYPE is set to `int'. This function should be used via the `build_int_2' macro. */ @@ -1545,7 +1545,7 @@ real_twop (expr) } /* Nonzero if EXP is a constant or a cast of a constant. */ - + int really_constant_p (exp) tree exp; @@ -1979,7 +1979,7 @@ save_expr (expr) /* If the tree evaluates to a constant, then we don't want to hide that fact (i.e. this allows further folding, and direct checks for constants). However, a read-only object that has side effects cannot be bypassed. - Since it is no problem to reevaluate literals, we just return the + Since it is no problem to reevaluate literals, we just return the literal node. */ if (TREE_CONSTANT (t) || (TREE_READONLY (t) && ! TREE_SIDE_EFFECTS (t)) @@ -2252,7 +2252,7 @@ substitute_in_type (t, f, r) /* If this is an anonymous field and the type of this field is a UNION_TYPE or RECORD_TYPE with no elements, ignore it. If - the type just has one element, treat that as the field. + the type just has one element, treat that as the field. But don't do this if we are processing a QUAL_UNION_TYPE. */ if (TREE_CODE (t) != QUAL_UNION_TYPE && DECL_NAME (new_field) == 0 && (TREE_CODE (TREE_TYPE (new_field)) == UNION_TYPE @@ -2437,7 +2437,7 @@ stabilize_reference_1 (e) /* Constants need no processing. In fact, we should never reach here. */ return e; - + case '2': /* Division is slow and tends to be compiled with jumps, especially the division by powers of 2 that is often @@ -2460,7 +2460,7 @@ stabilize_reference_1 (e) default: abort (); } - + TREE_TYPE (result) = TREE_TYPE (e); TREE_READONLY (result) = TREE_READONLY (e); TREE_SIDE_EFFECTS (result) = TREE_SIDE_EFFECTS (e); @@ -3621,7 +3621,7 @@ build_complex_type (component_type) OP must have integer, real or enumeral type. Pointers are not allowed! There are some cases where the obvious value we could return - would regenerate to OP if converted to OP's type, + would regenerate to OP if converted to OP's type, but would not extend like OP to wider types. If FOR_TYPE indicates such extension is contemplated, we eschew such values. For example, if OP is (unsigned short)(signed char)-1, @@ -4029,7 +4029,7 @@ get_set_constructor_bits (init, buffer, bit_size) for (i = 0; i < bit_size; i++) buffer[i] = 0; - for (vals = TREE_OPERAND (init, 1); + for (vals = TREE_OPERAND (init, 1); vals != NULL_TREE; vals = TREE_CHAIN (vals)) { if (TREE_CODE (TREE_VALUE (vals)) != INTEGER_CST diff --git a/gnu/usr.bin/cc/cc_int/unroll.c b/gnu/usr.bin/cc/cc_int/unroll.c index c82266e..b498843 100644 --- a/gnu/usr.bin/cc/cc_int/unroll.c +++ b/gnu/usr.bin/cc/cc_int/unroll.c @@ -140,7 +140,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ struct _factor { int factor, count; } factors[NUM_FACTORS] = { {2, 0}, {3, 0}, {5, 0}, {7, 0}}; - + /* Describes the different types of loop unrolling performed. */ enum unroll_types { UNROLL_COMPLETELY, UNROLL_MODULO, UNROLL_NAIVE }; @@ -792,7 +792,7 @@ unroll_loop (loop_end, insn_count, loop_start, end_insert_before, /* Calculate the difference between the final and initial values. Final value may be a (plus (reg x) (const_int 1)) rtx. Let the following cse pass simplify this if initial value is - a constant. + a constant. We must copy the final and initial values here to avoid improperly shared rtl. */ @@ -861,7 +861,7 @@ unroll_loop (loop_end, insn_count, loop_start, end_insert_before, For the negative increment case, the branch here could easily be merged with the `0' case branch above. For the positive increment case, it is not clear how this can be simplified. */ - + if (abs_inc != 1) { int cmp_const; @@ -885,7 +885,7 @@ unroll_loop (loop_end, insn_count, loop_start, end_insert_before, sequence = gen_sequence (); end_sequence (); emit_insn_before (sequence, loop_start); - + /* Only the last copy of the loop body here needs the exit test, so set copy_end to exclude the compare/branch here, and then reset it inside the loop when get to the last @@ -1066,7 +1066,7 @@ unroll_loop (loop_end, insn_count, loop_start, end_insert_before, { insn = PREV_INSN (copy_start); pattern = PATTERN (insn); - + tem = map->label_map[CODE_LABEL_NUMBER (XEXP (SET_SRC (pattern), 0))]; SET_SRC (pattern) = gen_rtx (LABEL_REF, VOIDmode, tem); @@ -1096,7 +1096,7 @@ unroll_loop (loop_end, insn_count, loop_start, end_insert_before, else safety_label = emit_label_after (gen_label_rtx (), copy_end); - /* Delete all of the original loop instructions. Don't delete the + /* Delete all of the original loop instructions. Don't delete the LOOP_BEG note, or the first code label in the loop. */ insn = NEXT_INSN (copy_start); @@ -1315,7 +1315,7 @@ calculate_giv_inc (pattern, src_insn, regno) pattern = PATTERN (src_insn); if (GET_CODE (SET_SRC (pattern)) != PLUS) abort (); - + /* The last insn emitted is not needed, so delete it to avoid confusing the second cse pass. This insn sets the giv unnecessarily. */ delete_insn (get_last_insn ()); @@ -1354,7 +1354,7 @@ calculate_giv_inc (pattern, src_insn, regno) if (GET_CODE (increment) != CONST_INT) abort (); - + /* The insn loading the constant into a register is no longer needed, so delete it. */ delete_insn (get_last_insn ()); @@ -1438,7 +1438,7 @@ final_reg_note_copy (notes, map) /* Copy each instruction in the loop, substituting from map as appropriate. This is very similar to a loop in expand_inline_function. */ - + static void copy_loop_body (copy_start, copy_end, map, exit_label, last_iteration, unroll_type, start_label, loop_end, insert_before, @@ -1472,29 +1472,29 @@ copy_loop_body (copy_start, copy_end, map, exit_label, last_iteration, map->label_map[CODE_LABEL_NUMBER (start_label)] = start_label; start_sequence (); - + insn = copy_start; do { insn = NEXT_INSN (insn); - + map->orig_asm_operands_vector = 0; - + switch (GET_CODE (insn)) { case INSN: pattern = PATTERN (insn); copy = 0; giv_inc = 0; - + /* Check to see if this is a giv that has been combined with - some split address givs. (Combined in the sense that + some split address givs. (Combined in the sense that `combine_givs' in loop.c has put two givs in the same register.) In this case, we must search all givs based on the same biv to find the address givs. Then split the address givs. Do this before splitting the giv, since that may map the SET_DEST to a new register. */ - + if (GET_CODE (pattern) == SET && GET_CODE (SET_DEST (pattern)) == REG && addr_combined_regs[REGNO (SET_DEST (pattern))]) @@ -1502,10 +1502,10 @@ copy_loop_body (copy_start, copy_end, map, exit_label, last_iteration, struct iv_class *bl; struct induction *v, *tv; int regno = REGNO (SET_DEST (pattern)); - + v = addr_combined_regs[REGNO (SET_DEST (pattern))]; bl = reg_biv_class[REGNO (v->src_reg)]; - + /* Although the giv_inc amount is not needed here, we must call calculate_giv_inc here since it might try to delete the last insn emitted. If we wait until later to call it, @@ -1526,24 +1526,24 @@ copy_loop_body (copy_start, copy_end, map, exit_label, last_iteration, if (tv->mult_val != v->mult_val) this_giv_inc = (this_giv_inc / INTVAL (v->mult_val) * INTVAL (tv->mult_val)); - + tv->dest_reg = plus_constant (tv->dest_reg, this_giv_inc); *tv->location = tv->dest_reg; - + if (last_iteration && unroll_type != UNROLL_COMPLETELY) { /* Must emit an insn to increment the split address giv. Add in the const_adjust field in case there was a constant eliminated from the address. */ rtx value, dest_reg; - + /* tv->dest_reg will be either a bare register, or else a register plus a constant. */ if (GET_CODE (tv->dest_reg) == REG) dest_reg = tv->dest_reg; else dest_reg = XEXP (tv->dest_reg, 0); - + /* Check for shared address givs, and avoid incrementing the shared psuedo reg more than once. */ @@ -1563,7 +1563,7 @@ copy_loop_body (copy_start, copy_end, map, exit_label, last_iteration, emit_unrolled_add (dest_reg, XEXP (value, 0), XEXP (value, 1)); } - + /* Reset the giv to be just the register again, in case it is used after the set we have just emitted. We must subtract the const_adjust factor added in @@ -1574,22 +1574,22 @@ copy_loop_body (copy_start, copy_end, map, exit_label, last_iteration, } } } - + /* If this is a setting of a splittable variable, then determine how to split the variable, create a new set based on this split, and set up the reg_map so that later uses of the variable will use the new split variable. */ - + dest_reg_was_split = 0; - + if (GET_CODE (pattern) == SET && GET_CODE (SET_DEST (pattern)) == REG && splittable_regs[REGNO (SET_DEST (pattern))]) { int regno = REGNO (SET_DEST (pattern)); - + dest_reg_was_split = 1; - + /* Compute the increment value for the giv, if it wasn't already computed above. */ @@ -1602,7 +1602,7 @@ copy_loop_body (copy_start, copy_end, map, exit_label, last_iteration, { /* Completely unrolling the loop. Set the induction variable to a known constant value. */ - + /* The value in splittable_regs may be an invariant value, so we must use plus_constant here. */ splittable_regs[regno] @@ -1629,7 +1629,7 @@ copy_loop_body (copy_start, copy_end, map, exit_label, last_iteration, be a constant plus the original register. Except on the last iteration, when the result has to go back into the original iteration var register. */ - + /* Handle bivs which must be mapped to a new register when split. This happens for bivs which need their final value set before loop entry. The new register @@ -1642,18 +1642,18 @@ copy_loop_body (copy_start, copy_end, map, exit_label, last_iteration, giv_src_reg = reg_biv_class[regno]->biv->src_reg; giv_dest_reg = giv_src_reg; } - + #if 0 /* If non-reduced/final-value givs were split, then this would have to remap those givs also. See find_splittable_regs. */ #endif - + splittable_regs[regno] = GEN_INT (INTVAL (giv_inc) + INTVAL (splittable_regs[regno])); giv_inc = splittable_regs[regno]; - + /* Now split the induction variable by changing the dest of this insn to a new register, and setting its reg_map entry to point to this new register. @@ -1691,7 +1691,7 @@ copy_loop_body (copy_start, copy_end, map, exit_label, last_iteration, copy = emit_insn (pattern); } REG_NOTES (copy) = initial_reg_note_copy (REG_NOTES (insn), map); - + #ifdef HAVE_cc0 /* If this insn is setting CC0, it may need to look at the insn that uses CC0 to see what type of insn it is. @@ -1731,7 +1731,7 @@ copy_loop_body (copy_start, copy_end, map, exit_label, last_iteration, map->const_age_map[regno] = -1; } break; - + case JUMP_INSN: pattern = copy_rtx_and_substitute (PATTERN (insn), map); copy = emit_jump_insn (pattern); @@ -1773,7 +1773,7 @@ copy_loop_body (copy_start, copy_end, map, exit_label, last_iteration, abort (); } } - + #ifdef HAVE_cc0 if (cc0_insn) try_constants (cc0_insn, map); @@ -1813,7 +1813,7 @@ copy_loop_body (copy_start, copy_end, map, exit_label, last_iteration, JUMP_LABEL (copy) = map->label_map[CODE_LABEL_NUMBER (JUMP_LABEL (insn))]; } - + /* If this is a non-local jump, then must increase the label use count so that the label will not be deleted when the original jump is deleted. */ @@ -1860,7 +1860,7 @@ copy_loop_body (copy_start, copy_end, map, exit_label, last_iteration, emit_barrier (); } break; - + case CALL_INSN: pattern = copy_rtx_and_substitute (PATTERN (insn), map); copy = emit_call_insn (pattern); @@ -1882,7 +1882,7 @@ copy_loop_body (copy_start, copy_end, map, exit_label, last_iteration, for (i = 0; i < FIRST_PSEUDO_REGISTER; i++) map->const_equiv_map[i] = 0; break; - + case CODE_LABEL: /* If this is the loop start label, then we don't need to emit a copy of this label since no one will use it. */ @@ -1893,15 +1893,15 @@ copy_loop_body (copy_start, copy_end, map, exit_label, last_iteration, map->const_age++; } break; - + case BARRIER: copy = emit_barrier (); break; - + case NOTE: /* VTOP notes are valid only before the loop exit test. If placed anywhere else, loop may generate bad code. */ - + if (NOTE_LINE_NUMBER (insn) != NOTE_INSN_DELETED && (NOTE_LINE_NUMBER (insn) != NOTE_INSN_LOOP_VTOP || (last_iteration && unroll_type != UNROLL_COMPLETELY))) @@ -1910,16 +1910,16 @@ copy_loop_body (copy_start, copy_end, map, exit_label, last_iteration, else copy = 0; break; - + default: abort (); break; } - + map->insn_map[INSN_UID (insn)] = copy; } while (insn != copy_end); - + /* Now finish coping the REG_NOTES. */ insn = copy_start; do @@ -2011,7 +2011,7 @@ back_branch_in_range_p (insn, loop_start, loop_end) if (GET_CODE (p) == JUMP_INSN) { target_insn = JUMP_LABEL (p); - + /* Search from loop_start to insn, to see if one of them is the target_insn. We can't use INSN_LUID comparisons here, since insn may not have an LUID entry. */ @@ -2077,7 +2077,7 @@ fold_rtx_mult_add (mult1, mult2, add1, mode) Returns the increment value as an rtx, simplified as much as possible, if it can be calculated. Otherwise, returns 0. */ -rtx +rtx biv_total_increment (bl, loop_start, loop_end) struct iv_class *bl; rtx loop_start, loop_end; @@ -2184,7 +2184,7 @@ iteration_info (iteration_var, initial_value, increment, loop_start, loop_end) bl = reg_biv_class[REGNO (v->src_reg)]; *initial_value = fold_rtx_mult_add (v->mult_val, bl->initial_value, v->add_val, v->mode); - + /* Increment value is mult_val times the increment value of the biv. */ *increment = biv_total_increment (bl, loop_start, loop_end); @@ -2359,7 +2359,7 @@ find_splittable_regs (unroll_type, loop_start, loop_end, end_insert_before, || REGNO (bl->initial_value) < FIRST_PSEUDO_REGISTER)) { rtx tem = gen_reg_rtx (bl->biv->mode); - + emit_insn_before (gen_move_insn (tem, bl->biv->src_reg), loop_start); @@ -2473,7 +2473,7 @@ find_splittable_givs (bl, unroll_type, loop_start, loop_end, increment, && (! v->always_computable || back_branch_in_range_p (v->insn, loop_start, loop_end))) continue; - + /* The giv increment value must be a constant. */ giv_inc = fold_rtx_mult_add (v->mult_val, increment, const0_rtx, v->mode); @@ -2485,7 +2485,7 @@ find_splittable_givs (bl, unroll_type, loop_start, loop_end, increment, the loop, or else the final value of the giv must be known. Otherwise, it is not safe to split the giv since it may not have the proper value on loop exit. */ - + /* The used outside loop test will fail for DEST_ADDR givs. They are never used outside the loop anyways, so it is always safe to split a DEST_ADDR giv. */ @@ -2525,11 +2525,11 @@ find_splittable_givs (bl, unroll_type, loop_start, loop_end, increment, emit_insn_before (gen_move_insn (tem, v->dest_reg), loop_start); emit_insn_before (gen_move_insn (v->dest_reg, final_value), loop_start); - + if (loop_dump_stream) fprintf (loop_dump_stream, "Giv %d mapped to %d for split.\n", REGNO (v->dest_reg), REGNO (tem)); - + v->src_reg = tem; } #endif @@ -2601,7 +2601,7 @@ find_splittable_givs (bl, unroll_type, loop_start, loop_end, increment, v->add_val, tem, loop_start); value = tem; } - + splittable_regs[REGNO (v->new_reg)] = value; } else @@ -2621,7 +2621,7 @@ find_splittable_givs (bl, unroll_type, loop_start, loop_end, increment, catch some of the common cases of this. Currently, I leave the work of simplifying multiple address givs to the following cse pass. */ - + /* As a special case, if we have multiple identical address givs within a single instruction, then we do use a single psuedo reg for both. This is necessary in case one is a match_dup @@ -2648,13 +2648,13 @@ find_splittable_givs (bl, unroll_type, loop_start, loop_end, increment, /* If the address giv has a constant in its new_reg value, then this constant can be pulled out and put in value, instead of being part of the initialization code. */ - + if (GET_CODE (v->new_reg) == PLUS && GET_CODE (XEXP (v->new_reg, 1)) == CONST_INT) { v->dest_reg = plus_constant (tem, INTVAL (XEXP (v->new_reg,1))); - + /* Only succeed if this will give valid addresses. Try to validate both the first and the last address resulting from loop unrolling, if @@ -2681,7 +2681,7 @@ find_splittable_givs (bl, unroll_type, loop_start, loop_end, increment, } else v->dest_reg = tem; - + /* If the address hasn't been checked for validity yet, do so now, and fail completely if either the first or the last unrolled copy of the address is not a valid address. */ @@ -2698,7 +2698,7 @@ find_splittable_givs (bl, unroll_type, loop_start, loop_end, increment, INSN_UID (v->insn)); continue; } - + /* To initialize the new register, just move the value of new_reg into it. This is not guaranteed to give a valid instruction on machines with complex addressing modes. @@ -2733,7 +2733,7 @@ find_splittable_givs (bl, unroll_type, loop_start, loop_end, increment, else { v->dest_reg = value; - + /* Check the resulting address for validity, and fail if the resulting address would be illegal. */ if (! memory_address_p (v->mem_mode, v->dest_reg) @@ -2749,28 +2749,28 @@ find_splittable_givs (bl, unroll_type, loop_start, loop_end, increment, continue; } } - + /* Store the value of dest_reg into the insn. This sharing will not be a problem as this insn will always be copied later. */ - + *v->location = v->dest_reg; - + /* If this address giv is combined with a dest reg giv, then save the base giv's induction pointer so that we will be able to handle this address giv properly. The base giv itself does not have to be splittable. */ - + if (v->same && v->same->giv_type == DEST_REG) addr_combined_regs[REGNO (v->same->new_reg)] = v->same; - + if (GET_CODE (v->new_reg) == REG) { /* This giv maybe hasn't been combined with any others. Make sure that it's giv is marked as splittable here. */ - + splittable_regs[REGNO (v->new_reg)] = value; - + /* Make it appear to depend upon itself, so that the giv will be properly split in the main loop above. */ if (! v->same) @@ -2793,7 +2793,7 @@ find_splittable_givs (bl, unroll_type, loop_start, loop_end, increment, it makes sense to reduce&split givs when possible, as this will result in simpler instructions, and will not require that a reg be live across loop iterations. */ - + splittable_regs[REGNO (v->dest_reg)] = value; fprintf (stderr, "Giv %d at insn %d not reduced\n", REGNO (v->dest_reg), INSN_UID (v->insn)); @@ -2801,7 +2801,7 @@ find_splittable_givs (bl, unroll_type, loop_start, loop_end, increment, continue; #endif } - + /* Givs are only updated once by definition. Mark it so if this is a splittable register. Don't need to do anything for address givs where this may not be a register. */ @@ -2810,11 +2810,11 @@ find_splittable_givs (bl, unroll_type, loop_start, loop_end, increment, splittable_regs_updates[REGNO (v->new_reg)] = 1; result++; - + if (loop_dump_stream) { int regnum; - + if (GET_CODE (v->dest_reg) == CONST_INT) regnum = -1; else if (GET_CODE (v->dest_reg) != REG) @@ -2896,7 +2896,7 @@ reg_dead_after_loop (reg, loop_start, loop_end) /* Try to calculate the final value of the biv, the value it will have at the end of the loop. If we can do it, return that value. */ - + rtx final_biv_value (bl, loop_start, loop_end) struct iv_class *bl; @@ -2918,7 +2918,7 @@ final_biv_value (bl, loop_start, loop_end) if (loop_dump_stream) fprintf (loop_dump_stream, "Final biv value for %d, reversed biv.\n", bl->regno); - + return const0_rtx; } @@ -2933,7 +2933,7 @@ final_biv_value (bl, loop_start, loop_end) && invariant_p (bl->initial_value)) { increment = biv_total_increment (bl, loop_start, loop_end); - + if (increment && invariant_p (increment)) { /* Can calculate the loop exit value, emit insns after loop @@ -2950,7 +2950,7 @@ final_biv_value (bl, loop_start, loop_end) if (loop_dump_stream) fprintf (loop_dump_stream, "Final biv value for %d, calculated.\n", bl->regno); - + return tem; } } @@ -3000,7 +3000,7 @@ final_giv_value (v, loop_start, loop_end) /* Try to calculate the final value as a function of the biv it depends upon. The only exit from the loop must be the fall through at the bottom (otherwise it may not have its final value when the loop exits). */ - + /* ??? Can calculate the final giv value by subtracting off the extra biv increments times the giv's mult_val. The loop must have only one exit for this to work, but the loop iterations does not need @@ -3022,7 +3022,7 @@ final_giv_value (v, loop_start, loop_end) { /* Can calculate the loop exit value of its biv as (loop_n_iterations * increment) + initial_value */ - + /* The loop exit value of the giv is then (final_biv_value - extra increments) * mult_val + add_val. The extra increments are any increments to the biv which @@ -3055,11 +3055,11 @@ final_giv_value (v, loop_start, loop_end) emit_insn_before (seq, insert_before); } } - + /* Now calculate the giv's final value. */ emit_iv_add_mult (tem, v->mult_val, v->add_val, tem, insert_before); - + if (loop_dump_stream) fprintf (loop_dump_stream, "Final giv value for %d, calc from biv's value.\n", @@ -3107,7 +3107,7 @@ loop_iterations (loop_start, loop_end) /* First find the iteration variable. If the last insn is a conditional branch, and the insn before tests a register value, make that the iteration variable. */ - + loop_initial_value = 0; loop_increment = 0; loop_final_value = 0; @@ -3161,7 +3161,7 @@ loop_iterations (loop_start, loop_end) if (GET_CODE (comparison_value) == REG && invariant_p (comparison_value)) { rtx insn, set; - + for (insn = PREV_INSN (loop_start); insn ; insn = PREV_INSN (insn)) { if (GET_CODE (insn) == CODE_LABEL) @@ -3272,7 +3272,7 @@ loop_iterations (loop_start, loop_end) will overflow before the loop exits), 4 infinite loop cases, and 15 immediate exit (0 or 1 iteration depending on loop type) cases. Only try to optimize the normal cases. */ - + /* (compare_dir/final_larger/increment_dir) Normal cases: (0/-1/-1), (0/1/1), (-1/-1/-1), (1/1/1) Reverse cases: (0/-1/1), (0/1/-1), (-1/-1/1), (1/1/-1) diff --git a/gnu/usr.bin/cc/cc_int/varasm.c b/gnu/usr.bin/cc/cc_int/varasm.c index 2ef7ec8..76f4b8c 100644 --- a/gnu/usr.bin/cc/cc_int/varasm.c +++ b/gnu/usr.bin/cc/cc_int/varasm.c @@ -213,7 +213,7 @@ named_section (name) { in_named_name = name; in_section = in_named; - + #ifdef ASM_OUTPUT_SECTION_NAME ASM_OUTPUT_SECTION_NAME (asm_out_file, name); #else @@ -239,7 +239,7 @@ make_function_rtl (decl) { if (DECL_RTL (decl) == 0) DECL_RTL (decl) = bc_gen_rtx (name, 0, (struct bc_label *) 0); - + /* Record that at least one function has been defined. */ function_defined = 1; return; @@ -351,7 +351,7 @@ decode_reg_name (asmspec) /* Get rid of confusing prefixes. */ asmspec = strip_reg_name (asmspec); - + /* Allow a decimal number as a "register name". */ for (i = strlen (asmspec) - 1; i >= 0; i--) if (! (asmspec[i] >= '0' && asmspec[i] <= '9')) @@ -1285,7 +1285,7 @@ assemble_variable (decl, top_level, at_end, dont_output_data) finish: #ifdef XCOFF_DEBUGGING_INFO /* Unfortunately, the IBM assembler cannot handle stabx before the actual - declaration. When something like ".stabx "aa:S-2",aa,133,0" is emitted + declaration. When something like ".stabx "aa:S-2",aa,133,0" is emitted and `aa' hasn't been output yet, the assembler generates a stab entry with a value of zero, in addition to creating an unnecessary external entry for `aa'. Hence, we must postpone dbxout_symbol to here at the end. */ @@ -2583,21 +2583,21 @@ output_constant_def (exp) the label number already assigned. */ hash = const_hash (exp) % MAX_HASH_TABLE; - + for (desc = const_hash_table[hash]; desc; desc = desc->next) if (compare_constant (exp, desc)) { found = desc->label; break; } - + if (found == 0) { /* No constant equal to EXP is known to have been output. Make a constant descriptor to enter EXP in the hash table. Assign the label number and record it in the descriptor for future calls to this function to find. */ - + /* Create a string containing the label name, in LABEL. */ ASM_GENERATE_INTERNAL_LABEL (label, "LC", const_labelno); @@ -2612,7 +2612,7 @@ output_constant_def (exp) /* Create a string containing the label name, in LABEL. */ ASM_GENERATE_INTERNAL_LABEL (label, "LC", const_labelno); } - + /* We have a symbol name; construct the SYMBOL_REF and the MEM. */ push_obstacks_nochange (); @@ -2620,7 +2620,7 @@ output_constant_def (exp) end_temporary_allocation (); def = gen_rtx (SYMBOL_REF, Pmode, desc->label); - + TREE_CST_RTL (exp) = gen_rtx (MEM, TYPE_MODE (TREE_TYPE (exp)), def); RTX_UNCHANGING_P (TREE_CST_RTL (exp)) = 1; @@ -3083,8 +3083,8 @@ force_const_mem (mode, x) push_obstacks_nochange (); rtl_in_saveable_obstack (); - x = gen_rtx (CONST, GET_MODE (x), - gen_rtx (PLUS, GET_MODE (x), + x = gen_rtx (CONST, GET_MODE (x), + gen_rtx (PLUS, GET_MODE (x), XEXP (XEXP (x, 0), 0), XEXP (XEXP (x, 0), 1))); pop_obstacks (); } @@ -3383,7 +3383,7 @@ output_constant (exp, size) /* Eliminate the NON_LVALUE_EXPR_EXPR that makes a cast not be an lvalue. That way we get the constant (we hope) inside it. Also, strip off any NOP_EXPR that converts between two record, union, or array types. */ - while ((TREE_CODE (exp) == NOP_EXPR + while ((TREE_CODE (exp) == NOP_EXPR && (TREE_TYPE (exp) == TREE_TYPE (TREE_OPERAND (exp, 0)) || TREE_CODE (TREE_TYPE (exp)) == ARRAY_TYPE || TREE_CODE (TREE_TYPE (exp)) == RECORD_TYPE @@ -3489,9 +3489,9 @@ bc_assemble_integer (exp, size) expand_expr() using EXPAND_SUM above in the RTL case? I hate RMS. FIXME: Copied as is from BC-GCC1; may need work. Don't hate. -bson */ - + exp = fold (exp); - + while (TREE_CODE (exp) == NOP_EXPR || TREE_CODE (exp) == CONVERT_EXPR) exp = TREE_OPERAND (exp, 0); if (TREE_CODE (exp) == INTEGER_CST) @@ -3523,7 +3523,7 @@ bc_assemble_integer (exp, size) } else abort (); /* FIXME: ditto previous. */ - + if (addr_part == 0) { if (size == 1) diff --git a/gnu/usr.bin/cc/cc_int/xcoffout.c b/gnu/usr.bin/cc/cc_int/xcoffout.c index 42b01f9..5518cfe 100644 --- a/gnu/usr.bin/cc/cc_int/xcoffout.c +++ b/gnu/usr.bin/cc/cc_int/xcoffout.c @@ -187,7 +187,7 @@ stab_to_sclass (stab) return C_GSYM; case N_FNAME: - UNKNOWN_STAB ("N_FNAME"); + UNKNOWN_STAB ("N_FNAME"); abort(); case N_FUN: @@ -199,7 +199,7 @@ stab_to_sclass (stab) #ifdef N_MAIN case N_MAIN: - UNKNOWN_STAB ("N_MAIN"); + UNKNOWN_STAB ("N_MAIN"); abort (); #endif @@ -207,7 +207,7 @@ stab_to_sclass (stab) return C_RSYM; case N_SSYM: - UNKNOWN_STAB ("N_SSYM"); + UNKNOWN_STAB ("N_SSYM"); abort (); case N_RPSYM: @@ -223,59 +223,59 @@ stab_to_sclass (stab) return C_ENTRY; case N_SO: - UNKNOWN_STAB ("N_SO"); + UNKNOWN_STAB ("N_SO"); abort (); case N_SOL: - UNKNOWN_STAB ("N_SOL"); + UNKNOWN_STAB ("N_SOL"); abort (); case N_SLINE: - UNKNOWN_STAB ("N_SLINE"); + UNKNOWN_STAB ("N_SLINE"); abort (); #ifdef N_DSLINE case N_DSLINE: - UNKNOWN_STAB ("N_DSLINE"); + UNKNOWN_STAB ("N_DSLINE"); abort (); #endif #ifdef N_BSLINE case N_BSLINE: - UNKNOWN_STAB ("N_BSLINE"); + UNKNOWN_STAB ("N_BSLINE"); abort (); #endif #if 0 /* This has the same value as N_BSLINE. */ case N_BROWS: - UNKNOWN_STAB ("N_BROWS"); + UNKNOWN_STAB ("N_BROWS"); abort (); #endif #ifdef N_BINCL case N_BINCL: - UNKNOWN_STAB ("N_BINCL"); + UNKNOWN_STAB ("N_BINCL"); abort (); #endif #ifdef N_EINCL case N_EINCL: - UNKNOWN_STAB ("N_EINCL"); + UNKNOWN_STAB ("N_EINCL"); abort (); #endif #ifdef N_EXCL case N_EXCL: - UNKNOWN_STAB ("N_EXCL"); + UNKNOWN_STAB ("N_EXCL"); abort (); #endif case N_LBRAC: - UNKNOWN_STAB ("N_LBRAC"); + UNKNOWN_STAB ("N_LBRAC"); abort (); case N_RBRAC: - UNKNOWN_STAB ("N_RBRAC"); + UNKNOWN_STAB ("N_RBRAC"); abort (); case N_BCOMM: @@ -286,31 +286,31 @@ stab_to_sclass (stab) return C_ECOML; case N_LENG: - UNKNOWN_STAB ("N_LENG"); + UNKNOWN_STAB ("N_LENG"); abort (); case N_PC: - UNKNOWN_STAB ("N_PC"); + UNKNOWN_STAB ("N_PC"); abort (); #ifdef N_M2C case N_M2C: - UNKNOWN_STAB ("N_M2C"); + UNKNOWN_STAB ("N_M2C"); abort (); #endif #ifdef N_SCOPE case N_SCOPE: - UNKNOWN_STAB ("N_SCOPE"); + UNKNOWN_STAB ("N_SCOPE"); abort (); #endif case N_CATCH: - UNKNOWN_STAB ("N_CATCH"); + UNKNOWN_STAB ("N_CATCH"); abort (); default: - UNKNOWN_STAB ("default"); + UNKNOWN_STAB ("default"); abort (); } } @@ -437,7 +437,7 @@ xcoffout_begin_block (file, line, n) { tree decl = current_function_decl; - + /* The IBM AIX compiler does not emit a .bb for the function level scope, so we avoid it here also. */ if (n != 1) diff --git a/gnu/usr.bin/cc/cpp/cccp.c b/gnu/usr.bin/cc/cpp/cccp.c index 3924004..ee8ed5a 100644 --- a/gnu/usr.bin/cc/cpp/cccp.c +++ b/gnu/usr.bin/cc/cpp/cccp.c @@ -116,7 +116,7 @@ typedef struct { unsigned :16, :16, :16; } vms_ino_t; #define BSTRING /* VMS/GCC supplies the bstring routines */ #endif /* __GNUC__ */ #endif /* VMS */ - + extern char *index (); extern char *rindex (); @@ -420,11 +420,11 @@ static enum {dump_none, dump_only, dump_names, dump_definitions} static int debug_output = 0; /* Nonzero indicates special processing used by the pcp program. The - special effects of this mode are: - + special effects of this mode are: + Inhibit all macro expansion, except those inside #if directives. - Process #define directives normally, and output their contents + Process #define directives normally, and output their contents to the output file. Output preconditions to pcp_outfile indicating all the relevant @@ -663,7 +663,7 @@ static char *include_prefix; /* Global list of strings read in from precompiled files. This list is kept in the order the strings are read in, with new strings being added at the end through stringlist_tailp. We use this list to output - the strings at the end of the run. + the strings at the end of the run. */ static STRINGDEF *stringlist; static STRINGDEF **stringlist_tailp = &stringlist; @@ -742,7 +742,7 @@ union hashval { }; /* - * special extension string that can be added to the last macro argument to + * special extension string that can be added to the last macro argument to * allow it to absorb the "rest" of the arguments when expanded. Ex: * #define wow(a, b...) process (b, a, b) * { wow (1, 2, 3); } -> { process (2, 3, 1, 2, 3); } @@ -969,7 +969,7 @@ static U_CHAR is_space[256]; #define SKIP_WHITE_SPACE(p) do { while (is_hor_space[*p]) p++; } while (0) #define SKIP_ALL_WHITE_SPACE(p) do { while (is_space[*p]) p++; } while (0) - + static int errors = 0; /* Error counter for exit code */ /* Name of output file, for error messages. */ @@ -1347,7 +1347,7 @@ main (argc, argv) if (i + 1 == argc) fatal ("Filename missing after -pcp option"); pcp_fname = argv[++i]; - pcp_outfile = + pcp_outfile = ((pcp_fname[0] != '-' || pcp_fname[1] != '\0') ? fopen (pcp_fname, "w") : fdopen (dup (fileno (stdout)), "w")); @@ -1463,7 +1463,7 @@ main (argc, argv) and suppress the usual output. */ deps_stream = stdout; inhibit_output = 1; - } + } break; case 'd': @@ -1677,7 +1677,7 @@ main (argc, argv) char *q; while (*p == ' ' || *p == '\t') p++; - /* Handle -D options. */ + /* Handle -D options. */ if (p[0] == '-' && p[1] == 'D') { q = &p[2]; while (*p && *p != ' ' && *p != '\t') @@ -1690,7 +1690,7 @@ main (argc, argv) while (*p == ' ' || *p == '\t') p++; } else if (p[0] == '-' && p[1] == 'A') { - /* Handle -A options (assertions). */ + /* Handle -A options (assertions). */ char *assertion; char *past_name; char *value; @@ -1965,7 +1965,7 @@ main (argc, argv) deps_target = 0; output_file = spec; } - + deps_file = output_file; deps_mode = "a"; } @@ -2408,7 +2408,7 @@ get_lintcmd (ibp, limit, argstart, arglen, cmdlen) if (ibp >= limit) return NULL; linsize = limit - ibp; - + /* Oh, I wish C had lexical functions... hell, I'll just open-code the set */ if ((linsize >= 10) && !strncmp (ibp, "NOTREACHED", 10)) { *cmdlen = 10; @@ -2604,7 +2604,7 @@ do { ip = &instack[indepth]; \ if (ident_length) goto specialchar; - + /* # keyword: a # must be first nonblank char on the line */ if (beg_of_line == 0) goto randomchar; @@ -3118,7 +3118,7 @@ randomchar: startagain: for (hp = hashtab[MAKE_POS (hash) % HASHSIZE]; hp != NULL; hp = hp->next) { - + if (hp->length == ident_length) { int obufp_before_macroname; int op_lineno_before_macroname; @@ -3126,30 +3126,30 @@ startagain: register U_CHAR *p = hp->name; register U_CHAR *q = obp - i; int disabled; - + if (! redo_char) q--; - + do { /* All this to avoid a strncmp () */ if (*p++ != *q++) goto hashcollision; } while (--i); - + /* We found a use of a macro name. see if the context shows it is a macro call. */ - + /* Back up over terminating character if not already done. */ if (! redo_char) { ibp--; obp--; } - + /* Save this as a displacement from the beginning of the output buffer. We can not save this as a position in the output buffer, because it may get realloc'ed by RECACHE. */ obufp_before_macroname = (obp - op->buf) - ident_length; op_lineno_before_macroname = op->lineno; - + if (hp->type == T_PCSTRING) { pcstring_used (hp); /* Mark the definition of this key as needed, ensuring that it @@ -3160,10 +3160,10 @@ startagain: /* Record whether the macro is disabled. */ disabled = hp->type == T_DISABLED; - + /* This looks like a macro ref, but if the macro was disabled, just copy its name and put in a marker if requested. */ - + if (disabled) { #if 0 /* This error check caught useful cases such as @@ -3172,7 +3172,7 @@ startagain: if (traditional) error ("recursive use of macro `%s'", hp->name); #endif - + if (output_marks) { check_expand (op, limit - ibp + 2); *obp++ = '\n'; @@ -3180,7 +3180,7 @@ startagain: } break; } - + /* If macro wants an arglist, verify that a '(' follows. first skip all whitespace, copying it to the output after the macro name. Then, if there is no '(', @@ -3192,7 +3192,7 @@ startagain: U_CHAR *old_obp = obp; int old_iln = ip->lineno; int old_oln = op->lineno; - + while (1) { /* Scan forward over whitespace, copying it to the output. */ if (ibp == limit && ip->macro != 0) { @@ -3271,7 +3271,7 @@ startagain: break; } } - + /* This is now known to be a macro call. Discard the macro name from the output, along with any following whitespace just copied, @@ -3304,7 +3304,7 @@ startagain: ip->bufp = ibp; op->bufp = obp; macroexpand (hp, op); - + /* Reexamine input stack, since macroexpand has pushed a new level on it. */ obp = op->bufp; @@ -3879,7 +3879,7 @@ special_symbol (hp, op) && hp->type != T_SPEC_DEFINED && hp->type != T_CONST) error ("Predefined macro `%s' used inside `#if' during precompilation", hp->name); - + for (i = indepth; i >= 0; i--) if (instack[i].fname != NULL) { ip = &instack[i]; @@ -4389,7 +4389,7 @@ get_filename: /* For -M, add this file to the dependencies. */ if (print_deps > (angle_brackets || (system_include_depth > 0))) deps_output (fname, ' '); - } + } /* Handle -H option. */ if (print_include_names) { @@ -4412,7 +4412,7 @@ get_filename: if (!no_precomp) do { sprintf (pcftry, "%s%d", fname, pcfnum++); - + pcf = open (pcftry, O_RDONLY, 0666); if (pcf != -1) { @@ -4435,7 +4435,7 @@ get_filename: } } } while (pcf != -1 && !pcfbuf); - + /* Actually process the file */ if (pcfbuf) { pcfname = xmalloc (strlen (pcftry) + 1); @@ -4619,7 +4619,7 @@ read_name_map (dirname) ptr->map_to[dirlen] = '/'; strcpy (ptr->map_to + dirlen + 1, to); free (to); - } + } ptr->map_next = map_list_ptr->map_list_map; map_list_ptr->map_list_map = ptr; @@ -4630,12 +4630,12 @@ read_name_map (dirname) } fclose (f); } - + map_list_ptr->map_list_next = map_list; map_list = map_list_ptr; return map_list_ptr->map_list_map; -} +} /* Try to open include file FILENAME. SEARCHPTR is the directory being tried from the include file search path. This function maps @@ -4871,7 +4871,7 @@ static struct import_file *import_hash_table[IMPORT_HASH_SIZE]; /* Hash a file name for import_hash_table. */ -static int +static int import_hash (f) char *f; { @@ -4952,9 +4952,9 @@ add_import (fd, fname) /* Load the specified precompiled header into core, and verify its preconditions. PCF indicates the file descriptor to read, which must - be a regular file. FNAME indicates the file name of the original + be a regular file. FNAME indicates the file name of the original header. *LIMIT will be set to an address one past the end of the file. - If the preconditions of the file are not satisfied, the buffer is + If the preconditions of the file are not satisfied, the buffer is freed and we return 0. If the preconditions are satisfied, return the address of the buffer following the preconditions. The buffer, in this case, should never be freed because various pieces of it will @@ -4975,7 +4975,7 @@ check_precompiled (pcf, fname, limit) if (pcp_outfile) return 0; - + if (file_size_and_mode (pcf, &st_mode, &st_size) < 0) return 0; @@ -4988,11 +4988,11 @@ check_precompiled (pcf, fname, limit) } else abort (); - + if (length > 0 && buf[length-1] != '\n') buf[length++] = '\n'; buf[length] = '\0'; - + *limit = buf + length; /* File is in core. Check the preconditions. */ @@ -5017,29 +5017,29 @@ check_precompiled (pcf, fname, limit) precompiled header. These are a series of #define and #undef lines which must match the current contents of the hash table. */ -static int +static int check_preconditions (prec) char *prec; { MACRODEF mdef; char *lineend; - + while (*prec) { lineend = (char *) index (prec, '\n'); - + if (*prec++ != '#') { error ("Bad format encountered while reading precompiled file"); return 0; } if (!strncmp (prec, "define", 6)) { HASHNODE *hp; - + prec += 6; mdef = create_definition (prec, lineend, NULL_PTR); if (mdef.defn == 0) abort (); - + if ((hp = lookup (mdef.symnam, mdef.symlen, -1)) == NULL || (hp->type != T_MACRO && hp->type != T_CONST) || (hp->type == T_MACRO @@ -5051,7 +5051,7 @@ check_preconditions (prec) } else if (!strncmp (prec, "undef", 5)) { char *name; int len; - + prec += 5; while (is_hor_space[(U_CHAR) *prec]) prec++; @@ -5059,7 +5059,7 @@ check_preconditions (prec) while (is_idchar[(U_CHAR) *prec]) prec++; len = prec - name; - + if (lookup (name, len, -1)) return 0; } else { @@ -5091,14 +5091,14 @@ pcfinclude (buf, limit, name, op) nstrings = (nstrings << 8) | *cp++; nstrings = (nstrings << 8) | *cp++; nstrings = (nstrings << 8) | *cp++; - + /* Looping over each string... */ while (nstrings--) { U_CHAR *string_start; U_CHAR *endofthiskey; STRINGDEF *str; int nkeys; - + /* Each string starts with a STRINGDEF structure (str), followed */ /* by the text of the string (string_start) */ @@ -5110,14 +5110,14 @@ pcfinclude (buf, limit, name, op) Do not include stddef.h--it will fail! */ if ((HOST_WIDE_INT) cp & 3) cp += 4 - ((HOST_WIDE_INT) cp & 3); - + /* Now get the string. */ str = (STRINGDEF *) cp; string_start = cp += sizeof (STRINGDEF); - + for (; *cp; cp++) /* skip the string */ ; - + /* We need to macro expand the string here to ensure that the proper definition environment is in place. If it were only expanded when we find out it is needed, macros necessary for @@ -5129,11 +5129,11 @@ pcfinclude (buf, limit, name, op) str->writeflag = 0; str->filename = name; str->output_mark = outbuf.bufp - outbuf.buf; - + str->chain = 0; *stringlist_tailp = str; stringlist_tailp = &str->chain; - + /* Next comes a fourbyte number indicating the number of keys */ /* for this string. */ nkeys = *cp++; @@ -5149,19 +5149,19 @@ pcfinclude (buf, limit, name, op) for (; nkeys--; free (tmpbuf.buf), cp = endofthiskey + 1) { KEYDEF *kp = (KEYDEF *) cp; HASHNODE *hp; - + /* It starts with a KEYDEF structure */ cp += sizeof (KEYDEF); - + /* Find the end of the key. At the end of this for loop we advance CP to the start of the next key using this variable. */ endofthiskey = cp + strlen (cp); kp->str = str; - + /* Expand the key, and enter it into the hash table. */ tmpbuf = expand_to_temp_buffer (cp, endofthiskey, 0, 0); tmpbuf.bufp = tmpbuf.buf; - + while (is_hor_space[*tmpbuf.bufp]) tmpbuf.bufp++; if (!is_idstart[*tmpbuf.bufp] @@ -5169,7 +5169,7 @@ pcfinclude (buf, limit, name, op) str->writeflag = 1; continue; } - + hp = lookup (tmpbuf.bufp, -1, -1); if (hp == NULL) { kp->chain = 0; @@ -5184,7 +5184,7 @@ pcfinclude (buf, limit, name, op) } } /* This output_line_command serves to switch us back to the current - input file in case some of these strings get output (which will + input file in case some of these strings get output (which will result in line commands for the header file being output). */ output_line_command (&instack[indepth], op, 0, enter_file); } @@ -5196,7 +5196,7 @@ pcstring_used (hp) HASHNODE *hp; { KEYDEF *kp; - + for (kp = hp->value.keydef; kp; kp = kp->chain) kp->str->writeflag = 1; delete_macro (hp); @@ -5217,16 +5217,16 @@ write_output () /* next_string_loc, in which case we print a series of strings, or */ /* it is less than next_string_loc, in which case we write some of */ /* the buffer. */ - cur_buf_loc = outbuf.buf; + cur_buf_loc = outbuf.buf; next_string = stringlist; - + while (cur_buf_loc < outbuf.bufp || next_string) { if (next_string && cur_buf_loc - outbuf.buf == next_string->output_mark) { if (next_string->writeflag) { len = 4 * strlen (next_string->filename) + 32; while (len > line_command_len) - line_command = xrealloc (line_command, + line_command = xrealloc (line_command, line_command_len *= 2); sprintf (line_command, "\n# %d ", next_string->lineno); strcpy (quote_string (line_command + strlen (line_command), @@ -5234,15 +5234,15 @@ write_output () "\n"); safe_write (fileno (stdout), line_command, strlen (line_command)); safe_write (fileno (stdout), next_string->contents, next_string->len); - } + } next_string = next_string->chain; } else { len = (next_string - ? (next_string->output_mark + ? (next_string->output_mark - (cur_buf_loc - outbuf.buf)) : outbuf.bufp - cur_buf_loc); - + safe_write (fileno (stdout), cur_buf_loc, len); cur_buf_loc += len; } @@ -5298,7 +5298,7 @@ struct arglist { char rest_args; }; -/* Create a DEFINITION node from a #define directive. Arguments are +/* Create a DEFINITION node from a #define directive. Arguments are as for do_define. */ static MACRODEF create_definition (buf, limit, op) @@ -5354,7 +5354,7 @@ create_definition (buf, limit, op) if (!is_idstart[*bp]) pedwarn ("invalid character in macro parameter name"); - + /* Find the end of the arg name. */ while (is_idchar[*bp]) { bp++; @@ -5473,7 +5473,7 @@ create_definition (buf, limit, op) mdef.defn = 0; return mdef; } - + /* Process a #define command. BUF points to the contents of the #define command, as a contiguous string. LIMIT points to the first character past the end of the definition. @@ -5660,7 +5660,7 @@ comp_def_part (first, beg1, len1, beg2, len2, last) in that list, or -1 for a macro name that wants no argument list. MACRONAME is the macro name itself (so we can avoid recursive expansion) and NAMELEN is its length in characters. - + Note that comments and backslash-newlines have already been deleted from the argument. */ @@ -6585,7 +6585,7 @@ do_once () if (ip != NULL) { struct file_name_list *new; - + new = (struct file_name_list *) xmalloc (sizeof (struct file_name_list)); new->next = dont_repeat_files; dont_repeat_files = new; @@ -6660,7 +6660,7 @@ do_pragma (buf, limit) fname = p + 1; if (p = (U_CHAR *) index (fname, '\"')) *p = '\0'; - + for (ptr = all_include_files; ptr; ptr = ptr->next) { inc_fname = (U_CHAR *) rindex (ptr->fname, '/'); inc_fname = inc_fname ? inc_fname + 1 : (U_CHAR *) ptr->fname; @@ -6820,7 +6820,7 @@ do_xifdef (buf, limit, op, keyword) { int skip; FILE_BUF *ip = &instack[indepth]; - U_CHAR *end; + U_CHAR *end; int start_of_file = 0; U_CHAR *control_macro = 0; @@ -6892,7 +6892,7 @@ do_xifdef (buf, limit, op, keyword) control_macro[end - buf] = 0; } } - + conditional_skip (ip, skip, T_IF, control_macro, op); return 0; } @@ -7558,7 +7558,7 @@ quote_string (dst, src) *dst++ = '\\'; *dst++ = c; break; - + case '\0': *dst++ = '\"'; *dst = '\0'; @@ -7705,7 +7705,7 @@ output_line_command (ip, op, conditional, file_change) `stringified_length' is the length the argument would have if stringified. `use_count' is the number of times this macro arg is substituted - into the macro. If the actual use count exceeds 10, + into the macro. If the actual use count exceeds 10, the value stored is 10. `free1' and `free2', if nonzero, point to blocks to be freed when the macro argument data is no longer needed. */ @@ -7752,7 +7752,7 @@ macroexpand (hp, op) /* recorded as a precondition. */ if (pcp_inside_if && pcp_outfile && defn->predefined) dump_single_macro (hp, pcp_outfile); - + nargs = defn->nargs; if (nargs >= 0) { @@ -8351,7 +8351,7 @@ macarg1 (start, limit, depthptr, newlines, comments, rest_args) /* Discard comments and duplicate newlines in the string of length LENGTH at START, except inside of string constants. - The string is copied into itself with its beginning staying fixed. + The string is copied into itself with its beginning staying fixed. NEWLINES is the number of newlines that must be duplicated. We assume that that much extra space is available past the end @@ -9332,7 +9332,7 @@ make_definition (str, op) } *q = 0; } - + ip = &instack[++indepth]; ip->nominal_fname = ip->fname = "*Initialization*"; @@ -9417,7 +9417,7 @@ make_assertion (option, str) error ("malformed option `%s %s'", option, str); return; } - + ip = &instack[++indepth]; ip->nominal_fname = ip->fname = "*Initialization*"; @@ -9695,7 +9695,7 @@ output_dots (fd, depth) depth--; } } - + #ifdef VMS @@ -9746,11 +9746,11 @@ hack_vms_include_specification (fname) /* We are trying to do a number of things here. First of all, we are trying to hammer the filenames into a standard format, such that later processing can handle them. - + If the file name contains something like [dir.], then it recognizes this as a root, and strips the ".]". Later processing will add whatever is needed to get things working properly. - + If no device is specified, then the first directory name is taken to be a device name (or a rooted logical). */ @@ -9950,7 +9950,7 @@ fopen (fname, type) return fopen (fname, type, "mbc=16"); } -static int +static int open (fname, flags, prot) char *fname; int flags; diff --git a/gnu/usr.bin/cc/cpp/cexp.c b/gnu/usr.bin/cc/cpp/cexp.c index 696635e..04d86e5 100644 --- a/gnu/usr.bin/cc/cpp/cexp.c +++ b/gnu/usr.bin/cc/cpp/cexp.c @@ -1419,14 +1419,14 @@ yylex () switch (c) { case 0: return 0; - + case ' ': case '\t': case '\r': case '\n': lexptr++; goto retry; - + case 'L': /* Capital L may start a wide-string or wide-character constant. */ if (lexptr[1] == '\'') @@ -1564,7 +1564,7 @@ yylex () /* This is always a signed type. */ yylval.integer.unsignedp = 0; - + return CHAR; /* some of these chars are invalid in constant expressions; @@ -1622,7 +1622,7 @@ yylex () if (c >= '0' && c <= '9' && !keyword_parsing) { /* It's a number */ for (namelen = 0; - c = tokstart[namelen], is_idchar[c] || c == '.'; + c = tokstart[namelen], is_idchar[c] || c == '.'; namelen++) ; return parse_number (namelen); @@ -1648,7 +1648,7 @@ yylex () for (namelen = 0; is_idchar[tokstart[namelen]]; namelen++) ; } - + lexptr += namelen; yylval.name.address = tokstart; yylval.name.length = namelen; @@ -1701,7 +1701,7 @@ parse_escape (string_ptr) case 0: (*string_ptr)--; return 0; - + case '0': case '1': case '2': @@ -1828,7 +1828,7 @@ parse_c_expression (string) char *string; { lexptr = string; - + if (lexptr == 0 || *lexptr == 0) { error ("empty #if expression"); return 0; /* don't include the #if group */ diff --git a/gnu/usr.bin/cc/f77/f77.c b/gnu/usr.bin/cc/f77/f77.c index e9f86c2..6ebb515 100644 --- a/gnu/usr.bin/cc/f77/f77.c +++ b/gnu/usr.bin/cc/f77/f77.c @@ -257,7 +257,7 @@ choose_temp_base () base = choose_temp_base_try ("/usr/tmp", base); base = choose_temp_base_try ("/tmp", base); - /* If all else fails, use the current directory! */ + /* If all else fails, use the current directory! */ if (base == (char *)0) base = "./"; @@ -324,7 +324,7 @@ run_dos (program, argv) i = system (scmd); remove (rf); - + if (i == -1) perror_exec (program); } @@ -424,7 +424,7 @@ main (argc, argv) if (argc == 2) { /* If they only gave us `-v', don't try to link - in libf2c. */ + in libf2c. */ added--; library = NULL; } @@ -450,7 +450,7 @@ main (argc, argv) } else { - int len; + int len; if (saw_speclang) continue; diff --git a/gnu/usr.bin/cc/include/bi-run.h b/gnu/usr.bin/cc/include/bi-run.h index 669f2ab..391ab8a 100644 --- a/gnu/usr.bin/cc/include/bi-run.h +++ b/gnu/usr.bin/cc/include/bi-run.h @@ -39,7 +39,7 @@ struct callinfo struct argtype retvaltype; /* Type of return value */ struct argtype argtypes[1]; /* Argument types */ }; - + /* Structure describing a bytecode function. If this changes, we also need to change expand_function_end () in bc-trans.c */ struct bytecode diff --git a/gnu/usr.bin/cc/include/bytecode.h b/gnu/usr.bin/cc/include/bytecode.h index 87030be..16397b1 100644 --- a/gnu/usr.bin/cc/include/bytecode.h +++ b/gnu/usr.bin/cc/include/bytecode.h @@ -33,7 +33,7 @@ extern int max_stack_depth; opcode = TREE_INT_CST_LOW (CST); \ bc_emit_bytecode_const ((char *) &opcode, sizeof opcode); \ } - + #else #define bc_emit_bytecode_DI_const(CST) \ @@ -43,7 +43,7 @@ extern int max_stack_depth; opcode = TREE_INT_CST_HIGH (CST); \ bc_emit_bytecode_const ((char *) &opcode, sizeof opcode); \ } - + #endif diff --git a/gnu/usr.bin/cc/include/c-gperf.h b/gnu/usr.bin/cc/include/c-gperf.h index edaaf22..4946075 100644 --- a/gnu/usr.bin/cc/include/c-gperf.h +++ b/gnu/usr.bin/cc/include/c-gperf.h @@ -49,10 +49,10 @@ hash (str, len) static struct resword wordlist[] = { - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"int", TYPESPEC, RID_INT}, - {"",}, {"",}, + {"",}, {"",}, {"__typeof__", TYPEOF, NORID}, {"__signed__", TYPESPEC, RID_SIGNED}, {"__imag__", IMAGPART, NORID}, @@ -71,20 +71,20 @@ static struct resword wordlist[] = {"__complex__", TYPESPEC, RID_COMPLEX}, {"__iterator", SCSPEC, RID_ITERATOR}, {"bycopy", TYPE_QUAL, RID_BYCOPY}, - {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"__complex", TYPESPEC, RID_COMPLEX}, - {"",}, + {"",}, {"in", TYPE_QUAL, RID_IN}, {"break", BREAK, NORID}, {"@defs", DEFS, NORID}, - {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"extern", SCSPEC, RID_EXTERN}, {"if", IF, NORID}, {"typeof", TYPEOF, NORID}, {"typedef", SCSPEC, RID_TYPEDEF}, {"__typeof", TYPEOF, NORID}, {"sizeof", SIZEOF, NORID}, - {"",}, + {"",}, {"return", RETURN, NORID}, {"const", TYPE_QUAL, RID_CONST}, {"__volatile__", TYPE_QUAL, RID_VOLATILE}, @@ -92,71 +92,71 @@ static struct resword wordlist[] = {"@selector", SELECTOR, NORID}, {"__volatile", TYPE_QUAL, RID_VOLATILE}, {"__asm__", ASM_KEYWORD, NORID}, - {"",}, {"",}, + {"",}, {"",}, {"continue", CONTINUE, NORID}, {"__alignof__", ALIGNOF, NORID}, {"__imag", IMAGPART, NORID}, {"__attribute__", ATTRIBUTE, NORID}, - {"",}, {"",}, + {"",}, {"",}, {"__attribute", ATTRIBUTE, NORID}, {"for", FOR, NORID}, - {"",}, + {"",}, {"@encode", ENCODE, NORID}, {"id", OBJECTNAME, RID_ID}, {"static", SCSPEC, RID_STATIC}, {"@interface", INTERFACE, NORID}, - {"",}, + {"",}, {"__signed", TYPESPEC, RID_SIGNED}, - {"",}, + {"",}, {"__label__", LABEL, NORID}, - {"",}, {"",}, + {"",}, {"",}, {"__asm", ASM_KEYWORD, NORID}, {"char", TYPESPEC, RID_CHAR}, - {"",}, + {"",}, {"inline", SCSPEC, RID_INLINE}, {"out", TYPE_QUAL, RID_OUT}, {"register", SCSPEC, RID_REGISTER}, {"__real", REALPART, NORID}, {"short", TYPESPEC, RID_SHORT}, - {"",}, + {"",}, {"enum", ENUM, NORID}, {"inout", TYPE_QUAL, RID_INOUT}, - {"",}, + {"",}, {"oneway", TYPE_QUAL, RID_ONEWAY}, {"union", UNION, NORID}, - {"",}, + {"",}, {"__alignof", ALIGNOF, NORID}, - {"",}, + {"",}, {"@implementation", IMPLEMENTATION, NORID}, - {"",}, + {"",}, {"@class", CLASS, NORID}, - {"",}, + {"",}, {"@public", PUBLIC, NORID}, {"asm", ASM_KEYWORD, NORID}, - {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"default", DEFAULT, NORID}, - {"",}, + {"",}, {"void", TYPESPEC, RID_VOID}, - {"",}, + {"",}, {"@protected", PROTECTED, NORID}, {"@protocol", PROTOCOL, NORID}, - {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"volatile", TYPE_QUAL, RID_VOLATILE}, - {"",}, {"",}, + {"",}, {"",}, {"signed", TYPESPEC, RID_SIGNED}, {"float", TYPESPEC, RID_FLOAT}, {"@end", END, NORID}, - {"",}, {"",}, + {"",}, {"",}, {"unsigned", TYPESPEC, RID_UNSIGNED}, {"@compatibility_alias", ALIAS, NORID}, {"double", TYPESPEC, RID_DOUBLE}, - {"",}, {"",}, + {"",}, {"",}, {"auto", SCSPEC, RID_AUTO}, - {"",}, + {"",}, {"goto", GOTO, NORID}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"do", DO, NORID}, - {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"long", TYPESPEC, RID_LONG}, }; diff --git a/gnu/usr.bin/cc/include/expr.h b/gnu/usr.bin/cc/include/expr.h index c71b3f6..affc28d 100644 --- a/gnu/usr.bin/cc/include/expr.h +++ b/gnu/usr.bin/cc/include/expr.h @@ -191,7 +191,7 @@ enum direction {none, upward, downward}; /* Value has this type. */ /* Supply a default definition for FUNCTION_ARG_BOUNDARY. Normally, we let FUNCTION_ARG_PADDING, which also pads the length, handle any needed alignment. */ - + #ifndef FUNCTION_ARG_BOUNDARY #define FUNCTION_ARG_BOUNDARY(MODE, TYPE) PARM_BOUNDARY #endif @@ -284,7 +284,7 @@ extern optab sub_optab; extern optab smul_optab; /* Signed and floating-point multiply */ extern optab smul_highpart_optab; /* Signed multiply, return high word */ extern optab umul_highpart_optab; -extern optab smul_widen_optab; /* Signed multiply with result +extern optab smul_widen_optab; /* Signed multiply with result one machine mode wider than args */ extern optab umul_widen_optab; extern optab sdiv_optab; /* Signed divide */ diff --git a/gnu/usr.bin/cc/include/gbl-ctors.h b/gnu/usr.bin/cc/include/gbl-ctors.h index 3e2ab83..f673fb9 100644 --- a/gnu/usr.bin/cc/include/gbl-ctors.h +++ b/gnu/usr.bin/cc/include/gbl-ctors.h @@ -80,6 +80,6 @@ do { \ for (nptrs = 0; __CTOR_LIST__[nptrs + 1] != 0; nptrs++); \ for (i = nptrs; i >= 1; i--) \ __CTOR_LIST__[i] (); \ -} while (0) +} while (0) #endif diff --git a/gnu/usr.bin/cc/include/hard-reg-set.h b/gnu/usr.bin/cc/include/hard-reg-set.h index 6bc668b..66111d5 100644 --- a/gnu/usr.bin/cc/include/hard-reg-set.h +++ b/gnu/usr.bin/cc/include/hard-reg-set.h @@ -209,7 +209,7 @@ extern char call_used_regs[FIRST_PSEUDO_REGISTER]; /* The same info as a HARD_REG_SET. */ extern HARD_REG_SET call_used_reg_set; - + /* Indexed by hard register number, contains 1 for registers that are fixed use -- i.e. in fixed_regs -- or a function value return register or STRUCT_VALUE_REGNUM or STATIC_CHAIN_REGNUM. These are the diff --git a/gnu/usr.bin/cc/include/i386/i386.h b/gnu/usr.bin/cc/include/i386/i386.h index a5623a7..8d6bf34 100644 --- a/gnu/usr.bin/cc/include/i386/i386.h +++ b/gnu/usr.bin/cc/include/i386/i386.h @@ -83,7 +83,7 @@ extern int target_flags; /* Compile using ret insn that pops args. This will not work unless you use prototypes at least - for all functions that can take varying numbers of args. */ + for all functions that can take varying numbers of args. */ #define TARGET_RTD (target_flags & MASK_RTD) /* Compile passing first two args in regs 0 and 1. @@ -374,7 +374,7 @@ extern int target_flags; This is ordinarily the length in words of a value of mode MODE but can be less for certain modes in special long registers. - Actually there are no two word move instructions for consecutive + Actually there are no two word move instructions for consecutive registers. And only registers 0-3 may have mov byte instructions applied to them. */ @@ -576,7 +576,7 @@ enum reg_class #define FP_REG_P(X) (REG_P (X) && FP_REGNO_P (REGNO (X))) #define FP_REGNO_P(n) ((n) >= FIRST_STACK_REG && (n) <= LAST_STACK_REG) - + #define STACK_REG_P(xop) (REG_P (xop) && \ REGNO (xop) >= FIRST_STACK_REG && \ REGNO (xop) <= LAST_STACK_REG) @@ -989,7 +989,7 @@ while (0) the stack pointer does not matter. The value is tested only in functions that have frame pointers. No definition is equivalent to always zero. */ -/* Note on the 386 it might be more efficient not to define this since +/* Note on the 386 it might be more efficient not to define this since we have to restore it ourselves from the frame pointer, in order to use pop */ @@ -1248,7 +1248,7 @@ do { \ } /* Nonzero if the constant value X is a legitimate general operand - when generating PIC code. It is given that flag_pic is on and + when generating PIC code. It is given that flag_pic is on and that X satisfies CONSTANT_P or is a CONST_DOUBLE. */ #define LEGITIMATE_PIC_OPERAND_P(X) \ @@ -1671,7 +1671,7 @@ do { long l; \ /* This is how to output an element of a case-vector that is relative. We don't use these on the 386 yet, because the ATT assembler can't do - forward reference the differences. + forward reference the differences. */ #define ASM_OUTPUT_ADDR_DIFF_ELT(FILE, VALUE, REL) \ diff --git a/gnu/usr.bin/cc/include/i386/unix.h b/gnu/usr.bin/cc/include/i386/unix.h index 51b112d..0f0b5d5 100644 --- a/gnu/usr.bin/cc/include/i386/unix.h +++ b/gnu/usr.bin/cc/include/i386/unix.h @@ -38,7 +38,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #define AS2(a,b,c) "a b,c" #define AS2C(b,c) " b,c" #define AS3(a,b,c,d) "a b,c,d" -#endif +#endif /* Define macro used to output shift-double opcodes when the shift count is in %cl. Some assemblers require %cl as an argument; @@ -76,7 +76,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ do \ { fputs (",", (FILE)); PRINT_REG ((IREG), 0, (FILE)); } \ while (0) - + /* Print an index scale factor SCALE. */ #define PRINT_SCALE(FILE,SCALE) \ if ((SCALE) != 1) fprintf ((FILE), ",%d", (SCALE)) diff --git a/gnu/usr.bin/cc/include/integrate.h b/gnu/usr.bin/cc/include/integrate.h index 1176ac0..cb0abf2 100644 --- a/gnu/usr.bin/cc/include/integrate.h +++ b/gnu/usr.bin/cc/include/integrate.h @@ -100,7 +100,7 @@ struct inline_remap rtx dest; rtx equiv; } equiv_sets[MAX_RECOG_OPERANDS]; - /* Record the last thing assigned to pc. This is used for folded + /* Record the last thing assigned to pc. This is used for folded conditional branch insns. */ rtx last_pc_value; #ifdef HAVE_cc0 diff --git a/gnu/usr.bin/cc/include/longlong.h b/gnu/usr.bin/cc/include/longlong.h index e811c73..0380ef7 100644 --- a/gnu/usr.bin/cc/include/longlong.h +++ b/gnu/usr.bin/cc/include/longlong.h @@ -402,7 +402,7 @@ : "=d" (__w) \ : "%dI" ((USItype)(u)), \ "dI" ((USItype)(v))); \ - __w; }) + __w; }) #endif /* __i960__ */ #if defined (__mc68000__) diff --git a/gnu/usr.bin/cc/include/obstack.h b/gnu/usr.bin/cc/include/obstack.h index 28bcd44..7b04c90 100644 --- a/gnu/usr.bin/cc/include/obstack.h +++ b/gnu/usr.bin/cc/include/obstack.h @@ -331,7 +331,7 @@ __extension__ \ /* These assume that the obstack alignment is good enough for pointers or ints, and that the data added so far to the current object shares that much alignment. */ - + #define obstack_ptr_grow(OBSTACK,datum) \ __extension__ \ ({ struct obstack *__o = (OBSTACK); \ diff --git a/gnu/usr.bin/cc/include/output.h b/gnu/usr.bin/cc/include/output.h index ebd0a2f..fc15463 100644 --- a/gnu/usr.bin/cc/include/output.h +++ b/gnu/usr.bin/cc/include/output.h @@ -33,7 +33,7 @@ extern void app_enable PROTO((void)); Called from varasm.c before most kinds of output. */ extern void app_disable PROTO((void)); -/* Return the number of slots filled in the current +/* Return the number of slots filled in the current delayed branch sequence (we don't count the insn needing the delay slot). Zero if not in a delayed branch sequence. */ extern int dbr_sequence_length PROTO((void)); diff --git a/gnu/usr.bin/cc/include/pcp.h b/gnu/usr.bin/cc/include/pcp.h index 0b86a87..4ca0727 100644 --- a/gnu/usr.bin/cc/include/pcp.h +++ b/gnu/usr.bin/cc/include/pcp.h @@ -46,7 +46,7 @@ struct keydef #define MAC --- Indicates MAC must be defined with any defn #undef MAC --- Indicates MAC cannot be defined -These preconditions must be true for a precompiled file to be used. +These preconditions must be true for a precompiled file to be used. The preconditions section is null terminated. */ /* Then, there is a four byte number (in network byte order) which */ @@ -70,7 +70,7 @@ The preconditions section is null terminated. */ Precondition 1 Precondition 2 - . + . . . <NUL> @@ -80,7 +80,7 @@ The preconditions section is null terminated. */ Number of keys KEYDEF Key . . . <NUL> - KEYDEF + KEYDEF Key . . . <NUL> . . diff --git a/gnu/usr.bin/cc/include/real.h b/gnu/usr.bin/cc/include/real.h index 34d6d67..de51448 100644 --- a/gnu/usr.bin/cc/include/real.h +++ b/gnu/usr.bin/cc/include/real.h @@ -216,7 +216,7 @@ extern REAL_VALUE_TYPE real_value_truncate (); /* Defining REAL_IS_NOT_DOUBLE breaks certain initializations when REAL_ARITHMETIC etc. are not defined. */ -/* Now see if the host and target machines use the same format. +/* Now see if the host and target machines use the same format. If not, define REAL_IS_NOT_DOUBLE (even if we end up representing reals as doubles because we have no better way in this cross compiler.) This turns off various optimizations that can happen when we know the @@ -386,7 +386,7 @@ extern REAL_VALUE_TYPE dconstm1; /* Union type used for extracting real values from CONST_DOUBLEs or putting them in. */ -union real_extract +union real_extract { REAL_VALUE_TYPE d; HOST_WIDE_INT i[sizeof (REAL_VALUE_TYPE) / sizeof (HOST_WIDE_INT)]; diff --git a/gnu/usr.bin/cc/include/reload.h b/gnu/usr.bin/cc/include/reload.h index 68c59bb..d033db7 100644 --- a/gnu/usr.bin/cc/include/reload.h +++ b/gnu/usr.bin/cc/include/reload.h @@ -82,7 +82,7 @@ extern rtx reload_reg_rtx[MAX_RELOADS]; enum reload_type { - RELOAD_FOR_INPUT, RELOAD_FOR_OUTPUT, RELOAD_FOR_INSN, + RELOAD_FOR_INPUT, RELOAD_FOR_OUTPUT, RELOAD_FOR_INSN, RELOAD_FOR_INPUT_ADDRESS, RELOAD_FOR_OUTPUT_ADDRESS, RELOAD_FOR_OPERAND_ADDRESS, RELOAD_FOR_OPADDR_ADDR, RELOAD_OTHER, RELOAD_FOR_OTHER_ADDRESS @@ -126,7 +126,7 @@ extern enum insn_code reload_out_optab[]; /* Functions from reload.c: */ -/* Return a memory location that will be used to copy X in mode MODE. +/* Return a memory location that will be used to copy X in mode MODE. If we haven't already made a location for this mode in this insn, call find_reloads_address on the location being returned. */ extern rtx get_secondary_mem PROTO((rtx, enum machine_mode, diff --git a/gnu/usr.bin/cc/include/rtl.h b/gnu/usr.bin/cc/include/rtl.h index 8e8a026..1701dd5 100644 --- a/gnu/usr.bin/cc/include/rtl.h +++ b/gnu/usr.bin/cc/include/rtl.h @@ -116,7 +116,7 @@ typedef struct rtx_def 0 if the MEM was a variable or the result of a * operator in C; 1 if it was the result of a . or -> operator (on a struct) in C. 1 in a REG if the register is used only in exit code a loop. - 1 in a SUBREG expression if was generated from a variable with a + 1 in a SUBREG expression if was generated from a variable with a promoted mode. 1 in a CODE_LABEL if the label is used for nonlocal gotos and must not be deleted even if its count is zero. @@ -130,7 +130,7 @@ typedef struct rtx_def unsigned int in_struct : 1; /* 1 if this rtx is used. This is used for copying shared structure. See `unshare_all_rtl'. - In a REG, this is not needed for that purpose, and used instead + In a REG, this is not needed for that purpose, and used instead in `leaf_renumber_regs_insn'. In a SYMBOL_REF, means that emit_library_call has used it as the function. */ @@ -303,7 +303,7 @@ typedef struct rtvec_def{ register is spilled to the stack then the constant value should be substituted for it. The contents of the REG_EQUIV is the constant value or memory address, which may be different - from the source of the SET although it has the same value. + from the source of the SET although it has the same value. REG_EQUAL is like REG_EQUIV except that the destination is only momentarily equal to the specified rtx. Therefore, it cannot be used for substitution; but it can be used for cse. @@ -510,7 +510,7 @@ extern char *note_insn_name[]; /* 1 if the REG contained in SUBREG_REG is already known to be sign- or zero-extended from the mode of the SUBREG to the mode of the reg. SUBREG_PROMOTED_UNSIGNED_P gives the signedness of the - extension. + extension. When used as a LHS, is means that this extension must be done when assigning to SUBREG_REG. */ @@ -835,7 +835,7 @@ extern rtx const_true_rtx; extern rtx const_tiny_rtx[3][(int) MAX_MACHINE_MODE]; -/* Returns a constant 0 rtx in mode MODE. Integer modes are treated the +/* Returns a constant 0 rtx in mode MODE. Integer modes are treated the same as VOIDmode. */ #define CONST0_RTX(MODE) (const_tiny_rtx[0][(int) (MODE)]) diff --git a/gnu/usr.bin/cc/include/stack.h b/gnu/usr.bin/cc/include/stack.h index c5d9a25..da4a54d 100644 --- a/gnu/usr.bin/cc/include/stack.h +++ b/gnu/usr.bin/cc/include/stack.h @@ -20,7 +20,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ on top of obstacks for GNU C++. */ /* Stack of data placed on obstacks. */ - + struct stack_level { /* Pointer back to previous such level. */ diff --git a/gnu/usr.bin/cc/include/tree.h b/gnu/usr.bin/cc/include/tree.h index 5976437..0955ad1 100644 --- a/gnu/usr.bin/cc/include/tree.h +++ b/gnu/usr.bin/cc/include/tree.h @@ -242,7 +242,7 @@ struct tree_common In a FUNCTION_DECL, nonzero means its address is needed. So it must be compiled even if it is an inline function. In CONSTRUCTOR nodes, it means object constructed must be in memory. - In LABEL_DECL nodes, it means a goto for this label has been seen + In LABEL_DECL nodes, it means a goto for this label has been seen from a place outside all binding contours that restore stack levels. In ..._TYPE nodes, it means that objects of this type must be fully addressable. This means that pieces of this @@ -692,7 +692,7 @@ struct tree_type from the base of the complete object to the base of the part of the object that is allocated on behalf of this `type'. This is always 0 except when there is multiple inheritance. */ - + #define BINFO_OFFSET(NODE) TREE_VEC_ELT ((NODE), 1) #define TYPE_BINFO_OFFSET(NODE) BINFO_OFFSET (TYPE_BINFO (NODE)) #define BINFO_OFFSET_ZEROP(NODE) (BINFO_OFFSET (NODE) == integer_zero_node) @@ -883,10 +883,10 @@ struct tree_type /* In a TYPE_DECL nonzero means the detail info about this type is not dumped into stabs. - Instead it will generate cross reference ('x') of names. + Instead it will generate cross reference ('x') of names. This uses the same flag as DECL_EXTERNAL. */ #define TYPE_DECL_SUPPRESS_DEBUG(NODE) ((NODE)->decl.external_flag) - + /* In VAR_DECL and PARM_DECL nodes, nonzero means declared `register'. In LABEL_DECL nodes, nonzero means that an error message about diff --git a/gnu/usr.bin/cc/libgcc/libgcc1.c b/gnu/usr.bin/cc/libgcc/libgcc1.c index 7c0e0c1..dff271d 100644 --- a/gnu/usr.bin/cc/libgcc/libgcc1.c +++ b/gnu/usr.bin/cc/libgcc/libgcc1.c @@ -221,7 +221,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ These definitions work for machines where an SF value is returned in the same register as an int. */ -#ifndef FLOAT_VALUE_TYPE +#ifndef FLOAT_VALUE_TYPE #define FLOAT_VALUE_TYPE int #endif diff --git a/gnu/usr.bin/cc/libgcc/libgcc2.c b/gnu/usr.bin/cc/libgcc/libgcc2.c index 63a7114..746c67d 100644 --- a/gnu/usr.bin/cc/libgcc/libgcc2.c +++ b/gnu/usr.bin/cc/libgcc/libgcc2.c @@ -1187,10 +1187,10 @@ asm ("___builtin_saveregs:"); */ asm (" fst.q %f8, 0(%sp)"); /* save floating regs (f8-f15) */ - asm (" fst.q %f12,16(%sp)"); + asm (" fst.q %f12,16(%sp)"); asm (" st.l %r16,32(%sp)"); /* save integer regs (r16-r27) */ - asm (" st.l %r17,36(%sp)"); + asm (" st.l %r17,36(%sp)"); asm (" st.l %r18,40(%sp)"); asm (" st.l %r19,44(%sp)"); asm (" st.l %r20,48(%sp)"); @@ -1256,9 +1256,9 @@ asm ("___builtin_saveregs:"); */ asm (" fst.q f8, 0(sp)"); - asm (" fst.q f12,16(sp)"); + asm (" fst.q f12,16(sp)"); asm (" st.l r16,32(sp)"); - asm (" st.l r17,36(sp)"); + asm (" st.l r17,36(sp)"); asm (" st.l r18,40(sp)"); asm (" st.l r19,44(sp)"); asm (" st.l r20,48(sp)"); @@ -1327,7 +1327,7 @@ asm ("___builtin_saveregs:"); asm (" adds 80,sp,r16"); /* return address of the __va_ctl. */ asm (" bri r1"); asm (" mov r30,sp"); - /* recover stack and pass address to start + /* recover stack and pass address to start of data. */ #endif /* not __PARAGON__ */ #endif /* not __svr4__ */ @@ -1621,7 +1621,7 @@ __builtin_new (size_t sz) (*__new_handler) (); p = (void *) malloc (sz); } - + return p; } #endif /* L_op_new */ @@ -1738,7 +1738,7 @@ void __clear_cache (beg, end) char *beg, *end; { -#ifdef CLEAR_INSN_CACHE +#ifdef CLEAR_INSN_CACHE CLEAR_INSN_CACHE (beg, end); #else #ifdef INSN_CACHE_SIZE @@ -1802,7 +1802,7 @@ __clear_cache (beg, end) /* Compute the cache alignment of the place to stop clearing. */ #if 0 /* This is not needed for gcc's purposes. */ /* If the block to clear is bigger than a cache plane, - we clear the entire cache, and OFFSET is already correct. */ + we clear the entire cache, and OFFSET is already correct. */ if (end < beg + INSN_CACHE_PLANE_SIZE) #endif offset = (((int) (end + INSN_CACHE_LINE_WIDTH - 1) @@ -1848,8 +1848,8 @@ __clear_cache (beg, end) /* Jump to a trampoline, loading the static chain address. */ -#ifdef TRANSFER_FROM_TRAMPOLINE -TRANSFER_FROM_TRAMPOLINE +#ifdef TRANSFER_FROM_TRAMPOLINE +TRANSFER_FROM_TRAMPOLINE #endif #if defined (NeXT) && defined (__MACH__) @@ -1885,7 +1885,7 @@ __enable_execute_stack (addr) #else __clear_cache ((int) addr, (int) eaddr); #endif -} +} #endif /* defined (NeXT) && defined (__MACH__) */ @@ -1931,7 +1931,7 @@ __enable_execute_stack () int save_errno; static unsigned long lowest = USRSTACK; unsigned long current = (unsigned long) &save_errno & -NBPC; - + /* Ignore errno being set. memctl sets errno to EINVAL whenever the address is seen as 'negative'. That is the case with the stack. */ @@ -2085,7 +2085,7 @@ extern void __do_global_dtors (); extern void _cleanup (); extern void _exit () __attribute__ ((noreturn)); -void +void exit (status) int status; { diff --git a/gnu/usr.bin/cpio/copyin.c b/gnu/usr.bin/cpio/copyin.c index 5196c5d..8094a7b 100644 --- a/gnu/usr.bin/cpio/copyin.c +++ b/gnu/usr.bin/cpio/copyin.c @@ -449,18 +449,18 @@ process_copy_in () { struct new_cpio_header *h; h = &file_hdr; - fprintf (stderr, + fprintf (stderr, "magic = 0%o, ino = %d, mode = 0%o, uid = %d, gid = %d\n", h->c_magic, h->c_ino, h->c_mode, h->c_uid, h->c_gid); - fprintf (stderr, + fprintf (stderr, "nlink = %d, mtime = %d, filesize = %d, dev_maj = 0x%x\n", h->c_nlink, h->c_mtime, h->c_filesize, h->c_dev_maj); - fprintf (stderr, + fprintf (stderr, "dev_min = 0x%x, rdev_maj = 0x%x, rdev_min = 0x%x, namesize = %d\n", h->c_dev_min, h->c_rdev_maj, h->c_rdev_min, h->c_namesize); - fprintf (stderr, + fprintf (stderr, "chksum = %d, name = \"%s\", tar_linkname = \"%s\"\n", - h->c_chksum, h->c_name, + h->c_chksum, h->c_name, h->c_tar_linkname ? h->c_tar_linkname : "(null)" ); } @@ -570,7 +570,7 @@ process_copy_in () skip_padding (in_file_des, file_hdr.c_filesize); continue; /* Go to the next file. */ } - else if (S_ISDIR (file_stat.st_mode) + else if (S_ISDIR (file_stat.st_mode) ? rmdir (file_hdr.c_name) : unlink (file_hdr.c_name)) { @@ -617,7 +617,7 @@ process_copy_in () but GNU cpio version 2.0-2.2 didn't do that, so we still have to check for links here (and also in case the archive was created and later appeneded to). */ - link_res = link_to_maj_min_ino (file_hdr.c_name, + link_res = link_to_maj_min_ino (file_hdr.c_name, file_hdr.c_dev_maj, file_hdr.c_dev_maj, file_hdr.c_ino); if (link_res == 0) @@ -631,7 +631,7 @@ process_copy_in () && archive_format != arf_ustar) { int link_res; - link_res = link_to_maj_min_ino (file_hdr.c_name, + link_res = link_to_maj_min_ino (file_hdr.c_name, file_hdr.c_dev_maj, file_hdr.c_dev_maj, file_hdr.c_ino); if (link_res == 0) @@ -642,7 +642,7 @@ process_copy_in () } } else if ((archive_format == arf_tar || archive_format == arf_ustar) - && file_hdr.c_tar_linkname && + && file_hdr.c_tar_linkname && file_hdr.c_tar_linkname[0] != '\0') { int link_res; @@ -725,8 +725,8 @@ process_copy_in () if (file_hdr.c_nlink > 1 && (archive_format == arf_newascii || archive_format == arf_crcascii) ) { - /* (see comment above for how the newc and crc formats - store multiple links). Now that we have the data + /* (see comment above for how the newc and crc formats + store multiple links). Now that we have the data for this file, create any other links to it which we defered. */ create_defered_links (&file_hdr); @@ -758,7 +758,7 @@ process_copy_in () the name before creating it. */ cdf_char = strlen (file_hdr.c_name) - 1; if ( (cdf_char > 0) && - (file_hdr.c_mode & 04000) && + (file_hdr.c_mode & 04000) && (file_hdr.c_name [cdf_char] == '+') ) { file_hdr.c_name [cdf_char] = '\0'; @@ -815,14 +815,14 @@ process_copy_in () && archive_format != arf_ustar) { int link_res; - link_res = link_to_maj_min_ino (file_hdr.c_name, + link_res = link_to_maj_min_ino (file_hdr.c_name, file_hdr.c_dev_maj, file_hdr.c_dev_maj, file_hdr.c_ino); if (link_res == 0) break; } else if (archive_format == arf_ustar && - file_hdr.c_tar_linkname && + file_hdr.c_tar_linkname && file_hdr.c_tar_linkname [0] != '\0') { int link_res; @@ -841,7 +841,7 @@ process_copy_in () } break; } - + res = mknod (file_hdr.c_name, file_hdr.c_mode, makedev (file_hdr.c_rdev_maj, file_hdr.c_rdev_min)); if (res < 0 && create_dir_flag) @@ -1134,10 +1134,10 @@ skip_padding (in_file_des, offset) } -/* The newc and crc formats store multiply linked copies of the same file - in the archive only once. The actual data is attached to the last link - in the archive, and the other links all have a filesize of 0. When a - file in the archive has multiple links and a filesize of 0, its data is +/* The newc and crc formats store multiply linked copies of the same file + in the archive only once. The actual data is attached to the last link + in the archive, and the other links all have a filesize of 0. When a + file in the archive has multiple links and a filesize of 0, its data is probably "attatched" to another file in the archive, so we can't create it right away. We have to "defer" creating it until we have created the file that has the data "attatched" to it. We keep a list of the @@ -1223,11 +1223,11 @@ create_final_defers () struct utimbuf times; /* For setting file times. */ /* Initialize this in case it has members we don't know to set. */ bzero (×, sizeof (struct utimbuf)); - + for (d = deferments; d != NULL; d = d->next) { d = deferments; - link_res = link_to_maj_min_ino (d->header.c_name, + link_res = link_to_maj_min_ino (d->header.c_name, d->header.c_dev_maj, d->header.c_dev_maj, d->header.c_ino); if (link_res == 0) diff --git a/gnu/usr.bin/cpio/copyout.c b/gnu/usr.bin/cpio/copyout.c index f763f2b..35682e1 100644 --- a/gnu/usr.bin/cpio/copyout.c +++ b/gnu/usr.bin/cpio/copyout.c @@ -149,8 +149,8 @@ write_out_header (file_hdr, out_des) { switch (file_hdr->c_mode & CP_IFMT) { - /* HP/UX cpio creates archives that look just like ordinary - archives, but for devices it sets major = 0, minor = 1, and + /* HP/UX cpio creates archives that look just like ordinary + archives, but for devices it sets major = 0, minor = 1, and puts the actual major/minor number in the filesize field. */ case CP_IFCHR: case CP_IFBLK: @@ -165,7 +165,7 @@ write_out_header (file_hdr, out_des) short_hdr.c_rdev = makedev (0, 1); break; default: - short_hdr.c_rdev = makedev (file_hdr->c_rdev_maj, + short_hdr.c_rdev = makedev (file_hdr->c_rdev_maj, file_hdr->c_rdev_min); break; } @@ -431,7 +431,7 @@ process_copy_out () file_hdr.c_dev_maj, file_hdr.c_dev_min))) { - /* This file is linked to another file already in the + /* This file is linked to another file already in the archive, so write it out as a hard link. */ file_hdr.c_mode = (file_stat.st_mode & 07777); file_hdr.c_mode |= CP_IFREG; @@ -439,7 +439,7 @@ process_copy_out () write_out_header (&file_hdr, out_file_des); break; } - add_inode (file_hdr.c_ino, file_hdr.c_name, + add_inode (file_hdr.c_ino, file_hdr.c_name, file_hdr.c_dev_maj, file_hdr.c_dev_min); } file_hdr.c_filesize = 0; @@ -719,7 +719,7 @@ writeout_other_defers (file_hdr, out_des) /* When writing newc and crc format archives we defer multiply linked files until we have seen all of the links to the file. If a file has links to it that aren't going into the archive, then we will - never see the "last" link to the file, so at the end we just write + never see the "last" link to the file, so at the end we just write all of the leftover defered files into the archive. */ static void diff --git a/gnu/usr.bin/cpio/copypass.c b/gnu/usr.bin/cpio/copypass.c index afd5753..0bf7c60 100644 --- a/gnu/usr.bin/cpio/copypass.c +++ b/gnu/usr.bin/cpio/copypass.c @@ -135,12 +135,12 @@ process_copy_pass () /* User said to link it if possible. Try and link to the original copy. If that fails we'll still try and link to a copy we've already made. */ - link_res = link_to_name (output_name.ds_string, + link_res = link_to_name (output_name.ds_string, input_name.ds_string); if ( (link_res < 0) && (in_file_stat.st_nlink > 1) ) - link_res = link_to_maj_min_ino (output_name.ds_string, - major (in_file_stat.st_dev), - minor (in_file_stat.st_dev), + link_res = link_to_maj_min_ino (output_name.ds_string, + major (in_file_stat.st_dev), + minor (in_file_stat.st_dev), in_file_stat.st_ino); #endif @@ -275,10 +275,10 @@ process_copy_pass () Set link_name to the original file name. */ if (link_flag) /* User said to link it if possible. */ - link_res = link_to_name (output_name.ds_string, + link_res = link_to_name (output_name.ds_string, input_name.ds_string); if ( (link_res < 0) && (in_file_stat.st_nlink > 1) ) - link_res = link_to_maj_min_ino (output_name.ds_string, + link_res = link_to_maj_min_ino (output_name.ds_string, major (in_file_stat.st_dev), minor (in_file_stat.st_dev), in_file_stat.st_ino); @@ -377,7 +377,7 @@ process_copy_pass () fprintf (stderr, "%d blocks\n", res); } -/* Try and create a hard link from FILE_NAME to another file +/* Try and create a hard link from FILE_NAME to another file with the given major/minor device number and inode. If no other file with the same major/minor/inode numbers is known, add this file to the list of known files and associated major/minor/inode numbers @@ -411,7 +411,7 @@ link_to_maj_min_ino (file_name, st_dev_maj, st_dev_min, st_ino) } /* Try and create a hard link from LINK_NAME to LINK_TARGET. If - `create_dir_flag' is set, any non-existent (parent) directories + `create_dir_flag' is set, any non-existent (parent) directories needed by LINK_NAME will be created. If the link is successfully created and `verbose_flag' is set, print "LINK_TARGET linked to LINK_NAME\n". If the link can not be created and `link_flag' is set, print diff --git a/gnu/usr.bin/cpio/idcache.c b/gnu/usr.bin/cpio/idcache.c index dd9c366..341c9f4 100644 --- a/gnu/usr.bin/cpio/idcache.c +++ b/gnu/usr.bin/cpio/idcache.c @@ -199,7 +199,7 @@ getgidbyname (group) group_alist = tail; return &tail->id.g; } - + tail->next = nogroup_alist; nogroup_alist = tail; return 0; diff --git a/gnu/usr.bin/cpio/makepath.c b/gnu/usr.bin/cpio/makepath.c index bdf6829..b9c09d7 100644 --- a/gnu/usr.bin/cpio/makepath.c +++ b/gnu/usr.bin/cpio/makepath.c @@ -145,7 +145,7 @@ make_path (argpath, mode, parent_mode, owner, group, verbose_fmt_string) `+' from the name and create the directory. Later we will "hide" the directory. */ if ( (*(slash +1) == '/') && (*(slash -1) == '+') ) - { + { iscdf = 1; *(slash -1) = '\0'; } diff --git a/gnu/usr.bin/cpio/tar.c b/gnu/usr.bin/cpio/tar.c index 16eeee0..84cb0ad 100644 --- a/gnu/usr.bin/cpio/tar.c +++ b/gnu/usr.bin/cpio/tar.c @@ -297,14 +297,14 @@ read_in_tar_header (file_hdr, in_des) /* If a POSIX tar header has a valid linkname it's always supposed to set typeflag to be LNKTYPE. System V.4 tar seems to be broken, and for device files with multiple links it - puts the name of the link into linkname, but leaves typeflag + puts the name of the link into linkname, but leaves typeflag as CHRTYPE, BLKTYPE, FIFOTYPE, etc. */ file_hdr->c_tar_linkname = stash_tar_linkname (tar_hdr->linkname); /* Does POSIX say that the filesize must be 0 for devices? We assume so, but HPUX's POSIX tar sets it to be 1 which causes us problems (when reading an archive we assume we can always - skip to the next file by skipping filesize bytes). For + skip to the next file by skipping filesize bytes). For now at least, it's easier to clear filesize for devices, rather than check everywhere we skip in copyin.c. */ file_hdr->c_filesize = 0; diff --git a/gnu/usr.bin/cpio/util.c b/gnu/usr.bin/cpio/util.c index 52e3e85..e2e1c1e 100644 --- a/gnu/usr.bin/cpio/util.c +++ b/gnu/usr.bin/cpio/util.c @@ -63,8 +63,8 @@ empty_output_buffer (out_des) #ifdef BROKEN_LONG_TAPE_DRIVER /* Some tape drivers seem to have a signed internal seek pointer and - they lose if it overflows and becomes negative (e.g. when writing - tapes > 2Gb). Doing an lseek (des, 0, SEEK_SET) seems to reset the + they lose if it overflows and becomes negative (e.g. when writing + tapes > 2Gb). Doing an lseek (des, 0, SEEK_SET) seems to reset the seek pointer and prevent it from overflowing. */ if (output_is_special && (output_bytes_before_lseek += output_size) < 0L) @@ -262,8 +262,8 @@ fill_input_buffer (in_des, num_bytes) { #ifdef BROKEN_LONG_TAPE_DRIVER /* Some tape drivers seem to have a signed internal seek pointer and - they lose if it overflows and becomes negative (e.g. when writing - tapes > 4Gb). Doing an lseek (des, 0, SEEK_SET) seems to reset the + they lose if it overflows and becomes negative (e.g. when writing + tapes > 4Gb). Doing an lseek (des, 0, SEEK_SET) seems to reset the seek pointer and prevent it from overflowing. */ if (input_is_special && (input_bytes_before_lseek += num_bytes) < 0L) @@ -369,8 +369,8 @@ peek_in_buf (peek_buf, in_des, num_bytes) #ifdef BROKEN_LONG_TAPE_DRIVER /* Some tape drivers seem to have a signed internal seek pointer and - they lose if it overflows and becomes negative (e.g. when writing - tapes > 4Gb). Doing an lseek (des, 0, SEEK_SET) seems to reset the + they lose if it overflows and becomes negative (e.g. when writing + tapes > 4Gb). Doing an lseek (des, 0, SEEK_SET) seems to reset the seek pointer and prevent it from overflowing. */ if (input_is_special && (input_bytes_before_lseek += num_bytes) < 0L) @@ -487,9 +487,9 @@ create_all_directories (name) dir [strlen (dir) - 1] = '\0'; /* remove final + */ mode = 04700; } - + #endif - + if (dir == NULL) error (2, 0, "virtual memory exhausted"); @@ -1002,7 +1002,7 @@ add_cdf_double_slashes (input_name) if (*p == '\0') return input_name; - /* There was a `/' preceeded by a `+' in the pathname. If it is a CDF + /* There was a `/' preceeded by a `+' in the pathname. If it is a CDF then we will need to copy the input pathname to our return buffer so we can insert the extra `/'s. Since we can't tell yet whether or not it is a CDF we will just always copy the @@ -1020,7 +1020,7 @@ add_cdf_double_slashes (input_name) ret_size = n; } - /* Clear the `/' after this component, so we can stat the pathname + /* Clear the `/' after this component, so we can stat the pathname up to and including this component. */ ++p; *p = '\0'; diff --git a/gnu/usr.bin/cvs/contrib/pcl-cvs/Makefile b/gnu/usr.bin/cvs/contrib/pcl-cvs/Makefile index 7f6f5b1..b072c71 100644 --- a/gnu/usr.bin/cvs/contrib/pcl-cvs/Makefile +++ b/gnu/usr.bin/cvs/contrib/pcl-cvs/Makefile @@ -1,4 +1,4 @@ -# @(#) Id: dist-makefile,v 1.19 1993/05/31 22:43:45 ceder Exp +# @(#) Id: dist-makefile,v 1.19 1993/05/31 22:43:45 ceder Exp # Makefile for pcl-cvs release 1.05. # Copyright (C) 1992, 1993 Per Cederqvist # @@ -53,7 +53,7 @@ elcfiles: all: elcfiles info -# Don't install the info file yet, since it requires makeinfo +# Don't install the info file yet, since it requires makeinfo # version 2.something (and version 1.something is distributed with emacs). # # install: install_elc install_info diff --git a/gnu/usr.bin/cvs/cvs/add.c b/gnu/usr.bin/cvs/cvs/add.c index e14c79c..b896829 100644 --- a/gnu/usr.bin/cvs/cvs/add.c +++ b/gnu/usr.bin/cvs/cvs/add.c @@ -1,25 +1,25 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * Add - * + * * Adds a file or directory to the RCS source repository. For a file, * the entry is marked as "needing to be added" in the user's own CVS * directory, and really added to the repository when it is committed. * For a directory, it is added at the appropriate place in the source * repository and a CVS directory is generated within the directory. - * + * * The -m option is currently the only supported option. Some may wish to * supply standard "rcs" options here, but I've found that this causes more * trouble than anything else. - * + * * The user files or directories must already exist. For a directory, it must * not already have a CVS file in it. - * + * * An "add" on a file that has been "remove"d but not committed will cause the * file to be resurrected. */ @@ -144,7 +144,7 @@ add (argc, argv) if (build_entry (repository, user, vers->options, message, entries, vers->tag) != 0) err++; - else + else { added_files++; if (!quiet) @@ -256,7 +256,7 @@ add (argc, argv) * The specified user file is really a directory. So, let's make sure that * it is created in the RCS source repository, and that the user's directory * is updated to include a CVS directory. - * + * * Returns 1 on failure, 0 on success. */ static int diff --git a/gnu/usr.bin/cvs/cvs/admin.c b/gnu/usr.bin/cvs/cvs/admin.c index 14a5b51..14afc8d 100644 --- a/gnu/usr.bin/cvs/cvs/admin.c +++ b/gnu/usr.bin/cvs/cvs/admin.c @@ -1,12 +1,12 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * Administration - * + * * For now, this is basically a front end for rcs. All options are passed * directly on. */ diff --git a/gnu/usr.bin/cvs/cvs/checkin.c b/gnu/usr.bin/cvs/cvs/checkin.c index 1f7691b..79037ae 100644 --- a/gnu/usr.bin/cvs/cvs/checkin.c +++ b/gnu/usr.bin/cvs/cvs/checkin.c @@ -1,17 +1,17 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * Check In - * + * * Does a very careful checkin of the file "user", and tries not to spoil its * modification time (to avoid needless recompilations). When RCS ID keywords * get expanded on checkout, however, the modification time is updated and * there is no good way to get around this. - * + * * Returns non-zero on error. */ diff --git a/gnu/usr.bin/cvs/cvs/checkout.c b/gnu/usr.bin/cvs/cvs/checkout.c index a5a79ad..e1bbc98 100644 --- a/gnu/usr.bin/cvs/cvs/checkout.c +++ b/gnu/usr.bin/cvs/cvs/checkout.c @@ -1,12 +1,12 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * Create Version - * + * * "checkout" creates a "version" of an RCS repository. This version is owned * totally by the user and is actually an independent copy, to be dealt with * as seen fit. Once "checkout" has been called in a given directory, it @@ -14,17 +14,17 @@ * "update" when he feels like it; this will supply him with a merge of his * own modifications and the changes made in the RCS original. See "update" * for details. - * + * * "checkout" can be given a list of directories or files to be updated and in * the case of a directory, will recursivley create any sub-directories that * exist in the repository. - * + * * When the user is satisfied with his own modifications, the present version * can be committed by "commit"; this keeps the present version in tact, * usually. - * + * * The call is cvs checkout [options] <module-name>... - * + * * "checkout" creates a directory ./CVS, in which it keeps its administration, * in two files, Repository and Entries. The first contains the name of the * repository. The second contains one line for each registered file, @@ -337,12 +337,12 @@ checkout_proc (pargc, argv, where, mwhere, mfile, shorten, char *realdirs; /* - * OK, so we're doing the checkout! Our args are as follows: - * argc,argv contain either dir or dir followed by a list of files - * where contains where to put it (if supplied by checkout) - * mwhere contains the module name or -d from module file + * OK, so we're doing the checkout! Our args are as follows: + * argc,argv contain either dir or dir followed by a list of files + * where contains where to put it (if supplied by checkout) + * mwhere contains the module name or -d from module file * mfile says do only that part of the module - * shorten = TRUE says shorten as much as possible + * shorten = TRUE says shorten as much as possible * omodule is the original arg to do_module() */ @@ -370,8 +370,8 @@ checkout_proc (pargc, argv, where, mwhere, mfile, shorten, * the rest of the path onto where if where is filled in * otherwise tack the rest of the path onto mwhere and make that * the where - * - * If shorten is enabled, we might use mwhere to set where if + * + * If shorten is enabled, we might use mwhere to set where if * nobody set it yet, so we'll need to setup mwhere as the last * component of the path we are tacking onto repository */ @@ -409,7 +409,7 @@ checkout_proc (pargc, argv, where, mwhere, mfile, shorten, * At this point, if shorten is not enabled, we make where either * where with mfile concatenated, or if where hadn't been set we * set it to mwhere with mfile concatenated. - * + * * If shorten is enabled and where hasn't been set yet, then where * becomes mfile */ diff --git a/gnu/usr.bin/cvs/cvs/classify.c b/gnu/usr.bin/cvs/cvs/classify.c index ff9305d..0253b3d 100644 --- a/gnu/usr.bin/cvs/cvs/classify.c +++ b/gnu/usr.bin/cvs/cvs/classify.c @@ -1,10 +1,10 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * */ #include "cvs.h" diff --git a/gnu/usr.bin/cvs/cvs/commit.c b/gnu/usr.bin/cvs/cvs/commit.c index cb36e9f..fd79d61 100644 --- a/gnu/usr.bin/cvs/cvs/commit.c +++ b/gnu/usr.bin/cvs/cvs/commit.c @@ -1,17 +1,17 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * Commit Files - * + * * "commit" commits the present version to the RCS repository, AFTER * having done a test on conflicts. * * The call is: cvs commit [options] files... - * + * */ #include "cvs.h" @@ -26,7 +26,7 @@ static int check_fileproc PROTO((char *file, char *update_dir, char *repository, List * entries, List * srcfiles)); static int check_filesdoneproc PROTO((int err, char *repos, char *update_dir)); static int checkaddfile PROTO((char *file, char *repository, char *tag, - List *srcfiles)); + List *srcfiles)); static Dtype commit_direntproc PROTO((char *dir, char *repos, char *update_dir)); static int commit_dirleaveproc PROTO((char *dir, int err, char *update_dir)); static int commit_fileproc PROTO((char *file, char *update_dir, char *repository, @@ -488,7 +488,7 @@ check_fileproc (file, update_dir, repository, entries, srcfiles) run_arg (RCS_MERGE_PAT); run_arg (file); retcode = run_exec (RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL); - + if (retcode == -1) { if (update_dir[0] == '\0') @@ -679,7 +679,7 @@ precommit_proc (repository, filter) if (filter[0] == '/') { char *s, *cp; - + s = xstrdup (filter); for (cp = s; *cp; cp++) if (isspace (*cp)) @@ -1039,7 +1039,7 @@ remove_file (file, repository, tag, message, entries, srcfiles) else { /* this was the head; really move it into the Attic */ - tmp = xmalloc(strlen(repository) + + tmp = xmalloc(strlen(repository) + sizeof('/') + sizeof(CVSATTIC) + sizeof('/') + @@ -1050,7 +1050,7 @@ remove_file (file, repository, tag, message, entries, srcfiles) (void) mkdir (tmp, 0777); (void) umask (omask); (void) sprintf (tmp, "%s/%s/%s%s", repository, CVSATTIC, file, RCSEXT); - + if ((strcmp (rcs, tmp) == 0 || rename (rcs, tmp) != -1) || (!isreadable (rcs) && isreadable (tmp))) @@ -1253,7 +1253,7 @@ lock_RCS (user, rcs, rev, repository) * For a specified, numeric revision of the form "1" or "1.1", (or when * no revision is specified ""), definitely move the branch to the trunk * before locking the RCS file. - * + * * The assumption is that if there is more than one revision on the trunk, * the head points to the trunk, not a branch... and as such, it's not * necessary to move the head in this case. diff --git a/gnu/usr.bin/cvs/cvs/create_adm.c b/gnu/usr.bin/cvs/cvs/create_adm.c index 55eb649..cceeb77 100644 --- a/gnu/usr.bin/cvs/cvs/create_adm.c +++ b/gnu/usr.bin/cvs/cvs/create_adm.c @@ -1,12 +1,12 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * Create Administration. - * + * * Creates a CVS administration directory based on the argument repository; the * "Entries" file is prefilled from the "initrecord" argument. */ diff --git a/gnu/usr.bin/cvs/cvs/cvs.h b/gnu/usr.bin/cvs/cvs/cvs.h index 95c6a9b..eb7d6c0 100644 --- a/gnu/usr.bin/cvs/cvs/cvs.h +++ b/gnu/usr.bin/cvs/cvs/cvs.h @@ -46,7 +46,7 @@ char *alloca (); #if __GNUC__ == 2 #define USE(var) static char sizeof##var = sizeof(sizeof##var) + sizeof(var); #else -#define USE(var) +#define USE(var) #endif @@ -54,7 +54,7 @@ char *alloca (); #ifdef HAVE_UNISTD_H #include <unistd.h> -#endif +#endif #ifdef HAVE_STRING_H #include <string.h> @@ -111,10 +111,10 @@ extern int errno; /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * Definitions for the CVS Administrative directory and the files it contains. * Here as #define's to make changing the names a simple task. */ @@ -213,7 +213,7 @@ extern int errno; /* * If the beginning of the Repository matches the following string, strip it * so that the output to the logfile does not contain a full pathname. - * + * * If the CVSROOT environment variable is set, it overrides this define. */ #define REPOS_STRIP "/master/" @@ -258,7 +258,7 @@ typedef enum classify_type Ctype; /* * a struct vers_ts contains all the information about a file including the * user and rcs file names, and the version checked out and the head. - * + * * this is usually obtained from a call to Version_TS which takes a tag argument * for the RCS file if desired */ @@ -266,15 +266,15 @@ struct vers_ts { char *vn_user; /* rcs version user file derives from * it can have the following special - * values: - * empty = no user file + * values: + * empty = no user file * 0 = user file is new * -vers = user file to be removed */ char *vn_rcs; /* the version for the rcs file * (tag version?) */ char *ts_user; /* the timestamp for the user file */ char *ts_rcs; /* the user timestamp from entries */ - char *options; /* opts from Entries file + char *options; /* opts from Entries file * (keyword expansion) */ char *ts_conflict; /* Holds time_stamp of conflict */ char *tag; /* tag stored in the Entries file */ diff --git a/gnu/usr.bin/cvs/cvs/cvsrc.c b/gnu/usr.bin/cvs/cvs/cvsrc.c index fedd020..0e47067 100644 --- a/gnu/usr.bin/cvs/cvs/cvsrc.c +++ b/gnu/usr.bin/cvs/cvs/cvsrc.c @@ -38,7 +38,7 @@ read_cvsrc (argc, argv) FILE *cvsrcfile; char linebuf [MAXLINELEN]; - + char *optstart; int found = 0; @@ -102,13 +102,13 @@ read_cvsrc (argc, argv) { /* skip over command in the options line */ optstart = strtok(linebuf+strlen((*argv)[0]), "\t \n"); - + do { new_argv [new_argc] = xstrdup (optstart); new_argv [new_argc+1] = NULL; new_argc += 1; - + if (new_argc >= max_new_argv) { char **tmp_argv; @@ -119,13 +119,13 @@ read_cvsrc (argc, argv) free(new_argv); new_argv = tmp_argv; } - + } while (optstart = strtok (NULL, "\t \n")); } /* now copy the remaining arguments */ - + for (i=1; i < *argc; i++) { new_argv [new_argc] = (*argv)[i]; diff --git a/gnu/usr.bin/cvs/cvs/diff.c b/gnu/usr.bin/cvs/cvs/diff.c index 99d8c18..0ea1d85 100644 --- a/gnu/usr.bin/cvs/cvs/diff.c +++ b/gnu/usr.bin/cvs/cvs/diff.c @@ -1,15 +1,15 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * Difference - * + * * Run diff against versions in the repository. Options that are specified are * passed on directly to "rcsdiff". - * + * * Without any file arguments, runs diff against all the currently modified * files. */ diff --git a/gnu/usr.bin/cvs/cvs/entries.c b/gnu/usr.bin/cvs/cvs/entries.c index 0dfd165..4970727 100644 --- a/gnu/usr.bin/cvs/cvs/entries.c +++ b/gnu/usr.bin/cvs/cvs/entries.c @@ -1,12 +1,12 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * Entries file to Files file - * + * * Creates the file Files containing the names that comprise the project, from * the Entries file. */ diff --git a/gnu/usr.bin/cvs/cvs/find_names.c b/gnu/usr.bin/cvs/cvs/find_names.c index a77807b..1bdeaa9 100644 --- a/gnu/usr.bin/cvs/cvs/find_names.c +++ b/gnu/usr.bin/cvs/cvs/find_names.c @@ -1,17 +1,17 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * Find Names - * + * * Finds all the pertinent file names, both from the administration and from the * repository - * + * * Find Dirs - * + * * Finds all pertinent sub-directories of the checked out instantiation and the * repository (and optionally the attic) */ @@ -174,7 +174,7 @@ find_rcs (dir, list) /* read the dir, grabbing the ,v files */ while ((dp = readdir (dirp)) != NULL) { - if (fnmatch (RCSPAT, dp->d_name, 0) == 0) + if (fnmatch (RCSPAT, dp->d_name, 0) == 0) { char *comma; @@ -221,7 +221,7 @@ find_dirs (dir, list, checkadm) continue; #ifdef DT_DIR - if (dp->d_type != DT_DIR) + if (dp->d_type != DT_DIR) { if (dp->d_type != DT_UNKNOWN && dp->d_type != DT_LNK) continue; diff --git a/gnu/usr.bin/cvs/cvs/history.c b/gnu/usr.bin/cvs/cvs/history.c index acec3cf..7b9cb35 100644 --- a/gnu/usr.bin/cvs/cvs/history.c +++ b/gnu/usr.bin/cvs/cvs/history.c @@ -485,7 +485,7 @@ history (argc, argv) #ifndef HAVE_RCS5 error (0, 0, "-z not supported with RCS 4"); #else - tz_local = + tz_local = (optarg[0] == 'l' || optarg[0] == 'L') && (optarg[1] == 't' || optarg[1] == 'T') && !optarg[2]; diff --git a/gnu/usr.bin/cvs/cvs/ignore.c b/gnu/usr.bin/cvs/cvs/ignore.c index 0005f40..74c1195 100644 --- a/gnu/usr.bin/cvs/cvs/ignore.c +++ b/gnu/usr.bin/cvs/cvs/ignore.c @@ -11,7 +11,7 @@ USE(rcsid) /* * Ignore file section. - * + * * "!" may be included any time to reset the list (i.e. ignore nothing); * "*" may be specified to ignore everything. It stays as the first * element forever, unless a "!" clears it out. diff --git a/gnu/usr.bin/cvs/cvs/import.c b/gnu/usr.bin/cvs/cvs/import.c index 2d2cdb8..5452eff 100644 --- a/gnu/usr.bin/cvs/cvs/import.c +++ b/gnu/usr.bin/cvs/cvs/import.c @@ -1,13 +1,13 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * "import" checks in the vendor release located in the current directory into * the CVS source repository. The CVS vendor branch support is utilized. - * + * * At least three arguments are expected to follow the options: * repository Where the source belongs relative to the CVSROOT * VendorTag Vendor's major tag @@ -180,7 +180,7 @@ import (argc, argv) if (use_editor) { do_editor ((char *) NULL, &message, repository, - (List *) NULL); + (List *) NULL); } msglen = message == NULL ? 0 : strlen (message); @@ -402,7 +402,7 @@ update_rcs_file (message, vfile, vtag, targc, targv, inattic) int retcode = 0; tmpdir = getenv ("TMPDIR"); - if (tmpdir == NULL || tmpdir[0] == '\0') + if (tmpdir == NULL || tmpdir[0] == '\0') tmpdir = "/tmp"; (void) sprintf (xtmpfile, "%s/cvs-imp%d", tmpdir, getpid()); @@ -412,7 +412,7 @@ update_rcs_file (message, vfile, vtag, targc, targv, inattic) * this revision with the import file; if they match exactly, there * is no need to install the new import file as a new revision to the * branch. Just tag the revision with the new import tags. - * + * * This is to try to cut down the number of "C" conflict messages for * locally modified import source files. */ @@ -573,7 +573,7 @@ add_tags (rcs, vfile, vtag, targc, targv) if ((retcode = run_exec (RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL)) != 0) { ierrno = errno; - fperror (logfp, 0, retcode == -1 ? ierrno : 0, + fperror (logfp, 0, retcode == -1 ? ierrno : 0, "ERROR: Failed to set tag %s in %s", vtag, rcs); error (0, retcode == -1 ? ierrno : 0, "ERROR: Failed to set tag %s in %s", vtag, rcs); @@ -588,7 +588,7 @@ add_tags (rcs, vfile, vtag, targc, targv) if ((retcode = run_exec (RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL)) != 0) { ierrno = errno; - fperror (logfp, 0, retcode == -1 ? ierrno : 0, + fperror (logfp, 0, retcode == -1 ? ierrno : 0, "WARNING: Couldn't add tag %s to %s", targv[i], rcs); error (0, retcode == -1 ? ierrno : 0, "WARNING: Couldn't add tag %s to %s", targv[i], rcs); @@ -963,7 +963,7 @@ add_log (ch, fname) * This is the recursive function that walks the argument directory looking * for sub-directories that have CVS administration files in them and updates * them recursively. - * + * * Note that we do not follow symbolic links here, which is a feature! */ static int @@ -1061,7 +1061,7 @@ strn2expmode(s, n) size_t n; { char const *const *p; - + for (p = expand_names; *p; ++p) if (memcmp(*p,s,n) == 0 && !(*p)[n]) return p - expand_names; diff --git a/gnu/usr.bin/cvs/cvs/lock.c b/gnu/usr.bin/cvs/cvs/lock.c index 940e963..7274a7e 100644 --- a/gnu/usr.bin/cvs/cvs/lock.c +++ b/gnu/usr.bin/cvs/cvs/lock.c @@ -1,12 +1,12 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * Set Lock - * + * * Lock file support for CVS. */ @@ -147,7 +147,7 @@ Reader_Lock (xrepository) } if (readlock[0] == '\0') - (void) sprintf (readlock, + (void) sprintf (readlock, #ifdef HAVE_LONG_FILE_NAMES "%s.%s.%d", CVSRFL, hostname, #else @@ -422,7 +422,7 @@ again: { #ifdef CVS_FUDGELOCKS /* - * If the create time of the file is more than CVSLCKAGE + * If the create time of the file is more than CVSLCKAGE * seconds ago, try to clean-up the lock file, and if * successful, re-open the directory and try again. */ diff --git a/gnu/usr.bin/cvs/cvs/log.c b/gnu/usr.bin/cvs/cvs/log.c index 4c3718e..15cb23a 100644 --- a/gnu/usr.bin/cvs/cvs/log.c +++ b/gnu/usr.bin/cvs/cvs/log.c @@ -1,12 +1,12 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * Print Log Information - * + * * Prints the RCS "log" (rlog) information for the specified files. With no * argument, prints the log information for all the files in the directory * (recursive by default). @@ -100,7 +100,7 @@ log_fileproc (file, update_dir, repository, entries, srcfiles) if (p != NULL) { Entnode *e; - + e = (Entnode *) p->data; if (e->version[0] == '0' || e->version[1] == '\0') { @@ -110,10 +110,10 @@ log_fileproc (file, update_dir, repository, entries, srcfiles) return(0); } } - + if (!really_quiet) error (0, 0, "nothing known about %s", file); - + return (1); } diff --git a/gnu/usr.bin/cvs/cvs/logmsg.c b/gnu/usr.bin/cvs/cvs/logmsg.c index 8fd0b2d..1f8dd3e 100644 --- a/gnu/usr.bin/cvs/cvs/logmsg.c +++ b/gnu/usr.bin/cvs/cvs/logmsg.c @@ -1,7 +1,7 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. */ @@ -14,7 +14,7 @@ USE(rcsid) #endif /* this is slightly dangerous, since it could conflict with other systems' - * own prototype. + * own prototype. */ #if 0 /* Which is why I'll nuke this */ @@ -123,11 +123,11 @@ fmt_proc (p, closure) * Builds a temporary file using setup_tmpfile() and invokes the user's * editor on the file. The header garbage in the resultant file is then * stripped and the log message is stored in the "message" argument. - * + * * rcsinfo - is the name of a file containing lines tacked onto the end of the * RCS info offered to the user for editing. If specified, the '-m' flag to * "commit" is disabled -- users are forced to run the editor. - * + * */ void do_editor (dir, messagep, repository, changes) diff --git a/gnu/usr.bin/cvs/cvs/modules.c b/gnu/usr.bin/cvs/cvs/modules.c index 384fbfd..2bd8277 100644 --- a/gnu/usr.bin/cvs/cvs/modules.c +++ b/gnu/usr.bin/cvs/cvs/modules.c @@ -51,7 +51,7 @@ open_module () if (CVSroot == NULL) { - (void) fprintf (stderr, + (void) fprintf (stderr, "%s: must set the CVSROOT environment variable\n", program_name); error (1, 0, "or specify the '-d' option to %s", program_name); diff --git a/gnu/usr.bin/cvs/cvs/no_diff.c b/gnu/usr.bin/cvs/cvs/no_diff.c index ec3e641..f43f58b 100644 --- a/gnu/usr.bin/cvs/cvs/no_diff.c +++ b/gnu/usr.bin/cvs/cvs/no_diff.c @@ -1,16 +1,16 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * No Difference - * + * * The user file looks modified judging from its time stamp; however it needn't * be. No_difference() finds out whether it is or not. If it is not, it * updates the administration. - * + * * returns 0 if no differences are found and non-zero otherwise */ diff --git a/gnu/usr.bin/cvs/cvs/options.h b/gnu/usr.bin/cvs/cvs/options.h index ad07c14..bdcc02e 100644 --- a/gnu/usr.bin/cvs/cvs/options.h +++ b/gnu/usr.bin/cvs/cvs/options.h @@ -1,16 +1,16 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * This file holds (most of) the configuration tweaks that can be made to * customize CVS for your site. CVS comes configured for a typical SunOS 4.x * environment. The comments for each configurable item are intended to be * self-explanatory. All #defines are tested first to see if an over-riding * option was specified on the "make" command line. - * + * * If special libraries are needed, you will have to edit the Makefile.in file * or the configure script directly. Sorry. */ @@ -33,7 +33,7 @@ * you should turn on the following define. It only exists to try to do * reasonable things with your existing checked out files when you upgrade to * RCS V5, since the keyword expansion formats have changed with RCS V5. - * + * * If you already have been running with RCS5, or haven't been running with CVS * yet at all, or are sticking with RCS V4 for now, leave the commented out. */ @@ -56,7 +56,7 @@ * must support the "-c" option for context diffing. Specify a full pathname * if your site wants to use a particular diff. If you are using the GNU * version of diff (version 1.15 or later), this should be "diff -a". - * + * * NOTE: this program is only used for the ``patch'' sub-command. The other * commands use rcsdiff which will use whatever version of diff was specified * when rcsdiff was built on your system. @@ -100,7 +100,7 @@ * this here will cause all RCS programs to be executed from this directory, * unless the user overrides the default with the RCSBIN environment variable * or the "-b" option to CVS. - * + * * This define should be either the empty string ("") or a full pathname to the * directory containing all the installed programs from the RCS distribution. */ @@ -123,7 +123,7 @@ * The Repository file holds the path to the directory within the source * repository that contains the RCS ,v files for each CVS working directory. * This path is either a full-path or a path relative to CVSROOT. - * + * * The only advantage that I can see to having a relative path is that One can * change the physical location of the master source repository, change one's * CVSROOT environment variable, and CVS will work without problems. I diff --git a/gnu/usr.bin/cvs/cvs/parseinfo.c b/gnu/usr.bin/cvs/cvs/parseinfo.c index 17cf1da..df232d6 100644 --- a/gnu/usr.bin/cvs/cvs/parseinfo.c +++ b/gnu/usr.bin/cvs/cvs/parseinfo.c @@ -1,7 +1,7 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. */ @@ -15,7 +15,7 @@ USE(rcsid) /* * Parse the INFOFILE file for the specified REPOSITORY. Invoke CALLPROC for - * each line in the file that matches the REPOSITORY. + * each line in the file that matches the REPOSITORY. * Return 0 for success, -1 if there was not an INFOFILE, and >0 for failure. */ int diff --git a/gnu/usr.bin/cvs/cvs/patch.c b/gnu/usr.bin/cvs/cvs/patch.c index 69e5b09..188d499 100644 --- a/gnu/usr.bin/cvs/cvs/patch.c +++ b/gnu/usr.bin/cvs/cvs/patch.c @@ -1,12 +1,12 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * Patch - * + * * Create a Larry Wall format "patch" file between a previous release and the * current head of a module, or between two releases. Can specify the * release as either a date or a revision number. diff --git a/gnu/usr.bin/cvs/cvs/rcs.c b/gnu/usr.bin/cvs/cvs/rcs.c index 2c424d9..b726c79 100644 --- a/gnu/usr.bin/cvs/cvs/rcs.c +++ b/gnu/usr.bin/cvs/cvs/rcs.c @@ -1,9 +1,9 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * The routines contained in this file do all the rcs file parsing and * manipulation */ @@ -113,7 +113,7 @@ RCS_addnode (file, rcs, list) List *list; { Node *p; - + p = getnode (); p->key = xstrdup (file); p->delproc = rcsnode_delproc; @@ -136,10 +136,10 @@ RCS_parse (file, repos) char rcsfile[PATH_MAX]; (void) sprintf (rcsfile, "%s/%s%s", repos, file, RCSEXT); - if ((fp = fopen (rcsfile, "r")) != NULL) + if ((fp = fopen (rcsfile, "r")) != NULL) { rcs = RCS_parsercsfile_i(fp, rcsfile); - if (rcs != NULL) + if (rcs != NULL) rcs->flags |= VALID; fclose (fp); @@ -147,7 +147,7 @@ RCS_parse (file, repos) } (void) sprintf (rcsfile, "%s/%s/%s%s", repos, CVSATTIC, file, RCSEXT); - if ((fp = fopen (rcsfile, "r")) != NULL) + if ((fp = fopen (rcsfile, "r")) != NULL) { rcs = RCS_parsercsfile_i(fp, rcsfile); if (rcs != NULL) @@ -429,16 +429,16 @@ null_delproc (p) /* * getrcskey - fill in the key and value from the rcs file the algorithm is - * as follows + * as follows * - * o skip whitespace o fill in key with everything up to next white - * space or semicolon - * o if key == "desc" then key and data are NULL and return -1 - * o if key wasn't terminated by a semicolon, skip white space and fill + * o skip whitespace o fill in key with everything up to next white + * space or semicolon + * o if key == "desc" then key and data are NULL and return -1 + * o if key wasn't terminated by a semicolon, skip white space and fill * in value with everything up to a semicolon o compress all whitespace - * down to a single space + * down to a single space * o if a word starts with @, do funky rcs processing - * o strip whitespace off end of value or set value to NULL if it empty + * o strip whitespace off end of value or set value to NULL if it empty * o return 0 since we found something besides "desc" */ @@ -739,10 +739,10 @@ do_branches (list, val) /* * Version Number - * + * * Returns the requested version number of the RCS file, satisfying tags and/or * dates, and walking branches, if necessary. - * + * * The result is returned; null-string if error. */ char * @@ -788,7 +788,7 @@ RCS_getversion (rcs, tag, date, force_tag_match) * If force_tag_match is set, return NULL if an exact match is not * possible otherwise return RCS_head (). We are careful to look for * and handle "magic" revisions specially. - * + * * If the matched tag is a branch tag, find the head of the branch. */ char * @@ -1410,7 +1410,7 @@ RCS_datecmp (date1, date2) * Lookup the specified revision in the ,v file and return, in the date * argument, the date specified for the revision *minus one second*, so that * the logically previous revision will be found later. - * + * * Returns zero on failure, RCS revision time as a Unix "time_t" on success. */ time_t diff --git a/gnu/usr.bin/cvs/cvs/rcs.h b/gnu/usr.bin/cvs/cvs/rcs.h index 6d6ecd4..cadc1bd 100644 --- a/gnu/usr.bin/cvs/cvs/rcs.h +++ b/gnu/usr.bin/cvs/cvs/rcs.h @@ -3,10 +3,10 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * RCS source control definitions needed by rcs.c and friends */ diff --git a/gnu/usr.bin/cvs/cvs/recurse.c b/gnu/usr.bin/cvs/cvs/recurse.c index 5ea344c..6fe2a7c 100644 --- a/gnu/usr.bin/cvs/cvs/recurse.c +++ b/gnu/usr.bin/cvs/cvs/recurse.c @@ -1,11 +1,11 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * General recursion handler - * + * */ #include "cvs.h" @@ -145,7 +145,7 @@ start_recursion (fileproc, filesdoneproc, direntproc, dirleaveproc, * other possibility is named entities whicha are not currently in * the working directory. */ - + for (i = 0; i < argc; i++) { /* if this argument is a directory, then add it to the list of @@ -197,7 +197,7 @@ start_recursion (fileproc, filesdoneproc, direntproc, dirleaveproc, /* otherwise, look for it in the repository. */ char *save_update_dir; char *repos; - + /* save & set (aka push) update_dir */ save_update_dir = xstrdup (update_dir); @@ -205,11 +205,11 @@ start_recursion (fileproc, filesdoneproc, direntproc, dirleaveproc, (void) strcat (update_dir, "/"); (void) strcat (update_dir, dir); - + /* look for it in the repository. */ repos = Name_Repository (dir, update_dir); (void) sprintf (tmp, "%s/%s", repos, comp); - + if (isdir(tmp)) addlist (&dirlist, argv[i]); else diff --git a/gnu/usr.bin/cvs/cvs/release.c b/gnu/usr.bin/cvs/cvs/release.c index a6200d9..26eff95 100644 --- a/gnu/usr.bin/cvs/cvs/release.c +++ b/gnu/usr.bin/cvs/cvs/release.c @@ -1,10 +1,10 @@ /* * Release: "cancel" a checkout in the history log. - * + * * - Don't allow release if anything is active - Don't allow release if not * above or inside repository. - Don't allow release if ./CVS/Repository is * not the same as the directory specified in the module database. - * + * * - Enter a line in the history log indicating the "release". - If asked to, * delete the local working directory. */ @@ -215,6 +215,6 @@ release_delete (dir) run_setup ("%s -fr", RM); run_arg (dir); if ((retcode = run_exec (RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL)) != 0) - error (0, retcode == -1 ? errno : 0, + error (0, retcode == -1 ? errno : 0, "deletion of module %s failed.", dir); } diff --git a/gnu/usr.bin/cvs/cvs/remove.c b/gnu/usr.bin/cvs/cvs/remove.c index 0a893d1..ed4bb2b 100644 --- a/gnu/usr.bin/cvs/cvs/remove.c +++ b/gnu/usr.bin/cvs/cvs/remove.c @@ -1,15 +1,15 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * Remove a File - * + * * Removes entries from the present version. The entries will be removed from * the RCS repository upon the next "commit". - * + * * "remove" accepts no options, only file names that are to be removed. The * file must not exist in the current directory for "remove" to work * correctly. diff --git a/gnu/usr.bin/cvs/cvs/repos.c b/gnu/usr.bin/cvs/cvs/repos.c index e7794d4..131324a 100644 --- a/gnu/usr.bin/cvs/cvs/repos.c +++ b/gnu/usr.bin/cvs/cvs/repos.c @@ -1,12 +1,12 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * Name of Repository - * + * * Determine the name of the RCS repository and sets "Repository" accordingly. */ diff --git a/gnu/usr.bin/cvs/cvs/root.c b/gnu/usr.bin/cvs/cvs/root.c index 9ff9ffa..0b71a3d 100644 --- a/gnu/usr.bin/cvs/cvs/root.c +++ b/gnu/usr.bin/cvs/cvs/root.c @@ -3,12 +3,12 @@ * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * Name of Root - * + * * Determine the path to the CVSROOT and set "Root" accordingly. * If this looks like of modified clone of Name_Repository() in - * repos.c, it is... + * repos.c, it is... */ #include "cvs.h" @@ -131,7 +131,7 @@ same_directories (dir1, dir2) return (0); if (stat (dir2, &sb2) < 0) return (0); - + ret = 0; if ( (memcmp( &sb1.st_dev, &sb2.st_dev, sizeof(dev_t) ) == 0) && (memcmp( &sb1.st_ino, &sb2.st_ino, sizeof(ino_t) ) == 0)) diff --git a/gnu/usr.bin/cvs/cvs/rtag.c b/gnu/usr.bin/cvs/cvs/rtag.c index c10f68b..7972451 100644 --- a/gnu/usr.bin/cvs/cvs/rtag.c +++ b/gnu/usr.bin/cvs/cvs/rtag.c @@ -1,12 +1,12 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * Rtag - * + * * Add or delete a symbolic name to an RCS file, or a collection of RCS files. * Uses the modules database, if necessary. */ @@ -50,7 +50,7 @@ static char *rtag_usage[] = "\t-d\tDelete the given Tag.\n", "\t-b\tMake the tag a \"branch\" tag, allowing concurrent development.\n", "\t-[rD]\tExisting tag or Date.\n", - "\t-F\tMove tag if it already exists\n", + "\t-F\tMove tag if it already exists\n", NULL }; @@ -135,7 +135,7 @@ rtag (argc, argv) for (i = 0; i < argc; i++) { /* XXX last arg should be repository, but doesn't make sense here */ - history_write ('T', (delete ? "D" : (numtag ? numtag : + history_write ('T', (delete ? "D" : (numtag ? numtag : (date ? date : "A"))), symtag, argv[i], ""); err += do_module (db, argv[i], TAG, delete ? "Untagging" : "Tagging", rtag_proc, (char *) NULL, 0, 0, run_module_prog, @@ -304,7 +304,7 @@ rtag_fileproc (file, update_dir, repository, entries, srcfiles) else { char *oversion; - + /* * As an enhancement for the case where a tag is being re-applied to * a large body of a module, make one extra call to Version_Number to @@ -330,16 +330,16 @@ rtag_fileproc (file, update_dir, repository, entries, srcfiles) free (version); return (0); } - + if (!force_tag_move) { /* we're NOT going to move the tag */ if (update_dir[0]) (void) printf ("W %s/%s", update_dir, file); else (void) printf ("W %s", file); - - (void) printf (" : %s already exists on %s %s", + + (void) printf (" : %s already exists on %s %s", symtag, isbranch ? "branch" : "version", oversion); - (void) printf (" : NOT MOVING tag to %s %s\n", + (void) printf (" : NOT MOVING tag to %s %s\n", branch_mode ? "branch" : "version", rev); free (oversion); free (version); @@ -366,10 +366,10 @@ rtag_fileproc (file, update_dir, repository, entries, srcfiles) * If -d is specified, "force_tag_match" is set, so that this call to * Version_Number() will return a NULL version string if the symbolic * tag does not exist in the RCS file. - * + * * If the -r flag was used, numtag is set, and we only delete the * symtag from files that have numtag. - * + * * This is done here because it's MUCH faster than just blindly calling * "rcs" to remove the tag... trust me. */ diff --git a/gnu/usr.bin/cvs/cvs/status.c b/gnu/usr.bin/cvs/cvs/status.c index 2f14a0b..05760de 100644 --- a/gnu/usr.bin/cvs/cvs/status.c +++ b/gnu/usr.bin/cvs/cvs/status.c @@ -1,10 +1,10 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * Status Information */ diff --git a/gnu/usr.bin/cvs/cvs/tag.c b/gnu/usr.bin/cvs/cvs/tag.c index fa7f162..e5a5d1a 100644 --- a/gnu/usr.bin/cvs/cvs/tag.c +++ b/gnu/usr.bin/cvs/cvs/tag.c @@ -1,12 +1,12 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * Tag - * + * * Add or delete a symbolic name to an RCS file, or a collection of RCS files. * Uses the checked out revision in the current directory. */ @@ -133,7 +133,7 @@ tag_fileproc (file, update_dir, repository, entries, srcfiles) * If -d is specified, "force_tag_match" is set, so that this call to * Version_Number() will return a NULL version string if the symbolic * tag does not exist in the RCS file. - * + * * This is done here because it's MUCH faster than just blindly calling * "rcs" to remove the tag... trust me. */ @@ -218,7 +218,7 @@ tag_fileproc (file, update_dir, repository, entries, srcfiles) int isbranch = RCS_isbranch (file, symtag, srcfiles); /* - * if versions the same and neither old or new are branches don't have + * if versions the same and neither old or new are branches don't have * to do anything */ if (strcmp (version, oversion) == 0 && !branch_mode && !isbranch) @@ -227,16 +227,16 @@ tag_fileproc (file, update_dir, repository, entries, srcfiles) freevers_ts (&vers); return (0); } - + if (!force_tag_move) { /* we're NOT going to move the tag */ if (update_dir[0]) (void) printf ("W %s/%s", update_dir, file); else (void) printf ("W %s", file); - (void) printf (" : %s already exists on %s %s", + (void) printf (" : %s already exists on %s %s", symtag, isbranch ? "branch" : "version", oversion); - (void) printf (" : NOT MOVING tag to %s %s\n", + (void) printf (" : NOT MOVING tag to %s %s\n", branch_mode ? "branch" : "version", rev); free (oversion); freevers_ts (&vers); diff --git a/gnu/usr.bin/cvs/cvs/update.c b/gnu/usr.bin/cvs/cvs/update.c index 9fdc0b4..d564f64 100644 --- a/gnu/usr.bin/cvs/cvs/update.c +++ b/gnu/usr.bin/cvs/cvs/update.c @@ -1,32 +1,32 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * "update" updates the version in the present directory with respect to the RCS * repository. The present version must have been created by "checkout". The * user can keep up-to-date by calling "update" whenever he feels like it. - * + * * The present version can be committed by "commit", but this keeps the version * in tact. - * + * * Arguments following the options are taken to be file names to be updated, * rather than updating the entire directory. - * + * * Modified or non-existent RCS files are checked out and reported as U * <user_file> - * + * * Modified user files are reported as M <user_file>. If both the RCS file and * the user file have been modified, the user file is replaced by the result * of rcsmerge, and a backup file is written for the user in .#file.version. * If this throws up irreconcilable differences, the file is reported as C * <user_file>, and as M <user_file> otherwise. - * + * * Files added but not yet committed are reported as A <user_file>. Files * removed but not yet committed are reported as R <user_file>. - * + * * If the current directory contains subdirectories that hold concurrent * versions, these are updated too. If the -d option was specified, new * directories added to the repository are automatically created and updated @@ -287,7 +287,7 @@ do_update (argc, argv, xoptions, xtag, xdate, xforce, local, xbuild, xaflag, * set to the path relative to where we started (for pretty printing). * repository is the repository. entries and srcfiles are the pre-parsed * entries and source control files. - * + * * This routine decides what needs to be done for each file and does the * appropriate magic for checkout */ @@ -311,7 +311,7 @@ update_file_proc (file, update_dir, repository, entries, srcfiles) /* * We just return success without doing anything if any of the really * funky cases occur - * + * * If there is still a valid RCS file, do a regular checkout type * operation */ @@ -1021,7 +1021,7 @@ join_file (file, srcfiles, vers, update_dir, entries) return; } } - + /* skip joining identical revs */ if (strcmp (rev2, vers->vn_user) == 0) /* no merge necessary */ { @@ -1035,7 +1035,7 @@ join_file (file, srcfiles, vers, update_dir, entries) /* if the first rev is missing, then it is implied to be the greatest common ancestor of both the join rev, and the checked out rev. */ - + tst = vers->vn_user; if (*tst == '!') { @@ -1107,7 +1107,7 @@ join_file (file, srcfiles, vers, update_dir, entries) "cannot find revision %s in file %s", join_rev2, file); return; } - + baserev = RCS_getversion (vers->srcfile, join_rev1, date_rev1, 1); if (baserev == NULL) { @@ -1117,7 +1117,7 @@ join_file (file, srcfiles, vers, update_dir, entries) free (rev); return; } - + /* * nothing to do if: * second revision matches our BASE revision (vn_user) && @@ -1129,7 +1129,7 @@ join_file (file, srcfiles, vers, update_dir, entries) /* might be the same branch. take a real look */ char *dot = strrchr (baserev, '.'); int len = (dot - baserev) + 1; - + if (strncmp (baserev, rev, len) == 0) return; } @@ -1144,12 +1144,12 @@ join_file (file, srcfiles, vers, update_dir, entries) free (rev); return; } - + baserev = RCS_whatbranch (file, join_rev1, srcfiles); if (baserev) { char *cp; - + /* we get a branch -- turn it into a revision, or NULL if trunk */ if ((cp = strrchr (baserev, '.')) == NULL) { @@ -1171,7 +1171,7 @@ join_file (file, srcfiles, vers, update_dir, entries) #endif /* OK, so we have two revisions; continue on */ - + /* * The users currently modified file is moved to a backup file name * ".#filename.version", so that it will stay around for a few days @@ -1272,7 +1272,7 @@ ignore_files (ilist, update_dir) #ifdef DT_DIR dp->d_type != DT_UNKNOWN || #endif - lstat(file, &sb) != -1) + lstat(file, &sb) != -1) { if ( @@ -1290,7 +1290,7 @@ ignore_files (ilist, update_dir) #ifdef S_ISLNK else if ( #ifdef DT_DIR - dp->d_type == DT_LNK || dp->d_type == DT_UNKNOWN && + dp->d_type == DT_LNK || dp->d_type == DT_UNKNOWN && #endif S_ISLNK(sb.st_mode)) { @@ -1298,7 +1298,7 @@ ignore_files (ilist, update_dir) } #endif } - + if (ign_name (file)) continue; (void) write_letter (file, '?', xdir); diff --git a/gnu/usr.bin/cvs/cvs/vers_ts.c b/gnu/usr.bin/cvs/cvs/vers_ts.c index 0bc1242..7164cdf 100644 --- a/gnu/usr.bin/cvs/cvs/vers_ts.c +++ b/gnu/usr.bin/cvs/cvs/vers_ts.c @@ -1,7 +1,7 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. */ @@ -145,7 +145,7 @@ Version_TS (repository, options, tag, date, user, force_tag_match, else vers_ts->vn_rcs = RCS_getversion (rcsdata, vers_ts->tag, vers_ts->date, force_tag_match); - } + } /* * If the source control file exists and has the requested revision, diff --git a/gnu/usr.bin/cvs/lib/alloca.c b/gnu/usr.bin/cvs/lib/alloca.c index b57659e..948c526 100644 --- a/gnu/usr.bin/cvs/lib/alloca.c +++ b/gnu/usr.bin/cvs/lib/alloca.c @@ -7,7 +7,7 @@ This implementation of the PWB library alloca() function, which is used to allocate space off the run-time stack so - that it is automatically reclaimed upon procedure exit, + that it is automatically reclaimed upon procedure exit, was inspired by discussions with J. Q. Johnson of Cornell. It should work under any C implementation that uses an diff --git a/gnu/usr.bin/cvs/lib/argmatch.c b/gnu/usr.bin/cvs/lib/argmatch.c index 327a27d..5f31cea 100644 --- a/gnu/usr.bin/cvs/lib/argmatch.c +++ b/gnu/usr.bin/cvs/lib/argmatch.c @@ -42,9 +42,9 @@ argmatch (arg, optlist) int arglen; /* Length of ARG. */ int matchind = -1; /* Index of first nonexact match. */ int ambiguous = 0; /* If nonzero, multiple nonexact match(es). */ - + arglen = strlen (arg); - + /* Test all elements for either exact match or abbreviated matches. */ for (i = 0; optlist[i]; i++) { diff --git a/gnu/usr.bin/cvs/lib/fnmatch.c b/gnu/usr.bin/cvs/lib/fnmatch.c index 2a05430..34a0f89 100644 --- a/gnu/usr.bin/cvs/lib/fnmatch.c +++ b/gnu/usr.bin/cvs/lib/fnmatch.c @@ -66,27 +66,27 @@ fnmatch (pattern, string, flags) (n == string || ((flags & FNM_PATHNAME) && n[-1] == '/'))) return FNM_NOMATCH; break; - + case '\\': if (!(flags & FNM_NOESCAPE)) c = *p++; if (*n != c) return FNM_NOMATCH; break; - + case '*': if ((flags & FNM_PERIOD) && *n == '.' && (n == string || ((flags & FNM_PATHNAME) && n[-1] == '/'))) return FNM_NOMATCH; - + for (c = *p++; c == '?' || c == '*'; c = *p++, ++n) if (((flags & FNM_PATHNAME) && *n == '/') || (c == '?' && *n == '\0')) return FNM_NOMATCH; - + if (c == '\0') return 0; - + { char c1 = (!(flags & FNM_NOESCAPE) && c == '\\') ? *p : c; for (--p; *n != '\0'; ++n) @@ -95,41 +95,41 @@ fnmatch (pattern, string, flags) return 0; return FNM_NOMATCH; } - + case '[': { /* Nonzero if the sense of the character class is inverted. */ register int not; - + if (*n == '\0') return FNM_NOMATCH; - + if ((flags & FNM_PERIOD) && *n == '.' && (n == string || ((flags & FNM_PATHNAME) && n[-1] == '/'))) return FNM_NOMATCH; - + not = (*p == '!' || *p == '^'); if (not) ++p; - + c = *p++; for (;;) { register char cstart = c, cend = c; - + if (!(flags & FNM_NOESCAPE) && c == '\\') cstart = cend = *p++; - + if (c == '\0') /* [ (unterminated) loses. */ return FNM_NOMATCH; - + c = *p++; - + if ((flags & FNM_PATHNAME) && c == '/') /* [/] can never match. */ return FNM_NOMATCH; - + if (c == '-' && *p != ']') { cend = *p++; @@ -139,17 +139,17 @@ fnmatch (pattern, string, flags) return FNM_NOMATCH; c = *p++; } - + if (*n >= cstart && *n <= cend) goto matched; - + if (c == ']') break; } if (!not) return FNM_NOMATCH; break; - + matched:; /* Skip the rest of the [...] that already matched. */ while (c != ']') @@ -157,7 +157,7 @@ fnmatch (pattern, string, flags) if (c == '\0') /* [... (unterminated) loses. */ return FNM_NOMATCH; - + c = *p++; if (!(flags & FNM_NOESCAPE) && c == '\\') /* 1003.2d11 is unclear if this is right. %%% */ @@ -167,12 +167,12 @@ fnmatch (pattern, string, flags) return FNM_NOMATCH; } break; - + default: if (c != *n) return FNM_NOMATCH; } - + ++n; } diff --git a/gnu/usr.bin/cvs/lib/hash.c b/gnu/usr.bin/cvs/lib/hash.c index afc554d..2e7444c 100644 --- a/gnu/usr.bin/cvs/lib/hash.c +++ b/gnu/usr.bin/cvs/lib/hash.c @@ -1,9 +1,9 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * Polk's hash list manager. So cool. */ @@ -203,7 +203,7 @@ freenode (p) /* * insert item p at end of list "list" (maybe hash it too) if hashing and it * already exists, return -1 and don't actually put it in the list - * + * * return 0 on success */ int @@ -392,7 +392,7 @@ printlist (list) (void) printf("List at 0x%p: list = 0x%p, HASHSIZE = %d, next = 0x%p\n", list, list->list, HASHSIZE, list->next); - + (void) walklist(list, printnode, NULL); return; diff --git a/gnu/usr.bin/cvs/lib/hash.h b/gnu/usr.bin/cvs/lib/hash.h index 8e10e81..f5dc375 100644 --- a/gnu/usr.bin/cvs/lib/hash.h +++ b/gnu/usr.bin/cvs/lib/hash.h @@ -2,7 +2,7 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. */ diff --git a/gnu/usr.bin/cvs/lib/myndbm.c b/gnu/usr.bin/cvs/lib/myndbm.c index 33ef49c..a8c9527 100644 --- a/gnu/usr.bin/cvs/lib/myndbm.c +++ b/gnu/usr.bin/cvs/lib/myndbm.c @@ -1,13 +1,13 @@ /* * Copyright (c) 1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * A simple ndbm-emulator for CVS. It parses a text file of the format: - * + * * key value - * + * * at dbm_open time, and loads the entire file into memory. As such, it is * probably only good for fairly small modules files. Ours is about 30K in * size, and this code works fine. diff --git a/gnu/usr.bin/cvs/lib/strerror.c b/gnu/usr.bin/cvs/lib/strerror.c index b0bec13..d4a3679 100644 --- a/gnu/usr.bin/cvs/lib/strerror.c +++ b/gnu/usr.bin/cvs/lib/strerror.c @@ -661,7 +661,7 @@ strerror (errnoval) /* In range, and a valid message. Just return the message. */ msg = sys_errlist[errnoval]; } - + return (msg); } diff --git a/gnu/usr.bin/cvs/lib/subr.c b/gnu/usr.bin/cvs/lib/subr.c index d3d40b1..3dc39bd 100644 --- a/gnu/usr.bin/cvs/lib/subr.c +++ b/gnu/usr.bin/cvs/lib/subr.c @@ -1,10 +1,10 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * Various useful functions for the CVS support code. */ @@ -394,7 +394,7 @@ unlink_file (f) /* * Compare "file1" to "file2". Return non-zero if they don't compare exactly. - * + * * mallocs a buffer large enough to hold the entire file and does two reads to * load the buffer and calls memcmp to do the cmp. This is reasonable, since * source files are typically not too large. @@ -535,10 +535,10 @@ getcaller () * arguments. The options to run_setup are essentially like printf(). The * arguments will be parsed into whitespace separated words and added to the * global run_argv list. - * + * * Then, optionally call run_arg() for each additional argument that you'd like * to pass to the executed program. - * + * * Finally, call run_exec() to execute the program with the specified arguments. * The execvp() syscall will be used, so that the PATH is searched correctly. * File redirections can be performed in the call to run_exec(). @@ -550,10 +550,10 @@ static int run_argc_allocated; /* VARARGS */ #if defined (HAVE_VPRINTF) && (defined (USE_PROTOTYPES) ? USE_PROTOTYPES : defined (__STDC__)) -void +void run_setup (char *fmt,...) #else -void +void run_setup (fmt, va_alist) char *fmt; va_dcl @@ -603,10 +603,10 @@ run_arg (s) /* VARARGS */ #if defined (HAVE_VPRINTF) && (defined (USE_PROTOTYPES) ? USE_PROTOTYPES : defined (__STDC__)) -void +void run_args (char *fmt,...) #else -void +void run_args (fmt, va_alist) char *fmt; va_dcl @@ -950,7 +950,7 @@ gca (rev1, rev2) int i; char c[2]; char *s[2]; - + for (i = 0; i < 2; ++i) { /* swap out the dot */ @@ -958,10 +958,10 @@ gca (rev1, rev2) if (s[i] != NULL) { c[i] = *s[i]; } - + /* read an int */ j[i] = atoi (p[i]); - + /* swap back the dot... */ if (s[i] != NULL) { *s[i] = c[i]; @@ -972,9 +972,9 @@ gca (rev1, rev2) /* or mark us at the end */ p[i] = NULL; } - + } - + /* use the lowest. */ (void) sprintf (gca + strlen (gca), "%d.", j[0] < j[1] ? j[0] : j[1]); @@ -1009,11 +1009,11 @@ gca (rev1, rev2) { /* we have a minor number. use it. */ q = gca + strlen (gca); - + *q++ = '.'; for ( ; *s != '.' && *s != '\0'; ) *q++ = *s++; - + *q = '\0'; } } @@ -1021,7 +1021,7 @@ gca (rev1, rev2) { /* if we have an even number of dots, then we have a branch. remove the last number in order to make it a revision. */ - + char *s; s = strrchr(gca, '.'); diff --git a/gnu/usr.bin/cvs/lib/system.h b/gnu/usr.bin/cvs/lib/system.h index 1f35065..3f69ca5 100644 --- a/gnu/usr.bin/cvs/lib/system.h +++ b/gnu/usr.bin/cvs/lib/system.h @@ -97,7 +97,7 @@ extern long timezone; ** On most systems MAXPATHLEN is defined in sys/param.h to be 1024. Of ** those that this is not true, again most define PATH_MAX in limits.h ** or sys/limits.h which usually gets included by limits.h. On the few -** remaining systems that neither statement is true, _POSIX_PATH_MAX +** remaining systems that neither statement is true, _POSIX_PATH_MAX ** is defined. ** ** So: @@ -125,7 +125,7 @@ extern long timezone; /* On MOST systems this will get you MAXPATHLEN */ #include <sys/param.h> -#ifndef PATH_MAX +#ifndef PATH_MAX # ifdef MAXPATHLEN # define PATH_MAX MAXPATHLEN # else @@ -232,10 +232,10 @@ char *getwd (); #endif #ifdef HAVE_SYS_DIR_H #include <sys/dir.h> -#endif +#endif #ifdef HAVE_NDIR_H #include <ndir.h> -#endif +#endif #endif /* not (DIRENT or _POSIX_VERSION) */ /* Convert B 512-byte blocks to kilobytes if K is nonzero, diff --git a/gnu/usr.bin/cvs/lib/version.c b/gnu/usr.bin/cvs/lib/version.c index 071b112..557d00a 100644 --- a/gnu/usr.bin/cvs/lib/version.c +++ b/gnu/usr.bin/cvs/lib/version.c @@ -3,10 +3,10 @@ * Copyright (c) 1994 Free Software Foundation, Inc. * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with this CVS source distribution. - * + * * version.c - the CVS version number */ diff --git a/gnu/usr.bin/cvs/mkmodules/mkmodules.c b/gnu/usr.bin/cvs/mkmodules/mkmodules.c index d5611de..6410559 100644 --- a/gnu/usr.bin/cvs/mkmodules/mkmodules.c +++ b/gnu/usr.bin/cvs/mkmodules/mkmodules.c @@ -1,12 +1,12 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * mkmodules - * + * * Re-build the modules database for the CVS system. Accepts one argument, * which is the directory that the modules,v file lives in. */ @@ -56,7 +56,7 @@ main (argc, argv) char *filename; char *errormsg; } *fileptr, filelist[] = { - {CVSROOTADM_LOGINFO, + {CVSROOTADM_LOGINFO, "no logging of 'cvs commit' messages is done without a %s file"}, {CVSROOTADM_RCSINFO, "a %s file can be used to configure 'cvs commit' templates"}, @@ -381,7 +381,7 @@ rename_rcsfile (temp, real) char bak[50]; struct stat statbuf; char rcs[PATH_MAX]; - + /* Set "x" bits if set in original. */ (void) sprintf (rcs, "%s%s", real, RCSEXT); statbuf.st_mode = 0; /* in case rcs file doesn't exist, but it should... */ diff --git a/gnu/usr.bin/dc/dc.c b/gnu/usr.bin/dc/dc.c index 229308f..a413253 100644 --- a/gnu/usr.bin/dc/dc.c +++ b/gnu/usr.bin/dc/dc.c @@ -1,4 +1,4 @@ -/* +/* * `dc' desk calculator utility. * * Copyright (C) 1984, 1993 Free Software Foundation, Inc. diff --git a/gnu/usr.bin/dc/decimal.c b/gnu/usr.bin/dc/decimal.c index 24f59ef..780de29 100644 --- a/gnu/usr.bin/dc/decimal.c +++ b/gnu/usr.bin/dc/decimal.c @@ -1,4 +1,4 @@ -/* +/* * Arbitrary precision decimal arithmetic. * * Copyright (C) 1984 Free Software Foundation, Inc. @@ -26,7 +26,7 @@ expected result is simply truncation, but all sorts of things happen instead. An example is that the result of .99999998/1 with scale set to 6 is .000001 - + There are some problems in the behavior of the decimal package related to printing and parsing. The printer is weird about very large output radices, tending to want @@ -161,7 +161,7 @@ decimal_zerop (b) /* Compare two decimal numbers arithmetically. The value is < 0 if b1 < b2, > 0 if b1 > b2, 0 if b1 = b2. This is the same way that `strcmp' reports the result of comparing - strings. */ + strings. */ int decimal_compare (b1, b2) @@ -187,7 +187,7 @@ decimal_compare (b1, b2) /* Else compare the numbers digit by digit from high end */ l1 = LENGTH(b1); - l2 = LENGTH(b2); + l2 = LENGTH(b2); s1 = b1->contents; /* Start of number -- don't back up digit pointer past here */ s2 = b2->contents; p1 = b1->contents + l1; /* Scanning pointer, for fetching digits. */ @@ -341,7 +341,7 @@ decimal_from_int (i) } /* Return (as an integer) the result of dividing decimal number `b' by - integer `divisor'. + integer `divisor'. This is used in printing decimal numbers in other radices. */ int @@ -411,7 +411,7 @@ decimal_print (b, charout, radix) if (radix == RADIX) { /* decimal output => just print the digits, inserting a point in - the proper place. */ + the proper place. */ int i; int before = b->before; int len = before + b->after; @@ -672,7 +672,7 @@ decimal_add1 (b1, b2) } /* subtract magnitude of b2 from that or b1, returning signed decimal - number. */ + number. */ static decimal decimal_sub1 (b1, b2) @@ -809,7 +809,7 @@ add_scaled (into, from, factor, scale) char *pi = into->contents + scale; int lengthf = LENGTH(from); int lengthi = LENGTH(into) - scale; - + int accum = 0; int i; @@ -822,9 +822,9 @@ add_scaled (into, from, factor, scale) *pi++ = accum % RADIX; } } - + /* Divide decimal number `b1' by `b2', keeping at most `digits' - fraction digits. + fraction digits. Returns the result as a decimal number. When division is not exact, the quotient is truncated toward zero. */ @@ -846,7 +846,7 @@ decimal_div (b1, b2, digits) int i; /* leading_divisor_digits contains the first two divisor digits, as - an integer */ + an integer */ int leading_divisor_digits = b2->contents[length2-1]*RADIX; if (length2 > 1) @@ -1026,7 +1026,7 @@ decimal_sqrt (d, frac_digits) frac_digits = MAX (frac_digits, d->after); - /* Compute an initial guess by taking the square root + /* Compute an initial guess by taking the square root of a nearby power of RADIX. */ if (d->before) diff --git a/gnu/usr.bin/dc/decimal.h b/gnu/usr.bin/dc/decimal.h index 49f749d..d2cab4d 100644 --- a/gnu/usr.bin/dc/decimal.h +++ b/gnu/usr.bin/dc/decimal.h @@ -1,4 +1,4 @@ -/* +/* * Header file for decimal.c (arbitrary precision decimal arithmetic) * * Copyright (C) 1984 Free Software Foundation, Inc. diff --git a/gnu/usr.bin/dialog/dialog.c b/gnu/usr.bin/dialog/dialog.c index 3056f1e..aafd777 100644 --- a/gnu/usr.bin/dialog/dialog.c +++ b/gnu/usr.bin/dialog/dialog.c @@ -25,7 +25,7 @@ * 19/12/93 - menu will now scroll if there are more items than can fit * on the screen. * - added 'checklist', a dialog box with a list of options that - * can be turned on or off. A list of options that are on is + * can be turned on or off. A list of options that are on is * returned on exit. * * 20/12/93 - Version 0.15 released. @@ -67,7 +67,7 @@ * 13/01/94 - some changes for easier porting to other Unix systems (tested * on Ultrix, SunOS and HPUX) * - Version 0.3 released. - * + * * 08/06/94 - Patches by Stuart Herbert - S.Herbert@shef.ac.uk * Fixed attr_clear and the textbox stuff to work with ncurses 1.8.5 * Fixed the wordwrap routine - it'll actually wrap properly now diff --git a/gnu/usr.bin/diff/analyze.c b/gnu/usr.bin/diff/analyze.c index 556d388..03f5647 100644 --- a/gnu/usr.bin/diff/analyze.c +++ b/gnu/usr.bin/diff/analyze.c @@ -332,7 +332,7 @@ diag (xoff, xlim, yoff, ylim, minimal, part) Note that XLIM, YLIM are exclusive bounds. All line numbers are origin-0 and discarded lines are not counted. - + If MINIMAL is nonzero, find a minimal difference no matter how expensive it is. */ diff --git a/gnu/usr.bin/diff/diff3.c b/gnu/usr.bin/diff/diff3.c index 1085c9b..50cb88d 100644 --- a/gnu/usr.bin/diff/diff3.c +++ b/gnu/usr.bin/diff/diff3.c @@ -163,7 +163,7 @@ static int simple_only; /* If nonzero, do not output information for non-overlapping diffs. */ static int overlap_only; -/* If nonzero, show information for 3_way and DIFF_2ND diffs. +/* If nonzero, show information for 3_way and DIFF_2ND diffs. 1= show 2nd only when 1st and 3rd differ 2= show 2nd when DIFF_2ND (1 and 3 have same change relative to 2) */ static int show_2nd; diff --git a/gnu/usr.bin/diff/ed.c b/gnu/usr.bin/diff/ed.c index 717ef35..24f7270 100644 --- a/gnu/usr.bin/diff/ed.c +++ b/gnu/usr.bin/diff/ed.c @@ -36,7 +36,7 @@ print_ed_script (script) static void print_ed_hunk (hunk) - struct change *hunk; + struct change *hunk; { int f0, l0, f1, l1; int deletes, inserts; @@ -180,7 +180,7 @@ print_rcs_hunk (hunk) and the number of lines deleted. */ fprintf (outfile, "%d %d\n", tf0, - (tl0 >= tf0 ? tl0 - tf0 + 1 : 1)); + (tl0 >= tf0 ? tl0 - tf0 + 1 : 1)); } if (inserts) @@ -191,7 +191,7 @@ print_rcs_hunk (hunk) translate_range (&files[1], f1, l1, &tf1, &tl1); fprintf (outfile, "%d %d\n", tl0, - (tl1 >= tf1 ? tl1 - tf1 + 1 : 1)); + (tl1 >= tf1 ? tl1 - tf1 + 1 : 1)); /* Print the inserted lines. */ for (i = f1; i <= l1; i++) diff --git a/gnu/usr.bin/diff/ifdef.c b/gnu/usr.bin/diff/ifdef.c index 4e81ef8..0dbfd43 100644 --- a/gnu/usr.bin/diff/ifdef.c +++ b/gnu/usr.bin/diff/ifdef.c @@ -336,7 +336,7 @@ print_ifdef_lines (out, format, group) case 'n': value = translate_line_number (file, from); break; - + default: goto bad_format; } diff --git a/gnu/usr.bin/diff/io.c b/gnu/usr.bin/diff/io.c index 95702ba..81d0260 100644 --- a/gnu/usr.bin/diff/io.c +++ b/gnu/usr.bin/diff/io.c @@ -47,7 +47,7 @@ struct equivclass /* Hash-table: array of buckets, each being a chain of equivalence classes. */ static int *buckets; - + /* Number of buckets in the hash table array. */ static int nbuckets; @@ -105,7 +105,7 @@ sip (current, skip_test) return binary_file_p (current->buffer, current->buffered_chars); } } - + current->buffered_chars = 0; return 0; } @@ -315,7 +315,7 @@ find_and_hash_each_line (current) - linbuf_base; } linbuf[line] = (char const *) p; - + if ((char const *) p == bufend) { linbuf[line] -= (char const *) p == incomplete_tail; @@ -360,7 +360,7 @@ prepare_text_end (current) current->buffered_chars = buffered_chars; current->missing_newline = ! ignore_blank_lines_flag; } - + /* Don't use uninitialized storage when planting or using sentinels. */ if (p) bzero (p + buffered_chars, sizeof (word)); diff --git a/gnu/usr.bin/diff/side.c b/gnu/usr.bin/diff/side.c index 9e03c27..59943f2 100644 --- a/gnu/usr.bin/diff/side.c +++ b/gnu/usr.bin/diff/side.c @@ -174,7 +174,7 @@ print_1sdiff_line (left, sep, right) unsigned hw = sdiff_half_width, c2o = sdiff_column2_offset; unsigned col = 0; int put_newline = 0; - + if (left) { if (left[1][-1] == '\n') diff --git a/gnu/usr.bin/gdb/bfd/aout-target.h b/gnu/usr.bin/gdb/bfd/aout-target.h index fc8d592..7e4a846 100644 --- a/gnu/usr.bin/gdb/bfd/aout-target.h +++ b/gnu/usr.bin/gdb/bfd/aout-target.h @@ -54,7 +54,7 @@ MY(callback) (abfd) /* The file offsets of the string table and symbol table. */ obj_sym_filepos (abfd) = N_SYMOFF (*execp); obj_str_filepos (abfd) = N_STROFF (*execp); - + /* Determine the architecture and machine type of the object file. */ #ifdef SET_ARCH_MACH SET_ARCH_MACH(abfd, *execp); @@ -489,7 +489,7 @@ MY_bfd_final_link (abfd, info) #endif /* Aout symbols normally have leading underscores */ -#ifndef MY_symbol_leading_char +#ifndef MY_symbol_leading_char #define MY_symbol_leading_char '_' #endif diff --git a/gnu/usr.bin/gdb/bfd/aoutx.h b/gnu/usr.bin/gdb/bfd/aoutx.h index 0bcc860..5afed7a 100644 --- a/gnu/usr.bin/gdb/bfd/aoutx.h +++ b/gnu/usr.bin/gdb/bfd/aoutx.h @@ -837,7 +837,7 @@ adjust_z_magic (abfd, execp) file_ptr text_end; CONST struct aout_backend_data *abdp; int ztih; /* Nonzero if text includes exec header. */ - + abdp = aout_backend_info (abfd); /* Text. */ @@ -856,7 +856,7 @@ adjust_z_magic (abfd, execp) + adata(abfd).exec_bytes_size) : abdp->default_text_vma)); /* Could take strange alignment of text section into account here? */ - + /* Find start of data. */ if (ztih) { @@ -891,7 +891,7 @@ adjust_z_magic (abfd, execp) } obj_datasec(abfd)->filepos = (obj_textsec(abfd)->filepos + obj_textsec(abfd)->_raw_size); - + /* Fix up exec header while we're at it. */ execp->a_text = obj_textsec(abfd)->_raw_size; if (ztih && (!abdp || (abdp && !abdp->exec_header_not_counted))) @@ -936,7 +936,7 @@ adjust_n_magic (abfd, execp) file_ptr pos = adata(abfd).exec_bytes_size; bfd_vma vma = 0; int pad; - + /* Text. */ obj_textsec(abfd)->filepos = pos; if (!obj_textsec(abfd)->user_set_vma) @@ -951,7 +951,7 @@ adjust_n_magic (abfd, execp) if (!obj_datasec(abfd)->user_set_vma) obj_datasec(abfd)->vma = BFD_ALIGN (vma, adata(abfd).segment_size); vma = obj_datasec(abfd)->vma; - + /* Since BSS follows data immediately, see if it needs alignment. */ vma += obj_datasec(abfd)->_raw_size; pad = align_power (vma, obj_bsssec(abfd)->alignment_power) - vma; @@ -1179,7 +1179,7 @@ aout_get_external_symbols (abfd) obj_aout_external_syms (abfd) = syms; obj_aout_external_sym_count (abfd) = count; } - + if (obj_aout_external_strings (abfd) == NULL && exec_hdr (abfd)->a_syms != 0) { @@ -4221,7 +4221,7 @@ aout_link_input_section_std (finfo, input_bfd, input_section, relocs, #ifdef MY_reloc_howto howto = MY_reloc_howto(input_bfd, rel, r_index, r_extern, r_pcrel); -#else +#else if (input_bfd->xvec->header_byteorder_big_p) { r_index = ((rel->r_index[0] << 16) diff --git a/gnu/usr.bin/gdb/bfd/archures.c b/gnu/usr.bin/gdb/bfd/archures.c index 1bed637..1bff43a 100644 --- a/gnu/usr.bin/gdb/bfd/archures.c +++ b/gnu/usr.bin/gdb/bfd/archures.c @@ -25,7 +25,7 @@ SECTION BFD keeps one atom in a BFD describing the architecture of the data attached to the BFD: a pointer to a - <<bfd_arch_info_type>>. + <<bfd_arch_info_type>>. Pointers to structures can be requested independently of a BFD so that an architecture's information can be interrogated @@ -35,13 +35,13 @@ SECTION The set of default architectures is selected by the macro <<SELECT_ARCHITECTURES>>. This is normally set up in the @file{config/@var{target}.mt} file of your choice. If the name is not - defined, then all the architectures supported are included. + defined, then all the architectures supported are included. When BFD starts up, all the architectures are called with an initialize method. It is up to the architecture back end to insert as many items into the list of architectures as it wants to; generally this would be one for each machine and one for the - default case (an item with a machine field of 0). + default case (an item with a machine field of 0). BFD's idea of an architecture is implemented in @file{archures.c}. */ @@ -58,21 +58,21 @@ DESCRIPTION the family is in use. The machine gives a number which distinguishes different versions of the architecture, containing, for example, 2 and 3 for Intel i960 KA and i960 KB, - and 68020 and 68030 for Motorola 68020 and 68030. + and 68020 and 68030 for Motorola 68020 and 68030. -.enum bfd_architecture +.enum bfd_architecture .{ . bfd_arch_unknown, {* File arch not known *} . bfd_arch_obscure, {* Arch known, not one of these *} . bfd_arch_m68k, {* Motorola 68xxx *} -. bfd_arch_vax, {* DEC Vax *} +. bfd_arch_vax, {* DEC Vax *} . bfd_arch_i960, {* Intel 960 *} . {* The order of the following is important. -. lower number indicates a machine type that +. lower number indicates a machine type that . only accepts a subset of the instructions . available to machines with higher numbers. . The exception is the "ca", which is -. incompatible with all other machines except +. incompatible with all other machines except . "core". *} . .#define bfd_mach_i960_core 1 @@ -127,7 +127,7 @@ DESCRIPTION within BFD. . -.typedef struct bfd_arch_info +.typedef struct bfd_arch_info .{ . int bits_per_word; . int bits_per_address; @@ -138,7 +138,7 @@ DESCRIPTION . CONST char *printable_name; . unsigned int section_align_power; . {* true if this is the default machine for the architecture *} -. boolean the_default; +. boolean the_default; . CONST struct bfd_arch_info * (*compatible) . PARAMS ((CONST struct bfd_arch_info *a, . CONST struct bfd_arch_info *b)); @@ -206,7 +206,7 @@ bfd_scan_arch (string) ap != (bfd_arch_info_type *)NULL; ap = ap->next) { - if (ap->scan(ap, string)) + if (ap->scan(ap, string)) return ap; } return (bfd_arch_info_type *)NULL; @@ -259,7 +259,7 @@ bfd_arch_info_type bfd_default_arch_struct = { 32,32,8,bfd_arch_unknown,0,"unknown","unknown",2,true, bfd_default_compatible, - bfd_default_scan, + bfd_default_scan, 0, }; @@ -295,7 +295,7 @@ DESCRIPTION Set the architecture and machine type in BFD @var{abfd} to @var{arch} and @var{mach}. Find the correct pointer to a structure and insert it into the <<arch_info>> - pointer. + pointer. */ boolean @@ -370,7 +370,7 @@ DESCRIPTION machine. */ -unsigned long +unsigned long bfd_get_mach (abfd) bfd *abfd; { @@ -436,7 +436,7 @@ extern void bfd_we32k_arch PARAMS ((void)); extern void bfd_z8k_arch PARAMS ((void)); extern void bfd_ns32k_arch PARAMS ((void)); -static void (*archures_init_table[]) PARAMS ((void)) = +static void (*archures_init_table[]) PARAMS ((void)) = { #ifdef SELECT_ARCHITECTURES SELECT_ARCHITECTURES, @@ -466,7 +466,7 @@ static void (*archures_init_table[]) PARAMS ((void)) = /* -INTERNAL_FUNCTION +INTERNAL_FUNCTION bfd_arch_init SYNOPSIS @@ -482,7 +482,7 @@ void bfd_arch_init () { void (**ptable) PARAMS ((void)); - for (ptable = archures_init_table; + for (ptable = archures_init_table; *ptable ; ptable++) { @@ -512,7 +512,7 @@ bfd_arch_linkin (ptr) /* -INTERNAL_FUNCTION +INTERNAL_FUNCTION bfd_default_compatible SYNOPSIS @@ -553,7 +553,7 @@ DESCRIPTION architecture hit and a machine hit. */ -boolean +boolean bfd_default_scan (info, string) CONST struct bfd_arch_info *info; CONST char *string; @@ -570,10 +570,10 @@ bfd_default_scan (info, string) up to the :, then we get left with the machine number */ for (ptr_src = string, - ptr_tst = info->arch_name; + ptr_tst = info->arch_name; *ptr_src && *ptr_tst; ptr_src++, - ptr_tst++) + ptr_tst++) { if (*ptr_src != *ptr_tst) break; } @@ -581,7 +581,7 @@ bfd_default_scan (info, string) /* Chewed up as much of the architecture as will match, skip any colons */ if (*ptr_src == ':') ptr_src++; - + if (*ptr_src == 0) { /* nothing more, then only keep this one if it is the default machine for this architecture */ @@ -593,7 +593,7 @@ bfd_default_scan (info, string) ptr_src++; } - switch (number) + switch (number) { case 300: arch = bfd_arch_h8300; @@ -608,17 +608,17 @@ bfd_default_scan (info, string) case 68030: case 68040: case 68332: - case 68050: - case 68000: - arch = bfd_arch_m68k; + case 68050: + case 68000: + arch = bfd_arch_m68k; break; - case 386: + case 386: case 80386: case 486: case 80486: arch = bfd_arch_i386; break; - case 29000: + case 29000: arch = bfd_arch_a29k; break; @@ -631,8 +631,8 @@ bfd_default_scan (info, string) break; case 860: - case 80860: - arch = bfd_arch_i860; + case 80860: + arch = bfd_arch_i860; break; case 960: case 80960: @@ -650,10 +650,10 @@ bfd_default_scan (info, string) arch = bfd_arch_rs6000; break; - default: + default: return false; } - if (arch != info->arch) + if (arch != info->arch) return false; if (number != info->mach) @@ -699,18 +699,18 @@ DESCRIPTION default. */ -bfd_arch_info_type * +bfd_arch_info_type * bfd_lookup_arch (arch, machine) enum bfd_architecture arch; long machine; { bfd_arch_info_type *ap; - bfd_check_init(); - for (ap = bfd_arch_info_list; + bfd_check_init(); + for (ap = bfd_arch_info_list; ap != (bfd_arch_info_type *)NULL; ap = ap->next) { if (ap->arch == arch && - ((ap->mach == machine) + ((ap->mach == machine) || (ap->the_default && machine == 0))) { return ap; } @@ -729,7 +729,7 @@ SYNOPSIS DESCRIPTION Return a printable string representing the architecture and - machine type. + machine type. This routine is depreciated. */ diff --git a/gnu/usr.bin/gdb/bfd/bfd.c b/gnu/usr.bin/gdb/bfd/bfd.c index 77e43ec..d6372ac 100644 --- a/gnu/usr.bin/gdb/bfd/bfd.c +++ b/gnu/usr.bin/gdb/bfd/bfd.c @@ -32,10 +32,10 @@ SECTION CODE_FRAGMENT . -.struct _bfd +.struct _bfd .{ . {* The filename the application opened the BFD with. *} -. CONST char *filename; +. CONST char *filename; . . {* A pointer to the target jump table. *} . const struct bfd_target *xvec; @@ -66,7 +66,7 @@ CODE_FRAGMENT . {* When a file is closed by the caching routines, BFD retains . state information on the file here: *} . -. file_ptr where; +. file_ptr where; . . {* and here: (``once'' means at least once) *} . @@ -79,7 +79,7 @@ CODE_FRAGMENT . . {* File modified time, if mtime_set is true: *} . -. long mtime; +. long mtime; . . {* Reserved for an unimplemented file locking extension.*} . @@ -98,13 +98,13 @@ CODE_FRAGMENT . . {* Format_specific flags*} . -. flagword flags; +. flagword flags; . . {* Currently my_archive is tested before adding origin to . anything. I believe that this can become always an add of . origin, with origin set to 0 for non archive files. *} . -. file_ptr origin; +. file_ptr origin; . . {* Remember when output has begun, to stop strange things . from happening. *} @@ -116,7 +116,7 @@ CODE_FRAGMENT . {* The number of sections *} . unsigned int section_count; . -. {* Stuff only useful for object files: +. {* Stuff only useful for object files: . The start address. *} . bfd_vma start_address; . @@ -124,17 +124,17 @@ CODE_FRAGMENT . unsigned int symcount; . . {* Symbol table for output BFD (with symcount entries) *} -. struct symbol_cache_entry **outsymbols; +. struct symbol_cache_entry **outsymbols; . . {* Pointer to structure which contains architecture information*} . struct bfd_arch_info *arch_info; . . {* Stuff only useful for archives:*} -. PTR arelt_data; +. PTR arelt_data; . struct _bfd *my_archive; {* The containing archive BFD. *} . struct _bfd *next; {* The next BFD in the archive. *} . struct _bfd *archive_head; {* The first BFD in the archive. *} -. boolean has_armap; +. boolean has_armap; . . {* A chain of BFD structures involved in a link. *} . struct _bfd *link_next; @@ -145,7 +145,7 @@ CODE_FRAGMENT . . {* Used by the back end to hold private data. *} . -. union +. union . { . struct aout_data_struct *aout_data; . struct artdata *aout_ar_data; @@ -171,7 +171,7 @@ CODE_FRAGMENT . struct cisco_core_struct *cisco_core_data; . PTR any; . } tdata; -. +. . {* Used by the application to hold private data*} . PTR usrdata; . @@ -719,7 +719,7 @@ bfd_scan_vma (string, end, base) (string[0] == '0') && ((string[1] == 'x') || (string[1] == 'X'))) string += 2; /* XXX should we also skip over "0b" or "0B" if base is 2? */ - + /* Speed could be improved with a table like hex_value[] in gas. */ #define HEX_VALUE(c) \ (isxdigit(c) ? \ @@ -747,7 +747,7 @@ SYNOPSIS boolean bfd_copy_private_bfd_data(bfd *ibfd, bfd *obfd); DESCRIPTION - Copy private BFD information from the BFD @var{ibfd} to the + Copy private BFD information from the BFD @var{ibfd} to the the BFD @var{obfd}. Return <<true>> on success, <<false>> on error. Possible error returns are: @@ -793,7 +793,7 @@ DESCRIPTION .#define bfd_get_relocated_section_contents(abfd, link_info, link_order, data, relocateable, symbols) \ . BFD_SEND (abfd, _bfd_get_relocated_section_contents, \ . (abfd, link_info, link_order, data, relocateable, symbols)) -. +. .#define bfd_relax_section(abfd, section, link_info, again) \ . BFD_SEND (abfd, _bfd_relax_section, (abfd, section, link_info, again)) . diff --git a/gnu/usr.bin/gdb/bfd/bfd.h b/gnu/usr.bin/gdb/bfd/bfd.h index e6159a7..78b0e9f 100644 --- a/gnu/usr.bin/gdb/bfd/bfd.h +++ b/gnu/usr.bin/gdb/bfd/bfd.h @@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* bfd.h -- The only header file required by users of the bfd library +/* bfd.h -- The only header file required by users of the bfd library The bfd.h file is generated from bfd-in.h and various .c files; if you change it, your changes will probably be lost. @@ -93,7 +93,7 @@ typedef enum bfd_boolean {bfd_false, bfd_true} boolean; /* FIXME: This should be using off_t from <sys/types.h>. For now, try to avoid breaking stuff by not including <sys/types.h> here. This will break on systems with 64-bit file offsets (e.g. 4.4BSD). - Probably the best long-term answer is to avoid using file_ptr AND off_t + Probably the best long-term answer is to avoid using file_ptr AND off_t in this header file, and to handle this in the BFD implementation rather than in its interface. */ /* typedef off_t file_ptr; */ @@ -249,11 +249,11 @@ typedef struct carsym { file_ptr file_offset; /* look here to find the file */ } carsym; /* to make these you call a carsymogen */ - + /* Used in generating armaps (archive tables of contents). Perhaps just a forward definition would do? */ struct orl { /* output ranlib */ - char **name; /* symbol name */ + char **name; /* symbol name */ file_ptr pos; /* bfd* or file position */ int namidx; /* index into string table */ }; @@ -262,7 +262,7 @@ struct orl { /* output ranlib */ /* Linenumber stuff */ typedef struct lineno_cache_entry { - unsigned int line_number; /* Linenumber from start of function*/ + unsigned int line_number; /* Linenumber from start of function*/ union { struct symbol_cache_entry *sym; /* Function name */ unsigned long offset; /* Offset into section */ @@ -293,15 +293,15 @@ typedef struct sec *sec_ptr; #define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),true) #define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),true) -typedef struct stat stat_type; +typedef struct stat stat_type; typedef enum bfd_print_symbol -{ +{ bfd_print_symbol_name, bfd_print_symbol_more, bfd_print_symbol_all } bfd_print_symbol_type; - + /* Information about a symbol that nm needs. */ typedef struct _symbol_info @@ -551,7 +551,7 @@ extern boolean bfd_linux_size_dynamic_sections PARAMS ((bfd *, struct bfd_link_info *)); /* And more from the source. */ -void +void bfd_init PARAMS ((void)); bfd * @@ -563,13 +563,13 @@ bfd_fdopenr PARAMS ((CONST char *filename, CONST char *target, int fd)); bfd * bfd_openw PARAMS ((CONST char *filename, CONST char *target)); -boolean +boolean bfd_close PARAMS ((bfd *abfd)); -boolean +boolean bfd_close_all_done PARAMS ((bfd *)); -bfd_size_type +bfd_size_type bfd_alloc_size PARAMS ((bfd *abfd)); bfd * @@ -929,20 +929,20 @@ bfd_make_section_anyway PARAMS ((bfd *abfd, CONST char *name)); asection * bfd_make_section PARAMS ((bfd *, CONST char *name)); -boolean +boolean bfd_set_section_flags PARAMS ((bfd *abfd, asection *sec, flagword flags)); -void +void bfd_map_over_sections PARAMS ((bfd *abfd, void (*func)(bfd *abfd, asection *sect, PTR obj), PTR obj)); -boolean +boolean bfd_set_section_size PARAMS ((bfd *abfd, asection *sec, bfd_size_type val)); -boolean +boolean bfd_set_section_contents PARAMS ((bfd *abfd, asection *section, @@ -950,30 +950,30 @@ bfd_set_section_contents file_ptr offset, bfd_size_type count)); -boolean +boolean bfd_get_section_contents PARAMS ((bfd *abfd, asection *section, PTR location, file_ptr offset, bfd_size_type count)); -boolean +boolean bfd_copy_private_section_data PARAMS ((bfd *ibfd, asection *isec, bfd *obfd, asection *osec)); #define bfd_copy_private_section_data(ibfd, isection, obfd, osection) \ BFD_SEND (ibfd, _bfd_copy_private_section_data, \ (ibfd, isection, obfd, osection)) -enum bfd_architecture +enum bfd_architecture { bfd_arch_unknown, /* File arch not known */ bfd_arch_obscure, /* Arch known, not one of these */ bfd_arch_m68k, /* Motorola 68xxx */ - bfd_arch_vax, /* DEC Vax */ + bfd_arch_vax, /* DEC Vax */ bfd_arch_i960, /* Intel 960 */ /* The order of the following is important. - lower number indicates a machine type that + lower number indicates a machine type that only accepts a subset of the instructions available to machines with higher numbers. The exception is the "ca", which is - incompatible with all other machines except + incompatible with all other machines except "core". */ #define bfd_mach_i960_core 1 @@ -1011,7 +1011,7 @@ enum bfd_architecture bfd_arch_last }; -typedef struct bfd_arch_info +typedef struct bfd_arch_info { int bits_per_word; int bits_per_address; @@ -1022,7 +1022,7 @@ typedef struct bfd_arch_info CONST char *printable_name; unsigned int section_align_power; /* true if this is the default machine for the architecture */ - boolean the_default; + boolean the_default; CONST struct bfd_arch_info * (*compatible) PARAMS ((CONST struct bfd_arch_info *a, CONST struct bfd_arch_info *b)); @@ -1049,22 +1049,22 @@ bfd_arch_get_compatible PARAMS (( CONST bfd *abfd, CONST bfd *bbfd)); -void +void bfd_set_arch_info PARAMS ((bfd *abfd, bfd_arch_info_type *arg)); -enum bfd_architecture +enum bfd_architecture bfd_get_arch PARAMS ((bfd *abfd)); -unsigned long +unsigned long bfd_get_mach PARAMS ((bfd *abfd)); -unsigned int +unsigned int bfd_arch_bits_per_byte PARAMS ((bfd *abfd)); -unsigned int +unsigned int bfd_arch_bits_per_address PARAMS ((bfd *abfd)); -bfd_arch_info_type * +bfd_arch_info_type * bfd_get_arch_info PARAMS ((bfd *abfd)); bfd_arch_info_type * @@ -1241,7 +1241,7 @@ struct reloc_howto_struct } \ } \ } -int +int bfd_get_reloc_size PARAMS ((const reloc_howto_type *)); typedef struct relent_chain { @@ -1572,7 +1572,7 @@ typedef struct symbol_cache_entry } asymbol; #define bfd_get_symtab_upper_bound(abfd) \ BFD_SEND (abfd, _bfd_get_symtab_upper_bound, (abfd)) -boolean +boolean bfd_is_local_label PARAMS ((bfd *abfd, asymbol *sym)); #define bfd_is_local_label(abfd, sym) \ @@ -1580,26 +1580,26 @@ bfd_is_local_label PARAMS ((bfd *abfd, asymbol *sym)); #define bfd_canonicalize_symtab(abfd, location) \ BFD_SEND (abfd, _bfd_canonicalize_symtab,\ (abfd, location)) -boolean +boolean bfd_set_symtab PARAMS ((bfd *abfd, asymbol **location, unsigned int count)); -void +void bfd_print_symbol_vandf PARAMS ((PTR file, asymbol *symbol)); #define bfd_make_empty_symbol(abfd) \ BFD_SEND (abfd, _bfd_make_empty_symbol, (abfd)) #define bfd_make_debug_symbol(abfd,ptr,size) \ BFD_SEND (abfd, _bfd_make_debug_symbol, (abfd, ptr, size)) -int +int bfd_decode_symclass PARAMS ((asymbol *symbol)); -void +void bfd_symbol_info PARAMS ((asymbol *symbol, symbol_info *ret)); -struct _bfd +struct _bfd { /* The filename the application opened the BFD with. */ - CONST char *filename; + CONST char *filename; /* A pointer to the target jump table. */ const struct bfd_target *xvec; @@ -1630,7 +1630,7 @@ struct _bfd /* When a file is closed by the caching routines, BFD retains state information on the file here: */ - file_ptr where; + file_ptr where; /* and here: (``once'' means at least once) */ @@ -1643,7 +1643,7 @@ struct _bfd /* File modified time, if mtime_set is true: */ - long mtime; + long mtime; /* Reserved for an unimplemented file locking extension.*/ @@ -1662,13 +1662,13 @@ struct _bfd /* Format_specific flags*/ - flagword flags; + flagword flags; /* Currently my_archive is tested before adding origin to anything. I believe that this can become always an add of origin, with origin set to 0 for non archive files. */ - file_ptr origin; + file_ptr origin; /* Remember when output has begun, to stop strange things from happening. */ @@ -1680,7 +1680,7 @@ struct _bfd /* The number of sections */ unsigned int section_count; - /* Stuff only useful for object files: + /* Stuff only useful for object files: The start address. */ bfd_vma start_address; @@ -1688,17 +1688,17 @@ struct _bfd unsigned int symcount; /* Symbol table for output BFD (with symcount entries) */ - struct symbol_cache_entry **outsymbols; + struct symbol_cache_entry **outsymbols; /* Pointer to structure which contains architecture information*/ struct bfd_arch_info *arch_info; /* Stuff only useful for archives:*/ - PTR arelt_data; + PTR arelt_data; struct _bfd *my_archive; /* The containing archive BFD. */ struct _bfd *next; /* The next BFD in the archive. */ struct _bfd *archive_head; /* The first BFD in the archive. */ - boolean has_armap; + boolean has_armap; /* A chain of BFD structures involved in a link. */ struct _bfd *link_next; @@ -1709,7 +1709,7 @@ struct _bfd /* Used by the back end to hold private data. */ - union + union { struct aout_data_struct *aout_data; struct artdata *aout_ar_data; @@ -1735,7 +1735,7 @@ struct _bfd struct cisco_core_struct *cisco_core_data; PTR any; } tdata; - + /* Used by the application to hold private data*/ PTR usrdata; @@ -1764,56 +1764,56 @@ typedef enum bfd_error bfd_error_invalid_error_code } bfd_error_type; -bfd_error_type +bfd_error_type bfd_get_error PARAMS ((void)); -void +void bfd_set_error PARAMS ((bfd_error_type error_tag)); CONST char * bfd_errmsg PARAMS ((bfd_error_type error_tag)); -void +void bfd_perror PARAMS ((CONST char *message)); -long +long bfd_get_reloc_upper_bound PARAMS ((bfd *abfd, asection *sect)); -long +long bfd_canonicalize_reloc PARAMS ((bfd *abfd, asection *sec, arelent **loc, asymbol **syms)); -void +void bfd_set_reloc PARAMS ((bfd *abfd, asection *sec, arelent **rel, unsigned int count) - + ); -boolean +boolean bfd_set_file_flags PARAMS ((bfd *abfd, flagword flags)); -boolean +boolean bfd_set_start_address PARAMS ((bfd *abfd, bfd_vma vma)); -long +long bfd_get_mtime PARAMS ((bfd *abfd)); -long +long bfd_get_size PARAMS ((bfd *abfd)); -int +int bfd_get_gp_size PARAMS ((bfd *abfd)); -void +void bfd_set_gp_size PARAMS ((bfd *abfd, int i)); -bfd_vma +bfd_vma bfd_scan_vma PARAMS ((CONST char *string, CONST char **end, int base)); -boolean +boolean bfd_copy_private_bfd_data PARAMS ((bfd *ibfd, bfd *obfd)); #define bfd_copy_private_bfd_data(ibfd, obfd) \ @@ -1845,7 +1845,7 @@ bfd_copy_private_bfd_data PARAMS ((bfd *ibfd, bfd *obfd)); #define bfd_get_relocated_section_contents(abfd, link_info, link_order, data, relocateable, symbols) \ BFD_SEND (abfd, _bfd_get_relocated_section_contents, \ (abfd, link_info, link_order, data, relocateable, symbols)) - + #define bfd_relax_section(abfd, section, link_info, again) \ BFD_SEND (abfd, _bfd_relax_section, (abfd, section, link_info, again)) @@ -1873,10 +1873,10 @@ bfd_copy_private_bfd_data PARAMS ((bfd *ibfd, bfd *obfd)); #define bfd_canonicalize_dynamic_reloc(abfd, arels, asyms) \ BFD_SEND (abfd, _bfd_canonicalize_dynamic_reloc, (abfd, arels, asyms)) -symindex +symindex bfd_get_next_mapent PARAMS ((bfd *abfd, symindex previous, carsym **sym)); -boolean +boolean bfd_set_archive_head PARAMS ((bfd *output, bfd *new_head)); bfd * @@ -1888,10 +1888,10 @@ bfd_openr_next_archived_file PARAMS ((bfd *archive, bfd *previous)); CONST char * bfd_core_file_failing_command PARAMS ((bfd *abfd)); -int +int bfd_core_file_failing_signal PARAMS ((bfd *abfd)); -boolean +boolean core_file_matches_executable_p PARAMS ((bfd *core_bfd, bfd *exec_bfd)); @@ -1938,10 +1938,10 @@ typedef struct bfd_target enum bfd_flavour flavour; boolean byteorder_big_p; boolean header_byteorder_big_p; - flagword object_flags; + flagword object_flags; flagword section_flags; char symbol_leading_char; - char ar_pad_char; + char ar_pad_char; unsigned short ar_max_namelen; unsigned int align_power_min; bfd_vma (*bfd_getx64) PARAMS ((const bfd_byte *)); @@ -1979,7 +1979,7 @@ CAT(NAME,_get_section_contents) /* Called when a new section is created. */ boolean (*_new_section_hook) PARAMS ((bfd *, sec_ptr)); /* Read the contents of a section. */ - boolean (*_bfd_get_section_contents) PARAMS ((bfd *, sec_ptr, PTR, + boolean (*_bfd_get_section_contents) PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type)); /* Entry points to copy private data. */ @@ -2014,14 +2014,14 @@ CAT(NAME,_generic_stat_arch_elt) boolean (*_bfd_slurp_armap) PARAMS ((bfd *)); boolean (*_bfd_slurp_extended_name_table) PARAMS ((bfd *)); void (*_bfd_truncate_arname) PARAMS ((bfd *, CONST char *, char *)); - boolean (*write_armap) PARAMS ((bfd *arch, + boolean (*write_armap) PARAMS ((bfd *arch, unsigned int elength, struct orl *map, - unsigned int orl_count, + unsigned int orl_count, int stridx)); bfd * (*openr_next_archived_file) PARAMS ((bfd *arch, bfd *prev)); int (*_bfd_stat_arch_elt) PARAMS ((bfd *, struct stat *)); - + /* Entry points used for symbols. */ #define BFD_JUMP_TABLE_SYMBOLS(NAME)\ CAT(NAME,_get_symtab_upper_bound),\ @@ -2136,13 +2136,13 @@ bfd_find_target PARAMS ((CONST char *target_name, bfd *abfd)); const char ** bfd_target_list PARAMS ((void)); -boolean +boolean bfd_check_format PARAMS ((bfd *abfd, bfd_format format)); -boolean +boolean bfd_check_format_matches PARAMS ((bfd *abfd, bfd_format format, char ***matching)); -boolean +boolean bfd_set_format PARAMS ((bfd *abfd, bfd_format format)); CONST char * diff --git a/gnu/usr.bin/gdb/bfd/cache.c b/gnu/usr.bin/gdb/bfd/cache.c index a26c3ce..fc02122 100644 --- a/gnu/usr.bin/gdb/bfd/cache.c +++ b/gnu/usr.bin/gdb/bfd/cache.c @@ -31,7 +31,7 @@ SECTION <<bfd_cache_lookup>>, which runs around and makes sure that the required BFD is open. If not, then it chooses a file to close, closes it and opens the one wanted, returning its file - handle. + handle. */ @@ -78,19 +78,19 @@ bfd *bfd_last_cache; /* INTERNAL_FUNCTION bfd_cache_lookup - + DESCRIPTION Check to see if the required BFD is the same as the last one looked up. If so, then it can use the stream in the BFD with impunity, since it can't have changed since the last lookup; otherwise, it has to perform the complicated lookup function. - + .#define bfd_cache_lookup(x) \ . ((x)==bfd_last_cache? \ . (FILE*)(bfd_last_cache->iostream): \ . bfd_cache_lookup_worker(x)) - - + + */ /* Insert a BFD into the cache. */ @@ -312,14 +312,14 @@ DESCRIPTION quick answer. Find a file descriptor for @var{abfd}. If necessary, it open it. If there are already more than <<BFD_CACHE_MAX_OPEN>> files open, it tries to close one first, to - avoid running out of file descriptors. + avoid running out of file descriptors. */ FILE * bfd_cache_lookup_worker (abfd) bfd *abfd; { - if (abfd->my_archive) + if (abfd->my_archive) abfd = abfd->my_archive; if (abfd->iostream != NULL) diff --git a/gnu/usr.bin/gdb/bfd/coff-i386.c b/gnu/usr.bin/gdb/bfd/coff-i386.c index aaaedca..aaac075 100644 --- a/gnu/usr.bin/gdb/bfd/coff-i386.c +++ b/gnu/usr.bin/gdb/bfd/coff-i386.c @@ -129,7 +129,7 @@ coff_i386_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd, return bfd_reloc_continue; } -static reloc_howto_type howto_table[] = +static reloc_howto_type howto_table[] = { {0}, {1}, @@ -137,18 +137,18 @@ static reloc_howto_type howto_table[] = {3}, {4}, {5}, - HOWTO (R_DIR32, /* type */ - 0, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ - 32, /* bitsize */ - false, /* pc_relative */ - 0, /* bitpos */ + HOWTO (R_DIR32, /* type */ + 0, /* rightshift */ + 2, /* size (0 = byte, 1 = short, 2 = long) */ + 32, /* bitsize */ + false, /* pc_relative */ + 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ - coff_i386_reloc, /* special_function */ - "dir32", /* name */ - true, /* partial_inplace */ - 0xffffffff, /* src_mask */ - 0xffffffff, /* dst_mask */ + coff_i386_reloc, /* special_function */ + "dir32", /* name */ + true, /* partial_inplace */ + 0xffffffff, /* src_mask */ + 0xffffffff, /* dst_mask */ false), /* pcrel_offset */ {7}, {010}, @@ -158,83 +158,83 @@ static reloc_howto_type howto_table[] = {014}, {015}, {016}, - HOWTO (R_RELBYTE, /* type */ - 0, /* rightshift */ - 0, /* size (0 = byte, 1 = short, 2 = long) */ - 8, /* bitsize */ - false, /* pc_relative */ - 0, /* bitpos */ + HOWTO (R_RELBYTE, /* type */ + 0, /* rightshift */ + 0, /* size (0 = byte, 1 = short, 2 = long) */ + 8, /* bitsize */ + false, /* pc_relative */ + 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ - coff_i386_reloc, /* special_function */ - "8", /* name */ - true, /* partial_inplace */ - 0x000000ff, /* src_mask */ - 0x000000ff, /* dst_mask */ + coff_i386_reloc, /* special_function */ + "8", /* name */ + true, /* partial_inplace */ + 0x000000ff, /* src_mask */ + 0x000000ff, /* dst_mask */ false), /* pcrel_offset */ - HOWTO (R_RELWORD, /* type */ - 0, /* rightshift */ - 1, /* size (0 = byte, 1 = short, 2 = long) */ - 16, /* bitsize */ - false, /* pc_relative */ - 0, /* bitpos */ + HOWTO (R_RELWORD, /* type */ + 0, /* rightshift */ + 1, /* size (0 = byte, 1 = short, 2 = long) */ + 16, /* bitsize */ + false, /* pc_relative */ + 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ - coff_i386_reloc, /* special_function */ - "16", /* name */ - true, /* partial_inplace */ - 0x0000ffff, /* src_mask */ - 0x0000ffff, /* dst_mask */ + coff_i386_reloc, /* special_function */ + "16", /* name */ + true, /* partial_inplace */ + 0x0000ffff, /* src_mask */ + 0x0000ffff, /* dst_mask */ false), /* pcrel_offset */ - HOWTO (R_RELLONG, /* type */ - 0, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ - 32, /* bitsize */ - false, /* pc_relative */ - 0, /* bitpos */ + HOWTO (R_RELLONG, /* type */ + 0, /* rightshift */ + 2, /* size (0 = byte, 1 = short, 2 = long) */ + 32, /* bitsize */ + false, /* pc_relative */ + 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ - coff_i386_reloc, /* special_function */ - "32", /* name */ - true, /* partial_inplace */ - 0xffffffff, /* src_mask */ - 0xffffffff, /* dst_mask */ + coff_i386_reloc, /* special_function */ + "32", /* name */ + true, /* partial_inplace */ + 0xffffffff, /* src_mask */ + 0xffffffff, /* dst_mask */ false), /* pcrel_offset */ - HOWTO (R_PCRBYTE, /* type */ - 0, /* rightshift */ - 0, /* size (0 = byte, 1 = short, 2 = long) */ - 8, /* bitsize */ - true, /* pc_relative */ - 0, /* bitpos */ + HOWTO (R_PCRBYTE, /* type */ + 0, /* rightshift */ + 0, /* size (0 = byte, 1 = short, 2 = long) */ + 8, /* bitsize */ + true, /* pc_relative */ + 0, /* bitpos */ complain_overflow_signed, /* complain_on_overflow */ - coff_i386_reloc, /* special_function */ - "DISP8", /* name */ - true, /* partial_inplace */ - 0x000000ff, /* src_mask */ - 0x000000ff, /* dst_mask */ + coff_i386_reloc, /* special_function */ + "DISP8", /* name */ + true, /* partial_inplace */ + 0x000000ff, /* src_mask */ + 0x000000ff, /* dst_mask */ false), /* pcrel_offset */ - HOWTO (R_PCRWORD, /* type */ - 0, /* rightshift */ - 1, /* size (0 = byte, 1 = short, 2 = long) */ - 16, /* bitsize */ - true, /* pc_relative */ - 0, /* bitpos */ + HOWTO (R_PCRWORD, /* type */ + 0, /* rightshift */ + 1, /* size (0 = byte, 1 = short, 2 = long) */ + 16, /* bitsize */ + true, /* pc_relative */ + 0, /* bitpos */ complain_overflow_signed, /* complain_on_overflow */ - coff_i386_reloc, /* special_function */ - "DISP16", /* name */ - true, /* partial_inplace */ - 0x0000ffff, /* src_mask */ - 0x0000ffff, /* dst_mask */ + coff_i386_reloc, /* special_function */ + "DISP16", /* name */ + true, /* partial_inplace */ + 0x0000ffff, /* src_mask */ + 0x0000ffff, /* dst_mask */ false), /* pcrel_offset */ - HOWTO (R_PCRLONG, /* type */ - 0, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ - 32, /* bitsize */ - true, /* pc_relative */ - 0, /* bitpos */ + HOWTO (R_PCRLONG, /* type */ + 0, /* rightshift */ + 2, /* size (0 = byte, 1 = short, 2 = long) */ + 32, /* bitsize */ + true, /* pc_relative */ + 0, /* bitpos */ complain_overflow_signed, /* complain_on_overflow */ - coff_i386_reloc, /* special_function */ - "DISP32", /* name */ - true, /* partial_inplace */ - 0xffffffff, /* src_mask */ - 0xffffffff, /* dst_mask */ + coff_i386_reloc, /* special_function */ + "DISP32", /* name */ + true, /* partial_inplace */ + 0xffffffff, /* src_mask */ + 0xffffffff, /* dst_mask */ false) /* pcrel_offset */ }; diff --git a/gnu/usr.bin/gdb/bfd/coffgen.c b/gnu/usr.bin/gdb/bfd/coffgen.c index f0c05c7..e81f45b 100644 --- a/gnu/usr.bin/gdb/bfd/coffgen.c +++ b/gnu/usr.bin/gdb/bfd/coffgen.c @@ -61,7 +61,7 @@ make_a_section_from_file (abfd, hdr, target_index) { asection *return_section; char *name; - + /* Assorted wastage to null-terminate the name, thanks AT&T! */ name = bfd_alloc(abfd, sizeof (hdr->s_name)+1); if (name == NULL) { @@ -161,7 +161,7 @@ coff_real_object_p (abfd, nscns, internal_f, internal_a) } /* make_abs_section(abfd);*/ - + if (bfd_coff_set_arch_mach_hook (abfd, (PTR) internal_f) == false) goto fail; @@ -261,7 +261,7 @@ coff_section_from_bfd_index (abfd, index) { struct sec *answer = abfd->sections; - if (index == N_ABS) + if (index == N_ABS) { return bfd_abs_section_ptr; } @@ -272,9 +272,9 @@ coff_section_from_bfd_index (abfd, index) if(index == N_DEBUG) { return &bfd_debug_section; - + } - + while (answer) { if (answer->target_index == index) return answer; @@ -318,10 +318,10 @@ coff_get_symtab (abfd, alocation) /* This nasty code looks at the symbol to decide whether or not it is descibes a constructor/destructor entry point. It is structured this way to (hopefully) speed non matches */ -#if 0 - if (0 && symbase->symbol.name[9] == '$') +#if 0 + if (0 && symbase->symbol.name[9] == '$') { - bfd_constructor_entry(abfd, + bfd_constructor_entry(abfd, (asymbol **)location, symbase->symbol.name[10] == 'I' ? "CTOR" : "DTOR"); @@ -689,7 +689,7 @@ coff_write_symbol (abfd, symbol, native, written) { native->u.syment.n_scnum = N_ABS; } - else if (symbol->section == &bfd_debug_section) + else if (symbol->section == &bfd_debug_section) { native->u.syment.n_scnum = N_DEBUG; } @@ -697,12 +697,12 @@ coff_write_symbol (abfd, symbol, native, written) { native->u.syment.n_scnum = N_UNDEF; } - else + else { native->u.syment.n_scnum = symbol->section->output_section->target_index; } - + coff_fix_symbol_name (abfd, symbol, native); symesz = bfd_coff_symesz (abfd); @@ -841,7 +841,7 @@ coff_write_native_symbol (abfd, symbol, written) while (lineno[count].line_number != 0) { #if 0 - /* 13 april 92. sac + /* 13 april 92. sac I've been told this, but still need proof: > The second bug is also in `bfd/coffcode.h'. This bug > causes the linker to screw up the pc-relocations for @@ -865,7 +865,7 @@ coff_write_native_symbol (abfd, symbol, written) count++; } symbol->done_lineno = true; - + symbol->symbol.section->output_section->moving_line_filepos += count * bfd_coff_linesz (abfd); } @@ -1185,13 +1185,13 @@ build_debug_section (abfd) return NULL; } - /* Seek to the beginning of the `.debug' section and read it. + /* Seek to the beginning of the `.debug' section and read it. Save the current position first; it is needed by our caller. Then read debug section and reset the file pointer. */ position = bfd_tell (abfd); if (bfd_seek (abfd, sect->filepos, SEEK_SET) != 0 - || (bfd_read (debug_section, + || (bfd_read (debug_section, bfd_get_section_size_before_reloc (sect), 1, abfd) != bfd_get_section_size_before_reloc(sect)) || bfd_seek (abfd, position, SEEK_SET) != 0) @@ -1299,11 +1299,11 @@ coff_get_normalized_symtab (abfd) for (i = 0; i < symbol_ptr->u.syment.n_numaux; - i++) + i++) { internal_ptr++; raw_src += symesz; - + internal_ptr->fix_value = 0; internal_ptr->fix_tag = 0; internal_ptr->fix_end = 0; @@ -1316,14 +1316,14 @@ coff_get_normalized_symtab (abfd) /* Remember that bal entries arn't pointerized */ if (i != 1 || symbol_ptr->u.syment.n_sclass != C_LEAFPROC) { - + coff_pointerize_aux(abfd, internal, symbol_ptr->u.syment.n_type, symbol_ptr->u.syment.n_sclass, internal_ptr); } - + } } @@ -1495,13 +1495,13 @@ coff_print_symbol (abfd, filep, symbol, how) break; case bfd_print_symbol_all: - if (coffsymbol(symbol)->native) + if (coffsymbol(symbol)->native) { unsigned int aux; combined_entry_type *combined = coffsymbol (symbol)->native; combined_entry_type *root = obj_raw_syments (abfd); struct lineno_cache_entry *l = coffsymbol(symbol)->lineno; - + fprintf (file,"[%3d]", combined - root); fprintf (file, @@ -1514,7 +1514,7 @@ coff_print_symbol (abfd, filep, symbol, how) (unsigned long) combined->u.syment.n_value, symbol->name); - for (aux = 0; aux < combined->u.syment.n_numaux; aux++) + for (aux = 0; aux < combined->u.syment.n_numaux; aux++) { combined_entry_type *auxp = combined + aux + 1; long tagndx; @@ -1539,12 +1539,12 @@ coff_print_symbol (abfd, filep, symbol, how) break; } } - + if (l) { fprintf (file, "\n%s :", l->u.sym->name); l++; - while (l->line_number) + while (l->line_number) { fprintf (file, "\n%4d : 0x%lx", l->line_number, @@ -1553,7 +1553,7 @@ coff_print_symbol (abfd, filep, symbol, how) l++; } } - } + } else { bfd_print_symbol_vandf ((PTR) file, symbol); diff --git a/gnu/usr.bin/gdb/bfd/coffswap.h b/gnu/usr.bin/gdb/bfd/coffswap.h index 74cc46e..f047a9a 100644 --- a/gnu/usr.bin/gdb/bfd/coffswap.h +++ b/gnu/usr.bin/gdb/bfd/coffswap.h @@ -346,7 +346,7 @@ coff_swap_aux_in (abfd, ext1, type, class, indx, numaux, in1) case C_FILE: if (ext->x_file.x_fname[0] == 0) { in->x_file.x_n.x_zeroes = 0; - in->x_file.x_n.x_offset = + in->x_file.x_n.x_offset = bfd_h_get_32(abfd, (bfd_byte *) ext->x_file.x_n.x_offset); } else { #if FILNMLEN != E_FILNMLEN diff --git a/gnu/usr.bin/gdb/bfd/cpu-i386.c b/gnu/usr.bin/gdb/bfd/cpu-i386.c index 3a8214f..bf67df2 100644 --- a/gnu/usr.bin/gdb/bfd/cpu-i386.c +++ b/gnu/usr.bin/gdb/bfd/cpu-i386.c @@ -21,7 +21,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "sysdep.h" #include "libbfd.h" -static bfd_arch_info_type arch_info_struct = +static bfd_arch_info_type arch_info_struct = { 32, /* 32 bits in a word */ 32, /* 32 bits in an address */ @@ -32,7 +32,7 @@ static bfd_arch_info_type arch_info_struct = "i386", 3, true, /* the one and only */ - bfd_default_compatible, + bfd_default_compatible, bfd_default_scan , 0, }; diff --git a/gnu/usr.bin/gdb/bfd/ctor.c b/gnu/usr.bin/gdb/bfd/ctor.c index 8a6e4e4..c9c2e32 100644 --- a/gnu/usr.bin/gdb/bfd/ctor.c +++ b/gnu/usr.bin/gdb/bfd/ctor.c @@ -31,7 +31,7 @@ SECTION which is static may also be have a type which requires `construction'; the contructor must be called before the data can be referenced, so the contructor must be called before the - program begins. + program begins. The common solution to this problem is for the compiler to call a magic function as the first statement before <<main>>. @@ -47,12 +47,12 @@ SECTION such over the result looking for strange <<__GLOBAL__$>> symbols, generate a C program from this, compile it, and link with the partially linked input. This process is usually - called <<collect>>. + called <<collect>>. Some versions of <<a.out>> use something called the <<set_vector>> mechanism. The constructor symbols are output from the compiler with a special stab code saying that they - are constructors, and the linker can deal with them directly. + are constructors, and the linker can deal with them directly. BFD allows applications (i.e., the linker) to deal with constructor information independently of their external @@ -61,11 +61,11 @@ SECTION of the contructor information. The application can interrogate the database to find out what it wants. The construction data essential for the linker to be able to - perform its job are: + perform its job are: o asymbol - The asymbol of the contructor entry point contains all the - information necessary to call the function. + information necessary to call the function. o table id - The type of symbol, i.e., is it a constructor, a destructor or @@ -76,7 +76,7 @@ SECTION creates these sections as if they were tables of pointers to the entry points, and builds relocation entries to go with them so that the tables can be relocated along with the data - they reference. + they reference. These sections are marked with a special bit (<<SEC_CONSTRUCTOR>>), which the linker notices and does with @@ -92,10 +92,10 @@ SECTION /* INTERNAL_FUNCTION - bfd_constructor_entry + bfd_constructor_entry SYNOPSIS - boolean bfd_constructor_entry(bfd *abfd, + boolean bfd_constructor_entry(bfd *abfd, asymbol **symbol_ptr_ptr, CONST char*type); @@ -113,7 +113,7 @@ DESCRIPTION */ - + boolean bfd_constructor_entry (abfd, symbol_ptr_ptr, type) bfd *abfd; diff --git a/gnu/usr.bin/gdb/bfd/ecoff.c b/gnu/usr.bin/gdb/bfd/ecoff.c index 9bf5050..ca71e7e 100644 --- a/gnu/usr.bin/gdb/bfd/ecoff.c +++ b/gnu/usr.bin/gdb/bfd/ecoff.c @@ -319,9 +319,9 @@ ecoff_sec_to_styp_flags (name, flags) styp = STYP_XDATA; else if (strcmp (name, _LIB) == 0) styp = STYP_ECOFF_LIB; - else if (flags & SEC_CODE) + else if (flags & SEC_CODE) styp = STYP_TEXT; - else if (flags & SEC_DATA) + else if (flags & SEC_DATA) styp = STYP_DATA; else if (flags & SEC_READONLY) styp = STYP_RDATA; @@ -420,7 +420,7 @@ _bfd_ecoff_swap_tir_in (bigend, ext_copy, intern) struct tir_ext ext[1]; *ext = *ext_copy; /* Make it reasonable to do in-place. */ - + /* now the fun stuff... */ if (bigend) { intern->fBitfield = 0 != (ext->t_bits1[0] & TIR_BITS1_FBITFIELD_BIG); @@ -477,7 +477,7 @@ _bfd_ecoff_swap_tir_out (bigend, intern_copy, ext) TIR intern[1]; *intern = *intern_copy; /* Make it reasonable to do in-place. */ - + /* now the fun stuff... */ if (bigend) { ext->t_bits1[0] = ((intern->fBitfield ? TIR_BITS1_FBITFIELD_BIG : 0) @@ -533,7 +533,7 @@ _bfd_ecoff_swap_rndx_in (bigend, ext_copy, intern) struct rndx_ext ext[1]; *ext = *ext_copy; /* Make it reasonable to do in-place. */ - + /* now the fun stuff... */ if (bigend) { intern->rfd = (ext->r_bits[0] << RNDX_BITS0_RFD_SH_LEFT_BIG) @@ -572,7 +572,7 @@ _bfd_ecoff_swap_rndx_out (bigend, intern_copy, ext) RNDXR intern[1]; *intern = *intern_copy; /* Make it reasonable to do in-place. */ - + /* now the fun stuff... */ if (bigend) { ext->r_bits[0] = intern->rfd >> RNDX_BITS0_RFD_SH_LEFT_BIG; @@ -610,7 +610,7 @@ ecoff_slurp_symbolic_header (abfd) HDRR *internal_symhdr; /* See if we've already read it in. */ - if (ecoff_data (abfd)->debug_info.symbolic_header.magic == + if (ecoff_data (abfd)->debug_info.symbolic_header.magic == backend->debug_swap.sym_magic) return true; @@ -1276,7 +1276,7 @@ ecoff_emit_aggregate (abfd, fdr, string, rndx, isym, which) unsigned int ifd = rndx->rfd; unsigned int indx = rndx->index; const char *name; - + if (ifd == 0xfff) ifd = isym; @@ -1665,7 +1665,7 @@ _bfd_ecoff_print_symbol (abfd, filep, symbol, how) if (ecoffsymbol (symbol)->local) { SYMR ecoff_sym; - + (*debug_swap->swap_sym_in) (abfd, ecoffsymbol (symbol)->native, &ecoff_sym); fprintf (file, "ecoff local "); @@ -1779,7 +1779,7 @@ _bfd_ecoff_print_symbol (abfd, filep, symbol, how) fprintf (file, "\n First symbol: %ld", (long) (indx + sym_base)); else - fprintf (file, "\n First symbol: %ld", + fprintf (file, "\n First symbol: %ld", ((long) (AUX_GET_ISYM (bigendian, &aux_base[ecoff_ext.asym.index]) @@ -1855,7 +1855,7 @@ ecoff_slurp_reloc_table (abfd, section, symbols) if (_bfd_ecoff_slurp_symbol_table (abfd) == false) return false; - + internal_relocs = (arelent *) bfd_alloc (abfd, (sizeof (arelent) * section->reloc_count)); @@ -1955,7 +1955,7 @@ _bfd_ecoff_canonicalize_reloc (abfd, section, relptr, symbols) { unsigned int count; - if (section->flags & SEC_CONSTRUCTOR) + if (section->flags & SEC_CONSTRUCTOR) { arelent_chain *chain; @@ -1968,7 +1968,7 @@ _bfd_ecoff_canonicalize_reloc (abfd, section, relptr, symbols) *relptr++ = &chain->relent; } else - { + { arelent *tblptr; if (ecoff_slurp_reloc_table (abfd, section, symbols) == false) @@ -2305,8 +2305,8 @@ _bfd_ecoff_sizeof_headers (abfd, reloc) c = 0; for (current = abfd->sections; - current != (asection *)NULL; - current = current->next) + current != (asection *)NULL; + current = current->next) ++c; ret = (bfd_coff_filhsz (abfd) @@ -2433,13 +2433,13 @@ ecoff_compute_reloc_file_positions (abfd) ecoff_compute_section_file_positions (abfd); abfd->output_has_begun = true; } - + reloc_base = ecoff_data (abfd)->reloc_filepos; reloc_size = 0; for (current = abfd->sections; - current != (asection *)NULL; - current = current->next) + current != (asection *)NULL; + current = current->next) { if (current->reloc_count == 0) current->rel_filepos = 0; @@ -2513,7 +2513,7 @@ bfd_ecoff_get_gp_value (abfd) bfd_set_error (bfd_error_invalid_operation); return 0; } - + return ecoff_data (abfd)->gp; } @@ -2692,8 +2692,8 @@ _bfd_ecoff_write_object_contents (abfd) count = 1; for (current = abfd->sections; - current != (asection *)NULL; - current = current->next) + current != (asection *)NULL; + current = current->next) { current->target_index = count; ++count; @@ -2821,7 +2821,7 @@ _bfd_ecoff_write_object_contents (abfd) /* Do nothing */ ; else abort (); - } + } /* Set up the file header. */ @@ -2969,7 +2969,7 @@ _bfd_ecoff_write_object_contents (abfd) arelent *reloc; asymbol *sym; struct internal_reloc in; - + memset ((PTR) &in, 0, sizeof in); reloc = *reloc_ptr_ptr; @@ -3165,7 +3165,7 @@ _bfd_ecoff_slurp_armap (abfd) char *raw_ptr; struct symdef *symdef_ptr; char *stringbase; - + /* Get the name of the first element. */ i = bfd_read ((PTR) nextname, 1, 16, abfd); if (i == 0) @@ -3217,14 +3217,14 @@ _bfd_ecoff_slurp_armap (abfd) return false; parsed_size = mapdata->parsed_size; bfd_release (abfd, (PTR) mapdata); - + raw_armap = (char *) bfd_alloc (abfd, parsed_size); if (raw_armap == (char *) NULL) { bfd_set_error (bfd_error_no_memory); return false; } - + if (bfd_read ((PTR) raw_armap, 1, parsed_size, abfd) != parsed_size) { if (bfd_get_error () != bfd_error_system_call) @@ -3232,7 +3232,7 @@ _bfd_ecoff_slurp_armap (abfd) bfd_release (abfd, (PTR) raw_armap); return false; } - + ardata->tdata = (PTR) raw_armap; count = bfd_h_get_32 (abfd, (PTR) raw_armap); @@ -3261,7 +3261,7 @@ _bfd_ecoff_slurp_armap (abfd) { unsigned int name_offset, file_offset; unsigned int hash, rehash, srch; - + name_offset = bfd_h_get_32 (abfd, (PTR) raw_ptr); file_offset = bfd_h_get_32 (abfd, (PTR) (raw_ptr + 4)); if (file_offset == 0) @@ -3406,7 +3406,7 @@ _bfd_ecoff_write_armap (abfd, elength, map, orl_count, stridx) bfd_h_put_32 (abfd, (bfd_vma) hashsize, temp); if (bfd_write ((PTR) temp, 1, 4, abfd) != 4) return false; - + hashtable = (bfd_byte *) bfd_zalloc (abfd, symdefsize); if (!hashtable) { @@ -3451,7 +3451,7 @@ _bfd_ecoff_write_armap (abfd, elength, map, orl_count, stridx) hash = srch; } - + bfd_h_put_32 (abfd, (bfd_vma) map[i].namidx, (PTR) (hashtable + hash * 8)); bfd_h_put_32 (abfd, (bfd_vma) firstreal, @@ -3522,7 +3522,7 @@ _bfd_ecoff_archive_p (abfd) bfd_ardata (abfd)->symdefs = NULL; bfd_ardata (abfd)->extended_names = NULL; bfd_ardata (abfd)->tdata = NULL; - + if (_bfd_ecoff_slurp_armap (abfd) == false || _bfd_ecoff_slurp_extended_name_table (abfd) == false) { @@ -3530,7 +3530,7 @@ _bfd_ecoff_archive_p (abfd) abfd->tdata.aout_ar_data = (struct artdata *) NULL; return (const bfd_target *) NULL; } - + return abfd->xvec; } @@ -4554,7 +4554,7 @@ ecoff_link_write_external (h, data) output_section = h->root.u.def.section->output_section; name = bfd_section_name (output_section->owner, output_section); - + if (strcmp (name, _TEXT) == 0) h->esym.asym.sc = scText; else if (strcmp (name, _DATA) == 0) diff --git a/gnu/usr.bin/gdb/bfd/ecofflink.c b/gnu/usr.bin/gdb/bfd/ecofflink.c index 784e874..f42025e 100644 --- a/gnu/usr.bin/gdb/bfd/ecofflink.c +++ b/gnu/usr.bin/gdb/bfd/ecofflink.c @@ -271,7 +271,7 @@ add_memory_shuffle (ainfo, head, tail, data, size) unsigned long size; { struct shuffle *n; - + n = (struct shuffle *) obstack_alloc (&ainfo->memory, sizeof (struct shuffle)); if (!n) @@ -365,7 +365,7 @@ bfd_ecoff_debug_free (handle, output_bfd, output_debug, output_swap, info) struct bfd_link_info *info; { struct accumulate *ainfo = (struct accumulate *) handle; - + bfd_hash_table_free (&ainfo->fdr_hash.table); if (! info->relocateable) diff --git a/gnu/usr.bin/gdb/bfd/elf32-target.h b/gnu/usr.bin/gdb/bfd/elf32-target.h index 67dabec..344683e 100644 --- a/gnu/usr.bin/gdb/bfd/elf32-target.h +++ b/gnu/usr.bin/gdb/bfd/elf32-target.h @@ -199,7 +199,7 @@ const bfd_target TARGET_BIG_SYM = /* object_flags: mask of all file flags */ (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT | D_PAGED), - + /* section_flags: mask of all section flags */ (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_READONLY | SEC_CODE | SEC_DATA | SEC_DEBUGGING), @@ -287,7 +287,7 @@ const bfd_target TARGET_LITTLE_SYM = /* object_flags: mask of all file flags */ (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT | D_PAGED), - + /* section_flags: mask of all section flags */ (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_READONLY | SEC_CODE | SEC_DATA | SEC_DEBUGGING), diff --git a/gnu/usr.bin/gdb/bfd/elfcode.h b/gnu/usr.bin/gdb/bfd/elfcode.h index 5d9ffd1..ab38ab9 100644 --- a/gnu/usr.bin/gdb/bfd/elfcode.h +++ b/gnu/usr.bin/gdb/bfd/elfcode.h @@ -1997,7 +1997,7 @@ assign_file_positions_except_relocs (abfd, dosyms) hdr->sh_offset = -1; continue; } - + off = assign_file_position_for_section (hdr, off, true); } } @@ -4143,7 +4143,7 @@ elf_link_add_object_symbols (abfd, info) strindex = bfd_add_to_strtab (abfd, elf_hash_table (info)->dynstr, name); - + if (strindex == (unsigned long) -1) goto error_return; if (! elf_add_dynamic_entry (info, DT_NEEDED, strindex)) @@ -5330,7 +5330,7 @@ elf_bfd_final_link (abfd, info) { if (*rel_hash == NULL) continue; - + BFD_ASSERT ((*rel_hash)->indx >= 0); if (rel_hdr->sh_entsize == sizeof (Elf_External_Rel)) diff --git a/gnu/usr.bin/gdb/bfd/format.c b/gnu/usr.bin/gdb/bfd/format.c index b4c8471..adee048 100644 --- a/gnu/usr.bin/gdb/bfd/format.c +++ b/gnu/usr.bin/gdb/bfd/format.c @@ -23,7 +23,7 @@ SECTION File formats A format is a BFD concept of high level file contents type. The - formats supported by BFD are: + formats supported by BFD are: o <<bfd_object>> @@ -68,7 +68,7 @@ DESCRIPTION the file, or an error results. The function returns <<true>> on success, otherwise <<false>> - with one of the following error codes: + with one of the following error codes: o <<bfd_error_invalid_operation>> - if <<format>> is not one of <<bfd_object>>, <<bfd_archive>> or @@ -109,7 +109,7 @@ DESCRIPTION Then the user may choose a format and try again. When done with the list that @var{matching} points to, the caller - should free it. + should free it. */ boolean @@ -133,7 +133,7 @@ bfd_check_format_matches (abfd, format, matching) return (abfd->format == format)? true: false; - /* Since the target type was defaulted, check them + /* Since the target type was defaulted, check them all in the hope that one will be uniquely recognized. */ save_targ = abfd->xvec; @@ -191,7 +191,7 @@ bfd_check_format_matches (abfd, format, matching) } match_count++; /* If this is the default target, accept it, even if other targets - might match. People who want those other targets have to set + might match. People who want those other targets have to set the GNUTARGET variable. */ if (temp == bfd_default_vector[0]) { @@ -301,18 +301,18 @@ CONST char * bfd_format_string (format) bfd_format format; { - if (((int)format <(int) bfd_unknown) - || ((int)format >=(int) bfd_type_end)) + if (((int)format <(int) bfd_unknown) + || ((int)format >=(int) bfd_type_end)) return "invalid"; - + switch (format) { case bfd_object: return "object"; /* linker/assember/compiler output */ - case bfd_archive: + case bfd_archive: return "archive"; /* object archive file */ - case bfd_core: + case bfd_core: return "core"; /* core dump */ - default: + default: return "unknown"; } } diff --git a/gnu/usr.bin/gdb/bfd/freebsd386.c b/gnu/usr.bin/gdb/bfd/freebsd386.c index c00ec0c..3b2633cf 100644 --- a/gnu/usr.bin/gdb/bfd/freebsd386.c +++ b/gnu/usr.bin/gdb/bfd/freebsd386.c @@ -91,7 +91,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* Text segment offset. */ #define N_TXTOFF(ex) \ (N_MAGIC(ex) == ZMAGIC ? PAGE_SIZE : (N_MAGIC(ex) == QMAGIC || \ - N_GETMAGIC_NET(ex) == ZMAGIC) ? 0 : EXEC_BYTES_SIZE) + N_GETMAGIC_NET(ex) == ZMAGIC) ? 0 : EXEC_BYTES_SIZE) /* Data segment offset. */ #define N_DATOFF(ex) \ diff --git a/gnu/usr.bin/gdb/bfd/hash.c b/gnu/usr.bin/gdb/bfd/hash.c index cb11c23..28d364c 100644 --- a/gnu/usr.bin/gdb/bfd/hash.c +++ b/gnu/usr.bin/gdb/bfd/hash.c @@ -268,7 +268,7 @@ SUBSUBSECTION Write other derived routines You will want to write other routines for your new hash table, - as well. + as well. You will want an initialization routine which calls the initialization routine of the hash table you are deriving from @@ -367,7 +367,7 @@ bfd_hash_lookup (table, string, create, copy) struct bfd_hash_entry *hashp; unsigned int len; unsigned int index; - + hash = 0; len = 0; s = (const unsigned char *) string; diff --git a/gnu/usr.bin/gdb/bfd/i386aout.c b/gnu/usr.bin/gdb/bfd/i386aout.c index b60d7e7..4af12ba 100644 --- a/gnu/usr.bin/gdb/bfd/i386aout.c +++ b/gnu/usr.bin/gdb/bfd/i386aout.c @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* The only 386 aout system we have here is GO32 from DJ. +/* The only 386 aout system we have here is GO32 from DJ. These numbers make BFD work with that. If your aout 386 system doesn't work with these, we'll have to split them into different files. Send me (sac@cygnus.com) the runes to make it work on your diff --git a/gnu/usr.bin/gdb/bfd/libaout.h b/gnu/usr.bin/gdb/bfd/libaout.h index 74babf2..7a66f65 100644 --- a/gnu/usr.bin/gdb/bfd/libaout.h +++ b/gnu/usr.bin/gdb/bfd/libaout.h @@ -186,7 +186,7 @@ struct internal_exec char a_relaxable; /* Enough info for linker relax */ }; -/* Magic number is written +/* Magic number is written < MSB > 3130292827262524232221201918171615141312111009080706050403020100 < FLAGS >< MACHINE TYPE >< MAGIC NUMBER > @@ -277,7 +277,7 @@ typedef struct aout_symbol { struct aoutdata { struct internal_exec *hdr; /* exec file header */ aout_symbol_type *symbols; /* symtab for input bfd */ - + /* For ease, we do this */ asection *textsec; asection *datasec; @@ -572,7 +572,7 @@ aout_stab_name PARAMS ((int code)); if (!NAME(aout,squirt_out_relocs)(abfd, obj_datasec (abfd))) \ return false; \ } \ - } + } #endif #endif /* ! defined (LIBAOUT_H) */ diff --git a/gnu/usr.bin/gdb/bfd/libbfd.c b/gnu/usr.bin/gdb/bfd/libbfd.c index a66eb6e..031f08f 100644 --- a/gnu/usr.bin/gdb/bfd/libbfd.c +++ b/gnu/usr.bin/gdb/bfd/libbfd.c @@ -68,7 +68,7 @@ bfd_nullvoidptr (ignore) } /*ARGSUSED*/ -int +int bfd_0 (ignore) bfd *ignore; { @@ -76,7 +76,7 @@ bfd_0 (ignore) } /*ARGSUSED*/ -unsigned int +unsigned int bfd_0u (ignore) bfd *ignore; { @@ -104,7 +104,7 @@ _bfd_n1 (ignore_abfd) } /*ARGSUSED*/ -void +void bfd_void (ignore) bfd *ignore; { @@ -180,7 +180,7 @@ bfd_zmalloc (size) contents (0 for non-archive elements). For archive entries this is the first octet in the file, NOT the beginning of the archive header. */ -static +static int real_read (where, a,b, file) PTR where; @@ -418,7 +418,7 @@ bfd_add_to_string_table (table, new_string, table_length, free_ptr) if ((size_t)(offset + string_length) >= space_length) { /* Make sure we will have enough space */ - while ((size_t)(offset + string_length) >= space_length) + while ((size_t)(offset + string_length) >= space_length) space_length += space_length/2; /* grow by 50% */ base = (char *) realloc (base, space_length); @@ -433,7 +433,7 @@ bfd_add_to_string_table (table, new_string, table_length, free_ptr) *table = base; *table_length = space_length; *free_ptr = base + offset + string_length; - + return true; } @@ -445,7 +445,7 @@ bfd_add_to_string_table (table, new_string, table_length, free_ptr) /* FIXME: Should these take a count argument? Answer (gnu@cygnus.com): No, but perhaps they should be inline - functions in swap.h #ifdef __GNUC__. + functions in swap.h #ifdef __GNUC__. Gprof them later and find out. */ /* @@ -511,7 +511,7 @@ DESCRIPTION .#define bfd_get_signed_64(abfd, ptr) \ . BFD_SEND(abfd, bfd_getx_signed_64, (ptr)) . -*/ +*/ /* FUNCTION @@ -563,7 +563,7 @@ DESCRIPTION .#define bfd_h_get_signed_64(abfd, ptr) \ . BFD_SEND(abfd, bfd_h_getx_signed_64, (ptr)) . -*/ +*/ /* Sign extension to bfd_signed_vma. */ #define COERCE16(x) (((bfd_signed_vma) (x) ^ 0x8000) - 0x8000) @@ -611,7 +611,7 @@ bfd_putb16 (data, addr) void bfd_putl16 (data, addr) - bfd_vma data; + bfd_vma data; register bfd_byte *addr; { addr[0] = (bfd_byte )data; diff --git a/gnu/usr.bin/gdb/bfd/libbfd.h b/gnu/usr.bin/gdb/bfd/libbfd.h index 908f08a..89e4c81 100644 --- a/gnu/usr.bin/gdb/bfd/libbfd.h +++ b/gnu/usr.bin/gdb/bfd/libbfd.h @@ -393,7 +393,7 @@ void bfd_assert PARAMS ((char*,int)); FILE * bfd_cache_lookup_worker PARAMS ((bfd *)); extern bfd *bfd_last_cache; - + /* Now Steve, what's the story here? */ #ifdef lint #define itos(x) "l" @@ -410,13 +410,13 @@ extern const bfd_target * const bfd_default_vector[]; /* And more follows */ -void +void bfd_check_init PARAMS ((void)); -void +void bfd_write_bigendian_4byte_int PARAMS ((bfd *abfd, int i)); -unsigned int +unsigned int bfd_log2 PARAMS ((bfd_vma x)); #define BFD_CACHE_MAX_OPEN 10 @@ -426,20 +426,20 @@ extern bfd *bfd_last_cache; ((x)==bfd_last_cache? \ (FILE*)(bfd_last_cache->iostream): \ bfd_cache_lookup_worker(x)) -boolean +boolean bfd_cache_init PARAMS ((bfd *abfd)); -boolean +boolean bfd_cache_close PARAMS ((bfd *abfd)); -FILE* +FILE* bfd_open_file PARAMS ((bfd *abfd)); FILE * bfd_cache_lookup_worker PARAMS ((bfd *abfd)); -boolean -bfd_constructor_entry PARAMS ((bfd *abfd, +boolean +bfd_constructor_entry PARAMS ((bfd *abfd, asymbol **symbol_ptr_ptr, CONST char*type)); @@ -447,7 +447,7 @@ const struct reloc_howto_struct * bfd_default_reloc_type_lookup PARAMS ((bfd *abfd, bfd_reloc_code_real_type code)); -boolean +boolean bfd_generic_relax_section PARAMS ((bfd *abfd, asection *section, @@ -464,15 +464,15 @@ bfd_generic_get_relocated_section_contents PARAMS ((bfd *abfd, asymbol **symbols)); extern bfd_arch_info_type bfd_default_arch_struct; -boolean +boolean bfd_default_set_arch_mach PARAMS ((bfd *abfd, enum bfd_architecture arch, unsigned long mach)); -void +void bfd_arch_init PARAMS ((void)); -void +void bfd_arch_linkin PARAMS ((bfd_arch_info_type *ptr)); CONST bfd_arch_info_type * @@ -480,7 +480,7 @@ bfd_default_compatible PARAMS ((CONST bfd_arch_info_type *a, CONST bfd_arch_info_type *b)); -boolean +boolean bfd_default_scan PARAMS ((CONST struct bfd_arch_info *info, CONST char *string)); struct elf_internal_shdr * diff --git a/gnu/usr.bin/gdb/bfd/linker.c b/gnu/usr.bin/gdb/bfd/linker.c index d8275b5..63391a2 100644 --- a/gnu/usr.bin/gdb/bfd/linker.c +++ b/gnu/usr.bin/gdb/bfd/linker.c @@ -59,7 +59,7 @@ SECTION a.out (in <<aoutx.h>>) and ECOFF (in <<ecoff.c>>). The a.out routines are used as examples throughout this section. -@menu +@menu @* Creating a Linker Hash Table:: @* Adding Symbols to the Hash Table:: @* Performing the Final Link:: @@ -525,7 +525,7 @@ bfd_link_hash_lookup (table, string, create, copy, follow) struct bfd_link_hash_entry * with no explicit cast required on the call. */ -void +void bfd_link_hash_traverse (table, func, info) struct bfd_link_hash_table *table; boolean (*func) PARAMS ((struct bfd_link_hash_entry *, PTR)); @@ -1573,7 +1573,7 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value, default: abort (); } - + if (! ((*info->callbacks->multiple_definition) (info, name, msec->owner, msec, mval, abfd, section, value))) @@ -2159,7 +2159,7 @@ _bfd_generic_reloc_link_order (abfd, info, sec, link_order) bfd_set_error (bfd_error_no_memory); return false; } - + r->address = link_order->offset; r->howto = bfd_reloc_type_lookup (abfd, link_order->u.reloc.p->reloc); if (r->howto == (const reloc_howto_type *) NULL) diff --git a/gnu/usr.bin/gdb/bfd/opncls.c b/gnu/usr.bin/gdb/bfd/opncls.c index fb93153..2d760a1 100644 --- a/gnu/usr.bin/gdb/bfd/opncls.c +++ b/gnu/usr.bin/gdb/bfd/opncls.c @@ -59,7 +59,7 @@ _bfd_new_bfd () nbfd->sections = (asection *)NULL; nbfd->format = bfd_unknown; nbfd->my_archive = (bfd *)NULL; - nbfd->origin = 0; + nbfd->origin = 0; nbfd->opened_once = false; nbfd->output_has_begun = false; nbfd->section_count = 0; @@ -238,7 +238,7 @@ bfd_fdopenr (filename, target, fd) case O_RDWR: nbfd->direction = both_direction; break; default: abort (); } - + if (! bfd_cache_init (nbfd)) return NULL; @@ -418,7 +418,7 @@ bfd_close_all_done (abfd) /* -FUNCTION +FUNCTION bfd_alloc_size SYNOPSIS diff --git a/gnu/usr.bin/gdb/bfd/reloc.c b/gnu/usr.bin/gdb/bfd/reloc.c index 9c65be9..edb8903 100644 --- a/gnu/usr.bin/gdb/bfd/reloc.c +++ b/gnu/usr.bin/gdb/bfd/reloc.c @@ -134,7 +134,7 @@ DESCRIPTION type which modifies the bottom two bytes of a four byte word would not touch the first byte pointed to in a big endian world. - + o <<addend>> The <<addend>> is a value provided by the back end to be added (!) diff --git a/gnu/usr.bin/gdb/bfd/srec.c b/gnu/usr.bin/gdb/bfd/srec.c index a52e9b2..2d82ffc 100644 --- a/gnu/usr.bin/gdb/bfd/srec.c +++ b/gnu/usr.bin/gdb/bfd/srec.c @@ -23,7 +23,7 @@ SUBSECTION S-Record handling DESCRIPTION - + Ordinary S-Records cannot hold anything but addresses and data, so that's all that we implement. @@ -41,10 +41,10 @@ DESCRIPTION up and output them when it's time to close the bfd. An s record looks like: - + EXAMPLE S<type><length><address><data><checksum> - + DESCRIPTION Where o length @@ -60,7 +60,7 @@ DESCRIPTION 7) four byte address termination record 8) three byte address termination record 9) two byte address termination record - + o address is the start address of the data following, or in the case of a termination record, the start address of the image @@ -100,7 +100,7 @@ EXAMPLE DESCRIPTION We allow symbols to be anywhere in the data stream - the module names are always ignored. - + */ #include "bfd.h" diff --git a/gnu/usr.bin/gdb/bfd/targets.c b/gnu/usr.bin/gdb/bfd/targets.c index 15a1e45..f6115a8 100644 --- a/gnu/usr.bin/gdb/bfd/targets.c +++ b/gnu/usr.bin/gdb/bfd/targets.c @@ -23,7 +23,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "libbfd.h" /* -SECTION +SECTION Targets DESCRIPTION @@ -32,7 +32,7 @@ DESCRIPTION part of BFD is a structure containing pointers to functions which perform certain low level operations on files. BFD translates the applications's requests through a pointer into - calls to the back end routines. + calls to the back end routines. When a file is opened with <<bfd_openr>>, its format and target are unknown. BFD uses various mechanisms to determine @@ -40,11 +40,11 @@ DESCRIPTION o Create a BFD by calling the internal routine <<_bfd_new_bfd>>, then call <<bfd_find_target>> with the - target string supplied to <<bfd_openr>> and the new BFD pointer. + target string supplied to <<bfd_openr>> and the new BFD pointer. o If a null target string was provided to <<bfd_find_target>>, look up the environment variable <<GNUTARGET>> and use - that as the target string. + that as the target string. o If the target string is still <<NULL>>, or the target string is <<default>>, then use the first item in the target vector @@ -54,7 +54,7 @@ DESCRIPTION o Otherwise, inspect the elements in the target vector one by one, until a match on target name is found. When found, - use it. + use it. o Otherwise return the error <<bfd_error_invalid_target>> to <<bfd_openr>>. @@ -64,7 +64,7 @@ DESCRIPTION Once the BFD has been opened and the target selected, the file format may be determined. This is done by calling - <<bfd_check_format>> on the BFD with a suggested format. + <<bfd_check_format>> on the BFD with a suggested format. If <<target_defaulted>> has been set, each possible target type is tried to see if it recognizes the specified format. <<bfd_check_format>> returns <<true>> when the caller guesses right. @@ -85,17 +85,17 @@ SUBSECTION DESCRIPTION This structure contains everything that BFD knows about a target. It includes things like its byte order, name, and which - routines to call to do various operations. + routines to call to do various operations. Every BFD points to a target structure with its <<xvec>> - member. + member. The macros below are used to dispatch to functions through the <<bfd_target>> vector. They are used in a number of macros further down in @file{bfd.h}, and are also used when calling various routines by hand inside the BFD implementation. The @var{arglist} argument must be parenthesized; it contains all the arguments - to the called function. + to the called function. They make the documentation (more) unpleasant to read, so if someone wants to fix this and not break the above, please do. @@ -132,7 +132,7 @@ DESCRIPTION FIXME, these names should be rationalised with the names of the entry points which call them. Too bad we can't have one - macro to define them both! + macro to define them both! .enum bfd_flavour { . bfd_target_unknown_flavour, @@ -174,21 +174,21 @@ The order of bytes within the header parts of a file. A mask of all the flags which an executable may have set - from the set <<NO_FLAGS>>, <<HAS_RELOC>>, ...<<D_PAGED>>. -. flagword object_flags; +. flagword object_flags; A mask of all the flags which a section may have set - from the set <<SEC_NO_FLAGS>>, <<SEC_ALLOC>>, ...<<SET_NEVER_LOAD>>. . flagword section_flags; -The character normally found at the front of a symbol +The character normally found at the front of a symbol (if any), perhaps `_'. . char symbol_leading_char; The pad character for file names within an archive header. -. char ar_pad_char; +. char ar_pad_char; The maximum number of characters in an archive header. @@ -227,15 +227,15 @@ Byte swapping for the headers Format dependent routines: these are vectors of entry points within the target vector structure, one for each format to check. -Check the format of a file being read. Return a <<bfd_target *>> or zero. +Check the format of a file being read. Return a <<bfd_target *>> or zero. . const struct bfd_target *(*_bfd_check_format[bfd_type_end]) PARAMS ((bfd *)); -Set the format of a file being written. +Set the format of a file being written. . boolean (*_bfd_set_format[bfd_type_end]) PARAMS ((bfd *)); -Write cached information into a file being written, at <<bfd_close>>. +Write cached information into a file being written, at <<bfd_close>>. . boolean (*_bfd_write_contents[bfd_type_end]) PARAMS ((bfd *)); @@ -255,7 +255,7 @@ The general target vector. . {* Called when a new section is created. *} . boolean (*_new_section_hook) PARAMS ((bfd *, sec_ptr)); . {* Read the contents of a section. *} -. boolean (*_bfd_get_section_contents) PARAMS ((bfd *, sec_ptr, PTR, +. boolean (*_bfd_get_section_contents) PARAMS ((bfd *, sec_ptr, PTR, . file_ptr, bfd_size_type)); . . {* Entry points to copy private data. *} @@ -290,14 +290,14 @@ The general target vector. . boolean (*_bfd_slurp_armap) PARAMS ((bfd *)); . boolean (*_bfd_slurp_extended_name_table) PARAMS ((bfd *)); . void (*_bfd_truncate_arname) PARAMS ((bfd *, CONST char *, char *)); -. boolean (*write_armap) PARAMS ((bfd *arch, +. boolean (*write_armap) PARAMS ((bfd *arch, . unsigned int elength, . struct orl *map, -. unsigned int orl_count, +. unsigned int orl_count, . int stridx)); . bfd * (*openr_next_archived_file) PARAMS ((bfd *arch, bfd *prev)); . int (*_bfd_stat_arch_elt) PARAMS ((bfd *, struct stat *)); -. +. . {* Entry points used for symbols. *} .#define BFD_JUMP_TABLE_SYMBOLS(NAME)\ .CAT(NAME,_get_symtab_upper_bound),\ @@ -695,7 +695,7 @@ DESCRIPTION variable to "default" will cause the first entry in the target list to be returned, and "target_defaulted" will be set in the BFD. This causes <<bfd_check_format>> to loop over all the - targets to find the one that matches the file being read. + targets to find the one that matches the file being read. */ const bfd_target * @@ -705,7 +705,7 @@ bfd_find_target (target_name, abfd) { const bfd_target * const *target; extern char *getenv (); - CONST char *targname = (target_name ? target_name : + CONST char *targname = (target_name ? target_name : (CONST char *) getenv ("GNUTARGET")); /* This is safe; the vector cannot be null */ diff --git a/gnu/usr.bin/gdb/bfd/trad-core.c b/gnu/usr.bin/gdb/bfd/trad-core.c index 48b5f8e..dc3d843 100644 --- a/gnu/usr.bin/gdb/bfd/trad-core.c +++ b/gnu/usr.bin/gdb/bfd/trad-core.c @@ -48,7 +48,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <errno.h> - struct trad_core_struct + struct trad_core_struct { asection *data_section; asection *stack_section; @@ -85,7 +85,7 @@ trad_unix_core_file_p (abfd) if (bfd_seek (abfd, TRAD_CORE_USER_OFFSET, SEEK_SET) != 0) return 0; #endif - + val = bfd_read ((void *)&u, 1, sizeof u, abfd); if (val != sizeof u) { @@ -152,7 +152,7 @@ trad_unix_core_file_p (abfd) bfd_set_error (bfd_error_no_memory); return 0; } - + abfd->tdata.trad_core_data = rawptr; rawptr->u = u; /*Copy the uarea into the tdata part of the bfd */ @@ -216,7 +216,7 @@ trad_unix_core_file_p (abfd) from *u_ar0. The other is that u_ar0 is sometimes an absolute address in kernel memory, and on other systems it is an offset from the beginning of the `struct user'. - + As a practical matter, we don't know where the registers actually are, so we have to pass the whole area to GDB. We encode the value of u_ar0 by setting the .regs section up so that its virtual memory address @@ -325,7 +325,7 @@ const bfd_target trad_core_vec = bfd_false, bfd_false, bfd_false, bfd_false }, - + BFD_JUMP_TABLE_GENERIC (_bfd_generic), BFD_JUMP_TABLE_COPY (_bfd_generic), BFD_JUMP_TABLE_CORE (trad_unix), diff --git a/gnu/usr.bin/gdb/gdb/aout/aout64.h b/gnu/usr.bin/gdb/gdb/aout/aout64.h index 18b6bfd..59588f7 100644 --- a/gnu/usr.bin/gdb/gdb/aout/aout64.h +++ b/gnu/usr.bin/gdb/gdb/aout/aout64.h @@ -6,7 +6,7 @@ /* This is the layout on disk of the 32-bit or 64-bit exec header. */ #ifndef external_exec -struct external_exec +struct external_exec { bfd_byte e_info[4]; /* magic number and stuff */ bfd_byte e_text[BYTES_IN_WORD]; /* length of text section in bytes */ @@ -299,7 +299,7 @@ struct internal_nlist { #define N_WEAKD 0x10 /* Weak data symbol. */ #define N_WEAKB 0x11 /* Weak bss symbol. */ -/* Relocations +/* Relocations There are two types of relocation flavours for a.out systems, standard and extended. The standard form is used on systems where the @@ -410,7 +410,7 @@ enum reloc_type RELOC_22, /* data[0:21] = (addend + sv) */ RELOC_13, /* data[0:12] = (addend + sv) */ RELOC_LO10, /* data[0:9] = (addend + sv) */ - RELOC_SFA_BASE, + RELOC_SFA_BASE, RELOC_SFA_OFF13, /* P.I.C. (base-relative) */ RELOC_BASE10, /* Not sure - maybe we can do this the */ @@ -427,17 +427,17 @@ enum reloc_type RELOC_JMP_SLOT, RELOC_RELATIVE, - RELOC_11, + RELOC_11, RELOC_WDISP2_14, RELOC_WDISP19, RELOC_HHI22, /* data[0:21] = (addend + sv) >> 42 */ RELOC_HLO10, /* data[0:9] = (addend + sv) >> 32 */ - + /* 29K relocation types */ RELOC_JUMPTARG, RELOC_CONST, RELOC_CONSTH, - + /* All the new ones I can think of, for sparc v9 */ RELOC_64, /* data[0:63] = addend + sv */ diff --git a/gnu/usr.bin/gdb/gdb/aout/ar.h b/gnu/usr.bin/gdb/gdb/aout/ar.h index 7b5dcda..1112af6 100644 --- a/gnu/usr.bin/gdb/gdb/aout/ar.h +++ b/gnu/usr.bin/gdb/gdb/aout/ar.h @@ -16,7 +16,7 @@ #define ARFMAG "`\012" /* The ar_date field of the armap (__.SYMDEF) member of an archive - must be greater than the modified date of the entire file, or + must be greater than the modified date of the entire file, or BSD-derived linkers complain. We originally write the ar_date with this offset from the real file's mod-time. After finishing the file, we rewrite ar_date if it's not still greater than the mod date. */ diff --git a/gnu/usr.bin/gdb/gdb/aout/encap.h b/gnu/usr.bin/gdb/gdb/aout/encap.h index cebedf3..fb79918 100644 --- a/gnu/usr.bin/gdb/gdb/aout/encap.h +++ b/gnu/usr.bin/gdb/gdb/aout/encap.h @@ -21,7 +21,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* * We only use the coff headers to tell the kernel - * how to exec the file. Therefore, the only fields that need to + * how to exec the file. Therefore, the only fields that need to * be filled in are the scnptr and vaddr for the text and data * sections, and the vaddr for the bss. As far as coff is concerned, * there is no symbol table, relocation, or line numbers. @@ -31,7 +31,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ * and a_flags. If a_machtype is M_386, and a_flags & A_ENCAP is * true, then the bsd header is preceeded by a coff header. Macros * like N_TXTOFF and N_TXTADDR use this field to find the bsd header. - * + * * The only problem is to track down the bsd exec header. The * macros HEADER_OFFSET, etc do this. */ @@ -82,7 +82,7 @@ struct coffheader separate GNU nm for every architecture!!? Unfortunately, it needs to be this way, since the COFF_MAGIC value is determined by the kernel we're trying to fool here. */ - + #define COFF_MAGIC_I386 0514 /* I386MAGIC */ #define COFF_MAGIC_M68K 0520 /* MC68MAGIC */ #define COFF_MAGIC_A29K 0x17A /* Used by asm29k cross-tools */ @@ -111,7 +111,7 @@ short __header_offset_temp; Non-encapsulated a.out files that are linked ZMAGIC have a text segment that starts at 0 and an N_TXTADR similarly offset to 0. They too are page-aligned with each other, but they include the - a.out header as part of the text. + a.out header as part of the text. The _N_HDROFF gets sizeof struct exec added to it, so we have to compensate here. See <a.out.gnu.h>. */ diff --git a/gnu/usr.bin/gdb/gdb/aout/ranlib.h b/gnu/usr.bin/gdb/gdb/aout/ranlib.h index 53e35ce..43ea0b4 100644 --- a/gnu/usr.bin/gdb/gdb/aout/ranlib.h +++ b/gnu/usr.bin/gdb/gdb/aout/ranlib.h @@ -49,7 +49,7 @@ struct symdef } s; /* this points to the front of the file header (AKA member header -- a struct ar_hdr), not to the front of the file or into the file). - in other words it only tells you which file to read */ + in other words it only tells you which file to read */ unsigned long file_offset; }; diff --git a/gnu/usr.bin/gdb/gdb/aout/reloc.h b/gnu/usr.bin/gdb/gdb/aout/reloc.h index 1811b73..ec9fef8 100644 --- a/gnu/usr.bin/gdb/gdb/aout/reloc.h +++ b/gnu/usr.bin/gdb/gdb/aout/reloc.h @@ -39,12 +39,12 @@ enum reloc_type RELOC_WDISP19, RELOC_HHI22, RELOC_HLO10, - + /* 29K relocation types */ RELOC_JUMPTARG, RELOC_CONST, RELOC_CONSTH, - + RELOC_WDISP14, RELOC_WDISP21, - + NO_RELOC }; diff --git a/gnu/usr.bin/gdb/gdb/bfdlink.h b/gnu/usr.bin/gdb/gdb/bfdlink.h index 2f0eb66..b46eb34 100644 --- a/gnu/usr.bin/gdb/gdb/bfdlink.h +++ b/gnu/usr.bin/gdb/gdb/bfdlink.h @@ -325,20 +325,20 @@ enum bfd_link_order_type /* This is the link_order structure itself. These form a chain attached to the section whose contents they are describing. */ -struct bfd_link_order +struct bfd_link_order { /* Next link_order in chain. */ struct bfd_link_order *next; /* Type of link_order. */ enum bfd_link_order_type type; /* Offset within output section. */ - bfd_vma offset; + bfd_vma offset; /* Size within output section. */ bfd_size_type size; /* Type specific information. */ - union + union { - struct + struct { /* Section to include. If this is used, then section->output_section must be the section the diff --git a/gnu/usr.bin/gdb/gdb/blockframe.c b/gnu/usr.bin/gdb/gdb/blockframe.c index 667472b..732bbdb 100644 --- a/gnu/usr.bin/gdb/gdb/blockframe.c +++ b/gnu/usr.bin/gdb/gdb/blockframe.c @@ -34,7 +34,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ has a way to detect the bottom of the stack, there is no need to call this function from FRAME_CHAIN_VALID; the reason for doing so is that some machines have no way of detecting bottom - of stack. + of stack. A PC of zero is always considered to be the bottom of the stack. */ @@ -372,7 +372,7 @@ get_prev_frame_info (next_frame) (where the PC is already set up) and here (where it isn't). INIT_FRAME_PC is only called from here, always after INIT_EXTRA_FRAME_INFO. - + The catch is the MIPS, where INIT_EXTRA_FRAME_INFO requires the PC value (which hasn't been set yet). Some other machines appear to require INIT_EXTRA_FRAME_INFO before they can do INIT_FRAME_PC. Phoo. diff --git a/gnu/usr.bin/gdb/gdb/breakpoint.c b/gnu/usr.bin/gdb/gdb/breakpoint.c index acdeff2..fe75ed13 100644 --- a/gnu/usr.bin/gdb/gdb/breakpoint.c +++ b/gnu/usr.bin/gdb/gdb/breakpoint.c @@ -348,7 +348,7 @@ commands_command (arg, from_tty) bnum = get_number (&p); if (p && *p) error ("Unexpected extra arguments following breakpoint number."); - + ALL_BREAKPOINTS (b) if (b->number == bnum) { @@ -369,7 +369,7 @@ extern int memory_breakpoint_size; /* from mem-break.c */ /* Like target_read_memory() but if breakpoints are inserted, return the shadow contents instead of the breakpoints themselves. - Read "memory data" from whatever target or inferior we have. + Read "memory data" from whatever target or inferior we have. Returns zero if successful, errno value if not. EIO is used for address out of bounds. If breakpoints are inserted, returns shadow contents, not the breakpoints themselves. From breakpoint.c. */ @@ -390,7 +390,7 @@ read_memory_nobpt (memaddr, myaddr, len) bytes of the shadow contents are used, or perhaps have something like target_xfer_shadow. */ return target_read_memory (memaddr, myaddr, len); - + ALL_BREAKPOINTS (b) { if (b->type == bp_watchpoint @@ -411,14 +411,14 @@ read_memory_nobpt (memaddr, myaddr, len) { /* Copy the breakpoint from the shadow contents, and recurse for the things before and after. */ - + /* Addresses and length of the part of the breakpoint that we need to copy. */ CORE_ADDR membpt = b->address; unsigned int bptlen = memory_breakpoint_size; /* Offset within shadow_contents. */ int bptoffset = 0; - + if (membpt < memaddr) { /* Only copy the second part of the breakpoint. */ @@ -433,7 +433,7 @@ read_memory_nobpt (memaddr, myaddr, len) bptlen -= (membpt + bptlen) - (memaddr + len); } - memcpy (myaddr + membpt - memaddr, + memcpy (myaddr + membpt - memaddr, b->shadow_contents + bptoffset, bptlen); if (membpt > memaddr) @@ -546,14 +546,14 @@ insert_breakpoints () if (within_current_scope) select_frame (fr, -1); } - + if (within_current_scope) { /* Evaluate the expression and cut the chain of values produced off from the value chain. */ v = evaluate_expression (b->exp); value_release_to_mark (mark); - + b->val_chain = v; b->inserted = 1; @@ -564,7 +564,7 @@ insert_breakpoints () if (v->lval == lval_memory) { int addr, len, type; - + addr = VALUE_ADDRESS (v) + VALUE_OFFSET (v); len = TYPE_LENGTH (VALUE_TYPE (v)); type = 0; @@ -631,7 +631,7 @@ remove_breakpoint (b) struct breakpoint *b; { int val; - + if (b->type != bp_watchpoint && b->type != bp_hardware_watchpoint && b->type != bp_read_watchpoint @@ -652,7 +652,7 @@ remove_breakpoint (b) && ! b->duplicate) { value_ptr v, n; - + b->inserted = 0; /* Walk down the saved value chain. */ for (v = b->val_chain; v; v = v->next) @@ -662,7 +662,7 @@ remove_breakpoint (b) if (v->lval == lval_memory) { int addr, len; - + addr = VALUE_ADDRESS (v) + VALUE_OFFSET (v); len = TYPE_LENGTH (VALUE_TYPE (v)); val = target_remove_watchpoint (addr, len, b->type); @@ -675,7 +675,7 @@ remove_breakpoint (b) if (b->inserted) error ("Hardware watchpoint %d: Could not remove watchpoint\n", b->number); - + /* Free the saved value chain. We will construct a new one the next time the watchpoint is inserted. */ for (v = b->val_chain; v; v = n) @@ -1030,14 +1030,14 @@ bpstat_print (bs) bpstat bs; { int val; - + if (bs == NULL) return 0; val = (*bs->print_it) (bs); if (val >= 0) return val; - + /* Maybe another breakpoint in the chain caused us to stop. (Currently all watchpoints go on the bpstat whether hit or not. That probably could (should) be changed, provided care is taken @@ -1050,8 +1050,8 @@ bpstat_print (bs) } /* Evaluate the expression EXP and return 1 if value is zero. - This is used inside a catch_errors to evaluate the breakpoint condition. - The argument is a "struct expression *" that has been cast to char * to + This is used inside a catch_errors to evaluate the breakpoint condition. + The argument is a "struct expression *" that has been cast to char * to make it pass through catch_errors. */ static int @@ -1122,7 +1122,7 @@ watchpoint_check (p) the user. */ select_frame (fr, -1); } - + if (within_current_scope) { /* We use value_{,free_to_}mark because it could be a @@ -1326,7 +1326,7 @@ bpstat_stop_status (pc, frame_address, not_a_breakpoint) found = 1; } } - if (found) + if (found) switch (catch_errors (watchpoint_check, (char *) bs, message, RETURN_MASK_ALL)) { @@ -1616,7 +1616,7 @@ bpstat_what (bs) without hardware support). This isn't related to a specific bpstat, just to things like whether watchpoints are set. */ -int +int bpstat_should_step () { struct breakpoint *b; @@ -1667,7 +1667,7 @@ breakpoint_1 (bnum, allflag) if (!found_a_breakpoint++) { annotate_breakpoints_headers (); - + annotate_field (0); printf_filtered ("Num "); annotate_field (1); @@ -1683,10 +1683,10 @@ breakpoint_1 (bnum, allflag) } annotate_field (5); printf_filtered ("What\n"); - + annotate_breakpoints_table (); } - + annotate_record (); annotate_field (0); printf_filtered ("%-3d ", b->number); @@ -2217,7 +2217,7 @@ set_breakpoint (s, line, tempflag, addr_string) { register struct breakpoint *b; struct symtab_and_line sal; - + sal.symtab = s; sal.line = line; sal.pc = 0; @@ -2276,12 +2276,12 @@ break_command_1 (arg, flag, from_tty) /* If no arg given, or if first arg is 'if ', use the default breakpoint. */ - if (!arg || (arg[0] == 'i' && arg[1] == 'f' + if (!arg || (arg[0] == 'i' && arg[1] == 'f' && (arg[2] == ' ' || arg[2] == '\t'))) { if (default_breakpoint_valid) { - sals.sals = (struct symtab_and_line *) + sals.sals = (struct symtab_and_line *) xmalloc (sizeof (struct symtab_and_line)); sal.pc = default_breakpoint_address; sal.line = default_breakpoint_line; @@ -2310,8 +2310,8 @@ break_command_1 (arg, flag, from_tty) addr_end = arg; } - - if (! sals.nelts) + + if (! sals.nelts) return; /* Make sure that all storage allocated in decode_line_1 gets freed in case @@ -2338,7 +2338,7 @@ break_command_1 (arg, flag, from_tty) int toklen; resolve_sal_pc (&sals.sals[i]); - + tok = arg; while (tok && *tok) @@ -2379,7 +2379,7 @@ break_command_1 (arg, flag, from_tty) { int i, target_resources_ok; - i = hw_breakpoint_used_count (); + i = hw_breakpoint_used_count (); target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT ( bp_hardware_breakpoint, i + sals.nelts, 0); if (target_resources_ok == 0) @@ -2415,7 +2415,7 @@ break_command_1 (arg, flag, from_tty) b->addr_string = savestring (addr_start, addr_end - addr_start); if (cond_start) b->cond_string = savestring (cond_start, cond_end - cond_start); - + b->enable = enabled; b->disposition = tempflag ? delete : donttouch; @@ -2511,7 +2511,7 @@ watch_command_1 (arg, accessflag, from_tty) sal.pc = 0; sal.symtab = NULL; sal.line = 0; - + /* Parse arguments. */ innermost_block = NULL; exp_start = arg; @@ -2549,7 +2549,7 @@ watch_command_1 (arg, accessflag, from_tty) mem_cnt = can_use_hardware_watchpoint (val); if (mem_cnt == 0 && bp_type != bp_hardware_watchpoint) error ("Expression cannot be implemented with read/access watchpoint."); - if (mem_cnt != 0) { + if (mem_cnt != 0) { i = hw_watchpoint_used_count (bp_type, &other_type_used); target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT( bp_type, i + mem_cnt, other_type_used); @@ -2558,7 +2558,7 @@ watch_command_1 (arg, accessflag, from_tty) if (target_resources_ok < 0 && bp_type != bp_hardware_watchpoint) error ("Target resources have been allocated for other types of watchpoints."); } - + /* Now set up the breakpoint. */ b = set_raw_breakpoint (sal); set_breakpoint_count (breakpoint_count + 1); @@ -2573,7 +2573,7 @@ watch_command_1 (arg, accessflag, from_tty) b->cond_string = savestring (cond_start, cond_end - cond_start); else b->cond_string = 0; - + frame = block_innermost_frame (exp_valid_block); if (frame) { @@ -2601,7 +2601,7 @@ watch_command_1 (arg, accessflag, from_tty) scope_sal.pc = get_frame_pc (prev_frame); scope_sal.symtab = NULL; scope_sal.line = 0; - + scope_breakpoint = set_raw_breakpoint (scope_sal); set_breakpoint_count (breakpoint_count + 1); scope_breakpoint->number = breakpoint_count; @@ -2636,10 +2636,10 @@ can_use_hardware_watchpoint (v) struct value *v; { int found_memory_cnt = 0; - + /* Make sure all the intermediate values are in memory. Also make sure we found at least one memory expression. Guards against watch 0x12345, - which is meaningless, but could cause errors if one tries to insert a + which is meaningless, but could cause errors if one tries to insert a hardware watchpoint for the constant expression. */ for ( ; v; v = v->next) { @@ -2699,41 +2699,41 @@ until_break_command (arg, from_tty) /* Set a breakpoint where the user wants it and at return from this function */ - + if (default_breakpoint_valid) sals = decode_line_1 (&arg, 1, default_breakpoint_symtab, default_breakpoint_line, (char ***)NULL); else sals = decode_line_1 (&arg, 1, (struct symtab *)NULL, 0, (char ***)NULL); - + if (sals.nelts != 1) error ("Couldn't get information on specified line."); - + sal = sals.sals[0]; free ((PTR)sals.sals); /* malloc'd, so freed */ - + if (*arg) error ("Junk at end of arguments."); - + resolve_sal_pc (&sal); - + breakpoint = set_momentary_breakpoint (sal, selected_frame, bp_until); - + old_chain = make_cleanup(delete_breakpoint, breakpoint); /* Keep within the current frame */ - + if (prev_frame) { struct frame_info *fi; - + fi = get_frame_info (prev_frame); sal = find_pc_line (fi->pc, 0); sal.pc = fi->pc; breakpoint = set_momentary_breakpoint (sal, prev_frame, bp_until); make_cleanup(delete_breakpoint, breakpoint); } - + proceed (-1, TARGET_SIGNAL_DEFAULT, 0); do_cleanups(old_chain); } @@ -2971,7 +2971,7 @@ catch_command_1 (arg, tempflag, from_tty) /* If no arg given, or if first arg is 'if ', all active catch clauses are breakpointed. */ - if (!arg || (arg[0] == 'i' && arg[1] == 'f' + if (!arg || (arg[0] == 'i' && arg[1] == 'f' && (arg[2] == ' ' || arg[2] == '\t'))) { /* Grab all active catch clauses. */ @@ -2987,19 +2987,19 @@ catch_command_1 (arg, tempflag, from_tty) #endif } - if (! sals.nelts) + if (! sals.nelts) return; save_arg = arg; for (i = 0; i < sals.nelts; i++) { resolve_sal_pc (&sals.sals[i]); - + while (arg && *arg) { if (arg[0] == 'i' && arg[1] == 'f' && (arg[2] == ' ' || arg[2] == '\t')) - cond = parse_exp_1 ((arg += 2, &arg), + cond = parse_exp_1 ((arg += 2, &arg), block_for_pc (sals.sals[i].pc), 0); else error ("Junk at end of arguments."); @@ -3183,7 +3183,7 @@ delete_breakpoint (bpt) if (bpt->inserted) remove_breakpoint (bpt); - + if (breakpoint_chain == bpt) breakpoint_chain = bpt->next; @@ -3334,7 +3334,7 @@ breakpoint_re_set_one (bint) strlen (sals.sals[i].symtab->filename)); b->line_number = sals.sals[i].line; b->address = sals.sals[i].pc; - + check_duplicates (b->address); mention (b); @@ -3402,7 +3402,7 @@ breakpoint_re_set () struct breakpoint *b, *temp; static char message1[] = "Error in re-setting breakpoint %d:\n"; char message[sizeof (message1) + 30 /* slop */]; - + ALL_BREAKPOINTS_SAFE (b, temp) { sprintf (message, message1, b->number); /* Format possible error msg */ @@ -3416,7 +3416,7 @@ breakpoint_re_set () create_longjmp_breakpoint(NULL); #if 0 - /* Took this out (temporaliy at least), since it produces an extra + /* Took this out (temporaliy at least), since it produces an extra blank line at startup. This messes up the gdbtests. -PB */ /* Blank line to finish off all those mention() messages we just printed. */ printf_filtered ("\n"); @@ -3480,7 +3480,7 @@ ignore_command (args, from_tty) if (p == 0) error_no_arg ("a breakpoint number"); - + num = get_number (&p); if (*p == 0) @@ -3512,7 +3512,7 @@ map_breakpoint_numbers (args, function) while (*p) { p1 = p; - + num = get_number (&p1); ALL_BREAKPOINTS (b) @@ -3538,12 +3538,12 @@ enable_breakpoint (bpt) int save_selected_frame_level = -1; int target_resources_ok, other_type_used; struct value *mark; - + if (bpt->type == bp_hardware_breakpoint) { int i; i = hw_breakpoint_used_count(); - target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT( + target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT( bp_hardware_breakpoint, i+1, 0); if (target_resources_ok == 0) error ("No hardware breakpoint support in the target."); @@ -3590,7 +3590,7 @@ is valid is not currently in scope.\n", bpt->number); target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT( bpt->type, i + mem_cnt, other_type_used); - /* we can consider of type is bp_hardware_watchpoint, convert to + /* we can consider of type is bp_hardware_watchpoint, convert to bp_watchpoint in the following condition */ if (target_resources_ok < 0) { @@ -3685,8 +3685,8 @@ enable_once_breakpoint (bpt) int target_resources_ok, other_type_used; struct value *mark; - if (bpt->type == bp_hardware_breakpoint) - { + if (bpt->type == bp_hardware_breakpoint) + { int i; i = hw_breakpoint_used_count(); target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT( @@ -3737,7 +3737,7 @@ is valid is not currently in scope.\n", bpt->number); int mem_cnt = can_use_hardware_watchpoint(bpt->val); target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT( bpt->type, i+mem_cnt, other_type_used); - /* we can consider of type is bp_hardware_watchpoint, convert to + /* we can consider of type is bp_hardware_watchpoint, convert to bp_watchpoint in the following condition */ if (target_resources_ok < 0) { diff --git a/gnu/usr.bin/gdb/gdb/breakpoint.h b/gnu/usr.bin/gdb/gdb/breakpoint.h index a3ce41c..8242c14 100644 --- a/gnu/usr.bin/gdb/gdb/breakpoint.h +++ b/gnu/usr.bin/gdb/gdb/breakpoint.h @@ -174,7 +174,7 @@ struct breakpoint when using watchpoints on local variables (might the concept of a related breakpoint be useful elsewhere, if not just call it the watchpoint_scope breakpoint or something like that. FIXME). */ - struct breakpoint *related_breakpoint; + struct breakpoint *related_breakpoint; /* Holds the frame address which identifies the frame this watchpoint should be evaluated in, or NULL if the watchpoint should be evaluated @@ -224,7 +224,7 @@ enum bpstat_what_main_action { taking into account stop_print_frame and source_only). But the implications are a bit scary (interaction with auto-displays, etc.), so I won't try it. */ - + /* Stop silently. */ BPSTAT_WHAT_STOP_SILENT, @@ -398,7 +398,7 @@ disable_longjmp_breakpoint PARAMS ((void)); extern void set_longjmp_resume_breakpoint PARAMS ((CORE_ADDR, FRAME)); - + extern void clear_breakpoint_hit_counts PARAMS ((void)); /* The following are for displays, which aren't really breakpoints, but diff --git a/gnu/usr.bin/gdb/gdb/buildsym.c b/gnu/usr.bin/gdb/gdb/buildsym.c index e4dcbdd..27f5634 100644 --- a/gnu/usr.bin/gdb/gdb/buildsym.c +++ b/gnu/usr.bin/gdb/gdb/buildsym.c @@ -65,7 +65,7 @@ struct complaint innerblock_complaint = struct complaint innerblock_anon_complaint = {"inner block not inside outer block", 0, 0}; -struct complaint blockvector_complaint = +struct complaint blockvector_complaint = {"block at 0x%lx out of order", 0, 0}; @@ -79,7 +79,7 @@ add_symbol_to_list (symbol, listhead) struct pending **listhead; { register struct pending *link; - + /* We keep PENDINGSIZE symbols in each link of the list. If we don't have a link with room in it, add a new link. */ if (*listhead == NULL || (*listhead)->nsyms == PENDINGSIZE) @@ -254,7 +254,7 @@ finish_block (symbol, listhead, old_blocks, start, end, objfile) if (BLOCK_SUPERBLOCK (pblock->block) == NULL) { #if 1 - /* Check to be sure the blocks are nested as we receive them. + /* Check to be sure the blocks are nested as we receive them. If the compiler/assembler/linker work, this just burns a small amount of time. */ if (BLOCK_START (pblock->block) < BLOCK_START (block) || @@ -342,7 +342,7 @@ make_blockvector (objfile) #if 1 /* FIXME, shut this off after a while to speed up symbol reading. */ /* Some compilers output blocks in the wrong order, but we depend - on their being in the right order so we can binary search. + on their being in the right order so we can binary search. Check the order and moan about it. FIXME. */ if (BLOCKVECTOR_NBLOCKS (blockvector) > 1) { @@ -360,7 +360,7 @@ make_blockvector (objfile) * which causes sprintf rather than fprintf to be called. */ - complain (&blockvector_complaint, + complain (&blockvector_complaint, (unsigned long) BLOCK_START(BLOCKVECTOR_BLOCK (blockvector, i))); } } @@ -408,7 +408,7 @@ start_subfile (name, dirname) subfile->name = (name == NULL) ? NULL : savestring (name, strlen (name)); subfile->dirname = (dirname == NULL) ? NULL : savestring (dirname, strlen (dirname)); - + /* Initialize line-number recording for this subfile. */ subfile->line_vector = NULL; @@ -706,7 +706,7 @@ end_symtab (end_addr, sort_pending, sort_linevec, objfile, section) do { struct pending_block *pb, *pbnext; - + pb = pending_blocks; pbnext = pb->next; swapped = 0; @@ -714,8 +714,8 @@ end_symtab (end_addr, sort_pending, sort_linevec, objfile, section) while (pbnext) { /* swap blocks if unordered! */ - - if (BLOCK_START(pb->block) < BLOCK_START(pbnext->block)) + + if (BLOCK_START(pb->block) < BLOCK_START(pbnext->block)) { struct block *tmp = pb->block; pb->block = pbnext->block; @@ -804,7 +804,7 @@ end_symtab (end_addr, sort_pending, sort_linevec, objfile, section) if (subfile->line_vector) { /* Reallocate the line table on the symbol obstack */ - symtab->linetable = (struct linetable *) + symtab->linetable = (struct linetable *) obstack_alloc (&objfile -> symbol_obstack, linetablesize); memcpy (symtab->linetable, subfile->line_vector, linetablesize); } diff --git a/gnu/usr.bin/gdb/gdb/buildsym.h b/gnu/usr.bin/gdb/gdb/buildsym.h index e034863..9c69a0e 100644 --- a/gnu/usr.bin/gdb/gdb/buildsym.h +++ b/gnu/usr.bin/gdb/gdb/buildsym.h @@ -22,7 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* This module provides definitions used for creating and adding to the symbol table. These routines are called from various symbol- - file-reading routines. + file-reading routines. They originated in dbxread.c of gdb-4.2, and were split out to make xcoffread.c more maintainable by sharing code. diff --git a/gnu/usr.bin/gdb/gdb/c-lang.c b/gnu/usr.bin/gdb/gdb/c-lang.c index 422bde8..9b4b3ee 100644 --- a/gnu/usr.bin/gdb/gdb/c-lang.c +++ b/gnu/usr.bin/gdb/gdb/c-lang.c @@ -369,7 +369,7 @@ static const struct op_print c_op_print_tab[] = {NULL, 0, 0, 0} }; -struct type ** const (c_builtin_types[]) = +struct type ** const (c_builtin_types[]) = { &builtin_type_int, &builtin_type_long, diff --git a/gnu/usr.bin/gdb/gdb/c-typeprint.c b/gnu/usr.bin/gdb/gdb/c-typeprint.c index fa5d6f2..8d915df 100644 --- a/gnu/usr.bin/gdb/gdb/c-typeprint.c +++ b/gnu/usr.bin/gdb/gdb/c-typeprint.c @@ -52,7 +52,7 @@ void c_type_print_base PARAMS ((struct type *, GDB_FILE *, int, int)); -/* Print a description of a type in the format of a +/* Print a description of a type in the format of a typedef for the current language. NEW is the new name for a type TYPE. */ @@ -156,7 +156,7 @@ cp_type_print_method_args (args, prefix, varstring, staticp, stream) while (1) { type_print (args[i++], "", stream, 0); - if (!args[i]) + if (!args[i]) { fprintf_filtered (stream, " ..."); break; @@ -170,7 +170,7 @@ cp_type_print_method_args (args, prefix, varstring, staticp, stream) } fprintf_filtered (stream, ")"); } - + /* If TYPE is a derived type, then print out derivation information. Print only the actual base classes of this type, not the base classes of the base classes. I.E. for the derivation hierarchy: @@ -374,14 +374,14 @@ c_type_print_varspec_suffix (type, stream, show, passed_a_ptr, demangled_args) case TYPE_CODE_ARRAY: if (passed_a_ptr) fprintf_filtered (stream, ")"); - + fprintf_filtered (stream, "["); if (TYPE_LENGTH (type) > 0 && TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0) fprintf_filtered (stream, "%d", (TYPE_LENGTH (type) / TYPE_LENGTH (TYPE_TARGET_TYPE (type)))); fprintf_filtered (stream, "]"); - + c_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, 0, 0); break; @@ -487,7 +487,7 @@ c_type_print_base (type, stream, show, level) } check_stub_type (type); - + switch (TYPE_CODE (type)) { case TYPE_CODE_ARRAY: @@ -530,7 +530,7 @@ c_type_print_base (type, stream, show, level) else if (show > 0 || TYPE_TAG_NAME (type) == NULL) { cp_type_print_derivation_info (stream, type); - + fprintf_filtered (stream, "{\n"); if ((TYPE_NFIELDS (type) == 0) && (TYPE_NFN_FIELDS (type) == 0)) { diff --git a/gnu/usr.bin/gdb/gdb/c-valprint.c b/gnu/usr.bin/gdb/gdb/c-valprint.c index ee98fc4..3ba7e84 100644 --- a/gnu/usr.bin/gdb/gdb/c-valprint.c +++ b/gnu/usr.bin/gdb/gdb/c-valprint.c @@ -120,7 +120,7 @@ c_val_print (type, valaddr, address, stream, format, deref_ref, recurse, if (stop_print_at_null) { int temp_len; - + /* Look for a NULL char. */ for (temp_len = 0; valaddr[temp_len] @@ -128,7 +128,7 @@ c_val_print (type, valaddr, address, stream, format, deref_ref, recurse, temp_len++); len = temp_len; } - + LA_PRINT_STRING (stream, valaddr, len, 0); i = len; } @@ -233,9 +233,9 @@ c_val_print (type, valaddr, address, stream, format, deref_ref, recurse, int is_this_fld; if (msymbol != NULL) - wsym = lookup_symbol (SYMBOL_NAME(msymbol), block, + wsym = lookup_symbol (SYMBOL_NAME(msymbol), block, VAR_NAMESPACE, &is_this_fld, &s); - + if (wsym) { wtype = SYMBOL_TYPE(wsym); diff --git a/gnu/usr.bin/gdb/gdb/ch-lang.c b/gnu/usr.bin/gdb/gdb/ch-lang.c index b3128fd..1ffb8d7 100644 --- a/gnu/usr.bin/gdb/gdb/ch-lang.c +++ b/gnu/usr.bin/gdb/gdb/ch-lang.c @@ -292,7 +292,7 @@ struct type *builtin_type_chill_long; struct type *builtin_type_chill_ulong; struct type *builtin_type_chill_real; -struct type ** const (chill_builtin_types[]) = +struct type ** const (chill_builtin_types[]) = { &builtin_type_chill_bool, &builtin_type_chill_char, diff --git a/gnu/usr.bin/gdb/gdb/ch-valprint.c b/gnu/usr.bin/gdb/gdb/ch-valprint.c index 00f5565..074329b 100644 --- a/gnu/usr.bin/gdb/gdb/ch-valprint.c +++ b/gnu/usr.bin/gdb/gdb/ch-valprint.c @@ -66,7 +66,7 @@ chill_val_print_array_elements (type, valaddr, address, stream, unsigned int reps; LONGEST low_bound = TYPE_FIELD_BITPOS (range_type, 0); LONGEST high_bound = TYPE_FIELD_BITPOS (range_type, 1); - + elttype = TYPE_TARGET_TYPE (type); eltlen = TYPE_LENGTH (elttype); len = TYPE_LENGTH (type) / eltlen; @@ -91,7 +91,7 @@ chill_val_print_array_elements (type, valaddr, address, stream, rep1 = i + 1; reps = 1; - while ((rep1 < len) && + while ((rep1 < len) && !memcmp (valaddr + i * eltlen, valaddr + rep1 * eltlen, eltlen)) { ++reps; @@ -249,7 +249,7 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse, fputs_filtered ("NULL", stream); return 0; } - + if (TYPE_CODE (elttype) == TYPE_CODE_FUNC) { /* Try to print what function it points to. */ @@ -261,7 +261,7 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse, { print_address_numeric (addr, 1, stream); } - + /* For a pointer to char or unsigned char, also print the string pointed to, unless pointer is null. */ if (TYPE_LENGTH (elttype) == 1 @@ -351,7 +351,7 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse, struct type *inner = TYPE_FIELD_TYPE (type, 1); long length = unpack_long (TYPE_FIELD_TYPE (type, 0), valaddr); char *data_addr = valaddr + TYPE_FIELD_BITPOS (type, 1) / 8; - + switch (TYPE_CODE (inner)) { case TYPE_CODE_STRING: @@ -474,7 +474,7 @@ chill_print_value_fields (type, valaddr, stream, format, recurse, pretty, fprintf_filtered (stream, "\n"); print_spaces_filtered (2 + 2 * recurse, stream); } - else + else { wrap_here (n_spaces (2 + 2 * recurse)); } @@ -496,7 +496,7 @@ chill_print_value_fields (type, valaddr, stream, format, recurse, pretty, } else { - chill_val_print (TYPE_FIELD_TYPE (type, i), + chill_val_print (TYPE_FIELD_TYPE (type, i), valaddr + TYPE_FIELD_BITPOS (type, i) / 8, 0, stream, format, 0, recurse + 1, pretty); } diff --git a/gnu/usr.bin/gdb/gdb/coff/i386.h b/gnu/usr.bin/gdb/gdb/coff/i386.h index df80c29..3c82229 100644 --- a/gnu/usr.bin/gdb/gdb/coff/i386.h +++ b/gnu/usr.bin/gdb/gdb/coff/i386.h @@ -49,7 +49,7 @@ struct external_filehdr { /********************** AOUT "OPTIONAL HEADER" **********************/ -typedef struct +typedef struct { char magic[2]; /* type of file */ char vstamp[2]; /* version stamp */ @@ -125,7 +125,7 @@ struct external_lineno { #define E_FILNMLEN 14 /* # characters in a file name */ #define E_DIMNUM 4 /* # array dimensions in auxiliary entry */ -struct external_syment +struct external_syment { union { char e_name[E_SYMNMLEN]; @@ -145,7 +145,7 @@ struct external_syment #define N_TMASK (0x30) #define N_BTSHFT (4) #define N_TSHIFT (2) - + union external_auxent { struct { char x_tagndx[4]; /* str, un, or enum tag indx */ @@ -192,7 +192,7 @@ union external_auxent { }; #define SYMENT struct external_syment -#define SYMESZ 18 +#define SYMESZ 18 #define AUXENT union external_auxent #define AUXESZ 18 diff --git a/gnu/usr.bin/gdb/gdb/coff/internal.h b/gnu/usr.bin/gdb/gdb/coff/internal.h index 53f73ac..78d7b93 100644 --- a/gnu/usr.bin/gdb/gdb/coff/internal.h +++ b/gnu/usr.bin/gdb/gdb/coff/internal.h @@ -193,7 +193,7 @@ struct internal_scnhdr #define STYP_LIB (0x0800) /* for .lib: same as INFO */ #define STYP_MERGE (0x2000) /* merge section -- combines with text, data or bss sections only */ #define STYP_REVERSE_PAD (0x4000) /* section will be padded with no-op instructions wherever padding is necessary and there is a - + word of contiguous bytes beginning on a word boundary. */ diff --git a/gnu/usr.bin/gdb/gdb/coff/sym.h b/gnu/usr.bin/gdb/gdb/coff/sym.h index 93bb3a1..e84caed 100644 --- a/gnu/usr.bin/gdb/gdb/coff/sym.h +++ b/gnu/usr.bin/gdb/gdb/coff/sym.h @@ -1,6 +1,6 @@ /* Declarations of internal format of MIPS ECOFF symbols. Originally contributed by MIPS Computer Systems and Third Eye Software. - Changes contributed by Cygnus Support are in the public domain. + Changes contributed by Cygnus Support are in the public domain. This file is just aggregated with the files that make up the GNU release; it is not considered part of GAS, GDB, or other GNU @@ -26,7 +26,7 @@ * symbol table to a particular use. */ -/* +/* * This file contains the definition of the Third Eye Symbol Table. * * Symbols are assumed to be in 'encounter order' - i.e. the order that @@ -52,7 +52,7 @@ */ -/* +/* * Symbolic Header (HDR) structure. * As long as all the pointers are set correctly, * we don't care WHAT order the various sections come out in! @@ -89,7 +89,7 @@ typedef struct { long iextMax; /* max index into external symbols */ bfd_vma cbExtOffset; /* offset to start of external symbol entries*/ /* If you add machine dependent fields, add them here */ - } HDRR, *pHDRR; + } HDRR, *pHDRR; #define cbHDRR sizeof(HDRR) #define hdrNil ((pHDRR)0) @@ -99,7 +99,7 @@ typedef struct { * memory by CDB at runtime. */ -/* +/* * File Descriptor * * There is one of these for EVERY FILE, whether compiled with @@ -144,7 +144,7 @@ typedef struct fdr { #define ilnNil -1 -/* +/* * Procedure Descriptor * * There is one of these for EVERY TEXT LABEL. @@ -353,7 +353,7 @@ typedef union { * Optimization symbols contain some overlap information with the normal * symbol table. In particular, the proc information * is somewhat redundant but necessary to easily find the other information - * present. + * present. * * All of the offsets are relative to the beginning of the last otProc */ @@ -433,7 +433,7 @@ typedef long FIT, *pFIT; * symbol for the next procedure. This allows rapid skipping over * internal information of various sorts. "stEnd"s ALWAYS have the * isym of the primary symbol that started the block. - * + * ST SC VALUE INDEX -------- ------ -------- ------ diff --git a/gnu/usr.bin/gdb/gdb/coff/symconst.h b/gnu/usr.bin/gdb/gdb/coff/symconst.h index 46d68e8..54bd0fb 100644 --- a/gnu/usr.bin/gdb/gdb/coff/symconst.h +++ b/gnu/usr.bin/gdb/gdb/coff/symconst.h @@ -36,7 +36,7 @@ #define magicSym2 0x1992 /* Language codes */ -#define langC 0 +#define langC 0 #define langPascal 1 #define langFortran 2 #define langAssembler 3 /* one Assembley inst might map to many mach */ @@ -80,7 +80,7 @@ #define scVariant 20 /* Variant record */ #define scSUndefined 21 /* small undefined(external) data */ #define scInit 22 /* .init section symbol */ -#define scBasedVar 23 /* Fortran or PL/1 ptr based var */ +#define scBasedVar 23 /* Fortran or PL/1 ptr based var */ #define scXData 24 /* exception handling data */ #define scPData 25 /* Procedure section */ #define scFini 26 /* .fini section */ diff --git a/gnu/usr.bin/gdb/gdb/coffread.c b/gnu/usr.bin/gdb/gdb/coffread.c index dfc2d3b..b0830c9 100644 --- a/gnu/usr.bin/gdb/gdb/coffread.c +++ b/gnu/usr.bin/gdb/gdb/coffread.c @@ -120,7 +120,7 @@ static unsigned local_n_tshift; #define N_BTSHFT local_n_btshft #define N_TMASK local_n_tmask #define N_TSHIFT local_n_tshift - + /* Local variables that hold the sizes in the file of various COFF structures. (We only need to know this to read them from the file -- BFD will then translate the data in them, into `internal_xxx' structs in the right @@ -145,7 +145,7 @@ struct type *in_function_type; /* Complaints about various problems in the file being read */ -struct complaint ef_complaint = +struct complaint ef_complaint = {"Unmatched .ef symbol(s) ignored starting at symnum %d", 0, 0}; struct complaint bf_no_aux_complaint = @@ -169,7 +169,7 @@ struct complaint misordered_blocks_complaint = struct complaint tagndx_bad_complaint = {"Symbol table entry for %s has bad tagndx value", 0, 0}; -struct complaint eb_complaint = +struct complaint eb_complaint = {"Mismatched .eb symbol ignored starting at symnum %d", 0, 0}; /* Simplified internal version of coff symbol table information */ @@ -312,7 +312,7 @@ coff_locate_sections (ignore_abfd, sectp, csip) /* Look up a coff type-number index. Return the address of the slot where the type for that index is stored. - The type-number is in INDEX. + The type-number is in INDEX. This can be used for finding the type associated with that index or for associating a new type with the index. */ @@ -637,7 +637,7 @@ coff_symfile_read (objfile, section_offsets, mainline) bfd_map_over_sections (abfd, find_linenos, (PTR) info); make_cleanup (free_linetab, 0); - val = init_lineno (desc, info->min_lineno_offset, + val = init_lineno (desc, info->min_lineno_offset, info->max_lineno_offset - info->min_lineno_offset); if (val < 0) error ("\"%s\": error reading line numbers\n", name); @@ -726,7 +726,7 @@ read_coff_symtab (symtab_offset, nsyms, objfile) int nsyms; struct objfile *objfile; { - GDB_FILE *stream; + GDB_FILE *stream; register struct context_stack *new; struct coff_symbol coff_symbol; register struct coff_symbol *cs = &coff_symbol; @@ -736,7 +736,7 @@ read_coff_symtab (symtab_offset, nsyms, objfile) static struct internal_syment fcn_sym_saved; static union internal_auxent fcn_aux_saved; struct symtab *s; - + /* A .file is open. */ int in_source_file = 0; int next_file_symnum = -1; @@ -1074,10 +1074,10 @@ read_file_hdr (chan, file_hdr) #endif #ifdef MC88DGMAGIC case MC88DGMAGIC: -#endif +#endif #ifdef MC88MAGIC case MC88MAGIC: -#endif +#endif #ifdef I960ROMAGIC case I960ROMAGIC: /* Intel 960 */ #endif @@ -1240,7 +1240,7 @@ static unsigned long linetab_size; /* Read in all the line numbers for fast lookups later. Leave them in external (unswapped) format in memory; we'll swap them as we enter them into GDB's data structures. */ - + static int init_lineno (chan, offset, size) int chan; @@ -1259,7 +1259,7 @@ init_lineno (chan, offset, size) if (lseek (chan, offset, 0) < 0) return -1; - + /* Allocate the desired table, plus a sentinel */ linetab = (char *) xmalloc (size + local_linesz); @@ -1301,7 +1301,7 @@ enter_linenos (file_offset, first_line, last_line) return; file_offset += linetab_offset; /* Try reading at that linetab offset */ } - + rawptr = &linetab[file_offset - linetab_offset]; /* skip first line entry for each function */ @@ -1317,7 +1317,7 @@ enter_linenos (file_offset, first_line, last_line) coff_record_line (first_line + L_LNNO32 (&lptr), lptr.l_addr.l_paddr); else break; - } + } } static void @@ -1353,7 +1353,7 @@ patch_opaque_types (s) register struct block *b; register int i; register struct symbol *real_sym; - + /* Go through the per-file symbols only */ b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK); for (i = BLOCK_NSYMS (b) - 1; i >= 0; i--) @@ -1371,7 +1371,7 @@ patch_opaque_types (s) register char *name = SYMBOL_NAME (real_sym); register int hash = hashname (name); register struct symbol *sym, *prev; - + prev = 0; for (sym = opaque_type_chain[hash]; sym;) { @@ -1386,9 +1386,9 @@ patch_opaque_types (s) { opaque_type_chain[hash] = SYMBOL_VALUE_CHAIN (sym); } - + patch_type (SYMBOL_TYPE (sym), SYMBOL_TYPE (real_sym)); - + if (prev) { sym = SYMBOL_VALUE_CHAIN (prev); @@ -1433,18 +1433,18 @@ process_coff_symbol (cs, aux, objfile) { #if 0 /* FIXME: This has NOT been tested. The DBX version has.. */ - /* Generate a template for the type of this function. The - types of the arguments will be added as we read the symbol + /* Generate a template for the type of this function. The + types of the arguments will be added as we read the symbol table. */ struct type *new = (struct type *) obstack_alloc (&objfile->symbol_obstack, sizeof (struct type)); - + memcpy (new, lookup_function_type (decode_function_type (cs, cs->c_type, aux)), sizeof(struct type)); SYMBOL_TYPE (sym) = new; in_function_type = SYMBOL_TYPE(sym); #else - SYMBOL_TYPE(sym) = + SYMBOL_TYPE(sym) = lookup_function_type (decode_function_type (cs, cs->c_type, aux)); #endif @@ -1550,7 +1550,7 @@ process_coff_symbol (cs, aux, objfile) } #endif break; - + case C_TPDEF: SYMBOL_CLASS (sym) = LOC_TYPEDEF; SYMBOL_NAMESPACE (sym) = VAR_NAMESPACE; @@ -2077,7 +2077,7 @@ coff_symfile_offsets (objfile, addr) for (i = 0; i < SECT_OFF_MAX; i++) ANOFFSET (section_offsets, i) = addr; - + return section_offsets; } diff --git a/gnu/usr.bin/gdb/gdb/command.c b/gnu/usr.bin/gdb/gdb/command.c index f2af0d5..5d42886 100644 --- a/gnu/usr.bin/gdb/gdb/command.c +++ b/gnu/usr.bin/gdb/gdb/command.c @@ -169,7 +169,7 @@ add_prefix_cmd (name, class, fun, doc, prefixlist, prefixname, } /* Like add_prefix_cmd but sets the abbrev_flag on the new command. */ - + struct cmd_list_element * add_abbrev_prefix_cmd (name, class, fun, doc, prefixlist, prefixname, allow_unknown, list) @@ -250,14 +250,14 @@ add_show_from_set (setcmd, list) memcpy (showcmd, setcmd, sizeof (struct cmd_list_element)); delete_cmd (showcmd->name, list); showcmd->type = show_cmd; - + /* Replace "set " at start of docstring with "show ". */ if (setcmd->doc[0] == 'S' && setcmd->doc[1] == 'e' && setcmd->doc[2] == 't' && setcmd->doc[3] == ' ') showcmd->doc = concat ("Show ", setcmd->doc + 4, NULL); else fprintf_unfiltered (gdb_stderr, "GDB internal error: Bad docstring for set command\n"); - + showcmd->next = *list; *list = showcmd; return showcmd; @@ -306,7 +306,7 @@ delete_cmd (name, list) * just "help".) * * I am going to split this into two seperate comamnds, help_cmd and - * help_list. + * help_list. */ void @@ -331,10 +331,10 @@ help_cmd (command, stream) /* There are three cases here. If c->prefixlist is nonzero, we have a prefix command. Print its documentation, then list its subcommands. - + If c->function is nonzero, we really have a command. Print its documentation and return. - + If c->function is zero, we have a class name. Print its documentation (as if it were a command) and then set class to the number of this class @@ -381,7 +381,7 @@ help_list (list, cmdtype, class, stream) { int len; char *cmdtype1, *cmdtype2; - + /* If CMDTYPE is "foo ", CMDTYPE1 gets " foo" and CMDTYPE2 gets "foo sub" */ len = strlen (cmdtype); cmdtype1 = (char *) alloca (len + 1); @@ -414,7 +414,7 @@ Type \"help%s\" followed by %scommand name for full documentation.\n\ Command name abbreviations are allowed if unambiguous.\n", cmdtype1, cmdtype2); } - + /* Print only the first line of STR on STREAM. */ static void print_doc_line (stream, str) @@ -522,7 +522,7 @@ help_cmd_list (list, class, prefix, recurse, stream) affect the operation). This routine does *not* modify the text pointed to by TEXT. - + If IGNORE_HELP_CLASSES is nonzero, ignore any command list elements which are actually help classes rather than commands (i.e. the function field of the struct cmd_list_element is NULL). */ @@ -551,7 +551,7 @@ lookup_cmd_1 (text, clist, result_list, ignore_help_classes) /* If nothing but whitespace, return 0. */ if (p == *text) return 0; - + len = p - *text; /* *text and p now bracket the first command word to lookup (and @@ -591,7 +591,7 @@ lookup_cmd_1 (text, clist, result_list, ignore_help_classes) if (result_list != NULL) /* Will be modified in calling routine if we know what the prefix command is. */ - *result_list = 0; + *result_list = 0; return (struct cmd_list_element *) -1; /* Ambiguous. */ } @@ -693,7 +693,7 @@ lookup_cmd (line, list, cmdtype, allow_unknown, ignore_help_classes) ptr--; *(ptr + 1) = '\0'; #endif - + if (!c) { if (!allow_unknown) @@ -725,7 +725,7 @@ lookup_cmd (line, list, cmdtype, allow_unknown, ignore_help_classes) char *local_cmdtype = last_list ? last_list->prefixname : cmdtype; struct cmd_list_element *local_list = (last_list ? *(last_list->prefixlist) : list); - + if (local_allow_unknown < 0) { if (last_list) @@ -744,7 +744,7 @@ lookup_cmd (line, list, cmdtype, allow_unknown, ignore_help_classes) && (*line)[amb_len] != '\t'); amb_len++) ; - + ambbuf[0] = 0; for (c = local_list; c; c = c->next) if (!strncmp (*line, c->name, amb_len)) @@ -781,7 +781,7 @@ lookup_cmd (line, list, cmdtype, allow_unknown, ignore_help_classes) } return 0; } - + #if 0 /* Look up the contents of *LINE as a command in the command list LIST. LIST is a chain of struct cmd_list_element's. @@ -837,12 +837,12 @@ lookup_cmd (line, list, cmdtype, allow_unknown) error ("Lack of needed %scommand", cmdtype); return 0; } - + /* Copy over to a local buffer, converting to lowercase on the way. This is in case the command being parsed is a subcommand which doesn't match anything, and that's ok. We want the original untouched for the routine of the original command. */ - + processed_cmd = (char *) alloca (p - *line + 1); for (cmd_len = 0; cmd_len < p - *line; cmd_len++) { @@ -921,7 +921,7 @@ lookup_cmd (line, list, cmdtype, allow_unknown) /* Helper function for SYMBOL_COMPLETION_FUNCTION. */ /* Return a vector of char pointers which point to the different - possible completions in LIST of TEXT. + possible completions in LIST of TEXT. WORD points in the same buffer as TEXT, and completions should be returned relative to this position. For example, suppose TEXT is "foo" @@ -958,7 +958,7 @@ complete_on_cmdlist (list, text, word) * sizeof (char *))); } - matchlist[matches] = (char *) + matchlist[matches] = (char *) xmalloc (strlen (word) + strlen (ptr->name) + 1); if (word == text) strcpy (matchlist[matches], ptr->name); @@ -1015,7 +1015,7 @@ parse_binary_operation (arg) || !strncmp (arg, "0", length) || !strncmp (arg, "no", length)) return 0; - else + else { error ("\"on\" or \"off\" expected."); return 0; @@ -1042,7 +1042,7 @@ do_setshow_command (arg, from_tty, c) char *p; char *q; int ch; - + if (arg == NULL) arg = ""; new = (char *) xmalloc (strlen (arg) + 2); @@ -1131,7 +1131,7 @@ do_setshow_command (arg, from_tty, c) { /* Print doc minus "show" at start. */ print_doc_line (gdb_stdout, c->doc + 5); - + fputs_filtered (" is ", gdb_stdout); wrap_here (" "); switch (c->var_type) @@ -1171,7 +1171,7 @@ do_setshow_command (arg, from_tty, c) else fprintf_filtered (gdb_stdout, "%d", *(int *) c->var); break; - + default: error ("gdb internal error: bad var_type in do_setshow_command"); } @@ -1264,7 +1264,7 @@ make_command (arg, from_tty) strcpy (p, "make "); strcpy (p + sizeof("make ")-1, arg); } - + shell_escape (p, from_tty); } @@ -1283,8 +1283,8 @@ show_user_1 (c, stream) fputs_filtered (":\n", stream); while (cmdlines) { - fputs_filtered (cmdlines->line, stream); - fputs_filtered ("\n", stream); + fputs_filtered (cmdlines->line, stream); + fputs_filtered ("\n", stream); cmdlines = cmdlines->next; } fputs_filtered ("\n", stream); @@ -1324,7 +1324,7 @@ _initialize_command () With no arguments, run an inferior shell."); add_com ("make", class_support, make_command, "Run the ``make'' program using the rest of the line as arguments."); - add_cmd ("user", no_class, show_user, + add_cmd ("user", no_class, show_user, "Show definitions of user defined commands.\n\ Argument is the name of the user defined command.\n\ With no argument, show definitions of all user defined commands.", &showlist); diff --git a/gnu/usr.bin/gdb/gdb/complaints.c b/gnu/usr.bin/gdb/gdb/complaints.c index e441db4..7ba7b18 100644 --- a/gnu/usr.bin/gdb/gdb/complaints.c +++ b/gnu/usr.bin/gdb/gdb/complaints.c @@ -39,7 +39,7 @@ struct complaint complaint_root[1] = { static unsigned int stop_whining = 0; /* Should each complaint be self explanatory, or should we assume that - a series of complaints is being produced? + a series of complaints is being produced? case 0: self explanatory message. case 1: First message of a series that must start off with explanation. case 2: Subsequent message, when user already knows we are reading diff --git a/gnu/usr.bin/gdb/gdb/complaints.h b/gnu/usr.bin/gdb/gdb/complaints.h index f7ff5a5..ea10cab 100644 --- a/gnu/usr.bin/gdb/gdb/complaints.h +++ b/gnu/usr.bin/gdb/gdb/complaints.h @@ -32,7 +32,7 @@ struct complaint struct complaint *next; }; -/* Root of the chain of complaints that have at some point been issued. +/* Root of the chain of complaints that have at some point been issued. This is used to reset the counters, and/or report the total counts. */ extern struct complaint complaint_root[1]; diff --git a/gnu/usr.bin/gdb/gdb/corelow.c b/gnu/usr.bin/gdb/gdb/corelow.c index cc0d4f0..2729742 100644 --- a/gnu/usr.bin/gdb/gdb/corelow.c +++ b/gnu/usr.bin/gdb/gdb/corelow.c @@ -36,7 +36,7 @@ static void core_files_info PARAMS ((struct target_ops *)); #ifdef SOLIB_ADD -static int +static int solib_add_stub PARAMS ((char *)); #endif @@ -75,7 +75,7 @@ core_close (quitting) /* Stub function for catch_errors around shared library hacking. FROM_TTYP is really an int * which points to from_tty. */ -static int +static int solib_add_stub (from_ttyp) char *from_ttyp; { @@ -127,7 +127,7 @@ core_open (filename, from_tty) target_preopen (from_tty); if (!filename) { - error (core_bfd? + error (core_bfd? "No core file specified. (Use `detach' to stop debugging a core file.)" : "No core file specified."); } @@ -311,7 +311,7 @@ struct target_ops core_ops = { "Use a core file as a target. Specify the filename of the core file.", core_open, core_close, find_default_attach, core_detach, 0, 0, /* resume, wait */ - get_core_registers, + get_core_registers, 0, 0, /* store_regs, prepare_to_store */ xfer_memory, core_files_info, ignore, ignore, /* core_insert_breakpoint, core_remove_breakpoint, */ diff --git a/gnu/usr.bin/gdb/gdb/cp-valprint.c b/gnu/usr.bin/gdb/gdb/cp-valprint.c index af8d767..de60814 100644 --- a/gnu/usr.bin/gdb/gdb/cp-valprint.c +++ b/gnu/usr.bin/gdb/gdb/cp-valprint.c @@ -86,7 +86,7 @@ cp_print_class_method (valaddr, type, stream) { f = TYPE_FN_FIELDLIST1 (domain, i); len2 = TYPE_FN_FIELDLIST_LENGTH (domain, i); - + for (j = 0; j < len2; j++) { QUIT; @@ -110,7 +110,7 @@ cp_print_class_method (valaddr, type, stream) { f = TYPE_FN_FIELDLIST1 (domain, i); len2 = TYPE_FN_FIELDLIST_LENGTH (domain, i); - + for (j = 0; j < len2; j++) { QUIT; @@ -263,7 +263,7 @@ cp_print_value_fields (type, valaddr, stream, format, recurse, pretty, fprintf_filtered (stream, "\n"); print_spaces_filtered (2 + 2 * recurse, stream); } - else + else { wrap_here (n_spaces (2 + 2 * recurse)); } @@ -321,7 +321,7 @@ cp_print_value_fields (type, valaddr, stream, format, recurse, pretty, } else { - val_print (TYPE_FIELD_TYPE (type, i), + val_print (TYPE_FIELD_TYPE (type, i), valaddr + TYPE_FIELD_BITPOS (type, i) / 8, 0, stream, format, 0, recurse + 1, pretty); } @@ -442,7 +442,7 @@ cp_print_class_member (valaddr, domain, stream, prefix) GDB_FILE *stream; char *prefix; { - + /* VAL is a byte offset into the structure type DOMAIN. Find the name of the field for that offset and print it. */ diff --git a/gnu/usr.bin/gdb/gdb/dbxread.c b/gnu/usr.bin/gdb/gdb/dbxread.c index 2b3a6be..f6f4cc3 100644 --- a/gnu/usr.bin/gdb/gdb/dbxread.c +++ b/gnu/usr.bin/gdb/gdb/dbxread.c @@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* This module provides three functions: dbx_symfile_init, - which initializes to read a symbol file; dbx_new_init, which + which initializes to read a symbol file; dbx_new_init, which discards existing cached information when all symbols are being discarded; and dbx_symfile_read, which reads a symbol table from a file. @@ -154,7 +154,7 @@ static CORE_ADDR lowest_text_address; /* Complaints about the symbols we have encountered. */ -struct complaint lbrac_complaint = +struct complaint lbrac_complaint = {"bad block start address patched", 0, 0}; struct complaint string_table_offset_complaint = @@ -460,7 +460,7 @@ record_minimal_symbol (name, address, type, objfile) case N_DATA: ms_type = mst_file_data; - /* Check for __DYNAMIC, which is used by Sun shared libraries. + /* Check for __DYNAMIC, which is used by Sun shared libraries. Record it as global even if it's local, not global, so lookup_minimal_symbol can find it. We don't check symbol_leading_char because for SunOS4 it always is '_'. */ @@ -501,7 +501,7 @@ record_minimal_symbol (name, address, type, objfile) } /* Scan and build partial symbols for a symbol file. - We have been initialized by a call to dbx_symfile_init, which + We have been initialized by a call to dbx_symfile_init, which put all the relevant info into a "struct dbx_symfile_info", hung off the objfile structure. @@ -603,7 +603,7 @@ dbx_new_init (ignore) Since BFD doesn't know how to read debug symbols in a format-independent way (and may never do so...), we have to do it ourselves. We will never - be called unless this is an a.out (or very similar) file. + be called unless this is an a.out (or very similar) file. FIXME, there should be a cleaner peephole into the BFD environment here. */ #define DBX_STRINGTAB_SIZE_SIZE sizeof(long) /* FIXME */ @@ -663,7 +663,7 @@ dbx_symfile_init (objfile) val = bfd_seek (sym_bfd, STRING_TABLE_OFFSET, SEEK_SET); if (val < 0) perror_with_name (name); - + memset ((PTR) size_temp, 0, sizeof (size_temp)); val = bfd_read ((PTR) size_temp, sizeof (size_temp), 1, sym_bfd); if (val < 0) @@ -688,18 +688,18 @@ dbx_symfile_init (objfile) bfd can't tell us there is no string table, the sanity checks may or may not catch this. */ DBX_STRINGTAB_SIZE (objfile) = bfd_h_get_32 (sym_bfd, size_temp); - + if (DBX_STRINGTAB_SIZE (objfile) < sizeof (size_temp) || DBX_STRINGTAB_SIZE (objfile) > bfd_get_size (sym_bfd)) error ("ridiculous string table size (%d bytes).", DBX_STRINGTAB_SIZE (objfile)); - + DBX_STRINGTAB (objfile) = (char *) obstack_alloc (&objfile -> psymbol_obstack, DBX_STRINGTAB_SIZE (objfile)); - + /* Now read in the string table in one big gulp. */ - + val = bfd_seek (sym_bfd, STRING_TABLE_OFFSET, SEEK_SET); if (val < 0) perror_with_name (name); @@ -740,7 +740,7 @@ static char *last_function_name; /* The address in memory of the string table of the object file we are reading (which might not be the "main" object file, but might be a shared library or some other dynamically loaded thing). This is set - by read_dbx_symtab when building psymtabs, and by read_ofile_symtab + by read_dbx_symtab when building psymtabs, and by read_ofile_symtab when building symtabs, and is used only by next_symbol_text. */ static char *stringtab_global; @@ -978,7 +978,7 @@ read_dbx_dynamic_symtab (section_offsets, objfile) do_cleanups (back_to); return; } - + dynrels = (arelent **) xmalloc (dynrel_size); make_cleanup (free, dynrels); @@ -1065,7 +1065,7 @@ read_dbx_symtab (section_offsets, objfile, text_addr, text_size) next_file_string_table_offset = 0; stringtab_global = DBX_STRINGTAB (objfile); - + pst = (struct partial_symtab *) 0; includes_allocated = 30; @@ -1118,8 +1118,8 @@ read_dbx_symtab (section_offsets, objfile, text_addr, text_size) symbol lists. This last is a large section of code, so I've imbedded it in the following macro. */ - -/* Set namestring based on bufp. If the string table index is invalid, + +/* Set namestring based on bufp. If the string table index is invalid, give a fake name, and print a single error message per symbol file read, rather than abort the symbol reading or flood the user with messages. */ @@ -1213,7 +1213,7 @@ start_psymtab (objfile, section_offsets, return result; } -/* Close off the current usage of PST. +/* Close off the current usage of PST. Returns PST or NULL if the partial symtab was empty and thrown away. FIXME: List variables and peculiarities of same. */ @@ -1242,7 +1242,7 @@ end_psymtab (pst, include_list, num_includes, capping_symbol_offset, we have to do some tricks to fill in texthigh and textlow. The first trick is in partial-stab.h: if we see a static or global function, and the textlow for the current pst - is still 0, then we use that function's address for + is still 0, then we use that function's address for the textlow of the pst. Now, to fill in texthigh, we remember the last function seen @@ -1272,7 +1272,7 @@ end_psymtab (pst, include_list, num_includes, capping_symbol_offset, p = alloca (n + 1); strncpy (p, last_function_name, n); p[n] = 0; - + minsym = lookup_minimal_symbol (p, objfile); if (minsym) { @@ -1283,7 +1283,7 @@ end_psymtab (pst, include_list, num_includes, capping_symbol_offset, difficult to imagine how hard it would be to track down the elf symbol. Luckily, most of the time no one will notice, since the next file will likely be compiled with -g, so - the code below will copy the first fuction's start address + the code below will copy the first fuction's start address back to our texthigh variable. (Also, if this file is the last one in a dynamically linked program, texthigh already has the right value.) If the next file isn't compiled @@ -1425,7 +1425,7 @@ dbx_psymtab_to_symtab_1 (pst) { struct cleanup *old_chain; int i; - + if (!pst) return; @@ -1520,7 +1520,7 @@ dbx_psymtab_to_symtab (pst) } /* Read in a defined section of a specific object file's symbols. */ - + static void read_ofile_symtab (pst) struct partial_symtab *pst; @@ -1887,7 +1887,7 @@ process_one_symbol (type, desc, valu, name, section_offsets, objfile) /* Check if previous symbol was also an N_SO (with some sanity checks). If so, that one was actually the directory name, and the current one is the real file name. - Patch things up. */ + Patch things up. */ if (previous_stab_code == (unsigned char) N_SO) { patch_subfile_names (current_subfile, name); @@ -2118,7 +2118,7 @@ process_one_symbol (type, desc, valu, name, section_offsets, objfile) Solaris 2.0, these addresses are just absolute, or relative to the N_SO, depending on BLOCK_ADDRESS_ABSOLUTE. */ - function_start_offset = valu; + function_start_offset = valu; within_function = 1; if (context_stack_depth > 0) @@ -2201,7 +2201,7 @@ process_one_symbol (type, desc, valu, name, section_offsets, objfile) adjusted for coff details. */ void -coffstab_build_psymtabs (objfile, section_offsets, mainline, +coffstab_build_psymtabs (objfile, section_offsets, mainline, staboffset, stabsize, stabstroffset, stabstrsize) struct objfile *objfile; @@ -2230,7 +2230,7 @@ coffstab_build_psymtabs (objfile, section_offsets, mainline, DBX_SYMCOUNT (objfile) = stabsize / DBX_SYMBOL_SIZE (objfile); DBX_STRINGTAB_SIZE (objfile) = stabstrsize; DBX_SYMTAB_OFFSET (objfile) = staboffset; - + if (stabstrsize > bfd_get_size (sym_bfd)) error ("ridiculous string table size: %d bytes", stabstrsize); DBX_STRINGTAB (objfile) = (char *) @@ -2279,7 +2279,7 @@ coffstab_build_psymtabs (objfile, section_offsets, mainline, adjusted for elf details. */ void -elfstab_build_psymtabs (objfile, section_offsets, mainline, +elfstab_build_psymtabs (objfile, section_offsets, mainline, staboffset, stabsize, stabstroffset, stabstrsize) struct objfile *objfile; @@ -2308,7 +2308,7 @@ elfstab_build_psymtabs (objfile, section_offsets, mainline, DBX_SYMCOUNT (objfile) = stabsize / DBX_SYMBOL_SIZE (objfile); DBX_STRINGTAB_SIZE (objfile) = stabstrsize; DBX_SYMTAB_OFFSET (objfile) = staboffset; - + if (stabstrsize > bfd_get_size (sym_bfd)) error ("ridiculous string table size: %d bytes", stabstrsize); DBX_STRINGTAB (objfile) = (char *) @@ -2392,7 +2392,7 @@ stabsect_build_psymtabs (objfile, section_offsets, mainline, stab_name, / DBX_SYMBOL_SIZE (objfile); DBX_STRINGTAB_SIZE (objfile) = bfd_section_size (sym_bfd, stabstrsect); DBX_SYMTAB_OFFSET (objfile) = stabsect->filepos; /* XXX - FIXME: POKING INSIDE BFD DATA STRUCTURES */ - + if (DBX_STRINGTAB_SIZE (objfile) > bfd_get_size (sym_bfd)) error ("ridiculous string table size: %d bytes", DBX_STRINGTAB_SIZE (objfile)); DBX_STRINGTAB (objfile) = (char *) @@ -2440,7 +2440,7 @@ dbx_symfile_offsets (objfile, addr) for (i = 0; i < SECT_OFF_MAX; i++) ANOFFSET (section_offsets, i) = addr; - + return section_offsets; } diff --git a/gnu/usr.bin/gdb/gdb/dcache.c b/gnu/usr.bin/gdb/gdb/dcache.c index aaa01d0..a957abe 100644 --- a/gnu/usr.bin/gdb/gdb/dcache.c +++ b/gnu/usr.bin/gdb/gdb/dcache.c @@ -230,7 +230,7 @@ When on, use data caching for remote targets. For many remote targets\n\ this option can offer better throughput for reading target memory.\n\ Unfortunately, gdb does not currently know anything about volatile\n\ registers and thus data caching will produce incorrect results with\n\ -volatile registers are in use. By default, this option is off.", +volatile registers are in use. By default, this option is off.", &setlist), &showlist); } diff --git a/gnu/usr.bin/gdb/gdb/defs.h b/gnu/usr.bin/gdb/gdb/defs.h index 00043ee..cb95cae 100644 --- a/gnu/usr.bin/gdb/gdb/defs.h +++ b/gnu/usr.bin/gdb/gdb/defs.h @@ -64,7 +64,7 @@ quit PARAMS ((void)); #define QUIT { if (quit_flag) quit (); } /* Command classes are top-level categories into which commands are broken - down for "help" purposes. + down for "help" purposes. Notes on classes: class_alias is for alias commands which are not abbreviations of the original command. class-pseudo is for commands which are not really commands nor help topics ("stop"). */ @@ -85,7 +85,7 @@ enum command_class be forward declared to satisfy opaque references before their actual definition, needs to be here. */ -enum language +enum language { language_unknown, /* Language not known */ language_auto, /* Placeholder for automatic setting */ @@ -565,7 +565,7 @@ extern int kernel_writablecore; extern int longest_to_int PARAMS ((LONGEST)); -/* Assorted functions we can declare, now that const and volatile are +/* Assorted functions we can declare, now that const and volatile are defined. */ extern char * @@ -715,7 +715,7 @@ psignal PARAMS ((unsigned, const char *)); the ANSI standard. So we can just duplicate them here without conflict, since they must be the same in all conforming ANSI environments. If these cause problems, then the environment is not ANSI conformant. */ - + #ifdef __STDC__ #include <stddef.h> #endif diff --git a/gnu/usr.bin/gdb/gdb/demangle.c b/gnu/usr.bin/gdb/gdb/demangle.c index eecd3d3..e4cc996 100644 --- a/gnu/usr.bin/gdb/gdb/demangle.c +++ b/gnu/usr.bin/gdb/gdb/demangle.c @@ -47,7 +47,7 @@ static char *current_demangling_style_string; /* List of supported demangling styles. Contains the name of the style as seen by the user, and the enum value that corresponds to that style. */ - + static const struct demangler { char *demangling_style_name; diff --git a/gnu/usr.bin/gdb/gdb/demangle.h b/gnu/usr.bin/gdb/gdb/demangle.h index a216799..7fee623 100644 --- a/gnu/usr.bin/gdb/gdb/demangle.h +++ b/gnu/usr.bin/gdb/gdb/demangle.h @@ -1,6 +1,6 @@ /* Defs for interface to demanglers. Copyright 1992 Free Software Foundation, Inc. - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) diff --git a/gnu/usr.bin/gdb/gdb/dis-asm.h b/gnu/usr.bin/gdb/gdb/dis-asm.h index 50601d7..fde2059 100644 --- a/gnu/usr.bin/gdb/gdb/dis-asm.h +++ b/gnu/usr.bin/gdb/gdb/dis-asm.h @@ -22,7 +22,7 @@ enum dis_insn_type { dis_dref2 /* Two data references in instruction */ }; -/* This struct is passed into the instruction decoding routine, +/* This struct is passed into the instruction decoding routine, and is passed back out into each callback. The various fields are used for conveying information from your main routine into your callbacks, for passing information into the instruction decoders (such as the diff --git a/gnu/usr.bin/gdb/gdb/disassemble.c b/gnu/usr.bin/gdb/gdb/disassemble.c index 87aa6ca..fe66107 100644 --- a/gnu/usr.bin/gdb/gdb/disassemble.c +++ b/gnu/usr.bin/gdb/gdb/disassemble.c @@ -63,7 +63,7 @@ disassembler (abfd) case bfd_arch_h8300: if (bfd_get_mach(abfd) == bfd_mach_h8300h) disassemble = print_insn_h8300h; - else + else disassemble = print_insn_h8300; break; #endif @@ -137,7 +137,7 @@ disassembler (abfd) case bfd_arch_z8k: if (bfd_get_mach(abfd) == bfd_mach_z8001) disassemble = print_insn_z8001; - else + else disassemble = print_insn_z8002; break; #endif diff --git a/gnu/usr.bin/gdb/gdb/dwarfread.c b/gnu/usr.bin/gdb/gdb/dwarfread.c index 96196f5..a373e4e 100644 --- a/gnu/usr.bin/gdb/gdb/dwarfread.c +++ b/gnu/usr.bin/gdb/gdb/dwarfread.c @@ -271,9 +271,9 @@ extern char *warning_pre_print; /* From utils.c */ we may want to test for the presence of some attributes in the DIE, such as AT_low_pc, without restricting the values of the field, we need someway to note that we found such an attribute. - + */ - + typedef char BLOCK; struct dieinfo { @@ -329,7 +329,7 @@ static int offreg; /* Which base register is it relative to? */ static int basereg; -/* This value is added to each symbol value. FIXME: Generalize to +/* This value is added to each symbol value. FIXME: Generalize to the section_offsets structure used by dbxread (once this is done, pass the appropriate section number to end_symtab). */ static CORE_ADDR baseaddr; /* Add to each symbol value */ @@ -433,7 +433,7 @@ static struct type *ftypes[FT_NUM_MEMBERS]; /* Fundamental types */ and we need it while processing the DIE's for that compilation unit. It is eventually saved in the symtab structure, but we don't finalize the symtab struct until we have processed all the DIE's for the - compilation unit. We also need to get and save a pointer to the + compilation unit. We also need to get and save a pointer to the language struct for this language, so we can call the language dependent routines for doing things such as creating fundamental types. */ @@ -732,7 +732,7 @@ dwarf_build_psymtabs (objfile, section_offsets, mainline, dbfoff, dbfsize, { bfd *abfd = objfile->obfd; struct cleanup *back_to; - + current_objfile = objfile; dbsize = dbfsize; dbbase = xmalloc (dbsize); @@ -744,17 +744,17 @@ dwarf_build_psymtabs (objfile, section_offsets, mainline, dbfoff, dbfsize, error ("can't read DWARF data from '%s'", bfd_get_filename (abfd)); } back_to = make_cleanup (free, dbbase); - + /* If we are reinitializing, or if we have never loaded syms yet, init. Since we have no idea how many DIES we are looking at, we just guess some arbitrary value. */ - + if (mainline || objfile -> global_psymbols.size == 0 || objfile -> static_psymbols.size == 0) { init_psymbol_list (objfile, 1024); } - + /* Save the relocation factor where everybody can see it. */ base_section_offsets = section_offsets; @@ -763,9 +763,9 @@ dwarf_build_psymtabs (objfile, section_offsets, mainline, dbfoff, dbfsize, /* Follow the compilation unit sibling chain, building a partial symbol table entry for each one. Save enough information about each compilation unit to locate the full DWARF information later. */ - + scan_compilation_units (dbbase, dbbase + dbsize, dbfoff, lnoffset, objfile); - + do_cleanups (back_to); current_objfile = NULL; } @@ -833,7 +833,7 @@ lookup_utype (die_ref) { struct type *type = NULL; int utypeidx; - + utypeidx = (die_ref - dbroff) / 4; if ((utypeidx < 0) || (utypeidx >= numutypes)) { @@ -875,7 +875,7 @@ alloc_utype (die_ref, utypep) { struct type **typep; int utypeidx; - + utypeidx = (die_ref - dbroff) / 4; typep = utypes + utypeidx; if ((utypeidx < 0) || (utypeidx >= numutypes)) @@ -921,7 +921,7 @@ decode_die_type (dip) struct dieinfo *dip; { struct type *type = NULL; - + if (dip -> at_fund_type != 0) { type = decode_fund_type (dip -> at_fund_type); @@ -989,7 +989,7 @@ struct_type (dip, thisdie, enddie, objfile) #if !BITS_BIG_ENDIAN int anonymous_size; #endif - + if ((type = lookup_utype (dip -> die_ref)) == NULL) { /* No forward references created an empty type, so install one now */ @@ -1026,7 +1026,7 @@ struct_type (dip, thisdie, enddie, objfile) /* Use whatever size is known. Zero is a valid size. We might however wish to check has_at_byte_size to make sure that some byte size was given explicitly, but DWARF doesn't specify that explicit sizes of - zero have to present, so complaining about missing sizes should + zero have to present, so complaining about missing sizes should probably not be the default. */ TYPE_LENGTH (type) = dip -> at_byte_size; thisdie += dip -> die_length; @@ -1120,7 +1120,7 @@ struct_type (dip, thisdie, enddie, objfile) for (n = nfields; list; list = list -> next) { TYPE_FIELD (type, --n) = list -> field; - } + } } return (type); } @@ -1156,7 +1156,7 @@ NOTES it is complete, we just call new_symbol, which does it's own checking about whether the struct/union is anonymous or not (and suppresses creating a symbol table entry itself). - + */ static void @@ -1168,7 +1168,7 @@ read_structure_scope (dip, thisdie, enddie, objfile) { struct type *type; struct symbol *sym; - + type = struct_type (dip, thisdie, enddie, objfile); if (!(TYPE_FLAGS (type) & TYPE_FLAG_STUB)) { @@ -1212,7 +1212,7 @@ decode_array_element_type (scan) unsigned short attribute; unsigned short fundtype; int nbytes; - + attribute = target_to_host (scan, SIZEOF_ATTRIBUTE, GET_UNSIGNED, current_objfile); scan += SIZEOF_ATTRIBUTE; @@ -1312,7 +1312,7 @@ decode_subscript_data_item (scan, end) unsigned long lowbound; unsigned long highbound; int nbytes; - + format = target_to_host (scan, SIZEOF_FORMAT_SPECIFIER, GET_UNSIGNED, current_objfile); scan += SIZEOF_FORMAT_SPECIFIER; @@ -1390,7 +1390,7 @@ dwarf_read_array_type (dip) char *subend; unsigned short blocksz; int nbytes; - + if (dip -> at_ordering != ORD_row_major) { /* FIXME: Can gdb even handle column major arrays? */ @@ -1451,7 +1451,7 @@ read_tag_pointer_type (dip) { struct type *type; struct type *utype; - + type = decode_die_type (dip); if ((utype = lookup_utype (dip -> die_ref)) == NULL) { @@ -1466,7 +1466,7 @@ read_tag_pointer_type (dip) /* We assume the machine has only one representation for pointers! */ /* FIXME: This confuses host<->target data representations, and is a poor assumption besides. */ - + TYPE_LENGTH (utype) = sizeof (char *); TYPE_CODE (utype) = TYPE_CODE_PTR; } @@ -1513,7 +1513,7 @@ read_tag_string_type (dip) indextype = dwarf_fundamental_type (current_objfile, FT_INTEGER); rangetype = create_range_type ((struct type *) NULL, indextype, lowbound, highbound); - + utype = lookup_utype (dip -> die_ref); if (utype == NULL) { @@ -1570,7 +1570,7 @@ read_subroutine_type (dip, thisdie, enddie) { struct type *type; /* Type that this function returns */ struct type *ftype; /* Function that returns above type */ - + /* Decode the type that this subroutine returns */ type = decode_die_type (dip); @@ -1632,7 +1632,7 @@ read_enumeration (dip, thisdie, enddie, objfile) { struct type *type; struct symbol *sym; - + type = enum_type (dip, objfile); sym = new_symbol (dip, objfile); if (sym != NULL) @@ -1695,7 +1695,7 @@ enum_type (dip, objfile) unsigned short blocksz; struct symbol *sym; int nbytes; - + if ((type = lookup_utype (dip -> die_ref)) == NULL) { /* No forward references created an empty type, so install one now */ @@ -1771,7 +1771,7 @@ enum_type (dip, objfile) for (n = 0; (n < nfields) && (list != NULL); list = list -> next) { TYPE_FIELD (type, n++) = list -> field; - } + } } } return (type); @@ -1806,7 +1806,7 @@ read_func_scope (dip, thisdie, enddie, objfile) struct objfile *objfile; { register struct context_stack *new; - + if (objfile -> ei.entry_point >= dip -> at_low_pc && objfile -> ei.entry_point < dip -> at_high_pc) { @@ -1906,7 +1906,7 @@ read_file_scope (dip, thisdie, enddie, objfile) { struct cleanup *back_to; struct symtab *symtab; - + if (objfile -> ei.entry_point >= dip -> at_low_pc && objfile -> ei.entry_point < dip -> at_high_pc) { @@ -1931,7 +1931,7 @@ read_file_scope (dip, thisdie, enddie, objfile) if (symtab != NULL) { symtab -> language = cu_language; - } + } do_cleanups (back_to); utypes = NULL; numutypes = 0; @@ -1962,7 +1962,7 @@ process_dies (thisdie, enddie, objfile) { char *nextdie; struct dieinfo di; - + while (thisdie < enddie) { basicdieinfo (&di, thisdie, objfile); @@ -2110,7 +2110,7 @@ decode_line_numbers (linetable) unsigned long base; unsigned long line; unsigned long pc; - + if (linetable != NULL) { tblscan = tblend = linetable; @@ -2158,7 +2158,7 @@ DESCRIPTION the value zero is used, which results in a value relative to the frame pointer, rather than the absolute value. This is what GDB wants anyway. - + When the result is a register number, the global isreg flag is set, otherwise it is cleared. This is a kludge until we figure out a better way to handle the problem. Gdb's design does not mesh well with the @@ -2182,7 +2182,7 @@ locval (loc) char *end; int loc_atom_code; int loc_value_size; - + nbytes = attribute_size (AT_location); locsize = target_to_host (loc, nbytes, GET_UNSIGNED, current_objfile); loc += nbytes; @@ -2300,7 +2300,7 @@ read_ofile_symtab (pst) /* If there is a line number table associated with this compilation unit then read the size of this fragment in bytes, from the fragment itself. - Allocate a buffer for the fragment and read it in for future + Allocate a buffer for the fragment and read it in for future processing. */ lnbase = NULL; @@ -2353,7 +2353,7 @@ psymtab_to_symtab_1 (pst) { int i; struct cleanup *old_chain; - + if (pst != NULL) { if (pst->readin) @@ -2382,7 +2382,7 @@ psymtab_to_symtab_1 (pst) } psymtab_to_symtab_1 (pst -> dependencies[i]); } - } + } if (DBLENGTH (pst)) /* Otherwise it's a dummy */ { buildsym_init (); @@ -2444,9 +2444,9 @@ dwarf_psymtab_to_symtab (pst) pst -> filename); gdb_flush (gdb_stdout); } - + psymtab_to_symtab_1 (pst); - + #if 0 /* FIXME: Check to see what dbxread is doing here and see if we need to do an equivalent or is this something peculiar to stabs/a.out format. @@ -2455,7 +2455,7 @@ dwarf_psymtab_to_symtab (pst) */ scan_file_globals (pst -> objfile); #endif - + /* Finish up the verbose info message. */ if (info_verbose) { @@ -2489,7 +2489,7 @@ init_psymbol_list (objfile, total_symbols) int total_symbols; { /* Free any previously allocated psymbol lists. */ - + if (objfile -> global_psymbols.list) { mfree (objfile -> md, (PTR)objfile -> global_psymbols.list); @@ -2498,11 +2498,11 @@ init_psymbol_list (objfile, total_symbols) { mfree (objfile -> md, (PTR)objfile -> static_psymbols.list); } - + /* Current best guess is that there are approximately a twentieth of the total symbols (in a debugging file) are global or static oriented symbols */ - + objfile -> global_psymbols.size = total_symbols / 10; objfile -> static_psymbols.size = total_symbols / 10; objfile -> global_psymbols.next = @@ -2537,7 +2537,7 @@ add_enum_psymbol (dip, objfile) char *listend; unsigned short blocksz; int nbytes; - + if ((scan = dip -> at_element_list) != NULL) { if (dip -> short_element_list) @@ -2662,14 +2662,14 @@ NOTES main () { int j; } for which the relevant DWARF segment has the structure: - + 0x51: 0x23 global subrtn sibling 0x9b name main fund_type FT_integer low_pc 0x800004cc high_pc 0x800004d4 - + 0x74: 0x23 local var sibling 0x97 name j @@ -2678,16 +2678,16 @@ NOTES OP_CONST 0xfffffffc OP_ADD 0x97: - 0x4 - + 0x4 + 0x9b: 0x1d local var sibling 0xb8 name i fund_type FT_integer location OP_ADDR 0x800025dc - + 0xb8: - 0x4 + 0x4 We want to include the symbol 'i' in the partial symbol table, but not the symbol 'j'. In essence, we want to skip all the dies within @@ -2712,7 +2712,7 @@ scan_partial_symbols (thisdie, enddie, objfile) char *nextdie; char *temp; struct dieinfo di; - + while (thisdie < enddie) { basicdieinfo (&di, thisdie, objfile); @@ -2735,7 +2735,7 @@ scan_partial_symbols (thisdie, enddie, objfile) add_partial_symbol (&di, objfile); /* If there is a sibling attribute, adjust the nextdie pointer to skip the entire scope of the subroutine. - Apply some sanity checking to make sure we don't + Apply some sanity checking to make sure we don't overrun or underrun the range of remaining DIE's */ if (di.at_sibling != 0) { @@ -2798,7 +2798,7 @@ DESCRIPTION It scans from the beginning of the DWARF table looking for the first TAG_compile_unit DIE, and then follows the sibling chain to locate each additional TAG_compile_unit DIE. - + For each TAG_compile_unit DIE it creates a partial symtab structure, calls a subordinate routine to collect all the compilation unit's global DIE's, file scope DIEs, typedef DIEs, etc, and then links the @@ -2892,7 +2892,7 @@ scan_compilation_units (thisdie, enddie, dbfoff, lnoffset, objfile) pst -> n_global_syms = objfile -> global_psymbols.next - (objfile -> global_psymbols.list + pst -> globals_offset); - pst -> n_static_syms = objfile -> static_psymbols.next - + pst -> n_static_syms = objfile -> static_psymbols.next - (objfile -> static_psymbols.list + pst -> statics_offset); sort_pst_symbols (pst); /* If there is already a psymtab or symtab for a file of this name, @@ -2900,7 +2900,7 @@ scan_compilation_units (thisdie, enddie, dbfoff, lnoffset, objfile) happen.) This happens in VxWorks. */ free_named_symtabs (pst -> filename); } - thisdie = nextdie; + thisdie = nextdie; } } @@ -2928,7 +2928,7 @@ new_symbol (dip, objfile) struct objfile *objfile; { struct symbol *sym = NULL; - + if (dip -> at_name != NULL) { sym = (struct symbol *) obstack_alloc (&objfile -> symbol_obstack, @@ -3074,7 +3074,7 @@ synthesize_typedef (dip, objfile, type) struct type *type; { struct symbol *sym = NULL; - + if (dip -> at_name != NULL) { sym = (struct symbol *) @@ -3120,7 +3120,7 @@ decode_mod_fund_type (typedata) struct type *typep = NULL; unsigned short modcount; int nbytes; - + /* Get the total size of the block, exclusive of the size itself */ nbytes = attribute_size (AT_mod_fund_type); @@ -3167,7 +3167,7 @@ decode_mod_u_d_type (typedata) struct type *typep = NULL; unsigned short modcount; int nbytes; - + /* Get the total size of the block, exclusive of the size itself */ nbytes = attribute_size (AT_mod_u_d_type); @@ -3235,7 +3235,7 @@ decode_modified_type (modifiers, modcount, mtype) DIE_REF die_ref; char modifier; int nbytes; - + if (modcount == 0) { switch (mtype) @@ -3318,14 +3318,14 @@ decode_fund_type (fundtype) unsigned int fundtype; { struct type *typep = NULL; - + switch (fundtype) { case FT_void: typep = dwarf_fundamental_type (current_objfile, FT_VOID); break; - + case FT_boolean: /* Was FT_set in AT&T version */ typep = dwarf_fundamental_type (current_objfile, FT_BOOLEAN); break; @@ -3334,11 +3334,11 @@ decode_fund_type (fundtype) typep = dwarf_fundamental_type (current_objfile, FT_VOID); typep = lookup_pointer_type (typep); break; - + case FT_char: typep = dwarf_fundamental_type (current_objfile, FT_CHAR); break; - + case FT_signed_char: typep = dwarf_fundamental_type (current_objfile, FT_SIGNED_CHAR); break; @@ -3346,7 +3346,7 @@ decode_fund_type (fundtype) case FT_unsigned_char: typep = dwarf_fundamental_type (current_objfile, FT_UNSIGNED_CHAR); break; - + case FT_short: typep = dwarf_fundamental_type (current_objfile, FT_SHORT); break; @@ -3354,11 +3354,11 @@ decode_fund_type (fundtype) case FT_signed_short: typep = dwarf_fundamental_type (current_objfile, FT_SIGNED_SHORT); break; - + case FT_unsigned_short: typep = dwarf_fundamental_type (current_objfile, FT_UNSIGNED_SHORT); break; - + case FT_integer: typep = dwarf_fundamental_type (current_objfile, FT_INTEGER); break; @@ -3366,11 +3366,11 @@ decode_fund_type (fundtype) case FT_signed_integer: typep = dwarf_fundamental_type (current_objfile, FT_SIGNED_INTEGER); break; - + case FT_unsigned_integer: typep = dwarf_fundamental_type (current_objfile, FT_UNSIGNED_INTEGER); break; - + case FT_long: typep = dwarf_fundamental_type (current_objfile, FT_LONG); break; @@ -3378,11 +3378,11 @@ decode_fund_type (fundtype) case FT_signed_long: typep = dwarf_fundamental_type (current_objfile, FT_SIGNED_LONG); break; - + case FT_unsigned_long: typep = dwarf_fundamental_type (current_objfile, FT_UNSIGNED_LONG); break; - + case FT_long_long: typep = dwarf_fundamental_type (current_objfile, FT_LONG_LONG); break; @@ -3398,27 +3398,27 @@ decode_fund_type (fundtype) case FT_float: typep = dwarf_fundamental_type (current_objfile, FT_FLOAT); break; - + case FT_dbl_prec_float: typep = dwarf_fundamental_type (current_objfile, FT_DBL_PREC_FLOAT); break; - + case FT_ext_prec_float: typep = dwarf_fundamental_type (current_objfile, FT_EXT_PREC_FLOAT); break; - + case FT_complex: typep = dwarf_fundamental_type (current_objfile, FT_COMPLEX); break; - + case FT_dbl_prec_complex: typep = dwarf_fundamental_type (current_objfile, FT_DBL_PREC_COMPLEX); break; - + case FT_ext_prec_complex: typep = dwarf_fundamental_type (current_objfile, FT_EXT_PREC_COMPLEX); break; - + } if (typep == NULL) @@ -3429,7 +3429,7 @@ decode_fund_type (fundtype) complain (&unexpected_fund_type, DIE_ID, DIE_NAME, fundtype); } } - + return (typep); } @@ -3559,7 +3559,7 @@ DESCRIPTION Given a pointer to an already partially initialized die info structure, scan the raw DIE data and finish filling in the die info structure from the various attributes found. - + Note that since there is no guarantee that the data is properly aligned in memory for the type of access required (indirection through anything other than a char pointer), and there is no @@ -3586,7 +3586,7 @@ completedieinfo (dip, objfile) unsigned short attr; /* Current attribute being scanned */ unsigned short form; /* Form of the attribute */ int nbytes; /* Size of next field to read */ - + diecount++; diep = dip -> die; end = diep + dip -> die_length; diff --git a/gnu/usr.bin/gdb/gdb/elf/common.h b/gnu/usr.bin/gdb/gdb/elf/common.h index d5d1bb0..58c5117 100644 --- a/gnu/usr.bin/gdb/gdb/elf/common.h +++ b/gnu/usr.bin/gdb/gdb/elf/common.h @@ -26,7 +26,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ that are common to both the internal and external representations. For example, ELFMAG0 is the byte 0x7F in both the internal (in-memory) and external (in-file) representations. */ - + /* Fields in e_ident[] */ diff --git a/gnu/usr.bin/gdb/gdb/elf/dwarf.h b/gnu/usr.bin/gdb/gdb/elf/dwarf.h index bc9723ae..3590576 100644 --- a/gnu/usr.bin/gdb/gdb/elf/dwarf.h +++ b/gnu/usr.bin/gdb/gdb/elf/dwarf.h @@ -211,7 +211,7 @@ enum dwarf_fundamental_type { FT_boolean = 0x0015, /* breaks "classic" svr4 SDB */ FT_ext_prec_complex = 0x0016, /* breaks "classic" svr4 SDB */ FT_label = 0x0017, - + /* GNU extensions The low order byte must indicate the size (in bytes) for the type. All of these types will probably break "classic" svr4 SDB */ diff --git a/gnu/usr.bin/gdb/gdb/elf/external.h b/gnu/usr.bin/gdb/gdb/elf/external.h index f2ab63e..3e9e53c 100644 --- a/gnu/usr.bin/gdb/gdb/elf/external.h +++ b/gnu/usr.bin/gdb/gdb/elf/external.h @@ -27,7 +27,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ I.E. it describes the in-file representation of ELF. It requires the elf-common.h file which contains the portions that are common to both the internal and external representations. */ - + /* The 64-bit stuff is kind of random. Perhaps someone will publish a spec someday. */ diff --git a/gnu/usr.bin/gdb/gdb/elf/internal.h b/gnu/usr.bin/gdb/gdb/elf/internal.h index 7176067..da12bdb 100644 --- a/gnu/usr.bin/gdb/gdb/elf/internal.h +++ b/gnu/usr.bin/gdb/gdb/elf/internal.h @@ -27,7 +27,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ I.E. it describes the in-memory representation of ELF. It requires the elf-common.h file which contains the portions that are common to both the internal and external representations. */ - + /* NOTE that these structures are not kept in the same order as they appear in the object file. In some cases they've been reordered for more optimal diff --git a/gnu/usr.bin/gdb/gdb/elfread.c b/gnu/usr.bin/gdb/gdb/elfread.c index 93b11ef..47a3de1 100644 --- a/gnu/usr.bin/gdb/gdb/elfread.c +++ b/gnu/usr.bin/gdb/gdb/elfread.c @@ -48,16 +48,16 @@ struct elfinfo { /* Various things we might complain about... */ -struct complaint section_info_complaint = +struct complaint section_info_complaint = {"elf/stab section information %s without a preceding file symbol", 0, 0}; -struct complaint section_info_dup_complaint = +struct complaint section_info_dup_complaint = {"duplicated elf/stab section information for %s", 0, 0}; -struct complaint stab_info_mismatch_complaint = +struct complaint stab_info_mismatch_complaint = {"elf/stab section information missing for %s", 0, 0}; -struct complaint stab_info_questionable_complaint = +struct complaint stab_info_questionable_complaint = {"elf/stab section information questionable for %s", 0, 0}; static void @@ -262,7 +262,7 @@ elf_symtab_read (abfd, addr, objfile, dynamic) objfile->sym_stab_info; unsigned long size; int stripped = (bfd_get_symcount (abfd) == 0); - + if (dynamic) { storage_needed = bfd_get_dynamic_symtab_upper_bound (abfd); @@ -493,7 +493,7 @@ elf_symtab_read (abfd, addr, objfile, dynamic) else { /* FIXME: Solaris2 shared libraries include lots of - odd "absolute" and "undefined" symbols, that play + odd "absolute" and "undefined" symbols, that play hob with actions like finding what function the PC is in. Ignore them if they aren't text, data, or bss. */ /* ms_type = mst_unknown; */ @@ -510,7 +510,7 @@ elf_symtab_read (abfd, addr, objfile, dynamic) } /* Scan and build partial symbols for a symbol file. - We have been initialized by a call to elf_symfile_init, which + We have been initialized by a call to elf_symfile_init, which currently does nothing. SECTION_OFFSETS is a set of offsets to apply to relocate the symbols @@ -563,7 +563,7 @@ elf_symfile_read (objfile, section_offsets, mainline) memset ((char *) objfile->sym_stab_info, 0, sizeof (struct dbx_symfile_info)); make_cleanup (free_elfinfo, (PTR) objfile); - /* Process the normal ELF symbol table first. This may write some + /* Process the normal ELF symbol table first. This may write some chain of info into the dbx_symfile_info in objfile->sym_stab_info, which can later be used by elfstab_offset_sections. */ diff --git a/gnu/usr.bin/gdb/gdb/eval.c b/gnu/usr.bin/gdb/gdb/eval.c index 46e95fb..cb956ac 100644 --- a/gnu/usr.bin/gdb/gdb/eval.c +++ b/gnu/usr.bin/gdb/gdb/eval.c @@ -71,7 +71,7 @@ parse_and_eval_address (exp) { struct expression *expr = parse_expression (exp); register CORE_ADDR addr; - register struct cleanup *old_chain = + register struct cleanup *old_chain = make_cleanup (free_current_contents, &expr); addr = value_as_pointer (evaluate_expression (expr)); @@ -419,7 +419,7 @@ evaluate_subexp (expect_type, exp, pos, noside) argvec[1] = arg2; argvec[0] = 0; strcpy(tstr, &exp->elts[pc2+2].string); - if (!argvec[0]) + if (!argvec[0]) { temp = arg2; argvec[0] = @@ -624,7 +624,7 @@ evaluate_subexp (expect_type, exp, pos, noside) error ("cannot subscript something of type `%s'", TYPE_NAME (VALUE_TYPE (arg1))); } - + if (binop_user_defined_p (op, arg1, arg2)) return value_x_binop (arg1, arg2, op, OP_NULL); else @@ -636,7 +636,7 @@ evaluate_subexp (expect_type, exp, pos, noside) if (noside == EVAL_SKIP) goto nosideret; return value_in (arg1, arg2); - + case MULTI_SUBSCRIPT: (*pos) += 2; nargs = longest_to_int (exp->elts[pc + 1].longconst); @@ -662,7 +662,7 @@ evaluate_subexp (expect_type, exp, pos, noside) /* If the user attempts to subscript something that has no target type (like a plain int variable for example), then report this as an error. */ - + type = TYPE_TARGET_TYPE (VALUE_TYPE (arg1)); if (type != NULL) { @@ -676,7 +676,7 @@ evaluate_subexp (expect_type, exp, pos, noside) TYPE_NAME (VALUE_TYPE (arg1))); } } - + if (binop_user_defined_p (op, arg1, arg2)) { arg1 = value_x_binop (arg1, arg2, op, OP_NULL); @@ -695,12 +695,12 @@ evaluate_subexp (expect_type, exp, pos, noside) arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside); goto nosideret; } - + oldpos = *pos; arg2 = evaluate_subexp (NULL_TYPE, exp, pos, EVAL_AVOID_SIDE_EFFECTS); *pos = oldpos; - - if (binop_user_defined_p (op, arg1, arg2)) + + if (binop_user_defined_p (op, arg1, arg2)) { arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside); return value_x_binop (arg1, arg2, op, OP_NULL); @@ -721,12 +721,12 @@ evaluate_subexp (expect_type, exp, pos, noside) arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside); goto nosideret; } - + oldpos = *pos; arg2 = evaluate_subexp (NULL_TYPE, exp, pos, EVAL_AVOID_SIDE_EFFECTS); *pos = oldpos; - - if (binop_user_defined_p (op, arg1, arg2)) + + if (binop_user_defined_p (op, arg1, arg2)) { arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside); return value_x_binop (arg1, arg2, op, OP_NULL); @@ -824,7 +824,7 @@ evaluate_subexp (expect_type, exp, pos, noside) { return value_x_binop (arg1, arg2, op, OP_NULL); } - else + else { tem = value_less (arg1, arg2) || value_equal (arg1, arg2); return value_from_longest (builtin_type_int, (LONGEST) tem); @@ -903,7 +903,7 @@ evaluate_subexp (expect_type, exp, pos, noside) case UNOP_ADDR: /* C++: check for and handle pointer to members. */ - + op = exp->elts[*pos].opcode; if (noside == EVAL_SKIP) @@ -956,7 +956,7 @@ evaluate_subexp (expect_type, exp, pos, noside) } else { - arg2 = value_add (arg1, value_from_longest (builtin_type_char, + arg2 = value_add (arg1, value_from_longest (builtin_type_char, (LONGEST) 1)); return value_assign (arg1, arg2); } @@ -971,7 +971,7 @@ evaluate_subexp (expect_type, exp, pos, noside) } else { - arg2 = value_sub (arg1, value_from_longest (builtin_type_char, + arg2 = value_sub (arg1, value_from_longest (builtin_type_char, (LONGEST) 1)); return value_assign (arg1, arg2); } @@ -986,7 +986,7 @@ evaluate_subexp (expect_type, exp, pos, noside) } else { - arg2 = value_add (arg1, value_from_longest (builtin_type_char, + arg2 = value_add (arg1, value_from_longest (builtin_type_char, (LONGEST) 1)); value_assign (arg1, arg2); return arg1; @@ -1002,12 +1002,12 @@ evaluate_subexp (expect_type, exp, pos, noside) } else { - arg2 = value_sub (arg1, value_from_longest (builtin_type_char, + arg2 = value_sub (arg1, value_from_longest (builtin_type_char, (LONGEST) 1)); value_assign (arg1, arg2); return arg1; } - + case OP_THIS: (*pos) += 1; return value_of_this (1); @@ -1188,7 +1188,7 @@ evaluate_subexp_for_sizeof (exp, pos) case UNOP_MEMVAL: (*pos) += 3; - return value_from_longest (builtin_type_int, + return value_from_longest (builtin_type_int, (LONGEST) TYPE_LENGTH (exp->elts[pc + 1].type)); case OP_VAR_VALUE: diff --git a/gnu/usr.bin/gdb/gdb/exec.c b/gnu/usr.bin/gdb/gdb/exec.c index 8bc872b..4da0a48 100644 --- a/gnu/usr.bin/gdb/gdb/exec.c +++ b/gnu/usr.bin/gdb/gdb/exec.c @@ -1,4 +1,4 @@ -/* Work with executable files, for GDB. +/* Work with executable files, for GDB. Copyright 1988, 1989, 1991, 1992, 1993, 1994 Free Software Foundation, Inc. This file is part of GDB. @@ -121,7 +121,7 @@ exec_file_command (args, from_tty) { char *scratch_pathname; int scratch_chan; - + /* Scan through the args and pick up the first non option arg as the filename. */ @@ -139,8 +139,8 @@ exec_file_command (args, from_tty) filename = tilde_expand (*argv); make_cleanup (free, filename); - - scratch_chan = openp (getenv ("PATH"), 1, filename, + + scratch_chan = openp (getenv ("PATH"), 1, filename, write_files? O_RDWR|O_BINARY: O_RDONLY|O_BINARY, 0, &scratch_pathname); if (scratch_chan < 0) @@ -165,7 +165,7 @@ exec_file_command (args, from_tty) /* Make sure to close exec_bfd, or else "run" might try to use it. */ exec_close (0); - error ("Can't find the file sections in `%s': %s", + error ("Can't find the file sections in `%s': %s", exec_bfd->filename, bfd_errmsg (bfd_get_error ())); } @@ -187,7 +187,7 @@ exec_file_command (args, from_tty) if (bfd_get_section_flags (p->bfd, p->the_bfd_section) & (SEC_CODE | SEC_READONLY)) { - if (text_start > p->addr) + if (text_start > p->addr) text_start = p->addr; if (text_end < p->endaddr) text_end = p->endaddr; @@ -207,7 +207,7 @@ exec_file_command (args, from_tty) printf_unfiltered ("No exec file now.\n"); } -/* Set both the exec file and the symbol file, in one command. +/* Set both the exec file and the symbol file, in one command. What a novelty. Why did GDB go through four major releases before this command was added? */ @@ -223,7 +223,7 @@ file_command (arg, from_tty) } -/* Locate all mappable sections of a BFD file. +/* Locate all mappable sections of a BFD file. table_pp_char is a char * to get it through bfd_map_over_sections; we cast it back to its proper type. */ @@ -322,7 +322,7 @@ xfer_memory (memaddr, myaddr, len, write, target) /* This section ends before the transfer starts. */ continue; } - else + else { /* This section overlaps the transfer. Just do half. */ len = p->endaddr - memaddr; @@ -426,7 +426,7 @@ set_section_command (args, from_tty) exec_files_info(&exec_ops); return; } - } + } if (seclen >= sizeof (secprint)) seclen = sizeof (secprint) - 1; strncpy (secprint, secname, seclen); @@ -501,6 +501,6 @@ file itself are wrong. Each section must be changed separately. The\n\ "Set writing into executable and core files.", &setlist), &showlist); - + add_target (&exec_ops); } diff --git a/gnu/usr.bin/gdb/gdb/expprint.c b/gnu/usr.bin/gdb/gdb/expprint.c index 4948f4a..14e2a40 100644 --- a/gnu/usr.bin/gdb/gdb/expprint.c +++ b/gnu/usr.bin/gdb/gdb/expprint.c @@ -370,7 +370,7 @@ print_subexp (exp, pos, stream, prec) case UNOP_ORD: print_simple_m2_func("ORD",exp,pos,stream); return; - + case UNOP_ABS: print_simple_m2_func("ABS",exp,pos,stream); return; @@ -398,7 +398,7 @@ print_subexp (exp, pos, stream, prec) case UNOP_TRUNC: print_simple_m2_func("TRUNC",exp,pos,stream); return; - + case BINOP_INCL: case BINOP_EXCL: error("print_subexp: Not implemented."); @@ -472,7 +472,7 @@ print_simple_m2_func(s,exp,pos,stream) print_subexp(exp,pos,stream,PREC_PREFIX); fprintf_unfiltered(stream,")"); } - + /* Return the operator corresponding to opcode OP as a string. NULL indicates that the opcode was not found in the current language table. */ diff --git a/gnu/usr.bin/gdb/gdb/findvar.c b/gnu/usr.bin/gdb/gdb/findvar.c index 98be449..59c813c 100644 --- a/gnu/usr.bin/gdb/gdb/findvar.c +++ b/gnu/usr.bin/gdb/gdb/findvar.c @@ -289,19 +289,19 @@ find_saved_register (frame, regnum) callers to this routine asking for the stack pointer want the stack pointer saved for *this* frame; this is returned from the next frame. */ - + if (REGISTER_IN_WINDOW_P(regnum)) { frame1 = get_next_frame (frame); if (!frame1) return 0; /* Registers of this frame are active. */ - + /* Get the SP from the next frame in; it will be this current frame. */ if (regnum != SP_REGNUM) - frame1 = frame; - + frame1 = frame; + fi = get_frame_info (frame1); get_frame_saved_regs (fi, &saved_regs); return saved_regs.regs[regnum]; /* ... which might be zero */ @@ -643,7 +643,7 @@ write_register (regno, val) if (register_valid [regno] && memcmp (®isters[REGISTER_BYTE (regno)], buf, size) == 0) return; - + target_prepare_to_store (); memcpy (®isters[REGISTER_BYTE (regno)], buf, size); @@ -848,7 +848,7 @@ symbol_read_needs_frame (sym) /* Given a struct symbol for a variable, and a stack frame id, read the value of the variable - and return a (pointer to a) struct value containing the value. + and return a (pointer to a) struct value containing the value. If the variable cannot be found, return a zero pointer. If FRAME is NULL, use the selected_frame. */ @@ -942,7 +942,7 @@ read_var_value (var, frame) addr += SYMBOL_VALUE (var); break; } - + case LOC_TYPEDEF: error ("Cannot look up value of a typedef"); break; @@ -960,7 +960,7 @@ read_var_value (var, frame) if (frame == NULL) return 0; b = get_frame_block (frame); - + if (SYMBOL_CLASS (var) == LOC_REGPARM_ADDR) { @@ -1022,7 +1022,7 @@ value_from_register (type, regnum, frame) ) { /* Value spread across multiple storage locations. */ - + int local_regnum; int mem_stor = 0, reg_stor = 0; int mem_tracking = 1; @@ -1111,7 +1111,7 @@ value_from_register (type, regnum, frame) else { mem_stor++; - + mem_tracking = (mem_tracking && (regnum == local_regnum @@ -1170,7 +1170,7 @@ value_from_register (type, regnum, frame) VALUE_ADDRESS (v) = addr; /* Convert raw data to virtual format if necessary. */ - + #ifdef REGISTER_CONVERTIBLE if (REGISTER_CONVERTIBLE (regnum)) { @@ -1192,12 +1192,12 @@ value_from_register (type, regnum, frame) memcpy (VALUE_CONTENTS_RAW (v), raw_buffer + VALUE_OFFSET (v), len); } - + return v; } /* Given a struct symbol for a variable or function, - and a stack frame id, + and a stack frame id, return a (pointer to a) struct value containing the properly typed address. */ @@ -1225,7 +1225,7 @@ locate_var_value (var, frame) } /* Not a memory address; check what the problem was. */ - switch (VALUE_LVAL (lazy_value)) + switch (VALUE_LVAL (lazy_value)) { case lval_register: case lval_reg_frame_relative: diff --git a/gnu/usr.bin/gdb/gdb/fopen-bin.h b/gnu/usr.bin/gdb/gdb/fopen-bin.h index b868f63..2b8a8e2 100644 --- a/gnu/usr.bin/gdb/gdb/fopen-bin.h +++ b/gnu/usr.bin/gdb/gdb/fopen-bin.h @@ -1,4 +1,4 @@ -/* Macros for the 'type' part of an fopen, freopen or fdopen. +/* Macros for the 'type' part of an fopen, freopen or fdopen. <Read|Write>[Update]<Binary file|text file> diff --git a/gnu/usr.bin/gdb/gdb/fopen-same.h b/gnu/usr.bin/gdb/gdb/fopen-same.h index 0f37529..c296678 100644 --- a/gnu/usr.bin/gdb/gdb/fopen-same.h +++ b/gnu/usr.bin/gdb/gdb/fopen-same.h @@ -1,4 +1,4 @@ -/* Macros for the 'type' part of an fopen, freopen or fdopen. +/* Macros for the 'type' part of an fopen, freopen or fdopen. <Read|Write>[Update]<Binary file|text file> diff --git a/gnu/usr.bin/gdb/gdb/fork-child.c b/gnu/usr.bin/gdb/gdb/fork-child.c index 26b74cf..bca1841 100644 --- a/gnu/usr.bin/gdb/gdb/fork-child.c +++ b/gnu/usr.bin/gdb/gdb/fork-child.c @@ -155,7 +155,7 @@ fork_inferior (exec_file, allargs, env, traceme_fun, init_trace_fun, close_exec_file (); /* Retain a copy of our environment variables, since the child will - replace the value of environ and if we're vforked, we have to + replace the value of environ and if we're vforked, we have to restore it. */ save_our_env = environ; @@ -185,7 +185,7 @@ fork_inferior (exec_file, allargs, env, traceme_fun, init_trace_fun, if (pid == 0) { - if (debug_fork) + if (debug_fork) sleep (debug_fork); /* Run inferior in a separate process group. */ diff --git a/gnu/usr.bin/gdb/gdb/frame.h b/gnu/usr.bin/gdb/gdb/frame.h index 92b8d2a..a46ed17 100644 --- a/gnu/usr.bin/gdb/gdb/frame.h +++ b/gnu/usr.bin/gdb/gdb/frame.h @@ -140,7 +140,7 @@ struct frame_saved_regs /* Use the alternate method of avoiding running up off the end of the frame chain or following frames back into the startup code. See the comments in objfiles.h. */ - + #define FRAME_CHAIN_VALID(chain, thisframe) \ ((chain) != 0 \ && !inside_main_func ((thisframe) -> pc) \ diff --git a/gnu/usr.bin/gdb/gdb/freebsd-nat.c b/gnu/usr.bin/gdb/gdb/freebsd-nat.c index ef7a98a..90b3236 100644 --- a/gnu/usr.bin/gdb/gdb/freebsd-nat.c +++ b/gnu/usr.bin/gdb/gdb/freebsd-nat.c @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: freebsd-nat.c,v 1.5 1995/04/26 01:01:07 jkh Exp $ + $Id: freebsd-nat.c,v 1.6 1995/05/09 13:59:22 rgrimes Exp $ */ #include <sys/types.h> @@ -32,7 +32,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. /* this table must line up with REGISTER_NAMES in tm-i386v.h */ /* symbols like 'tEAX' come from <machine/reg.h> */ -static int tregmap[] = +static int tregmap[] = { tEAX, tECX, tEDX, tEBX, tESP, tEBP, tESI, tEDI, @@ -64,7 +64,7 @@ i387_to_double (from, to) /* push extended mode on 387 stack, then pop in double mode * * first, set exception masks so no error is generated - - * number will be rounded to inf or 0, if necessary + * number will be rounded to inf or 0, if necessary */ asm ("pushl %eax"); /* grab a stack slot */ asm ("fstcw (%esp)"); /* get 387 control word */ @@ -72,14 +72,14 @@ i387_to_double (from, to) asm ("orl $0x3f,%eax"); /* mask all exceptions */ asm ("pushl %eax"); asm ("fldcw (%esp)"); /* load new value into 387 */ - + asm ("movl 8(%ebp),%eax"); asm ("fldt (%eax)"); /* push extended number on 387 stack */ asm ("fwait"); asm ("movl 12(%ebp),%eax"); asm ("fstpl (%eax)"); /* pop double */ asm ("fwait"); - + asm ("popl %eax"); /* flush modified control word */ asm ("fnclex"); /* clear exceptions */ asm ("fldcw (%esp)"); /* restore original control word */ @@ -105,7 +105,7 @@ double_to_i387 (from, to) } #endif -struct env387 +struct env387 { unsigned short control; unsigned short r0; @@ -128,7 +128,7 @@ unsigned int control; { printf ("control 0x%04x: ", control); printf ("compute to "); - switch ((control >> 8) & 3) + switch ((control >> 8) & 3) { case 0: printf ("24 bits; "); break; case 1: printf ("(bad); "); break; @@ -136,14 +136,14 @@ unsigned int control; case 3: printf ("64 bits; "); break; } printf ("round "); - switch ((control >> 10) & 3) + switch ((control >> 10) & 3) { case 0: printf ("NEAREST; "); break; case 1: printf ("DOWN; "); break; case 2: printf ("UP; "); break; case 3: printf ("CHOP; "); break; } - if (control & 0x3f) + if (control & 0x3f) { printf ("mask:"); if (control & 0x0001) printf (" INVALID"); @@ -164,7 +164,7 @@ print_387_status_word (status) unsigned int status; { printf ("status 0x%04x: ", status); - if (status & 0xff) + if (status & 0xff) { printf ("exceptions:"); if (status & 0x0001) printf (" INVALID"); @@ -181,7 +181,7 @@ print_387_status_word (status) (status & 0x0400) != 0, (status & 0x0200) != 0, (status & 0x0100) != 0); - + printf ("top %d\n", (status >> 11) & 7); } @@ -195,43 +195,43 @@ print_387_status (status, ep) int top; int fpreg; unsigned char *p; - + bothstatus = ((status != 0) && (ep->status != 0)); - if (status != 0) + if (status != 0) { if (bothstatus) printf ("u: "); print_387_status_word ((unsigned int)status); } - - if (ep->status != 0) + + if (ep->status != 0) { if (bothstatus) printf ("e: "); print_387_status_word ((unsigned int)ep->status); } - + print_387_control_word ((unsigned int)ep->control); printf ("opcode 0x%x; ", ep->opcode); printf ("pc 0x%x:0x%x; ", ep->code_seg, ep->eip); printf ("operand 0x%x:0x%x\n", ep->operand_seg, ep->operand); - + top = (ep->status >> 11) & 7; - + printf (" regno tag msb lsb value\n"); - for (fpreg = 7; fpreg >= 0; fpreg--) + for (fpreg = 7; fpreg >= 0; fpreg--) { int st_regno; double val; - + /* The physical regno `fpreg' is only relevant as an index into the * tag word. Logical `%st' numbers are required for indexing ep->regs. */ st_regno = (fpreg + 8 - top) & 7; printf ("%%st(%d) %s ", st_regno, fpreg == top ? "=>" : " "); - - switch ((ep->tag >> (fpreg * 2)) & 3) + + switch ((ep->tag >> (fpreg * 2)) & 3) { case 0: printf ("valid "); break; case 1: printf ("zero "); break; @@ -240,7 +240,7 @@ print_387_status (status, ep) } for (i = 9; i >= 0; i--) printf ("%02x", ep->regs[st_regno][i]); - + i387_to_double (ep->regs[st_regno], (char *)&val); printf (" %g\n", val); } @@ -261,25 +261,25 @@ i386_float_info () /*extern int corechan;*/ int skip; extern int inferior_pid; - + uaddr = (char *)&U_FPSTATE(u) - (char *)&u; - if (inferior_pid) + if (inferior_pid) { int *ip; - + rounded_addr = uaddr & -sizeof (int); rounded_size = (((uaddr + sizeof (struct fpstate)) - uaddr) + sizeof (int) - 1) / sizeof (int); skip = uaddr - rounded_addr; - + ip = (int *)buf; - for (i = 0; i < rounded_size; i++) + for (i = 0; i < rounded_size; i++) { *ip++ = ptrace (PT_READ_U, inferior_pid, (caddr_t)rounded_addr, 0); rounded_addr += sizeof (int); } - } - else + } + else { #if 1 printf("float info: can't do a core file (yet)\n"); @@ -287,12 +287,12 @@ i386_float_info () #else if (lseek (corechan, uaddr, 0) < 0) perror_with_name ("seek on core file"); - if (myread (corechan, buf, sizeof (struct fpstate)) < 0) + if (myread (corechan, buf, sizeof (struct fpstate)) < 0) perror_with_name ("read from core file"); skip = 0; #endif } - + fpstatep = (struct fpstate *)(buf + skip); print_387_status (fpstatep->sv_ex_sw, (struct env387 *)fpstatep); } @@ -582,7 +582,7 @@ CORE_ADDR uaddr; } /* - * read len bytes from kernel virtual address 'addr' into local + * read len bytes from kernel virtual address 'addr' into local * buffer 'buf'. Return numbert of bytes if read ok, 0 otherwise. On read * errors, portion of buffer not read is zeroed. */ diff --git a/gnu/usr.bin/gdb/gdb/gdb-stabs.h b/gnu/usr.bin/gdb/gdb/gdb-stabs.h index c1e0253..6c2a5f0 100644 --- a/gnu/usr.bin/gdb/gdb/gdb-stabs.h +++ b/gnu/usr.bin/gdb/gdb/gdb-stabs.h @@ -39,7 +39,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #define SECT_OFF_MAX 4 /* Count of possible values */ /* The stab_section_info chain remembers info from the ELF symbol table, - while psymtabs are being built for the other symbol tables in the + while psymtabs are being built for the other symbol tables in the objfile. It is destroyed at the complation of psymtab-reading. Any info that was used from it has been copied into psymtabs. */ @@ -53,7 +53,7 @@ struct stab_section_info { /* Information is passed among various dbxread routines for accessing symbol files. A pointer to this structure is kept in the sym_stab_info field of the objfile struct. */ - + struct dbx_symfile_info { asection *text_sect; /* Text section accessor */ int symcount; /* How many symbols are there in the file */ diff --git a/gnu/usr.bin/gdb/gdb/gdbcore.h b/gnu/usr.bin/gdb/gdb/gdbcore.h index 54570a6..595e20c 100644 --- a/gnu/usr.bin/gdb/gdb/gdbcore.h +++ b/gnu/usr.bin/gdb/gdb/gdbcore.h @@ -36,7 +36,7 @@ get_exec_file PARAMS ((int err)); extern int have_core_file_p PARAMS ((void)); -/* Read "memory data" from whatever target or inferior we have. +/* Read "memory data" from whatever target or inferior we have. Returns zero if successful, errno value if not. EIO is used for address out of bounds. If breakpoints are inserted, returns shadow contents, not the breakpoints themselves. From breakpoint.c. */ @@ -79,7 +79,7 @@ extern void generic_search PARAMS ((int len, char *data, char *mask, /* Hook for `exec_file_command' command to call. */ extern void (*exec_file_display_hook) PARAMS ((char *filename)); - + extern void specify_exec_file_hook PARAMS ((void (*hook) (char *filename))); diff --git a/gnu/usr.bin/gdb/gdb/gdbm.h b/gnu/usr.bin/gdb/gdb/gdbm.h index 18b324d..5d244a3 100644 --- a/gnu/usr.bin/gdb/gdb/gdbm.h +++ b/gnu/usr.bin/gdb/gdb/gdbm.h @@ -23,7 +23,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ Western Washington University Bellingham, WA 98226 phone: (206) 676-3035 - + *************************************************************************/ /* Parameters to gdbm_open for READERS, WRITERS, and WRITERS who diff --git a/gnu/usr.bin/gdb/gdb/gdbtypes.c b/gnu/usr.bin/gdb/gdb/gdbtypes.c index b891237..36857be 100644 --- a/gnu/usr.bin/gdb/gdb/gdbtypes.c +++ b/gnu/usr.bin/gdb/gdb/gdbtypes.c @@ -101,8 +101,8 @@ make_pointer_type (type, typeptr) ntype = TYPE_POINTER_TYPE (type); - if (ntype) - if (typeptr == 0) + if (ntype) + if (typeptr == 0) return ntype; /* Don't care about alloc, and have new type. */ else if (*typeptr == 0) { @@ -134,7 +134,7 @@ make_pointer_type (type, typeptr) /* pointers are unsigned */ TYPE_FLAGS (ntype) |= TYPE_FLAG_UNSIGNED; - + if (!TYPE_POINTER_TYPE (type)) /* Remember it, if don't have one. */ TYPE_POINTER_TYPE (type) = ntype; @@ -166,8 +166,8 @@ make_reference_type (type, typeptr) ntype = TYPE_REFERENCE_TYPE (type); - if (ntype) - if (typeptr == 0) + if (ntype) + if (typeptr == 0) return ntype; /* Don't care about alloc, and have new type. */ else if (*typeptr == 0) { @@ -197,7 +197,7 @@ make_reference_type (type, typeptr) TYPE_LENGTH (ntype) = TARGET_PTR_BIT / TARGET_CHAR_BIT; TYPE_CODE (ntype) = TYPE_CODE_REF; - + if (!TYPE_REFERENCE_TYPE (type)) /* Remember it, if don't have one. */ TYPE_REFERENCE_TYPE (type) = ntype; @@ -228,8 +228,8 @@ make_function_type (type, typeptr) ntype = TYPE_FUNCTION_TYPE (type); - if (ntype) - if (typeptr == 0) + if (ntype) + if (typeptr == 0) return ntype; /* Don't care about alloc, and have new type. */ else if (*typeptr == 0) { @@ -256,7 +256,7 @@ make_function_type (type, typeptr) TYPE_LENGTH (ntype) = 1; TYPE_CODE (ntype) = TYPE_CODE_FUNC; - + if (!TYPE_FUNCTION_TYPE (type)) /* Remember it, if don't have one. */ TYPE_FUNCTION_TYPE (type) = ntype; @@ -291,7 +291,7 @@ lookup_member_type (type, domain) return (mtype); } -/* Allocate a stub method whose return type is TYPE. +/* Allocate a stub method whose return type is TYPE. This apparently happens for speed of symbol reading, since parsing out the arguments to the method is cpu-intensive, the way we are doing it. So, we will fill in arguments later. @@ -487,7 +487,7 @@ create_set_type (result_type, domain_type) return (result_type); } -/* Smash TYPE to be a type of members of DOMAIN with type TO_TYPE. +/* Smash TYPE to be a type of members of DOMAIN with type TO_TYPE. A MEMBER is a wierd thing -- it amounts to a typed offset into a struct, e.g. "an int at offset 8". A MEMBER TYPE doesn't include the offset (that's the value of the MEMBER itself), but does @@ -558,7 +558,7 @@ type_name_no_tag (type) return TYPE_NAME (type); } -/* Lookup a primitive type named NAME. +/* Lookup a primitive type named NAME. Return zero if NAME is not a primitive type.*/ struct type * @@ -574,7 +574,7 @@ lookup_primitive_typename (name) return (**p); } } - return (NULL); + return (NULL); } /* Lookup a typedef or primitive type named NAME, @@ -695,7 +695,7 @@ lookup_enum (name, block) { register struct symbol *sym; - sym = lookup_symbol (name, block, STRUCT_NAMESPACE, 0, + sym = lookup_symbol (name, block, STRUCT_NAMESPACE, 0, (struct symtab **) NULL); if (sym == NULL) { @@ -737,7 +737,7 @@ lookup_template_type (name, type, block) return (SYMBOL_TYPE (sym)); } -/* Given a type TYPE, lookup the type of the component of type named NAME. +/* Given a type TYPE, lookup the type of the component of type named NAME. TYPE can be either a struct or union, or a pointer or reference to a struct or union. If it is a pointer or reference, its target type is automatically used. @@ -811,7 +811,7 @@ lookup_struct_elt_type (type, name, noerr) { return NULL; } - + target_terminal_ours (); gdb_flush (gdb_stdout); fprintf_unfiltered (gdb_stderr, "Type "); @@ -866,13 +866,13 @@ fill_in_vptr_fieldno (type) be a mistake, though--we might load in more symbols which contain a full definition for the type. - This used to be coded as a macro, but I don't think it is called + This used to be coded as a macro, but I don't think it is called often enough to merit such treatment. */ struct complaint stub_noname_complaint = {"stub type has NULL name", 0, 0}; -void +void check_stub_type (type) struct type *type; { @@ -889,7 +889,7 @@ check_stub_type (type) complain (&stub_noname_complaint); return; } - sym = lookup_symbol (name, 0, STRUCT_NAMESPACE, 0, + sym = lookup_symbol (name, 0, STRUCT_NAMESPACE, 0, (struct symtab **) NULL); if (sym) { @@ -1125,7 +1125,7 @@ lookup_fundamental_type (objfile, typeid) /* If this is the first time we need a fundamental type for this objfile then we need to initialize the vector of type pointers. */ - + if (objfile -> fundamental_types == NULL) { nbytes = FT_NUM_MEMBERS * sizeof (struct type *); @@ -1550,7 +1550,7 @@ _initialize_gdbtypes () init_type (TYPE_CODE_INT, TARGET_LONG_LONG_BIT / TARGET_CHAR_BIT, 0, "long long", (struct objfile *) NULL); - builtin_type_unsigned_long_long = + builtin_type_unsigned_long_long = init_type (TYPE_CODE_INT, TARGET_LONG_LONG_BIT / TARGET_CHAR_BIT, TYPE_FLAG_UNSIGNED, "unsigned long long", (struct objfile *) NULL); diff --git a/gnu/usr.bin/gdb/gdb/gdbtypes.h b/gnu/usr.bin/gdb/gdb/gdbtypes.h index 62fe1ab..8ba6bfa 100644 --- a/gnu/usr.bin/gdb/gdb/gdbtypes.h +++ b/gnu/usr.bin/gdb/gdb/gdbtypes.h @@ -207,7 +207,7 @@ struct type /* Type that is a pointer to this type. NULL if no such pointer-to type is known yet. The debugger may add the address of such a type - if it has to construct one later. */ + if it has to construct one later. */ struct type *pointer_type; @@ -261,7 +261,7 @@ struct type /* Size of this field, in bits, or zero if not packed. For an unpacked field, the field's type's length says how many bytes the field occupies. */ - /* FIXME: This is abused by TYPE_FIELD_STATIC_PHYSNAME to contain + /* FIXME: This is abused by TYPE_FIELD_STATIC_PHYSNAME to contain a pointer, so it has to be long. */ long bitsize; @@ -280,7 +280,7 @@ struct type } *fields; /* For types with virtual functions, VPTR_BASETYPE is the base class which - defined the virtual function table pointer. + defined the virtual function table pointer. For types that are pointer to member types, VPTR_BASETYPE is the type that this pointer is a member of. diff --git a/gnu/usr.bin/gdb/gdb/i386-dis.c b/gnu/usr.bin/gdb/gdb/i386-dis.c index 7f9641d..ff94b3d8 100644 --- a/gnu/usr.bin/gdb/gdb/i386-dis.c +++ b/gnu/usr.bin/gdb/gdb/i386-dis.c @@ -28,7 +28,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ * of the "Opcode Map" chapter (Appendix A) of the Intel 80386 * Programmers Manual. Usually, there is a capital letter, followed * by a small letter. The capital letter tell the addressing mode, - * and the small letter tells about the operand size. Refer to + * and the small letter tells about the operand size. Refer to * the Intel manual for details. */ @@ -515,83 +515,83 @@ struct dis386 dis386_twobyte[] = { { GRP6 }, { GRP7 }, { "larS", Gv, Ew }, - { "lslS", Gv, Ew }, + { "lslS", Gv, Ew }, { "(bad)" }, { "(bad)" }, { "clts" }, - { "(bad)" }, + { "(bad)" }, /* 08 */ { "invd" }, { "wbinvd" }, - { "(bad)" }, { "(bad)" }, - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, /* 10 */ - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, /* 18 */ - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, /* 20 */ /* these are all backward in appendix A of the intel book */ { "movl", Rd, Cd }, { "movl", Rd, Dd }, { "movl", Cd, Rd }, - { "movl", Dd, Rd }, + { "movl", Dd, Rd }, { "movl", Rd, Td }, { "(bad)" }, { "movl", Td, Rd }, - { "(bad)" }, + { "(bad)" }, /* 28 */ - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, /* 30 */ - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, /* 38 */ - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, /* 40 */ - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, /* 48 */ - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, /* 50 */ - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, /* 58 */ - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, /* 60 */ - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, /* 68 */ - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, /* 70 */ - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, /* 78 */ - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, /* 80 */ { "jo", Jv }, { "jno", Jv }, { "jb", Jv }, - { "jae", Jv }, + { "jae", Jv }, { "je", Jv }, { "jne", Jv }, { "jbe", Jv }, - { "ja", Jv }, + { "ja", Jv }, /* 88 */ { "js", Jv }, { "jns", Jv }, { "jp", Jv }, - { "jnp", Jv }, + { "jnp", Jv }, { "jl", Jv }, { "jge", Jv }, { "jle", Jv }, - { "jg", Jv }, + { "jg", Jv }, /* 90 */ { "seto", Eb }, { "setno", Eb }, @@ -609,48 +609,48 @@ struct dis386 dis386_twobyte[] = { { "setl", Eb }, { "setge", Eb }, { "setle", Eb }, - { "setg", Eb }, + { "setg", Eb }, /* a0 */ { "pushl", fs }, { "popl", fs }, { "(bad)" }, - { "btS", Ev, Gv }, + { "btS", Ev, Gv }, { "shldS", Ev, Gv, Ib }, { "shldS", Ev, Gv, CL }, { "(bad)" }, - { "(bad)" }, + { "(bad)" }, /* a8 */ { "pushl", gs }, { "popl", gs }, { "(bad)" }, - { "btsS", Ev, Gv }, + { "btsS", Ev, Gv }, { "shrdS", Ev, Gv, Ib }, { "shrdS", Ev, Gv, CL }, { "(bad)" }, - { "imulS", Gv, Ev }, + { "imulS", Gv, Ev }, /* b0 */ { "cmpxchgb", Eb, Gb }, { "cmpxchgS", Ev, Gv }, { "lssS", Gv, Mp }, /* 386 lists only Mp */ - { "btrS", Ev, Gv }, + { "btrS", Ev, Gv }, { "lfsS", Gv, Mp }, /* 386 lists only Mp */ { "lgsS", Gv, Mp }, /* 386 lists only Mp */ { "movzbS", Gv, Eb }, - { "movzwS", Gv, Ew }, + { "movzwS", Gv, Ew }, /* b8 */ { "(bad)" }, { "(bad)" }, { GRP8 }, - { "btcS", Ev, Gv }, + { "btcS", Ev, Gv }, { "bsfS", Gv, Ev }, { "bsrS", Gv, Ev }, { "movsbS", Gv, Eb }, - { "movswS", Gv, Ew }, + { "movswS", Gv, Ew }, /* c0 */ { "xaddb", Eb, Gb }, { "xaddS", Ev, Gv }, - { "(bad)" }, { "(bad)" }, - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, /* c8 */ { "bswap", eAX }, { "bswap", eCX }, @@ -661,23 +661,23 @@ struct dis386 dis386_twobyte[] = { { "bswap", eSI }, { "bswap", eDI }, /* d0 */ - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, /* d8 */ - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, /* e0 */ - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, /* e8 */ - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, /* f0 */ - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, /* f8 */ - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, - { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, + { "(bad)" }, { "(bad)" }, { "(bad)" }, { "(bad)" }, }; static char obuf[100]; @@ -951,7 +951,7 @@ ckprefix () } static int dflag; -static int aflag; +static int aflag; static char op1out[100], op2out[100], op3out[100]; static int op_address[3], op_ad, op_index[3]; @@ -977,7 +977,7 @@ print_insn_i386 (pc, info) int enter_instruction; char *first, *second, *third; int needcomma; - + struct dis_private priv; bfd_byte *inbuf = priv.the_buffer; @@ -999,7 +999,7 @@ print_insn_i386 (pc, info) start_pc = pc; start_codep = inbuf; codep = inbuf; - + ckprefix (); FETCH_DATA (info, codep + 1); @@ -1007,16 +1007,16 @@ print_insn_i386 (pc, info) enter_instruction = 1; else enter_instruction = 0; - + obufp = obuf; - + if (prefixes & PREFIX_REPZ) oappend ("repz "); if (prefixes & PREFIX_REPNZ) oappend ("repnz "); if (prefixes & PREFIX_LOCK) oappend ("lock "); - + if ((prefixes & PREFIX_FWAIT) && ((*codep < 0xd8) || (*codep > 0xdf))) { @@ -1024,20 +1024,20 @@ print_insn_i386 (pc, info) (*info->fprintf_func) (info->stream, "fwait"); return (1); } - + /* these would be initialized to 0 if disassembling for 8086 or 286 */ dflag = 1; aflag = 1; - + if (prefixes & PREFIX_DATA) dflag ^= 1; - + if (prefixes & PREFIX_ADR) { aflag ^= 1; oappend ("addr16 "); } - + if (*codep == 0x0f) { FETCH_DATA (info, codep + 2); @@ -1065,34 +1065,34 @@ print_insn_i386 (pc, info) { if (dp->name == NULL) dp = &grps[dp->bytemode1][reg]; - + putop (dp->name); - + obufp = op1out; op_ad = 2; if (dp->op1) (*dp->op1)(dp->bytemode1); - + obufp = op2out; op_ad = 1; if (dp->op2) (*dp->op2)(dp->bytemode2); - + obufp = op3out; op_ad = 0; if (dp->op3) (*dp->op3)(dp->bytemode3); } - + obufp = obuf + strlen (obuf); for (i = strlen (obuf); i < 6; i++) oappend (" "); oappend (" "); (*info->fprintf_func) (info->stream, "%s", obuf); - + /* enter instruction is printed with operands in the * same order as the intel book; everything else - * is printed in reverse order + * is printed in reverse order */ if (enter_instruction) { @@ -1374,9 +1374,9 @@ dofloat () { struct dis386 *dp; unsigned char floatop; - + floatop = codep[-1]; - + if (mod != 3) { putop (float_mem[(floatop - 0xd8) * 8 + reg]); @@ -1385,7 +1385,7 @@ dofloat () return; } codep++; - + dp = &float_reg[floatop - 0xd8][reg]; if (dp->name == NULL) { @@ -1434,7 +1434,7 @@ putop (template) char *template; { char *p; - + for (p = template; *p; p++) { switch (*p) @@ -1507,14 +1507,14 @@ OP_E (bytemode) int index; int scale; int havebase; - + /* skip mod/rm byte */ codep++; - + havesib = 0; havebase = 0; disp = 0; - + if (mod == 3) { switch (bytemode) @@ -1537,7 +1537,7 @@ OP_E (bytemode) } return (0); } - + append_prefix (); if (rm == 4) { @@ -1549,7 +1549,7 @@ OP_E (bytemode) base = *codep & 7; codep++; } - + switch (mod) { case 0: @@ -1589,21 +1589,21 @@ OP_E (bytemode) } break; } - + if (mod != 0 || rm == 5 || (havesib && base == 5)) { sprintf (scratchbuf, "0x%x", disp); oappend (scratchbuf); } - - if (havebase || havesib) + + if (havebase || havesib) { oappend ("("); if (havebase) oappend (names32[base]); - if (havesib) + if (havesib) { - if (index != 4) + if (index != 4) { sprintf (scratchbuf, ",%s", names32[index]); oappend (scratchbuf); @@ -1620,7 +1620,7 @@ int OP_G (bytemode) int bytemode; { - switch (bytemode) + switch (bytemode) { case b_mode: oappend (names8[reg]); @@ -1681,8 +1681,8 @@ OP_REG (code) int code; { char *s; - - switch (code) + + switch (code) { case indir_dx_reg: s = "(%dx)"; break; case ax_reg: case cx_reg: case dx_reg: case bx_reg: @@ -1717,8 +1717,8 @@ OP_I (bytemode) int bytemode; { int op; - - switch (bytemode) + + switch (bytemode) { case b_mode: FETCH_DATA (the_info, codep + 1); @@ -1747,8 +1747,8 @@ OP_sI (bytemode) int bytemode; { int op; - - switch (bytemode) + + switch (bytemode) { case b_mode: FETCH_DATA (the_info, codep + 1); @@ -1778,8 +1778,8 @@ OP_J (bytemode) { int disp; int mask = -1; - - switch (bytemode) + + switch (bytemode) { case b_mode: FETCH_DATA (the_info, codep + 1); @@ -1826,16 +1826,16 @@ OP_DIR (size) int size; { int seg, offset; - - switch (size) + + switch (size) { case lptr: - if (aflag) + if (aflag) { offset = get32 (); seg = get16 (); - } - else + } + else { offset = get16 (); seg = get16 (); @@ -1848,7 +1848,7 @@ OP_DIR (size) offset = get32 (); else offset = (short)get16 (); - + offset = start_pc + codep - start_codep + offset; set_op (offset); sprintf (scratchbuf, "0x%x", offset); @@ -1867,12 +1867,12 @@ OP_OFF (bytemode) int bytemode; { int off; - + if (aflag) off = get32 (); else off = get16 (); - + sprintf (scratchbuf, "0x%x", off); oappend (scratchbuf); return (0); @@ -1946,7 +1946,7 @@ int OP_rm (bytemode) int bytemode; { - switch (bytemode) + switch (bytemode) { case d_mode: oappend (names32[rm]); diff --git a/gnu/usr.bin/gdb/gdb/i386-tdep.c b/gnu/usr.bin/gdb/gdb/i386-tdep.c index 511b432..2247dd1 100644 --- a/gnu/usr.bin/gdb/gdb/i386-tdep.c +++ b/gnu/usr.bin/gdb/gdb/i386-tdep.c @@ -37,7 +37,7 @@ codestream_read PARAMS ((unsigned char *, int)); static void codestream_seek PARAMS ((int)); -static unsigned char +static unsigned char codestream_fill PARAMS ((int)); /* helper functions for tm-i386.h */ @@ -72,7 +72,7 @@ static int codestream_cnt; #define codestream_get() (codestream_cnt-- == 0 ? \ codestream_fill(0) : codestream_buf[codestream_off++]) -static unsigned char +static unsigned char codestream_fill (peek_flag) int peek_flag; { @@ -81,7 +81,7 @@ codestream_fill (peek_flag) codestream_off = 0; codestream_cnt = CODESTREAM_BUFSIZ; read_memory (codestream_addr, (char *) codestream_buf, CODESTREAM_BUFSIZ); - + if (peek_flag) return (codestream_peek()); else @@ -142,7 +142,7 @@ i386_follow_jump () delta = extract_signed_integer (buf, 2); /* include size of jmp inst (including the 0x66 prefix). */ - pos += delta + 4; + pos += delta + 4; } else { @@ -168,7 +168,7 @@ i386_follow_jump () * find & return amound a local space allocated, and advance codestream to * first register push (if any) * - * if entry sequence doesn't make sense, return -1, and leave + * if entry sequence doesn't make sense, return -1, and leave * codestream pointer random */ @@ -188,7 +188,7 @@ i386_get_frame_setup (pc) { /* * this function must start with - * + * * popl %eax 0x58 * xchgl %eax, (%esp) 0x87 0x04 0x24 * or xchgl %eax, 0(%esp) 0x87 0x44 0x24 0x00 @@ -196,7 +196,7 @@ i386_get_frame_setup (pc) * (the system 5 compiler puts out the second xchg * inst, and the assembler doesn't try to optimize it, * so the 'sib' form gets generated) - * + * * this sequence is used to get the address of the return * buffer for a function that returns a structure */ @@ -216,7 +216,7 @@ i386_get_frame_setup (pc) } if (op == 0x55) /* pushl %ebp */ - { + { /* check for movl %esp, %ebp - can be written two ways */ switch (codestream_get ()) { @@ -231,13 +231,13 @@ i386_get_frame_setup (pc) default: return (-1); } - /* check for stack adjustment + /* check for stack adjustment * * subl $XXX, %esp * * note: you can't subtract a 16 bit immediate * from a 32 bit reg, so we don't have to worry - * about a data16 prefix + * about a data16 prefix */ op = codestream_peek (); if (op == 0x83) @@ -250,7 +250,7 @@ i386_get_frame_setup (pc) codestream_seek (codestream_tell () - 2); return 0; } - /* subl with signed byte immediate + /* subl with signed byte immediate * (though it wouldn't make sense to be negative) */ return (codestream_get()); @@ -301,8 +301,8 @@ i386_frame_num_args (fi) this call and a previous one, and we would say there are more args than there really are. */ - int retpc; - unsigned char op; + int retpc; + unsigned char op; struct frame_info *pfi; /* on the 386, the instruction following the call could be: @@ -319,7 +319,7 @@ i386_frame_num_args (fi) nameless arguments. */ return -1; - pfi = get_prev_frame_info (fi); + pfi = get_prev_frame_info (fi); if (pfi == 0) { /* Note: this can happen if we are looking at the frame for @@ -331,25 +331,25 @@ i386_frame_num_args (fi) } else { - retpc = pfi->pc; - op = read_memory_integer (retpc, 1); - if (op == 0x59) - /* pop %ecx */ - return 1; + retpc = pfi->pc; + op = read_memory_integer (retpc, 1); + if (op == 0x59) + /* pop %ecx */ + return 1; else if (op == 0x83) { - op = read_memory_integer (retpc+1, 1); - if (op == 0xc4) - /* addl $<signed imm 8 bits>, %esp */ + op = read_memory_integer (retpc+1, 1); + if (op == 0xc4) + /* addl $<signed imm 8 bits>, %esp */ return (read_memory_integer (retpc+2,1)&0xff)/4; else return 0; } else if (op == 0x81) { /* add with 32 bit immediate */ - op = read_memory_integer (retpc+1, 1); - if (op == 0xc4) - /* addl $<imm 32>, %esp */ + op = read_memory_integer (retpc+1, 1); + if (op == 0xc4) + /* addl $<imm 32>, %esp */ return read_memory_integer (retpc+2, 4) / 4; else return 0; @@ -371,7 +371,7 @@ i386_frame_num_args (fi) * The startup sequence can be at the start of the function, * or the function can start with a branch to startup code at the end. * - * %ebp can be set up with either the 'enter' instruction, or + * %ebp can be set up with either the 'enter' instruction, or * 'pushl %ebp, movl %esp, %ebp' (enter is too slow to be useful, * but was once used in the sys5 compiler) * @@ -401,33 +401,33 @@ i386_frame_find_saved_regs (fip, fsrp) CORE_ADDR dummy_bottom; CORE_ADDR adr; int i; - + memset (fsrp, 0, sizeof *fsrp); - + /* if frame is the end of a dummy, compute where the * beginning would be */ dummy_bottom = fip->frame - 4 - REGISTER_BYTES - CALL_DUMMY_LENGTH; - + /* check if the PC is in the stack, in a dummy frame */ - if (dummy_bottom <= fip->pc && fip->pc <= fip->frame) + if (dummy_bottom <= fip->pc && fip->pc <= fip->frame) { /* all regs were saved by push_call_dummy () */ adr = fip->frame; - for (i = 0; i < NUM_REGS; i++) + for (i = 0; i < NUM_REGS; i++) { adr -= REGISTER_RAW_SIZE (i); fsrp->regs[i] = adr; } return; } - + locals = i386_get_frame_setup (get_pc_function_start (fip->pc)); - - if (locals >= 0) + + if (locals >= 0) { adr = fip->frame - 4 - locals; - for (i = 0; i < 8; i++) + for (i = 0; i < 8; i++) { op = codestream_get (); if (op < 0x50 || op > 0x57) @@ -441,7 +441,7 @@ i386_frame_find_saved_regs (fip, fsrp) adr -= 4; } } - + fsrp->regs[PC_REGNUM] = fip->frame + 4; fsrp->regs[FP_REGNUM] = fip->frame; } @@ -458,20 +458,20 @@ i386_skip_prologue (pc) 0x5b, /* popl %ebx */ }; CORE_ADDR pos; - + if (i386_get_frame_setup (pc) < 0) return (pc); - - /* found valid frame setup - codestream now points to + + /* found valid frame setup - codestream now points to * start of push instructions for saving registers */ - + /* skip over register saves */ for (i = 0; i < 8; i++) { op = codestream_peek (); /* break if not pushl inst */ - if (op < 0x50 || op > 0x57) + if (op < 0x50 || op > 0x57) break; codestream_get (); } @@ -485,7 +485,7 @@ i386_skip_prologue (pc) This code is with the rest of the prologue (at the end of the function), so we have to skip it to get to the first real instruction at the start of the function. */ - + pos = codestream_tell (); for (i = 0; i < 6; i++) { @@ -517,15 +517,15 @@ i386_skip_prologue (pc) op = codestream_get (); } /* addl y,%ebx */ - if (delta > 0 && op == 0x81 && codestream_get () == 0xc3) + if (delta > 0 && op == 0x81 && codestream_get () == 0xc3) { pos += delta + 6; } } codestream_seek (pos); - + i386_follow_jump (); - + return (codestream_tell ()); } @@ -535,7 +535,7 @@ i386_push_dummy_frame () CORE_ADDR sp = read_register (SP_REGNUM); int regnum; char regbuf[MAX_REGISTER_RAW_SIZE]; - + sp = push_word (sp, read_register (PC_REGNUM)); sp = push_word (sp, read_register (FP_REGNUM)); write_register (FP_REGNUM, sp); @@ -556,11 +556,11 @@ i386_pop_frame () struct frame_saved_regs fsr; struct frame_info *fi; char regbuf[MAX_REGISTER_RAW_SIZE]; - + fi = get_frame_info (frame); fp = fi->frame; get_frame_saved_regs (fi, &fsr); - for (regnum = 0; regnum < NUM_REGS; regnum++) + for (regnum = 0; regnum < NUM_REGS; regnum++) { CORE_ADDR adr; adr = fsr.regs[regnum]; @@ -632,8 +632,8 @@ i386_extract_return_value(type, regbuf, valbuf) store_floating (valbuf, TYPE_LENGTH (type), d); } else - { - memcpy (valbuf, regbuf, TYPE_LENGTH (type)); + { + memcpy (valbuf, regbuf, TYPE_LENGTH (type)); } } #endif /* I386_AIX_TARGET */ diff --git a/gnu/usr.bin/gdb/gdb/ieee.h b/gnu/usr.bin/gdb/gdb/ieee.h index 077bb48..22cd140 100644 --- a/gnu/usr.bin/gdb/gdb/ieee.h +++ b/gnu/usr.bin/gdb/gdb/ieee.h @@ -38,7 +38,7 @@ typedef union ieee_w_variable { typedef enum ieee_record -{ +{ ieee_number_start_enum = 0x00, ieee_number_end_enum=0x7f, ieee_number_repeat_start_enum = 0x80, @@ -62,31 +62,31 @@ typedef enum ieee_record ieee_load_constant_bytes_enum = 0xed, ieee_load_with_relocation_enum = 0xe4, - ieee_variable_A_enum = 0xc1, - ieee_variable_B_enum = 0xc2, - ieee_variable_C_enum = 0xc3, - ieee_variable_D_enum = 0xc4, - ieee_variable_E_enum = 0xc5, - ieee_variable_F_enum = 0xc6, - ieee_variable_G_enum = 0xc7, - ieee_variable_H_enum = 0xc8, - ieee_variable_I_enum = 0xc9, - ieee_variable_J_enum = 0xca, - ieee_variable_K_enum = 0xcb, - ieee_variable_L_enum = 0xcc, - ieee_variable_M_enum = 0xcd, - ieee_variable_N_enum = 0xce, - ieee_variable_O_enum = 0xcf, - ieee_variable_P_enum = 0xd0, - ieee_variable_Q_enum = 0xd1, - ieee_variable_R_enum = 0xd2, - ieee_variable_S_enum = 0xd3, - ieee_variable_T_enum = 0xd4, - ieee_variable_U_enum = 0xd5, - ieee_variable_V_enum = 0xd6, - ieee_variable_W_enum = 0xd7, - ieee_variable_X_enum = 0xd8, - ieee_variable_Y_enum = 0xd9, + ieee_variable_A_enum = 0xc1, + ieee_variable_B_enum = 0xc2, + ieee_variable_C_enum = 0xc3, + ieee_variable_D_enum = 0xc4, + ieee_variable_E_enum = 0xc5, + ieee_variable_F_enum = 0xc6, + ieee_variable_G_enum = 0xc7, + ieee_variable_H_enum = 0xc8, + ieee_variable_I_enum = 0xc9, + ieee_variable_J_enum = 0xca, + ieee_variable_K_enum = 0xcb, + ieee_variable_L_enum = 0xcc, + ieee_variable_M_enum = 0xcd, + ieee_variable_N_enum = 0xce, + ieee_variable_O_enum = 0xcf, + ieee_variable_P_enum = 0xd0, + ieee_variable_Q_enum = 0xd1, + ieee_variable_R_enum = 0xd2, + ieee_variable_S_enum = 0xd3, + ieee_variable_T_enum = 0xd4, + ieee_variable_U_enum = 0xd5, + ieee_variable_V_enum = 0xd6, + ieee_variable_W_enum = 0xd7, + ieee_variable_X_enum = 0xd8, + ieee_variable_Y_enum = 0xd9, ieee_variable_Z_enum = 0xda, ieee_function_plus_enum = 0xa5, ieee_function_minus_enum = 0xa6, @@ -116,7 +116,7 @@ ieee_nn_record = 0xf0, ieee_weak_external_reference_enum= 0xf4, ieee_repeat_data_enum = 0xf7 } ieee_record_enum_type; - + typedef struct ieee_section { unsigned int section_index; diff --git a/gnu/usr.bin/gdb/gdb/infcmd.c b/gnu/usr.bin/gdb/gdb/infcmd.c index c89a159..d0404e1 100644 --- a/gnu/usr.bin/gdb/gdb/infcmd.c +++ b/gnu/usr.bin/gdb/gdb/infcmd.c @@ -38,7 +38,7 @@ continue_command PARAMS ((char *, int)); static void until_next_command PARAMS ((int)); -static void +static void until_command PARAMS ((char *, int)); static void @@ -638,7 +638,7 @@ until_next_command (from_tty) CORE_ADDR pc; struct symbol *func; struct symtab_and_line sal; - + clear_proceed_status (); frame = get_current_frame (); @@ -649,34 +649,34 @@ until_next_command (from_tty) pc = read_pc (); func = find_pc_function (pc); - + if (!func) { struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (pc); - + if (msymbol == NULL) error ("Execution is not within a known function."); - + step_range_start = SYMBOL_VALUE_ADDRESS (msymbol); step_range_end = pc; } else { sal = find_pc_line (pc, 0); - + step_range_start = BLOCK_START (SYMBOL_BLOCK_VALUE (func)); step_range_end = sal.end; } - + step_over_calls = 1; step_frame_address = FRAME_FP (frame); - + step_multi = 0; /* Only one call to proceed */ - + proceed ((CORE_ADDR) -1, TARGET_SIGNAL_DEFAULT, 1); } -static void +static void until_command (arg, from_tty) char *arg; int from_tty; @@ -752,7 +752,7 @@ finish_command (arg, from_tty) value_type = TYPE_TARGET_TYPE (SYMBOL_TYPE (function)); if (!value_type) fatal ("internal: finish_command: function has no target type"); - + if (TYPE_CODE (value_type) == TYPE_CODE_VOID) return; @@ -779,7 +779,7 @@ program_info (args, from_tty) { bpstat bs = stop_bpstat; int num = bpstat_num (&bs); - + if (!target_has_execution) { printf_filtered ("The program being debugged is not being run.\n"); @@ -866,7 +866,7 @@ set_environment_command (arg, from_tty) if (p != 0 && val != 0) { /* We have both a space and an equals. If the space is before the - equals, walk forward over the spaces til we see a nonspace + equals, walk forward over the spaces til we see a nonspace (possibly the equals). */ if (p > val) while (*val == ' ') @@ -973,7 +973,7 @@ const char * const reg_names[] = REGISTER_NAMES; is required, (eg, for MIPS or Pyramid 90x, which both have lots of regs), or there is an existing convention for showing all the registers, define the macro DO_REGISTERS_INFO(regnum, fp) - to provide that format. */ + to provide that format. */ #if !defined (DO_REGISTERS_INFO) @@ -1088,7 +1088,7 @@ registers_info (addr_exp, fpregs) } do - { + { if (addr_exp[0] == '$') addr_exp++; end = addr_exp; @@ -1239,13 +1239,13 @@ void _initialize_infcmd () { struct cmd_list_element *c; - + add_com ("tty", class_run, tty_command, "Set terminal for future runs of program being debugged."); add_show_from_set (add_set_cmd ("args", class_run, var_string_noescape, (char *)&inferior_args, - + "Set arguments to give program being debugged when it is started.\n\ Follow this command with any number of args, to be passed to the program.", &setlist), @@ -1262,7 +1262,7 @@ environment to be given to the program.", &showlist); add_prefix_cmd ("unset", no_class, unset_command, "Complement to certain \"set\" commands", &unsetlist, "unset ", 0, &cmdlist); - + c = add_cmd ("environment", class_run, unset_environment_command, "Cancel environment variable VAR for the program.\n\ This does not affect the program until the next \"run\" command.", @@ -1276,7 +1276,7 @@ VALUES of environment variables are uninterpreted strings.\n\ This does not affect the program until the next \"run\" command.", &setlist); c->completer = noop_completer; - + add_com ("path", class_files, path_command, "Add directory DIR(s) to beginning of search path for object files.\n\ $cwd in the path means the current working directory.\n\ @@ -1341,7 +1341,7 @@ Argument N means do this N times (or till program stops for another reason)."); or a specified line or address or function (same args as break command).\n\ Execution will also stop upon exit from the current stack frame."); add_com_alias ("u", "until", class_run, 1); - + add_com ("jump", class_run, jump_command, "Continue program being debugged at specified line or address.\n\ Give as argument either LINENUM or *ADDR, where ADDR is an expression\n\ diff --git a/gnu/usr.bin/gdb/gdb/inferior.h b/gnu/usr.bin/gdb/gdb/inferior.h index 9754bb4..6fd94a6 100644 --- a/gnu/usr.bin/gdb/gdb/inferior.h +++ b/gnu/usr.bin/gdb/gdb/inferior.h @@ -168,7 +168,7 @@ store_inferior_registers PARAMS ((int)); extern void fetch_inferior_registers PARAMS ((int)); -extern void +extern void solib_create_inferior_hook PARAMS ((void)); extern void diff --git a/gnu/usr.bin/gdb/gdb/inflow.c b/gnu/usr.bin/gdb/gdb/inflow.c index 18006ab..fc937da 100644 --- a/gnu/usr.bin/gdb/gdb/inflow.c +++ b/gnu/usr.bin/gdb/gdb/inflow.c @@ -404,7 +404,7 @@ child_terminal_info (args, from_tty) /* First the fcntl flags. */ { int flags; - + flags = tflags_inferior; printf_filtered ("File descriptor flags = "); @@ -422,11 +422,11 @@ child_terminal_info (args, from_tty) flags &= ~(O_ACCMODE); #ifdef O_NONBLOCK - if (flags & O_NONBLOCK) + if (flags & O_NONBLOCK) printf_filtered (" | O_NONBLOCK"); flags &= ~O_NONBLOCK; #endif - + #if defined (O_NDELAY) /* If O_NDELAY and O_NONBLOCK are defined to the same thing, we will print it as O_NONBLOCK, which is good cause that is what POSIX @@ -608,7 +608,7 @@ set_sigio_trap () if (target_activity_function) { old_sigio = (void (*) ()) signal (SIGIO, handle_sigio); - fcntl (target_activity_fd, F_SETOWN, getpid()); + fcntl (target_activity_fd, F_SETOWN, getpid()); old_fcntl_flags = fcntl (target_activity_fd, F_GETFL, 0); fcntl (target_activity_fd, F_SETFL, old_fcntl_flags | FASYNC); } diff --git a/gnu/usr.bin/gdb/gdb/infptrace.c b/gnu/usr.bin/gdb/gdb/infptrace.c index cb3fd14..36a4b4c 100644 --- a/gnu/usr.bin/gdb/gdb/infptrace.c +++ b/gnu/usr.bin/gdb/gdb/infptrace.c @@ -81,8 +81,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #endif /* !FETCH_INFERIOR_REGISTERS */ -/* This function simply calls ptrace with the given arguments. - It exists so that all calls to ptrace are isolated in this +/* This function simply calls ptrace with the given arguments. + It exists so that all calls to ptrace are isolated in this machine-dependent file. */ int call_ptrace (request, pid, addr, data) @@ -416,7 +416,7 @@ store_inferior_registers (regno) /* Copy LEN bytes to or from inferior's memory starting at MEMADDR to debugger memory starting at MYADDR. Copy to inferior if WRITE is nonzero. - + Returns the length copied, which is either the LEN argument or zero. This xfer function does not do partial moves, since child_ops doesn't allow memory operations to cross below us in the target stack diff --git a/gnu/usr.bin/gdb/gdb/infrun.c b/gnu/usr.bin/gdb/gdb/infrun.c index 4fc8b1f..b07b1fe 100644 --- a/gnu/usr.bin/gdb/gdb/infrun.c +++ b/gnu/usr.bin/gdb/gdb/infrun.c @@ -296,7 +296,7 @@ proceed (addr, siggnal, step) #ifdef PREPARE_TO_PROCEED /* In a multi-threaded task we may select another thread and then continue. - + In this case the thread that stopped at a breakpoint will immediately cause another stop, if it is not stepped over first. On the other hand, if (ADDR != -1) we only want to single step over the breakpoint if we did @@ -506,7 +506,7 @@ wait_for_inferior () target_terminal_ours (); /* Must do this before mourn anyway */ annotate_exited (w.value.integer); if (w.value.integer) - printf_filtered ("\nProgram exited with code 0%o.\n", + printf_filtered ("\nProgram exited with code 0%o.\n", (unsigned int)w.value.integer); else printf_filtered ("\nProgram exited normally.\n"); @@ -653,7 +653,7 @@ wait_for_inferior () if (one_stepped) single_step (0); /* This actually cleans up the ss */ #endif /* NO_SINGLE_STEP */ - + /* If PC is pointing at a nullified instruction, then step beyond it so that the user won't be confused when GDB appears to be ready to execute it. */ @@ -669,7 +669,7 @@ wait_for_inferior () #ifdef HAVE_STEPPABLE_WATCHPOINT /* It may not be necessary to disable the watchpoint to stop over - it. For example, the PA can (with some kernel cooperation) + it. For example, the PA can (with some kernel cooperation) single step over a watchpoint without disabling the watchpoint. */ if (STOPPED_BY_WATCHPOINT (w)) { @@ -723,7 +723,7 @@ wait_for_inferior () random_signal = 0; stopped_by_random_signal = 0; breakpoints_failed = 0; - + /* Look at the cause of the stop, and decide what to do. The alternatives are: 1) break; to really stop and return to the debugger, @@ -731,14 +731,14 @@ wait_for_inferior () (set another_trap to 1 to single step once) 3) set random_signal to 1, and the decision between 1 and 2 will be made according to the signal handling tables. */ - + /* First, distinguish signals caused by the debugger from signals that have to do with the program's own actions. Note that breakpoint insns may cause SIGTRAP or SIGILL or SIGEMT, depending on the operating system version. Here we detect when a SIGILL or SIGEMT is really a breakpoint and change it to SIGTRAP. */ - + if (stop_signal == TARGET_SIGNAL_TRAP || (breakpoints_inserted && (stop_signal == TARGET_SIGNAL_ILL @@ -820,9 +820,9 @@ wait_for_inferior () { /* Signal not for debugging purposes. */ int printed = 0; - + stopped_by_random_signal = 1; - + if (signal_print[stop_signal]) { printed = 1; @@ -1195,7 +1195,7 @@ step_over_function: { /* Set a special breakpoint after the return */ struct symtab_and_line sr_sal; - sr_sal.pc = + sr_sal.pc = ADDR_BITS_REMOVE (SAVED_PC_AFTER_CALL (get_current_frame ())); sr_sal.symtab = NULL; @@ -1299,7 +1299,7 @@ step_into_function: Optimize by setting the stepping range to the line. (We might not be in the original line, but if we entered a - new line in mid-statement, we continue stepping. This makes + new line in mid-statement, we continue stepping. This makes things like for(;;) statements work better.) */ if (stop_func_end && sal.end >= stop_func_end) @@ -1419,7 +1419,7 @@ step_into_function: (this is only used on the 88k). */ if (!bpstat_explains_signal (stop_bpstat) - && (stop_signal != TARGET_SIGNAL_CHLD) + && (stop_signal != TARGET_SIGNAL_CHLD) && !stopped_by_random_signal) SHIFT_INST_REGS(); #endif /* SHIFT_INST_REGS */ @@ -1459,7 +1459,7 @@ normal_stop () DECR_PC_AFTER_BREAK */ if (target_has_execution && get_current_frame()) (get_current_frame ())->pc = read_pc (); - + if (breakpoints_failed) { target_terminal_ours_for_output (); @@ -1859,7 +1859,7 @@ save_inferior_status (inf_status, restore_stack_info) inf_status->step_over_calls = step_over_calls; inf_status->stop_after_trap = stop_after_trap; inf_status->stop_soon_quietly = stop_soon_quietly; - /* Save original bpstat chain here; replace it with copy of chain. + /* Save original bpstat chain here; replace it with copy of chain. If caller's caller is walking the chain, they'll be happier if we hand them back the original chain when restore_i_s is called. */ inf_status->stop_bpstat = stop_bpstat; @@ -1867,7 +1867,7 @@ save_inferior_status (inf_status, restore_stack_info) inf_status->breakpoint_proceeded = breakpoint_proceeded; inf_status->restore_stack_info = restore_stack_info; inf_status->proceed_to_finish = proceed_to_finish; - + memcpy (inf_status->stop_registers, stop_registers, REGISTER_BYTES); read_register_bytes (0, inf_status->registers, REGISTER_BYTES); @@ -2001,7 +2001,7 @@ This allows you to set a list of commands to be run each time execution\n\ of the program stops.", &cmdlist); numsigs = (int)TARGET_SIGNAL_LAST; - signal_stop = (unsigned char *) + signal_stop = (unsigned char *) xmalloc (sizeof (signal_stop[0]) * numsigs); signal_print = (unsigned char *) xmalloc (sizeof (signal_print[0]) * numsigs); diff --git a/gnu/usr.bin/gdb/gdb/kcorelow.c b/gnu/usr.bin/gdb/gdb/kcorelow.c index ccf27c9..e08c486 100644 --- a/gnu/usr.bin/gdb/gdb/kcorelow.c +++ b/gnu/usr.bin/gdb/gdb/kcorelow.c @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: kcorelow.c,v 1.1.1.1 1995/04/23 18:35:48 garyj Exp $ + $Id: kcorelow.c,v 1.3 1995/04/26 01:01:09 jkh Exp $ */ #include "defs.h" @@ -196,7 +196,7 @@ kcore_open (filename, from_tty) /* print out the panic string if there is one */ if (kvread(ksym_lookup("panicstr"), &addr) == 0 && - addr != 0 && + addr != 0 && target_read_memory(addr, buf, sizeof(buf)) == 0) { for (cp = buf; cp < &buf[sizeof(buf)] && *cp; cp++) @@ -338,7 +338,7 @@ struct target_ops kcore_ops = { "Use a core file as a target. Specify the filename of the core file.", kcore_open, kcore_close, find_default_attach, kcore_detach, 0, 0, /* resume, wait */ - get_kcore_registers, + get_kcore_registers, 0, 0, /* store_regs, prepare_to_store */ xfer_kmem, kcore_files_info, ignore, ignore, /* core_insert_breakpoint, core_remove_breakpoint, */ diff --git a/gnu/usr.bin/gdb/gdb/language.c b/gnu/usr.bin/gdb/gdb/language.c index 4a3b6a0..6d254fb 100644 --- a/gnu/usr.bin/gdb/gdb/language.c +++ b/gnu/usr.bin/gdb/gdb/language.c @@ -86,7 +86,7 @@ set_type_range PARAMS ((void)); /* Forward declaration */ extern const struct language_defn unknown_language_defn; extern char *warning_pre_print; - + /* The current (default at startup) state of type and range checking. (If the modes are set to "auto", though, these are changed based on the default language at startup, and then again based on the @@ -196,7 +196,7 @@ set_language_command (ignore, from_tty) } } - /* Reset the language (esp. the global string "language") to the + /* Reset the language (esp. the global string "language") to the correct values. */ err_lang=savestring(language,strlen(language)); make_cleanup (free, err_lang); /* Free it after error */ diff --git a/gnu/usr.bin/gdb/gdb/language.h b/gnu/usr.bin/gdb/gdb/language.h index a4ec6fb..202d606 100644 --- a/gnu/usr.bin/gdb/gdb/language.h +++ b/gnu/usr.bin/gdb/gdb/language.h @@ -99,7 +99,7 @@ struct language_format_info struct language_defn { /* Name of the language */ - + char *la_name; /* its symtab language-enum (defs.h) */ @@ -122,7 +122,7 @@ struct language_defn enum type_check la_type_check; /* Parser function. */ - + int (*la_parser) PARAMS((void)); /* Parser error function */ @@ -206,7 +206,7 @@ extern const struct language_defn *current_language; extern const struct language_defn *expected_language; -/* language_mode == +/* language_mode == language_mode_auto: current_language automatically set upon selection of scope (e.g. stack frame) language_mode_manual: current_language set only by user. */ @@ -214,7 +214,7 @@ extern const struct language_defn *expected_language; extern enum language_mode {language_mode_auto, language_mode_manual} language_mode; -/* These macros define the behaviour of the expression +/* These macros define the behaviour of the expression evaluator. */ /* Should we strictly type check expressions? */ diff --git a/gnu/usr.bin/gdb/gdb/m2-lang.c b/gnu/usr.bin/gdb/gdb/m2-lang.c index c12b7dd..6e15d30 100644 --- a/gnu/usr.bin/gdb/gdb/m2-lang.c +++ b/gnu/usr.bin/gdb/gdb/m2-lang.c @@ -383,7 +383,7 @@ struct type *builtin_type_m2_card; struct type *builtin_type_m2_real; struct type *builtin_type_m2_bool; -struct type ** const (m2_builtin_types[]) = +struct type ** const (m2_builtin_types[]) = { &builtin_type_m2_char, &builtin_type_m2_int, diff --git a/gnu/usr.bin/gdb/gdb/main.c b/gnu/usr.bin/gdb/gdb/main.c index 8445b3a..cd434e5 100644 --- a/gnu/usr.bin/gdb/gdb/main.c +++ b/gnu/usr.bin/gdb/gdb/main.c @@ -87,7 +87,7 @@ main (argc, argv) int dirsize; /* Number of elements used. */ int ndir; - + struct stat homebuf, cwdbuf; char *homedir, *homeinit; @@ -370,7 +370,7 @@ For more information, type \"help\" from within GDB, or consult the\n\ GDB manual (available as on-line info or a printed manual).\n", gdb_stdout); exit (0); } - + if (!quiet) { /* Print all the junk at the top, with trailing "..." if we are about @@ -410,15 +410,15 @@ GDB manual (available as on-line info or a printed manual).\n", gdb_stdout); need them if homedir is set. Make sure that they are zero in case one of them fails (this guarantees that they won't match if either exists). */ - + memset (&homebuf, 0, sizeof (struct stat)); memset (&cwdbuf, 0, sizeof (struct stat)); - + stat (homeinit, &homebuf); stat (gdbinit, &cwdbuf); /* We'll only need this if homedir was set. */ } - + /* Now perform all the actions indicated by the arguments. */ if (cdarg != NULL) { @@ -488,7 +488,7 @@ GDB manual (available as on-line info or a printed manual).\n", gdb_stdout); /* Read the .gdbinit file in the current directory, *if* it isn't the same as the $HOME/.gdbinit file (it should exist, also). */ - + if (!homedir || memcmp ((char *) &homebuf, (char *) &cwdbuf, sizeof (struct stat))) if (!inhibit_gdbinit && access (gdbinit, R_OK) == 0) diff --git a/gnu/usr.bin/gdb/gdb/mdebugread.c b/gnu/usr.bin/gdb/gdb/mdebugread.c index 8c31457..9c1309f 100644 --- a/gnu/usr.bin/gdb/gdb/mdebugread.c +++ b/gnu/usr.bin/gdb/gdb/mdebugread.c @@ -1616,7 +1616,7 @@ parse_type (fd, ax, aux_index, bs, bigend, sym_name) /* Complain for illegal continuations due to corrupt aux entries. */ if (t->continued) complain (&bad_continued_complaint, sym_name); - + return tp; } @@ -1770,7 +1770,7 @@ parse_procedure (pr, search_symtab, first_off, pst) { /* external */ EXTR she; - + (*debug_swap->swap_ext_in) (cur_bfd, ((char *) debug_info->external_ext + (pr->isym @@ -1878,7 +1878,7 @@ ecoff_relocate_efi (sym, delta) struct mips_extra_func_info *e; e = (struct mips_extra_func_info *) SYMBOL_VALUE (sym); - + e->pdr.adr += delta; } @@ -2394,7 +2394,7 @@ parse_partial_symbols (objfile, section_offsets) { long procaddr; long isym; - + sh.value += ANOFFSET (section_offsets, SECT_OFF_TEXT); if (sh.st == stStaticProc) { diff --git a/gnu/usr.bin/gdb/gdb/mem-break.c b/gnu/usr.bin/gdb/gdb/mem-break.c index 74dfaa1..2c7ba1f 100644 --- a/gnu/usr.bin/gdb/gdb/mem-break.c +++ b/gnu/usr.bin/gdb/gdb/mem-break.c @@ -41,7 +41,7 @@ static unsigned char check_break_insn_size[BREAKPOINT_MAX] = BREAKPOINT; /* Insert a breakpoint on targets that don't have any better breakpoint support. We read the contents of the target location and stash it, then overwrite it with a breakpoint instruction. ADDR is the target - location in the target machine. CONTENTS_CACHE is a pointer to + location in the target machine. CONTENTS_CACHE is a pointer to memory allocated for saving the target contents. It is guaranteed by the caller to be long enough to save sizeof BREAKPOINT bytes (this is accomplished via BREAKPOINT_MAX). */ diff --git a/gnu/usr.bin/gdb/gdb/minsyms.c b/gnu/usr.bin/gdb/gdb/minsyms.c index fde97e9..743ba83 100644 --- a/gnu/usr.bin/gdb/gdb/minsyms.c +++ b/gnu/usr.bin/gdb/gdb/minsyms.c @@ -30,7 +30,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ In many cases, even if a file was compiled with no special options for debugging at all, as long as was not stripped it will contain sufficient information to build useful minimal symbol tables using this structure. - + Even when a file contains enough debugging information to build a full symbol table, these minimal symbols are still useful for quickly mapping between names and addresses, and vice versa. They are also sometimes used @@ -249,7 +249,7 @@ lookup_minimal_symbol_by_pc (pc) if (hi >= 0 && ((best_symbol == NULL) || - (SYMBOL_VALUE_ADDRESS (best_symbol) < + (SYMBOL_VALUE_ADDRESS (best_symbol) < SYMBOL_VALUE_ADDRESS (&msymbol[hi])))) { best_symbol = &msymbol[hi]; @@ -458,7 +458,7 @@ compact_minimal_symbols (msymbol, mcount) copyfrom = copyto = msymbol; while (copyfrom < msymbol + mcount - 1) { - if (SYMBOL_VALUE_ADDRESS (copyfrom) == + if (SYMBOL_VALUE_ADDRESS (copyfrom) == SYMBOL_VALUE_ADDRESS ((copyfrom + 1)) && (STREQ (SYMBOL_NAME (copyfrom), SYMBOL_NAME ((copyfrom + 1))))) { @@ -529,7 +529,7 @@ install_minimal_symbols (objfile) /* Copy in the existing minimal symbols, if there are any. */ if (objfile->minimal_symbol_count) - memcpy ((char *)msymbols, (char *)objfile->msymbols, + memcpy ((char *)msymbols, (char *)objfile->msymbols, objfile->minimal_symbol_count * sizeof (struct minimal_symbol)); /* Walk through the list of minimal symbol bunches, adding each symbol @@ -537,10 +537,10 @@ install_minimal_symbols (objfile) current, possibly partially filled bunch (thus we use the current msym_bunch_index for the first bunch we copy over), and thereafter each bunch is full. */ - + mcount = objfile->minimal_symbol_count; leading_char = bfd_get_symbol_leading_char (objfile->obfd); - + for (bunch = msym_bunch; bunch != NULL; bunch = bunch -> next) { for (bindex = 0; bindex < msym_bunch_index; bindex++, mcount++) @@ -556,13 +556,13 @@ install_minimal_symbols (objfile) } /* Sort the minimal symbols by address. */ - + qsort (msymbols, mcount, sizeof (struct minimal_symbol), compare_minimal_symbols); - + /* Compact out any duplicates, and free up whatever space we are no longer using. */ - + mcount = compact_minimal_symbols (msymbols, mcount); obstack_blank (&objfile->symbol_obstack, diff --git a/gnu/usr.bin/gdb/gdb/nlmread.c b/gnu/usr.bin/gdb/gdb/nlmread.c index 7ba977a..b2ebbe0 100644 --- a/gnu/usr.bin/gdb/gdb/nlmread.c +++ b/gnu/usr.bin/gdb/gdb/nlmread.c @@ -127,7 +127,7 @@ nlm_symtab_read (abfd, addr, objfile) struct cleanup *back_to; CORE_ADDR symaddr; enum minimal_symbol_type ms_type; - + storage_needed = bfd_get_symtab_upper_bound (abfd); if (storage_needed < 0) error ("Can't read symbols from %s: %s", bfd_get_filename (abfd), @@ -136,11 +136,11 @@ nlm_symtab_read (abfd, addr, objfile) { symbol_table = (asymbol **) xmalloc (storage_needed); back_to = make_cleanup (free, symbol_table); - number_of_symbols = bfd_canonicalize_symtab (abfd, symbol_table); + number_of_symbols = bfd_canonicalize_symtab (abfd, symbol_table); if (number_of_symbols < 0) error ("Can't read symbols from %s: %s", bfd_get_filename (abfd), bfd_errmsg (bfd_get_error ())); - + for (i = 0; i < number_of_symbols; i++) { sym = symbol_table[i]; @@ -172,7 +172,7 @@ nlm_symtab_read (abfd, addr, objfile) /* Scan and build partial symbols for a symbol file. - We have been initialized by a call to nlm_symfile_init, which + We have been initialized by a call to nlm_symfile_init, which currently does nothing. SECTION_OFFSETS is a set of offsets to apply to relocate the symbols @@ -283,7 +283,7 @@ nlm_symfile_offsets (objfile, addr) { ANOFFSET (section_offsets, i) = addr; } - + return (section_offsets); } diff --git a/gnu/usr.bin/gdb/gdb/objfiles.c b/gnu/usr.bin/gdb/gdb/objfiles.c index 5e9e354..8ec08a2 100644 --- a/gnu/usr.bin/gdb/gdb/objfiles.c +++ b/gnu/usr.bin/gdb/gdb/objfiles.c @@ -62,7 +62,7 @@ struct objfile *symfile_objfile; /* Main symbol table loaded from */ int mapped_symbol_files; /* Try to use mapped symbol files */ -/* Locate all mappable sections of a BFD file. +/* Locate all mappable sections of a BFD file. objfile_p_char is a char * to get it through bfd_map_over_sections; we cast it back to its proper type. */ @@ -253,7 +253,7 @@ allocate_objfile (abfd, mapped) if (build_objfile_section_table (objfile)) { - error ("Can't find the file sections in `%s': %s", + error ("Can't find the file sections in `%s': %s", objfile -> name, bfd_errmsg (bfd_get_error ())); } @@ -286,7 +286,7 @@ unlink_objfile (objfile) for (objpp = &object_files; *objpp != NULL; objpp = &((*objpp) -> next)) { - if (*objpp == objfile) + if (*objpp == objfile) { *objpp = (*objpp) -> next; objfile -> next = NULL; @@ -347,7 +347,7 @@ free_objfile (objfile) symbol table was blown away. How much still needs to be done is unknown, but we play it safe for now and keep each action until it is shown to be no longer needed. */ - + #if defined (CLEAR_SOLIB) CLEAR_SOLIB (); /* CLEAR_SOLIB closes the bfd's for any shared libraries. But @@ -455,7 +455,7 @@ objfile_relocate (objfile, new_offsets) struct linetable *l; struct blockvector *bv; int i; - + /* First the line table. */ l = LINETABLE (s); if (l) @@ -473,7 +473,7 @@ objfile_relocate (objfile, new_offsets) { struct block *b; int j; - + b = BLOCKVECTOR_BLOCK (bv, i); BLOCK_START (b) += ANOFFSET (delta, s->block_line_section); BLOCK_END (b) += ANOFFSET (delta, s->block_line_section); @@ -837,7 +837,7 @@ find_pc_section(pc) { struct obj_section *s; struct objfile *objfile; - + ALL_OBJFILES (objfile) for (s = objfile->sections; s < objfile->sections_end; ++s) if (s->addr <= pc @@ -847,7 +847,7 @@ find_pc_section(pc) return(NULL); } -/* In SVR4, we recognize a trampoline by it's section name. +/* In SVR4, we recognize a trampoline by it's section name. That is, if the pc is in a section named ".plt" then we are in a trampoline. */ @@ -858,9 +858,9 @@ in_plt_section(pc, name) { struct obj_section *s; int retval = 0; - + s = find_pc_section(pc); - + retval = (s != NULL && s->the_bfd_section->name != NULL && STREQ (s->the_bfd_section->name, ".plt")); diff --git a/gnu/usr.bin/gdb/gdb/objfiles.h b/gnu/usr.bin/gdb/gdb/objfiles.h index f7cd113..b1aa8c9 100644 --- a/gnu/usr.bin/gdb/gdb/objfiles.h +++ b/gnu/usr.bin/gdb/gdb/objfiles.h @@ -52,7 +52,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ process startup code. Since we have no guarantee that the linked in startup modules have any debugging information that gdb can use, we need to avoid following frame pointers back into frames that might - have been built in the startup code, as we might get hopelessly + have been built in the startup code, as we might get hopelessly confused. However, we almost always have debugging information available for main(). @@ -86,7 +86,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ struct entry_info { - + /* The value we should use for this objects entry point. The illegal/unknown value needs to be something other than 0, ~0 for instance, which is much less likely than 0. */ @@ -103,7 +103,7 @@ struct entry_info /* Start (inclusive) and end (exclusive) of object file containing the entry point. */ - + CORE_ADDR entry_file_lowpc; CORE_ADDR entry_file_highpc; diff --git a/gnu/usr.bin/gdb/gdb/obstack.h b/gnu/usr.bin/gdb/gdb/obstack.h index 28061a0..59ceace5 100644 --- a/gnu/usr.bin/gdb/gdb/obstack.h +++ b/gnu/usr.bin/gdb/gdb/obstack.h @@ -328,7 +328,7 @@ __extension__ \ /* These assume that the obstack alignment is good enough for pointers or ints, and that the data added so far to the current object shares that much alignment. */ - + #define obstack_ptr_grow(OBSTACK,datum) \ __extension__ \ ({ struct obstack *__o = (OBSTACK); \ diff --git a/gnu/usr.bin/gdb/gdb/parse.c b/gnu/usr.bin/gdb/gdb/parse.c index 8c387c8..5fb0683 100644 --- a/gnu/usr.bin/gdb/gdb/parse.c +++ b/gnu/usr.bin/gdb/gdb/parse.c @@ -27,7 +27,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ What is important here is that it can be built up sequentially during the process of parsing; the lower levels of the tree always come first in the result. */ - + #include "defs.h" #include <string.h> #include "symtab.h" @@ -76,7 +76,7 @@ struct funcall static struct funcall *funcall_chain; -/* Assign machine-independent names to certain registers +/* Assign machine-independent names to certain registers (unless overridden by the REGISTER_NAMES table) */ #ifdef NO_STD_REGS @@ -253,7 +253,7 @@ write_exp_elt_intern (expelt) constant itself into however many expression elements are needed to hold it, and then writing another expression element that contains the length of the string. I.E. an expression element at each end of - the string records the string length, so you can skip over the + the string records the string length, so you can skip over the expression elements containing the actual string bytes from either end of the string. Note that this also allows gdb to handle strings with embedded null bytes, as is required for some languages. @@ -786,7 +786,7 @@ parse_expression (string) /* Stuff for maintaining a stack of types. Currently just used by C, but probably useful for any language which declares its types "backwards". */ -void +void push_type (tp) enum type_pieces tp; { @@ -812,7 +812,7 @@ push_type_int (n) type_stack[type_stack_depth++].int_val = n; } -enum type_pieces +enum type_pieces pop_type () { if (type_stack_depth) diff --git a/gnu/usr.bin/gdb/gdb/parser-defs.h b/gnu/usr.bin/gdb/gdb/parser-defs.h index fd03a6e..67ba0c3 100644 --- a/gnu/usr.bin/gdb/gdb/parser-defs.h +++ b/gnu/usr.bin/gdb/gdb/parser-defs.h @@ -119,13 +119,13 @@ end_arglist PARAMS ((void)); extern char * copy_name PARAMS ((struct stoken)); -extern void +extern void push_type PARAMS ((enum type_pieces)); extern void push_type_int PARAMS ((int)); -extern enum type_pieces +extern enum type_pieces pop_type PARAMS ((void)); extern int diff --git a/gnu/usr.bin/gdb/gdb/partial-stab.h b/gnu/usr.bin/gdb/gdb/partial-stab.h index 747e6a5..2f15423 100644 --- a/gnu/usr.bin/gdb/gdb/partial-stab.h +++ b/gnu/usr.bin/gdb/gdb/partial-stab.h @@ -275,11 +275,11 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ { enum language tmp_language; /* Mark down an include file in the current psymtab */ - + SET_NAMESTRING(); - + tmp_language = deduce_language_from_filename (namestring); - + /* Only change the psymtab's language if we've learned something useful (eg. tmp_language is not language_unknown). In addition, to match what start_subfile does, never change @@ -288,13 +288,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ && (tmp_language != language_c || psymtab_language != language_cplus)) psymtab_language = tmp_language; - + /* In C++, one may expect the same filename to come round many times, when code is coming alternately from the main file and from inline functions in other files. So I check to see if this is a file we've seen before -- either the main source file, or a previously included file. - + This seems to be a lot of time to be spending on N_SOL, but things like "break c-exp.y:435" need to work (I suppose the psymtab_include_list could be hashed or put @@ -306,22 +306,22 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ for (i = 0; i < includes_used; i++) if (STREQ (namestring, psymtab_include_list[i])) { - i = -1; + i = -1; break; } if (i == -1) continue; } - + #ifdef DBXREAD_ONLY record_include_file: #endif - + psymtab_include_list[includes_used++] = namestring; if (includes_used >= includes_allocated) { char **orig = psymtab_include_list; - + psymtab_include_list = (char **) alloca ((includes_allocated *= 2) * sizeof (char *)); diff --git a/gnu/usr.bin/gdb/gdb/printcmd.c b/gnu/usr.bin/gdb/gdb/printcmd.c index 8ebc94c..1f81bc9 100644 --- a/gnu/usr.bin/gdb/gdb/printcmd.c +++ b/gnu/usr.bin/gdb/gdb/printcmd.c @@ -931,7 +931,7 @@ address_info (exp, from_tty) if (exp == 0) error ("Argument required."); - sym = lookup_symbol (exp, get_selected_block (), VAR_NAMESPACE, + sym = lookup_symbol (exp, get_selected_block (), VAR_NAMESPACE, &is_a_field_of_this, (struct symtab **)NULL); if (sym == NULL) { @@ -1036,7 +1036,7 @@ address_info (exp, from_tty) case LOC_OPTIMIZED_OUT: printf_filtered ("optimized out"); break; - + default: printf_filtered ("of unknown (botched) type"); break; @@ -1104,7 +1104,7 @@ x_command (exp, from_tty) value_from_longest ( lookup_pointer_type (VALUE_TYPE (last_examine_value)), (LONGEST) last_examine_address)); - + /* Make contents of last address examined available to the user as $__.*/ set_internalvar (lookup_internalvar ("__"), last_examine_value); } @@ -1258,7 +1258,7 @@ undisplay_command (args, from_tty) dont_repeat (); } -/* Display a single auto-display. +/* Display a single auto-display. Do nothing if the display cannot be printed in the current context, or if the display is disabled. */ @@ -1307,7 +1307,7 @@ do_one_display (d) printf_filtered ("\n"); else printf_filtered (" "); - + addr = value_as_pointer (evaluate_expression (d->exp)); if (d->format.format == 'i') addr = ADDR_BITS_REMOVE (addr); @@ -1372,7 +1372,7 @@ disable_display (num) } printf_unfiltered ("No display number %d.\n", num); } - + void disable_current_display () { @@ -1437,9 +1437,9 @@ enable_display (args, from_tty) p1++; if (*p1 && *p1 != ' ' && *p1 != '\t') error ("Arguments must be display numbers."); - + num = atoi (p); - + for (d = display_chain; d; d = d->next) if (d->number == num) { @@ -1477,7 +1477,7 @@ disable_display_command (args, from_tty) p1++; if (*p1 && *p1 != ' ' && *p1 != '\t') error ("Arguments must be display numbers."); - + disable_display (atoi (p)); p = p1; @@ -1550,7 +1550,7 @@ print_frame_args (func, fi, num, stream) long current_offset = SYMBOL_VALUE (sym); arg_size = TYPE_LENGTH (SYMBOL_TYPE (sym)); - + /* Compute address of next argument by adding the size of this argument and rounding to an int boundary. */ current_offset @@ -1851,7 +1851,7 @@ printf_command (arg, from_tty) if (*f++ == '%') { lcount = 0; - while (strchr ("0123456789.hlL-+ #", *f)) + while (strchr ("0123456789.hlL-+ #", *f)) { if (*f == 'l' || *f == 'L') lcount++; @@ -1909,10 +1909,10 @@ printf_command (arg, from_tty) * sizeof (value_ptr)); s1 = s; val_args[nargs] = parse_to_comma_and_eval (&s1); - + /* If format string wants a float, unchecked-convert the value to floating point of the same size */ - + if (argclass[nargs] == double_arg) { if (TYPE_LENGTH (VALUE_TYPE (val_args[nargs])) == sizeof (float)) @@ -1925,7 +1925,7 @@ printf_command (arg, from_tty) if (*s == ',') s++; } - + if (nargs != nargs_wanted) error ("Wrong number of arguments for specified format-string"); @@ -2099,7 +2099,7 @@ Two arguments are taken as a range of memory to dump."); add_com ("whereis", class_vars, whereis_command, "Print line number and file of definition of variable."); #endif - + add_info ("display", display_info, "Expressions to display when program stops, with code numbers."); @@ -2120,19 +2120,19 @@ and examining is done as in the \"x\" command.\n\n\ With no argument, display all currently requested auto-display expressions.\n\ Use \"undisplay\" to cancel display requests previously made."); - add_cmd ("display", class_vars, enable_display, + add_cmd ("display", class_vars, enable_display, "Enable some expressions to be displayed when program stops.\n\ Arguments are the code numbers of the expressions to resume displaying.\n\ No argument means enable all automatic-display expressions.\n\ Do \"info display\" to see current list of code numbers.", &enablelist); - add_cmd ("display", class_vars, disable_display_command, + add_cmd ("display", class_vars, disable_display_command, "Disable some expressions to be displayed when program stops.\n\ Arguments are the code numbers of the expressions to stop displaying.\n\ No argument means disable all automatic-display expressions.\n\ Do \"info display\" to see current list of code numbers.", &disablelist); - add_cmd ("display", class_vars, undisplay_command, + add_cmd ("display", class_vars, undisplay_command, "Cancel some expressions to be displayed when program stops.\n\ Arguments are the code numbers of the expressions to stop displaying.\n\ No argument means cancel all automatic-display expressions.\n\ diff --git a/gnu/usr.bin/gdb/gdb/remote-utils.c b/gnu/usr.bin/gdb/gdb/remote-utils.c index ba7d297..3f38d3e 100644 --- a/gnu/usr.bin/gdb/gdb/remote-utils.c +++ b/gnu/usr.bin/gdb/gdb/remote-utils.c @@ -30,7 +30,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ The second package is a collection of more or less generic functions for use by remote backends. They support user settable - variables for debugging, retries, and the like. + variables for debugging, retries, and the like. Todo: @@ -429,7 +429,7 @@ gr_detach(args, from_tty) { if (args) error ("Argument given to \"detach\" when remotely debugging."); - + if (sr_is_open()) gr_clear_all_breakpoints (); @@ -438,7 +438,7 @@ gr_detach(args, from_tty) puts_filtered ("Ending remote debugging.\n"); return; -} +} void gr_files_info (ops) diff --git a/gnu/usr.bin/gdb/gdb/remote-utils.h b/gnu/usr.bin/gdb/gdb/remote-utils.h index 9c344d8..d859330 100644 --- a/gnu/usr.bin/gdb/gdb/remote-utils.h +++ b/gnu/usr.bin/gdb/gdb/remote-utils.h @@ -137,6 +137,6 @@ void sr_write PARAMS((char *a, int l)); void sr_write_cr PARAMS((char *s)); void gr_open PARAMS((char *args, int from_tty, - struct gr_settings *gr_settings)); + struct gr_settings *gr_settings)); void gr_load_image PARAMS((char*, int from_tty)); #endif /* REMOTE_UTILS_H */ diff --git a/gnu/usr.bin/gdb/gdb/remote.c b/gnu/usr.bin/gdb/gdb/remote.c index 371b146..c340ca9 100644 --- a/gnu/usr.bin/gdb/gdb/remote.c +++ b/gnu/usr.bin/gdb/gdb/remote.c @@ -28,7 +28,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ '$' or '#'. If <data> starts with two characters followed by ':', then the existing stubs interpret this as a sequence number. - CSUM1 and CSUM2 are ascii hex representation of an 8-bit + CSUM1 and CSUM2 are ascii hex representation of an 8-bit checksum of <data>, the most significant nibble is sent first. the hex digits 0-9,a-f are used. @@ -170,7 +170,7 @@ static int remote_xfer_memory PARAMS ((CORE_ADDR memaddr, char *myaddr, int len, int should_write, struct target_ops *target)); -static void +static void remote_prepare_to_store PARAMS ((void)); static void @@ -412,7 +412,7 @@ device is attached to the remote system (e.g. /dev/ttya)."); /* Start the remote connection; if error (0), discard this target. In particular, if the user quits, be sure to discard it (we'd be in an inconsistent state otherwise). */ - if (!catch_errors (remote_start_remote, (char *)0, + if (!catch_errors (remote_start_remote, (char *)0, "Couldn't establish connection to remote target\n", RETURN_MASK_ALL)) pop_target(); } @@ -432,7 +432,7 @@ remote_detach (args, from_tty) { if (args) error ("Argument given to \"detach\" when remotely debugging."); - + pop_target (); if (from_tty) puts_filtered ("Ending remote debugging.\n"); @@ -498,7 +498,7 @@ remote_interrupt (signo) { /* If this doesn't work, try more severe steps. */ signal (signo, remote_interrupt_twice); - + if (remote_debug) printf_unfiltered ("remote_interrupt called\n"); @@ -513,7 +513,7 @@ remote_interrupt_twice (signo) int signo; { signal (signo, ofunc); - + interrupt_query (); signal (signo, remote_interrupt); @@ -708,7 +708,7 @@ remote_fetch_registers (regno) 'G' request), we have to read out the ones we don't want to change first. */ -static void +static void remote_prepare_to_store () { /* Make sure the entire registers array is valid. */ @@ -1386,7 +1386,7 @@ static unsigned char break_insn[] = BREAKPOINT; /* Insert a breakpoint on targets that don't have any better breakpoint support. We read the contents of the target location and stash it, then overwrite it with a breakpoint instruction. ADDR is the target - location in the target machine. CONTENTS_CACHE is a pointer to + location in the target machine. CONTENTS_CACHE is a pointer to memory allocated for saving the target contents. It is guaranteed by the caller to be long enough to save sizeof BREAKPOINT bytes (this is accomplished via BREAKPOINT_MAX). */ diff --git a/gnu/usr.bin/gdb/gdb/ser-unix.c b/gnu/usr.bin/gdb/gdb/ser-unix.c index 237384b..1e5e1a6 100644 --- a/gnu/usr.bin/gdb/gdb/ser-unix.c +++ b/gnu/usr.bin/gdb/gdb/ser-unix.c @@ -287,7 +287,7 @@ hardwire_flush_output (scb) #ifdef HAVE_SGTTY /* This flushes both input and output, but we can't do better. */ return ioctl (scb->fd, TIOCFLUSH, 0); -#endif +#endif } static int @@ -305,7 +305,7 @@ hardwire_flush_input (scb) #ifdef HAVE_SGTTY /* This flushes both input and output, but we can't do better. */ return ioctl (scb->fd, TIOCFLUSH, 0); -#endif +#endif } static int @@ -336,7 +336,7 @@ hardwire_send_break (scb) status = ioctl (scb->fd, TIOCCBRK, 0); return status; } -#endif +#endif } static void @@ -453,7 +453,7 @@ wait_for(scb, timeout) if (state.termios.c_cc[VTIME] != timeout * 10) { - /* If c_cc is an 8-bit signed character, we can't go + /* If c_cc is an 8-bit signed character, we can't go bigger than this. If it is always unsigned, we could use 25. */ @@ -477,7 +477,7 @@ wait_for(scb, timeout) state.termio.c_cc[VTIME] = timeout * 10; if (state.termio.c_cc[VTIME] != timeout * 10) { - /* If c_cc is an 8-bit signed character, we can't go + /* If c_cc is an 8-bit signed character, we can't go bigger than this. If it is always unsigned, we could use 25. */ @@ -582,14 +582,14 @@ baudtab[] = {-1, -1}, }; -static int +static int rate_to_code(rate) int rate; { int i; for (i = 0; baudtab[i].rate != -1; i++) - if (rate == baudtab[i].rate) + if (rate == baudtab[i].rate) return baudtab[i].code; return -1; diff --git a/gnu/usr.bin/gdb/gdb/serial.c b/gnu/usr.bin/gdb/gdb/serial.c index 631f0f3..e15b0c8 100644 --- a/gnu/usr.bin/gdb/gdb/serial.c +++ b/gnu/usr.bin/gdb/gdb/serial.c @@ -174,7 +174,7 @@ connect_command (args, fromtty) if (args) fprintf_unfiltered(gdb_stderr, "This command takes no args. They have been ignored.\n"); - + printf_unfiltered("[Entering connect mode. Use ~. or ~^D to escape]\n"); tty_desc = SERIAL_FDOPEN (0); diff --git a/gnu/usr.bin/gdb/gdb/solib.c b/gnu/usr.bin/gdb/gdb/solib.c index f851dee..55eaba7 100644 --- a/gnu/usr.bin/gdb/gdb/solib.c +++ b/gnu/usr.bin/gdb/gdb/solib.c @@ -1,6 +1,6 @@ /* Handle SunOS and SVR4 shared libraries for GDB, the GNU Debugger. Copyright 1990, 1991, 1992, 1993, 1994 Free Software Foundation, Inc. - + This file is part of GDB. This program is free software; you can redistribute it and/or modify @@ -32,7 +32,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef SVR4_SHARED_LIBS /* SunOS shared libs need the nlist structure. */ -#include <a.out.h> +#include <a.out.h> #else #include "libelf.h" #ifndef DT_MIPS_RLD_MAP @@ -216,10 +216,10 @@ solib_map_sections (so) struct section_table *p; struct cleanup *old_chain; bfd *abfd; - + filename = tilde_expand (so -> so_name); old_chain = make_cleanup (free, filename); - + scratch_chan = openp (getenv ("PATH"), 1, filename, O_RDONLY, 0, &scratch_pathname); if (scratch_chan < 0) @@ -251,7 +251,7 @@ solib_map_sections (so) } if (build_section_table (abfd, &so -> sections, &so -> sections_end)) { - error ("Can't find the file sections in `%s': %s", + error ("Can't find the file sections in `%s': %s", bfd_get_filename (abfd), bfd_errmsg (bfd_get_error ())); } @@ -424,15 +424,15 @@ bfd_lookup_symbol (abfd, symname) unsigned int i; struct cleanup *back_to; CORE_ADDR symaddr = 0; - + storage_needed = bfd_get_symtab_upper_bound (abfd); if (storage_needed > 0) { symbol_table = (asymbol **) xmalloc (storage_needed); back_to = make_cleanup (free, (PTR)symbol_table); - number_of_symbols = bfd_canonicalize_symtab (abfd, symbol_table); - + number_of_symbols = bfd_canonicalize_symtab (abfd, symbol_table); + for (i = 0; i < number_of_symbols; i++) { sym = *symbol_table++; @@ -791,7 +791,7 @@ find_solib (so_list_ptr) struct so_list *so_list_next = NULL; struct link_map *lm = NULL; struct so_list *new; - + if (so_list_ptr == NULL) { /* We are setting up for a new scan through the loaded images. */ @@ -846,7 +846,7 @@ find_solib (so_list_ptr) else { so_list_head = new; - } + } so_list_next = new; read_memory ((CORE_ADDR) lm, (char *) &(new -> lm), sizeof (struct link_map)); @@ -868,7 +868,7 @@ find_solib (so_list_ptr) new -> so_name[MAX_PATH_SIZE - 1] = '\0'; free (buffer); solib_map_sections (new); - } + } } return (so_list_next); } @@ -880,7 +880,7 @@ symbol_add_stub (arg) char *arg; { register struct so_list *so = (struct so_list *) arg; /* catch_errs bogon */ - + so -> objfile = symbol_file_add (so -> so_name, so -> from_tty, (so->textsection == NULL @@ -910,7 +910,7 @@ solib_add (arg_string, from_tty, target) char *arg_string; int from_tty; struct target_ops *target; -{ +{ register struct so_list *so = NULL; /* link map state variable */ /* Last shared library that we read. */ @@ -919,12 +919,12 @@ solib_add (arg_string, from_tty, target) char *re_err; int count; int old; - + if ((re_err = re_comp (arg_string ? arg_string : ".")) != NULL) { error ("Invalid regexp: %s", re_err); } - + /* Add the shared library sections to the section table of the specified target, if any. We have to do this before reading the symbol files as symbol_file_add calls reinit_frame_cache and @@ -941,7 +941,7 @@ solib_add (arg_string, from_tty, target) count += so -> sections_end - so -> sections; } } - + if (count) { /* Reallocate the target's section table including the new size. */ @@ -959,7 +959,7 @@ solib_add (arg_string, from_tty, target) xmalloc ((sizeof (struct section_table)) * count); } target -> to_sections_end = target -> to_sections + (count + old); - + /* Add these section table entries to the target's table. */ while ((so = find_solib (so)) != NULL) { @@ -967,14 +967,14 @@ solib_add (arg_string, from_tty, target) { count = so -> sections_end - so -> sections; memcpy ((char *) (target -> to_sections + old), - so -> sections, + so -> sections, (sizeof (struct section_table)) * count); old += count; } } } } - + /* Now add the symbol files. */ while ((so = find_solib (so)) != NULL) { @@ -1036,7 +1036,7 @@ info_sharedlibrary_command (ignore, from_tty) { register struct so_list *so = NULL; /* link map state variable */ int header_done = 0; - + if (exec_bfd == NULL) { printf_unfiltered ("No exec file.\n"); @@ -1066,7 +1066,7 @@ info_sharedlibrary_command (ignore, from_tty) } if (so_list_head == NULL) { - printf_unfiltered ("No shared libraries loaded at this time.\n"); + printf_unfiltered ("No shared libraries loaded at this time.\n"); } } @@ -1099,7 +1099,7 @@ solib_address (address) CORE_ADDR address; { register struct so_list *so = 0; /* link map state variable */ - + while ((so = find_solib (so)) != NULL) { if (so -> so_name[0]) @@ -1116,12 +1116,12 @@ solib_address (address) /* Called by free_all_symtabs */ -void +void clear_solib() { struct so_list *next; char *bfd_filename; - + while (so_list_head) { if (so_list_head -> sections) @@ -1136,7 +1136,7 @@ clear_solib() else /* This happens for the executable on SVR4. */ bfd_filename = NULL; - + next = so_list_head -> next; if (bfd_filename) free ((PTR)bfd_filename); @@ -1171,7 +1171,7 @@ disable_break () #ifndef SVR4_SHARED_LIBS int in_debugger = 0; - + /* Read the debugger structure from the inferior to retrieve the address of the breakpoint and the original contents of the breakpoint address. Remove the breakpoint by writing the original @@ -1338,19 +1338,19 @@ enable_break () return (success); } - + /* - + GLOBAL FUNCTION - + solib_create_inferior_hook -- shared library startup support - + SYNOPSIS - + void solib_create_inferior_hook() - + DESCRIPTION - + When gdb starts up the inferior, it nurses it along (through the shell) until it is ready to execute it's first instruction. At this point, this function gets called via expansion of the macro @@ -1391,7 +1391,7 @@ FIXME Also, what if child has exit()ed? Must exit loop somehow. */ -void +void solib_create_inferior_hook() { /* If we are using the BKPT_AT_SYMBOL code, then we don't need the base @@ -1427,7 +1427,7 @@ solib_create_inferior_hook() } while (stop_signal != TARGET_SIGNAL_TRAP); stop_soon_quietly = 0; - + /* We are now either at the "mapping complete" breakpoint (or somewhere else, a condition we aren't prepared to deal with anyway), so adjust the PC as necessary after a breakpoint, disable the breakpoint, and @@ -1460,11 +1460,11 @@ SYNOPSIS DESCRIPTION Once the symbols from a shared object have been loaded in the usual - way, we are called to do any system specific symbol handling that + way, we are called to do any system specific symbol handling that is needed. For Suns, this consists of grunging around in the dynamic linkers - structures to find symbol definitions for "common" symbols and + structures to find symbol definitions for "common" symbols and adding them to the minimal symbol table for the corresponding objfile. @@ -1541,9 +1541,9 @@ int from_tty; void _initialize_solib() { - + add_com ("sharedlibrary", class_files, sharedlibrary_command, "Load shared object library symbols for files matching REGEXP."); - add_info ("sharedlibrary", info_sharedlibrary_command, + add_info ("sharedlibrary", info_sharedlibrary_command, "Status of loaded shared object libraries."); } diff --git a/gnu/usr.bin/gdb/gdb/source.c b/gnu/usr.bin/gdb/gdb/source.c index af2d14d..9dc175b 100644 --- a/gnu/usr.bin/gdb/gdb/source.c +++ b/gnu/usr.bin/gdb/gdb/source.c @@ -125,7 +125,7 @@ select_source_symtab (s) struct partial_symtab *ps; struct partial_symtab *cs_pst = 0; struct objfile *ofp; - + if (s) { current_source_symtab = s; @@ -148,7 +148,7 @@ select_source_symtab (s) if (current_source_symtab) return; } - + /* All right; find the last file in the symtab list (ignoring .h's). */ current_source_line = 1; @@ -247,7 +247,7 @@ init_source_path () } /* Add zero or more directories to the front of the source path. */ - + void directory_command (dirname, from_tty) char *dirname; @@ -471,7 +471,7 @@ source_info (ignore, from_tty) the actual file opened (this string will always start with a "/". We have to take special pains to avoid doubling the "/" between the directory and the file, sigh! Emacs gets confuzzed by this when we print the - source file name!!! + source file name!!! If a file is found, return the descriptor. Otherwise, return -1, with errno set for the last name we tried to open. */ @@ -558,8 +558,8 @@ openp (path, try_cwd_first, string, mode, prot, filename_opened) else { /* Beware the // my son, the Emacs barfs, the botch that catch... */ - - *filename_opened = concat (current_directory, + + *filename_opened = concat (current_directory, '/' == current_directory[strlen(current_directory)-1]? "": "/", filename, NULL); } @@ -580,7 +580,7 @@ open_source_file (s) char *fullname; /* Quick way out if we already know its full name */ - if (s->fullname) + if (s->fullname) { result = open (s->fullname, O_RDONLY); if (result >= 0) @@ -666,11 +666,11 @@ find_source_lines (s, desc) line_charpos[0] = tell(desc); nlines = 1; - while (myread(desc, &c, 1)>0) + while (myread(desc, &c, 1)>0) { - if (c == '\n') + if (c == '\n') { - if (nlines == lines_allocated) + if (nlines == lines_allocated) { lines_allocated *= 2; line_charpos = @@ -685,7 +685,7 @@ find_source_lines (s, desc) { struct cleanup *old_cleanups; - /* st_size might be a large type, but we only support source files whose + /* st_size might be a large type, but we only support source files whose size fits in an int. */ size = (int) st.st_size; @@ -752,7 +752,7 @@ source_charpos_line (s, chr) { register int line = 0; register int *lnp; - + if (s == 0 || s->line_charpos == 0) return 0; lnp = s->line_charpos; /* Files are usually short, so sequential search is Ok */ @@ -780,14 +780,14 @@ get_filename_and_charpos (s, fullname) char **fullname; { register int desc, linenums_changed = 0; - + desc = open_source_file (s); if (desc < 0) { if (fullname) *fullname = NULL; return 0; - } + } if (fullname) *fullname = s->fullname; if (s->line_charpos == 0) linenums_changed = 1; @@ -900,7 +900,7 @@ print_source_lines (s, line, stopline, noerror) -/* +/* C++ Print a list of files and line numbers which a user may choose from in order to list a function which was specified ambiguously @@ -1010,7 +1010,7 @@ list_command (arg, from_tty) sals_end = decode_line_1 (&arg1, 0, 0, 0, 0); else sals_end = decode_line_1 (&arg1, 0, sal.symtab, sal.line, 0); - if (sals_end.nelts == 0) + if (sals_end.nelts == 0) return; if (sals_end.nelts > 1) { @@ -1031,7 +1031,7 @@ list_command (arg, from_tty) error ("Specified start and end are in different files."); if (dummy_beg && dummy_end) error ("Two empty args do not say what lines to list."); - + /* if line was specified by address, first print exactly which line, and which file. In this case, sal.symtab == 0 means address is outside @@ -1115,7 +1115,7 @@ line_info (arg, from_tty) else { sals = decode_line_spec_1 (arg, 0); - + dont_repeat (); } @@ -1124,7 +1124,7 @@ line_info (arg, from_tty) for (i = 0; i < sals.nelts; i++) { sal = sals.sals[i]; - + if (sal.symtab == 0) { printf_filtered ("No line number information available"); diff --git a/gnu/usr.bin/gdb/gdb/stabsread.c b/gnu/usr.bin/gdb/gdb/stabsread.c index 1445540..7e4d32f 100644 --- a/gnu/usr.bin/gdb/gdb/stabsread.c +++ b/gnu/usr.bin/gdb/gdb/stabsread.c @@ -47,7 +47,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "stabsread.h" /* Our own declarations */ #undef EXTERN -/* The routines that read and process a complete stabs for a C struct or +/* The routines that read and process a complete stabs for a C struct or C++ class pass lists of data member fields and lists of member function fields in an instance of a field_info structure, as defined below. This is part of some reorganization of low level C++ support and is @@ -370,7 +370,7 @@ dbx_alloc_type (typenums, objfile) return (*type_addr); } -/* for all the stabs in a given stab vector, build appropriate types +/* for all the stabs in a given stab vector, build appropriate types and fix their symbols in given symbol vector. */ static void @@ -386,10 +386,10 @@ patch_block_stabs (symbols, stabs, objfile) if (stabs) { - - /* for all the stab entries, find their corresponding symbols and + + /* for all the stab entries, find their corresponding symbols and patch their types! */ - + for (ii = 0; ii < stabs->count; ++ii) { name = stabs->stab[ii]; @@ -539,7 +539,7 @@ define_symbol (valu, string, desc, type, objfile) e.g. ":t10=*2" or a nameless enum like " :T16=ered:0,green:1,blue:2,;" */ nameless = (p == string || ((string[0] == ' ') && (string[1] == ':'))); - sym = (struct symbol *) + sym = (struct symbol *) obstack_alloc (&objfile -> symbol_obstack, sizeof (struct symbol)); memset (sym, 0, sizeof (struct symbol)); @@ -780,8 +780,8 @@ define_symbol (valu, string, desc, type, objfile) /* Attempt to set up to record a function prototype... */ struct type *new = alloc_type (objfile); - /* Generate a template for the type of this function. The - types of the arguments will be added as we read the symbol + /* Generate a template for the type of this function. The + types of the arguments will be added as we read the symbol table. */ *new = *lookup_function_type (SYMBOL_TYPE(sym)); SYMBOL_TYPE(sym) = new; @@ -899,7 +899,7 @@ define_symbol (valu, string, desc, type, objfile) we should believe the type of a PCC 'short' argument, but shouldn't believe the address (the address is the address of the corresponding int). - + My guess is that this correction, as opposed to changing the parameter to an 'int' (as done below, for PCC on most machines), is the right thing to do @@ -910,20 +910,20 @@ define_symbol (valu, string, desc, type, objfile) the called function wants an int or a short), so there is little practical difference between an int and a short (except perhaps what happens when the GDB user types - "print short_arg = 0x10000;"). - + "print short_arg = 0x10000;"). + Hacked for SunOS 4.1 by gnu@cygnus.com. In 4.1, the compiler actually produces the correct address (we don't need to fix it up). I made this code adapt so that it will offset the symbol if it was pointing at an int-aligned location and not otherwise. This way you can use the same gdb for 4.0.x and 4.1 systems. - + If the parameter is shorter than an int, and is integral (e.g. char, short, or unsigned equivalent), and is claimed to be passed on an integer boundary, don't believe it! Offset the parameter's address to the tail-end of that integer. */ - + if (TYPE_LENGTH (SYMBOL_TYPE (sym)) < TYPE_LENGTH (pcc_promotion_type) && TYPE_CODE (SYMBOL_TYPE (sym)) == TYPE_CODE_INT && 0 == SYMBOL_VALUE (sym) % TYPE_LENGTH (pcc_promotion_type)) @@ -932,7 +932,7 @@ define_symbol (valu, string, desc, type, objfile) - TYPE_LENGTH (SYMBOL_TYPE (sym)); } break; - + #else /* no BELIEVE_PCC_PROMOTION_TYPE. */ /* If PCC says a parameter is a short or a char, @@ -1122,7 +1122,7 @@ define_symbol (valu, string, desc, type, objfile) strlen (SYMBOL_NAME (sym)), &objfile -> symbol_obstack); } - /* The semantics of C++ state that "struct foo { ... }" also defines + /* The semantics of C++ state that "struct foo { ... }" also defines a typedef for "foo". Unfortunately, cfront never makes the typedef when translating C++ into C. We make the typedef here so that "ptype foo" works as expected for cfront translated code. */ @@ -1207,7 +1207,7 @@ define_symbol (valu, string, desc, type, objfile) } /* When passing structures to a function, some systems sometimes pass - the address in a register, not the structure itself. + the address in a register, not the structure itself. If REG_STRUCT_HAS_ADDR yields non-zero we have to convert LOC_REGPARM to LOC_REGPARM_ADDR for structures and unions. */ @@ -1321,7 +1321,7 @@ read_type (pp, objfile) { if (read_type_number (pp, typenums) != 0) return error_type (pp); - + /* Type is not being defined here. Either it already exists, or this is a forward reference to it. dbx_alloc_type handles both cases. */ @@ -1394,13 +1394,13 @@ read_type (pp, objfile) /* Used to index through file_symbols. */ struct pending *ppt; int i; - + /* Name including "struct", etc. */ char *type_name; - + { char *from, *to, *p, *q1, *q2; - + /* Set the type code according to the following letter. */ switch ((*pp)[0]) { @@ -1424,7 +1424,7 @@ read_type (pp, objfile) break; } } - + q1 = strchr(*pp, '<'); p = strchr(*pp, ':'); if (p == NULL) @@ -1439,15 +1439,15 @@ read_type (pp, objfile) if (p == NULL) return error_type (pp); } - to = type_name = + to = type_name = (char *)obstack_alloc (&objfile->type_obstack, p - *pp + 1); - + /* Copy the name. */ from = *pp + 1; - while (from < p) + while (from < p) *to++ = *from++; *to = '\0'; - + /* Set the pointer ahead of the name which we just read, and the colon. */ *pp = from + 1; @@ -1677,7 +1677,7 @@ read_type (pp, objfile) if (typenums[0] != -1) *dbx_lookup_type (typenums) = type; break; - + case 'e': /* Enumeration type */ type = dbx_alloc_type (typenums, objfile); type = read_enum_type (pp, type, objfile); @@ -1709,7 +1709,7 @@ read_type (pp, objfile) if (**pp != 'r') return error_type (pp); ++*pp; - + type = dbx_alloc_type (typenums, objfile); type = read_array_type (pp, type, objfile); if (is_string) @@ -1937,7 +1937,7 @@ read_member_functions (fip, pp, type, objfile) struct next_fnfield *new_sublist; char *main_fn_name; register char *p; - + /* Process each list until we find something that is not a member function or find the end of the functions. */ @@ -1959,12 +1959,12 @@ read_member_functions (fip, pp, type, objfile) sublist = NULL; look_ahead_type = NULL; length = 0; - + new_fnlist = (struct next_fnfieldlist *) xmalloc (sizeof (struct next_fnfieldlist)); make_cleanup (free, new_fnlist); memset (new_fnlist, 0, sizeof (struct next_fnfieldlist)); - + if ((*pp)[0] == 'o' && (*pp)[1] == 'p' && (*pp)[2] == CPLUS_MARKER) { /* This is a completely wierd case. In order to stuff in the @@ -1978,7 +1978,7 @@ read_member_functions (fip, pp, type, objfile) work for "*". */ static char opname[32] = {'o', 'p', CPLUS_MARKER}; char *o = opname + 3; - + /* Skip past '::'. */ *pp = p + 2; @@ -1999,20 +1999,20 @@ read_member_functions (fip, pp, type, objfile) *pp = p + 2; } new_fnlist -> fn_fieldlist.name = main_fn_name; - + do { new_sublist = (struct next_fnfield *) xmalloc (sizeof (struct next_fnfield)); make_cleanup (free, new_sublist); memset (new_sublist, 0, sizeof (struct next_fnfield)); - + /* Check for and handle cretinous dbx symbol name continuation! */ if (look_ahead_type == NULL) { /* Normal case. */ STABS_CONTINUE (pp); - + new_sublist -> fn_field.type = read_type (pp, objfile); if (**pp != ':') { @@ -2026,14 +2026,14 @@ read_member_functions (fip, pp, type, objfile) new_sublist -> fn_field.type = look_ahead_type; look_ahead_type = NULL; } - + (*pp)++; p = *pp; while (*p != ';') { p++; } - + /* If this is just a stub, then we don't have the real name here. */ if (TYPE_FLAGS (new_sublist -> fn_field.type) & TYPE_FLAG_STUB) @@ -2044,7 +2044,7 @@ read_member_functions (fip, pp, type, objfile) } new_sublist -> fn_field.physname = savestring (*pp, p - *pp); *pp = p + 1; - + /* Set this member function's visibility fields. */ switch (*(*pp)++) { @@ -2055,7 +2055,7 @@ read_member_functions (fip, pp, type, objfile) new_sublist -> fn_field.is_protected = 1; break; } - + STABS_CONTINUE (pp); switch (**pp) { @@ -2087,7 +2087,7 @@ read_member_functions (fip, pp, type, objfile) complain (&const_vol_complaint, **pp); break; } - + switch (*(*pp)++) { case '*': @@ -2104,7 +2104,7 @@ read_member_functions (fip, pp, type, objfile) (0x7fffffff & read_huge_number (pp, ';', &nbits)) + 2; if (nbits != 0) return 0; - + STABS_CONTINUE (pp); if (**pp == ';' || **pp == '\0') { @@ -2146,30 +2146,30 @@ read_member_functions (fip, pp, type, objfile) new_sublist -> fn_field.is_stub = 1; } break; - + default: /* error */ complain (&member_fn_complaint, (*pp)[-1]); /* Fall through into normal member function. */ - + case '.': /* normal member function. */ new_sublist -> fn_field.voffset = 0; new_sublist -> fn_field.fcontext = 0; break; } - + new_sublist -> next = sublist; sublist = new_sublist; length++; STABS_CONTINUE (pp); } while (**pp != ';' && **pp != '\0'); - + (*pp)++; - + new_fnlist -> fn_fieldlist.fn_fields = (struct fn_field *) - obstack_alloc (&objfile -> type_obstack, + obstack_alloc (&objfile -> type_obstack, sizeof (struct fn_field) * length); memset (new_fnlist -> fn_fieldlist.fn_fields, 0, sizeof (struct fn_field) * length); @@ -2177,7 +2177,7 @@ read_member_functions (fip, pp, type, objfile) { new_fnlist -> fn_fieldlist.fn_fields[i] = sublist -> fn_field; } - + new_fnlist -> fn_fieldlist.length = length; new_fnlist -> next = fip -> fnlist; fip -> fnlist = new_fnlist; @@ -2335,7 +2335,7 @@ read_one_struct_field (fip, pp, p, type, objfile) /* Static class member. */ fip -> list -> field.bitpos = (long) -1; } - while (*p != ';') + while (*p != ';') { p++; } @@ -2399,7 +2399,7 @@ read_one_struct_field (fip, pp, p, type, objfile) { fip -> list -> field.bitsize = 0; } - if ((fip -> list -> field.bitsize + if ((fip -> list -> field.bitsize == TARGET_CHAR_BIT * TYPE_LENGTH (fip -> list -> field.type) || (TYPE_CODE (fip -> list -> field.type) == TYPE_CODE_ENUM && (fip -> list -> field.bitsize @@ -2487,7 +2487,7 @@ read_struct_fields (fip, pp, type, objfile) functions are delimited by a pair of ':'s. When we hit the member functions (if any), terminate scan loop and return. */ - while (*p != ':' && *p != '\0') + while (*p != ':' && *p != '\0') { p++; } @@ -2627,7 +2627,7 @@ read_baseclasses (fip, pp, type, objfile) { int nbits; - + /* The remaining value is the bit offset of the portion of the object corresponding to this baseclass. Always zero in the absence of multiple inheritance. */ @@ -2712,7 +2712,7 @@ read_tilde_fields (fip, pp, type, objfile) /* Premature end of symbol. */ return 0; } - + TYPE_VPTR_BASETYPE (type) = t; if (type == t) /* Our own class provides vtbl ptr */ { @@ -2720,7 +2720,7 @@ read_tilde_fields (fip, pp, type, objfile) i >= TYPE_N_BASECLASSES (t); --i) { - if (! strncmp (TYPE_FIELD_NAME (t, i), vptr_name, + if (! strncmp (TYPE_FIELD_NAME (t, i), vptr_name, sizeof (vptr_name) - 1)) { TYPE_VPTR_FIELDNO (type) = i; @@ -2874,7 +2874,7 @@ attach_fields_to_type (fip, type, objfile) OBJFILE points to the current objfile from which the stabs information is being read. (Note that it is redundant in that TYPE also contains a pointer - to this same objfile, so it might be a good idea to eliminate it. FIXME). + to this same objfile, so it might be a good idea to eliminate it. FIXME). */ static struct type * @@ -2974,7 +2974,7 @@ read_array_type (pp, type, objfile) upper = read_huge_number (pp, ';', &nbits); if (nbits != 0) return error_type (pp); - + element_type = read_type (pp, objfile); if (adjustable) @@ -3250,7 +3250,7 @@ read_huge_number (pp, end, bits) int nbits = 0; int c; long upper_limit; - + if (*p == '-') { sign = -1; @@ -3279,7 +3279,7 @@ read_huge_number (pp, end, bits) } else overflow = 1; - + /* This depends on large values being output in octal, which is what GCC does. */ if (radix == 8) @@ -3323,7 +3323,7 @@ read_huge_number (pp, end, bits) *bits = -1; return 0; } - + /* -0x7f is the same as 0x80. So deal with it by adding one to the number of bits. */ if (sign == -1) @@ -3374,7 +3374,7 @@ read_range_type (pp, typenums, objfile) if (n2bits == -1 || n3bits == -1) return error_type (pp); - + /* If limits are huge, must be large integral type. */ if (n2bits != 0 || n3bits != 0) { @@ -3612,7 +3612,7 @@ common_block_end (objfile) return; } - sym = (struct symbol *) + sym = (struct symbol *) obstack_alloc (&objfile -> symbol_obstack, sizeof (struct symbol)); memset (sym, 0, sizeof (struct symbol)); SYMBOL_NAME (sym) = common_block_name; @@ -3732,7 +3732,7 @@ cleanup_undefined_types () for (i = 0; i < ppt->nsyms; i++) { struct symbol *sym = ppt->symbol[i]; - + if (SYMBOL_CLASS (sym) == LOC_TYPEDEF && SYMBOL_NAMESPACE (sym) == STRUCT_NAMESPACE && (TYPE_CODE (SYMBOL_TYPE (sym)) == @@ -3840,7 +3840,7 @@ scan_file_globals (objfile) { global_sym_chain[hash] = SYMBOL_VALUE_CHAIN (sym); } - + /* Check to see whether we need to fix up a common block. */ /* Note: this code might be executed several times for the same symbol if there are multiple references. */ @@ -3855,7 +3855,7 @@ scan_file_globals (objfile) } SYMBOL_SECTION (sym) = SYMBOL_SECTION (msymbol); - + if (prev) { sym = SYMBOL_VALUE_CHAIN (prev); diff --git a/gnu/usr.bin/gdb/gdb/stabsread.h b/gnu/usr.bin/gdb/gdb/stabsread.h index a5a0de7..20859d6 100644 --- a/gnu/usr.bin/gdb/gdb/stabsread.h +++ b/gnu/usr.bin/gdb/gdb/stabsread.h @@ -88,7 +88,7 @@ struct header_file { /* Name of header file */ - + char *name; /* Numeric code distinguishing instances of one header file that produced diff --git a/gnu/usr.bin/gdb/gdb/stack.c b/gnu/usr.bin/gdb/gdb/stack.c index 34f0d83..6eb56e4 100644 --- a/gnu/usr.bin/gdb/gdb/stack.c +++ b/gnu/usr.bin/gdb/gdb/stack.c @@ -267,7 +267,7 @@ print_frame_info (fi, level, source, args) struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (fi->pc); if (msymbol != NULL - && (SYMBOL_VALUE_ADDRESS (msymbol) + && (SYMBOL_VALUE_ADDRESS (msymbol) > BLOCK_START (SYMBOL_BLOCK_VALUE (func)))) { #if 0 @@ -394,7 +394,7 @@ parse_frame_specification (frame_exp) int numargs = 0; #define MAXARGS 4 CORE_ADDR args[MAXARGS]; - + if (frame_exp) { char *addr_string, *p; @@ -468,7 +468,7 @@ parse_frame_specification (frame_exp) while ((tfid = get_prev_frame (fid)) && (FRAME_FP (tfid) == args[0])) fid = tfid; - + /* We couldn't identify the frame as an existing frame, but perhaps we can create one with a single argument. */ } @@ -651,7 +651,7 @@ frame_info (addr_exp, from_tty) } } -#if defined (FRAME_FIND_SAVED_REGS) +#if defined (FRAME_FIND_SAVED_REGS) get_frame_saved_regs (fi, &fsr); /* The sp is special; what's returned isn't the save address, but actually the value of the previous frame's sp. */ @@ -748,7 +748,7 @@ backtrace_command (count_exp, from_tty) QUIT; current = get_prev_frame (current); } - + /* Will stop when CURRENT reaches the top of the stack. TRAILING will be COUNT below it. */ while (current) @@ -758,7 +758,7 @@ backtrace_command (count_exp, from_tty) current = get_prev_frame (current); trailing_level++; } - + count = -1; } } @@ -768,7 +768,7 @@ backtrace_command (count_exp, from_tty) if (info_verbose) { struct partial_symtab *ps; - + /* Read in symbols for all of the frames. Need to do this in a separate pass so that "Reading in symbols for xxx" messages don't screw up the appearance of the backtrace. Also @@ -909,7 +909,7 @@ print_frame_local_vars (frame, stream) fprintf_filtered (stream, "No symbol table info available.\n"); return; } - + while (block != 0) { if (print_block_frame_locals (block, frame, stream)) @@ -1115,7 +1115,7 @@ select_frame (frame, level) if (frame) { s = find_pc_symtab (get_frame_info (frame)->pc); - if (s + if (s && s->language != current_language->la_language && s->language != language_unknown && language_mode == language_mode_auto) { @@ -1254,7 +1254,7 @@ up_silently_command (count_exp, from_tty) if (count_exp) count = parse_and_eval_address (count_exp); count1 = count; - + if (target_has_stack == 0 || selected_frame == 0) error ("No stack."); @@ -1287,7 +1287,7 @@ down_silently_command (count_exp, from_tty) if (count_exp) count = - parse_and_eval_address (count_exp); count1 = count; - + if (target_has_stack == 0 || selected_frame == 0) error ("No stack."); @@ -1394,7 +1394,7 @@ get_frame_language() register struct symtab *s; FRAME fr; enum language flang; /* The language of the current frame */ - + fr = get_frame_info(selected_frame); if(fr) { @@ -1413,7 +1413,7 @@ get_frame_language() void _initialize_stack () { -#if 0 +#if 0 backtrace_limit = 30; #endif @@ -1473,7 +1473,7 @@ With a negative argument, print outermost -COUNT frames."); "Exceptions that can be caught in the current stack frame."); #if 0 - add_cmd ("backtrace-limit", class_stack, set_backtrace_limit_command, + add_cmd ("backtrace-limit", class_stack, set_backtrace_limit_command, "Specify maximum number of frames for \"backtrace\" to print by default.", &setlist); add_info ("backtrace-limit", backtrace_limit_info, diff --git a/gnu/usr.bin/gdb/gdb/symfile.c b/gnu/usr.bin/gdb/gdb/symfile.c index a56e233..7857041 100644 --- a/gnu/usr.bin/gdb/gdb/symfile.c +++ b/gnu/usr.bin/gdb/gdb/symfile.c @@ -272,7 +272,7 @@ psymtab_to_symtab (pst) /* If it has not yet been read in, read it. */ if (!pst->readin) - { + { (*pst->read_symtab) (pst); } @@ -311,7 +311,7 @@ entry_point_address() return symfile_objfile ? symfile_objfile->ei.entry_point : 0; } -/* Remember the lowest-addressed loadable section we've seen. +/* Remember the lowest-addressed loadable section we've seen. This function is called via bfd_map_over_sections. */ #if 0 /* Not used yet */ @@ -330,7 +330,7 @@ find_lowest_section (abfd, sect, obj) else if (bfd_section_vma (abfd, *lowest) >= bfd_section_vma (abfd, sect)) *lowest = sect; /* A lower loadable section */ } -#endif +#endif /* Process a symbol file, as either the main file or as a dynamically loaded file. @@ -362,7 +362,7 @@ syms_from_objfile (objfile, addr, mainline, verbo) if an error occurs during symbol reading. */ old_chain = make_cleanup (free_objfile, objfile); - if (mainline) + if (mainline) { /* We will modify the main symbol table, make sure that all its users will be cleaned up if an error occurs during symbol reading. */ @@ -493,7 +493,7 @@ syms_from_objfile (objfile, addr, mainline, verbo) /* Perform required actions after either reading in the initial symbols for a new objfile, or mapping in the symbols from a reusable objfile. */ - + void new_symfile_objfile (objfile, mainline, verbo) struct objfile *objfile; @@ -589,7 +589,7 @@ symbol_file_add (name, from_tty, addr, mainline, mapped, readnow) gdb_flush (gdb_stdout); } syms_from_objfile (objfile, addr, mainline, from_tty); - } + } /* We now have at least a partial symbol table. Check to see if the user requested that all symbols be read on initial access via either @@ -620,7 +620,7 @@ symbol_file_add (name, from_tty, addr, mainline, mapped, readnow) } new_symfile_objfile (objfile, mainline, from_tty); - + /* Getting new symbols may change our opinion about what is frameless. */ @@ -737,7 +737,7 @@ static void set_initial_language () { struct partial_symtab *pst; - enum language lang = language_unknown; + enum language lang = language_unknown; pst = find_main_psymtab (); if (pst != NULL) @@ -888,15 +888,15 @@ generic_load (filename, from_tty) } old_cleanups = make_cleanup (bfd_close, loadfile_bfd); - if (!bfd_check_format (loadfile_bfd, bfd_object)) + if (!bfd_check_format (loadfile_bfd, bfd_object)) { error ("\"%s\" is not an object file: %s", filename, bfd_errmsg (bfd_get_error ())); } - - for (s = loadfile_bfd->sections; s; s = s->next) + + for (s = loadfile_bfd->sections; s; s = s->next) { - if (s->flags & SEC_LOAD) + if (s->flags & SEC_LOAD) { bfd_size_type size; @@ -956,7 +956,7 @@ add_symbol_file_command (args, from_tty) char *arg; int readnow = 0; int mapped = 0; - + dont_repeat (); if (args == NULL) @@ -1037,7 +1037,7 @@ add_shared_symbol_files_command (args, from_tty) ADD_SHARED_SYMBOL_FILES (args, from_tty); #else error ("This command is not available in this configuration of GDB."); -#endif +#endif } /* Re-read symbols if a symbol-file has changed. */ @@ -1165,7 +1165,7 @@ reread_symbols () xmalloc, free); if (build_objfile_section_table (objfile)) { - error ("Can't find the file sections in `%s': %s", + error ("Can't find the file sections in `%s': %s", objfile -> name, bfd_errmsg (bfd_get_error ())); } @@ -1226,8 +1226,8 @@ deduce_language_from_filename (filename) char *filename; { char *c; - - if (0 == filename) + + if (0 == filename) ; /* Get default */ else if (0 == (c = strrchr (filename, '.'))) ; /* Get default. */ @@ -1316,7 +1316,7 @@ allocate_psymtab (filename, objfile) psymtab -> objfile = objfile; psymtab -> next = objfile -> psymtabs; objfile -> psymtabs = psymtab; - + return (psymtab); } @@ -1343,7 +1343,7 @@ clear_symtab_users () This function is run after symbol reading, or from a cleanup. If an old symbol table was obsoleted, the old symbol table - has been blown away, but the other GDB data structures that may + has been blown away, but the other GDB data structures that may reference it have not yet been cleared or re-directed. (The old symtab was zapped, and the cleanup queued, in free_named_symtab() below.) @@ -1595,7 +1595,7 @@ add_psymbol_to_list (name, namelength, namespace, class, list, val, language, extend_psymbol_list (list,objfile); } psym = list->next++; - + SYMBOL_NAME (psym) = (char *) obstack_alloc (&objfile->psymbol_obstack, namelength + 1); memcpy (SYMBOL_NAME (psym), name, namelength); @@ -1629,7 +1629,7 @@ add_psymbol_addr_to_list (name, namelength, namespace, class, list, val, extend_psymbol_list (list,objfile); } psym = list->next++; - + SYMBOL_NAME (psym) = (char *) obstack_alloc (&objfile->psymbol_obstack, namelength + 1); memcpy (SYMBOL_NAME (psym), name, namelength); @@ -1648,7 +1648,7 @@ void _initialize_symfile () { struct cmd_list_element *c; - + c = add_cmd ("symbol-file", class_files, symbol_file_command, "Load symbol table from executable file FILE.\n\ The `file' command can also load symbol tables, as well as setting the file\n\ diff --git a/gnu/usr.bin/gdb/gdb/symfile.h b/gnu/usr.bin/gdb/gdb/symfile.h index ed43049..17303bb 100644 --- a/gnu/usr.bin/gdb/gdb/symfile.h +++ b/gnu/usr.bin/gdb/gdb/symfile.h @@ -65,7 +65,7 @@ struct sym_fns { /* Called when we are finished with an objfile. Should do all cleanup that is specific to the object file format for the particular objfile. */ - + void (*sym_finish) PARAMS ((struct objfile *)); /* This function produces a file-dependent section_offsets structure, @@ -78,7 +78,7 @@ struct sym_fns { struct section_offsets *(*sym_offsets) PARAMS ((struct objfile *, CORE_ADDR)); /* Finds the next struct sym_fns. They are allocated and initialized - in whatever module implements the functions pointed to; an + in whatever module implements the functions pointed to; an initializer calls add_symtab_fns to add them to the global chain. */ struct sym_fns *next; diff --git a/gnu/usr.bin/gdb/gdb/symmisc.c b/gnu/usr.bin/gdb/gdb/symmisc.c index 4185c8a..5b3930f 100644 --- a/gnu/usr.bin/gdb/gdb/symmisc.c +++ b/gnu/usr.bin/gdb/gdb/symmisc.c @@ -47,16 +47,16 @@ FILE *std_err; /* Prototypes for local functions */ -static void +static void dump_symtab PARAMS ((struct objfile *, struct symtab *, GDB_FILE *)); -static void +static void dump_psymtab PARAMS ((struct objfile *, struct partial_symtab *, GDB_FILE *)); -static void +static void dump_msymbols PARAMS ((struct objfile *, GDB_FILE *)); -static void +static void dump_objfile PARAMS ((struct objfile *)); static int @@ -128,7 +128,7 @@ free_symtab (s) /* Free the blockvector itself. */ mfree (s -> objfile -> md, (PTR) bv); /* Also free the linetable. */ - + case free_linetable: /* Everything will be freed either by our `free_ptr' or by some other symtab, except for our linetable. @@ -152,7 +152,7 @@ free_symtab (s) #if MAINTENANCE_CMDS -static void +static void dump_objfile (objfile) struct objfile *objfile; { @@ -208,8 +208,8 @@ dump_objfile (objfile) } /* Print minimal symbols from this objfile. */ - -static void + +static void dump_msymbols (objfile, outfile) struct objfile *objfile; GDB_FILE *outfile; @@ -217,7 +217,7 @@ dump_msymbols (objfile, outfile) struct minimal_symbol *msymbol; int index; char ms_type; - + fprintf_filtered (outfile, "\nObject file %s:\n\n", objfile -> name); if (objfile -> minimal_symbol_count == 0) { @@ -345,7 +345,7 @@ dump_psymtab (objfile, psymtab, outfile) fprintf_filtered (outfile, "\n"); } -static void +static void dump_symtab (objfile, symtab, outfile) struct objfile *objfile; struct symtab *symtab; @@ -464,7 +464,7 @@ Arguments missing: an output file name and an optional symbol file name"); filename = tilde_expand (filename); make_cleanup (free, filename); - + outfile = gdb_fopen (filename, FOPEN_WT); if (outfile == 0) perror_with_name (filename); @@ -669,7 +669,7 @@ maintenance_print_psymbols (args, from_tty) filename = tilde_expand (filename); make_cleanup (free, filename); - + outfile = gdb_fopen (filename, FOPEN_WT); if (outfile == 0) perror_with_name (filename); @@ -814,7 +814,7 @@ maintenance_print_msymbols (args, from_tty) filename = tilde_expand (filename); make_cleanup (free, filename); - + outfile = gdb_fopen (filename, FOPEN_WT); if (outfile == 0) perror_with_name (filename); @@ -938,7 +938,7 @@ block_depth (block) struct block *block; { register int i = 0; - while ((block = BLOCK_SUPERBLOCK (block)) != NULL) + while ((block = BLOCK_SUPERBLOCK (block)) != NULL) { i++; } diff --git a/gnu/usr.bin/gdb/gdb/symtab.c b/gnu/usr.bin/gdb/gdb/symtab.c index 8f65ea1..eab46ce 100644 --- a/gnu/usr.bin/gdb/gdb/symtab.c +++ b/gnu/usr.bin/gdb/gdb/symtab.c @@ -95,7 +95,7 @@ lookup_symtab_1 PARAMS ((char *)); struct type *builtin_type_error; /* Block in which the most recently searched-for symbol was found. - Might be better to make this a parameter to lookup_symbol and + Might be better to make this a parameter to lookup_symbol and value_of_this. */ const struct block *block_found; @@ -224,7 +224,7 @@ char *name; { register struct partial_symtab *pst; register struct objfile *objfile; - + ALL_PSYMTABS (objfile, pst) { if (STREQ (name, pst -> filename)) @@ -279,8 +279,8 @@ gdb_mangle_name (type, i, j) char buf[20]; int len = (newname == NULL ? 0 : strlen (newname)); - is_full_physname_constructor = - ((physname[0]=='_' && physname[1]=='_' && + is_full_physname_constructor = + ((physname[0]=='_' && physname[1]=='_' && (isdigit(physname[2]) || physname[2]=='Q' || physname[2]=='t')) || (strncmp(physname, "__ct", 4) == 0)); @@ -288,7 +288,7 @@ gdb_mangle_name (type, i, j) is_full_physname_constructor || (newname && STREQ(field_name, newname)); if (!is_destructor) - is_destructor = (strncmp(physname, "__dt", 4) == 0); + is_destructor = (strncmp(physname, "__dt", 4) == 0); #ifndef GCC_MANGLE_BUG if (is_destructor || is_full_physname_constructor) @@ -338,7 +338,7 @@ gdb_mangle_name (type, i, j) strcat (mangled_name, buf); /* If the class doesn't have a name, i.e. newname NULL, then we just mangle it using 0 for the length of the class. Thus it gets mangled - as something starting with `::' rather than `classname::'. */ + as something starting with `::' rather than `classname::'. */ if (newname != NULL) strcat (mangled_name, newname); @@ -418,7 +418,7 @@ find_pc_psymbol (psymtab, pc) { struct partial_symbol *best = NULL, *p; CORE_ADDR best_pc; - + if (!psymtab) psymtab = find_pc_psymtab (pc); if (!psymtab) @@ -466,7 +466,7 @@ find_pc_psymbol (psymtab, pc) symbol was found there, or NULL if not found. C++: if IS_A_FIELD_OF_THIS is nonzero on entry, check to see if NAME is a field of the current implied argument `this'. If so set - *IS_A_FIELD_OF_THIS to 1, otherwise set it to zero. + *IS_A_FIELD_OF_THIS to 1, otherwise set it to zero. BLOCK_FOUND is set to the block in which NAME is found (in the case of a field of `this', value_of_this sets BLOCK_FOUND to the proper value.) */ @@ -501,7 +501,7 @@ lookup_symbol (name, block, namespace, is_a_field_of_this, symtab) while (block != 0) { sym = lookup_block_symbol (block, name, namespace); - if (sym) + if (sym) { block_found = block; if (symtab != NULL) @@ -556,12 +556,12 @@ found: } - /* C++: If requested to do so by the caller, + /* C++: If requested to do so by the caller, check to see if NAME is a field of `this'. */ if (is_a_field_of_this) { struct value *v = value_of_this (0); - + *is_a_field_of_this = 0; if (v && check_field (v, name)) { @@ -574,13 +574,13 @@ found: /* Now search all global blocks. Do the symtab's first, then check the psymtab's */ - + ALL_SYMTABS (objfile, s) { bv = BLOCKVECTOR (s); block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK); sym = lookup_block_symbol (block, name, namespace); - if (sym) + if (sym) { block_found = block; if (symtab != NULL) @@ -592,7 +592,7 @@ found: /* Check for the possibility of the symbol being a global function that is stored in one of the minimal symbol tables. Eventually, all global symbols might be resolved in this way. */ - + if (namespace == VAR_NAMESPACE) { msymbol = lookup_minimal_symbol (name, (struct objfile *) NULL); @@ -634,7 +634,7 @@ found: } } } - + ALL_PSYMTABS (objfile, ps) { if (!ps->readin && lookup_partial_symbol (ps, name, 1, namespace)) @@ -660,7 +660,7 @@ found: bv = BLOCKVECTOR (s); block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK); sym = lookup_block_symbol (block, name, namespace); - if (sym) + if (sym) { block_found = block; if (symtab != NULL) @@ -695,7 +695,7 @@ found: bv = BLOCKVECTOR (s); block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK); sym = lookup_block_symbol (block, name, VAR_NAMESPACE); - if (sym) + if (sym) { block_found = block; if (symtab != NULL) @@ -745,7 +745,7 @@ lookup_partial_symbol (pst, name, global, namespace) { return (NULL); } - + start = (global ? pst->objfile->global_psymbols.list + pst->globals_offset : pst->objfile->static_psymbols.list + pst->statics_offset ); @@ -1085,8 +1085,8 @@ find_addr_symbol (addr, symtabp, symaddrp) sym = BLOCK_SYM (block, bot); switch (SYMBOL_CLASS (sym)) { - case LOC_STATIC: - case LOC_LABEL: + case LOC_STATIC: + case LOC_LABEL: sym_addr = SYMBOL_VALUE_ADDRESS (sym); break; @@ -1680,7 +1680,7 @@ find_methods (t, name, sym_arr) if (cplus_demangle_opname(method_name, dem_opname, DMGL_ANSI)) method_name = dem_opname; else if (cplus_demangle_opname(method_name, dem_opname, 0)) - method_name = dem_opname; + method_name = dem_opname; } if (STREQ (name, method_name)) /* Find all the fields with that name. */ @@ -1762,7 +1762,7 @@ build_canonical_line_spec (sal, symname, canonical) || s->filename == (char *)NULL || canonical == (char ***)NULL) return; - + canonical_arr = (char **) xmalloc (sizeof (char *)); *canonical = canonical_arr; @@ -1879,7 +1879,7 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical) struct type *t; char *saved_arg = *argptr; extern char *gdb_completer_quote_characters; - + /* Defaults have defaults. */ if (default_symtab == 0) @@ -1915,7 +1915,7 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical) for (p = *argptr; *p; p++) { - if (p[0] == '<') + if (p[0] == '<') { while(++p && *p != '>'); if (!p) @@ -1947,9 +1947,9 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical) while (*p == ' ' || *p == '\t') p++; *argptr = p; - sym_class = lookup_symbol (copy, 0, STRUCT_NAMESPACE, 0, + sym_class = lookup_symbol (copy, 0, STRUCT_NAMESPACE, 0, (struct symtab **)NULL); - + if (sym_class && ( TYPE_CODE (SYMBOL_TYPE (sym_class)) == TYPE_CODE_STRUCT || TYPE_CODE (SYMBOL_TYPE (sym_class)) == TYPE_CODE_UNION)) @@ -2193,7 +2193,7 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical) { p = pp+1; } - else + else { p = skip_quoted(*argptr); } @@ -2352,7 +2352,7 @@ decode_line_2 (sym_arr, nelts, funfirstline, canonical) printf_unfiltered ("?HERE\n"); i++; } - + if ((prompt = getenv ("PS2")) == NULL) { prompt = ">"; @@ -2361,7 +2361,7 @@ decode_line_2 (sym_arr, nelts, funfirstline, canonical) gdb_flush(gdb_stdout); args = command_line_input ((char *) NULL, 0, "overload-choice"); - + if (args == 0 || *args == 0) error_no_arg ("one or more choice numbers"); @@ -2489,7 +2489,7 @@ output_source_filename (name, first) wrap_here (""); fputs_filtered (name, gdb_stdout); -} +} static void sources_info (ignore, from_tty) @@ -2500,12 +2500,12 @@ sources_info (ignore, from_tty) register struct partial_symtab *ps; register struct objfile *objfile; int first; - + if (!have_full_symbols () && !have_partial_symbols ()) { error (no_symtab_msg); } - + printf_filtered ("Source files for which symbols have been read in:\n\n"); first = 1; @@ -2514,7 +2514,7 @@ sources_info (ignore, from_tty) output_source_filename (s -> filename, &first); } printf_filtered ("\n\n"); - + printf_filtered ("Source files for which symbols will be read in on demand:\n\n"); first = 1; @@ -2604,7 +2604,7 @@ list_symbols (regexp, class, bpt, from_tty) regexp = tmp; } } - + if (0 != (val = re_comp (regexp))) error ("Invalid regexp (%s): %s", val, regexp); } @@ -2617,13 +2617,13 @@ list_symbols (regexp, class, bpt, from_tty) { struct partial_symbol *bound, *gbound, *sbound; int keep_going = 1; - + if (ps->readin) continue; - + gbound = objfile->global_psymbols.list + ps->globals_offset + ps->n_global_syms; sbound = objfile->static_psymbols.list + ps->statics_offset + ps->n_static_syms; bound = gbound; - + /* Go through all of the symbols stored in a partial symtab in one loop. */ psym = objfile->global_psymbols.list + ps->globals_offset; @@ -2755,24 +2755,24 @@ list_symbols (regexp, class, bpt, from_tty) fputs_filtered (":\n", gdb_stdout); } found_in_file = 1; - + if (class != 2 && i == STATIC_BLOCK) printf_filtered ("static "); - + /* Typedef that is not a C++ class */ if (class == 2 && SYMBOL_NAMESPACE (sym) != STRUCT_NAMESPACE) c_typedef_print (SYMBOL_TYPE(sym), sym, gdb_stdout); /* variable, func, or typedef-that-is-c++-class */ - else if (class < 2 || - (class == 2 && + else if (class < 2 || + (class == 2 && SYMBOL_NAMESPACE(sym) == STRUCT_NAMESPACE)) { type_print (SYMBOL_TYPE (sym), (SYMBOL_CLASS (sym) == LOC_TYPEDEF ? "" : SYMBOL_SOURCE_NAME (sym)), gdb_stdout, 0); - + printf_filtered (";\n"); } else @@ -2780,9 +2780,9 @@ list_symbols (regexp, class, bpt, from_tty) # if 0 /* FIXME, why is this zapped out? */ char buf[1024]; c_type_print_base (TYPE_FN_FIELD_TYPE(t, i), - gdb_stdout, 0, 0); + gdb_stdout, 0, 0); c_type_print_varspec_prefix (TYPE_FN_FIELD_TYPE(t, i), - gdb_stdout, 0); + gdb_stdout, 0); sprintf (buf, " %s::", type_name_no_tag (t)); cp_type_print_method_args (TYPE_FN_FIELD_ARGS (t, i), buf, name, gdb_stdout); @@ -2814,7 +2814,7 @@ list_symbols (regexp, class, bpt, from_tty) (0 == find_pc_symtab (SYMBOL_VALUE_ADDRESS (msymbol)))) { /* Variables/Absolutes: Look up by name */ - if (lookup_symbol (SYMBOL_NAME (msymbol), + if (lookup_symbol (SYMBOL_NAME (msymbol), (struct block *) NULL, VAR_NAMESPACE, 0, (struct symtab **) NULL) == NULL) { @@ -2943,7 +2943,7 @@ completion_list_add_name (symname, sym_text, sym_text_len, text, word) return; } } - + /* We have a match for a completion, so add SYMNAME to the current list of matches. Note that the name is moved to freshly malloc'd space. */ @@ -3068,7 +3068,7 @@ make_symbol_completion_list (text, word) /* If the psymtab's been read in we'll get it when we search through the blockvector. */ if (ps->readin) continue; - + for (psym = objfile->global_psymbols.list + ps->globals_offset; psym < (objfile->global_psymbols.list + ps->globals_offset + ps->n_global_syms); @@ -3078,7 +3078,7 @@ make_symbol_completion_list (text, word) QUIT; COMPLETION_LIST_ADD_SYMBOL (psym, sym_text, sym_text_len, text, word); } - + for (psym = objfile->static_psymbols.list + ps->statics_offset; psym < (objfile->static_psymbols.list + ps->statics_offset + ps->n_static_syms); @@ -3109,7 +3109,7 @@ make_symbol_completion_list (text, word) { surrounding_static_block = b; /* For elmin of dups */ } - + /* Also catch fields of types defined in this places which match our text string. Only complete on types visible from current context. */ @@ -3172,22 +3172,22 @@ make_symbol_completion_list (text, word) /* Add the type of the symbol sym to the type of the current function whose block we are in (assumed). The type of this current function is contained in *TYPE. - + This basically works as follows: When we find a function symbol (N_FUNC with a 'f' or 'F' in the symbol name), we record - a pointer to its type in the global in_function_type. Every + a pointer to its type in the global in_function_type. Every time we come across a parameter symbol ('p' in its name), then this procedure adds the name and type of that parameter to the function type pointed to by *TYPE. (Which should correspond to in_function_type if it was called correctly). - Note that since we are modifying a type, the result of + Note that since we are modifying a type, the result of lookup_function_type() should be memcpy()ed before calling this. When not in strict typing mode, the expression evaluator can choose to ignore this. Assumption: All of a function's parameter symbols will - appear before another function symbol is found. The parameters + appear before another function symbol is found. The parameters appear in the same order in the argument list as they do in the symbol table. */ @@ -3205,13 +3205,13 @@ add_param_to_type (type,sym) else TYPE_FIELDS(*type) = (struct field *) (*current_objfile->xmalloc) (num*sizeof(struct field)); - + TYPE_FIELD_BITPOS(*type,num-1) = num-1; TYPE_FIELD_BITSIZE(*type,num-1) = 0; TYPE_FIELD_TYPE(*type,num-1) = SYMBOL_TYPE(sym); TYPE_FIELD_NAME(*type,num-1) = SYMBOL_NAME(sym); } -#endif +#endif void _initialize_symtab () diff --git a/gnu/usr.bin/gdb/gdb/symtab.h b/gnu/usr.bin/gdb/gdb/symtab.h index 058b9e7..5e4fa56 100644 --- a/gnu/usr.bin/gdb/gdb/symtab.h +++ b/gnu/usr.bin/gdb/gdb/symtab.h @@ -240,7 +240,7 @@ struct general_symbol_info (STREQ (SYMBOL_NAME (symbol), (name)) \ || (SYMBOL_DEMANGLED_NAME (symbol) != NULL \ && strcmp_iw (SYMBOL_DEMANGLED_NAME (symbol), (name)) == 0)) - + /* Macro that tests a symbol for an re-match against the last compiled regular expression. First test the unencoded name, then look for and test a C++ encoded name if it exists. @@ -250,7 +250,7 @@ struct general_symbol_info (re_exec (SYMBOL_NAME (symbol)) != 0 \ || (SYMBOL_DEMANGLED_NAME (symbol) != NULL \ && re_exec (SYMBOL_DEMANGLED_NAME (symbol)) != 0)) - + /* Define a simple structure used to hold some very basic information about all defined global symbols (text, data, bss, abs, etc). The only required information is the general_symbol_info. @@ -584,7 +584,7 @@ struct symbol machine generated programs? */ unsigned short line; - + /* Some symbols require an additional value to be recorded on a per- symbol basis. Stash those values here. */ @@ -606,7 +606,7 @@ struct symbol symbols whose types we have not parsed yet. For functions, it also contains their memory address, so we can find them from a PC value. Each partial_symbol sits in a partial_symtab, all of which are chained - on a partial symtab list and which points to the corresponding + on a partial symtab list and which points to the corresponding normal symtab once the partial_symtab has been referenced. */ struct partial_symbol @@ -699,7 +699,7 @@ struct section_offsets #define ANOFFSET(secoff, whichone) (secoff->offsets[whichone]) -/* Each source file or header is represented by a struct symtab. +/* Each source file or header is represented by a struct symtab. These objects are chained through the `next' field. */ struct symtab @@ -754,7 +754,7 @@ struct symtab /* Pointer to one block of storage to be freed, if nonzero. */ /* This is IN ADDITION to the action indicated by free_code. */ - + char *free_ptr; /* Total number of lines found in source file. */ @@ -824,7 +824,7 @@ struct partial_symtab struct objfile *objfile; - /* Set of relocation offsets to apply to each section. */ + /* Set of relocation offsets to apply to each section. */ struct section_offsets *section_offsets; @@ -895,7 +895,7 @@ struct partial_symtab /* The virtual function table is now an array of structures which have the - form { int16 offset, delta; void *pfn; }. + form { int16 offset, delta; void *pfn; }. In normal virtual function tables, OFFSET is unused. DELTA is the amount which is added to the apparent object's base @@ -904,7 +904,7 @@ struct partial_symtab PFN is a pointer to the virtual function. Note that this macro is g++ specific (FIXME). */ - + #define VTBL_FNADDR_OFFSET 2 /* Macro that yields non-zero value iff NAME is the prefix for C++ operator @@ -1085,7 +1085,7 @@ find_addr_symbol PARAMS ((CORE_ADDR, struct symtab **, CORE_ADDR *)); extern CORE_ADDR find_line_pc PARAMS ((struct symtab *, int)); -extern int +extern int find_line_pc_range PARAMS ((struct symtab_and_line, CORE_ADDR *, CORE_ADDR *)); diff --git a/gnu/usr.bin/gdb/gdb/target.c b/gnu/usr.bin/gdb/gdb/target.c index 4cf54f5..e3c6b34 100644 --- a/gnu/usr.bin/gdb/gdb/target.c +++ b/gnu/usr.bin/gdb/gdb/target.c @@ -73,7 +73,7 @@ static struct target_ops * find_default_run_target PARAMS ((char *)); /* Pointer to array of target architecture structures; the size of the - array; the current index into the array; the allocated size of the + array; the current index into the array; the allocated size of the array. */ struct target_ops **target_structs; unsigned target_struct_size; @@ -142,7 +142,7 @@ add_target (t) { if (t->to_magic != OPS_MAGIC) { - fprintf_unfiltered(gdb_stderr, "Magic number of %s target struct wrong\n", + fprintf_unfiltered(gdb_stderr, "Magic number of %s target struct wrong\n", t->to_shortname); abort(); } @@ -157,7 +157,7 @@ add_target (t) { target_struct_allocsize *= 2; target_structs = (struct target_ops **) - xrealloc ((char *) target_structs, + xrealloc ((char *) target_structs, target_struct_allocsize * sizeof (*target_structs)); } target_structs[target_struct_size++] = t; @@ -309,7 +309,7 @@ cleanup_target (t) the struct definition, but not all the places that initialize one. */ if (t->to_magic != OPS_MAGIC) { - fprintf_unfiltered(gdb_stderr, "Magic number of %s target struct wrong\n", + fprintf_unfiltered(gdb_stderr, "Magic number of %s target struct wrong\n", t->to_shortname); abort(); } @@ -398,7 +398,7 @@ push_target (t) return prev != 0; } -/* Remove a target_ops vector from the stack, wherever it may be. +/* Remove a target_ops vector from the stack, wherever it may be. Return how many times it was removed (0 or 1 unless bug). */ int @@ -578,14 +578,14 @@ target_write_memory (memaddr, myaddr, len) { return target_xfer_memory (memaddr, myaddr, len, 1); } - + /* Move memory to or from the targets. Iterate until all of it has been moved, if necessary. The top target gets priority; anything it doesn't want, is offered to the next one down, etc. Note the business with curlen: if an early target says "no, but I have a boundary overlapping this xfer" then we shorten what we offer to the subsequent targets so the early guy will get a chance at the - tail before the subsequent ones do. + tail before the subsequent ones do. Result is 0 or errno value. */ @@ -654,7 +654,7 @@ target_info (args, from_tty) { struct target_ops *t; int has_all_mem = 0; - + if (symfile_objfile != NULL) printf_unfiltered ("Symbols from \"%s\".\n", symfile_objfile->name); @@ -687,7 +687,7 @@ target_preopen (from_tty) dont_repeat(); if (target_has_execution) - { + { if (query ("A program is being debugged already. Kill it? ")) target_kill (); else @@ -799,9 +799,9 @@ find_core_target () struct target_ops **t; struct target_ops *runable = NULL; int count; - + count = 0; - + for (t = target_structs; t < target_structs + target_struct_size; ++t) { @@ -815,7 +815,7 @@ find_core_target () ++count; } } - + return(count == 1 ? runable : NULL); } @@ -1155,7 +1155,7 @@ target_signal_to_host (oursig) case TARGET_SIGNAL_USR2: return SIGUSR2; #endif #if defined (SIGCHLD) || defined (SIGCLD) - case TARGET_SIGNAL_CHLD: + case TARGET_SIGNAL_CHLD: #if defined (SIGCHLD) return SIGCHLD; #else @@ -1297,7 +1297,7 @@ normal_pid_to_str (pid) return buf; } -static char targ_desc[] = +static char targ_desc[] = "Names of targets and files being debugged.\n\ Shows the entire stack of targets currently in use (including the exec-file,\n\ core-file, and process, if any), as well as the symbol file name."; diff --git a/gnu/usr.bin/gdb/gdb/target.h b/gnu/usr.bin/gdb/gdb/target.h index 79a1252..750be84 100644 --- a/gnu/usr.bin/gdb/gdb/target.h +++ b/gnu/usr.bin/gdb/gdb/target.h @@ -26,8 +26,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ specific to the communications interface between us and the target. - A TARGET is an interface between the debugger and a particular - kind of file or process. Targets can be STACKED in STRATA, + A TARGET is an interface between the debugger and a particular + kind of file or process. Targets can be STACKED in STRATA, so that more than one target can potentially respond to a request. In particular, memory accesses will walk down the stack of targets until they find a target that is interested in handling that particular @@ -313,9 +313,9 @@ extern struct target_ops *current_target; /* Attaches to a process on the target side. Arguments are as passed to the `attach' command by the user. This routine can be called when the target is not on the target-stack, if the target_can_run - routine returns 1; in that case, it must push itself onto the stack. + routine returns 1; in that case, it must push itself onto the stack. Upon exit, the target should be ready for normal operations, and - should be ready to deliver the status of the process immediately + should be ready to deliver the status of the process immediately (without waiting) to an upcoming target_wait call. */ #define target_attach(args, from_tty) \ @@ -416,8 +416,8 @@ print_section_info PARAMS ((struct target_ops *, bfd *)); (*current_target->to_insert_breakpoint) (addr, save) /* Remove a breakpoint at address ADDR in the target machine. - SAVE is a pointer to the same save area - that was previously passed to target_insert_breakpoint. + SAVE is a pointer to the same save area + that was previously passed to target_insert_breakpoint. Result is 0 for success, or an errno value. */ #define target_remove_breakpoint(addr, save) \ @@ -487,7 +487,7 @@ print_section_info PARAMS ((struct target_ops *, bfd *)); ALLARGS is a string containing the arguments to the program. ENV is the environment vector to pass. Errors reported with error(). On VxWorks and various standalone systems, we ignore exec_file. */ - + #define target_create_inferior(exec_file, args, env) \ (*current_target->to_create_inferior) (exec_file, args, env) @@ -525,7 +525,7 @@ print_section_info PARAMS ((struct target_ops *, bfd *)); /* Does the target have a stack? (Exec files don't, VxWorks doesn't, until we start a process.) */ - + #define target_has_stack \ (current_target->to_has_stack) diff --git a/gnu/usr.bin/gdb/gdb/tm-i386v.h b/gnu/usr.bin/gdb/gdb/tm-i386v.h index 49de3a0..1584b82 100644 --- a/gnu/usr.bin/gdb/gdb/tm-i386v.h +++ b/gnu/usr.bin/gdb/gdb/tm-i386v.h @@ -30,8 +30,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* turn this on when rest of gdb is ready */ #define IEEE_FLOAT -/* number of traps that happen between exec'ing the shell - * to run an inferior, and when we finally get to +/* number of traps that happen between exec'ing the shell + * to run an inferior, and when we finally get to * the inferior code. This is 2 on most implementations. */ #ifndef START_INFERIOR_TRAPS_EXPECTED @@ -97,7 +97,7 @@ i386_skip_prologue PARAMS ((int)); /* Initializer for an array of names of registers. There should be NUM_REGS strings in this initializer. */ -/* the order of the first 8 registers must match the compiler's +/* the order of the first 8 registers must match the compiler's * numbering scheme (which is the same as the 386 scheme) * also, this table must match regmap in i386-pinsn.c. */ @@ -254,7 +254,7 @@ i386_push_dummy_frame PARAMS ((void)); extern void i386_pop_frame PARAMS ((void)); -/* this is +/* this is * call 11223344 (32 bit relative) * int3 */ diff --git a/gnu/usr.bin/gdb/gdb/top.c b/gnu/usr.bin/gdb/gdb/top.c index a38e639..f90f141 100644 --- a/gnu/usr.bin/gdb/gdb/top.c +++ b/gnu/usr.bin/gdb/gdb/top.c @@ -75,7 +75,7 @@ float_handler PARAMS ((int)); static void init_signals PARAMS ((void)); -static void +static void set_verbose PARAMS ((char *, int, struct cmd_list_element *)); static void @@ -514,7 +514,7 @@ execute_user_command (c, args) { register struct command_line *cmdlines; struct cleanup *old_chain; - + if (args) error ("User-defined commands cannot take arguments."); @@ -552,12 +552,12 @@ execute_command (p, from_tty) /* This can happen when command_line_input hits end of file. */ if (p == NULL) return; - + while (*p == ' ' || *p == '\t') p++; if (*p) { char *arg; - + c = lookup_cmd (&p, cmdlist, "", 0, 1); /* Pass null arg rather than an empty one. */ arg = *p ? p : 0; @@ -657,7 +657,7 @@ dont_repeat () /* Read a line from the stream "instream" without command line editing. It prints PRROMPT once at the start. - Action is compatible with "readline", e.g. space for the result is + Action is compatible with "readline", e.g. space for the result is malloc'd and should be freed by the caller. A NULL return means end of file. */ @@ -678,7 +678,7 @@ gdb_readline (prrompt) fputs_unfiltered (prrompt, gdb_stdout); gdb_flush (gdb_stdout); } - + result = (char *) xmalloc (result_size); while (1) @@ -1457,7 +1457,7 @@ read_command_lines () if (p == NULL) /* Treat end of file like "end". */ break; - + /* Remove leading and trailing blanks. */ while (*p == ' ' || *p == '\t') p++; p1 = p + strlen (p); @@ -1672,7 +1672,7 @@ define_command (comname, from_tty) c = lookup_cmd (&tem, cmdlist, "", -1, 1); if (c && !STREQ (comname, c->name)) c = 0; - + if (c) { if (c->class == class_user || c->class == class_alias) @@ -1705,7 +1705,7 @@ define_command (comname, from_tty) comname = savestring (comname, strlen (comname)); - /* If the rest of the commands will be case insensitive, this one + /* If the rest of the commands will be case insensitive, this one should behave in the same manner. */ for (tem = comname; *tem; tem++) if (isupper(*tem)) *tem = tolower(*tem); @@ -2147,7 +2147,7 @@ show_commands (args, from_tty) /* The next command we want to display is the next one that we haven't displayed yet. */ num += Hist_print; - + /* If the user repeats this command with return, it should do what "show commands +" does. This is unnecessary if arg is null, because "show commands +" is not useful after "show commands". */ @@ -2200,7 +2200,7 @@ int info_verbose = 0; /* Default verbose msgs off */ /* Called by do_setshow_command. An elaborate joke. */ /* ARGSUSED */ -static void +static void set_verbose (args, from_tty, c) char *args; int from_tty; @@ -2208,7 +2208,7 @@ set_verbose (args, from_tty, c) { char *cmdname = "verbose"; struct cmd_list_element *showcmd; - + showcmd = lookup_cmd_1 (&cmdname, showlist, NULL, 1); if (info_verbose) @@ -2295,7 +2295,7 @@ static void init_main () { struct cmd_list_element *c; - + #ifdef DEFAULT_PROMPT prompt = savestring (DEFAULT_PROMPT, strlen(DEFAULT_PROMPT)); #else @@ -2310,7 +2310,7 @@ init_main () command_editing_p = 1; history_expansion_p = 0; write_history_p = 0; - + /* Setup important stuff for command line editing. */ rl_completion_entry_function = (int (*)()) symbol_completion_function; rl_completer_word_break_characters = gdb_completer_word_break_characters; @@ -2359,7 +2359,7 @@ until the next time it is started.", &cmdlist); "Set gdb's prompt", &setlist), &showlist); - + add_com ("echo", class_support, echo_command, "Print a constant string. Give string as argument.\n\ C escape sequences may be used in the argument.\n\ @@ -2405,7 +2405,7 @@ when gdb is started.", &cmdlist); add_show_from_set (c, &showlist); c->function.sfunc = set_verbose; set_verbose (NULL, 0, c); - + add_show_from_set (add_set_cmd ("editing", class_support, var_boolean, (char *)&command_editing_p, "Set editing of command lines as they are typed.\n\ diff --git a/gnu/usr.bin/gdb/gdb/utils.c b/gnu/usr.bin/gdb/gdb/utils.c index 863cef4..5749013 100644 --- a/gnu/usr.bin/gdb/gdb/utils.c +++ b/gnu/usr.bin/gdb/gdb/utils.c @@ -58,7 +58,7 @@ fatal_dump_core (); /* Can't prototype with <varargs.h> usage... */ static void prompt_for_continue PARAMS ((void)); -static void +static void set_width_command PARAMS ((char *, int, struct cmd_list_element *)); /* If this definition isn't overridden by the header files, assume @@ -493,7 +493,7 @@ pollquit() immediate_quit = 1; quit (); } - else + else { /* We just ignore it */ fprintf_unfiltered (gdb_stderr, "CTRL-A to quit, CTRL-B to quit harder\n"); @@ -516,7 +516,7 @@ void notice_quit() { immediate_quit = 1; } - else + else { fprintf_unfiltered (gdb_stderr, "CTRL-A to quit, CTRL-B to quit harder\n"); } @@ -854,7 +854,7 @@ query (va_alist) break; } if (answer != '\n') /* Eat rest of input line, to EOF or newline */ - do + do { ans2 = fgetc (stdin); clearerr (stdin); @@ -931,7 +931,7 @@ parse_escape (string_ptr) if (c == '?') return 0177; return (c & 0200) | (c & 037); - + case '0': case '1': case '2': @@ -977,7 +977,7 @@ gdb_printchar (c, stream, quoter) c &= 0xFF; /* Avoid sign bit follies */ - if ( c < 0x20 || /* Low control chars */ + if ( c < 0x20 || /* Low control chars */ (c >= 0x7F && c < 0xA0) || /* DEL, High controls */ (sevenbit_strings && c >= 0x80)) { /* high order bit set */ switch (c) @@ -1046,7 +1046,7 @@ static char *wrap_indent; static int wrap_column; /* ARGSUSED */ -static void +static void set_width_command (args, from_tty, c) char *args; int from_tty; @@ -1080,7 +1080,7 @@ prompt_for_continue () strcat (cont_prompt, "\n\032\032prompt-for-continue\n"); /* We must do this *before* we call gdb_readline, else it will eventually - call us -- thinking that we're trying to print beyond the end of the + call us -- thinking that we're trying to print beyond the end of the screen. */ reinitialize_more_filter (); @@ -1128,7 +1128,7 @@ reinitialize_more_filter () } /* Indicate that if the next sequence of characters overflows the line, - a newline should be inserted here rather than when it hits the end. + a newline should be inserted here rather than when it hits the end. If INDENT is non-null, it is a string to be printed to indent the wrapped part on the next line. INDENT must remain accessible until the next call to wrap_here() or until a newline is printed through @@ -1237,7 +1237,7 @@ fputs_maybe_filtered (linebuffer, stream, filter) if (linebuffer == 0) return; - + /* Don't do any filtering if it is disabled. */ if (stream != gdb_stdout || (lines_per_page == UINT_MAX && chars_per_line == UINT_MAX)) @@ -1249,7 +1249,7 @@ fputs_maybe_filtered (linebuffer, stream, filter) /* Go through and output each character. Show line extension when this is necessary; prompt user for new page when this is necessary. */ - + lineptr = linebuffer; while (*lineptr) { @@ -1282,7 +1282,7 @@ fputs_maybe_filtered (linebuffer, stream, filter) chars_printed++; lineptr++; } - + if (chars_printed >= chars_per_line) { unsigned int save_chars = chars_printed; @@ -1308,7 +1308,7 @@ fputs_maybe_filtered (linebuffer, stream, filter) /* FIXME, this strlen is what prevents wrap_indent from containing tabs. However, if we recurse to print it and count its chars, we risk trouble if wrap_indent is - longer than (the user settable) chars_per_line. + longer than (the user settable) chars_per_line. Note also that this can set chars_printed > chars_per_line if we are printing a long string. */ chars_printed = strlen (wrap_indent) @@ -1652,7 +1652,7 @@ fprintf_symbol_filtered (stream, name, lang, arg_mode) /* Do a strcmp() type operation on STRING1 and STRING2, ignoring any differences in whitespace. Returns 0 if they match, non-zero if they don't (slightly different than strcmp()'s range of return values). - + As an extra hack, string1=="FOO(ARGS)" matches string2=="FOO". This "feature" is useful when searching for matching C++ function names (such as if the user types 'break FOO', where FOO is a mangled C++ @@ -1692,7 +1692,7 @@ _initialize_utils () { struct cmd_list_element *c; - c = add_set_cmd ("width", class_support, var_uinteger, + c = add_set_cmd ("width", class_support, var_uinteger, (char *)&chars_per_line, "Set number of characters gdb thinks are in a line.", &setlist); @@ -1704,13 +1704,13 @@ _initialize_utils () var_uinteger, (char *)&lines_per_page, "Set number of lines gdb thinks are in a page.", &setlist), &showlist); - + /* These defaults will be used if we are unable to get the correct values from termcap. */ #if defined(__GO32__) lines_per_page = ScreenRows(); chars_per_line = ScreenCols(); -#else +#else lines_per_page = 24; chars_per_line = 80; /* Initialize the screen height and width from termcap. */ @@ -1730,7 +1730,7 @@ _initialize_utils () if (status > 0) { int val; - + val = tgetnum ("li"); if (val >= 0) lines_per_page = val; @@ -1740,7 +1740,7 @@ _initialize_utils () that paging is not useful (e.g. emacs shell window), so disable paging. */ lines_per_page = UINT_MAX; - + val = tgetnum ("co"); if (val >= 0) chars_per_line = val; @@ -1761,21 +1761,21 @@ _initialize_utils () set_width_command ((char *)NULL, 0, c); add_show_from_set - (add_set_cmd ("demangle", class_support, var_boolean, + (add_set_cmd ("demangle", class_support, var_boolean, (char *)&demangle, "Set demangling of encoded C++ names when displaying symbols.", &setprintlist), &showprintlist); add_show_from_set - (add_set_cmd ("sevenbit-strings", class_support, var_boolean, + (add_set_cmd ("sevenbit-strings", class_support, var_boolean, (char *)&sevenbit_strings, "Set printing of 8-bit characters in strings as \\nnn.", &setprintlist), &showprintlist); add_show_from_set - (add_set_cmd ("asm-demangle", class_support, var_boolean, + (add_set_cmd ("asm-demangle", class_support, var_boolean, (char *)&asm_demangle, "Set demangling of C++ names in disassembly listings.", &setprintlist), diff --git a/gnu/usr.bin/gdb/gdb/valarith.c b/gnu/usr.bin/gdb/gdb/valarith.c index acdf159..8a01b46 100644 --- a/gnu/usr.bin/gdb/gdb/valarith.c +++ b/gnu/usr.bin/gdb/gdb/valarith.c @@ -177,7 +177,7 @@ value_subscripted_rvalue (array, idx) } /* Check to see if either argument is a structure. This is called so - we know whether to go ahead with the normal binop or look for a + we know whether to go ahead with the normal binop or look for a user defined function instead. For now, we do not overload the `=' operator. */ @@ -198,7 +198,7 @@ binop_user_defined_p (op, arg1, arg2) } /* Check to see if argument is a structure. This is called so - we know whether to go ahead with the normal unop or look for a + we know whether to go ahead with the normal unop or look for a user defined function instead. For now, we do not overload the `&' operator. */ @@ -215,7 +215,7 @@ int unop_user_defined_p (op, arg1) } /* We know either arg1 or arg2 is a structure, so try to find the right - user defined function. Create an argument vector that calls + user defined function. Create an argument vector that calls arg1.operator @ (arg1,arg2) and return that value (where '@' is any binary operator which is legal for GNU C++). @@ -249,7 +249,7 @@ value_x_binop (arg1, arg2, op, otherop) argvec[2] = arg2; argvec[3] = 0; - /* make the right function name up */ + /* make the right function name up */ strcpy(tstr, "operator__"); ptr = tstr+8; switch (op) @@ -269,7 +269,7 @@ value_x_binop (arg1, arg2, op, otherop) case BINOP_MIN: strcpy(ptr,"<?"); break; case BINOP_MAX: strcpy(ptr,">?"); break; case BINOP_ASSIGN: strcpy(ptr,"="); break; - case BINOP_ASSIGN_MODIFY: + case BINOP_ASSIGN_MODIFY: switch (otherop) { case BINOP_ADD: strcpy(ptr,"+="); break; @@ -298,7 +298,7 @@ value_x_binop (arg1, arg2, op, otherop) } argvec[0] = value_struct_elt (&arg1, argvec+1, tstr, &static_memfuncp, "structure"); - + if (argvec[0]) { if (static_memfuncp) @@ -315,7 +315,7 @@ value_x_binop (arg1, arg2, op, otherop) } /* We know that arg1 is a structure, so try to find a unary user - defined operator that matches the operator in question. + defined operator that matches the operator in question. Create an argument vector that calls arg1.operator @ (arg1) and return that value (where '@' is (almost) any unary operator which is legal for GNU C++). */ @@ -342,7 +342,7 @@ value_x_unop (arg1, op) argvec[1] = value_addr (arg1); argvec[2] = 0; - /* make the right function name up */ + /* make the right function name up */ strcpy(tstr,"operator__"); ptr = tstr+8; strcpy(mangle_tstr, "__"); @@ -410,7 +410,7 @@ value_concat (arg1, arg2) /* First figure out if we are dealing with two values to be concatenated or a repeat count and a value to be repeated. INVAL1 is set to the first of two concatenated values, or the repeat count. INVAL2 is set - to the second of the two concatenated values or the value to be + to the second of the two concatenated values or the value to be repeated. */ if (TYPE_CODE (VALUE_TYPE (arg2)) == TYPE_CODE_INT) @@ -487,7 +487,7 @@ value_concat (arg1, arg2) } if (TYPE_CODE (VALUE_TYPE (inval2)) == TYPE_CODE_CHAR) { - *(ptr + inval1len) = + *(ptr + inval1len) = (char) unpack_long (VALUE_TYPE (inval2), VALUE_CONTENTS (inval2)); } else @@ -506,7 +506,7 @@ value_concat (arg1, arg2) error ("Bitstrings or booleans can only be concatenated with other bitstrings or booleans."); } error ("unimplemented support for bitstring/boolean concatenation."); - } + } else { /* We don't know how to concatenate these operands. */ @@ -589,25 +589,25 @@ value_binop (arg1, arg2, op) LONGEST v1, v2, v; v1 = value_as_long (arg1); v2 = value_as_long (arg2); - + switch (op) { case BINOP_BITWISE_AND: v = v1 & v2; break; - + case BINOP_BITWISE_IOR: v = v1 | v2; break; - + case BINOP_BITWISE_XOR: v = v1 ^ v2; break; - + default: error ("Invalid operation on booleans."); } - + val = allocate_value (builtin_type_chill_bool); store_signed_integer (VALUE_CONTENTS_RAW (val), TYPE_LENGTH (VALUE_TYPE (val)), @@ -626,29 +626,29 @@ value_binop (arg1, arg2, op) unsigned LONGEST v1, v2, v; v1 = (unsigned LONGEST) value_as_long (arg1); v2 = (unsigned LONGEST) value_as_long (arg2); - + switch (op) { case BINOP_ADD: v = v1 + v2; break; - + case BINOP_SUB: v = v1 - v2; break; - + case BINOP_MUL: v = v1 * v2; break; - + case BINOP_DIV: v = v1 / v2; break; - + case BINOP_REM: v = v1 % v2; break; - + case BINOP_MOD: /* Knuth 1.2.4, integer only. Note that unlike the C '%' op, v1 mod 0 has a defined value, v1. */ @@ -669,43 +669,43 @@ value_binop (arg1, arg2, op) v = v1 - (v2 * v); } break; - + case BINOP_LSH: v = v1 << v2; break; - + case BINOP_RSH: v = v1 >> v2; break; - + case BINOP_BITWISE_AND: v = v1 & v2; break; - + case BINOP_BITWISE_IOR: v = v1 | v2; break; - + case BINOP_BITWISE_XOR: v = v1 ^ v2; break; - + case BINOP_LOGICAL_AND: v = v1 && v2; break; - + case BINOP_LOGICAL_OR: v = v1 || v2; break; - + case BINOP_MIN: v = v1 < v2 ? v1 : v2; break; - + case BINOP_MAX: v = v1 > v2 ? v1 : v2; break; - + default: error ("Invalid binary operation on numbers."); } @@ -732,29 +732,29 @@ value_binop (arg1, arg2, op) LONGEST v1, v2, v; v1 = value_as_long (arg1); v2 = value_as_long (arg2); - + switch (op) { case BINOP_ADD: v = v1 + v2; break; - + case BINOP_SUB: v = v1 - v2; break; - + case BINOP_MUL: v = v1 * v2; break; - + case BINOP_DIV: v = v1 / v2; break; - + case BINOP_REM: v = v1 % v2; break; - + case BINOP_MOD: /* Knuth 1.2.4, integer only. Note that unlike the C '%' op, X mod 0 has a defined value, X. */ @@ -779,43 +779,43 @@ value_binop (arg1, arg2, op) v = v1 - (v2 * v); } break; - + case BINOP_LSH: v = v1 << v2; break; - + case BINOP_RSH: v = v1 >> v2; break; - + case BINOP_BITWISE_AND: v = v1 & v2; break; - + case BINOP_BITWISE_IOR: v = v1 | v2; break; - + case BINOP_BITWISE_XOR: v = v1 ^ v2; break; - + case BINOP_LOGICAL_AND: v = v1 && v2; break; - + case BINOP_LOGICAL_OR: v = v1 || v2; break; - + case BINOP_MIN: v = v1 < v2 ? v1 : v2; break; - + case BINOP_MAX: v = v1 > v2 ? v1 : v2; break; - + default: error ("Invalid binary operation on numbers."); } diff --git a/gnu/usr.bin/gdb/gdb/valops.c b/gnu/usr.bin/gdb/gdb/valops.c index 444ed14..f84db12 100644 --- a/gnu/usr.bin/gdb/gdb/valops.c +++ b/gnu/usr.bin/gdb/gdb/valops.c @@ -207,13 +207,13 @@ value_zero (type, lv) return val; } -/* Return a value with type TYPE located at ADDR. +/* Return a value with type TYPE located at ADDR. Call value_at only if the data needs to be fetched immediately; if we can be 'lazy' and defer the fetch, perhaps indefinately, call value_at_lazy instead. value_at_lazy simply records the address of - the data and sets the lazy-evaluation-required flag. The lazy flag - is tested in the VALUE_CONTENTS macro, which is used if and when + the data and sets the lazy-evaluation-required flag. The lazy flag + is tested in the VALUE_CONTENTS macro, which is used if and when the contents are actually required. */ value_ptr @@ -276,7 +276,7 @@ value_fetch_lazy (val) CORE_ADDR addr = VALUE_ADDRESS (val) + VALUE_OFFSET (val); if (TYPE_LENGTH (VALUE_TYPE (val))) - read_memory (addr, VALUE_CONTENTS_RAW (val), + read_memory (addr, VALUE_CONTENTS_RAW (val), TYPE_LENGTH (VALUE_TYPE (val))); VALUE_LAZY (val) = 0; return 0; @@ -482,7 +482,7 @@ Can't handle bitfield which doesn't fit in a single register."); /* Just find out where to put it. */ get_saved_register ((char *)NULL, &optim, &addr, frame, regno, &lval); - + if (optim) error ("Attempt to assign to a value that was optimized out."); if (lval == lval_memory) @@ -494,7 +494,7 @@ Can't handle bitfield which doesn't fit in a single register."); } } break; - + default: error ("Left operand of assignment is not an lvalue."); @@ -514,7 +514,7 @@ Can't handle bitfield which doesn't fit in a single register."); memcpy (VALUE_CONTENTS_RAW (val), VALUE_CONTENTS (fromval), TYPE_LENGTH (type)); VALUE_TYPE (val) = type; - + return val; } @@ -631,7 +631,7 @@ value_coerce_function (arg1) return value_from_longest (lookup_pointer_type (VALUE_TYPE (arg1)), (LONGEST) (VALUE_ADDRESS (arg1) + VALUE_OFFSET (arg1))); -} +} /* Return a pointer value for the object for which ARG1 is the contents. */ @@ -800,7 +800,7 @@ value_arg_push (sp, arg) return value_push (sp, value_arg_coerce (arg)); } -/* Determine a function's address and its return type from its value. +/* Determine a function's address and its return type from its value. Calls error() if the function is not valid for calling. */ static CORE_ADDR @@ -994,7 +994,7 @@ call_function_by_hand (function, nargs, args) if (struct_return) len += TYPE_LENGTH (value_type); - + for (i = nargs - 1; i >= 0; i--) len += TYPE_LENGTH (VALUE_TYPE (value_arg_coerce (args[i]))); #ifdef CALL_DUMMY_STACK_ADJUST @@ -1072,7 +1072,7 @@ call_function_by_hand (function, nargs, args) it doesn't cost us anything but space and if the function is pcc it will ignore this value, we will make that assumption. - Also note that on some machines (like the sparc) pcc uses a + Also note that on some machines (like the sparc) pcc uses a convention like gcc's. */ if (struct_return) @@ -1220,7 +1220,7 @@ value_array (lowbound, highbound, elemvec) rangetype = create_range_type ((struct type *) NULL, builtin_type_int, lowbound, highbound); - arraytype = create_array_type ((struct type *) NULL, + arraytype = create_array_type ((struct type *) NULL, VALUE_TYPE (elemvec[0]), rangetype); val = value_at_lazy (arraytype, addr); return (val); @@ -1309,7 +1309,7 @@ typecmp (staticp, t1, t2) while (TYPE_CODE (tt1) == TYPE_CODE_PTR && (TYPE_CODE(tt2)==TYPE_CODE_ARRAY || TYPE_CODE(tt2)==TYPE_CODE_PTR)) { - tt1 = TYPE_TARGET_TYPE(tt1); + tt1 = TYPE_TARGET_TYPE(tt1); tt2 = TYPE_TARGET_TYPE(tt2); } if (TYPE_CODE(tt1) == TYPE_CODE(tt2)) continue; @@ -1436,13 +1436,13 @@ search_struct_method (name, arg1p, args, offset, static_memfuncp, type) if (cplus_demangle_opname(t_field_name, dem_opname, DMGL_ANSI)) t_field_name = dem_opname; else if (cplus_demangle_opname(t_field_name, dem_opname, 0)) - t_field_name = dem_opname; + t_field_name = dem_opname; } if (t_field_name && STREQ (t_field_name, name)) { int j = TYPE_FN_FIELDLIST_LENGTH (type, i) - 1; struct fn_field *f = TYPE_FN_FIELDLIST1 (type, i); - name_matched = 1; + name_matched = 1; if (j > 0 && args == 0) error ("cannot resolve overloaded method `%s'", name); @@ -1666,7 +1666,7 @@ check_field_in (type, name) for (i = TYPE_N_BASECLASSES (type) - 1; i >= 0; i--) if (check_field_in (TYPE_BASECLASS (type, i), name)) return 1; - + return 0; } @@ -1725,7 +1725,7 @@ value_struct_elt_for_reference (domain, offset, curtype, name, intype) for (i = TYPE_NFIELDS (t) - 1; i >= TYPE_N_BASECLASSES (t); i--) { char *t_field_name = TYPE_FIELD_NAME (t, i); - + if (t_field_name && STREQ (t_field_name, name)) { if (TYPE_FIELD_STATIC (t, i)) @@ -1741,7 +1741,7 @@ value_struct_elt_for_reference (domain, offset, curtype, name, intype) } if (TYPE_FIELD_PACKED (t, i)) error ("pointers to bitfield members not allowed"); - + return value_from_longest (lookup_reference_type (lookup_member_type (TYPE_FIELD_TYPE (t, i), domain)), @@ -1774,13 +1774,13 @@ value_struct_elt_for_reference (domain, offset, curtype, name, intype) if (cplus_demangle_opname(t_field_name, dem_opname, DMGL_ANSI)) t_field_name = dem_opname; else if (cplus_demangle_opname(t_field_name, dem_opname, 0)) - t_field_name = dem_opname; + t_field_name = dem_opname; } if (t_field_name && STREQ (t_field_name, name)) { int j = TYPE_FN_FIELDLIST_LENGTH (t, i); struct fn_field *f = TYPE_FN_FIELDLIST1 (t, i); - + if (intype == 0 && j > 1) error ("non-unique member `%s' requires type instantiation", name); if (intype) @@ -1793,7 +1793,7 @@ value_struct_elt_for_reference (domain, offset, curtype, name, intype) } else j = 0; - + if (TYPE_FN_FIELD_STUB (f, j)) check_stub_method (t, i, j); if (TYPE_FN_FIELD_VIRTUAL_P (f, j)) diff --git a/gnu/usr.bin/gdb/gdb/valprint.c b/gnu/usr.bin/gdb/gdb/valprint.c index 2214b16..823a8c4 100644 --- a/gnu/usr.bin/gdb/gdb/valprint.c +++ b/gnu/usr.bin/gdb/gdb/valprint.c @@ -139,7 +139,7 @@ val_print (type, valaddr, address, stream, format, deref_ref, recurse, pretty) { pretty = prettyprint_structs ? Val_prettyprint : Val_no_prettyprint; } - + QUIT; /* Ensure that the type is complete and not just a stub. If the type is @@ -153,7 +153,7 @@ val_print (type, valaddr, address, stream, format, deref_ref, recurse, pretty) gdb_flush (stream); return (0); } - + return (LA_VAL_PRINT (type, valaddr, address, stream, format, deref_ref, recurse, pretty)); } @@ -204,7 +204,7 @@ val_print_type_code_int (type, valaddr, stream) in all its bytes more significant than least significant sizeof (LONGEST) ones. */ len = TYPE_LENGTH (type); - + #if TARGET_BYTE_ORDER == BIG_ENDIAN for (p = valaddr; len > sizeof (LONGEST) && p < valaddr + TYPE_LENGTH (type); @@ -416,7 +416,7 @@ print_floating (valaddr, type, stream) double doub; int inv; unsigned len = TYPE_LENGTH (type); - + #if defined (IEEE_FLOAT) /* Check for NaN's. Note that this code does not depend on us being @@ -441,7 +441,7 @@ print_floating (valaddr, type, stream) integer byte order. */ low = extract_unsigned_integer (valaddr, 4); nonnegative = ((low & 0x80000000) == 0); - is_nan = ((((low >> 23) & 0xFF) == 0xFF) + is_nan = ((((low >> 23) & 0xFF) == 0xFF) && 0 != (low & 0x7FFFFF)); low &= 0x7fffff; high = 0; @@ -552,7 +552,7 @@ val_print_array_elements (type, valaddr, address, stream, format, deref_ref, unsigned int rep1; /* Number of repetitions we have detected so far. */ unsigned int reps; - + elttype = TYPE_TARGET_TYPE (type); eltlen = TYPE_LENGTH (elttype); len = TYPE_LENGTH (type) / eltlen; @@ -577,7 +577,7 @@ val_print_array_elements (type, valaddr, address, stream, format, deref_ref, rep1 = i + 1; reps = 1; - while ((rep1 < len) && + while ((rep1 < len) && !memcmp (valaddr + i * eltlen, valaddr + rep1 * eltlen, eltlen)) { ++reps; @@ -623,7 +623,7 @@ value_print_array_elements (val, stream, format, pretty) unsigned int rep1; /* Number of repetitions we have detected so far. */ unsigned int reps; - + n = VALUE_REPETITIONS (val); typelen = TYPE_LENGTH (VALUE_TYPE (val)); for (i = 0; i < n && things_printed < print_max; i++) @@ -633,7 +633,7 @@ value_print_array_elements (val, stream, format, pretty) fprintf_filtered (stream, ", "); } wrap_here (""); - + rep1 = i + 1; reps = 1; while (rep1 < n && !memcmp (VALUE_CONTENTS (val) + typelen * i, @@ -643,7 +643,7 @@ value_print_array_elements (val, stream, format, pretty) ++reps; ++rep1; } - + if (reps > repeat_count_threshold) { val_print (VALUE_TYPE (val), VALUE_CONTENTS (val) + typelen * i, @@ -991,15 +991,15 @@ _initialize_valprint () add_prefix_cmd ("print", no_class, set_print, "Generic command for setting how things print.", &setprintlist, "set print ", 0, &setlist); - add_alias_cmd ("p", "print", no_class, 1, &setlist); - /* prefer set print to set prompt */ + add_alias_cmd ("p", "print", no_class, 1, &setlist); + /* prefer set print to set prompt */ add_alias_cmd ("pr", "print", no_class, 1, &setlist); add_prefix_cmd ("print", no_class, show_print, "Generic command for showing print settings.", &showprintlist, "show print ", 0, &showlist); - add_alias_cmd ("p", "print", no_class, 1, &showlist); - add_alias_cmd ("pr", "print", no_class, 1, &showlist); + add_alias_cmd ("p", "print", no_class, 1, &showlist); + add_alias_cmd ("pr", "print", no_class, 1, &showlist); add_show_from_set (add_set_cmd ("elements", no_class, var_uinteger, (char *)&print_max, @@ -1035,7 +1035,7 @@ _initialize_valprint () "Set printing of unions interior to structures.", &setprintlist), &showprintlist); - + add_show_from_set (add_set_cmd ("array", class_support, var_boolean, (char *)&prettyprint_arrays, diff --git a/gnu/usr.bin/gdb/gdb/value.h b/gnu/usr.bin/gdb/gdb/value.h index 403b661..31d3585 100644 --- a/gnu/usr.bin/gdb/gdb/value.h +++ b/gnu/usr.bin/gdb/gdb/value.h @@ -61,7 +61,7 @@ struct value int regnum; } location; /* Describes offset of a value within lval a structure in bytes. */ - int offset; + int offset; /* Only used for bitfields; number of bits contained in them. */ int bitsize; /* Only used for bitfields; position of start of field. @@ -114,11 +114,11 @@ typedef struct value *value_ptr; #define VALUE_TYPE(val) (val)->type #define VALUE_LAZY(val) (val)->lazy /* VALUE_CONTENTS and VALUE_CONTENTS_RAW both return the address of - the gdb buffer used to hold a copy of the contents of the lval. + the gdb buffer used to hold a copy of the contents of the lval. VALUE_CONTENTS is used when the contents of the buffer are needed -- - it uses value_fetch_lazy() to load the buffer from the process being - debugged if it hasn't already been loaded. VALUE_CONTENTS_RAW is - used when data is being stored into the buffer, or when it is + it uses value_fetch_lazy() to load the buffer from the process being + debugged if it hasn't already been loaded. VALUE_CONTENTS_RAW is + used when data is being stored into the buffer, or when it is certain that the contents of the buffer are valid. */ #define VALUE_CONTENTS_RAW(val) ((char *) (val)->aligner.contents) #define VALUE_CONTENTS(val) ((void)(VALUE_LAZY(val) && value_fetch_lazy(val)),\ @@ -307,7 +307,7 @@ extern value_ptr value_subscript PARAMS ((value_ptr array, value_ptr idx)); extern value_ptr value_from_vtable_info PARAMS ((value_ptr arg, struct type *type)); -extern value_ptr value_being_returned PARAMS ((struct type *valtype, +extern value_ptr value_being_returned PARAMS ((struct type *valtype, char retbuf[REGISTER_BYTES], int struct_return)); diff --git a/gnu/usr.bin/gdb/gdb/values.c b/gnu/usr.bin/gdb/gdb/values.c index 1c833af..3a2dd43 100644 --- a/gnu/usr.bin/gdb/gdb/values.c +++ b/gnu/usr.bin/gdb/gdb/values.c @@ -440,7 +440,7 @@ value_of_internalvar (var) #ifdef IS_TRAPPED_INTERNALVAR if (IS_TRAPPED_INTERNALVAR (var->name)) return VALUE_OF_TRAPPED_INTERNALVAR (var); -#endif +#endif val = value_copy (var->value); if (VALUE_LAZY (val)) @@ -578,7 +578,7 @@ value_as_double (val) { double foo; int inv; - + foo = unpack_double (VALUE_TYPE (val), VALUE_CONTENTS (val), &inv); if (inv) error ("Invalid floating value found in program."); @@ -797,13 +797,13 @@ value_fn_field (arg1p, f, j, type, offset) sym = lookup_symbol (TYPE_FN_FIELD_PHYSNAME (f, j), 0, VAR_NAMESPACE, 0, NULL); - if (! sym) + if (! sym) return NULL; /* error ("Internal error: could not find physical method named %s", TYPE_FN_FIELD_PHYSNAME (f, j)); */ - + v = allocate_value (ftype); VALUE_ADDRESS (v) = BLOCK_START (SYMBOL_BLOCK_VALUE (sym)); VALUE_TYPE (v) = ftype; @@ -814,7 +814,7 @@ value_fn_field (arg1p, f, j, type, offset) *arg1p = value_ind (value_cast (lookup_pointer_type (type), value_addr (*arg1p))); - /* Move the `this' pointer according to the offset. + /* Move the `this' pointer according to the offset. VALUE_OFFSET (*arg1p) += offset; */ } @@ -844,7 +844,7 @@ value_virtual_fn_field (arg1p, f, j, type, offset) should serve just fine as a function type). Then, index into the table, and convert final value to appropriate function type. */ value_ptr entry, vfn, vtbl; - value_ptr vi = value_from_longest (builtin_type_int, + value_ptr vi = value_from_longest (builtin_type_int, (LONGEST) TYPE_FN_FIELD_VOFFSET (f, j)); struct type *fcontext = TYPE_FN_FIELD_FCONTEXT (f, j); struct type *context; @@ -870,7 +870,7 @@ value_virtual_fn_field (arg1p, f, j, type, offset) /* The virtual function table is now an array of structures which have the form { int16 offset, delta; void *pfn; }. */ - vtbl = value_ind (value_primitive_field (arg1, 0, + vtbl = value_ind (value_primitive_field (arg1, 0, TYPE_VPTR_FIELDNO (context), TYPE_VPTR_BASETYPE (context))); @@ -884,7 +884,7 @@ value_virtual_fn_field (arg1p, f, j, type, offset) { /* Move the `this' pointer according to the virtual function table. */ VALUE_OFFSET (arg1) += value_as_long (value_field (entry, 0)); - + if (! VALUE_LAZY (arg1)) { VALUE_LAZY (arg1) = 1; @@ -956,7 +956,7 @@ value_headof (in_arg, btype, dtype) nelems = longest_to_int (value_as_long (value_field (entry, 2))); for (i = 1; i <= nelems; i++) { - entry = value_subscript (vtbl, value_from_longest (builtin_type_int, + entry = value_subscript (vtbl, value_from_longest (builtin_type_int, (LONGEST) i)); /* This won't work if we're using thunks. */ if (TYPE_CODE (VALUE_TYPE (entry)) != TYPE_CODE_STRUCT) @@ -1331,7 +1331,7 @@ value_from_longest (type, num) case TYPE_CODE_RANGE: store_signed_integer (VALUE_CONTENTS_RAW (val), len, num); break; - + case TYPE_CODE_REF: case TYPE_CODE_PTR: /* This assumes that all pointers of a given length diff --git a/gnu/usr.bin/gdb/gdb/wait.h b/gnu/usr.bin/gdb/gdb/wait.h index a72943c..10a5eb0 100644 --- a/gnu/usr.bin/gdb/gdb/wait.h +++ b/gnu/usr.bin/gdb/gdb/wait.h @@ -8,13 +8,13 @@ /* The following macros are defined equivalently to their definitions in POSIX.1. We fail to define WNOHANG and WUNTRACED, which POSIX.1 <sys/wait.h> defines, since our code does not use waitpid(). We - also fail to declare wait() and waitpid(). */ + also fail to declare wait() and waitpid(). */ #define WIFEXITED(w) (((w)&0377) == 0) #define WIFSIGNALED(w) (((w)&0377) != 0177 && ((w)&~0377) == 0) #ifdef IBM6000 -/* Unfortunately, the above comment (about being compatible in all Unix +/* Unfortunately, the above comment (about being compatible in all Unix systems) is not quite correct for AIX, sigh. And AIX 3.2 can generate status words like 0x57c (sigtrap received after load), and gdb would choke on it. */ diff --git a/gnu/usr.bin/gdb/libiberty/argv.c b/gnu/usr.bin/gdb/libiberty/argv.c index 300ada2..f344255 100644 --- a/gnu/usr.bin/gdb/libiberty/argv.c +++ b/gnu/usr.bin/gdb/libiberty/argv.c @@ -307,7 +307,7 @@ static char *tests[] = "arg 'Jack said \\'hi\\'' has single quotes", "arg 'Jack said \\\"hi\\\"' has double quotes", "a b c d e f g h i j k l m n o p q r s t u v w x y z 1 2 3 4 5 6 7 8 9", - + /* This should be expanded into only one argument. */ "trailing-whitespace ", diff --git a/gnu/usr.bin/gdb/libiberty/cplus-dem.c b/gnu/usr.bin/gdb/libiberty/cplus-dem.c index 5465fd8..cc9edf0 100644 --- a/gnu/usr.bin/gdb/libiberty/cplus-dem.c +++ b/gnu/usr.bin/gdb/libiberty/cplus-dem.c @@ -1,8 +1,8 @@ -/* Demangler for GNU C++ +/* Demangler for GNU C++ Copyright 1989, 1991 Free Software Foundation, Inc. Written by James Clark (jjc@jclark.uucp) Rewritten by Fred Fish (fnf@cygnus.com) for ARM and Lucid demangling - + This file is part of the libiberty library. Libiberty is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -319,7 +319,7 @@ cplus_demangle_opname (opname, result, options) result[0] = '\0'; ret = 0; work->options = options; - + if (opname[0] == '_' && opname[1] == '_' && opname[2] == 'o' && opname[3] == 'p') { @@ -367,12 +367,12 @@ cplus_demangle_opname (opname, result, options) strcat (result, optable[i].out); ret = 1; break; - } + } } } } } - else if (len >= 3 + else if (len >= 3 && opname[0] == 'o' && opname[1] == 'p' && strchr (cplus_markers, opname[2]) != NULL) @@ -400,7 +400,7 @@ cplus_demangle_opname (opname, result, options) for (i = 0; i < sizeof (optable) / sizeof (optable[0]); i++) { len1 = len - 3; - if (strlen (optable[i].in) == len1 + if (strlen (optable[i].in) == len1 && memcmp (optable[i].in, opname + 3, len1) == 0) { strcat (result, "operator"); @@ -482,7 +482,7 @@ int cplus_match (mangled, text, text_len) DMGL_PARAMS Function parameters are included. For example, - + cplus_demangle ("foo__1Ai", DMGL_PARAMS) => "A::foo(int)" cplus_demangle ("foo__1Ai", DMGL_PARAMS | DMGL_ANSI) => "A::foo(int)" cplus_demangle ("foo__1Ai", 0) => "A::foo" @@ -511,7 +511,7 @@ cplus_demangle (mangled, options) work -> options = options; if ((work->options & DMGL_STYLE_MASK) == 0) work->options |= (int)current_demangling_style & DMGL_STYLE_MASK; - + string_init (&decl); /* First check to see if gnu style demangling is active and if the @@ -557,16 +557,16 @@ mop_up (work, declp, success) char *demangled = NULL; /* Discard the remembered types, if any. */ - + forget_types (work); if (work -> typevec != NULL) { free ((char *) work -> typevec); } - + /* If demangling was successful, ensure that the demangled string is null terminated and return it. Otherwise, free the demangling decl. */ - + if (!success) { string_delete (declp); @@ -640,7 +640,7 @@ demangle_signature (work, mangled, declp) } oldmangled = NULL; break; - + case 'S': /* Static member function */ if (oldmangled == NULL) @@ -660,7 +660,7 @@ demangle_signature (work, mangled, declp) (*mangled)++; work -> const_type = 1; break; - + case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': if (oldmangled == NULL) @@ -678,7 +678,7 @@ demangle_signature (work, mangled, declp) } oldmangled = NULL; break; - + case 'F': /* Function */ /* ARM style demangling includes a specific 'F' character after @@ -701,10 +701,10 @@ demangle_signature (work, mangled, declp) } success = demangle_args (work, mangled, declp); break; - + case 't': /* G++ Template */ - string_init(&trawname); + string_init(&trawname); string_init(&tname); if (oldmangled == NULL) { @@ -901,7 +901,7 @@ demangle_template (work, mangled, tname, trawname) } string_append (tname, "="); while (*old_p && !done) - { + { switch (*old_p) { case 'P': @@ -954,7 +954,7 @@ demangle_template (work, mangled, tname, trawname) string_appendn (tname, "-", 1); (*mangled)++; } - while (isdigit (**mangled)) + while (isdigit (**mangled)) { string_appendn (tname, *mangled, 1); (*mangled)++; @@ -967,7 +967,7 @@ demangle_template (work, mangled, tname, trawname) string_appendn (tname, "-", 1); (*mangled)++; } - while (isdigit (**mangled)) + while (isdigit (**mangled)) { string_appendn (tname, *mangled, 1); (*mangled)++; @@ -976,7 +976,7 @@ demangle_template (work, mangled, tname, trawname) { string_appendn (tname, ".", 1); (*mangled)++; - while (isdigit (**mangled)) + while (isdigit (**mangled)) { string_appendn (tname, *mangled, 1); (*mangled)++; @@ -986,7 +986,7 @@ demangle_template (work, mangled, tname, trawname) { string_appendn (tname, "e", 1); (*mangled)++; - while (isdigit (**mangled)) + while (isdigit (**mangled)) { string_appendn (tname, *mangled, 1); (*mangled)++; @@ -1009,7 +1009,7 @@ demangle_template (work, mangled, tname, trawname) if (tname->p[-1] == '>') string_append (tname, " "); string_append (tname, ">"); - + /* if (work -> static_type) { @@ -1160,7 +1160,7 @@ demangle_class (work, mangled, declp) } else { - work -> constructor -= 1; + work -> constructor -= 1; } } string_prepend (declp, "::"); @@ -1198,7 +1198,7 @@ DESCRIPTION the mangled name. Upon exit, it should point to the first character of the signature if demangling was successful, or to the first unconsumed character if demangling of the prefix was unsuccessful. - + Returns 1 on success, 0 otherwise. */ @@ -1265,10 +1265,10 @@ demangle_prefix (work, mangled, declp) i = strspn (scan, "_"); if (i > 2) { - scan += (i - 2); + scan += (i - 2); } } - + if (scan == NULL) { success = 0; @@ -1292,7 +1292,7 @@ demangle_prefix (work, mangled, declp) consume_count (mangled); string_append (declp, *mangled); *mangled += strlen (*mangled); - success = 1; + success = 1; } else { @@ -1354,7 +1354,7 @@ demangle_prefix (work, mangled, declp) string_append (declp, *mangled); *mangled += strlen (*mangled); success = 1; - } + } return (success); } @@ -1708,7 +1708,7 @@ demangle_qualified (work, mangled, result, isfuncname, append) if (!success) break; } else - { + { namelength = consume_count (mangled); if (strlen (*mangled) < namelength) { @@ -1740,7 +1740,7 @@ demangle_qualified (work, mangled, result, isfuncname, append) string_appendn (&temp, (*mangled) - namelength, namelength); } - /* Now either prepend the temp buffer to the result, or append it, + /* Now either prepend the temp buffer to the result, or append it, depending upon the state of the append flag. */ if (append) @@ -1796,12 +1796,12 @@ get_count (type, count) { p = *type; n = *count; - do + do { n *= 10; n += *p - '0'; p++; - } + } while (isdigit (*p)); if (*p == '_') { @@ -1867,7 +1867,7 @@ do_type (work, mangled, result) if (**mangled == '_') { string_appendn (&decl, p, *mangled - p); - string_append (&decl, "]"); + string_append (&decl, "]"); *mangled += 1; } else @@ -2331,7 +2331,7 @@ demangle_args (work, mangled, declp) if ((**mangled == 'N') || (**mangled == 'T')) { temptype = *(*mangled)++; - + if (temptype == 'N') { if (!get_count (mangled, &r)) @@ -2459,7 +2459,7 @@ demangle_function_name (work, mangled, declp, scan) } } - if (declp->p - declp->b >= 3 + if (declp->p - declp->b >= 3 && declp->b[0] == 'o' && declp->b[1] == 'p' && strchr (cplus_markers, declp->b[2]) != NULL) @@ -2487,7 +2487,7 @@ demangle_function_name (work, mangled, declp, scan) for (i = 0; i < sizeof (optable) / sizeof (optable[0]); i++) { int len = declp->p - declp->b - 3; - if (strlen (optable[i].in) == len + if (strlen (optable[i].in) == len && memcmp (optable[i].in, declp->b + 3, len) == 0) { string_clear (declp); @@ -2558,7 +2558,7 @@ demangle_function_name (work, mangled, declp, scan) string_append (declp, "operator"); string_append (declp, optable[i].out); break; - } + } } } } @@ -2612,7 +2612,7 @@ string_init (s) s->b = s->p = s->e = NULL; } -static void +static void string_clear (s) string *s; { @@ -2748,7 +2748,7 @@ static void usage (stream, status) FILE *stream; int status; -{ +{ fprintf (stream, "\ Usage: %s [-_] [-n] [-s {gnu,lucid,arm}] [--strip-underscores]\n\ [--no-strip-underscores] [--format={gnu,lucid,arm}]\n\ @@ -2853,7 +2853,7 @@ main (argc, argv) { int skip_first = strip_underscore && i > 1 && mbuffer[0] == '_'; mbuffer[i] = 0; - + result = cplus_demangle (mbuffer+skip_first, DMGL_PARAMS | DMGL_ANSI); if (result) diff --git a/gnu/usr.bin/gdb/libiberty/fdmatch.c b/gnu/usr.bin/gdb/libiberty/fdmatch.c index 10033d4..3a0218a 100644 --- a/gnu/usr.bin/gdb/libiberty/fdmatch.c +++ b/gnu/usr.bin/gdb/libiberty/fdmatch.c @@ -32,7 +32,7 @@ DESCRIPTION Check to see if two open file descriptors refer to the same file. This is useful, for example, when we have an open file descriptor - for an unnamed file, and the name of a file that we believe to + for an unnamed file, and the name of a file that we believe to correspond to that fd. This can happen when we are exec'd with an already open file (stdout for example) or from the SVR4 /proc calls that return open file descriptors for mapped address spaces. diff --git a/gnu/usr.bin/gdb/libiberty/ieee-float.c b/gnu/usr.bin/gdb/libiberty/ieee-float.c index b50eb85..040f783 100644 --- a/gnu/usr.bin/gdb/libiberty/ieee-float.c +++ b/gnu/usr.bin/gdb/libiberty/ieee-float.c @@ -33,7 +33,7 @@ ieee_extended_to_double (ext_format, from, to) unsigned char *ufrom = (unsigned char *)from; double dto; unsigned long mant0, mant1, exponent; - + memcpy (&mant0, &from[MANBYTE_H], 4); memcpy (&mant1, &from[MANBYTE_L], 4); exponent = ((ufrom[EXPBYTE_H] & (unsigned char)~SIGNMASK) << 8) | ufrom[EXPBYTE_L]; @@ -43,7 +43,7 @@ ieee_extended_to_double (ext_format, from, to) difference. It will end up as Infinity or something close. */ if (exponent == EXT_EXP_NAN) { /* We have a NaN source. */ - dto = 0.123456789; /* Not much else useful to do -- we don't know if + dto = 0.123456789; /* Not much else useful to do -- we don't know if the host system even *has* NaNs, nor how to generate an innocuous one if it does. */ } else @@ -118,7 +118,7 @@ double_to_ieee_extended (ext_format, from, to) /* OK, now store it in extended format. */ to[EXPBYTE_H] |= (unsigned char)(exponent >> 8); /* Retain sign */ to[EXPBYTE_L] = (unsigned char) exponent; - + memcpy (&to[MANBYTE_H], &mant0, 4); memcpy (&to[MANBYTE_L], &mant1, 4); } diff --git a/gnu/usr.bin/gdb/libiberty/sigsetmask.c b/gnu/usr.bin/gdb/libiberty/sigsetmask.c index 545b12e..5c9e8fa 100644 --- a/gnu/usr.bin/gdb/libiberty/sigsetmask.c +++ b/gnu/usr.bin/gdb/libiberty/sigsetmask.c @@ -19,7 +19,7 @@ License along with libiberty; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* Set the current signal mask to the set provided, and return the +/* Set the current signal mask to the set provided, and return the previous value */ #define _POSIX_SOURCE @@ -33,7 +33,7 @@ DEFUN(sigsetmask,(set), { sigset_t new; sigset_t old; - + sigemptyset (&new); if (set != 0) { abort(); /* FIXME, we don't know how to translate old mask to new */ diff --git a/gnu/usr.bin/gdb/libiberty/spaces.c b/gnu/usr.bin/gdb/libiberty/spaces.c index 6b1c9d1..884c960 100644 --- a/gnu/usr.bin/gdb/libiberty/spaces.c +++ b/gnu/usr.bin/gdb/libiberty/spaces.c @@ -32,7 +32,7 @@ DESCRIPTION Returns a pointer to a memory region filled with the specified number of spaces and null terminated. The returned pointer is valid until at least the next call. - + BUGS */ diff --git a/gnu/usr.bin/gdb/libiberty/strerror.c b/gnu/usr.bin/gdb/libiberty/strerror.c index 5c0a58d..29a4e4a 100644 --- a/gnu/usr.bin/gdb/libiberty/strerror.c +++ b/gnu/usr.bin/gdb/libiberty/strerror.c @@ -666,7 +666,7 @@ strerror (errnoval) /* In range, and a valid message. Just return the message. */ msg = (char *) sys_errlist[errnoval]; } - + return (msg); } diff --git a/gnu/usr.bin/gdb/libiberty/strsignal.c b/gnu/usr.bin/gdb/libiberty/strsignal.c index 7acb733..815af83 100644 --- a/gnu/usr.bin/gdb/libiberty/strsignal.c +++ b/gnu/usr.bin/gdb/libiberty/strsignal.c @@ -448,7 +448,7 @@ strsignal (signo) /* In range, and a valid message. Just return the message. */ msg = (const char *) sys_siglist[signo]; } - + return (msg); } diff --git a/gnu/usr.bin/gdb/libiberty/xmalloc.c b/gnu/usr.bin/gdb/libiberty/xmalloc.c index b15b27c..a750339 100644 --- a/gnu/usr.bin/gdb/libiberty/xmalloc.c +++ b/gnu/usr.bin/gdb/libiberty/xmalloc.c @@ -1,6 +1,6 @@ /* memory allocation routines with error checking. Copyright 1989, 90, 91, 92, 93, 94 Free Software Foundation, Inc. - + This file is part of the libiberty library. Libiberty is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/gnu/usr.bin/gdb/mmalloc/attach.c b/gnu/usr.bin/gdb/mmalloc/attach.c index 6737fca..a1b6686 100644 --- a/gnu/usr.bin/gdb/mmalloc/attach.c +++ b/gnu/usr.bin/gdb/mmalloc/attach.c @@ -155,7 +155,7 @@ mmalloc_attach (fd, baseaddr) Note that we have to update the file descriptor number in the malloc- descriptor read from the file to match the current valid one, before trying to map the file in, and again after a successful mapping and - after we've switched over to using the mapped in malloc descriptor + after we've switched over to using the mapped in malloc descriptor rather than the temporary one on the stack. Once we've switched over to using the mapped in malloc descriptor, we diff --git a/gnu/usr.bin/gdb/mmalloc/detach.c b/gnu/usr.bin/gdb/mmalloc/detach.c index 03d632c..7f7f685 100644 --- a/gnu/usr.bin/gdb/mmalloc/detach.c +++ b/gnu/usr.bin/gdb/mmalloc/detach.c @@ -48,10 +48,10 @@ mmalloc_detach (md) { mtemp = *(struct mdesc *) md; - + /* Now unmap all the pages associated with this region by asking for a negative increment equal to the current size of the region. */ - + if ((mtemp.morecore (&mtemp, mtemp.base - mtemp.top)) == NULL) { /* Update the original malloc descriptor with any changes */ diff --git a/gnu/usr.bin/gdb/mmalloc/keys.c b/gnu/usr.bin/gdb/mmalloc/keys.c index 69d41b9..c9ef0e6 100644 --- a/gnu/usr.bin/gdb/mmalloc/keys.c +++ b/gnu/usr.bin/gdb/mmalloc/keys.c @@ -35,7 +35,7 @@ Cambridge, MA 02139, USA. */ int mmalloc_setkey (md, keynum, key) - PTR md; + PTR md; int keynum; PTR key; { @@ -52,7 +52,7 @@ mmalloc_setkey (md, keynum, key) PTR mmalloc_getkey (md, keynum) - PTR md; + PTR md; int keynum; { struct mdesc *mdp = (struct mdesc *) md; diff --git a/gnu/usr.bin/gdb/mmalloc/mfree.c b/gnu/usr.bin/gdb/mmalloc/mfree.c index aee43aa..16328be 100644 --- a/gnu/usr.bin/gdb/mmalloc/mfree.c +++ b/gnu/usr.bin/gdb/mmalloc/mfree.c @@ -221,7 +221,7 @@ mfree (md, ptr) ptr = l -> exact; break; } - } + } if (mdp -> mfree_hook != NULL) { (*mdp -> mfree_hook) (md, ptr); diff --git a/gnu/usr.bin/gdb/mmalloc/mmalloc.c b/gnu/usr.bin/gdb/mmalloc/mmalloc.c index 46b450e..491aa16 100644 --- a/gnu/usr.bin/gdb/mmalloc/mmalloc.c +++ b/gnu/usr.bin/gdb/mmalloc/mmalloc.c @@ -60,7 +60,7 @@ initialize (mdp) struct mdesc *mdp; { mdp -> heapsize = HEAP / BLOCKSIZE; - mdp -> heapinfo = (malloc_info *) + mdp -> heapinfo = (malloc_info *) align (mdp, mdp -> heapsize * sizeof (malloc_info)); if (mdp -> heapinfo == NULL) { @@ -143,7 +143,7 @@ mmalloc (md, size) } mdp = MD_TO_MDP (md); - + if (mdp -> mmalloc_hook != NULL) { return ((*mdp -> mmalloc_hook) (md, size)); diff --git a/gnu/usr.bin/gdb/mmalloc/mmalloc.h b/gnu/usr.bin/gdb/mmalloc/mmalloc.h index 54b6ed6..34ba775 100644 --- a/gnu/usr.bin/gdb/mmalloc/mmalloc.h +++ b/gnu/usr.bin/gdb/mmalloc/mmalloc.h @@ -206,7 +206,7 @@ struct mdesc needs to be maintained on a per-process basis. */ PTR (*morecore) PARAMS ((struct mdesc *, int)); - + /* Pointer to the function that causes an abort when the memory checking features are activated. By default this is set to abort(), but can be set to another function by the application using mmalloc(). diff --git a/gnu/usr.bin/grep/dfa.c b/gnu/usr.bin/grep/dfa.c index 4a02d0d..0409b1e 100644 --- a/gnu/usr.bin/grep/dfa.c +++ b/gnu/usr.bin/grep/dfa.c @@ -549,7 +549,7 @@ lex() notset(ccl); laststart = 0; return lasttok = CSET + charclass_index(ccl); - + case '[': if (backslash) goto normal_char; @@ -1907,7 +1907,7 @@ dfacomp(s, len, d, searchflag) copy = malloc(len); if (!copy) dfaerror("out of memory"); - + /* This is a kludge. */ case_fold = 0; for (i = 0; i < len; ++i) @@ -1997,9 +1997,9 @@ dfafree(d) Type left right is in ---- ---- ----- -- -- char c # c # c # c # c - + CSET ZERO ZERO ZERO ZERO - + STAR ZERO ZERO ZERO ZERO QMARK ZERO ZERO ZERO ZERO @@ -2010,12 +2010,12 @@ dfafree(d) p->left : q->right : q->is!=ZERO) ? q->in plus p->is##q->left p->right##q->is p->is##q->is : p->right##q->left ZERO - + OR longest common longest common (do p->is and substrings common to leading trailing q->is have same p->in and q->in - (sub)sequence (sub)sequence length and - of p->left of p->right content) ? - and q->left and q->right p->is : NULL + (sub)sequence (sub)sequence length and + of p->left of p->right content) ? + and q->left and q->right p->is : NULL If there's anything else we recognize in the tree, all four sequences get set to zero-length sequences. If there's something we don't recognize in the tree, @@ -2042,7 +2042,7 @@ dfafree(d) Does optimization actually accomplish anything, or is the automaton you get from "psi|epsilon" (for example) the same as the one you get from "psi" (for example)? - + Are optimizable r.e.'s likely to be used in real-life situations (something like 'ab*' is probably unlikely; something like is 'psi|epsilon' is likelier)? */ diff --git a/gnu/usr.bin/grep/grep.c b/gnu/usr.bin/grep/grep.c index 07872a1..dc33298 100644 --- a/gnu/usr.bin/grep/grep.c +++ b/gnu/usr.bin/grep/grep.c @@ -90,7 +90,7 @@ memchr(vp, c, n) return 0; } #endif - + /* Define flags declared in grep.h. */ char *matcher; int match_icase; @@ -591,7 +591,7 @@ setmatcher(name) return 1; } return 0; -} +} int main(argc, argv) diff --git a/gnu/usr.bin/grep/kwset.c b/gnu/usr.bin/grep/kwset.c index 9b09071..afbeb64 100644 --- a/gnu/usr.bin/grep/kwset.c +++ b/gnu/usr.bin/grep/kwset.c @@ -758,7 +758,7 @@ cwexec(kws, text, len, kwsmatch) } return mch; } - + /* Search through the given text for a match of any member of the given keyword set. Return a pointer to the first character of the matching substring, or NULL if no match is found. If FOUNDLEN diff --git a/gnu/usr.bin/grep/obstack.h b/gnu/usr.bin/grep/obstack.h index 8a18e45..09d2c32 100644 --- a/gnu/usr.bin/grep/obstack.h +++ b/gnu/usr.bin/grep/obstack.h @@ -321,7 +321,7 @@ __extension__ \ /* These assume that the obstack alignment is good enough for pointers or ints, and that the data added so far to the current object shares that much alignment. */ - + #define obstack_ptr_grow(OBSTACK,datum) \ __extension__ \ ({ struct obstack *__o = (OBSTACK); \ diff --git a/gnu/usr.bin/grep/search.c b/gnu/usr.bin/grep/search.c index 43c2d12..2b89338 100644 --- a/gnu/usr.bin/grep/search.c +++ b/gnu/usr.bin/grep/search.c @@ -128,7 +128,7 @@ kwsinit() if (!(kwset = kwsalloc(match_icase ? trans : (char *) 0))) fatal("memory exhausted", 0); -} +} /* If the DFA turns out to have some set of fixed strings one of which must occur in the match, then we build a kwset matcher diff --git a/gnu/usr.bin/groff/Makefile b/gnu/usr.bin/groff/Makefile index 23d24f6..5cb5306 100644 --- a/gnu/usr.bin/groff/Makefile +++ b/gnu/usr.bin/groff/Makefile @@ -7,7 +7,7 @@ SUBDIR= libgroff libdriver libbib\ devX100 devX100-12 devX75 devX75-12 devascii devdvi devlatin1 \ devkoi8-r devps tmac mm man xditview -# BSD already provides soelim +# BSD already provides soelim MISC= soelim .include <bsd.subdir.mk> diff --git a/gnu/usr.bin/groff/Makefile.comm b/gnu/usr.bin/groff/Makefile.comm index 63c80ab..b3d24af 100644 --- a/gnu/usr.bin/groff/Makefile.comm +++ b/gnu/usr.bin/groff/Makefile.comm @@ -1,18 +1,18 @@ # Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc. # Written by James Clark (jjc@jclark.com) -# +# # This file is part of groff. -# +# # groff is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free # Software Foundation; either version 2, or (at your option) any later # version. -# +# # groff is distributed in the hope that it will be useful, but WITHOUT ANY # WARRANTY; without even the implied warranty of MERCHANTABILITY or # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # for more details. -# +# # You should have received a copy of the GNU General Public License along # with groff; see the file COPYING. If not, write to the Free Software # Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. @@ -187,7 +187,7 @@ install_prog: .PHONY: uninstall_prog uninstall_prog: - -rm -f $(bindir)/$(NAMEPREFIX)$(PROG) + -rm -f $(bindir)/$(NAMEPREFIX)$(PROG) .PHONY: install_dev install_dev: diff --git a/gnu/usr.bin/groff/Makefile.in b/gnu/usr.bin/groff/Makefile.in index 59dc524..321fc2e 100644 --- a/gnu/usr.bin/groff/Makefile.in +++ b/gnu/usr.bin/groff/Makefile.in @@ -1,18 +1,18 @@ # Copyright (C) 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc. # Written by James Clark (jjc@jclark.com) -# +# # This file is part of groff. -# +# # groff is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free # Software Foundation; either version 2, or (at your option) any later # version. -# +# # groff is distributed in the hope that it will be useful, but WITHOUT ANY # WARRANTY; without even the implied warranty of MERCHANTABILITY or # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # for more details. -# +# # You should have received a copy of the GNU General Public License along # with groff; see the file COPYING. If not, write to the Free Software # Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. @@ -161,7 +161,7 @@ man7dir=$(manroot)/man$(man7ext) # (Reiser) preprocessor. # -DLONG_FOR_TIME_T if localtime() takes a long * not a time_t * # -DHAVE_STRUCT_EXCEPTION if <math.h> defines struct exception -# -DRETSIGTYPE=int if signal handlers return int not void +# -DRETSIGTYPE=int if signal handlers return int not void DEFINES=@DEFS@ # Include fmod.o, strtol.o, getcwd.o, strerror.o, putenv.o in LIBOBJS if @@ -260,7 +260,7 @@ $(TARGETS): dot: FORCE @$(MAKE) $(MDEFINES) srcdir=$(srcdir) VPATH=$(srcdir) \ -f $(srcdir)/Makefile.comm -f $(srcdir)/Makefile.sub $(do) - + $(LIBDIRS): FORCE @if test $(srcdir) = .; \ then srcdir=.; \ diff --git a/gnu/usr.bin/groff/Makefile.init b/gnu/usr.bin/groff/Makefile.init index 8d93c93..dfcf0dd 100644 --- a/gnu/usr.bin/groff/Makefile.init +++ b/gnu/usr.bin/groff/Makefile.init @@ -1,18 +1,18 @@ # Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc. # Written by James Clark (jjc@jclark.com) -# +# # This file is part of groff. -# +# # groff is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free # Software Foundation; either version 2, or (at your option) any later # version. -# +# # groff is distributed in the hope that it will be useful, but WITHOUT ANY # WARRANTY; without even the implied warranty of MERCHANTABILITY or # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # for more details. -# +# # You should have received a copy of the GNU General Public License along # with groff; see the file COPYING. If not, write to the Free Software # Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. diff --git a/gnu/usr.bin/groff/addftinfo/guess.h b/gnu/usr.bin/groff/addftinfo/guess.h index 6712045..f13767c 100644 --- a/gnu/usr.bin/groff/addftinfo/guess.h +++ b/gnu/usr.bin/groff/addftinfo/guess.h @@ -40,5 +40,5 @@ struct char_metric { int left_ic; int sk; }; - + void guess(const char *s, const font_params ¶m, char_metric *metric); diff --git a/gnu/usr.bin/groff/devascii/Makefile b/gnu/usr.bin/groff/devascii/Makefile index 47057d8..b57a34d 100644 --- a/gnu/usr.bin/groff/devascii/Makefile +++ b/gnu/usr.bin/groff/devascii/Makefile @@ -1,4 +1,4 @@ -# Makefile for devascii +# Makefile for devascii DEVICE= ascii diff --git a/gnu/usr.bin/groff/doc/Makefile b/gnu/usr.bin/groff/doc/Makefile index 0d4088d..2d9ae08 100644 --- a/gnu/usr.bin/groff/doc/Makefile +++ b/gnu/usr.bin/groff/doc/Makefile @@ -43,7 +43,7 @@ meref.PS: meref.dit meintro.PS: meintro.dit install: - + clean: -rm -f *.PS *.dit core diff --git a/gnu/usr.bin/groff/eqn/Makefile b/gnu/usr.bin/groff/eqn/Makefile index ff5500d..fa1784b 100644 --- a/gnu/usr.bin/groff/eqn/Makefile +++ b/gnu/usr.bin/groff/eqn/Makefile @@ -3,7 +3,7 @@ PROG= eqn SRCS= main.cc lex.cc box.cc limit.cc list.cc over.cc text.cc\ script.cc mark.cc other.cc delim.cc sqrt.cc pile.cc special.cc -OBJS= eqn.o +OBJS= eqn.o CFLAGS+= -I. -I${.CURDIR}/../include LDADD+= ${LIBGROFF} DPADD+= ${LIBGROFF} diff --git a/gnu/usr.bin/groff/include/cset.h b/gnu/usr.bin/groff/include/cset.h index f454cc5..b160782 100644 --- a/gnu/usr.bin/groff/include/cset.h +++ b/gnu/usr.bin/groff/include/cset.h @@ -24,7 +24,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef UCHAR_MAX #define UCHAR_MAX 255 #endif -#endif /* not HAVE_CC_LIMITS_H */ +#endif /* not HAVE_CC_LIMITS_H */ enum cset_builtin { CSET_BUILTIN }; diff --git a/gnu/usr.bin/groff/include/stringclass.h b/gnu/usr.bin/groff/include/stringclass.h index cf4da4b..9f85233 100644 --- a/gnu/usr.bin/groff/include/stringclass.h +++ b/gnu/usr.bin/groff/include/stringclass.h @@ -44,7 +44,7 @@ public: string(char); ~string(); - + string &operator=(const string &); string &operator=(const char *); string &operator=(char); @@ -53,7 +53,7 @@ public: string &operator+=(const char *); string &operator+=(char); void append(const char *, int); - + int length() const; int empty() const; int operator*() const; @@ -75,7 +75,7 @@ public: friend string operator+(const char *, const string &); friend string operator+(const string &, char); friend string operator+(char, const string &); - + friend int operator==(const string &, const string &); friend int operator!=(const string &, const string &); friend int operator<=(const string &, const string &); @@ -158,13 +158,13 @@ inline string operator+(char c, const string &s) inline int operator==(const string &s1, const string &s2) { - return (s1.len == s2.len + return (s1.len == s2.len && (s1.len == 0 || memcmp(s1.ptr, s2.ptr, s1.len) == 0)); } inline int operator!=(const string &s1, const string &s2) { - return (s1.len != s2.len + return (s1.len != s2.len || (s1.len != 0 && memcmp(s1.ptr, s2.ptr, s1.len) != 0)); } diff --git a/gnu/usr.bin/groff/libgroff/Makefile b/gnu/usr.bin/groff/libgroff/Makefile index ba150356..7463a60 100644 --- a/gnu/usr.bin/groff/libgroff/Makefile +++ b/gnu/usr.bin/groff/libgroff/Makefile @@ -10,7 +10,7 @@ SRCS+= iftoa.c itoa.c matherr.c CFLAGS+= -I$(.CURDIR)/../include NOMAN= noman -NOPROFILE= noprofile +NOPROFILE= noprofile CLEANFILES+= version.cc version.cc: $(.CURDIR)/../VERSION diff --git a/gnu/usr.bin/groff/libgroff/iftoa.c b/gnu/usr.bin/groff/libgroff/iftoa.c index ac37183..2b16ab2 100644 --- a/gnu/usr.bin/groff/libgroff/iftoa.c +++ b/gnu/usr.bin/groff/libgroff/iftoa.c @@ -23,7 +23,7 @@ char *iftoa(i, decimal_point) int i, decimal_point; { /* room for a -, INT_DIGITS digits, a decimal point, and a terminating '\0' */ - static char buf[INT_DIGITS + 3]; + static char buf[INT_DIGITS + 3]; char *p = buf + INT_DIGITS + 2; int point = 0; buf[INT_DIGITS + 2] = '\0'; diff --git a/gnu/usr.bin/groff/libgroff/strtol.c b/gnu/usr.bin/groff/libgroff/strtol.c index ffe354e..3caf4e2 100644 --- a/gnu/usr.bin/groff/libgroff/strtol.c +++ b/gnu/usr.bin/groff/libgroff/strtol.c @@ -94,7 +94,7 @@ long strtol(str, ptr, base) } if (neg) val = -val; - + while (*++str != '\0') { int n; @@ -123,7 +123,7 @@ long strtol(str, ptr, base) val = val*base + n; } } - + if (ptr) *ptr = str; diff --git a/gnu/usr.bin/groff/mm/Makefile b/gnu/usr.bin/groff/mm/Makefile index 3091676..f2ea0b3 100644 --- a/gnu/usr.bin/groff/mm/Makefile +++ b/gnu/usr.bin/groff/mm/Makefile @@ -3,7 +3,7 @@ TMACGRP?= bin TMACMODE?= 444 TMACDIR?= /usr/share/tmac -FILES= 0.MT 5.MT 4.MT ms.cov se_ms.cov +FILES= 0.MT 5.MT 4.MT ms.cov se_ms.cov LOCALE= locale se_locale MAN7= groff_mm.7 groff_mmse.7 diff --git a/gnu/usr.bin/groff/mm/Makefile.sub b/gnu/usr.bin/groff/mm/Makefile.sub index 25b5ba0..7ca7eed 100644 --- a/gnu/usr.bin/groff/mm/Makefile.sub +++ b/gnu/usr.bin/groff/mm/Makefile.sub @@ -1,6 +1,6 @@ # MAN7=groff_mm.n groff_mmse.n -FILES=0.MT 5.MT 4.MT ms.cov se_ms.cov +FILES=0.MT 5.MT 4.MT ms.cov se_ms.cov # Local configuration files with default values. LOCALE = locale se_locale CLEANADD=temp diff --git a/gnu/usr.bin/groff/pic/Makefile.sub b/gnu/usr.bin/groff/pic/Makefile.sub index 06d1975..d8ed426 100644 --- a/gnu/usr.bin/groff/pic/Makefile.sub +++ b/gnu/usr.bin/groff/pic/Makefile.sub @@ -2,7 +2,7 @@ PROG=pic MAN1=pic.n XLIBS=$(LIBGROFF) MLIB=$(LIBM) -OBJS=pic.o lex.o main.o object.o common.o troff.o tex.o # fig.o +OBJS=pic.o lex.o main.o object.o common.o troff.o tex.o # fig.o CCSRCS=lex.cc main.cc object.cc common.cc troff.cc tex.cc HDRS=common.h object.h output.h pic.h position.h text.h GRAM=pic.y diff --git a/gnu/usr.bin/groff/pic/pic.h b/gnu/usr.bin/groff/pic/pic.h index 30c2cd5..11979d9 100644 --- a/gnu/usr.bin/groff/pic/pic.h +++ b/gnu/usr.bin/groff/pic/pic.h @@ -94,7 +94,7 @@ void lex_cleanup(); extern int flyback_flag; extern int command_char; -// zero_length_line_flag is non-zero if zero-length lines are drawn +// zero_length_line_flag is non-zero if zero-length lines are drawn // as dots by the output device extern int zero_length_line_flag; extern int driver_extension_flag; diff --git a/gnu/usr.bin/groff/psbb/psbb.c b/gnu/usr.bin/groff/psbb/psbb.c index 4df1562..8879cc8 100644 --- a/gnu/usr.bin/groff/psbb/psbb.c +++ b/gnu/usr.bin/groff/psbb/psbb.c @@ -65,7 +65,7 @@ char **argv; printf("%d %d %d %d\n", bb.llx, bb.lly, bb.urx, bb.ury); exit(0); } - + /* If the bounding box was found return NULL, and store the bounding box in bb. If the bounding box was not found return a string suitable for giving to printf with the filename as an argument saying why not. */ diff --git a/gnu/usr.bin/groff/tbl/table.h b/gnu/usr.bin/groff/tbl/table.h index f97ab7b..3912d9a 100644 --- a/gnu/usr.bin/groff/tbl/table.h +++ b/gnu/usr.bin/groff/tbl/table.h @@ -49,12 +49,12 @@ struct entry_modifier { }; enum format_type { - FORMAT_LEFT, - FORMAT_CENTER, - FORMAT_RIGHT, + FORMAT_LEFT, + FORMAT_CENTER, + FORMAT_RIGHT, FORMAT_NUMERIC, FORMAT_ALPHABETIC, - FORMAT_SPAN, + FORMAT_SPAN, FORMAT_VSPAN, FORMAT_HLINE, FORMAT_DOUBLE_HLINE diff --git a/gnu/usr.bin/groff/troff/charinfo.h b/gnu/usr.bin/groff/troff/charinfo.h index 38e9e8f..3dc131b 100644 --- a/gnu/usr.bin/groff/troff/charinfo.h +++ b/gnu/usr.bin/groff/troff/charinfo.h @@ -34,7 +34,7 @@ class charinfo { char transparent_translate; // non-zero means translation applies to // to transparent throughput public: - enum { + enum { ENDS_SENTENCE = 1, BREAK_BEFORE = 2, BREAK_AFTER = 4, diff --git a/gnu/usr.bin/groff/troff/env.h b/gnu/usr.bin/groff/troff/env.h index 14441e1..40ce6b8 100644 --- a/gnu/usr.bin/groff/troff/env.h +++ b/gnu/usr.bin/groff/troff/env.h @@ -199,7 +199,7 @@ public: unsigned char control_char; unsigned char no_break_control_char; charinfo *hyphen_indicator_char; - + environment(symbol); environment(const environment *); // for temporary environment ~environment(); @@ -231,7 +231,7 @@ public: hunits get_prev_char_skew(); vunits get_prev_char_height(); vunits get_prev_char_depth(); - hunits get_text_length(); // .k + hunits get_text_length(); // .k hunits get_prev_text_length(); // .n hunits get_space_width() { return env_space_width(this); } int get_space_size() { return space_size; } // in ems/36 @@ -277,7 +277,7 @@ public: const char *get_point_size_string(); const char *get_requested_point_size_string(); void output_pending_lines(); - + friend void title_length(); friend void space_size(); friend void fill(); @@ -314,7 +314,7 @@ public: friend void widow_control_request(); #endif /* WIDOW_CONTROL */ }; - + extern environment *curenv; extern void pop_env(); extern void push_env(int); diff --git a/gnu/usr.bin/groff/troff/token.h b/gnu/usr.bin/groff/troff/token.h index f8a319a..2c160e5 100644 --- a/gnu/usr.bin/groff/troff/token.h +++ b/gnu/usr.bin/groff/troff/token.h @@ -51,7 +51,7 @@ class token { TOKEN_RIGHT_BRACE, TOKEN_SPACE, // ` ' -- ordinary space TOKEN_SPECIAL, // a special character -- \' \` \- \(xx - TOKEN_SPREAD, // \p -- break and spread output line + TOKEN_SPREAD, // \p -- break and spread output line TOKEN_TAB, // tab TOKEN_TRANSPARENT, // \! TOKEN_EOF // end of file @@ -114,12 +114,12 @@ void interpolate_number_reg(symbol, int); const char *asciify(int c); inline int token::newline() -{ - return type == TOKEN_NEWLINE; +{ + return type == TOKEN_NEWLINE; } inline int token::space() -{ +{ return type == TOKEN_SPACE; } @@ -149,7 +149,7 @@ inline int token::page_ejector() inline unsigned char token::ch() { return type == TOKEN_CHAR ? c : 0; -} +} inline int token::eof() { diff --git a/gnu/usr.bin/groff/xditview/Dvi.c b/gnu/usr.bin/groff/xditview/Dvi.c index 1748509..86bb511 100644 --- a/gnu/usr.bin/groff/xditview/Dvi.c +++ b/gnu/usr.bin/groff/xditview/Dvi.c @@ -56,7 +56,7 @@ SS -adobe-symbol-medium-r-normal--*-100-*-*-*-*-adobe-fontspecific\n\ #define MY_WIDTH(dw) ((int)(dw->dvi.paperwidth * dw->dvi.scale_factor + .5)) #define MY_HEIGHT(dw) ((int)(dw->dvi.paperlength * dw->dvi.scale_factor + .5)) -static XtResource resources[] = { +static XtResource resources[] = { {XtNfontMap, XtCFontMap, XtRString, sizeof (char *), offset(dvi.font_map_string), XtRString, default_font_map}, {XtNforeground, XtCForeground, XtRPixel, sizeof (unsigned long), @@ -96,7 +96,7 @@ static void SaveToFile (); DviClassRec dviClassRec = { { - &widgetClassRec, /* superclass */ + &widgetClassRec, /* superclass */ "Dvi", /* class_name */ sizeof(DviRec), /* size */ ClassInitialize, /* class_initialize */ @@ -254,7 +254,7 @@ Redisplay(w, event, region) { DviWidget dw = (DviWidget) w; XRectangle extents; - + XClipBox (region, &extents); dw->dvi.extents.x1 = extents.x; dw->dvi.extents.y1 = extents.y; @@ -430,7 +430,7 @@ ShowDvi (dw) } FindPage (dw); - + dw->dvi.display_enable = 1; ParseInput (dw); if (dw->dvi.last_page && dw->dvi.requested_page > dw->dvi.last_page) @@ -465,7 +465,7 @@ FindPage (dw) FileSeek (dw, file_position); dw->dvi.current_page = i; - + dw->dvi.display_enable = 0; while (dw->dvi.current_page != dw->dvi.requested_page) { dw->dvi.current_page = ParseInput (dw); @@ -531,7 +531,7 @@ void ClassPartInitialize(widget_class) if (wc->command_class.save == InheritSaveToFile) wc->command_class.save = super->command_class.save; } - + /* Local Variables: c-indent-level: 8 diff --git a/gnu/usr.bin/groff/xditview/DviChar.c b/gnu/usr.bin/groff/xditview/DviChar.c index cd84d35..f6d2569 100644 --- a/gnu/usr.bin/groff/xditview/DviChar.c +++ b/gnu/usr.bin/groff/xditview/DviChar.c @@ -110,7 +110,7 @@ compute_hash (map) h->name = map->dvi_names[c][s]; h->position = c; } - + } int diff --git a/gnu/usr.bin/groff/xditview/DviP.h b/gnu/usr.bin/groff/xditview/DviP.h index c3b7d2c..a1c3495 100644 --- a/gnu/usr.bin/groff/xditview/DviP.h +++ b/gnu/usr.bin/groff/xditview/DviP.h @@ -2,7 +2,7 @@ * $XConsortium: DviP.h,v 1.5 89/07/22 19:44:08 keith Exp $ */ -/* +/* * DviP.h - Private definitions for Dvi widget */ @@ -51,7 +51,7 @@ extern DviClassRec dviClassRec; /*************************************** * - * Instance (widget) structure + * Instance (widget) structure * **************************************/ diff --git a/gnu/usr.bin/groff/xditview/Makefile b/gnu/usr.bin/groff/xditview/Makefile index c646258..24bf879 100644 --- a/gnu/usr.bin/groff/xditview/Makefile +++ b/gnu/usr.bin/groff/xditview/Makefile @@ -15,7 +15,7 @@ CFLAGS+= -I${X11BASE}/include -DFONTPATH=\"$(fontpath)\" SRCS+= xditview.c Dvi.c draw.c font.c lex.c page.c parse.c \ XFontName.c DviChar.c device.c LDDESTDIR+= -L${X11BASE}/lib -LDADD+= -lXaw -lXmu -lXt -lXext -lX11 -lm +LDADD+= -lXaw -lXmu -lXt -lXext -lX11 -lm DPADD+= ${X11BASE}/lib/libXaw.a ${X11BASE}/lib/libXmu.a \ ${X11BASE}/lib/libXt.a ${X11BASE}/lib/libXext.a \ ${X11BASE}/lib/libX11.a diff --git a/gnu/usr.bin/groff/xditview/XFontName.c b/gnu/usr.bin/groff/xditview/XFontName.c index 5ca9bb8..0aa7618 100644 --- a/gnu/usr.bin/groff/xditview/XFontName.c +++ b/gnu/usr.bin/groff/xditview/XFontName.c @@ -143,7 +143,7 @@ XFormatFontName (fontName, fontNameAttributes, fontNameString) return False; \ while (*f) \ if ((*name++ = *f++) == '-') \ - return False; + return False; #define PutHyphen()\ if (--left < 0) \ return False; \ diff --git a/gnu/usr.bin/groff/xditview/device.c b/gnu/usr.bin/groff/xditview/device.c index d14c538..6410472 100644 --- a/gnu/usr.bin/groff/xditview/device.c +++ b/gnu/usr.bin/groff/xditview/device.c @@ -89,7 +89,7 @@ void device_destroy(dev) Device *dev; { DeviceFont *f; - + if (!dev) return; f = dev->fonts; @@ -98,7 +98,7 @@ void device_destroy(dev) f = f->next; delete_font(tem); } - + XtFree(dev->name); XtFree((char *)dev); } @@ -138,7 +138,7 @@ Device *device_load(name) np = &dev->paperwidth; else if (strcmp(p, "paperlength") == 0) np = &dev->paperlength; - + if (np) { q = strtok((char *)0, WS); if (!q || sscanf(q, "%d", np) != 1 || *np <= 0) { @@ -146,7 +146,7 @@ Device *device_load(name) err = 1; break; } - } + } } } fclose(fp); @@ -387,7 +387,7 @@ int device_font_special(f) { return f->special; } - + static struct charinfo *add_char(f, name, width, code) DeviceFont *f; @@ -396,18 +396,18 @@ struct charinfo *add_char(f, name, width, code) { struct charinfo **pp; struct charinfo *ci; - + name = canonicalize_name(name); if (strcmp(name, "---") == 0) name = ""; ci = (struct charinfo *)XtMalloc(XtOffsetOf(struct charinfo, name[0]) + strlen(name) + 1); - + strcpy(ci->name, name); ci->width = width; ci->code = code; - + if (*name != '\0') { pp = &f->char_table[hash_name(name) % CHAR_TABLE_SIZE]; ci->next = *pp; @@ -486,30 +486,30 @@ FILE *find_file(file, path, result) int bufsiz = 0; int flen; FILE *fp; - + *result = NULL; - + if (file == NULL) return NULL; if (*file == '\0') return NULL; - + if (*file == '/') { fp = fopen(file, "r"); if (fp) *result = XtNewString(file); return fp; } - + flen = strlen(file); - + if (!path) return NULL; - + while (*path) { int len; char *start, *end; - + start = path; end = strchr(path, ':'); if (end) diff --git a/gnu/usr.bin/groff/xditview/draw.c b/gnu/usr.bin/groff/xditview/draw.c index 7715cde..04f76c8 100644 --- a/gnu/usr.bin/groff/xditview/draw.c +++ b/gnu/usr.bin/groff/xditview/draw.c @@ -102,7 +102,7 @@ FlushCharCache (dw) XDrawText (XtDisplay (dw), XtWindow (dw), dw->dvi.normal_GC, dw->dvi.cache.start_x, dw->dvi.cache.start_y, dw->dvi.cache.cache, dw->dvi.cache.index + 1); - } + } dw->dvi.cache.index = 0; dw->dvi.cache.max = DVI_TEXT_CACHE_SIZE; #if 0 @@ -135,7 +135,7 @@ Word (dw) :\ (fi)->max_bounds.width\ ) - + static int charExists (fi, c) @@ -161,7 +161,7 @@ DoCharacter (dw, c, wid) register XFontStruct *font; register XTextItem *text; int x, y; - + x = XPos(dw); y = YPos(dw); @@ -176,7 +176,7 @@ DoCharacter (dw, c, wid) #endif )) return; - + if (y != dw->dvi.cache.y || dw->dvi.cache.char_index >= DVI_CHAR_CACHE_SIZE) { FlushCharCache (dw); @@ -362,7 +362,7 @@ PutNumberedCharacter (dw, c) dw->dvi.device_font = QueryDeviceFont (dw, dw->dvi.device_font_number); } - + if (dw->dvi.device_font == 0 || !device_code_width (dw->dvi.device_font, dw->dvi.state->font_size, c, &wid)) @@ -398,14 +398,14 @@ setGC (dw) DviWidget dw; { int desired_line_width; - + if (dw->dvi.line_thickness < 0) desired_line_width = (int)(((double)dw->dvi.device_resolution * dw->dvi.state->font_size) / (10.0*72.0*dw->dvi.sizescale)); else desired_line_width = dw->dvi.line_thickness; - + if (desired_line_width != dw->dvi.line_width) { XGCValues values; values.line_width = DeviceToX(dw, desired_line_width); @@ -422,7 +422,7 @@ setFillGC (dw) DviWidget dw; { int fill_type; - + if (dw->dvi.fill == DVI_FILL_MAX) fill_type = DVI_FILL_BLACK; else if (dw->dvi.fill == 0) @@ -528,11 +528,11 @@ DrawArc (dw, x0, y0, x1, y1) return; angle1 = (int)(atan2 ((double)y0, (double)-x0)*180.0*64.0/M_PI); angle2 = (int)(atan2 ((double)-y1, (double)x1)*180.0*64.0/M_PI); - + angle2 -= angle1; if (angle2 < 0) angle2 += 64*360; - + AdjustCacheDeltas (dw); setGC (dw); @@ -551,9 +551,9 @@ DrawPolygon (dw, v, n) XPoint *p; int i; int dx, dy; - + n /= 2; - + AdjustCacheDeltas (dw); setGC (dw); p = (XPoint *)XtMalloc((n + 2)*sizeof(XPoint)); @@ -583,11 +583,11 @@ DrawFilledPolygon (dw, v, n) XPoint *p; int i; int dx, dy; - + n /= 2; if (n < 2) return; - + AdjustCacheDeltas (dw); setFillGC (dw); p = (XPoint *)XtMalloc((n + 1)*sizeof(XPoint)); @@ -633,10 +633,10 @@ flattenCurve(points, pointi, x2, y2, x3, y3, x4, y4) x1 = points[*pointi - 1].x; y1 = points[*pointi - 1].y; - + dx = x4 - x1; dy = y4 - y1; - + n1 = dy*(x2 - x1) - dx*(y2 - y1); n2 = dy*(x3 - x1) - dx*(y3 - y1); if (n1 < 0) @@ -670,7 +670,7 @@ DrawSpline (dw, v, n) int i; int pointi; XPoint points[POINTS_MAX]; - + if (n == 0 || (n & 1) != 0) return; AdjustCacheDeltas (dw); @@ -683,12 +683,12 @@ DrawSpline (dw, v, n) sy = oy; tx = sx + DeviceToX (dw, dx); ty = sy + DeviceToX (dw, dy); - + pointi = 0; - + appendPoint (points, &pointi, sx, sy); appendPoint (points, &pointi, (sx + tx)/2, (sy + ty)/2); - + for (i = 2; i < n; i += 2) { int ux = ox + DeviceToX (dw, dx += v[i]); int uy = oy + DeviceToX (dw, dy += v[i+1]); @@ -701,9 +701,9 @@ DrawSpline (dw, v, n) tx = ux; ty = uy; } - + appendPoint (points, &pointi, tx, ty); - + XDrawLines (XtDisplay (dw), XtWindow (dw), dw->dvi.normal_GC, points, pointi, CoordModeOrigin); } diff --git a/gnu/usr.bin/groff/xditview/font.c b/gnu/usr.bin/groff/xditview/font.c index ecfba4e..3778eec 100644 --- a/gnu/usr.bin/groff/xditview/font.c +++ b/gnu/usr.bin/groff/xditview/font.c @@ -66,7 +66,7 @@ LookupFontSizeBySize (dw, f, size) unsigned int fontNameAttributes; char fontNameString[2048]; int decipointsize; - + if (f->scalable) { decipointsize = (10*size)/dw->dvi.sizescale; for (best = f->sizes; best; best = best->next) @@ -251,7 +251,7 @@ InstallFont (dw, position, dvi_name, x_name) f->char_map = DviFindMap (encoding); } else f->char_map = 0; - /* + /* * force requery of fonts */ dw->dvi.font = 0; @@ -267,7 +267,7 @@ ForgetFonts (dw) DviWidget dw; { DviFontList *f = dw->dvi.fonts; - + while (f) { DviFontList *tem = f; @@ -280,8 +280,8 @@ ForgetFonts (dw) f = f->next; XtFree ((char *) tem); } - - /* + + /* * force requery of fonts */ dw->dvi.font = 0; @@ -300,7 +300,7 @@ MapDviNameToXName (dw, dvi_name) char *dvi_name; { DviFontMap *fm; - + for (fm = dw->dvi.font_map; fm; fm=fm->next) if (!strcmp (fm->dvi_name, dvi_name)) return fm->x_name; @@ -314,7 +314,7 @@ MapXNameToDviName (dw, x_name) char *x_name; { DviFontMap *fm; - + for (fm = dw->dvi.font_map; fm; fm=fm->next) if (!strcmp (fm->x_name, x_name)) return fm->dvi_name; diff --git a/gnu/usr.bin/groff/xditview/lex.c b/gnu/usr.bin/groff/xditview/lex.c index 32831bd..854f7cb 100644 --- a/gnu/usr.bin/groff/xditview/lex.c +++ b/gnu/usr.bin/groff/xditview/lex.c @@ -27,9 +27,9 @@ GetLine(dw, Buffer, Length) int Length; { int i = 0, c; - + Length--; /* Save room for final '\0' */ - + while (DviGetC (dw, &c) != EOF) { if (Buffer && i < Length) Buffer[i++] = c; @@ -41,7 +41,7 @@ GetLine(dw, Buffer, Length) if (Buffer) Buffer[i] = '\0'; return Buffer; -} +} char * GetWord(dw, Buffer, Length) @@ -50,7 +50,7 @@ GetWord(dw, Buffer, Length) int Length; { int i = 0, c; - + Length--; /* Save room for final '\0' */ while (DviGetC(dw, &c) == ' ' || c == '\n') ; @@ -65,7 +65,7 @@ GetWord(dw, Buffer, Length) if (Buffer) Buffer[i] = '\0'; return Buffer; -} +} GetNumber(dw) DviWidget dw; @@ -90,7 +90,7 @@ GetNumber(dw) DviUngetC(dw, c); return i; } - + /* Local Variables: c-indent-level: 8 diff --git a/gnu/usr.bin/groff/xditview/parse.c b/gnu/usr.bin/groff/xditview/parse.c index 8367c17..58928f0 100644 --- a/gnu/usr.bin/groff/xditview/parse.c +++ b/gnu/usr.bin/groff/xditview/parse.c @@ -37,7 +37,7 @@ ParseInput(dw) push_env (dw); for (;;) { switch (DviGetC(dw, &c)) { - case '\n': + case '\n': break; case ' ': /* when input is text */ case 0: /* occasional noise creeps in */ @@ -206,13 +206,13 @@ char *buf; int v[DRAW_ARGS_MAX]; int i; char *ptr; - + v[0] = v[1] = v[2] = v[3] = 0; - + if (buf[0] == '\0') return; ptr = buf+1; - + for (i = 0; i < DRAW_ARGS_MAX; i++) { if (sscanf(ptr, "%d", v + i) != 1) break; @@ -221,7 +221,7 @@ char *buf; while (*ptr != '\0' && *ptr != ' ') ptr++; } - + switch (buf[0]) { case 'l': /* draw a line */ DrawLine(dw, v[0], v[1]); @@ -263,7 +263,7 @@ char *buf; #endif break; } - + if (buf[0] == 'e') { if (i > 0) dw->dvi.state->x += v[0]; @@ -276,7 +276,7 @@ char *buf; dw->dvi.state->x += v[i]; } } -} +} static ParseDeviceControl(dw) /* Parse the x commands */ diff --git a/gnu/usr.bin/groff/xditview/xditview.c b/gnu/usr.bin/groff/xditview/xditview.c index 6894cee..f800d09 100644 --- a/gnu/usr.bin/groff/xditview/xditview.c +++ b/gnu/usr.bin/groff/xditview/xditview.c @@ -20,7 +20,7 @@ * */ /* - * xditview -- + * xditview -- * * Display ditroff output in an X window */ @@ -189,11 +189,11 @@ void main(argc, argv) XCreateBitmapFromData (XtDisplay (toplevel), XtScreen(toplevel)->root, xdit_bits, xdit_width, xdit_height)); - + XtSetArg (topLevelArgs[1], XtNiconMask, XCreateBitmapFromData (XtDisplay (toplevel), XtScreen(toplevel)->root, - xdit_mask_bits, + xdit_mask_bits, xdit_mask_width, xdit_mask_height)); XtSetValues (toplevel, topLevelArgs, 2); if (argc > 1) @@ -205,7 +205,7 @@ void main(argc, argv) simpleMenu = XtCreatePopupShell ("menu", simpleMenuWidgetClass, toplevel, NULL, 0); for (i = 0; i < XtNumber (menuEntries); i++) { - entry = XtCreateManagedWidget(menuEntries[i].name, + entry = XtCreateManagedWidget(menuEntries[i].name, smeBSBObjectClass, simpleMenu, NULL, (Cardinal) 0); XtAddCallback(entry, XtNcallback, menuEntries[i].function, NULL); @@ -413,7 +413,7 @@ RerasterizeAction() if (current_file_name[0] == 0) { /* XXX display an error message */ return; - } + } XtSetArg (args[0], XtNpageNumber, &number); XtGetValues (dvi, args, 1); NewFile(current_file_name); @@ -525,7 +525,7 @@ char *def; Dimension center_width, center_height; Dimension prompt_width, prompt_height; Widget valueWidget; - + CancelAction ((Widget)NULL, (XEvent *) 0, (String *) 0, (Cardinal *) 0); promptShell = XtCreatePopupShell ("promptShell", transientShellWidgetClass, toplevel, NULL, (Cardinal) 0); diff --git a/gnu/usr.bin/groff/xditview/xtotroff.c b/gnu/usr.bin/groff/xditview/xtotroff.c index 16e8c26..15841f8 100644 --- a/gnu/usr.bin/groff/xditview/xtotroff.c +++ b/gnu/usr.bin/groff/xditview/xtotroff.c @@ -12,7 +12,7 @@ #ifdef X_NOT_STDC_ENV char *malloc(); -#else +#else #include <stdlib.h> #endif @@ -145,7 +145,7 @@ MapFont (font_name, troff_name) fprintf (stderr, "font does not exist: %s\n", names[0]); return 0; } - + printf ("%s -> %s\n", names[0], troff_name); (void) unlink (troff_name); @@ -189,7 +189,7 @@ MapFont (font_name, troff_name) fprintf (out, ",%d", param[k]); } fprintf (out, "\t0\t0%o\n", c); - + if (name) { for (k = 1; DviCharName(char_map,c,k); k++) { fprintf (out, "%s\t\"\n", diff --git a/gnu/usr.bin/gzip/bits.c b/gnu/usr.bin/gzip/bits.c index 544d6da..fae1780 100644 --- a/gnu/usr.bin/gzip/bits.c +++ b/gnu/usr.bin/gzip/bits.c @@ -60,7 +60,7 @@ #endif #ifdef RCSID -static char rcsid[] = "$Id: bits.c,v 0.9 1993/06/11 10:16:58 jloup Exp $"; +static char rcsid[] = "$Id: bits.c,v 1.3 1993/10/14 00:32:24 nate Exp $"; #endif /* =========================================================================== @@ -186,7 +186,7 @@ void copy_block(buf, len, header) bi_windup(); /* align on byte boundary */ if (header) { - put_short((ush)len); + put_short((ush)len); put_short((ush)~len); #ifdef DEBUG bits_sent += 2*16; diff --git a/gnu/usr.bin/gzip/deflate.c b/gnu/usr.bin/gzip/deflate.c index 7f52b64..0bc0ed4 100644 --- a/gnu/usr.bin/gzip/deflate.c +++ b/gnu/usr.bin/gzip/deflate.c @@ -68,7 +68,7 @@ #include "lzw.h" /* just for consistency checking */ #ifdef RCSID -static char rcsid[] = "$Id: deflate.c,v 0.15 1993/06/24 10:53:53 jloup Exp $"; +static char rcsid[] = "$Id: deflate.c,v 1.3 1993/10/14 00:32:29 nate Exp $"; #endif /* =========================================================================== @@ -623,7 +623,7 @@ local ulg deflate_fast() * the next lookahead bytes will be emitted as literals. */ } while (--match_length != 0); - strstart++; + strstart++; } else { strstart += match_length; match_length = 0; @@ -638,7 +638,7 @@ local ulg deflate_fast() Tracevv((stderr,"%c",window[strstart])); flush = ct_tally (0, window[strstart]); lookahead--; - strstart++; + strstart++; } if (flush) FLUSH_BLOCK(0), block_start = strstart; diff --git a/gnu/usr.bin/gzip/gzip.c b/gnu/usr.bin/gzip/gzip.c index 09fe9a1..846b69e 100644 --- a/gnu/usr.bin/gzip/gzip.c +++ b/gnu/usr.bin/gzip/gzip.c @@ -39,13 +39,13 @@ static char *license_msg[] = { * example, foo.txt -> foo.tgz (.tgz must be reserved as shorthand for * tar.gz). Similarly, foo.dir and foo.doc would both be mapped to foo.dgz. * I also considered 12345678.txt -> 12345txt.gz but this truncates the name - * too heavily. There is no ideal solution given the MSDOS 8+3 limitation. + * too heavily. There is no ideal solution given the MSDOS 8+3 limitation. * * For the meaning of all compilation flags, see comments in Makefile.in. */ #ifdef RCSID -static char rcsid[] = "$Id: gzip.c,v 0.24 1993/06/24 10:52:07 jloup Exp $"; +static char rcsid[] = "$Id: gzip.c,v 1.3 1993/10/14 00:32:48 nate Exp $"; #endif #include <ctype.h> @@ -804,7 +804,7 @@ local void treat_file(iname) if (!save_orig_name) save_orig_name = !no_name; if (verbose) { - fprintf(stderr, "%s:\t%s", ifname, (int)strlen(ifname) >= 15 ? + fprintf(stderr, "%s:\t%s", ifname, (int)strlen(ifname) >= 15 ? "" : ((int)strlen(ifname) >= 7 ? "\t" : "\t\t")); } @@ -1654,7 +1654,7 @@ local void treat_dir(dir) int len; dirp = opendir(dir); - + if (dirp == NULL) { fprintf(stderr, "%s: %s unreadable\n", progname, dir); exit_code = ERROR; @@ -1675,7 +1675,7 @@ local void treat_dir(dir) ** think it's worth it. -- Dave Mack ** (An other alternative might be two passes to avoid depth-first.) */ - + while ((dp = readdir(dirp)) != NULL) { if (strequ(dp->d_name,".") || strequ(dp->d_name,"..")) { diff --git a/gnu/usr.bin/gzip/gzip.h b/gnu/usr.bin/gzip/gzip.h index 88b0710..1ec96cb 100644 --- a/gnu/usr.bin/gzip/gzip.h +++ b/gnu/usr.bin/gzip/gzip.h @@ -28,10 +28,10 @@ # define memzero(s, n) memset ((voidp)(s), 0, (n)) #else # include <strings.h> -# define strchr index +# define strchr index # define strrchr rindex -# define memcpy(d, s, n) bcopy((s), (d), (n)) -# define memcmp(s1, s2, n) bcmp((s1), (s2), (n)) +# define memcpy(d, s, n) bcopy((s), (d), (n)) +# define memcmp(s1, s2, n) bcmp((s1), (s2), (n)) # define memzero(s, n) bzero((s), (n)) #endif diff --git a/gnu/usr.bin/gzip/inflate.c b/gnu/usr.bin/gzip/inflate.c index ede3656..a53d013 100644 --- a/gnu/usr.bin/gzip/inflate.c +++ b/gnu/usr.bin/gzip/inflate.c @@ -43,7 +43,7 @@ chunks), otherwise the dynamic method is used. In the latter case, the codes are customized to the probabilities in the current block, and so can code it much better than the pre-determined fixed codes. - + The Huffman codes themselves are decoded using a mutli-level table lookup, in order to maximize the speed of decoding plus the speed of building the decoding tables. See the comments below that precede the @@ -97,7 +97,7 @@ */ #ifdef RCSID -static char rcsid[] = "$Id: inflate.c,v 0.14 1993/06/10 13:27:04 jloup Exp $"; +static char rcsid[] = "$Id: inflate.c,v 1.3 1993/10/14 00:32:55 nate Exp $"; #endif #include <sys/types.h> @@ -175,7 +175,7 @@ static ush cpdext[] = { /* Extra bits for distance codes */ /* Macros for inflate() bit peeking and grabbing. The usage is: - + NEEDBITS(j) x = b & mask_bits[j]; DUMPBITS(j) @@ -307,7 +307,7 @@ int *m; /* maximum lookup bits, returns actual */ memzero(c, sizeof(c)); p = b; i = n; do { - Tracecv(*p, (stderr, (n-i >= ' ' && n-i <= '~' ? "%c %d\n" : "0x%x %d\n"), + Tracecv(*p, (stderr, (n-i >= ' ' && n-i <= '~' ? "%c %d\n" : "0x%x %d\n"), n-i, *p)); c[*p]++; /* assume all entries <= BMAX */ p++; /* Can't combine with above line (Solaris bug) */ @@ -482,7 +482,7 @@ struct huft *t; /* table to free */ q = (--p)->v.t; free((char*)p); p = q; - } + } return 0; } diff --git a/gnu/usr.bin/gzip/tailor.h b/gnu/usr.bin/gzip/tailor.h index a97d8be..840733a 100644 --- a/gnu/usr.bin/gzip/tailor.h +++ b/gnu/usr.bin/gzip/tailor.h @@ -8,7 +8,7 @@ * The target dependent functions should be defined in tailor.c. */ -/* $Id: tailor.h,v 0.18 1993/06/14 19:32:20 jloup Exp $ */ +/* $Id: tailor.h,v 1.3 1993/10/14 00:33:08 nate Exp $ */ #if defined(__MSDOS__) && !defined(MSDOS) # define MSDOS @@ -235,9 +235,9 @@ # define NO_MEMORY_H # define NO_UTIME_H # define NO_UTIME -# define NO_CHOWN -# define NO_STDIN_FSTAT -# define NO_SIZE_CHECK +# define NO_CHOWN +# define NO_STDIN_FSTAT +# define NO_SIZE_CHECK # define NO_SYMLINK # define RECORD_IO 1 # define casemap(c) tolow(c) /* Force file names to lower case */ diff --git a/gnu/usr.bin/gzip/trees.c b/gnu/usr.bin/gzip/trees.c index db3b4b7..d5b41c8 100644 --- a/gnu/usr.bin/gzip/trees.c +++ b/gnu/usr.bin/gzip/trees.c @@ -59,7 +59,7 @@ #include "gzip.h" #ifdef RCSID -static char rcsid[] = "$Id: trees.c,v 0.12 1993/06/10 13:27:54 jloup Exp $"; +static char rcsid[] = "$Id: trees.c,v 1.3 1993/10/14 00:33:11 nate Exp $"; #endif /* =========================================================================== @@ -342,7 +342,7 @@ void ct_init(attr, methodp) file_type = attr; file_method = methodp; compressed_len = input_len = 0L; - + if (static_dtree[0].Len != 0) return; /* ct_init already called */ /* Initialize the mapping length (0..255) -> length code (0..28) */ diff --git a/gnu/usr.bin/gzip/unlzw.c b/gnu/usr.bin/gzip/unlzw.c index 15d2a31..fe2110f 100644 --- a/gnu/usr.bin/gzip/unlzw.c +++ b/gnu/usr.bin/gzip/unlzw.c @@ -8,7 +8,7 @@ */ #ifdef RCSID -static char rcsid[] = "$Id: unlzw.c,v 0.15 1993/06/10 13:28:35 jloup Exp $"; +static char rcsid[] = "$Id: unlzw.c,v 1.3 1993/10/14 00:33:17 nate Exp $"; #endif #include <sys/types.h> @@ -32,22 +32,22 @@ typedef unsigned short count_short; typedef unsigned long cmp_code_int; #define MAXCODE(n) (1L << (n)) - + #ifndef REGISTERS # define REGISTERS 2 #endif -#define REG1 -#define REG2 -#define REG3 -#define REG4 -#define REG5 -#define REG6 -#define REG7 -#define REG8 -#define REG9 +#define REG1 +#define REG2 +#define REG3 +#define REG4 +#define REG5 +#define REG6 +#define REG7 +#define REG8 +#define REG9 #define REG10 -#define REG11 -#define REG12 +#define REG11 +#define REG12 #define REG13 #define REG14 #define REG15 @@ -116,11 +116,11 @@ typedef unsigned long cmp_code_int; # undef REG16 # define REG16 register #endif - + #ifndef BYTEORDER # define BYTEORDER 0000 #endif - + #ifndef NOALLIGN # define NOALLIGN 0 #endif @@ -189,7 +189,7 @@ int block_mode = BLOCK_MODE; /* block compress mode -C compatible with 2.0 */ * The magic header has already been checked and skipped. * bytes_in and bytes_out have been initialized. */ -int unlzw(in, out) +int unlzw(in, out) int in, out; /* input and output file descriptors */ { REG2 char_type *stackp; @@ -207,7 +207,7 @@ int unlzw(in, out) REG14 code_int maxmaxcode; REG15 int n_bits; REG16 int rsize; - + #ifdef MAXSEG_64K tab_prefix[0] = tab_prefix0; tab_prefix[1] = tab_prefix1; @@ -220,7 +220,7 @@ int unlzw(in, out) } maxbits &= BIT_MASK; maxmaxcode = MAXCODE(maxbits); - + if (maxbits > BITS) { fprintf(stderr, "\n%s: %s: compressed with %d bits, can only handle %d bits\n", @@ -237,9 +237,9 @@ int unlzw(in, out) posbits = inptr<<3; free_ent = ((block_mode) ? FIRST : 256); - + clear_tab_prefixof(); /* Initialize the first 256 entries in the table. */ - + for (code = 255 ; code >= 0 ; --code) { tab_suffixof(code) = (char_type)code; } @@ -247,16 +247,16 @@ int unlzw(in, out) REG1 int i; int e; int o; - + resetbuf: e = insize-(o = (posbits>>3)); - + for (i = 0 ; i < e ; ++i) { inbuf[i] = inbuf[i+o]; } insize = e; posbits = 0; - + if (insize < INBUF_EXTRA) { if ((rsize = read(in, (char*)inbuf+insize, INBUFSIZ)) == EOF) { read_error(); @@ -264,9 +264,9 @@ int unlzw(in, out) insize += rsize; bytes_in += (ulg)rsize; } - inbits = ((rsize != 0) ? ((long)insize - insize%n_bits)<<3 : + inbits = ((rsize != 0) ? ((long)insize - insize%n_bits)<<3 : ((long)insize<<3)-(n_bits-1)); - + while (inbits > posbits) { if (free_ent > maxcode) { posbits = ((posbits-1) + @@ -299,10 +299,10 @@ int unlzw(in, out) } incode = code; stackp = de_stack; - + if (code >= free_ent) { /* Special case for KwKwK string. */ if (code > free_ent) { -#ifdef DEBUG +#ifdef DEBUG char_type *p; posbits -= n_bits; @@ -331,11 +331,11 @@ int unlzw(in, out) code = tab_prefixof(code); } *--stackp = (char_type)(finchar = tab_suffixof(code)); - + /* And put them out in forward order */ { REG1 int i; - + if (outpos+(i = (de_stack-stackp)) >= OUTBUFSIZ) { do { if (i > OUTBUFSIZ-outpos) i = OUTBUFSIZ-outpos; @@ -364,11 +364,11 @@ int unlzw(in, out) tab_prefixof(code) = (unsigned short)oldcode; tab_suffixof(code) = (char_type)finchar; free_ent = code+1; - } + } oldcode = incode; /* Remember previous code. */ } } while (rsize != 0); - + if (!test && outpos > 0) { write_buf(out, (char*)outbuf, outpos); bytes_out += (ulg)outpos; diff --git a/gnu/usr.bin/gzip/util.c b/gnu/usr.bin/gzip/util.c index 70375d8..2cddf92 100644 --- a/gnu/usr.bin/gzip/util.c +++ b/gnu/usr.bin/gzip/util.c @@ -5,7 +5,7 @@ */ #ifdef RCSID -static char rcsid[] = "$Id: util.c,v 0.15 1993/06/15 09:04:13 jloup Exp $"; +static char rcsid[] = "$Id: util.c,v 1.3 1993/10/14 00:33:26 nate Exp $"; #endif #include <ctype.h> @@ -271,7 +271,7 @@ int strcspn(s, reject) /* ======================================================================== * Add an environment variable (if any) before argv, and update argc. - * Return the expanded environment variable to be freed later, or NULL + * Return the expanded environment variable to be freed later, or NULL * if no options were added to argv. */ #define SEPARATOR " \t" /* separators in env variable */ diff --git a/gnu/usr.bin/ld/cplus-dem.c b/gnu/usr.bin/ld/cplus-dem.c index 808db5e..27f56ef 100644 --- a/gnu/usr.bin/ld/cplus-dem.c +++ b/gnu/usr.bin/ld/cplus-dem.c @@ -5,13 +5,13 @@ #ifndef lint /*static char sccsid[] = "from: @(#)cplus-dem.c 5.4 (Berkeley) 4/30/91";*/ -static char rcsid[] = "$Id: cplus-dem.c,v 1.2 1993/08/01 18:46:58 mycroft Exp $"; +static char rcsid[] = "$Id: cplus-dem.c,v 1.3 1993/11/09 04:18:51 paul Exp $"; #endif /* not lint */ -/* Demangler for GNU C++ +/* Demangler for GNU C++ Copyright (C) 1989 Free Software Foundation, Inc. written by James Clark (jjc@jclark.uucp) - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 1, or (at your option) @@ -34,7 +34,7 @@ static char rcsid[] = "$Id: cplus-dem.c,v 1.2 1993/08/01 18:46:58 mycroft Exp $" /* This file exports one function char *cplus_demangle (const char *name) - + If `name' is a mangled function name produced by g++, then a pointer to a malloced string giving a C++ representation of the name will be returned; otherwise NULL will be returned. @@ -42,9 +42,9 @@ static char rcsid[] = "$Id: cplus-dem.c,v 1.2 1993/08/01 18:46:58 mycroft Exp $" is returned. For example, - + cplus_demangle ("_foo__1Ai") - + returns "A::foo(int)" @@ -65,7 +65,7 @@ static char rcsid[] = "$Id: cplus-dem.c,v 1.2 1993/08/01 18:46:58 mycroft Exp $" #include <strings.h> #define memcpy(s1, s2, n) bcopy ((s2), (s1), (n)) #define memcmp(s1, s2, n) bcmp ((s2), (s1), (n)) -#define strchr index +#define strchr index #define strrchr rindex #endif @@ -358,12 +358,12 @@ get_count (type, count) { const char *p = *type; int n = *count; - do + do { n *= 10; n += *p - '0'; p += 1; - } + } while (isdigit (*p)); if (*p == '_') { @@ -451,7 +451,7 @@ do_type (type, result) n *= 10; n += **type - '0'; *type += 1; - } + } while (isdigit (**type)); if (strlen (*type) < n) { @@ -783,7 +783,7 @@ static void munge_function_name (name) string *name; { - if (!string_empty (name) && name->p - name->b >= 3 + if (!string_empty (name) && name->p - name->b >= 3 && name->b[0] == 'o' && name->b[1] == 'p' && name->b[2] == '$') { int i; @@ -810,7 +810,7 @@ munge_function_name (name) for (i = 0; i < sizeof (optable)/sizeof (optable[0]); i++) { int len = name->p - name->b - 3; - if (strlen (optable[i].in) == len + if (strlen (optable[i].in) == len && memcmp (optable[i].in, name->b + 3, len) == 0) { string_clear (name); @@ -882,7 +882,7 @@ string_init (s) s->b = s->p = s->e = NULL; } -static void +static void string_clear (s) string *s; { diff --git a/gnu/usr.bin/ld/ld.c b/gnu/usr.bin/ld/ld.c index 7570ee1..a1f81ad 100644 --- a/gnu/usr.bin/ld/ld.c +++ b/gnu/usr.bin/ld/ld.c @@ -32,9 +32,9 @@ static char sccsid[] = "@(#)ld.c 6.10 (Berkeley) 5/22/91"; Set, indirect, and warning symbol features added by Randy Smith. */ /* - * $Id: ld.c,v 1.25 1995/03/06 08:00:23 phk Exp $ + * $Id: ld.c,v 1.26 1995/03/10 19:41:50 davidg Exp $ */ - + /* Define how to initialize system-dependent header fields. */ #include <sys/param.h> @@ -75,7 +75,7 @@ int force_executable; /* 1 => assign space to common symbols even if `relocatable_output'. */ int force_common_definition; - + /* 1 => assign jmp slots to text symbols in shared objects even if non-PIC */ int force_alias_definition; @@ -214,7 +214,7 @@ int text_start_alignment; * This prevents text_start from being set later to default values. */ int T_flag_specified; - + /* * Nonzero if -Tdata was specified in the command line. * This prevents data_start from being set later to default values. @@ -404,7 +404,7 @@ main(argc, argv) * Analyze a command line argument. Return 0 if the argument is a filename. * Return 1 if the argument is a option complete in itself. Return 2 if the * argument is a option which uses an argument. - * + * * Thus, the value is the number of consecutive arguments that are part of * options. */ @@ -606,7 +606,7 @@ set_element_prefixed_p(name) /* * Record an option and arrange to act on it later. ARG should be the * following command argument, which may or may not be used by this option. - * + * * The `l' and `A' options are ignored here since they actually specify input * files. */ @@ -792,7 +792,7 @@ decode_option(swt, arg) * Call FUNCTION on each input file entry. Do not call for entries for * libraries; instead, call once for each library member that is being * loaded. - * + * * FUNCTION receives two arguments: the entry, and ARG. */ @@ -844,7 +844,7 @@ each_file(function, arg) * Call FUNCTION on each input file entry until it returns a non-zero value. * Return this value. Do not call for entries for libraries; instead, call * once for each library member that is being loaded. - * + * * FUNCTION receives two arguments: the entry, and ARG. It must be a function * returning unsigned long (though this can probably be fudged). */ @@ -1233,7 +1233,7 @@ read_file_symbols(entry) if (SARMAG != read(fd, armag, SARMAG) || strncmp (armag, ARMAG, SARMAG)) errx(1, - "%s: malformed input file (not rel or archive)", + "%s: malformed input file (not rel or archive)", get_file_name(entry)); entry->flags |= E_IS_LIBRARY; search_library(fd, entry); @@ -1320,7 +1320,7 @@ enter_file_symbols(entry) * Enter one global symbol in the hash table. LSP points to the `struct * localsymbol' from the file that describes the global symbol. NAME is the * symbol's name. ENTRY is the file entry for the file the symbol comes from. - * + * * LSP is put on the chain of all such structs that refer to the same symbol. * This chain starts in the `refs' for symbols from relocatable objects. A * backpointer to the global symbol is kept in LSP. @@ -1430,7 +1430,7 @@ enter_global_ref(lsp, name, entry) if (sp == dynamic_symbol || sp == got_symbol) { if (type != (N_UNDF | N_EXT) && !(entry->flags & E_JUST_SYMS)) - errx(1,"Linker reserved symbol %s defined as type %x ", + errx(1,"Linker reserved symbol %s defined as type %x ", name, type); return; } @@ -1608,11 +1608,11 @@ contains_symbol(entry, np) /* * Having entered all the global symbols and found the sizes of sections of * all files to be linked, make all appropriate deductions from this data. - * + * * We propagate global symbol values from definitions to references. We compute * the layout of the output file and where each input file's contents fit * into it. - * + * * This is now done in several stages. * * 1) All global symbols are examined for definitions in relocatable (.o) @@ -2062,7 +2062,7 @@ consider_relocation(entry, dataseg) * pass2() and during actual relocation. We convert * the type back to something real again when writing * out the symbols. - * + * */ lsp = &entry->symbols[reloc->r_symbolnum]; sp = lsp->symbol; diff --git a/gnu/usr.bin/ld/ld.h b/gnu/usr.bin/ld/ld.h index 6b4b7f5..82f88e8 100644 --- a/gnu/usr.bin/ld/ld.h +++ b/gnu/usr.bin/ld/ld.h @@ -1,5 +1,5 @@ /* - * $Id: ld.h,v 1.12 1994/12/23 22:30:42 nate Exp $ + * $Id: ld.h,v 1.13 1995/03/04 17:46:07 nate Exp $ */ /*- * This code is derived from software copyrighted by the Free Software @@ -446,7 +446,7 @@ extern int list_warning_symbols; * Define a linked list of strings which define symbols which should be * treated as set elements even though they aren't. Any symbol with a prefix * matching one of these should be treated as a set element. - * + * * This is to make up for deficiencies in many assemblers which aren't willing * to pass any stabs through to the loader which they don't understand. */ @@ -465,10 +465,10 @@ extern symbol *dynamic_symbol; /* the symbol __DYNAMIC */ /* * Each input file, and each library member ("subfile") being loaded, has a * `file_entry' structure for it. - * + * * For files specified by command args, these are contained in the vector which * `file_table' points to. - * + * * For library members, they are dynamically allocated, and chained through the * `chain' field. The chain is found in the `subfiles' field of the * `file_entry'. The `file_entry' objects for the members have `superfile' diff --git a/gnu/usr.bin/ld/lib.c b/gnu/usr.bin/ld/lib.c index 43953de..78d6926 100644 --- a/gnu/usr.bin/ld/lib.c +++ b/gnu/usr.bin/ld/lib.c @@ -1,5 +1,5 @@ /* - * $Id: lib.c,v 1.12 1995/03/04 17:46:08 nate Exp $ - library routines + * $Id: lib.c,v 1.14 1995/04/07 05:08:28 nate Exp $ - library routines */ #include <sys/param.h> @@ -129,7 +129,7 @@ decode_library_subfile(fd, library_entry, subfile_offset, length_loc) name[namelen] = 0; content_length -= namelen; starting_offset += namelen; - } else + } else #endif { diff --git a/gnu/usr.bin/ld/rtld/malloc.c b/gnu/usr.bin/ld/rtld/malloc.c index 0d94200..60e6ec3 100644 --- a/gnu/usr.bin/ld/rtld/malloc.c +++ b/gnu/usr.bin/ld/rtld/malloc.c @@ -33,16 +33,16 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)malloc.c 5.11 (Berkeley) 2/23/91";*/ -static char *rcsid = "$Id: malloc.c,v 1.2 1994/06/15 22:41:13 rich Exp $"; +static char *rcsid = "$Id: malloc.c,v 1.3 1995/03/04 17:46:24 nate Exp $"; #endif /* LIBC_SCCS and not lint */ /* * malloc.c (Caltech) 2/21/82 * Chris Kingsley, kingsley@cit-20. * - * This is a very fast storage allocator. It allocates blocks of a small + * This is a very fast storage allocator. It allocates blocks of a small * number of different sizes, and keeps free lists of each size. Blocks that - * don't exactly fit are passed up to the next larger size. In this + * don't exactly fit are passed up to the next larger size. In this * implementation, the available sizes are 2^n-4 (or 2^n-10) bytes long. * This is designed for use in a virtual memory environment. */ @@ -280,7 +280,7 @@ morecore(bucket) void free(cp) void *cp; -{ +{ register int size; register union overhead *op; @@ -321,9 +321,9 @@ int realloc_srchlen = 4; /* 4 should be plenty, -1 =>'s whole list */ void * realloc(cp, nbytes) - void *cp; + void *cp; size_t nbytes; -{ +{ register u_int onb; register int i; union overhead *op; @@ -412,7 +412,7 @@ findbucket(freep, srchlen) #ifdef MSTATS /* * mstats - print out statistics about malloc - * + * * Prints two lines of numbers, one showing the length of the free list * for each size category, the second showing the number of mallocs - * frees for each size category. diff --git a/gnu/usr.bin/ld/rtld/rtld.c b/gnu/usr.bin/ld/rtld/rtld.c index 547d51d..e0547af 100644 --- a/gnu/usr.bin/ld/rtld/rtld.c +++ b/gnu/usr.bin/ld/rtld/rtld.c @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: rtld.c,v 1.23 1995/03/03 06:37:36 nate Exp $ + * $Id: rtld.c,v 1.23 1995/04/21 04:57:50 nate Exp $ */ #include <sys/param.h> @@ -232,7 +232,7 @@ struct _dynamic *dp; n > 0; n -= sizeof(struct relocation_info) ) nreloc++; - + /* Relocate ourselves */ for (reloc = (struct relocation_info *)(LD_REL(dp) + crtp->crt_ba); nreloc; @@ -562,7 +562,7 @@ again: (long)dp->d_un.d_sdt += (long)addr; p = alloc_link_map(path, sodp, smp, addr, dp); - + /* save segment sizes for unmap. */ smpp = LM_PRIVATE(p); smpp->a_text = hdr.a_text; @@ -584,7 +584,7 @@ unmap_object(smp) /* Find the object in the list and unlink it */ for (prev = NULL, p = link_map_head; - p != smp; + p != smp; prev = p, p = p->som_next) continue; if (prev == NULL) { @@ -903,7 +903,7 @@ lookup(name, src_map, strong) continue; if ((buckets = LD_BUCKETS(smp->som_dynamic)) == 0) - continue; + continue; if (LM_PRIVATE(smp)->spd_flags & RTLD_RTLD) continue; @@ -1323,7 +1323,7 @@ __dlclose(fd) /* Dismantle shared object map and descriptor */ init_map(smp, "_fini"); - + if (unmap_object(smp) < 0) return -1; diff --git a/gnu/usr.bin/ld/symseg.h b/gnu/usr.bin/ld/symseg.h index 5e11b0b..112dd6f 100644 --- a/gnu/usr.bin/ld/symseg.h +++ b/gnu/usr.bin/ld/symseg.h @@ -4,7 +4,7 @@ * Foundation. * * from: @(#)symseg.h 5.4 (Berkeley) 4/30/91 - * $Id: symseg.h,v 1.2 1993/08/01 18:46:59 mycroft Exp $ + * $Id: symseg.h,v 1.3 1993/11/09 04:19:05 paul Exp $ */ /* GDB symbol table format definitions. @@ -150,7 +150,7 @@ struct type /* Type that is a pointer to this type. Zero if no such pointer-to type is known yet. The debugger may add the address of such a type - if it has to construct one later. */ + if it has to construct one later. */ struct type *pointer_type; /* Type that is a function returning this type. Zero if no such function type is known here. @@ -342,7 +342,7 @@ struct sourcevector }; /* Line number and address of one line. */ - + struct line { int linenum; diff --git a/gnu/usr.bin/man/Makefile b/gnu/usr.bin/man/Makefile index 0e7e506..9e59558 100644 --- a/gnu/usr.bin/man/Makefile +++ b/gnu/usr.bin/man/Makefile @@ -2,7 +2,7 @@ # # You may distribute under the terms of the GNU General Public # License as specified in the README file that comes with the man 1.0 -# distribution. +# distribution. # SUBDIR = lib man manpath apropos whatis makewhatis catman diff --git a/gnu/usr.bin/man/lib/gripes.c b/gnu/usr.bin/man/lib/gripes.c index 76f8e70..466f0bc 100644 --- a/gnu/usr.bin/man/lib/gripes.c +++ b/gnu/usr.bin/man/lib/gripes.c @@ -5,7 +5,7 @@ * * You may distribute under the terms of the GNU General Public * License as specified in the file COPYING that comes with the man - * distribution. + * distribution. * * John W. Eaton * jwe@che.utexas.edu diff --git a/gnu/usr.bin/man/lib/gripes.h b/gnu/usr.bin/man/lib/gripes.h index e3be4a0..5fd59b2 100644 --- a/gnu/usr.bin/man/lib/gripes.h +++ b/gnu/usr.bin/man/lib/gripes.h @@ -5,7 +5,7 @@ * * You may distribute under the terms of the GNU General Public * License as specified in the file COPYING that comes with the man - * distribution. + * distribution. * * John W. Eaton * jwe@che.utexas.edu diff --git a/gnu/usr.bin/man/lib/util.c b/gnu/usr.bin/man/lib/util.c index e12419a..14a6cb9 100644 --- a/gnu/usr.bin/man/lib/util.c +++ b/gnu/usr.bin/man/lib/util.c @@ -5,7 +5,7 @@ * * You may distribute under the terms of the GNU General Public * License as specified in the file COPYING that comes with the man - * distribution. + * distribution. * * John W. Eaton * jwe@che.utexas.edu diff --git a/gnu/usr.bin/man/man/Makefile b/gnu/usr.bin/man/man/Makefile index aaeb086..8c03e76 100644 --- a/gnu/usr.bin/man/man/Makefile +++ b/gnu/usr.bin/man/man/Makefile @@ -17,7 +17,7 @@ MAN1= ${.CURDIR}/man.1 .endif DPADD+= ${MAN1} -CFLAGS+= -I${.CURDIR}/../lib -DSTDC_HEADERS -DPOSIX -DHAS_TROFF +CFLAGS+= -I${.CURDIR}/../lib -DSTDC_HEADERS -DPOSIX -DHAS_TROFF CFLAGS+= -DDO_COMPRESS -DALT_SYSTEMS -DSETREUID -DCATMODE=0664 CLEANFILES+= ${MAN1} diff --git a/gnu/usr.bin/man/man/glob.c b/gnu/usr.bin/man/man/glob.c index 6a89ba6..ba4be06 100644 --- a/gnu/usr.bin/man/man/glob.c +++ b/gnu/usr.bin/man/man/glob.c @@ -134,7 +134,7 @@ glob_pattern_p (pattern) case ']': if (open) return 1; - continue; + continue; case '\\': if (*p++ == '\0') @@ -198,7 +198,7 @@ glob_match (pattern, text, dot_special) register char c1 = *t++; int invert; char *cp1 = p; - + if (c1 == '\0') return 0; @@ -227,7 +227,7 @@ glob_match (pattern, text, dot_special) p = cp1; goto breakbracket; } - + c = *p++; if (c == '-') @@ -371,14 +371,14 @@ glob_vector (pat, dir) goto lost; } #endif /* SHELL */ - + dp = readdir (d); if (dp == NULL) break; if (REAL_DIR_ENTRY (dp) && glob_match (pat, dp->d_name, noglob_dot_filenames)) { -#ifdef ALLOCA_MISSING +#ifdef ALLOCA_MISSING nextlink = (struct globval *) malloc (sizeof (struct globval)); #else nextlink = (struct globval *) alloca (sizeof (struct globval)); diff --git a/gnu/usr.bin/man/man/man.c b/gnu/usr.bin/man/man/man.c index 94840e6..2823e23 100644 --- a/gnu/usr.bin/man/man/man.c +++ b/gnu/usr.bin/man/man/man.c @@ -5,7 +5,7 @@ * * You may distribute under the terms of the GNU General Public * License as specified in the file COPYING that comes with the man - * distribution. + * distribution. * * John W. Eaton * jwe@che.utexas.edu @@ -315,7 +315,7 @@ man_getopt (argc, argv) pager = strdup (optarg); break; case 'S': - colon_sep_section_list = strdup (optarg); + colon_sep_section_list = strdup (optarg); break; case 'a': findall++; @@ -449,7 +449,7 @@ man_getopt (argc, argv) * first character of name is a numeral, or the name matches one of * the sections listed in section_list, we'll assume that it's a section. * The list of sections in config.h simply allows us to specify oddly - * named directories like .../man3f. Yuk. + * named directories like .../man3f. Yuk. */ char * is_section (name) @@ -624,7 +624,7 @@ glob_for_file (path, section, name, cat) /* * Return an un-globbed name in the same form as if we were doing - * globbing. + * globbing. */ char ** make_name (path, section, name, cat) @@ -957,7 +957,7 @@ make_roff_command (file) { /* * Is there really any point in continuing to look for - * preprocessor options if we can't even read the man page source? + * preprocessor options if we can't even read the man page source? */ gripe_reading_man_file (file); return NULL; @@ -1125,7 +1125,7 @@ format_and_display (path, man_file, cat_file) if (access (man_file, R_OK) != 0) return 0; - + if (troff) { roff_command = make_roff_command (man_file); @@ -1169,7 +1169,7 @@ format_and_display (path, man_file, cat_file) if (!found) { /* Try again as real user - see note below. - By running with + By running with effective group (user) ID == real group (user) ID except for the call above, I believe the problems of reading private man pages is avoided. */ @@ -1206,7 +1206,7 @@ format_and_display (path, man_file, cat_file) { /* * Couldn't create cat file. Just format it and - * display it through the pager. + * display it through the pager. */ roff_command = make_roff_command (man_file); if (roff_command == NULL) @@ -1277,7 +1277,7 @@ try_section (path, section, name, glob) if (names == (char **) -1 || *names == NULL) /* * No files match. See if there's a preformatted page around that - * we can display. + * we can display. */ #endif /* NROFF_MISSING */ { diff --git a/gnu/usr.bin/man/man/manpath.c b/gnu/usr.bin/man/man/manpath.c index ccf7a55..294ffaf 100644 --- a/gnu/usr.bin/man/man/manpath.c +++ b/gnu/usr.bin/man/man/manpath.c @@ -5,7 +5,7 @@ * * You may distribute under the terms of the GNU General Public * License as specified in the file COPYING that comes with the man - * distribution. + * distribution. * * John W. Eaton * jwe@che.utexas.edu @@ -490,7 +490,7 @@ add_dir_to_list (lp, dir, perrs) /* * Check to see if the current directory has man or MAN - * subdirectories. + * subdirectories. */ char * has_subdirs (p) @@ -507,12 +507,12 @@ has_subdirs (p) memcpy (t, p, len); strcpy (t + len, "/man"); - + if (is_directory (t) == 1) return t; strcpy (t + len, "/MAN"); - + if (is_directory (t) == 1) return t; diff --git a/gnu/usr.bin/man/man/manpath.h b/gnu/usr.bin/man/man/manpath.h index a61761f..3039bd9 100644 --- a/gnu/usr.bin/man/man/manpath.h +++ b/gnu/usr.bin/man/man/manpath.h @@ -5,7 +5,7 @@ * * You may distribute under the terms of the GNU General Public * License as specified in the file COPYING that comes with the man - * distribution. + * distribution. * * John W. Eaton * jwe@che.utexas.edu diff --git a/gnu/usr.bin/man/man/version.h b/gnu/usr.bin/man/man/version.h index 4d9eb63..2ec5c22 100644 --- a/gnu/usr.bin/man/man/version.h +++ b/gnu/usr.bin/man/man/version.h @@ -5,7 +5,7 @@ * * You may distribute under the terms of the GNU General Public * License as specified in the file COPYING that comes with the man - * distribution. + * distribution. * * John W. Eaton * jwe@che.utexas.edu diff --git a/gnu/usr.bin/man/manpath/manpath.c b/gnu/usr.bin/man/manpath/manpath.c index ccf7a55..294ffaf 100644 --- a/gnu/usr.bin/man/manpath/manpath.c +++ b/gnu/usr.bin/man/manpath/manpath.c @@ -5,7 +5,7 @@ * * You may distribute under the terms of the GNU General Public * License as specified in the file COPYING that comes with the man - * distribution. + * distribution. * * John W. Eaton * jwe@che.utexas.edu @@ -490,7 +490,7 @@ add_dir_to_list (lp, dir, perrs) /* * Check to see if the current directory has man or MAN - * subdirectories. + * subdirectories. */ char * has_subdirs (p) @@ -507,12 +507,12 @@ has_subdirs (p) memcpy (t, p, len); strcpy (t + len, "/man"); - + if (is_directory (t) == 1) return t; strcpy (t + len, "/MAN"); - + if (is_directory (t) == 1) return t; diff --git a/gnu/usr.bin/man/manpath/manpath.h b/gnu/usr.bin/man/manpath/manpath.h index a61761f..3039bd9 100644 --- a/gnu/usr.bin/man/manpath/manpath.h +++ b/gnu/usr.bin/man/manpath/manpath.h @@ -5,7 +5,7 @@ * * You may distribute under the terms of the GNU General Public * License as specified in the file COPYING that comes with the man - * distribution. + * distribution. * * John W. Eaton * jwe@che.utexas.edu diff --git a/gnu/usr.bin/mkisofs/Makefile.in b/gnu/usr.bin/mkisofs/Makefile.in index 85cf95e..dd0d318 100644 --- a/gnu/usr.bin/mkisofs/Makefile.in +++ b/gnu/usr.bin/mkisofs/Makefile.in @@ -15,7 +15,7 @@ Makefile: Makefile.in Configure ./Configure echo "Type make again to build mkisofs." -mkisofs: Makefile $(OBJS) +mkisofs: Makefile $(OBJS) $(CC) $(LDFLAGS) -o mkisofs $(OBJS) install: mkisofs mkisofs.8 @@ -29,7 +29,7 @@ tree.o: tree.c mkisofs.h iso9660.h exclude.h write.o: write.c mkisofs.h iso9660.h $(CC) $(CFLAGS) write.c -hash.o: hash.c mkisofs.h +hash.o: hash.c mkisofs.h $(CC) $(CFLAGS) hash.c rock.o: rock.c mkisofs.h iso9660.h diff --git a/gnu/usr.bin/mkisofs/diag/Makefile b/gnu/usr.bin/mkisofs/diag/Makefile index 4f2a697..1aefdf6 100644 --- a/gnu/usr.bin/mkisofs/diag/Makefile +++ b/gnu/usr.bin/mkisofs/diag/Makefile @@ -1,4 +1,4 @@ -all: dump isodump isovfy +all: dump isodump isovfy dump:dump.c gcc -o dump dump.c isodump:isodump.c @@ -7,4 +7,4 @@ isovfy:isovfy.c gcc -o isovfy isovfy.c clean: - rm dump isodump isovfy
\ No newline at end of file + rm dump isodump isovfy diff --git a/gnu/usr.bin/mkisofs/diag/dump.c b/gnu/usr.bin/mkisofs/diag/dump.c index 0e9db39..3c28481 100644 --- a/gnu/usr.bin/mkisofs/diag/dump.c +++ b/gnu/usr.bin/mkisofs/diag/dump.c @@ -183,7 +183,7 @@ main(int argc, char * argv[]){ c = getbyte(&file_addr); if (c == search[0]) break; }; - for (j=1;j<strlen(search);j++) + for (j=1;j<strlen(search);j++) if(search[j] != getbyte()) break; if(j==strlen(search)) break; }; @@ -195,7 +195,7 @@ main(int argc, char * argv[]){ reset_tty(); fclose(infile); } - + diff --git a/gnu/usr.bin/mkisofs/diag/isodump.c b/gnu/usr.bin/mkisofs/diag/isodump.c index bca9a2f..49ef4b9 100644 --- a/gnu/usr.bin/mkisofs/diag/isodump.c +++ b/gnu/usr.bin/mkisofs/diag/isodump.c @@ -211,7 +211,7 @@ int parse_rr(unsigned char * pnt, int len, int cont_flag) cont_extent = isonum_733(pnt+4); cont_offset = isonum_733(pnt+12); cont_size = isonum_733(pnt+20); - printf("=[%x,%x,%d]", cont_extent, cont_offset, + printf("=[%x,%x,%d]", cont_extent, cont_offset, cont_size); }; @@ -259,7 +259,7 @@ int parse_rr(unsigned char * pnt, int len, int cont_flag) slen -= (pnts[1] + 2); pnts += (pnts[1] + 2); - + }; if(cflag) printf("+"); printf("=%s", symlink); @@ -276,12 +276,12 @@ int parse_rr(unsigned char * pnt, int len, int cont_flag) }; }; if(ncount) printf("]"); - if (!cont_flag && flag1 != flag2) + if (!cont_flag && flag1 != flag2) printf("Flag %x != %x", flag1, flag2, goof++); return flag2; } -int +int dump_rr(struct iso_directory_record * idr) { int len; @@ -320,7 +320,7 @@ showblock(int flag){ printf("[%2d] ", idr->volume_sequence_number[0]); printf("%5x ", *((unsigned int *) idr->extent)); printf("%8d ", *((unsigned int *) idr->size)); - printf ((idr->flags[0] & 2) ? "*" : " "); + printf ((idr->flags[0] & 2) ? "*" : " "); if(idr->name_len[0] == 1 && idr->name[0] == 0) printf(". "); else if(idr->name_len[0] == 1 && idr->name[0] == 1) @@ -372,7 +372,7 @@ main(int argc, char * argv[]){ file_addr = file_addr << 11; /* Now setup the keyboard for single character input. */ -#ifdef USE_TERMIOS +#ifdef USE_TERMIOS if(tcgetattr(0, &savetty) == -1) #else if(ioctl(0, TCGETA, &savetty) == -1) @@ -416,7 +416,7 @@ main(int argc, char * argv[]){ c = getbyte(&file_addr); if (c == search[0]) break; }; - for (j=1;j<strlen(search);j++) + for (j=1;j<strlen(search);j++) if(search[j] != getbyte()) break; if(j==strlen(search)) break; }; @@ -428,7 +428,7 @@ main(int argc, char * argv[]){ reset_tty(); fclose(infile); } - + diff --git a/gnu/usr.bin/mkisofs/diag/isovfy.c b/gnu/usr.bin/mkisofs/diag/isovfy.c index 5da5314..43e1389 100644 --- a/gnu/usr.bin/mkisofs/diag/isovfy.c +++ b/gnu/usr.bin/mkisofs/diag/isovfy.c @@ -122,7 +122,7 @@ int iline; int rr_goof; -int +int dump_rr(struct iso_directory_record * idr){ int len; char * pnt; @@ -166,9 +166,9 @@ int parse_rr(unsigned char * pnt, int len, int cont_flag) else iline += sprintf(lbuffer+iline,"["); iline += sprintf(lbuffer+iline,"%c%c", pnt[0], pnt[1]); - if(pnt[0] < 'A' || pnt[0] > 'Z' || pnt[1] < 'A' || + if(pnt[0] < 'A' || pnt[0] > 'Z' || pnt[1] < 'A' || pnt[1] > 'Z') { - iline += sprintf(lbuffer+iline,"**BAD SUSP %d %d]", + iline += sprintf(lbuffer+iline,"**BAD SUSP %d %d]", pnt[0], pnt[1], rr_goof++); return flag2; }; @@ -237,7 +237,7 @@ int parse_rr(unsigned char * pnt, int len, int cont_flag) strcat(symlink,"/"); slen -= (pnts[1] + 2); pnts += (pnts[1] + 2); - + }; if(symlink[0] != 0) { iline += sprintf(lbuffer+iline,"=%s", symlink); @@ -255,7 +255,7 @@ int parse_rr(unsigned char * pnt, int len, int cont_flag) }; }; if(ncount) iline += sprintf(lbuffer+iline,"]"); - if (!cont_flag && flag1 && flag1 != flag2) + if (!cont_flag && flag1 && flag1 != flag2) iline += sprintf(lbuffer+iline,"Flag %x != %x", flag1, flag2, rr_goof++); return flag2; } @@ -304,7 +304,7 @@ check_tree(int file_addr, int file_size, int parent_addr){ size = isonum_733(idr->size); iline += sprintf(&lbuffer[iline],"%5x ", extent); iline += sprintf(&lbuffer[iline],"%8d ", size); - iline += sprintf (&lbuffer[iline], "%c", (idr->flags[0] & 2) ? '*' : ' '); + iline += sprintf (&lbuffer[iline], "%c", (idr->flags[0] & 2) ? '*' : ' '); if(idr->name_len[0] > 33 || idr->name_len[0] < 0) iline += sprintf(&lbuffer[iline],"File name length=(%d)", @@ -323,7 +323,7 @@ check_tree(int file_addr, int file_size, int parent_addr){ iline += sprintf(&lbuffer[iline],"***** Directory has null extent.", goof++); if(i1 != 1) iline += sprintf(&lbuffer[iline],"***** .. not second entry.", rr_goof++); - + } else { if(i1 < 2) iline += sprintf(&lbuffer[iline]," Improper sorting.", rr_goof++); for(j=0; j<idr->name_len[0]; j++) iline += sprintf(&lbuffer[iline],"%c", idr->name[j]); @@ -481,7 +481,7 @@ main(int argc, char * argv[]){ if(!ngoof) printf("No errors found\n"); } - + diff --git a/gnu/usr.bin/mkisofs/exclude.c b/gnu/usr.bin/mkisofs/exclude.c index 3be700b..99c66bd 100644 --- a/gnu/usr.bin/mkisofs/exclude.c +++ b/gnu/usr.bin/mkisofs/exclude.c @@ -1,6 +1,6 @@ /* * 9-Dec-93 R.-D. Marzusch, marzusch@odiehh.hanse.de: - * added 'exclude' option (-x) to specify pathnames NOT to be included in + * added 'exclude' option (-x) to specify pathnames NOT to be included in * CD image. */ @@ -29,7 +29,7 @@ char * fn; return; } - + excl[i] = malloc(strlen(fn)+1); if (! excl[i]) { fprintf(stderr,"Can't allocate memory for excluded filename\n"); diff --git a/gnu/usr.bin/mkisofs/exclude.h b/gnu/usr.bin/mkisofs/exclude.h index dc96c09..d22fda2 100644 --- a/gnu/usr.bin/mkisofs/exclude.h +++ b/gnu/usr.bin/mkisofs/exclude.h @@ -1,6 +1,6 @@ /* * 9-Dec-93 R.-D. Marzusch, marzusch@odiehh.hanse.de: - * added 'exclude' option (-x) to specify pathnames NOT to be included in + * added 'exclude' option (-x) to specify pathnames NOT to be included in * CD image. */ diff --git a/gnu/usr.bin/mkisofs/hash.c b/gnu/usr.bin/mkisofs/hash.c index cfa145f..d21d84f 100644 --- a/gnu/usr.bin/mkisofs/hash.c +++ b/gnu/usr.bin/mkisofs/hash.c @@ -32,7 +32,7 @@ void FDECL1(add_hash, struct directory_entry *, spnt){ struct file_hash * s_hash; unsigned int hash_number; - if(spnt->size == 0 || spnt->starting_block == 0) + if(spnt->size == 0 || spnt->starting_block == 0) if(spnt->size != 0 || spnt->starting_block != 0) { fprintf(stderr,"Non zero-length file assigned zero extent.\n"); exit(1); @@ -172,6 +172,6 @@ void flush_file_hash(){ nh = nh1; }; name_hash_table[i] = NULL; - + }; } diff --git a/gnu/usr.bin/mkisofs/mkisofs.c b/gnu/usr.bin/mkisofs/mkisofs.c index 2fd8a31..4cfed78 100644 --- a/gnu/usr.bin/mkisofs/mkisofs.c +++ b/gnu/usr.bin/mkisofs/mkisofs.c @@ -228,7 +228,7 @@ int FDECL2(iso9660_date,char *, result, time_t, ctime){ return 0; } -int FDECL3(iso9660_file_length,const char*, name, struct directory_entry *, sresult, +int FDECL3(iso9660_file_length,const char*, name, struct directory_entry *, sresult, int, dirflag){ int seen_dot = 0; int seen_semic = 0; @@ -298,7 +298,7 @@ int FDECL3(iso9660_file_length,const char*, name, struct directory_entry *, sres current_length++; pnt++; }; - + if(tildes == 2){ int prio1 = 0; pnt = name; @@ -310,10 +310,10 @@ int FDECL3(iso9660_file_length,const char*, name, struct directory_entry *, sres }; priority = prio1; }; - + if (!dirflag){ if (!seen_dot && !omit_period) { - if (result) *result++ = '.'; + if (result) *result++ = '.'; extra++; }; if(!omit_version_number && !seen_semic) { @@ -458,7 +458,7 @@ int FDECL2(main, int, argc, char **, argv){ { int resource; struct rlimit rlp; - if (getrlimit(RLIMIT_DATA,&rlp) == -1) + if (getrlimit(RLIMIT_DATA,&rlp) == -1) perror("Warning: getrlimit"); else { rlp.rlim_cur=33554432; @@ -513,7 +513,7 @@ int FDECL2(main, int, argc, char **, argv){ if(reloc_dir) sort_n_finish(reloc_dir); if (goof) exit(1); - + if (outfile){ discimage = fopen(outfile, "w"); if (!discimage){ @@ -564,7 +564,7 @@ int FDECL2(main, int, argc, char **, argv){ iso_write(discimage); - fprintf(stderr,"Max brk space used %x\n", + fprintf(stderr,"Max brk space used %x\n", ((unsigned int)sbrk(0)) - mem_start); fprintf(stderr,"%d extents written (%d Mb)\n", last_extent, last_extent >> 9); #ifdef VMS diff --git a/gnu/usr.bin/mkisofs/mkisofs.h b/gnu/usr.bin/mkisofs/mkisofs.h index 89e9423..e17bb84 100644 --- a/gnu/usr.bin/mkisofs/mkisofs.h +++ b/gnu/usr.bin/mkisofs/mkisofs.h @@ -117,7 +117,7 @@ struct file_hash{ unsigned int starting_block; unsigned int size; }; - + struct directory{ struct directory * next; /* Next directory at same level as this one */ struct directory * subdir; /* First subdirectory in this directory */ @@ -169,7 +169,7 @@ extern int DECL(scan_directory_tree,(char * path, struct directory_entry * self) extern void DECL(dump_tree,(struct directory * node)); extern void DECL(assign_directory_addresses,(struct directory * root)); -extern int DECL(iso9660_file_length,(const char* name, +extern int DECL(iso9660_file_length,(const char* name, struct directory_entry * sresult, int flag)); extern int DECL(iso_write,(FILE * outfile)); extern void generate_path_tables(); @@ -192,7 +192,7 @@ extern void DECL(set_723,(char *, unsigned int)); extern void DECL(set_733,(char *, unsigned int)); extern void DECL(sort_directory,(struct directory_entry **)); extern int DECL(generate_rock_ridge_attributes,(char *, char *, - struct directory_entry *, + struct directory_entry *, struct stat *, struct stat *, int deep_flag)); extern char * DECL(generate_rr_extension_record,(char * id, char * descriptor, diff --git a/gnu/usr.bin/mkisofs/rock.c b/gnu/usr.bin/mkisofs/rock.c index 171434d..dfa774f 100644 --- a/gnu/usr.bin/mkisofs/rock.c +++ b/gnu/usr.bin/mkisofs/rock.c @@ -72,7 +72,7 @@ a CE entry for the continuation record */ #define MAYBE_ADD_CE_ENTRY(BYTES) \ - (BYTES + CE_SIZE + currlen + (ipnt - recstart) > reclimit ? 1 : 0) + (BYTES + CE_SIZE + currlen + (ipnt - recstart) > reclimit ? 1 : 0) /* * Buffer to build RR attributes @@ -189,13 +189,13 @@ int deep_opt; }; /* - * Add the posix modes + * Add the posix modes */ if(MAYBE_ADD_CE_ENTRY(PX_SIZE)) add_CE_entry(); Rock[ipnt++] ='P'; Rock[ipnt++] ='X'; Rock[ipnt++] = PX_SIZE; - Rock[ipnt++] = SU_VERSION; + Rock[ipnt++] = SU_VERSION; flagval |= (1<<0); set_733((char*)Rock + ipnt, lstatbuf->st_mode); ipnt += 8; @@ -215,7 +215,7 @@ int deep_opt; Rock[ipnt++] ='P'; Rock[ipnt++] ='N'; Rock[ipnt++] = PN_SIZE; - Rock[ipnt++] = SU_VERSION; + Rock[ipnt++] = SU_VERSION; flagval |= (1<<1); if(sizeof(dev_t) <= 4) { set_733((char*)Rock + ipnt, 0); @@ -254,7 +254,7 @@ int deep_opt; Rock[ipnt++] ='L'; lenpos = ipnt; Rock[ipnt++] = SL_SIZE; - Rock[ipnt++] = SU_VERSION; + Rock[ipnt++] = SU_VERSION; Rock[ipnt++] = 0; /* Flags */ lenval = 5; while(*cpnt){ @@ -263,7 +263,7 @@ int deep_opt; nchar--; *cpnt1 = 0; }; - + /* We treat certain components in a special way. */ if(cpnt[0] == '.' && cpnt[1] == '.' && cpnt[2] == 0){ if(MAYBE_ADD_CE_ENTRY(2)) add_CE_entry(); @@ -329,7 +329,7 @@ int deep_opt; if(nchar) Rock[lenpos + 2] = SL_CONTINUE; /* We need another SL entry */ } /* while nchar */ } /* Is a symbolic link */ - /* + /* * Add in the Rock Ridge TF time field */ if(MAYBE_ADD_CE_ENTRY(TF_SIZE)) add_CE_entry(); @@ -354,7 +354,7 @@ int deep_opt; iso9660_date((char *) &Rock[ipnt], lstatbuf->st_ctime); ipnt += 7; - /* + /* * Add in the Rock Ridge RE time field */ if(deep_opt & NEED_RE){ @@ -365,7 +365,7 @@ int deep_opt; Rock[ipnt++] = SU_VERSION; flagval |= (1<<6); }; - /* + /* * Add in the Rock Ridge PL record, if required. */ if(deep_opt & NEED_PL){ @@ -379,7 +379,7 @@ int deep_opt; flagval |= (1<<5); }; - /* + /* * Add in the Rock Ridge CL field, if required. */ if(deep_opt & NEED_CL){ @@ -396,7 +396,7 @@ int deep_opt; #ifndef VMS /* If transparent compression was requested, fill in the correct field for this file */ - if(transparent_compression && + if(transparent_compression && S_ISREG(lstatbuf->st_mode) && strlen(name) > 3 && strcmp(name + strlen(name) - 3,".gZ") == 0){ @@ -429,8 +429,8 @@ int deep_opt; else { int blocksize; blocksize = (header[3] << 8) | header[2]; - file_size = ((unsigned int)header[7] << 24) | - ((unsigned int)header[6] << 16) | + file_size = ((unsigned int)header[7] << 24) | + ((unsigned int)header[6] << 16) | ((unsigned int)header[5] << 8) | header[4]; #if 0 fprintf(stderr,"Blocksize = %d %d\n", blocksize, file_size); @@ -465,7 +465,7 @@ int deep_opt; }; } #endif - /* + /* * Add in the Rock Ridge CE field, if required. We use this for the * extension record that is stored in the root directory. */ diff --git a/gnu/usr.bin/mkisofs/tree.c b/gnu/usr.bin/mkisofs/tree.c index a3b8ebb..c07c52e 100644 --- a/gnu/usr.bin/mkisofs/tree.c +++ b/gnu/usr.bin/mkisofs/tree.c @@ -103,15 +103,15 @@ void FDECL1(sort_n_finish, struct directory *, this_dir) flush_file_hash(); s_entry = this_dir->contents; while(s_entry){ - + /* First assume no conflict, and handle this case */ - + if(!(s_entry1 = find_file_hash(s_entry->isorec.name))){ add_file_hash(s_entry); s_entry = s_entry->next; continue; }; - + if(s_entry1 == s_entry){ fprintf(stderr,"Fatal goof\n"); exit(1); @@ -127,7 +127,7 @@ void FDECL1(sort_n_finish, struct directory *, this_dir) count = 0; while(count < 1000){ sprintf(newname,"%s.%3.3d%s", rootname, count, - (s_entry->isorec.flags[0] == 2 || + (s_entry->isorec.flags[0] == 2 || omit_version_number ? "" : ";1")); #ifdef VMS @@ -147,10 +147,10 @@ void FDECL1(sort_n_finish, struct directory *, this_dir) fprintf(stderr,"Unable to generate unique name for file %s\n", s_entry->name); exit(1); }; - + /* OK, now we have a good replacement name. Now decide which one of these two beasts should get the name changed */ - + if(s_entry->priority < s_entry1->priority) { fprintf(stderr,"Using %s for %s%s%s (%s)\n", newname, this_dir->whole_name, SPATH_SEPARATOR, s_entry->name, s_entry1->name); s_entry->isorec.name_len[0] = strlen(newname); @@ -188,10 +188,10 @@ void FDECL1(sort_n_finish, struct directory *, this_dir) /* First we need to figure out how big this table is */ for (s_entry = this_dir->contents; s_entry; s_entry = s_entry->next){ if(strcmp(s_entry->name, ".") == 0 || - strcmp(s_entry->name, "..") == 0) continue; + strcmp(s_entry->name, "..") == 0) continue; if(s_entry->table) tablesize += 35 + strlen(s_entry->table); }; - table = (struct directory_entry *) + table = (struct directory_entry *) e_malloc(sizeof (struct directory_entry)); memset(table, 0, sizeof(struct directory_entry)); table->table = NULL; @@ -213,10 +213,10 @@ void FDECL1(sort_n_finish, struct directory *, this_dir) memset(table->table, 0, ROUND_UP(tablesize)); #if 1 /* WALNUT CREEK -- 950126 */ iso9660_file_length (trans_tbl, table, 0); -#else +#else iso9660_file_length (trans_tbl, table, 1); -#endif - +#endif + if(use_RockRidge){ fstatbuf.st_mode = 0444 | S_IFREG; fstatbuf.st_nlink = 1; @@ -228,7 +228,7 @@ void FDECL1(sort_n_finish, struct directory *, this_dir) for(s_entry = this_dir->contents; s_entry; s_entry = s_entry->next){ new_reclen = strlen(s_entry->isorec.name); - + if(s_entry->isorec.flags[0] == 2){ if (strcmp(s_entry->name,".") && strcmp(s_entry->name,"..")) { path_table_size += new_reclen + sizeof(struct iso_path_table) - 1; @@ -242,16 +242,16 @@ void FDECL1(sort_n_finish, struct directory *, this_dir) if(path_table_size & 1) path_table_size++; /* For odd lengths we pad */ s_entry->isorec.name_len[0] = new_reclen; - new_reclen += + new_reclen += sizeof(struct iso_directory_record) - sizeof(s_entry->isorec.name); - - if (new_reclen & 1) + + if (new_reclen & 1) new_reclen++; if(use_RockRidge){ new_reclen += s_entry->rr_attr_size; - if (new_reclen & 1) + if (new_reclen & 1) new_reclen++; }; if(new_reclen > 0xff) { @@ -273,7 +273,7 @@ void FDECL1(sort_n_finish, struct directory *, this_dir) if(strcmp(s_entry->name, ".") == 0 || strcmp(s_entry->name, "..") == 0) continue; - sprintf(buffer,"%c %-34s%s",s_entry->table[0], + sprintf(buffer,"%c %-34s%s",s_entry->table[0], s_entry->isorec.name, s_entry->table+1); memcpy(table->table + count, buffer, strlen(buffer)); count += strlen(buffer); @@ -289,18 +289,18 @@ void FDECL1(sort_n_finish, struct directory *, this_dir) /* Now go through the directory and figure out how large this one will be. Do not split a directory entry across a sector boundary */ - + s_entry = this_dir->contents; this_dir->ce_bytes = 0; while(s_entry){ new_reclen = s_entry->isorec.length[0]; if ((this_dir->size & (SECTOR_SIZE - 1)) + new_reclen >= SECTOR_SIZE) - this_dir->size = (this_dir->size + (SECTOR_SIZE - 1)) & + this_dir->size = (this_dir->size + (SECTOR_SIZE - 1)) & ~(SECTOR_SIZE - 1); this_dir->size += new_reclen; /* See if continuation entries were used on disc */ - if(use_RockRidge && + if(use_RockRidge && s_entry->rr_attr_size != s_entry->total_rr_attr_size) { unsigned char * pnt; int len; @@ -316,9 +316,9 @@ void FDECL1(sort_n_finish, struct directory *, this_dir) while(len > 3){ if(pnt[0] == 'C' && pnt[1] == 'E') { nbytes = get_733(pnt+20); - + if((this_dir->ce_bytes & (SECTOR_SIZE - 1)) + nbytes >= - SECTOR_SIZE) this_dir->ce_bytes = + SECTOR_SIZE) this_dir->ce_bytes = ROUND_UP(this_dir->ce_bytes); /* Now store the block in the ce buffer */ this_dir->ce_bytes += nbytes; @@ -340,7 +340,7 @@ static void generate_reloc_directory() /* Create an entry for our internal tree */ time (¤t_time); - reloc_dir = (struct directory *) + reloc_dir = (struct directory *) e_malloc(sizeof(struct directory)); memset(reloc_dir, 0, sizeof(struct directory)); reloc_dir->parent = root; @@ -350,11 +350,11 @@ static void generate_reloc_directory() reloc_dir->whole_name = strdup("./rr_moved"); reloc_dir->de_name = strdup("rr_moved"); reloc_dir->extent = 0; - + new_reclen = strlen(reloc_dir->de_name); - + /* Now create an actual directory entry */ - s_entry = (struct directory_entry *) + s_entry = (struct directory_entry *) e_malloc(sizeof (struct directory_entry)); memset(s_entry, 0, sizeof(struct directory_entry)); s_entry->next = root->contents; @@ -378,12 +378,12 @@ static void generate_reloc_directory() "rr_moved", s_entry, &fstatbuf, &fstatbuf, 0); }; - + /* Now create the . and .. entries in rr_moved */ /* Now create an actual directory entry */ - s_entry = (struct directory_entry *) + s_entry = (struct directory_entry *) e_malloc(sizeof (struct directory_entry)); - memcpy(s_entry, root->contents, + memcpy(s_entry, root->contents, sizeof(struct directory_entry)); s_entry->name = strdup("."); iso9660_file_length (".", s_entry, 1); @@ -398,10 +398,10 @@ static void generate_reloc_directory() ".", s_entry, &fstatbuf, &fstatbuf, 0); }; - - s_entry = (struct directory_entry *) + + s_entry = (struct directory_entry *) e_malloc(sizeof (struct directory_entry)); - memcpy(s_entry, root->contents, + memcpy(s_entry, root->contents, sizeof(struct directory_entry)); s_entry->name = strdup(".."); iso9660_file_length ("..", s_entry, 1); @@ -559,7 +559,7 @@ FDECL2(scan_directory_tree,char *, path, struct directory_entry *, de){ exit(1); }; - this_dir->parent = parent; + this_dir->parent = parent; this_dir->depth = parent->depth + 1; if(!parent->subdir) @@ -651,14 +651,14 @@ FDECL2(scan_directory_tree,char *, path, struct directory_entry *, de){ continue; /* Non Rock Ridge discs - ignore all symlinks */ }; } - + /* Here we handle a different kind of case. Here we have a symlink, but we want to follow symlinks. If we run across a directory loop, then we need to pretend that we are not following symlinks for this file. If this is the first time we have seen this, then make this seem as if there was no symlink there in the first place */ - - else if(strcmp(d_entry->d_name, ".") && + + else if(strcmp(d_entry->d_name, ".") && strcmp(d_entry->d_name, "..")) { if(find_directory_hash(statbuf.st_dev, STAT_INODE(statbuf))){ fprintf(stderr, "Infinite loop detected (%s)\n", whole_path); @@ -671,11 +671,11 @@ FDECL2(scan_directory_tree,char *, path, struct directory_entry *, de){ lstatbuf = statbuf; add_directory_hash(statbuf.st_dev, STAT_INODE(statbuf)); }; - }; + }; }; #ifdef VMS - if(!S_ISDIR(lstatbuf.st_mode) && (statbuf.st_fab_rfm != FAB$C_FIX && + if(!S_ISDIR(lstatbuf.st_mode) && (statbuf.st_fab_rfm != FAB$C_FIX && statbuf.st_fab_rfm != FAB$C_STMLF)) { fprintf(stderr,"Warning - file %s has an unsupported VMS record" " format (%d)\n", @@ -684,14 +684,14 @@ FDECL2(scan_directory_tree,char *, path, struct directory_entry *, de){ #endif if(S_ISREG(lstatbuf.st_mode) && (status = access(whole_path, R_OK))){ - fprintf(stderr, "File %s is not readable (errno = %d) - ignoring\n", + fprintf(stderr, "File %s is not readable (errno = %d) - ignoring\n", whole_path, errno); continue; } /* Add this so that we can detect directory loops with hard links. If we are set up to follow symlinks, then we skip this checking. */ - if(!follow_links && S_ISDIR(lstatbuf.st_mode) && strcmp(d_entry->d_name, ".") && + if(!follow_links && S_ISDIR(lstatbuf.st_mode) && strcmp(d_entry->d_name, ".") && strcmp(d_entry->d_name, "..")) { if(find_directory_hash(statbuf.st_dev, STAT_INODE(statbuf))) { fprintf(stderr,"Directory loop - fatal goof (%s %x %d).\n", @@ -716,10 +716,10 @@ FDECL2(scan_directory_tree,char *, path, struct directory_entry *, de){ fprintf(stderr, "Unable to stat file %s - ignoring and continuing.\n", whole_path); - continue; + continue; }; - s_entry = (struct directory_entry *) + s_entry = (struct directory_entry *) e_malloc(sizeof (struct directory_entry)); s_entry->next = this_dir->contents; this_dir->contents = s_entry; @@ -750,24 +750,24 @@ FDECL2(scan_directory_tree,char *, path, struct directory_entry *, de){ /* Directories are assigned sizes later on */ if (!S_ISDIR(statbuf.st_mode)) { - set_733(s_entry->isorec.size, statbuf.st_size); + set_733(s_entry->isorec.size, statbuf.st_size); - if (S_ISCHR(lstatbuf.st_mode) || S_ISBLK(lstatbuf.st_mode) || + if (S_ISCHR(lstatbuf.st_mode) || S_ISBLK(lstatbuf.st_mode) || S_ISFIFO(lstatbuf.st_mode) || S_ISSOCK(lstatbuf.st_mode) || S_ISLNK(lstatbuf.st_mode)) - s_entry->size = 0; + s_entry->size = 0; else - s_entry->size = statbuf.st_size; + s_entry->size = statbuf.st_size; } else s_entry->isorec.flags[0] = 2; - if (strcmp(d_entry->d_name,".") && strcmp(d_entry->d_name,"..") && + if (strcmp(d_entry->d_name,".") && strcmp(d_entry->d_name,"..") && S_ISDIR(statbuf.st_mode) && this_dir->depth > RR_relocation_depth){ if(!reloc_dir) generate_reloc_directory(); - s_entry1 = (struct directory_entry *) + s_entry1 = (struct directory_entry *) e_malloc(sizeof (struct directory_entry)); - memcpy(s_entry1, this_dir->contents, + memcpy(s_entry1, this_dir->contents, sizeof(struct directory_entry)); s_entry1->table = NULL; s_entry1->name = strdup(this_dir->contents->name); @@ -800,7 +800,7 @@ FDECL2(scan_directory_tree,char *, path, struct directory_entry *, de){ s_entry->inode = UNCACHED_INODE; deep_flag = NEED_CL; }; - + if(generate_tables && strcmp(s_entry->name, ".") && strcmp(s_entry->name, "..")) { char buffer[2048]; switch(lstatbuf.st_mode & S_IFMT){ @@ -841,7 +841,7 @@ FDECL2(scan_directory_tree,char *, path, struct directory_entry *, de){ }; s_entry->table = strdup(buffer); }; - + if(S_ISDIR(statbuf.st_mode)){ int dflag; if (strcmp(d_entry->d_name,".") && strcmp(d_entry->d_name,"..")) { @@ -861,7 +861,7 @@ FDECL2(scan_directory_tree,char *, path, struct directory_entry *, de){ generate_rock_ridge_attributes(whole_path, d_entry->d_name, s_entry, &statbuf, &lstatbuf, deep_flag); - + } } closedir(current_dir); diff --git a/gnu/usr.bin/mkisofs/vms.c b/gnu/usr.bin/mkisofs/vms.c index 0c086f0..19dc516 100644 --- a/gnu/usr.bin/mkisofs/vms.c +++ b/gnu/usr.bin/mkisofs/vms.c @@ -172,7 +172,7 @@ struct direct * readdir(int context){ if(dircontext[context] == -3) dircontext[context] = 0; dpath.dsc$w_length = strlen(searchpath[context]); - lib$find_file(&dpath, &result, &dircontext[context], + lib$find_file(&dpath, &result, &dircontext[context], 0, 0, &status, 0); if(status == SS$_NOMOREFILES) return 0; @@ -250,7 +250,7 @@ int vms_write_one_file(char * filename, int size, FILE * outfile){ open_file(filename); remain = size; - + while(remain > 0){ use = (remain > SECTOR_SIZE * NSECT - 1 ? NSECT*SECTOR_SIZE : remain); use = ROUND_UP(use); /* Round up to nearest sector boundary */ @@ -263,7 +263,7 @@ int vms_write_one_file(char * filename, int size, FILE * outfile){ if((last_extent_written % 1000) < use/SECTOR_SIZE) fprintf(stderr,"%d..", last_extent_written); remain -= use; }; - + close_file(rab); } #endif diff --git a/gnu/usr.bin/mkisofs/write.c b/gnu/usr.bin/mkisofs/write.c index ac85674..3a98a39 100644 --- a/gnu/usr.bin/mkisofs/write.c +++ b/gnu/usr.bin/mkisofs/write.c @@ -170,7 +170,7 @@ static void FDECL3(write_one_file, char *, filename, unsigned int, size, FILE *, use = ROUND_UP(use); /* Round up to nearest sector boundary */ memset(buffer, 0, use); if (fread(buffer, 1, use, infile) == 0) { - fprintf(stderr,"cannot read from %s\n",filename); + fprintf(stderr,"cannot read from %s\n",filename); exit(1); } xfwrite(buffer, 1, use, outfile); @@ -251,7 +251,7 @@ void FDECL1(sort_directory, struct directory_entry **, sort_dir){ }; /* OK, now we know how many there are. Build a vector for sorting. */ - sortlist = (struct directory_entry **) + sortlist = (struct directory_entry **) e_malloc(sizeof(struct directory_entry *) * dcount); dcount = 0; @@ -263,7 +263,7 @@ void FDECL1(sort_directory, struct directory_entry **, sort_dir){ dcount++; s_entry = s_entry->next; }; - + qsort(sortlist, dcount, sizeof(struct directory_entry *), (void *)compare_dirs); @@ -306,18 +306,18 @@ static void FDECL1(assign_file_addresses, struct directory *, dpnt){ while (dpnt){ s_entry = dpnt->contents; for(s_entry = dpnt->contents; s_entry; s_entry = s_entry->next){ - + /* This saves some space if there are symlinks present */ s_hash = find_hash(s_entry->dev, s_entry->inode); if(s_hash){ if(verbose) - fprintf(stderr, "Cache hit for %s%s%s\n",s_entry->filedir->de_name, + fprintf(stderr, "Cache hit for %s%s%s\n",s_entry->filedir->de_name, SPATH_SEPARATOR, s_entry->name); set_733(s_entry->isorec.extent, s_hash->starting_block); set_733(s_entry->isorec.size, s_hash->size); continue; }; - if (strcmp(s_entry->name,".") && strcmp(s_entry->name,"..") && + if (strcmp(s_entry->name,".") && strcmp(s_entry->name,"..") && s_entry->isorec.flags[0] == 2){ finddir = dpnt->subdir; while(1==1){ @@ -335,22 +335,22 @@ static void FDECL1(assign_file_addresses, struct directory *, dpnt){ if(strcmp(s_entry->name,".") ==0 || strcmp(s_entry->name,"..") == 0) { if(strcmp(s_entry->name,".") == 0) { set_733(s_entry->isorec.extent, dpnt->extent); - + /* Set these so that the hash table has the correct information */ s_entry->starting_block = dpnt->extent; s_entry->size = ROUND_UP(dpnt->size); - + add_hash(s_entry); s_entry->starting_block = dpnt->extent; set_733(s_entry->isorec.size, ROUND_UP(dpnt->size)); } else { if(dpnt == root) total_dir_size += root->size; set_733(s_entry->isorec.extent, dpnt->parent->extent); - + /* Set these so that the hash table has the correct information */ s_entry->starting_block = dpnt->parent->extent; s_entry->size = ROUND_UP(dpnt->parent->size); - + add_hash(s_entry); s_entry->starting_block = dpnt->parent->extent; set_733(s_entry->isorec.size, ROUND_UP(dpnt->parent->size)); @@ -360,9 +360,9 @@ static void FDECL1(assign_file_addresses, struct directory *, dpnt){ straightforward, just make a list and assign extents as we go. Once we get through writing all of the directories, we should be ready write out these files */ - + if(s_entry->size) { - dwpnt = (struct deferred_write *) + dwpnt = (struct deferred_write *) e_malloc(sizeof(struct deferred_write)); if(dw_tail){ dw_tail->next = dwpnt; @@ -398,7 +398,7 @@ static void FDECL1(assign_file_addresses, struct directory *, dpnt){ fprintf(stderr,"Warning: large file %s\n", whole_path); fprintf(stderr,"Starting block is %d\n", s_entry->starting_block); fprintf(stderr,"Reported file size is %d extents\n", s_entry->size); - + }; #endif if(last_extent > (700000000 >> 11)) { /* More than 700Mb? Punt */ @@ -437,9 +437,9 @@ void FDECL2(generate_one_directory, struct directory *, dpnt, FILE *, outfile){ if(ce_size) { ce_buffer = (char *) e_malloc(ce_size); memset(ce_buffer, 0, ce_size); - + ce_index = 0; - + /* Absolute byte address of CE entries for this directory */ ce_address = last_extent_written + (total_size >> 11); ce_address = ce_address << 11; @@ -452,13 +452,13 @@ void FDECL2(generate_one_directory, struct directory *, dpnt, FILE *, outfile){ pad, and then start the next entry at the next sector */ new_reclen = s_entry->isorec.length[0]; if ((dir_index & (SECTOR_SIZE - 1)) + new_reclen >= SECTOR_SIZE) - dir_index = (dir_index + (SECTOR_SIZE - 1)) & + dir_index = (dir_index + (SECTOR_SIZE - 1)) & ~(SECTOR_SIZE - 1); - memcpy(directory_buffer + dir_index, &s_entry->isorec, + memcpy(directory_buffer + dir_index, &s_entry->isorec, sizeof(struct iso_directory_record) - sizeof(s_entry->isorec.name) + s_entry->isorec.name_len[0]); - dir_index += sizeof(struct iso_directory_record) - + dir_index += sizeof(struct iso_directory_record) - sizeof (s_entry->isorec.name)+ s_entry->isorec.name_len[0]; /* Add the Rock Ridge attributes, if present */ @@ -486,10 +486,10 @@ void FDECL2(generate_one_directory, struct directory *, dpnt, FILE *, outfile){ set_733(pnt+4, (ce_address + ce_index) >> 11); set_733(pnt+12, (ce_address + ce_index) & (SECTOR_SIZE - 1)); - + /* Now store the block in the ce buffer */ - memcpy(ce_buffer + ce_index, + memcpy(ce_buffer + ce_index, pnt + pnt[2], nbytes); ce_index += nbytes; if(ce_index & 1) ce_index++; @@ -501,7 +501,7 @@ void FDECL2(generate_one_directory, struct directory *, dpnt, FILE *, outfile){ } rockridge_size += s_entry->total_rr_attr_size; - memcpy(directory_buffer + dir_index, s_entry->rr_attributes, + memcpy(directory_buffer + dir_index, s_entry->rr_attributes, s_entry->rr_attr_size); dir_index += s_entry->rr_attr_size; }; @@ -518,7 +518,7 @@ void FDECL2(generate_one_directory, struct directory *, dpnt, FILE *, outfile){ sort_dir = NULL; if(dpnt->size != dir_index) - fprintf(stderr,"Unexpected directory length %d %d %s\n",dpnt->size, + fprintf(stderr,"Unexpected directory length %d %d %s\n",dpnt->size, dir_index, dpnt->de_name); xfwrite(directory_buffer, 1, total_size, outfile); last_extent_written += total_size >> 11; @@ -551,7 +551,7 @@ int FDECL2(compare_paths, const struct directory **, r, const struct directory * if((*r)->parent->path_index < (*l)->parent->path_index) return -1; if((*r)->parent->path_index > (*l)->parent->path_index) return 1; return strcmp((*r)->self->isorec.name, (*l)->self->isorec.name); - + } void generate_path_tables(){ @@ -597,7 +597,7 @@ void generate_path_tables(){ if(*npnt == 0 || dpnt == root) npnt = "."; /* So the root comes out OK */ npnt1 = strrchr(npnt, PATH_SEPARATOR); if(npnt1) npnt = npnt1 + 1; - + de = dpnt->self; if(!de) {fprintf(stderr,"Fatal goof\n"); exit(1);}; @@ -607,11 +607,11 @@ void generate_path_tables(){ path_table_l[path_table_index] = namelen; path_table_m[path_table_index] = namelen; path_table_index += 2; - set_731(path_table_l + path_table_index, dpnt->extent); - set_732(path_table_m + path_table_index, dpnt->extent); + set_731(path_table_l + path_table_index, dpnt->extent); + set_732(path_table_m + path_table_index, dpnt->extent); path_table_index += 4; - set_721(path_table_l + path_table_index, dpnt->parent->path_index); - set_722(path_table_m + path_table_index, dpnt->parent->path_index); + set_721(path_table_l + path_table_index, dpnt->parent->path_index); + set_722(path_table_m + path_table_index, dpnt->parent->path_index); path_table_index += 2; for(i =0; i<namelen; i++){ path_table_l[path_table_index] = de->isorec.name[i]; @@ -678,7 +678,7 @@ int FDECL1(iso_write, FILE *, outfile){ /* Now we copy the actual root directory record */ - memcpy(vol_desc.root_directory_record, &root_record, + memcpy(vol_desc.root_directory_record, &root_record, sizeof(struct iso_directory_record) + 1); /* The rest is just fluff. It looks nice to fill in many of these fields, @@ -749,7 +749,7 @@ int FDECL1(iso_write, FILE *, outfile){ #ifdef DBG_ISO fprintf(stderr,"Total directory extents being written = %d\n", last_extent); #endif -#if 0 +#if 0 generate_one_directory(root, outfile); #endif generate_iso9660_directories(root, outfile); diff --git a/gnu/usr.bin/patch/EXTERN.h b/gnu/usr.bin/patch/EXTERN.h index bdc1ef9..96dd888 100644 --- a/gnu/usr.bin/patch/EXTERN.h +++ b/gnu/usr.bin/patch/EXTERN.h @@ -1,9 +1,12 @@ -/* $Header: EXTERN.h,v 2.0 86/09/17 15:35:37 lwall Exp $ +/* $Header: /home/ncvs/src/gnu/usr.bin/patch/EXTERN.h,v 1.1.1.1 1993/06/19 14:21:52 paul Exp $ + * + * $Log: EXTERN.h,v $ + * Revision 1.1.1.1 1993/06/19 14:21:52 paul + * b-maked patch-2.10 * - * $Log: EXTERN.h,v $ * Revision 2.0 86/09/17 15:35:37 lwall * Baseline for netwide release. - * + * */ #ifdef EXT diff --git a/gnu/usr.bin/patch/INTERN.h b/gnu/usr.bin/patch/INTERN.h index 38574ef..b718b1d 100644 --- a/gnu/usr.bin/patch/INTERN.h +++ b/gnu/usr.bin/patch/INTERN.h @@ -1,9 +1,12 @@ -/* $Header: INTERN.h,v 2.0 86/09/17 15:35:58 lwall Exp $ +/* $Header: /home/ncvs/src/gnu/usr.bin/patch/INTERN.h,v 1.1.1.1 1993/06/19 14:21:52 paul Exp $ + * + * $Log: INTERN.h,v $ + * Revision 1.1.1.1 1993/06/19 14:21:52 paul + * b-maked patch-2.10 * - * $Log: INTERN.h,v $ * Revision 2.0 86/09/17 15:35:58 lwall * Baseline for netwide release. - * + * */ #ifdef EXT diff --git a/gnu/usr.bin/patch/Makefile b/gnu/usr.bin/patch/Makefile index d614e89..4d5fad2 100644 --- a/gnu/usr.bin/patch/Makefile +++ b/gnu/usr.bin/patch/Makefile @@ -1,6 +1,6 @@ PROG= patch SRCS = backupfile.c getopt.c getopt1.c inp.c patch.c pch.c util.c \ - version.c + version.c CFLAGS += -DHAVE_CONFIG_H MAN= patch.1 .include <bsd.prog.mk> diff --git a/gnu/usr.bin/patch/backupfile.c b/gnu/usr.bin/patch/backupfile.c index d7eb5874..7779056 100644 --- a/gnu/usr.bin/patch/backupfile.c +++ b/gnu/usr.bin/patch/backupfile.c @@ -146,11 +146,11 @@ max_backup_version (file, dir) int highest_version; int this_version; int file_name_length; - + dirp = opendir (dir); if (!dirp) return 0; - + highest_version = 0; file_name_length = strlen (file); @@ -158,7 +158,7 @@ max_backup_version (file, dir) { if (!REAL_DIR_ENTRY (dp) || NLENGTH (dp) <= file_name_length) continue; - + this_version = version_number (file, dp->d_name, file_name_length); if (this_version > highest_version) highest_version = this_version; @@ -196,7 +196,7 @@ version_number (base, backup, base_length) { int version; char *p; - + version = 0; if (!strncmp (base, backup, base_length) && ISDIGIT (backup[base_length])) { @@ -276,9 +276,9 @@ argmatch (arg, optlist) int arglen; /* Length of ARG. */ int matchind = -1; /* Index of first nonexact match. */ int ambiguous = 0; /* If nonzero, multiple nonexact match(es). */ - + arglen = strlen (arg); - + /* Test all elements for either exact match or abbreviated matches. */ for (i = 0; optlist[i]; i++) { diff --git a/gnu/usr.bin/patch/common.h b/gnu/usr.bin/patch/common.h index 9bae5bd..4bb99e0 100644 --- a/gnu/usr.bin/patch/common.h +++ b/gnu/usr.bin/patch/common.h @@ -1,18 +1,22 @@ -/* $Header: /a/cvs/386BSD/src/gnu/patch/common.h,v 1.1.1.1 1993/06/19 14:21:52 paul Exp $ +/* $Header: /home/ncvs/src/gnu/usr.bin/patch/common.h,v 1.2 1993/09/22 16:51:03 rich Exp $ * * $Log: common.h,v $ + * Revision 1.2 1993/09/22 16:51:03 rich + * Increaed the fixed static buffer sizes and maximum hunk size that + * otherwise causes the XFree86 1.3 patch set to fail. + * * Revision 1.1.1.1 1993/06/19 14:21:52 paul * b-maked patch-2.10 * * Revision 2.0.1.2 88/06/22 20:44:53 lwall * patch12: sprintf was declared wrong - * + * * Revision 2.0.1.1 88/06/03 15:01:56 lwall * patch10: support for shorter extensions. - * + * * Revision 2.0 86/09/17 15:36:39 lwall * Baseline for netwide release. - * + * */ #define DEBUGGING diff --git a/gnu/usr.bin/patch/config.h b/gnu/usr.bin/patch/config.h index 71623d7..177a8c5 100644 --- a/gnu/usr.bin/patch/config.h +++ b/gnu/usr.bin/patch/config.h @@ -5,7 +5,7 @@ /* #undef const */ /* Define if the system supports file names longer than 14 characters. */ -#define HAVE_LONG_FILE_NAMES +#define HAVE_LONG_FILE_NAMES /* Define if the system has pathconf(). */ /* #undef HAVE_PATHCONF */ diff --git a/gnu/usr.bin/patch/inp.c b/gnu/usr.bin/patch/inp.c index 0d0e6af..e8e1531 100644 --- a/gnu/usr.bin/patch/inp.c +++ b/gnu/usr.bin/patch/inp.c @@ -1,15 +1,19 @@ -/* $Header: /home/ncvs/src/gnu/usr.bin/patch/inp.c,v 1.1.1.1 1993/06/19 14:21:52 paul Exp $ +/* $Header: /home/ncvs/src/gnu/usr.bin/patch/inp.c,v 1.2 1995/01/12 22:09:39 hsu Exp $ * * $Log: inp.c,v $ + * Revision 1.2 1995/01/12 22:09:39 hsu + * Fix bug that created new files even when running in -C check mode. + * Reviewed by: phk + * * Revision 1.1.1.1 1993/06/19 14:21:52 paul * b-maked patch-2.10 * * Revision 2.0.1.1 88/06/03 15:06:13 lwall * patch10: made a little smarter about sccs files - * + * * Revision 2.0 86/09/17 15:37:02 lwall * Baseline for netwide release. - * + * */ #include "EXTERN.h" @@ -210,7 +214,7 @@ char *filename; free((char *)i_womp); return FALSE; } - + /* now scan the buffer and build pointer array */ iline = 1; @@ -223,7 +227,7 @@ char *filename; /* now check for revision, if any */ - if (revision != Nullch) { + if (revision != Nullch) { if (!rev_in_string(i_womp)) { if (force) { if (verbose) @@ -369,7 +373,7 @@ char *string; if (strnEQ(string,revision,patlen) && isspace(string[patlen])) return TRUE; for (s = string; *s; s++) { - if (isspace(*s) && strnEQ(s+1, revision, patlen) && + if (isspace(*s) && strnEQ(s+1, revision, patlen) && isspace(s[patlen+1] )) { return TRUE; } diff --git a/gnu/usr.bin/patch/inp.h b/gnu/usr.bin/patch/inp.h index c6d2a91..ea07ee8 100644 --- a/gnu/usr.bin/patch/inp.h +++ b/gnu/usr.bin/patch/inp.h @@ -1,9 +1,12 @@ -/* $Header: inp.h,v 2.0 86/09/17 15:37:25 lwall Exp $ +/* $Header: /home/ncvs/src/gnu/usr.bin/patch/inp.h,v 1.1.1.1 1993/06/19 14:21:52 paul Exp $ + * + * $Log: inp.h,v $ + * Revision 1.1.1.1 1993/06/19 14:21:52 paul + * b-maked patch-2.10 * - * $Log: inp.h,v $ * Revision 2.0 86/09/17 15:37:25 lwall * Baseline for netwide release. - * + * */ EXT LINENUM input_lines INIT(0); /* how long is input file in lines */ diff --git a/gnu/usr.bin/patch/patch.c b/gnu/usr.bin/patch/patch.c index c34ca83..b03d065 100644 --- a/gnu/usr.bin/patch/patch.c +++ b/gnu/usr.bin/patch/patch.c @@ -1,5 +1,5 @@ char rcsid[] = - "$Header: /home/ncvs/src/gnu/usr.bin/patch/patch.c,v 1.4 1994/02/25 21:46:04 phk Exp $"; + "$Header: /home/ncvs/src/gnu/usr.bin/patch/patch.c,v 1.5 1995/01/12 22:09:40 hsu Exp $"; /* patch - a program to apply diffs to original files * @@ -9,6 +9,10 @@ char rcsid[] = * money off of it, or pretend that you wrote it. * * $Log: patch.c,v $ + * Revision 1.5 1995/01/12 22:09:40 hsu + * Fix bug that created new files even when running in -C check mode. + * Reviewed by: phk + * * Revision 1.4 1994/02/25 21:46:04 phk * added the -C/-check again. * @@ -25,83 +29,83 @@ char rcsid[] = * * Revision 2.0.2.0 90/05/01 22:17:50 davison * patch12u: unidiff support added - * + * * Revision 2.0.1.6 88/06/22 20:46:39 lwall * patch12: rindex() wasn't declared - * + * * Revision 2.0.1.5 88/06/03 15:09:37 lwall * patch10: exit code improved. * patch10: better support for non-flexfilenames. - * + * * Revision 2.0.1.4 87/02/16 14:00:04 lwall * Short replacement caused spurious "Out of sync" message. - * + * * Revision 2.0.1.3 87/01/30 22:45:50 lwall * Improved diagnostic on sync error. * Moved do_ed_script() to pch.c. - * + * * Revision 2.0.1.2 86/11/21 09:39:15 lwall * Fuzz factor caused offset of installed lines. - * + * * Revision 2.0.1.1 86/10/29 13:10:22 lwall * Backwards search could terminate prematurely. - * + * * Revision 2.0 86/09/17 15:37:32 lwall * Baseline for netwide release. - * + * * Revision 1.5 86/08/01 20:53:24 lwall * Changed some %d's to %ld's. * Linted. - * + * * Revision 1.4 86/08/01 19:17:29 lwall * Fixes for machines that can't vararg. * Added fuzz factor. * Generalized -p. * General cleanup. - * + * * 85/08/15 van%ucbmonet@berkeley * Changes for 4.3bsd diff -c. * * Revision 1.3 85/03/26 15:07:43 lwall * Frozen. - * + * * Revision 1.2.1.9 85/03/12 17:03:35 lwall * Changed pfp->_file to fileno(pfp). - * + * * Revision 1.2.1.8 85/03/12 16:30:43 lwall * Check i_ptr and i_womp to make sure they aren't null before freeing. * Also allow ed output to be suppressed. - * + * * Revision 1.2.1.7 85/03/12 15:56:13 lwall * Added -p option from jromine@uci-750a. - * + * * Revision 1.2.1.6 85/03/12 12:12:51 lwall * Now checks for normalness of file to patch. - * + * * Revision 1.2.1.5 85/03/12 11:52:12 lwall * Added -D (#ifdef) option from joe@fluke. - * + * * Revision 1.2.1.4 84/12/06 11:14:15 lwall * Made smarter about SCCS subdirectories. - * + * * Revision 1.2.1.3 84/12/05 11:18:43 lwall * Added -l switch to do loose string comparison. - * + * * Revision 1.2.1.2 84/12/04 09:47:13 lwall * Failed hunk count not reset on multiple patch file. - * + * * Revision 1.2.1.1 84/12/04 09:42:37 lwall * Branch for sdcrdcf changes. - * + * * Revision 1.2 84/11/29 13:29:51 lwall * Linted. Identifiers uniqified. Fixed i_ptr malloc() bug. Fixed * multiple calls to mktemp(). Will now work on machines that can only * read 32767 chars. Added -R option for diffs with new and old swapped. * Various cosmetic changes. - * + * * Revision 1.1 84/11/09 17:03:58 lwall * Initial revision - * + * */ #include "INTERN.h" @@ -214,7 +218,7 @@ char **argv; Argc = argc; Argv = argv; get_some_switches(); - + /* make sure we clean up /tmp in case of disaster */ set_signals(0); @@ -226,27 +230,27 @@ char **argv; if (outname == Nullch) outname = savestr(filearg[0]); - + /* for ed script just up and do it and exit */ if (diff_type == ED_DIFF) { do_ed_script(); continue; } - + /* initialize the patched file */ if (!skip_rest_of_patch) init_output(TMPOUTNAME); - + /* initialize reject file */ init_reject(TMPREJNAME); - + /* find out where all the lines are */ if (!skip_rest_of_patch) scan_input(filearg[0]); - + /* from here on, open no standard i/o files, because malloc */ /* might misfire and we can't catch it easily */ - + /* apply each hunk of patch */ hunk = 0; failed = 0; @@ -356,13 +360,13 @@ char **argv; rejfp = Nullfp; continue; } - + assert(hunk); - + /* finish spewing out the new file */ if (!skip_rest_of_patch) spew_output(); - + /* and put the output where desired */ ignore_signals(); if (!skip_rest_of_patch) { @@ -630,7 +634,7 @@ LINENUM fuzz; Reg2 LINENUM offset; LINENUM pat_lines = pch_ptrn_lines(); Reg3 LINENUM max_pos_offset = input_lines - first_guess - - pat_lines + 1; + - pat_lines + 1; Reg4 LINENUM max_neg_offset = first_guess - last_frozen_line - 1 + pch_context(); @@ -706,7 +710,7 @@ abort_hunk() fprintf(rejfp, "%c %s", pch_char(i), pfetch(i)); break; default: - fatal1("fatal internal error in abort_hunk\n"); + fatal1("fatal internal error in abort_hunk\n"); } } } @@ -731,7 +735,7 @@ LINENUM where; where--; while (pch_char(new) == '=' || pch_char(new) == '\n') new++; - + while (old <= lastline) { if (pch_char(old) == '-') { copy_till(where + old - 1); diff --git a/gnu/usr.bin/patch/pch.c b/gnu/usr.bin/patch/pch.c index 0a844f2..98f1dd4 100644 --- a/gnu/usr.bin/patch/pch.c +++ b/gnu/usr.bin/patch/pch.c @@ -1,6 +1,9 @@ -/* $Header: /home/cvs/386BSD/src/gnu/usr.bin/patch/pch.c,v 1.3 1994/02/17 22:20:36 jkh Exp $ +/* $Header: /home/ncvs/src/gnu/usr.bin/patch/pch.c,v 1.4 1994/02/25 21:46:07 phk Exp $ * * $Log: pch.c,v $ + * Revision 1.4 1994/02/25 21:46:07 phk + * added the -C/-check again. + * * Revision 1.3 1994/02/17 22:20:36 jkh * Put this back - I was somehow under the erroneous impression that patch was in * ports, until I saw the the commit messages, that is! :-) All changed backed out. @@ -18,29 +21,29 @@ * Revision 2.0.1.7 88/06/03 15:13:28 lwall * patch10: Can now find patches in shar scripts. * patch10: Hunks that swapped and then swapped back could core dump. - * + * * Revision 2.0.1.6 87/06/04 16:18:13 lwall * pch_swap didn't swap p_bfake and p_efake. - * + * * Revision 2.0.1.5 87/01/30 22:47:42 lwall * Improved responses to mangled patches. - * + * * Revision 2.0.1.4 87/01/05 16:59:53 lwall * New-style context diffs caused double call to free(). - * + * * Revision 2.0.1.3 86/11/14 10:08:33 lwall * Fixed problem where a long pattern wouldn't grow the hunk. * Also restored p_input_line when backtracking so error messages are right. - * + * * Revision 2.0.1.2 86/11/03 17:49:52 lwall * New-style delete triggers spurious assertion error. - * + * * Revision 2.0.1.1 86/10/29 15:52:08 lwall * Could falsely report new-style context diff. - * + * * Revision 2.0 86/09/17 15:39:37 lwall * Baseline for netwide release. - * + * */ #include "EXTERN.h" @@ -132,7 +135,7 @@ void grow_hunkmax() { hunkmax *= 2; - /* + /* * Note that on most systems, only the p_line array ever gets fresh memory * since p_len can move into p_line's old space, and p_Char can move into * p_len's old space. Not on PDP-11's however. But it doesn't matter. @@ -269,10 +272,10 @@ intuit_diff_type() else indent++; } - for (t=s; isdigit(*t) || *t == ','; t++) ; + for (t=s; isdigit(*t) || *t == ','; t++) ; this_is_a_command = (isdigit(*s) && (*t == 'd' || *t == 'c' || *t == 'a') ); - if (first_command_line < 0L && this_is_a_command) { + if (first_command_line < 0L && this_is_a_command) { first_command_line = this_line; fcl_line = p_input_line; p_indent = indent; /* assume this for now */ @@ -328,7 +331,7 @@ intuit_diff_type() retval = (*(s-1) == '*' ? NEW_CONTEXT_DIFF : CONTEXT_DIFF); goto scan_exit; } - if ((!diff_type || diff_type == NORMAL_DIFF) && + if ((!diff_type || diff_type == NORMAL_DIFF) && last_line_was_command && (strnEQ(s, "< ", 2) || strnEQ(s, "> ", 2)) ) { p_start = previous_line; @@ -698,19 +701,19 @@ another_hunk() else p_len[p_end] = 0; } - + hunk_done: if (p_end >=0 && !repl_beginning) fatal2("no --- found in patch at line %ld\n", pch_hunk_beg()); if (repl_missing) { - + /* reset state back to just after --- */ p_input_line = repl_patch_line; for (p_end--; p_end > repl_beginning; p_end--) free(p_line[p_end]); Fseek(pfp, repl_backtrack_position, 0); - + /* redundant 'new' context lines were omitted - set */ /* up to fill them in from the old file context */ if (!p_context && p_repl_lines == 1) { @@ -749,7 +752,7 @@ another_hunk() "the new style...)"); diff_type = NEW_CONTEXT_DIFF; } - + /* if there were omitted context lines, fill them in now */ if (fillcnt) { p_bfake = filldst; /* remember where not to free() */ @@ -1081,7 +1084,7 @@ pch_swap() i = p_first; p_first = p_newfirst; p_newfirst = i; - + /* make a scratch copy */ tp_line = p_line; diff --git a/gnu/usr.bin/patch/pch.h b/gnu/usr.bin/patch/pch.h index 97a5b28..4967081 100644 --- a/gnu/usr.bin/patch/pch.h +++ b/gnu/usr.bin/patch/pch.h @@ -1,12 +1,15 @@ -/* $Header: pch.h,v 2.0.1.1 87/01/30 22:47:16 lwall Exp $ +/* $Header: /home/ncvs/src/gnu/usr.bin/patch/pch.h,v 1.1.1.1 1993/06/19 14:21:52 paul Exp $ + * + * $Log: pch.h,v $ + * Revision 1.1.1.1 1993/06/19 14:21:52 paul + * b-maked patch-2.10 * - * $Log: pch.h,v $ * Revision 2.0.1.1 87/01/30 22:47:16 lwall * Added do_ed_script(). - * + * * Revision 2.0 86/09/17 15:39:57 lwall * Baseline for netwide release. - * + * */ EXT FILE *pfp INIT(Nullfp); /* patch file pointer */ diff --git a/gnu/usr.bin/patch/util.c b/gnu/usr.bin/patch/util.c index ecb85ff..56ce12e 100644 --- a/gnu/usr.bin/patch/util.c +++ b/gnu/usr.bin/patch/util.c @@ -69,7 +69,7 @@ char *from, *to; dev_t to_device = filestat.st_dev; ino_t to_inode = filestat.st_ino; char *simplename = bakname; - + for (s=bakname; *s; s++) { if (*s == '/') simplename = s+1; @@ -104,7 +104,7 @@ char *from, *to; #endif if (rename(from, to) < 0) { /* different file system? */ Reg4 int tofd; - + tofd = creat(to, 0666); if (tofd < 0) { say4("Can't create %s, output is in %s: %s\n", @@ -133,7 +133,7 @@ char *from, *to; Reg3 int tofd; Reg2 int fromfd; Reg1 int i; - + tofd = creat(to, 0666); if (tofd < 0) pfatal2("can't create %s", to); diff --git a/gnu/usr.bin/patch/util.h b/gnu/usr.bin/patch/util.h index d8e46bb..c56b4c3 100644 --- a/gnu/usr.bin/patch/util.h +++ b/gnu/usr.bin/patch/util.h @@ -1,9 +1,12 @@ -/* $Header: util.h,v 2.0 86/09/17 15:40:06 lwall Exp $ +/* $Header: /home/ncvs/src/gnu/usr.bin/patch/util.h,v 1.1.1.1 1993/06/19 14:21:52 paul Exp $ + * + * $Log: util.h,v $ + * Revision 1.1.1.1 1993/06/19 14:21:52 paul + * b-maked patch-2.10 * - * $Log: util.h,v $ * Revision 2.0 86/09/17 15:40:06 lwall * Baseline for netwide release. - * + * */ /* and for those machine that can't handle a variable argument list */ diff --git a/gnu/usr.bin/patch/version.c b/gnu/usr.bin/patch/version.c index f0b5223..dfd2e9a 100644 --- a/gnu/usr.bin/patch/version.c +++ b/gnu/usr.bin/patch/version.c @@ -1,9 +1,12 @@ -/* $Header: version.c,v 2.0 86/09/17 15:40:11 lwall Exp $ +/* $Header: /home/ncvs/src/gnu/usr.bin/patch/version.c,v 1.1.1.1 1993/06/19 14:21:52 paul Exp $ + * + * $Log: version.c,v $ + * Revision 1.1.1.1 1993/06/19 14:21:52 paul + * b-maked patch-2.10 * - * $Log: version.c,v $ * Revision 2.0 86/09/17 15:40:11 lwall * Baseline for netwide release. - * + * */ #include "EXTERN.h" diff --git a/gnu/usr.bin/patch/version.h b/gnu/usr.bin/patch/version.h index 08fe68d..f59ee26 100644 --- a/gnu/usr.bin/patch/version.h +++ b/gnu/usr.bin/patch/version.h @@ -1,9 +1,12 @@ -/* $Header: version.h,v 2.0 86/09/17 15:40:14 lwall Exp $ +/* $Header: /home/ncvs/src/gnu/usr.bin/patch/version.h,v 1.1.1.1 1993/06/19 14:21:52 paul Exp $ + * + * $Log: version.h,v $ + * Revision 1.1.1.1 1993/06/19 14:21:52 paul + * b-maked patch-2.10 * - * $Log: version.h,v $ * Revision 2.0 86/09/17 15:40:14 lwall * Baseline for netwide release. - * + * */ void version(); diff --git a/gnu/usr.bin/perl/Makefile b/gnu/usr.bin/perl/Makefile index 661af5f6..385033a 100644 --- a/gnu/usr.bin/perl/Makefile +++ b/gnu/usr.bin/perl/Makefile @@ -4,7 +4,7 @@ # Note: I'm not sure what to do with c2ph located in misc... # -SUBDIR= perl tperl sperl usub lib x2p +SUBDIR= perl tperl sperl usub lib x2p .include <bsd.subdir.mk> diff --git a/gnu/usr.bin/perl/lib/Makefile b/gnu/usr.bin/perl/lib/Makefile index 88bc2ab..387824b 100644 --- a/gnu/usr.bin/perl/lib/Makefile +++ b/gnu/usr.bin/perl/lib/Makefile @@ -4,7 +4,7 @@ PLIB+= abbrev.pl assert.pl bigfloat.pl bigint.pl bigrat.pl cacheout.pl PLIB+= chat2.pl complete.pl ctime.pl dumpvar.pl exceptions.pl fastcwd.pl PLIB+= find.pl finddepth.pl flush.pl getcwd.pl getopts.pl importenv.pl PLIB+= look.pl newgetopt.pl open2.pl perldb.pl pwd.pl shellwords.pl -PLIB+= stat.pl syslog.pl termcap.pl timelocal.pl validate.pl +PLIB+= stat.pl syslog.pl termcap.pl timelocal.pl validate.pl NOOBJ= diff --git a/gnu/usr.bin/perl/perl/EXTERN.h b/gnu/usr.bin/perl/perl/EXTERN.h index 181d50d..fec95bf 100644 --- a/gnu/usr.bin/perl/perl/EXTERN.h +++ b/gnu/usr.bin/perl/perl/EXTERN.h @@ -1,4 +1,4 @@ -/* $RCSfile: EXTERN.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:33 $ +/* $RCSfile: EXTERN.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $ * * Copyright (c) 1991, Larry Wall * @@ -6,15 +6,18 @@ * License or the Artistic License, as specified in the README file. * * $Log: EXTERN.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:34 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:33 nate * PERL! * * Revision 4.0.1.1 91/06/07 10:10:32 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 00:58:26 lwall * 4.0 baseline. - * + * */ #undef EXT diff --git a/gnu/usr.bin/perl/perl/INTERN.h b/gnu/usr.bin/perl/perl/INTERN.h index 21c9026..d1792d8 100644 --- a/gnu/usr.bin/perl/perl/INTERN.h +++ b/gnu/usr.bin/perl/perl/INTERN.h @@ -1,4 +1,4 @@ -/* $RCSfile: INTERN.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:33 $ +/* $RCSfile: INTERN.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $ * * Copyright (c) 1991, Larry Wall * @@ -6,15 +6,18 @@ * License or the Artistic License, as specified in the README file. * * $Log: INTERN.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:34 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:33 nate * PERL! * * Revision 4.0.1.1 91/06/07 10:10:42 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 00:58:35 lwall * 4.0 baseline. - * + * */ #undef EXT diff --git a/gnu/usr.bin/perl/perl/Makefile b/gnu/usr.bin/perl/perl/Makefile index 3468e22..c981ac1 100644 --- a/gnu/usr.bin/perl/perl/Makefile +++ b/gnu/usr.bin/perl/perl/Makefile @@ -1,17 +1,17 @@ # -# +# PROG= perl SRCS+= array.c cmd.c cons.c consarg.c doarg.c doio.c dolist.c dump.c SRCS+= eval.c form.c hash.c malloc.c perl.c perly.c regcomp.c regexec.c SRCS+= stab.c str.c toke.c util.c usersub.c -CFLAGS+= -I${.CURDIR} -LDADD= -lm -DPADD= ${LIBM} +CFLAGS+= -I${.CURDIR} +LDADD= -lm +DPADD= ${LIBM} DPADD+= ${LIBCRYPT} LDADD+= -lcrypt .include "../../Makefile.inc" -.include <bsd.prog.mk> +.include <bsd.prog.mk> diff --git a/gnu/usr.bin/perl/perl/arg.h b/gnu/usr.bin/perl/perl/arg.h index 813ce3a..b3f8d5a 100644 --- a/gnu/usr.bin/perl/perl/arg.h +++ b/gnu/usr.bin/perl/perl/arg.h @@ -1,4 +1,4 @@ -/* $RCSfile: arg.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $ +/* $RCSfile: arg.h,v $$Revision: 1.2 $$Date: 1994/09/11 03:17:24 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,10 @@ * License or the Artistic License, as specified in the README file. * * $Log: arg.h,v $ + * Revision 1.2 1994/09/11 03:17:24 gclarkii + * Changed AF_LOCAL to AF_LOCAL_XX so as not to conflict with 4.4 socket.h + * Added casts to shutup warnings in doio.c + * * Revision 1.1.1.1 1994/09/10 06:27:34 gclarkii * Initial import of Perl 4.046 bmaked * @@ -15,19 +19,19 @@ * Revision 4.0.1.3 92/06/08 11:44:06 lwall * patch20: O_PIPE conflicted with Atari * patch20: clarified debugging output for literals and double-quoted strings - * + * * Revision 4.0.1.2 91/11/05 15:51:05 lwall * patch11: added eval {} * patch11: added sort {} LIST - * + * * Revision 4.0.1.1 91/06/07 10:18:30 lwall * patch4: length($`), length($&), length($') now optimized to avoid string copy * patch4: new copyright notice * patch4: many, many itty-bitty portability fixes - * + * * Revision 4.0 91/03/20 01:03:09 lwall * 4.0 baseline. - * + * */ #define O_NULL 0 diff --git a/gnu/usr.bin/perl/perl/array.c b/gnu/usr.bin/perl/perl/array.c index 445bc60..a413e3b 100644 --- a/gnu/usr.bin/perl/perl/array.c +++ b/gnu/usr.bin/perl/perl/array.c @@ -1,4 +1,4 @@ -/* $RCSfile: array.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:34 $ +/* $RCSfile: array.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:31 $ * * Copyright (c) 1991, Larry Wall * @@ -6,22 +6,25 @@ * License or the Artistic License, as specified in the README file. * * $Log: array.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:31 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:34 nate * PERL! * * Revision 4.0.1.3 92/06/08 11:45:05 lwall * patch20: Perl now distinguishes overlapped copies from non-overlapped - * + * * Revision 4.0.1.2 91/11/05 16:00:14 lwall * patch11: random cleanup * patch11: passing non-existend array elements to subrouting caused core dump - * + * * Revision 4.0.1.1 91/06/07 10:19:08 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:03:32 lwall * 4.0 baseline. - * + * */ #include "EXTERN.h" diff --git a/gnu/usr.bin/perl/perl/array.h b/gnu/usr.bin/perl/perl/array.h index 93d4920..9b2207b 100644 --- a/gnu/usr.bin/perl/perl/array.h +++ b/gnu/usr.bin/perl/perl/array.h @@ -1,4 +1,4 @@ -/* $RCSfile: array.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:34 $ +/* $RCSfile: array.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $ * * Copyright (c) 1991, Larry Wall * @@ -6,18 +6,21 @@ * License or the Artistic License, as specified in the README file. * * $Log: array.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:34 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:34 nate * PERL! * * Revision 4.0.1.2 92/06/08 11:45:57 lwall * patch20: removed implicit int declarations on funcions - * + * * Revision 4.0.1.1 91/06/07 10:19:20 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:03:44 lwall * 4.0 baseline. - * + * */ struct atbl { diff --git a/gnu/usr.bin/perl/perl/cmd.c b/gnu/usr.bin/perl/perl/cmd.c index 1ddbde0..162926d 100644 --- a/gnu/usr.bin/perl/perl/cmd.c +++ b/gnu/usr.bin/perl/perl/cmd.c @@ -1,4 +1,4 @@ -/* $RCSfile: cmd.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:35 $ +/* $RCSfile: cmd.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:32 $ * * Copyright (c) 1991, Larry Wall * @@ -6,32 +6,35 @@ * License or the Artistic License, as specified in the README file. * * $Log: cmd.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:32 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:35 nate * PERL! * * Revision 4.0.1.5 92/06/08 12:00:39 lwall * patch20: the switch optimizer didn't do anything in subroutines * patch20: removed implicit int declarations on funcions - * + * * Revision 4.0.1.4 91/11/11 16:29:33 lwall * patch19: do {$foo ne "bar";} returned wrong value * patch19: some earlier patches weren't propagated to alternate 286 code - * + * * Revision 4.0.1.3 91/11/05 16:07:43 lwall * patch11: random cleanup * patch11: "foo\0" eq "foo" was sometimes optimized to true * patch11: foreach on null list could spring memory leak - * + * * Revision 4.0.1.2 91/06/07 10:26:45 lwall * patch4: new copyright notice * patch4: made some allowances for "semi-standard" C - * + * * Revision 4.0.1.1 91/04/11 17:36:16 lwall * patch1: you may now use "die" and "caller" in a signal handler - * + * * Revision 4.0 91/03/20 01:04:18 lwall * 4.0 baseline. - * + * */ #include "EXTERN.h" diff --git a/gnu/usr.bin/perl/perl/cmd.h b/gnu/usr.bin/perl/perl/cmd.h index 76ef5c8..da0fa8e 100644 --- a/gnu/usr.bin/perl/perl/cmd.h +++ b/gnu/usr.bin/perl/perl/cmd.h @@ -1,4 +1,4 @@ -/* $RCSfile: cmd.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:35 $ +/* $RCSfile: cmd.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $ * * Copyright (c) 1991, Larry Wall * @@ -6,19 +6,22 @@ * License or the Artistic License, as specified in the README file. * * $Log: cmd.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:34 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:35 nate * PERL! * * Revision 4.0.1.2 92/06/08 12:01:02 lwall * patch20: removed implicit int declarations on funcions - * + * * Revision 4.0.1.1 91/06/07 10:28:50 lwall * patch4: new copyright notice * patch4: length($`), length($&), length($') now optimized to avoid string copy - * + * * Revision 4.0 91/03/20 01:04:34 lwall * 4.0 baseline. - * + * */ #define C_NULL 0 diff --git a/gnu/usr.bin/perl/perl/cons.c b/gnu/usr.bin/perl/perl/cons.c index c926f7a..bbf783e 100644 --- a/gnu/usr.bin/perl/perl/cons.c +++ b/gnu/usr.bin/perl/perl/cons.c @@ -1,4 +1,4 @@ -/* $RCSfile: cons.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:35 $ +/* $RCSfile: cons.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:32 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: cons.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:32 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:35 nate * PERL! * @@ -21,18 +24,18 @@ * patch20: debugger sometimes displayed wrong source line * patch20: various error messages have been clarified * patch20: an eval block containing a null block or statement could dump core - * + * * Revision 4.0.1.2 91/11/05 16:15:13 lwall * patch11: debugger got confused over nested subroutine definitions * patch11: prepared for ctype implementations that don't define isascii() - * + * * Revision 4.0.1.1 91/06/07 10:31:15 lwall * patch4: new copyright notice * patch4: added global modifier for pattern matches - * + * * Revision 4.0 91/03/20 01:05:51 lwall * 4.0 baseline. - * + * */ #include "EXTERN.h" @@ -1224,7 +1227,7 @@ register ARG *arg; case A_LEXPR: if (arg->arg_type == O_AASSIGN && arg[i].arg_ptr.arg_arg->arg_type == O_LARRAY) { - char *name = + char *name = stab_name(arg[i].arg_ptr.arg_arg[1].arg_ptr.arg_stab); if (strnEQ("_GEN_",name, 5)) /* array for foreach */ diff --git a/gnu/usr.bin/perl/perl/consarg.c b/gnu/usr.bin/perl/perl/consarg.c index 440fcfd..d0d59b7 100644 --- a/gnu/usr.bin/perl/perl/consarg.c +++ b/gnu/usr.bin/perl/perl/consarg.c @@ -1,4 +1,4 @@ -/* $RCSfile: consarg.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:32 $ +/* $RCSfile: consarg.c,v $$Revision: 1.2 $$Date: 1994/09/11 03:17:29 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,10 @@ * License or the Artistic License, as specified in the README file. * * $Log: consarg.c,v $ + * Revision 1.2 1994/09/11 03:17:29 gclarkii + * Changed AF_LOCAL to AF_LOCAL_XX so as not to conflict with 4.4 socket.h + * Added casts to shutup warnings in doio.c + * * Revision 1.1.1.1 1994/09/10 06:27:32 gclarkii * Initial import of Perl 4.046 bmaked * @@ -17,24 +21,24 @@ * patch20: modulus with highest bit in left operand set didn't always work * patch20: illegal lvalue message could be followed by core dump * patch20: deleted some minor memory leaks - * + * * Revision 4.0.1.3 91/11/05 16:21:16 lwall * patch11: random cleanup * patch11: added eval {} * patch11: added sort {} LIST * patch11: "foo" x -1 dumped core * patch11: substr() and vec() weren't allowed in an lvalue list - * + * * Revision 4.0.1.2 91/06/07 10:33:12 lwall * patch4: new copyright notice * patch4: length($`), length($&), length($') now optimized to avoid string copy - * + * * Revision 4.0.1.1 91/04/11 17:38:34 lwall * patch1: fixed "Bad free" error - * + * * Revision 4.0 91/03/20 01:06:15 lwall * 4.0 baseline. - * + * */ #include "EXTERN.h" @@ -200,9 +204,9 @@ ARG *arg3; } /*SUPPRESS 560*/ if (chld = arg2) { - if (chld->arg_type == O_ITEM && - (hoistable[chld[1].arg_type&A_MASK] || - (type == O_ASSIGN && + if (chld->arg_type == O_ITEM && + (hoistable[chld[1].arg_type&A_MASK] || + (type == O_ASSIGN && ((chld[1].arg_type == A_READ && !(arg[1].arg_type & A_DONT)) || (chld[1].arg_type == A_INDREAD && !(arg[1].arg_type & A_DONT)) @@ -1074,7 +1078,7 @@ ARG *arg; if (arg->arg_type == O_CONCAT && arg[2].arg_type == A_EXPR) { arg2 = arg[2].arg_ptr.arg_arg; if (arg2->arg_type == O_ITEM && arg2[1].arg_type == A_READ) { - arg->arg_type = O_RCAT; + arg->arg_type = O_RCAT; arg[2].arg_type = arg2[1].arg_type; arg[2].arg_ptr = arg2[1].arg_ptr; free_arg(arg2); diff --git a/gnu/usr.bin/perl/perl/crypt.c b/gnu/usr.bin/perl/perl/crypt.c index 3299a86..3e95f45 100644 --- a/gnu/usr.bin/perl/perl/crypt.c +++ b/gnu/usr.bin/perl/perl/crypt.c @@ -36,7 +36,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /* from static char sccsid[] = "@(#)crypt.c 5.11 (Berkeley) 6/25/91"; */ -static char rcsid[] = "$Header: /home/cvs/386BSD/src/lib/libc/gen/crypt.c,v 1.6 1993/08/29 22:03:56 nate Exp $"; +static char rcsid[] = "$Header: /home/ncvs/src/gnu/usr.bin/perl/perl/crypt.c,v 1.1.1.1 1994/09/10 06:27:37 gclarkii Exp $"; #endif /* LIBC_SCCS and not lint */ #include <unistd.h> @@ -44,7 +44,7 @@ static char rcsid[] = "$Header: /home/cvs/386BSD/src/lib/libc/gen/crypt.c,v 1.6 /* * UNIX password, and DES, encryption. - * + * * since this is non-exportable, this is just a dummy. if you want real * encryption, make sure you've got libcrypt.a around. */ diff --git a/gnu/usr.bin/perl/perl/doarg.c b/gnu/usr.bin/perl/perl/doarg.c index 7c03bff..2a64787 100644 --- a/gnu/usr.bin/perl/perl/doarg.c +++ b/gnu/usr.bin/perl/perl/doarg.c @@ -1,4 +1,4 @@ -/* $RCSfile: doarg.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:32 $ +/* $RCSfile: doarg.c,v $$Revision: 1.2 $$Date: 1994/09/11 03:17:30 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,10 @@ * License or the Artistic License, as specified in the README file. * * $Log: doarg.c,v $ + * Revision 1.2 1994/09/11 03:17:30 gclarkii + * Changed AF_LOCAL to AF_LOCAL_XX so as not to conflict with 4.4 socket.h + * Added casts to shutup warnings in doio.c + * * Revision 1.1.1.1 1994/09/10 06:27:32 gclarkii * Initial import of Perl 4.046 bmaked * @@ -18,7 +22,7 @@ * Revision 4.0.1.7 92/06/11 21:07:11 lwall * patch34: join with null list attempted negative allocation * patch34: sprintf("%6.4s", "abcdefg") didn't print "abcd " - * + * * Revision 4.0.1.6 92/06/08 12:34:30 lwall * patch20: removed implicit int declarations on funcions * patch20: pattern modifiers i and o didn't interact right @@ -28,10 +32,10 @@ * patch20: usersub routines didn't reclaim temp values soon enough * patch20: ($<,$>) = ... didn't work on some architectures * patch20: added Atari ST portability - * + * * Revision 4.0.1.5 91/11/11 16:31:58 lwall * patch19: added little-endian pack/unpack options - * + * * Revision 4.0.1.4 91/11/05 16:35:06 lwall * patch11: /$foo/o optimizer could access deallocated data * patch11: minimum match length calculation in regexp is now cumulative @@ -40,10 +44,10 @@ * patch11: sprintf() now supports any length of s field * patch11: indirect subroutine calls through magic vars (e.g. &$1) didn't work * patch11: defined(&$foo) and undef(&$foo) didn't work - * + * * Revision 4.0.1.3 91/06/10 01:18:41 lwall * patch10: pack(hh,1) dumped core - * + * * Revision 4.0.1.2 91/06/07 10:42:17 lwall * patch4: new copyright notice * patch4: // wouldn't use previous pattern if it started with a null character @@ -53,14 +57,14 @@ * patch4: chop("") was returning "\0" rather than "" * patch4: vector logical operations &, | and ^ sometimes returned null string * patch4: syscall couldn't pass numbers with most significant bit set on sparcs - * + * * Revision 4.0.1.1 91/04/11 17:40:14 lwall * patch1: fixed undefined environ problem * patch1: fixed debugger coredump on subroutines - * + * * Revision 4.0 91/03/20 01:06:42 lwall * 4.0 baseline. - * + * */ #include "EXTERN.h" @@ -911,7 +915,7 @@ register STR **sarg; xlen = strlen(xs); break; case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': + case '5': case '6': case '7': case '8': case '9': case '.': case '#': case '-': case '+': case ' ': continue; case 'l': diff --git a/gnu/usr.bin/perl/perl/doio.c b/gnu/usr.bin/perl/perl/doio.c index a603feb..9c0731f 100644 --- a/gnu/usr.bin/perl/perl/doio.c +++ b/gnu/usr.bin/perl/perl/doio.c @@ -1,4 +1,4 @@ -/* $RCSfile: doio.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:32 $ +/* $RCSfile: doio.c,v $$Revision: 1.2 $$Date: 1994/09/11 03:17:32 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,10 @@ * License or the Artistic License, as specified in the README file. * * $Log: doio.c,v $ + * Revision 1.2 1994/09/11 03:17:32 gclarkii + * Changed AF_LOCAL to AF_LOCAL_XX so as not to conflict with 4.4 socket.h + * Added casts to shutup warnings in doio.c + * * Revision 1.1.1.1 1994/09/10 06:27:32 gclarkii * Initial import of Perl 4.046 bmaked * @@ -17,7 +21,7 @@ * * Revision 4.0.1.6 92/06/11 21:08:16 lwall * patch34: some systems don't declare h_errno extern in header files - * + * * Revision 4.0.1.5 92/06/08 13:00:21 lwall * patch20: some machines don't define ENOTSOCK in errno.h * patch20: new warnings for failed use of stat operators on filenames with \n @@ -27,7 +31,7 @@ * patch20: fixed memory leak on system() for vfork() machines * patch20: get*by* routines now return something useful in a scalar context * patch20: h_errno now accessible via $? - * + * * Revision 4.0.1.4 91/11/05 16:51:43 lwall * patch11: prepared for ctype implementations that don't define isascii() * patch11: perl mistook some streams for sockets because they return mode 0 too @@ -36,11 +40,11 @@ * patch11: truncate on a closed filehandle could dump * patch11: stats of _ forgot whether prior stat was actually lstat * patch11: -T returned true on NFS directory - * + * * Revision 4.0.1.3 91/06/10 01:21:19 lwall * patch10: read didn't work from character special files open for writing * patch10: close-on-exec wrongly set on system file descriptors - * + * * Revision 4.0.1.2 91/06/07 10:53:39 lwall * patch4: new copyright notice * patch4: system fd's are now treated specially @@ -48,13 +52,13 @@ * patch4: character special files now opened with bidirectional stdio buffers * patch4: taintchecks could improperly modify parent in vfork() * patch4: many, many itty-bitty portability fixes - * + * * Revision 4.0.1.1 91/04/11 17:41:06 lwall * patch1: hopefully straightened out some of the Xenix mess - * + * * Revision 4.0 91/03/20 01:07:06 lwall * 4.0 baseline. - * + * */ #include "EXTERN.h" @@ -1000,7 +1004,7 @@ STR *str; if (!str->str_pok) return TRUE; - s = str->str_ptr; + s = str->str_ptr; send = s + str->str_cur; while (isSPACE(*s)) s++; @@ -1012,7 +1016,7 @@ STR *str; s++; if (s == send) return TRUE; - if (*s == '.') + if (*s == '.') s++; else if (s == str->str_ptr) return FALSE; @@ -1648,7 +1652,7 @@ int *arglast; st[sp] = &str_yes; break; } - + return sp; nuts: @@ -1692,7 +1696,7 @@ int *arglast; goto nuts2; break; } - + return sp; nuts: diff --git a/gnu/usr.bin/perl/perl/dolist.c b/gnu/usr.bin/perl/perl/dolist.c index f966479..448a260 100644 --- a/gnu/usr.bin/perl/perl/dolist.c +++ b/gnu/usr.bin/perl/perl/dolist.c @@ -1,4 +1,4 @@ -/* $RCSfile: dolist.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:36 $ +/* $RCSfile: dolist.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:32 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: dolist.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:32 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:36 nate * PERL! * @@ -19,11 +22,11 @@ * patch20: splice with negative offset didn't work with $[ = 1 * patch20: fixed some memory leaks in splice * patch20: scalar keys %array now counts keys for you - * + * * Revision 4.0.1.4 91/11/11 16:33:19 lwall * patch19: added little-endian pack/unpack options * patch19: sort $subname was busted by changes in 4.018 - * + * * Revision 4.0.1.3 91/11/05 17:07:02 lwall * patch11: prepared for ctype implementations that don't define isascii() * patch11: /$foo/o optimizer could access deallocated data @@ -34,10 +37,10 @@ * patch11: grep of a split lost its values * patch11: added sort {} LIST * patch11: multiple reallocations now avoided in 1 .. 100000 - * + * * Revision 4.0.1.2 91/06/10 01:22:15 lwall * patch10: //g only worked first time through - * + * * Revision 4.0.1.1 91/06/07 10:58:28 lwall * patch4: new copyright notice * patch4: added global modifier for pattern matches @@ -45,10 +48,10 @@ * patch4: //o and s///o now optimize themselves fully at runtime * patch4: $` was busted inside s/// * patch4: caller($arg) didn't work except under debugger - * + * * Revision 4.0 91/03/20 01:08:03 lwall * 4.0 baseline. - * + * */ #include "EXTERN.h" @@ -558,7 +561,7 @@ int *arglast; zaps = str_get(afetch(ary,sp,FALSE)); zapb = (int) *zaps; } - + while (iters > 0 && (!zapb)) { iters--,sp--; if (iters > 0) { @@ -1593,7 +1596,7 @@ int *arglast; if (stab) { if (!stab_sub(stab) || !(sortcmd = stab_sub(stab)->cmd)) - fatal("Undefined subroutine \"%s\" in sort", + fatal("Undefined subroutine \"%s\" in sort", stab_ename(stab)); stash = stab_estash(stab); } diff --git a/gnu/usr.bin/perl/perl/dump.c b/gnu/usr.bin/perl/perl/dump.c index c955169..7a07135 100644 --- a/gnu/usr.bin/perl/perl/dump.c +++ b/gnu/usr.bin/perl/perl/dump.c @@ -1,4 +1,4 @@ -/* $RCSfile: dump.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:32 $ +/* $RCSfile: dump.c,v $$Revision: 1.2 $$Date: 1994/09/11 03:17:33 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,10 @@ * License or the Artistic License, as specified in the README file. * * $Log: dump.c,v $ + * Revision 1.2 1994/09/11 03:17:33 gclarkii + * Changed AF_LOCAL to AF_LOCAL_XX so as not to conflict with 4.4 socket.h + * Added casts to shutup warnings in doio.c + * * Revision 1.1.1.1 1994/09/10 06:27:32 gclarkii * Initial import of Perl 4.046 bmaked * @@ -15,13 +19,13 @@ * Revision 4.0.1.2 92/06/08 13:14:22 lwall * patch20: removed implicit int declarations on funcions * patch20: fixed confusion between a *var's real name and its effective name - * + * * Revision 4.0.1.1 91/06/07 10:58:44 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:08:25 lwall * 4.0 baseline. - * + * */ #include "EXTERN.h" diff --git a/gnu/usr.bin/perl/perl/eval.c b/gnu/usr.bin/perl/perl/eval.c index fbd2fdd..40155f5 100644 --- a/gnu/usr.bin/perl/perl/eval.c +++ b/gnu/usr.bin/perl/perl/eval.c @@ -1,4 +1,4 @@ -/* $RCSfile: eval.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:36 $ +/* $RCSfile: eval.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:32 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: eval.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:32 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:36 nate * PERL! * @@ -18,7 +21,7 @@ * patch20: dbmclose(%array) didn't work * patch20: added ... as variant on .. * patch20: O_PIPE conflicted with Atari - * + * * Revision 4.0.1.3 91/11/05 17:15:21 lwall * patch11: prepared for ctype implementations that don't define isascii() * patch11: various portability fixes @@ -28,7 +31,7 @@ * patch11: a last statement outside any block caused occasional core dumps * patch11: missing arguments caused core dump in -D8 code * patch11: eval 'stuff' now optimized to eval {stuff} - * + * * Revision 4.0.1.2 91/06/07 11:07:23 lwall * patch4: new copyright notice * patch4: length($`), length($&), length($') now optimized to avoid string copy @@ -37,14 +40,14 @@ * patch4: added $^P variable to control calling of perldb routines * patch4: taintchecks could improperly modify parent in vfork() * patch4: many, many itty-bitty portability fixes - * + * * Revision 4.0.1.1 91/04/11 17:43:48 lwall * patch1: fixed failed fork to return undef as documented * patch1: reduced maximum branch distance in eval.c - * + * * Revision 4.0 91/03/20 01:16:48 lwall * 4.0 baseline. - * + * */ #include "EXTERN.h" @@ -1242,8 +1245,8 @@ register int sp; lstr = (struct lstring*)str; str->str_magic = st[1]; st[1]->str_rare = 's'; - lstr->lstr_offset = tmps - str_get(st[1]); - lstr->lstr_len = anum; + lstr->lstr_offset = tmps - str_get(st[1]); + lstr->lstr_len = anum; } } break; diff --git a/gnu/usr.bin/perl/perl/form.c b/gnu/usr.bin/perl/perl/form.c index 57fc5de..cfb7aed 100644 --- a/gnu/usr.bin/perl/perl/form.c +++ b/gnu/usr.bin/perl/perl/form.c @@ -1,4 +1,4 @@ -/* $RCSfile: form.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:36 $ +/* $RCSfile: form.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:33 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: form.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:33 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:36 nate * PERL! * @@ -16,19 +19,19 @@ * patch20: removed implicit int declarations on funcions * patch20: form feed for formats is now specifiable via $^L * patch20: Perl now distinguishes overlapped copies from non-overlapped - * + * * Revision 4.0.1.2 91/11/05 17:18:43 lwall * patch11: formats didn't fill their fields as well as they could * patch11: ^ fields chopped hyphens on line break * patch11: # fields could write outside allocated memory - * + * * Revision 4.0.1.1 91/06/07 11:07:59 lwall * patch4: new copyright notice * patch4: default top-of-form format is now FILEHANDLE_TOP - * + * * Revision 4.0 91/03/20 01:19:23 lwall * 4.0 baseline. - * + * */ #include "EXTERN.h" diff --git a/gnu/usr.bin/perl/perl/form.h b/gnu/usr.bin/perl/perl/form.h index 1e3e6f4..3f63289 100644 --- a/gnu/usr.bin/perl/perl/form.h +++ b/gnu/usr.bin/perl/perl/form.h @@ -1,4 +1,4 @@ -/* $RCSfile: form.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:36 $ +/* $RCSfile: form.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $ * * Copyright (c) 1991, Larry Wall * @@ -6,15 +6,18 @@ * License or the Artistic License, as specified in the README file. * * $Log: form.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:34 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:36 nate * PERL! * * Revision 4.0.1.1 91/06/07 11:08:20 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:19:37 lwall * 4.0 baseline. - * + * */ #define F_NULL 0 diff --git a/gnu/usr.bin/perl/perl/handy.h b/gnu/usr.bin/perl/perl/handy.h index 46231ae..df71984 100644 --- a/gnu/usr.bin/perl/perl/handy.h +++ b/gnu/usr.bin/perl/perl/handy.h @@ -1,4 +1,4 @@ -/* $RCSfile: handy.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:36 $ +/* $RCSfile: handy.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $ * * Copyright (c) 1991, Larry Wall * @@ -6,25 +6,28 @@ * License or the Artistic License, as specified in the README file. * * $Log: handy.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:34 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:36 nate * PERL! * * Revision 4.0.1.4 92/06/08 13:23:17 lwall * patch20: isascii() may now be supplied by a library routine * patch20: Perl now distinguishes overlapped copies from non-overlapped - * + * * Revision 4.0.1.3 91/11/05 22:54:26 lwall * patch11: erratum - * + * * Revision 4.0.1.2 91/11/05 17:23:38 lwall * patch11: prepared for ctype implementations that don't define isascii() - * + * * Revision 4.0.1.1 91/06/07 11:09:56 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:22:15 lwall * 4.0 baseline. - * + * */ #ifdef NULL diff --git a/gnu/usr.bin/perl/perl/hash.c b/gnu/usr.bin/perl/perl/hash.c index 15cc116..5d9b594 100644 --- a/gnu/usr.bin/perl/perl/hash.c +++ b/gnu/usr.bin/perl/perl/hash.c @@ -1,4 +1,4 @@ -/* $RCSfile: hash.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:37 $ +/* $RCSfile: hash.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:33 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: hash.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:33 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:37 nate * PERL! * @@ -13,16 +16,16 @@ * patch20: removed implicit int declarations on functions * patch20: delete could cause %array to give too low a count of buckets filled * patch20: hash tables now split only if the memory is available to do so - * + * * Revision 4.0.1.2 91/11/05 17:24:13 lwall * patch11: saberized perl - * + * * Revision 4.0.1.1 91/06/07 11:10:11 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:22:26 lwall * 4.0 baseline. - * + * */ #include "EXTERN.h" diff --git a/gnu/usr.bin/perl/perl/hash.h b/gnu/usr.bin/perl/perl/hash.h index 858721f..ddf2a11 100644 --- a/gnu/usr.bin/perl/perl/hash.h +++ b/gnu/usr.bin/perl/perl/hash.h @@ -1,4 +1,4 @@ -/* $RCSfile: hash.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:37 $ +/* $RCSfile: hash.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:35 $ * * Copyright (c) 1991, Larry Wall * @@ -6,18 +6,21 @@ * License or the Artistic License, as specified in the README file. * * $Log: hash.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:35 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:37 nate * PERL! * * Revision 4.0.1.2 91/11/05 17:24:31 lwall * patch11: random cleanup - * + * * Revision 4.0.1.1 91/06/07 11:10:33 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:22:38 lwall * 4.0 baseline. - * + * */ #define FILLPCT 80 /* don't make greater than 99 */ diff --git a/gnu/usr.bin/perl/perl/malloc.c b/gnu/usr.bin/perl/perl/malloc.c index 8bfee40..5cc86d9 100644 --- a/gnu/usr.bin/perl/perl/malloc.c +++ b/gnu/usr.bin/perl/perl/malloc.c @@ -1,6 +1,9 @@ -/* $RCSfile: malloc.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:37 $ +/* $RCSfile: malloc.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:33 $ * * $Log: malloc.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:33 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:37 nate * PERL! * @@ -8,19 +11,19 @@ * patch20: removed implicit int declarations on functions * patch20: hash tables now split only if the memory is available to do so * patch20: realloc(0, size) now does malloc in case library routines call it - * + * * Revision 4.0.1.3 91/11/05 17:57:40 lwall * patch11: safe malloc code now integrated into Perl's malloc when possible - * + * * Revision 4.0.1.2 91/06/07 11:20:45 lwall * patch4: many, many itty-bitty portability fixes - * + * * Revision 4.0.1.1 91/04/11 17:48:31 lwall * patch1: Configure now figures out malloc ptr type - * + * * Revision 4.0 91/03/20 01:28:52 lwall * 4.0 baseline. - * + * */ #ifndef lint @@ -34,12 +37,12 @@ static char sccsid[] = "@(#)malloc.c 4.3 (Berkeley) 9/16/83"; * malloc.c (Caltech) 2/21/82 * Chris Kingsley, kingsley@cit-20. * - * This is a very fast storage allocator. It allocates blocks of a small + * This is a very fast storage allocator. It allocates blocks of a small * number of different sizes, and keeps free lists of each size. Blocks that - * don't exactly fit are passed up to the next larger size. In this + * don't exactly fit are passed up to the next larger size. In this * implementation, the available sizes are 2^n-4 (or 2^n-12) bytes long. * This is designed for use in a program that uses vast quantities of memory, - * but bombs when it runs out. + * but bombs when it runs out. */ #include "EXTERN.h" @@ -158,7 +161,7 @@ malloc(nbytes) * space used per block for accounting. */ nbytes += sizeof (union overhead) + RSLOP; - nbytes = (nbytes + 3) &~ 3; + nbytes = (nbytes + 3) &~ 3; shiftr = (nbytes - 1) >> 2; /* apart from this loop, this is O(1) */ while (shiftr >>= 1) @@ -167,7 +170,7 @@ malloc(nbytes) * If nothing in hash bucket right now, * request more memory from the system. */ - if (nextf[bucket] == NULL) + if (nextf[bucket] == NULL) morecore(bucket); if ((p = (union overhead *)nextf[bucket]) == NULL) { #ifdef safemalloc @@ -253,7 +256,7 @@ morecore(bucket) /* take 2k unless the block is bigger than that */ rnu = (bucket <= 8) ? 11 : bucket + 3; #else - /* take 16k unless the block is bigger than that + /* take 16k unless the block is bigger than that (80286s like large segments!), probably good on the atari too */ rnu = (bucket <= 11) ? 14 : bucket + 3; #endif @@ -291,7 +294,7 @@ morecore(bucket) void free(mp) MALLOCPTRTYPE *mp; -{ +{ register MEM_SIZE size; register union overhead *op; char *cp = (char*)mp; @@ -350,9 +353,9 @@ int reall_srchlen = 4; /* 4 should be plenty, -1 =>'s whole list */ MALLOCPTRTYPE * realloc(mp, nbytes) - MALLOCPTRTYPE *mp; + MALLOCPTRTYPE *mp; MEM_SIZE nbytes; -{ +{ register MEM_SIZE onb; union overhead *op; char *res; @@ -416,7 +419,7 @@ realloc(mp, nbytes) * space used per block for accounting. */ nbytes += sizeof (union overhead) + RSLOP; - nbytes = (nbytes + 3) &~ 3; + nbytes = (nbytes + 3) &~ 3; op->ov_size = nbytes - 1; *((u_int *)((caddr_t)op + nbytes - RSLOP)) = RMAGIC; } @@ -477,7 +480,7 @@ findbucket(freep, srchlen) #ifdef MSTATS /* * mstats - print out statistics about malloc - * + * * Prints two lines of numbers, one showing the length of the free list * for each size category, the second showing the number of mallocs - * frees for each size category. diff --git a/gnu/usr.bin/perl/perl/perl.c b/gnu/usr.bin/perl/perl/perl.c index f727d1f..4d1a7ae 100644 --- a/gnu/usr.bin/perl/perl/perl.c +++ b/gnu/usr.bin/perl/perl/perl.c @@ -1,4 +1,4 @@ -char rcsid[] = "$RCSfile: perl.c,v $$Revision: 1.2 $$Date: 1994/10/27 23:16:54 $\nPatch level: ###\n"; +char rcsid[] = "$RCSfile: perl.c,v $$Revision: 1.3 $$Date: 1995/05/28 19:21:54 $\nPatch level: ###\n"; /* * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,10 @@ char rcsid[] = "$RCSfile: perl.c,v $$Revision: 1.2 $$Date: 1994/10/27 23:16:54 $ * License or the Artistic License, as specified in the README file. * * $Log: perl.c,v $ + * Revision 1.3 1995/05/28 19:21:54 ache + * Fix $] variable value (version number), close PR 449 + * Submitted by: Bill Fenner <fenner@parc.xerox.com> + * * Revision 1.2 1994/10/27 23:16:54 wollman * Convince Perl to that is is part of the system, as /usr/bin/perl (binary) * and /usr/share/perl (library). The latter was chosen as analogous to other @@ -32,11 +36,11 @@ char rcsid[] = "$RCSfile: perl.c,v $$Revision: 1.2 $$Date: 1994/10/27 23:16:54 $ * patch20: eval "1 #comment" didn't work * patch20: couldn't require . files * patch20: semantic compilation errors didn't abort execution - * + * * Revision 4.0.1.6 91/11/11 16:38:45 lwall * patch19: default arg for shift was wrong after first subroutine definition * patch19: op/regexp.t failed from missing arg to bcmp() - * + * * Revision 4.0.1.5 91/11/05 18:03:32 lwall * patch11: random cleanup * patch11: $0 was being truncated at times @@ -45,25 +49,25 @@ char rcsid[] = "$RCSfile: perl.c,v $$Revision: 1.2 $$Date: 1994/10/27 23:16:54 $ * patch11: prepared for ctype implementations that don't define isascii() * patch11: added eval {} * patch11: eval confused by string containing null - * + * * Revision 4.0.1.4 91/06/10 01:23:07 lwall * patch10: perl -v printed incorrect copyright notice - * + * * Revision 4.0.1.3 91/06/07 11:40:18 lwall * patch4: changed old $^P to $^X - * + * * Revision 4.0.1.2 91/06/07 11:26:16 lwall * patch4: new copyright notice * patch4: added $^P variable to control calling of perldb routines * patch4: added $^F variable to specify maximum system fd, default 2 * patch4: debugger lost track of lines in eval - * + * * Revision 4.0.1.1 91/04/11 17:49:05 lwall * patch1: fixed undefined environ problem - * + * * Revision 4.0 91/03/20 01:37:44 lwall * 4.0 baseline. - * + * */ /*SUPPRESS 560*/ @@ -1054,7 +1058,7 @@ int *arglast; } tmpfilename = savestr(specfilename); if (*tmpfilename == '/' || - (*tmpfilename == '.' && + (*tmpfilename == '.' && (tmpfilename[1] == '/' || (tmpfilename[1] == '.' && tmpfilename[2] == '/')))) { diff --git a/gnu/usr.bin/perl/perl/perl.h b/gnu/usr.bin/perl/perl/perl.h index 8249c62..7693aa0 100644 --- a/gnu/usr.bin/perl/perl/perl.h +++ b/gnu/usr.bin/perl/perl/perl.h @@ -1,4 +1,4 @@ -/* $RCSfile: perl.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:35 $ +/* $RCSfile: perl.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:35 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: perl.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:35 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:35 nate * PERL! * @@ -17,32 +20,32 @@ * patch20: bcopy() and memcpy() now tested for overlap safety * patch20: Perl now distinguishes overlapped copies from non-overlapped * patch20: removed implicit int declarations on functions - * + * * Revision 4.0.1.5 91/11/11 16:41:07 lwall * patch19: uts wrongly defines S_ISDIR() et al * patch19: too many preprocessors can't expand a macro right in #if * patch19: added little-endian pack/unpack options - * + * * Revision 4.0.1.4 91/11/05 18:06:10 lwall * patch11: various portability fixes * patch11: added support for dbz * patch11: added some support for 64-bit integers * patch11: hex() didn't understand leading 0x - * + * * Revision 4.0.1.3 91/06/10 01:25:10 lwall * patch10: certain pattern optimizations were botched - * + * * Revision 4.0.1.2 91/06/07 11:28:33 lwall * patch4: new copyright notice * patch4: made some allowances for "semi-standard" C * patch4: many, many itty-bitty portability fixes - * + * * Revision 4.0.1.1 91/04/11 17:49:51 lwall * patch1: hopefully straightened out some of the Xenix mess - * + * * Revision 4.0 91/03/20 01:37:56 lwall * 4.0 baseline. - * + * */ #define VOIDWANT 1 diff --git a/gnu/usr.bin/perl/perl/perly.c b/gnu/usr.bin/perl/perl/perly.c index 1084cc4..9e314cd 100644 --- a/gnu/usr.bin/perl/perl/perly.c +++ b/gnu/usr.bin/perl/perl/perly.c @@ -2800,7 +2800,7 @@ case 149: { static char p[]="/\\s+/"; char *oldend = bufend; ARG *oldarg = yylval.arg; - + bufend=p+5; (void)scanpat(p); bufend=oldend; diff --git a/gnu/usr.bin/perl/perl/regcomp.c b/gnu/usr.bin/perl/perl/regcomp.c index 8337e9c..0287778 100644 --- a/gnu/usr.bin/perl/perl/regcomp.c +++ b/gnu/usr.bin/perl/perl/regcomp.c @@ -7,9 +7,12 @@ * blame Henry for some of the lack of readability. */ -/* $RCSfile: regcomp.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:39 $ +/* $RCSfile: regcomp.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:33 $ * * $Log: regcomp.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:33 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:39 nate * PERL! * @@ -18,27 +21,27 @@ * patch20: /^stuff/ wrongly assumed an implicit $* == 1 * patch20: /x{0}/ was wrongly interpreted as /x{0,}/ * patch20: added \W, \S and \D inside /[...]/ - * + * * Revision 4.0.1.4 91/11/05 22:55:14 lwall * patch11: Erratum - * + * * Revision 4.0.1.3 91/11/05 18:22:28 lwall * patch11: minimum match length calculation in regexp is now cumulative * patch11: initial .* in pattern had dependency on value of $* * patch11: certain patterns made use of garbage pointers from uncleared memory * patch11: prepared for ctype implementations that don't define isascii() - * + * * Revision 4.0.1.2 91/06/07 11:48:24 lwall * patch4: new copyright notice * patch4: /(x+) \1/ incorrectly optimized to not match "xxx xx" * patch4: // wouldn't use previous pattern if it started with a null character - * + * * Revision 4.0.1.1 91/04/12 09:04:45 lwall * patch1: random cleanup in cpp namespace - * + * * Revision 4.0 91/03/20 01:39:01 lwall * 4.0 baseline. - * + * */ /*SUPPRESS 112*/ /* @@ -1321,7 +1324,7 @@ regexp *r; s += regarglen[op]; if (next == NULL) /* Next ptr. */ fprintf(stderr,"(0)"); - else + else fprintf(stderr,"(%d)", (s-r->program)+(next-s)); s += 3; if (op == ANYOF) { diff --git a/gnu/usr.bin/perl/perl/regcomp.h b/gnu/usr.bin/perl/perl/regcomp.h index 6dcd482..b6b8c18 100644 --- a/gnu/usr.bin/perl/perl/regcomp.h +++ b/gnu/usr.bin/perl/perl/regcomp.h @@ -1,15 +1,18 @@ -/* $RCSfile: regcomp.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:39 $ +/* $RCSfile: regcomp.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:35 $ * * $Log: regcomp.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:35 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:39 nate * PERL! * * Revision 4.0.1.1 91/06/07 11:49:40 lwall * patch4: no change - * + * * Revision 4.0 91/03/20 01:39:09 lwall * 4.0 baseline. - * + * */ /* diff --git a/gnu/usr.bin/perl/perl/regexec.c b/gnu/usr.bin/perl/perl/regexec.c index 7802465f..b835306 100644 --- a/gnu/usr.bin/perl/perl/regexec.c +++ b/gnu/usr.bin/perl/perl/regexec.c @@ -7,9 +7,12 @@ * blame Henry for some of the lack of readability. */ -/* $RCSfile: regexec.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:39 $ +/* $RCSfile: regexec.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:33 $ * * $Log: regexec.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:33 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:39 nate * PERL! * @@ -17,21 +20,21 @@ * patch20: pattern modifiers i and g didn't interact right * patch20: in some cases $` and $' didn't get set by match * patch20: /x{0}/ was wrongly interpreted as /x{0,}/ - * + * * Revision 4.0.1.3 91/11/05 18:23:55 lwall * patch11: prepared for ctype implementations that don't define isascii() * patch11: initial .* in pattern had dependency on value of $* - * + * * Revision 4.0.1.2 91/06/07 11:50:33 lwall * patch4: new copyright notice * patch4: // wouldn't use previous pattern if it started with a null character - * + * * Revision 4.0.1.1 91/04/12 09:07:39 lwall * patch1: regexec only allocated space for 9 subexpresssions - * + * * Revision 4.0 91/03/20 01:39:16 lwall * 4.0 baseline. - * + * */ /*SUPPRESS 112*/ /* @@ -219,7 +222,7 @@ int safebase; /* no need to remember string in subbase */ New(1102,regmystartp,regmyp_size,char*); New(1102,regmyendp, regmyp_size,char*); } - + } /* Simplest case: anchored match need be tried only once. */ @@ -629,7 +632,7 @@ char *prog; case BOUND: if (locinput == regbol) /* was last char in word? */ ln = isALNUM(regprev); - else + else ln = isALNUM(locinput[-1]); n = isALNUM(nextchar); /* is next char in word? */ if ((ln == n) == (OP(scan) == BOUND)) diff --git a/gnu/usr.bin/perl/perl/regexp.h b/gnu/usr.bin/perl/perl/regexp.h index 66a1b88..634b19b 100644 --- a/gnu/usr.bin/perl/perl/regexp.h +++ b/gnu/usr.bin/perl/perl/regexp.h @@ -5,24 +5,27 @@ * not the System V one. */ -/* $RCSfile: regexp.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:39 $ +/* $RCSfile: regexp.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:35 $ * * $Log: regexp.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:35 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:39 nate * PERL! * * Revision 4.0.1.2 91/11/05 18:24:31 lwall * patch11: minimum match length calculation in regexp is now cumulative * patch11: initial .* in pattern had dependency on value of $* - * + * * Revision 4.0.1.1 91/06/07 11:51:18 lwall * patch4: new copyright notice * patch4: // wouldn't use previous pattern if it started with a null character * patch4: $` was busted inside s/// - * + * * Revision 4.0 91/03/20 01:39:23 lwall * 4.0 baseline. - * + * */ typedef struct regexp { diff --git a/gnu/usr.bin/perl/perl/spat.h b/gnu/usr.bin/perl/perl/spat.h index 2a840e2..7c392b0 100644 --- a/gnu/usr.bin/perl/perl/spat.h +++ b/gnu/usr.bin/perl/perl/spat.h @@ -1,4 +1,4 @@ -/* $RCSfile: spat.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:39 $ +/* $RCSfile: spat.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:35 $ * * Copyright (c) 1991, Larry Wall * @@ -6,16 +6,19 @@ * License or the Artistic License, as specified in the README file. * * $Log: spat.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:35 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:39 nate * PERL! * * Revision 4.0.1.1 91/06/07 11:51:59 lwall * patch4: new copyright notice * patch4: added global modifier for pattern matches - * + * * Revision 4.0 91/03/20 01:39:36 lwall * 4.0 baseline. - * + * */ struct scanpat { diff --git a/gnu/usr.bin/perl/perl/stab.c b/gnu/usr.bin/perl/perl/stab.c index 7082725..e34aa94 100644 --- a/gnu/usr.bin/perl/perl/stab.c +++ b/gnu/usr.bin/perl/perl/stab.c @@ -1,4 +1,4 @@ -/* $RCSfile: stab.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:39 $ +/* $RCSfile: stab.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:33 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: stab.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:33 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:39 nate * PERL! * @@ -18,14 +21,14 @@ * patch20: the debugger made perl forget the last pattern used by // * patch20: paragraph mode now skips extra newlines automatically * patch20: ($<,$>) = ... didn't work on some architectures - * + * * Revision 4.0.1.3 91/11/05 18:35:33 lwall * patch11: length($x) was sometimes wrong for numeric $x * patch11: perl now issues warning if $SIG{'ALARM'} is referenced * patch11: *foo = undef coredumped * patch11: solitary subroutine references no longer trigger typo warnings * patch11: local(*FILEHANDLE) had a memory leak - * + * * Revision 4.0.1.2 91/06/07 11:55:53 lwall * patch4: new copyright notice * patch4: added $^P variable to control calling of perldb routines @@ -34,14 +37,14 @@ * patch4: default top-of-form format is now FILEHANDLE_TOP * patch4: length($`), length($&), length($') now optimized to avoid string copy * patch4: $^D |= 1024 now does syntax tree dump at run-time - * + * * Revision 4.0.1.1 91/04/12 09:10:24 lwall * patch1: Configure now differentiates getgroups() type from getgid() type * patch1: you may now use "die" and "caller" in a signal handler - * + * * Revision 4.0 91/03/20 01:39:41 lwall * 4.0 baseline. - * + * */ #include "EXTERN.h" @@ -1038,7 +1041,7 @@ register STAB *stab; ARRAY *stab_array(stab) register STAB *stab; { - if (((STBP*)(stab->str_ptr))->stbp_array) + if (((STBP*)(stab->str_ptr))->stbp_array) return ((STBP*)(stab->str_ptr))->stbp_array; else return ((STBP*)(aadd(stab)->str_ptr))->stbp_array; diff --git a/gnu/usr.bin/perl/perl/stab.h b/gnu/usr.bin/perl/perl/stab.h index 7bce082..9da5a4a 100644 --- a/gnu/usr.bin/perl/perl/stab.h +++ b/gnu/usr.bin/perl/perl/stab.h @@ -1,4 +1,4 @@ -/* $RCSfile: stab.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:39 $ +/* $RCSfile: stab.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:35 $ * * Copyright (c) 1991, Larry Wall * @@ -6,23 +6,26 @@ * License or the Artistic License, as specified in the README file. * * $Log: stab.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:35 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:39 nate * PERL! * * Revision 4.0.1.3 92/06/08 15:33:44 lwall * patch20: fixed confusion between a *var's real name and its effective name * patch20: ($<,$>) = ... didn't work on some architectures - * + * * Revision 4.0.1.2 91/11/05 18:36:15 lwall * patch11: length($x) was sometimes wrong for numeric $x - * + * * Revision 4.0.1.1 91/06/07 11:56:35 lwall * patch4: new copyright notice * patch4: length($`), length($&), length($') now optimized to avoid string copy - * + * * Revision 4.0 91/03/20 01:39:49 lwall * 4.0 baseline. - * + * */ struct stabptrs { diff --git a/gnu/usr.bin/perl/perl/str.c b/gnu/usr.bin/perl/perl/str.c index f034292..0f8b36d 100644 --- a/gnu/usr.bin/perl/perl/str.c +++ b/gnu/usr.bin/perl/perl/str.c @@ -1,4 +1,4 @@ -/* $RCSfile: str.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:39 $ +/* $RCSfile: str.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:33 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: str.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:33 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:39 nate * PERL! * @@ -14,7 +17,7 @@ * * Revision 4.0.1.6 92/06/11 21:14:21 lwall * patch34: quotes containing subscripts containing variables didn't parse right - * + * * Revision 4.0.1.5 92/06/08 15:40:43 lwall * patch20: removed implicit int declarations on functions * patch20: Perl now distinguishes overlapped copies from non-overlapped @@ -24,27 +27,27 @@ * patch20: "$var{$foo'bar}" didn't scan subscript correctly * patch20: a splice on non-existent array elements could dump core * patch20: running taintperl explicitly now does checks even if $< == $> - * + * * Revision 4.0.1.4 91/11/05 18:40:51 lwall * patch11: $foo .= <BAR> could overrun malloced memory * patch11: \$ didn't always make it through double-quoter to regexp routines * patch11: prepared for ctype implementations that don't define isascii() - * + * * Revision 4.0.1.3 91/06/10 01:27:54 lwall * patch10: $) and $| incorrectly handled in run-time patterns - * + * * Revision 4.0.1.2 91/06/07 11:58:13 lwall * patch4: new copyright notice * patch4: taint check on undefined string could cause core dump - * + * * Revision 4.0.1.1 91/04/12 09:15:30 lwall * patch1: fixed undefined environ problem * patch1: substr($ENV{"PATH"},0,0) = "/foo:" didn't modify environment * patch1: $foo .= <BAR> could cause core dump for certain lengths of $foo - * + * * Revision 4.0 91/03/20 01:39:55 lwall * 4.0 baseline. - * + * */ #include "EXTERN.h" @@ -503,7 +506,7 @@ str_new(len) STRLEN len; { register STR *str; - + if (freestrroot) { str = freestrroot; freestrroot = str->str_magic; @@ -815,9 +818,9 @@ int append; screamer: while (--cnt >= 0) { /* this */ /* eat */ if ((*bp++ = *ptr++) == newline) /* really */ /* dust */ - goto thats_all_folks; /* screams */ /* sed :-) */ + goto thats_all_folks; /* screams */ /* sed :-) */ } - + if (shortbuffered) { /* oh well, must extend */ cnt = shortbuffered; shortbuffered = 0; @@ -1023,7 +1026,7 @@ STR *src; s++; s = scanident(s,send,tokenbuf); if (*t == '@' && - (!(stab = stabent(tokenbuf,FALSE)) || + (!(stab = stabent(tokenbuf,FALSE)) || (*s == '{' ? !stab_xhash(stab) : !stab_xarray(stab)) )) { str_ncat(str,"@",1); s = ++t; diff --git a/gnu/usr.bin/perl/perl/str.h b/gnu/usr.bin/perl/perl/str.h index 7eb4b69..8e95749 100644 --- a/gnu/usr.bin/perl/perl/str.h +++ b/gnu/usr.bin/perl/perl/str.h @@ -1,4 +1,4 @@ -/* $RCSfile: str.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:39 $ +/* $RCSfile: str.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:35 $ * * Copyright (c) 1991, Larry Wall * @@ -6,26 +6,29 @@ * License or the Artistic License, as specified in the README file. * * $Log: str.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:35 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:39 nate * PERL! * * Revision 4.0.1.4 92/06/08 15:41:45 lwall * patch20: fixed confusion between a *var's real name and its effective name * patch20: removed implicit int declarations on functions - * + * * Revision 4.0.1.3 91/11/05 18:41:47 lwall * patch11: random cleanup * patch11: solitary subroutine references no longer trigger typo warnings - * + * * Revision 4.0.1.2 91/06/07 11:58:33 lwall * patch4: new copyright notice - * + * * Revision 4.0.1.1 91/04/12 09:16:12 lwall * patch1: you may now use "die" and "caller" in a signal handler - * + * * Revision 4.0 91/03/20 01:40:04 lwall * 4.0 baseline. - * + * */ struct string { diff --git a/gnu/usr.bin/perl/perl/tdoio.c b/gnu/usr.bin/perl/perl/tdoio.c index 5dd8065..1cd6269 100644 --- a/gnu/usr.bin/perl/perl/tdoio.c +++ b/gnu/usr.bin/perl/perl/tdoio.c @@ -1,11 +1,14 @@ -/* $RCSfile: doio.c,v $$Revision: 1.2 $$Date: 1994/03/09 22:24:27 $ +/* $RCSfile: tdoio.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:36 $ * * Copyright (c) 1991, Larry Wall * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. * - * $Log: doio.c,v $ + * $Log: tdoio.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:36 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.2 1994/03/09 22:24:27 ache * (cast) added for last argument of semctl * @@ -14,7 +17,7 @@ * * Revision 4.0.1.6 92/06/11 21:08:16 lwall * patch34: some systems don't declare h_errno extern in header files - * + * * Revision 4.0.1.5 92/06/08 13:00:21 lwall * patch20: some machines don't define ENOTSOCK in errno.h * patch20: new warnings for failed use of stat operators on filenames with \n @@ -24,7 +27,7 @@ * patch20: fixed memory leak on system() for vfork() machines * patch20: get*by* routines now return something useful in a scalar context * patch20: h_errno now accessible via $? - * + * * Revision 4.0.1.4 91/11/05 16:51:43 lwall * patch11: prepared for ctype implementations that don't define isascii() * patch11: perl mistook some streams for sockets because they return mode 0 too @@ -33,11 +36,11 @@ * patch11: truncate on a closed filehandle could dump * patch11: stats of _ forgot whether prior stat was actually lstat * patch11: -T returned true on NFS directory - * + * * Revision 4.0.1.3 91/06/10 01:21:19 lwall * patch10: read didn't work from character special files open for writing * patch10: close-on-exec wrongly set on system file descriptors - * + * * Revision 4.0.1.2 91/06/07 10:53:39 lwall * patch4: new copyright notice * patch4: system fd's are now treated specially @@ -45,13 +48,13 @@ * patch4: character special files now opened with bidirectional stdio buffers * patch4: taintchecks could improperly modify parent in vfork() * patch4: many, many itty-bitty portability fixes - * + * * Revision 4.0.1.1 91/04/11 17:41:06 lwall * patch1: hopefully straightened out some of the Xenix mess - * + * * Revision 4.0 91/03/20 01:07:06 lwall * 4.0 baseline. - * + * */ #include "EXTERN.h" @@ -994,7 +997,7 @@ STR *str; if (!str->str_pok) return TRUE; - s = str->str_ptr; + s = str->str_ptr; send = s + str->str_cur; while (isSPACE(*s)) s++; @@ -1006,7 +1009,7 @@ STR *str; s++; if (s == send) return TRUE; - if (*s == '.') + if (*s == '.') s++; else if (s == str->str_ptr) return FALSE; @@ -1642,7 +1645,7 @@ int *arglast; st[sp] = &str_yes; break; } - + return sp; nuts: @@ -1686,7 +1689,7 @@ int *arglast; goto nuts2; break; } - + return sp; nuts: diff --git a/gnu/usr.bin/perl/perl/toke.c b/gnu/usr.bin/perl/perl/toke.c index 34603ce..bf2e116 100644 --- a/gnu/usr.bin/perl/perl/toke.c +++ b/gnu/usr.bin/perl/perl/toke.c @@ -1,4 +1,4 @@ -/* $RCSfile: toke.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:40 $ +/* $RCSfile: toke.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: toke.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:34 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:40 nate * PERL! * @@ -15,10 +18,10 @@ * * Revision 4.0.1.8 92/06/23 12:33:45 lwall * patch35: bad interaction between backslash and hyphen in tr/// - * + * * Revision 4.0.1.7 92/06/11 21:16:30 lwall * patch34: expectterm incorrectly set to indicate start of program or block - * + * * Revision 4.0.1.6 92/06/08 16:03:49 lwall * patch20: an EXPR may now start with a bareword * patch20: print $fh EXPR can now expect term rather than operator in EXPR @@ -31,10 +34,10 @@ * patch20: 2. now eats the dot * patch20: <@ARGV> now notices @ARGV * patch20: tr/// now lets you say \- - * + * * Revision 4.0.1.5 91/11/11 16:45:51 lwall * patch19: default arg for shift was wrong after first subroutine definition - * + * * Revision 4.0.1.4 91/11/05 19:02:48 lwall * patch11: \x and \c were subject to double interpretation in regexps * patch11: prepared for ctype implementations that don't define isascii() @@ -42,23 +45,23 @@ * patch11: once-thru blocks didn't display right in the debugger * patch11: sort eval "whatever" didn't work * patch11: underscore is now allowed within literal octal and hex numbers - * + * * Revision 4.0.1.3 91/06/10 01:32:26 lwall * patch10: m'$foo' now treats string as single quoted * patch10: certain pattern optimizations were botched - * + * * Revision 4.0.1.2 91/06/07 12:05:56 lwall * patch4: new copyright notice * patch4: debugger lost track of lines in eval * patch4: //o and s///o now optimize themselves fully at runtime * patch4: added global modifier for pattern matches - * + * * Revision 4.0.1.1 91/04/12 09:18:18 lwall * patch1: perl -de "print" wouldn't stop at the first statement - * + * * Revision 4.0 91/03/20 01:42:14 lwall * 4.0 baseline. - * + * */ #include "EXTERN.h" @@ -1996,8 +1999,8 @@ char *start; yylval.arg = Nullarg; return s; } - tstr = yylval.arg[1].arg_ptr.arg_str; - yylval.arg[1].arg_ptr.arg_str = Nullstr; + tstr = yylval.arg[1].arg_ptr.arg_str; + yylval.arg[1].arg_ptr.arg_str = Nullstr; arg_free(yylval.arg); t = tstr->str_ptr; tlen = tstr->str_cur; @@ -2011,8 +2014,8 @@ char *start; yylval.arg = Nullarg; return s; } - rstr = yylval.arg[1].arg_ptr.arg_str; - yylval.arg[1].arg_ptr.arg_str = Nullstr; + rstr = yylval.arg[1].arg_ptr.arg_str; + yylval.arg[1].arg_ptr.arg_str = Nullstr; arg_free(yylval.arg); r = rstr->str_ptr; rlen = rstr->str_cur; @@ -2290,7 +2293,7 @@ int in_what; leave = Nullch; goto snarf_it; - case '"': + case '"': do_double: term = *s; arg[1].arg_type = A_DOUBLE; diff --git a/gnu/usr.bin/perl/perl/usersub.c b/gnu/usr.bin/perl/perl/usersub.c index d0ee952..8c7cb65 100644 --- a/gnu/usr.bin/perl/perl/usersub.c +++ b/gnu/usr.bin/perl/perl/usersub.c @@ -1,22 +1,25 @@ -/* $RCSfile: usersub.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:40 $ +/* $RCSfile: usersub.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $ * * This file contains stubs for routines that the user may define to * set up glue routines for C libraries or to decrypt encrypted scripts * for execution. * * $Log: usersub.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:34 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:40 nate * PERL! * * Revision 4.0.1.2 92/06/08 16:04:24 lwall * patch20: removed implicit int declarations on functions - * + * * Revision 4.0.1.1 91/11/11 16:47:17 lwall * patch19: deleted some unused functions from usersub.c - * + * * Revision 4.0 91/03/20 01:55:56 lwall * 4.0 baseline. - * + * */ #include "EXTERN.h" diff --git a/gnu/usr.bin/perl/perl/util.c b/gnu/usr.bin/perl/perl/util.c index 5748983..fd4b436 100644 --- a/gnu/usr.bin/perl/perl/util.c +++ b/gnu/usr.bin/perl/perl/util.c @@ -1,4 +1,4 @@ -/* $RCSfile: util.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:40 $ +/* $RCSfile: util.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $ * * Copyright (c) 1991, Larry Wall * @@ -6,42 +6,45 @@ * License or the Artistic License, as specified in the README file. * * $Log: util.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:34 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:40 nate * PERL! * * Revision 4.0.1.6 92/06/11 21:18:47 lwall * patch34: boneheaded typo in my_bcopy() - * + * * Revision 4.0.1.5 92/06/08 16:08:37 lwall * patch20: removed implicit int declarations on functions * patch20: Perl now distinguishes overlapped copies from non-overlapped * patch20: fixed confusion between a *var's real name and its effective name * patch20: bcopy() and memcpy() now tested for overlap safety * patch20: added Atari ST portability - * + * * Revision 4.0.1.4 91/11/11 16:48:54 lwall * patch19: study was busted by 4.018 * patch19: added little-endian pack/unpack options - * + * * Revision 4.0.1.3 91/11/05 19:18:26 lwall * patch11: safe malloc code now integrated into Perl's malloc when possible * patch11: index("little", "longer string") could visit faraway places * patch11: warn '-' x 10000 dumped core * patch11: forked exec on non-existent program now issues a warning - * + * * Revision 4.0.1.2 91/06/07 12:10:42 lwall * patch4: new copyright notice * patch4: made some allowances for "semi-standard" C * patch4: index() could blow up searching for null string * patch4: taintchecks could improperly modify parent in vfork() * patch4: exec would close files even if you cleared close-on-exec flag - * + * * Revision 4.0.1.1 91/04/12 09:19:25 lwall * patch1: random cleanup in cpp namespace - * + * * Revision 4.0 91/03/20 01:56:39 lwall * 4.0 baseline. - * + * */ /*SUPPRESS 112*/ @@ -420,7 +423,7 @@ unsigned char fold[] = { 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, - 216, 217, 218, 219, 220, 221, 222, 223, + 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, @@ -682,7 +685,7 @@ STR *littlestr; register unsigned char *bigend; register unsigned char *littleend; - if ((pos = screamfirst[littlestr->str_rare]) < 0) + if ((pos = screamfirst[littlestr->str_rare]) < 0) return Nullch; #ifndef lint little = (unsigned char *)(littlestr->str_ptr); diff --git a/gnu/usr.bin/perl/perl/util.h b/gnu/usr.bin/perl/perl/util.h index ff64f85..003e4438 100644 --- a/gnu/usr.bin/perl/perl/util.h +++ b/gnu/usr.bin/perl/perl/util.h @@ -1,4 +1,4 @@ -/* $RCSfile: util.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:40 $ +/* $RCSfile: util.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:35 $ * * Copyright (c) 1991, Larry Wall * @@ -6,24 +6,27 @@ * License or the Artistic License, as specified in the README file. * * $Log: util.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:35 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:29:40 nate * PERL! * * Revision 4.0.1.4 92/06/11 21:19:36 lwall * patch34: pidgone() wasn't declared right - * + * * Revision 4.0.1.3 92/06/08 16:09:20 lwall * patch20: bcopy() and memcpy() now tested for overlap safety - * + * * Revision 4.0.1.2 91/11/05 19:18:40 lwall * patch11: safe malloc code now integrated into Perl's malloc when possible - * + * * Revision 4.0.1.1 91/06/07 12:11:00 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:56:48 lwall * 4.0 baseline. - * + * */ EXT int *screamfirst INIT(Null(int*)); diff --git a/gnu/usr.bin/perl/sperl/Makefile b/gnu/usr.bin/perl/sperl/Makefile index a073d0e..af19d47 100644 --- a/gnu/usr.bin/perl/sperl/Makefile +++ b/gnu/usr.bin/perl/sperl/Makefile @@ -1,20 +1,20 @@ # -# +# -PROG= suidperl +PROG= suidperl LINKS= ${BINDIR}/suidperl ${BINDIR}/sperl4.036 -SRCS+= array.c cmd.c cons.c consarg.c +SRCS+= array.c cmd.c cons.c consarg.c SRCS+= doarg.c doio.c dolist.c dump.c -SRCS+= eval.c form.c hash.c malloc.c +SRCS+= eval.c form.c hash.c malloc.c SRCS+= perl.c perly.c regcomp.c regexec.c -SRCS+= stab.c str.c toke.c util.c +SRCS+= stab.c str.c toke.c util.c SRCS+= usersub.c .PATH: ${.CURDIR}/../perl CFLAGS+= -I${.CURDIR}/../perl -DIAMSUID -DTAINT -LDADD= -lm +LDADD= -lm DPADD= ${LIBM} LDADD+= -lcrypt diff --git a/gnu/usr.bin/perl/tperl/Makefile b/gnu/usr.bin/perl/tperl/Makefile index 939f6d5..f76988e 100644 --- a/gnu/usr.bin/perl/tperl/Makefile +++ b/gnu/usr.bin/perl/tperl/Makefile @@ -1,21 +1,21 @@ # -# +# PROG= tperl LINKS= ${BINDIR}/tperl ${BINDIR}/tperl4.036 -SRCS+= array.c cmd.c cons.c consarg.c +SRCS+= array.c cmd.c cons.c consarg.c SRCS+= doarg.c doio.c dolist.c dump.c -SRCS+= eval.c form.c hash.c malloc.c +SRCS+= eval.c form.c hash.c malloc.c SRCS+= perl.c perly.c regcomp.c regexec.c -SRCS+= stab.c str.c toke.c util.c +SRCS+= stab.c str.c toke.c util.c SRCS+= usersub.c .PATH: ${.CURDIR}/../perl CFLAGS+= -I${.CURDIR}/../perl -DTAINT -LDADD+= -lm -DPADD= ${LIBM} +LDADD+= -lm +DPADD= ${LIBM} LDADD+= -lcrypt DPADD+= ${LIBCRYPT} diff --git a/gnu/usr.bin/perl/usub/usersub.c b/gnu/usr.bin/perl/usub/usersub.c index ffbfbe1..26fbcbc 100644 --- a/gnu/usr.bin/perl/usub/usersub.c +++ b/gnu/usr.bin/perl/usub/usersub.c @@ -1,15 +1,20 @@ -/* $RCSfile: usersub.c,v $$Revision: 4.0.1.1 $$Date: 91/11/05 19:07:24 $ +/* $RCSfile: usersub.c,v $$Revision: 1.1 $$Date: 1995/03/24 04:33:54 $ + * + * $Log: usersub.c,v $ + * Revision 1.1 1995/03/24 04:33:54 jkh + * Bring back perl/usub as usub/, this time containing an updated curseperl + * which is also installed by default (the reason for which should also be + * plain shortly). * - * $Log: usersub.c,v $ * Revision 4.0.1.1 91/11/05 19:07:24 lwall * patch11: there are now subroutines for calling back from C into Perl - * + * * Revision 4.0 91/03/20 01:56:34 lwall * 4.0 baseline. - * + * * Revision 3.0.1.1 90/08/09 04:06:10 lwall * patch19: Initial revision - * + * */ #include "EXTERN.h" @@ -33,7 +38,7 @@ int numargs; /* how many args are pushed on the stack */ { static ARG myarg[3]; /* fake syntax tree node */ int arglast[3]; - + arglast[2] = sp; sp -= numargs; arglast[1] = sp--; diff --git a/gnu/usr.bin/perl/x2p/EXTERN.h b/gnu/usr.bin/perl/x2p/EXTERN.h index f3048ed..b0bb6d0 100644 --- a/gnu/usr.bin/perl/x2p/EXTERN.h +++ b/gnu/usr.bin/perl/x2p/EXTERN.h @@ -1,4 +1,4 @@ -/* $RCSfile: EXTERN.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:11 $ +/* $RCSfile: EXTERN.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:54 $ * * Copyright (c) 1991, Larry Wall * @@ -6,15 +6,18 @@ * License or the Artistic License, as specified in the README file. * * $Log: EXTERN.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:54 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:30:11 nate * PERL! * * Revision 4.0.1.1 91/06/07 12:11:15 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:56:53 lwall * 4.0 baseline. - * + * */ #undef EXT diff --git a/gnu/usr.bin/perl/x2p/INTERN.h b/gnu/usr.bin/perl/x2p/INTERN.h index e1967d2..d8a8a3e 100644 --- a/gnu/usr.bin/perl/x2p/INTERN.h +++ b/gnu/usr.bin/perl/x2p/INTERN.h @@ -1,4 +1,4 @@ -/* $RCSfile: INTERN.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:11 $ +/* $RCSfile: INTERN.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:54 $ * * Copyright (c) 1991, Larry Wall * @@ -6,15 +6,18 @@ * License or the Artistic License, as specified in the README file. * * $Log: INTERN.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:54 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:30:11 nate * PERL! * * Revision 4.0.1.1 91/06/07 12:11:20 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:56:58 lwall * 4.0 baseline. - * + * */ #undef EXT diff --git a/gnu/usr.bin/perl/x2p/Makefile b/gnu/usr.bin/perl/x2p/Makefile index 3d371c6..cc6c2fe 100644 --- a/gnu/usr.bin/perl/x2p/Makefile +++ b/gnu/usr.bin/perl/x2p/Makefile @@ -8,7 +8,7 @@ CLEANFILES+= y.tab.h a2p.c LDADD= -lm DPADD= ${LIBM} -MAN1+= a2p.1 s2p.1 h2ph.1 +MAN1+= a2p.1 s2p.1 h2ph.1 beforeinstall: install -c -o ${BINOWN} -g ${BINGRP} -m 555 ${.CURDIR}/s2p \ diff --git a/gnu/usr.bin/perl/x2p/a2p.h b/gnu/usr.bin/perl/x2p/a2p.h index 7c6a66dd..cc59fb7 100644 --- a/gnu/usr.bin/perl/x2p/a2p.h +++ b/gnu/usr.bin/perl/x2p/a2p.h @@ -1,4 +1,4 @@ -/* $RCSfile: a2p.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:09 $ +/* $RCSfile: a2p.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:53 $ * * Copyright (c) 1991, Larry Wall * @@ -6,18 +6,21 @@ * License or the Artistic License, as specified in the README file. * * $Log: a2p.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:53 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:30:09 nate * PERL! * * Revision 4.0.1.2 92/06/08 16:12:23 lwall * patch20: hash tables now split only if the memory is available to do so - * + * * Revision 4.0.1.1 91/06/07 12:12:27 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:57:07 lwall * 4.0 baseline. - * + * */ #define VOIDUSED 1 diff --git a/gnu/usr.bin/perl/x2p/a2py.c b/gnu/usr.bin/perl/x2p/a2py.c index 1558f99..fcc196b 100644 --- a/gnu/usr.bin/perl/x2p/a2py.c +++ b/gnu/usr.bin/perl/x2p/a2py.c @@ -1,4 +1,4 @@ -/* $RCSfile: a2py.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:10 $ +/* $RCSfile: a2py.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:53 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: a2py.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:53 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:30:10 nate * PERL! * @@ -13,13 +16,13 @@ * patch20: in a2p, now warns about spurious backslashes * patch20: in a2p, now allows [ to be backslashed in pattern * patch20: in a2p, now allows numbers of the form 2. - * + * * Revision 4.0.1.1 91/06/07 12:12:59 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:57:26 lwall * 4.0 baseline. - * + * */ #ifdef OS2 diff --git a/gnu/usr.bin/perl/x2p/handy.h b/gnu/usr.bin/perl/x2p/handy.h index 85a777c..1db94d4 100644 --- a/gnu/usr.bin/perl/x2p/handy.h +++ b/gnu/usr.bin/perl/x2p/handy.h @@ -1,4 +1,4 @@ -/* $RCSfile: handy.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:10 $ +/* $RCSfile: handy.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:54 $ * * Copyright (c) 1991, Larry Wall * @@ -6,18 +6,21 @@ * License or the Artistic License, as specified in the README file. * * $Log: handy.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:54 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:30:10 nate * PERL! * * Revision 4.0.1.2 91/06/07 12:15:43 lwall * patch4: new copyright notice - * + * * Revision 4.0.1.1 91/04/12 09:29:08 lwall * patch1: random cleanup in cpp namespace - * + * * Revision 4.0 91/03/20 01:57:45 lwall * 4.0 baseline. - * + * */ #define Null(type) ((type)0) diff --git a/gnu/usr.bin/perl/x2p/hash.c b/gnu/usr.bin/perl/x2p/hash.c index d525882..d1ae8ac 100644 --- a/gnu/usr.bin/perl/x2p/hash.c +++ b/gnu/usr.bin/perl/x2p/hash.c @@ -1,4 +1,4 @@ -/* $RCSfile: hash.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:10 $ +/* $RCSfile: hash.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:54 $ * * Copyright (c) 1991, Larry Wall * @@ -6,15 +6,18 @@ * License or the Artistic License, as specified in the README file. * * $Log: hash.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:54 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:30:10 nate * PERL! * * Revision 4.0.1.1 91/06/07 12:15:55 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:57:49 lwall * 4.0 baseline. - * + * */ #include <stdio.h> diff --git a/gnu/usr.bin/perl/x2p/hash.h b/gnu/usr.bin/perl/x2p/hash.h index ae4ffaf..452321c 100644 --- a/gnu/usr.bin/perl/x2p/hash.h +++ b/gnu/usr.bin/perl/x2p/hash.h @@ -1,4 +1,4 @@ -/* $RCSfile: hash.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:10 $ +/* $RCSfile: hash.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:54 $ * * Copyright (c) 1991, Larry Wall * @@ -6,15 +6,18 @@ * License or the Artistic License, as specified in the README file. * * $Log: hash.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:54 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:30:10 nate * PERL! * * Revision 4.0.1.1 91/06/07 12:16:04 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:57:53 lwall * 4.0 baseline. - * + * */ #define FILLPCT 60 /* don't make greater than 99 */ diff --git a/gnu/usr.bin/perl/x2p/malloc.c b/gnu/usr.bin/perl/x2p/malloc.c index dd43390..e7fff7f 100644 --- a/gnu/usr.bin/perl/x2p/malloc.c +++ b/gnu/usr.bin/perl/x2p/malloc.c @@ -1,6 +1,9 @@ -/* $RCSfile: malloc.c,v $$Revision: 1.2 $$Date: 1993/08/24 17:57:39 $ +/* $RCSfile: malloc.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:54 $ * * $Log: malloc.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:54 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.2 1993/08/24 17:57:39 nate * Fix for ALIGN macros in PERL that conflict with 4.4 macros * @@ -11,19 +14,19 @@ * patch20: removed implicit int declarations on functions * patch20: hash tables now split only if the memory is available to do so * patch20: realloc(0, size) now does malloc in case library routines call it - * + * * Revision 4.0.1.3 91/11/05 17:57:40 lwall * patch11: safe malloc code now integrated into Perl's malloc when possible - * + * * Revision 4.0.1.2 91/06/07 11:20:45 lwall * patch4: many, many itty-bitty portability fixes - * + * * Revision 4.0.1.1 91/04/11 17:48:31 lwall * patch1: Configure now figures out malloc ptr type - * + * * Revision 4.0 91/03/20 01:28:52 lwall * 4.0 baseline. - * + * */ #ifndef lint @@ -37,12 +40,12 @@ static char sccsid[] = "@(#)malloc.c 4.3 (Berkeley) 9/16/83"; * malloc.c (Caltech) 2/21/82 * Chris Kingsley, kingsley@cit-20. * - * This is a very fast storage allocator. It allocates blocks of a small + * This is a very fast storage allocator. It allocates blocks of a small * number of different sizes, and keeps free lists of each size. Blocks that - * don't exactly fit are passed up to the next larger size. In this + * don't exactly fit are passed up to the next larger size. In this * implementation, the available sizes are 2^n-4 (or 2^n-12) bytes long. * This is designed for use in a program that uses vast quantities of memory, - * but bombs when it runs out. + * but bombs when it runs out. */ #include "EXTERN.h" @@ -161,7 +164,7 @@ malloc(nbytes) * space used per block for accounting. */ nbytes += sizeof (union overhead) + RSLOP; - nbytes = (nbytes + 3) &~ 3; + nbytes = (nbytes + 3) &~ 3; shiftr = (nbytes - 1) >> 2; /* apart from this loop, this is O(1) */ while (shiftr >>= 1) @@ -170,7 +173,7 @@ malloc(nbytes) * If nothing in hash bucket right now, * request more memory from the system. */ - if (nextf[bucket] == NULL) + if (nextf[bucket] == NULL) morecore(bucket); if ((p = (union overhead *)nextf[bucket]) == NULL) { #ifdef safemalloc @@ -256,7 +259,7 @@ morecore(bucket) /* take 2k unless the block is bigger than that */ rnu = (bucket <= 8) ? 11 : bucket + 3; #else - /* take 16k unless the block is bigger than that + /* take 16k unless the block is bigger than that (80286s like large segments!), probably good on the atari too */ rnu = (bucket <= 11) ? 14 : bucket + 3; #endif @@ -294,7 +297,7 @@ morecore(bucket) void free(mp) MALLOCPTRTYPE *mp; -{ +{ register MEM_SIZE size; register union overhead *op; char *cp = (char*)mp; @@ -353,9 +356,9 @@ int reall_srchlen = 4; /* 4 should be plenty, -1 =>'s whole list */ MALLOCPTRTYPE * realloc(mp, nbytes) - MALLOCPTRTYPE *mp; + MALLOCPTRTYPE *mp; MEM_SIZE nbytes; -{ +{ register MEM_SIZE onb; union overhead *op; char *res; @@ -419,7 +422,7 @@ realloc(mp, nbytes) * space used per block for accounting. */ nbytes += sizeof (union overhead) + RSLOP; - nbytes = (nbytes + 3) &~ 3; + nbytes = (nbytes + 3) &~ 3; op->ov_size = nbytes - 1; *((u_int *)((caddr_t)op + nbytes - RSLOP)) = RMAGIC; } @@ -480,7 +483,7 @@ findbucket(freep, srchlen) #ifdef MSTATS /* * mstats - print out statistics about malloc - * + * * Prints two lines of numbers, one showing the length of the free list * for each size category, the second showing the number of mallocs - * frees for each size category. diff --git a/gnu/usr.bin/perl/x2p/str.c b/gnu/usr.bin/perl/x2p/str.c index 0461194..4e078a6 100644 --- a/gnu/usr.bin/perl/x2p/str.c +++ b/gnu/usr.bin/perl/x2p/str.c @@ -1,4 +1,4 @@ -/* $RCSfile: str.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:09 $ +/* $RCSfile: str.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:54 $ * * Copyright (c) 1991, Larry Wall * @@ -6,15 +6,18 @@ * License or the Artistic License, as specified in the README file. * * $Log: str.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:54 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:30:09 nate * PERL! * * Revision 4.0.1.1 91/06/07 12:20:08 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:58:15 lwall * 4.0 baseline. - * + * */ #include "handy.h" @@ -215,7 +218,7 @@ str_new(len) int len; { register STR *str; - + if (freestrroot) { str = freestrroot; freestrroot = str->str_link.str_next; @@ -314,7 +317,7 @@ register FILE *fp; bp -= 2; } } - + fp->_cnt = cnt; /* deregisterize cnt and ptr */ fp->_ptr = ptr; i = _filbuf(fp); /* get more characters */ diff --git a/gnu/usr.bin/perl/x2p/str.h b/gnu/usr.bin/perl/x2p/str.h index 765d9ea..642e18e 100644 --- a/gnu/usr.bin/perl/x2p/str.h +++ b/gnu/usr.bin/perl/x2p/str.h @@ -1,4 +1,4 @@ -/* $RCSfile: str.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:10 $ +/* $RCSfile: str.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:55 $ * * Copyright (c) 1991, Larry Wall * @@ -6,15 +6,18 @@ * License or the Artistic License, as specified in the README file. * * $Log: str.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:55 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:30:10 nate * PERL! * * Revision 4.0.1.1 91/06/07 12:20:22 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:58:21 lwall * 4.0 baseline. - * + * */ struct string { diff --git a/gnu/usr.bin/perl/x2p/util.c b/gnu/usr.bin/perl/x2p/util.c index 4c5b078..70a6cd7 100644 --- a/gnu/usr.bin/perl/x2p/util.c +++ b/gnu/usr.bin/perl/x2p/util.c @@ -1,4 +1,4 @@ -/* $RCSfile: util.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:10 $ +/* $RCSfile: util.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:55 $ * * Copyright (c) 1991, Larry Wall * @@ -6,15 +6,18 @@ * License or the Artistic License, as specified in the README file. * * $Log: util.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:55 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:30:10 nate * PERL! * * Revision 4.0.1.1 91/06/07 12:20:35 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:58:25 lwall * 4.0 baseline. - * + * */ #include <stdio.h> @@ -103,7 +106,7 @@ register int len; { register char *dest = to; - if (from != Nullch) + if (from != Nullch) for (len--; len && (*dest++ = *from++); len--) ; *dest = '\0'; return to; @@ -234,7 +237,7 @@ char *nam, *val; #else char **tmpenv = Null(char **); #endif /* lint */ - + firstsetenv = FALSE; for (j=0; j<i; j++) /* copy environment */ tmpenv[j] = environ[j]; diff --git a/gnu/usr.bin/perl/x2p/util.h b/gnu/usr.bin/perl/x2p/util.h index 15bf78e5..ad94422 100644 --- a/gnu/usr.bin/perl/x2p/util.h +++ b/gnu/usr.bin/perl/x2p/util.h @@ -1,4 +1,4 @@ -/* $RCSfile: util.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:10 $ +/* $RCSfile: util.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:55 $ * * Copyright (c) 1991, Larry Wall * @@ -6,18 +6,21 @@ * License or the Artistic License, as specified in the README file. * * $Log: util.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:55 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:30:10 nate * PERL! * * Revision 4.0.1.2 91/11/05 19:21:20 lwall * patch11: various portability fixes - * + * * Revision 4.0.1.1 91/06/07 12:20:43 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:58:29 lwall * 4.0 baseline. - * + * */ /* is the string for makedir a directory name or a filename? */ diff --git a/gnu/usr.bin/perl/x2p/walk.c b/gnu/usr.bin/perl/x2p/walk.c index 4cc4a79..c7e5e44 100644 --- a/gnu/usr.bin/perl/x2p/walk.c +++ b/gnu/usr.bin/perl/x2p/walk.c @@ -1,4 +1,4 @@ -/* $RCSfile: walk.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:11 $ +/* $RCSfile: walk.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:55 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: walk.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:55 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:30:11 nate * PERL! * @@ -14,17 +17,17 @@ * patch20: in a2p, made RS="" translate to $/ = "\n\n" * patch20: in a2p, do {...} while ... was missing some reconstruction code * patch20: in a2p, getline should allow variable to be array element - * + * * Revision 4.0.1.2 91/11/05 19:25:09 lwall * patch11: in a2p, split on whitespace produced extra null field - * + * * Revision 4.0.1.1 91/06/07 12:22:04 lwall * patch4: new copyright notice * patch4: a2p didn't correctly implement -n switch - * + * * Revision 4.0 91/03/20 01:58:36 lwall * 4.0 baseline. - * + * */ #include "handy.h" @@ -645,7 +648,7 @@ sub Pick {\n\ else tmpstr = str_make(""); sprintf(tokenbuf," = &Getline%d(%s)",len,tmpstr->str_ptr); - str_cat(str,tokenbuf); + str_cat(str,tokenbuf); str_free(tmpstr); if (useval) str_cat(str,",$getline_ok)"); diff --git a/gnu/usr.bin/ptx/bumpalloc.h b/gnu/usr.bin/ptx/bumpalloc.h index bbf901f..6fe8952 100644 --- a/gnu/usr.bin/ptx/bumpalloc.h +++ b/gnu/usr.bin/ptx/bumpalloc.h @@ -27,12 +27,12 @@ /* Routines `xmalloc' and `xrealloc' are called to do the actual memory management. This implies that the program will abort with an `Virtual Memory exhausted!' error if any problem arise. - + To work correctly, at least EXPONENT and TYPE should always be the same for all uses of this macro for any given TABLE. A secure way to achieve this is to never use this macro directly, but use it to define other macros, which would then be TABLE-specific. - + The first time through, COUNT is usually zero. Note that COUNT is not updated by this macro, but it should be update elsewhere, later. This is convenient, because it allows TABLE[COUNT] to refer to the new diff --git a/gnu/usr.bin/ptx/ptx.c b/gnu/usr.bin/ptx/ptx.c index 3ef3665..8c1b8d2 100644 --- a/gnu/usr.bin/ptx/ptx.c +++ b/gnu/usr.bin/ptx/ptx.c @@ -79,7 +79,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n"; #include <fcntl.h> #include <sys/types.h> #include <sys/stat.h> - + #if !defined(S_ISREG) && defined(S_IFREG) #define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) #endif @@ -257,25 +257,25 @@ char *text_buffer_maxend; /* allocated end of text_buffer */ while (0) /* Occurrences table. - + The `keyword' pointer provides the central word, which is surrounded by a left context and a right context. The `keyword' and `length' field allow full 8-bit characters keys, even including NULs. At other places in this program, the name `keyafter' refers to the keyword followed by its right context. - + The left context does not extend, towards the beginning of the file, further than a distance given by the `left' value. This value is relative to the keyword beginning, it is usually negative. This insures that, except for white space, we will never have to backward scan the source text, when it is time to generate the final output lines. - + The right context, indirectly attainable through the keyword end, does not extend, towards the end of the file, further than a distance given by the `right' value. This value is relative to the keyword beginning, it is usually positive. - + When automatic references are used, the `reference' value is the overall line number in all input files read so far, in this case, it is of type (int). When input references are used, the `reference' @@ -302,7 +302,7 @@ size_t number_of_occurs[1]; /* number of used slots in occurs_table */ #define ALLOC_NEW_OCCURS(language) \ BUMP_ALLOC (occurs_table[language], number_of_occurs[language], 9, OCCURS) - + /* Communication among output routines. */ @@ -472,7 +472,7 @@ alloc_and_compile_regex (const char *string) /* The fastmap should be compiled before `re_match'. The following call is not mandatory, because `re_search' is always called sooner, and it compiles the fastmap if this has not been done yet. */ - + re_compile_fastmap (pattern); /* Do not waste extra allocated space. */ @@ -581,7 +581,7 @@ swallow_file_in_memory (const char *file_name, BLOCK *block) /* As special cases, a file name which is NULL or "-" indicates standard input, which is already opened. In all other cases, open the file from - its name. */ + its name. */ if (!file_name || !*file_name || strcmp (file_name, "-") == 0) file_handle = fileno (stdin); @@ -1363,8 +1363,8 @@ fix_output_parameters (void) . One ending the tail field. . One beginning the before field, another ending the keyafter field. . One ending the tail field, another beginning the before field. - . One ending the keyafter field, another beginning the head field. - + . One ending the keyafter field, another beginning the head field. + So, there is at most two truncation marks, which could appear both on the left side of the center of the output line, both on the right side, or one on either side. */ @@ -1987,7 +1987,7 @@ main (int argc, char *const argv[]) /* Decode program options. */ program_name = argv[0]; - + while ((optchar = getopt_long (argc, argv, "ACF:GM:ORS:TW:b:i:fg:o:trw:", long_options, NULL)), optchar != EOF) diff --git a/gnu/usr.bin/rcs/ci/Makefile b/gnu/usr.bin/rcs/ci/Makefile index 3ac3d29..2fbb74f 100644 --- a/gnu/usr.bin/rcs/ci/Makefile +++ b/gnu/usr.bin/rcs/ci/Makefile @@ -1,5 +1,5 @@ PROG= ci -SRCS= ci.c +SRCS= ci.c CFLAGS+= -I${.CURDIR}/../lib LDADD= ${LIBRCS} DPADD= ${LIBRCS} diff --git a/gnu/usr.bin/rcs/ci/ci.c b/gnu/usr.bin/rcs/ci/ci.c index 566747e..3d2e6f7 100644 --- a/gnu/usr.bin/rcs/ci/ci.c +++ b/gnu/usr.bin/rcs/ci/ci.c @@ -35,6 +35,9 @@ Report problems and direct all questions to: /* $Log: ci.c,v $ + * Revision 1.1.1.1 1993/06/18 04:22:10 jkh + * Updated GNU utilities + * * Revision 5.21 1991/11/20 17:58:07 eggert * Don't read the delta tree from a nonexistent RCS file. * @@ -114,37 +117,37 @@ Report problems and direct all questions to: * * Revision 4.9 89/05/01 15:10:54 narten * changed copyright header to reflect current distribution rules - * + * * Revision 4.8 88/11/08 13:38:23 narten * changes from root@seismo.CSS.GOV (Super User) * -d with no arguments uses the mod time of the file it is checking in - * + * * Revision 4.7 88/08/09 19:12:07 eggert * Make sure workfile is a regular file; use its mode if RCSfile doesn't have one. * Use execv(), not system(); allow cc -R; remove lint. * isatty(fileno(stdin)) -> ttystdin() - * + * * Revision 4.6 87/12/18 11:34:41 narten * lint cleanups (from Guy Harris) - * + * * Revision 4.5 87/10/18 10:18:48 narten * Updating version numbers. Changes relative to revision 1.1 are actually * relative to 4.3 - * + * * Revision 1.3 87/09/24 13:57:19 narten - * Sources now pass through lint (if you ignore printf/sprintf/fprintf + * Sources now pass through lint (if you ignore printf/sprintf/fprintf * warnings) - * + * * Revision 1.2 87/03/27 14:21:33 jenkins * Port to suns - * + * * Revision 4.3 83/12/15 12:28:54 wft * ci -u and ci -l now set mode of working file properly. - * + * * Revision 4.2 83/12/05 13:40:54 wft * Merged with 3.9.1.1: added calls to clearerr(stdin). * made rewriteflag external. - * + * * Revision 4.1 83/05/10 17:03:06 wft * Added option -d and -w, and updated assingment of date, etc. to new delta. * Added handling of default branches. @@ -155,13 +158,13 @@ Report problems and direct all questions to: * Removed calls to stat(); now done by pairfilenames(). * Changed most calls to catchints() with restoreints(). * Directed all interactive messages to stderr. - * + * * Revision 3.9.1.1 83/10/19 04:21:03 lepreau * Added clearerr(stdin) to getlogmsg() for re-reading stdin. - * + * * Revision 3.9 83/02/15 15:25:44 wft * 4.2 prerelease - * + * * Revision 3.9 83/02/15 15:25:44 wft * Added call to fastcopy() to copy remainder of RCS file. * @@ -238,7 +241,7 @@ static struct hshentry newdelta; /* new delta to be inserted */ static struct stat workstat; static struct Symrev *assoclst, *lastassoc; -mainProg(ciId, "ci", "$Id: ci.c,v 5.21 1991/11/20 17:58:07 eggert Exp $") +mainProg(ciId, "ci", "$Id: ci.c,v 1.1.1.1 1993/06/18 04:22:10 jkh Exp $") { static char const cmdusage[] = "\nci usage: ci -{fklqru}[rev] -mmsg -{nN}name -sstate -t[textfile] -Vn file ..."; @@ -258,7 +261,7 @@ mainProg(ciId, "ci", "$Id: ci.c,v 5.21 1991/11/20 17:58:07 eggert Exp $") int usestatdate; /* Use mod time of file for -d. */ mode_t newworkmode; /* mode for working file */ struct hshentry *workdelta; - + setrid(); author = rev = state = textfile = nil; @@ -321,7 +324,7 @@ mainProg(ciId, "ci", "$Id: ci.c,v 5.21 1991/11/20 17:58:07 eggert Exp $") checksid(a); addassoclst(false, a); break; - + case 'N': if (!*a) { error("missing symbolic name after -N"); @@ -494,7 +497,7 @@ mainProg(ciId, "ci", "$Id: ci.c,v 5.21 1991/11/20 17:58:07 eggert Exp $") if (!addsyms(newdelta.num)) continue; - + putadmin(frewrite); puttree(Head,frewrite); putdesc(false,textfile); @@ -1151,7 +1154,7 @@ int flag; char * sp; { struct Symrev *pt; - + pt = talloc(struct Symrev); pt->ssymbol = sp; pt->override = flag; diff --git a/gnu/usr.bin/rcs/co/Makefile b/gnu/usr.bin/rcs/co/Makefile index a759d1f..0c73865 100644 --- a/gnu/usr.bin/rcs/co/Makefile +++ b/gnu/usr.bin/rcs/co/Makefile @@ -1,5 +1,5 @@ PROG= co -SRCS= co.c +SRCS= co.c CFLAGS+= -I${.CURDIR}/../lib LDADD= ${LIBRCS} DPADD= ${LIBRCS} diff --git a/gnu/usr.bin/rcs/co/co.c b/gnu/usr.bin/rcs/co/co.c index 82f7cc8..6a1579d 100644 --- a/gnu/usr.bin/rcs/co/co.c +++ b/gnu/usr.bin/rcs/co/co.c @@ -34,6 +34,11 @@ Report problems and direct all questions to: /* $Log: co.c,v $ + * Revision 1.2 1994/05/14 07:00:10 rgrimes + * Add new option -K from David Dawes that allows you to turn on and off + * specific keyword substitution during a rcs co command. + * Add the new keyword FreeBSD that is IDENTICAL in operation to $Id$. + * * Revision 1.1.1.1 1993/06/18 04:22:11 jkh * Updated GNU utilities * @@ -74,28 +79,28 @@ Report problems and direct all questions to: * * Revision 4.7 89/05/01 15:11:41 narten * changed copyright header to reflect current distribution rules - * + * * Revision 4.6 88/08/09 19:12:15 eggert * Fix "co -d" core dump; rawdate wasn't always initialized. * Use execv(), not system(); fix putchar('\0') and diagnose() botches; remove lint - * + * * Revision 4.5 87/12/18 11:35:40 narten * lint cleanups (from Guy Harris) - * + * * Revision 4.4 87/10/18 10:20:53 narten * Updating version numbers changes relative to 1.1, are actually * relative to 4.2 - * + * * Revision 1.3 87/09/24 13:58:30 narten - * Sources now pass through lint (if you ignore printf/sprintf/fprintf + * Sources now pass through lint (if you ignore printf/sprintf/fprintf * warnings) - * + * * Revision 1.2 87/03/27 14:21:38 jenkins * Port to suns - * + * * Revision 4.2 83/12/05 13:39:48 wft * made rewriteflag external. - * + * * Revision 4.1 83/05/10 16:52:55 wft * Added option -u and -f. * Added handling of default branch. @@ -103,7 +108,7 @@ Report problems and direct all questions to: * Removed calls to stat(); now done by pairfilenames(). * Changed and renamed rmoldfile() to rmworkfile(). * Replaced catchints() calls with restoreints(), unlink()--link() with rename(); - * + * * Revision 3.7 83/02/15 15:27:07 wft * Added call to fastcopy() to copy remainder of RCS file. * @@ -167,7 +172,7 @@ static struct hshentries *gendeltas; /* deltas to be generated */ static struct hshentry *targetdelta; /* final delta to be generated */ static struct stat workstat; -mainProg(coId, "co", "$Id: co.c,v 1.1.1.1 1993/06/18 04:22:11 jkh Exp $") +mainProg(coId, "co", "$Id: co.c,v 1.2 1994/05/14 07:00:10 rgrimes Exp $") { static char const cmdusage[] = "\nco usage: co -{flpqru}[rev] -ddate -jjoinlist -sstate -w[login] -Vn file ..."; diff --git a/gnu/usr.bin/rcs/ident/Makefile b/gnu/usr.bin/rcs/ident/Makefile index 25e028b..f28f8d3 100644 --- a/gnu/usr.bin/rcs/ident/Makefile +++ b/gnu/usr.bin/rcs/ident/Makefile @@ -1,5 +1,5 @@ PROG= ident -SRCS= ident.c +SRCS= ident.c CFLAGS+= -I${.CURDIR}/../lib LDADD= ${LIBRCS} DPADD= ${LIBRCS} diff --git a/gnu/usr.bin/rcs/ident/ident.c b/gnu/usr.bin/rcs/ident/ident.c index a2cc018..e3e723c 100644 --- a/gnu/usr.bin/rcs/ident/ident.c +++ b/gnu/usr.bin/rcs/ident/ident.c @@ -29,6 +29,9 @@ Report problems and direct all questions to: */ /* $Log: ident.c,v $ + * Revision 1.1.1.1 1993/06/18 04:22:11 jkh + * Updated GNU utilities + * * Revision 5.3 1991/09/10 22:15:46 eggert * Open files with FOPEN_R, not FOPEN_R_WORK, * because they might be executables, not working files. @@ -45,26 +48,26 @@ Report problems and direct all questions to: * * Revision 4.5 89/05/01 15:11:54 narten * changed copyright header to reflect current distribution rules - * + * * Revision 4.4 87/10/23 17:09:57 narten * added exit(0) so exit return code would be non random - * + * * Revision 4.3 87/10/18 10:23:55 narten * Updating version numbers. Changes relative to 1.1 are actually relative * to 4.1 - * + * * Revision 1.3 87/07/09 09:20:52 trinkle * Added check to make sure there is at least one arg before comparing argv[1] * with "-q". This necessary on machines that don't allow dereferncing null * pointers (i.e. Suns). - * + * * Revision 1.2 87/03/27 14:21:47 jenkins * Port to suns - * + * * Revision 4.1 83/05/10 16:31:02 wft * Added option -q and input from reading stdin. * Marker matching is now done with trymatch() (independent of keywords). - * + * * Revision 3.4 83/02/18 17:37:49 wft * removed printing of new line after last file. * @@ -83,7 +86,7 @@ Report problems and direct all questions to: static int match P((FILE*)); static void scanfile P((FILE*,char const*,int)); -mainProg(identId, "ident", "$Id: ident.c,v 5.3 1991/09/10 22:15:46 eggert Exp $") +mainProg(identId, "ident", "$Id: ident.c,v 1.1.1.1 1993/06/18 04:22:11 jkh Exp $") /* Ident searches the named files for all occurrences * of the pattern $keyword:...$, where the keywords are * Author, Date, Header, Id, Log, RCSfile, Revision, Source, and State. diff --git a/gnu/usr.bin/rcs/lib/maketime.c b/gnu/usr.bin/rcs/lib/maketime.c index c95c9f0..b87d744 100644 --- a/gnu/usr.bin/rcs/lib/maketime.c +++ b/gnu/usr.bin/rcs/lib/maketime.c @@ -21,6 +21,9 @@ * (ARPANET: KLH @ SRI) */ /* $Log: maketime.c,v $ + * Revision 1.1.1.1 1993/06/18 04:22:13 jkh + * Updated GNU utilities + * * Revision 5.3 1991/08/19 03:13:55 eggert * Add setfiledate, str2time, TZ_must_be_set. * @@ -37,41 +40,41 @@ * * Revision 1.8 88/11/08 13:54:53 narten * allow negative timezones (-24h <= x <= 24h) - * + * * Revision 1.7 88/08/28 14:47:52 eggert * Allow cc -R. Remove unportable "#endif XXX"s. - * + * * Revision 1.6 87/12/18 17:05:58 narten * include rcsparam.h - * + * * Revision 1.5 87/12/18 11:35:51 narten * maketime.c: fixed USG code - you have tgo call "tzset" in order to have - * "timezone" set. ("localtime" calls it, but it's probably better not to + * "timezone" set. ("localtime" calls it, but it's probably better not to * count on "localtime" having been called.) - * + * * Revision 1.4 87/10/18 10:26:57 narten - * Updating version numbers. Changes relative to 1.0 are actually + * Updating version numbers. Changes relative to 1.0 are actually * relative to 1.2 - * + * * Revision 1.3 87/09/24 13:58:45 narten - * Sources now pass through lint (if you ignore printf/sprintf/fprintf + * Sources now pass through lint (if you ignore printf/sprintf/fprintf * warnings) - * + * * Revision 1.2 87/03/27 14:21:48 jenkins * Port to suns - * + * * Revision 1.2 83/12/05 10:12:56 wft * added cond. compilation for USG Unix; long timezone; - * + * * Revision 1.1 82/05/06 11:38:00 wft * Initial revision - * + * */ #include "rcsbase.h" -libId(maketId, "$Id: maketime.c,v 5.3 1991/08/19 03:13:55 eggert Exp $") +libId(maketId, "$Id: maketime.c,v 1.1.1.1 1993/06/18 04:22:13 jkh Exp $") static struct tm const *time2tm P((time_t)); diff --git a/gnu/usr.bin/rcs/lib/partime.c b/gnu/usr.bin/rcs/lib/partime.c index 4751fc5..6c2c2a1 100644 --- a/gnu/usr.bin/rcs/lib/partime.c +++ b/gnu/usr.bin/rcs/lib/partime.c @@ -21,6 +21,9 @@ */ /* $Log: partime.c,v $ + * Revision 1.1.1.1 1993/06/18 04:22:13 jkh + * Updated GNU utilities + * * Revision 5.6 1991/08/19 03:13:55 eggert * Update timezones. * @@ -48,21 +51,21 @@ * * Revision 1.4 89/05/01 14:48:46 narten * fixed #ifdef DEBUG construct - * + * * Revision 1.3 88/08/28 14:53:40 eggert * Remove unportable "#endif XXX"s. - * + * * Revision 1.2 87/03/27 14:21:53 jenkins * Port to suns - * + * * Revision 1.1 82/05/06 11:38:26 wft * Initial revision - * + * */ #include "rcsbase.h" -libId(partId, "$Id: partime.c,v 5.6 1991/08/19 03:13:55 eggert Exp $") +libId(partId, "$Id: partime.c,v 1.1.1.1 1993/06/18 04:22:13 jkh Exp $") #define given(v) (0 <= (v)) #define TMNULL (-1) /* Items not given are given this value */ @@ -510,7 +513,7 @@ register struct token *tkp; } #else return(0); -#endif +#endif cp = tkp->tcp; #ifdef DEBUG diff --git a/gnu/usr.bin/rcs/lib/rcsbase.h b/gnu/usr.bin/rcs/lib/rcsbase.h index 17a123d..788ea5d 100644 --- a/gnu/usr.bin/rcs/lib/rcsbase.h +++ b/gnu/usr.bin/rcs/lib/rcsbase.h @@ -2,7 +2,7 @@ /* * RCS common definitions and data structures */ -#define RCSBASE "$Id: rcsbase.h,v 1.1.1.1 1993/06/18 04:22:13 jkh Exp $" +#define RCSBASE "$Id: rcsbase.h,v 1.2 1994/05/14 07:00:20 rgrimes Exp $" /* Copyright (C) 1982, 1988, 1989 Walter Tichy Copyright 1990, 1991 by Paul Eggert @@ -43,6 +43,11 @@ Report problems and direct all questions to: /* $Log: rcsbase.h,v $ + * Revision 1.2 1994/05/14 07:00:20 rgrimes + * Add new option -K from David Dawes that allows you to turn on and off + * specific keyword substitution during a rcs co command. + * Add the new keyword FreeBSD that is IDENTICAL in operation to $Id$. + * * Revision 1.1.1.1 1993/06/18 04:22:13 jkh * Updated GNU utilities * @@ -88,45 +93,45 @@ Report problems and direct all questions to: * Remove snoop and v2 support. * * Revision 4.9 89/05/01 15:17:14 narten - * botched previous USG fix - * + * botched previous USG fix + * * Revision 4.8 89/05/01 14:53:05 narten * changed #include <strings.h> -> string.h for USG systems. - * + * * Revision 4.7 88/11/08 15:58:45 narten * removed defs for functions loaded from libraries - * + * * Revision 4.6 88/08/09 19:12:36 eggert * Shrink stdio code size; remove lint; permit -Dhshsize=nn. - * + * * Revision 4.5 87/12/18 17:06:41 narten * made removed BSD ifdef, now uses V4_2BSD - * + * * Revision 4.4 87/10/18 10:29:49 narten * Updating version numbers * Changes relative to 1.1 are actually relative to 4.2 - * + * * Revision 1.3 87/09/24 14:02:25 narten * changes for lint - * + * * Revision 1.2 87/03/27 14:22:02 jenkins * Port to suns - * + * * Revision 4.2 83/12/20 16:04:20 wft * merged 3.6.1.1 and 4.1 (SMALLOG, logsize). * moved setting of STRICT_LOCKING to Makefile. * changed DOLLAR to UNKN (conflict with KDELIM). - * + * * Revision 4.1 83/05/04 09:12:41 wft * Added markers Id and RCSfile. * Added Dbranch for default branches. - * + * * Revision 3.6.1.1 83/12/02 21:56:22 wft * Increased logsize, added macro SMALLOG. - * + * * Revision 3.6 83/01/15 16:43:28 wft * 4.2 prerelease - * + * * Revision 3.6 83/01/15 16:43:28 wft * Replaced dbm.h with BYTESIZ, fixed definition of rindex(). * Added variants of NCPFN and NCPPN for bsd 4.2, selected by defining V4_2BSD. diff --git a/gnu/usr.bin/rcs/lib/rcsedit.c b/gnu/usr.bin/rcs/lib/rcsedit.c index 98e4c4b..32ff7e2 100644 --- a/gnu/usr.bin/rcs/lib/rcsedit.c +++ b/gnu/usr.bin/rcs/lib/rcsedit.c @@ -36,6 +36,11 @@ Report problems and direct all questions to: /* $Log: rcsedit.c,v $ + * Revision 1.2 1994/05/14 07:00:22 rgrimes + * Add new option -K from David Dawes that allows you to turn on and off + * specific keyword substitution during a rcs co command. + * Add the new keyword FreeBSD that is IDENTICAL in operation to $Id$. + * * Revision 1.1.1.1 1993/06/18 04:22:12 jkh * Updated GNU utilities * @@ -85,50 +90,50 @@ Report problems and direct all questions to: * * Revision 4.8 89/05/01 15:12:35 narten * changed copyright header to reflect current distribution rules - * + * * Revision 4.7 88/11/08 13:54:14 narten * misplaced semicolon caused infinite loop - * + * * Revision 4.6 88/08/09 19:12:45 eggert * Shrink stdio code size; allow cc -R. - * + * * Revision 4.5 87/12/18 11:38:46 narten * Changes from the 43. version. Don't know the significance of the * first change involving "rewind". Also, additional "lint" cleanup. * (Guy Harris) - * + * * Revision 4.4 87/10/18 10:32:21 narten * Updating version numbers. Changes relative to version 1.1 actually * relative to 4.1 - * + * * Revision 1.4 87/09/24 13:59:29 narten - * Sources now pass through lint (if you ignore printf/sprintf/fprintf + * Sources now pass through lint (if you ignore printf/sprintf/fprintf * warnings) - * + * * Revision 1.3 87/09/15 16:39:39 shepler * added an initializatin of the variables editline and linecorr * this will be done each time a file is processed. * (there was an obscure bug where if co was used to retrieve multiple files * it would dump) * fix attributed to Roy Morris @FileNet Corp ...!felix!roy - * + * * Revision 1.2 87/03/27 14:22:17 jenkins * Port to suns - * + * * Revision 4.1 83/05/12 13:10:30 wft * Added new markers Id and RCSfile; added locker to Header and Id. * Overhauled expandline completely() (problem with $01234567890123456789@). * Moved trymatch() and marker table to rcskeys.c. - * + * * Revision 3.7 83/05/12 13:04:39 wft * Added retry to expandline to resume after failed match which ended in $. * Fixed truncation problem for $19chars followed by@@. * Log no longer expands full path of RCS file. - * + * * Revision 3.6 83/05/11 16:06:30 wft * added retry to expandline to resume after failed match which ended in $. * Fixed truncation problem for $19chars followed by@@. - * + * * Revision 3.5 82/12/04 13:20:56 wft * Added expansion of keyword Locker. * @@ -157,7 +162,7 @@ Report problems and direct all questions to: #include "rcsbase.h" -libId(editId, "$Id: rcsedit.c,v 1.1.1.1 1993/06/18 04:22:12 jkh Exp $") +libId(editId, "$Id: rcsedit.c,v 1.2 1994/05/14 07:00:22 rgrimes Exp $") static void keyreplace P((enum markers,struct hshentry const*,FILE*)); diff --git a/gnu/usr.bin/rcs/lib/rcsfcmp.c b/gnu/usr.bin/rcs/lib/rcsfcmp.c index 75a6bbc..d8bb555 100644 --- a/gnu/usr.bin/rcs/lib/rcsfcmp.c +++ b/gnu/usr.bin/rcs/lib/rcsfcmp.c @@ -38,6 +38,9 @@ Report problems and direct all questions to: /* $Log: rcsfcmp.c,v $ + * Revision 1.1.1.1 1993/06/18 04:22:13 jkh + * Updated GNU utilities + * * Revision 5.9 1991/10/07 17:32:46 eggert * Count log lines correctly. * @@ -69,24 +72,24 @@ Report problems and direct all questions to: * * Revision 4.5 89/05/01 15:12:42 narten * changed copyright header to reflect current distribution rules - * + * * Revision 4.4 88/08/09 19:12:50 eggert * Shrink stdio code size. - * + * * Revision 4.3 87/12/18 11:40:02 narten * lint cleanups (Guy Harris) - * + * * Revision 4.2 87/10/18 10:33:06 narten - * updting version number. Changes relative to 1.1 actually relative to + * updting version number. Changes relative to 1.1 actually relative to * 4.1 - * + * * Revision 1.2 87/03/27 14:22:19 jenkins * Port to suns - * + * * Revision 4.1 83/05/10 16:24:04 wft * Marker matching now uses trymatch(). Marker pattern is now * checked precisely. - * + * * Revision 3.1 82/12/04 13:21:40 wft * Initial revision. * @@ -101,7 +104,7 @@ Report problems and direct all questions to: #include "rcsbase.h" -libId(fcmpId, "$Id: rcsfcmp.c,v 5.9 1991/10/07 17:32:46 eggert Exp $") +libId(fcmpId, "$Id: rcsfcmp.c,v 1.1.1.1 1993/06/18 04:22:13 jkh Exp $") static int discardkeyval(c, f) diff --git a/gnu/usr.bin/rcs/lib/rcsfnms.c b/gnu/usr.bin/rcs/lib/rcsfnms.c index 02562f0..93c96b9 100644 --- a/gnu/usr.bin/rcs/lib/rcsfnms.c +++ b/gnu/usr.bin/rcs/lib/rcsfnms.c @@ -38,6 +38,9 @@ Report problems and direct all questions to: /* $Log: rcsfnms.c,v $ + * Revision 1.1.1.1 1993/06/18 04:22:13 jkh + * Updated GNU utilities + * * Revision 5.8 1991/09/24 00:28:40 eggert * Don't export bindex(). * @@ -75,43 +78,43 @@ Report problems and direct all questions to: * * Revision 4.8 89/05/01 15:09:41 narten * changed getwd to not stat empty directories. - * + * * Revision 4.7 88/08/09 19:12:53 eggert * Fix troff macro comment leader bug; add Prolog; allow cc -R; remove lint. - * + * * Revision 4.6 87/12/18 11:40:23 narten * additional file types added from 4.3 BSD version, and SPARC assembler * comment character added. Also, more lint cleanups. (Guy Harris) - * + * * Revision 4.5 87/10/18 10:34:16 narten * Updating version numbers. Changes relative to 1.1 actually relative * to verion 4.3 - * + * * Revision 1.3 87/03/27 14:22:21 jenkins * Port to suns - * + * * Revision 1.2 85/06/26 07:34:28 svb * Comment leader '% ' for '*.tex' files added. - * + * * Revision 4.3 83/12/15 12:26:48 wft * Added check for KDELIM in file names to pairfilenames(). - * + * * Revision 4.2 83/12/02 22:47:45 wft * Added csh, red, and sl file name suffixes. - * + * * Revision 4.1 83/05/11 16:23:39 wft * Added initialization of Dbranch to InitAdmin(). Canged pairfilenames(): * 1. added copying of path from workfile to RCS file, if RCS file is omitted; * 2. added getting the file status of RCS and working files; * 3. added ignoring of directories. - * + * * Revision 3.7 83/05/11 15:01:58 wft * Added comtable[] which pairs file name suffixes with comment leaders; * updated InitAdmin() accordingly. - * + * * Revision 3.6 83/04/05 14:47:36 wft * fixed Suffix in InitAdmin(). - * + * * Revision 3.5 83/01/17 18:01:04 wft * Added getwd() and rename(); these can be removed by defining * V4_2BSD, since they are not needed in 4.2 bsd. @@ -140,7 +143,7 @@ Report problems and direct all questions to: #include "rcsbase.h" -libId(fnmsId, "$Id: rcsfnms.c,v 5.8 1991/09/24 00:28:40 eggert Exp $") +libId(fnmsId, "$Id: rcsfnms.c,v 1.1.1.1 1993/06/18 04:22:13 jkh Exp $") char const *RCSfilename; char *workfilename; diff --git a/gnu/usr.bin/rcs/lib/rcsgen.c b/gnu/usr.bin/rcs/lib/rcsgen.c index 9a6072e..dfb03c1 100644 --- a/gnu/usr.bin/rcs/lib/rcsgen.c +++ b/gnu/usr.bin/rcs/lib/rcsgen.c @@ -31,6 +31,9 @@ Report problems and direct all questions to: /* $Log: rcsgen.c,v $ + * Revision 1.1.1.1 1993/06/18 04:22:12 jkh + * Updated GNU utilities + * * Revision 5.10 1991/10/07 17:32:46 eggert * Fix log bugs, e.g. ci -t/dev/null when has_mmap. * @@ -69,39 +72,39 @@ Report problems and direct all questions to: * * Revision 4.7 89/05/01 15:12:49 narten * changed copyright header to reflect current distribution rules - * + * * Revision 4.6 88/08/28 14:59:10 eggert * Shrink stdio code size; allow cc -R; remove lint; isatty() -> ttystdin() - * + * * Revision 4.5 87/12/18 11:43:25 narten * additional lint cleanups, and a bug fix from the 4.3BSD version that * keeps "ci" from sticking a '\377' into the description if you run it * with a zero-length file as the description. (Guy Harris) - * + * * Revision 4.4 87/10/18 10:35:10 narten * Updating version numbers. Changes relative to 1.1 actually relative to * 4.2 - * + * * Revision 1.3 87/09/24 13:59:51 narten - * Sources now pass through lint (if you ignore printf/sprintf/fprintf + * Sources now pass through lint (if you ignore printf/sprintf/fprintf * warnings) - * + * * Revision 1.2 87/03/27 14:22:27 jenkins * Port to suns - * + * * Revision 4.2 83/12/02 23:01:39 wft * merged 4.1 and 3.3.1.1 (clearerr(stdin)). - * + * * Revision 4.1 83/05/10 16:03:33 wft * Changed putamin() to abort if trying to reread redirected stdin. * Fixed getdesc() to output a prompt on initial newline. - * + * * Revision 3.3.1.1 83/10/19 04:21:51 lepreau * Added clearerr(stdin) for re-reading description from stdin. - * + * * Revision 3.3 82/11/28 21:36:49 wft * 4.2 prerelease - * + * * Revision 3.3 82/11/28 21:36:49 wft * Replaced ferror() followed by fclose() with ffclose(). * Putdesc() now suppresses the prompts if stdin @@ -122,7 +125,7 @@ Report problems and direct all questions to: #include "rcsbase.h" -libId(genId, "$Id: rcsgen.c,v 5.10 1991/10/07 17:32:46 eggert Exp $") +libId(genId, "$Id: rcsgen.c,v 1.1.1.1 1993/06/18 04:22:12 jkh Exp $") int interactiveflag; /* Should we act as if stdin is a tty? */ struct buf curlogbuf; /* buffer for current log message */ @@ -415,7 +418,7 @@ getsstdin(option, name, note, buf) faterror("can't reread redirected stdin for %s; use -%s<%s>", name, option, name ); - + for ( i = 0, p = 0; c = getcstdin(), !feof(stdin); diff --git a/gnu/usr.bin/rcs/lib/rcskeep.c b/gnu/usr.bin/rcs/lib/rcskeep.c index 1a0c78f..232a616 100644 --- a/gnu/usr.bin/rcs/lib/rcskeep.c +++ b/gnu/usr.bin/rcs/lib/rcskeep.c @@ -36,6 +36,9 @@ Report problems and direct all questions to: /* $Log: rcskeep.c,v $ + * Revision 1.1.1.1 1993/06/18 04:22:13 jkh + * Updated GNU utilities + * * Revision 5.4 1991/08/19 03:13:55 eggert * Tune. * @@ -56,28 +59,28 @@ Report problems and direct all questions to: * * Revision 4.6 89/05/01 15:12:56 narten * changed copyright header to reflect current distribution rules - * + * * Revision 4.5 88/08/09 19:13:03 eggert * Remove lint and speed up by making FILE *fp local, not global. - * + * * Revision 4.4 87/12/18 11:44:21 narten * more lint cleanups (Guy Harris) - * + * * Revision 4.3 87/10/18 10:35:50 narten * Updating version numbers. Changes relative to 1.1 actually relative * to 4.1 - * + * * Revision 1.3 87/09/24 14:00:00 narten - * Sources now pass through lint (if you ignore printf/sprintf/fprintf + * Sources now pass through lint (if you ignore printf/sprintf/fprintf * warnings) - * + * * Revision 1.2 87/03/27 14:22:29 jenkins * Port to suns - * + * * Revision 4.1 83/05/10 16:26:44 wft * Added new markers Id and RCSfile; extraction added. * Marker matching with trymatch(). - * + * * Revision 3.2 82/12/24 12:08:26 wft * added missing #endif. * @@ -93,7 +96,7 @@ Report problems and direct all questions to: #include "rcsbase.h" -libId(keepId, "$Id: rcskeep.c,v 5.4 1991/08/19 03:13:55 eggert Exp $") +libId(keepId, "$Id: rcskeep.c,v 1.1.1.1 1993/06/18 04:22:13 jkh Exp $") static int checknum P((char const*,int)); static int getval P((RILE*,struct buf*,int)); diff --git a/gnu/usr.bin/rcs/lib/rcskeys.c b/gnu/usr.bin/rcs/lib/rcskeys.c index cb80314..b45105c 100644 --- a/gnu/usr.bin/rcs/lib/rcskeys.c +++ b/gnu/usr.bin/rcs/lib/rcskeys.c @@ -31,6 +31,10 @@ Report problems and direct all questions to: /* $Log: rcskeys.c,v $ + * Revision 1.4 1994/06/22 00:51:42 rgrimes + * Fix serious off by one error for FreeBSD keyword, this has been driving + * me nuts as it was on by default and that is NOT what I wanted. + * * Revision 1.3 1994/05/15 22:15:14 rgrimes * To truely have the OLD behavior of RCS by default make the expansion * of $FreeBSD$ false by default. This should keep them out @@ -39,7 +43,7 @@ Report problems and direct all questions to: * Revision 1.2 1994/05/14 07:00:23 rgrimes * Add new option -K from David Dawes that allows you to turn on and off * specific keyword substitution during a rcs co command. - * Add the new keyword FreeBSD that is IDENTICAL in operation to $Id: rcskeys.c,v 1.3 1994/05/15 22:15:14 rgrimes Exp $. + * Add the new keyword FreeBSD that is IDENTICAL in operation to $Id: rcskeys.c,v 1.4 1994/06/22 00:51:42 rgrimes Exp $. * * Revision 1.1.1.1 1993/06/18 04:22:12 jkh * Updated GNU utilities @@ -56,24 +60,24 @@ Report problems and direct all questions to: * * Revision 4.3 89/05/01 15:13:02 narten * changed copyright header to reflect current distribution rules - * + * * Revision 4.2 87/10/18 10:36:33 narten * Updating version numbers. Changes relative to 1.1 actuallyt * relative to 4.1 - * + * * Revision 1.2 87/09/24 14:00:10 narten - * Sources now pass through lint (if you ignore printf/sprintf/fprintf + * Sources now pass through lint (if you ignore printf/sprintf/fprintf * warnings) - * + * * Revision 4.1 83/05/04 10:06:53 wft * Initial revision. - * + * */ #include "rcsbase.h" -libId(keysId, "$Id: rcskeys.c,v 1.3 1994/05/15 22:15:14 rgrimes Exp $") +libId(keysId, "$Id: rcskeys.c,v 1.4 1994/06/22 00:51:42 rgrimes Exp $") char const *const Keyword[] = { diff --git a/gnu/usr.bin/rcs/lib/rcslex.c b/gnu/usr.bin/rcs/lib/rcslex.c index cedbc40..621d492 100644 --- a/gnu/usr.bin/rcs/lib/rcslex.c +++ b/gnu/usr.bin/rcs/lib/rcslex.c @@ -39,6 +39,10 @@ Report problems and direct all questions to: /* $Log: rcslex.c,v $ + * Revision 1.2 1993/06/28 19:13:10 nate + * Added Chris Demetriou's FSYNC_ALL option which causes all writes to be + * flushed immediately. (In case of a crash in the middle of CVS/RCS commits + * * Revision 1.1.1.1 1993/06/18 04:22:12 jkh * Updated GNU utilities * @@ -83,31 +87,31 @@ Report problems and direct all questions to: * * Revision 4.6 89/05/01 15:13:07 narten * changed copyright header to reflect current distribution rules - * + * * Revision 4.5 88/08/28 15:01:12 eggert * Don't loop when writing error messages to a full filesystem. * Flush stderr/stdout when mixing output. * Yield exit status compatible with diff(1). * Shrink stdio code size; allow cc -R; remove lint. - * + * * Revision 4.4 87/12/18 11:44:47 narten * fixed to use "varargs" in "fprintf"; this is required if it is to * work on a SPARC machine such as a Sun-4 - * + * * Revision 4.3 87/10/18 10:37:18 narten * Updating version numbers. Changes relative to 1.1 actually relative * to version 4.1 - * + * * Revision 1.3 87/09/24 14:00:17 narten - * Sources now pass through lint (if you ignore printf/sprintf/fprintf + * Sources now pass through lint (if you ignore printf/sprintf/fprintf * warnings) - * + * * Revision 1.2 87/03/27 14:22:33 jenkins * Port to suns - * + * * Revision 4.1 83/03/25 18:12:51 wft * Only changed $Header to $Id. - * + * * Revision 3.3 82/12/10 16:22:37 wft * Improved error messages, changed exit status on error to 1. * @@ -135,7 +139,7 @@ Report problems and direct all questions to: #include "rcsbase.h" -libId(lexId, "$Id: rcslex.c,v 1.1.1.1 1993/06/18 04:22:12 jkh Exp $") +libId(lexId, "$Id: rcslex.c,v 1.2 1993/06/28 19:13:10 nate Exp $") static struct hshentry *nexthsh; /*pointer to next hash entry, set by lookup*/ diff --git a/gnu/usr.bin/rcs/lib/rcsrev.c b/gnu/usr.bin/rcs/lib/rcsrev.c index ce11f54..96eb9e6 100644 --- a/gnu/usr.bin/rcs/lib/rcsrev.c +++ b/gnu/usr.bin/rcs/lib/rcsrev.c @@ -32,6 +32,9 @@ Report problems and direct all questions to: /* $Log: rcsrev.c,v $ + * Revision 1.1.1.1 1993/06/18 04:22:13 jkh + * Updated GNU utilities + * * Revision 5.3 1991/08/19 03:13:55 eggert * Add `-r$', `-rB.'. Remove botches like `<now>' from messages. Tune. * @@ -48,25 +51,25 @@ Report problems and direct all questions to: * * Revision 4.5 89/05/01 15:13:22 narten * changed copyright header to reflect current distribution rules - * + * * Revision 4.4 87/12/18 11:45:22 narten - * more lint cleanups. Also, the NOTREACHED comment is no longer necessary, + * more lint cleanups. Also, the NOTREACHED comment is no longer necessary, * since there's now a return value there with a value. (Guy Harris) - * + * * Revision 4.3 87/10/18 10:38:42 narten - * Updating version numbers. Changes relative to version 1.1 actually + * Updating version numbers. Changes relative to version 1.1 actually * relative to 4.1 - * + * * Revision 1.3 87/09/24 14:00:37 narten - * Sources now pass through lint (if you ignore printf/sprintf/fprintf + * Sources now pass through lint (if you ignore printf/sprintf/fprintf * warnings) - * + * * Revision 1.2 87/03/27 14:22:37 jenkins * Port to suns - * + * * Revision 4.1 83/03/25 21:10:45 wft * Only changed $Header to $Id. - * + * * Revision 3.4 82/12/04 13:24:08 wft * Replaced getdelta() with gettree(). * @@ -94,7 +97,7 @@ Report problems and direct all questions to: #include "rcsbase.h" -libId(revId, "$Id: rcsrev.c,v 5.3 1991/08/19 03:13:55 eggert Exp $") +libId(revId, "$Id: rcsrev.c,v 1.1.1.1 1993/06/18 04:22:13 jkh Exp $") static char const *branchtip P((char const*)); static struct hshentry *genbranch P((struct hshentry const*,char const*,unsigned,char const*,char const*,char const*,struct hshentries**)); diff --git a/gnu/usr.bin/rcs/lib/rcssyn.c b/gnu/usr.bin/rcs/lib/rcssyn.c index 31086c2..10b6147 100644 --- a/gnu/usr.bin/rcs/lib/rcssyn.c +++ b/gnu/usr.bin/rcs/lib/rcssyn.c @@ -37,6 +37,9 @@ Report problems and direct all questions to: /* $Log: rcssyn.c,v $ + * Revision 1.1.1.1 1993/06/18 04:22:12 jkh + * Updated GNU utilities + * * Revision 5.8 1991/08/19 03:13:55 eggert * Tune. * @@ -78,27 +81,27 @@ Report problems and direct all questions to: * * Revision 4.6 89/05/01 15:13:32 narten * changed copyright header to reflect current distribution rules - * + * * Revision 4.5 88/08/09 19:13:21 eggert * Allow cc -R; remove lint. - * + * * Revision 4.4 87/12/18 11:46:16 narten * more lint cleanups (Guy Harris) - * + * * Revision 4.3 87/10/18 10:39:36 narten * Updating version numbers. Changes relative to 1.1 actually relative to * 4.1 - * + * * Revision 1.3 87/09/24 14:00:49 narten - * Sources now pass through lint (if you ignore printf/sprintf/fprintf + * Sources now pass through lint (if you ignore printf/sprintf/fprintf * warnings) - * + * * Revision 1.2 87/03/27 14:22:40 jenkins * Port to suns - * + * * Revision 4.1 83/03/28 11:38:49 wft * Added parsing and printing of default branch. - * + * * Revision 3.6 83/01/15 17:46:50 wft * Changed readdelta() to initialize selector and log-pointer. * Changed puttree to check for selector==DELETE; putdtext() uses DELNUMFORM. @@ -133,7 +136,7 @@ Report problems and direct all questions to: #include "rcsbase.h" -libId(synId, "$Id: rcssyn.c,v 5.8 1991/08/19 03:13:55 eggert Exp $") +libId(synId, "$Id: rcssyn.c,v 1.1.1.1 1993/06/18 04:22:12 jkh Exp $") /* forward */ static char const *getkeyval P((char const*,enum tokens,int)); diff --git a/gnu/usr.bin/rcs/lib/rcsutil.c b/gnu/usr.bin/rcs/lib/rcsutil.c index c523ccf1..55140c2 100644 --- a/gnu/usr.bin/rcs/lib/rcsutil.c +++ b/gnu/usr.bin/rcs/lib/rcsutil.c @@ -32,6 +32,9 @@ Report problems and direct all questions to: /* $Log: rcsutil.c,v $ + * Revision 1.1.1.1 1993/06/18 04:22:13 jkh + * Updated GNU utilities + * * Revision 5.10 1991/10/07 17:32:46 eggert * Support piece tables even if !has_mmap. * @@ -75,32 +78,32 @@ Report problems and direct all questions to: * * Revision 4.6 89/05/01 15:13:40 narten * changed copyright header to reflect current distribution rules - * + * * Revision 4.5 88/11/08 16:01:02 narten * corrected use of varargs routines - * + * * Revision 4.4 88/08/09 19:13:24 eggert * Check for memory exhaustion. * Permit signal handlers to yield either 'void' or 'int'; fix oldSIGINT botch. * Use execv(), not system(); yield exit status like diff(1)'s. - * + * * Revision 4.3 87/10/18 10:40:22 narten * Updating version numbers. Changes relative to 1.1 actually * relative to 4.1 - * + * * Revision 1.3 87/09/24 14:01:01 narten - * Sources now pass through lint (if you ignore printf/sprintf/fprintf + * Sources now pass through lint (if you ignore printf/sprintf/fprintf * warnings) - * + * * Revision 1.2 87/03/27 14:22:43 jenkins * Port to suns - * + * * Revision 4.1 83/05/10 15:53:13 wft * Added getcaller() and findlock(). * Changed catchints() to check SIGINT for SIG_IGN before setting up the signal * (needed for background jobs in older shells). Added restoreints(). * Removed printing of full RCS path from logcommand(). - * + * * Revision 3.8 83/02/15 15:41:49 wft * Added routine fastcopy() to copy remainder of a file in blocks. * @@ -136,7 +139,7 @@ Report problems and direct all questions to: #include "rcsbase.h" -libId(utilId, "$Id: rcsutil.c,v 5.10 1991/10/07 17:32:46 eggert Exp $") +libId(utilId, "$Id: rcsutil.c,v 1.1.1.1 1993/06/18 04:22:13 jkh Exp $") #if !has_memcmp int diff --git a/gnu/usr.bin/rcs/rcs/Makefile b/gnu/usr.bin/rcs/rcs/Makefile index e3cd12e..344ab6e 100644 --- a/gnu/usr.bin/rcs/rcs/Makefile +++ b/gnu/usr.bin/rcs/rcs/Makefile @@ -1,5 +1,5 @@ PROG= rcs -SRCS= rcs.c +SRCS= rcs.c CFLAGS+= -I${.CURDIR}/../lib LDADD= ${LIBRCS} DPADD= ${LIBRCS} diff --git a/gnu/usr.bin/rcs/rcs/rcs.c b/gnu/usr.bin/rcs/rcs/rcs.c index 70e7ffc..6a83770 100644 --- a/gnu/usr.bin/rcs/rcs/rcs.c +++ b/gnu/usr.bin/rcs/rcs/rcs.c @@ -31,6 +31,9 @@ Report problems and direct all questions to: /* $Log: rcs.c,v $ + * Revision 1.1.1.1 1993/06/18 04:22:14 jkh + * Updated GNU utilities + * * Revision 5.12 1991/11/20 17:58:08 eggert * Don't read the delta tree from a nonexistent RCS file. * @@ -77,42 +80,42 @@ Report problems and direct all questions to: * * Revision 4.11 89/05/01 15:12:06 narten * changed copyright header to reflect current distribution rules - * + * * Revision 4.10 88/11/08 16:01:54 narten * didn't install previous patch correctly - * + * * Revision 4.9 88/11/08 13:56:01 narten * removed include <sysexits.h> (not needed) * minor fix for -A option - * + * * Revision 4.8 88/08/09 19:12:27 eggert * Don't access freed storage. * Use execv(), not system(); yield proper exit status; remove lint. - * + * * Revision 4.7 87/12/18 11:37:17 narten * lint cleanups (Guy Harris) - * + * * Revision 4.6 87/10/18 10:28:48 narten - * Updating verison numbers. Changes relative to 1.1 are actually + * Updating verison numbers. Changes relative to 1.1 are actually * relative to 4.3 - * + * * Revision 1.4 87/09/24 13:58:52 narten - * Sources now pass through lint (if you ignore printf/sprintf/fprintf + * Sources now pass through lint (if you ignore printf/sprintf/fprintf * warnings) - * + * * Revision 1.3 87/03/27 14:21:55 jenkins * Port to suns - * + * * Revision 1.2 85/12/17 13:59:09 albitz * Changed setstate to rcs_setstate because of conflict with random.o. - * + * * Revision 4.3 83/12/15 12:27:33 wft * rcs -u now breaks most recent lock if it can't find a lock by the caller. - * + * * Revision 4.2 83/12/05 10:18:20 wft * Added conditional compilation for sending mail. * Alternatives: V4_2BSD, V6, USG, and other. - * + * * Revision 4.1 83/05/10 16:43:02 wft * Simplified breaklock(); added calls to findlock() and getcaller(). * Added option -b (default branch). Updated -s and -w for -b. @@ -120,10 +123,10 @@ Report problems and direct all questions to: * Replaced most catchints() calls with restoreints(). * Removed check for exit status of delivermail(). * Directed all interactive output to stderr. - * + * * Revision 3.9.1.1 83/12/02 22:08:51 wft * Added conditional compilation for 4.2 sendmail and 4.1 delivermail. - * + * * Revision 3.9 83/02/15 15:38:39 wft * Added call to fastcopy() to copy remainder of RCS file. * @@ -238,7 +241,7 @@ static struct delrevpair delrev; static struct hshentry *cuthead, *cuttail, *delstrt; static struct hshentries *gendeltas; -mainProg(rcsId, "rcs", "$Id: rcs.c,v 5.12 1991/11/20 17:58:08 eggert Exp $") +mainProg(rcsId, "rcs", "$Id: rcs.c,v 1.1.1.1 1993/06/18 04:22:14 jkh Exp $") { static char const cmdusage[] = "\nrcs usage: rcs -{ae}logins -Afile -{blu}[rev] -cstring -{iLU} -{nNs}name[:rev] -orange -t[file] -Vn file ..."; diff --git a/gnu/usr.bin/rcs/rcsclean/Makefile b/gnu/usr.bin/rcs/rcsclean/Makefile index 2651a3f..fe538a0 100644 --- a/gnu/usr.bin/rcs/rcsclean/Makefile +++ b/gnu/usr.bin/rcs/rcsclean/Makefile @@ -1,5 +1,5 @@ PROG= rcsclean -SRCS= rcsclean.c +SRCS= rcsclean.c CFLAGS+= -I${.CURDIR}/../lib LDADD= ${LIBRCS} DPADD= ${LIBRCS} diff --git a/gnu/usr.bin/rcs/rcsdiff/Makefile b/gnu/usr.bin/rcs/rcsdiff/Makefile index 070e231..45ce23f 100644 --- a/gnu/usr.bin/rcs/rcsdiff/Makefile +++ b/gnu/usr.bin/rcs/rcsdiff/Makefile @@ -1,5 +1,5 @@ PROG= rcsdiff -SRCS= rcsdiff.c +SRCS= rcsdiff.c CFLAGS+= -I${.CURDIR}/../lib LDADD= ${LIBRCS} DPADD= ${LIBRCS} diff --git a/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c b/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c index 7155c8d..01d1942 100644 --- a/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c +++ b/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c @@ -36,6 +36,9 @@ Report problems and direct all questions to: /* $Log: rcsdiff.c,v $ + * Revision 1.1.1.1 1993/06/18 04:22:16 jkh + * Updated GNU utilities + * * Revision 5.10 1991/10/07 17:32:46 eggert * Remove lint. * @@ -75,30 +78,30 @@ Report problems and direct all questions to: * * Revision 4.6 89/05/01 15:12:27 narten * changed copyright header to reflect current distribution rules - * + * * Revision 4.5 88/08/09 19:12:41 eggert * Use execv(), not system(); yield exit status like diff(1)s; allow cc -R. - * + * * Revision 4.4 87/12/18 11:37:46 narten * changes Jay Lepreau made in the 4.3 BSD version, to add support for * "-i", "-w", and "-t" flags and to permit flags to be bundled together, * merged in. - * + * * Revision 4.3 87/10/18 10:31:42 narten * Updating version numbers. Changes relative to 1.1 actually * relative to 4.1 - * + * * Revision 1.3 87/09/24 13:59:21 narten - * Sources now pass through lint (if you ignore printf/sprintf/fprintf + * Sources now pass through lint (if you ignore printf/sprintf/fprintf * warnings) - * + * * Revision 1.2 87/03/27 14:22:15 jenkins * Port to suns - * + * * Revision 4.1 83/05/03 22:13:19 wft * Added default branch, option -q, exit status like diff. * Added fterror() to replace faterror(). - * + * * Revision 3.6 83/01/15 17:52:40 wft * Expanded mainprogram to handle multiple RCS files. * @@ -129,7 +132,7 @@ static int exitstatus; static RILE *workptr; static struct stat workstat; -mainProg(rcsdiffId, "rcsdiff", "$Id: rcsdiff.c,v 5.10 1991/10/07 17:32:46 eggert Exp $") +mainProg(rcsdiffId, "rcsdiff", "$Id: rcsdiff.c,v 1.1.1.1 1993/06/18 04:22:16 jkh Exp $") { static char const cmdusage[] = "\nrcsdiff usage: rcsdiff [-q] [-rrev1 [-rrev2]] [-Vn] [diff options] file ..."; diff --git a/gnu/usr.bin/rcs/rcsmerge/Makefile b/gnu/usr.bin/rcs/rcsmerge/Makefile index 801b01e..9fd8afa 100644 --- a/gnu/usr.bin/rcs/rcsmerge/Makefile +++ b/gnu/usr.bin/rcs/rcsmerge/Makefile @@ -1,5 +1,5 @@ PROG= rcsmerge -SRCS= rcsmerge.c +SRCS= rcsmerge.c CFLAGS+= -I${.CURDIR}/../lib LDADD= ${LIBRCS} DPADD= ${LIBRCS} diff --git a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c index e5d4394..f5c46a8 100644 --- a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c +++ b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c @@ -35,6 +35,9 @@ Report problems and direct all questions to: /* $Log: rcsmerge.c,v $ + * Revision 1.1.1.1 1993/06/18 04:22:16 jkh + * Updated GNU utilities + * * Revision 5.7 1991/11/20 17:58:09 eggert * Don't Iopen(f, "r+"); it's not portable. * @@ -64,26 +67,26 @@ Report problems and direct all questions to: * * Revision 4.5 89/05/01 15:13:16 narten * changed copyright header to reflect current distribution rules - * + * * Revision 4.4 88/08/09 19:13:13 eggert * Beware merging into a readonly file. * Beware merging a revision to itself (no change). * Use execv(), not system(); yield exit status like diff(1)'s. - * + * * Revision 4.3 87/10/18 10:38:02 narten - * Updating version numbers. Changes relative to version 1.1 + * Updating version numbers. Changes relative to version 1.1 * actually relative to 4.1 - * + * * Revision 1.3 87/09/24 14:00:31 narten - * Sources now pass through lint (if you ignore printf/sprintf/fprintf + * Sources now pass through lint (if you ignore printf/sprintf/fprintf * warnings) - * + * * Revision 1.2 87/03/27 14:22:36 jenkins * Port to suns - * + * * Revision 4.1 83/03/28 11:14:57 wft * Added handling of default branch. - * + * * Revision 3.3 82/12/24 15:29:00 wft * Added call to catchsig(). * @@ -98,7 +101,7 @@ Report problems and direct all questions to: static char const co[] = CO; -mainProg(rcsmergeId, "rcsmerge", "$Id: rcsmerge.c,v 5.7 1991/11/20 17:58:09 eggert Exp $") +mainProg(rcsmergeId, "rcsmerge", "$Id: rcsmerge.c,v 1.1.1.1 1993/06/18 04:22:16 jkh Exp $") { static char const cmdusage[] = "\nrcsmerge usage: rcsmerge -rrev1 [-rrev2] [-p] [-Vn] file"; diff --git a/gnu/usr.bin/rcs/rlog/Makefile b/gnu/usr.bin/rcs/rlog/Makefile index a1d19aa..bdbf68f 100644 --- a/gnu/usr.bin/rcs/rlog/Makefile +++ b/gnu/usr.bin/rcs/rlog/Makefile @@ -1,5 +1,5 @@ PROG= rlog -SRCS= rlog.c +SRCS= rlog.c CFLAGS+= -I${.CURDIR}/../lib LDADD= ${LIBRCS} DPADD= ${LIBRCS} diff --git a/gnu/usr.bin/rcs/rlog/rlog.c b/gnu/usr.bin/rcs/rlog/rlog.c index bf59e66..80912bd 100644 --- a/gnu/usr.bin/rcs/rlog/rlog.c +++ b/gnu/usr.bin/rcs/rlog/rlog.c @@ -36,6 +36,9 @@ Report problems and direct all questions to: /* $Log: rlog.c,v $ + * Revision 1.5 1994/05/12 00:42:59 phk + * typo. + * * Revision 1.4 1994/05/12 00:37:59 phk * made -v produce tip-revision, which was what I wanted in the first place... * @@ -85,37 +88,37 @@ Report problems and direct all questions to: * * Revision 4.7 89/05/01 15:13:48 narten * changed copyright header to reflect current distribution rules - * + * * Revision 4.6 88/08/09 19:13:28 eggert * Check for memory exhaustion; don't access freed storage. * Shrink stdio code size; remove lint. - * + * * Revision 4.5 87/12/18 11:46:38 narten * more lint cleanups (Guy Harris) - * + * * Revision 4.4 87/10/18 10:41:12 narten * Updating version numbers * Changes relative to 1.1 actually relative to 4.2 - * + * * Revision 1.3 87/09/24 14:01:10 narten - * Sources now pass through lint (if you ignore printf/sprintf/fprintf + * Sources now pass through lint (if you ignore printf/sprintf/fprintf * warnings) - * + * * Revision 1.2 87/03/27 14:22:45 jenkins * Port to suns - * + * * Revision 4.2 83/12/05 09:18:09 wft * changed rewriteflag to external. - * + * * Revision 4.1 83/05/11 16:16:55 wft * Added -b, updated getnumericrev() accordingly. * Replaced getpwuid() with getcaller(). - * + * * Revision 3.7 83/05/11 14:24:13 wft * Added options -L and -R; * Fixed selection bug with -l on multiple files. * Fixed error on dates of the form -d'>date' (rewrote getdatepair()). - * + * * Revision 3.6 82/12/24 15:57:53 wft * shortened output format. * @@ -204,7 +207,7 @@ static struct lockers *lockerlist; static struct stateattri *statelist; -mainProg(rlogId, "rlog", "$Id: rlog.c,v 1.4 1994/05/12 00:37:59 phk Exp $") +mainProg(rlogId, "rlog", "$Id: rlog.c,v 1.5 1994/05/12 00:42:59 phk Exp $") { static char const cmdusage[] = "\nrlog usage: rlog -{bhLRt} [-v[string]] -ddates -l[lockers] -rrevs -sstates -w[logins] -Vn file ..."; diff --git a/gnu/usr.bin/sort/long-options.c b/gnu/usr.bin/sort/long-options.c index 03305aa..8587667 100644 --- a/gnu/usr.bin/sort/long-options.c +++ b/gnu/usr.bin/sort/long-options.c @@ -72,7 +72,7 @@ parse_long_options (argc, argv, usage) case 'v': printf ("%s\n", version_string); exit (0); - + default: /* Don't process any other long-named options. */ break; diff --git a/gnu/usr.bin/tar/Makefile.gnu b/gnu/usr.bin/tar/Makefile.gnu index a03617a..f43f8ed 100644 --- a/gnu/usr.bin/tar/Makefile.gnu +++ b/gnu/usr.bin/tar/Makefile.gnu @@ -73,7 +73,7 @@ DEFS = -DRETSIGTYPE=void -DDIRENT=1 -DHAVE_SYS_MTIO_H=1 -DHAVE_UNISTD_H=1 -DHAV # Set this to rtapelib.o unless you defined NO_REMOTE, in which case # make it empty. RTAPELIB = rtapelib.o -LIBS = +LIBS = CFLAGS = -g LDFLAGS = -g @@ -82,7 +82,7 @@ prefix = /usr/bin exec_prefix = $(prefix) # Prefix for each installed program, normally empty or `g'. -binprefix = +binprefix = # The directory to install tar in. bindir = $(exec_prefix)/bin @@ -102,8 +102,8 @@ SRC2 = version.c list.c names.c diffarch.c port.c fnmatch.c getopt.c malloc.c SRC3 = getopt1.c regex.c getdate.y getdate.c alloca.c SRCS = $(SRC1) $(SRC2) $(SRC3) OBJ1 = tar.o create.o extract.o buffer.o getoldopt.o update.o gnu.o mangle.o -OBJ2 = version.o list.o names.o diffarch.o port.o fnmatch.o getopt.o -OBJ3 = getopt1.o regex.o getdate.o $(RTAPELIB) +OBJ2 = version.o list.o names.o diffarch.o port.o fnmatch.o getopt.o +OBJ3 = getopt1.o regex.o getdate.o $(RTAPELIB) OBJS = $(OBJ1) $(OBJ2) $(OBJ3) AUX = README INSTALL NEWS COPYING ChangeLog Makefile.in makefile.pc \ configure configure.in \ @@ -113,7 +113,7 @@ AUX = README INSTALL NEWS COPYING ChangeLog Makefile.in makefile.pc \ level-0 level-1 backup-specs dump-remind getpagesize.h # tar.texinfo tar.info* texinfo.tex \ -all: tar rmt +all: tar rmt # tar.info .c.o: diff --git a/gnu/usr.bin/tar/extract.c b/gnu/usr.bin/tar/extract.c index 57f8222..4b09fad 100644 --- a/gnu/usr.bin/tar/extract.c +++ b/gnu/usr.bin/tar/extract.c @@ -735,9 +735,9 @@ extract_archive () if (!f_modified) { - tmp = ((struct saved_dir_info *) + tmp = ((struct saved_dir_info *) ck_malloc (sizeof (struct saved_dir_info))); - tmp->path = (char *) ck_malloc (strlen (skipcrud + tmp->path = (char *) ck_malloc (strlen (skipcrud + current_file_name) + 1); strcpy (tmp->path, skipcrud + current_file_name); tmp->mode = hstat.st_mode; @@ -889,7 +889,7 @@ extract_sparse_file (fd, sizeleft, totalsize, name) } else if (count != written) { - msg ("could only write %d of %d bytes to file %s", count, + msg ("could only write %d of %d bytes to file %s", count, totalsize, name); skip_file ((long) (*sizeleft)); } @@ -910,7 +910,7 @@ extract_sparse_file (fd, sizeleft, totalsize, name) } /* Set back the utime and mode for all the extracted directories. */ -void +void restore_saved_dir_info () { struct utimbuf acc_upd_times; diff --git a/gnu/usr.bin/tar/getopt.c b/gnu/usr.bin/tar/getopt.c index 3db9abf..6b8e3f2 100644 --- a/gnu/usr.bin/tar/getopt.c +++ b/gnu/usr.bin/tar/getopt.c @@ -10,12 +10,12 @@ under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/gnu/usr.bin/tar/getopt.h b/gnu/usr.bin/tar/getopt.h index 93a5cf7..f977e15 100644 --- a/gnu/usr.bin/tar/getopt.h +++ b/gnu/usr.bin/tar/getopt.h @@ -5,12 +5,12 @@ under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/gnu/usr.bin/tar/getopt1.c b/gnu/usr.bin/tar/getopt1.c index c3582cf..b2b23f2 100644 --- a/gnu/usr.bin/tar/getopt1.c +++ b/gnu/usr.bin/tar/getopt1.c @@ -5,12 +5,12 @@ under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -55,7 +55,7 @@ getopt_long (argc, argv, options, long_options, opt_index) but does match a short option, it is parsed as a short option instead. */ -int +int getopt_long_only (argc, argv, options, long_options, opt_index) int argc; char *const *argv; diff --git a/gnu/usr.bin/tar/list.c b/gnu/usr.bin/tar/list.c index d40c014..470fc6b 100644 --- a/gnu/usr.bin/tar/list.c +++ b/gnu/usr.bin/tar/list.c @@ -97,7 +97,7 @@ read_and (do_something) status = read_header (); /* check if the namelist got emptied during the course of reading */ /* the tape, if so stop by setting status to EOF */ - if ((namelist == NULL) && nlpsfreed) { + if ((namelist == NULL) && nlpsfreed) { status = EOF; } switch (status) diff --git a/gnu/usr.bin/tar/port.c b/gnu/usr.bin/tar/port.c index 10ec32e..9a40dc3 100644 --- a/gnu/usr.bin/tar/port.c +++ b/gnu/usr.bin/tar/port.c @@ -1002,7 +1002,7 @@ un_quote_string (string) } #ifndef __MSDOS__ -void +void ck_pipe (pipes) int *pipes; { @@ -1223,7 +1223,7 @@ msg_perror (str, args) #endif /* !HAVE_VPRINTF and HAVE_DOPRNT */ #if !defined(HAVE_VPRINTF) && !defined(HAVE_DOPRNT) -void +void msg (str, a1, a2, a3, a4, a5, a6) char *str; { diff --git a/gnu/usr.bin/tar/tar.c b/gnu/usr.bin/tar/tar.c index a51ff2b..6385986 100644 --- a/gnu/usr.bin/tar/tar.c +++ b/gnu/usr.bin/tar/tar.c @@ -169,7 +169,7 @@ struct option long_options[] = {"gzip", 0, 0, 'z'}, {"ungzip", 0, 0, 'z'}, {"use-compress-program", 1, 0, 18}, - + {"same-permissions", 0, &f_use_protection, 1}, {"sparse", 0, &f_sparse_files, 1}, @@ -201,7 +201,7 @@ main (argc, argv) tar = argv[0]; /* JF: was "tar" Set program name */ filename_terminator = '\n'; errors = 0; - + options (argc, argv); if (!n_argv) @@ -1182,12 +1182,12 @@ again: if (strcmp(p, nlp->name) == 0) { /* remove the current entry, since we found a match */ /* use brute force, this code is a mess anyway */ - if (namelist->next == NULL) { + if (namelist->next == NULL) { /* the list contains one element */ free(namelist); namelist = NULL; } else { - if (nlp == namelist) { + if (nlp == namelist) { /* the first element is the one */ tmpnlp = namelist->next; free(namelist); @@ -1203,11 +1203,11 @@ again: } /* set a boolean to decide wether we started with a */ /* non-empty namelist, that was emptied */ - nlpsfreed = 1; + nlpsfreed = 1; } - } + } return 1; /* We got a match */ - + } } diff --git a/gnu/usr.bin/texinfo/info/Makefile b/gnu/usr.bin/texinfo/info/Makefile index e21819f..fbb32e0 100644 --- a/gnu/usr.bin/texinfo/info/Makefile +++ b/gnu/usr.bin/texinfo/info/Makefile @@ -6,10 +6,10 @@ PROG= info -SRCS+= dir.c display.c dribble.c echo_area.c filesys.c info-utils.c info.c -SRCS+= infodoc.c infomap.c m-x.c nodes.c search.c session.c signals.c +SRCS+= dir.c display.c dribble.c echo_area.c filesys.c info-utils.c info.c +SRCS+= infodoc.c infomap.c m-x.c nodes.c search.c session.c signals.c SRCS+= terminal.c tilde.c window.c indices.c doc.c nodemenu.c -SRCS+= footnotes.c variables.c gc.c xmalloc.c getopt1.c getopt.c +SRCS+= footnotes.c variables.c gc.c xmalloc.c getopt1.c getopt.c CFLAGS= @@ -17,7 +17,7 @@ CFLAGS+= -I${.CURDIR} CFLAGS+= -DNAMED_FUNCTIONS=1 -DSTDC_HEADERS=1 CFLAGS+= -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DHAVE_VARARGS_H=1 CFLAGS+= -DHAVE_SYS_FCNTL_H=1 -DHAVE_SETVBUF=1 -DHAVE_GETCWD=1 -DHAVE_BZERO=1 -CFLAGS+= -DHAVE_RINDEX=1 -DHAVE_VFPRINTF=1 -DHAVE_VSPRINTF=1 +CFLAGS+= -DHAVE_RINDEX=1 -DHAVE_VFPRINTF=1 -DHAVE_VSPRINTF=1 CFLAGS+= -DHAVE_SYS_TIME_H=1 -DDEFAULT_INFOPATH='"${INFODIR}"' LDADD+= -ltermcap diff --git a/gnu/usr.bin/texinfo/info/display.c b/gnu/usr.bin/texinfo/info/display.c index 441f1f2..1a348fe 100644 --- a/gnu/usr.bin/texinfo/info/display.c +++ b/gnu/usr.bin/texinfo/info/display.c @@ -196,7 +196,7 @@ display_update_one_window (win) to the next line. */ for (i = 0; pl_index < (win->width - 1);) printed_line[pl_index++] = rep[i++]; - + rep_carried_over = rep + i; /* If printing the last character in this window couldn't @@ -296,7 +296,7 @@ display_update_one_window (win) printed_line[0] = '\0'; begin = nodetext; - + while ((nodetext < last_node_char) && (*nodetext != '\n')) nodetext++; } diff --git a/gnu/usr.bin/texinfo/info/echo_area.c b/gnu/usr.bin/texinfo/info/echo_area.c index d751e90..a116cc6 100644 --- a/gnu/usr.bin/texinfo/info/echo_area.c +++ b/gnu/usr.bin/texinfo/info/echo_area.c @@ -582,7 +582,7 @@ DECLARE_INFO_COMMAND (ea_yank_pop, "Yank back a previous kill") register int i, counter; counter = input_line_end - input_line_point; - + for (i = input_line_point - len; counter; i++, counter--) input_line[i] = input_line[i + len]; @@ -885,7 +885,7 @@ info_read_completing_internal (window, prompt, completions, force) return (line); } - + /* Read a line in the echo area with completion over COMPLETIONS. */ char * info_read_completing_in_echo_area (window, prompt, completions) diff --git a/gnu/usr.bin/texinfo/info/filesys.c b/gnu/usr.bin/texinfo/info/filesys.c index 0793591..17004a4 100644 --- a/gnu/usr.bin/texinfo/info/filesys.c +++ b/gnu/usr.bin/texinfo/info/filesys.c @@ -498,7 +498,7 @@ filesys_read_compressed (pathname, filesize, finfo) { int offset, size; char *chunk; - + offset = size = 0; chunk = (char *)xmalloc (FILESYS_PIPE_BUFFER_SIZE); diff --git a/gnu/usr.bin/texinfo/info/footnotes.c b/gnu/usr.bin/texinfo/info/footnotes.c index f6e8b6b..9fd0f95 100644 --- a/gnu/usr.bin/texinfo/info/footnotes.c +++ b/gnu/usr.bin/texinfo/info/footnotes.c @@ -47,7 +47,7 @@ find_footnotes_window () } /* Manufacture a node containing the footnotes of this node, and - return the manufactured node. If NODE has no footnotes, return a + return the manufactured node. If NODE has no footnotes, return a NULL pointer. */ NODE * make_footnotes_node (node) @@ -126,7 +126,7 @@ make_footnotes_node (node) while (text_start < fn_node->nodelen) if (fn_node->contents[text_start++] == '\n') break; - + result->nodelen = strlen (header) + fn_node->nodelen - text_start; /* Set the contents of this node. */ diff --git a/gnu/usr.bin/texinfo/info/info.c b/gnu/usr.bin/texinfo/info/info.c index 0647d98..dfbffcc 100644 --- a/gnu/usr.bin/texinfo/info/info.c +++ b/gnu/usr.bin/texinfo/info/info.c @@ -200,7 +200,7 @@ main (argc, argv) info_short_help (); exit (0); } - + /* If the user hasn't specified a path for Info files, default that path now. */ if (!infopath) diff --git a/gnu/usr.bin/texinfo/info/infodoc.c b/gnu/usr.bin/texinfo/info/infodoc.c index 2fcbf0f..d92d40b 100644 --- a/gnu/usr.bin/texinfo/info/infodoc.c +++ b/gnu/usr.bin/texinfo/info/infodoc.c @@ -545,7 +545,7 @@ replace_in_documentation (string) /* Find a key which invokes this function in the info_keymap. */ function = named_function (fun_name); - /* If the internal documentation string fails, there is a + /* If the internal documentation string fails, there is a serious problem with the associated command's documentation. We croak so that it can be fixed immediately. */ if (!function) @@ -605,7 +605,7 @@ where_is_internal (map, function) VFunction *function; { register int i; - + /* If the function is directly invokable in MAP, return the representation of that keystroke. */ for (i = 0; i < 256; i++) @@ -686,4 +686,4 @@ DECLARE_INFO_COMMAND (info_where_is, free (command_name); } - + diff --git a/gnu/usr.bin/texinfo/info/infomap.c b/gnu/usr.bin/texinfo/info/infomap.c index 47eafa9..a2c1b7f 100644 --- a/gnu/usr.bin/texinfo/info/infomap.c +++ b/gnu/usr.bin/texinfo/info/infomap.c @@ -266,4 +266,4 @@ initialize_info_keymaps () map['w'].function = info_toggle_wrap; } - + diff --git a/gnu/usr.bin/texinfo/info/infomap.h b/gnu/usr.bin/texinfo/info/infomap.h index 43d160d..85e5d80 100644 --- a/gnu/usr.bin/texinfo/info/infomap.h +++ b/gnu/usr.bin/texinfo/info/infomap.h @@ -28,7 +28,7 @@ #define ESC '\033' #define DEL '\177' -#define TAB '\011' +#define TAB '\011' #define RET '\r' #define LFD '\n' #define SPC ' ' diff --git a/gnu/usr.bin/texinfo/info/nodes.c b/gnu/usr.bin/texinfo/info/nodes.c index c66a8c1..2036680 100644 --- a/gnu/usr.bin/texinfo/info/nodes.c +++ b/gnu/usr.bin/texinfo/info/nodes.c @@ -1008,7 +1008,7 @@ forget_info_file (filename) if (file_buffer->contents) free (file_buffer->contents); - + /* Note that free_file_buffer_tags () also kills the subfiles list, since the subfiles list is only of use in conjunction with tags. */ diff --git a/gnu/usr.bin/texinfo/info/search.c b/gnu/usr.bin/texinfo/info/search.c index 409faf3..d214f9d 100644 --- a/gnu/usr.bin/texinfo/info/search.c +++ b/gnu/usr.bin/texinfo/info/search.c @@ -354,7 +354,7 @@ skip_node_characters (string, newlines_okay) continue; } - + /* If the character following the close paren is a space or period, then this node name has no more characters associated with it. */ if (c == '\t' || diff --git a/gnu/usr.bin/texinfo/info/session.c b/gnu/usr.bin/texinfo/info/session.c index 0e4fb0a..46290af 100644 --- a/gnu/usr.bin/texinfo/info/session.c +++ b/gnu/usr.bin/texinfo/info/session.c @@ -2149,7 +2149,7 @@ DECLARE_INFO_COMMAND (info_goto_node, "Read a node name and select it") add_pointer_to_array (entry, items_index, items, items_slots, 100, REFERENCE *); - } + } if (this_is_the_current_fb) { diff --git a/gnu/usr.bin/texinfo/info/window.c b/gnu/usr.bin/texinfo/info/window.c index 9035bd4..b114986 100644 --- a/gnu/usr.bin/texinfo/info/window.c +++ b/gnu/usr.bin/texinfo/info/window.c @@ -668,7 +668,7 @@ window_delete_window (window) window_to_fix = prev; else window_to_fix = windows; - + if (window_to_fix->first_row > window->first_row) { int diff; @@ -1218,7 +1218,7 @@ free_echo_area () echo_area_node = (NODE *)NULL; window_set_node_of_window (the_echo_area, echo_area_node); } - + /* Clear the echo area, removing any message that is already present. The echo area is cleared immediately. */ void diff --git a/gnu/usr.bin/texinfo/makedoc/Makefile b/gnu/usr.bin/texinfo/makedoc/Makefile index 930e4ab..d97ec09 100644 --- a/gnu/usr.bin/texinfo/makedoc/Makefile +++ b/gnu/usr.bin/texinfo/makedoc/Makefile @@ -1,10 +1,10 @@ # # Bmakefile for GNU info # -# $Id$ +# $Id: Makefile,v 1.2 1994/09/15 13:10:41 jkh Exp $ # -PROG= makedoc +PROG= makedoc NOMAN=yes SRCS+= makedoc.c xmalloc.c @@ -12,7 +12,7 @@ CFLAGS+= -I${.CURDIR}/../info -I${.CURDIR} CFLAGS+= -DNAMED_FUNCTIONS=1 -DSTDC_HEADERS=1 CFLAGS+= -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DHAVE_VARARGS_H=1 CFLAGS+= -DHAVE_SYS_FCNTL_H=1 -DHAVE_SETVBUF=1 -DHAVE_GETCWD=1 -DHAVE_BZERO=1 -CFLAGS+= -DHAVE_RINDEX=1 -DHAVE_VFPRINTF=1 -DHAVE_VSPRINTF=1 +CFLAGS+= -DHAVE_RINDEX=1 -DHAVE_VFPRINTF=1 -DHAVE_VSPRINTF=1 CFLAGS+= -DHAVE_SYS_TIME_H=1 -DDEFAULT_INFOPATH='"${INFODIR}"' .include "../../Makefile.inc" diff --git a/gnu/usr.bin/texinfo/makedoc/makedoc.c b/gnu/usr.bin/texinfo/makedoc/makedoc.c index 68b2199..ddf19b7 100644 --- a/gnu/usr.bin/texinfo/makedoc/makedoc.c +++ b/gnu/usr.bin/texinfo/makedoc/makedoc.c @@ -121,7 +121,7 @@ main (argc, argv) funs_filename = "/dev/null"; doc_filename = "/dev/null"; } - + funs_stream = must_fopen (funs_filename, "w"); doc_stream = must_fopen (doc_filename, "w"); diff --git a/gnu/usr.bin/texinfo/makeinfo/Makefile b/gnu/usr.bin/texinfo/makeinfo/Makefile index 26fbbea..e102200 100644 --- a/gnu/usr.bin/texinfo/makeinfo/Makefile +++ b/gnu/usr.bin/texinfo/makeinfo/Makefile @@ -1,12 +1,12 @@ # # Bmakefile for GNU info # -# $Id$ +# $Id: Makefile,v 1.2 1994/09/15 13:11:36 jkh Exp $ # PROG= makeinfo NOMAN=yes -SRCS+= makeinfo.c getopt1.c getopt.c +SRCS+= makeinfo.c getopt1.c getopt.c .PATH: ${.CURDIR}/../info @@ -14,7 +14,7 @@ CFLAGS+= -I${.CURDIR}/../info -I${.CURDIR} CFLAGS+= -DNAMED_FUNCTIONS=1 -DSTDC_HEADERS=1 CFLAGS+= -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DHAVE_VARARGS_H=1 CFLAGS+= -DHAVE_SYS_FCNTL_H=1 -DHAVE_SETVBUF=1 -DHAVE_GETCWD=1 -DHAVE_BZERO=1 -CFLAGS+= -DHAVE_RINDEX=1 -DHAVE_VFPRINTF=1 -DHAVE_VSPRINTF=1 +CFLAGS+= -DHAVE_RINDEX=1 -DHAVE_VFPRINTF=1 -DHAVE_VSPRINTF=1 CFLAGS+= -DHAVE_SYS_TIME_H=1 -DDEFAULT_INFOPATH='"${INFODIR}"' .include "../../Makefile.inc" diff --git a/gnu/usr.bin/texinfo/makeinfo/makeinfo.c b/gnu/usr.bin/texinfo/makeinfo/makeinfo.c index 6b810b9..1e292922 100644 --- a/gnu/usr.bin/texinfo/makeinfo/makeinfo.c +++ b/gnu/usr.bin/texinfo/makeinfo/makeinfo.c @@ -3342,7 +3342,7 @@ cm_asterisk () close_single_paragraph (); #if !defined (ASTERISK_NEW_PARAGRAPH) cm_noindent (); -#endif /* ASTERISK_NEW_PARAGRAPH */ +#endif /* ASTERISK_NEW_PARAGRAPH */ } /* Insert ellipsis. */ @@ -4275,7 +4275,7 @@ validate_file (filename, tag_table) tags = tags->next_ent; continue; } - + /* If this node has a Next, then make sure that the Next exists. */ if (tags->next) { diff --git a/gnu/usr.bin/texinfo/misc/Makefile b/gnu/usr.bin/texinfo/misc/Makefile index 00cb486..59fb65f 100644 --- a/gnu/usr.bin/texinfo/misc/Makefile +++ b/gnu/usr.bin/texinfo/misc/Makefile @@ -34,7 +34,7 @@ TAR = tar MKDIR = mkdir DEFS = -DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DHAVE_VARARGS_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_FCNTL_H=1 -DHAVE_SETVBUF=1 -DHAVE_GETCWD=1 -DHAVE_BZERO=1 -DHAVE_RINDEX=1 -DHAVE_VFPRINTF=1 -DHAVE_VSPRINTF=1 -LIBS = -L../libtxi -ltxi +LIBS = -L../libtxi -ltxi LOADLIBES = $(LIBS) SHELL = /bin/sh @@ -46,10 +46,10 @@ prefix = /usr/local exec_prefix = $(prefix) bindir = $(exec_prefix)/bin # Prefix for each installed program, normally empty or `g'. -binprefix = +binprefix = libdir = $(prefix)/lib # Prefix for each installed man page, normally empty or `g'. -manprefix = +manprefix = mandir = $(prefix)/man/man1 manext = 1 infodir = $(prefix)/info diff --git a/gnu/usr.bin/texinfo/misc/Makefile.in b/gnu/usr.bin/texinfo/misc/Makefile.in index 571b59bb..2d8f769 100644 --- a/gnu/usr.bin/texinfo/misc/Makefile.in +++ b/gnu/usr.bin/texinfo/misc/Makefile.in @@ -45,10 +45,10 @@ prefix = /usr/local exec_prefix = $(prefix) bindir = $(exec_prefix)/bin # Prefix for each installed program, normally empty or `g'. -binprefix = +binprefix = libdir = $(prefix)/lib # Prefix for each installed man page, normally empty or `g'. -manprefix = +manprefix = mandir = $(prefix)/man/man1 manext = 1 infodir = $(prefix)/info diff --git a/gnu/usr.bin/texinfo/texindex/Makefile b/gnu/usr.bin/texinfo/texindex/Makefile index 94320b5..aee14df 100644 --- a/gnu/usr.bin/texinfo/texindex/Makefile +++ b/gnu/usr.bin/texinfo/texindex/Makefile @@ -1,19 +1,19 @@ # # Bmakefile for GNU info # -# $Id$ +# $Id: Makefile,v 1.2 1994/09/15 13:12:23 jkh Exp $ # -PROG= texindex +PROG= texindex NOMAN=yes -SRCS+= texindex.c getopt1.c getopt.c +SRCS+= texindex.c getopt1.c getopt.c .PATH: ${.CURDIR}/../info CFLAGS+= -I${.CURDIR}/../info -I${.CURDIR} CFLAGS+= -DNAMED_FUNCTIONS=1 -DSTDC_HEADERS=1 CFLAGS+= -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DHAVE_VARARGS_H=1 CFLAGS+= -DHAVE_SYS_FCNTL_H=1 -DHAVE_SETVBUF=1 -DHAVE_GETCWD=1 -DHAVE_BZERO=1 -CFLAGS+= -DHAVE_RINDEX=1 -DHAVE_VFPRINTF=1 -DHAVE_VSPRINTF=1 +CFLAGS+= -DHAVE_RINDEX=1 -DHAVE_VFPRINTF=1 -DHAVE_VSPRINTF=1 CFLAGS+= -DHAVE_SYS_TIME_H=1 -DDEFAULT_INFOPATH='"${INFODIR}"' .include "../../Makefile.inc" diff --git a/gnu/usr.bin/yppush/Makefile b/gnu/usr.bin/yppush/Makefile index e76d3fe..9d883b6 100644 --- a/gnu/usr.bin/yppush/Makefile +++ b/gnu/usr.bin/yppush/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.8 (Berkeley) 7/28/90 -# $Id: Makefile,v 1.5 1995/04/02 20:01:48 wpaul Exp $ +# $Id: Makefile,v 1.6 1995/04/02 20:28:09 wpaul Exp $ PROG= yppush SRCS= yp_clnt.c yppush.c @@ -12,7 +12,7 @@ yp_clnt.c: yp.h cp ${DESTDIR}/usr/include/rpcsvc/yp.x . rpcgen -l -o yp_clnt.c yp.x -yp.h: +yp.h: rm -f yp.x cp ${DESTDIR}/usr/include/rpcsvc/yp.x . rpcgen -h -o yp.h yp.x diff --git a/gnu/usr.bin/yppush/yppush.c b/gnu/usr.bin/yppush/yppush.c index 5c1a623..37410cf 100644 --- a/gnu/usr.bin/yppush/yppush.c +++ b/gnu/usr.bin/yppush/yppush.c @@ -18,7 +18,7 @@ Modified for use with FreeBSD 2.x by Bill Paul (wpaul@ctr.columbia.edu) - $Id: yppush.c,v 1.3 1995/04/02 01:10:13 wpaul Exp $ + $Id: yppush.c,v 1.5 1995/04/02 20:01:50 wpaul Exp $ */ #include <stdio.h> @@ -119,7 +119,7 @@ __yppushproc_null_1(void * req, struct svc_req * rqstp) { static inline void * __yppushproc_xfrresp_1(yppushresp_xfr *req, struct svc_req * rqstp) { static int resp; - + if (req->status!=YPPUSH_SUCC) fprintf(stderr, "%s: %s\n", progname, yppush_err_string(req->status)); return &resp; @@ -255,7 +255,7 @@ getOrderNum( void) fprintf(stderr, "%s: %s: cannot open\n", progname, mapPath); return -1; } - + o.data="YP_LAST_MODIFIED"; o.size=strlen(o.data); (db->get)(db,&o,&d,0); if (d.data==NULL) { @@ -280,7 +280,7 @@ doPushClient( const char *targetHost) { struct ypreq_xfr req; static struct timeval tv={0,0}; - + req.map_parms.domain=DomainName; req.map_parms.map=(char *)MapName; req.map_parms.peer=ThisHost; @@ -380,7 +380,7 @@ yppushForeach(int status, const char *inKey, int inKeylen, doPush(targetHost); return 0; } - + static void intrHandler(int sig) { diff --git a/gnu/usr.sbin/isdn/alaw2ulaw/con.h b/gnu/usr.sbin/isdn/alaw2ulaw/con.h index def02c5..9f359c8 100644 --- a/gnu/usr.sbin/isdn/alaw2ulaw/con.h +++ b/gnu/usr.sbin/isdn/alaw2ulaw/con.h @@ -1,107 +1,107 @@ static unsigned char ulaw_linear[] = { - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 2, - 5, 9, 13, 17, 21, 25, 29, 33, - 37, 41, 45, 49, 53, 57, 61, 65, - 68, 70, 72, 74, 76, 78, 80, 82, - 84, 86, 88, 90, 92, 94, 96, 98, - 100, 101, 102, 103, 104, 105, 106, 107, - 108, 109, 110, 111, 112, 113, 114, 115, - 115, 116, 116, 117, 117, 118, 118, 119, - 119, 120, 120, 121, 121, 122, 122, 123, - 123, 123, 124, 124, 124, 124, 125, 125, - 125, 125, 126, 126, 126, 126, 127, 127, - 127, 127, 127, 127, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, - 252, 248, 244, 240, 236, 232, 228, 224, - 220, 216, 212, 208, 204, 200, 196, 192, - 189, 187, 185, 183, 181, 179, 177, 175, - 173, 171, 169, 167, 165, 163, 161, 159, - 157, 156, 155, 154, 153, 152, 151, 150, - 149, 148, 147, 146, 145, 144, 143, 142, - 142, 141, 141, 140, 140, 139, 139, 138, - 138, 137, 137, 136, 136, 135, 135, 134, - 134, 134, 133, 133, 133, 133, 132, 132, - 132, 132, 131, 131, 131, 131, 130, 130, - 130, 130, 130, 130, 129, 129, 129, 129, - 129, 129, 129, 129, 128, 128, 128, 128, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 2, + 5, 9, 13, 17, 21, 25, 29, 33, + 37, 41, 45, 49, 53, 57, 61, 65, + 68, 70, 72, 74, 76, 78, 80, 82, + 84, 86, 88, 90, 92, 94, 96, 98, + 100, 101, 102, 103, 104, 105, 106, 107, + 108, 109, 110, 111, 112, 113, 114, 115, + 115, 116, 116, 117, 117, 118, 118, 119, + 119, 120, 120, 121, 121, 122, 122, 123, + 123, 123, 124, 124, 124, 124, 125, 125, + 125, 125, 126, 126, 126, 126, 127, 127, + 127, 127, 127, 127, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, + 252, 248, 244, 240, 236, 232, 228, 224, + 220, 216, 212, 208, 204, 200, 196, 192, + 189, 187, 185, 183, 181, 179, 177, 175, + 173, 171, 169, 167, 165, 163, 161, 159, + 157, 156, 155, 154, 153, 152, 151, 150, + 149, 148, 147, 146, 145, 144, 143, 142, + 142, 141, 141, 140, 140, 139, 139, 138, + 138, 137, 137, 136, 136, 135, 135, 134, + 134, 134, 133, 133, 133, 133, 132, 132, + 132, 132, 131, 131, 131, 131, 130, 130, + 130, 130, 130, 130, 129, 129, 129, 129, + 129, 129, 129, 129, 128, 128, 128, 128, }; static unsigned char linear_ulaw[] = { - 31, 31, 31, 32, 32, 32, 32, 33, - 33, 33, 33, 34, 34, 34, 34, 35, - 35, 35, 35, 36, 36, 36, 36, 37, - 37, 37, 37, 38, 38, 38, 38, 39, - 39, 39, 39, 40, 40, 40, 40, 41, - 41, 41, 41, 42, 42, 42, 42, 43, - 43, 43, 43, 44, 44, 44, 44, 45, - 45, 45, 45, 46, 46, 46, 46, 47, - 47, 47, 47, 48, 48, 49, 49, 50, - 50, 51, 51, 52, 52, 53, 53, 54, - 54, 55, 55, 56, 56, 57, 57, 58, - 58, 59, 59, 60, 60, 61, 61, 62, - 62, 63, 63, 64, 65, 66, 67, 68, - 69, 70, 71, 72, 73, 74, 75, 76, - 77, 78, 79, 81, 83, 85, 87, 89, - 91, 93, 95, 99, 103, 107, 111, 119, - 255, 247, 239, 235, 231, 227, 223, 221, - 219, 217, 215, 213, 211, 209, 207, 206, - 205, 204, 203, 202, 201, 200, 199, 198, - 197, 196, 195, 194, 193, 192, 191, 191, - 190, 190, 189, 189, 188, 188, 187, 187, - 186, 186, 185, 185, 184, 184, 183, 183, - 182, 182, 181, 181, 180, 180, 179, 179, - 178, 178, 177, 177, 176, 176, 175, 175, - 175, 175, 174, 174, 174, 174, 173, 173, - 173, 173, 172, 172, 172, 172, 171, 171, - 171, 171, 170, 170, 170, 170, 169, 169, - 169, 169, 168, 168, 168, 168, 167, 167, - 167, 167, 166, 166, 166, 166, 165, 165, - 165, 165, 164, 164, 164, 164, 163, 163, - 163, 163, 162, 162, 162, 162, 161, 161, - 161, 161, 160, 160, 160, 160, 159, 159, + 31, 31, 31, 32, 32, 32, 32, 33, + 33, 33, 33, 34, 34, 34, 34, 35, + 35, 35, 35, 36, 36, 36, 36, 37, + 37, 37, 37, 38, 38, 38, 38, 39, + 39, 39, 39, 40, 40, 40, 40, 41, + 41, 41, 41, 42, 42, 42, 42, 43, + 43, 43, 43, 44, 44, 44, 44, 45, + 45, 45, 45, 46, 46, 46, 46, 47, + 47, 47, 47, 48, 48, 49, 49, 50, + 50, 51, 51, 52, 52, 53, 53, 54, + 54, 55, 55, 56, 56, 57, 57, 58, + 58, 59, 59, 60, 60, 61, 61, 62, + 62, 63, 63, 64, 65, 66, 67, 68, + 69, 70, 71, 72, 73, 74, 75, 76, + 77, 78, 79, 81, 83, 85, 87, 89, + 91, 93, 95, 99, 103, 107, 111, 119, + 255, 247, 239, 235, 231, 227, 223, 221, + 219, 217, 215, 213, 211, 209, 207, 206, + 205, 204, 203, 202, 201, 200, 199, 198, + 197, 196, 195, 194, 193, 192, 191, 191, + 190, 190, 189, 189, 188, 188, 187, 187, + 186, 186, 185, 185, 184, 184, 183, 183, + 182, 182, 181, 181, 180, 180, 179, 179, + 178, 178, 177, 177, 176, 176, 175, 175, + 175, 175, 174, 174, 174, 174, 173, 173, + 173, 173, 172, 172, 172, 172, 171, 171, + 171, 171, 170, 170, 170, 170, 169, 169, + 169, 169, 168, 168, 168, 168, 167, 167, + 167, 167, 166, 166, 166, 166, 165, 165, + 165, 165, 164, 164, 164, 164, 163, 163, + 163, 163, 162, 162, 162, 162, 161, 161, + 161, 161, 160, 160, 160, 160, 159, 159, }; static unsigned char alaw_linear[] = { - 45, 214, 122, 133, 0, 255, 107, 149, - 86, 171, 126, 129, 0, 255, 117, 138, - 13, 246, 120, 135, 0, 255, 99, 157, - 70, 187, 124, 131, 0, 255, 113, 142, - 61, 198, 123, 132, 0, 255, 111, 145, - 94, 163, 127, 128, 0, 255, 119, 136, - 29, 230, 121, 134, 0, 255, 103, 153, - 78, 179, 125, 130, 0, 255, 115, 140, - 37, 222, 122, 133, 0, 255, 105, 151, - 82, 175, 126, 129, 0, 255, 116, 139, - 5, 254, 120, 135, 0, 255, 97, 159, - 66, 191, 124, 131, 0, 255, 112, 143, - 53, 206, 123, 132, 0, 255, 109, 147, - 90, 167, 127, 128, 0, 255, 118, 137, - 21, 238, 121, 134, 0, 255, 101, 155, - 74, 183, 125, 130, 0, 255, 114, 141, - 49, 210, 123, 133, 0, 255, 108, 148, - 88, 169, 127, 129, 0, 255, 118, 138, - 17, 242, 121, 135, 0, 255, 100, 156, - 72, 185, 125, 131, 0, 255, 114, 142, - 64, 194, 124, 132, 0, 255, 112, 144, - 96, 161, 128, 128, 1, 255, 120, 136, - 33, 226, 122, 134, 0, 255, 104, 152, - 80, 177, 126, 130, 0, 255, 116, 140, - 41, 218, 122, 133, 0, 255, 106, 150, - 84, 173, 126, 129, 0, 255, 117, 139, - 9, 250, 120, 135, 0, 255, 98, 158, - 68, 189, 124, 131, 0, 255, 113, 143, - 57, 202, 123, 132, 0, 255, 110, 146, - 92, 165, 127, 128, 0, 255, 119, 137, - 25, 234, 121, 134, 0, 255, 102, 154, - 76, 181, 125, 130, 0, 255, 115, 141, + 45, 214, 122, 133, 0, 255, 107, 149, + 86, 171, 126, 129, 0, 255, 117, 138, + 13, 246, 120, 135, 0, 255, 99, 157, + 70, 187, 124, 131, 0, 255, 113, 142, + 61, 198, 123, 132, 0, 255, 111, 145, + 94, 163, 127, 128, 0, 255, 119, 136, + 29, 230, 121, 134, 0, 255, 103, 153, + 78, 179, 125, 130, 0, 255, 115, 140, + 37, 222, 122, 133, 0, 255, 105, 151, + 82, 175, 126, 129, 0, 255, 116, 139, + 5, 254, 120, 135, 0, 255, 97, 159, + 66, 191, 124, 131, 0, 255, 112, 143, + 53, 206, 123, 132, 0, 255, 109, 147, + 90, 167, 127, 128, 0, 255, 118, 137, + 21, 238, 121, 134, 0, 255, 101, 155, + 74, 183, 125, 130, 0, 255, 114, 141, + 49, 210, 123, 133, 0, 255, 108, 148, + 88, 169, 127, 129, 0, 255, 118, 138, + 17, 242, 121, 135, 0, 255, 100, 156, + 72, 185, 125, 131, 0, 255, 114, 142, + 64, 194, 124, 132, 0, 255, 112, 144, + 96, 161, 128, 128, 1, 255, 120, 136, + 33, 226, 122, 134, 0, 255, 104, 152, + 80, 177, 126, 130, 0, 255, 116, 140, + 41, 218, 122, 133, 0, 255, 106, 150, + 84, 173, 126, 129, 0, 255, 117, 139, + 9, 250, 120, 135, 0, 255, 98, 158, + 68, 189, 124, 131, 0, 255, 113, 143, + 57, 202, 123, 132, 0, 255, 110, 146, + 92, 165, 127, 128, 0, 255, 119, 137, + 25, 234, 121, 134, 0, 255, 102, 154, + 76, 181, 125, 130, 0, 255, 115, 141, }; diff --git a/gnu/usr.sbin/isdn/ulaw2alaw/con.h b/gnu/usr.sbin/isdn/ulaw2alaw/con.h index def02c5..9f359c8 100644 --- a/gnu/usr.sbin/isdn/ulaw2alaw/con.h +++ b/gnu/usr.sbin/isdn/ulaw2alaw/con.h @@ -1,107 +1,107 @@ static unsigned char ulaw_linear[] = { - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 2, - 5, 9, 13, 17, 21, 25, 29, 33, - 37, 41, 45, 49, 53, 57, 61, 65, - 68, 70, 72, 74, 76, 78, 80, 82, - 84, 86, 88, 90, 92, 94, 96, 98, - 100, 101, 102, 103, 104, 105, 106, 107, - 108, 109, 110, 111, 112, 113, 114, 115, - 115, 116, 116, 117, 117, 118, 118, 119, - 119, 120, 120, 121, 121, 122, 122, 123, - 123, 123, 124, 124, 124, 124, 125, 125, - 125, 125, 126, 126, 126, 126, 127, 127, - 127, 127, 127, 127, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, - 252, 248, 244, 240, 236, 232, 228, 224, - 220, 216, 212, 208, 204, 200, 196, 192, - 189, 187, 185, 183, 181, 179, 177, 175, - 173, 171, 169, 167, 165, 163, 161, 159, - 157, 156, 155, 154, 153, 152, 151, 150, - 149, 148, 147, 146, 145, 144, 143, 142, - 142, 141, 141, 140, 140, 139, 139, 138, - 138, 137, 137, 136, 136, 135, 135, 134, - 134, 134, 133, 133, 133, 133, 132, 132, - 132, 132, 131, 131, 131, 131, 130, 130, - 130, 130, 130, 130, 129, 129, 129, 129, - 129, 129, 129, 129, 128, 128, 128, 128, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 2, + 5, 9, 13, 17, 21, 25, 29, 33, + 37, 41, 45, 49, 53, 57, 61, 65, + 68, 70, 72, 74, 76, 78, 80, 82, + 84, 86, 88, 90, 92, 94, 96, 98, + 100, 101, 102, 103, 104, 105, 106, 107, + 108, 109, 110, 111, 112, 113, 114, 115, + 115, 116, 116, 117, 117, 118, 118, 119, + 119, 120, 120, 121, 121, 122, 122, 123, + 123, 123, 124, 124, 124, 124, 125, 125, + 125, 125, 126, 126, 126, 126, 127, 127, + 127, 127, 127, 127, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, + 252, 248, 244, 240, 236, 232, 228, 224, + 220, 216, 212, 208, 204, 200, 196, 192, + 189, 187, 185, 183, 181, 179, 177, 175, + 173, 171, 169, 167, 165, 163, 161, 159, + 157, 156, 155, 154, 153, 152, 151, 150, + 149, 148, 147, 146, 145, 144, 143, 142, + 142, 141, 141, 140, 140, 139, 139, 138, + 138, 137, 137, 136, 136, 135, 135, 134, + 134, 134, 133, 133, 133, 133, 132, 132, + 132, 132, 131, 131, 131, 131, 130, 130, + 130, 130, 130, 130, 129, 129, 129, 129, + 129, 129, 129, 129, 128, 128, 128, 128, }; static unsigned char linear_ulaw[] = { - 31, 31, 31, 32, 32, 32, 32, 33, - 33, 33, 33, 34, 34, 34, 34, 35, - 35, 35, 35, 36, 36, 36, 36, 37, - 37, 37, 37, 38, 38, 38, 38, 39, - 39, 39, 39, 40, 40, 40, 40, 41, - 41, 41, 41, 42, 42, 42, 42, 43, - 43, 43, 43, 44, 44, 44, 44, 45, - 45, 45, 45, 46, 46, 46, 46, 47, - 47, 47, 47, 48, 48, 49, 49, 50, - 50, 51, 51, 52, 52, 53, 53, 54, - 54, 55, 55, 56, 56, 57, 57, 58, - 58, 59, 59, 60, 60, 61, 61, 62, - 62, 63, 63, 64, 65, 66, 67, 68, - 69, 70, 71, 72, 73, 74, 75, 76, - 77, 78, 79, 81, 83, 85, 87, 89, - 91, 93, 95, 99, 103, 107, 111, 119, - 255, 247, 239, 235, 231, 227, 223, 221, - 219, 217, 215, 213, 211, 209, 207, 206, - 205, 204, 203, 202, 201, 200, 199, 198, - 197, 196, 195, 194, 193, 192, 191, 191, - 190, 190, 189, 189, 188, 188, 187, 187, - 186, 186, 185, 185, 184, 184, 183, 183, - 182, 182, 181, 181, 180, 180, 179, 179, - 178, 178, 177, 177, 176, 176, 175, 175, - 175, 175, 174, 174, 174, 174, 173, 173, - 173, 173, 172, 172, 172, 172, 171, 171, - 171, 171, 170, 170, 170, 170, 169, 169, - 169, 169, 168, 168, 168, 168, 167, 167, - 167, 167, 166, 166, 166, 166, 165, 165, - 165, 165, 164, 164, 164, 164, 163, 163, - 163, 163, 162, 162, 162, 162, 161, 161, - 161, 161, 160, 160, 160, 160, 159, 159, + 31, 31, 31, 32, 32, 32, 32, 33, + 33, 33, 33, 34, 34, 34, 34, 35, + 35, 35, 35, 36, 36, 36, 36, 37, + 37, 37, 37, 38, 38, 38, 38, 39, + 39, 39, 39, 40, 40, 40, 40, 41, + 41, 41, 41, 42, 42, 42, 42, 43, + 43, 43, 43, 44, 44, 44, 44, 45, + 45, 45, 45, 46, 46, 46, 46, 47, + 47, 47, 47, 48, 48, 49, 49, 50, + 50, 51, 51, 52, 52, 53, 53, 54, + 54, 55, 55, 56, 56, 57, 57, 58, + 58, 59, 59, 60, 60, 61, 61, 62, + 62, 63, 63, 64, 65, 66, 67, 68, + 69, 70, 71, 72, 73, 74, 75, 76, + 77, 78, 79, 81, 83, 85, 87, 89, + 91, 93, 95, 99, 103, 107, 111, 119, + 255, 247, 239, 235, 231, 227, 223, 221, + 219, 217, 215, 213, 211, 209, 207, 206, + 205, 204, 203, 202, 201, 200, 199, 198, + 197, 196, 195, 194, 193, 192, 191, 191, + 190, 190, 189, 189, 188, 188, 187, 187, + 186, 186, 185, 185, 184, 184, 183, 183, + 182, 182, 181, 181, 180, 180, 179, 179, + 178, 178, 177, 177, 176, 176, 175, 175, + 175, 175, 174, 174, 174, 174, 173, 173, + 173, 173, 172, 172, 172, 172, 171, 171, + 171, 171, 170, 170, 170, 170, 169, 169, + 169, 169, 168, 168, 168, 168, 167, 167, + 167, 167, 166, 166, 166, 166, 165, 165, + 165, 165, 164, 164, 164, 164, 163, 163, + 163, 163, 162, 162, 162, 162, 161, 161, + 161, 161, 160, 160, 160, 160, 159, 159, }; static unsigned char alaw_linear[] = { - 45, 214, 122, 133, 0, 255, 107, 149, - 86, 171, 126, 129, 0, 255, 117, 138, - 13, 246, 120, 135, 0, 255, 99, 157, - 70, 187, 124, 131, 0, 255, 113, 142, - 61, 198, 123, 132, 0, 255, 111, 145, - 94, 163, 127, 128, 0, 255, 119, 136, - 29, 230, 121, 134, 0, 255, 103, 153, - 78, 179, 125, 130, 0, 255, 115, 140, - 37, 222, 122, 133, 0, 255, 105, 151, - 82, 175, 126, 129, 0, 255, 116, 139, - 5, 254, 120, 135, 0, 255, 97, 159, - 66, 191, 124, 131, 0, 255, 112, 143, - 53, 206, 123, 132, 0, 255, 109, 147, - 90, 167, 127, 128, 0, 255, 118, 137, - 21, 238, 121, 134, 0, 255, 101, 155, - 74, 183, 125, 130, 0, 255, 114, 141, - 49, 210, 123, 133, 0, 255, 108, 148, - 88, 169, 127, 129, 0, 255, 118, 138, - 17, 242, 121, 135, 0, 255, 100, 156, - 72, 185, 125, 131, 0, 255, 114, 142, - 64, 194, 124, 132, 0, 255, 112, 144, - 96, 161, 128, 128, 1, 255, 120, 136, - 33, 226, 122, 134, 0, 255, 104, 152, - 80, 177, 126, 130, 0, 255, 116, 140, - 41, 218, 122, 133, 0, 255, 106, 150, - 84, 173, 126, 129, 0, 255, 117, 139, - 9, 250, 120, 135, 0, 255, 98, 158, - 68, 189, 124, 131, 0, 255, 113, 143, - 57, 202, 123, 132, 0, 255, 110, 146, - 92, 165, 127, 128, 0, 255, 119, 137, - 25, 234, 121, 134, 0, 255, 102, 154, - 76, 181, 125, 130, 0, 255, 115, 141, + 45, 214, 122, 133, 0, 255, 107, 149, + 86, 171, 126, 129, 0, 255, 117, 138, + 13, 246, 120, 135, 0, 255, 99, 157, + 70, 187, 124, 131, 0, 255, 113, 142, + 61, 198, 123, 132, 0, 255, 111, 145, + 94, 163, 127, 128, 0, 255, 119, 136, + 29, 230, 121, 134, 0, 255, 103, 153, + 78, 179, 125, 130, 0, 255, 115, 140, + 37, 222, 122, 133, 0, 255, 105, 151, + 82, 175, 126, 129, 0, 255, 116, 139, + 5, 254, 120, 135, 0, 255, 97, 159, + 66, 191, 124, 131, 0, 255, 112, 143, + 53, 206, 123, 132, 0, 255, 109, 147, + 90, 167, 127, 128, 0, 255, 118, 137, + 21, 238, 121, 134, 0, 255, 101, 155, + 74, 183, 125, 130, 0, 255, 114, 141, + 49, 210, 123, 133, 0, 255, 108, 148, + 88, 169, 127, 129, 0, 255, 118, 138, + 17, 242, 121, 135, 0, 255, 100, 156, + 72, 185, 125, 131, 0, 255, 114, 142, + 64, 194, 124, 132, 0, 255, 112, 144, + 96, 161, 128, 128, 1, 255, 120, 136, + 33, 226, 122, 134, 0, 255, 104, 152, + 80, 177, 126, 130, 0, 255, 116, 140, + 41, 218, 122, 133, 0, 255, 106, 150, + 84, 173, 126, 129, 0, 255, 117, 139, + 9, 250, 120, 135, 0, 255, 98, 158, + 68, 189, 124, 131, 0, 255, 113, 143, + 57, 202, 123, 132, 0, 255, 110, 146, + 92, 165, 127, 128, 0, 255, 119, 137, + 25, 234, 121, 134, 0, 255, 102, 154, + 76, 181, 125, 130, 0, 255, 115, 141, }; diff --git a/gnu/usr.sbin/yp_mkdb/yp_mkdb.c b/gnu/usr.sbin/yp_mkdb/yp_mkdb.c index bf1a90a..bf648a0 100644 --- a/gnu/usr.sbin/yp_mkdb/yp_mkdb.c +++ b/gnu/usr.sbin/yp_mkdb/yp_mkdb.c @@ -20,7 +20,7 @@ */ /* - * $Id: yp_mkdb.c,v 1.1 1995/01/31 08:43:07 wpaul Exp $ + * $Id: yp_mkdb.c,v 1.2 1995/03/31 19:45:13 wpaul Exp $ */ #define BUFFERSIZE 4096 @@ -103,7 +103,7 @@ load( char *FileName, char *DbName) } sprintf(filename, "%s~.db", DbName); - + if ((dp = dbopen(DbName,O_RDWR|O_EXCL|O_CREAT, PERM_SECURE, DB_HASH, &openinfo)) == NULL) { perror("dbopen"); @@ -199,7 +199,7 @@ main(int argc, char **argv) int c=getopt(argc, argv, "ui:o:m:d:"); if (c==EOF) break; switch (c) { - case 'u': + case 'u': UFlag++; break; case 'd': diff --git a/gnu/usr.sbin/yppasswdd/pw_util.c b/gnu/usr.sbin/yppasswdd/pw_util.c index 9ca2d16..45e3b9d 100644 --- a/gnu/usr.sbin/yppasswdd/pw_util.c +++ b/gnu/usr.sbin/yppasswdd/pw_util.c @@ -98,7 +98,7 @@ static int lockfd; int pw_lock() { - /* + /* * If the master password file doesn't exist, the system is hosed. * Might as well try to build one. Set the close-on-exec bit so * that users can't get at the encrypted passwords while editing. @@ -162,7 +162,7 @@ pw_edit(notsetuid) editor = _PATH_VI; if (p = strrchr(editor, '/')) ++p; - else + else p = editor; if (!(pid = vfork())) { diff --git a/gnu/usr.sbin/yppasswdd/update.c b/gnu/usr.sbin/yppasswdd/update.c index 5909712..0bb48a1 100644 --- a/gnu/usr.sbin/yppasswdd/update.c +++ b/gnu/usr.sbin/yppasswdd/update.c @@ -1,4 +1,4 @@ -/* +/* * yppasswdd * Copyright 1994 Olaf Kirch, <okir@monad.swb.de> * @@ -87,7 +87,7 @@ yppasswdproc_pwupdate_1(yppasswd *yppw, struct svc_req *rqstp) /* Check if the user exists */ - if (!(pw = getpwnam(yppw->newpw.pw_name))) { + if (!(pw = getpwnam(yppw->newpw.pw_name))) { syslog ( LOG_WARNING, "%s failed", logbuf ); syslog ( LOG_WARNING, "User not in password file." ); return (&res); diff --git a/gnu/usr.sbin/yppasswdd/yppasswd.h b/gnu/usr.sbin/yppasswdd/yppasswd.h index fb85d86..4f879ce 100644 --- a/gnu/usr.sbin/yppasswdd/yppasswd.h +++ b/gnu/usr.sbin/yppasswdd/yppasswd.h @@ -1,11 +1,11 @@ -/* +/* * yppasswdd * Copyright 1994 Olaf Kirch, <okir@monad.swb.de> * * This program is covered by the GNU General Public License, version 2. * It is provided in the hope that it is useful. However, the author * disclaims ALL WARRANTIES, expressed or implied. See the GPL for details. - * + * * This file was generated automatically by rpcgen from yppasswd.x, and * editied manually. */ diff --git a/gnu/usr.sbin/yppasswdd/yppasswdd.c b/gnu/usr.sbin/yppasswdd/yppasswdd.c index 7b9a45f..5d350a4 100644 --- a/gnu/usr.sbin/yppasswdd/yppasswdd.c +++ b/gnu/usr.sbin/yppasswdd/yppasswdd.c @@ -1,4 +1,4 @@ -/* +/* * yppasswdd * Copyright 1994 Olaf Kirch, <okir@monad.swb.de> * diff --git a/gnu/usr.sbin/ypserv/Makefile.yp b/gnu/usr.sbin/ypserv/Makefile.yp index a98b9c5..adc2143 100644 --- a/gnu/usr.sbin/ypserv/Makefile.yp +++ b/gnu/usr.sbin/ypserv/Makefile.yp @@ -1,7 +1,7 @@ # # Makefile for the NIS databases # -# $Id: Makefile.yp,v 1.5 1995/03/05 22:48:50 wpaul Exp $ +# $Id: Makefile.yp,v 1.6 1995/04/02 01:53:47 wpaul Exp $ # # This Makefile should only be run on the NIS master server of a domain. # All updated maps will be pushed to all NIS slave servers listed in the @@ -26,7 +26,7 @@ NOPUSH = "True" # passwords in them) to the superuser on other FreeBSD machines, but # non-FreeBSD clients (e.g. SunOS, Solaris (without NIS+), IRIX, HP-UX, # etc...) will only work properly in 'unsecure' mode. -# +# #UNSECURE = "True" # These are commands which this Makefile needs to properly rebuild the diff --git a/gnu/usr.sbin/ypserv/server.c b/gnu/usr.sbin/ypserv/server.c index 750bf91..95ccd70 100644 --- a/gnu/usr.sbin/ypserv/server.c +++ b/gnu/usr.sbin/ypserv/server.c @@ -14,17 +14,17 @@ ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ** General Public License for more details. -** +** ** You should have received a copy of the GNU General Public ** License along with the NYS YP Server; see the file COPYING. If ** not, write to the Free Software Foundation, Inc., 675 Mass Ave, ** Cambridge, MA 02139, USA. ** ** Author: Peter Eriksson <pen@signum.se> -** Ported to FreeBSD and hacked all to pieces +** Ported to FreeBSD and hacked all to pieces ** by Bill Paul <wpaul@ctr.columbia.edu> ** -** $Id: server.c,v 1.4 1995/04/01 19:31:12 wpaul Exp $ +** $Id: server.c,v 1.5 1995/05/03 14:36:12 wpaul Exp $ ** */ @@ -170,7 +170,7 @@ void *ypproc_null_2_svc(void *dummy, { static int foo; struct sockaddr_in *rqhost; - + rqhost = svc_getcaller(rqstp->rq_xprt); if (!is_valid_host(rqhost)) @@ -184,14 +184,14 @@ void *ypproc_null_2_svc(void *dummy, return (void *) &foo; } - + /* ** Return 1 if the name is a valid domain name served by us, else 0. */ static int is_valid_domain(const char *domain) { struct stat sbuf; - + if (domain == NULL || strcmp(domain, "binding") == 0 || @@ -199,7 +199,7 @@ static int is_valid_domain(const char *domain) strcmp(domain, ".") == 0 || strchr(domain, '/')) return 0; - + if (stat(domain, &sbuf) < 0 || !S_ISDIR(sbuf.st_mode)) return 0; @@ -213,10 +213,10 @@ bool_t *ypproc_domain_2_svc(domainname *name, { static bool_t result; struct sockaddr_in *rqhost; - - + + rqhost = svc_getcaller(rqstp->rq_xprt); - + if (debug_flag) Perror("ypproc_domain(\"%s\") [From: %s:%d]\n", *name, @@ -227,19 +227,19 @@ bool_t *ypproc_domain_2_svc(domainname *name, { if (debug_flag) Perror("\t-> Ignored (not a valid source host)\n"); - + return NULL; } - + if (is_valid_domain(*name)) result = TRUE; else result = FALSE; - + if (debug_flag) Perror("\t-> %s.\n", (result == TRUE ? "Ok" : "Not served by us")); - + return &result; } @@ -250,7 +250,7 @@ bool_t *ypproc_domain_nonack_2_svc(domainname *name, static bool_t result; struct sockaddr_in *rqhost; - + rqhost = svc_getcaller(rqstp->rq_xprt); if (debug_flag) @@ -263,7 +263,7 @@ bool_t *ypproc_domain_nonack_2_svc(domainname *name, { if (debug_flag) Perror("\t-> Ignored (not a valid source host)\n"); - + return NULL; } @@ -275,10 +275,10 @@ bool_t *ypproc_domain_nonack_2_svc(domainname *name, /* Bail out and don't return any RPC value */ return NULL; } - + if (debug_flag) Perror("\t-> OK.\n"); - + result = TRUE; return &result; } @@ -300,12 +300,12 @@ static DB *open_database(const char *domain, strcpy(buf, domain); strcat(buf, "/"); strcat(buf, map); - + dbp = dbopen(buf,O_RDONLY|O_EXCL, PERM_SECURE, DB_HASH, &openinfo); if (debug_flag > 1 && dbp == NULL) Perror("dbopen(): ",strerror(errno)); - + return dbp; } @@ -326,8 +326,8 @@ int read_database(DB *dbp, { int first_flag = 0; DBT nkey, ckey, dummyval; - - + + if (ikey == NULL || ikey->data == NULL) { (dbp->seq)(dbp,&ckey,&dummyval,R_FIRST); @@ -351,7 +351,7 @@ int read_database(DB *dbp, else ckey = *ikey; } - + if (ckey.data == NULL) { return (flags & F_NEXT) ? YP_NOMORE : YP_NOKEY; @@ -375,14 +375,14 @@ int read_database(DB *dbp, else return YP_FALSE; } - + if ((flags & F_ALL) || strncmp(ckey.data, "YP_", 3) != 0) { if (okey) *okey = ckey; else if (ikey == NULL || ikey->data != ckey.data) free(ckey.data); - + return YP_TRUE; } @@ -414,11 +414,11 @@ static unsigned long get_dtm(const char *domain, struct stat sbuf; char buf[1025]; - + strcpy(buf, domain); strcat(buf, "/"); strcat(buf, map); - + if (stat(buf, &sbuf) < 0) return 0; else @@ -435,7 +435,7 @@ ypresp_val *ypproc_match_2_svc(ypreq_key *key, static ypresp_val result; struct sockaddr_in *rqhost; - + rqhost = svc_getcaller(rqstp->rq_xprt); if (debug_flag) @@ -443,7 +443,7 @@ ypresp_val *ypproc_match_2_svc(ypreq_key *key, Perror("ypproc_match(): [From: %s:%d]\n", inet_ntoa(rqhost->sin_addr), ntohs(rqhost->sin_port)); - + Perror("\t\tdomainname = \"%s\"\n", key->domain); Perror("\t\tmapname = \"%s\"\n", @@ -457,7 +457,7 @@ ypresp_val *ypproc_match_2_svc(ypreq_key *key, { if (debug_flag) Perror("\t-> Ignored (not a valid source host)\n"); - + return NULL; } @@ -481,7 +481,7 @@ ypresp_val *ypproc_match_2_svc(ypreq_key *key, free(result.val.valdat_val); result.val.valdat_val = NULL; } - + if (key->domain[0] == '\0' || key->map[0] == '\0') result.stat = YP_BADARGS; else if (!is_valid_domain(key->domain)) @@ -489,7 +489,7 @@ ypresp_val *ypproc_match_2_svc(ypreq_key *key, else { DBT rdat, qdat; - + DB *dbp = open_database(key->domain, key->map); if (dbp == NULL) result.stat = YP_NOMAP; @@ -509,7 +509,7 @@ ypresp_val *ypproc_match_2_svc(ypreq_key *key, (void)(dbp->close)(dbp); } } - + if (debug_flag) { if (result.stat == YP_TRUE) @@ -536,15 +536,15 @@ ypresp_val *ypproc_match_2_svc(ypreq_key *key, if (debug_flag) Perror("Doing DNS lookup of %s\n", key->key.keydat_val); - + if (strcmp(key->map, "hosts.byname") == 0) cp = dnsname(key->key.keydat_val); else if (strcmp(key->map, "hosts.byaddr") == 0) cp = dnsaddr(key->key.keydat_val); - + if (cp) { - + if (debug_flag) Perror("\t-> OK (%s)\n", cp); @@ -563,7 +563,7 @@ ypresp_val *ypproc_match_2_svc(ypreq_key *key, result.stat = YP_NOKEY; } } - + return &result; } @@ -574,7 +574,7 @@ ypresp_key_val *ypproc_first_2_svc(ypreq_nokey *key, { static ypresp_key_val result; struct sockaddr_in *rqhost; - + rqhost = svc_getcaller(rqstp->rq_xprt); @@ -583,7 +583,7 @@ ypresp_key_val *ypproc_first_2_svc(ypreq_nokey *key, Perror("ypproc_first(): [From: %s:%d]\n", inet_ntoa(rqhost->sin_addr), ntohs(rqhost->sin_port)); - + Perror("\tdomainname = \"%s\"\n", key->domain); Perror("\tmapname = \"%s\"\n", key->map); #if 0 @@ -597,7 +597,7 @@ ypresp_key_val *ypproc_first_2_svc(ypreq_nokey *key, { if (debug_flag) Perror("\t-> Ignored (not a valid source host)\n"); - + return NULL; } @@ -621,7 +621,7 @@ ypresp_key_val *ypproc_first_2_svc(ypreq_nokey *key, free(result.key.keydat_val); result.key.keydat_val = NULL; } - + result.val.valdat_len = 0; if (result.val.valdat_val) { @@ -636,7 +636,7 @@ ypresp_key_val *ypproc_first_2_svc(ypreq_nokey *key, else { DBT dkey, dval; - + DB *dbp = open_database(key->domain, key->map); if (dbp == NULL) result.stat = YP_NOMAP; @@ -648,15 +648,15 @@ ypresp_key_val *ypproc_first_2_svc(ypreq_nokey *key, { result.key.keydat_len = dkey.size; result.key.keydat_val = dkey.data; - + result.val.valdat_len = dval.size; result.val.valdat_val = dval.data; } - + (void)(dbp->close)(dbp); } } - + if (debug_flag) { if (result.stat == YP_TRUE) @@ -665,11 +665,11 @@ ypresp_key_val *ypproc_first_2_svc(ypreq_nokey *key, result.key.keydat_val, (int) result.val.valdat_len, result.val.valdat_val); - + else Perror("\t-> Error #%d\n", result.stat); } - + return &result; } @@ -679,8 +679,8 @@ ypresp_key_val *ypproc_next_2_svc(ypreq_key *key, { static ypresp_key_val result; struct sockaddr_in *rqhost; - - + + rqhost = svc_getcaller(rqstp->rq_xprt); if (debug_flag) @@ -688,7 +688,7 @@ ypresp_key_val *ypproc_next_2_svc(ypreq_key *key, Perror("ypproc_next(): [From: %s:%d]\n", inet_ntoa(rqhost->sin_addr), ntohs(rqhost->sin_port)); - + Perror("\tdomainname = \"%s\"\n", key->domain); Perror("\tmapname = \"%s\"\n", key->map); Perror("\tkeydat = \"%.*s\"\n", @@ -700,7 +700,7 @@ ypresp_key_val *ypproc_next_2_svc(ypreq_key *key, { if (debug_flag) Perror("\t-> Ignored (not a valid source host)\n"); - + return NULL; } @@ -724,14 +724,14 @@ ypresp_key_val *ypproc_next_2_svc(ypreq_key *key, free(result.key.keydat_val); result.key.keydat_val = NULL; } - + result.val.valdat_len = 0; if (result.val.valdat_val) { free(result.val.valdat_val); result.val.valdat_val = NULL; } - + if (key->map[0] == '\0' || key->domain[0] == '\0') result.stat = YP_BADARGS; else if (!is_valid_domain(key->domain)) @@ -755,14 +755,14 @@ ypresp_key_val *ypproc_next_2_svc(ypreq_key *key, { result.key.keydat_len = okey.size; result.key.keydat_val = okey.data; - + result.val.valdat_len = dval.size; result.val.valdat_val = dval.data; } (void)(dbp->close)(dbp); } } - + if (debug_flag) { if (result.stat == YP_TRUE) @@ -774,7 +774,7 @@ ypresp_key_val *ypproc_next_2_svc(ypreq_key *key, else Perror("\t-> Error #%d\n", result.stat); } - + return &result; } @@ -817,7 +817,7 @@ ypresp_xfr *ypproc_xfr_2_svc(ypreq_xfr *xfr, Perror("ypproc_xfr_2_svc(): [From: %s:%d]\n\tmap_parms:\n", inet_ntoa(rqhost->sin_addr), ntohs(rqhost->sin_port)); - + print_ypmap_parms(&xfr->map_parms); Perror("\t\ttransid = %u\n", xfr->transid); Perror("\t\tprog = %u\n", xfr->prog); @@ -828,7 +828,7 @@ ypresp_xfr *ypproc_xfr_2_svc(ypreq_xfr *xfr, { if (debug_flag) Perror("\t-> Ignored (not a valid source host)\n"); - + return NULL; } @@ -857,7 +857,7 @@ ypresp_xfr *ypproc_xfr_2_svc(ypreq_xfr *xfr, sprintf (g, "%u", xfr->prog); sprintf (p, "%u", xfr->port); execl(ypxfr_command, "ypxfr", "-d", xfr->map_parms.domain, "-h", - xfr->map_parms.peer, "-f", "-C", t, g, + xfr->map_parms.peer, "-f", "-C", t, g, inet_ntoa(rqhost->sin_addr), p, xfr->map_parms.map, NULL); Perror("ypxfr execl(): %s",strerror(errno)); exit(0); @@ -883,7 +883,7 @@ void *ypproc_clear_2_svc(void *dummy, { static int foo; struct sockaddr_in *rqhost; - + rqhost = svc_getcaller(rqstp->rq_xprt); @@ -891,12 +891,12 @@ void *ypproc_clear_2_svc(void *dummy, Perror("ypproc_clear_2_svc() [From: %s:%d]\n", inet_ntoa(rqhost->sin_addr), ntohs(rqhost->sin_port)); - + if (!is_valid_host(rqhost)) { if (debug_flag) Perror("\t-> Ignored (not a valid source host)\n"); - + return NULL; } @@ -927,7 +927,7 @@ static int ypall_encode(ypresp_key_val *val, dkey.data = val->key.keydat_val; dkey.size = val->key.keydat_len; - + val->stat = read_database((DB *) data, &dkey, &okey, &dval, F_NEXT); if (val->stat == YP_TRUE) @@ -939,7 +939,7 @@ static int ypall_encode(ypresp_key_val *val, val->val.valdat_len = dval.size; } - + return val->stat; } @@ -951,7 +951,7 @@ ypresp_all *ypproc_all_2_svc(ypreq_nokey *nokey, extern __xdr_ypall_cb_t __xdr_ypall_cb; struct sockaddr_in *rqhost; - + rqhost = svc_getcaller(rqstp->rq_xprt); if (debug_flag) @@ -959,7 +959,7 @@ ypresp_all *ypproc_all_2_svc(ypreq_nokey *nokey, Perror("ypproc_all_2_svc(): [From: %s:%d]\n", inet_ntoa(rqhost->sin_addr), ntohs(rqhost->sin_port)); - + Perror("\t\tdomain = \"%s\"\n", nokey->domain); Perror("\t\tmap = \"%s\"\n", nokey->map); } @@ -968,14 +968,14 @@ ypresp_all *ypproc_all_2_svc(ypreq_nokey *nokey, { if (debug_flag) Perror("\t-> Ignored (not a valid source host)\n"); - + return NULL; } __xdr_ypall_cb.u.encode = NULL; __xdr_ypall_cb.u.close = NULL; __xdr_ypall_cb.data = NULL; - + result.more = TRUE; /* @@ -991,7 +991,7 @@ ypresp_all *ypproc_all_2_svc(ypreq_nokey *nokey, result.ypresp_all_u.val.stat = YP_YPERR; return &result; } - + if (nokey->map[0] == '\0' || nokey->domain[0] == '\0') result.ypresp_all_u.val.stat = YP_BADARGS; else if (!is_valid_domain(nokey->domain)) @@ -999,7 +999,7 @@ ypresp_all *ypproc_all_2_svc(ypreq_nokey *nokey, else { DBT dkey, dval; - + DB *dbp = open_database(nokey->domain, nokey->map); if (dbp == NULL) result.ypresp_all_u.val.stat = YP_NOMAP; @@ -1015,7 +1015,7 @@ ypresp_all *ypproc_all_2_svc(ypreq_nokey *nokey, { result.ypresp_all_u.val.key.keydat_len = dkey.size; result.ypresp_all_u.val.key.keydat_val = dkey.data; - + result.ypresp_all_u.val.val.valdat_len = dval.size; result.ypresp_all_u.val.val.valdat_val = dval.data; @@ -1029,7 +1029,7 @@ ypresp_all *ypproc_all_2_svc(ypreq_nokey *nokey, (void)(dbp->close)(dbp); } } - + return &result; } @@ -1039,8 +1039,8 @@ ypresp_master *ypproc_master_2_svc(ypreq_nokey *nokey, { static ypresp_master result; struct sockaddr_in *rqhost; - - + + rqhost = svc_getcaller(rqstp->rq_xprt); if (debug_flag) @@ -1048,7 +1048,7 @@ ypresp_master *ypproc_master_2_svc(ypreq_nokey *nokey, Perror("ypproc_master_2_svc(): [From: %s:%d]\n", inet_ntoa(rqhost->sin_addr), ntohs(rqhost->sin_port)); - + Perror("\t\tdomain = \"%s\"\n", nokey->domain); Perror("\t\tmap = \"%s\"\n", nokey->map); } @@ -1057,7 +1057,7 @@ ypresp_master *ypproc_master_2_svc(ypreq_nokey *nokey, { if (debug_flag) Perror("\t-> Ignored (not a valid source host)\n"); - + return NULL; } @@ -1096,7 +1096,7 @@ ypresp_master *ypproc_master_2_svc(ypreq_nokey *nokey, key.size = sizeof("YP_MASTER_NAME")-1; key.data = "YP_MASTER_NAME"; - + if ((dbp->get)(dbp,&key,&val,0)) val.data = NULL; @@ -1125,7 +1125,7 @@ ypresp_master *ypproc_master_2_svc(ypreq_nokey *nokey, if (debug_flag) Perror("\t-> Peer = \"%s\"\n", result.peer); - + return &result; } @@ -1135,8 +1135,8 @@ ypresp_order *ypproc_order_2_svc(ypreq_nokey *nokey, { static ypresp_order result; struct sockaddr_in *rqhost; - - + + rqhost = svc_getcaller(rqstp->rq_xprt); if (debug_flag) @@ -1144,7 +1144,7 @@ ypresp_order *ypproc_order_2_svc(ypreq_nokey *nokey, Perror("ypproc_order_2_svc(): [From: %s:%d]\n", inet_ntoa(rqhost->sin_addr), ntohs(rqhost->sin_port)); - + Perror("\t\tdomain = \"%s\"\n", nokey->domain); Perror("\t\tmap = \"%s\"\n", nokey->map); } @@ -1153,7 +1153,7 @@ ypresp_order *ypproc_order_2_svc(ypreq_nokey *nokey, { if (debug_flag) Perror("\t-> Ignored (not a valid source host)\n"); - + return NULL; } @@ -1188,7 +1188,7 @@ ypresp_order *ypproc_order_2_svc(ypreq_nokey *nokey, key.size = sizeof("YP_LAST_MODIFIED")-1; key.data = "YP_LAST_MODIFIED"; - + (dbp->get)(dbp,&key,&val,0); if (val.data == NULL) { @@ -1208,7 +1208,7 @@ ypresp_order *ypproc_order_2_svc(ypreq_nokey *nokey, if (debug_flag) Perror("-> Order # %d\n", result.ordernum); - + return &result; } @@ -1257,7 +1257,7 @@ ypresp_maplist *ypproc_maplist_2_svc(domainname *name, { static ypresp_maplist result; struct sockaddr_in *rqhost; - + rqhost = svc_getcaller(rqstp->rq_xprt); @@ -1266,7 +1266,7 @@ ypresp_maplist *ypproc_maplist_2_svc(domainname *name, Perror("ypproc_maplist_2_svc(): [From: %s:%d]\n", inet_ntoa(rqhost->sin_addr), ntohs(rqhost->sin_port)); - + Perror("\t\tdomain = \"%s\"\n", *name); } @@ -1274,13 +1274,13 @@ ypresp_maplist *ypproc_maplist_2_svc(domainname *name, { if (debug_flag) Perror("\t-> Ignored (not a valid source host)\n"); - + return NULL; } if (result.maps) free_maplist(result.maps); - + result.maps = NULL; if ((*name)[0] == '\0') @@ -1300,13 +1300,13 @@ ypresp_maplist *ypproc_maplist_2_svc(domainname *name, { Perror("%s: opendir: %s", progname,strerror(errno)); } - + result.stat = YP_BADDB; } else { struct dirent *dep; - + while ((dep = readdir(dp)) != NULL) if (add_maplist(&result.maps, dep->d_name) < 0) { @@ -1317,7 +1317,7 @@ ypresp_maplist *ypproc_maplist_2_svc(domainname *name, result.stat = YP_TRUE; } } - + if (debug_flag) { if (result.stat == YP_TRUE) @@ -1336,6 +1336,6 @@ ypresp_maplist *ypproc_maplist_2_svc(domainname *name, else Perror("\t-> Error #%d\n", result.stat); } - + return &result; } diff --git a/gnu/usr.sbin/ypserv/yp.h b/gnu/usr.sbin/ypserv/yp.h index fde95cd..5a3b33a 100644 --- a/gnu/usr.sbin/ypserv/yp.h +++ b/gnu/usr.sbin/ypserv/yp.h @@ -10,7 +10,7 @@ * Modification history: * 940716 pen@signum.se Change "ypreq_key" to "ypreq_nokey" for FIRST. * - * $Id$ + * $Id: yp.h,v 1.1 1995/01/31 08:58:55 wpaul Exp $ */ #ifndef _YP_H_RPCGEN @@ -40,13 +40,13 @@ enum ypstat { YP_VERS = -8 }; typedef enum ypstat ypstat; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t __xdr_ypstat(XDR *, ypstat*); -#elif __STDC__ +#elif __STDC__ extern bool_t __xdr_ypstat(XDR *, ypstat*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t __xdr_ypstat(); -#endif /* Old Style C */ +#endif /* Old Style C */ enum ypxfrstat { @@ -68,69 +68,69 @@ enum ypxfrstat { YPXFR_REFUSED = -14 }; typedef enum ypxfrstat ypxfrstat; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t __xdr_ypxfrstat(XDR *, ypxfrstat*); -#elif __STDC__ +#elif __STDC__ extern bool_t __xdr_ypxfrstat(XDR *, ypxfrstat*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t __xdr_ypxfrstat(); -#endif /* Old Style C */ +#endif /* Old Style C */ typedef char *domainname; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t __xdr_domainname(XDR *, domainname*); -#elif __STDC__ +#elif __STDC__ extern bool_t __xdr_domainname(XDR *, domainname*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t __xdr_domainname(); -#endif /* Old Style C */ +#endif /* Old Style C */ typedef char *mapname; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t __xdr_mapname(XDR *, mapname*); -#elif __STDC__ +#elif __STDC__ extern bool_t __xdr_mapname(XDR *, mapname*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t __xdr_mapname(); -#endif /* Old Style C */ +#endif /* Old Style C */ typedef char *peername; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t __xdr_peername(XDR *, peername*); -#elif __STDC__ +#elif __STDC__ extern bool_t __xdr_peername(XDR *, peername*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t __xdr_peername(); -#endif /* Old Style C */ +#endif /* Old Style C */ typedef struct { u_int keydat_len; char *keydat_val; } keydat; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t __xdr_keydat(XDR *, keydat*); -#elif __STDC__ +#elif __STDC__ extern bool_t __xdr_keydat(XDR *, keydat*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t __xdr_keydat(); -#endif /* Old Style C */ +#endif /* Old Style C */ typedef struct { u_int valdat_len; char *valdat_val; } valdat; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t __xdr_valdat(XDR *, valdat*); -#elif __STDC__ +#elif __STDC__ extern bool_t __xdr_valdat(XDR *, valdat*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t __xdr_valdat(); -#endif /* Old Style C */ +#endif /* Old Style C */ struct ypmap_parms { @@ -140,13 +140,13 @@ struct ypmap_parms { peername peer; }; typedef struct ypmap_parms ypmap_parms; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t __xdr_ypmap_parms(XDR *, ypmap_parms*); -#elif __STDC__ +#elif __STDC__ extern bool_t __xdr_ypmap_parms(XDR *, ypmap_parms*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t __xdr_ypmap_parms(); -#endif /* Old Style C */ +#endif /* Old Style C */ struct ypreq_key { @@ -155,13 +155,13 @@ struct ypreq_key { keydat key; }; typedef struct ypreq_key ypreq_key; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t __xdr_ypreq_key(XDR *, ypreq_key*); -#elif __STDC__ +#elif __STDC__ extern bool_t __xdr_ypreq_key(XDR *, ypreq_key*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t __xdr_ypreq_key(); -#endif /* Old Style C */ +#endif /* Old Style C */ struct ypreq_nokey { @@ -169,13 +169,13 @@ struct ypreq_nokey { mapname map; }; typedef struct ypreq_nokey ypreq_nokey; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t __xdr_ypreq_nokey(XDR *, ypreq_nokey*); -#elif __STDC__ +#elif __STDC__ extern bool_t __xdr_ypreq_nokey(XDR *, ypreq_nokey*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t __xdr_ypreq_nokey(); -#endif /* Old Style C */ +#endif /* Old Style C */ struct ypreq_xfr { @@ -185,13 +185,13 @@ struct ypreq_xfr { u_int port; }; typedef struct ypreq_xfr ypreq_xfr; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t __xdr_ypreq_xfr(XDR *, ypreq_xfr*); -#elif __STDC__ +#elif __STDC__ extern bool_t __xdr_ypreq_xfr(XDR *, ypreq_xfr*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t __xdr_ypreq_xfr(); -#endif /* Old Style C */ +#endif /* Old Style C */ struct ypresp_val { @@ -199,13 +199,13 @@ struct ypresp_val { valdat val; }; typedef struct ypresp_val ypresp_val; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t __xdr_ypresp_val(XDR *, ypresp_val*); -#elif __STDC__ +#elif __STDC__ extern bool_t __xdr_ypresp_val(XDR *, ypresp_val*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t __xdr_ypresp_val(); -#endif /* Old Style C */ +#endif /* Old Style C */ struct ypresp_key_val { @@ -214,13 +214,13 @@ struct ypresp_key_val { valdat val; }; typedef struct ypresp_key_val ypresp_key_val; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t __xdr_ypresp_key_val(XDR *, ypresp_key_val*); -#elif __STDC__ +#elif __STDC__ extern bool_t __xdr_ypresp_key_val(XDR *, ypresp_key_val*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t __xdr_ypresp_key_val(); -#endif /* Old Style C */ +#endif /* Old Style C */ struct ypresp_master { @@ -228,13 +228,13 @@ struct ypresp_master { peername peer; }; typedef struct ypresp_master ypresp_master; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t __xdr_ypresp_master(XDR *, ypresp_master*); -#elif __STDC__ +#elif __STDC__ extern bool_t __xdr_ypresp_master(XDR *, ypresp_master*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t __xdr_ypresp_master(); -#endif /* Old Style C */ +#endif /* Old Style C */ struct ypresp_order { @@ -242,13 +242,13 @@ struct ypresp_order { u_int ordernum; }; typedef struct ypresp_order ypresp_order; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t __xdr_ypresp_order(XDR *, ypresp_order*); -#elif __STDC__ +#elif __STDC__ extern bool_t __xdr_ypresp_order(XDR *, ypresp_order*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t __xdr_ypresp_order(); -#endif /* Old Style C */ +#endif /* Old Style C */ typedef struct @@ -269,13 +269,13 @@ struct ypresp_all { } ypresp_all_u; }; typedef struct ypresp_all ypresp_all; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t __xdr_ypresp_all(XDR *, ypresp_all*); -#elif __STDC__ +#elif __STDC__ extern bool_t __xdr_ypresp_all(XDR *, ypresp_all*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t __xdr_ypresp_all(); -#endif /* Old Style C */ +#endif /* Old Style C */ struct ypresp_xfr { @@ -283,13 +283,13 @@ struct ypresp_xfr { ypxfrstat xfrstat; }; typedef struct ypresp_xfr ypresp_xfr; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t __xdr_ypresp_xfr(XDR *, ypresp_xfr*); -#elif __STDC__ +#elif __STDC__ extern bool_t __xdr_ypresp_xfr(XDR *, ypresp_xfr*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t __xdr_ypresp_xfr(); -#endif /* Old Style C */ +#endif /* Old Style C */ struct ypmaplist { @@ -297,13 +297,13 @@ struct ypmaplist { struct ypmaplist *next; }; typedef struct ypmaplist ypmaplist; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t __xdr_ypmaplist(XDR *, ypmaplist*); -#elif __STDC__ +#elif __STDC__ extern bool_t __xdr_ypmaplist(XDR *, ypmaplist*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t __xdr_ypmaplist(); -#endif /* Old Style C */ +#endif /* Old Style C */ struct ypresp_maplist { @@ -311,13 +311,13 @@ struct ypresp_maplist { ypmaplist *maps; }; typedef struct ypresp_maplist ypresp_maplist; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t __xdr_ypresp_maplist(XDR *, ypresp_maplist*); -#elif __STDC__ +#elif __STDC__ extern bool_t __xdr_ypresp_maplist(XDR *, ypresp_maplist*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t __xdr_ypresp_maplist(); -#endif /* Old Style C */ +#endif /* Old Style C */ enum yppush_status { @@ -339,13 +339,13 @@ enum yppush_status { YPPUSH_REFUSED = -14 }; typedef enum yppush_status yppush_status; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t __xdr_yppush_status(XDR *, yppush_status*); -#elif __STDC__ +#elif __STDC__ extern bool_t __xdr_yppush_status(XDR *, yppush_status*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t __xdr_yppush_status(); -#endif /* Old Style C */ +#endif /* Old Style C */ struct yppushresp_xfr { @@ -353,13 +353,13 @@ struct yppushresp_xfr { yppush_status status; }; typedef struct yppushresp_xfr yppushresp_xfr; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t __xdr_yppushresp_xfr(XDR *, yppushresp_xfr*); -#elif __STDC__ +#elif __STDC__ extern bool_t __xdr_yppushresp_xfr(XDR *, yppushresp_xfr*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t __xdr_yppushresp_xfr(); -#endif /* Old Style C */ +#endif /* Old Style C */ enum ypbind_resptype { @@ -367,13 +367,13 @@ enum ypbind_resptype { YPBIND_FAIL_VAL = 2 }; typedef enum ypbind_resptype ypbind_resptype; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t __xdr_ypbind_resptype(XDR *, ypbind_resptype*); -#elif __STDC__ +#elif __STDC__ extern bool_t __xdr_ypbind_resptype(XDR *, ypbind_resptype*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t __xdr_ypbind_resptype(); -#endif /* Old Style C */ +#endif /* Old Style C */ struct ypbind_binding { @@ -381,13 +381,13 @@ struct ypbind_binding { char ypbind_binding_port[2]; }; typedef struct ypbind_binding ypbind_binding; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t __xdr_ypbind_binding(XDR *, ypbind_binding*); -#elif __STDC__ +#elif __STDC__ extern bool_t __xdr_ypbind_binding(XDR *, ypbind_binding*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t __xdr_ypbind_binding(); -#endif /* Old Style C */ +#endif /* Old Style C */ struct ypbind_resp { @@ -398,13 +398,13 @@ struct ypbind_resp { } ypbind_resp_u; }; typedef struct ypbind_resp ypbind_resp; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t __xdr_ypbind_resp(XDR *, ypbind_resp*); -#elif __STDC__ +#elif __STDC__ extern bool_t __xdr_ypbind_resp(XDR *, ypbind_resp*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t __xdr_ypbind_resp(); -#endif /* Old Style C */ +#endif /* Old Style C */ #define YPBIND_ERR_ERR 1 #define YPBIND_ERR_NOSERV 2 @@ -416,13 +416,13 @@ struct ypbind_setdom { u_int ypsetdom_vers; }; typedef struct ypbind_setdom ypbind_setdom; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t __xdr_ypbind_setdom(XDR *, ypbind_setdom*); -#elif __STDC__ +#elif __STDC__ extern bool_t __xdr_ypbind_setdom(XDR *, ypbind_setdom*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t __xdr_ypbind_setdom(); -#endif /* Old Style C */ +#endif /* Old Style C */ #define YPPROG ((u_long)100004) @@ -504,7 +504,7 @@ extern ypresp_order * ypproc_order_2_svc(ypreq_nokey *, struct svc_req *); extern ypresp_maplist * ypproc_maplist_2(domainname *, CLIENT *); extern ypresp_maplist * ypproc_maplist_2_svc(domainname *, struct svc_req *); -#else /* Old Style C */ +#else /* Old Style C */ #define YPPROC_NULL ((u_long)0) extern void * ypproc_null_2(); extern void * ypproc_null_2_svc(); @@ -541,7 +541,7 @@ extern ypresp_order * ypproc_order_2_svc(); #define YPPROC_MAPLIST ((u_long)11) extern ypresp_maplist * ypproc_maplist_2(); extern ypresp_maplist * ypproc_maplist_2_svc(); -#endif /* Old Style C */ +#endif /* Old Style C */ #define YPPUSH_XFRRESPPROG ((u_long)0x40000000) #define YPPUSH_XFRRESPVERS ((u_long)1) @@ -562,14 +562,14 @@ extern void * yppushproc_null_1_svc(void *, struct svc_req *); extern yppushresp_xfr * yppushproc_xfrresp_1(void *, CLIENT *); extern yppushresp_xfr * yppushproc_xfrresp_1_svc(void *, struct svc_req *); -#else /* Old Style C */ +#else /* Old Style C */ #define YPPUSHPROC_NULL ((u_long)0) extern void * yppushproc_null_1(); extern void * yppushproc_null_1_svc(); #define YPPUSHPROC_XFRRESP ((u_long)1) extern yppushresp_xfr * yppushproc_xfrresp_1(); extern yppushresp_xfr * yppushproc_xfrresp_1_svc(); -#endif /* Old Style C */ +#endif /* Old Style C */ #define YPBINDPROG ((u_long)100007) #define YPBINDVERS ((u_long)2) @@ -596,7 +596,7 @@ extern ypbind_resp * ypbindproc_domain_2_svc(domainname *, struct svc_req *); extern void * ypbindproc_setdom_2(ypbind_setdom *, CLIENT *); extern void * ypbindproc_setdom_2_svc(ypbind_setdom *, struct svc_req *); -#else /* Old Style C */ +#else /* Old Style C */ #define YPBINDPROC_NULL ((u_long)0) extern void * ypbindproc_null_2(); extern void * ypbindproc_null_2_svc(); @@ -606,6 +606,6 @@ extern ypbind_resp * ypbindproc_domain_2_svc(); #define YPBINDPROC_SETDOM ((u_long)2) extern void * ypbindproc_setdom_2(); extern void * ypbindproc_setdom_2_svc(); -#endif /* Old Style C */ +#endif /* Old Style C */ #endif /* !_YP_H_RPCGEN */ diff --git a/gnu/usr.sbin/ypserv/yp_svc.c b/gnu/usr.sbin/ypserv/yp_svc.c index ea5fe73..b4ce749 100644 --- a/gnu/usr.sbin/ypserv/yp_svc.c +++ b/gnu/usr.sbin/ypserv/yp_svc.c @@ -6,7 +6,7 @@ * And thus replied Lpd@NannyMUD: * Who cares? :-) /Peter Eriksson <pen@signum.se> * - * $Id: yp_svc.c,v 1.1 1995/01/31 08:58:56 wpaul Exp $ + * $Id: yp_svc.c,v 1.2 1995/04/05 03:23:38 wpaul Exp $ */ #include "system.h" @@ -262,7 +262,7 @@ int main(int argc, char **argv) struct sockaddr_in socket_address; int result; int sunos_4_kludge = 0; - + progname = strrchr (argv[0], '/'); if (progname == (char *) NULL) progname = argv[0]; @@ -270,7 +270,7 @@ int main(int argc, char **argv) progname++; openlog(progname, LOG_PID, TCPW_FACILITY); - + for (i = 1; i < argc && argv[i][0] == '-'; i++) { if (strcmp(argv[i], "-debug") == 0 || strcmp(argv[i], "-d") == 0) @@ -313,7 +313,7 @@ int main(int argc, char **argv) Perror("%s: chdir: %", argv[0], strerror(errno)); exit(1); } - + (void) pmap_unset(YPPROG, YPVERS); if (sunos_4_kludge) (void) pmap_unset(YPPROG, 1); @@ -403,7 +403,7 @@ int main(int argc, char **argv) Perror("%s: unable to register (YPPROG, YPVERS, tcp)\n", progname); exit(1); } - + svc_run(); Perror("svc_run returned"); exit(1); diff --git a/gnu/usr.sbin/ypserv/yp_xdr.c b/gnu/usr.sbin/ypserv/yp_xdr.c index bb70473..9e88645 100644 --- a/gnu/usr.sbin/ypserv/yp_xdr.c +++ b/gnu/usr.sbin/ypserv/yp_xdr.c @@ -11,7 +11,7 @@ * 940616 pen@signum.se Major cleanups. * 940713 pen@signum.se Added SunOS 4 prototypes. * - * $Id$ + * $Id: yp_xdr.c,v 1.1 1995/01/31 08:58:57 wpaul Exp $ */ #include "system.h" @@ -227,12 +227,12 @@ __xdr_ypresp_all(XDR *xdrs, ypresp_all *objp) return FALSE; } - + if (!__xdr_ypresp_key_val(xdrs, &objp->ypresp_all_u.val)) { if (__xdr_ypall_cb.u.close != NULL) (*(__xdr_ypall_cb.u.close))(__xdr_ypall_cb.data); - + __xdr_ypall_cb.data = NULL; return FALSE; @@ -244,32 +244,32 @@ __xdr_ypresp_all(XDR *xdrs, ypresp_all *objp) if (__xdr_ypall_cb.u.close != NULL) (*(__xdr_ypall_cb.u.close))(__xdr_ypall_cb.data); - + __xdr_ypall_cb.data = NULL; - + if (!xdr_bool(xdrs, &objp->more)) return FALSE; - + return TRUE; } if ((*__xdr_ypall_cb.u.encode)(&objp->ypresp_all_u.val, __xdr_ypall_cb.data) == YP_NOKEY) objp->more = FALSE; - } + } } - + #ifdef NOTYET /* This code isn't needed in the server */ else if (xdrs->x_op == XDR_DECODE) { int more = 0; - + while (1) { if (!xdr_bool(xdrs, &objp->more)) return FALSE; - + switch (objp->more) { case TRUE: @@ -280,10 +280,10 @@ __xdr_ypresp_all(XDR *xdrs, ypresp_all *objp) more = (*__xdr_ypall_callback->foreach.decoder) (&objp->ypresp_all_u.val, __xdr_ypall_callback->data); break; - + case FALSE: return TRUE; - + default: return FALSE; } @@ -314,7 +314,7 @@ __xdr_ypmaplist(XDR *xdrs, ypmaplist *objp) return FALSE; if (!xdr_pointer(xdrs, (char **)&objp->next, sizeof(ypmaplist), - (xdrproc_t)__xdr_ypmaplist)) + (xdrproc_t)__xdr_ypmaplist)) return FALSE; return TRUE; @@ -387,12 +387,12 @@ __xdr_ypbind_resp(XDR *xdrs, ypbind_resp *objp) if (!xdr_u_int(xdrs, &objp->ypbind_resp_u.ypbind_error)) return FALSE; break; - + case YPBIND_SUCC_VAL: if (!__xdr_ypbind_binding(xdrs, &objp->ypbind_resp_u.ypbind_bindinfo)) return FALSE; break; - + default: return FALSE; } diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h index dfaa3db..eea3927 100644 --- a/include/arpa/nameser.h +++ b/include/arpa/nameser.h @@ -32,14 +32,14 @@ * * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT diff --git a/include/db.h b/include/db.h index 109f841..abf4ddd 100644 --- a/include/db.h +++ b/include/db.h @@ -152,7 +152,7 @@ typedef struct { int lorder; /* byte order */ size_t reclen; /* record length (fixed-length records) */ u_char bval; /* delimiting byte (variable-length records */ - char *bfname; /* btree file name */ + char *bfname; /* btree file name */ } RECNOINFO; #ifdef __DBINTERFACE_PRIVATE diff --git a/include/dirent.h b/include/dirent.h index f6fca1f..81f1086 100644 --- a/include/dirent.h +++ b/include/dirent.h @@ -37,7 +37,7 @@ #define _DIRENT_H_ /* - * The kernel defines the format of directory entries returned by + * The kernel defines the format of directory entries returned by * the getdirentries(2) system call. */ #include <sys/dirent.h> diff --git a/include/glob.h b/include/glob.h index 49f0a21..6f7164a 100644 --- a/include/glob.h +++ b/include/glob.h @@ -57,7 +57,7 @@ typedef struct { * and lstat(2). */ void (*gl_closedir) __P((void *)); - struct dirent *(*gl_readdir) __P((void *)); + struct dirent *(*gl_readdir) __P((void *)); void *(*gl_opendir) __P((const char *)); int (*gl_lstat) __P((const char *, struct stat *)); int (*gl_stat) __P((const char *, struct stat *)); diff --git a/include/histedit.h b/include/histedit.h index 95423c6..a65a60d 100644 --- a/include/histedit.h +++ b/include/histedit.h @@ -92,7 +92,7 @@ void el_push __P((EditLine *, const char *)); * High level function internals control * Parses argc, argv array and executes builtin editline commands */ -int el_parse __P((EditLine *, int, char **)); +int el_parse __P((EditLine *, int, char **)); /* * Low level editline access function diff --git a/include/math.h b/include/math.h index dd0b20c..214b80e 100644 --- a/include/math.h +++ b/include/math.h @@ -50,7 +50,7 @@ * was defined to be the largest float so that overflow didn't occur when it * was assigned to a single precision number. HUGE_VAL is strongly preferred. */ -#define HUGE 1.701411733192644270E+38 +#define HUGE 1.701411733192644270E+38 #else #define HUGE HUGE_VAL #endif diff --git a/include/netdb.h b/include/netdb.h index abf4c57..1be7163 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -31,17 +31,17 @@ * SUCH DAMAGE. * * @(#)netdb.h 8.1 (Berkeley) 6/2/93 - * $Id: netdb.h,v 4.9.1.2 1993/05/17 09:59:01 vixie Exp $ + * $Id: netdb.h,v 1.1.1.1 1994/05/24 09:57:18 rgrimes Exp $ * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT diff --git a/include/nl_types.h b/include/nl_types.h index accd718..ac8b433 100644 --- a/include/nl_types.h +++ b/include/nl_types.h @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: nl_types.h,v 1.1 1995/03/30 12:47:56 jkh Exp $ */ /*********************************************************** Copyright 1990, by Alfalfa Software Incorporated, Cambridge, Massachusetts. @@ -29,7 +29,7 @@ up-to-date. Many thanks. 267 Allston St., #3 Cambridge, MA 02139 USA nazgul@alfalfa.com - + ******************************************************************/ #ifndef _NL_TYPES_H_ diff --git a/include/protocols/routed.h b/include/protocols/routed.h index d53b168..4dd83bd 100644 --- a/include/protocols/routed.h +++ b/include/protocols/routed.h @@ -61,7 +61,7 @@ struct rip { #define rip_nets ripun.ru_nets #define rip_tracefile ripun.ru_tracefile }; - + /* * Packet types. */ diff --git a/include/protocols/timed.h b/include/protocols/timed.h index cbbbdba..6c6a05e 100644 --- a/include/protocols/timed.h +++ b/include/protocols/timed.h @@ -56,14 +56,14 @@ struct tsp { #define tsp_time tsp_u.tspu_time #define tsp_hopcnt tsp_u.tspu_hopcnt - + /* * Command types. */ #define TSP_ANY 0 /* match any types */ #define TSP_ADJTIME 1 /* send adjtime */ #define TSP_ACK 2 /* generic acknowledgement */ -#define TSP_MASTERREQ 3 /* ask for master's name */ +#define TSP_MASTERREQ 3 /* ask for master's name */ #define TSP_MASTERACK 4 /* acknowledge master request */ #define TSP_SETTIME 5 /* send network time */ #define TSP_MASTERUP 6 /* inform slaves that master is up */ @@ -90,8 +90,8 @@ struct tsp { #ifdef TSPTYPES char *tsptype[TSPTYPENUMBER] = - { "ANY", "ADJTIME", "ACK", "MASTERREQ", "MASTERACK", "SETTIME", "MASTERUP", - "SLAVEUP", "ELECTION", "ACCEPT", "REFUSE", "CONFLICT", "RESOLVE", "QUIT", + { "ANY", "ADJTIME", "ACK", "MASTERREQ", "MASTERACK", "SETTIME", "MASTERUP", + "SLAVEUP", "ELECTION", "ACCEPT", "REFUSE", "CONFLICT", "RESOLVE", "QUIT", "DATE", "DATEREQ", "DATEACK", "TRACEON", "TRACEOFF", "MSITE", "MSITEREQ", "TEST", "SETDATE", "SETDATEREQ", "LOOP" }; #endif diff --git a/include/resolv.h b/include/resolv.h index c903a20..e1c57f1 100644 --- a/include/resolv.h +++ b/include/resolv.h @@ -32,14 +32,14 @@ * * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT @@ -53,7 +53,7 @@ * * @(#)resolv.h 8.1 (Berkeley) 6/2/93 * From Id: resolv.h,v 4.9.1.2 1993/05/17 09:59:01 vixie Exp - * $Id$ + * $Id: resolv.h,v 1.2 1994/09/25 02:11:32 pst Exp $ */ #ifndef _RESOLV_H_ diff --git a/include/rpc/auth.h b/include/rpc/auth.h index e7db1d0..8d0836b 100644 --- a/include/rpc/auth.h +++ b/include/rpc/auth.h @@ -5,30 +5,30 @@ * 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. - * + * * 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: @(#)auth.h 1.17 88/02/08 SMI * from: @(#)auth.h 2.3 88/08/07 4.0 RPCSRC - * $Id: auth.h,v 1.1 1993/10/27 05:40:09 paul Exp $ + * $Id: auth.h,v 1.2 1994/08/07 18:40:53 wollman Exp $ */ /* diff --git a/include/rpc/auth_unix.h b/include/rpc/auth_unix.h index e9da264..3888ed5 100644 --- a/include/rpc/auth_unix.h +++ b/include/rpc/auth_unix.h @@ -5,30 +5,30 @@ * 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. - * + * * 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: @(#)auth_unix.h 1.8 88/02/08 SMI * from: @(#)auth_unix.h 2.2 88/07/29 4.0 RPCSRC - * $Id: auth_unix.h,v 1.1 1993/10/27 05:40:12 paul Exp $ + * $Id: auth_unix.h,v 1.2 1994/08/07 18:40:54 wollman Exp $ */ /* @@ -70,8 +70,8 @@ __BEGIN_DECLS extern bool_t xdr_authunix_parms __P((XDR *, struct authunix_parms *)); __END_DECLS -/* - * If a response verifier has flavor AUTH_SHORT, +/* + * If a response verifier has flavor AUTH_SHORT, * then the body of the response verifier encapsulates the following structure; * again it is serialized in the obvious fashion. */ diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h index 71d36bc..7f35067 100644 --- a/include/rpc/clnt.h +++ b/include/rpc/clnt.h @@ -5,30 +5,30 @@ * 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. - * + * * 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: @(#)clnt.h 1.31 88/02/08 SMI * from: @(#)clnt.h 2.1 88/07/29 4.0 RPCSRC - * $Id: clnt.h,v 1.1 1993/10/27 05:40:18 paul Exp $ + * $Id: clnt.h,v 1.2 1994/08/07 18:40:55 wollman Exp $ */ /* @@ -228,7 +228,7 @@ typedef struct { /* * Below are the client handle creation routines for the various - * implementations of client side rpc. They can return NULL if a + * implementations of client side rpc. They can return NULL if a * creation failure occurs. */ @@ -326,7 +326,7 @@ __END_DECLS /* * Like clnt_perror(), but is more verbose in its output - */ + */ __BEGIN_DECLS extern void clnt_perrno __P((enum clnt_stat)); /* stderr */ extern char *clnt_sperrno __P((enum clnt_stat)); /* string */ @@ -341,7 +341,7 @@ extern char *clnt_sperror __P((CLIENT *, char *)); /* string */ __END_DECLS -/* +/* * If a creation fails, the following allows the user to figure out why. */ struct rpc_createerr { diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h index f080ec50..ff40799 100644 --- a/include/rpc/pmap_clnt.h +++ b/include/rpc/pmap_clnt.h @@ -5,30 +5,30 @@ * 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. - * + * * 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: @(#)pmap_clnt.h 1.11 88/02/08 SMI + * from: @(#)pmap_clnt.h 1.11 88/02/08 SMI * from: @(#)pmap_clnt.h 2.1 88/07/29 4.0 RPCSRC - * $Id: pmap_clnt.h,v 1.1 1993/10/27 05:40:33 paul Exp $ + * $Id: pmap_clnt.h,v 1.2 1994/08/07 18:40:56 wollman Exp $ */ /* @@ -46,7 +46,7 @@ * head = pmap_getmaps(address); * clnt_stat = pmap_rmtcall(address, program, version, procedure, * xdrargs, argsp, xdrres, resp, tout, port_ptr) - * (works for udp only.) + * (works for udp only.) * clnt_stat = clnt_broadcast(program, version, procedure, * xdrargs, argsp, xdrres, resp, eachresult) * (like pmap_rmtcall, except the call is broadcasted to all diff --git a/include/rpc/pmap_prot.h b/include/rpc/pmap_prot.h index 1c10c36..d2bb793 100644 --- a/include/rpc/pmap_prot.h +++ b/include/rpc/pmap_prot.h @@ -5,30 +5,30 @@ * 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. - * + * * 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: @(#)pmap_prot.h 1.14 88/02/08 SMI + * from: @(#)pmap_prot.h 1.14 88/02/08 SMI * from: @(#)pmap_prot.h 2.1 88/07/29 4.0 RPCSRC - * $Id: pmap_prot.h,v 1.1 1993/10/27 05:40:38 paul Exp $ + * $Id: pmap_prot.h,v 1.2 1994/08/07 18:40:56 wollman Exp $ */ /* diff --git a/include/rpc/pmap_rmt.h b/include/rpc/pmap_rmt.h index c8c06ecb..7c46152 100644 --- a/include/rpc/pmap_rmt.h +++ b/include/rpc/pmap_rmt.h @@ -5,30 +5,30 @@ * 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. - * + * * 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: @(#)pmap_rmt.h 1.2 88/02/08 SMI + * from: @(#)pmap_rmt.h 1.2 88/02/08 SMI * from: @(#)pmap_rmt.h 2.1 88/07/29 4.0 RPCSRC - * $Id: pmap_rmt.h,v 1.1 1993/10/27 05:40:41 paul Exp $ + * $Id: pmap_rmt.h,v 1.2 1994/08/07 18:40:57 wollman Exp $ */ /* diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h index e4de8f4..b4a4de3 100644 --- a/include/rpc/rpc.h +++ b/include/rpc/rpc.h @@ -5,11 +5,11 @@ * 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. - * + * * 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. @@ -26,9 +26,9 @@ * 2550 Garcia Avenue * Mountain View, California 94043 * - * from: @(#)rpc.h 1.9 88/02/08 SMI + * from: @(#)rpc.h 1.9 88/02/08 SMI * from: @(#)rpc.h 2.4 89/07/11 4.0 RPCSRC - * $Id: rpc.h,v 1.2 1994/08/07 18:40:58 wollman Exp $ + * $Id: rpc.h,v 1.3 1995/02/24 08:57:44 phk Exp $ */ /* @@ -56,7 +56,7 @@ #include <rpc/rpc_msg.h> /* protocol for rpc messages */ #include <rpc/auth_unix.h> /* protocol for unix style cred */ /* - * Uncomment-out the next line if you are building the rpc library with + * Uncomment-out the next line if you are building the rpc library with * DES Authentication (see the README file in the secure_rpc/ directory). */ #if 0 diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h index fc1adbb..aec7aa0 100644 --- a/include/rpc/rpc_msg.h +++ b/include/rpc/rpc_msg.h @@ -5,30 +5,30 @@ * 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. - * + * * 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_msg.h 1.7 86/07/16 SMI * from: @(#)rpc_msg.h 2.1 88/07/29 4.0 RPCSRC - * $Id: rpc_msg.h,v 1.2 1994/08/07 18:40:59 wollman Exp $ + * $Id: rpc_msg.h,v 1.3 1995/03/12 12:13:37 bde Exp $ */ /* diff --git a/include/rpc/svc.h b/include/rpc/svc.h index 11b0afe..859a15b 100644 --- a/include/rpc/svc.h +++ b/include/rpc/svc.h @@ -5,30 +5,30 @@ * 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. - * + * * 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: @(#)svc.h 1.20 88/02/08 SMI + * from: @(#)svc.h 1.20 88/02/08 SMI * from: @(#)svc.h 2.2 88/07/29 4.0 RPCSRC - * $Id: svc.h,v 1.2 1994/08/07 18:41:00 wollman Exp $ + * $Id: svc.h,v 1.3 1995/02/24 08:57:45 phk Exp $ */ /* @@ -155,7 +155,7 @@ struct svc_req { * u_long prog; * u_long vers; * void (*dispatch)(); - * int protocol; // like TCP or UDP, zero means do not register + * int protocol; // like TCP or UDP, zero means do not register */ __BEGIN_DECLS extern bool_t svc_register __P((SVCXPRT *, u_long, u_long, void (*)(), int)); @@ -198,7 +198,7 @@ __END_DECLS /* * When the service routine is called, it must first check to see if it * knows about the procedure; if not, it should call svcerr_noproc - * and return. If so, it should deserialize its arguments via + * and return. If so, it should deserialize its arguments via * SVC_GETARGS (defined above). If the deserialization does not work, * svcerr_decode should be called followed by a return. Successful * decoding of the arguments should be followed the execution of the @@ -209,7 +209,7 @@ __END_DECLS * Note: do not confuse access-control failure with weak authentication! * * NB: In pure implementations of rpc, the caller always waits for a reply - * msg. This message is sent when svc_sendreply is called. + * msg. This message is sent when svc_sendreply is called. * Therefore pure service implementations should always call * svc_sendreply even if the function logically returns void; use * xdr.h - xdr_void for the xdr routine. HOWEVER, tcp based rpc allows @@ -231,7 +231,7 @@ extern void svcerr_auth __P((SVCXPRT *, enum auth_stat)); extern void svcerr_noprog __P((SVCXPRT *)); extern void svcerr_systemerr __P((SVCXPRT *)); __END_DECLS - + /* * Lowest level dispatching -OR- who owns this process anyway. * Somebody has to wait for incoming requests and then call the correct @@ -245,7 +245,7 @@ __END_DECLS /* * Global keeper of rpc service descriptors in use - * dynamic; must be inspected before each call to select + * dynamic; must be inspected before each call to select */ #ifdef FD_SETSIZE extern fd_set svc_fdset; diff --git a/include/rpc/svc_auth.h b/include/rpc/svc_auth.h index c6db440..f01d070 100644 --- a/include/rpc/svc_auth.h +++ b/include/rpc/svc_auth.h @@ -5,35 +5,35 @@ * 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. - * + * * 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: @(#)svc_auth.h 1.6 86/07/16 SMI * from: @(#)svc_auth.h 2.1 88/07/29 4.0 RPCSRC - * $Id: svc_auth.h,v 1.1 1993/10/27 05:40:57 paul Exp $ + * $Id: svc_auth.h,v 1.2 1994/08/07 18:41:01 wollman Exp $ */ /* * svc_auth.h, Service side of rpc authentication. - * + * * Copyright (C) 1984, Sun Microsystems, Inc. */ diff --git a/include/rpc/types.h b/include/rpc/types.h index b12221d..db2b6a3 100644 --- a/include/rpc/types.h +++ b/include/rpc/types.h @@ -5,30 +5,30 @@ * 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. - * + * * 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: @(#)types.h 1.18 87/07/24 SMI * from: @(#)types.h 2.3 88/08/15 4.0 RPCSRC - * $Id: types.h,v 1.1 1993/10/27 05:41:04 paul Exp $ + * $Id: types.h,v 1.2 1994/08/07 18:41:01 wollman Exp $ */ /* diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h index c29cc48..552c355 100644 --- a/include/rpc/xdr.h +++ b/include/rpc/xdr.h @@ -5,30 +5,30 @@ * 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. - * + * * 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: @(#)xdr.h 1.19 87/04/22 SMI * from: @(#)xdr.h 2.2 88/07/29 4.0 RPCSRC - * $Id: xdr.h,v 1.1 1993/10/27 05:41:07 paul Exp $ + * $Id: xdr.h,v 1.2 1994/08/07 18:41:02 wollman Exp $ */ /* @@ -254,7 +254,7 @@ __END_DECLS * Common opaque bytes objects used by many rpc protocols; * declared here due to commonality. */ -#define MAX_NETOBJ_SZ 1024 +#define MAX_NETOBJ_SZ 1024 struct netobj { u_int n_len; char *n_bytes; diff --git a/include/rpcsvc/yp_prot.h b/include/rpcsvc/yp_prot.h index f5206a9..11a1f5c 100644 --- a/include/rpcsvc/yp_prot.h +++ b/include/rpcsvc/yp_prot.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: yp_prot.h,v 1.1 1993/09/14 17:42:54 jtc Exp $ + * $Id: yp_prot.h,v 1.1 1994/08/04 19:01:56 wollman Exp $ */ #ifndef _YP_PROT_H_ @@ -34,9 +34,9 @@ /* * YPSERV PROTOCOL: - * + * * ypserv supports the following procedures: - * + * * YPPROC_NULL takes (void), returns (void). * called to check if server is alive. * YPPROC_DOMAIN takes (char *), returns (bool_t). @@ -209,7 +209,7 @@ struct ypresp_maplist { * Users of the ypclnt package (or of this protocol) don't HAVE to know about * it, but it must be available to users because _yp_dobind is a public * interface." - * + * * This is totally bogus! Nowhere else does Sun state that _yp_dobind() is * a public interface, and I don't know any reason anyone would want to call * it. But, just in case anyone does actually expect it to be available.. @@ -228,7 +228,7 @@ struct dom_binding { /* * YPBIND PROTOCOL: - * + * * ypbind supports the following procedures: * * YPBINDPROC_NULL takes (void), returns (void). @@ -239,7 +239,7 @@ struct dom_binding { * YPBINDPROC_SETDOM takes (struct ypbind_setdom), returns (void). * used by ypset. */ - + #define YPBINDPROG ((u_long)100007) #define YPBINDVERS ((u_long)2) #define YPBINDVERS_ORIG ((u_long)1) @@ -287,13 +287,13 @@ struct ypbind_setdom { /* * YPPUSH PROTOCOL: - * + * * Sun says: * "Protocol between clients (ypxfr, only) and yppush * yppush speaks a protocol in the transient range, which * is supplied to ypxfr as a command-line parameter when it * is activated by ypserv." - * + * * This protocol is not implimented, naturally, because this YP * implimentation only does the client side. */ diff --git a/include/rpcsvc/ypclnt.h b/include/rpcsvc/ypclnt.h index d6b7a2a..8168012 100644 --- a/include/rpcsvc/ypclnt.h +++ b/include/rpcsvc/ypclnt.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ypclnt.h,v 1.1 1994/08/04 19:01:56 wollman Exp $ + * $Id: ypclnt.h,v 1.2 1995/04/21 18:07:34 wpaul Exp $ */ #ifndef _YPCLNT_H_ @@ -56,7 +56,7 @@ #define YPOP_INSERT 2 /* add, do not change */ #define YPOP_DELETE 3 /* delete this entry */ #define YPOP_STORE 4 /* add, or change */ - + struct ypall_callback { int (*foreach)(); /* return non-0 to stop getting called */ char *data; /* opaque pointer for use of callback fn */ diff --git a/include/stdio.h b/include/stdio.h index 8cb07e3..595f8f2 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -330,7 +330,7 @@ int __swbuf __P((int, FILE *)); __END_DECLS /* - * The __sfoo macros are here so that we can + * The __sfoo macros are here so that we can * define function versions in the C library. */ #define __sgetc(p) (--(p)->_r < 0 ? __srget(p) : (int)(*(p)->_p++)) diff --git a/include/strhash.h b/include/strhash.h index 97e50a8..7533fb9 100644 --- a/include/strhash.h +++ b/include/strhash.h @@ -1,7 +1,7 @@ #ifndef _STRHASH_H_INCLUDE #define _STRHASH_H_INCLUDE -/* $Header: /home/ncvs/src/usr.bin/dmenu/hash.h,v 1.2 1995/03/21 06:39:04 jkh Exp $ */ +/* $Header: /home/ncvs/src/include/strhash.h,v 1.1 1995/03/26 10:12:53 jkh Exp $ */ /* * @@ -13,12 +13,12 @@ * * * All rights reserved. - * + * * This is unsupported software and is subject to change without notice. * the author makes no representations about the suitability of this software * for any purpose. It is supplied "as is" without express or implied * warranty. - * + * * Permission to use, copy, modify, and distribute this software and its * documentation for any purpose and without fee is hereby granted, provided * that the above copyright notice appear in all copies and that both that diff --git a/include/string.h b/include/string.h index e82428e..0619626 100644 --- a/include/string.h +++ b/include/string.h @@ -87,7 +87,7 @@ void strmode __P((int, char *)); int strncasecmp __P((const char *, const char *, size_t)); char *strsep __P((char **, const char *)); void swab __P((const void *, void *, size_t)); -#endif +#endif __END_DECLS #endif /* _STRING_H_ */ diff --git a/libexec/rtld-aout/rtld.c b/libexec/rtld-aout/rtld.c index 547d51d..e0547af 100644 --- a/libexec/rtld-aout/rtld.c +++ b/libexec/rtld-aout/rtld.c @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: rtld.c,v 1.23 1995/03/03 06:37:36 nate Exp $ + * $Id: rtld.c,v 1.23 1995/04/21 04:57:50 nate Exp $ */ #include <sys/param.h> @@ -232,7 +232,7 @@ struct _dynamic *dp; n > 0; n -= sizeof(struct relocation_info) ) nreloc++; - + /* Relocate ourselves */ for (reloc = (struct relocation_info *)(LD_REL(dp) + crtp->crt_ba); nreloc; @@ -562,7 +562,7 @@ again: (long)dp->d_un.d_sdt += (long)addr; p = alloc_link_map(path, sodp, smp, addr, dp); - + /* save segment sizes for unmap. */ smpp = LM_PRIVATE(p); smpp->a_text = hdr.a_text; @@ -584,7 +584,7 @@ unmap_object(smp) /* Find the object in the list and unlink it */ for (prev = NULL, p = link_map_head; - p != smp; + p != smp; prev = p, p = p->som_next) continue; if (prev == NULL) { @@ -903,7 +903,7 @@ lookup(name, src_map, strong) continue; if ((buckets = LD_BUCKETS(smp->som_dynamic)) == 0) - continue; + continue; if (LM_PRIVATE(smp)->spd_flags & RTLD_RTLD) continue; @@ -1323,7 +1323,7 @@ __dlclose(fd) /* Dismantle shared object map and descriptor */ init_map(smp, "_fini"); - + if (unmap_object(smp) < 0) return -1; diff --git a/sys/rpc/types.h b/sys/rpc/types.h index b12221d..db2b6a3 100644 --- a/sys/rpc/types.h +++ b/sys/rpc/types.h @@ -5,30 +5,30 @@ * 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. - * + * * 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: @(#)types.h 1.18 87/07/24 SMI * from: @(#)types.h 2.3 88/08/15 4.0 RPCSRC - * $Id: types.h,v 1.1 1993/10/27 05:41:04 paul Exp $ + * $Id: types.h,v 1.2 1994/08/07 18:41:01 wollman Exp $ */ /* |
