From: simonpj <unknown>
Date: Thu, 7 Sep 2000 13:25:28 +0000 (+0000)
Subject: [project @ 2000-09-07 13:25:28 by simonpj]
X-Git-Tag: Approximately_9120_patches~3775
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=04a2850741d155974f85000ccd7ed3565721ea65;p=ghc-hetmet.git

[project @ 2000-09-07 13:25:28 by simonpj]
Primitives can return ThreadId# values
---

diff --git a/ghc/compiler/codeGen/CgRetConv.lhs b/ghc/compiler/codeGen/CgRetConv.lhs
index fa7215b..29e795e 100644
--- a/ghc/compiler/codeGen/CgRetConv.lhs
+++ b/ghc/compiler/codeGen/CgRetConv.lhs
@@ -1,7 +1,7 @@
 %
 % (c) The GRASP Project, Glasgow University, 1992-1998
 %
-% $Id: CgRetConv.lhs,v 1.25 2000/09/06 10:23:52 simonmar Exp $
+% $Id: CgRetConv.lhs,v 1.26 2000/09/07 13:25:28 simonpj Exp $
 %
 \section[CgRetConv]{Return conventions for the code generator}
 
@@ -87,17 +87,17 @@ dataReturnConvPrim DoubleRep	= DoubleReg ILIT(1)
 dataReturnConvPrim VoidRep	= VoidReg
 
 -- Return a primitive-array pointer in the usual register:
-dataReturnConvPrim ArrayRep     = VanillaReg ArrayRep ILIT(1)
+dataReturnConvPrim ArrayRep     = VanillaReg ArrayRep     ILIT(1)
 dataReturnConvPrim ByteArrayRep = VanillaReg ByteArrayRep ILIT(1)
-dataReturnConvPrim PrimPtrRep   = VanillaReg PrimPtrRep ILIT(1)
+dataReturnConvPrim PrimPtrRep   = VanillaReg PrimPtrRep   ILIT(1)
+dataReturnConvPrim ThreadIdRep  = VanillaReg ThreadIdRep  ILIT(1)
 
-dataReturnConvPrim StablePtrRep = VanillaReg StablePtrRep ILIT(1)
+dataReturnConvPrim StablePtrRep  = VanillaReg StablePtrRep  ILIT(1)
 dataReturnConvPrim ForeignObjRep = VanillaReg ForeignObjRep ILIT(1)
-dataReturnConvPrim WeakPtrRep   = VanillaReg WeakPtrRep ILIT(1)
+dataReturnConvPrim WeakPtrRep    = VanillaReg WeakPtrRep    ILIT(1)
 
 #ifdef DEBUG
-dataReturnConvPrim PtrRep	= panic "dataReturnConvPrim: PtrRep"
-dataReturnConvPrim _		= panic "dataReturnConvPrim: other"
+dataReturnConvPrim rep		= pprPanic "dataReturnConvPrim:" (ppr rep)
 #endif
 \end{code}