* Copyright (c) 1994-2000.
*
* $RCSfile: Interpreter.c,v $
- * $Revision: 1.9 $
- * $Date: 2001/01/09 17:36:21 $
+ * $Revision: 1.13 $
+ * $Date: 2001/01/15 16:55:25 $
* ---------------------------------------------------------------------------*/
#ifdef GHCI
SAVE_STACK_POINTERS; return retcode;
+static __inline__ StgPtr allocate_UPD ( int n_words )
+{
+ //fprintf(stderr, "alloc_UPD %d -> ", n_words );
+ if (n_words - sizeofW(StgHeader) < MIN_UPD_SIZE)
+ n_words = MIN_UPD_SIZE + sizeofW(StgHeader);
+ //fprintf(stderr, "%d\n", n_words );
+ return allocate(n_words);
+}
+
+static __inline__ StgPtr allocate_NONUPD ( int n_words )
+{
+ //fprintf(stderr, "alloc_NONUPD %d -> ", n_words );
+ if (n_words - sizeofW(StgHeader) < MIN_NONUPD_SIZE)
+ n_words = MIN_NONUPD_SIZE + sizeofW(StgHeader);
+ //fprintf(stderr, "%d\n", n_words );
+ return allocate(n_words);
+}
+
+
StgThreadReturnCode interpretBCO ( Capability* cap )
{
/* On entry, the closure to interpret is on the top of the
/* Start of the bytecode interpreter */
/* ---------------------------------------------------- */
{
+ int do_print_stack = 1;
register int bciPtr = 1; /* instruction pointer */
register StgBCO* bco = (StgBCO*)obj;
register UShort* instrs = (UShort*)(&bco->instrs->payload[0]);
ASSERT(bciPtr <= instrs[0]);
IF_DEBUG(evaluator,
+ //if (do_print_stack) {
//fprintf(stderr, "\n-- BEGIN stack\n");
//printStack(iSp,cap->rCurrentTSO->stack+cap->rCurrentTSO->stack_size,iSu);
//fprintf(stderr, "-- END stack\n\n");
+ //}
+ do_print_stack = 1;
fprintf(stderr,"iSp = %p iSu = %p pc = %d ", iSp, iSu, bciPtr);
- disInstr(bco,bciPtr);
- if (0) { int i;
- fprintf(stderr,"\n");
- for (i = 8; i >= 0; i--)
- fprintf(stderr, "%d %p\n", i, (StgPtr)(*(iSp+i)));
- fprintf(stderr,"\n");
- }
- );
+ disInstr(bco,bciPtr);
+ if (0) { int i;
+ fprintf(stderr,"\n");
+ for (i = 8; i >= 0; i--)
+ fprintf(stderr, "%d %p\n", i, (StgPtr)(*(iSp+i)));
+ fprintf(stderr,"\n");
+ }
+ //if (do_print_stack) checkStack(iSp,cap->rCurrentTSO->stack+cap->rCurrentTSO->stack_size,iSu);
+ );
- // checkStack(iSp,cap->rCurrentTSO->stack+cap->rCurrentTSO->stack_size,iSu);
switch (BCO_NEXT) {
/* Handle arg check failure. Copy the spare args
into a PAP frame. */
/* fprintf(stderr, "arg check fail %d %d\n", arg_words_reqd, arg_words_avail ); */
- pap = (StgPAP*)allocate(PAP_sizeW(arg_words_avail));
+ pap = (StgPAP*)allocate_UPD(PAP_sizeW(arg_words_avail));
SET_HDR(pap,&stg_PAP_info,CCS_SYSTEM/*ToDo*/);
pap->n_args = arg_words_avail;
pap->fun = obj;
iSp = (StgPtr)iSu;
iSp --;
StackWord(0) = (W_)pap;
+ IF_DEBUG(evaluator,
+ fprintf(stderr,"\tBuilt ");
+ printObj((StgClosure*)pap);
+ );
RETURN(ThreadEnterGHC);
}
case bci_PUSH_L: {
ASSERT((W_*)iSp+o1 < (W_*)iSu);
StackWord(-1) = StackWord(o1);
iSp--;
+ do_print_stack = 0;
goto nextInsn;
}
case bci_PUSH_LL: {
goto nextInsn;
}
case bci_PUSH_UBX: {
+ int i;
int o_lits = BCO_NEXT;
int n_words = BCO_NEXT;
- for (; n_words > 0; n_words--) {
- iSp --;
- StackWord(0) = BCO_LIT(o_lits);
- o_lits++;
- }
+ iSp -= n_words;
+ for (i = 0; i < n_words; i++)
+ StackWord(i) = BCO_LIT(o_lits+i);
+ do_print_stack = 0;
goto nextInsn;
}
case bci_PUSH_TAG: {
goto nextInsn;
}
case bci_ALLOC: {
+ StgAP_UPD* ap;
int n_payload = BCO_NEXT - 1;
- StgAP_UPD* ap = (StgAP_UPD*)allocate(AP_sizeW(n_payload));
+ int request = AP_sizeW(n_payload);
+ ap = (StgAP_UPD*)allocate_UPD(request);
StackWord(-1) = (W_)ap;
ap->n_args = n_payload;
SET_HDR(ap, &stg_AP_UPD_info, ??)
for (i = 0; i < n_payload; i++)
ap->payload[i] = (StgClosure*)StackWord(i+1);
iSp += n_payload+1;
+ IF_DEBUG(evaluator,
+ fprintf(stderr,"\tBuilt ");
+ printObj((StgClosure*)ap);
+ );
goto nextInsn;
}
case bci_UNPACK: {
int i;
int o_itbl = BCO_NEXT;
int n_words = BCO_NEXT;
- StgInfoTable* itbl = BCO_ITBL(o_itbl);
- /* A bit of a kludge since n_words = n_p + n_np */
- int request = CONSTR_sizeW( n_words, 0 );
- StgClosure* con = (StgClosure*)allocate(request);
- SET_HDR(con, itbl, CCS_SYSTEM/*ToDo*/);
+ StgInfoTable* itbl = INFO_PTR_TO_STRUCT(BCO_ITBL(o_itbl));
+ int request = CONSTR_sizeW( itbl->layout.payload.ptrs,
+ itbl->layout.payload.nptrs );
+ StgClosure* con = (StgClosure*)allocate_NONUPD(request);
+ //fprintf(stderr, "---PACK p %d, np %d\n",
+ // (int) itbl->layout.payload.ptrs,
+ // (int) itbl->layout.payload.nptrs );
+ ASSERT( itbl->layout.payload.ptrs + itbl->layout.payload.nptrs > 0);
+ SET_HDR(con, BCO_ITBL(o_itbl), CCS_SYSTEM/*ToDo*/);
for (i = 0; i < n_words; i++)
con->payload[i] = (StgClosure*)StackWord(i);
iSp += n_words;
iSp --;
StackWord(0) = (W_)con;
+ IF_DEBUG(evaluator,
+ fprintf(stderr,"\tBuilt ");
+ printObj((StgClosure*)con);
+ );
goto nextInsn;
}
case bci_TESTLT_P: {
bciPtr = failto;
goto nextInsn;
}
+ case bci_TESTLT_I: {
+ /* The top thing on the stack should be a tagged int. */
+ int discr = BCO_NEXT;
+ int failto = BCO_NEXT;
+ I_ stackInt = (I_)StackWord(1);
+ ASSERT(1 == StackWord(0));
+ if (stackInt >= (I_)BCO_LIT(discr))
+ bciPtr = failto;
+ goto nextInsn;
+ }
case bci_TESTEQ_I: {
/* The top thing on the stack should be a tagged int. */
int discr = BCO_NEXT;
int failto = BCO_NEXT;
I_ stackInt = (I_)StackWord(1);
ASSERT(1 == StackWord(0));
- fprintf(stderr, "TESTEQ_I: discr = %d, stack = %d\n",(I_)BCO_LIT(discr), stackInt);
if (stackInt != (I_)BCO_LIT(discr))
bciPtr = failto;
goto nextInsn;
}
+ case bci_TESTLT_D: {
+ /* The top thing on the stack should be a tagged double. */
+ int discr = BCO_NEXT;
+ int failto = BCO_NEXT;
+ StgDouble stackDbl, discrDbl;
+ ASSERT(sizeofW(StgDouble) == StackWord(0));
+ stackDbl = PK_DBL( & StackWord(1) );
+ discrDbl = PK_DBL( & BCO_LIT(discr) );
+ if (stackDbl >= discrDbl)
+ bciPtr = failto;
+ goto nextInsn;
+ }
+ case bci_TESTEQ_D: {
+ /* The top thing on the stack should be a tagged double. */
+ int discr = BCO_NEXT;
+ int failto = BCO_NEXT;
+ StgDouble stackDbl, discrDbl;
+ ASSERT(sizeofW(StgDouble) == StackWord(0));
+ stackDbl = PK_DBL( & StackWord(1) );
+ discrDbl = PK_DBL( & BCO_LIT(discr) );
+ if (stackDbl != discrDbl)
+ bciPtr = failto;
+ goto nextInsn;
+ }
/* Control-flow ish things */
case bci_ENTER: {
int tag = StackWord(0);
StgInfoTable* ret_itbl = (StgInfoTable*)StackWord(tag +1);
ASSERT(tag <= 2); /* say ... */
- if (ret_itbl == (StgInfoTable*)&stg_ctoi_ret_R1_info
- /* || ret_itbl == stg_ctoi_ret_F1_info
- || ret_itbl == stg_ctoi_ret_D1_info */) {
+ if (ret_itbl == (StgInfoTable*)&stg_ctoi_ret_R1p_info
+ || ret_itbl == (StgInfoTable*)&stg_ctoi_ret_R1n_info
+ || ret_itbl == (StgInfoTable*)&stg_ctoi_ret_F1_info
+ || ret_itbl == (StgInfoTable*)&stg_ctoi_ret_D1_info) {
/* Returning to interpreted code. Interpret the BCO
immediately underneath the itbl. */
StgBCO* ret_bco = (StgBCO*)StackWord(tag +1+1);
barf("interpretBCO: hit a CASEFAIL");
/* As yet unimplemented */
- case bci_TESTLT_I:
case bci_TESTLT_F:
case bci_TESTEQ_F:
- case bci_TESTLT_D:
- case bci_TESTEQ_D:
/* Errors */
default:
projects / ghc-hetmet.git / blobdiff