From: simonmar <unknown>
Date: Tue, 5 Apr 2005 09:23:12 +0000 (+0000)
Subject: [project @ 2005-04-05 09:22:27 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~811
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=9392c09726a8018a447eff14f08eb76a060ec9e5;p=ghc-hetmet.git

[project @ 2005-04-05 09:22:27 by simonmar]
type fixup
---

diff --git a/ghc/rts/Interpreter.c b/ghc/rts/Interpreter.c
index 74f2454..d4a4830 100644
--- a/ghc/rts/Interpreter.c
+++ b/ghc/rts/Interpreter.c
@@ -1005,7 +1005,7 @@ run_BCO:
 	}
 
 	case bci_TESTLT_P: {
-	    int discr  = BCO_NEXT;
+	    unsigned int discr  = BCO_NEXT;
 	    int failto = BCO_NEXT;
 	    StgClosure* con = (StgClosure*)Sp[0];
 	    if (GET_TAG(con) >= discr) {
@@ -1015,7 +1015,7 @@ run_BCO:
 	}
 
 	case bci_TESTEQ_P: {
-	    int discr  = BCO_NEXT;
+	    unsigned int discr  = BCO_NEXT;
 	    int failto = BCO_NEXT;
 	    StgClosure* con = (StgClosure*)Sp[0];
 	    if (GET_TAG(con) != discr) {
diff --git a/ghc/rts/Stats.c b/ghc/rts/Stats.c
index 9176607..42c49db 100644
--- a/ghc/rts/Stats.c
+++ b/ghc/rts/Stats.c
@@ -746,7 +746,7 @@ stat_exit(int alloc)
 
 	if (RtsFlags.GcFlags.giveStats == ONELINE_GC_STATS) {
 	  /* print the long long separately to avoid bugginess on mingwin (2001-07-02, mingw-0.5) */
-	  statsPrintf("<<ghc: %llu bytes, ", GC_tot_alloc*sizeof(W_));
+	  statsPrintf("<<ghc: %llu bytes, ", GC_tot_alloc*(ullong)sizeof(W_));
 	  statsPrintf("%d GCs, %ld/%ld avg/max bytes residency (%ld samples), %luM in use, %.2f INIT (%.2f elapsed), %.2f MUT (%.2f elapsed), %.2f GC (%.2f elapsed) :ghc>>\n",
 		    total_collections,
 		    ResidencySamples == 0 ? 0 :