From owner-p4-projects@FreeBSD.ORG Sun Oct 26 17:37:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B71E16A4C0; Sun, 26 Oct 2003 17:37:30 -0800 (PST) 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 E845616A4B3 for ; Sun, 26 Oct 2003 17:37:29 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A4B143F85 for ; Sun, 26 Oct 2003 17:37:29 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9R1bTXJ017350 for ; Sun, 26 Oct 2003 17:37:29 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9R1bSHQ017347 for perforce@freebsd.org; Sun, 26 Oct 2003 17:37:28 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sun, 26 Oct 2003 17:37:28 -0800 (PST) Message-Id: <200310270137.h9R1bSHQ017347@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 40596 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: Mon, 27 Oct 2003 01:37:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=40596 Change 40596 by peter@peter_daintree on 2003/10/26 17:36:35 It seems that its just the QuickSort that blows things up. Fall back to the InsertionSort only rather than doing no sorting at all. I think this is behind the mismatched exception lists. Affected files ... .. //depot/projects/ezm3/language/modula3/m3compiler/m3linker/src/MxGen.m3#3 edit .. //depot/projects/ezm3/language/modula3/m3compiler/m3linker/src/MxGenRep.m3#3 edit .. //depot/projects/ezm3/libs/libm3/src/sort/ArraySort.mg#2 edit Differences ... ==== //depot/projects/ezm3/language/modula3/m3compiler/m3linker/src/MxGen.m3#3 (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,7 +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 @@ -320,7 +320,7 @@ ELSE RETURN +1; END; END CmpUnit; -*) + BEGIN ui := all_ui; @@ -332,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#3 (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,7 +109,6 @@ 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 @@ -118,7 +117,6 @@ ELSE RETURN +1; END; END CmpUnit; -*) BEGIN ui := all_ui; @@ -130,7 +128,7 @@ END; <*ASSERT cnt = n_units*> - (*IntArraySort.Sort (map^, CmpUnit); *) + IntArraySort.Sort (map^, CmpUnit); (* rebuild the linked list *) ui := NIL; ==== //depot/projects/ezm3/libs/libm3/src/sort/ArraySort.mg#2 (text+ko) ==== @@ -9,7 +9,7 @@ PROCEDURE Sort (VAR a: ARRAY OF Elem.T; cmp := Elem.Compare) = BEGIN - QuickSort (a, 0, NUMBER (a), cmp); + (* QuickSort (a, 0, NUMBER (a), cmp); *) InsertionSort (a, 0, NUMBER (a), cmp); END Sort;