From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1499) id 4F3D23858D28; Tue, 20 Sep 2022 11:41:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4F3D23858D28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1663674111; bh=8X9ExsXRpwe2JBtw3L8TNm6w1EoQXBX/HccTGKvAYcQ=; h=From:To:Subject:Date:From; b=aw7OERR1WkYX4r0i9qMN7bUH7w4U/8zeixSYgLaSTsP9C3SI7i9tCwAVKon374vJZ xD+YjIW7hlu9gj0p3eO7Mi/913cgA+QVb6gynYXphbKs+q1lWXYLFX0CqioYd08rec t5uiBLoA+uMTnpNYz5G8zAROUnQAQyfAzzcjPLOE= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Gaius Mulley To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/modula-2] Fixes to remove warnings and rebuild gcc/m2/configure. X-Act-Checkin: gcc X-Git-Author: Gaius Mulley X-Git-Refname: refs/heads/devel/modula-2 X-Git-Oldrev: c7ddd74ac004ffb9e1215befdc8077a957c0d5b1 X-Git-Newrev: d2e4f24ef5883a24fa31a098665b07c68d8e2226 Message-Id: <20220920114151.4F3D23858D28@sourceware.org> Date: Tue, 20 Sep 2022 11:41:51 +0000 (GMT) List-Id: https://gcc.gnu.org/g:d2e4f24ef5883a24fa31a098665b07c68d8e2226 commit d2e4f24ef5883a24fa31a098665b07c68d8e2226 Author: Gaius Mulley Date: Tue Sep 20 12:00:56 2022 +0100 Fixes to remove warnings and rebuild gcc/m2/configure. gcc/m2/ChangeLog: * configure: Rebuilt. * gm2-compiler/M2GenGCC.mod (FoldBuiltin): Replace variable op3. * gm2-compiler/M2Quads.mod (IsBackReference): Fix spacing. (IsBackReferenceConditional): Fix spacing. * gm2-gcc/m2color.cc: Correct line breaks and change drop const from return to allow modula-2 to build without warning. * gm2-gcc/m2color.def: Tidyup comments and use PtrToChar as the return result rather than ADDRESS. * gm2-gcc/m2color.h: Change return result to char * (avoiding const). * gm2-libs-min/libc.c: Correct spacing. * gm2-libs/FIO.mod (StringFormat1): Initialize local variables to avoid warning. (FormatError) Correct spacing. (FormatError2) Correct spacing. (CheckAccess) Tidy comments and spacing. (SetEndOfLine) Tidy comments and spacing. libgm2/ChangeLog: * libm2pim/wrapc.c (wrapc_fileinode): Avoid a warning by using a check whether to assign high to 0 if sizeof (high) in bits <= shift length. Signed-off-by: Gaius Mulley Diff: --- gcc/m2/configure | 6 ------ gcc/m2/gm2-compiler/M2GenGCC.mod | 8 +++++--- gcc/m2/gm2-compiler/M2Quads.mod | 6 +++--- gcc/m2/gm2-gcc/m2color.cc | 26 ++++++++++++++++---------- gcc/m2/gm2-gcc/m2color.def | 19 +++++++++++-------- gcc/m2/gm2-gcc/m2color.h | 8 ++++---- gcc/m2/gm2-libs-min/libc.c | 2 +- gcc/m2/gm2-libs/FIO.mod | 34 +++++++++++++++++++--------------- gcc/m2/mc-boot/GFIO.c | 26 ++++++++++++++++---------- libgm2/libm2pim/wrapc.c | 5 ++++- 10 files changed, 79 insertions(+), 61 deletions(-) diff --git a/gcc/m2/configure b/gcc/m2/configure index 0a3adac76c0..13d9f1f3d6f 100755 --- a/gcc/m2/configure +++ b/gcc/m2/configure @@ -2236,12 +2236,6 @@ test -n "$target_alias" && NONENONEs,x,x, && program_prefix=${target_alias}- -# Determine the noncanonical host name, for Modula-2. -ACX_NONCANONICAL_HOST - -# Determine the noncanonical target name, for directory use. -ACX_NONCANONICAL_TARGET - for ac_prog in flex do # Extract the first word of "$ac_prog", so it can be a program name with args. diff --git a/gcc/m2/gm2-compiler/M2GenGCC.mod b/gcc/m2/gm2-compiler/M2GenGCC.mod index 722fb5739c9..ebe64a170fb 100644 --- a/gcc/m2/gm2-compiler/M2GenGCC.mod +++ b/gcc/m2/gm2-compiler/M2GenGCC.mod @@ -2371,17 +2371,19 @@ END doParam ; FoldBuiltin - attempts to fold the gcc builtin function. *) -PROCEDURE FoldBuiltin (tokenno: CARDINAL; p: WalkAction; - q: CARDINAL; op1, op2, op3: CARDINAL) ; +PROCEDURE FoldBuiltin (tokenno: CARDINAL; p: WalkAction; q: CARDINAL) ; VAR resolved : BOOLEAN ; procedure, r : CARDINAL ; n : CARDINAL ; + op1, op2, + op3 : CARDINAL ; op : QuadOperator ; val : Tree ; location : location_t ; BEGIN + GetQuad (q, op, op1, op2, op3) ; resolved := TRUE ; procedure := NulSym ; n := q ; @@ -2454,7 +2456,7 @@ BEGIN FoldMakeAdr (tokenno, p, q, op1, op2, op3) ELSIF IsProcedure (op3) AND IsProcedureBuiltin (op3) AND CanUseBuiltin (op3) THEN - FoldBuiltin (tokenno, p, q, op1, op2, op3) + FoldBuiltin (tokenno, p, q) END END END FoldBuiltinFunction ; diff --git a/gcc/m2/gm2-compiler/M2Quads.mod b/gcc/m2/gm2-compiler/M2Quads.mod index 29cc9cd98b1..9f13d8359fa 100644 --- a/gcc/m2/gm2-compiler/M2Quads.mod +++ b/gcc/m2/gm2-compiler/M2Quads.mod @@ -550,7 +550,7 @@ VAR BEGIN i := q ; WHILE i#0 DO - GetQuad(i, op, op1, op2, op3) ; + GetQuad (i, op, op1, op2, op3) ; CASE op OF NewLocalVarOp, @@ -649,7 +649,7 @@ VAR BEGIN i := q ; WHILE i#0 DO - GetQuad(i, op, op1, op2, op3) ; + GetQuad (i, op, op1, op2, op3) ; CASE op OF NewLocalVarOp, @@ -819,7 +819,7 @@ VAR op : QuadOperator ; op1, op2, op3: CARDINAL ; BEGIN - GetQuad(QuadNo, op, op1, op2, op3) ; + GetQuad (QuadNo, op, op1, op2, op3) ; CASE op OF InclOp, diff --git a/gcc/m2/gm2-gcc/m2color.cc b/gcc/m2/gm2-gcc/m2color.cc index 75f3b5f373e..c73d6ccaf58 100644 --- a/gcc/m2/gm2-gcc/m2color.cc +++ b/gcc/m2/gm2-gcc/m2color.cc @@ -26,35 +26,41 @@ along with GNU Modula-2; see the file COPYING3. If not see #include "diagnostic-color.h" -const char *m2color_colorize_start (bool show_color, char *name, unsigned int name_len) +char * +m2color_colorize_start (bool show_color, char *name, unsigned int name_len) { - return colorize_start (show_color, name, name_len); + return const_cast (colorize_start (show_color, name, name_len)); } -const char *m2color_colorize_stop (bool show_color) +char * +m2color_colorize_stop (bool show_color) { - return colorize_stop (show_color); + return const_cast (colorize_stop (show_color)); } -const char *m2color_open_quote (void) +char * +m2color_open_quote (void) { - return open_quote; + return const_cast (open_quote); } -const char *m2color_close_quote (void) +char * +m2color_close_quote (void) { - return close_quote; + return const_cast (close_quote); } -void _M2_m2color_init () +void +_M2_m2color_init () { } -void _M2_m2color_finish () +void +_M2_m2color_finish () { } diff --git a/gcc/m2/gm2-gcc/m2color.def b/gcc/m2/gm2-gcc/m2color.def index 411a5e8a9bd..619191ebac6 100644 --- a/gcc/m2/gm2-gcc/m2color.def +++ b/gcc/m2/gm2-gcc/m2color.def @@ -23,32 +23,35 @@ DEFINITION MODULE m2color ; FROM SYSTEM IMPORT ADDRESS ; +TYPE + PtrToChar = POINTER TO CHAR ; -(* colorize_start - returns a C string containing the color escape sequences + +(* colorize_start returns a C string containing the color escape sequences mapped onto, name. See diagnostic-color.c for the definitive list of GCC colors. The name list includes: error, warning, note, range1, range2, quote, locus, fixit-insert, fixit-delete, diff-filename, diff-hunk, diff-delete, diff-insert, type-diff. *) PROCEDURE colorize_start (show_color: BOOLEAN; - name: ARRAY OF CHAR; name_len: CARDINAL) : ADDRESS ; + name: ARRAY OF CHAR; name_len: CARDINAL) : PtrToChar ; -(* colorize_stop - return a C string containing the escape sequences to +(* colorize_stop return a C string containing the escape sequences to stop text colorization. *) -PROCEDURE colorize_stop (show_color: BOOLEAN) : ADDRESS ; +PROCEDURE colorize_stop (show_color: BOOLEAN) : PtrToChar ; -(* open_quote - return a C string containing the open quote character which +(* open_quote return a C string containing the open quote character which might be a UTF-8 character if on a UTF-8 supporting host. *) -PROCEDURE open_quote () : ADDRESS ; +PROCEDURE open_quote () : PtrToChar ; -(* close_quote - return a C string containing the close quote character which +(* close_quote return a C string containing the close quote character which might be a UTF-8 character if on a UTF-8 supporting host. *) -PROCEDURE close_quote () : ADDRESS ; +PROCEDURE close_quote () : PtrToChar ; END m2color. diff --git a/gcc/m2/gm2-gcc/m2color.h b/gcc/m2/gm2-gcc/m2color.h index ed84989a8f7..0cbd551697b 100644 --- a/gcc/m2/gm2-gcc/m2color.h +++ b/gcc/m2/gm2-gcc/m2color.h @@ -36,14 +36,14 @@ along with GNU Modula-2; see the file COPYING3. If not see #endif /* !m2color_c. */ -EXTERN const char * +EXTERN char * m2color_colorize_start (bool show_color, char *name, unsigned int name_len); -EXTERN const char *m2color_colorize_stop (bool show_color); +EXTERN char *m2color_colorize_stop (bool show_color); -EXTERN const char *m2color_open_quote (void); +EXTERN char *m2color_open_quote (void); -EXTERN const char *m2color_close_quote (void); +EXTERN char *m2color_close_quote (void); EXTERN void _M2_m2color_init (); EXTERN void _M2_m2color_finish (); diff --git a/gcc/m2/gm2-libs-min/libc.c b/gcc/m2/gm2-libs-min/libc.c index 44e314120a7..b39bfffb65c 100644 --- a/gcc/m2/gm2-libs-min/libc.c +++ b/gcc/m2/gm2-libs-min/libc.c @@ -25,7 +25,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see . */ void abort (int); -void exit (int); +void exit (int); void abort (int i) { diff --git a/gcc/m2/gm2-libs/FIO.mod b/gcc/m2/gm2-libs/FIO.mod index c8a53e43df1..6548bcb0de3 100644 --- a/gcc/m2/gm2-libs/FIO.mod +++ b/gcc/m2/gm2-libs/FIO.mod @@ -816,6 +816,8 @@ VAR BEGIN HighSrc := StrLen(src) ; HighDest := HIGH(dest) ; + p := NIL ; + c := 0 ; i := 0 ; j := 0 ; WHILE (i> (sizeof (unsigned int) * 8)); + if ((sizeof (s.st_ino) == (sizeof (unsigned int)))) + *high = 0; + else + *high = (unsigned int)(s.st_ino >> (sizeof (unsigned int) * 8)); return 0; } else