From owner-p4-projects@FreeBSD.ORG Fri Sep 5 15:08:52 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFC0816A4C1; Fri, 5 Sep 2003 15:08:51 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 862D616A4BF for ; Fri, 5 Sep 2003 15:08:51 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A91243F75 for ; Fri, 5 Sep 2003 15:08:50 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85M8o0U064756 for ; Fri, 5 Sep 2003 15:08:50 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85M8o7h064753 for perforce@freebsd.org; Fri, 5 Sep 2003 15:08:50 -0700 (PDT) Date: Fri, 5 Sep 2003 15:08:50 -0700 (PDT) Message-Id: <200309052208.h85M8o7h064753@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37601 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 22:08:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=37601 Change 37601 by peter@peter_daintree on 2003/09/05 15:07:48 comment out the sort calls in the linker. This causes an exception when an array gets trashed/overflowed/something bad. This is a sign of a more serious problem. Affected files ... .. //depot/projects/ezm3/language/modula3/m3compiler/m3linker/src/MxGen.m3#2 edit .. //depot/projects/ezm3/language/modula3/m3compiler/m3linker/src/MxGenRep.m3#2 edit Differences ... ==== //depot/projects/ezm3/language/modula3/m3compiler/m3linker/src/MxGen.m3#2 (text+ko) ==== @@ -8,7 +8,7 @@ MODULE MxGen; -IMPORT Wr, Fmt, Thread, IntRefTbl, Stdio, IntArraySort; +IMPORT Wr, Fmt, Thread, IntRefTbl, Stdio (*, IntArraySort *); IMPORT Mx, MxRep, MxMap, M3ID, M3RT, Target; <*FATAL Wr.Failure, Thread.Alerted*> @@ -311,6 +311,7 @@ units := NEW (REF ARRAY OF UnitInfo, n_units); map := NEW (REF ARRAY OF INTEGER, n_units); +(* PROCEDURE CmpUnit (a, b: INTEGER): [-1..1] = VAR ax := units[a].unit.name; bx := units[b].unit.name; BEGIN @@ -319,6 +320,7 @@ ELSE RETURN +1; END; END CmpUnit; +*) BEGIN ui := all_ui; @@ -330,7 +332,7 @@ END; <*ASSERT cnt = n_units*> - IntArraySort.Sort (map^, CmpUnit); + (* IntArraySort.Sort (map^, CmpUnit); *) (* rebuild the linked list *) ui := NIL; ==== //depot/projects/ezm3/language/modula3/m3compiler/m3linker/src/MxGenRep.m3#2 (text+ko) ==== @@ -10,7 +10,7 @@ (* Modified On Fri Jul 2 19:33:09 PDT 1993 By muller *) MODULE MxGenRep; -IMPORT IntRefTbl, Wr, IntArraySort, Fmt, Thread; +IMPORT IntRefTbl, Wr, (* IntArraySort,*) Fmt, Thread; IMPORT Mx, MxRep, M3ID, MxMap; <* FATAL Thread.Alerted, Wr.Failure *> @@ -109,6 +109,7 @@ units := NEW (REF ARRAY OF UnitInfo, n_units); map := NEW (REF ARRAY OF INTEGER, n_units); +(* PROCEDURE CmpUnit (a, b: INTEGER): [-1..1] = VAR ax := units[a].unit.name; bx := units[b].unit.name; BEGIN @@ -117,6 +118,7 @@ ELSE RETURN +1; END; END CmpUnit; +*) BEGIN ui := all_ui; @@ -128,7 +130,7 @@ END; <*ASSERT cnt = n_units*> - IntArraySort.Sort (map^, CmpUnit); + (*IntArraySort.Sort (map^, CmpUnit); *) (* rebuild the linked list *) ui := NIL;