/* -----------------------------------------------------------------------------
- * $Id: PrimOps.hc,v 1.4 1999/01/15 17:32:22 simonm Exp $
+ * $Id: PrimOps.hc,v 1.11 1999/02/02 14:17:05 simonm Exp $
*
* Primitive functions / data
*
#include "RtsUtils.h"
#include "Storage.h"
#include "BlockAlloc.h" /* tmp */
-#include "StablePtr.h"
+#include "StablePriv.h"
/* ** temporary **
for these.
*/
-W_ GHC_ZcCCallable_static_info[0];
-W_ GHC_ZcCReturnable_static_info[0];
+W_ GHC_ZCCCallable_static_info[0];
+W_ GHC_ZCCReturnable_static_info[0];
#ifndef aix_TARGET_OS /* AIX gives link errors with this as a const (RO assembler section) */
const
#define BYTES_TO_STGWORDS(n) ((n) + sizeof(W_) - 1)/sizeof(W_)
#define newByteArray(ty,scale) \
- FN_(new##ty##ArrayZh_fast) \
+ FN_(new##ty##Arrayzh_fast) \
{ \
W_ stuff_size, size, n; \
StgArrWords* p; \
FB_ \
- MAYBE_GC(NO_PTRS,new##ty##ArrayZh_fast); \
+ MAYBE_GC(NO_PTRS,new##ty##Arrayzh_fast); \
n = R1.w; \
stuff_size = BYTES_TO_STGWORDS(n*scale); \
size = sizeofW(StgArrWords)+ stuff_size; \
p = (StgArrWords *)RET_STGCALL1(P_,allocate,size); \
+ TICK_ALLOC_PRIM(sizeofW(StgArrWords),stuff_size,0); \
SET_HDR(p, &MUT_ARR_WORDS_info, CCCS); \
p->words = stuff_size; \
+ TICK_RET_UNBOXED_TUP(1) \
RET_P(p); \
FE_ \
}
newByteArray(Double, sizeof(StgDouble));
newByteArray(StablePtr, sizeof(StgStablePtr));
-FN_(newArrayZh_fast)
+FN_(newArrayzh_fast)
{
W_ size, n, init;
StgMutArrPtrs* arr;
FB_
n = R1.w;
- MAYBE_GC(R2_PTR,newArrayZh_fast);
+ MAYBE_GC(R2_PTR,newArrayzh_fast);
size = sizeofW(StgMutArrPtrs) + n;
arr = (StgMutArrPtrs *)RET_STGCALL1(P_, allocate, size);
+ TICK_ALLOC_PRIM(sizeofW(StgMutArrPtrs), n, 0);
SET_HDR(arr,&MUT_ARR_PTRS_info,CCCS);
arr->ptrs = n;
*p = (W_)init;
}
+ TICK_RET_UNBOXED_TUP(1);
RET_P(arr);
FE_
}
-FN_(newMutVarZh_fast)
+FN_(newMutVarzh_fast)
{
StgMutVar* mv;
/* Args: R1.p = initialisation value */
FB_
- HP_CHK_GEN(sizeofW(StgMutVar), R1_PTR, newMutVarZh_fast,);
- TICK_ALLOC_PRIM(sizeofW(StgMutVar),wibble,wibble,wibble)
+ HP_CHK_GEN(sizeofW(StgMutVar), R1_PTR, newMutVarzh_fast,);
+ TICK_ALLOC_PRIM(sizeofW(StgHeader)+1,1, 0); /* hack, dependent on rep. */
CCS_ALLOC(CCCS,sizeofW(StgMutVar));
- mv = stgCast(StgMutVar*,Hp-sizeofW(StgMutVar)+1);
+ mv = (StgMutVar *)(Hp-sizeofW(StgMutVar)+1);
SET_HDR(mv,&MUT_VAR_info,CCCS);
mv->var = R1.cl;
+ TICK_RET_UNBOXED_TUP(1);
RET_P(mv);
-
FE_
}
-------------------------------------------------------------------------- */
#ifndef PAR
-FN_(makeForeignObjZh_fast)
+FN_(makeForeignObjzh_fast)
{
/* R1.p = ptr to foreign object,
*/
StgForeignObj *result;
FB_
- HP_CHK_GEN(sizeofW(StgForeignObj), NO_PTRS, makeForeignObjZh_fast,);
- TICK_ALLOC_PRIM(sizeofW(StgForeignObj),wibble,wibble,wibble)
+ HP_CHK_GEN(sizeofW(StgForeignObj), NO_PTRS, makeForeignObjzh_fast,);
+ TICK_ALLOC_PRIM(sizeofW(StgHeader),
+ sizeofW(StgForeignObj)-sizeofW(StgHeader), 0);
CCS_ALLOC(CCCS,sizeofW(StgForeignObj)); /* ccs prof */
result = (StgForeignObj *) (Hp + 1 - sizeofW(StgForeignObj));
result->data = R1.p;
/* returns (# s#, ForeignObj# #) */
+ TICK_RET_UNBOXED_TUP(1);
RET_P(result);
FE_
}
#ifndef PAR
-FN_(mkWeakZh_fast)
+FN_(mkWeakzh_fast)
{
/* R1.p = key
R2.p = value
StgWeak *w;
FB_
- HP_CHK_GEN(sizeofW(StgWeak), R1_PTR|R2_PTR|R3_PTR, mkWeakZh_fast,);
- TICK_ALLOC_PRIM(sizeofW(StgWeak),wibble,wibble,wibble);
+ HP_CHK_GEN(sizeofW(StgWeak), R1_PTR|R2_PTR|R3_PTR, mkWeakzh_fast,);
+ TICK_ALLOC_PRIM(sizeofW(StgHeader)+1, // +1 is for the link field
+ sizeofW(StgWeak)-sizeofW(StgHeader)-1, 0);
CCS_ALLOC(CCCS,sizeofW(StgWeak)); /* ccs prof */
w = (StgWeak *) (Hp + 1 - sizeofW(StgWeak));
w->key = R1.cl;
w->value = R2.cl;
- w->finaliser = R3.cl;
+ if (R3.cl) {
+ w->finaliser = R3.cl;
+ } else {
+ w->finaliser = &NO_FINALISER_closure;
+ }
w->link = weak_ptr_list;
weak_ptr_list = w;
IF_DEBUG(weak, fprintf(stderr,"New weak pointer at %p\n",w));
+ TICK_RET_UNBOXED_TUP(1);
RET_P(w);
FE_
}
-FN_(deRefWeakZh_fast)
+FN_(finaliseWeakzh_fast)
{
/* R1.p = weak ptr
*/
StgWeak *w;
FB_
-
+ TICK_RET_UNBOXED_TUP(0);
w = (StgWeak *)R1.p;
- if (w->header.info == &WEAK_info) {
- RET_NP(1, w->value);
- } else {
- RET_NP(0, w);
+
+ if (w->finaliser != &NO_FINALISER_closure) {
+#ifdef INTERPRETER
+ STGCALL2(createGenThread, RtsFlags.GcFlags.initialStkSize, w->finaliser);
+#else
+ STGCALL2(createIOThread, RtsFlags.GcFlags.initialStkSize, w->finaliser);
+#endif
}
+ w->header.info = &DEAD_WEAK_info;
+
+ JMP_(ENTRY_CODE(Sp[0]));
FE_
}
Arbitrary-precision Integer operations.
-------------------------------------------------------------------------- */
-FN_(int2IntegerZh_fast)
+FN_(int2Integerzh_fast)
{
/* arguments: R1 = Int# */
FB_
val = R1.i;
- HP_CHK_GEN(sizeofW(StgArrWords)+1, NO_PTRS, int2IntegerZh_fast,)
- TICK_ALLOC_PRIM(sizeofW(StgArrWords)+1,wibble,wibble,wibble)
+ HP_CHK_GEN(sizeofW(StgArrWords)+1, NO_PTRS, int2Integerzh_fast,);
+ TICK_ALLOC_PRIM(sizeofW(StgArrWords),1,0);
CCS_ALLOC(CCCS,sizeofW(StgArrWords)+1); /* ccs prof */
p = stgCast(StgArrWords*,Hp)-1;
data :: ByteArray#
#)
*/
+ TICK_RET_UNBOXED_TUP(3);
RET_NNP(1,s,p);
FE_
}
-FN_(word2IntegerZh_fast)
+FN_(word2Integerzh_fast)
{
/* arguments: R1 = Word# */
FB_
val = R1.w;
- HP_CHK_GEN(sizeofW(StgArrWords)+1, NO_PTRS, word2IntegerZh_fast,)
- TICK_ALLOC_PRIM(sizeofW(StgArrWords)+1,wibble,wibble,wibble)
+ HP_CHK_GEN(sizeofW(StgArrWords)+1, NO_PTRS, word2Integerzh_fast,)
+ TICK_ALLOC_PRIM(sizeofW(StgArrWords),1,0);
CCS_ALLOC(CCCS,sizeofW(StgArrWords)+1); /* ccs prof */
p = stgCast(StgArrWords*,Hp)-1;
data :: ByteArray#
#)
*/
+ TICK_RET_UNBOXED_TUP(3);
RET_NNP(1,s,p);
FE_
}
-FN_(addr2IntegerZh_fast)
+FN_(addr2Integerzh_fast)
{
MP_INT result;
char *str;
FB_
- MAYBE_GC(NO_PTRS,addr2IntegerZh_fast);
+ MAYBE_GC(NO_PTRS,addr2Integerzh_fast);
/* args: R1 :: Addr# */
str = R1.a;
if (RET_STGCALL3(int, mpz_init_set_str,&result,(str),/*base*/10))
abort();
+ TICK_RET_UNBOXED_TUP(3);
RET_NNP(result._mp_alloc, result._mp_size,
result._mp_d - sizeofW(StgArrWords));
FE_
#ifdef SUPPORT_LONG_LONGS
-FN_(int64ToIntegerZh_fast)
+FN_(int64ToIntegerzh_fast)
{
/* arguments: L1 = Int64# */
- StgInt64 val; /* to avoid aliasing */
+ StgInt64 val; /* to avoid aliasing */
W_ hi;
I_ s,a, neg, words_needed;
StgArrWords* p; /* address of array result */
FB_
- /* ToDo: extend StgUnion?? */
val = (LI_)L1;
neg = 0;
- if ((LW_)(val) >= 0x100000000ULL) {
+
+ if ( val >= 0x100000000LL || val <= -0x100000000LL ) {
words_needed = 2;
} else {
/* minimum is one word */
words_needed = 1;
}
- HP_CHK_GEN(sizeofW(StgArrWords)+words_needed, NO_PTRS, int64ToIntegerZh_fast,)
- TICK_ALLOC_PRIM(sizeofW(StgArrWords)+words_needed,wibble,wibble,wibble)
+ HP_CHK_GEN(sizeofW(StgArrWords)+words_needed, NO_PTRS, int64ToIntegerzh_fast,)
+ TICK_ALLOC_PRIM(sizeofW(StgArrWords),words_needed,0);
CCS_ALLOC(CCCS,sizeofW(StgArrWords)+words_needed); /* ccs prof */
- p = stgCast(StgArrWords*,Hp)-1;
+ p = stgCast(StgArrWords*,(Hp-words_needed+1))-1;
SET_ARR_HDR(p, &ARR_WORDS_info, CCCS, words_needed);
+ a = words_needed;
+
if ( val < 0LL ) {
neg = 1;
val = -val;
- }
+ }
+
hi = (W_)((LW_)val / 0x100000000ULL);
- if ((LW_)(val) >= 0x100000000ULL) {
+
+ if ( a == 2 ) {
s = 2;
- a = 2;
- Hp[0] = (W_)val;
- Hp[1] = hi;
+ Hp[-1] = (W_)val;
+ Hp[0] = hi;
} else if ( val != 0 ) {
s = 1;
- a = 1;
- Hp[0] = (W_)val;
+ Hp[0] = (W_)val;
} else /* val==0 */ {
s = 0;
- a = 1;
}
- s = ( neg ? -s : s );
+ s = ( neg ? -s : s );
/* returns (# alloc :: Int#,
size :: Int#,
data :: ByteArray#
#)
*/
+ TICK_RET_UNBOXED_TUP(3);
RET_NNP(a,s,p);
FE_
}
-FN_(word64ToIntegerZh_fast)
+FN_(word64ToIntegerzh_fast)
{
/* arguments: L1 = Word64# */
} else {
words_needed = 1;
}
- HP_CHK_GEN(sizeofW(StgArrWords)+words_needed, NO_PTRS, word64ToIntegerZh_fast,)
- TICK_ALLOC_PRIM(sizeofW(StgArrWords)+words_needed,wibble,wibble,wibble)
+ HP_CHK_GEN(sizeofW(StgArrWords)+words_needed, NO_PTRS, word64ToIntegerzh_fast,)
+ TICK_ALLOC_PRIM(sizeofW(StgArrWords),words_needed,0);
CCS_ALLOC(CCCS,sizeofW(StgArrWords)+words_needed); /* ccs prof */
- p = stgCast(StgArrWords*,Hp)-1;
+ p = stgCast(StgArrWords*,(Hp-words_needed+1))-1;
SET_ARR_HDR(p, &ARR_WORDS_info, CCCS, words_needed);
+ a = words_needed;
+
hi = (W_)((LW_)val / 0x100000000ULL);
if ( val >= 0x100000000ULL ) {
s = 2;
- a = 2;
- Hp[0] = ((W_)val);
- Hp[1] = (hi);
+ Hp[-1] = ((W_)val);
+ Hp[0] = (hi);
} else if ( val != 0 ) {
s = 1;
- a = 1;
Hp[0] = ((W_)val);
} else /* val==0 */ {
s = 0;
- a = 1;
}
/* returns (# alloc :: Int#,
data :: ByteArray#
#)
*/
+ TICK_RET_UNBOXED_TUP(3);
RET_NNP(a,s,p);
FE_
}
/* Perform the operation */ \
STGCALL3(mp_fun,&result,&arg1,&arg2); \
\
+ TICK_RET_UNBOXED_TUP(3); \
RET_NNP(result._mp_alloc, \
result._mp_size, \
result._mp_d-sizeofW(StgArrWords)); \
/* Perform the operation */ \
STGCALL4(mp_fun,&result1,&result2,&arg1,&arg2); \
\
+ TICK_RET_UNBOXED_TUP(6); \
RET_NNPNNP(result1._mp_alloc, \
result1._mp_size, \
result1._mp_d-sizeofW(StgArrWords), \
FE_ \
}
-GMP_TAKE2_RET1(plusIntegerZh_fast, mpz_add);
-GMP_TAKE2_RET1(minusIntegerZh_fast, mpz_sub);
-GMP_TAKE2_RET1(timesIntegerZh_fast, mpz_mul);
-GMP_TAKE2_RET1(gcdIntegerZh_fast, mpz_gcd);
+GMP_TAKE2_RET1(plusIntegerzh_fast, mpz_add);
+GMP_TAKE2_RET1(minusIntegerzh_fast, mpz_sub);
+GMP_TAKE2_RET1(timesIntegerzh_fast, mpz_mul);
+GMP_TAKE2_RET1(gcdIntegerzh_fast, mpz_gcd);
-GMP_TAKE2_RET2(quotRemIntegerZh_fast, mpz_tdiv_qr);
-GMP_TAKE2_RET2(divModIntegerZh_fast, mpz_fdiv_qr);
+GMP_TAKE2_RET2(quotRemIntegerzh_fast, mpz_tdiv_qr);
+GMP_TAKE2_RET2(divModIntegerzh_fast, mpz_fdiv_qr);
#ifndef FLOATS_AS_DOUBLES
-FN_(decodeFloatZh_fast)
+FN_(decodeFloatzh_fast)
{
MP_INT mantissa;
I_ exponent;
/* arguments: F1 = Float# */
arg = F1;
- HP_CHK_GEN(sizeof(StgArrWords)+1, NO_PTRS, decodeFloatZh_fast,);
- TICK_ALLOC_PRIM(sizeofW(StgArrWords)+1,wibble,wibble,wibble)
+ HP_CHK_GEN(sizeof(StgArrWords)+1, NO_PTRS, decodeFloatzh_fast,);
+ TICK_ALLOC_PRIM(sizeofW(StgArrWords),1,0);
CCS_ALLOC(CCCS,sizeofW(StgArrWords)+1); /* ccs prof */
/* Be prepared to tell Lennart-coded __decodeFloat */
STGCALL3(__decodeFloat,&mantissa,&exponent,arg);
/* returns: (R1 = Int# (expn), R2 = Int#, R3 = Int#, R4 = ByteArray#) */
+ TICK_RET_UNBOXED_TUP(4);
RET_NNNP(exponent,mantissa._mp_alloc,mantissa._mp_size,p);
FE_
}
#define DOUBLE_MANTISSA_SIZE (sizeof(StgDouble)/sizeof(W_))
#define ARR_SIZE (sizeof(StgArrWords) + DOUBLE_MANTISSA_SIZE)
-FN_(decodeDoubleZh_fast)
+FN_(decodeDoublezh_fast)
{ MP_INT mantissa;
I_ exponent;
StgDouble arg;
/* arguments: D1 = Double# */
arg = D1;
- HP_CHK_GEN(ARR_SIZE, NO_PTRS, decodeDoubleZh_fast,);
- TICK_ALLOC_PRIM(ARR_SIZE,wibble,wibble,wibble)
+ HP_CHK_GEN(ARR_SIZE, NO_PTRS, decodeDoublezh_fast,);
+ TICK_ALLOC_PRIM(sizeof(StgArrWords),DOUBLE_MANTISSA_SIZE,0);
CCS_ALLOC(CCCS,ARR_SIZE); /* ccs prof */
/* Be prepared to tell Lennart-coded __decodeDouble */
STGCALL3(__decodeDouble,&mantissa,&exponent,arg);
/* returns: (R1 = Int# (expn), R2 = Int#, R3 = Int#, R4 = ByteArray#) */
+ TICK_RET_UNBOXED_TUP(4);
RET_NNNP(exponent,mantissa._mp_alloc,mantissa._mp_size,p);
FE_
}
* Concurrency primitives
* -------------------------------------------------------------------------- */
-FN_(forkZh_fast)
+FN_(forkzh_fast)
{
FB_
/* args: R1 = closure to spark */
if (closure_SHOULD_SPARK(stgCast(StgClosure*,R1.p))) {
- MAYBE_GC(R1_PTR, forkZh_fast);
+ MAYBE_GC(R1_PTR, forkzh_fast);
/* create it right now, return ThreadID in R1 */
R1.t = RET_STGCALL2(StgTSO *, createIOThread,
context_switch = 1;
}
- JMP_(*Sp);
-
+ JMP_(ENTRY_CODE(Sp[0]));
FE_
}
-FN_(killThreadZh_fast)
+FN_(killThreadzh_fast)
{
FB_
/* args: R1.p = TSO to kill */
FE_
}
-FN_(newMVarZh_fast)
+FN_(newMVarzh_fast)
{
StgMVar *mvar;
FB_
/* args: none */
- HP_CHK_GEN(sizeofW(StgMVar), NO_PTRS, newMVarZh_fast,);
- TICK_ALLOC_PRIM(sizeofW(StgMVar),wibble,wibble,wibble)
+ HP_CHK_GEN(sizeofW(StgMVar), NO_PTRS, newMVarzh_fast,);
+ TICK_ALLOC_PRIM(sizeofW(StgMutVar)-1, // consider head,tail,link as admin wds
+ 1, 0);
CCS_ALLOC(CCCS,sizeofW(StgMVar)); /* ccs prof */
mvar = (StgMVar *) (Hp - sizeofW(StgMVar) + 1);
mvar->head = mvar->tail = (StgTSO *)&END_TSO_QUEUE_closure;
mvar->value = (StgClosure *)&END_TSO_QUEUE_closure;
- R1.p = (P_)mvar;
-
- JMP_(ENTRY_CODE(Sp[0]));
+ TICK_RET_UNBOXED_TUP(1);
+ RET_P(mvar);
FE_
}
-FN_(takeMVarZh_fast)
+FN_(takeMVarzh_fast)
{
StgMVar *mvar;
+ StgClosure *val;
FB_
/* args: R1 = MVar closure */
CurrentTSO->link = (StgTSO *)&END_TSO_QUEUE_closure;
mvar->tail = CurrentTSO;
- BLOCK(R1_PTR, takeMVarZh_fast);
+ BLOCK(R1_PTR, takeMVarzh_fast);
}
SET_INFO(mvar,&EMPTY_MVAR_info);
- R1.cl = mvar->value;
+ val = mvar->value;
mvar->value = (StgClosure *)&END_TSO_QUEUE_closure;
- JMP_(ENTRY_CODE(Sp[0]));
+ TICK_RET_UNBOXED_TUP(1);
+ RET_P(val);
FE_
}
-FN_(putMVarZh_fast)
+FN_(putMVarzh_fast)
{
StgMVar *mvar;
StgTSO *tso;
}
/* ToDo: yield here for better communication performance? */
- JMP_(ENTRY_CODE(*Sp));
+ JMP_(ENTRY_CODE(Sp[0]));
FE_
}
Stable pointer primitives
------------------------------------------------------------------------- */
-FN_(makeStablePtrZh_fast)
+FN_(makeStableNamezh_fast)
{
- StgInt stable_ptr;
- FB_
+ StgWord index;
+ StgStableName *sn_obj;
+ FB_
- if (stable_ptr_free == NULL) {
- enlargeStablePtrTable();
- }
+ HP_CHK_GEN(sizeofW(StgStableName), R1_PTR, makeStableNamezh_fast,);
+ TICK_ALLOC_PRIM(sizeofW(StgHeader),
+ sizeofW(StgStableName)-sizeofW(StgHeader), 0);
+ CCS_ALLOC(CCCS,sizeofW(StgStableName)); /* ccs prof */
+
+ index = RET_STGCALL1(StgWord,lookupStableName,R1.p);
- stable_ptr = stable_ptr_free - stable_ptr_table;
- (P_)stable_ptr_free = *stable_ptr_free;
- stable_ptr_table[stable_ptr] = R1.p;
+ sn_obj = (StgStableName *) (Hp - sizeofW(StgStableName) + 1);
+ sn_obj->header.info = &STABLE_NAME_info;
+ sn_obj->sn = index;
- R1.i = stable_ptr;
- JMP_(ENTRY_CODE(Sp[0]));
- FE_
+ TICK_RET_UNBOXED_TUP(1);
+ RET_P(sn_obj);
}
#endif /* COMPILER */
+
projects / ghc-hetmet.git / blobdiff