X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FAssembler.c;h=a382920b7784c00f76e083964416f5ba4391d73d;hb=9ff75d089614cce1cfa8c88344ace47698258bfa;hp=9c0b922a612ab4a1a6146c303b5c660f85065978;hpb=7be9e958de6a97f3f9be8264cbf2cef1b3fd9df4;p=ghc-hetmet.git diff --git a/ghc/rts/Assembler.c b/ghc/rts/Assembler.c index 9c0b922..a382920 100644 --- a/ghc/rts/Assembler.c +++ b/ghc/rts/Assembler.c @@ -5,8 +5,8 @@ * Copyright (c) 1994-1998. * * $RCSfile: Assembler.c,v $ - * $Revision: 1.6 $ - * $Date: 1999/03/02 19:52:24 $ + * $Revision: 1.26 $ + * $Date: 2000/04/14 15:18:06 $ * * This module provides functions to construct BCOs and other closures * required by the bytecode compiler. @@ -49,9 +49,10 @@ #include "Bytecodes.h" #include "Printer.h" #include "Disassembler.h" -#include "Evaluator.h" #include "StgMiscClosures.h" #include "Storage.h" +#include "Schedule.h" +#include "Evaluator.h" #define INSIDE_ASSEMBLER_C #include "Assembler.h" @@ -76,36 +77,35 @@ typedef struct { * Queues (of instructions, ptrs, nonptrs) * ------------------------------------------------------------------------*/ -/* ToDo: while debugging, we use a chunk size of 1 to stress-test the code - * this should be fine-tuned using statistics on common sizes - */ - -#define InstrsChunkSize 40 -#define PtrsChunkSize 10 -#define RefsChunkSize 10 -#define NonPtrsChunkSize 10 - #define Queue Instrs #define Type StgWord8 +#define MAKE_findIn 0 #include "QueueTemplate.h" +#undef MAKE_findIn #undef Type #undef Queue #define Queue Ptrs #define Type AsmObject +#define MAKE_findIn 0 #include "QueueTemplate.h" +#undef MAKE_findIn #undef Type #undef Queue #define Queue Refs #define Type AsmRef +#define MAKE_findIn 0 #include "QueueTemplate.h" +#undef MAKE_findIn #undef Type #undef Queue #define Queue NonPtrs #define Type StgWord +#define MAKE_findIn 1 #include "QueueTemplate.h" +#undef MAKE_findIn #undef Type #undef Queue @@ -146,15 +146,15 @@ struct AsmCAF_ { struct AsmBCO_ { struct AsmObject_ object; /* must be first in struct */ - int /*StgExpr*/ stgexpr; Instrs is; NonPtrs nps; + int /*StgExpr*/ stgexpr; + /* abstract machine ("executed" during compilation) */ AsmSp sp; /* stack ptr */ AsmSp max_sp; - StgWord hp; /* heap ptr */ - StgWord max_hp; + Instr lastOpc; }; static void asmResolveRef( AsmObject obj, AsmNat i, AsmClosure reference ) @@ -178,8 +178,8 @@ static void asmResolveRef( AsmObject obj, AsmNat i, AsmClosure reference ) case CONSTR: { StgClosure* con = stgCast(StgClosure*,obj->closure); - ASSERT(i < get_itbl(con)->layout.payload.nptrs && payloadCPtr(con,i) == NULL); - payloadCPtr(con,i) = reference; + ASSERT(i < get_itbl(con)->layout.payload.nptrs && con->payload[i] == NULL); + con->payload[i] = reference; break; } case AP_UPD: @@ -190,8 +190,8 @@ static void asmResolveRef( AsmObject obj, AsmNat i, AsmClosure reference ) ASSERT(ap->fun == NULL); ap->fun = reference; } else { - ASSERT(payloadCPtr(ap,i-1) == NULL); - payloadCPtr(ap,i-1) = reference; + ASSERT(ap->payload[i-1] == NULL); + ap->payload[i-1] = (StgPtr)reference; } break; } @@ -199,13 +199,6 @@ static void asmResolveRef( AsmObject obj, AsmNat i, AsmClosure reference ) barf("asmResolveRef"); } obj->num_unresolved -= 1; - - if (obj->num_unresolved == 0) { - /* todo: free the queues */ - - /* we don't print until all ptrs are resolved */ - IF_DEBUG(codegen,printObj(obj->closure);printf("\n\n")); - } } static void asmAddRef( AsmObject referent, AsmObject referer, AsmNat i ) @@ -237,19 +230,13 @@ static void asmEndObject( AsmObject obj, StgClosure* c ) obj->closure = c; mapQueue(Ptrs, AsmObject, obj->ptrs, asmAddRef(x,obj,i)); mapQueue(Refs, AsmRef, obj->refs, asmResolveRef(x.ref,x.i,c)); -#if 0 + if (obj->num_unresolved == 0) { - /* todo: free the queues */ + freePtrs(&obj->ptrs); + freeRefs(&obj->refs); /* we don't print until all ptrs are resolved */ - IF_DEBUG(codegen, - if (obj->num_unresolved > 0) - fprintf(stderr, "{{%d unresolved}} ", obj->num_unresolved); - ) IF_DEBUG(codegen,printObj(obj->closure)); } - //printf( "unresolved %d\n", obj->num_unresolved); - //printObj(obj->closure); -#endif } int asmObjectHasClosure ( AsmObject obj ) @@ -281,30 +268,25 @@ static StgClosure* asmAlloc( nat size ) return o; } -static void grabHpUpd( AsmBCO bco, nat size ) -{ - /* ToDo: sometimes we should test for MIN_UPD_SIZE instead */ - ASSERT( size >= MIN_UPD_SIZE + sizeofW(StgHeader) ); - bco->hp += size; -} - -static void grabHpNonUpd( AsmBCO bco, nat size ) +static void setSp( AsmBCO bco, AsmSp sp ) { - /* ToDo: sometimes we should test for MIN_UPD_SIZE instead */ - ASSERT( size >= MIN_NONUPD_SIZE + sizeofW(StgHeader) ); - bco->hp += size; + bco->max_sp = stg_max(bco->sp,bco->max_sp); + bco->sp = sp; + bco->max_sp = stg_max(bco->sp,bco->max_sp); } -static void resetHp( AsmBCO bco, nat hp ) +static void incSp ( AsmBCO bco, int sp_delta ) { - bco->max_hp = stg_max(bco->hp,bco->max_hp); - bco->hp = hp; + bco->max_sp = stg_max(bco->sp,bco->max_sp); + bco->sp += sp_delta; + bco->max_sp = stg_max(bco->sp,bco->max_sp); } -static void resetSp( AsmBCO bco, AsmSp sp ) +static void decSp ( AsmBCO bco, int sp_delta ) { - bco->max_sp = stg_max(bco->sp,bco->max_sp); - bco->sp = sp; + bco->max_sp = stg_max(bco->sp,bco->max_sp); + bco->sp -= sp_delta; + bco->max_sp = stg_max(bco->sp,bco->max_sp); } /* -------------------------------------------------------------------------- @@ -341,8 +323,8 @@ void asmEndCon( AsmCon con ) StgClosure* c = asmAlloc(CONSTR_sizeW(p,np)); StgClosure* o = stgCast(StgClosure*,c); SET_HDR(o,con->info,??); - mapQueue(Ptrs, AsmObject, con->object.ptrs, payloadCPtr(o,i) = NULL); - { nat i; for( i=0; iobject.ptrs, o->payload[i] = NULL); + { nat i; for( i=0; ipayload[p+i] = (StgClosure *)0xdeadbeef; }} asmEndObject(&con->object,c); } @@ -364,6 +346,7 @@ void asmEndCAF( AsmCAF caf, AsmBCO body ) o->body = NULL; o->value = stgCast(StgClosure*,0xdeadbeef); o->link = stgCast(StgCAF*,0xdeadbeef); + o->mut_link = NULL; asmAddPtr(&caf->object,&body->object); asmEndObject(&caf->object,c); } @@ -380,7 +363,7 @@ AsmBCO asmBeginBCO( int /*StgExpr*/ e ) bco->stgexpr = e; bco->max_sp = bco->sp = 0; - bco->max_hp = bco->hp = 0; + bco->lastOpc = i_INTERNAL_ERROR; return bco; } @@ -388,11 +371,7 @@ void asmEndBCO( AsmBCO bco ) { nat p = bco->object.ptrs.len; nat np = bco->nps.len; -#if 0 - nat is = bco->is.len + 4; /* 4 for stack and heap checks */ -#else - nat is = bco->is.len + 2; /* 4 for stack check */ -#endif + nat is = bco->is.len + (bco->max_sp <= 255 ? 2 : 3); /* 2 or 3 for stack check */ StgClosure* c = asmAlloc(BCO_sizeW(p,np,is)); StgBCO* o = stgCast(StgBCO*,c); @@ -406,16 +385,22 @@ void asmEndBCO( AsmBCO bco ) { nat j = 0; bco->max_sp = stg_max(bco->sp,bco->max_sp); - bco->max_hp = stg_max(bco->hp,bco->max_hp); - bcoInstr(o,j++) = i_STK_CHECK; - bcoInstr(o,j++) = bco->max_sp; -#if 0 - bcoInstr(o,j++) = i_HP_CHECK; - bcoInstr(o,j++) = bco->max_hp; -#endif + + ASSERT(bco->max_sp <= 65535); + if (bco->max_sp <= 255) { + bcoInstr(o,j++) = i_STK_CHECK; + bcoInstr(o,j++) = bco->max_sp; + } else { + bcoInstr(o,j++) = i_STK_CHECK_big; + bcoInstr(o,j++) = bco->max_sp / 256; + bcoInstr(o,j++) = bco->max_sp % 256; + } + mapQueue(Instrs, StgWord8, bco->is, bcoInstr(o,j++) = x); ASSERT(j == is); } + freeInstrs(&bco->is); + freeNonPtrs(&bco->nps); asmEndObject(&bco->object,c); } @@ -423,12 +408,39 @@ void asmEndBCO( AsmBCO bco ) * * ------------------------------------------------------------------------*/ -static void asmInstr( AsmBCO bco, StgWord i ) +static void asmInstrOp ( AsmBCO bco, StgWord i ) { + ASSERT(i <= BIGGEST_OPCODE); /* must be a valid opcode */ + bco->lastOpc = i; + insertInstrs(&(bco->is),i); +} + +static void asmInstr8 ( AsmBCO bco, StgWord i ) +{ + if (i >= 256) { ASSERT(i < 256); /* must be a byte */ + } insertInstrs(&(bco->is),i); } +static void asmInstr16 ( AsmBCO bco, StgWord i ) +{ + ASSERT(i < 65536); /* must be a short */ + insertInstrs(&(bco->is),i / 256); + insertInstrs(&(bco->is),i % 256); +} + +static Instr asmInstrBack ( AsmBCO bco, StgWord n ) +{ + return bco->is.elems[bco->is.len - n]; +} + +static void asmInstrRecede ( AsmBCO bco, StgWord n ) +{ + if (bco->is.len < n) barf("asmInstrRecede"); + bco->is.len -= n; +} + static void asmPtr( AsmBCO bco, AsmObject x ) { insertPtrs( &bco->object.ptrs, x ); @@ -439,6 +451,11 @@ static void asmWord( AsmBCO bco, StgWord i ) insertNonPtrs( &bco->nps, i ); } +static int asmFindInNonPtrs ( AsmBCO bco, StgWord i ) +{ + return findInNonPtrs ( &bco->nps, i ); +} + #define asmWords(bco,ty,x) \ { \ union { ty a; AsmWord b[sizeofW(ty)]; } p; \ @@ -456,25 +473,15 @@ static StgWord repSizeW( AsmRep rep ) case CHAR_REP: return sizeofW(StgWord) + sizeofW(StgChar); case BOOL_REP: - case INT_REP: return sizeofW(StgWord) + sizeofW(StgInt); -#ifdef PROVIDE_INT64 - case INT64_REP: return sizeofW(StgWord) + sizeofW(StgInt64); -#endif -#ifdef PROVIDE_WORD - case WORD_REP: return sizeofW(StgWord) + sizeofW(StgWord); -#endif -#ifdef PROVIDE_ADDR - case ADDR_REP: return sizeofW(StgWord) + sizeofW(StgAddr); -#endif - case FLOAT_REP: return sizeofW(StgWord) + sizeofW(StgFloat); - case DOUBLE_REP: return sizeofW(StgWord) + sizeofW(StgDouble); -#ifdef PROVIDE_STABLE - case STABLE_REP: return sizeofW(StgWord) + sizeofW(StgWord); -#endif + case INT_REP: return sizeofW(StgWord) + sizeofW(StgInt); + case THREADID_REP: + case WORD_REP: return sizeofW(StgWord) + sizeofW(StgWord); + case ADDR_REP: return sizeofW(StgWord) + sizeofW(StgAddr); + case FLOAT_REP: return sizeofW(StgWord) + sizeofW(StgFloat); + case DOUBLE_REP: return sizeofW(StgWord) + sizeofW(StgDouble); + case STABLE_REP: return sizeofW(StgWord) + sizeofW(StgWord); -#ifdef PROVIDE_INTEGER case INTEGER_REP: -#endif #ifdef PROVIDE_WEAK case WEAK_REP: #endif @@ -484,19 +491,15 @@ static StgWord repSizeW( AsmRep rep ) case ALPHA_REP: /* a */ case BETA_REP: /* b */ case GAMMA_REP: /* c */ + case DELTA_REP: /* d */ case HANDLER_REP: /* IOError -> IO a */ case ERROR_REP: /* IOError */ -#ifdef PROVIDE_ARRAY case ARR_REP : /* PrimArray a */ case BARR_REP : /* PrimByteArray a */ case REF_REP : /* Ref s a */ case MUTARR_REP : /* PrimMutableArray s a */ case MUTBARR_REP: /* PrimMutableByteArray s a */ -#endif -#ifdef PROVIDE_CONCURRENT - case THREADID_REP: /* ThreadId */ case MVAR_REP: /* MVar a */ -#endif case PTR_REP: return sizeofW(StgPtr); case VOID_REP: return sizeofW(StgWord); @@ -504,6 +507,261 @@ static StgWord repSizeW( AsmRep rep ) } } + +int asmRepSizeW ( AsmRep rep ) +{ + return repSizeW ( rep ); +} + + +/* -------------------------------------------------------------------------- + * Instruction emission. All instructions should be routed through here + * so that the peephole optimiser gets to see what's happening. + * ------------------------------------------------------------------------*/ + +static void emiti_ ( AsmBCO bco, Instr opcode ) +{ + StgInt x, y; + if (bco->lastOpc == i_SLIDE && opcode == i_ENTER) { + /* SLIDE x y ; ENTER ===> SE x y */ + x = asmInstrBack(bco,2); + y = asmInstrBack(bco,1); + asmInstrRecede(bco,3); + asmInstrOp(bco,i_SE); asmInstr8(bco,x); asmInstr8(bco,y); + } + else + if (bco->lastOpc == i_RV && opcode == i_ENTER) { + /* RV x y ; ENTER ===> RVE x (y-2) + Because RETADDR pushes 2 words on the stack, y must be at least 2. */ + x = asmInstrBack(bco,2); + y = asmInstrBack(bco,1); + if (y < 2) barf("emiti_: RVE: impossible y value"); + asmInstrRecede(bco,3); + asmInstrOp(bco, i_RVE); asmInstr8(bco,x); asmInstr8(bco,y-2); + } + else { + asmInstrOp(bco,opcode); + } +} + +static void emiti_8 ( AsmBCO bco, Instr opcode, int arg1 ) +{ + StgInt x; + if (bco->lastOpc == i_VAR && opcode == i_VAR) { + /* VAR x ; VAR y ===> VV x y */ + x = asmInstrBack(bco,1); + asmInstrRecede(bco,2); + asmInstrOp(bco,i_VV); asmInstr8(bco,x); asmInstr8(bco,arg1); + } + else + if (bco->lastOpc == i_RETADDR && opcode == i_VAR) { + /* RETADDR x ; VAR y ===> RV x y */ + x = asmInstrBack(bco,1); + asmInstrRecede(bco,2); + asmInstrOp(bco, i_RV); asmInstr8(bco,x); asmInstr8(bco,arg1); + } + else { + asmInstrOp(bco,opcode); + asmInstr8(bco,arg1); + } +} + +static void emiti_16 ( AsmBCO bco, Instr opcode, int arg1 ) +{ + asmInstrOp(bco,opcode); + asmInstr16(bco,arg1); +} + +static void emiti_8_8 ( AsmBCO bco, Instr opcode, int arg1, int arg2 ) +{ + asmInstrOp(bco,opcode); + asmInstr8(bco,arg1); + asmInstr8(bco,arg2); +} + +static void emiti_8_16 ( AsmBCO bco, Instr opcode, int arg1, int arg2 ) +{ + asmInstrOp(bco,opcode); + asmInstr8(bco,arg1); + asmInstr16(bco,arg2); +} + +static void emiti_16_16 ( AsmBCO bco, Instr opcode, int arg1, int arg2 ) +{ + asmInstrOp(bco,opcode); + asmInstr16(bco,arg1); + asmInstr16(bco,arg2); +} + + +/* -------------------------------------------------------------------------- + * Wrappers around the above fns + * ------------------------------------------------------------------------*/ + +static void emit_i_VAR_INT ( AsmBCO bco, int arg1 ) +{ + ASSERT(arg1 >= 0); + if (arg1 < 256) + emiti_8 (bco,i_VAR_INT, arg1); else + emiti_16(bco,i_VAR_INT_big,arg1); +} + +static void emit_i_VAR_WORD ( AsmBCO bco, int arg1 ) +{ + ASSERT(arg1 >= 0); + if (arg1 < 256) + emiti_8 (bco,i_VAR_WORD, arg1); else + emiti_16(bco,i_VAR_WORD_big,arg1); +} + +static void emit_i_VAR_ADDR ( AsmBCO bco, int arg1 ) +{ + ASSERT(arg1 >= 0); + if (arg1 < 256) + emiti_8 (bco,i_VAR_ADDR, arg1); else + emiti_16(bco,i_VAR_ADDR_big,arg1); +} + +static void emit_i_VAR_CHAR ( AsmBCO bco, int arg1 ) +{ + ASSERT(arg1 >= 0); + if (arg1 < 256) + emiti_8 (bco,i_VAR_CHAR, arg1); else + emiti_16(bco,i_VAR_CHAR_big,arg1); +} + +static void emit_i_VAR_FLOAT ( AsmBCO bco, int arg1 ) +{ + ASSERT(arg1 >= 0); + if (arg1 < 256) + emiti_8 (bco,i_VAR_FLOAT, arg1); else + emiti_16(bco,i_VAR_FLOAT_big,arg1); +} + +static void emit_i_VAR_DOUBLE ( AsmBCO bco, int arg1 ) +{ + ASSERT(arg1 >= 0); + if (arg1 < 256) + emiti_8 (bco,i_VAR_DOUBLE, arg1); else + emiti_16(bco,i_VAR_DOUBLE_big,arg1); +} + +static void emit_i_VAR_STABLE ( AsmBCO bco, int arg1 ) +{ + ASSERT(arg1 >= 0); + if (arg1 < 256) + emiti_8 (bco,i_VAR_STABLE, arg1); else + emiti_16(bco,i_VAR_STABLE_big,arg1); +} + +static void emit_i_VAR ( AsmBCO bco, int arg1 ) +{ + ASSERT(arg1 >= 0); + if (arg1 < 256) + emiti_8 (bco,i_VAR, arg1); else + emiti_16(bco,i_VAR_big,arg1); +} + +static void emit_i_PACK ( AsmBCO bco, int arg1 ) +{ + ASSERT(arg1 >= 0); + if (arg1 < 256) + emiti_8 (bco,i_PACK, arg1); else + emiti_16(bco,i_PACK_big,arg1); +} + +static void emit_i_SLIDE ( AsmBCO bco, int arg1, int arg2 ) +{ + ASSERT(arg1 >= 0); + ASSERT(arg2 >= 0); + if (arg1 < 256 && arg2 < 256) + emiti_8_8 (bco,i_SLIDE, arg1,arg2); else + emiti_16_16(bco,i_SLIDE_big,arg1,arg2); +} + +static void emit_i_MKAP ( AsmBCO bco, int arg1, int arg2 ) +{ + ASSERT(arg1 >= 0); + ASSERT(arg2 >= 0); + if (arg1 < 256 && arg2 < 256) + emiti_8_8 (bco,i_MKAP, arg1,arg2); else + emiti_16_16(bco,i_MKAP_big,arg1,arg2); +} + + +static void emit_i_CONST_INT ( AsmBCO bco, int arg1 ) +{ + ASSERT(arg1 >= 0); + if (arg1 < 256) + emiti_8 (bco,i_CONST_INT, arg1); else + emiti_16(bco,i_CONST_INT_big,arg1); +} + +static void emit_i_CONST_INTEGER ( AsmBCO bco, int arg1 ) +{ + ASSERT(arg1 >= 0); + if (arg1 < 256) + emiti_8 (bco,i_CONST_INTEGER, arg1); else + emiti_16(bco,i_CONST_INTEGER_big,arg1); +} + +static void emit_i_CONST_ADDR ( AsmBCO bco, int arg1 ) +{ + ASSERT(arg1 >= 0); + if (arg1 < 256) + emiti_8 (bco,i_CONST_ADDR, arg1); else + emiti_16(bco,i_CONST_ADDR_big,arg1); +} + +static void emit_i_CONST_CHAR ( AsmBCO bco, int arg1 ) +{ + ASSERT(arg1 >= 0); + if (arg1 < 256) + emiti_8 (bco,i_CONST_CHAR, arg1); else + emiti_16(bco,i_CONST_CHAR_big,arg1); +} + +static void emit_i_CONST_FLOAT ( AsmBCO bco, int arg1 ) +{ + ASSERT(arg1 >= 0); + if (arg1 < 256) + emiti_8 (bco,i_CONST_FLOAT, arg1); else + emiti_16(bco,i_CONST_FLOAT_big,arg1); +} + +static void emit_i_CONST_DOUBLE ( AsmBCO bco, int arg1 ) +{ + ASSERT(arg1 >= 0); + if (arg1 < 256) + emiti_8 (bco,i_CONST_DOUBLE, arg1); else + emiti_16(bco,i_CONST_DOUBLE_big,arg1); +} + +static void emit_i_CONST ( AsmBCO bco, int arg1 ) +{ + ASSERT(arg1 >= 0); + if (arg1 < 256) + emiti_8 (bco,i_CONST, arg1); else + emiti_16(bco,i_CONST_big,arg1); +} + +static void emit_i_RETADDR ( AsmBCO bco, int arg1 ) +{ + ASSERT(arg1 >= 0); + if (arg1 < 256) + emiti_8 (bco,i_RETADDR, arg1); else + emiti_16(bco,i_RETADDR_big,arg1); +} + +static void emit_i_ALLOC_CONSTR ( AsmBCO bco, int arg1 ) +{ + ASSERT(arg1 >= 0); + if (arg1 < 256) + emiti_8 (bco,i_ALLOC_CONSTR, arg1); else + emiti_16(bco,i_ALLOC_CONSTR_big,arg1); +} + + /* -------------------------------------------------------------------------- * Arg checks. * ------------------------------------------------------------------------*/ @@ -518,10 +776,7 @@ void asmEndArgCheck ( AsmBCO bco, AsmSp last_arg ) { nat args = bco->sp - last_arg; if (args != 0) { /* optimisation */ - asmInstr(bco,i_ARG_CHECK); - asmInstr(bco,args); - grabHpNonUpd(bco,PAP_sizeW(args-1)); - resetHp(bco,0); + emiti_8(bco,i_ARG_CHECK,args); } } @@ -531,50 +786,47 @@ void asmEndArgCheck ( AsmBCO bco, AsmSp last_arg ) AsmVar asmBind ( AsmBCO bco, AsmRep rep ) { - bco->sp += repSizeW(rep); + incSp(bco,repSizeW(rep)); return bco->sp; } void asmVar ( AsmBCO bco, AsmVar v, AsmRep rep ) { + int offset; + + if (rep == VOID_REP) { + emiti_(bco,i_VOID); + incSp(bco,repSizeW(rep)); + return; + } + + offset = bco->sp - v; switch (rep) { case BOOL_REP: case INT_REP: - asmInstr(bco,i_VAR_INT); - break; -#ifdef PROVIDE_INT64 - case INT64_REP: - asmInstr(bco,i_VAR_INT64); + emit_i_VAR_INT(bco,offset); break; -#endif -#ifdef PROVIDE_WORD + case THREADID_REP: case WORD_REP: - asmInstr(bco,i_VAR_WORD); + emit_i_VAR_WORD(bco,offset); break; -#endif -#ifdef PROVIDE_ADDR case ADDR_REP: - asmInstr(bco,i_VAR_ADDR); + emit_i_VAR_ADDR(bco,offset); break; -#endif case CHAR_REP: - asmInstr(bco,i_VAR_CHAR); + emit_i_VAR_CHAR(bco,offset); break; case FLOAT_REP: - asmInstr(bco,i_VAR_FLOAT); + emit_i_VAR_FLOAT(bco,offset); break; case DOUBLE_REP: - asmInstr(bco,i_VAR_DOUBLE); + emit_i_VAR_DOUBLE(bco,offset); break; -#ifdef PROVIDE_STABLE case STABLE_REP: - asmInstr(bco,i_VAR_STABLE); + emit_i_VAR_STABLE(bco,offset); break; -#endif -#ifdef PROVIDE_INTEGER case INTEGER_REP: -#endif #ifdef PROVIDE_WEAK case WEAK_REP: #endif @@ -584,32 +836,22 @@ void asmVar ( AsmBCO bco, AsmVar v, AsmRep rep ) case ALPHA_REP: /* a */ case BETA_REP: /* b */ case GAMMA_REP: /* c */ + case DELTA_REP: /* d */ case HANDLER_REP: /* IOError -> IO a */ case ERROR_REP: /* IOError */ -#ifdef PROVIDE_ARRAY case ARR_REP : /* PrimArray a */ case BARR_REP : /* PrimByteArray a */ case REF_REP : /* Ref s a */ case MUTARR_REP : /* PrimMutableArray s a */ case MUTBARR_REP: /* PrimMutableByteArray s a */ -#endif -#ifdef PROVIDE_CONCURRENT - case THREADID_REP: /* ThreadId */ case MVAR_REP: /* MVar a */ -#endif case PTR_REP: - asmInstr(bco,i_VAR); + emit_i_VAR(bco,offset); break; - - case VOID_REP: - asmInstr(bco,i_VOID); - bco->sp += repSizeW(rep); - return; /* NB we don't break! */ default: barf("asmVar %d",rep); } - asmInstr(bco,bco->sp - v); - bco->sp += repSizeW(rep); + incSp(bco,repSizeW(rep)); } /* -------------------------------------------------------------------------- @@ -627,12 +869,11 @@ void asmEndEnter( AsmBCO bco, AsmSp sp1, AsmSp sp2 ) int y = sp1 - sp2; ASSERT(x >= 0 && y >= 0); if (y != 0) { - asmInstr(bco,i_SLIDE); - asmInstr(bco,x); - asmInstr(bco,y); - bco->sp -= sp1 - sp2; + emit_i_SLIDE(bco,x,y); + decSp(bco,sp1 - sp2); } - asmInstr(bco,i_ENTER); + emiti_(bco,i_ENTER); + decSp(bco,sizeofW(StgPtr)); } /* -------------------------------------------------------------------------- @@ -643,52 +884,34 @@ AsmVar asmBox( AsmBCO bco, AsmRep rep ) { switch (rep) { case CHAR_REP: - asmInstr(bco,i_PACK_CHAR); - grabHpNonUpd(bco,Czh_sizeW); + emiti_(bco,i_PACK_CHAR); break; case INT_REP: - asmInstr(bco,i_PACK_INT); - grabHpNonUpd(bco,Izh_sizeW); - break; -#ifdef PROVIDE_INT64 - case INT64_REP: - asmInstr(bco,i_PACK_INT64); - grabHpNonUpd(bco,I64zh_sizeW); + emiti_(bco,i_PACK_INT); break; -#endif -#ifdef PROVIDE_WORD + case THREADID_REP: case WORD_REP: - asmInstr(bco,i_PACK_WORD); - grabHpNonUpd(bco,Wzh_sizeW); + emiti_(bco,i_PACK_WORD); break; -#endif -#ifdef PROVIDE_ADDR case ADDR_REP: - asmInstr(bco,i_PACK_ADDR); - grabHpNonUpd(bco,Azh_sizeW); + emiti_(bco,i_PACK_ADDR); break; -#endif case FLOAT_REP: - asmInstr(bco,i_PACK_FLOAT); - grabHpNonUpd(bco,Fzh_sizeW); + emiti_(bco,i_PACK_FLOAT); break; case DOUBLE_REP: - asmInstr(bco,i_PACK_DOUBLE); - grabHpNonUpd(bco,Dzh_sizeW); + emiti_(bco,i_PACK_DOUBLE); break; -#ifdef PROVIDE_STABLE case STABLE_REP: - asmInstr(bco,i_PACK_STABLE); - grabHpNonUpd(bco,Stablezh_sizeW); + emiti_(bco,i_PACK_STABLE); break; -#endif default: barf("asmBox %d",rep); } /* NB: these operations DO pop their arg */ - bco->sp -= repSizeW(rep); /* pop unboxed arg */ - bco->sp += sizeofW(StgPtr); /* push box */ + decSp(bco, repSizeW(rep)); /* pop unboxed arg */ + incSp(bco, sizeofW(StgPtr)); /* push box */ return bco->sp; } @@ -700,110 +923,35 @@ AsmVar asmUnbox( AsmBCO bco, AsmRep rep ) { switch (rep) { case INT_REP: - asmInstr(bco,i_UNPACK_INT); - break; -#ifdef PROVIDE_INT64 - case INT64_REP: - asmInstr(bco,i_UNPACK_INT64); + emiti_(bco,i_UNPACK_INT); break; -#endif -#ifdef PROVIDE_WORD + case THREADID_REP: case WORD_REP: - asmInstr(bco,i_UNPACK_WORD); + emiti_(bco,i_UNPACK_WORD); break; -#endif -#ifdef PROVIDE_ADDR case ADDR_REP: - asmInstr(bco,i_UNPACK_ADDR); + emiti_(bco,i_UNPACK_ADDR); break; -#endif case CHAR_REP: - asmInstr(bco,i_UNPACK_CHAR); + emiti_(bco,i_UNPACK_CHAR); break; case FLOAT_REP: - asmInstr(bco,i_UNPACK_FLOAT); + emiti_(bco,i_UNPACK_FLOAT); break; case DOUBLE_REP: - asmInstr(bco,i_UNPACK_DOUBLE); + emiti_(bco,i_UNPACK_DOUBLE); break; -#ifdef PROVIDE_STABLE case STABLE_REP: - asmInstr(bco,i_UNPACK_STABLE); + emiti_(bco,i_UNPACK_STABLE); break; -#endif default: barf("asmUnbox %d",rep); } /* NB: these operations DO NOT pop their arg */ - bco->sp += repSizeW(rep); /* push unboxed arg */ + incSp(bco, repSizeW(rep)); /* push unboxed arg */ return bco->sp; } -/* -------------------------------------------------------------------------- - * Return unboxed Ints, Floats, etc - * ------------------------------------------------------------------------*/ - -void asmReturnUnboxed( AsmBCO bco, AsmRep rep ) -{ - switch (rep) { - case CHAR_REP: - asmInstr(bco,i_RETURN_CHAR); - break; - case INT_REP: - asmInstr(bco,i_RETURN_INT); - break; -#ifdef PROVIDE_INT64 - case INT64_REP: - asmInstr(bco,i_RETURN_INT64); - break; -#endif -#ifdef PROVIDE_WORD - case WORD_REP: - asmInstr(bco,i_RETURN_WORD); - break; -#endif -#ifdef PROVIDE_ADDR - case ADDR_REP: - asmInstr(bco,i_RETURN_ADDR); - break; -#endif - case FLOAT_REP: - asmInstr(bco,i_RETURN_FLOAT); - break; - case DOUBLE_REP: - asmInstr(bco,i_RETURN_DOUBLE); - break; -#ifdef PROVIDE_STABLE - case STABLE_REP: - asmInstr(bco,i_RETURN_STABLE); - break; -#endif -#ifdef PROVIDE_INTEGER - case INTEGER_REP: -#endif -#ifdef PROVIDE_WEAK - case WEAK_REP: -#endif -#ifdef PROVIDE_FOREIGN - case FOREIGN_REP: -#endif -#ifdef PROVIDE_ARRAY - case ARR_REP : /* PrimArray a */ - case BARR_REP : /* PrimByteArray a */ - case REF_REP : /* Ref s a */ - case MUTARR_REP : /* PrimMutableArray s a */ - case MUTBARR_REP: /* PrimMutableByteArray s a */ -#endif -#ifdef PROVIDE_CONCURRENT - case THREADID_REP: /* ThreadId */ - case MVAR_REP: /* MVar a */ -#endif - asmInstr(bco,i_RETURN_GENERIC); - break; - default: - barf("asmReturnUnboxed %d",rep); - } -} /* -------------------------------------------------------------------------- * Push unboxed Ints, Floats, etc @@ -811,78 +959,55 @@ void asmReturnUnboxed( AsmBCO bco, AsmRep rep ) void asmConstInt( AsmBCO bco, AsmInt x ) { - asmInstr(bco,i_CONST_INT); - asmInstr(bco,bco->nps.len); + emit_i_CONST_INT(bco,bco->nps.len); asmWords(bco,AsmInt,x); - bco->sp += repSizeW(INT_REP); + incSp(bco, repSizeW(INT_REP)); } -#ifdef PROVIDE_INT64 -void asmConstInt64( AsmBCO bco, AsmInt64 x ) -{ - asmInstr(bco,i_CONST_INT64); - asmInstr(bco,bco->nps.len); - asmWords(bco,AsmInt64,x); - bco->sp += repSizeW(INT64_REP); -} -#endif - -#ifdef PROVIDE_INTEGER void asmConstInteger( AsmBCO bco, AsmString x ) { - asmInstr(bco,i_CONST_INTEGER); - asmInstr(bco,bco->nps.len); + emit_i_CONST_INTEGER(bco,bco->nps.len); asmWords(bco,AsmString,x); - bco->sp += repSizeW(INTEGER_REP); + incSp(bco, repSizeW(INTEGER_REP)); } -#endif -#ifdef PROVIDE_ADDR void asmConstAddr( AsmBCO bco, AsmAddr x ) { - asmInstr(bco,i_CONST_ADDR); - asmInstr(bco,bco->nps.len); + emit_i_CONST_ADDR(bco,bco->nps.len); asmWords(bco,AsmAddr,x); - bco->sp += repSizeW(ADDR_REP); + incSp(bco, repSizeW(ADDR_REP)); } -#endif -#ifdef PROVIDE_WORD void asmConstWord( AsmBCO bco, AsmWord x ) { - asmInstr(bco,i_CONST_INT); - asmInstr(bco,bco->nps.len); - asmWords(bco,AsmWord,x); - bco->sp += repSizeW(WORD_REP); + emit_i_CONST_INT(bco,bco->nps.len); + asmWords(bco,AsmWord,(AsmInt)x); + incSp(bco, repSizeW(WORD_REP)); } -#endif void asmConstChar( AsmBCO bco, AsmChar x ) { - asmInstr(bco,i_CONST_CHAR); - asmInstr(bco,bco->nps.len); + emit_i_CONST_CHAR(bco,bco->nps.len); asmWords(bco,AsmChar,x); - bco->sp += repSizeW(CHAR_REP); + incSp(bco, repSizeW(CHAR_REP)); } void asmConstFloat( AsmBCO bco, AsmFloat x ) { - asmInstr(bco,i_CONST_FLOAT); - asmInstr(bco,bco->nps.len); + emit_i_CONST_FLOAT(bco,bco->nps.len); asmWords(bco,AsmFloat,x); - bco->sp += repSizeW(FLOAT_REP); + incSp(bco, repSizeW(FLOAT_REP)); } void asmConstDouble( AsmBCO bco, AsmDouble x ) { - asmInstr(bco,i_CONST_DOUBLE); - asmInstr(bco,bco->nps.len); + emit_i_CONST_DOUBLE(bco,bco->nps.len); asmWords(bco,AsmDouble,x); - bco->sp += repSizeW(DOUBLE_REP); + incSp(bco, repSizeW(DOUBLE_REP)); } /* -------------------------------------------------------------------------- - * + * Algebraic case helpers * ------------------------------------------------------------------------*/ /* a mildly bogus pair of functions... */ @@ -897,17 +1022,16 @@ void asmEndCase( AsmBCO bco ) AsmSp asmContinuation( AsmBCO bco, AsmBCO ret_addr ) { - asmInstr(bco,i_RETADDR); - asmInstr(bco,bco->object.ptrs.len); + emit_i_RETADDR(bco,bco->object.ptrs.len); asmPtr(bco,&(ret_addr->object)); - bco->sp += 2 * sizeofW(StgPtr); + incSp(bco, 2 * sizeofW(StgPtr)); return bco->sp; } AsmBCO asmBeginContinuation ( AsmSp sp, int /*List*/ alts ) { AsmBCO bco = asmBeginBCO(alts); - bco->sp = sp; + setSp(bco, sp); return bco; } @@ -928,20 +1052,12 @@ AsmSp asmBeginAlt( AsmBCO bco ) void asmEndAlt( AsmBCO bco, AsmSp sp ) { -#if 0 - /* This warning is now redundant since we no longer use the hp/max_hp - * information calculated by the assembler - */ -#warning ToDo: adjust hp/max_hp in asmEndAlt -#endif - resetSp(bco,sp); + setSp(bco,sp); } AsmPc asmTest( AsmBCO bco, AsmWord tag ) { - asmInstr(bco,i_TEST); - asmInstr(bco,tag); - asmInstr(bco,0); + emiti_8_16(bco,i_TEST,tag,0); return bco->is.len; } @@ -949,9 +1065,8 @@ AsmPc asmTestInt( AsmBCO bco, AsmVar v, AsmInt x ) { asmVar(bco,v,INT_REP); asmConstInt(bco,x); - asmInstr(bco,i_TEST_INT); - asmInstr(bco,0); - bco->sp -= 2*repSizeW(INT_REP); + emiti_16(bco,i_TEST_INT,0); + decSp(bco, 2*repSizeW(INT_REP)); return bco->is.len; } @@ -959,12 +1074,14 @@ void asmFixBranch( AsmBCO bco, AsmPc from ) { int distance = bco->is.len - from; ASSERT(distance >= 0); - setInstrs(&(bco->is),from-1,distance); + ASSERT(distance < 65536); + setInstrs(&(bco->is),from-2,distance/256); + setInstrs(&(bco->is),from-1,distance%256); } void asmPanic( AsmBCO bco ) { - asmInstr(bco,i_PANIC); /* "irrefutable" pattern failed - oops! */ + emiti_(bco,i_PANIC); /* "irrefutable" pattern failed - oops! */ } /* -------------------------------------------------------------------------- @@ -976,11 +1093,15 @@ AsmSp asmBeginPrim( AsmBCO bco ) return bco->sp; } -void asmEndPrim( AsmBCO bco, const AsmPrim* prim, AsmSp base ) +void asmEndPrim( AsmBCO bco, const AsmPrim* prim, AsmSp base ) { - asmInstr(bco,prim->prefix); - asmInstr(bco,prim->opcode); - bco->sp = base; + emiti_8(bco,prim->prefix,prim->opcode); + setSp(bco, base); +} + +char* asmGetPrimopName ( AsmPrim* p ) +{ + return p->name; } /* Hugs used to let you add arbitrary primops with arbitrary types @@ -988,7 +1109,7 @@ void asmEndPrim( AsmBCO bco, const AsmPrim* prim, AsmSp base ) * We deliberately avoided that approach because we wanted more * control over which primops are provided. */ -const AsmPrim asmPrimOps[] = { +AsmPrim asmPrimOps[] = { /* Char# operations */ { "primGtChar", "CC", "B", MONAD_Id, i_PRIMOP1, i_gtChar } @@ -1025,45 +1146,6 @@ const AsmPrim asmPrimOps[] = { , { "primShiftRAInt", "II", "I", MONAD_Id, i_PRIMOP1, i_shiftRAInt } , { "primShiftRLInt", "II", "I", MONAD_Id, i_PRIMOP1, i_shiftRLInt } -#ifdef PROVIDE_INT64 - /* Int64# operations */ - , { "primGtInt64", "zz", "B", MONAD_Id, i_PRIMOP1, i_gtInt64 } - , { "primGeInt64", "zz", "B", MONAD_Id, i_PRIMOP1, i_geInt64 } - , { "primEqInt64", "zz", "B", MONAD_Id, i_PRIMOP1, i_eqInt64 } - , { "primNeInt64", "zz", "B", MONAD_Id, i_PRIMOP1, i_neInt64 } - , { "primLtInt64", "zz", "B", MONAD_Id, i_PRIMOP1, i_ltInt64 } - , { "primLeInt64", "zz", "B", MONAD_Id, i_PRIMOP1, i_leInt64 } - , { "primMinInt64", "", "z", MONAD_Id, i_PRIMOP1, i_minInt64 } - , { "primMaxInt64", "", "z", MONAD_Id, i_PRIMOP1, i_maxInt64 } - , { "primPlusInt64", "zz", "z", MONAD_Id, i_PRIMOP1, i_plusInt64 } - , { "primMinusInt64", "zz", "z", MONAD_Id, i_PRIMOP1, i_minusInt64 } - , { "primTimesInt64", "zz", "z", MONAD_Id, i_PRIMOP1, i_timesInt64 } - , { "primQuotInt64", "zz", "z", MONAD_Id, i_PRIMOP1, i_quotInt64 } - , { "primRemInt64", "zz", "z", MONAD_Id, i_PRIMOP1, i_remInt64 } - , { "primQuotRemInt64", "zz", "zz", MONAD_Id, i_PRIMOP1, i_quotRemInt64 } - , { "primNegateInt64", "z", "z", MONAD_Id, i_PRIMOP1, i_negateInt64 } - - , { "primAndInt64", "zz", "z", MONAD_Id, i_PRIMOP1, i_andInt64 } - , { "primOrInt64", "zz", "z", MONAD_Id, i_PRIMOP1, i_orInt64 } - , { "primXorInt64", "zz", "z", MONAD_Id, i_PRIMOP1, i_xorInt64 } - , { "primNotInt64", "z", "z", MONAD_Id, i_PRIMOP1, i_notInt64 } - , { "primShiftLInt64", "zW", "z", MONAD_Id, i_PRIMOP1, i_shiftLInt64 } - , { "primShiftRAInt64", "zW", "z", MONAD_Id, i_PRIMOP1, i_shiftRAInt64 } - , { "primShiftRLInt64", "zW", "z", MONAD_Id, i_PRIMOP1, i_shiftRLInt64 } - - , { "primInt64ToInt", "z", "I", MONAD_Id, i_PRIMOP1, i_int64ToInt } - , { "primIntToInt64", "I", "z", MONAD_Id, i_PRIMOP1, i_intToInt64 } -#ifdef PROVIDE_WORD - , { "primInt64ToWord", "z", "W", MONAD_Id, i_PRIMOP1, i_int64ToWord } - , { "primWordToInt64", "W", "z", MONAD_Id, i_PRIMOP1, i_wordToInt64 } -#endif - , { "primInt64ToFloat", "z", "F", MONAD_Id, i_PRIMOP1, i_int64ToFloat } - , { "primFloatToInt64", "F", "z", MONAD_Id, i_PRIMOP1, i_floatToInt64 } - , { "primInt64ToDouble", "z", "D", MONAD_Id, i_PRIMOP1, i_int64ToDouble } - , { "primDoubleToInt64", "D", "z", MONAD_Id, i_PRIMOP1, i_doubleToInt64 } -#endif - -#ifdef PROVIDE_WORD /* Word# operations */ , { "primGtWord", "WW", "B", MONAD_Id, i_PRIMOP1, i_gtWord } , { "primGeWord", "WW", "B", MONAD_Id, i_PRIMOP1, i_geWord } @@ -1091,9 +1173,7 @@ const AsmPrim asmPrimOps[] = { , { "primIntToWord", "I", "W", MONAD_Id, i_PRIMOP1, i_intToWord } , { "primWordToInt", "W", "I", MONAD_Id, i_PRIMOP1, i_wordToInt } -#endif -#ifdef PROVIDE_ADDR /* Addr# operations */ , { "primGtAddr", "AA", "B", MONAD_Id, i_PRIMOP1, i_gtAddr } , { "primGeAddr", "AA", "B", MONAD_Id, i_PRIMOP1, i_geAddr } @@ -1106,54 +1186,34 @@ const AsmPrim asmPrimOps[] = { , { "primIndexCharOffAddr", "AI", "C", MONAD_Id, i_PRIMOP1, i_indexCharOffAddr } , { "primIndexIntOffAddr", "AI", "I", MONAD_Id, i_PRIMOP1, i_indexIntOffAddr } -#ifdef PROVIDE_INT64 - , { "primIndexInt64OffAddr", "AI", "z", MONAD_Id, i_PRIMOP1, i_indexInt64OffAddr } -#endif -#ifdef PROVIDE_WORD , { "primIndexWordOffAddr", "AI", "W", MONAD_Id, i_PRIMOP1, i_indexWordOffAddr } -#endif , { "primIndexAddrOffAddr", "AI", "A", MONAD_Id, i_PRIMOP1, i_indexAddrOffAddr } , { "primIndexFloatOffAddr", "AI", "F", MONAD_Id, i_PRIMOP1, i_indexFloatOffAddr } , { "primIndexDoubleOffAddr", "AI", "D", MONAD_Id, i_PRIMOP1, i_indexDoubleOffAddr } -#ifdef PROVIDE_STABLE , { "primIndexStableOffAddr", "AI", "s", MONAD_Id, i_PRIMOP1, i_indexStableOffAddr } -#endif + + /* Stable# operations */ + , { "primIntToStablePtr", "I", "s", MONAD_Id, i_PRIMOP1, i_intToStable } + , { "primStablePtrToInt", "s", "I", MONAD_Id, i_PRIMOP1, i_stableToInt } /* These ops really ought to be in the IO monad */ , { "primReadCharOffAddr", "AI", "C", MONAD_ST, i_PRIMOP1, i_readCharOffAddr } , { "primReadIntOffAddr", "AI", "I", MONAD_ST, i_PRIMOP1, i_readIntOffAddr } -#ifdef PROVIDE_INT64 - , { "primReadInt64OffAddr", "AI", "z", MONAD_ST, i_PRIMOP1, i_readInt64OffAddr } -#endif -#ifdef PROVIDE_WORD , { "primReadWordOffAddr", "AI", "W", MONAD_ST, i_PRIMOP1, i_readWordOffAddr } -#endif , { "primReadAddrOffAddr", "AI", "A", MONAD_ST, i_PRIMOP1, i_readAddrOffAddr } , { "primReadFloatOffAddr", "AI", "F", MONAD_ST, i_PRIMOP1, i_readFloatOffAddr } , { "primReadDoubleOffAddr", "AI", "D", MONAD_ST, i_PRIMOP1, i_readDoubleOffAddr } -#ifdef PROVIDE_STABLE , { "primReadStableOffAddr", "AI", "s", MONAD_ST, i_PRIMOP1, i_readStableOffAddr } -#endif /* These ops really ought to be in the IO monad */ , { "primWriteCharOffAddr", "AIC", "", MONAD_ST, i_PRIMOP1, i_writeCharOffAddr } , { "primWriteIntOffAddr", "AII", "", MONAD_ST, i_PRIMOP1, i_writeIntOffAddr } -#ifdef PROVIDE_INT64 - , { "primWriteInt64OffAddr", "AIz", "", MONAD_ST, i_PRIMOP1, i_writeInt64OffAddr } -#endif -#ifdef PROVIDE_WORD , { "primWriteWordOffAddr", "AIW", "", MONAD_ST, i_PRIMOP1, i_writeWordOffAddr } -#endif , { "primWriteAddrOffAddr", "AIA", "", MONAD_ST, i_PRIMOP1, i_writeAddrOffAddr } , { "primWriteFloatOffAddr", "AIF", "", MONAD_ST, i_PRIMOP1, i_writeFloatOffAddr } , { "primWriteDoubleOffAddr", "AID", "", MONAD_ST, i_PRIMOP1, i_writeDoubleOffAddr } -#ifdef PROVIDE_STABLE , { "primWriteStableOffAddr", "AIs", "", MONAD_ST, i_PRIMOP1, i_writeStableOffAddr } -#endif - -#endif /* PROVIDE_ADDR */ -#ifdef PROVIDE_INTEGER /* Integer operations */ , { "primCompareInteger", "ZZ", "I", MONAD_Id, i_PRIMOP1, i_compareInteger } , { "primNegateInteger", "Z", "Z", MONAD_Id, i_PRIMOP1, i_negateInteger } @@ -1164,19 +1224,12 @@ const AsmPrim asmPrimOps[] = { , { "primDivModInteger", "ZZ", "ZZ", MONAD_Id, i_PRIMOP1, i_divModInteger } , { "primIntegerToInt", "Z", "I", MONAD_Id, i_PRIMOP1, i_integerToInt } , { "primIntToInteger", "I", "Z", MONAD_Id, i_PRIMOP1, i_intToInteger } -#ifdef PROVIDE_INT64 - , { "primIntegerToInt64", "Z", "z", MONAD_Id, i_PRIMOP1, i_integerToInt64 } - , { "primInt64ToInteger", "z", "Z", MONAD_Id, i_PRIMOP1, i_int64ToInteger } -#endif -#ifdef PROVIDE_WORD , { "primIntegerToWord", "Z", "W", MONAD_Id, i_PRIMOP1, i_integerToWord } , { "primWordToInteger", "W", "Z", MONAD_Id, i_PRIMOP1, i_wordToInteger } -#endif , { "primIntegerToFloat", "Z", "F", MONAD_Id, i_PRIMOP1, i_integerToFloat } , { "primFloatToInteger", "F", "Z", MONAD_Id, i_PRIMOP1, i_floatToInteger } , { "primIntegerToDouble", "Z", "D", MONAD_Id, i_PRIMOP1, i_integerToDouble } , { "primDoubleToInteger", "D", "Z", MONAD_Id, i_PRIMOP1, i_doubleToInteger } -#endif /* Float# operations */ , { "primGtFloat", "FF", "B", MONAD_Id, i_PRIMOP1, i_gtFloat } @@ -1211,14 +1264,8 @@ const AsmPrim asmPrimOps[] = { , { "primCoshFloat", "F", "F", MONAD_Id, i_PRIMOP1, i_coshFloat } , { "primTanhFloat", "F", "F", MONAD_Id, i_PRIMOP1, i_tanhFloat } , { "primPowerFloat", "FF", "F", MONAD_Id, i_PRIMOP1, i_powerFloat } -#ifdef PROVIDE_INT64 - , { "primDecodeFloatz", "F", "zI", MONAD_Id, i_PRIMOP1, i_decodeFloatz } - , { "primEncodeFloatz", "zI", "F", MONAD_Id, i_PRIMOP1, i_encodeFloatz } -#endif -#ifdef PROVIDE_INTEGER , { "primDecodeFloatZ", "F", "ZI", MONAD_Id, i_PRIMOP1, i_decodeFloatZ } , { "primEncodeFloatZ", "ZI", "F", MONAD_Id, i_PRIMOP1, i_encodeFloatZ } -#endif , { "primIsNaNFloat", "F", "B", MONAD_Id, i_PRIMOP1, i_isNaNFloat } , { "primIsInfiniteFloat", "F", "B", MONAD_Id, i_PRIMOP1, i_isInfiniteFloat } , { "primIsDenormalizedFloat", "F", "B", MONAD_Id, i_PRIMOP1, i_isDenormalizedFloat } @@ -1260,29 +1307,14 @@ const AsmPrim asmPrimOps[] = { , { "primCoshDouble", "D", "D", MONAD_Id, i_PRIMOP1, i_coshDouble } , { "primTanhDouble", "D", "D", MONAD_Id, i_PRIMOP1, i_tanhDouble } , { "primPowerDouble", "DD", "D", MONAD_Id, i_PRIMOP1, i_powerDouble } -#ifdef PROVIDE_INT64 - , { "primDecodeDoublez", "D", "zI", MONAD_Id, i_PRIMOP1, i_decodeDoublez } - , { "primEncodeDoublez", "zI", "D", MONAD_Id, i_PRIMOP1, i_encodeDoublez } -#endif -#ifdef PROVIDE_INTEGER , { "primDecodeDoubleZ", "D", "ZI", MONAD_Id, i_PRIMOP1, i_decodeDoubleZ } , { "primEncodeDoubleZ", "ZI", "D", MONAD_Id, i_PRIMOP1, i_encodeDoubleZ } -#endif , { "primIsNaNDouble", "D", "B", MONAD_Id, i_PRIMOP1, i_isNaNDouble } , { "primIsInfiniteDouble", "D", "B", MONAD_Id, i_PRIMOP1, i_isInfiniteDouble } , { "primIsDenormalizedDouble", "D", "B", MONAD_Id, i_PRIMOP1, i_isDenormalizedDouble } , { "primIsNegativeZeroDouble", "D", "B", MONAD_Id, i_PRIMOP1, i_isNegativeZeroDouble } , { "primIsIEEEDouble", "", "B", MONAD_Id, i_PRIMOP1, i_isIEEEDouble } - - /* Polymorphic force :: a -> (# #) */ - /* , { "primForce", "a", "", MONAD_Id, i_PRIMOP2, i_force } */ - - /* Error operations - not in IO monad! */ - //, { "primRaise", "E", "a", MONAD_Id, i_PRIMOP2, i_raise } - //, { "primCatch'", "aH", "a", MONAD_Id, i_PRIMOP2, i_catch } - -#ifdef PROVIDE_ARRAY /* Ref operations */ , { "primNewRef", "a", "R", MONAD_ST, i_PRIMOP2, i_newRef } , { "primWriteRef", "Ra", "", MONAD_ST, i_PRIMOP2, i_writeRef } @@ -1313,57 +1345,52 @@ const AsmPrim asmPrimOps[] = { , { "primReadIntArray", "mI", "I", MONAD_ST, i_PRIMOP2, i_readIntArray } , { "primIndexIntArray", "xI", "I", MONAD_Id, i_PRIMOP2, i_indexIntArray } -#ifdef PROVIDE_INT64 - , { "primWriteInt64Array", "mIz", "", MONAD_ST, i_PRIMOP2, i_writeInt64Array } - , { "primReadInt64Array", "mI", "z", MONAD_ST, i_PRIMOP2, i_readInt64Array } - , { "primIndexInt64Array", "xI", "z", MONAD_Id, i_PRIMOP2, i_indexInt64Array } -#endif - /* {new,write,read,index}IntegerArray not provided */ -#ifdef PROVIDE_WORD , { "primWriteWordArray", "mIW", "", MONAD_ST, i_PRIMOP2, i_writeWordArray } , { "primReadWordArray", "mI", "W", MONAD_ST, i_PRIMOP2, i_readWordArray } , { "primIndexWordArray", "xI", "W", MONAD_Id, i_PRIMOP2, i_indexWordArray } -#endif -#ifdef PROVIDE_ADDR , { "primWriteAddrArray", "mIA", "", MONAD_ST, i_PRIMOP2, i_writeAddrArray } , { "primReadAddrArray", "mI", "A", MONAD_ST, i_PRIMOP2, i_readAddrArray } , { "primIndexAddrArray", "xI", "A", MONAD_Id, i_PRIMOP2, i_indexAddrArray } -#endif , { "primWriteFloatArray", "mIF", "", MONAD_ST, i_PRIMOP2, i_writeFloatArray } , { "primReadFloatArray", "mI", "F", MONAD_ST, i_PRIMOP2, i_readFloatArray } , { "primIndexFloatArray", "xI", "F", MONAD_Id, i_PRIMOP2, i_indexFloatArray } - , { "primWriteDoubleArray" , "mID", "", MONAD_ST, i_PRIMOP2, i_writeDoubleArray } , { "primReadDoubleArray", "mI", "D", MONAD_ST, i_PRIMOP2, i_readDoubleArray } , { "primIndexDoubleArray", "xI", "D", MONAD_Id, i_PRIMOP2, i_indexDoubleArray } -#ifdef PROVIDE_STABLE +#if 0 +#ifdef PROVIDE_STABLE , { "primWriteStableArray", "mIs", "", MONAD_ST, i_PRIMOP2, i_writeStableArray } , { "primReadStableArray", "mI", "s", MONAD_ST, i_PRIMOP2, i_readStableArray } , { "primIndexStableArray", "xI", "s", MONAD_Id, i_PRIMOP2, i_indexStableArray } #endif - +#endif /* {new,write,read,index}ForeignObjArray not provided */ -#endif PROVIDE_ARRAY #ifdef PROVIDE_FOREIGN /* ForeignObj# operations */ - , { "primMakeForeignObj", "A", "f", MONAD_IO, i_PRIMOP2, i_makeForeignObj } + , { "primMkForeignObj", "A", "f", MONAD_IO, i_PRIMOP2, i_mkForeignObj } #endif #ifdef PROVIDE_WEAK /* WeakPair# operations */ , { "primMakeWeak", "bac", "w", MONAD_IO, i_PRIMOP2, i_makeWeak } , { "primDeRefWeak", "w", "Ia", MONAD_IO, i_PRIMOP2, i_deRefWeak } #endif -#ifdef PROVIDE_STABLE /* StablePtr# operations */ , { "primMakeStablePtr", "a", "s", MONAD_IO, i_PRIMOP2, i_makeStablePtr } , { "primDeRefStablePtr", "s", "a", MONAD_IO, i_PRIMOP2, i_deRefStablePtr } , { "primFreeStablePtr", "s", "", MONAD_IO, i_PRIMOP2, i_freeStablePtr } -#endif + + /* foreign export dynamic support */ + , { "primCreateAdjThunkARCH", "sAC","A", MONAD_IO, i_PRIMOP2, i_createAdjThunkARCH } + + /* misc handy hacks */ + , { "primGetArgc", "", "I", MONAD_IO, i_PRIMOP2, i_getArgc } + , { "primGetArgv", "I", "A", MONAD_IO, i_PRIMOP2, i_getArgv } + #ifdef PROVIDE_PTREQUALITY , { "primReallyUnsafePtrEquality", "aa", "B",MONAD_Id, i_PRIMOP2, i_reallyUnsafePtrEquality } #endif @@ -1372,27 +1399,50 @@ const AsmPrim asmPrimOps[] = { #endif #ifdef PROVIDE_CONCURRENT /* Concurrency operations */ - , { "primFork", "a", "T", MONAD_IO, i_PRIMOP2, i_fork } + , { "primForkIO", "a", "T", MONAD_IO, i_PRIMOP2, i_forkIO } , { "primKillThread", "T", "", MONAD_IO, i_PRIMOP2, i_killThread } - , { "primSameMVar", "rr", "B", MONAD_Id, i_PRIMOP2, i_sameMVar } - , { "primNewMVar", "", "r", MONAD_IO, i_PRIMOP2, i_newMVar } - , { "primTakeMVar", "r", "a", MONAD_IO, i_PRIMOP2, i_takeMVar } - , { "primPutMVar", "ra", "", MONAD_IO, i_PRIMOP2, i_putMVar } - , { "primDelay", "I", "", MONAD_IO, i_PRIMOP2, i_delay } + , { "primRaiseInThread", "TE", "", MONAD_IO, i_PRIMOP2, i_raiseInThread } + , { "primWaitRead", "I", "", MONAD_IO, i_PRIMOP2, i_waitRead } , { "primWaitWrite", "I", "", MONAD_IO, i_PRIMOP2, i_waitWrite } + , { "primYield", "", "", MONAD_IO, i_PRIMOP2, i_yield } , { "primDelay", "I", "", MONAD_IO, i_PRIMOP2, i_delay } + , { "primGetThreadId", "", "T", MONAD_IO, i_PRIMOP2, i_getThreadId } + , { "primCmpThreadIds", "TT", "I", MONAD_Id, i_PRIMOP2, i_cmpThreadIds } #endif + , { "primNewEmptyMVar", "", "r", MONAD_IO, i_PRIMOP2, i_newMVar } + /* primTakeMVar is handwritten bytecode */ + , { "primPutMVar", "ra", "", MONAD_IO, i_PRIMOP2, i_putMVar } + , { "primSameMVar", "rr", "B", MONAD_Id, i_PRIMOP2, i_sameMVar } + /* Ccall is polyadic - so it's excluded from this table */ - , { 0,0,0,0 } + , { 0,0,0,0,0,0 } }; -const AsmPrim ccall_Id = { "ccall", 0, 0, MONAD_IO, i_PRIMOP2, i_ccall_Id }; -const AsmPrim ccall_IO = { "ccall", 0, 0, MONAD_IO, i_PRIMOP2, i_ccall_IO }; +AsmPrim ccall_ccall_Id + = { "ccall", 0, 0, MONAD_IO, i_PRIMOP2, i_ccall_ccall_Id }; +AsmPrim ccall_ccall_IO + = { "ccall", 0, 0, MONAD_IO, i_PRIMOP2, i_ccall_ccall_IO }; +AsmPrim ccall_stdcall_Id + = { "ccall", 0, 0, MONAD_IO, i_PRIMOP2, i_ccall_stdcall_Id }; +AsmPrim ccall_stdcall_IO + = { "ccall", 0, 0, MONAD_IO, i_PRIMOP2, i_ccall_stdcall_IO }; +#ifdef DEBUG +void checkBytecodeCount( void ); +void checkBytecodeCount( void ) +{ + if (MAX_Primop1 >= 255) { + printf("Too many Primop1 bytecodes (%d)\n",MAX_Primop1); + } + if (MAX_Primop2 >= 255) { + printf("Too many Primop2 bytecodes (%d)\n",MAX_Primop2); + } +} +#endif -const AsmPrim* asmFindPrim( char* s ) +AsmPrim* asmFindPrim( char* s ) { int i; for (i=0; asmPrimOps[i].name; ++i) { @@ -1403,7 +1453,7 @@ const AsmPrim* asmFindPrim( char* s ) return 0; } -const AsmPrim* asmFindPrimop( AsmInstr prefix, AsmInstr op ) +AsmPrim* asmFindPrimop( AsmInstr prefix, AsmInstr op ) { nat i; for (i=0; asmPrimOps[i].name; ++i) { @@ -1421,10 +1471,11 @@ const AsmPrim* asmFindPrimop( AsmInstr prefix, AsmInstr op ) AsmBCO asm_BCO_catch ( void ) { AsmBCO bco = asmBeginBCO(0 /*NIL*/); - asmInstr(bco,i_ARG_CHECK); asmInstr(bco,2); - asmInstr(bco,i_PRIMOP1); asmInstr(bco,i_pushcatchframe); - bco->sp += (1-2)*sizeofW(StgPtr) + sizeofW(StgCatchFrame); - asmInstr(bco,i_ENTER); + emiti_8(bco,i_ARG_CHECK,2); + emiti_8(bco,i_PRIMOP1,i_pushcatchframe); + incSp(bco, (1-2)*sizeofW(StgPtr) + sizeofW(StgCatchFrame)); + emiti_(bco,i_ENTER); + decSp(bco, sizeofW(StgPtr)); asmEndBCO(bco); return bco; } @@ -1432,8 +1483,9 @@ AsmBCO asm_BCO_catch ( void ) AsmBCO asm_BCO_raise ( void ) { AsmBCO bco = asmBeginBCO(0 /*NIL*/); - asmInstr(bco,i_ARG_CHECK); asmInstr(bco,1); - asmInstr(bco,i_PRIMOP2); asmInstr(bco,i_raise); + emiti_8(bco,i_ARG_CHECK,1); + emiti_8(bco,i_PRIMOP2,i_raise); + decSp(bco,sizeofW(StgPtr)); asmEndBCO(bco); return bco; } @@ -1443,40 +1495,88 @@ AsmBCO asm_BCO_seq ( void ) AsmBCO eval, cont; cont = asmBeginBCO(0 /*NIL*/); - asmInstr(cont,i_ARG_CHECK); asmInstr(cont,2); - asmInstr(cont,i_VAR); asmInstr(cont,1); - asmInstr(cont,i_SLIDE); asmInstr(cont,1); asmInstr(cont,2); - asmInstr(cont,i_ENTER); - cont->sp += 3*sizeofW(StgPtr); + emiti_8(cont,i_ARG_CHECK,2); /* should never fail */ + emit_i_VAR(cont,1); + emit_i_SLIDE(cont,1,2); + emiti_(cont,i_ENTER); + incSp(cont, 3*sizeofW(StgPtr)); asmEndBCO(cont); eval = asmBeginBCO(0 /*NIL*/); - asmInstr(eval,i_ARG_CHECK); asmInstr(eval,2); - asmInstr(eval,i_RETADDR); - asmInstr(eval,eval->object.ptrs.len); + emiti_8(eval,i_ARG_CHECK,2); + emit_i_RETADDR(eval,eval->object.ptrs.len); asmPtr(eval,&(cont->object)); - asmInstr(eval,i_VAR); asmInstr(eval,2); - asmInstr(eval,i_SLIDE); asmInstr(eval,3); asmInstr(eval,1); - asmInstr(eval,i_PRIMOP1); asmInstr(eval,i_pushseqframe); - asmInstr(eval,i_ENTER); - eval->sp += sizeofW(StgSeqFrame) + 4*sizeofW(StgPtr); + emit_i_VAR(eval,2); + emit_i_SLIDE(eval,3,1); + emiti_8(eval,i_PRIMOP1,i_pushseqframe); + emiti_(eval,i_ENTER); + incSp(eval, sizeofW(StgSeqFrame) + 4*sizeofW(StgPtr)); asmEndBCO(eval); return eval; } +AsmBCO asm_BCO_takeMVar ( void ) +{ + AsmBCO kase, casecont, take; + + take = asmBeginBCO(0 /*NIL*/); + emit_i_VAR(take,0); + emiti_8(take,i_PRIMOP2,i_takeMVar); + emit_i_VAR(take,3); + emit_i_VAR(take,1); + emit_i_VAR(take,4); + emit_i_SLIDE(take,3,4); + emiti_(take,i_ENTER); + incSp(take,20); + asmEndBCO(take); + + casecont = asmBeginBCO(0 /*NIL*/); + emiti_(casecont,i_UNPACK); + emit_i_VAR(casecont,4); + emit_i_VAR(casecont,4); + emit_i_VAR(casecont,2); + emit_i_CONST(casecont,casecont->object.ptrs.len); + asmPtr(casecont,&(take->object)); + emit_i_SLIDE(casecont,4,5); + emiti_(casecont,i_ENTER); + incSp(casecont,20); + asmEndBCO(casecont); + + kase = asmBeginBCO(0 /*NIL*/); + emiti_8(kase,i_ARG_CHECK,3); + emit_i_RETADDR(kase,kase->object.ptrs.len); + asmPtr(kase,&(casecont->object)); + emit_i_VAR(kase,2); + emiti_(kase,i_ENTER); + incSp(kase,20); + asmEndBCO(kase); + + return kase; +} + + /* -------------------------------------------------------------------------- * Heap manipulation * ------------------------------------------------------------------------*/ AsmVar asmAllocCONSTR ( AsmBCO bco, AsmInfo info ) { + int i; ASSERT( sizeW_fromITBL(info) >= MIN_NONUPD_SIZE + sizeofW(StgHeader) ); - asmInstr(bco,i_ALLOC_CONSTR); - asmInstr(bco,bco->nps.len); - asmWords(bco,AsmInfo,info); - bco->sp += sizeofW(StgClosurePtr); - grabHpNonUpd(bco,sizeW_fromITBL(info)); + + /* Look in this bco's collection of nonpointers (literals) + to see if the itbl pointer is already there. If so, re-use it. */ + i = asmFindInNonPtrs ( bco, (StgWord)info ); + + if (i == -1) { + emit_i_ALLOC_CONSTR(bco,bco->nps.len); + asmWords(bco,AsmInfo,info); + } else { + emit_i_ALLOC_CONSTR(bco,i); + } + + incSp(bco, sizeofW(StgClosurePtr)); return bco->sp; } @@ -1492,9 +1592,8 @@ void asmEndPack( AsmBCO bco, AsmVar v, AsmSp start, AsmInfo info ) assert(start >= v); /* only reason to include info is for this assertion */ assert(info->layout.payload.ptrs == size); - asmInstr(bco,i_PACK); - asmInstr(bco,bco->sp - v); - bco->sp = start; + emit_i_PACK(bco, bco->sp - v); + setSp(bco, start); } void asmBeginUnpack( AsmBCO bco ) @@ -1504,15 +1603,13 @@ void asmBeginUnpack( AsmBCO bco ) void asmEndUnpack( AsmBCO bco ) { - asmInstr(bco,i_UNPACK); + emiti_(bco,i_UNPACK); } AsmVar asmAllocAP( AsmBCO bco, AsmNat words ) { - asmInstr(bco,i_ALLOC_AP); - asmInstr(bco,words); - bco->sp += sizeofW(StgPtr); - grabHpUpd(bco,AP_sizeW(words)); + emiti_8(bco,i_ALLOC_AP,words); + incSp(bco, sizeofW(StgPtr)); return bco->sp; } @@ -1523,17 +1620,15 @@ AsmSp asmBeginMkAP( AsmBCO bco ) void asmEndMkAP( AsmBCO bco, AsmVar v, AsmSp start ) { - asmInstr(bco,i_MKAP); - asmInstr(bco,bco->sp-v); - asmInstr(bco,bco->sp-start-1); /* -1 because fun isn't counted */ - bco->sp = start; + emit_i_MKAP(bco,bco->sp-v,bco->sp-start-1); + /* -1 because fun isn't counted */ + setSp(bco, start); } AsmVar asmAllocPAP( AsmBCO bco, AsmNat size ) { - asmInstr(bco,i_ALLOC_PAP); - asmInstr(bco,size); - bco->sp += sizeofW(StgPtr); + emiti_8(bco,i_ALLOC_PAP,size); + incSp(bco, sizeofW(StgPtr)); return bco->sp; } @@ -1544,29 +1639,29 @@ AsmSp asmBeginMkPAP( AsmBCO bco ) void asmEndMkPAP( AsmBCO bco, AsmVar v, AsmSp start ) { - asmInstr(bco,i_MKPAP); - asmInstr(bco,bco->sp-v); - asmInstr(bco,bco->sp-start-1); /* -1 because fun isn't counted */ - bco->sp = start; + emiti_8_8(bco,i_MKPAP,bco->sp-v,bco->sp-start-1); + /* -1 because fun isn't counted */ + setSp(bco, start); } AsmVar asmClosure( AsmBCO bco, AsmObject p ) { - StgWord o = bco->object.ptrs.len; - if (o < 256) { - asmInstr(bco,i_CONST); - asmInstr(bco,o); - asmPtr(bco,p); - } else { - asmInstr(bco,i_CONST2); - asmInstr(bco,o / 256); - asmInstr(bco,o % 256); - asmPtr(bco,p); - } - bco->sp += sizeofW(StgPtr); + emit_i_CONST(bco,bco->object.ptrs.len); + asmPtr(bco,p); + incSp(bco, sizeofW(StgPtr)); return bco->sp; } +AsmVar asmGHCClosure( AsmBCO bco, AsmObject p ) +{ + // A complete hack. Pushes the address as a tagged int + // and then uses SLIDE to get rid of the tag. Appalling. + asmConstInt(bco, (AsmInt)p); + emit_i_SLIDE(bco,0,1); decSp(bco,1); + return bco->sp; +} + + /* -------------------------------------------------------------------------- * Building InfoTables * ------------------------------------------------------------------------*/ @@ -1584,7 +1679,6 @@ AsmInfo asmMkInfo( AsmNat tag, AsmNat ptrs ) info->layout.payload.nptrs = nptrs; info->srt_len = tag; info->type = CONSTR; - info->flags = FLAGS_CONSTR; #ifdef USE_MINIINTERPRETER info->entry = stgCast(StgFunPtr,&Hugs_CONSTR_entry); #else