diff --git a/src/0000Boot/0000Kernel.BIN.C b/src/0000Boot/0000Kernel.BIN.C index 9bc22a46..9e4802f4 100755 Binary files a/src/0000Boot/0000Kernel.BIN.C and b/src/0000Boot/0000Kernel.BIN.C differ diff --git a/src/Apps/Budget/BgtFile.HC b/src/Apps/Budget/BgtFile.HC index bb0537b8..87566cb3 100755 --- a/src/Apps/Budget/BgtFile.HC +++ b/src/Apps/Budget/BgtFile.HC @@ -2,7 +2,7 @@ U0 BgtDataRead() { CBgtEntry *tmpb; CBgtTemplate *tmpt; - I64 i,cnt,size; + I64 i,count,size; U8 *b,*ptr; I64 max_num; U8 **s=StrFileRead(bgt_string_file,&max_num); @@ -15,8 +15,8 @@ U0 BgtDataRead() t_head.b.date=Now; if (ptr=b=FileRead(bgt_data_file,&size)) { - cnt=*ptr(I64 *)++; - for (i=0;istart,ptr,BE_SIZE); tmpb->credit=StrNew(s[tmpb->credit_idx]); @@ -26,8 +26,8 @@ U0 BgtDataRead() ptr+=BE_SIZE; } - cnt=*ptr(I64 *)++; - for (i=0;istart,ptr,BT_SIZE); ptr+=BT_SIZE; @@ -48,7 +48,7 @@ U0 BgtDataRead() U0 BgtDataWrite() { - I64 i,num=0,size,cnt1,cnt2; + I64 i,num=0,size,count1,count2; CHashTable *table=HashTableNew(1024); CBgtEntry *tmpb; CBgtTemplate *tmpt; @@ -64,33 +64,33 @@ U0 BgtDataWrite() } tmpb=b_head.next; - cnt1=0; + count1=0; while (tmpb!=&b_head) { if (tmpb->type!=BE_TEMPLATE_COPY) { tmpb->credit_idx =StrFileAdd(tmpb->credit,&num,table); tmpb->debit_idx =StrFileAdd(tmpb->debit,&num,table); tmpb->desc_idx =StrFileAdd(tmpb->desc,&num,table); - cnt1++; + count1++; } tmpb=tmpb->next; } tmpt=t_head.next; - cnt2=0; + count2=0; while (tmpt!=&t_head) { tmpt->b.credit_idx =StrFileAdd(tmpt->b.credit,&num,table); tmpt->b.debit_idx =StrFileAdd(tmpt->b.debit,&num,table); tmpt->b.desc_idx =StrFileAdd(tmpt->b.desc,&num,table); - cnt2++; + count2++; tmpt=tmpt->next; } StrFileWrite(bgt_string_file,table); StrFileDel(table); - size=sizeof(I64)*2+cnt1*BE_SIZE+cnt2*(BT_SIZE+BE_SIZE); + size=sizeof(I64)*2+count1*BE_SIZE+count2*(BT_SIZE+BE_SIZE); buf=ptr=MAlloc(size); - MemCpy(ptr,&cnt1,sizeof(I64)); + MemCpy(ptr,&count1,sizeof(I64)); ptr+=sizeof(I64); tmpb=b_head.next; while (tmpb!=&b_head) { @@ -101,7 +101,7 @@ U0 BgtDataWrite() tmpb=tmpb->next; } - MemCpy(ptr,&cnt2,sizeof(I64)); + MemCpy(ptr,&count2,sizeof(I64)); ptr+=sizeof(I64); tmpt=t_head.next; while (tmpt!=&t_head) { diff --git a/src/Apps/Budget/BgtMain.HC b/src/Apps/Budget/BgtMain.HC index 23a17454..7de84c45 100755 --- a/src/Apps/Budget/BgtMain.HC +++ b/src/Apps/Budget/BgtMain.HC @@ -137,8 +137,8 @@ U0 BgtRegen() //and line entries, so we never had to resync. doc_ce=pdoc->cur_entry; - timeout_jiffy=cnts.jiffies+JIFFY_FREQ; //Max one second. - while (doc_ce!=pdoc && cnts.jiffiestype_u8!=DOCT_MENU_VAL || !(tmpb_ce=doc_ce->user_data)) { doc_ce=doc_ce->next; if (doc_ce==pdoc) goto br_cont; diff --git a/src/Apps/Budget/BgtStrs.HC b/src/Apps/Budget/BgtStrs.HC index 6170eec5..52c37141 100755 --- a/src/Apps/Budget/BgtStrs.HC +++ b/src/Apps/Budget/BgtStrs.HC @@ -78,14 +78,14 @@ I64 StrEntriesCompare(CHashGeneric *h1,CHashGeneric *h2) public U0 StrFileWrite(U8 *name,CHashTable *table,Bool no_nums=FALSE) { - I64 i,j,cnt,color=BLACK; + I64 i,j,count,color=BLACK; CDoc *doc=DocNew(name); CHashGeneric *tmph,**a; if (table) { - cnt=0; //Count Strings + count=0; //Count Strings for (i=0;i<=table->mask;i++) - cnt+=LinkedLstCnt(table->body[i]); - a=MAlloc(cnt*sizeof(CHashGeneric *)); + count+=LinkedLstCount(table->body[i]); + a=MAlloc(count*sizeof(CHashGeneric *)); j=0; //Load Strings for (i=0;i<=table->mask;i++) { tmph=table->body[i]; @@ -94,8 +94,8 @@ public U0 StrFileWrite(U8 *name,CHashTable *table,Bool no_nums=FALSE) tmph=tmph->next; } } - QSortI64(a,cnt,&StrEntriesCompare); - for (i=0;iuser_data1&15!=color) { DocPrint(doc,"$$FG,%d$$",tmph->user_data1&15); diff --git a/src/Apps/GrModels/BallGen.HC b/src/Apps/GrModels/BallGen.HC index 6ab0b144..db80159d 100755 --- a/src/Apps/GrModels/BallGen.HC +++ b/src/Apps/GrModels/BallGen.HC @@ -5,8 +5,8 @@ class Ball { - I32 vertex_cnt; - I32 tri_cnt; + I32 vertex_count; + I32 tri_count; CD3I32 v[VERTICES_NUM]; CMeshTri t[TRIS_NUM]; } *b; @@ -35,10 +35,10 @@ U0 BDCorrect(BallDefineStruct *bd) I64 AddVertex(BallDefineStruct *,I64 x,I64 y,I64 z) { I64 i; - for (i=0;ivertex_cnt;i++) + for (i=0;ivertex_count;i++) if (b->v[i].x==x && b->v[i].y==y && b->v[i].z==z) return i; - i=b->vertex_cnt++; + i=b->vertex_count++; b->v[i].x=x; b->v[i].y=y; b->v[i].z=z; @@ -47,7 +47,7 @@ I64 AddVertex(BallDefineStruct *,I64 x,I64 y,I64 z) I64 AddTri(BallDefineStruct *,I64 c,I64 n0,I64 n1,I64 n2) { - I64 res=b->tri_cnt++; + I64 res=b->tri_count++; b->t[res].color=c; b->t[res].nums[0]=n0; b->t[res].nums[1]=n1; @@ -59,16 +59,16 @@ U8 *Ball2CSprite() { //See $LK,"::/Zenith/Gr/GrSpritePlot.HC",A="FL:::/Zenith/Gr/GrSpritePlot.HC,1"$ for how CSprite are stored. U8 *res=MAlloc(sizeof(CSpriteMeshU8s)+ - b->vertex_cnt*sizeof(CD3I32)+b->tri_cnt*sizeof(CMeshTri) + b->vertex_count*sizeof(CD3I32)+b->tri_count*sizeof(CMeshTri) +sprite_elem_base_sizes[SPT_END]), *dst=res; *dst++ =SPT_MESH; - *dst(I32 *)++ =b->vertex_cnt; - *dst(I32 *)++ =b->tri_cnt; - MemCpy(dst,&b->v,b->vertex_cnt*sizeof(CD3I32)); - dst+=b->vertex_cnt*sizeof(CD3I32); - MemCpy(dst,&b->t,b->tri_cnt*sizeof(CMeshTri)); - dst+=b->tri_cnt*sizeof(CMeshTri); + *dst(I32 *)++ =b->vertex_count; + *dst(I32 *)++ =b->tri_count; + MemCpy(dst,&b->v,b->vertex_count*sizeof(CD3I32)); + dst+=b->vertex_count*sizeof(CD3I32); + MemCpy(dst,&b->t,b->tri_count*sizeof(CMeshTri)); + dst+=b->tri_count*sizeof(CMeshTri); *dst++ =SPT_END; return res; } @@ -116,7 +116,7 @@ public U8 *BallGen() "%h7c",'\n'; Sprite(res,"\t\t$$SP,\"<1>\",BI=%d$$"); "%h7c",'\n'; - "Vertices:%d\n",b->vertex_cnt; + "Vertices:%d\n",b->vertex_count; Free(b); "Do another"; if (YorN) diff --git a/src/Apps/GrModels/ManGen.HC b/src/Apps/GrModels/ManGen.HC index 0ed6ae52..32f83830 100755 --- a/src/Apps/GrModels/ManGen.HC +++ b/src/Apps/GrModels/ManGen.HC @@ -5,8 +5,8 @@ class Man { - I32 vertex_cnt; - I32 tri_cnt; + I32 vertex_count; + I32 tri_count; CD3I32 v[VERTICES_NUM]; CMeshTri t[TRIS_NUM]; } *m; @@ -142,7 +142,7 @@ U0 MDCorrect(ManDefineStruct *md) I64 AddVertex(ManDefineStruct *md,I64 x,I64 y,I64 z) { - I64 res=m->vertex_cnt++; + I64 res=m->vertex_count++; m->v[res].x=-x; m->v[res].y=-y-md->leg_len-md->foot_rad*2; m->v[res].z=-z; @@ -151,7 +151,7 @@ I64 AddVertex(ManDefineStruct *md,I64 x,I64 y,I64 z) I64 AddTri(ManDefineStruct *,I64 c,I64 n0,I64 n1,I64 n2) { - I64 res=m->tri_cnt++; + I64 res=m->tri_count++; m->t[res].color=c; m->t[res].nums[0]=n1; m->t[res].nums[1]=n0; @@ -213,16 +213,16 @@ U8 *Man2CSprite() { //See $LK,"::/Zenith/Gr/GrSpritePlot.HC",A="FL:::/Zenith/Gr/GrSpritePlot.HC,1"$ for how CSprite are stored. U8 *res=MAlloc(sizeof(CSpriteMeshU8s)+ - m->vertex_cnt*sizeof(CD3I32)+m->tri_cnt*sizeof(CMeshTri)+ + m->vertex_count*sizeof(CD3I32)+m->tri_count*sizeof(CMeshTri)+ sprite_elem_base_sizes[SPT_END]), *dst=res; *dst++ =SPT_MESH; - *dst(I32 *)++ =m->vertex_cnt; - *dst(I32 *)++ =m->tri_cnt; - MemCpy(dst,&m->v,m->vertex_cnt*sizeof(CD3I32)); - dst+=m->vertex_cnt*sizeof(CD3I32); - MemCpy(dst,&m->t,m->tri_cnt*sizeof(CMeshTri)); - dst+=m->tri_cnt*sizeof(CMeshTri); + *dst(I32 *)++ =m->vertex_count; + *dst(I32 *)++ =m->tri_count; + MemCpy(dst,&m->v,m->vertex_count*sizeof(CD3I32)); + dst+=m->vertex_count*sizeof(CD3I32); + MemCpy(dst,&m->t,m->tri_count*sizeof(CMeshTri)); + dst+=m->tri_count*sizeof(CMeshTri); *dst++ =SPT_END; return res; } diff --git a/src/Apps/Psalmody/PsalmodyMain.HC b/src/Apps/Psalmody/PsalmodyMain.HC index 72eebbb2..9bf295fc 100755 --- a/src/Apps/Psalmody/PsalmodyMain.HC +++ b/src/Apps/Psalmody/PsalmodyMain.HC @@ -641,7 +641,7 @@ mo_got_message: tmpn=psm.cur_note; while (tmpn!=&psm.head) { if (tmpn->type!=PSMT_METER) { - timeout_val=cnts.jiffies; + timeout_val=counts.jiffies; if (ms.pos_text.y-Fs->win_top<18) message_code=ScanMessage(&arg1,&arg2,1<next; } - if (_size) *_size=cnt; + if (_size) *_size=count; return res; } diff --git a/src/Apps/Titanium/Titanium.HC b/src/Apps/Titanium/Titanium.HC index f355c0e1..ce67077c 100755 --- a/src/Apps/Titanium/Titanium.HC +++ b/src/Apps/Titanium/Titanium.HC @@ -274,14 +274,14 @@ U0 MPMenDraw(CDC *dc2) { CTask *task=dc2->win_task; CDC *dc=DCAlias(dc2,task); - I64 i,r[16],lo=Gs->num*U_NUM/mp_cnt,hi=(Gs->num+1)*U_NUM/mp_cnt, + I64 i,r[16],lo=Gs->num*U_NUM/mp_count,hi=(Gs->num+1)*U_NUM/mp_count, yy,phase,scroll_y=MAP_HEIGHT-100-100*(tS-t0); Unit *tmpu; Explosion *tmpe; U8 *tmps,**_tmps; F64 tt,ts=tS; - for (i=Gs->num;inum;iy-scroll_y)&(MAP_HEIGHT-1); if (-32<=yy<=task->pix_bottom+32 && !tmpe->dead) { @@ -376,8 +376,8 @@ U0 DrawIt(CTask *task,CDC *dc) } DCDepthBufAlloc(dc); - mp_not_done_flags=1<x; y=(tmpu->y-scroll_y)&(MAP_HEIGHT-1); if (0<=xcollision_cnt=0; + dc2->collision_count=0; GrRect(dc2,x-3,y-9,6,8); - if (dc2->collision_cnt) + if (dc2->collision_count) ManDie(tmpu,TRUE); } } @@ -817,7 +817,7 @@ U0 Titanium() try { while (TRUE) { - next_update_jiffy=cnts.jiffies+JIFFY_FREQ/100; + next_update_jiffy=counts.jiffies+JIFFY_FREQ/100; while (message_code=ScanMessage(&ch,&sc,1<life=0; VisRecalc(VR_FRIENDLY_UNIT_DIED,target); - alive_cnt[target->player]--; + alive_count[target->player]--; return TRUE; } else { if (target->armor) { @@ -201,7 +201,7 @@ Bool HexOccupy(Bool overrun,Unit *tmpu,Unit *target) } else { tmpu->life=0; VisRecalc(VR_FRIENDLY_UNIT_DIED,tmpu); - alive_cnt[tmpu->player]--; + alive_count[tmpu->player]--; "$$RED$$Failure$$FG$$\n"; while (scrncast.ona) //see $LK,"Snd",A="MN:Snd"$() Yield; diff --git a/src/Apps/ToTheFront/TTFGlobals.HC b/src/Apps/ToTheFront/TTFGlobals.HC index 7d8cafe3..9190e925 100755 --- a/src/Apps/ToTheFront/TTFGlobals.HC +++ b/src/Apps/ToTheFront/TTFGlobals.HC @@ -78,7 +78,7 @@ U8 vis_unit_bitmap[2][(((UNITS_NUM+7)&~7)*UNITS_NUM)>>3]; #define PHASE_END 6 I64 phase,cur_player,enemy_player,view_player,turn, - cursor_row,cursor_col,alive_cnt[2], + cursor_row,cursor_col,alive_count[2], player_indirect[2],player_move[2],player_direct[2]; F64 animation_delay=0.5; diff --git a/src/Apps/ToTheFront/TTFInit.HC b/src/Apps/ToTheFront/TTFInit.HC index 509c1a44..b288cece 100755 --- a/src/Apps/ToTheFront/TTFInit.HC +++ b/src/Apps/ToTheFront/TTFInit.HC @@ -71,10 +71,10 @@ U0 DrawHexes() } } -U0 MakeTerrain(U8 color,I64 cnt,I64 clus_lo,I64 clus_hi) +U0 MakeTerrain(U8 color,I64 count,I64 clus_lo,I64 clus_hi) { I64 i,j,l,row,col; - for (i=0;iplayer=j; tmpu->num=i; diff --git a/src/Apps/ToTheFront/TTFVis.HC b/src/Apps/ToTheFront/TTFVis.HC index 9b532aba..bd0cc398 100755 --- a/src/Apps/ToTheFront/TTFVis.HC +++ b/src/Apps/ToTheFront/TTFVis.HC @@ -133,7 +133,7 @@ Bool MPVisRecalc(MPCtrl1 *job) Bool VisRecalc(I64 mode,Unit *tmpu=NULL) { - I64 i,hi,k,cnt; + I64 i,hi,k,count; Bool res; /*The compiler doesn't go out of it's way to know if something is const.;-)This @@ -143,8 +143,8 @@ AOT binaries.ZenithOS has a limited stk size, so don't get in the habit. $LK,"MAlloc",A="MN:MAlloc"$() would probably be the better choice. */ - MPCtrl1 job[mp_cnt]; - CJob *cmd[mp_cnt]; + MPCtrl1 job[mp_count]; + CJob *cmd[mp_count]; if (mode==VR_FRIENDLY_UNIT_DIED) { MemSet((&vis_unit_bitmap[enemy_player])(U8 *)+ @@ -153,7 +153,7 @@ $LK,"MAlloc",A="MN:MAlloc"$() would probably be the better choice. return 0; //Return any value--don't care } - cnt=mp_cnt; //Cores + count=mp_count; //Cores hi=UNITS_NUM; if (mode==VR_ONE_ENEMY_UNIT) { for (hi--;hi>=0;hi--) @@ -162,22 +162,22 @@ $LK,"MAlloc",A="MN:MAlloc"$() would probably be the better choice. hi++; } k=hi; - if (hi/mp_cnt<2) - cnt=1; - for (i=0;inum.local_asm_undef_hash=NULL; arg->num.glbl_asm_undef_hash=NULL; cc->asm_undef_hash=NULL; - cc->abs_cnts=0; + cc->abs_counts=0; cc->flags&=~(CCF_UNRESOLVED+CCF_LOCAL); if (!IsLexExpression2Bin(cc,&arg->num.machine_code)) LexSkipEol(cc); else { - if (cc->abs_cnts.externs) + if (cc->abs_counts.externs) LexExcept(cc,"Extern Not Allowed at "); if (cc->flags & CCF_UNRESOLVED) { if (cc->flags & CCF_LOCAL) { @@ -114,8 +114,8 @@ U0 ParseAsmArg(CCompCtrl *cc,CAsmArg *arg,Bool rel) } else { pa_asm_direct_imm: ParseAsmImm(cc,arg); - arg->num.abs_cnts=cc->abs_cnts; - if (arg->size<=1 && !rel && arg->num.abs_cnts&1) { + arg->num.abs_counts=cc->abs_counts; + if (arg->size<=1 && !rel && arg->num.abs_counts&1) { if (cc->aotc->seg_size==16) arg->size=2; else @@ -162,7 +162,7 @@ pa_asm_direct_imm: } else { pa_asm_indirect_imm: ParseAsmImm(cc,arg); - arg->num.abs_cnts=cc->abs_cnts; + arg->num.abs_counts=cc->abs_counts; } } if (cc->token!=']') @@ -265,7 +265,7 @@ mm_done: return res; } -Bool AsmStoreNum(CCompCtrl *cc,CAsmNum2 *num2,I64 cnt,Bool U8_avail) +Bool AsmStoreNum(CCompCtrl *cc,CAsmNum2 *num2,I64 count,Bool U8_avail) { CAOTCtrl *aotc=cc->aotc; I64 i; @@ -273,8 +273,8 @@ Bool AsmStoreNum(CCompCtrl *cc,CAsmNum2 *num2,I64 cnt,Bool U8_avail) if (!num2->imm_flag) num2->num.i-=num2->rel; - for (i=0;iU8_cnt==1) { + for (i=0;iU8_count==1) { if (num2->num.local_asm_undef_hash||num2->num.glbl_asm_undef_hash) AsmUnresolvedAdd(cc,num2->num.machine_code,IET_REL_I8+num2->imm_flag, aotc->rip,num2->rel,num2->num.local_asm_undef_hash, @@ -283,7 +283,7 @@ Bool AsmStoreNum(CCompCtrl *cc,CAsmNum2 *num2,I64 cnt,Bool U8_avail) else if (!num2->imm_flag && !(I8_MIN<=num2->num.i<=I8_MAX)) LexExcept(cc,"Branch out of range at "); if (num2->imm_flag) { - if (num2->num.abs_cnts.abs_addres&1) { + if (num2->num.abs_counts.abs_addres&1) { tmpa=CAlloc(sizeof(CAOTAbsAddr)); tmpa->next=aotc->abss; aotc->abss=tmpa; @@ -291,7 +291,7 @@ Bool AsmStoreNum(CCompCtrl *cc,CAsmNum2 *num2,I64 cnt,Bool U8_avail) tmpa->type=AAT_ADD_U8; } } else { - if (num2->num.abs_cnts.c_addres&1) { + if (num2->num.abs_counts.c_addres&1) { tmpa=CAlloc(sizeof(CAOTAbsAddr)); tmpa->next=aotc->abss; aotc->abss=tmpa; @@ -301,7 +301,7 @@ Bool AsmStoreNum(CCompCtrl *cc,CAsmNum2 *num2,I64 cnt,Bool U8_avail) } AOTStoreCodeU8(cc,num2->num.i); } else { - if (num2->U8_cnt==2) { + if (num2->U8_count==2) { if (num2->num.local_asm_undef_hash||num2->num.glbl_asm_undef_hash) AsmUnresolvedAdd(cc,num2->num.machine_code,IET_REL_I16+num2->imm_flag, aotc->rip,num2->rel,num2->num.local_asm_undef_hash, @@ -310,7 +310,7 @@ Bool AsmStoreNum(CCompCtrl *cc,CAsmNum2 *num2,I64 cnt,Bool U8_avail) else if (!num2->imm_flag && !(I16_MIN<=num2->num.i<=I16_MAX)) LexExcept(cc,"Branch out of range at "); if (num2->imm_flag) { - if (num2->num.abs_cnts.abs_addres&1) { + if (num2->num.abs_counts.abs_addres&1) { tmpa=CAlloc(sizeof(CAOTAbsAddr)); tmpa->next=aotc->abss; aotc->abss=tmpa; @@ -318,7 +318,7 @@ Bool AsmStoreNum(CCompCtrl *cc,CAsmNum2 *num2,I64 cnt,Bool U8_avail) tmpa->type=AAT_ADD_U16; } } else { - if (num2->num.abs_cnts.c_addres&1) { + if (num2->num.abs_counts.c_addres&1) { tmpa=CAlloc(sizeof(CAOTAbsAddr)); tmpa->next=aotc->abss; aotc->abss=tmpa; @@ -328,7 +328,7 @@ Bool AsmStoreNum(CCompCtrl *cc,CAsmNum2 *num2,I64 cnt,Bool U8_avail) } AOTStoreCodeU8(cc,num2->num.i.u8[0]); AOTStoreCodeU8(cc,num2->num.i.u8[1]); - } else if (num2->U8_cnt==4) { + } else if (num2->U8_count==4) { if (num2->num.local_asm_undef_hash||num2->num.glbl_asm_undef_hash) AsmUnresolvedAdd(cc,num2->num.machine_code,IET_REL_I32+num2->imm_flag, aotc->rip,num2->rel,num2->num.local_asm_undef_hash, @@ -337,7 +337,7 @@ Bool AsmStoreNum(CCompCtrl *cc,CAsmNum2 *num2,I64 cnt,Bool U8_avail) else if (!num2->imm_flag && !(I32_MIN<=num2->num.i<=I32_MAX)) LexExcept(cc,"Branch out of range at "); if (num2->imm_flag) { - if (num2->num.abs_cnts.abs_addres&1) { + if (num2->num.abs_counts.abs_addres&1) { tmpa=CAlloc(sizeof(CAOTAbsAddr)); tmpa->next=aotc->abss; aotc->abss=tmpa; @@ -345,7 +345,7 @@ Bool AsmStoreNum(CCompCtrl *cc,CAsmNum2 *num2,I64 cnt,Bool U8_avail) tmpa->type=AAT_ADD_U32; } } else { - if (num2->num.abs_cnts.c_addres&1) { + if (num2->num.abs_counts.c_addres&1) { tmpa=CAlloc(sizeof(CAOTAbsAddr)); tmpa->next=aotc->abss; aotc->abss=tmpa; @@ -354,14 +354,14 @@ Bool AsmStoreNum(CCompCtrl *cc,CAsmNum2 *num2,I64 cnt,Bool U8_avail) } } AOTStoreCodeU32(cc,num2->num.i); - } else if (num2->U8_cnt==8) { + } else if (num2->U8_count==8) { if (num2->num.local_asm_undef_hash||num2->num.glbl_asm_undef_hash) AsmUnresolvedAdd(cc,num2->num.machine_code,IET_REL_I64+num2->imm_flag, aotc->rip,num2->rel,num2->num.local_asm_undef_hash, num2->num.glbl_asm_undef_hash,cc->lex_include_stk->line_num, U8_avail); if (num2->imm_flag) { - if (num2->num.abs_cnts.abs_addres&1) { + if (num2->num.abs_counts.abs_addres&1) { tmpa=CAlloc(sizeof(CAOTAbsAddr)); tmpa->next=aotc->abss; aotc->abss=tmpa; @@ -369,7 +369,7 @@ Bool AsmStoreNum(CCompCtrl *cc,CAsmNum2 *num2,I64 cnt,Bool U8_avail) tmpa->type=AAT_ADD_U64; } } else { - if (num2->num.abs_cnts.c_addres&1) { + if (num2->num.abs_counts.c_addres&1) { tmpa=CAlloc(sizeof(CAOTAbsAddr)); tmpa->next=aotc->abss; aotc->abss=tmpa; @@ -392,7 +392,7 @@ Bool AsmStoreNum(CCompCtrl *cc,CAsmNum2 *num2,I64 cnt,Bool U8_avail) U8 asm_seg_prefixes[6]={0x26,0x2E,0x36,0x3E,0x64,0x65}; -Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcnt) +Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcount) { CAOTCtrl *aotc=cc->aotc; I64 i,j,arg1,arg2,om,seg,arg1mask,arg2mask; @@ -401,16 +401,16 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcnt) CInst *tmpins; CAsmIns cur,best; - best.U8_cnt=255; - if (argcnt>0) + best.U8_count=255; + if (argcount>0) arg1mask=AsmMakeArgMask(cc,&aotc->arg1); else arg1mask=1; - if (argcnt>1) + if (argcount>1) arg2mask=AsmMakeArgMask(cc,&aotc->arg2); else arg2mask=1; - for (i=0;iinst_entry_cnt;i++) { + for (i=0;iinst_entry_count;i++) { tmpins=&tmpo->ins[i]; if (tmpins->arg1==ARGT_REL8 || tmpins->arg2==ARGT_REL8) U8_avail=TRUE; @@ -433,7 +433,7 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcnt) arg2=tmpins->arg2; tmpa1=&aotc->arg1; tmpa2=&aotc->arg2; - cur.last_opcode_U8=tmpins->opcode[tmpins->opcode_cnt-1]; + cur.last_opcode_U8=tmpins->opcode[tmpins->opcode_count-1]; if (tmpins->slash_val<8) { cur.ModrM|=tmpins->slash_val<<3; @@ -444,23 +444,23 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcnt) aotc->seg_size!=16 && tmpins->flags & IEF_OP_SIZE16) cur.has_operand_prefix=TRUE; - if (om==OM_IB) cur.imm.U8_cnt=1; - else if (om==OM_IW) cur.imm.U8_cnt=2; - else if (om==OM_ID) cur.imm.U8_cnt=4; + if (om==OM_IB) cur.imm.U8_count=1; + else if (om==OM_IW) cur.imm.U8_count=2; + else if (om==OM_ID) cur.imm.U8_count=4; if (om==OM_CB) { - cur.imm.U8_cnt=1; + cur.imm.U8_count=1; cur.imm.imm_flag=FALSE; } else if (om==OM_CW) { - cur.imm.U8_cnt=2; + cur.imm.U8_count=2; cur.imm.imm_flag=FALSE; } else if (om==OM_CD) { - cur.imm.U8_cnt=4; + cur.imm.U8_count=4; cur.imm.imm_flag=FALSE; } - if (argcnt==1) { - if (best.U8_cnt!=255 && !found_second_possible && !best.is_dft) { + if (argcount==1) { + if (best.U8_count!=255 && !found_second_possible && !best.is_dft) { found_second_possible=TRUE; if (!aotc->arg1.size) PrintWarn("no size specified at %s,%04d\n", @@ -490,7 +490,7 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcnt) tmpa1->reg1==REG_NONE) { cur.ModrM=cur.ModrM+5; MemCpy(&cur.disp.num,&tmpa1->num,sizeof(CAsmNum)); - cur.disp.U8_cnt=4; + cur.disp.U8_count=4; if (aotc->seg_size==64) cur.disp.imm_flag=FALSE; } else { @@ -519,7 +519,7 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcnt) if (tmpa1->reg1>=20) //RBPu8,RSPu8,RSIu8,RDIu8? cur.has_REX=TRUE; MemCpy(&cur.disp.num,&tmpa1->num,sizeof(CAsmNum)); - cur.disp.U8_cnt=4; + cur.disp.U8_count=4; } else { cur.SIB|=(tmpa1->reg1&7)<<3+tmpa1->reg2&7; if (tmpa1->reg1&15>7) @@ -533,7 +533,7 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcnt) if (tmpa1->reg2&7==REG_RBP && !tmpa1->imm_or_off_present && tmpa1->indirect) { cur.ModrM|=0x40; - cur.disp.U8_cnt=1; + cur.disp.U8_count=1; ModrM_complete=TRUE; } } @@ -544,13 +544,13 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcnt) if (!cur.disp.num.machine_code && I8_MIN<=cur.disp.num.i<=I8_MAX) { cur.ModrM|=0x40; - cur.disp.U8_cnt=1; + cur.disp.U8_count=1; } else if (aotc->seg_size==16) { cur.ModrM|=0x80; - cur.disp.U8_cnt=2; + cur.disp.U8_count=2; } else { cur.ModrM|=0x80; - cur.disp.U8_cnt=4; + cur.disp.U8_count=4; } } else if (!tmpa1->indirect) { cur.has_addr_prefix=FALSE; @@ -558,7 +558,7 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcnt) } else { if (tmpa1->reg1&7==REG_RBP) { cur.ModrM|=0x40; - cur.disp.U8_cnt=1; + cur.disp.U8_count=1; } } } @@ -569,8 +569,8 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcnt) cur.REX|=8; MemCpy(&cur.imm.num,&tmpa1->num,sizeof(CAsmNum)); } - } else if (argcnt==2) { - if (best.U8_cnt!=255 && !found_second_possible && !best.is_dft) { + } else if (argcount==2) { + if (best.U8_count!=255 && !found_second_possible && !best.is_dft) { found_second_possible=TRUE; if (!aotc->arg1.size && !aotc->arg2.size) PrintWarn("no size specified at %s,%04d\n", @@ -658,7 +658,7 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcnt) if (tmpa1->reg1>=20) //RBPu8,RSPu8,RSIu8,RDIu8? cur.has_REX=TRUE; MemCpy(&cur.disp.num,&tmpa1->num,sizeof(CAsmNum)); - cur.disp.U8_cnt=4; + cur.disp.U8_count=4; } else { cur.SIB|=(tmpa1->reg1&7)<<3+tmpa1->reg2&7; if (tmpa1->reg1&15>7) @@ -672,7 +672,7 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcnt) if (tmpa1->reg2&7==REG_RBP && !tmpa1->imm_or_off_present && tmpa1->indirect) { cur.ModrM|=0x40; - cur.disp.U8_cnt=1; + cur.disp.U8_count=1; ModrM_complete=TRUE; } } @@ -682,7 +682,7 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcnt) tmpa1->indirect && tmpa1->reg1==REG_NONE) { cur.ModrM=cur.ModrM&0xF8+5; MemCpy(&cur.disp.num,&tmpa1->num,sizeof(CAsmNum)); - cur.disp.U8_cnt=4; + cur.disp.U8_count=4; if (aotc->seg_size==64) cur.disp.imm_flag=FALSE; } else { @@ -691,13 +691,13 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcnt) if (!cur.disp.num.machine_code && I8_MIN<=cur.disp.num.i<=I8_MAX) { cur.ModrM|=0x40; - cur.disp.U8_cnt=1; + cur.disp.U8_count=1; } else if (aotc->seg_size==16) { cur.ModrM|=0x80; - cur.disp.U8_cnt=2; + cur.disp.U8_count=2; } else { cur.ModrM|=0x80; - cur.disp.U8_cnt=4; + cur.disp.U8_count=4; } } else if (!tmpa1->indirect) { cur.has_addr_prefix=FALSE; @@ -705,7 +705,7 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcnt) } else { if (tmpa1->reg1&7==REG_RBP) { cur.ModrM|=0x40; - cur.disp.U8_cnt=1; + cur.disp.U8_count=1; } } } @@ -713,64 +713,64 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcnt) } else if (ARGT_MOFFS8<=arg1<=ARGT_MOFFS64) { MemCpy(&cur.disp.num,&tmpa1->num,sizeof(CAsmNum)); if (aotc->seg_size==16) - cur.disp.U8_cnt=2; + cur.disp.U8_count=2; else - cur.disp.U8_cnt=4; + cur.disp.U8_count=4; cur.has_addr_prefix=FALSE; } else if (ARGT_MOFFS8<=arg2<=ARGT_MOFFS64) { MemCpy(&cur.disp.num,&tmpa2->num,sizeof(CAsmNum)); if (aotc->seg_size==16) - cur.disp.U8_cnt=2; + cur.disp.U8_count=2; else - cur.disp.U8_cnt=4; + cur.disp.U8_count=4; cur.has_addr_prefix=FALSE; } else if (ARGT_IMM8<=arg1<=ARGT_IMM64 || ARGT_UIMM8<=arg1<=ARGT_UIMM64) { MemCpy(&cur.imm.num,&tmpa1->num,sizeof(CAsmNum)); - if (arg1==ARGT_IMM8 || arg1==ARGT_UIMM8) cur.imm.U8_cnt=1; - else if (arg1==ARGT_IMM16 || arg1==ARGT_UIMM16) cur.imm.U8_cnt=2; - else if (arg1==ARGT_IMM32 || arg1==ARGT_UIMM32) cur.imm.U8_cnt=4; + if (arg1==ARGT_IMM8 || arg1==ARGT_UIMM8) cur.imm.U8_count=1; + else if (arg1==ARGT_IMM16 || arg1==ARGT_UIMM16) cur.imm.U8_count=2; + else if (arg1==ARGT_IMM32 || arg1==ARGT_UIMM32) cur.imm.U8_count=4; else { - cur.imm.U8_cnt=8; + cur.imm.U8_count=8; cur.REX|=8; } } if (ARGT_IMM8<=arg2<=ARGT_IMM64 || ARGT_UIMM8<=arg2<=ARGT_UIMM64) { MemCpy(&cur.imm.num,&tmpa2->num,sizeof(CAsmNum)); - if (arg2==ARGT_IMM8 || arg2==ARGT_UIMM8) cur.imm.U8_cnt=1; - else if (arg2==ARGT_IMM16 || arg2==ARGT_UIMM16) cur.imm.U8_cnt=2; + if (arg2==ARGT_IMM8 || arg2==ARGT_UIMM8) cur.imm.U8_count=1; + else if (arg2==ARGT_IMM16 || arg2==ARGT_UIMM16) cur.imm.U8_count=2; else if (arg2==ARGT_IMM32 || arg2==ARGT_UIMM32) { - cur.imm.U8_cnt=4; + cur.imm.U8_count=4; if (tmpins->flags&IEF_REX_ONLY_R8_R15 && arg2==ARGT_UIMM32) cur.REX&=~8; } else { - cur.imm.U8_cnt=8; + cur.imm.U8_count=8; cur.REX|=8; } } } - cur.U8_cnt=tmpins->opcode_cnt+cur.disp.U8_cnt+cur.imm.U8_cnt; - if (cur.has_ModrM) cur.U8_cnt++; - if (cur.has_SIB) cur.U8_cnt++; + cur.U8_count=tmpins->opcode_count+cur.disp.U8_count+cur.imm.U8_count; + if (cur.has_ModrM) cur.U8_count++; + if (cur.has_SIB) cur.U8_count++; if (aotc->seg_size==64 && cur.REX&0x40==0x40 && (cur.REX!=0x40 || cur.has_REX) && (cur.REX&7 || !(tmpins->flags&IEF_REX_ONLY_R8_R15 || tmpins->flags&IEF_REX_XOR_LIKE && tmpa1->reg1==tmpa2->reg1 && cur.ModrM&0xC0==0xC0))) - cur.U8_cnt++; - if (cur.U8_cntflags & IEF_DONT_SWITCH_MODES && (cur.has_addr_prefix || cur.has_operand_prefix))) MemCpy(&best,&cur,sizeof(CAsmIns)); } } - if (best.U8_cnt<255) { + if (best.U8_count<255) { tmpins=best.tmpins; seg=REG_NONE; - if (argcnt>1 && aotc->arg2.seg!=REG_NONE && !aotc->arg2.just_seg) + if (argcount>1 && aotc->arg2.seg!=REG_NONE && !aotc->arg2.just_seg) seg=aotc->arg2.seg; - else if (argcnt>0 && aotc->arg1.seg!=REG_NONE && !aotc->arg1.just_seg) + else if (argcount>0 && aotc->arg1.seg!=REG_NONE && !aotc->arg1.just_seg) seg=aotc->arg1.seg; if (seg!=REG_NONE) AOTStoreCodeU8(cc,asm_seg_prefixes[seg]); @@ -784,7 +784,7 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcnt) tmpins->flags&IEF_REX_XOR_LIKE && tmpa1->reg1==tmpa2->reg1 && best.ModrM&0xC0==0xC0))) AOTStoreCodeU8(cc,best.REX); - for (j=0;jopcode_cnt-1;j++) + for (j=0;jopcode_count-1;j++) AOTStoreCodeU8(cc,tmpins->opcode[j]); AOTStoreCodeU8(cc,best.last_opcode_U8); @@ -793,14 +793,14 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcnt) if (best.has_SIB) AOTStoreCodeU8(cc,best.SIB); - if (best.disp.U8_cnt) { - best.disp.rel=aotc->rip+best.disp.U8_cnt+best.imm.U8_cnt; + if (best.disp.U8_count) { + best.disp.rel=aotc->rip+best.disp.U8_count+best.imm.U8_count; if (!AsmStoreNum(cc,&best.disp,1,U8_avail)) return FALSE; } - if (best.imm.U8_cnt) { - best.imm.rel=aotc->rip+best.imm.U8_cnt; + if (best.imm.U8_count) { + best.imm.rel=aotc->rip+best.imm.U8_count; if (!AsmStoreNum(cc,&best.imm,1,U8_avail)) return FALSE; } @@ -811,13 +811,13 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcnt) LexExcept(cc,"Invalid inst at "); } -U0 ParseAsmDefine(CCompCtrl *cc,I64 U8_cnt) +U0 ParseAsmDefine(CCompCtrl *cc,I64 U8_count) { Bool is_dup; I64 i,dup_val; U8 *ptr; CAsmNum2 num2; - num2.U8_cnt=U8_cnt; + num2.U8_count=U8_count; while (cc->token && cc->token!=';') { num2.num.local_asm_undef_hash=NULL; @@ -830,13 +830,13 @@ U0 ParseAsmDefine(CCompCtrl *cc,I64 U8_cnt) Lex(cc); //Skip Str } else { is_dup=FALSE; - cc->abs_cnts=0; + cc->abs_counts=0; cc->asm_undef_hash=NULL; cc->flags&=~(CCF_UNRESOLVED+CCF_LOCAL); if (!IsLexExpression2Bin(cc,&num2.num.machine_code)) LexSkipEol(cc); else { - if (cc->abs_cnts.externs) + if (cc->abs_counts.externs) LexExcept(cc,"Extern Not Allowed at "); if (cc->flags & CCF_UNRESOLVED) { if (cc->flags & CCF_LOCAL) { @@ -866,10 +866,10 @@ U0 ParseAsmDefine(CCompCtrl *cc,I64 U8_cnt) } num2.rel=0; num2.imm_flag=TRUE; - num2.num.abs_cnts=cc->abs_cnts; + num2.num.abs_counts=cc->abs_counts; if (is_dup) { if (num2.num.local_asm_undef_hash || num2.num.glbl_asm_undef_hash) - LexExcept(cc,"Undefined DUP cnt at "); + LexExcept(cc,"Undefined DUP count at "); num2.num.i=dup_val; AsmStoreNum(cc,&num2,i,FALSE); } else { @@ -904,7 +904,7 @@ U0 ParseBinFile(CCompCtrl *cc) U0 ParseAsmBlk(CCompCtrl *cc,I64 cmp_flags) { CAOTCtrl *aotc=cc->aotc; - I64 i,j,k,argcnt, + I64 i,j,k,argcount, old_flags=cc->flags & CCF_ASM_EXPRESSIONS; CHashOpcode *tmpo; CHashExport *tmpex; @@ -1008,15 +1008,15 @@ U0 ParseAsmBlk(CCompCtrl *cc,I64 cmp_flags) } else if (cc->hash_entry->type & HTT_OPCODE) { tmpo=cc->hash_entry; Lex(cc); //skip opcode - argcnt=0; + argcount=0; if (tmpo->ins[0].arg1) { - argcnt++; + argcount++; if (ARGT_REL8<=tmpo->ins[0].arg1<=ARGT_REL32) ParseAsmArg(cc,&aotc->arg1,TRUE); else ParseAsmArg(cc,&aotc->arg1,FALSE); if (tmpo->ins[0].arg2) { - argcnt++; + argcount++; if (cc->token!=',') LexExcept(cc,"Expecting ',' at "); else { @@ -1028,7 +1028,7 @@ U0 ParseAsmBlk(CCompCtrl *cc,I64 cmp_flags) } } } - ParseAsmInst(cc,tmpo,argcnt); + ParseAsmInst(cc,tmpo,argcount); } else if (cc->hash_entry->type & HTT_EXPORT_SYS_SYM) { if (Btr(&cc->hash_entry->type,HTf_UNRESOLVED)) { if (cc->hash_entry->type & HTF_LOCAL) { @@ -1087,7 +1087,7 @@ U0 ParseAsmBlk(CCompCtrl *cc,I64 cmp_flags) g_lb->type=CMT_ASM_LABEL; g_lb->flags|=CMF_DEFINED; g_lb->rip=aotc->rip; - g_lb->use_cnt++; //Disable warning on unused labels. + g_lb->use_count++; //Disable warning on unused labels. ICAdd(cc,IC_LABEL,g_lb,0); } if (cc->token==TK_DBL_COLON) { diff --git a/src/Compiler/AsmInit.HC b/src/Compiler/AsmInit.HC index 2aea2837..941c0c68 100755 --- a/src/Compiler/AsmInit.HC +++ b/src/Compiler/AsmInit.HC @@ -100,16 +100,16 @@ U0 AsmHashLoad() LexExcept(cc,"Expecting opcode at "); MemSet(tmpo_max,0,size_max); tmpo_max->type=HTT_OPCODE; - tmpo_max->inst_entry_cnt=0; + tmpo_max->inst_entry_count=0; tmpo_max->str=cc->cur_str; cc->cur_str=0; Lex(cc); //Skip OPCODE while (cc->token && cc->token!=';' && cc->token!=':') { - tmpins=&tmpo_max->ins[tmpo_max->inst_entry_cnt]; - tmpins->ins_entry_num=tmpo_max->inst_entry_cnt++; + tmpins=&tmpo_max->ins[tmpo_max->inst_entry_count]; + tmpins->ins_entry_num=tmpo_max->inst_entry_count++; tmpins->slash_val=SV_NONE; //Not zero!! while (cc->token==TK_I64) { - tmpins->opcode[tmpins->opcode_cnt++]=cc->cur_i64; + tmpins->opcode[tmpins->opcode_count++]=cc->cur_i64; Lex(cc); } if (cc->token==',') @@ -151,10 +151,10 @@ U0 AsmHashLoad() } } } - size=offset(CHashOpcode.ins)+sizeof(CInst)*tmpo_max->inst_entry_cnt; + size=offset(CHashOpcode.ins)+sizeof(CInst)*tmpo_max->inst_entry_count; tmpo=MAlloc(size); MemCpy(tmpo,tmpo_max,size); - tmpo->use_cnt=0; + tmpo->use_count=0; if (HashFind(tmpo->str,cmp.asm_hash,HTT_OPCODE)) LexExcept(cc,"Duplicate OPCODE entry "); HashAdd(tmpo,cmp.asm_hash); diff --git a/src/Compiler/AsmLib.HC b/src/Compiler/AsmLib.HC index 6527f4bf..19681c7a 100755 --- a/src/Compiler/AsmLib.HC +++ b/src/Compiler/AsmLib.HC @@ -130,11 +130,11 @@ I64 AsmLexExpression(CCompCtrl *cc) I64 res=0; cc->asm_undef_hash=NULL; cc->flags&=~(CCF_UNRESOLVED+CCF_LOCAL); - cc->abs_cnts=0; + cc->abs_counts=0; if (!IsLexExpression2Bin(cc,&machine_code)) LexSkipEol(cc); else { - if (cc->abs_cnts.externs) + if (cc->abs_counts.externs) LexExcept(cc,"Extern Not Allowed at "); if (cc->flags & CCF_UNRESOLVED) LexExcept(cc,"Undefined sym at "); diff --git a/src/Compiler/AsmResolve.HC b/src/Compiler/AsmResolve.HC index b2be0bb0..c84e9b8e 100755 --- a/src/Compiler/AsmResolve.HC +++ b/src/Compiler/AsmResolve.HC @@ -106,7 +106,7 @@ U0 AOTGlobalsResolve(CCompCtrl *cc,CAOT *tmpaot) if (!(tmpex->type & HTF_IMPORT)) { if (cc->htc.local_var_lst) { tmpex->type|=HTF_GOTO_LABEL; - tmpex->use_cnt++; + tmpex->use_count++; } else { PrintErr("Undefined sym at line:%04d %s\n", tmpu->line_num,tmpex->str); @@ -135,7 +135,7 @@ U0 AOTGlobalsResolve(CCompCtrl *cc,CAOT *tmpaot) tmpex=cc->htc.glbl_hash_table->body[i]; while (tmpex) { if (tmpex->type & (HTF_IMPORT|HTF_GOTO_LABEL)) { - if (tmpex->use_cnt && (tmpie=tmpex->ie_lst)) { + if (tmpex->use_count && (tmpie=tmpex->ie_lst)) { if (tmpex->type&HTF_GOTO_LABEL) tmpie->flags|=IEF_GOTO_LABEL; if (tmpex->import_name) diff --git a/src/Compiler/BackB.HC b/src/Compiler/BackB.HC index c20179ea..519c9d18 100755 --- a/src/Compiler/BackB.HC +++ b/src/Compiler/BackB.HC @@ -306,7 +306,7 @@ U0 ICPreIncDec(CIntermediateCode *tmpi,I64 op,I64 rip) I64 r; CHashClass *tmpc=tmpi->ic_class,*tmpc1=tmpc-1; if (tmpi->ic_flags & ICF_BY_VAL) { - if (tmpc->ptr_stars_cnt && tmpc1->size!=1) { + if (tmpc->ptr_stars_count && tmpc1->size!=1) { ICAddSubEctImm(tmpi, tmpi->arg1.type&MDG_MASK+tmpi->arg1_type_pointed_to, tmpi->arg1.reg,tmpi->arg1.disp, @@ -328,7 +328,7 @@ U0 ICPreIncDec(CIntermediateCode *tmpi,I64 op,I64 rip) tmpi->arg1.type,tmpi->arg1.reg,tmpi->arg1.disp,rip); r=REG_RCX; } - if (tmpc->ptr_stars_cnt && + if (tmpc->ptr_stars_count && tmpc1->size!=1) { ICAddSubEctImm(tmpi,MDF_DISP+tmpi->arg1_type_pointed_to,r,0, MDF_DISP+tmpi->arg1_type_pointed_to,r,0, @@ -351,7 +351,7 @@ U0 ICPostIncDec(CIntermediateCode *tmpi,I64 op,I64 rip) ICMov(tmpi,tmpi->res.type,tmpi->res.reg,tmpi->res.disp, tmpi->arg1.type&MDG_MASK+tmpi->arg1_type_pointed_to, tmpi->arg1.reg,tmpi->arg1.disp,rip); - if (tmpc->ptr_stars_cnt && tmpc1->size!=1) + if (tmpc->ptr_stars_count && tmpc1->size!=1) ICAddSubEctImm(tmpi, tmpi->arg1.type&MDG_MASK+tmpi->arg1_type_pointed_to, tmpi->arg1.reg,tmpi->arg1.disp, @@ -373,7 +373,7 @@ U0 ICPostIncDec(CIntermediateCode *tmpi,I64 op,I64 rip) if (tmpi->res.type.mode) ICMov(tmpi,tmpi->res.type,tmpi->res.reg,tmpi->res.disp, MDF_DISP+tmpi->arg1_type_pointed_to,r,0,rip); - if (tmpc->ptr_stars_cnt && tmpc1->size!=1) + if (tmpc->ptr_stars_count && tmpc1->size!=1) ICAddSubEctImm(tmpi,MDF_DISP+tmpi->arg1_type_pointed_to,r,0, MDF_DISP+tmpi->arg1_type_pointed_to,r,0,tmpc1->size,op.u16[3],rip); else @@ -595,7 +595,7 @@ U0 ICCompAndBranch(CIntermediateCode *tmpi,Bool has_res,I64 rip, } } - rip+=tmpi->ic_cnt; + rip+=tmpi->ic_count; lb=OptLabelFwd(tmpi->ic_data); short_jmp=ToBool(tmpi->ic_flags&ICF_SHORT_JMP); if (!buf && lb->addr!=INVALID_PTR) { @@ -658,7 +658,7 @@ U0 ICTestAndBranch(CIntermediateCode *tmpi,I64 rip,I64 is,U8 *buf,I64 rip2) } else ICTest(tmpi,tmpi->arg1.reg); - rip+=tmpi->ic_cnt; + rip+=tmpi->ic_count; lb=OptLabelFwd(tmpi->ic_data); short_jmp=ToBool(tmpi->ic_flags&ICF_SHORT_JMP); if (!buf && lb->addr!=INVALID_PTR) { @@ -691,7 +691,7 @@ U0 ICFlagBranch(CIntermediateCode *tmpi,I64 rip,I64 is,U8 *buf) Bool short_jmp; CCodeMisc *lb; - rip+=tmpi->ic_cnt; + rip+=tmpi->ic_count; lb=OptLabelFwd(tmpi->ic_data); short_jmp=ToBool(tmpi->ic_flags&ICF_SHORT_JMP); if (!buf && lb->addr!=INVALID_PTR) { diff --git a/src/Compiler/BackC.HC b/src/Compiler/BackC.HC index 41a3e5d7..7e061ffa 100755 --- a/src/Compiler/BackC.HC +++ b/src/Compiler/BackC.HC @@ -129,7 +129,7 @@ U0 ICAndBranch(CIntermediateCode *tmpi,I64 rip,I64 is,U8 *buf,I64 rip2) ICModr2(tmpi,i,,d1,rip2); } - rip+=tmpi->ic_cnt; + rip+=tmpi->ic_count; lb=OptLabelFwd(tmpi->ic_data); short_jmp=ToBool(tmpi->ic_flags&ICF_SHORT_JMP); if (!buf && lb->addr!=INVALID_PTR) { @@ -310,7 +310,7 @@ U0 ICBrBitOps(CIntermediateCode *tmpi,I64 rip, ICModr2(tmpi,i,,arg2->disp,rip2); } - rip+=tmpi->ic_cnt; + rip+=tmpi->ic_count; lb=OptLabelFwd(tmpi->ic_data); short_jmp=ToBool(tmpi->ic_flags&ICF_SHORT_JMP); if (!buf && lb->addr!=INVALID_PTR) { @@ -602,7 +602,7 @@ U0 ICXorEqu(CIntermediateCode *tmpi,I64 rip2) U0 ICSwitch(CIntermediateCode *tmpi,I64 rip, Bool nobound,CCompCtrl *cc,U8 *buf,I64 rip2) { - I64 i,j,cnt,min,max,begin,r; + I64 i,j,count,min,max,begin,r; CCodeMisc *lb; Bool short_jmp; CAOTAbsAddr *tmpa; @@ -645,7 +645,7 @@ U0 ICSwitch(CIntermediateCode *tmpi,I64 rip, ICU24(tmpi,i); } - rip+=tmpi->ic_cnt; + rip+=tmpi->ic_count; lb=tmpi->ic_data(CCodeMisc *)->dft; short_jmp=ToBool(tmpi->ic_flags&ICF_SHORT_JMP); if (!buf && lb->addr!=INVALID_PTR) { @@ -695,13 +695,13 @@ U0 ICSwitch(CIntermediateCode *tmpi,I64 rip, else ICU8(tmpi,0x49); ICU24(tmpi,0x98BE0F+(r&7)<<16); - cnt=1; + count=1; } else if (lb->flags&CMF_U8_JMP_TABLE) { if (r<8) - cnt=2; + count=2; else { ICU8(tmpi,0x49); - cnt=1; + count=1; } ICU24(tmpi,0x98B60F+(r&7)<<16); } else if (lb->flags&CMF_I16_JMP_TABLE) { @@ -710,21 +710,21 @@ U0 ICSwitch(CIntermediateCode *tmpi,I64 rip, else ICU8(tmpi,0x4A); ICU32(tmpi,0x451CBF0F+(r&7)<<27); - cnt=0; + count=0; } else if (lb->flags&CMF_U16_JMP_TABLE) { if (r<8) - cnt=1; + count=1; else { ICU8(tmpi,0x4A); - cnt=0; + count=0; } ICU32(tmpi,0x451CB70F+(r&7)<<27); } else { if (r<8) - cnt=2; + count=2; else { ICU8(tmpi,0x42); - cnt=1; + count=1; } ICU24(tmpi,0x851C8B+(r&7)<<19); } @@ -733,7 +733,7 @@ U0 ICSwitch(CIntermediateCode *tmpi,I64 rip, tmpa->next=cc->aotc->abss; tmpa->type=AAT_ADD_U32; cc->aotc->abss=tmpa; - tmpa->rip=rip2+tmpi->ic_cnt; + tmpa->rip=rip2+tmpi->ic_count; ICU32(tmpi,lb->addr+cc->aotc->rip); } else ICU32(tmpi,lb->addr+buf); @@ -746,14 +746,14 @@ U0 ICSwitch(CIntermediateCode *tmpi,I64 rip, tmpa->next=cc->aotc->abss; tmpa->type=AAT_ADD_U32; cc->aotc->abss=tmpa; - tmpa->rip=rip2+tmpi->ic_cnt; + tmpa->rip=rip2+tmpi->ic_count; ICU32(tmpi,begin+cc->aotc->rip); } else ICU32(tmpi,begin+buf); } else - cnt+=6; + count+=6; ICU16(tmpi,0xE3FF); //JMP EBX - for (i=0;iic_flags&=~ICF_CODE_FINAL; } diff --git a/src/Compiler/BackFA.HC b/src/Compiler/BackFA.HC index 7a428dab..41c73227 100755 --- a/src/Compiler/BackFA.HC +++ b/src/Compiler/BackFA.HC @@ -21,7 +21,7 @@ U0 CompNoteFloatOp(CCompCtrl *cc,CIntermediateCode *tmpi, case CN_INST: if (cc->last_float_op_ic!=tmpi) { if (cc->dont_push_float) { - if (intermediate_code_table[tmpi->ic_code].arg_cnt==IS_2_ARG && + if (intermediate_code_table[tmpi->ic_code].arg_count==IS_2_ARG && cc->last_float_op_ic->res.reg!=REG_R8) tmpi->ic_flags|=ICF_ALT_TEMPLATE; else @@ -29,7 +29,7 @@ U0 CompNoteFloatOp(CCompCtrl *cc,CIntermediateCode *tmpi, link=TRUE; } } else { - if (intermediate_code_table[tmpi->ic_code].arg_cnt==IS_2_ARG && + if (intermediate_code_table[tmpi->ic_code].arg_count==IS_2_ARG && cc->last_float_op_pos!=CN_A1) tmpi->ic_flags|=ICF_ALT_TEMPLATE; else @@ -114,10 +114,10 @@ U0 ICCopyTemplate(CCompCtrl *cc,CIntermediateCode *tmpi,I64 op, } } } - MemCpy(&tmpi->ic_body[tmpi->ic_cnt],ptr,i); + MemCpy(&tmpi->ic_body[tmpi->ic_count],ptr,i); if (!off_the_record) CompNoteFloatOp(cc,tmpi,dont_pushable,dont_popable,pos); - tmpi->ic_cnt+=i; + tmpi->ic_count+=i; } U0 ICFCvt(CCompCtrl *cc,CIntermediateCode *tmpi,I64 r1, @@ -288,18 +288,18 @@ U0 ICFPow(CCompCtrl *cc,CIntermediateCode *tmpi,U8 *buf,I64 rip) if (buf) { tmpie=CAlloc(sizeof(CAOTImportExport)); tmpie->type=IET_IMM_I64; - tmpie->rip=rip+tmpi->ic_cnt-8; + tmpie->rip=rip+tmpi->ic_count-8; tmpie->next=tmpex->ie_lst; tmpex->ie_lst=tmpie; } ICU16(tmpi,0xD3FF); } else { ICU8(tmpi,0xE8); - ICU32(tmpi,-(rip+tmpi->ic_cnt+4)); + ICU32(tmpi,-(rip+tmpi->ic_count+4)); if (buf) { tmpie=CAlloc(sizeof(CAOTImportExport)); tmpie->type=IET_REL_I32; - tmpie->rip=rip+tmpi->ic_cnt-4; + tmpie->rip=rip+tmpi->ic_count-4; tmpie->next=tmpex->ie_lst; tmpex->ie_lst=tmpie; } @@ -308,7 +308,7 @@ U0 ICFPow(CCompCtrl *cc,CIntermediateCode *tmpi,U8 *buf,I64 rip) if (tmpex->type&HTF_UNRESOLVED) throw('Compiler'); else { - i=tmpex->val-(rip+tmpi->ic_cnt+5); + i=tmpex->val-(rip+tmpi->ic_count+5); if (!(I32_MIN<=i<=I32_MAX)) { throw('Compiler'); // ICU16(tmpi,0xBB48); @@ -321,7 +321,7 @@ U0 ICFPow(CCompCtrl *cc,CIntermediateCode *tmpi,U8 *buf,I64 rip) } } } else { - i=tmpex->val-(rip+tmpi->ic_cnt+5); + i=tmpex->val-(rip+tmpi->ic_count+5); if (!(I32_MIN<=i<=I32_MAX)) { ICU16(tmpi,0xBB48); ICU64(tmpi,tmpex->val); diff --git a/src/Compiler/BackFB.HC b/src/Compiler/BackFB.HC index dafdfde3..475cf968 100755 --- a/src/Compiler/BackFB.HC +++ b/src/Compiler/BackFB.HC @@ -446,7 +446,7 @@ U0 ICFCmpAndBranch(CCompCtrl *cc,CIntermediateCode *tmpi,I64 rip, } } - rip+=tmpi->ic_cnt; + rip+=tmpi->ic_count; lb=OptLabelFwd(tmpi->ic_data); short_jmp=ToBool(tmpi->ic_flags&ICF_SHORT_JMP); if (!buf && lb->addr!=INVALID_PTR) { diff --git a/src/Compiler/BackLib.HC b/src/Compiler/BackLib.HC index 9679c13e..93cc2eca 100755 --- a/src/Compiler/BackLib.HC +++ b/src/Compiler/BackLib.HC @@ -16,44 +16,44 @@ sign or zero extended to 64-bits. U0 ICU8(CIntermediateCode *tmpi,U8 b) { - tmpi->ic_body[tmpi->ic_cnt++]=b; + tmpi->ic_body[tmpi->ic_count++]=b; } U0 ICRex(CIntermediateCode *tmpi,U8 b) { if (b) - tmpi->ic_body[tmpi->ic_cnt++]=b; + tmpi->ic_body[tmpi->ic_count++]=b; } U0 ICOpSizeRex(CIntermediateCode *tmpi,U8 b) { - tmpi->ic_body[tmpi->ic_cnt++]=OC_OP_SIZE_PREFIX; + tmpi->ic_body[tmpi->ic_count++]=OC_OP_SIZE_PREFIX; if (b) - tmpi->ic_body[tmpi->ic_cnt++]=b; + tmpi->ic_body[tmpi->ic_count++]=b; } U0 ICU16(CIntermediateCode *tmpi,U16 w) { - *(&tmpi->ic_body[tmpi->ic_cnt])(U16)=w; - tmpi->ic_cnt+=2; + *(&tmpi->ic_body[tmpi->ic_count])(U16)=w; + tmpi->ic_count+=2; } U0 ICU24(CIntermediateCode *tmpi,U32 d) {//Writes extra harmless overhanging byte. - *(&tmpi->ic_body[tmpi->ic_cnt])(U32)=d; - tmpi->ic_cnt+=3; + *(&tmpi->ic_body[tmpi->ic_count])(U32)=d; + tmpi->ic_count+=3; } U0 ICU32(CIntermediateCode *tmpi,U32 d) { - *(&tmpi->ic_body[tmpi->ic_cnt])(U32)=d; - tmpi->ic_cnt+=4; + *(&tmpi->ic_body[tmpi->ic_count])(U32)=d; + tmpi->ic_count+=4; } U0 ICU64(CIntermediateCode *tmpi,U64 q) { - *(&tmpi->ic_body[tmpi->ic_cnt])(U64)=q; - tmpi->ic_cnt+=8; + *(&tmpi->ic_body[tmpi->ic_count])(U64)=q; + tmpi->ic_count+=8; } U0 ICAddRSP(CIntermediateCode *tmpi,I64 i,Bool optimize=TRUE) @@ -62,11 +62,11 @@ U0 ICAddRSP(CIntermediateCode *tmpi,I64 i,Bool optimize=TRUE) CIntermediateCode *tmpil1; if (optimize) { tmpil1=tmpi; - if (tmpi->ic_last_start<0 && !tmpi->ic_cnt && + if (tmpi->ic_last_start<0 && !tmpi->ic_count && (tmpil1=OptLag1(tmpi)) && tmpil1->ic_last_start<0) tmpil1=NULL; if (tmpil1) { - j=tmpil1->ic_cnt; + j=tmpil1->ic_count; if (tmpil1->ic_last_start==j-4 && tmpil1->ic_body[j-3]==0x83 && tmpil1->ic_body[j-4]==0x48) { if (tmpil1->ic_body[j-2]==0xEC) @@ -87,7 +87,7 @@ U0 ICAddRSP(CIntermediateCode *tmpi,I64 i,Bool optimize=TRUE) j=0; if (j) { if (tmpi==tmpil1) { - tmpi->ic_cnt=tmpi->ic_last_start; + tmpi->ic_count=tmpi->ic_last_start; i+=j; } else if (!(tmpi->ic_flags&ICF_PREV_DELETED)) { tmpil1->ic_flags|=ICF_DEL_PREV_INS; @@ -97,7 +97,7 @@ U0 ICAddRSP(CIntermediateCode *tmpi,I64 i,Bool optimize=TRUE) } } } - last_start=tmpi->ic_cnt; + last_start=tmpi->ic_count; if (i>0) { if (i<=I8_MAX) ICU32(tmpi,0xC48348+i<<24); @@ -116,7 +116,7 @@ U0 ICAddRSP(CIntermediateCode *tmpi,I64 i,Bool optimize=TRUE) } else throw('Compiler'); } - if (optimize && tmpi->ic_cnt>last_start) + if (optimize && tmpi->ic_count>last_start) tmpi->ic_last_start=last_start; } @@ -249,7 +249,7 @@ U0 ICModr2(CIntermediateCode *tmpi,I64 i,CICType t=0,I64 d,I64 rip=0) d-=4; } case MODR_RIP_REL: - ICU32(tmpi,d-(rip+4+tmpi->ic_cnt)); + ICU32(tmpi,d-(rip+4+tmpi->ic_count)); tmpi->ic_flags&=~ICF_CODE_FINAL; break; } @@ -445,8 +445,8 @@ I64 ICBuiltInFloatConst(F64 d) U0 ICMov(CIntermediateCode *tmpi, CICType t1,I64 r1,I64 d1,CICType t2,I64 r2,I64 d2,I64 rip) { - I64 i,cnt1,cnt2,b1_rex,b2_rex,b1,b2,b1_modr,b2_modr, - b1_r1,b1_r2,b2_r1,b2_r2,last_start=tmpi->ic_cnt; + I64 i,count1,count2,b1_rex,b2_rex,b1,b2,b1_modr,b2_modr, + b1_r1,b1_r2,b2_r1,b2_r2,last_start=tmpi->ic_count; CIntermediateCode *tmpil1; Bool old_lock=Btr(&tmpi->ic_flags,ICf_LOCK); switch (Bsr(t1)) { @@ -582,21 +582,21 @@ move_done: tmpil1=NULL; if (tmpil1) { if (tmpil1==tmpi) - cnt1=last_start-tmpil1->ic_last_start; + count1=last_start-tmpil1->ic_last_start; else { if (!(tmpil1->ic_flags&ICF_CODE_FINAL)) tmpi->ic_flags&=~ICF_CODE_FINAL; if (last_start) - cnt1=0; + count1=0; else - cnt1=tmpil1->ic_cnt-tmpil1->ic_last_start; + count1=tmpil1->ic_count-tmpil1->ic_last_start; } - cnt2=tmpi->ic_cnt-last_start; - if (cnt1 && cnt1==cnt2) { + count2=tmpi->ic_count-last_start; + if (count1 && count1==count2) { b1_rex=tmpil1->ic_body[tmpil1->ic_last_start]; b2_rex=tmpi->ic_body[last_start]; if (b1_rex&0x48==0x48 && b2_rex&0x48==0x48) { - for (i=1;iic_body[tmpil1->ic_last_start+i])== (b2=tmpi->ic_body[last_start+i])) { if (i==1 && (b2==0x89 || b2==0x8B)) { @@ -606,7 +606,7 @@ move_done: b2_modr=tmpi->ic_body[last_start+2]; b2_r1=b2_modr&7 +Bt(&b2_rex,0)<<3; b2_r2=b2_modr>>3&7+Bt(&b2_rex,2)<<3; - if (cnt1==3 && b2_modr&0xC0==0xC0) { + if (count1==3 && b2_modr&0xC0==0xC0) { if (b2_r1==b2_r2) goto move_redundant; if (b1_modr&0xC0==0xC0) { @@ -628,7 +628,7 @@ move_done: b2_modr=tmpi->ic_body[last_start+2]; b2_r1=b2_modr&7 +Bt(&b2_rex,0)<<3; b2_r2=b2_modr>>3&7+Bt(&b2_rex,2)<<3; - if (cnt1==3 && b2_modr&0xC0==0xC0) { + if (count1==3 && b2_modr&0xC0==0xC0) { if (b2_r1==b2_r2) goto move_redundant; if (b1==0x89 && b2==0x8B || b1==0x8B && b2==0x89) { @@ -645,15 +645,15 @@ move_done: !(b1==0x89 && b2==0x8B || b1==0x8B && b2==0x89)) break; } - if (i==cnt1) { + if (i==count1) { move_redundant: - tmpi->ic_cnt=last_start; + tmpi->ic_count=last_start; } } } } } - if (tmpi->ic_cnt>last_start>tmpi->ic_last_start) + if (tmpi->ic_count>last_start>tmpi->ic_last_start) tmpi->ic_last_start=last_start; BEqu(&tmpi->ic_flags,ICf_LOCK,old_lock); } @@ -679,7 +679,7 @@ U0 ICLea(CIntermediateCode *tmpi,CICType t1,I64 r1,I64 d1, tmpa->next=cc->aotc->abss; tmpa->type=AAT_ADD_U32; cc->aotc->abss=tmpa; - tmpa->rip=rip+tmpi->ic_cnt-4; + tmpa->rip=rip+tmpi->ic_count-4; } tmpi->ic_flags&=~ICF_CODE_FINAL; break; diff --git a/src/Compiler/CExcept.HC b/src/Compiler/CExcept.HC index 9fa6187f..94f2fa36 100755 --- a/src/Compiler/CExcept.HC +++ b/src/Compiler/CExcept.HC @@ -75,7 +75,7 @@ U0 LexWarn(CCompCtrl *cc,U8 *str=NULL) } } else LexPutPos(cc); - cc->warning_cnt++; + cc->warning_count++; } U0 LexExcept(CCompCtrl *cc,U8 *str=NULL) @@ -88,7 +88,7 @@ U0 LexExcept(CCompCtrl *cc,U8 *str=NULL) if (!IsRaw) ZenithErr("Task:%08X %s\n",Fs,str); LexPutPos(cc); - cc->error_cnt++; + cc->error_count++; FlushMessages; if (!Bt(&sys_run_level,RLf_ZENITH_SERVER)) Debug("Type \"Fix;\""); @@ -104,7 +104,7 @@ U0 UndefinedExtern() U0 UnusedExternWarning(CCompCtrl *cc,CHashClass *tmpc) { PrintWarn("Unused extern '%s'\n",tmpc->str); - cc->warning_cnt++; + cc->warning_count++; } U0 ParenWarning(CCompCtrl *cc) @@ -118,15 +118,15 @@ U0 ICClassPut(CHashClass *c) { I64 i; if (!c) return; - if (c->ptr_stars_cnt>4) { - PrintErr("put_class ptrcnt=%d\n",c->ptr_stars_cnt); + if (c->ptr_stars_count>4) { + PrintErr("put_class ptrcount=%d\n",c->ptr_stars_count); while (TRUE) //TODO: Yield; } - for (i=0;iptr_stars_cnt;i++) + for (i=0;iptr_stars_count;i++) '*'; - c-=c->ptr_stars_cnt; + c-=c->ptr_stars_count; if (c->str) "%s",c->str; else { diff --git a/src/Compiler/CExts.HC b/src/Compiler/CExts.HC index e06a81c5..b14fcd1d 100755 --- a/src/Compiler/CExts.HC +++ b/src/Compiler/CExts.HC @@ -26,7 +26,7 @@ extern CHashClass *ParseClass( extern CHashFun *ParseFunJoin( CCompCtrl *cc,CHashClass *tmp_return,U8 *name,I64 fsp_flags); extern I64 ParseKeyWord(CCompCtrl *cc); -extern Bool ParseStatement(CCompCtrl *cc,I64 try_cnt=0, +extern Bool ParseStatement(CCompCtrl *cc,I64 try_count=0, CCodeMisc *lb_break=NULL,I64 cmp_flags=CMPF_PRS_SEMICOLON); extern U0 ParseStreamBlk(CCompCtrl *cc); extern CHashClass *ParseType(CCompCtrl *cc,CHashClass **_tmpc1, diff --git a/src/Compiler/CHash.HC b/src/Compiler/CHash.HC index c474e865..6f162ca0 100755 --- a/src/Compiler/CHash.HC +++ b/src/Compiler/CHash.HC @@ -59,7 +59,7 @@ I64 HashEntrySize2(CHashSrcSym *tmph) res+=MSize2(tmph(CHashGlobalVar *)->data_addr); if (tmph(CHashGlobalVar *)->fun_ptr) res+=HashEntrySize2(tmph(CHashGlobalVar *)->fun_ptr - -tmph(CHashGlobalVar *)->fun_ptr->ptr_stars_cnt); + -tmph(CHashGlobalVar *)->fun_ptr->ptr_stars_count); } } else if (tmph->type & HTT_FILE) res+=MSize2(tmph(CHashGeneric *)->user_data0); @@ -118,7 +118,7 @@ U0 MapFileWrite(CHashTable *h,U8 *map_name,U8 drv_let) tmpb->data=MAlloc(size); MemCpy(tmpb->data,dbg_info,size); tmpb->num=doc->cur_bin_num++; - tmpb->use_cnt=1; + tmpb->use_count=1; QueueInsert(tmpb,doc->bin_head.last); } else dbg_info=NULL; diff --git a/src/Compiler/CMain.HC b/src/Compiler/CMain.HC index 04bf2f5e..2a74e792 100755 --- a/src/Compiler/CMain.HC +++ b/src/Compiler/CMain.HC @@ -102,8 +102,8 @@ CAOT *CompJoin(CCompCtrl *cc,I64 cmp_flags,U8 *map_name=NULL,U8 mapfile_drv_let= okay=FALSE; } if (!okay) { - if (cc->error_cnt<1) - cc->error_cnt=1; + if (cc->error_count<1) + cc->error_count=1; cc->aot=res->parent_aot; Free(res); LinkedLstDel(aotc->bin); @@ -155,7 +155,7 @@ CAOT *CompJoin(CCompCtrl *cc,I64 cmp_flags,U8 *map_name=NULL,U8 mapfile_drv_let= } CAOT *CompBuf(U8 *buf,U8 *map_name=NULL, - I64 *error_cnt=NULL, I64 *warning_cnt=NULL,U8 mapfile_drv_let=0) + I64 *error_count=NULL, I64 *warning_count=NULL,U8 mapfile_drv_let=0) { CCompCtrl *cc; CAOT *res=NULL; @@ -163,8 +163,8 @@ CAOT *CompBuf(U8 *buf,U8 *map_name=NULL, cc->flags|=CCF_AOT_COMPILE; QueueInsert(cc,Fs->last_cc); res=CompJoin(cc,CMPF_LEX_FIRST,map_name,mapfile_drv_let); - if (error_cnt) *error_cnt=cc->error_cnt; - if (warning_cnt) *warning_cnt=cc->warning_cnt; + if (error_count) *error_count=cc->error_count; + if (warning_count) *warning_count=cc->warning_count; QueueRemove(cc); if (res) CompCtrlDel(cc); @@ -228,7 +228,7 @@ U0 CompFixUpJITAsm(CCompCtrl *cc,CAOT *tmpaot) if(!(g_lb=COCGoToLabelFind(cc,str))) "Unresolved Reference:%s\n",str; else { - g_lb->use_cnt++; + g_lb->use_count++; g_lb=OptLabelFwd(g_lb); i=g_lb->addr+tmpaot->buf; } @@ -338,7 +338,7 @@ U0 CompFixUpAOTAsm(CCompCtrl *cc,CAOT *tmpaot) if(!(g_lb=COCGoToLabelFind(cc,tmpie->str))) "Unresolved Reference:%s\n",tmpie->str; else { - g_lb->use_cnt++; + g_lb->use_count++; g_lb=OptLabelFwd(g_lb); } } else @@ -417,11 +417,11 @@ U0 CompFixUpAOTAsm(CCompCtrl *cc,CAOT *tmpaot) } I64 Comp(U8 *filename,U8 *map_name=NULL,U8 *out_name=NULL,U8 mapfile_drv_let=0) -{//AOT Compile HC or PRJ file a and output BIN file. Returns err_cnt. +{//AOT Compile HC or PRJ file a and output BIN file. Returns err_count. U8 *ptr,*fbuf=NULL,*fbuf2=NULL,*fbuf3=NULL, *patch_table=MAlloc(0x20000); CAOT *tmpaot; - I64 i,cnt,size=0,error_cnt=0,warning_cnt=0,aot_U8s=0; + I64 i,count,size=0,error_count=0,warning_count=0,aot_U8s=0; CBinFile *bfh; CAOTImportExport *tmpie,*tmpie1; CAOTAbsAddr *tmpa,*tmpa1; @@ -433,20 +433,20 @@ I64 Comp(U8 *filename,U8 *map_name=NULL,U8 *out_name=NULL,U8 mapfile_drv_let=0) if (map_name) fbuf3=ExtDft(map_name,"MAP"); - if (tmpaot=CompBuf(fbuf2,fbuf3,&error_cnt,&warning_cnt,mapfile_drv_let)) { + if (tmpaot=CompBuf(fbuf2,fbuf3,&error_count,&warning_count,mapfile_drv_let)) { aot_U8s=tmpaot->aot_U8s; ptr=patch_table; //See $LK,"Load",A="MN:Load"$() - cnt=0; + count=0; tmpa=tmpaot->abss; while (tmpa) { if (!(tmpa->type&IEF_IMM_NOT_REL)) - cnt++; + count++; tmpa=tmpa->next; } - if (cnt) { + if (count) { *ptr++=IET_ABS_ADDR; - *ptr(U32 *)++=cnt; + *ptr(U32 *)++=count; *ptr++=0; tmpa=tmpaot->abss; while (tmpa) { @@ -460,15 +460,15 @@ I64 Comp(U8 *filename,U8 *map_name=NULL,U8 *out_name=NULL,U8 mapfile_drv_let=0) tmphg=tmpaot->heap_glbls; while (tmphg) { tmphg1=tmphg->next; - cnt=0; + count=0; tmphgr=tmphg->references; while (tmphgr) { - cnt++; + count++; tmphgr=tmphgr->next; } - if (cnt) { + if (count) { *ptr++=IET_DATA_HEAP; - *ptr(U32 *)++=cnt; + *ptr(U32 *)++=count; if (tmphg->str) { i=StrLen(tmphg->str); MemCpy(ptr,tmphg->str,i+1); @@ -564,8 +564,8 @@ I64 Comp(U8 *filename,U8 *map_name=NULL,U8 *out_name=NULL,U8 mapfile_drv_let=0) Free(fbuf2); Free(fbuf3); Print("Errs:%d Warns:%d Code:%X Size:%X\n", - error_cnt,warning_cnt,aot_U8s,size); - return error_cnt; + error_count,warning_count,aot_U8s,size); + return error_count; } I64 ExePutS(U8 *buf,U8 *filename=NULL, diff --git a/src/Compiler/Compiler.BIN b/src/Compiler/Compiler.BIN index 351195ac..1bebfa35 100755 Binary files a/src/Compiler/Compiler.BIN and b/src/Compiler/Compiler.BIN differ diff --git a/src/Compiler/Compiler.MAP b/src/Compiler/Compiler.MAP index ff6c6d57..ab7cbc08 100755 --- a/src/Compiler/Compiler.MAP +++ b/src/Compiler/Compiler.MAP @@ -344,75 +344,84 @@ $LK,"ParseDoWhile",A="FL:::/Compiler/ParseStatement.HC,506",BI=266$ $LK,"ParseStreamBlk",A="FL:::/Compiler/ParseStatement.HC,805",BI=267$ $LK,"ICMulEqu",A="FL:::/Compiler/BackA.HC,285",BI=268$ $LK,"AsmPrsInsFlags",A="FL:::/Compiler/AsmInit.HC,1",BI=269$ -H2@2#2#;#A#\#a#########aaaaaaaaaaa#b*bUbcbcbbbbbbcbc#cNcNcUcycccccu$$$$$$$$% %%%!%+%1%<%L%T%d%k%s%{%%%%%%%%p *?Uhd`nn .9?DFRYhsy~$4DDI\cjjjjq !D&&<?BOUbehnpz,cjpp~ os66DY_ P 7777777777777 -;\LLLLMM;M\MeMvMMMMMMMMM.N?NCNKNKN^NnNrNvN |1"""""""""""""# -###!#$#$#.# ``t{ĢբBMXZajlw~ (" GGVlr  +7BTeVTŵϵֵݵ  +=N?=nŶ̶жҶض +=N?=nŷ̷зҷط -,=.,]djv¸¸̸ڸ OOl:tÄʄۄ((=??KSWddpx|ƅޅ %49?JOO]frz݆݆͆ 0UlyʇЇׇ܇܇ /44;FLTZejjÿ҈ڈ -"((Mtyyʼnމ -#)?PV[tz׊!)/6;;QWm~‹‹‹ԋ݋*=DJRXhnv|||ɌԌ݌*;AFX^c|ǍǍ (FFKKW_biott׎6>V^ahnnnя7C^fipvvvv{{Ȑې%19<CIrzӑّ -:@Sǒ̒̒  (4@KKPPjvœדݓ /:COWZ`fkŔݔ'*066GP\dgnty•ŕ̕ҕ+36=CCS\hpsyɖіԖږ">FIOUUfo{ܗ 6S[^ekkkkkppΘژ -5MUX_e}ƙəЙ֙֙֙+:Failsyܚ '-8==Pflwyyқۛ+AGUdii|М֜  5;@LUddii.4QiižžǞǞݞBHJV_jjjjo}ȟ؟ݟ (EUy-<nv|~ССաڡ4;AITZjpxǢǢǢ̢̢̢ޢ&7:FO[bhmmxģɣɣԣأأ /:EKW[[gpss~ǤѤԤؤؤ29DORX]]hllxåΥ٥ߥ*17?JU[ehllt{~Ʀͦئ*,BIOalw}ŧʧʧާ %,00=IQWgk|¨¨Шר++L[suɩҩ۩ *66cxZ5Z5l5n5r5{5555555555 6 666"6,6 6JXoulbyW}W}m}|}}}}}}}}}}}}}~*~C~\~f~mmmmmmmmmmmmmmmmnnn&n?nbnnnnnnnnnnnnnoo -o oooo#o,oBqfW ---3?QYq%3:>@S]krvvvv #7AOVZjuz%3M]h} ',@HSSSSgw 2Kdfqyy """?M[r - -$3NYpxx!AOe &>GGNW]iH5ELc~ׇ4IR!&PwoOoOOOOOOOP PP!P$P0P cccN``lŠȊ,8-~~ -$,28::F.8 2/2/@/F/R/]/n/x////@0S  5 H O V ] c e l s v v             - - -6 -N -R -R -W -` -j -~ - - - - - - - - - - -   % - 6 > C I _ o              % + C [ ` k             -   " * 3 ; @ G ] m            #)AYYYeku,,,M]kkt~%??X1D -2\ObȊȊ "''8<D\_k3 -  2KKVZeyl $6)Uimmr 5:NV_gls /"Nbfuuuu)7L_d LLLdW)DX\ar38LT]ejq/3BBBU[el"5:Yha   +40^^glu|~5Dtffv6<&7@FJU74oGG.G1G5GBGKGVGfGnGxGGGGGGGGGGGGGGGH H HHHH.H3H3HCHHHHHXH]H]H]H`HiHHHHHHHHHHHHHHHHII3I;IAIAIUIUI^IaI!J8lzg~g~}~~~~~~~~~~~~~!:Slv944#474T4_4444444 55$5+5?5F5F5U5c5r555555555566 6J6:d(=/7;EOWZ`; nggɬ+/ADOXdwϭ3WkmtѮخ15bbzɯܯ!+>JOOOqǰ̰Ұװװܰ 1=JVeou~DẔ#2<BKTTYYYYYiii˲زڲ - -$<HZfltzгس +-;;@@GUZmyʹʹʹʹʹʹʹʹʹʹ/<>K[```iµµǵǵǵǵǵǵǵǵܵ 3Hiڶ4<DR|ŷŷŷŷŷ )/5:CLQQQQ`tԸ ';YiottԹڹڹ߹߹߹ 0ANP_aaaaauuuuuuuuuuuuuuuuغ!9HTjû')<jB̼ϼFIXlٽ A?4)OOORWZtҾҾ#DXt`ֿ˿1=<-1<CNbbm~!!99T'1@EMMRRYo%+@FKKKKKKKKKVdtz*2AKekppw$*.7<`lt,1<DY^^$,;@HPRZiow#(:nv &+HMMV[[[[[[[[[[[[[[[[fr )146FPPPRgx{~ $9NUUZZZZZZZbmy #4<_elnt{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{}}+!=x[''=DKV]nx  *<BX_g} '.6=Rccjjjx!f>x`ww "8CNYdk~  ,:IQ`h,8H[wE? ?C11111@DTa||||}|}}7}O}W}A ;z 3Q`~!2IMMQV[ehrw)5>RRafftBPcs/A/APA=ArA_AAAAAAAAAAACP ! >0V^DD$rrsss)s.s7sCsEsWsWsYssE//b%*;OTVVVrF.+<C\`qq{3G7//0000#0:0Q0h000000011*1/1:1B1B1L1L1W1\1q1w111111122#2#2-2-2?2}222H$ ZZ*[[4[<[ITHYeeeeeeeeff -ff"f%f/fJ!Gdd(d1dDdQd]diduddddddddddddee+e=e=eFeieieke~eeeeeeKlppppp-q4qHqOqWq_qhqpqxqzqqqqqqqqq r7r@rbr|rrrrrrrss$s@sgsssss t0tLtsttttttttttttt -uu4uLudufufufumumuzuuuuuuuuv v v vv.vVYkO$ZZZZZZPPWDWDxDeDDDDDDDDDDDE EQl:OGOGhGGGGGGGGH'H+H.H2H7HAHDHKHQHXH^HbHgHqHHHHHHHHHHHHHHHHHI"I+I4I3hmm٨è+00<Uevv֩E3hppp|êȪȪ"';'JUZZev{{ƫѫ֫֫ (7<P<_ddxdϬԬԬԬ0?KVafzfĭۭӭ   +00;@@KPP[``kpp{ɮԮٮٮ""/44AFFFFFNSS[``hmmuzzǯү 1@KV[[bm̰۰(-CNgSv۱=)LW\\wc̲Ѳ"''B.Qqvӳ %%%/11;Beggqqqqqssʴմϴ %%3-YNqqqzٵ<LasжжԶٶ*166:EQ_&2CHYxϸҸ&Wzz}T, '06U`EYww·҇؇   >, ]gV8 -OZOZpZ]ZZZZZZZZW\áˡ֡"+.]X@BB_r (;;;NYlYlOOty"Kk%Kbhl*2QV^dhl~!!8==TVVjll--@EEEEh00000JMbikt)Ee5M\s:`o",NPPP\\\z.Z\ -OOOOOOPP'P=O=O=r==\$ww]|k 9;;;C^``jj^7778888.8E8\8g88888888 9!939J9O9a9f9i99999999:::0:8:=:B:M:M:X:X:d:d:v:::::_dύ&6PT\`(r*r********+ -++8+b+s++++++++++++,,,,,,,,B,B,X,X,n,n,,,,,,,,,,,,,--%-%-<-D-O-`-k-|-----.a(΁݁b8-7*0*0>0B0G0R0]0`0d0l0cZggՈڈ%7@HRpljى(7IS[[dlNJ̊"CMW`‹ЋӋ .2MQQQWeoΌٌ - !#+.GIUW_e~э  !9EZ_tǎՎ܎d   ) - 8 J J e h j v                   C!ee )IIOW_gou%''--466<<CEEKKRRZ`fnnnnz !'/6>FJP[anz f`b!b!k!r!!!!!!!!"""-"6"8"L"\""gxee-e?eEeQehehezeeeeeeeeeeeee f f;fh2ȕȕޕ"3FN\zіז#)>FJR`fkk՗!#02DDKSeeŘɘ՘٘"(,6:IM\`swwwwșؙ#+8Scsxxxxƚۚ&,9TdpvśRiTP 8HU[_egjnn -&*-4:>DU[`ert#@d~ ,3?Wcccilo %%*7DDJXoux{&-=AJbgn  'I\jnnnnnno$oLt0X[[[[[>\$\\[[D\V\F\v\v\\\\\\\\\\]%]]]<]>]Z]Z]a]]]]]ud$CCD DDDD,D.D;D=DHD\DdDtDyDDDDDvtR4R4d4m4p4y4444444444444445w`2PPPPPPPQQQQQ(Q0Q;QQQFQiQqQx-HhHhfhvhhhhhhhhhhhhhhhhi!i!i1i>i>iaininiiiiiiiijjjRjjjjjjytZ3Z3n3333333334 4 4!4!4$4'4<4B4D4D4L4zQ88:GRXix -%333>YDatv~$*333FKKSS^s||||#(--9Vet|!**H^in{ ',,9DJSSfs&+2?FXmtz-5=Ifmz|'5@OVVo.5@EMT_dy{)228AA``mpy )24Vi~3 {%%%%%& -&&&,&,&7&A&A&N&W&f&q&w&&&&&&&&&&&&&&&'' '3'9'<'B'B'D'J'P'R'R'R'c'm'r'r'''''''''''''''( (((#(,(>(>(c(g(m(s((((((((((((((((((( ) )$)1)5)=)O)o)o)u)x)|))))))))))))* ***0*;*^*i*o*u*{*************+ -+++6+)+P+Y+_+_+t+y+y++++++++++++, ,,,;,A,G,S,j,q,w,,,,,,,,,,,,,,,,,,,, -$-4-A-L-h-j-------------------. ...!.-.4.8.@.H.P.b.p.u..................../ /"/$/$/$///////4/]0|``xzƎю &,/9JP\\ď}&))))))*)*9*%*H*Y*^**k*******+*+/+E+1+]+j+j++++~x ֱݱ!0?NXX]dwֲ (*8JJJ\gydz̳ٳ޳'):CCEU\llʹʹʹд\ȏȏ#146@RRY`/ww؅܅H6gqL[j22222222222253=gRgRRRRRRRRRRRRSS S&S(S*S7S7STTTTTT UUUU0U6U8UCUJUJUNU]UfUnUwUUUUUUUUUUUUUUUVV#V#V7VBVIVRV`ViVVVVVVVVVVVVVVWWWWWkW\k~7373E3W3]3e3w3}333333334, $__}-/QQQ`|r8(()&)<)])J)u))))`j~*4?GV`c_'115=EMW`hkt (00;OV]t83=8>HDDQ111111112222=2{''QT[`fhmss'9@OQgzz0RZ?2?2H2n22222  -00000"O6O6q6{666666666677 7/777D7L7O7O7O7Q7`7j7s7{7~77=Z?K?KoKuK~KKKKKKKKKKKKL%L'L?LWL{LLLl OOgy%,NNV y}!-2a~NN`u&*9LH%/////////////0 'O'ONO;O]OyOoOOOL''((,(M(:(e(j(((((((([LLLLLM M+M+M5M7MRM:MaMaMoMyMMMMMMMMMN N*NCN`NcNkNrNNNNNNNNNNO'OT]n $'10 -RWW{ %1<DIUZnuy "7INYaaac| Z0f0fJfXf]fjfxfffffffggg g"g,g8gL,LDLSLXL_LhL{LLLLLLLLLLLLLMMM%M-M2M2M8M8MAMRMTMiMkMsMyMMMMMMMMMMMMMMMMMMMNNNN N NN1N5N7NCNEN`NfNnNsN|NNNNNNNNNNNNO OOO#O(O(O-O/O7O7OROdOiOuO{O~OOOOOOOOOOOOOOOOPPP4P9PCPkPvPPPPPPPPPPPPPP Q)QBQDQJQLQPQ[Q]Q]QcQiQiQqQzQQQQQQQQQQQQQQQQQRRRRDRDRMR[RlRxRRRRRRRRRRRRRSSS$S&S/S2S2SV>VLVRVXVbVlVzVVVVVVVVVVVVVVVVVVVVVVWW!W&W+W0W5W:W?W?WDWIWeWoWWWWWWWWWWWWWWWXXXXX!X&X/X/X4X4X:XBXGXGXLXWX\XaXfXuXuXXXXXXXXXXXXXXXYYYY YYYY!Y)Y.Y.Y3Y>YCYHYMY\Y\YmYsYsYYYYYYYYYYYYYYYYYYZZZZZZ"Z(Z(Z6Zl@lElTl_lllvlvllccccccdd!d)d1d7d@dLdTdTd\ddddddd e"e e;eAeJeQeYeaemeue}eeeeeeeeee fff2f9f9f9fBfIfbfhfpfpfufyffffffffgg!g.gBgXg\g{gggggggggggh%h9hOhWh[hfhnh~hhhhhhhhhhhh i iiEiMiMiMiMiVibixiiiiiiiiiiiiiiijjj(j*j/jBjIjUj\j\jijsjsjxjjjjJOuOukuruuuuuuuuuuuu vvv.vCvCvWv_vov|vvvvvvvvvv w w!w.w?wOwXwiwiwow}wwww x+L"%(,1S@cksvxҦ ,l3JwQwQQQQQQQQQQQQQR R#R.RDR9R\RfRPQa$$$$%%&%+%H%N%U%\%j%v%%%D+FFZhn._C_C}CCCCCCCCCCCDD)D8DGDXDgDgDuDyD}DDDDDDDDDDDDDEEEEE E EE$E,EBEBEBEGEGE_EkEvE{E{E~EEEEEEEEEEEEEEEEEFFFFFFFF"F'FCFCFCFCFCFCFCFCFCFCFCFCFEFVFhFwFFFFFFFFFOGLWf"1"161:1?1J1J1T1Z1Z1^1f1\CV0000000000011111  @F`Biiiij(j6j8jFjSjYjdj{jjjjjjjjjjkk%k3kEkGkUkgkgkpkkkkkkkkkkkkkkll3lBlMl_lklllllllllllllll mm m m.m.m3m3m=mHmZm`mlm|mmmmmmmmmmmmnn'n.n4n@nHnSnZn^nqnwnnnnnnnno ooo&o1oAoQoQoaofofopo{oooooooooooop -p -ppp#p'p7p@pRpXpZpZphpnpwpppppppppppppqqBqTq_qqquqzqqqqqqqqqqr8(2^^gguyY]]]]]]]^k^Q^F^,^^q^^v^^^^^^^^^^^(_S_6_j_____M :EPYadkoxͧܧ - '0A?7OX^^loԨݨ+<<C\hp©ɩ +7;PRcmxĪɪKlQh---.-!.A.].S.u..z.....///)/)/3/4??SX^bfx"1;BX]bfhntŵ -2626P6T6X6`6n6q6t666666666666666 77<EE?EJEoEQEEEEEEEEEEF$FEFWFdFFFFFFFFFFGG7GSGIGmGsGsG|GGGGGGGGGGGGH,H"HFHFHKHNHdHpHHHHHHHHIII(I`L`_`a`o`}````````````aa'a.a?aMaoavaaaaaaaaaaaaaa bbb$b-b5b:b:bIbVbdbobzbbbbbbbbbbbbbbcc$c*c3cDckcsc}cccccccccccddddeMz#05GIMQTgDIPi#4xx#777777777 88+8M8u8888888 9*999T9_9z999999 ::-:<:<:G:Z:k:~::::::::::::;;(;9;=;E;P;h;;;;;;;;;; <<<<<><I<|<<<<<<<<<<=!=)=4=6=F=^=v========>> ><%0DDDDDDDEE)E9778%8,808F8s88888888899995ohohhhhhhhhhhiii i&i9i?iHiNi`ifiqiyiiii oWoWWWWWWWWWWXXX"X4X4XRX]XpXwXXXXXX YY!Y)Y6Y?YDYTYbYYYYYYYYYYY0ZZ Z@Z{ZeZVZZZZB[P>>8>:>H>N>i>x>>>>>>>X{..Ycv ')9IRX]djpv$+3Nkox0+1CHNQUUx}Ҁ ";'JJJe ƈ݈d//FHHL#')/AMbd}88JP1A0E0EFEREZE^EoE}EEEEEEEE(rx (ntZ&Z&c&m&~&&&&  - - ""11@@OO^^m|#__________```8`i`L`?`````````aa aCaYaYaaaa ^0^0m000 ->>>>>>???.???Q?c?r?????????????????? @ @@@&@.@;@C@K@\@g@l@l@y@@@@@@@@@@@@@AAAA!A!A)A)A;ABAXAXAXA]A]AuAAAAAAAAAAAAAAAAA -BBBBBBB*B,B,B/B/B/B/B/B8B>BBBNBnB{BBBXC4PPPPPPPPPltF!F!h!s!v!~!!!!!!!!!!!!!!!!!!!!"#"&"."6";";"B"K"\"b"k"v"""""""""""""""######&#/#@#a#r#############$8 .... -////%/%/+/ :>g1g1q1y1~1Svvvvvvv -w.w\wbwhwpwrwzwwwwwwwwx=xCxIxQxVx^xsxvxxxxxxxxxxxxy y%y-y=y?ycyyyyyyyyyyz zzzz2zIzKzhzzzzzzzzzzz{{,{9{[{r{{{{{{{{{{ ||*|=|A|A|A|H|M|`|k||||||||||tVVx %*M`dj -  ?MYs!8CR`o|$/4:Q\ipp~(k:::::::::::;;;;;;";&;<;<;r;~;;;;;;;;;;;;;<<<$<0<8<=<=<Y<e<n<v<~<<<<<<<<<< =#=-=9=A=F=F=e=q================= >>*>,>/>4>4>4>>>F>M>U>^>i>o>|>>>>>>>>>>???(?0?0?2?2?7?7?>?D?H?O?S?S?S?S?b?b?????C(CCCCCClllllllll mmmmmm*m5mNmPmUmcmnm{mmm\=P,,,,,,--1-F-3-U-n--------8fpNNNNOOOO O>O0),4T'Q'QAQTQWQaQnQQQQQQQQQR<88LS_k{0S[&&:BOYl 26H!/?[?[S[_[u[a[[[[[[[\[..HO\glr469EMU]kqz.DO]hx $))499DIITTov|5J\mv  +1FL]hn~~%3COal{} %339@D#ѭ٭٭ <<<DFFNPPXZZbbkqvvîЮ !@@@HJJJRTTT\^^^fhhssy~~~~ȯȯȯدد߯"/X[dkӰ۰&,118CCHZ````l (**>@IOOOOW"``nȬͬ !-8CLTTXEnEEEEEF F FF(F,F1FFFHFKFOFVFjFnFvFFFFFFFFFFFFFFFFG Bjjjjjjjjjjjkkkkkk$k-k8k>kGkZk_ktkkkkkkkkkkkl lllll!l'l,l,l?lMl[lelklplzlllllllllllmmm3mZm_m_m_mbmimomvm{m{mmmmmmmmmmmmmnnnnn)n3n9n@n@nBnBnBnGnMnRnVnXn[nfnunxnzn~n~nnnnn -h/g/gEgPg[gigtg}ggggggggggh -hh!hoh %Issssssssst tt,tYtsttttttttttttuu"u(uKu $b========>=0>0><>D>S>>>>>>>?>2? ?A?G?V?k?m?x??????????@??%@B@-@b@z@g@@@@@@@@@@@@AA*A 1““ /6ES\luwwww~Õ \ No newline at end of file +H2@2#2#;#A#\#a#########aaaaaaaab b b3b:bebsbsbbbbbbcc,c3c^c^ceccccccu$$$$$$$%%%!%&%1%;%A%L%\%d%t%{%%%%%%%%%%p$)+0:Oexd`~~(/>IOTVbix"$4DTTYlszzzz!##1D66LOR_erux~,cjxx osFFTio P 7777777777778 +;\LLLLM.MKMlMuMMMMMMMMN N>NONSN[N[NnN~NNN |1"""""""""""""# +###!#$#$#.# hh|Ţ̢ݢ %JU`birt (" WWf| 3?J\m^\͵׵޵#(3EVGEvƶͶԶضڶ#3EVGEvƷͷԷطڷ"4E64elr~ƸʸʸԸ __|Jӄڄ 88MOO[cgttххօ5DIOZ__mvÆ݆̆   +@e|LJˇ·ڇ + +'0?DDKV\djuzzʈ܈  "288]ʉЉՉ 39O`fkˊъ)19?FKKag}ŋˋҋҋҋ!):MTZbhx~Ќٌ$:KQVhnsÍƍ̍ҍ׍׍ !''8VV[[goryŽɎ!(.FNfnqx~~~ďˏя")/GSnvyؐ/5AILSY͑JPcɒђגܒܒ8DP[[``zʓГՓ %,?JS_gjpv{ƔɔϔՔ/7:@FFW`ltw~ʕҕՕܕ!;CFMSSclxٖ2NVY_eevɗї$Fcknu{{{{{آИޘ +.=E]ehouΙ֙ٙ $;JVqy|Ϛ  7=HMM`v|śЛЛ##((;QWetyyŜʜʜEKP\ettyyʝʝ ##((>DayyÞҞҞממ((RXZfozzzzȟȟȟ؟#8UeѠ%',=L~ȡѡ ##DKQYdjzȢעעעܢܢܢ &&&++6GJV_krx}}ģʣϣϣϣϣԣ٣٣  #*0?JU[gkkwƤѤפ "$BIT_bhmmx||ĥӥޥ "$:AGOZekux||֦ݦ#,//:<RY_q|ħ˧Чէڧڧ!5<@@MYagw{¨ʨШШШШШҨҨ'/;;\kΩ٩ +:FFsxb5b5t5v5z55555555556666"6*6460FZhlbyg}g}}}}}}}}}}}}}}}~!~:~S~l~v~mmmmmmmmmmmmn nnn$n.n.n6nOnrnnnnnnnnnnoo ooooo#o(o+o3or>r>rLrdrfrfrtrrrrrrrrrs ss)s-s-s-s4s:sTs\sgsssssssssss-¹ʹչ 2HVZzƺк 3:JNNXnrrɻԻۻ":+UU[bq{¼'2GLZisýҽԽ !%5@Ecm{ǾϾھ޾޾޾&.9HP[`hs׿(FJyn_ ##555;GYay #-;BFH[esz~~~~ '+?IW^br} &-;Uep  $/4HP[[[[o#:Slny "***GUcz,;Vax )IWm.FOOV_eqH'=MTk߇4IR .16PwOOOOOOOPPP+P1P4P@P cc cDcDcRcRcRcRc[c[cbc}cccccccccccccccd(kqƋҋ=oo!',,5C`x})...5<CX_{{@^j77EMTs$/4__l$).//<QV\$#($)/ Chh~ƞ̞ܞ*0@JT[f{!$5:"DiƟ͟ԟ$/9D[^`ryàˠˠ#(&,0000!0'0-0$K**4DZbl",6@JT^hr| " , 6 @ J T ^ h r | !!!&!0!:!D!N!\!%0]eNNNNNNNN&LAP$$$!$-$H$M$m$o$$$$$$$'P~@@N[i{̌ڌ(4 +*7*787D7U7g7p7~77)(*4.w &*17KSX[fqy39BSYbtzzx+P>NhhtNJʊЊ,8--4<BHJJV.8 :/:/H/N/Z/e/v/////@0S  E X _ f m s u |               + +( +- +F +^ +b +b +g +p +z + + + + + + + + + + +  ! ! 5 = F N S Y o              * 5 ; S k p {               2 : C K P W m }           (39Qiiiu{!<<<]m{{ %5OOh1D"2\ObЊЊ%*//@DLdgs300B[[fju| #(04F9ey}}-EJ^fow|$,0?2^rv +9G\ot.0\\\tg(9Thlq+CH\dmuz+?CRRReku|2EJixq;40nnw|5Dtvv6<&&6GPVZe74oGG6G9G=GJGSG^GnGvGGGGGGGGGGGGGGGG HHH!H&H&H6H;H;HKHPHPH`HeHeHeHhHqHHHHHHHHHHHHHHHII#I;ICIIIII]I]IfIiI)J8lzw~w~~~~~~~~~~~~~~1Jc|9'4'434G4d4o444444 +55-545;5O5V5V5e5s55555555556666Z6:d(= #7?CMW_bh; nwwЬ٬ *;?QT_htȭ߭ .Cg{}ĮĮˮ ))AErrϯٯ 1;NZ___Ȱװܰ +!&&.AMZfuʱױܱ+3BLR[ddiiiiiyyyʲ۲!/4LXjv|ų˳ѳ.;=KKPPWej}Ǵ̴̴̴̴̴ݴݴݴݴݴݴݴݴݴݴ .?LN[kpppyƵҵҵ׵׵׵׵׵׵׵׵ +CXyĶ ++DLTbշշշշշ09?EJS\aaaapи +##((7Kiyѹ%@Q^`oqqqqqϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺϺѺѺ1IXdzӻ79LzR˼ܼ߼++VYh|ͽQOD9*___bgj 3Thpۿ̿   AM<''=ALS^rr}11IId '7APU]]bbi#-5;PV[[[[[[[[[ft:BQ[u{'.4:>GLp|'<ALTinn .4<KPX`bjy .38J~+++6;X]]fkkkkkkkkkkkkkkkkv  9ADFV```bw4I^eejjjjjjjr}+3DLou|~-;1=x[77MT[fm~  %0:LRhow !7>FMbsszzz %1v>x`$'2HS^it{ "(00<JYapx"<HXkU? ?C11111@DTa|||}} +}-}/}G}_}g}A ;z"Cap1BY]]afkux .9ENbbqvvBPcs?A?A`AMAAoAAAAAAAAAAACP1N@fnDD$ssss)s9s>sGsSsUsgsgsissE??r$5:K_dfffF.!,;LSlpCG7//"0%0(0.030J0a0x00000011)1:1?1J1R1R1\1\1g1l111111112 2(23232=2=2O2222H$ [[:[#[D[L[ITHYeeeeeeef +f ff f*f-f7fJ!G d d0d9dLdYdedqd}ddddddddddeee'e3eEeEeNeqeqeseeeeeeeKlppppp5q}O}X}Z}h}j}x}z}}}}}}}}}}}}}~,~1~1~1~S~X~X~X~x~}~}~}~~~~~~~~~~~~~~~~9MRRmz|:::[```ˀЀЀ +-//4/UWW_Zρρ)4J^włǂ؂  L7//M[q022@MhhMdVVpy *=CHHQqqqxzz $3=@@JPVVZbimu}  (,2=BXinqNL(.F^asO$ZZZZ[ [PPgDgDDuDDDDDDDDDDDEEQl:_G_GxGGGGGGHH/H7H;H>HBHGHQHTH[HaHhHnHrHwHHHHHHHHHHHHHHHHHI!I2I;IDILIWIbInIIIIIIIIIIIIIJJJ%J>JOJXJaJiJrJxJ|JJJJJJJJJJJK KKK&K,K0K5K;KEKOKnK|KKKKKKKKKKKK L L3L:LCLLLSL\LeLnLLwLLLLR,Swwȏ:JJWW^qoАאڐ +$>OU[byhƑ̑ґڑڑ<$EKQYYYoooozʒϒ  ,@PezǓד-8==H^sŔݔ + +  166IX]]p͕ҕҕ  =BdiwiԖٖٖ"DIWIkppǗۗ  ;@@[``{ۘ  #8==Ibgәޙ  %//BGGGKdmmך#,111B_jtÛӛ':DOp|ǜϜԜߜ0EPU`hmxɝޝޝޝޝ*,IISgqsʞ +CSXXchhp{ٟޟޟ$8$PUUbggottɠΠΠ֠۠۠  %5::Tdii¡ǡޡǡ G5# _d|d̢ܢ"'O='gll٣ǣ=MRRmYɤΤΤ 1AFFYinnv{{ͥҥ ҥ-2n\J2Ҧ##+008==ucQDڧȧ &+`NC+x}}ʨϨӨϨ# ;@@Leuéɩɩ$UCxɪӪتت'27K7Zejju֫(-8-GL`Lottt̬߬',@,O[fqvvԭ""+00;@@KPP[``kpp{îήٮ %%-22?DDQVVVVV^cckppx}}˯ЯЯׯ(A-P[fkkr}ðܰȰ 8=S^wc˱*M9\gllsѲܲ'277R>aϳ%***0555?AAKRuwwĴϴڴߴ55C=i^ʵʵ +++L\qζ#:AFFJUaoķ6BSXi߸""%6gT, $*.7@FU`EYŇއN<mwV8 +_Z_ZZmZZZZZZZZW\ˡӡޡ *36eX@$+.RRo %8KKK^i|Yl__-2[{5[rx|$):Bafntx|11HMMdffz||$==PUUUUx @@@@@Z]ry{'9Uu E]l+Jp2<^```lll>Z\ +OOOOOPP,P7PLP9P[PcPnPPzPPP[:: ;;;;%;);+;2;9;=;A;T;|;;;;;;;;;;5<:<g<o<t<}<<<<<<<<=%==4=:=A=A=G=J=N=_=_===\$]|k 0IKKKSnppzz^77888!8'8>8U8l8w88888889919C9Z9_9q9v9y9999999::: :@:H:M:R:]:]:h:h:t:t::::::_dɍ׍ .>X\d`(z*z******** ++"+@+j+{++++++++++++,,,,4,4,J,J,`,`,v,v,,,,,,,,,,,,,------D-L-W-h-s------.a(ށˁb8-72020F0J0O0Z0e0h0l0t0cZww"5GPXbȉ׉8"GYckkt|̊ЊЊ׊܊ """&2S]gpċҋ>B]aaaguŌތ%13;>WYegouǍ̍ +&1IUjoĎώ׎d  * 9 = H Z Z u x z                  !!S!ee09YY_gow%%%,..577==DFFLLSUU[[bbjpv~~~~ + +%-17?FNVZ`kq~ "%f`b!b!k!r!!!!!!!!"""-"6"8"L"\""gxee=eOeUeaexexeeeeeeeeeeeee fffKfh2ЕЕ*;NVdȖٖߖ#+1FNRZhnssݗ +#)+8:LLS[mmØ͘јݘ*04>BQUdh{Й+3@[k{Κ + + +".4A\lx~͛ZiTP!'*.0HXekouwz~~!,6:=DJNTekpu'3Pt (<COgsssy|%.55:GTTZh"'.6=MQZrw~)07Yljnnnnnoo,oDoIoXo_olosooooooooooooppp$p;pYp`pbpepjppppk$hm&& &4&;&U&lxKewRwRRRRRRRRRRRR SSS$S/SES:S]SeSm8'R'R+R0R5RFRTR]RbRgRiRn88Bz0z000000000o0GPGP]PpP}PPPPp`0DɆ%''XF'wqD 8<AAHKP\mq 1<@E{;r??Siiinnuzz )sH>Lt0X[[[[[N\4\)\\[T\f\V\\\\\\\\\\] +]]5]$]]L]N]j]j]q]]]]]ud$CC +DDDD!D4D6DCDEDPDdDlD|DDDDDDvtZ4Z4l4u4x44444444444444555w`2PPPPPQPQQQ&Q-Q8Q@QKQaQVQyQQx-PhPhnh~hhhhhhhhhhhhhhhhi)i)i9iFiFiiiviviiiiiiiij'j'jZjjjjjjytb3b3v333333333 444)4)4,4/4D4J4L4L4T4zQ "HHJWbhy 5CCCNiTq,4:CCCV[[ccn38==Ifu $$1::Xny~%..07<<ITZccv!6;BOVh}),,=EMYv} ,7EP_ff!,>EPU]dot9BBHQQpp}  -09BDfyC {%%%&&&&6&<&<&G&Q&Q&^&g&v&&&&&&&&&&&&&&&&&''0'C'I'L'R'R'T'Z'`'b'b'b's'}'''''''''''''((((((%(,(3(<(N(N(s(w(}((((((((((((((((((( )))4)A)E)M)_)))))))))))))))****:*@*K*n*y**************++++#+)+F+9+`+i+o+o++++++++++++++,,,!,(,K,Q,W,c,z,,,,,,,,,,,,,,,,,,,- ---4-D-Q-\-x-z---------------.. +....'.'.1.=.D.H.P.X.`.r.................... ////2/4/4/4/?/?/?/D/m0|hhŽƎΎَ%%.47ARXdd̏}&))))))**)*I*5*X*i*n**{*******+ +.+?+U+A+m+z+z++++~x ȱȱޱ )8GV``elȲȲ޲ '02@RRRdoóϳԳ /1BKKM]dttŴմմմش\ЏЏ!+9<>HZZa`/υ%''XF'wL[j22222222233 3E3=wRwRRRRRRRRRRRRS+S0S6S8S:SGSGSLSUS]SfSnSpSxSSSSSSSSSSSS +TT$T(T0T0TDTTT\T_TTL (2323@3O3S3V3\3\F F h o }             - 8 8 E M ^ g             ,1?HHO^uu.BGO[mm-2BU]q (8>GGY]i + +$**.D>TTTTTUU"U$U$U@UFUHUSUZUZU^UmUvU~UUUUUUUUUUUUUUV V!V&V3V3VGVRVYVbVpVyVVVVVVVVVVVVVWWWW&W)W{W\k~G3G3U3g3m3u3333333333 4, $oo + .=?aaap8))!)6)L)m)Z)))))`j~'2<GO^hk_ (+-7AAEMU]gpx{-8@@K_fm83=8>HDDQ1111111 222(2.2M2{77adkpvx}    7IP_aw0RZO2O2X2~22222  +00000"_6_6666666666677&707?7G7T7\7_7_7_7a7p7z77777=ZOKOKKKKKKKKKKKKKL L-L5L7LOLgLLLLl __w##5<^^f y} )5:a~^^p /6:I\H%////////////00 7O7O^OKOmOOOOOL''(&(<(](J(u(z((((((()[LLLL MMM;M;MEMGMbMJMqMqMMMMMMMMMMMNN:NSNpNsN{NNNNNNNNNNN%O7OT]n + &47A0 +Rgg*5ALTYej~2GY^iqqqs Z8f8fRf`fefrffffffff gg&g(g*g4g@gDgQg]gogwgggggggggggggggMhd'<++++++ ,+!,A,-,P,a,w,c,,,,,,,/`FFZo~#(,??UWa]%` AVCqe2&di|p/>[[[m(!'FFO]cej(?EJJP0'ΉD]j(:(:B:I:R:^:s:{::::::XX«ƫΫӫ׫!0CKVVVh``yĝ۝ޝ!3;;QQc(A (.688IIIQYkzk'/6JWYjwww "*5GRWW^bpt}!!!(6EXkmmm>EQo;k~/555@JVaccchtt  gWgWWWWWWWWW X$X*X2X5XJXOXaXXXXXXXXXXXXXYY5Y;Y@Y@Y@YMY^YiYvYYYYYYYYYYZZZ%ZHZHZHZZZ<555$5,545<5D5K5[5[5`5*ӣ #+6>AMUoϤ 29]d<DɐԐސ (28BHRYektϑّ + + ,1ALQegxȒђْ&&33;I$QQQ#Q.Q4Q0FF^hf''''''(2(2(B(G(G([(`(`(|(((((((((((()4)T)f)x)))))))z*$bg%%%%%& %)9Ykq *68DLPV___q| +$-8>T[cj  -1=U]cr{ #xww'-<EMUW]crztAA B*BB_BEB9BnB}BBBBBBBBBBC4C!CVCCCjCeCCCCCCCCCCCC D DDD7D9D[D[D[DcDfgSgSSSSSSSSSSTTT'T,TATRTqTyT{TTTTTTTTTTTTT UTU!U!U)U2UAU`UgUiUUUUUUUUUUUUUVVV,VV;VAVHVPVVVXViVnVVpVVVVVVVVVVVWWW#W9W.WQWQWcW$??]pw~  +  # ' 0 4 9 ? \ \ j               ! !!!!#!5!E!\!^!w!!!!!!!!!!!!!!"""/"3"E"E"E"J"Y"["}"}""""""""""# ###-#-#;#R#T#m#~##############$$)$.$G$Z$^$p$p$p$p$$u$$$$$$$$%%% %%5%5%5%D%D%W%n%y%%%%%%%%%%%%%%&&&&+&2&9&C&K&O&S&U&Z&b&f&x&z&&&&&&&&&&&' '''''+'+'+'2'7'Q'_'k'r'r''''''''''''' 0J0JMJ\J\J\JyJyJJJJJJJJJJJJJJJJJJJJJJJJJJ K!K#KBKDKcKhKKKKKKKKKKLL#L(LFL4LLL[L`LgLpLLLLLLLLLLLLLMMM'M-M5M:M:M@M@MIMZM\MqMsM{MMMMMMMMMMMMMMMMMMMN +N N N NNN"N9N=N?NKNMNhNnNvN{NNNNNNNNNNNNNOOO"O+O0O0O5O7O?O?OZOlOqO}OOOOOOOOOOOOOOOOPPPP$PZDZJZTZ^ZlZZZZZZZZZZZZZZZZZZZZZZZZ [[![6[9[;[E[T[Y[Y[Y[a[f[o[t[t[~[[[[[[[[[[[[[[[[[[[\\\\\+\<\I\P\X\b\p\p\u\u\\\\\\\\\\\\\\\\\\\\\\\] ]]]]]]]]]]]]/]5]>]D]L]Q]V]_]j]s]{]]]]]]]]]]]]]]]]]]]]]]^^^^#^,^B^B^K^K^K^T^Y^Y^a^f^f^^^^^^^^^^^^^^^^^_____)_3_<_>_>_>_D_H_J_J_J_J_O_U_[___b xx=x@xFxZxbxsxxxxxxxxxxxxxy yyy+y>yIyMy^y^y^ycycyoy~yyyyyyyyyyyyyzz zzz$z+z-z2z:zgRghglggggggggg h h h(h5hIh_hghkhvh~hhhhhhhhhh iiiii$iUi]i]i]i]ifiriiiiiiiiiiiiiij jjjj8j:j?jRjYjejljljyjjjjjjjJ_u_u{uuuuuuuuuuuu vv#v)v>vSvSvgvovvvvvvvvvvvwww1w>wOw_whwywywwwwwwx+L!*-049[Hks{~ڦ(,l3JQQQQQQQQQQRR RRRR3R>RTRIRlRvRPQa$$$$%%&%+%H%N%U%\%j%v%%%D+VVjx~.oCoCCCCCCCCCCCDD'D9DHDWDhDwDwDDDDDDDDDDDDDEEEEEEEEEE+E4E1B1G1R1R1\1b1b1f1n1\CV00000000001 1 111&1  &HN`Biij jj8jFjHjVjcjijtjjjjjjjjjjkk+k5kCkUkWkekwkwkkkkkkkkkkkkkk ll,lClRl]lol{llllllllllllll mm+m0m0m>m>mCmCmMmXmjmpm|mmmmmmmmmmmnnn'n7n>nDnPnXncnjnnnnnnnnnnnnoo$o/o6oAoQoaoaoqovovooooooooooooopppp.p.p3p7pGpPpbphpjpjpxp~pppppppppppppqq)qRqdqoqqqqqqqqqqqqqs8(2nnwwY]]]]]]]^{^a^V^<^%^^^^^^^^^^____8_c_F_z_____M((BMXailswȧէ /8IG?W`fftwĨܨ3DDKdpxũʩѩ"&(3?CXZkuĪ̪ѪSlQh---"..1.Q.m.c........///9/9/C/4OOchnrvx2AKRhmrvx~‚ʂ܂:6:6X6\6`6h6v6y6|6666666666666777&7<EEOEZEEaEEEEEEEEF +FF4FUFgFtFFFFFFFFF GG,GGGcGYG}GGGGGGGGGGGGGGHHg5AFFRW\glll׃׃ ";@@Yr„ۄ (AZsss PPYx}0&GGMlu&&&&&&&&&&& '('*':':'?'A'H'|'sst-t"ttMttetXtttttttt uduWuLu8ujuuuuuuuuuuu v&vvIv5v`vgvvvvvv<:E*9*939>9L9X9d9m9v9999LixG/G/e/w/~/////////$qvOOOOcOkOvO|Ogr1r111111112222"2,2D2O2_2k2r2}22222222222222222223Lx~~:<)4>\gw`FZ999999999999999::::,2911-1>1W1k1n1t1W[W[x[[[[[[[[[[[[[[[\#\/\5\@\d\d\u\\\\\\\\\\\\\\\] ] ]]]]0]0]C]H]Y]_]h]}]]]]]]]]]]]]]]]]]]]]^*^*^2^A^L^S^U^i^x^}^^^^^^^^^^^^^^^_ +__%_*_*_6_E_W_f________```+`2`9`L`N`\`o`q````````````aaa%a7a>aOa]aaaaaaaaaaaaaaaab b)b4b=bEbJbJbYbfbtbbbbbbbbbbbbbbb +c(c.c4c:cCcTc{ccccccccccccdddddeMz+.3@EWY]adw.TY`y!34#7777777778)8;8]888888889:9I9d9o999999::.:=:L:L:W:j:{:::::::::::: ;;/;8;I;M;U;`;x;;;;;;;;;<<<&<L<N<Y<<<<<<<<<<=)=1=9=D=F=V=n========>>>><%0DDDDDDE E%E1E9888-84888N8{888888888999'95hhhhhhhhhhii$i*i0i6iIiOiXi^ipiviiiiii WWWWWWWWWW XX!X&X2XDXDXbXmXXXXXXXXY"Y1Y9YFYOYTYdYrYYYYYYYYYYY@Z*ZZPZZuZfZZZZR[P>>H>J>X>^>y>>>>>>>>X{>>is-79IYbhmtz%4;C^{(..@;ASX^aeeɀ΀#),02K7ZZZu Έd((??VXX\ *.379?Q]rt.HHZP1A8E8ENEZEbEfEwEEEEEEEEE(rx(ntZ&Z&c&m&~&&&&  +  ""11@@OO^^m|#________`_`#`#`H`y`\`O```````` aa)a0aSaiaiaaaa n0n0}000 ->>>>? ???-?>?O?a?s?????????????? @ @ @ @ @@@ @(@6@>@K@S@[@l@w@|@|@@@@@@@@@@@@@AAA A+A1A1A9A9AKARAhAhAhAmAmAAAAAAAAAAAAAAAAA BB&B(B(B+B-B-B:B"F"K"K"R"["l"r"{"""""""""""""""######$#6#?#P#q#############$$8 ..////!/'/-/-/3/ :>w1w1111Svvvvvv ww>wlwrwxwwwwwwwwwwwxMxSxYxaxfxnxxxxxxxxxxxxxx*y0y5y=yMyOysyyyyyyyyyzzz*z*z/zBzYz[zxzzzzzzzzzzz{*{<{I{k{{{{{{{{{{||/|:|M|Q|Q|Q|X|]|p|{||||||||||tff/5:]ptz +#(0O]i%1HSbp%.4?DJaly8k::::::::;;; ;;;;!;!;*;.;D;D;z;;;;;;;;;;;;;< <<<,<8<@<E<E<a<m<v<~<<<<<<<<<<<=+=5=A=I=N=N=m=y=================> >2>4>7><><><>F>N>U>]>f>q>w>>>>>>>>>>>???0?8?8?:?:?????F?L?P?W?[?[?[?[?j?j?????C(CCCCCClllllllm mm"m"m"m'm,m:mEm^m`memsm~mmmm\=P,,,,, -)--A-V-C-e-~--------8fpNNNNO!O'O-O0ONO014<T7Q7QQQdQgQqQ~QQQQQQQQQ"R<@@T[gs0S[66JR_i| 26H!/O[O[c[o[[q[[[[[[[\[>>X_lw|/DFIU]em{ +&/>T_mx $))499DIITYYdd!!!!+EZl} *0;AV\mx~ 5CS_q|5CCIPD#٭(DDDLNNVXX`bbjjsy~~ƮƮˮخ)HHHPRRRZ\\\dfffnpp{{ƯЯЯЯ *7`clsư۰ ".499@KKPbhhhhıl )8::NPY____g"hhvŬЬլ')5@KT\\`EnEEEEF FFFF0F4F9FNFPFSFWF^FrFvF~FFFFFFFFFFFFFFFF G Bjjjjjjjjjkkkk k"k"k'k,k5k@kFkOkbkgk|kkkkkkkkkkl +llll#l#l)l/l4l4lGlUlclmlslxllllllllllll mmm;mbmgmgmgmjmqmwm~mmmmmmmmmmmmmmm +nnn%n'n1n;nAnHnHnJnJnJnOnUnZn^n`ncnnn}nnnnnnnnn +h?g?gUg`gkgyggggggggggghhh+h1hh %Issssssssttt#t> >@>@>L>T>c>>>>>> ?!??B?0?Q?W?f?{?}???????????&@ @@5@R@=@r@@w@@@@@@@@AAA A.A.A:A 1ʓʓ7>M[dt}Ĕ˕ \ No newline at end of file diff --git a/src/Compiler/CompilerA.HH b/src/Compiler/CompilerA.HH index bfc9c485..7a6ba355 100755 --- a/src/Compiler/CompilerA.HH +++ b/src/Compiler/CompilerA.HH @@ -3,7 +3,7 @@ #define IS_0_ARG 0 #define IS_1_ARG 1 #define IS_2_ARG 2 -#define IS_V_ARG 3 //Variable Arg Cnt +#define IS_V_ARG 3 //Variable Arg Count #define IST_NULL 0 #define IST_DEREF 1 @@ -12,7 +12,7 @@ class CIntermediateStruct { - U8 arg_cnt,res_cnt,type; + U8 arg_count,res_count,type; Bool fpop,not_const,pad[3]; U8 *name; }; diff --git a/src/Compiler/CompilerB.HH b/src/Compiler/CompilerB.HH index ca9d5716..65fc4d89 100755 --- a/src/Compiler/CompilerB.HH +++ b/src/Compiler/CompilerB.HH @@ -67,10 +67,10 @@ extern I64 Comp(U8 *filename, U8 *map_name=NULL,U8 *out_name=NULL,U8 mapfile_drv_let=0); #help_index "Debugging/Unassemble" -public extern U8 *U(U8 *rip,I64 cnt=20,I64 seg_size=64); +public extern U8 *U(U8 *rip,I64 count=20,I64 seg_size=64); public extern U0 Ui(U8 *buf,U8 **_rip,I64 seg_size=64, I64 *_jmp_dst=NULL,Bool just_ins=FALSE); -public extern I64 Un(U8 *rip,I64 cnt=0x80,I64 seg_size=64); +public extern I64 Un(U8 *rip,I64 count=0x80,I64 seg_size=64); extern CUAsmGlobals uasm; #help_index "Hash/System" diff --git a/src/Compiler/Lex.HC b/src/Compiler/Lex.HC index c9138e87..9ddb0f37 100755 --- a/src/Compiler/Lex.HC +++ b/src/Compiler/Lex.HC @@ -97,7 +97,7 @@ Bool LexDollar(CCompCtrl *cc,CDoc *doc,CDocEntry *doc_e) Free(cc->dollar_buf); st=Doc2PlainText(doc,doc_e); cc->dollar_buf=MStrPrint("$$%$$Q$$",st); - cc->dollar_cnt=2; + cc->dollar_count=2; Free(st); return TRUE; } else @@ -425,10 +425,10 @@ I64 LexInStr(CCompCtrl *cc,U8 *buf,I64 size,Bool *done) } } else if (ch=='$$') { buf[i++]='$$'; - if (cc->dollar_cnt) - cc->dollar_cnt--; + if (cc->dollar_count) + cc->dollar_count--; else if (LexGetChar(cc)!='$$') { - cc->dollar_cnt=1; + cc->dollar_count=1; cc->flags|=CCF_USE_LAST_U16; } } else @@ -799,7 +799,7 @@ lex_float_start: MemCpy(buf2,buf,j); } tmph(CHashDefineStr *)->data=buf2; - tmph(CHashDefineStr *)->cnt=-1; + tmph(CHashDefineStr *)->count=-1; HashAdd(tmph,cc->htc.define_hash_table); } cc->flags&=~CCF_NO_DEFINES; diff --git a/src/Compiler/LexLib.HC b/src/Compiler/LexLib.HC index ec61350f..972dadf3 100755 --- a/src/Compiler/LexLib.HC +++ b/src/Compiler/LexLib.HC @@ -72,7 +72,7 @@ CMemberLst *MemberFind(U8 *needle_str,CHashClass *haystack_class) tmpm=haystack_class->member_lst_and_root; while (tmpm) { if (!(i=StrCmp(tmpm->str,needle_str))) { - tmpm->use_cnt++; + tmpm->use_count++; return tmpm; } if (i<=0) @@ -119,7 +119,7 @@ U0 MemberAdd(CCompCtrl *cc,CMemberLst *tmpm,CHashClass *tmpc,I64 mode) if (mode==PRS1B_LOCAL_VAR) { tmpm->member_class_base= - tmpm->member_class-tmpm->member_class->ptr_stars_cnt; + tmpm->member_class-tmpm->member_class->ptr_stars_count; if (Bt(&cc->opts,OPTf_WARN_DUP_TYPES) && MemberClassBaseFind(tmpm->member_class_base,tmpc)) LexWarn(cc,"Duplicate type at "); @@ -154,9 +154,9 @@ CMemberLst *MemberLstNew(I64 _reg) return res; } -Bool MemberLstCmp(CMemberLst *tmpm1,CMemberLst *tmpm2,I64 cnt=I64_MAX) +Bool MemberLstCmp(CMemberLst *tmpm1,CMemberLst *tmpm2,I64 count=I64_MAX) { - while (tmpm1 && tmpm2 && cnt--) { + while (tmpm1 && tmpm2 && count--) { if (StrCmp(tmpm1->str,tmpm2->str) || tmpm1->member_class!=tmpm2->member_class || tmpm1->member_class_base!=tmpm2->member_class_base) @@ -174,7 +174,7 @@ Bool MemberLstCmp(CMemberLst *tmpm1,CMemberLst *tmpm2,I64 cnt=I64_MAX) tmpm1=tmpm1->next; tmpm2=tmpm2->next; } - if (cnt<0 || !tmpm1 && !tmpm2) + if (count<0 || !tmpm1 && !tmpm2) return TRUE; else return FALSE; @@ -191,7 +191,7 @@ U0 MemberLstDel(CMemberLst *tmpm) if (tmpm->flags & MLF_STR_DFT_AVAILABLE) Free(tmpm->dft_val); if (tmpm->flags & MLF_FUN) - HashDel(tmpm->fun_ptr-tmpm->fun_ptr->ptr_stars_cnt); + HashDel(tmpm->fun_ptr-tmpm->fun_ptr->ptr_stars_count); tmp_meta=tmpm->meta; while (tmp_meta) { tmp_meta1=tmp_meta->next; @@ -213,9 +213,9 @@ U0 ClassMemberLstDel(CHashClass *tmpc) tmpc->last_in_member_lst=&tmpc->member_lst_and_root; tmpc->member_lst_and_root=NULL; tmpc->member_class_base_root=NULL; - tmpc->member_cnt=0; + tmpc->member_count=0; if (tmpc->type&HTT_FUN) - tmpc(CHashFun *)->arg_cnt=0; + tmpc(CHashFun *)->arg_count=0; } I64 MemberLstSize(CHashClass *tmpc) @@ -230,7 +230,7 @@ I64 MemberLstSize(CHashClass *tmpc) if (tmpm->flags & MLF_STR_DFT_AVAILABLE) res+=MSize2(tmpm->dft_val); if (tmpm->flags & MLF_FUN) - res+=HashEntrySize2(tmpm->fun_ptr-tmpm->fun_ptr->ptr_stars_cnt); + res+=HashEntrySize2(tmpm->fun_ptr-tmpm->fun_ptr->ptr_stars_count); tmp_meta=tmpm->meta; while (tmp_meta) { res+=MSize2(tmp_meta->str); diff --git a/src/Compiler/OptLib.HC b/src/Compiler/OptLib.HC index b508b63f..a2ef860c 100755 --- a/src/Compiler/OptLib.HC +++ b/src/Compiler/OptLib.HC @@ -488,7 +488,7 @@ U0 OptFixSizeOf(CIntermediateCode *tmpi1, tmpi1->t.arg2_tree->ic_code=IC_IMM_I64; tmpi1->t.arg2_tree->ic_class=tmpcc; tmpi_push->ic_class=tmpcc; - if (tmpcc->ptr_stars_cnt) { + if (tmpcc->ptr_stars_count) { tmpcc--; if (tmpcc->size==1) goto here; @@ -517,7 +517,7 @@ I64 CompRawType(CHashClass *tmpc) I64 CompRawTypePointed(CHashClass *tmpc) { if (tmpc) { - if (tmpc->ptr_stars_cnt) + if (tmpc->ptr_stars_count) tmpc--; tmpc=OptClassFwd(tmpc); return tmpc->raw_type; diff --git a/src/Compiler/OptPass012.HC b/src/Compiler/OptPass012.HC index 323fd99f..620aa4ff 100755 --- a/src/Compiler/OptPass012.HC +++ b/src/Compiler/OptPass012.HC @@ -45,7 +45,7 @@ args. tmpi_push=tmpi; MemSet(&tmpi->arg1,0,3*sizeof(CICArg)); tmpi->arg1_type_pointed_to=0; - switch [intermediate_code_table[code].arg_cnt] { + switch [intermediate_code_table[code].arg_count] { case IS_V_ARG: ps->ptr-=tmpi->ic_data>>2; break; @@ -96,7 +96,7 @@ args. OptSetNOP1(tmpi); } else { if (tmpi->ic_data) {//was paren - if (!tmpi_push->ic_class->ptr_stars_cnt) { + if (!tmpi_push->ic_class->ptr_stars_count) { if (tmpi_push->ic_class->raw_type==RT_F64) tmpi_push->ic_class2=cmp.internal_types[RT_F64]; else @@ -265,7 +265,7 @@ args. } break; end: - if (!tmpi_push->ic_class->ptr_stars_cnt) { + if (!tmpi_push->ic_class->ptr_stars_count) { if (tmpi_push->ic_class->raw_type==RT_F64) tmpi_push->ic_class2=cmp.internal_types[RT_F64]; else @@ -712,7 +712,7 @@ args. tmpi->ic_class=cmp.internal_types[RT_I64]; break; end: - if (!tmpi_push->ic_class->ptr_stars_cnt) { + if (!tmpi_push->ic_class->ptr_stars_count) { if (tmpi_push->ic_class->raw_type==RT_F64) tmpi_push->ic_class2=cmp.internal_types[RT_F64]; else if (is_unsigned) @@ -808,7 +808,7 @@ args. break; end: tmpi->ic_flags&=~ICF_RES_TO_INT; - if (!tmpi_push->ic_class->ptr_stars_cnt) { + if (!tmpi_push->ic_class->ptr_stars_count) { if (tmpi_push->ic_class->raw_type==RT_F64) tmpi_push->ic_class2=cmp.internal_types[RT_F64]; else if (is_unsigned) @@ -1256,7 +1256,7 @@ args. ICPut(cc,tmpi); LexExcept(cc,"Compiler Optimization Error at "); } - if (intermediate_code_table[code].arg_cnt==IS_2_ARG) { + if (intermediate_code_table[code].arg_count==IS_2_ARG) { if (tmpi_push->ic_precedence&~ASSOC_MASK==PREC_ASSIGN) OptFixSizeOf(tmpi2,tmpi_push,tmpi1->ic_class-1); else { @@ -1264,7 +1264,7 @@ args. OptFixSizeOf(tmpi2,tmpi_push,tmpi1->ic_class); } } - if (intermediate_code_table[tmpi_push->ic_code].res_cnt) { + if (intermediate_code_table[tmpi_push->ic_code].res_count) { ParsePush(ps,tmpi->ic_class2); ParsePush(ps,tmpi_push); } diff --git a/src/Compiler/OptPass3.HC b/src/Compiler/OptPass3.HC index 40fe1fb6..263c275f 100755 --- a/src/Compiler/OptPass3.HC +++ b/src/Compiler/OptPass3.HC @@ -4,7 +4,7 @@ U0 OptPass3(CCompCtrl *cc,COptReg *reg_offsets) CCodeMisc *lb; CIntermediateCode *tmpi,*tmpi1,*tmpi2,*tmpi_next, *tmpil1,*tmpil2; - I64 code,i,j,l,member_cnt,used_reg_mask=0; + I64 code,i,j,l,member_count,used_reg_mask=0; CMemberLst *tmpm; COptMemberVar *mv=NULL; CAOT *tmpaot; @@ -18,11 +18,11 @@ U0 OptPass3(CCompCtrl *cc,COptReg *reg_offsets) reg_offsets[i].m=NULL; } if (cc->htc.fun) { - member_cnt=cc->htc.fun->member_cnt; + member_count=cc->htc.fun->member_count; if (Bt(&cc->htc.fun->flags,Ff_DOT_DOT_DOT)) - member_cnt+=2; - mv=CAlloc(member_cnt*sizeof(COptMemberVar)); - member_cnt=0; + member_count+=2; + mv=CAlloc(member_count*sizeof(COptMemberVar)); + member_count=0; tmpm=cc->htc.fun->member_lst_and_root; while (tmpm) { tmpc=OptClassFwd(tmpm->member_class); @@ -36,10 +36,10 @@ U0 OptPass3(CCompCtrl *cc,COptReg *reg_offsets) } else if (tmpc->raw_type!=RT_F64 && tmpm->reg!=REG_NONE || tmpm->reg==REG_ALLOC) { if (tmpm->reg==REG_ALLOC) - mv[member_cnt].score=I64_MAX/2; //big but not too big - mv[member_cnt].offset_start=tmpm->offset; - mv[member_cnt].offset_end=tmpm->offset+MaxI64(1,tmpm->size); - mv[member_cnt++].m=tmpm; + mv[member_count].score=I64_MAX/2; //big but not too big + mv[member_count].offset_start=tmpm->offset; + mv[member_count].offset_end=tmpm->offset+MaxI64(1,tmpm->size); + mv[member_count++].m=tmpm; } else if (tmpm->reg==REG_ALLOC) PrintWarn("Can't reg var\n $$LK,\"FL:%s,%d\"$$'%s' in '%s'\n", cc->lex_include_stk->full_name, @@ -47,7 +47,7 @@ U0 OptPass3(CCompCtrl *cc,COptReg *reg_offsets) tmpm=tmpm->next; } } else - member_cnt=0; + member_count=0; tmpi=cc->coc.coc_head.next; while (code=tmpi->ic_code) { @@ -61,7 +61,7 @@ U0 OptPass3(CCompCtrl *cc,COptReg *reg_offsets) } else tmpil1=tmpil2=&cmp.ic_nop; tmpc=tmpi->ic_class; - switch [intermediate_code_table[code].arg_cnt] { + switch [intermediate_code_table[code].arg_count] { case IS_V_ARG: ps->ptr-=tmpi->ic_data>>3; break; @@ -90,7 +90,7 @@ U0 OptPass3(CCompCtrl *cc,COptReg *reg_offsets) case IS_0_ARG: //nobound switch break; } - if (intermediate_code_table[code].res_cnt) { + if (intermediate_code_table[code].res_count) { tmpi->res.type=MDF_STK+CompRawType(tmpc); tmpi->ic_flags|=ICF_RES_WAS_STK; ParsePush(ps,tmpi); @@ -127,7 +127,7 @@ U0 OptPass3(CCompCtrl *cc,COptReg *reg_offsets) tmpi->ic_code=IC_MOV; OptFree(tmpi1); if (tmpi->arg1.reg==REG_RBP) - for (i=0;iarg1.disp) { mv[i].lea_balance--; mv[i].score++; @@ -155,7 +155,7 @@ U0 OptPass3(CCompCtrl *cc,COptReg *reg_offsets) case IC_DEREF_MM: if (tmpi1->ic_code==IC_LEA && tmpi1->arg1.type&MDF_DISP && tmpi1->arg1.reg==REG_RBP) - for (i=0;iarg1.disp) { mv[i].lea_balance--; mv[i].score++; @@ -190,7 +190,7 @@ U0 OptPass3(CCompCtrl *cc,COptReg *reg_offsets) tmpi->arg1.reg=REG_RBP; tmpi->arg1.type=MDF_DISP+tmpi->arg1.type.raw_type; tmpi->arg1.disp=tmpi->ic_data; - for (i=0;iic_dataic_code==IC_LEA && tmpi1->arg1.type&MDF_DISP && tmpi1->arg1.reg==REG_RBP) - for (i=0;iarg1.disp) { mv[i].lea_balance--; mv[i].score++; @@ -269,7 +269,7 @@ U0 OptPass3(CCompCtrl *cc,COptReg *reg_offsets) case IC_NOBOUND_SWITCH: case IC_SWITCH: lb=OptLabelFwd(tmpi->ic_data(CCodeMisc *)->dft); - lb->use_cnt++; + lb->use_count++; break; case IC_ASM: tmpaot=tmpi->ic_data; @@ -278,7 +278,7 @@ U0 OptPass3(CCompCtrl *cc,COptReg *reg_offsets) if (IET_REL_I0<=tmpie->type<=IET_IMM_I64 && tmpie->str && tmpie->flags&IEF_GOTO_LABEL && (lb=COCGoToLabelFind(cc,tmpie->str))) - lb->use_cnt++; //Prevent deadcode elimination. + lb->use_count++; //Prevent deadcode elimination. tmpie=tmpie->next; } break; @@ -361,7 +361,7 @@ U0 OptPass3(CCompCtrl *cc,COptReg *reg_offsets) case IC_BR_MM_NOT_ZERO: if (tmpi1->ic_code==IC_LEA && tmpi1->arg1.type&MDF_DISP && tmpi1->arg1.reg==REG_RBP) - for (i=0;iarg1.disp) { mv[i].lea_balance--; mv[i].score++; @@ -394,7 +394,7 @@ here1: lb=tmpi->ic_data; else lb=OptLabelFwd(tmpi->ic_data); - lb->use_cnt++; + lb->use_count++; break; case IC_NOP1: tmpi=OptFree(tmpi); @@ -535,11 +535,11 @@ R12 and R13 as non-pointer register variables, such as index variables i,j,k. ~(REGG_LOCAL_VARS|REGG_LOCAL_NON_PTR_VARS)|used_reg_mask; if (!Bt(&cc->opts,OPTf_NO_REG_VAR) && !(cc->flags & CCF_NO_REG_OPT)) { - QSort(mv,member_cnt,sizeof(COptMemberVar),&OptMVCompare); - while (member_cnt && !mv[member_cnt-1].score) - member_cnt--; + QSort(mv,member_count,sizeof(COptMemberVar),&OptMVCompare); + while (member_count && !mv[member_count-1].score) + member_count--; j=0; - for (i=0;imember_class); - if (!tmpc->ptr_stars_cnt && !tmpm->dim.next) { + if (!tmpc->ptr_stars_count && !tmpm->dim.next) { while (lhtc.fun->used_reg_mask,cmp.non_ptr_vars_map[l])) l++; diff --git a/src/Compiler/OptPass4.HC b/src/Compiler/OptPass4.HC index 399c0e3f..f0a34c3a 100755 --- a/src/Compiler/OptPass4.HC +++ b/src/Compiler/OptPass4.HC @@ -151,8 +151,8 @@ U0 OptPass4(CCompCtrl *cc,COptReg *reg_offsets,I64 *_type) if (dead_code&&code!=IC_LABEL) { if (code==IC_JMP||code==IC_SUB_CALL) { lb=OptLabelFwd(tmpi->ic_data); - if (lb->use_cnt>0) - lb->use_cnt--; + if (lb->use_count>0) + lb->use_count--; } tmpi=OptFree(tmpi); } else { @@ -166,7 +166,7 @@ U0 OptPass4(CCompCtrl *cc,COptReg *reg_offsets,I64 *_type) tmpil2=tmpil3=&cmp.ic_nop; } else tmpil1=tmpil2=tmpil3=&cmp.ic_nop; - switch [intermediate_code_table[code].arg_cnt] { + switch [intermediate_code_table[code].arg_count] { case IS_V_ARG: ps->ptr-=tmpi->ic_data>>3; break; @@ -527,7 +527,7 @@ p4_sib: break; case IC_LABEL: lb=tmpi->ic_data; - if (lb->use_cnt) + if (lb->use_count) dead_code=FALSE; break; case IC_JMP: @@ -549,7 +549,7 @@ p4_sib: tmpi->arg1.disp=0; tmpil1->res.type=MDF_REG+tmpil1->res.type.raw_type; tmpil1->res.disp=0; - if (intermediate_code_table[tmpi->ic_code].arg_cnt==IS_2_ARG) { + if (intermediate_code_table[tmpi->ic_code].arg_count==IS_2_ARG) { tmpi->arg1.reg=REG_R8; tmpil1->res.reg=REG_R8; } else { @@ -676,7 +676,7 @@ p4_sib: if (tmpi) { while (OptIC4(tmpi)); code=tmpi->ic_code; - if (intermediate_code_table[code].res_cnt) + if (intermediate_code_table[code].res_count) ParsePush(ps,tmpi); } } diff --git a/src/Compiler/OptPass5.HC b/src/Compiler/OptPass5.HC index bc0d7cdf..bc4253f7 100755 --- a/src/Compiler/OptPass5.HC +++ b/src/Compiler/OptPass5.HC @@ -15,7 +15,7 @@ U0 OptPass5(CCompCtrl *cc) ICPut(cc,tmpi); } } - if (intermediate_code_table[code].arg_cnt==IS_V_ARG) + if (intermediate_code_table[code].arg_count==IS_V_ARG) ps->ptr-=tmpi->ic_data>>3; if (code==IC_PUSH_REGS) { for (i=0;iptr--; stk_ptr=ParsePop(ps); } - if (intermediate_code_table[code].arg_cnt==IS_V_ARG) + if (intermediate_code_table[code].arg_count==IS_V_ARG) stk_ptr-=tmpi->ic_data>>3; if (tmpi->arg2.type&MDF_STK) { stk_ptr--; @@ -147,7 +147,7 @@ U0 OptPass6(CCompCtrl *cc) tmpi->arg1.disp=0; tmpil2->res.type=MDF_REG+tmpil2->res.type.raw_type; tmpil2->res.disp=0; - if (intermediate_code_table[tmpi->ic_code].arg_cnt==IS_2_ARG) { + if (intermediate_code_table[tmpi->ic_code].arg_count==IS_2_ARG) { tmpi->arg1.reg=REG_R8; tmpil2->res.reg=REG_R8; } else { diff --git a/src/Compiler/OptPass789A.HC b/src/Compiler/OptPass789A.HC index a15ae252..541aeaa3 100755 --- a/src/Compiler/OptPass789A.HC +++ b/src/Compiler/OptPass789A.HC @@ -7,7 +7,7 @@ size is now known cc->pass==10 is final pass, code is placed into buf. */ CIntermediateCode *tmpi,*tmpi_next; - I64 i,cnt,num_lines=cc->max_line+1-cc->min_line,rip=0,rip2; + I64 i,count,num_lines=cc->max_line+1-cc->min_line,rip=0,rip2; U8 *ptr,saved_arg1_arg2_r[3*sizeof(CICArg)]; CCodeMisc *lb; CAOT *tmpaot; @@ -42,7 +42,7 @@ cc->pass==10 is final pass, code is placed into buf. cc->last_float_op_ic=NULL; tmpi=&cc->coc.coc_head; tmpi->ic_last_start=-1; - tmpi->ic_cnt=0; + tmpi->ic_count=0; tmpi=tmpi->next; while (tmpi->ic_code) { tmpi_next=tmpi->next; @@ -60,7 +60,7 @@ cc->pass==10 is final pass, code is placed into buf. if (cc->pass==7) cc->dont_push_float=Btr(&tmpi->ic_flags,ICf_DONT_PUSH_FLOAT0); MemCpy(saved_arg1_arg2_r,&tmpi->arg1,3*sizeof(CICArg)); - tmpi->ic_cnt=0; + tmpi->ic_count=0; tmpi->ic_last_start=-1; if (tmpi->arg2.type.mode) { if (tmpi->ic_flags & ICF_ARG2_TO_F64) { @@ -105,7 +105,7 @@ cc->pass==10 is final pass, code is placed into buf. tmpa->next=aotc->abss; tmpa->type=AAT_ADD_U64; aotc->abss=tmpa; - tmpa->rip=rip2+tmpi->ic_cnt-8; + tmpa->rip=rip2+tmpi->ic_count-8; } break; case IC_HEAP_GLBL: @@ -118,7 +118,7 @@ cc->pass==10 is final pass, code is placed into buf. tmphgr=CAlloc(sizeof(CAOTHeapGlobalRef)); tmphgr->next=tmphg->references; tmphg->references=tmphgr; - tmphgr->rip=rip2+tmpi->ic_cnt-8; + tmphgr->rip=rip2+tmpi->ic_count-8; } break; case IC_ADDR_IMPORT: @@ -128,7 +128,7 @@ cc->pass==10 is final pass, code is placed into buf. tmpg=tmpi->ic_data; tmpie=CAlloc(sizeof(CAOTImportExport)); tmpie->type=IET_IMM_U32; - tmpie->rip=rip2+tmpi->ic_cnt-4; + tmpie->rip=rip2+tmpi->ic_count-4; tmpie->next=tmpg->ie_lst; tmpg->ie_lst=tmpie; } @@ -136,13 +136,13 @@ cc->pass==10 is final pass, code is placed into buf. break; case IC_RIP: ICU16(tmpi,0xB848); - ICU64(tmpi,rip2+tmpi->ic_cnt-2); + ICU64(tmpi,rip2+tmpi->ic_count-2); if (cc->flags&CCF_AOT_COMPILE && buf &&!(cc->flags&CCF_NO_ABSS)) { tmpa=CAlloc(sizeof(CAOTAbsAddr)); tmpa->next=aotc->abss; tmpa->type=AAT_ADD_U64; aotc->abss=tmpa; - tmpa->rip=rip2+tmpi->ic_cnt-8; + tmpa->rip=rip2+tmpi->ic_count-8; } break; end: @@ -305,7 +305,7 @@ cc->pass==10 is final pass, code is placed into buf. break; case IC_ASM: tmpaot=tmpi->ic_data; - tmpi->ic_cnt+=tmpaot->aot_U8s; + tmpi->ic_count+=tmpaot->aot_U8s; if (buf) { MemCpy(buf+rip,tmpaot->buf,tmpaot->aot_U8s); Free(tmpaot->buf); @@ -316,7 +316,7 @@ cc->pass==10 is final pass, code is placed into buf. CompFixUpAOTAsm(cc,tmpaot); else CompFixUpJITAsm(cc,tmpaot); - cnt=tmpi->ic_cnt; + count=tmpi->ic_count; goto op789A_skip_copy; } break; @@ -344,7 +344,7 @@ cc->pass==10 is final pass, code is placed into buf. break; case IC_CALL_INDIRECT2: ICU16(tmpi,0xBB48); - if (cc->flags&CCF_AOT_COMPILE) i=rip2+tmpi->ic_cnt; + if (cc->flags&CCF_AOT_COMPILE) i=rip2+tmpi->ic_count; ICU64(tmpi,tmpi->ic_data); ICU16(tmpi,0x13FF); if (buf && cc->flags&CCF_AOT_COMPILE&& !(cc->flags&CCF_NO_ABSS)) { @@ -363,7 +363,7 @@ cc->pass==10 is final pass, code is placed into buf. tmpf=tmpi->ic_data; tmpie=CAlloc(sizeof(CAOTImportExport)); tmpie->type=IET_IMM_I64; - tmpie->rip=rip2+tmpi->ic_cnt-8; + tmpie->rip=rip2+tmpi->ic_count-8; tmpie->next=tmpf->ie_lst; tmpf->ie_lst=tmpie; } @@ -375,7 +375,7 @@ cc->pass==10 is final pass, code is placed into buf. tmpf=tmpi->ic_data; tmpie=CAlloc(sizeof(CAOTImportExport)); tmpie->type=IET_REL_I32; - tmpie->rip=rip2+tmpi->ic_cnt-4; + tmpie->rip=rip2+tmpi->ic_count-4; tmpie->next=tmpf->ie_lst; tmpf->ie_lst=tmpie; } @@ -406,12 +406,12 @@ cc->pass==10 is final pass, code is placed into buf. if (Bt(&cc->htc.fun->flags,Ff_HASERRCODE)) ICAddRSP(tmpi,8); ICU16(tmpi,0xCF48); - } else if (cc->htc.fun && cc->htc.fun->arg_cnt && + } else if (cc->htc.fun && cc->htc.fun->arg_count && (Bt(&cc->htc.fun->flags,Ff_RET1) || Bt(&cc->htc.fun->flags,Ff_ARGPOP)) && !Bt(&cc->htc.fun->flags,Ff_NOARGPOP)) { ICU8(tmpi,0xC2); - ICU16(tmpi,cc->htc.fun->arg_cnt<<3); + ICU16(tmpi,cc->htc.fun->arg_count<<3); } else ICU8(tmpi,0xC3); break; @@ -1063,14 +1063,14 @@ cc->pass==10 is final pass, code is placed into buf. } } } - cnt=tmpi->ic_cnt; + count=tmpi->ic_count; if (tmpi->ic_flags&ICF_DEL_PREV_INS) { if (cc->pass>8) - cnt=tmpi->ic_last_start; + count=tmpi->ic_last_start; tmpi->ic_flags&=~ICF_DEL_PREV_INS; } - if (cnt && buf) - MemCpy(buf+rip,tmpi->ic_body,cnt); + if (count && buf) + MemCpy(buf+rip,tmpi->ic_body,count); op789A_skip_copy: if (dbg_info && cc->min_line<=tmpi->ic_line<=cc->max_line) { i=tmpi->ic_line-cc->min_line; @@ -1078,18 +1078,18 @@ op789A_skip_copy: dbg_info->body[i]=rip2; } if (tmpi->ic_flags&ICF_PASS_TRACE && - Bt(&cc->saved_pass_trace,cc->pass) && cnt) { + Bt(&cc->saved_pass_trace,cc->pass) && count) { "$$RED$$"; if (buf) - Un(buf+rip,cnt,64); + Un(buf+rip,count,64); else - Un(tmpi->ic_body,cnt,64); + Un(tmpi->ic_body,count,64); "$$FG$$"; } if (!(tmpi->ic_flags&(ICF_CODE_FINAL|ICF_DONT_RESTORE))) MemCpy(&tmpi->arg1,saved_arg1_arg2_r,3*sizeof(CICArg)); - rip+=cnt; - if (tmpi->ic_cnt>=IC_BODY_SIZE && tmpi->ic_code!=IC_ASM) + rip+=count; + if (tmpi->ic_count>=IC_BODY_SIZE && tmpi->ic_code!=IC_ASM) throw('Compiler'); op789A_next: tmpi=tmpi_next; diff --git a/src/Compiler/ParseExp.HC b/src/Compiler/ParseExp.HC index e94bb699..b1191992 100755 --- a/src/Compiler/ParseExp.HC +++ b/src/Compiler/ParseExp.HC @@ -18,15 +18,15 @@ CIntermediateCode *ParseAddOp(CCompCtrl *cc,I64 stk_op,CHashClass *tmpc) Bool div_sizeof=FALSE; switch (stk_op.u16[0]) { case IC_ADD: - if (tmpc->ptr_stars_cnt && !tmpi->ic_class->ptr_stars_cnt && + if (tmpc->ptr_stars_count && !tmpi->ic_class->ptr_stars_count && tmpi->ic_class->raw_type!=RT_F64) { ICAdd(cc,IC_SIZEOF,1,cmp.internal_types[RT_I64]); ICAdd(cc,IC_MUL,0,cmp.internal_types[RT_I64]); } break; case IC_SUB: - if (tmpc->ptr_stars_cnt && tmpi->ic_class->raw_type!=RT_F64) { - if (!tmpi->ic_class->ptr_stars_cnt) { + if (tmpc->ptr_stars_count && tmpi->ic_class->raw_type!=RT_F64) { + if (!tmpi->ic_class->ptr_stars_count) { ICAdd(cc,IC_SIZEOF,1,cmp.internal_types[RT_I64]); ICAdd(cc,IC_MUL,0,cmp.internal_types[RT_I64]); } else @@ -39,7 +39,7 @@ CIntermediateCode *ParseAddOp(CCompCtrl *cc,I64 stk_op,CHashClass *tmpc) break; case IC_ADD_EQU: case IC_SUB_EQU: - if (tmpc->ptr_stars_cnt) { + if (tmpc->ptr_stars_count) { ICAdd(cc,IC_SIZEOF,1,cmp.internal_types[RT_I64]); ICAdd(cc,IC_MUL,0,cmp.internal_types[RT_I64]); } @@ -148,10 +148,10 @@ pe_check_binary_ops2: } else { tmpi=cc->coc.coc_head.last; tmpc=tmpi->ic_class; - if (stk_op.u16[0]==IC_DEREF && tmpc->ptr_stars_cnt) + if (stk_op.u16[0]==IC_DEREF && tmpc->ptr_stars_count) tmpc--; else if (stk_op.u16[0]==IC_ADDR) { - cc->abs_cnts.c_addres++; + cc->abs_counts.c_addres++; if (intermediate_code_table[tmpi->ic_code].type==IST_DEREF) OptFree(tmpi); tmpc++; @@ -173,7 +173,7 @@ pe_do_binary_op: case IC_ADD: case IC_SUB: tmpi=cc->coc.coc_head.last; - if (!tmpi->ic_class->ptr_stars_cnt && + if (!tmpi->ic_class->ptr_stars_count && tmpi->ic_class->raw_type!=RT_F64) { ICAdd(cc,IC_SIZEOF,1,cmp.internal_types[RT_I64]); ICAdd(cc,IC_MUL,0,cmp.internal_types[RT_I64]); @@ -202,7 +202,7 @@ pe_do_binary_op: tmpi=cc->coc.coc_head.last; tmpc=OptClassFwd(tmpi->ic_class); if (intermediate_code_table[tmpi->ic_code].type!=IST_DEREF || - !tmpc->ptr_stars_cnt && !Bt(&tmpc->flags,Cf_INTERNAL_TYPE)) + !tmpc->ptr_stars_count && !Bt(&tmpc->flags,Cf_INTERNAL_TYPE)) LexExcept(cc,"Invalid lval at "); tmpi->ic_code=IC_NOP1; //Important for setting class (pretty sure) cur_op.u8[2]=PREC_ASSIGN|ASSOCF_RIGHT; @@ -310,7 +310,7 @@ U0 ParseSizeOf(CCompCtrl *cc) LexExcept(cc,"Invalid class at "); if (tmpm=cc->local_var_entry) { tmpc=tmpm->member_class; - i=tmpc->size*tmpm->dim.total_cnt; + i=tmpc->size*tmpm->dim.total_count; if (Lex(cc)=='.') goto pu_sizeof_member; } else { @@ -335,11 +335,11 @@ pu_sizeof_member: if (Lex(cc)!=TK_IDENT || !(tmpm=MemberFind(cc->cur_str,tmpc))) LexExcept(cc,"Invalid member at "); else if (cc->local_var_entry) - cc->local_var_entry->use_cnt--; + cc->local_var_entry->use_count--; tmpc=tmpm->member_class; //Probably others like this: #assert offset(CHashClass.size)==offset(CHashGlobalVar.size) - i=tmpc->size*tmpm->dim.total_cnt; + i=tmpc->size*tmpm->dim.total_count; } } } @@ -373,7 +373,7 @@ U0 ParseOffsetOf(CCompCtrl *cc) if (Lex(cc)!=TK_IDENT || !(tmpm=MemberFind(cc->cur_str,tmpc))) LexExcept(cc,"Invalid member at "); else if (cc->local_var_entry) - cc->local_var_entry->use_cnt--; + cc->local_var_entry->use_count--; i+=tmpm->offset; tmpc=tmpm->member_class; } while (Lex(cc)=='.'); @@ -382,7 +382,7 @@ U0 ParseOffsetOf(CCompCtrl *cc) I64 ParseFunCall(CCompCtrl *cc,CPrsStk *ps,Bool indirect,CHashFun *tmpf) { - I64 i,argc_cnt,dft_val; + I64 i,argc_count,dft_val; Bool is_first_arg=TRUE,needs_right_paren,is_print,is_putchars, is_template_fun; CHashClass *tmpc2,*last_class=NULL; @@ -427,9 +427,9 @@ I64 ParseFunCall(CCompCtrl *cc,CPrsStk *ps,Bool indirect,CHashFun *tmpf) COCPush(cc); tmpcbh=cc->coc.coc_next; cc->coc.coc_next=NULL; - i=tmpf->arg_cnt; + i=tmpf->arg_count; tmpm=tmpf->member_lst_and_root; - argc_cnt=0; + argc_count=0; if (cc->token=='(') { Lex(cc); needs_right_paren=TRUE; @@ -456,7 +456,7 @@ I64 ParseFunCall(CCompCtrl *cc,CPrsStk *ps,Bool indirect,CHashFun *tmpf) (cc->token==')' || cc->token==',' || !needs_right_paren)) { dft_val=tmpm->dft_val; if (tmpm->flags & MLF_LASTCLASS && last_class) - dft_val=(last_class-last_class->ptr_stars_cnt)->str; + dft_val=(last_class-last_class->ptr_stars_count)->str; if (tmpm->flags & (MLF_STR_DFT_AVAILABLE|MLF_LASTCLASS) && cc->flags&CCF_AOT_COMPILE) { cm=COCMiscNew(cc,CMT_STR_CONST); @@ -506,7 +506,7 @@ I64 ParseFunCall(CCompCtrl *cc,CPrsStk *ps,Bool indirect,CHashFun *tmpf) throw('Compiler'); COCPush(cc); is_first_arg=FALSE; - argc_cnt++; + argc_count++; } while (cc->token==','); } } else if (needs_right_paren) { @@ -523,11 +523,11 @@ I64 ParseFunCall(CCompCtrl *cc,CPrsStk *ps,Bool indirect,CHashFun *tmpf) throw('Compiler'); COCPush(cc); is_first_arg=FALSE; - argc_cnt++; + argc_count++; } while (cc->token==','); } } - tmpi->ic_data=argc_cnt++; //++ so add_esp latter works + tmpi->ic_data=argc_count++; //++ so add_esp latter works } if (needs_right_paren) { if (cc->token==')') @@ -557,9 +557,9 @@ I64 ParseFunCall(CCompCtrl *cc,CPrsStk *ps,Bool indirect,CHashFun *tmpf) else { if (indirect) ICAdd(cc,IC_CALL_INDIRECT, - (argc_cnt+tmpf->arg_cnt)<<3,tmpf->return_class); + (argc_count+tmpf->arg_count)<<3,tmpf->return_class); else if (Bt(&tmpf->flags,Cf_EXTERN)) { - cc->abs_cnts.externs++; + cc->abs_counts.externs++; if (cc->flags&CCF_AOT_COMPILE) { if (tmpf->type&HTF_IMPORT) ICAdd(cc,IC_CALL_IMPORT,tmpf,tmpf->return_class); @@ -572,14 +572,14 @@ I64 ParseFunCall(CCompCtrl *cc,CPrsStk *ps,Bool indirect,CHashFun *tmpf) if ((Bt(&tmpf->flags,Ff_RET1) || Bt(&tmpf->flags,Ff_ARGPOP)) && !Bt(&tmpf->flags,Ff_NOARGPOP)) { if (indirect) { - ICAdd(cc,IC_ADD_RSP1,(argc_cnt+tmpf->arg_cnt)<<3,tmpf->return_class); + ICAdd(cc,IC_ADD_RSP1,(argc_count+tmpf->arg_count)<<3,tmpf->return_class); ICAdd(cc,IC_ADD_RSP,8,tmpf->return_class); } else - ICAdd(cc,IC_ADD_RSP1,(argc_cnt+tmpf->arg_cnt)<<3,tmpf->return_class); + ICAdd(cc,IC_ADD_RSP1,(argc_count+tmpf->arg_count)<<3,tmpf->return_class); } else { if (indirect) - argc_cnt++; - ICAdd(cc,IC_ADD_RSP,(argc_cnt+tmpf->arg_cnt)<<3,tmpf->return_class); + argc_count++; + ICAdd(cc,IC_ADD_RSP,(argc_count+tmpf->arg_count)<<3,tmpf->return_class); } } if (!is_template_fun) @@ -635,7 +635,7 @@ I64 ParseUnaryTerm(CCompCtrl *cc,CPrsStk *ps,CMemberLst **_local_var, } LexExcept(cc,"Can't take addr of extern fun"); } - cc->abs_cnts.externs++; + cc->abs_counts.externs++; ICAdd(cc,IC_IMM_I64, &tmpf->exe_addr,cmp.internal_types[RT_PTR]); ICAdd(cc,IC_DEREF,0,cmp.internal_types[RT_PTR]); @@ -644,12 +644,12 @@ I64 ParseUnaryTerm(CCompCtrl *cc,CPrsStk *ps,CMemberLst **_local_var, ICAdd(cc,IC_ABS_ADDR, tmpf->exe_addr,cmp.internal_types[RT_PTR]); if (cc->flags&CCF_ASM_EXPRESSIONS) - cc->abs_cnts.abs_addres++; + cc->abs_counts.abs_addres++; } else ICAdd(cc,IC_IMM_I64, tmpf->exe_addr,cmp.internal_types[RT_PTR]); } - cc->abs_cnts.c_addres++; + cc->abs_counts.c_addres++; Lex(cc); return PE_MAYBE_MODIFIERS; } @@ -657,7 +657,7 @@ I64 ParseUnaryTerm(CCompCtrl *cc,CPrsStk *ps,CMemberLst **_local_var, tmpex=tmpc; if (cc->flags&CCF_ASM_EXPRESSIONS && !(cc->flags&CCF_AOT_COMPILE) && tmpex->type&HTF_IMM) { - cc->abs_cnts.c_addres++; + cc->abs_counts.c_addres++; ICAdd(cc,IC_IMM_I64, tmpex->val,cmp.internal_types[RT_PTR]); Lex(cc); @@ -706,7 +706,7 @@ I64 ParseUnaryTerm(CCompCtrl *cc,CPrsStk *ps,CMemberLst **_local_var, break; case '$$': if (cc->flags & CCF_ASM_EXPRESSIONS) { - cc->abs_cnts.abs_addres++; + cc->abs_counts.abs_addres++; if (cc->flags&CCF_AOT_COMPILE) ICAdd(cc,IC_ABS_ADDR,cc->aotc->rip,cmp.internal_types[RT_PTR]); else @@ -767,7 +767,7 @@ I64 ParseUnaryTerm(CCompCtrl *cc,CPrsStk *ps,CMemberLst **_local_var, if (tmpm->flags & MLF_FUN && !(cc->flags&CCF_ASM_EXPRESSIONS)) { ParsePopDeref(ps); cc->flags|=CCF_FUN_EXP; - ParsePush2(ps,tmpm->fun_ptr-tmpm->fun_ptr->ptr_stars_cnt); + ParsePush2(ps,tmpm->fun_ptr-tmpm->fun_ptr->ptr_stars_count); } if (tmpm->dim.next) { *_tmpad=tmpm->dim.next; @@ -833,7 +833,7 @@ pu_export_sys_sym: if (PREC_TERM>*max_prec) *max_prec=PREC_TERM; if (!(tmpex->type & (HTF_IMM|HTF_IMPORT))) - cc->abs_cnts.abs_addres++; + cc->abs_counts.abs_addres++; if (tmpex->type & HTF_UNRESOLVED) { if (!(cc->flags&CCF_ASM_EXPRESSIONS)) LexExcept(cc,"Illegal fwd ref at "); @@ -853,7 +853,7 @@ pu_export_sys_sym: ICAdd(cc,IC_ABS_ADDR,tmpex->val,cmp.internal_types[RT_PTR]); else { if (tmpex->type&HTF_IMM) - cc->abs_cnts.c_addres++; + cc->abs_counts.c_addres++; ICAdd(cc,IC_IMM_I64,tmpex->val,cmp.internal_types[RT_PTR]); } } @@ -889,7 +889,7 @@ pu_export_sys_sym: } } else { if (tmpg->flags & GVF_EXTERN) { - cc->abs_cnts.externs++; + cc->abs_counts.externs++; ICAdd(cc,IC_IMM_I64,&tmpg->data_addr,tmpc); ICAdd(cc,IC_DEREF,0,tmpc); } else @@ -899,7 +899,7 @@ pu_export_sys_sym: if (tmpg->flags & GVF_FUN) { ParsePopDeref(ps); cc->flags|=CCF_FUN_EXP; - ParsePush2(ps,tmpg->fun_ptr-tmpg->fun_ptr->ptr_stars_cnt); + ParsePush2(ps,tmpg->fun_ptr-tmpg->fun_ptr->ptr_stars_count); } return PE_UNARY_MODIFIERS; case HTt_CLASS: @@ -987,7 +987,7 @@ I64 ParseUnaryModifier(CCompCtrl *cc,CPrsStk *ps,CMemberLst **_local_var, if (!*unary_post_prec) *unary_post_prec=PREC_TERM; tmpc=cc->coc.coc_head.last->ic_class; - if ((!tmpc->ptr_stars_cnt || cc->flags & CCF_ARRAY) && cc->token=='.') + if ((!tmpc->ptr_stars_count || cc->flags & CCF_ARRAY) && cc->token=='.') LexExcept(cc,"Must be address, not value "); if (!(cc->flags & CCF_RAX)) tmpc--; @@ -997,7 +997,7 @@ I64 ParseUnaryModifier(CCompCtrl *cc,CPrsStk *ps,CMemberLst **_local_var, !(tmpm=MemberFind(cc->cur_str,tmpc))) LexExcept(cc,"Invalid member at "); else if (cc->local_var_entry) - cc->local_var_entry->use_cnt--; + cc->local_var_entry->use_count--; Lex(cc); //skip member name tmpc1=tmpm->member_class+1; ICAdd(cc,IC_IMM_I64,tmpm->offset,tmpc1); @@ -1008,7 +1008,7 @@ I64 ParseUnaryModifier(CCompCtrl *cc,CPrsStk *ps,CMemberLst **_local_var, } if(tmpm->flags & MLF_FUN) { ParsePopDeref(ps); - ParsePush2(ps,tmpm->fun_ptr-tmpm->fun_ptr->ptr_stars_cnt); + ParsePush2(ps,tmpm->fun_ptr-tmpm->fun_ptr->ptr_stars_count); cc->flags|=CCF_FUN_EXP; } ICAdd(cc,IC_ADD,0,tmpc1); @@ -1057,17 +1057,17 @@ I64 ParseUnaryModifier(CCompCtrl *cc,CPrsStk *ps,CMemberLst **_local_var, *unary_post_prec=PREC_TERM; Lex(cc); tmpc=OptClassFwd(cc->coc.coc_head.last->ic_class); - if (!tmpc->ptr_stars_cnt) + if (!tmpc->ptr_stars_count) LexExcept(cc,"Not array or ptr "); if (!(cc->flags & (CCF_ARRAY | CCF_RAX))) { tmpc=OptClassFwd(tmpc-1); - if (!tmpc->ptr_stars_cnt) + if (!tmpc->ptr_stars_count) LexExcept(cc,"Not array or ptr "); ICAdd(cc,IC_DEREF+PREC_UNARY_PRE<<16,0,tmpc); } tmpc1=tmpc-1; if (tmpad1=*_tmpad) { - ICAdd(cc,IC_IMM_I64,tmpad1->total_cnt*tmpc1->size,tmpc); + ICAdd(cc,IC_IMM_I64,tmpad1->total_count*tmpc1->size,tmpc); if (*_tmpad=tmpad1->next) { old_flags=cc->flags; if (!ParseExpression(cc,NULL,FALSE,ps)) diff --git a/src/Compiler/ParseLib.HC b/src/Compiler/ParseLib.HC index 7e2e4371..c3d40d45 100755 --- a/src/Compiler/ParseLib.HC +++ b/src/Compiler/ParseLib.HC @@ -51,7 +51,7 @@ for one * and two fwd for two **. tmpc->type=HTT_CLASS; tmpc->raw_type=RT_PTR; tmpc->size=sizeof(U8 *); - tmpc->ptr_stars_cnt=i; + tmpc->ptr_stars_count=i; tmpc++; } res->last_in_member_lst=&res->member_lst_and_root; @@ -68,7 +68,7 @@ CHashFun *ParseFunNew() tmpf->type=HTT_FUN; tmpf->raw_type=RT_PTR; tmpf->size=sizeof(U8 *); - tmpf->ptr_stars_cnt=i; + tmpf->ptr_stars_count=i; tmpf++; } res->last_in_member_lst=&res->member_lst_and_root; @@ -88,7 +88,7 @@ CIntermediateCode *ICAdd(CCompCtrl *cc, Bts(&cc->flags,CCf_PASS_TRACE_PRESENT); flags|=ICF_PASS_TRACE; } - if (cc->lock_cnt) + if (cc->lock_count) flags|=ICF_LOCK; tmpi->ic_flags=flags; tmpi->ic_line=cc->last_line_num; @@ -197,7 +197,7 @@ U0 COCDel(CCompCtrl *cc,CCodeCtrl *coc) if (!(cm->flags&CMF_DEFINED)) { undef=cm->str; cm->str=NULL; - } else if (!cm->use_cnt) { + } else if (!cm->use_count) { PrintWarn("Unused label %s\n",cm->str); LexWarn(cc,"Unused label at "); } diff --git a/src/Compiler/ParseStatement.HC b/src/Compiler/ParseStatement.HC index 1f158080..7bbed50f 100755 --- a/src/Compiler/ParseStatement.HC +++ b/src/Compiler/ParseStatement.HC @@ -19,7 +19,7 @@ CHashClass *ParseClass(CCompCtrl *cc,I64 keyword,I64 fsp_flags,Bool is_extern) if (tmpc) { if (!Bt(&tmpc->flags,Cf_EXTERN)) tmpc=NULL; - else if (tmpc->use_cnt<3) + else if (tmpc->use_count<3) UnusedExternWarning(cc,tmpc); } if (tmpc) { @@ -36,7 +36,7 @@ CHashClass *ParseClass(CCompCtrl *cc,I64 keyword,I64 fsp_flags,Bool is_extern) LBtr(&tmpc->flags,Cf_EXTERN); if (fsp_flags&FSF_PUBLIC) tmpc->type|=HTF_PUBLIC; - tmpc->use_cnt=0; + tmpc->use_count=0; if (cc->last_U16=='\n') HashSrcFileSet(cc,tmpc,-1); else @@ -66,7 +66,7 @@ CHashFun *ParseFunJoin(CCompCtrl *cc,CHashClass *tmp_return, CAOTCtrl *aotc=cc->aotc; CHashClass *header_return; CHashFun *tmpf; - I64 header_arg_cnt; + I64 header_arg_count; if (name) {//if not fun_ptr if (cc->flags&CCF_AOT_COMPILE) { if ((tmpf=HashFind(name,cc->htc.glbl_hash_table,HTT_FUN)) && @@ -76,7 +76,7 @@ CHashFun *ParseFunJoin(CCompCtrl *cc,CHashClass *tmp_return, if ((tmpf=HashSingleTableFind(name,cc->htc.glbl_hash_table,HTT_FUN)) && !Bt(&tmpf->flags,Cf_EXTERN)) tmpf=NULL; - if (tmpf && tmpf->use_cnt<3) + if (tmpf && tmpf->use_count<3) UnusedExternWarning(cc,tmpf); } else tmpf=NULL; @@ -87,7 +87,7 @@ CHashFun *ParseFunJoin(CCompCtrl *cc,CHashClass *tmp_return, Free(tmpf->idx); tmpf->idx=NULL; Free(name); - header_arg_cnt=tmpf->arg_cnt; + header_arg_count=tmpf->arg_count; header_lst=tmpf->member_lst_and_root; header_return=tmpf->return_class; tmpf->member_lst_and_root=NULL; @@ -109,11 +109,11 @@ CHashFun *ParseFunJoin(CCompCtrl *cc,CHashClass *tmp_return, } BEqu(&tmpf->type,HTf_PUBLIC,fsp_flags&FSF_PUBLIC); tmpf->return_class=tmp_return; - tmpf->use_cnt=0; + tmpf->use_count=0; HashSrcFileSet(cc,tmpf); ParseVarLst(cc,tmpf,PRS0_NULL|PRS1_FUN_ARG); - tmpf->arg_cnt=tmpf->member_cnt; - if (0arg_cnt<<3<=I16_MAX && !Bt(&tmpf->flags,Ff_DOT_DOT_DOT)) + tmpf->arg_count=tmpf->member_count; + if (0arg_count<<3<=I16_MAX && !Bt(&tmpf->flags,Ff_DOT_DOT_DOT)) LBts(&tmpf->flags,Ff_RET1); tmpm=tmpf->member_lst_and_root; while (tmpm) { @@ -125,11 +125,11 @@ CHashFun *ParseFunJoin(CCompCtrl *cc,CHashClass *tmp_return, if (GetOption(OPTf_WARN_HEADER_MISMATCH)) { if (tmpf->return_class!=header_return) { PrintWarn("Fun Header return mismatch '%s'\n",tmpf->str); - cc->warning_cnt++; + cc->warning_count++; } - if (!MemberLstCmp(tmpf->member_lst_and_root,header_lst,header_arg_cnt)) { + if (!MemberLstCmp(tmpf->member_lst_and_root,header_lst,header_arg_count)) { PrintWarn("Fun header args mismatch '%s'\n",tmpf->str); - cc->warning_cnt++; + cc->warning_count++; } } MemberLstDel(header_lst); @@ -193,11 +193,11 @@ U0 ParseFun(CCompCtrl *cc,CHashClass *tmp_return,U8 *name,I64 fsp_flags) tmpm=cc->htc.fun->member_lst_and_root; while (tmpm) { if (tmpm->flags & MLF_NO_UNUSED_WARN) { - if (tmpm->use_cnt>1&&StrCmp(tmpm->str,"_anon_")) + if (tmpm->use_count>1&&StrCmp(tmpm->str,"_anon_")) PrintWarn("Unneeded no_warn\n $$LK,\"FL:%s,%d\"$$'%s' in '%s'\n", cc->lex_include_stk->full_name,cc->lex_include_stk->line_num, tmpm->str,cc->htc.fun->str); - } else if (!tmpm->use_cnt && GetOption(OPTf_WARN_UNUSED_VAR)) + } else if (!tmpm->use_count && GetOption(OPTf_WARN_UNUSED_VAR)) PrintWarn("Unused var\n $$LK,\"FL:%s,%d\"$$'%s' in '%s'\n", cc->lex_include_stk->full_name,cc->lex_include_stk->line_num, tmpm->str,cc->htc.fun->str); @@ -226,7 +226,7 @@ U0 ParseGlobalVarLst(CCompCtrl *cc,I64 saved_mode,CHashClass *saved_tmpc, if (!st) return; if (tmpad.next) is_array=TRUE; - else if (tmpad.total_cnt<0) { + else if (tmpad.total_count<0) { is_array=TRUE; tmpc--; } else @@ -282,11 +282,11 @@ U0 ParseGlobalVarLst(CCompCtrl *cc,I64 saved_mode,CHashClass *saved_tmpc, return; } } else { - if (tmpad.total_cnt<0) { + if (tmpad.total_count<0) { i=0; undef_array_size=TRUE; } else { - i=tmpad.total_cnt; + i=tmpad.total_count; undef_array_size=FALSE; } if (tmpf_fun_ptr) @@ -390,8 +390,8 @@ U0 ParseGlobalVarLst(CCompCtrl *cc,I64 saved_mode,CHashClass *saved_tmpc, tmpg->var_class=tmpc; tmpg->str=st; tmpg->size=j; - tmpg->dim.total_cnt=i; - tmpg->use_cnt=0; + tmpg->dim.total_count=i; + tmpg->use_count=0; if (cc->last_U16=='\n') HashSrcFileSet(cc,tmpg,-1); else @@ -416,7 +416,7 @@ U0 ParseGlobalVarLst(CCompCtrl *cc,I64 saved_mode,CHashClass *saved_tmpc, Lex(cc); ParseGlobalInit(cc,tmpg,1); LexPopNoRestore(cc); - tmpg->size=tmpg->dim.total_cnt*tmpc->size; + tmpg->size=tmpg->dim.total_count*tmpc->size; if (tmphg) tmphg->size=tmpg->size; if (cc->flags&CCF_AOT_COMPILE) @@ -436,9 +436,9 @@ U0 ParseGlobalVarLst(CCompCtrl *cc,I64 saved_mode,CHashClass *saved_tmpc, LexPopNoRestore(cc); } if (has_alias) { - if (tmpex(CHashGlobalVar *)->use_cnt<2) { + if (tmpex(CHashGlobalVar *)->use_count<2) { PrintWarn("Unused extern '%s'\n",tmpex(CHashGlobalVar *)->str); - cc->warning_cnt++; + cc->warning_count++; } tmpex(CHashGlobalVar *)->flags|=GVF_ALIAS; tmpex(CHashGlobalVar *)->data_addr=tmpg->data_addr; @@ -456,7 +456,7 @@ U0 ParseGlobalVarLst(CCompCtrl *cc,I64 saved_mode,CHashClass *saved_tmpc, } } -U0 ParseIf(CCompCtrl *cc,I64 try_cnt,CCodeMisc *lb_break) +U0 ParseIf(CCompCtrl *cc,I64 try_count,CCodeMisc *lb_break) { CCodeMisc *lb,*lb1; I64 k; @@ -470,20 +470,20 @@ U0 ParseIf(CCompCtrl *cc,I64 try_cnt,CCodeMisc *lb_break) Lex(cc); lb=COCMiscNew(cc,CMT_LABEL); ICAdd(cc,IC_BR_ZERO,lb,0); - ParseStatement(cc,try_cnt,lb_break); + ParseStatement(cc,try_count,lb_break); k=ParseKeyWord(cc); if (k==KW_ELSE) { Lex(cc); lb1=COCMiscNew(cc,CMT_LABEL); ICAdd(cc,IC_JMP,lb1,0); ICAdd(cc,IC_LABEL,lb,0); - ParseStatement(cc,try_cnt,lb_break); + ParseStatement(cc,try_count,lb_break); ICAdd(cc,IC_LABEL,lb1,0); } else ICAdd(cc,IC_LABEL,lb,0); } -U0 ParseWhile(CCompCtrl *cc,I64 try_cnt) +U0 ParseWhile(CCompCtrl *cc,I64 try_count) { CCodeMisc *lb,*lb_done; if (cc->token!='(') @@ -498,18 +498,18 @@ U0 ParseWhile(CCompCtrl *cc,I64 try_cnt) Lex(cc); lb_done=COCMiscNew(cc,CMT_LABEL); ICAdd(cc,IC_BR_ZERO,lb_done,0); - ParseStatement(cc,try_cnt,lb_done); + ParseStatement(cc,try_count,lb_done); ICAdd(cc,IC_JMP,lb,0); ICAdd(cc,IC_LABEL,lb_done,0); } -U0 ParseDoWhile(CCompCtrl *cc,I64 try_cnt) +U0 ParseDoWhile(CCompCtrl *cc,I64 try_count) { CCodeMisc *lb,*lb_done; lb=COCMiscNew(cc,CMT_LABEL); lb_done=COCMiscNew(cc,CMT_LABEL); ICAdd(cc,IC_LABEL,lb,0); - ParseStatement(cc,try_cnt,lb_done); + ParseStatement(cc,try_count,lb_done); if (ParseKeyWord(cc)!=KW_WHILE) LexExcept(cc,"Missing 'while' at"); if (Lex(cc)!='(') @@ -526,7 +526,7 @@ U0 ParseDoWhile(CCompCtrl *cc,I64 try_cnt) Lex(cc); } -U0 ParseFor(CCompCtrl *cc,I64 try_cnt) +U0 ParseFor(CCompCtrl *cc,I64 try_count) { CCodeCtrl *tmpcbh; CCodeMisc *lb,*lb_done; @@ -534,7 +534,7 @@ U0 ParseFor(CCompCtrl *cc,I64 try_cnt) if (cc->token!='(') LexExcept(cc,"Expecting '(' at "); Lex(cc); - ParseStatement(cc,try_cnt); + ParseStatement(cc,try_count); lb=COCMiscNew(cc,CMT_LABEL); ICAdd(cc,IC_LABEL,lb,0); @@ -549,7 +549,7 @@ U0 ParseFor(CCompCtrl *cc,I64 try_cnt) COCPush(cc); COCInit(cc); if (cc->token!=')') - ParseStatement(cc,try_cnt,NULL,0); + ParseStatement(cc,try_count,NULL,0); COCPush(cc); tmpcbh=COCPopNoFree(cc); COCPop(cc); @@ -557,7 +557,7 @@ U0 ParseFor(CCompCtrl *cc,I64 try_cnt) LexExcept(cc,"Missing ')' at "); Lex(cc); - ParseStatement(cc,try_cnt,lb_done); + ParseStatement(cc,try_count,lb_done); COCAppend(cc,tmpcbh); ICAdd(cc,IC_JMP,lb,0); ICAdd(cc,IC_LABEL,lb_done,0); @@ -575,7 +575,7 @@ class CSwitchCase { CSubSwitch *ss; }; -U0 ParseSwitch(CCompCtrl *cc,I64 try_cnt) +U0 ParseSwitch(CCompCtrl *cc,I64 try_count) { CSwitchCase *header=NULL,*tmps,*tmps1; //Leaks on except CSubSwitch head,*tmpss; //Leaks on except @@ -594,12 +594,12 @@ U0 ParseSwitch(CCompCtrl *cc,I64 try_cnt) QueueInit(&head); head.last->lb_break=COCMiscNew(cc,CMT_LABEL); - head.last->lb_break->use_cnt++; + head.last->lb_break->use_count++; lb_dft=COCMiscNew(cc,CMT_LABEL); - lb_dft->use_cnt++; + lb_dft->use_count++; mc_jt=COCMiscNew(cc,CMT_JMP_TABLE); mc_jt->begin=COCMiscNew(cc,CMT_LABEL); - mc_jt->begin->use_cnt++; + mc_jt->begin->use_count++; if (!ParseExpression(cc,NULL,FALSE)) throw('Compiler'); tmpi_sub=ICAdd(cc,IC_IMM_I64,0,cmp.internal_types[RT_I64]); @@ -632,7 +632,7 @@ sw_cont: tmpss=MAlloc(sizeof(CSubSwitch)); QueueInsert(tmpss,head.last); head.last->lb_break=COCMiscNew(cc,CMT_LABEL); - head.last->lb_break->use_cnt++; + head.last->lb_break->use_count++; lb_fwd_case=COCMiscNew(cc,CMT_LABEL); tmpi_jmp=ICAdd(cc,IC_JMP,lb_fwd_case,0); @@ -656,7 +656,7 @@ sw_cont: } goto sw_cont; default: - ParseStatement(cc,try_cnt); + ParseStatement(cc,try_count); } } break; @@ -668,7 +668,7 @@ sw_cont: Lex(cc); lb_entry=COCMiscNew(cc,CMT_LABEL); ICAdd(cc,IC_LABEL,lb_entry,0); - lb_entry->use_cnt++; + lb_entry->use_count++; if (head.next!=&head) { tmpss=head.next; while (tmpss!=&head) { @@ -739,7 +739,7 @@ sw_cont: dft_found=TRUE; break; default: - ParseStatement(cc,try_cnt,head.last->lb_break); + ParseStatement(cc,try_count,head.last->lb_break); } } sw_sub_end: @@ -839,7 +839,7 @@ U0 ParseStreamBlk(CCompCtrl *cc) Lex(cc); //Skip '}' } -U0 ParseTryBlk(CCompCtrl *cc,I64 try_cnt) +U0 ParseTryBlk(CCompCtrl *cc,I64 try_count) { CCodeMisc *lb_catch,*lb_done,*lb_untry; CHashClass *tmpc=cmp.internal_types[RT_PTR]; @@ -859,7 +859,7 @@ U0 ParseTryBlk(CCompCtrl *cc,I64 try_cnt) ICAdd(cc,IC_GET_LABEL,lb_untry,tmpc,ICF_PUSH_RES); ICAdd(cc,IC_GET_LABEL,lb_catch,tmpc,ICF_PUSH_RES); if (Bt(&tmp_try->flags,Cf_EXTERN)) { - cc->abs_cnts.externs++; + cc->abs_counts.externs++; if (cc->flags&CCF_AOT_COMPILE) ICAdd(cc,IC_CALL_IMPORT,tmp_try,tmpc); else @@ -874,12 +874,12 @@ U0 ParseTryBlk(CCompCtrl *cc,I64 try_cnt) ICAdd(cc,IC_CALL_END,0,tmpc); ICAdd(cc,IC_END_EXP,0,0,ICF_RES_NOT_USED); - ParseStatement(cc,try_cnt+1); + ParseStatement(cc,try_count+1); ICAdd(cc,IC_LABEL,lb_untry,0); ICAdd(cc,IC_CALL_START,0,0); if (Bt(&tmp_untry->flags,Cf_EXTERN)) { - cc->abs_cnts.externs++; + cc->abs_counts.externs++; if (cc->flags&CCF_AOT_COMPILE) ICAdd(cc,IC_CALL_IMPORT,tmp_untry,tmpc); else @@ -896,12 +896,12 @@ U0 ParseTryBlk(CCompCtrl *cc,I64 try_cnt) Lex(cc); ICAdd(cc,IC_LABEL,lb_catch,0); - ParseStatement(cc,try_cnt+1); + ParseStatement(cc,try_count+1); ICAdd(cc,IC_RET,0,tmpc); ICAdd(cc,IC_LABEL,lb_done,0); } -Bool ParseStatement(CCompCtrl *cc,I64 try_cnt=0, +Bool ParseStatement(CCompCtrl *cc,I64 try_count=0, CCodeMisc *lb_break=NULL,I64 cmp_flags=CMPF_PRS_SEMICOLON) { I64 i,fsp_flags=0; @@ -923,7 +923,7 @@ Bool ParseStatement(CCompCtrl *cc,I64 try_cnt=0, if (cc->token=='{') { Lex(cc); while (cc->token!='}' && cc->token!=TK_EOF) - ParseStatement(cc,try_cnt,lb_break); + ParseStatement(cc,try_count,lb_break); if (cc->lex_include_stk==cc->fun_lex_file) cc->max_line=cc->lex_include_stk->line_num; if (Lex(cc)!=',') goto sm_done; @@ -963,27 +963,27 @@ Bool ParseStatement(CCompCtrl *cc,I64 try_cnt=0, start: Lex(cc); case KW_LOCK: - cc->lock_cnt++; - ParseStatement(cc,try_cnt); - cc->lock_cnt--; + cc->lock_count++; + ParseStatement(cc,try_count); + cc->lock_count--; break; case KW_TRY: - ParseTryBlk(cc,try_cnt); + ParseTryBlk(cc,try_count); break; case KW_IF: - ParseIf(cc,try_cnt,lb_break); + ParseIf(cc,try_count,lb_break); break; case KW_FOR: - ParseFor(cc,try_cnt); + ParseFor(cc,try_count); break; case KW_WHILE: - ParseWhile(cc,try_cnt); + ParseWhile(cc,try_count); break; case KW_DO: - ParseDoWhile(cc,try_cnt); + ParseDoWhile(cc,try_count); break; case KW_SWITCH: - ParseSwitch(cc,try_cnt); + ParseSwitch(cc,try_count); break; end: end: @@ -1089,12 +1089,12 @@ sm_import: case KW_RETURN: if (!cc->htc.fun) LexExcept(cc,"Not in fun. Can't return a val "); - if (try_cnt) { + if (try_count) { tmp_untry=HashFind("SysUntry", cc->htc.hash_table_lst,HTT_FUN); - for (i=0;iflags,Cf_EXTERN)) { - cc->abs_cnts.externs++; + cc->abs_counts.externs++; if (cc->flags&CCF_AOT_COMPILE) ICAdd(cc,IC_CALL_IMPORT, tmp_untry,cmp.internal_types[RT_PTR]); @@ -1126,7 +1126,7 @@ sm_import: g_lb->str=cc->cur_str; cc->cur_str=NULL; } - g_lb->use_cnt++; + g_lb->use_count++; ICAdd(cc,IC_JMP,g_lb,0); Lex(cc); goto sm_semicolon; diff --git a/src/Compiler/ParseVar.HC b/src/Compiler/ParseVar.HC index b7a23827..83204fa5 100755 --- a/src/Compiler/ParseVar.HC +++ b/src/Compiler/ParseVar.HC @@ -29,7 +29,7 @@ U0 ParseVarInit(CCompCtrl *cc,U8 **_dst,CHashClass *tmpc,CArrayDim *tmpad, LexExcept(cc,"Missing '}' at "); Lex(cc); } else { - if (tmpc->ptr_stars_cnt==1 && + if (tmpc->ptr_stars_count==1 && ((tmpc-1)->raw_type==RT_I8 || (tmpc-1)->raw_type==RT_U8) && !tmpad && cc->token==TK_STR) is_str=TRUE; @@ -123,20 +123,20 @@ class CVI2 U0 ParseVarInit2(CCompCtrl *cc,U8 **_dst,CHashClass *tmpc, CArrayDim *tmpad,U8 *data_addr_rip,U8 **_base,Bool data_heap,I64 pass) { - I64 i,j,cnt; + I64 i,j,count; U8 *st,*_b; CVI2 head,*tmpvi,*tmpvi1; CArrayDim *tmpad1; tmpc=OptClassFwd(tmpc); if (tmpad1=tmpad->next) { - if (!tmpc->ptr_stars_cnt && + if (!tmpc->ptr_stars_count && (tmpc->raw_type==RT_I8 || tmpc->raw_type==RT_U8) && cc->token==TK_STR) { LexPopNoRestore(cc); st=LexExtStr(cc,&i); - if (tmpad1->cnt<0) {//[] - tmpad1->cnt=i; - tmpad->total_cnt=i*tmpad1->total_cnt; + if (tmpad1->count<0) {//[] + tmpad1->count=i; + tmpad->total_count=i*tmpad1->total_count; Free(*_base); if (data_heap) *_base=MAlloc(i); @@ -145,8 +145,8 @@ U0 ParseVarInit2(CCompCtrl *cc,U8 **_dst,CHashClass *tmpc, MemCpy(*_base,st,i); *_dst=*_base+i; } else { - MemCpy(*_dst,st,tmpad1->cnt); - *_dst+=tmpad1->cnt; + MemCpy(*_dst,st,tmpad1->count); + *_dst+=tmpad1->count; } Free(st); LexPush(cc); @@ -156,23 +156,23 @@ U0 ParseVarInit2(CCompCtrl *cc,U8 **_dst,CHashClass *tmpc, LexPush(cc); Lex(cc); } - if (tmpad1->cnt<0) {//[] + if (tmpad1->count<0) {//[] QueueInit(&head); - cnt=0; + count=0; while (cc->token!='}') { - tmpvi=MAlloc(offset(CVI2.base)+tmpad1->total_cnt*tmpc->size); + tmpvi=MAlloc(offset(CVI2.base)+tmpad1->total_count*tmpc->size); _b=&tmpvi->base; ParseVarInit2(cc,&_b,tmpc,tmpad1,data_addr_rip,_base,data_heap,pass); QueueInsert(tmpvi,head.last); if (cc->token==',') Lex(cc); - cnt++; + count++; } Lex(cc); //skip '}' - tmpad1->cnt=cnt; - tmpad->total_cnt=cnt*tmpad1->total_cnt; - j=tmpad1->total_cnt*tmpc->size; - i=cnt*j; + tmpad1->count=count; + tmpad->total_count=count*tmpad1->total_count; + j=tmpad1->total_count*tmpc->size; + i=count*j; Free(*_base); if (data_heap) *_base=_b=MAlloc(i); @@ -188,9 +188,9 @@ U0 ParseVarInit2(CCompCtrl *cc,U8 **_dst,CHashClass *tmpc, } *_dst=_b; } else { - for (i=0;icnt;i++) { + for (i=0;icount;i++) { ParseVarInit2(cc,_dst,tmpc,tmpad1,data_addr_rip,_base,data_heap,pass); - if (tmpad1->cnt>1 && cc->token==',') + if (tmpad1->count>1 && cc->token==',') Lex(cc); } if (cc->token=='}') @@ -249,8 +249,8 @@ U0 ParseArrayDims(CCompCtrl *cc,I64 mode,CArrayDim *dim) CArrayDim *tmpad,*tmpad1; I64 j; dim->next=NULL; - dim->cnt=0; - dim->total_cnt=1; + dim->count=0; + dim->total_count=1; tmpad1=&dim->next; if (cc->token=='[') { if (mode.u8[1]==PRS1B_FUN_ARG) @@ -266,7 +266,7 @@ U0 ParseArrayDims(CCompCtrl *cc,I64 mode,CArrayDim *dim) tmpad->next=NULL; tmpad1=&dim; do { - tmpad1->total_cnt*=j; + tmpad1->total_count*=j; if (!tmpad1->next) { tmpad1->next=tmpad; break; @@ -274,8 +274,8 @@ U0 ParseArrayDims(CCompCtrl *cc,I64 mode,CArrayDim *dim) tmpad1=tmpad1->next; } while (tmpad1); tmpad1=tmpad; - tmpad->cnt=j; - tmpad->total_cnt=1; + tmpad->count=j; + tmpad->total_count=1; if (cc->token!=']') LexExcept(cc,"Missing ']' at "); } while (Lex(cc)=='['); @@ -286,7 +286,7 @@ CHashClass *ParseType(CCompCtrl *cc,CHashClass **_tmpc1, I64 *_mode,CMemberLst *tmpm,U8 **_ident,CHashFun **_fun_ptr, CHashExport **_tmpex,CArrayDim *tmpad,I64 fsp_flags) { - I64 k,ptr_stars_cnt,mode=*_mode; + I64 k,ptr_stars_count,mode=*_mode; CHashClass *tmpc1=*_tmpc1,*tmpc2; CHashFun *fun_ptr=NULL; CHashExport *tmpex=NULL; @@ -295,7 +295,7 @@ CHashClass *ParseType(CCompCtrl *cc,CHashClass **_tmpc1, if (!tmpc1 || !(tmpc1->type & (HTT_CLASS|HTT_INTERNAL_TYPE))) LexExcept(cc,"Invalid class at "); - ptr_stars_cnt=0; + ptr_stars_count=0; while (cc->token=='*') { if (mode.u8[1]) { LexPopNoRestore(cc); @@ -303,7 +303,7 @@ CHashClass *ParseType(CCompCtrl *cc,CHashClass **_tmpc1, } Lex(cc); tmpc1++; - if (++ptr_stars_cnt>PTR_STARS_NUM) + if (++ptr_stars_count>PTR_STARS_NUM) LexExcept(cc,"Too many *'s at "); } @@ -321,13 +321,13 @@ CHashClass *ParseType(CCompCtrl *cc,CHashClass **_tmpc1, if (cc->token=='(') { if (Lex(cc)!='*') LexExcept(cc,"Expecting '*' at "); - ptr_stars_cnt=1; //fun_ptr + ptr_stars_count=1; //fun_ptr while (Lex(cc)=='*') - ptr_stars_cnt++; //fun_ptr - if (ptr_stars_cnt>PTR_STARS_NUM) + ptr_stars_count++; //fun_ptr + if (ptr_stars_count>PTR_STARS_NUM) LexExcept(cc,"Too many *'s at "); } else - ptr_stars_cnt=-1; //fun_ptr + ptr_stars_count=-1; //fun_ptr if (_ident) { if (cc->token==TK_IDENT) { @@ -347,19 +347,19 @@ CHashClass *ParseType(CCompCtrl *cc,CHashClass **_tmpc1, } } - if (ptr_stars_cnt>=0) { //fun_ptr + if (ptr_stars_count>=0) { //fun_ptr if (cc->token!=')') LexExcept(cc,"Missing ')' at "); if (Lex(cc)!='(') LexExcept(cc,"Expecting '(' at "); - fun_ptr=ParseFunJoin(cc,tmpc1,NULL,fsp_flags)+ptr_stars_cnt; - tmpc1=cmp.internal_types[RT_PTR]+ptr_stars_cnt; + fun_ptr=ParseFunJoin(cc,tmpc1,NULL,fsp_flags)+ptr_stars_count; + tmpc1=cmp.internal_types[RT_PTR]+ptr_stars_count; } ParseArrayDims(cc,mode,tmpad); tmpc2=OptClassFwd(tmpc1); - if (tmpc2->ptr_stars_cnt) { - tmpc2-=tmpc2->ptr_stars_cnt; + if (tmpc2->ptr_stars_count) { + tmpc2-=tmpc2->ptr_stars_count; if (tmpc2->type&HTT_INTERNAL_TYPE && !tmpc2->size) LexWarn(cc,"use \"U8 *\" instead of \"U0 *\" at "); } @@ -391,11 +391,11 @@ U0 ParseDotDotDot(CCompCtrl *cc,CHashFun *tmpf,I64 _reg) tmpm->flags=MLF_DOT_DOT_DOT; tmpm->member_class=cmp.internal_types[RT_I64]; tmpm->str=StrNew("argv"); - tmpm->dim.total_cnt=127; //arbitrary + tmpm->dim.total_count=127; //arbitrary tmpm->dim.next=tmpad=MAlloc(sizeof(CArrayDim)); tmpad->next=NULL; - tmpad->cnt=127; //arbitrary - tmpad->total_cnt=1; + tmpad->count=127; //arbitrary + tmpad->total_count=1; tmpm->offset=tmpf->size; tmpm->size=8; //Close enough tmpf->size+=8;//Close enough @@ -526,10 +526,10 @@ pvl_restart3: MemberAdd(cc,tmpm,tmpc,mode.u8[1]); else MemberAdd(cc,tmpm,tmpc,PRS1B_NULL); - tmpc->member_cnt++; + tmpc->member_count++; tmpc2=tmpm->member_class; - i=tmpc2->size*tmpm->dim.total_cnt; + i=tmpc2->size*tmpm->dim.total_count; switch (mode.u8[1]) { case PRS1B_STATIC_LOCAL_VAR: if (i<0) { @@ -562,7 +562,7 @@ pvl_restart3: Lex(cc); //skip = ParseStaticInit(cc,tmpm,1); LexPopNoRestore(cc); - i=tmpc2->size*tmpm->dim.total_cnt; + i=tmpc2->size*tmpm->dim.total_count; k=(i+7)&~7; if (cc->flags&CCF_AOT_COMPILE) { k>>=3; @@ -581,7 +581,7 @@ pvl_restart3: for (k=0;kstatic_data_rip+k, tmpm->static_data[k]); - tmpm->use_cnt=0; + tmpm->use_count=0; cc->flags|=CCF_DONT_MAKE_RES; } if (cc->flags&CCF_AOT_COMPILE) @@ -611,7 +611,7 @@ pvl_restart3: Lex(cc); if (!ParseExpression(cc,NULL,TRUE)) throw('Compiler'); - tmpm->use_cnt=0; + tmpm->use_count=0; cc->flags|=CCF_DONT_MAKE_RES; } else LexPopNoRestore(cc); diff --git a/src/Compiler/UAsm.HC b/src/Compiler/UAsm.HC index f5ad6237..850ad9a0 100755 --- a/src/Compiler/UAsm.HC +++ b/src/Compiler/UAsm.HC @@ -1,17 +1,17 @@ I64 InstEntriesCompare(CInst *tmpins1,CInst *tmpins2) { - I64 i1,i2,j=0,res=0,oc_cnt1=tmpins1->opcode_cnt,oc_cnt2=tmpins2->opcode_cnt; + I64 i1,i2,j=0,res=0,oc_count1=tmpins1->opcode_count,oc_count2=tmpins2->opcode_count; if (tmpins1->flags&IEF_STI_LIKE) - oc_cnt1--; + oc_count1--; if (tmpins2->flags&IEF_STI_LIKE) - oc_cnt2--; + oc_count2--; while (TRUE) { - if (jopcode[j]-tmpins2->opcode[j]) return res; j++; } else { - if (res=oc_cnt1-oc_cnt2) + if (res=oc_count1-oc_count2) return res; if (tmpins1->flags&IEF_STI_LIKE && tmpins2->flags&IEF_STI_LIKE) @@ -65,7 +65,7 @@ U0 DumpUAsmTables() CInst *InstEntryFind(U8 *rip,I64 opsize,I64 seg_size) {//Binary Search - I64 i,j,n,m,k,arg1,arg2,o1,o2,oc_cnt; + I64 i,j,n,m,k,arg1,arg2,o1,o2,oc_count; CInst *tmpins,**table; i=0; if (seg_size==64) { @@ -84,12 +84,12 @@ CInst *InstEntryFind(U8 *rip,I64 opsize,I64 seg_size) while (TRUE) { //ief_compare_start arg1=tmpins->arg1; arg2=tmpins->arg2; - oc_cnt=tmpins->opcode_cnt; + oc_count=tmpins->opcode_count; if (tmpins->flags&IEF_STI_LIKE) - oc_cnt--; - if (nopcode_cnt-1 && tmpins->flags & IEF_PLUS_OPCODE) + if (n==tmpins->opcode_count-1 && tmpins->flags & IEF_PLUS_OPCODE) o1&=-8; o2=tmpins->opcode[n++]; if (m=o1-o2) @@ -132,11 +132,11 @@ CInst *InstEntryFind(U8 *rip,I64 opsize,I64 seg_size) m=1; goto ief_compare_done; case SV_I_REG: - m=rip[n]>>3-tmpins->opcode[tmpins->opcode_cnt-1]>>3; + m=rip[n]>>3-tmpins->opcode[tmpins->opcode_count-1]>>3; goto ief_compare_done; case SV_STI_LIKE: - if (!(m=rip[n]>>3-tmpins->opcode[tmpins->opcode_cnt-1]>>3)) - m=rip[n]-tmpins->opcode[tmpins->opcode_cnt-1]; + if (!(m=rip[n]>>3-tmpins->opcode[tmpins->opcode_count-1]>>3)) + m=rip[n]-tmpins->opcode[tmpins->opcode_count-1]; goto ief_compare_done; case SV_R_REG: case SV_NONE: @@ -209,7 +209,7 @@ U0 UAsmHashLoad() while (tmph) { if (tmph->type==HTT_OPCODE && !(tmph->oc_flags&OCF_ALIAS)) { tmpins=&tmph->ins; - for (k=0;kinst_entry_cnt;k++) { + for (k=0;kinst_entry_count;k++) { uasm.table_16_32_entries++; if (!(tmpins->flags&IEF_NOT_IN_64_BIT)) uasm.table_64_entries++; @@ -228,7 +228,7 @@ U0 UAsmHashLoad() while (tmph) { if (tmph->type==HTT_OPCODE && !(tmph->oc_flags&OCF_ALIAS)) { tmpins=&tmph->ins; - for (k=0;kinst_entry_cnt;k++) { + for (k=0;kinst_entry_count;k++) { uasm.table_16_32[j1++]=tmpins; if (!(tmpins->flags&IEF_NOT_IN_64_BIT)) uasm.table_64[j2++]=tmpins; @@ -341,7 +341,7 @@ U0 Ui(U8 *buf,U8 **_rip,I64 seg_size=64,I64 *_jmp_dst=NULL,Bool just_ins=FALSE) tmpins=tmpins2; } - rip+=tmpins->opcode_cnt; + rip+=tmpins->opcode_count; tmpo=tmpins(U8 *)-tmpins->ins_entry_num*sizeof(CInst) -offset(CHashOpcode.ins); if (just_ins) @@ -367,7 +367,7 @@ U0 Ui(U8 *buf,U8 **_rip,I64 seg_size=64,I64 *_jmp_dst=NULL,Bool just_ins=FALSE) if (tmpins->flags & IEF_PLUS_OPCODE) { rip--; - RM1=*rip++ - tmpins->opcode[tmpins->opcode_cnt-1]+REX_b; + RM1=*rip++ - tmpins->opcode[tmpins->opcode_count-1]+REX_b; ptr=NULL; if (ARGT_R8<=arg1<=ARGT_R64) { if (arg1_size==8) { @@ -582,7 +582,7 @@ U0 Ui(U8 *buf,U8 **_rip,I64 seg_size=64,I64 *_jmp_dst=NULL,Bool just_ins=FALSE) break; case ARGT_STI: rip--; - CatPrint(arg1_st,"%Z",*rip++ - tmpins->opcode[tmpins->opcode_cnt-1], + CatPrint(arg1_st,"%Z",*rip++ - tmpins->opcode[tmpins->opcode_count-1], "ST_FSTK_REGS"); break; } @@ -621,7 +621,7 @@ U0 Ui(U8 *buf,U8 **_rip,I64 seg_size=64,I64 *_jmp_dst=NULL,Bool just_ins=FALSE) break; case ARGT_STI: rip--; - CatPrint(arg2_st,"%Z",*rip++ -tmpins->opcode[tmpins->opcode_cnt-1], + CatPrint(arg2_st,"%Z",*rip++ -tmpins->opcode[tmpins->opcode_count-1], "ST_FSTK_REGS"); break; } @@ -650,14 +650,14 @@ U0 Ui(U8 *buf,U8 **_rip,I64 seg_size=64,I64 *_jmp_dst=NULL,Bool just_ins=FALSE) *_rip=rip; } -U8 *U(U8 *rip,I64 cnt=20,I64 seg_size=64) +U8 *U(U8 *rip,I64 count=20,I64 seg_size=64) {//Unassembles a num of insts. I64 i; U8 buf[1024]; if (seg_size==16) PrintWarn("16-bit unassembly is not well supported.\n"); "$$HL,1$$"; - for (i=0;iheight/FONT_HEIGHT;row++) { for (col=0;colwidth/FONT_WIDTH;col++) { @@ -126,7 +126,7 @@ public CDoc *DC2Doc(CDC *dc,I64 dx=0,I64 dy=0,I64 *_total_score=NULL) diff_image=*ptr++ ^ cur_char_image; score=0; for (i=0;i<8;i++) - score+=byte_bit_cnts[diff_image.u8[i]]; + score+=byte_bit_counts[diff_image.u8[i]]; if (score>3 //JIT Const. Simple delay loop + MOV RCX,counts.time_stamp_freq>>3 //JIT Const. Simple delay loop @@10: LOOP @@10 POP RCX diff --git a/src/Demo/Asm/AsmAndC2.HC b/src/Demo/Asm/AsmAndC2.HC index a233e3ce..c5b219f2 100755 --- a/src/Demo/Asm/AsmAndC2.HC +++ b/src/Demo/Asm/AsmAndC2.HC @@ -6,7 +6,7 @@ it from the cmd line. */ //This is to demo glbl var access. -//Glbs defined elsewhere can accessed too, like cnts.jiffies. +//Glbs defined elsewhere can accessed too, like counts.jiffies. I64 glbl_ona=Freq2Ona(400),glbl_ona_step=10,glbl_ona_base=Freq2Ona(100); asm { @@ -24,7 +24,7 @@ _BEEPS2:: MOV RBP,RSP MOV RCX,U64 SF_ARG1[RBP] //$LK,"SF_ARG1",A="FF:::/Kernel/KernelA.HH,SF_ARG1"$ - PUSH U64 [&cnts.jiffies] + PUSH U64 [&counts.jiffies] @@05: PUSH RCX //U0 $LK,"Beep",A="MN:Beep"$(I8 ona=62,Bool busy=FALSE) @@ -40,7 +40,7 @@ _BEEPS2:: POP RSI POP RAX - SUB RAX,U64 [&cnts.jiffies] + SUB RAX,U64 [&counts.jiffies] NEG RAX CALL PUT_HEX_U64 MOV RAX,'\n' @@ -52,7 +52,7 @@ _BEEPS2:: //My convention is to put an underscore //on C callable asm routines. -_extern _BEEPS2 U0 Beeps2(I64 cnt); +_extern _BEEPS2 U0 Beeps2(I64 count); U0 AsmAndC2() { @@ -73,7 +73,7 @@ U0 AsmAndC2() ADD RAX,U64 [&glbl_ona_base] //Intentionally evaluated at run time PUSH RAX CALL &Snd //We can skip IMPORT with & if JIT compiling. - MOV RCX,cnts.time_stamp_freq>>3 //JIT Const. Simple delay loop. + MOV RCX,counts.time_stamp_freq>>3 //JIT Const. Simple delay loop. @@10: LOOP @@10 POP RCX diff --git a/src/Demo/Asm/AsmAndC3.HC b/src/Demo/Asm/AsmAndC3.HC index f166e408..9b64b506 100755 --- a/src/Demo/Asm/AsmAndC3.HC +++ b/src/Demo/Asm/AsmAndC3.HC @@ -14,7 +14,7 @@ U0 AsmAndC3() STC ADC AL,0 //Round-about way to make the not-special constant, 0x42. CALL PUT_HEX_U8 - MOV RCX,cnts.time_stamp_freq>>5 //JIT Const. Simple delay loop. + MOV RCX,counts.time_stamp_freq>>5 //JIT Const. Simple delay loop. @@1: LOOP @@1 '\n'; } diff --git a/src/Demo/Carry.HC b/src/Demo/Carry.HC index 457e4569..9244f5cd 100755 --- a/src/Demo/Carry.HC +++ b/src/Demo/Carry.HC @@ -1,10 +1,10 @@ //Shows the $LK,"Carry",A="MN:Carry"$ function. It holds the CPU carry flag. //$LK,"U",A="MN:U"$() Unassemble to make sure it is right. -U0 BigCnt() +U0 BigCount() { U64 lo=0,hi=0; - "BigCnt\n"; + "BigCount\n"; while (hi<0x10) { lo+=1<<58; hi+=Carry; @@ -12,7 +12,7 @@ U0 BigCnt() } } -BigCnt; +BigCount; U0 BigShift() { diff --git a/src/Demo/DolDoc/ClickCallBack.HC b/src/Demo/DolDoc/ClickCallBack.HC index 15853e16..5052ed83 100755 --- a/src/Demo/DolDoc/ClickCallBack.HC +++ b/src/Demo/DolDoc/ClickCallBack.HC @@ -29,7 +29,7 @@ ClickCallBack; I64 MyLeftCB2(CDoc *,CDocEntry *) { - return cnts.jiffies; + return counts.jiffies; } U0 PopUpJiffiesCallBack(I64 i) diff --git a/src/Demo/DolDoc/UnusedDefine.HC b/src/Demo/DolDoc/UnusedDefine.HC index 5e63ff86..3c421ad2 100755 --- a/src/Demo/DolDoc/UnusedDefine.HC +++ b/src/Demo/DolDoc/UnusedDefine.HC @@ -14,7 +14,7 @@ output $LK,"Silent",A="MN:Silent"$(). U0 UnusedDefineScan() { CDoc *old_put_doc,*old_display_doc,*doc; - I64 i,cnt=0; + I64 i,count=0; CHashTable *table; CHash *tmph; CDocEntry *doc_e,*doc_e2; @@ -27,7 +27,7 @@ U0 UnusedDefineScan() tmph=table->body[i]; while (tmph) { if (tmph->type&HTT_DEFINE_STR) - cnt++; + count++; tmph=tmph->next; } } @@ -35,7 +35,7 @@ U0 UnusedDefineScan() } progress1=0; - progress1_max=cnt; + progress1_max=count; StrCpy(progress1_desc,"Define Scan"); table=Fs->hash_table; diff --git a/src/Demo/Games/BattleLines.HC b/src/Demo/Games/BattleLines.HC index dababd85..6faf220f 100755 Binary files a/src/Demo/Games/BattleLines.HC and b/src/Demo/Games/BattleLines.HC differ diff --git a/src/Demo/Games/BigGuns.HC b/src/Demo/Games/BigGuns.HC index 2e8133ba..357de112 100755 Binary files a/src/Demo/Games/BigGuns.HC and b/src/Demo/Games/BigGuns.HC differ diff --git a/src/Demo/Games/BlackDiamond.HC b/src/Demo/Games/BlackDiamond.HC index 50ea565e..14869d6c 100755 Binary files a/src/Demo/Games/BlackDiamond.HC and b/src/Demo/Games/BlackDiamond.HC differ diff --git a/src/Demo/Games/BomberGolf.HC b/src/Demo/Games/BomberGolf.HC index 88f7e406..626cf0a6 100755 Binary files a/src/Demo/Games/BomberGolf.HC and b/src/Demo/Games/BomberGolf.HC differ diff --git a/src/Demo/Games/FlapBat.HC b/src/Demo/Games/FlapBat.HC index 504620b8..5d6ee1cb 100755 Binary files a/src/Demo/Games/FlapBat.HC and b/src/Demo/Games/FlapBat.HC differ diff --git a/src/Demo/Games/RawHide.HC b/src/Demo/Games/RawHide.HC index 67db6032..88090790 100755 --- a/src/Demo/Games/RawHide.HC +++ b/src/Demo/Games/RawHide.HC @@ -4,7 +4,7 @@ RegDft("ZenithOS/RawHide","F64 best_score=9999;\n"); RegExe("ZenithOS/RawHide"); F64 t0,tf; -I64 outside_cnt; +I64 outside_count; #define MAP_WIDTH 1000 #define MAP_HEIGHT 1000 @@ -257,7 +257,7 @@ U0 DrawIt(CTask *task,CDC *dc) } GrPrint(dc,-task->scroll_x,-task->scroll_y, "Outside:%03d Time:%7.2fs Best:%7.2fs", - outside_cnt,t,best_score); + outside_count,t,best_score); } U0 BuddySel(I64 i) @@ -328,8 +328,8 @@ Bool CheckMap(I64 x,I64 y) U0 AnimateTask(CTask *parent) { - I64 i,cx,cy,cursor_x,cursor_y,dd,ddx,ddy,cnt,max_speed=I64_MAX,updates=0, - my_outside_cnt; + I64 i,cx,cy,cursor_x,cursor_y,dd,ddx,ddy,count,max_speed=I64_MAX,updates=0, + my_outside_count; F64 f,d,dx,dy,s,stress; Animal *tmpa,*tmpa1; while (TRUE) { @@ -338,8 +338,8 @@ U0 AnimateTask(CTask *parent) cy=(MAP_HEIGHT-parent->pix_height)/2; cursor_x=ms.pos.x+cx-parent->pix_left-parent->scroll_x; cursor_y=ms.pos.y+cy-parent->pix_top -parent->scroll_y; - cnt=0;stress=0; - my_outside_cnt=0; + count=0;stress=0; + my_outside_count=0; if (cursor_xy -=tmpa->dy; tmpa->dy=-tmpa->dy; } - cnt++; + count++; if (tmpa->x>>32>=FENCE_WIDTH || tmpa->y>>32>=FENCE_HEIGHT) - my_outside_cnt++; + my_outside_count++; } } - outside_cnt=my_outside_cnt; + outside_count=my_outside_count; if (!(updates&15)) RiverDropsNext(parent); - if (!tf && !outside_cnt) { + if (!tf && !outside_count) { tf=tS; music.mute=TRUE; Snd(86);Sleep(200);Snd;Sleep(100); @@ -432,8 +432,8 @@ U0 AnimateTask(CTask *parent) updates++; - if (cnt) - stress/=cnt; + if (count) + stress/=count; else stress=0; if (stress>100.0) { @@ -501,7 +501,7 @@ U0 ReInit() a[i].frame0=RandU16&3; BuddySel(i); } - outside_cnt=ANIMALS_NUM; + outside_count=ANIMALS_NUM; gate_t=0; gate_=0; t0=tS; diff --git a/src/Demo/Games/RocketScience.HC b/src/Demo/Games/RocketScience.HC index 4eb04674..7c8b0bec 100755 Binary files a/src/Demo/Games/RocketScience.HC and b/src/Demo/Games/RocketScience.HC differ diff --git a/src/Demo/Games/Talons.HC b/src/Demo/Games/Talons.HC index ac77788d..a7b2e9e7 100755 --- a/src/Demo/Games/Talons.HC +++ b/src/Demo/Games/Talons.HC @@ -148,7 +148,7 @@ class Bird Bird *next,*last; CD3I64 p; F64 ; -} b_head[mp_cnt]; +} b_head[mp_count]; class Obj { @@ -162,7 +162,7 @@ class Panel {//Polygon or Obj Panel *next; CD3I32 *pts; - I64 cnt; + I64 count; U16 update,num_sides; CColorROPU32 color; Obj *next_obj,*last_obj; @@ -274,8 +274,8 @@ U0 MPDoPanels(CTask *task) Panel *tmpp,*start_ptr=NULL,*end_ptr=NULL; CD3I32 *poly; Obj *tmpo; - lo=Gs->num*(MAP_HEIGHT-1)/mp_cnt; - hi=(Gs->num+1)*(MAP_HEIGHT-1)/mp_cnt; + lo=Gs->num*(MAP_HEIGHT-1)/mp_count; + hi=(Gs->num+1)*(MAP_HEIGHT-1)/mp_count; for (threshold=8;threshold>=1;threshold--) for (j=lo;j>=1; yh2>>=1; w_on_map=FALSE; dd_old=I64_MAX; - for (strip_width=0;cnts.jiffies>8; y1=y1h>>8; if (0<=x1update!=update) { tmpp->update=update; - if (tmpp->cnt>8*(1.1-Gs->idle_factor)) { + if (tmpp->count>8*(1.1-Gs->idle_factor)) { dc->color=tmpp->color; - tmpp->cnt=GrFillPoly3(dc,tmpp->num_sides,tmpp->pts); + tmpp->count=GrFillPoly3(dc,tmpp->num_sides,tmpp->pts); } else - tmpp->cnt++; + tmpp->count++; tmpo=tmpp->next_obj; while (tmpo!=&tmpp->next_obj) { Sprite3(dc,tmpo->p.x,tmpo->p.y,tmpo->p.z,tmpo->img); @@ -859,7 +859,7 @@ U0 Core0Talons() I64 i,xx,yy,elev,height,cx=Fs->pix_width>>1,cy=Fs->pix_height>>1; F64 min_strip_width,tt; - update_jiffy_limit=cnts.jiffies+JIFFY_FREQ/40; + update_jiffy_limit=counts.jiffies+JIFFY_FREQ/40; xx=x/(MAP_SCALE*COORDINATE_SCALE); yy=y/(MAP_SCALE*COORDINATE_SCALE); @@ -887,13 +887,13 @@ U0 Core0Talons() } } else { DCDepthBufRst(dc); - mp.update_not_done_flags=1<p.x+=10*ms/1000*MAP_SCALE*Cos(tmpb->); @@ -1047,7 +1047,7 @@ U0 AnimateTask(I64) U0 MPEnd() { update_jiffy_limit=0; - mp.app_not_done_flags=1<p.z=BIRD_ELEVATION*MAP_SCALE+ elevations[tmpb->p.y/MAP_SCALE][tmpb->p.x/MAP_SCALE]; tmpb->=2**Rand; - QueueInsert(tmpb,b_head[i%mp_cnt].last); + QueueInsert(tmpb,b_head[i%mp_count].last); } - for (i=1;itask_end_cb=&TaskEndCB; game_t0=tS; @@ -1150,7 +1150,7 @@ U0 CleanUp() Free(tmpp); tmpp=tmpp1; } - for (i=0;inum/mp_cnt+1; + for (i=0;inum/mp_count+1; track_start[i]=tmpt; while (tmpt!=&track_head && tmpt->num!=j) tmpt=tmpt->next; @@ -378,7 +378,7 @@ U0 MPUpdateWin(CDC *dc2) } dc->flags|=DCF_TRANSFORMATION; - for (i=Gs->num;inum;i0) { @@ -394,7 +394,7 @@ U0 MPUpdateWin(CDC *dc2) dc->flags&=~(DCF_SYMMETRY|DCF_JUST_MIRROR); } } - for (i=Gs->num+1;inum+1;ip.x-c[0].p.x; y=tmpc->p.y-c[0].p.y; z=tmpc->p.z-c[0].p.z; Mat4x4MulXYZ(r,&x,&y,&z); @@ -455,8 +455,8 @@ U0 DrawIt(CTask *task,CDC *dc) GrFloodFill(dc,s*x+cx,15+HORIZON_DIP*Sin(dip_)); } - mp_not_done_flags=1<color=LTBLUE; GrPrint(dc,0,0,"Freezing Peasants:%d Time:%3.2f Best:%3.2f", - not_stopped_cnt,tt-t0,best_score); + not_stopped_count,tt-t0,best_score); } U0 StepNew(CTask *task,I64 x,I64 y,F64 ,Bool left_right,Bool king) @@ -356,7 +356,7 @@ U0 AnimateTask(I64) tmps=tmps1; } - not_stopped_cnt=0; + not_stopped_count=0; tmpp=peasant_head.next; while (tmpp!=&peasant_head) { if (tmpp->stopped) { @@ -388,12 +388,12 @@ U0 AnimateTask(I64) if (!animate_mS && animate_phase&1) StepNew(Fs->parent_task,tmpp->x,tmpp->y,tmpp->, animate_phase&2,FALSE); - not_stopped_cnt++; + not_stopped_count++; } } tmpp=tmpp->next; } - if (!not_stopped_cnt && !tf) { + if (!not_stopped_count && !tf) { tf=tS; music.mute=TRUE; Snd(86);Sleep(200);Snd;Sleep(100); diff --git a/src/Demo/Graphics/Collision.HC b/src/Demo/Graphics/Collision.HC index 3af2199a..011a7bd0 100755 Binary files a/src/Demo/Graphics/Collision.HC and b/src/Demo/Graphics/Collision.HC differ diff --git a/src/Demo/Graphics/Life.HC b/src/Demo/Graphics/Life.HC index eb8c65ff..032bc3fa 100755 --- a/src/Demo/Graphics/Life.HC +++ b/src/Demo/Graphics/Life.HC @@ -12,7 +12,7 @@ U0 DrawIt(CTask *,CDC *dc2) U0 AnimateTask(I64) { - I64 x,y,x1,y1,cnt,next_dc; + I64 x,y,x1,y1,count,next_dc; while (TRUE) { next_dc=cur_dc^1; start_over: @@ -20,20 +20,20 @@ start_over: DCClear(dc[next_dc]); for (y=1;yparent_task->pix_height-1;y++) { for (x=1;xparent_task->pix_width-1;x++) { - cnt=0; + count=0; for (y1=y-1;y1<=y+1;y1++) for (x1=x-1;x1<=x+1;x1++) if (GrPeek(dc[cur_dc],x1,y1)==GREEN) - cnt++; + count++; if (restart) goto start_over; if (GrPeek(dc[cur_dc],x,y)==GREEN) { - if (cnt==3) { + if (count==3) { dc[next_dc]->color=GREEN; GrPlot(dc[next_dc],x,y); } } else { -// if (cnt==3) {//Use this for the classic rules - if (cnt==2) { +// if (count==3) {//Use this for the classic rules + if (count==2) { dc[next_dc]->color=GREEN; GrPlot(dc[next_dc],x,y); } @@ -48,7 +48,7 @@ start_over: public U0 Life() { - I64 message_code,cnt,x1,y1,x2,y2,arg1,arg2; + I64 message_code,count,x1,y1,x2,y2,arg1,arg2; dc[0]=DCNew(GR_WIDTH,GR_HEIGHT); dc[1]=DCNew(GR_WIDTH,GR_HEIGHT); @@ -71,7 +71,7 @@ public U0 Life() case MESSAGE_MS_L_DOWN: x1=arg1; y1=arg2; x2=arg1; y2=arg2; - cnt=0; + count=0; while (message_code!=MESSAGE_MS_L_UP) { restart=TRUE; dc[cur_dc]->color=GREEN; diff --git a/src/Demo/Graphics/LightTable.HC b/src/Demo/Graphics/LightTable.HC index 80642a1c..08fd15ff 100755 --- a/src/Demo/Graphics/LightTable.HC +++ b/src/Demo/Graphics/LightTable.HC @@ -8,18 +8,18 @@ class Photon { Photon *next,*last; CD3 p,v,n,p_normal_inhibit; -} p_root[mp_cnt]; +} p_root[mp_count]; I64 p_root_locks; #define ANIMATE_JIFFIES (JIFFY_FREQ*0.01) I64 master_sleep_jiffy; -CTask *animate_tasks[mp_cnt]; +CTask *animate_tasks[mp_count]; #define LENS_COLOR WHITE #define MIRROR_COLOR DKGRAY CDC *map; -I64 photon_cnt,mirror_cnt,snell_cnt,normal_inhibit,zero_normal; +I64 photon_count,mirror_count,snell_count,normal_inhibit,zero_normal; Bool full_speed,show_normals; U8 *bmp_refract,*bmp_reflect; @@ -45,7 +45,7 @@ U0 BmpLine(U8 *bmp,F64 x1,F64 y1,F64 x2,F64 y2) Photon *PhotonNew() { - I64 num=photon_cnt++%mp_cnt; + I64 num=photon_count++%mp_count; Photon *res=CAlloc(sizeof(Photon)); while (LBts(&p_root_locks,num)) Yield; @@ -65,9 +65,9 @@ U0 DrawIt(CTask *,CDC *dc) bmp_mem,bmp_mem/1024/1024,bmp_scale, map->width,map->height,bmp_width,bmp_height); GrPrint(dc,0,FONT_HEIGHT, - "PhotonCnt:%d MirrorCnt:%d SnellCnt:%d SnellInhibit:%d ZeroNormal:%d", - photon_cnt,mirror_cnt,snell_cnt,normal_inhibit,zero_normal); - for (i=0;in.x,tmpp->n.y); D3Equ(&tmpp->v,Cos(2*$SY,3$n$SY,0$+-),Sin(2*$SY,3$n$SY,0$+-)); - lock {mirror_cnt++;} + lock {mirror_count++;} } U0 SnellsLaw(Photon *tmpp,I64 last,I64 next) @@ -264,15 +264,15 @@ U0 SnellsLaw(Photon *tmpp,I64 last,I64 next) =$SY,3$n$SY,0$-2; D3Equ(&tmpp->v,Cos(),Sin()); - lock {snell_cnt++;} + lock {snell_count++;} } U0 AnimateTask(I64) { while (TRUE) { master_sleep_jiffy+=ANIMATE_JIFFIES; - if (cnts.jiffies>=master_sleep_jiffy) - master_sleep_jiffy=cnts.jiffies+ANIMATE_JIFFIES; + if (counts.jiffies>=master_sleep_jiffy) + master_sleep_jiffy=counts.jiffies+ANIMATE_JIFFIES; SleepUntil(master_sleep_jiffy); } } @@ -338,11 +338,11 @@ U0 MPAnimateTask(I64) } tmpp=tmpp->next; - if (cnts.jiffies>=timeout_jiffy) + if (counts.jiffies>=timeout_jiffy) break; } LBtr(&p_root_locks,Gs->num); - if (cnts.jiffies>=timeout_jiffy) { + if (counts.jiffies>=timeout_jiffy) { Sleep(1); timeout_jiffy=master_sleep_jiffy+ANIMATE_JIFFIES; } @@ -359,11 +359,11 @@ U0 MPAnimateTask(I64) U0 Init() { I64 i; - master_sleep_jiffy=cnts.jiffies; + master_sleep_jiffy=counts.jiffies; full_speed=show_normals=FALSE; - photon_cnt=mirror_cnt=snell_cnt=normal_inhibit=zero_normal=0; + photon_count=mirror_count=snell_count=normal_inhibit=zero_normal=0; map=DCNew(Fs->pix_width,Fs->pix_height); - for (i=0;idraw_it=&DrawIt; Fs->animate_task=Spawn(&AnimateTask,NULL,"Animate",,Fs); - for (i=0;icolor=ROP_XOR+MIRROR_COLOR; else map->color=ROP_XOR+LENS_COLOR; do { - c[cnt].x=arg1; c[cnt].y=arg2; c[cnt].z=0; - Gr2BSpline(map,c,cnt+1); + c[count].x=arg1; c[count].y=arg2; c[count].z=0; + Gr2BSpline(map,c,count+1); message_code=GetMessage(&arg1,&arg2,1<color=MIRROR_COLOR; else map->color=LENS_COLOR; - Gr2BSpline3(map,c,cnt); - for (i=0;ipix_width,h=task->pix_height,cx=w/2,cy=h/2, - lo=Gs->num*h/mp_cnt,hi=(Gs->num+1)*h/mp_cnt; + lo=Gs->num*h/mp_count,hi=(Gs->num+1)*h/mp_count; F64 yy,y_total=0; CDC *dc=DCAlias(,task); for (y=lo;ypix_width,h=Fs->pix_height,cx=w/2,cy=h/2; CDC *dc=DCAlias; while (TRUE) { - for (i=0;icolor=color; @@ -26,7 +26,7 @@ public U0 SpeedLineDemo() case MESSAGE_MS_L_DOWN: x1=arg1; y1=arg2; x2=arg1; y2=arg2; - cnt=0; + count=0; while (message_code!=MESSAGE_MS_L_UP) { dc->thick=0.04*ms.speed; GrLine3(dc,x1,y1,0,x2,y2,0); diff --git a/src/Demo/Graphics/Transform.HC b/src/Demo/Graphics/Transform.HC index a4aaec8b..674e3651 100755 Binary files a/src/Demo/Graphics/Transform.HC and b/src/Demo/Graphics/Transform.HC differ diff --git a/src/Demo/Lectures/PCIInterrupts.HC b/src/Demo/Lectures/PCIInterrupts.HC index bc0c5b92..97faabce 100755 --- a/src/Demo/Lectures/PCIInterrupts.HC +++ b/src/Demo/Lectures/PCIInterrupts.HC @@ -1,6 +1,6 @@ //See $LK,"PCI",A="HI:PCI"$. -#if mp_cnt>1 +#if mp_count>1 #define DEST_CPU 1 #else #define DEST_CPU 0 @@ -56,7 +56,7 @@ U0 Main() Sleep(1000); "The keyboard and timer seem to be active.\n" "IntA:%d IntB:%d IntC:%d IntD:%d\n\n" - "IntB is my keybaord and regs a single KEY-UP.\n" + "IntB is my keyboard and regs a single KEY-UP.\n" "Rerun and press a few keys.\n", progress1,progress2,progress3,progress4; diff --git a/src/Demo/MagicPairs.HC b/src/Demo/MagicPairs.HC index b23032cc..8bf652cd 100755 --- a/src/Demo/MagicPairs.HC +++ b/src/Demo/MagicPairs.HC @@ -45,7 +45,7 @@ class PowPrime class Prime { - U32 prime,pow_cnt; + U32 prime,pow_count; PowPrime *pp; }; @@ -110,7 +110,7 @@ PowPrime *PowPrimesNew(I64 N,I64 sqrt_primes,Prime *primes,I64 *_num_powprimes) pp->sumfact=sf; j*=p->prime; pp++; - p->pow_cnt++; + p->pow_count++; } p++; } @@ -259,32 +259,32 @@ class RangeJob I64 num,lo,hi,N,sqrt_primes,cbrt_primes; Prime *primes; CJob *cmd; -} rj[mp_cnt]; +} rj[mp_count]; I64 TestCoreSubRange(RangeJob *r) { I64 i,j,m,n,n2,sf,res=0,range=r->hi-r->lo, *sumfacts=MAlloc(range*sizeof(I64)), *residue =MAlloc(range*sizeof(I64)); - U16 *pow_cnt =MAlloc(range*sizeof(U16)); + U16 *pow_count =MAlloc(range*sizeof(U16)); Prime *p=r->primes; PowPrime *pp; MemSetI64(sumfacts,1,range); for (n=r->lo;nhi;n++) residue[n-r->lo]=n; for (j=0;jsqrt_primes;j++) { - MemSet(pow_cnt,0,range*sizeof(U16)); + MemSet(pow_count,0,range*sizeof(U16)); m=1; - for (i=0;ipow_cnt;i++) { + for (i=0;ipow_count;i++) { m*=p->prime; n=m-r->lo%m; while (npp[i-1]; sumfacts[n]*=pp->sumfact; residue [n]/=pp->n; @@ -307,7 +307,7 @@ I64 TestCoreSubRange(RangeJob *r) } } } - Free(pow_cnt); + Free(pow_count); Free(residue); Free(sumfacts); return res; @@ -340,7 +340,7 @@ I64 MagicPairs(I64 N) F64 t0=tS; I64 res=0; I64 sqrt_primes,cbrt_primes,num_powprimes, - i,k,n=(N-1)/mp_cnt+1; + i,k,n=(N-1)/mp_count+1; Prime *primes=PrimesNew(N,&sqrt_primes,&cbrt_primes); PowPrime *powprimes=PowPrimesNew(N,sqrt_primes,primes,&num_powprimes); @@ -350,7 +350,7 @@ I64 MagicPairs(I64 N) *progress1_desc=0; progress1_max=N; k=2; - for (i=0;inum/my_mp_cnt, - hi=mp_n*(Gs->num+1)/my_mp_cnt, + I64 lo=mp_n*Gs->num/my_mp_count, + hi=mp_n*(Gs->num+1)/my_mp_count, res=0,i; for (i=lo;i>k1+k2; //This is a preliminary radix sort. b[j][bn[j]++]=arg1[i]; } - mp_not_done_flags=1<num/mp_cnt, + U8 *src=buf+BORDER_CHARS+size*Gs->num/mp_count, *f,*b; I64 len,best=0, - my_size=(size+mp_cnt-1)/mp_cnt; + my_size=(size+mp_count-1)/mp_count; while (my_size--) { //Odd @@ -83,8 +83,8 @@ U0 Palindrome(U8 *filename) PDNormalize; doc=DocPut; - mp_not_done_flags=1<hi2) lo2=hi2; @@ -35,20 +35,20 @@ U0 PrimesJob(I64 i) lock pending--; } -I64 Primes(I64 range,I64 _my_mp_cnt) +I64 Primes(I64 range,I64 _my_mp_count) { - I64 i,prime_cnt=0; + I64 i,prime_count=0; F64 t0=tS,tf; prime_range=range; - if (_my_mp_cnt<=mp_cnt) - my_mp_cnt=_my_mp_cnt; + if (_my_mp_count<=mp_count) + my_mp_count=_my_mp_count; else - my_mp_cnt=mp_cnt; + my_mp_count=mp_count; master_bitmap=CAlloc((prime_range+7)/8+1); Bts(master_bitmap,0); Bts(master_bitmap,1); - pending=my_mp_cnt; - for (i=0;inum/mp_cnt, //This is how to divide a job - hi=NUM*(Gs->num+1)/mp_cnt; + lo=NUM*Gs->num/mp_count, //This is how to divide a job + hi=NUM*(Gs->num+1)/mp_count; for (i=lo;inum,lo,hi-1,sum); @@ -18,8 +18,8 @@ U0 Main() { I64 i; grand_total=0; - mp_not_done_flags=1<link,root->link))) - root->cnt++; + root->count++; else if (i<0) LinkTreeAdd(&root->left,tmplg); else @@ -270,7 +270,7 @@ U0 LinkTreeAdd(LinkStruct **_root,LogStruct *tmplg) } else { tmplk=CAlloc(sizeof(LinkStruct)); tmplk->link=tmplg->link; - tmplk->cnt=1; + tmplk->count=1; *_root=tmplk; } } @@ -285,7 +285,7 @@ U0 FileTreeAdd(LinkStruct **_root,LogStruct *tmplg) } if (root=*_root) { if (!(i=StrCmp(tmplg->file,root->file))) - root->cnt++; + root->count++; else if (i<0) FileTreeAdd(&root->left,tmplg); else @@ -293,7 +293,7 @@ U0 FileTreeAdd(LinkStruct **_root,LogStruct *tmplg) } else { tmplk=CAlloc(sizeof(LinkStruct)); tmplk->file=tmplg->file; - tmplk->cnt=1; + tmplk->count=1; *_root=tmplk; } } @@ -311,7 +311,7 @@ U0 LinkTreeTraverse(LinkStruct *root) { if (root) { LinkTreeTraverse(root->left); - "%3d:%$$Q\n",root->cnt,root->link; + "%3d:%$$Q\n",root->count,root->link; LinkTreeTraverse(root->right); } } @@ -329,16 +329,16 @@ U0 FileTreeTraverse(LinkStruct *root) { if (root) { FileTreeTraverse(root->left); - "%3d:%$$Q\n",root->cnt,root->file; + "%3d:%$$Q\n",root->count,root->file; FileTreeTraverse(root->right); } } U0 DownLoadRep(LogStruct *head,CDate dstart,CDate dend) { - I64 i,j,cnt,dups, - hours_start,hours_end,*hour_cnts,*dup_cnts, - days_start,days_end,*day_cnts,*day_dup_cnts; + I64 i,j,count,dups, + hours_start,hours_end,*hour_counts,*dup_counts, + days_start,days_end,*day_counts,*day_dup_counts; LogStruct *tmplg=head->next,*dup_head=NULL; LinkStruct *link_root=NULL; CDateStruct ds; @@ -349,20 +349,20 @@ U0 DownLoadRep(LogStruct *head,CDate dstart,CDate dend) days_start=(dstart+local_time_offset)>>32; days_end =(dend+local_time_offset)>>32; - hour_cnts=CAlloc((hours_end-hours_start+1)*sizeof(I64)); - dup_cnts =CAlloc((hours_end-hours_start+1)*sizeof(I64)); - day_cnts =CAlloc((days_end-days_start+1)*sizeof(I64)); - day_dup_cnts=CAlloc((days_end-days_start+1)*sizeof(I64)); - dups=cnt=0; + hour_counts=CAlloc((hours_end-hours_start+1)*sizeof(I64)); + dup_counts =CAlloc((hours_end-hours_start+1)*sizeof(I64)); + day_counts =CAlloc((days_end-days_start+1)*sizeof(I64)); + day_dup_counts=CAlloc((days_end-days_start+1)*sizeof(I64)); + dups=count=0; while (tmplg!=head) { if (IsKeeper(tmplg,dstart,dend) && IsDownLoad(tmplg)) { i=tmplg->datetime*24; - hour_cnts[i.u32[1]-hours_start]++; - day_cnts[(tmplg->datetime+local_time_offset)>>32-days_start]++; - cnt++; + hour_counts[i.u32[1]-hours_start]++; + day_counts[(tmplg->datetime+local_time_offset)>>32-days_start]++; + count++; if (IPNumTreeAdd(&dup_head,tmplg)) { - day_dup_cnts[(tmplg->datetime+local_time_offset)>>32-days_start]++; - dup_cnts[i.u32[1]-hours_start]++; + day_dup_counts[(tmplg->datetime+local_time_offset)>>32-days_start]++; + dup_counts[i.u32[1]-hours_start]++; dups++; } LinkTreeAdd(&link_root,tmplg); @@ -373,10 +373,10 @@ U0 DownLoadRep(LogStruct *head,CDate dstart,CDate dend) "\n\nDownloads of /TOS_Distro.ISO\n"; for (i=dstart;i<=dend;i+=1<<32) "%DDups:%5dTotal:%5dUniques:%5d\n",i, - day_dup_cnts[(i+local_time_offset)>>32-days_start], - day_cnts[(i+local_time_offset)>>32-days_start], - day_cnts[(i+local_time_offset)>>32-days_start]- - day_dup_cnts[(i+local_time_offset)>>32-days_start]; + day_dup_counts[(i+local_time_offset)>>32-days_start], + day_counts[(i+local_time_offset)>>32-days_start], + day_counts[(i+local_time_offset)>>32-days_start]- + day_dup_counts[(i+local_time_offset)>>32-days_start]; "\n\nDownloads of /TOS_Distro.ISO\n" "'-' is a dup.'+' is not a dup.\n"; @@ -387,23 +387,23 @@ U0 DownLoadRep(LogStruct *head,CDate dstart,CDate dend) for (;i<=hours_end;i++) { Date2Struct(&ds,i<<32/24+local_time_offset); "%D %02d: ",i<<32/24,ds.hour; - for (j=0;jnext,*dup_head=NULL; LinkStruct *link_root=NULL; CDateStruct ds; @@ -436,20 +436,20 @@ U0 IndexRep(LogStruct *head,CDate dstart,CDate dend) days_start=(dstart+local_time_offset)>>32; days_end =(dend+local_time_offset)>>32; - hour_cnts=CAlloc((hours_end-hours_start+1)*sizeof(I64)); - dup_cnts =CAlloc((hours_end-hours_start+1)*sizeof(I64)); - day_cnts =CAlloc((days_end-days_start+1)*sizeof(I64)); - day_dup_cnts=CAlloc((days_end-days_start+1)*sizeof(I64)); - dups=cnt=0; + hour_counts=CAlloc((hours_end-hours_start+1)*sizeof(I64)); + dup_counts =CAlloc((hours_end-hours_start+1)*sizeof(I64)); + day_counts =CAlloc((days_end-days_start+1)*sizeof(I64)); + day_dup_counts=CAlloc((days_end-days_start+1)*sizeof(I64)); + dups=count=0; while (tmplg!=head) { if (IsKeeper(tmplg,dstart,dend) && IsIndex(tmplg)) { i=tmplg->datetime*24; - hour_cnts[i.u32[1]-hours_start]++; - day_cnts[(tmplg->datetime+local_time_offset)>>32-days_start]++; - cnt++; + hour_counts[i.u32[1]-hours_start]++; + day_counts[(tmplg->datetime+local_time_offset)>>32-days_start]++; + count++; if (IPNumTreeAdd(&dup_head,tmplg)) { - day_dup_cnts[(tmplg->datetime+local_time_offset)>>32-days_start]++; - dup_cnts[i.u32[1]-hours_start]++; + day_dup_counts[(tmplg->datetime+local_time_offset)>>32-days_start]++; + dup_counts[i.u32[1]-hours_start]++; dups++; } LinkTreeAdd(&link_root,tmplg); @@ -461,10 +461,10 @@ U0 IndexRep(LogStruct *head,CDate dstart,CDate dend) "'-' is a dup.'+' is not a dup.\n"; for (i=dstart;i<=dend;i+=1<<32) "%DDups:%5dTotal:%5dUniques:%5d\n",i, - day_dup_cnts[(i+local_time_offset)>>32-days_start], - day_cnts[(i+local_time_offset)>>32-days_start], - day_cnts[(i+local_time_offset)>>32-days_start]- - day_dup_cnts[(i+local_time_offset)>>32-days_start]; + day_dup_counts[(i+local_time_offset)>>32-days_start], + day_counts[(i+local_time_offset)>>32-days_start], + day_counts[(i+local_time_offset)>>32-days_start]- + day_dup_counts[(i+local_time_offset)>>32-days_start]; "\n\nHits on /index.html\n"; if (hours_end-hours_start>=HOURS_MAX) @@ -474,23 +474,23 @@ U0 IndexRep(LogStruct *head,CDate dstart,CDate dend) for (;i<=hours_end;i++) { Date2Struct(&ds,i<<32/24+local_time_offset); "%D %02d: ",i<<32/24,ds.hour; - for (j=0;jtype!=BDT_ATAPI && bd->base1) OutU8(bd->base1+ATAR1_CTRL,0x8); if (bd->flags & BDF_EXT_SIZE) { //48 Bit LBA? - OutU8(bd->base0+ATAR0_NSECT,cnt.u8[1]); + OutU8(bd->base0+ATAR0_NSECT,count.u8[1]); OutU8(bd->base0+ATAR0_SECT,blk.u8[3]); OutU8(bd->base0+ATAR0_LCYL,blk.u8[4]); OutU8(bd->base0+ATAR0_HCYL,blk.u8[5]); - OutU8(bd->base0+ATAR0_NSECT,cnt); + OutU8(bd->base0+ATAR0_NSECT,count); OutU8(bd->base0+ATAR0_SECT,blk); OutU8(bd->base0+ATAR0_LCYL,blk.u8[1]); OutU8(bd->base0+ATAR0_HCYL,blk.u8[2]); OutU8(bd->base0+ATAR0_SEL,0xEF|bd->unit<<4); } else { //28 Bit LBA - OutU8(bd->base0+ATAR0_NSECT,cnt); + OutU8(bd->base0+ATAR0_NSECT,count); OutU8(bd->base0+ATAR0_SECT,blk); OutU8(bd->base0+ATAR0_LCYL,blk.u8[1]); OutU8(bd->base0+ATAR0_HCYL,blk.u8[2]); @@ -64,13 +64,13 @@ U0 ATACmd(CBlkDev *bd,U8 cmd) PortNop; } -Bool ATAGetRes(CBlkDev *bd,F64 timeout,U8 *buf,I64 cnt, +Bool ATAGetRes(CBlkDev *bd,F64 timeout,U8 *buf,I64 count, I64 _avail,Bool one_read) { I64 avail,overflow; bd->flags&=~BDF_LAST_WAS_WRITE; - MemSet(buf,0,cnt); - while (cnt>0) { + MemSet(buf,0,count); + while (count>0) { if (!ATAWaitDRQ(bd,timeout)) return FALSE; if (_avail) @@ -78,16 +78,16 @@ Bool ATAGetRes(CBlkDev *bd,F64 timeout,U8 *buf,I64 cnt, else avail=InU8(bd->base0+ATAR0_HCYL)<<8+InU8(bd->base0+ATAR0_LCYL); if (avail) { - if (avail>cnt) { - overflow=avail-cnt; - avail=cnt; + if (avail>count) { + overflow=avail-count; + avail=count; } else overflow=0; if (avail&2) RepInU16(buf,avail>>1,bd->base0+ATAR0_DATA); else RepInU32(buf,avail>>2,bd->base0+ATAR0_DATA); - cnt-=avail; + count-=avail; buf+=avail; while (overflow>0) { InU16(bd->base0+ATAR0_DATA); @@ -350,18 +350,18 @@ Bool ATAPIWaitReady(CBlkDev *bd,F64 timeout) return FALSE; } -U0 ATAReadBlks(CBlkDev *bd,U8 *buf, I64 blk, I64 cnt) +U0 ATAReadBlks(CBlkDev *bd,U8 *buf, I64 blk, I64 count) { I64 retries=3; Bool unlock=BlkDevLock(bd); retry: - ATABlkSel(bd,blk,cnt); + ATABlkSel(bd,blk,count); if (bd->flags & BDF_EXT_SIZE) ATACmd(bd,ATA_READ_MULTI_EXT); else ATACmd(bd,ATA_READ_MULTI); - if (!ATAGetRes(bd,tS+1.0,buf,cnt*bd->blk_size,BLK_SIZE,FALSE)) { + if (!ATAGetRes(bd,tS+1.0,buf,count*bd->blk_size,BLK_SIZE,FALSE)) { if (retries--) { ATAWaitNotBUSY(bd,0); goto retry; @@ -369,7 +369,7 @@ U0 ATAReadBlks(CBlkDev *bd,U8 *buf, I64 blk, I64 cnt) throw('BlkDev'); } - blkdev.read_cnt+=(cnt*bd->blk_size)>>BLK_SIZE_BITS; + blkdev.read_count+=(count*bd->blk_size)>>BLK_SIZE_BITS; if (unlock) BlkDevUnlock(bd); } @@ -386,10 +386,10 @@ I64 ATAProbe(I64 base0,I64 base1,I64 unit) } Bool ATAPIReadBlks2(CBlkDev *bd,F64 timeout,U8 *buf, - I64 native_blk, I64 cnt,Bool lock) + I64 native_blk, I64 count,Bool lock) { Bool res=FALSE,unlock; - if (cnt<=0) + if (count<=0) return FALSE; if (lock) unlock=BlkDevLock(bd); @@ -402,9 +402,9 @@ Bool ATAPIReadBlks2(CBlkDev *bd,F64 timeout,U8 *buf, OutU8(bd->base0+ATAR0_HCYL,bd->blk_size.u8[1]); ATACmd(bd,ATA_PACKET); if (ATAPIWritePktWord(bd,timeout,0xA800, - native_blk.u16[1],native_blk,cnt.u16[1],cnt,0) && - ATAGetRes(bd,timeout,buf,cnt*bd->blk_size,0,FALSE)) { - blkdev.read_cnt+=(cnt*bd->blk_size)>>BLK_SIZE_BITS; + native_blk.u16[1],native_blk,count.u16[1],count,0) && + ATAGetRes(bd,timeout,buf,count*bd->blk_size,0,FALSE)) { + blkdev.read_count+=(count*bd->blk_size)>>BLK_SIZE_BITS; res=TRUE; } } @@ -413,13 +413,13 @@ Bool ATAPIReadBlks2(CBlkDev *bd,F64 timeout,U8 *buf, return res; } -U0 ATAPIReadBlks(CBlkDev *bd,U8 *buf, I64 blk, I64 cnt) +U0 ATAPIReadBlks(CBlkDev *bd,U8 *buf, I64 blk, I64 count) { CDrive *dv=Letter2Drive(bd->first_drv_let); I64 retry,spc=bd->blk_size>>BLK_SIZE_BITS,n,blk2, l2=bd->max_reads<<1+spc<<1; U8 *dvd_buf=MAlloc(l2<0) { + if (count>0) { if (blk<=bd->max_reads) blk2=0; else @@ -437,17 +437,17 @@ U0 ATAPIReadBlks(CBlkDev *bd,U8 *buf, I64 blk, I64 cnt) ATAPIReadBlks2(bd,0,dvd_buf,blk2/spc,n,TRUE); if (bd->flags & BDF_READ_CACHE) DiskCacheAdd(dv,dvd_buf,blk2,n*spc); - MemCpy(buf,dvd_buf+(blk-blk2)<bd; - while (cnt>0) { - n=cnt; + while (count>0) { + n=count; if (n>bd->max_reads) n=bd->max_reads; if (bd->type==BDT_ATAPI) @@ -456,25 +456,25 @@ Bool ATARBlks(CDrive *dv,U8 *buf, I64 blk, I64 cnt) ATAReadBlks(bd,buf,blk,n); buf+=n<flags&BDF_EXT_SIZE) ATACmd(bd,ATA_WRITE_MULTI_EXT); else ATACmd(bd,ATA_WRITE_MULTI); bd->flags|=BDF_LAST_WAS_WRITE; - while (cnt>0) { + while (count>0) { timeout=tS+1.0; while (TRUE) { i=InU8(bd->base0+ATAR0_STAT); @@ -494,7 +494,7 @@ retry: U32s_avail=sects_avail<>2; RepOutU32(buf,U32s_avail,bd->base0+ATAR0_DATA); buf+=U32s_avail<<2; - cnt-=sects_avail; + count-=sects_avail; retries=3; } ATAWaitNotBUSY(bd,0); @@ -535,7 +535,7 @@ U0 ATAPIClose(CBlkDev *bd,I64 close_field=0x200,I64 track=0) ATAWaitNotBUSY(bd,0); } -U0 ATAPIWriteBlks(CBlkDev *bd,U8 *buf, I64 native_blk, I64 cnt) +U0 ATAPIWriteBlks(CBlkDev *bd,U8 *buf, I64 native_blk, I64 count) { I64 U32s_avail; U8 *buf2; @@ -550,7 +550,7 @@ U0 ATAPIWriteBlks(CBlkDev *bd,U8 *buf, I64 native_blk, I64 cnt) else OutU8(bd->base0+ATAR0_SEL,0xE0|bd->unit<<4); OutU8(bd->base0+ATAR0_CMD,ATA_PACKET); - ATAPIWritePktWord(bd,0,0x0400,native_blk.u16[1],native_blk,cnt.u16[1],cnt,0); + ATAPIWritePktWord(bd,0,0x0400,native_blk.u16[1],native_blk,count.u16[1],count,0); bd->flags|=BDF_LAST_WAS_WRITE; ATAWaitNotBUSY(bd,0); @@ -563,8 +563,8 @@ U0 ATAPIWriteBlks(CBlkDev *bd,U8 *buf, I64 native_blk, I64 cnt) OutU8(bd->base0+ATAR0_LCYL,bd->blk_size); OutU8(bd->base0+ATAR0_HCYL,bd->blk_size.u8[1]); ATACmd(bd,ATA_PACKET); - ATAPIWritePktWord(bd,0,0xAA00,native_blk.u16[1],native_blk,cnt.u16[1],cnt,0); - buf2=buf+bd->blk_size*cnt; + ATAPIWritePktWord(bd,0,0xAA00,native_blk.u16[1],native_blk,count.u16[1],count,0); + buf2=buf+bd->blk_size*count; while (bufbase0+ATAR0_HCYL)<<8+InU8(bd->base0+ATAR0_LCYL))>>2; @@ -573,13 +573,13 @@ U0 ATAPIWriteBlks(CBlkDev *bd,U8 *buf, I64 native_blk, I64 cnt) if (U32s_avail) { RepOutU32(buf,U32s_avail,bd->base0+ATAR0_DATA); buf+=U32s_avail<<2; - blkdev.write_cnt+=U32s_avail>>(BLK_SIZE_BITS-2); + blkdev.write_count+=U32s_avail>>(BLK_SIZE_BITS-2); } } ATAWaitNotBUSY(bd,0); } -Bool ATAWBlks(CDrive *dv,U8 *buf, I64 blk, I64 cnt) +Bool ATAWBlks(CDrive *dv,U8 *buf, I64 blk, I64 count) { I64 n,spc; CBlkDev *bd=dv->bd; @@ -589,8 +589,8 @@ Bool ATAWBlks(CDrive *dv,U8 *buf, I64 blk, I64 cnt) unlock=BlkDevLock(bd); ATAPIWaitReady(bd,0); } - while (cnt>0) { - n=cnt; + while (count>0) { + n=count; if (n>bd->max_writes) n=bd->max_writes; if (bd->type==BDT_ATAPI) @@ -599,8 +599,8 @@ Bool ATAWBlks(CDrive *dv,U8 *buf, I64 blk, I64 cnt) ATAWriteBlks(bd,buf,blk,n); buf+=n<type==BDT_ATAPI) { ATAPISync(bd); diff --git a/src/Kernel/BlkDev/DiskATAId.HC b/src/Kernel/BlkDev/DiskATAId.HC index 00fcf850..ced29abd 100755 --- a/src/Kernel/BlkDev/DiskATAId.HC +++ b/src/Kernel/BlkDev/DiskATAId.HC @@ -133,7 +133,7 @@ Bool ATARepExitAllApplications() public I64 ATARep(Bool pmt=TRUE,Bool just_ide=FALSE,CATARep **_head=NULL) {//Report possible ATA devices by probing. Hard disks and CD/DVDs. - I64 d1,d2,i,j,k,cnt=0,unlock_flags=0,num_hints=0; + I64 d1,d2,i,j,k,count=0,unlock_flags=0,num_hints=0; #assert BLKDEVS_NUM<=64 if (_head) *_head=NULL; @@ -154,7 +154,7 @@ public I64 ATARep(Bool pmt=TRUE,Bool just_ide=FALSE,CATARep **_head=NULL) break; "\nSubcode:0x%X Bus:0x%X Dev:0x%X Fun:0x%X\n",k,j.u8[2],j.u8[1],j.u8[0]; - cnt++; + count++; d1=PCIReadU32(j.u8[2],j.u8[1],j.u8[0],0x10); d2=PCIReadU32(j.u8[2],j.u8[1],j.u8[0],0x14); @@ -178,7 +178,7 @@ public I64 ATARep(Bool pmt=TRUE,Bool just_ide=FALSE,CATARep **_head=NULL) } } } - if (!cnt) { + if (!count) { d1=0x1F0; d2=0x3F6; ATARepEntry(d1,d2,0,"Primary IDE",_head,&num_hints); ATARepEntry(d1,d2,1,"Primary IDE",_head,&num_hints); @@ -288,6 +288,6 @@ I64 MountIDEAuto() tmpha=tmpha->next; } LinkedLstDel(head); - blkdev.mount_ide_auto_cnt=res; + blkdev.mount_ide_auto_count=res; return res; } diff --git a/src/Kernel/BlkDev/DiskBlk.HC b/src/Kernel/BlkDev/DiskBlk.HC index 94e5473f..50566592 100755 --- a/src/Kernel/BlkDev/DiskBlk.HC +++ b/src/Kernel/BlkDev/DiskBlk.HC @@ -1,22 +1,22 @@ #define ZERO_BUF_SIZE 2048 -U0 BlkWriteZero(CDrive *dv,I64 blk,I64 cnt) -{//Fill blk cnt with zeros in Drive. +U0 BlkWriteZero(CDrive *dv,I64 blk,I64 count) +{//Fill blk count with zeros in Drive. I64 n; U8 *z=CAlloc(ZERO_BUF_SIZE<ZERO_BUF_SIZE && dv->bd->type!=BDT_RAM) { - progress1=0; progress1_max=cnt; + if (count>ZERO_BUF_SIZE && dv->bd->type!=BDT_RAM) { + progress1=0; progress1_max=count; StrCpy(progress1_desc,"Zeroing"); show_progress=TRUE; } else show_progress=FALSE; - while (cnt>0) { - n=cnt; + while (count>0) { + n=count; if (n>ZERO_BUF_SIZE) n=ZERO_BUF_SIZE; BlkWrite(dv,z,blk,n); blk+=n; - cnt-=n; + count-=n; if (show_progress) progress1+=n; Yield; //Prevent locking @@ -28,37 +28,37 @@ U0 BlkWriteZero(CDrive *dv,I64 blk,I64 cnt) } } -Bool BlkRead(CDrive *dv,U8 *buf, I64 blk, I64 cnt) -{//Read blk cnt from Drive to buf. +Bool BlkRead(CDrive *dv,U8 *buf, I64 blk, I64 count) +{//Read blk count from Drive to buf. Bool res=TRUE,unlock; CBlkDev *bd=dv->bd; - if (cnt<=0) return TRUE; + if (count<=0) return TRUE; DriveCheck(dv); try { unlock=DriveLock(dv); BlkDevInit(bd); if (dv->drv_offset && blkdrv_offset || - blk+cnt>dv->drv_offset+dv->size) + blk+count>dv->drv_offset+dv->size) throw('Drive'); if (bd->flags & BDF_READ_CACHE) - RCache(dv,&buf,&blk,&cnt); - if (cnt>0) { + RCache(dv,&buf,&blk,&count); + if (count>0) { switch (bd->type) { case BDT_RAM: - MemCpy(buf,bd->RAM_dsk+blk<RAM_dsk+blk<file_dsk,buf,blk,cnt); + FBlkRead(bd->file_dsk,buf,blk,count); break; case BDT_ATA: case BDT_ATAPI: - res=ATARBlks(dv,buf,blk,cnt); + res=ATARBlks(dv,buf,blk,count); break; } bd->last_time=tS; if (bd->flags & BDF_READ_CACHE) - DiskCacheAdd(dv,buf,blk,cnt); + DiskCacheAdd(dv,buf,blk,count); } if (unlock) DriveUnlock(dv); @@ -68,11 +68,11 @@ Bool BlkRead(CDrive *dv,U8 *buf, I64 blk, I64 cnt) return res; } -Bool BlkWrite(CDrive *dv,U8 *buf, I64 blk, I64 cnt) -{//Write blk cnt from buf to Drive. +Bool BlkWrite(CDrive *dv,U8 *buf, I64 blk, I64 count) +{//Write blk count from buf to Drive. Bool res=TRUE,unlock; CBlkDev *bd=dv->bd; - if (cnt<=0) return TRUE; + if (count<=0) return TRUE; DriveCheck(dv); try { unlock=DriveLock(dv); @@ -80,25 +80,25 @@ Bool BlkWrite(CDrive *dv,U8 *buf, I64 blk, I64 cnt) if (bd->flags&BDF_READ_ONLY && !(bd->flags & BDF_READ_ONLY_OVERRIDE)) throw('BlkDev'); if (dv->drv_offset && blkdrv_offset || - blk+cnt>dv->drv_offset+dv->size) + blk+count>dv->drv_offset+dv->size) throw('Drive'); - if (cnt>0) { + if (count>0) { switch (bd->type) { case BDT_RAM: - MemCpy(bd->RAM_dsk+blk<RAM_dsk+blk<file_dsk,buf,blk,cnt); + FBlkWrite(bd->file_dsk,buf,blk,count); break; case BDT_ATA: case BDT_ATAPI: - res=ATAWBlks(dv,buf,blk,cnt); + res=ATAWBlks(dv,buf,blk,count); break; } bd->last_time=tS; if (bd->flags & BDF_READ_CACHE) - DiskCacheAdd(dv,buf,blk,cnt); + DiskCacheAdd(dv,buf,blk,count); } if (unlock) DriveUnlock(dv); diff --git a/src/Kernel/BlkDev/DiskCDDVD.HC b/src/Kernel/BlkDev/DiskCDDVD.HC index 20dc9717..6c847821 100755 --- a/src/Kernel/BlkDev/DiskCDDVD.HC +++ b/src/Kernel/BlkDev/DiskCDDVD.HC @@ -69,18 +69,18 @@ U0 DVDImageRead(U8 dvd_drv_let,U8 *out_name) U8 *buf=MAlloc(COPY_BUF_BLKS<blk_size>>BLK_SIZE_BITS,blk=0,cnt,retry; + I64 n,spc=bd->blk_size>>BLK_SIZE_BITS,blk=0,count,retry; BlkDevInit(bd); if (bd->type!=BDT_ATAPI) throw('BlkDev'); if (!out_name) out_name=blkdev.dft_iso_filename; - cnt=CeilU64(dv->size,spc); - while (cnt>0) { - if (cnt>COPY_BUF_BLKS) + count=CeilU64(dv->size,spc); + while (count>0) { + if (count>COPY_BUF_BLKS) n=COPY_BUF_BLKS; else - n=cnt; + n=count; if (n>bd->max_reads) n=bd->max_reads; @@ -94,7 +94,7 @@ U0 DVDImageRead(U8 dvd_drv_let,U8 *out_name) ATAPIReadBlks2(bd,0,buf,blk/spc,n/spc,TRUE); FBlkWrite(f,buf,blk,n); - cnt-=n; + count-=n; blk+=n; } FClose(f); @@ -105,7 +105,7 @@ U0 DVDImageRead(U8 dvd_drv_let,U8 *out_name) class CDualBuf { U8 *buf0,*buf1; - I64 in_buf,out_buf,cnt; + I64 in_buf,out_buf,count; U8 *filename; CBlkDev *dvd_bd; }; @@ -113,17 +113,17 @@ class CDualBuf U0 DVDImageWriteTask(CDualBuf *d) { U8 *buf; - I64 n,blk=0,cnt=d->cnt; + I64 n,blk=0,count=d->count; CFile *f; if (FileAttr(d->filename)&RS_ATTR_CONTIGUOUS) f=FOpen(d->filename,"rc"); else f=FOpen(d->filename,"r"); - while (cnt>0) { - if (cnt>COPY_BUF_BLKS) + while (count>0) { + if (count>COPY_BUF_BLKS) n=COPY_BUF_BLKS; else - n=cnt; + n=count; if (n>d->dvd_bd->max_writes) n=d->dvd_bd->max_writes; if (d->in_buf&1) @@ -134,7 +134,7 @@ U0 DVDImageWriteTask(CDualBuf *d) Yield; FBlkRead(f,buf,blk,n); d->in_buf++; - cnt-=n; + count-=n; blk+=n; } FClose(f); @@ -144,7 +144,7 @@ U0 DVDImageWrite(U8 dvd_drv_let,U8 *in_name=NULL,I64 media_type=MT_DVD) {//Write CD/DVD ISO file to disk. CDualBuf *d=CAlloc(sizeof(CDualBuf)); U8 *buf,*in_name2,*in_name3; - I64 i,n,spc,blk=0,cnt; + I64 i,n,spc,blk=0,count; CDrive *dv=Letter2Drive(dvd_drv_let); CBlkDev *bd=dv->bd,*bd2; CTask *task; @@ -159,7 +159,7 @@ U0 DVDImageWrite(U8 dvd_drv_let,U8 *in_name=NULL,I64 media_type=MT_DVD) Free(d); return; } - cnt=(FSize(f)+BLK_SIZE-1)>>BLK_SIZE_BITS; + count=(FSize(f)+BLK_SIZE-1)>>BLK_SIZE_BITS; FClose(f); if (bd->type!=BDT_ATAPI) throw('BlkDev'); @@ -175,14 +175,14 @@ U0 DVDImageWrite(U8 dvd_drv_let,U8 *in_name=NULL,I64 media_type=MT_DVD) bd->flags|=BDF_READ_ONLY_OVERRIDE; BlkDevInit(bd); spc=bd->blk_size>>BLK_SIZE_BITS; - if (dv->sizesize=cnt; + if (dv->sizesize=count; d->filename=in_name2; d->dvd_bd=bd; d->buf0=MAlloc(COPY_BUF_BLKS<buf1=MAlloc(COPY_BUF_BLKS<cnt=cnt; + d->count=count; task=Spawn(&DVDImageWriteTask,d,"Write CD/DVD"); while (d->in_buf<=d->out_buf) @@ -191,13 +191,13 @@ U0 DVDImageWrite(U8 dvd_drv_let,U8 *in_name=NULL,I64 media_type=MT_DVD) BlkDevLock(bd); ATAPIWaitReady(bd,0); - progress1=0; progress1_max=cnt; + progress1=0; progress1_max=count; StrCpy(progress1_desc,"Writing"); - while (cnt>0) { - if (cnt>COPY_BUF_BLKS) + while (count>0) { + if (count>COPY_BUF_BLKS) n=COPY_BUF_BLKS; else - n=cnt; + n=count; if (n>bd->max_writes) n=bd->max_writes; if (d->out_buf&1) @@ -208,7 +208,7 @@ U0 DVDImageWrite(U8 dvd_drv_let,U8 *in_name=NULL,I64 media_type=MT_DVD) Yield; ATAPIWriteBlks(bd,buf,blk/spc,(n+spc-1)/spc); d->out_buf++; - cnt-=n; + count-=n; blk+=n; progress1+=n; } diff --git a/src/Kernel/BlkDev/DiskCFile.HC b/src/Kernel/BlkDev/DiskCFile.HC index ee932828..b76c59ce 100755 --- a/src/Kernel/BlkDev/DiskCFile.HC +++ b/src/Kernel/BlkDev/DiskCFile.HC @@ -6,7 +6,7 @@ I64 FSize(CFile *f) return 0; } -CFile *FOpen(U8 *filename,U8 *flags,I64 cnt=0) +CFile *FOpen(U8 *filename,U8 *flags,I64 count=0) {//Allows flags "r","w","w+". "c" for contiguous. //(It uses $LK,"StrOcc",A="MN:StrOcc"$() for 'w', 'r', '+', 'c') CFile *f=CAlloc(sizeof(CFile)); @@ -16,8 +16,8 @@ CFile *FOpen(U8 *filename,U8 *flags,I64 cnt=0) f->clus=INVALID_CLUS; f->fblk_num=0; - if (cnt>0) - f->max_blk=cnt-1; + if (count>0) + f->max_blk=count-1; else f->max_blk=I64_MAX; f->file_clus_num=INVALID_CLUS; @@ -47,10 +47,10 @@ CFile *FOpen(U8 *filename,U8 *flags,I64 cnt=0) f->flags|=FF_NEW_FILE; if (dirc=DirContextNew(full_name)) { StrCpy(f->de.name,dirc->mask); - if (cnt>0) {//We pre-alloc the whole thing. + if (count>0) {//We pre-alloc the whole thing. f->de.clus=ClusAlloc(f->dv,0, - (cnt+f->dv->spc-1)/f->dv->spc,contiguous); - f->de.size=cnt<dv->spc-1)/f->dv->spc,contiguous); + f->de.size=count<dv,Fs->cur_dir,&f->de,TRUE); f->flags&=~FF_NEW_FILE; } @@ -126,20 +126,20 @@ I64 FSetClus(CFile *f,I64 c,I64 blk,Bool read) return c; } -Bool FBlkRead(CFile *f,U8 *buf,I64 blk=FFB_NEXT_BLK,I64 cnt=1) -{//Read [nth,n+cnt) blks of file. +Bool FBlkRead(CFile *f,U8 *buf,I64 blk=FFB_NEXT_BLK,I64 count=1) +{//Read [nth,n+count) blks of file. CDrive *dv=f->dv; I64 spc=dv->spc,i,j,c=f->de.clus; if (!f || !dv) return FALSE; if (blk==FFB_NEXT_BLK) blk=f->fblk_num; - if (blk+cnt-1>f->max_blk) + if (blk+count-1>f->max_blk) return FALSE; - if (cnt<=0) return TRUE; + if (count<=0) return TRUE; if (f->flags & FF_CONTIGUOUS) { - BlkRead(dv,buf,Clus2Blk(dv,c)+blk,cnt); - blk+=cnt; + BlkRead(dv,buf,Clus2Blk(dv,c)+blk,count); + blk+=count; } else { i=blk/spc; if (0<=f->file_clus_num<=i) { @@ -151,48 +151,48 @@ Bool FBlkRead(CFile *f,U8 *buf,I64 blk=FFB_NEXT_BLK,I64 cnt=1) if (i=blk%spc) { c=FSetClus(f,c,blk,TRUE); - if (cntclus_buf+i<=spc) { + while (count>=spc) { c=FSetClus(f,c,blk,TRUE); MemCpy(buf,f->clus_buf,spc<0) { + if (count>0) { c=FSetClus(f,c,blk,TRUE); - MemCpy(buf,f->clus_buf,cnt<clus_buf,count<fblk_num=blk; return TRUE; } -Bool FBlkWrite(CFile *f,U8 *buf,I64 blk=FFB_NEXT_BLK,I64 cnt=1) -{//Write [nth,n+cnt) blks of file. +Bool FBlkWrite(CFile *f,U8 *buf,I64 blk=FFB_NEXT_BLK,I64 count=1) +{//Write [nth,n+count) blks of file. CDrive *dv=f->dv; I64 spc=dv->spc,i,j,c=f->de.clus,c1; if (!f || !dv) return FALSE; if (blk==FFB_NEXT_BLK) blk=f->fblk_num; - if (blk+cnt-1>f->max_blk) + if (blk+count-1>f->max_blk) return FALSE; if (!(f->flags & FF_WRITE)) return FALSE; - if (cnt<=0) return TRUE; + if (count<=0) return TRUE; if (f->flags & FF_CONTIGUOUS) { - BlkWrite(dv,buf,Clus2Blk(dv,c)+blk,cnt); - blk+=cnt; + BlkWrite(dv,buf,Clus2Blk(dv,c)+blk,count); + blk+=count; } else { if (!c) { c=ClusAlloc(dv,0,1,FALSE); @@ -220,42 +220,42 @@ Bool FBlkWrite(CFile *f,U8 *buf,I64 blk=FFB_NEXT_BLK,I64 cnt=1) if (i=blk%spc) { FSetClus(f,c,blk,TRUE); - if (cntclus_buf+BLK_SIZE*i,buf,j<flags|=FF_BUF_DIRTY; buf+=j<0) { + if (count>0) { c1=c; c=ClusNumNext(dv,c1,1); if (c==INVALID_CLUS) c=ClusAlloc(dv,c1,1,FALSE); } } - while (cnt>=spc) { + while (count>=spc) { FSetClus(f,c,blk,FALSE); MemCpy(f->clus_buf,buf,spc<flags|=FF_BUF_DIRTY; buf+=spc<0) { + if (count>0) { c1=c; c=ClusNumNext(dv,c1,1); if (c==INVALID_CLUS) c=ClusAlloc(dv,c1,1,FALSE); } } - if (cnt>0) { + if (count>0) { FSetClus(f,c,blk,TRUE); - MemCpy(f->clus_buf,buf,cnt<clus_buf,buf,count<flags|=FF_BUF_DIRTY; - buf+=cnt<de.sizede.size=blk<last_lru); tmpc->next_hash=tmpc->last_hash=tmpc; @@ -73,13 +73,13 @@ CCacheBlk *DiskCacheFind(CDrive *dv,I64 blk) return NULL; } -U0 DiskCacheAdd(CDrive *dv,U8 *buf, I64 blk, I64 cnt) +U0 DiskCacheAdd(CDrive *dv,U8 *buf, I64 blk, I64 count) { CCacheBlk *tmpc; if (blkdev.cache_base) { while (LBts(&sys_semas[SEMA_DSK_CACHE],0)) Yield; - while (cnt-->0) { + while (count-->0) { if (!(tmpc=DiskCacheFind(dv,blk))) tmpc=blkdev.cache_ctrl->next_lru; DiskCacheQueueRemove(tmpc); @@ -116,27 +116,27 @@ U0 DiskCacheInvalidate2(CDrive *dv) } } -U0 RCache(CDrive *dv,U8 **_buf, I64 *_blk, I64 *_cnt) +U0 RCache(CDrive *dv,U8 **_buf, I64 *_blk, I64 *_count) { CCacheBlk *tmpc; if (blkdev.cache_base) { while (LBts(&sys_semas[SEMA_DSK_CACHE],0)) Yield; //fetch leading blks from cache - while (*_cnt>0) { + while (*_count>0) { if (tmpc=DiskCacheFind(dv,*_blk)) { MemCpy(*_buf,&tmpc->body,BLK_SIZE); - *_cnt-=1; + *_count-=1; *_buf+=BLK_SIZE; *_blk+=1; } else break; } //fetch trailing blks from cache - while (*_cnt>0) { - if (tmpc=DiskCacheFind(dv,*_blk+*_cnt-1)) { - MemCpy(*_buf+(*_cnt-1)<body,BLK_SIZE); - *_cnt-=1; + while (*_count>0) { + if (tmpc=DiskCacheFind(dv,*_blk+*_count-1)) { + MemCpy(*_buf+(*_count-1)<body,BLK_SIZE); + *_count-=1; } else break; } diff --git a/src/Kernel/BlkDev/DiskClus.HC b/src/Kernel/BlkDev/DiskClus.HC index 51a0b040..8cbe2b0e 100755 --- a/src/Kernel/BlkDev/DiskClus.HC +++ b/src/Kernel/BlkDev/DiskClus.HC @@ -1,16 +1,16 @@ -I64 ClusNumNext(CDrive *dv,I64 c,I64 cnt=1) -{//Return next cnt'th clus in chain. +I64 ClusNumNext(CDrive *dv,I64 c,I64 count=1) +{//Return next count'th clus in chain. Bool unlock; DriveCheck(dv); - if (cnt<=0) return c; + if (count<=0) return c; try { unlock=DriveLock(dv); switch (dv->fs_type) { case FSt_REDSEA: - c+=cnt; + c+=count; break; case FSt_FAT32: - while (cnt-->0 && 00 && 0cur_fat_blk[c & (BLK_SIZE/4-1)]; } @@ -78,9 +78,9 @@ I64 ClusBlkRead(CDrive *dv,U8 *buf,I64 c,I64 blks) return c; } -I64 ClusRead(CDrive *dv,U8 *buf,I64 c,I64 cnt) -{//Read clus cnt from drv to buf. - return ClusBlkRead(dv,buf,c,cnt*dv->spc); +I64 ClusRead(CDrive *dv,U8 *buf,I64 c,I64 count) +{//Read clus count from drv to buf. + return ClusBlkRead(dv,buf,c,count*dv->spc); } I64 ClusBlkWrite(CDrive *dv,U8 *buf,I64 c,I64 blks) @@ -120,25 +120,25 @@ I64 ClusBlkWrite(CDrive *dv,U8 *buf,I64 c,I64 blks) return c; } -I64 ClusWrite(CDrive *dv,U8 *buf,I64 c,I64 cnt) -{//Write clus cnt from buf to drv. - return ClusBlkWrite(dv,buf,c,cnt*dv->spc); +I64 ClusWrite(CDrive *dv,U8 *buf,I64 c,I64 count) +{//Write clus count from buf to drv. + return ClusBlkWrite(dv,buf,c,count*dv->spc); } -I64 ClusAlloc(CDrive *dv,I64 c=0,I64 cnt=1,Bool contiguous=FALSE) -{//Alloc clus cnt into chain. +I64 ClusAlloc(CDrive *dv,I64 c=0,I64 count=1,Bool contiguous=FALSE) +{//Alloc clus count into chain. //c=0 means first clus in chain DriveCheck(dv); - if (cnt<=0) return c; + if (count<=0) return c; switch (dv->fs_type) { case FSt_REDSEA: - return RedSeaAllocClus(dv,cnt); + return RedSeaAllocClus(dv,count); case FSt_FAT32: if (contiguous) { if (c) throw('File'); - return FAT32AllocContiguousClus(dv,cnt); + return FAT32AllocContiguousClus(dv,count); } else - return FAT32AllocClus(dv,c,cnt); + return FAT32AllocClus(dv,c,count); default: throw('Drive'); } diff --git a/src/Kernel/BlkDev/DiskCopy.HC b/src/Kernel/BlkDev/DiskCopy.HC index 571089a5..4e82ded9 100755 --- a/src/Kernel/BlkDev/DiskCopy.HC +++ b/src/Kernel/BlkDev/DiskCopy.HC @@ -23,7 +23,7 @@ Bool CopySingleZ(U8 *f1,U8 *f2) //Just one file Bool CopySingle(U8 *f1,U8 *f2) //Just one file { U8 *absf1=FileNameAbs(f1),*absf2=FileNameAbs(f2),*buf; - I64 cnt,n,size,attr1=FileAttr(f1),attr2=FileAttr(f2),i,j; + I64 count,n,size,attr1=FileAttr(f1),attr2=FileAttr(f2),i,j; CFile *in_file=NULL,*out_file=NULL; if (!StrCmp(absf1,absf2)) {//onto self? Free(absf1); @@ -41,25 +41,25 @@ Bool CopySingle(U8 *f1,U8 *f2) //Just one file in_file=FOpen(f1,"r"); if (in_file) { size=FSize(in_file); - cnt=(size+BLK_SIZE-1)>>BLK_SIZE_BITS; + count=(size+BLK_SIZE-1)>>BLK_SIZE_BITS; if (attr2 & RS_ATTR_CONTIGUOUS) - out_file=FOpen(f2,"wc",cnt); + out_file=FOpen(f2,"wc",count); else - out_file=FOpen(f2,"w",cnt); + out_file=FOpen(f2,"w",count); if (out_file) { "Copying %s to %s\n",f1,f2; j=size; - while (cnt>0) { - if (cnt>COPY_BUF_BLKS) { + while (count>0) { + if (count>COPY_BUF_BLKS) { n=COPY_BUF_BLKS; i=n<flags|=FF_USE_OLD_DATETIME; diff --git a/src/Kernel/BlkDev/DiskDirA.HC b/src/Kernel/BlkDev/DiskDirA.HC index 6e983740..3596ed10 100755 --- a/src/Kernel/BlkDev/DiskDirA.HC +++ b/src/Kernel/BlkDev/DiskDirA.HC @@ -88,12 +88,12 @@ I64 DirEntryCompareClus(CDirEntry *e1,CDirEntry *e2) U0 DirFilesSort(CDirEntry **_tmpde,I64 key) { - I64 i,cnt; + I64 i,count; CDirEntry *tmpde=*_tmpde,*tmpde1,**sort_buf; if (tmpde) { - cnt=LinkedLstCnt(tmpde); - if (cnt>1) { - sort_buf=MAlloc(cnt*sizeof(U8 *)); + count=LinkedLstCount(tmpde); + if (count>1) { + sort_buf=MAlloc(count*sizeof(U8 *)); i=0; tmpde1=tmpde; while (tmpde1) { @@ -102,15 +102,15 @@ U0 DirFilesSort(CDirEntry **_tmpde,I64 key) } switch [key] { case SK_NAME: - QSortI64(sort_buf,cnt,&DirEntryCompareName); + QSortI64(sort_buf,count,&DirEntryCompareName); break; case SK_CLUS: - QSortI64(sort_buf,cnt,&DirEntryCompareClus); + QSortI64(sort_buf,count,&DirEntryCompareClus); break; } tmpde=sort_buf[0]; *_tmpde=tmpde; - for (i=0;inext=sort_buf[i+1]; } diff --git a/src/Kernel/BlkDev/DiskDirB.HC b/src/Kernel/BlkDev/DiskDirB.HC index 834ca49c..7717ed9f 100755 --- a/src/Kernel/BlkDev/DiskDirB.HC +++ b/src/Kernel/BlkDev/DiskDirB.HC @@ -159,9 +159,9 @@ I64 Dir(U8 *files_find_mask,Bool full) return res; } -Bool DirMk(U8 *filename,I64 entry_cnt=0) +Bool DirMk(U8 *filename,I64 entry_count=0) {//Make directory. $LK,"Cd",A="MN:Cd"$() can also make directories. -//entry_cnt is for preallocating dir blks, leave it zero if you like. +//entry_count is for preallocating dir blks, leave it zero if you like. U8 *name; CDirContext *dirc; Bool res=FALSE; @@ -177,10 +177,10 @@ Bool DirMk(U8 *filename,I64 entry_cnt=0) SUF_REM_LEADING|SUF_REM_TRAILING|SUF_REM_CTRL_CHARS); switch (dirc->dv->fs_type) { case FSt_REDSEA: - res=RedSeaMkDir(dirc->dv,Fs->cur_dir,name,entry_cnt); + res=RedSeaMkDir(dirc->dv,Fs->cur_dir,name,entry_count); break; case FSt_FAT32: - res=FAT32MkDir(dirc->dv,Fs->cur_dir,name,entry_cnt); + res=FAT32MkDir(dirc->dv,Fs->cur_dir,name,entry_count); break; default: PrintErr("File System Not Supported\n"); diff --git a/src/Kernel/BlkDev/FileSysFAT.HC b/src/Kernel/BlkDev/FileSysFAT.HC index 468c8edd..e3a19064 100755 --- a/src/Kernel/BlkDev/FileSysFAT.HC +++ b/src/Kernel/BlkDev/FileSysFAT.HC @@ -227,9 +227,9 @@ Bool FAT32CDirFill(CDirEntry *tmpde, } Bool FAT32DirFill(CFAT32DirEntry *de, - CDirEntry *tmpde,I64 *_de_cnt,CDate _local_time_offset) -{//Fill up to 3 entries and store cnt of entries. - I64 de_cnt=0,i,l,xsum,ord; + CDirEntry *tmpde,I64 *_de_count,CDate _local_time_offset) +{//Fill up to 3 entries and store count of entries. + I64 de_count=0,i,l,xsum,ord; U8 *ptr,dname[16]; CFAT32DirEntryLong *ld=de; Bool res; @@ -241,11 +241,11 @@ Bool FAT32DirFill(CFAT32DirEntry *de, ord=0x41; xsum=FATNameXSum(de->name); if ((l=StrLen(tmpde->name))>13) { - ptr=&ld[de_cnt]; + ptr=&ld[de_count]; MemSet(ptr,0,sizeof(CFAT32DirEntryLong)); - ld[de_cnt].attr=RS_ATTR_LONG_NAME; - ld[de_cnt].xsum=xsum; - ld[de_cnt].ord=0x42; + ld[de_count].attr=RS_ATTR_LONG_NAME; + ld[de_count].xsum=xsum; + ld[de_count].ord=0x42; for (i=13;iname[i]; i++; @@ -253,33 +253,33 @@ Bool FAT32DirFill(CFAT32DirEntry *de, ptr[fat_long_name_map[i-13]](U16)=0xFFFF; ord=1; l=13; - de_cnt++; + de_count++; } - ptr=&de[de_cnt]; + ptr=&de[de_count]; MemSet(ptr,0,sizeof(CFAT32DirEntryLong)); - ld[de_cnt].attr=RS_ATTR_LONG_NAME; - ld[de_cnt].xsum=xsum; - ld[de_cnt].ord=ord; + ld[de_count].attr=RS_ATTR_LONG_NAME; + ld[de_count].xsum=xsum; + ld[de_count].ord=ord; for (i=0;iname[i]; i++; for (;i<13;i++) ptr[fat_long_name_map[i]](U16)=0xFFFF; - de_cnt++; - MemSet(&de[de_cnt],0,sizeof(CFAT32DirEntry)); - res=FATNameTo(de[de_cnt].name,tmpde->name); + de_count++; + MemSet(&de[de_count],0,sizeof(CFAT32DirEntry)); + res=FATNameTo(de[de_count].name,tmpde->name); } - de[de_cnt].clus_lo=tmpde->clus.u16[0]; - de[de_cnt].clus_hi=tmpde->clus.u16[1]; + de[de_count].clus_lo=tmpde->clus.u16[0]; + de[de_count].clus_hi=tmpde->clus.u16[1]; if (!(tmpde->attr&RS_ATTR_DIR)) - de[de_cnt].size=tmpde->size; - de[de_cnt].attr=tmpde->attr; + de[de_count].size=tmpde->size; + de[de_count].attr=tmpde->attr; if (!tmpde->datetime) tmpde->datetime=Now; - CDate2Dos(&de[de_cnt].WrtTime,&de[de_cnt].WrtDate, + CDate2Dos(&de[de_count].WrtTime,&de[de_count].WrtDate, tmpde->datetime+_local_time_offset); - if (_de_cnt) - *_de_cnt=de_cnt+1; + if (_de_count) + *_de_count=de_count+1; return res; } @@ -356,7 +356,7 @@ U8 *FAT32FileRead(CDrive *dv,U8 *cur_dir,U8 *filename,I64 *_size,I64 *_attr) { U8 *buf=NULL; CDirEntry de; - I64 c,blk_cnt,cur_dir_clus; + I64 c,blk_count,cur_dir_clus; DriveCheck(dv); *_size=0; *_attr=0; @@ -367,13 +367,13 @@ U8 *FAT32FileRead(CDrive *dv,U8 *cur_dir,U8 *filename,I64 *_size,I64 *_attr) DriveLock(dv); cur_dir_clus=Name2DirClus(dv,cur_dir); if (FAT32FileFind(dv,cur_dir_clus,filename,&de,FUF_JUST_FILES)) { - blk_cnt=(de.size+BLK_SIZE-1)>>BLK_SIZE_BITS; - buf=MAlloc(blk_cnt<>BLK_SIZE_BITS; + buf=MAlloc(blk_count<size+dv->drv_offset-dv->data_area)/dv->spc-1; j=dv->fis->most_recently_alloced; - while (cnt-->0) { + while (count-->0) { while (TRUE) { j++; if (j<1) j=1; @@ -497,12 +497,12 @@ I64 FAT32AllocClus(CDrive *dv,I64 c,I64 cnt) return first; } -I64 FAT32AllocContiguousClus(CDrive *dv,I64 cnt) +I64 FAT32AllocContiguousClus(CDrive *dv,I64 count) { I64 i,first=1; Bool cont,unlock,unlock_break; - if (cnt<=0) return 0x0FFFFFFF; + if (count<=0) return 0x0FFFFFFF; try { unlock_break=BreakLock; unlock=DriveLock(dv); @@ -510,7 +510,7 @@ I64 FAT32AllocContiguousClus(CDrive *dv,I64 cnt) first++; i=0; cont=TRUE; - while (cont && ispc+dv->data_area>dv->size+dv->drv_offset) throw('Drive'); DriveFATBlkSet(dv,first+i); @@ -524,9 +524,9 @@ I64 FAT32AllocContiguousClus(CDrive *dv,I64 cnt) else { DriveFATBlkClean(dv); - for (i=0;icur_fat_blk[(first+i)&(BLK_SIZE/4-1)]=0x0FFFFFFF; else dv->cur_fat_blk[(first+i)&(BLK_SIZE/4-1)]=first+i+1; @@ -534,9 +534,9 @@ I64 FAT32AllocContiguousClus(CDrive *dv,I64 cnt) } DriveFATBlkClean(dv,0); - for (i=0;icur_fat_blk[(first+i)&(BLK_SIZE/4-1)]=0x0FFFFFFF; else dv->cur_fat_blk[(first+i)&(BLK_SIZE/4-1)]=first+i+1; @@ -563,13 +563,13 @@ Bool FAT32DirNew(CDrive *dv,U8 *cur_dir,CDirEntry *tmpde,Bool free_old_chain) { //See $LK,"::/Doc/CutCorners.DD"$. CFAT32DirEntry *buf,*last_buf,*tmp_buf,de[3]; - I64 i,attr,avail_cnt,de_cnt,c, + I64 i,attr,avail_count,de_count,c, cur_dir_entry,entries_per_clus, cur_dir_clus,xsum=0,last_dir_clus=INVALID_CLUS; U8 ch; Bool written=FALSE,unlock,unlock_break; CDirEntry long_name; - FAT32DirFill(&de,tmpde,&de_cnt,dv->fat32_local_time_offset); + FAT32DirFill(&de,tmpde,&de_count,dv->fat32_local_time_offset); MemSet(&long_name,0,sizeof(CDirEntry)); try { unlock_break=BreakLock; @@ -585,20 +585,20 @@ Bool FAT32DirNew(CDrive *dv,U8 *cur_dir,CDirEntry *tmpde,Bool free_old_chain) if (ch!=0xE5 && attr&RS_ATTR_LONG_NAME_MASK==RS_ATTR_LONG_NAME) DirLongNameFill(&long_name,&buf[cur_dir_entry],&xsum); else { - avail_cnt=FAT32_ENTRIES_PER_BLK-cur_dir_entry + avail_count=FAT32_ENTRIES_PER_BLK-cur_dir_entry &(FAT32_ENTRIES_PER_BLK-1); - for (i=0;i=de_cnt) { - MemCpy(&buf[cur_dir_entry],&de,de_cnt*sizeof(CFAT32DirEntry)); + if (ch==0xE5 && !written && avail_count>=de_count) { + MemCpy(&buf[cur_dir_entry],&de,de_count*sizeof(CFAT32DirEntry)); BlkWrite(dv,&buf[cur_dir_entry & -FAT32_ENTRIES_PER_BLK], dv->data_area+cur_dir_clus*dv->spc +cur_dir_entry>>FAT32_ENTRIES_BITS,1); - cur_dir_entry+=de_cnt-1; //gets inc'ed + cur_dir_entry+=de_count-1; //gets inc'ed written=TRUE; } else if (ch!=0xE5 && !(attr&RS_ATTR_VOL_ID)) { if (xsum!=FATNameXSum(buf[cur_dir_entry].name)) @@ -611,7 +611,7 @@ Bool FAT32DirNew(CDrive *dv,U8 *cur_dir,CDirEntry *tmpde,Bool free_old_chain) FAT32FreeClus(dv,buf[cur_dir_entry].clus_lo+ buf[cur_dir_entry].clus_hi<<16); if (!written) { - MemCpy(&buf[cur_dir_entry],&de[de_cnt-1],sizeof(CFAT32DirEntry)); + MemCpy(&buf[cur_dir_entry],&de[de_count-1],sizeof(CFAT32DirEntry)); BlkWrite(dv,&buf[cur_dir_entry & -FAT32_ENTRIES_PER_BLK], dv->data_area+cur_dir_clus*dv->spc +cur_dir_entry>>FAT32_ENTRIES_BITS,1); @@ -661,14 +661,14 @@ Bool FAT32DirNew(CDrive *dv,U8 *cur_dir,CDirEntry *tmpde,Bool free_old_chain) } } if (!written) { - avail_cnt=FAT32_ENTRIES_PER_BLK-cur_dir_entry & (FAT32_ENTRIES_PER_BLK-1); - if (avail_cntdata_area+cur_dir_clus*dv->spc +cur_dir_entry>>FAT32_ENTRIES_BITS,1); - cur_dir_entry+=avail_cnt; + cur_dir_entry+=avail_count; if (cur_dir_entry==entries_per_clus) { last_dir_clus=cur_dir_clus; tmp_buf=buf; buf=last_buf; last_buf=tmp_buf; @@ -678,11 +678,11 @@ Bool FAT32DirNew(CDrive *dv,U8 *cur_dir,CDirEntry *tmpde,Bool free_old_chain) ClusWrite(dv,buf,cur_dir_clus,1); } } - MemCpy(&buf[cur_dir_entry],&de,de_cnt*sizeof(CFAT32DirEntry)); + MemCpy(&buf[cur_dir_entry],&de,de_count*sizeof(CFAT32DirEntry)); BlkWrite(dv,&buf[cur_dir_entry &-FAT32_ENTRIES_PER_BLK], dv->data_area+cur_dir_clus*dv->spc+ cur_dir_entry>>FAT32_ENTRIES_BITS,1); - cur_dir_entry+=de_cnt; + cur_dir_entry+=de_count; if (cur_dir_entry==entries_per_clus) { cur_dir_clus=ClusAlloc(dv,cur_dir_clus,1); MemSet(buf,0,BLK_SIZE*dv->spc); @@ -800,7 +800,7 @@ I64 FAT32FileWrite(CDrive *dv,U8 *cur_dir,U8 *name,U8 *buf,I64 size, CDate cdt,I64 attr) { CDirEntry de; - I64 c=0,blk_cnt; + I64 c=0,blk_count; Bool contiguous; MemSet(&de,0,sizeof(CDirEntry)); if (size<0) size=0; @@ -815,15 +815,15 @@ I64 FAT32FileWrite(CDrive *dv,U8 *cur_dir,U8 *name,U8 *buf,I64 size, else contiguous=FALSE; de.size=size; - if (blk_cnt=(size+BLK_SIZE-1)>>BLK_SIZE_BITS) - c=ClusAlloc(dv,0,(blk_cnt+dv->spc-1)/dv->spc,contiguous); + if (blk_count=(size+BLK_SIZE-1)>>BLK_SIZE_BITS) + c=ClusAlloc(dv,0,(blk_count+dv->spc-1)/dv->spc,contiguous); else c=0x0FFFFFFF; de.clus=c; de.attr=attr; de.datetime=cdt; - if (blk_cnt) - ClusBlkWrite(dv,buf,c,blk_cnt); + if (blk_count) + ClusBlkWrite(dv,buf,c,blk_count); FAT32DirNew(dv,cur_dir,&de,TRUE); } return c; @@ -916,11 +916,11 @@ CDirEntry *FAT32FilesFind(U8 *files_find_mask, return res; } -Bool FAT32MkDir(CDrive *dv,U8 *cur_dir,U8 *name,I64 entry_cnt) +Bool FAT32MkDir(CDrive *dv,U8 *cur_dir,U8 *name,I64 entry_count) { I64 c,cur_dir_clus=Name2DirClus(dv,cur_dir), //Rough estimate of size - size=CeilU64((entry_cnt+2)<spc<spc<>BLK_SIZE_BITS; - buf=MAlloc(blk_cnt<>BLK_SIZE_BITS; + buf=MAlloc(blk_count<next_free; while (!found && tmpf!=&dv->next_free) { if (tmpf->start+tmpf->size==c) { - tmpf->size+=cnt; + tmpf->size+=count; found=TRUE; - } else if (c+cnt==tmpf->start) { - tmpf->size+=cnt; + } else if (c+count==tmpf->start) { + tmpf->size+=count; tmpf->start=c; found=TRUE; } @@ -273,11 +273,11 @@ U0 RedSeaFreeClus(CDrive *dv,I64 c,I64 cnt) } if (!found) { tmpf=AMAlloc(sizeof(CFreeLst)); - tmpf->size=cnt; + tmpf->size=count; tmpf->start=c; QueueInsert(tmpf,dv->last_free); } - while (cnt-->0) { + while (count-->0) { DriveFATBlkSet(dv,c); LBtr(dv->cur_fat_blk,(c-dv->data_area)&(BLK_SIZE<<3-1)); LBts(&dv->fat_blk_dirty,0); @@ -297,12 +297,12 @@ U0 RedSeaFreeClus(CDrive *dv,I64 c,I64 cnt) } } -I64 RedSeaAllocClus(CDrive *dv,I64 cnt) +I64 RedSeaAllocClus(CDrive *dv,I64 count) { CFreeLst *tmpf,*best_free=NULL; I64 i,first,best_size=I64_MAX; Bool unlock,unlock_break; - if (cnt<=0) + if (count<=0) throw('Drive'); try { unlock_break=BreakLock; @@ -311,10 +311,10 @@ I64 RedSeaAllocClus(CDrive *dv,I64 cnt) RedSeaFreeLstBuild(dv); tmpf=dv->next_free; while (tmpf!=&dv->next_free) { - if (tmpf->size>=cnt && tmpf->sizesize>=count && tmpf->sizesize; - if (tmpf->size==cnt) + if (tmpf->size==count) break; } tmpf=tmpf->next; @@ -322,14 +322,14 @@ I64 RedSeaAllocClus(CDrive *dv,I64 cnt) if (!best_free) throw('Drive'); first=best_free->start; - for (i=0;icur_fat_blk,(first+i-dv->data_area)&(BLK_SIZE<<3-1)); LBts(&dv->fat_blk_dirty,0); } DriveFATBlkClean(dv); - if (best_free->size-=cnt) - best_free->start+=cnt; + if (best_free->size-=count) + best_free->start+=count; else { QueueRemove(best_free); Free(best_free); @@ -510,7 +510,7 @@ I64 RedSeaFileWrite(CDrive *dv,U8 *cur_dir,U8 *name,U8 *buf,I64 size, CDate cdt,I64 attr) { CDirEntry de; - I64 c=0,blk_cnt; + I64 c=0,blk_count; MemSet(&de,0,sizeof(CDirEntry)); if (size<0) size=0; if (dv->fs_type!=FSt_REDSEA) @@ -520,15 +520,15 @@ I64 RedSeaFileWrite(CDrive *dv,U8 *cur_dir,U8 *name,U8 *buf,I64 size, else { RedSeaFilesDel(dv,cur_dir,de.name,0,FALSE,FALSE); de.size=size; - if (blk_cnt=(size+BLK_SIZE-1)>>BLK_SIZE_BITS) - c=ClusAlloc(dv,0,blk_cnt,TRUE); //Always contiguous + if (blk_count=(size+BLK_SIZE-1)>>BLK_SIZE_BITS) + c=ClusAlloc(dv,0,blk_count,TRUE); //Always contiguous else c=INVALID_CLUS; de.clus=c; de.attr=attr|RS_ATTR_CONTIGUOUS; de.datetime=cdt; - if (blk_cnt) - BlkWrite(dv,buf,c,blk_cnt); + if (blk_count) + BlkWrite(dv,buf,c,blk_count); RedSeaDirNew(dv,cur_dir,&de,TRUE); } return c; @@ -599,10 +599,10 @@ CDirEntry *RedSeaFilesFind(U8 *files_find_mask,I64 fuf_flags, return res; } -Bool RedSeaMkDir(CDrive *dv,U8 *cur_dir,U8 *name,I64 entry_cnt) -{//entry_cnt is for preallocating dir blks. +Bool RedSeaMkDir(CDrive *dv,U8 *cur_dir,U8 *name,I64 entry_count) +{//entry_count is for preallocating dir blks. I64 c,cur_dir_clus=Name2DirClus(dv,cur_dir), - size=CeilU64((entry_cnt+3)<<6,BLK_SIZE); + size=CeilU64((entry_count+3)<<6,BLK_SIZE); #assert CDIR_SIZE==64 U8 *buf=CAlloc(size); CDirEntry *d_native=buf-offset(CDirEntry.start); diff --git a/src/Kernel/EdLite.HC b/src/Kernel/EdLite.HC index dc2ed27e..4e66617a 100755 --- a/src/Kernel/EdLite.HC +++ b/src/Kernel/EdLite.HC @@ -58,7 +58,7 @@ U0 EdLiteUpdate(CLine *head,CLine *cur_line,I64 cur_col,I64 line_start_col) Bool EdLite(U8 *filename,I64 num=1,I64 edf_dof_flags=0) {//Light weight text editor for debugging. U8 *src,*src2,*src3,*dst,*buf,*bin_data=NULL; - I64 i,cnt=0,ch,sc,size,bin_size=0,line_start_col=0,cur_col=0, + I64 i,count=0,ch,sc,size,bin_size=0,line_start_col=0,cur_col=0, old_raw_flags=text.raw_flags; CLine head,*tmpl,*tmpl1,*cur_line; Bool res=FALSE, @@ -96,7 +96,7 @@ Bool EdLite(U8 *filename,I64 num=1,I64 edf_dof_flags=0) tmpl=MAlloc(sizeof(CLine)); tmpl->line=StrNew(src2); QueueInsert(tmpl,head.last); - cnt++; + count++; } if (src+1-bufnext; else { diff --git a/src/Kernel/FunSeg.HC b/src/Kernel/FunSeg.HC index 520bc63d..3835de2e 100755 --- a/src/Kernel/FunSeg.HC +++ b/src/Kernel/FunSeg.HC @@ -64,7 +64,7 @@ CHash *FunSegFind(U8 *addr,I64 *_offset) return NULL; } if (IsDebugMode) - for (i=0;iseth_task; do { @@ -203,7 +203,7 @@ U0 StrPrintFunSeg(U8 *buf,I64 addr,I64 field_len,I64 flags) StrPrint(buf,"%X",addr); } -I64 SrcLineNum(U8 *addr,I64 cnt=1) +I64 SrcLineNum(U8 *addr,I64 count=1) {//linenum for src of addr. CHashSrcSym *tmph; I64 cur_line,first_line,last_line,num_lines,offset; @@ -241,7 +241,7 @@ I64 SrcLineNum(U8 *addr,I64 cnt=1) while ((!body[cur_line] || body[cur_line]min_line; } else if (tmph->src_link) { @@ -258,7 +258,7 @@ I64 SrcLineNum(U8 *addr,I64 cnt=1) return -1; } -U8 *SrcFileName(U8 *addr,I64 cnt=1,CTask *mem_task=NULL) +U8 *SrcFileName(U8 *addr,I64 count=1,CTask *mem_task=NULL) {//MAlloc filename for src of addr. CHashSrcSym *tmph; I64 i,j,ii,offset,best=NULL,d,best_d; @@ -272,7 +272,7 @@ U8 *SrcFileName(U8 *addr,I64 cnt=1,CTask *mem_task=NULL) body=dbg_info->body; best_d=I64_MAX; for (i=0;isrv_ctrl.next_waiting!=&task->srv_ctrl) switch (JobRunOne(run_flags,&task->srv_ctrl)) { case JOB_CONT: - cnt++; + count++; break; case JOB_EXIT: Exit; @@ -370,7 +370,7 @@ I64 JobsHandler(I64 run_flags,CTask *task=NULL) jh_done: LBtr(&task->srv_ctrl.flags,JOBCf_LOCKED); SetRFlags(old_flags); - return cnt; + return count; } I64 PopUp(U8 *buf,CTask *parent=NULL,CTask **_pu_task=NULL) diff --git a/src/Kernel/KDataTypes.HC b/src/Kernel/KDataTypes.HC index ee379deb..d8e159cb 100755 --- a/src/Kernel/KDataTypes.HC +++ b/src/Kernel/KDataTypes.HC @@ -18,7 +18,7 @@ U8 *LinkedLstCopy(U8 **_lst,CTask *mem_task=NULL) return res; } -I64 LinkedLstCnt(U8 **_lst) +I64 LinkedLstCount(U8 **_lst) {//Count of nodes in linked-list. I64 res=0; while (_lst) { @@ -62,7 +62,7 @@ CQueue *QueueCopy(CQueue *head,CTask *mem_task=NULL) return res; } -I64 QueueCnt(CQueue *head) +I64 QueueCount(CQueue *head) {//Count of nodes in queue, not head. CQueue *tmpq=head->next; I64 res=0; @@ -88,7 +88,7 @@ CQueueVectU8 *QueueVectU8New(I64 min_idx=0) {//Create new queue vecter. CQueueVectU8 *res=MAlloc(sizeof(CQueueVectU8)); QueueInit(res); - res->total_cnt=res->node_cnt=0; + res->total_count=res->node_count=0; res->min_idx=min_idx; return res; } @@ -98,32 +98,32 @@ U0 QueueVectU8Put(CQueueVectU8 *v,I64 idx,U8 ch) CQueueVectU8 *tmpv; idx-=v->min_idx; if (idx<0) return; - if (idxtotal_cnt) { + if (idxtotal_count) { tmpv=v; do { - idx-=tmpv->node_cnt; + idx-=tmpv->node_count; if (idx<0) { - tmpv->body[idx+tmpv->node_cnt]=ch; + tmpv->body[idx+tmpv->node_count]=ch; return; } tmpv=tmpv->next; } while (tmpv!=v); } else - idx-=v->total_cnt; + idx-=v->total_count; while (TRUE) { tmpv=v->last; - if (tmpv->node_cnt>=QUE_VECT_U8_CNT) { + if (tmpv->node_count>=QUE_VECT_U8_CNT) { tmpv=MAlloc(sizeof(CQueueVectU8)); - tmpv->node_cnt=0; + tmpv->node_count=0; QueueInsert(tmpv,v->last); } if (idx--) { - tmpv->body[tmpv->node_cnt++]=0; - v->total_cnt++; + tmpv->body[tmpv->node_count++]=0; + v->total_count++; } else { - tmpv->body[tmpv->node_cnt++]=ch; - v->total_cnt++; + tmpv->body[tmpv->node_count++]=ch; + v->total_count++; break; } } @@ -141,12 +141,12 @@ I64 QueueVectU8Get(CQueueVectU8 *v,I64 idx) {//Get U8 at idx i. CQueueVectU8 *tmpv; idx-=v->min_idx; - if (!(0<=idxtotal_cnt)) return 0; + if (!(0<=idxtotal_count)) return 0; tmpv=v; do { - idx-=tmpv->node_cnt; + idx-=tmpv->node_count; if (idx<0) - return tmpv->body[idx+tmpv->node_cnt]; + return tmpv->body[idx+tmpv->node_count]; tmpv=tmpv->next; } while (tmpv!=v); return 0; @@ -224,7 +224,7 @@ U0 FifoU8Flush(CFifoU8 *f) POPFD } -I64 FifoU8Cnt(CFifoU8 *f) +I64 FifoU8Count(CFifoU8 *f) {//Count of U8's in fifo. I64 res; PUSHFD @@ -309,7 +309,7 @@ U0 FifoI64Flush(CFifoI64 *f) POPFD } -I64 FifoI64Cnt(CFifoI64 *f) +I64 FifoI64Count(CFifoI64 *f) {//Count of I64's in fifo. I64 res; PUSHFD diff --git a/src/Kernel/KDebug.HC b/src/Kernel/KDebug.HC index be655982..36f744b4 100755 --- a/src/Kernel/KDebug.HC +++ b/src/Kernel/KDebug.HC @@ -169,20 +169,20 @@ U0 CallerRep(U8 **rbp=NULL,CTask *task=NULL) } } -U0 D(U8 *addr,I64 cnt=0x80,Bool show_offset=TRUE) +U0 D(U8 *addr,I64 count=0x80,Bool show_offset=TRUE) {//Dump mem, showing offsets. //See $LK,"DocD",A="MN:DocD"$() for a live dump. I64 i,j,ch; U8 *ptr=addr; - while (cnt) { + while (count) { if (show_offset) "%08X",ptr-addr; else "%010X",ptr; - if (cnt>16) + if (count>16) j=16; else - j=cnt; + j=count; for (i=0;i0) { + while (count-->0) { "%08X:%08X,%P\n",addr,*addr,*addr; addr++; } @@ -231,7 +231,7 @@ U0 RawPrint(I64 mS=100,U8 *fmt,...) Free(buf); } -U0 RawD(I64 mS=100,U8 *addr,I64 cnt=0x80) +U0 RawD(I64 mS=100,U8 *addr,I64 count=0x80) {//Dumps a block of mem using $LK,"Raw",A="MN:Raw"$ //scrn output for a fixed length //of time. @@ -240,14 +240,14 @@ U0 RawD(I64 mS=100,U8 *addr,I64 cnt=0x80) CLI old_raw=Raw(ON); old_input_filter=LBtr(&Fs->task_flags,TASKf_INPUT_FILTER_TASK); - D(addr,cnt); + D(addr,count); Busy(mS<<10); POPFD LBEqu(&Fs->task_flags,TASKf_INPUT_FILTER_TASK,old_input_filter); Raw(old_raw); } -U0 RawDm(I64 mS=100,U8 *addr,I64 cnt=0x80) +U0 RawDm(I64 mS=100,U8 *addr,I64 count=0x80) {//Dumps a block of mem using $LK,"Raw",A="MN:Raw"$ //scrn output for a fixed length //of time. @@ -256,7 +256,7 @@ U0 RawDm(I64 mS=100,U8 *addr,I64 cnt=0x80) CLI old_raw=Raw(ON); old_input_filter=LBtr(&Fs->task_flags,TASKf_INPUT_FILTER_TASK); - Dm(addr,cnt); + Dm(addr,count); Busy(mS<<10); POPFD LBEqu(&Fs->task_flags,TASKf_INPUT_FILTER_TASK,old_input_filter); @@ -421,7 +421,7 @@ Bool B(U8 *addr,CTask *task=NULL,Bool live=TRUE) I64 B2(CTask *task=NULL,Bool live=TRUE) {//Remove all breakpoints. -//Return: cnt of removed. +//Return: count of removed. I64 res=0; CBpt *tmpb,*tmpb1; if (!task) task=Fs; @@ -567,7 +567,7 @@ U0 Fault3(I64 fault_num,I64 fault_err_code) PUSHFD CLI if (Gs->num && dbg.mp_crash) { - mp_cnt=1; + mp_count=1; dbg.mp_crash->cpu_num=Gs->num; dbg.mp_crash->task=Fs; dbg.mp_crash->rip=Fs->rip; diff --git a/src/Kernel/KDefine.HC b/src/Kernel/KDefine.HC index abfb4523..80875fa7 100755 --- a/src/Kernel/KDefine.HC +++ b/src/Kernel/KDefine.HC @@ -4,7 +4,7 @@ CHashDefineStr *DefineLoad(U8 *dname,U8 *st) tmph->type=HTT_DEFINE_STR; tmph->str=StrNew(dname); tmph->data=StrNew(st); - tmph->cnt=-1; + tmph->count=-1; tmph->src_link=MStrPrint("AD:0x%X",Caller); HashAdd(tmph,Fs->hash_table); return tmph; @@ -12,7 +12,7 @@ CHashDefineStr *DefineLoad(U8 *dname,U8 *st) CHashDefineStr *DefineLstLoad(U8 *dname,U8 *lst) {//Create DEFINE list. Not efficient, but handy. - I64 cnt=0; + I64 count=0; U8 *ptr,**idx; CHashDefineStr *tmph=CAlloc(sizeof(CHashDefineStr)); tmph->type=HTT_DEFINE_STR; @@ -21,14 +21,14 @@ CHashDefineStr *DefineLstLoad(U8 *dname,U8 *lst) ptr=lst; while (*ptr) { if (*ptr!='@') - cnt++; + count++; while (*ptr++); } tmph->data=MAlloc(ptr+1-lst); MemCpy(tmph->data,lst,ptr+1-lst); - tmph->cnt=cnt; + tmph->count=count; - idx=tmph->sub_idx=MAlloc(cnt*sizeof(U8 *)); + idx=tmph->sub_idx=MAlloc(count*sizeof(U8 *)); ptr=lst; while (*ptr) { if (*ptr!='@') @@ -61,7 +61,7 @@ U8 *DefineSub(I64 sub,U8 *dname) {//Return DEFINE list entry indexed by number. CHashDefineStr *tmph; if (tmph=HashFind(dname,Fs->hash_table,HTT_DEFINE_STR)) { - if (0<=subcnt) + if (0<=subcount) return tmph->sub_idx[sub]; else return NULL; @@ -71,11 +71,11 @@ U8 *DefineSub(I64 sub,U8 *dname) return NULL; } -I64 DefineCnt(U8 *dname) -{//Return cnt of entries in define list. +I64 DefineCount(U8 *dname) +{//Return count of entries in define list. CHashDefineStr *tmph; if (tmph=HashFind(dname,Fs->hash_table,HTT_DEFINE_STR)) - return tmph->cnt; + return tmph->count; else if (dname) UndefinedDefine(dname); else diff --git a/src/Kernel/KExts.HC b/src/Kernel/KExts.HC index b2c9dec4..de389c58 100755 --- a/src/Kernel/KExts.HC +++ b/src/Kernel/KExts.HC @@ -19,8 +19,8 @@ extern Bool BlkDevLock(CBlkDev *bd); extern CBlkDev *BlkDevNextFreeSlot(U8 first_drv_let,I64 type); extern Bool BlkDevUnlock(CBlkDev *bd,Bool rst=FALSE); extern U0 BlkDevsRelease(); -extern Bool BlkRead(CDrive *dv,U8 *buf, I64 blk, I64 cnt); -extern Bool BlkWrite(CDrive *dv,U8 *buf, I64 blk, I64 cnt); +extern Bool BlkRead(CDrive *dv,U8 *buf, I64 blk, I64 count); +extern Bool BlkWrite(CDrive *dv,U8 *buf, I64 blk, I64 count); extern U8 *Caller(I64 num=1); extern U8 *CatPrint(U8 *_dst,U8 *fmt,...); extern Bool Cd(U8 *dirname=NULL,Bool make_dirs=FALSE); @@ -30,7 +30,7 @@ extern I64 DefineMatch(U8 *needle,U8 *haystack_lst_dname,I64 flags=0); extern U8 *DefineSub(I64 sub,U8 *dname); extern I64 Del(U8 *files_find_mask,Bool make_mask=FALSE, Bool del_dir=FALSE,Bool print_message=TRUE); -extern Bool DirMk(U8 *filename,I64 entry_cnt=0); +extern Bool DirMk(U8 *filename,I64 entry_count=0); extern Bool Drive(U8 drv_let); extern U8 Drive2Letter(CDrive *dv=NULL); extern U0 DriveBlkDevDel(CBlkDev *bd); @@ -41,17 +41,17 @@ extern U0 DrivesRelease(); extern U0 DiskCacheInvalidate(CDrive *dv); extern U0 Exit(); extern U8 *ExtDft(U8 *filename,U8 *extension); -extern I64 FAT32AllocClus(CDrive *dv,I64 c,I64 cnt); -extern I64 FAT32AllocContiguousClus(CDrive *dv,I64 cnt); +extern I64 FAT32AllocClus(CDrive *dv,I64 c,I64 count); +extern I64 FAT32AllocContiguousClus(CDrive *dv,I64 count); extern Bool FAT32DirNew(CDrive *dv,U8 *cur_dir,CDirEntry *tmpde, Bool free_old_chain); extern Bool FAT32FileFind(CDrive *dv,I64 cur_dir_clus,U8 *name, CDirEntry *_res,I64 fuf_flags=0); extern U0 FAT32Init(CDrive *dv); -extern Bool FBlkRead(CFile *f,U8 *buf,I64 blk=FFB_NEXT_BLK,I64 cnt=1); -extern Bool FBlkWrite(CFile *f,U8 *buf,I64 blk=FFB_NEXT_BLK,I64 cnt=1); +extern Bool FBlkRead(CFile *f,U8 *buf,I64 blk=FFB_NEXT_BLK,I64 count=1); +extern Bool FBlkWrite(CFile *f,U8 *buf,I64 blk=FFB_NEXT_BLK,I64 count=1); extern U0 FClose(CFile *f); -extern CFile *FOpen(U8 *filename,U8 *flags,I64 cnt=0); +extern CFile *FOpen(U8 *filename,U8 *flags,I64 count=0); extern U8 *FileExtRemove(U8 *src,U8 *dst=NULL); extern Bool FileFind(U8 *filename,CDirEntry *_de=NULL,I64 fuf_flags=0); extern U8 *FileNameAbs(U8 *_filename,I64 fuf_flags=0); @@ -83,7 +83,7 @@ extern I64 PopUp(U8 *buf,CTask *parent=NULL,CTask **_pu_task=NULL); extern U0 Print(U8 *fmt,...); extern U0 PutChars(U64 ch); extern U0 PutS(U8 *st); //Use $LK,"Print",A="MN:Print"$() -extern I64 RedSeaAllocClus(CDrive *dv,I64 cnt); +extern I64 RedSeaAllocClus(CDrive *dv,I64 count); extern Bool RedSeaDirNew(CDrive *dv,U8 *cur_dir,CDirEntry *tmpde, Bool free_old_chain); extern Bool RedSeaFileFind(CDrive *dv,I64 cur_dir_clus,U8 *name, diff --git a/src/Kernel/KGlobals.HC b/src/Kernel/KGlobals.HC index 5cbe2003..94d23637 100755 --- a/src/Kernel/KGlobals.HC +++ b/src/Kernel/KGlobals.HC @@ -18,7 +18,7 @@ F64 *pow10_I64, CAutoCompleteDictGlobals acd; CAutoCompleteGlobals ac; CBlkDevGlobals blkdev; -CCntsGlobals cnts={1,0,2676302000,2676302,2676302000,0,0,0,FALSE}; +CCountsGlobals counts={1,0,2676302000,2676302,2676302000,0,0,0,FALSE}; CDebugGlobals dbg; CDevGlobals dev; CGridGlobals ms_grid; //See $LK,"::/Demo/Graphics/Grid.HC"$. diff --git a/src/Kernel/KHashA.HC b/src/Kernel/KHashA.HC index 7074963b..6e8be08a 100755 --- a/src/Kernel/KHashA.HC +++ b/src/Kernel/KHashA.HC @@ -66,7 +66,7 @@ SYS_HASH_SINGLE_TABLE_FIND:: POP RDI POP RAX LOOP @@30 - INC U32 CHash.use_cnt[RAX] + INC U32 CHash.use_count[RAX] TEST RAX,RAX RET diff --git a/src/Kernel/KHashB.HC b/src/Kernel/KHashB.HC index 6f37391f..e8c0e048 100755 --- a/src/Kernel/KHashB.HC +++ b/src/Kernel/KHashB.HC @@ -80,7 +80,7 @@ U0 HashDel(CHashSrcSym *tmph) LinkedLstDel(tmph(CHashGlobalVar *)->dim.next); if (tmph(CHashGlobalVar *)->fun_ptr) HashDel(tmph(CHashGlobalVar *)->fun_ptr - -tmph(CHashGlobalVar *)->fun_ptr->ptr_stars_cnt); + -tmph(CHashGlobalVar *)->fun_ptr->ptr_stars_count); } } else if (tmph->type & HTT_FILE) Free(tmph(CHashGeneric *)->user_data0); diff --git a/src/Kernel/KInts.HC b/src/Kernel/KInts.HC index 6a281636..029bb44e 100755 --- a/src/Kernel/KInts.HC +++ b/src/Kernel/KInts.HC @@ -150,7 +150,7 @@ interrupt U0 IntNop() interrupt U0 IntDivZero() { if (Gs->num) { - mp_cnt=1; + mp_count=1; dbg.mp_crash->cpu_num=Gs->num; dbg.mp_crash->task=Fs; MOV RAX,U64 8[RBP] //Get RIP off of stk. diff --git a/src/Kernel/KLoad.HC b/src/Kernel/KLoad.HC index ec5b5682..0263583c 100755 --- a/src/Kernel/KLoad.HC +++ b/src/Kernel/KLoad.HC @@ -67,7 +67,7 @@ U0 SysSymImportsResolve(U8 *st_ptr,I64 ld_flags) U0 LoadPass1(U8 *src,U8 *module_base,I64 ld_flags) { U8 *ptr2,*ptr3,*st_ptr; - I64 i,j,cnt,etype; + I64 i,j,count,etype; CHashExport *tmpex=NULL; while (etype=*src++) { i=*src(U32 *)++; @@ -96,8 +96,8 @@ U0 LoadPass1(U8 *src,U8 *module_base,I64 ld_flags) if (ld_flags & LDF_NO_ABSS) src+=i*sizeof(U32); else { - cnt=i; - for (j=0;jval=ptr3; HashAdd(tmpex,Fs->hash_table); } - cnt=i; - for (j=0;jval=ptr3; HashAdd(tmpex,Fs->hash_table); } - cnt=i; - for (j=0;j1) + if (mp_count>1) MPHalt; *0x472(U16 *)=0; OutU8(0x70,0x8F); @@ -211,7 +211,7 @@ U0 KMain() LBts(&sys_run_level,RLf_COMPILER); DebugMode(OFF); - cnts.time_stamp_freq_initial=TimeCal; + counts.time_stamp_freq_initial=TimeCal; Cd("/"); try ExeFile("StartOS"); //Continues $LK,"/StartOS.HC",A="FL:/StartOS.HC,1"$ catch { diff --git a/src/Kernel/KMisc.HC b/src/Kernel/KMisc.HC index b3de7d55..c693da5d 100755 --- a/src/Kernel/KMisc.HC +++ b/src/Kernel/KMisc.HC @@ -36,7 +36,7 @@ I64 EndianI64(I64 d) return res; } -I64 BCnt(I64 d) +I64 BCount(I64 d) {//Count set bits in I64. I64 res=0,i; for (i=0;i<8;i++) @@ -47,13 +47,13 @@ I64 BCnt(I64 d) U0 IntCore0TimerHandler(CTask *) {//Called from $LK,"IntCore0TimerHandler",A="FF:::/Kernel/KInts.HC,IntCore0TimerHandler"$ I64 i; - if (mp_cnt>1) + if (mp_count>1) while (LBts(&sys_semas[SEMA_SYS_TIMER],0)) PAUSE - lock cnts.jiffies++; - cnts.timer+=SYS_TIMER0_PERIOD+1; + lock counts.jiffies++; + counts.timer+=SYS_TIMER0_PERIOD+1; LBtr(&sys_semas[SEMA_SYS_TIMER],0); - for (i=1;i1) + if (mp_count>1) while (LBts(&sys_semas[SEMA_SYS_TIMER],0)) PAUSE OutU8(0x43,0); //Latch Timer0 @@ -71,7 +71,7 @@ I64 SysTimerRead() if (InU8(0x20) & 1) i=-1; } - res=cnts.timer+SYS_TIMER0_PERIOD-i; + res=counts.timer+SYS_TIMER0_PERIOD-i; LBtr(&sys_semas[SEMA_SYS_TIMER],0); POPFD return res; @@ -90,24 +90,24 @@ I64 TimeCal() PUSHFD CLI if (HPET_start) { - cnts.time_stamp_freq=cnts.HPET_freq*(GetTSC-time_stamp_start); + counts.time_stamp_freq=counts.HPET_freq*(GetTSC-time_stamp_start); i=HPET-HPET_start; } else { - cnts.time_stamp_freq=SYS_TIMER_FREQ*(GetTSC-time_stamp_start); + counts.time_stamp_freq=SYS_TIMER_FREQ*(GetTSC-time_stamp_start); i=SysTimerRead-timer_start; } if (!i) ZenithErr("Timer Cal Error"); else { - cnts.time_stamp_freq/=i; - cnts.time_stamp_kHz_freq=cnts.time_stamp_freq/1000; - cnts.time_stamp_calibrated=TRUE; + counts.time_stamp_freq/=i; + counts.time_stamp_kHz_freq=counts.time_stamp_freq/1000; + counts.time_stamp_calibrated=TRUE; } POPFD } PUSHFD CLI - if (cnts.HPET_freq) { + if (counts.HPET_freq) { timer_start=0; HPET_start=HPET; } else { @@ -116,13 +116,13 @@ I64 TimeCal() } time_stamp_start=GetTSC; POPFD - return cnts.time_stamp_freq; + return counts.time_stamp_freq; } F64 tS() {//Time since boot in seconds as a float. - if (cnts.HPET_freq) - return ToF64(HPET-cnts.HPET_initial)/cnts.HPET_freq; + if (counts.HPET_freq) + return ToF64(HPET-counts.HPET_initial)/counts.HPET_freq; else return SysTimerRead/ToF64(SYS_TIMER_FREQ); } @@ -130,14 +130,14 @@ F64 tS() Bool Blink(F64 Hz=2.5) {//Return TRUE, then FALSE, then TRUE at given frequency. if (!Hz) return 0; - return ToI64(cnts.jiffies*2*Hz/JIFFY_FREQ)&1; + return ToI64(counts.jiffies*2*Hz/JIFFY_FREQ)&1; } U0 Busy(I64 S) {//Loosely timed. I64 i; - if (cnts.HPET_freq) { - i=HPET+cnts.HPET_freq*S/1000000; + if (counts.HPET_freq) { + i=HPET+counts.HPET_freq*S/1000000; while (HPETtask_flags,TASKf_KILL_TASK); @@ -357,7 +357,7 @@ I64 ExeCmdLine(CCompCtrl *cc) } Free(old_task_title); if (cc->flags&CCF_JUST_LOAD) { - if (cc->error_cnt) + if (cc->error_count) return FALSE; else return TRUE; @@ -516,7 +516,7 @@ I64 TaskEnd() LBtr(&task->srv_ctrl.flags,JOBCf_LOCKED); LBtr(&task->task_flags,TASKf_TASK_LOCK); - task->wake_jiffy=cnts.jiffies+DYING_JIFFIES; + task->wake_jiffy=counts.jiffies+DYING_JIFFIES; while (LBts(&Gs->cpu_flags,CPUf_DYING_TASK_QUE)) PAUSE QueueInsert(task,Gs->last_dying); @@ -529,17 +529,17 @@ U0 TaskKillDying() {//Delay freeing to prevent asking for trouble with quick reincarnations. //What if the user is doing this: $LK,"DoTreeCheckers",A="FF:::/Misc/OSTestSuite.HC,DoTreeCheckers"$. CTaskDying *task,*task1; - if (Gs->kill_jiffykill_jiffycpu_flags,CPUf_DYING_TASK_QUE)) PAUSE task=Gs->next_dying; - while (task!=&Gs->next_dying && task->wake_jiffynext_dying && task->wake_jiffynext; QueueRemove(task); TaskDel(task); task=task1; } LBtr(&Gs->cpu_flags,CPUf_DYING_TASK_QUE); - Gs->kill_jiffy=cnts.jiffies+DYING_JIFFIES; + Gs->kill_jiffy=counts.jiffies+DYING_JIFFIES; } } diff --git a/src/Kernel/Kernel.MAP b/src/Kernel/Kernel.MAP index d0184a86..d6d5c239 100755 --- a/src/Kernel/Kernel.MAP +++ b/src/Kernel/Kernel.MAP @@ -104,6 +104,7 @@ $LK,"FUf_WHOLE_LABELS_BEFORE",A="FL:::/Kernel/KernelA.HH,2562"$ $LK,"GVF_ARRAY",A="FL:::/Kernel/KernelA.HH,876"$ $LK,"KbdCmdFlush",A="FL:::/Kernel/SerialDev/Keyboard.HC,45",BI=17$ $LK,"CFPU",A="FL:::/Kernel/KernelA.HH,3123"$ +$LK,"CAbsCountsI64",A="FL:::/Kernel/KernelA.HH,1816"$ $LK,"TASKf_IDLE",A="FL:::/Kernel/KernelA.HH,3232"$ $LK,"CDIR_SIZE",A="FL:::/Kernel/KernelA.HH,2532"$ $LK,"ARGT_UIMM32",A="FL:::/Kernel/KernelA.HH,1901"$ @@ -165,52 +166,51 @@ $LK,"C:/Doc/Pags.DD",A="FL:::/Kernel/KernelA.HH,2811"$ $LK,"ARGT_ST0",A="FL:::/Kernel/KernelA.HH,1945"$ $LK,"RT_I64",A="FL:::/Kernel/KernelA.HH,1572"$ $LK,"SEMA_REFRESH_IN_PROGRESS",A="FL:::/Kernel/KernelA.HH,619"$ -$LK,"FifoI64Cnt",A="FL:::/Kernel/KDataTypes.HC,312",BI=30$ $LK,"sys_task_being_scrn_updated",A="FL:::/Kernel/KGlobals.HC,11"$ $LK,"SUF_SAFE_DOLLAR",A="FL:::/Kernel/KernelA.HH,3740"$ $LK,"RWF_SHOW_DOLLAR",A="FL:::/Kernel/KernelA.HH,3538"$ $LK,"_CFG_HEAP_DBG",A="FL:::/Kernel/KernelA.HH,2773"$ $LK,"HTt_INTERNAL_TYPE",A="FL:::/Kernel/KernelA.HH,662"$ -$LK,"RedSeaFileWrite",A="FL:::/Kernel/BlkDev/FileSysRedSea.HC,509",BI=31$ +$LK,"RedSeaFileWrite",A="FL:::/Kernel/BlkDev/FileSysRedSea.HC,509",BI=30$ $LK,"CPatchTableAbsAddr",A="FL:::/Kernel/KernelA.HH,396"$ -$LK,"DVDImageRead",A="FL:::/Kernel/BlkDev/DiskCDDVD.HC,65",BI=32$ +$LK,"DVDImageRead",A="FL:::/Kernel/BlkDev/DiskCDDVD.HC,65",BI=31$ $LK,"IET_CODE_HEAP",A="FL:::/Kernel/KernelA.HH,424"$ $LK,"ROPB_MONO",A="FL:::/Kernel/KernelA.HH,2892"$ $LK,"CAsmNum2",A="FL:::/Kernel/KernelA.HH,1837"$ $LK,"WIf_FOCUS_TASK_MS_WHEEL",A="FL:::/Kernel/KernelA.HH,1466"$ -$LK,"MsHardSetPost",A="FL:::/Kernel/SerialDev/Mouse.HC,203",BI=33$ -$LK,"AMAlloc",A="FL:::/Kernel/Mem/MAllocFree.HC,390",BI=34$ +$LK,"MsHardSetPost",A="FL:::/Kernel/SerialDev/Mouse.HC,203",BI=32$ +$LK,"AMAlloc",A="FL:::/Kernel/Mem/MAllocFree.HC,390",BI=33$ $LK,"DOCEf_LEN",A="FL:::/Kernel/KernelA.HH,1059"$ -$LK,"B",A="FL:::/Kernel/KDebug.HC,407",BI=35$ -$LK,"CheckPtr",A="FL:::/Kernel/KDebug.HC,1",BI=36$ +$LK,"B",A="FL:::/Kernel/KDebug.HC,407",BI=34$ +$LK,"CheckPtr",A="FL:::/Kernel/KDebug.HC,1",BI=35$ $LK,"ICF_PUSH_RES",A="FL:::/Kernel/KernelA.HH,1615"$ -$LK,"DriveTextAttrGet",A="FL:::/Kernel/BlkDev/DiskDrive.HC,321",BI=37$ +$LK,"DriveTextAttrGet",A="FL:::/Kernel/BlkDev/DiskDrive.HC,321",BI=36$ $LK,"D3Equ",A="FL:::/Kernel/KernelB.HH,155"$ $LK,"FF_NEW_FILE",A="FL:::/Kernel/KernelA.HH,2757"$ $LK,"CMT_STR_CONST",A="FL:::/Kernel/KernelA.HH,1700"$ -$LK,"D",A="FL:::/Kernel/KDebug.HC,172",BI=38$ -$LK,"StrPrint",A="FL:::/Kernel/StrPrint.HC,876",BI=39$ +$LK,"D",A="FL:::/Kernel/KDebug.HC,172",BI=37$ +$LK,"StrPrint",A="FL:::/Kernel/StrPrint.HC,876",BI=38$ $LK,"MEM_PAG_BITS",A="FL:::/Kernel/KernelA.HH,2832"$ $LK,"WINMGR_FPS",A="FL:::/Kernel/KernelA.HH,1479"$ $LK,"DOC_COLOR_CHAR_CONST",A="FL:::/Kernel/KernelA.HH,1149"$ -$LK,"E",A="FL:::/Kernel/FunSeg.HC,332",BI=40$ +$LK,"E",A="FL:::/Kernel/FunSeg.HC,332",BI=39$ $LK,"CEdFileName",A="FL:::/Kernel/KernelA.HH,1251"$ $LK,"DOCT_LEFT_MARGIN",A="FL:::/Kernel/KernelA.HH,915"$ $LK,"_STRNCMP",A="FL:::/Kernel/StrA.HC,154"$ $LK,"CCF_NO_CHAR_CONST",A="FL:::/Kernel/KernelA.HH,2149"$ $LK,"U64_MAX",A="FL:::/Kernel/KernelA.HH,40"$ -$LK,"G",A="FL:::/Kernel/KDebug.HC,444",BI=41$ -$LK,"ScaleIndent",A="FL:::/Kernel/StrB.HC,35",BI=42$ +$LK,"G",A="FL:::/Kernel/KDebug.HC,444",BI=40$ +$LK,"ScaleIndent",A="FL:::/Kernel/StrB.HC,35",BI=41$ $LK,"JOBCf_LOCKED",A="FL:::/Kernel/KernelA.HH,3164"$ $LK,"IET_ABS_ADDR",A="FL:::/Kernel/KernelA.HH,423"$ -$LK,"PressAKey",A="FL:::/Kernel/StrB.HC,103",BI=43$ +$LK,"PressAKey",A="FL:::/Kernel/StrB.HC,103",BI=42$ $LK,"DOF_WIN_MAX",A="FL:::/Kernel/KernelA.HH,1229"$ $LK,"CCodeCtrl",A="FL:::/Kernel/KernelA.HH,2027"$ -$LK,"Char2ScanCode",A="FL:::/Kernel/SerialDev/Keyboard.HC,100",BI=44$ -$LK,"Mem32DevInit",A="FL:::/Kernel/Mem/MemPhysical.HC,30",BI=45$ +$LK,"Char2ScanCode",A="FL:::/Kernel/SerialDev/Keyboard.HC,100",BI=43$ +$LK,"Mem32DevInit",A="FL:::/Kernel/Mem/MemPhysical.HC,30",BI=44$ $LK,"_BIT_FIELD_OR_U32",A="FL:::/Kernel/KUtils.HC,154"$ $LK,"DOCf_NO_SCROLL_BARS",A="FL:::/Kernel/KernelA.HH,1320"$ -$LK,"SPutChar",A="FL:::/Kernel/StrPrint.HC,1",BI=46$ +$LK,"SPutChar",A="FL:::/Kernel/StrPrint.HC,1",BI=45$ $LK,"CYAN",A="FL:::/Kernel/KernelA.HH,2917"$ $LK,"U64_MIN",A="FL:::/Kernel/KernelA.HH,39"$ $LK,"TK_SUPERSCRIPT",A="FL:::/Kernel/KernelA.HH,2080"$ @@ -219,19 +219,19 @@ $LK,"RS_ATTR_DELETED",A="FL:::/Kernel/KernelA.HH,2506"$ $LK,"CMT_ASM_LABEL",A="FL:::/Kernel/KernelA.HH,1698"$ $LK,"RLF_64BIT",A="FL:::/Kernel/KernelA.HH,480"$ $LK,"RLf_64BIT",A="FL:::/Kernel/KernelA.HH,458"$ -$LK,"RedSeaFreeLstBuild",A="FL:::/Kernel/BlkDev/FileSysRedSea.HC,24",BI=47$ +$LK,"RedSeaFreeLstBuild",A="FL:::/Kernel/BlkDev/FileSysRedSea.HC,24",BI=46$ $LK,"TK_SHL",A="FL:::/Kernel/KernelA.HH,2092"$ $LK,"DOCf_HAS_SONG",A="FL:::/Kernel/KernelA.HH,1323"$ $LK,"DOCF_HAS_SONG",A="FL:::/Kernel/KernelA.HH,1286"$ -$LK,"TaskQueueIns",A="FL:::/Kernel/Sched.HC,287",BI=48$ +$LK,"TaskQueueIns",A="FL:::/Kernel/Sched.HC,287",BI=47$ $LK,"CH_CTRLA",A="FL:::/Kernel/KernelA.HH,3426"$ $LK,"CH_CTRLB",A="FL:::/Kernel/KernelA.HH,3427"$ $LK,"DOCEf_TAG",A="FL:::/Kernel/KernelA.HH,1058"$ -$LK,"S",A="FL:::/Kernel/KDebug.HC,479",BI=49$ +$LK,"S",A="FL:::/Kernel/KDebug.HC,479",BI=48$ $LK,"CH_CTRLC",A="FL:::/Kernel/KernelA.HH,3428"$ $LK,"SEMA_RECORD_MACRO",A="FL:::/Kernel/KernelA.HH,612"$ -$LK,"FifoI64Ins",A="FL:::/Kernel/KDataTypes.HC,258",BI=50$ -$LK,"FloorU64",A="FL:::/Kernel/KMathB.HC,36",BI=51$ +$LK,"FifoI64Ins",A="FL:::/Kernel/KDataTypes.HC,258",BI=49$ +$LK,"FloorU64",A="FL:::/Kernel/KMathB.HC,36",BI=50$ $LK,"CH_CTRLD",A="FL:::/Kernel/KernelA.HH,3429"$ $LK,"DOCF_WORD_WRAP",A="FL:::/Kernel/KernelA.HH,1295"$ $LK,"DOCT_WORD_WRAP",A="FL:::/Kernel/KernelA.HH,924"$ @@ -242,21 +242,21 @@ $LK,"ARGT_STI",A="FL:::/Kernel/KernelA.HH,1946"$ $LK,"DOCf_WORD_WRAP",A="FL:::/Kernel/KernelA.HH,1333"$ $LK,"DOCEf_BOTTOM_Y",A="FL:::/Kernel/KernelA.HH,1085"$ $LK,"DOCEF_BOTTOM_Y",A="FL:::/Kernel/KernelA.HH,997"$ -$LK,"FileNameAbs",A="FL:::/Kernel/BlkDev/DiskStrA.HC,171",BI=52$ +$LK,"FileNameAbs",A="FL:::/Kernel/BlkDev/DiskStrA.HC,171",BI=51$ $LK,"CH_CTRLF",A="FL:::/Kernel/KernelA.HH,3431"$ $LK,"TK_SHR",A="FL:::/Kernel/KernelA.HH,2093"$ $LK,"CH_CTRLG",A="FL:::/Kernel/KernelA.HH,3432"$ $LK,"DOCEF_REMALLOC_DATA",A="FL:::/Kernel/KernelA.HH,1017"$ $LK,"_HASH_REM_DEL",A="FL:::/Kernel/KHashA.HC,208"$ -$LK,"RedSeaValidate",A="FL:::/Kernel/BlkDev/FileSysRedSea.HC,82",BI=53$ +$LK,"RedSeaValidate",A="FL:::/Kernel/BlkDev/FileSysRedSea.HC,82",BI=52$ $LK,"CH_CTRLH",A="FL:::/Kernel/KernelA.HH,3433"$ $LK,"CPalindromeU32",A="FL:::/Kernel/KernelA.HH,2428"$ $LK,"CPalindromeU16",A="FL:::/Kernel/KernelA.HH,2423"$ $LK,"DOCT_CHECK_BOX",A="FL:::/Kernel/KernelA.HH,936"$ $LK,"DCF_SCRN_BITMAP",A="FL:::/Kernel/KernelA.HH,3581"$ $LK,"CH_CTRLI",A="FL:::/Kernel/KernelA.HH,3434"$ -$LK,"FileNameTmpTxt",A="FL:::/Kernel/BlkDev/DiskStrA.HC,276",BI=54$ -$LK,"FifoI64New",A="FL:::/Kernel/KDataTypes.HC,240",BI=55$ +$LK,"FileNameTmpTxt",A="FL:::/Kernel/BlkDev/DiskStrA.HC,276",BI=53$ +$LK,"FifoI64New",A="FL:::/Kernel/KDataTypes.HC,240",BI=54$ $LK,"CH_CTRLJ",A="FL:::/Kernel/KernelA.HH,3435"$ $LK,"ARGT_XMM128",A="FL:::/Kernel/KernelA.HH,1955"$ $LK,"SC_CURSOR_UP",A="FL:::/Kernel/KernelA.HH,3507"$ @@ -264,17 +264,17 @@ $LK,"CH_CTRLK",A="FL:::/Kernel/KernelA.HH,3436"$ $LK,"TASKf_HAS_SONG",A="FL:::/Kernel/KernelA.HH,3236"$ $LK,"WIF_FOCUS_TASK_MS_L_D",A="FL:::/Kernel/KernelA.HH,1436"$ $LK,"DOCEf_SEL",A="FL:::/Kernel/KernelA.HH,1054"$ -$LK,"RandI32",A="FL:::/Kernel/KMathB.HC,97",BI=56$ -$LK,"RandI16",A="FL:::/Kernel/KMathB.HC,77",BI=57$ +$LK,"RandI32",A="FL:::/Kernel/KMathB.HC,97",BI=55$ +$LK,"RandI16",A="FL:::/Kernel/KMathB.HC,77",BI=56$ $LK,"CH_CTRLL",A="FL:::/Kernel/KernelA.HH,3437"$ $LK,"EXT_EXTS_NUM",A="FL:::/Kernel/KernelA.HH,601"$ $LK,"CH_CTRLM",A="FL:::/Kernel/KernelA.HH,3438"$ $LK,"ICf_LOCK",A="FL:::/Kernel/KernelA.HH,1627"$ $LK,"ICF_LOCK",A="FL:::/Kernel/KernelA.HH,1626"$ $LK,"WIF_SELF_MS_WHEEL",A="FL:::/Kernel/KernelA.HH,1426"$ -$LK,"PutFileLink",A="FL:::/Kernel/BlkDev/DiskDirA.HC,160",BI=58$ -$LK,"BreakLock",A="FL:::/Kernel/KExcept.HC,131",BI=59$ -$LK,"HPET",A="FL:::/Kernel/KMisc.HC,80",BI=60$ +$LK,"PutFileLink",A="FL:::/Kernel/BlkDev/DiskDirA.HC,160",BI=57$ +$LK,"BreakLock",A="FL:::/Kernel/KExcept.HC,131",BI=58$ +$LK,"HPET",A="FL:::/Kernel/KMisc.HC,80",BI=59$ $LK,"CORE0_32BIT_INIT",A="FL:::/Kernel/KStart32.HC,75"$ $LK,"CORE0_16BIT_INIT",A="FL:::/Kernel/KStart16.HC,56"$ $LK,"CH_CTRLN",A="FL:::/Kernel/KernelA.HH,3439"$ @@ -288,23 +288,23 @@ $LK,"DOCEF_WIN_REL",A="FL:::/Kernel/KernelA.HH,1002"$ $LK,"_D3_DIV",A="FL:::/Kernel/KMathA.HC,184"$ $LK,"CH_CTRLP",A="FL:::/Kernel/KernelA.HH,3441"$ $LK,"ICF_ARG2_TO_INT",A="FL:::/Kernel/KernelA.HH,1607"$ -$LK,"SysDebug",A="FL:::/Kernel/KMisc.HC,280",BI=61$ +$LK,"SysDebug",A="FL:::/Kernel/KMisc.HC,280",BI=60$ $LK,"PRTF_NEG",A="FL:::/Kernel/KernelA.HH,3878"$ $LK,"CH_CTRLQ",A="FL:::/Kernel/KernelA.HH,3442"$ $LK,"CTSS",A="FL:::/Kernel/KernelA.HH,3355"$ -$LK,"HomeSet",A="FL:::/Kernel/BlkDev/DiskDirB.HC,1",BI=62$ -$LK,"PostMessage",A="FL:::/Kernel/Job.HC,242",BI=63$ -$LK,"DrivesRelease",A="FL:::/Kernel/BlkDev/DiskDrive.HC,27",BI=64$ +$LK,"HomeSet",A="FL:::/Kernel/BlkDev/DiskDirB.HC,1",BI=61$ +$LK,"PostMessage",A="FL:::/Kernel/Job.HC,242",BI=62$ +$LK,"DrivesRelease",A="FL:::/Kernel/BlkDev/DiskDrive.HC,27",BI=63$ $LK,"D3Mul",A="FL:::/Kernel/KernelB.HH,156"$ $LK,"CH_CTRLR",A="FL:::/Kernel/KernelA.HH,3443"$ $LK,"SK_NAME",A="FL:::/Kernel/BlkDev/DiskDirA.HC,86"$ -$LK,"CtrlAltC",A="FL:::/Kernel/KeyDev.HC,133",BI=65$ -$LK,"CallerRep",A="FL:::/Kernel/KDebug.HC,152",BI=66$ +$LK,"CtrlAltC",A="FL:::/Kernel/KeyDev.HC,133",BI=64$ +$LK,"CallerRep",A="FL:::/Kernel/KDebug.HC,152",BI=65$ $LK,"CH_CTRLS",A="FL:::/Kernel/KernelA.HH,3444"$ $LK,"ROP_EQU",A="FL:::/Kernel/KernelA.HH,2898"$ $LK,"DOCEf_LST",A="FL:::/Kernel/KernelA.HH,1108"$ -$LK,"CtrlAltD",A="FL:::/Kernel/KeyDev.HC,138",BI=67$ -$LK,"RandI64",A="FL:::/Kernel/KMathB.HC,117",BI=68$ +$LK,"CtrlAltD",A="FL:::/Kernel/KeyDev.HC,138",BI=66$ +$LK,"RandI64",A="FL:::/Kernel/KMathB.HC,117",BI=67$ $LK,"CH_CTRLT",A="FL:::/Kernel/KernelA.HH,3445"$ $LK,"MBS_UNUSED_SIGNATURE_VAL",A="FL:::/Kernel/KernelA.HH,2813"$ $LK,"RT_U32",A="FL:::/Kernel/KernelA.HH,1571"$ @@ -315,7 +315,7 @@ $LK,"CH_CTRLU",A="FL:::/Kernel/KernelA.HH,3446"$ $LK,"ARGT_MM32",A="FL:::/Kernel/KernelA.HH,1949"$ $LK,"WIf_SELF_MS_WHEEL",A="FL:::/Kernel/KernelA.HH,1454"$ $LK,"DOCSS_COMMENT",A="FL:::/Kernel/KernelA.HH,1136"$ -$LK,"CtrlAltF",A="FL:::/Kernel/KeyDev.HC,148",BI=69$ +$LK,"CtrlAltF",A="FL:::/Kernel/KeyDev.HC,148",BI=68$ $LK,"CH_CTRLV",A="FL:::/Kernel/KernelA.HH,3447"$ $LK,"CCodeMisc",A="FL:::/Kernel/KernelA.HH,1715"$ $LK,"DOF_DONT_TEXT_ATTR",A="FL:::/Kernel/KernelA.HH,1230"$ @@ -323,7 +323,7 @@ $LK,"DOCEf_WORD_WRAP",A="FL:::/Kernel/KernelA.HH,1051"$ $LK,"DOCEF_WORD_WRAP",A="FL:::/Kernel/KernelA.HH,1045"$ $LK,"CH_CTRLW",A="FL:::/Kernel/KernelA.HH,3448"$ $LK,"FFB_NEXT_BLK",A="FL:::/Kernel/KernelA.HH,2754"$ -$LK,"MPIntAll",A="FL:::/Kernel/MultiProc.HC,149",BI=70$ +$LK,"MPIntAll",A="FL:::/Kernel/MultiProc.HC,149",BI=69$ $LK,"TaskContextRestore",A="FL:::/Kernel/Sched.HC,283"$ $LK,"SCf_ALT",A="FL:::/Kernel/KernelA.HH,3467"$ $LK,"CH_CTRLX",A="FL:::/Kernel/KernelA.HH,3449"$ @@ -334,25 +334,24 @@ $LK,"_FCLEX",A="FL:::/Kernel/KMathA.HC,646"$ $LK,"_D3_DOT",A="FL:::/Kernel/KMathA.HC,113"$ $LK,"CH_CTRLZ",A="FL:::/Kernel/KernelA.HH,3451"$ $LK,"CHashGeneric",A="FL:::/Kernel/KernelA.HH,738"$ -$LK,"TaskQueueInsChild",A="FL:::/Kernel/Sched.HC,314",BI=71$ +$LK,"TaskQueueInsChild",A="FL:::/Kernel/Sched.HC,314",BI=70$ $LK,"SYS_FIND_PCIBIOS_SERVICE_DIR",A="FL:::/Kernel/PCIBIOS.HC,8"$ $LK,"CTRLF_CLICKED",A="FL:::/Kernel/KernelA.HH,3047"$ $LK,"HTF_RESOLVE",A="FL:::/Kernel/KernelA.HH,712"$ -$LK,"BCnt",A="FL:::/Kernel/KMisc.HC,39",BI=72$ -$LK,"Mem64DevAlloc",A="FL:::/Kernel/Mem/MemPhysical.HC,108",BI=73$ -$LK,"Mem32DevAlloc",A="FL:::/Kernel/Mem/MemPhysical.HC,58",BI=74$ +$LK,"Mem64DevAlloc",A="FL:::/Kernel/Mem/MemPhysical.HC,108",BI=71$ +$LK,"Mem32DevAlloc",A="FL:::/Kernel/Mem/MemPhysical.HC,58",BI=72$ $LK,"RT_U64",A="FL:::/Kernel/KernelA.HH,1574"$ $LK,"DOCT_TAB",A="FL:::/Kernel/KernelA.HH,908"$ $LK,"HTT_FRAME_PTR",A="FL:::/Kernel/KernelA.HH,703"$ $LK,"HTt_FRAME_PTR",A="FL:::/Kernel/KernelA.HH,673"$ -$LK,"CtrlAltM",A="FL:::/Kernel/KeyDev.HC,153",BI=75$ -$LK,"DefineLstLoad",A="FL:::/Kernel/KDefine.HC,13",BI=76$ +$LK,"CtrlAltM",A="FL:::/Kernel/KeyDev.HC,153",BI=73$ +$LK,"DefineLstLoad",A="FL:::/Kernel/KDefine.HC,13",BI=74$ $LK,"ARGT_MM64",A="FL:::/Kernel/KernelA.HH,1950"$ $LK,"DOCEf_LEFT_CB",A="FL:::/Kernel/KernelA.HH,1076"$ $LK,"DOCEF_LEFT_CB",A="FL:::/Kernel/KernelA.HH,988"$ $LK,"RFLAGf_DIR",A="FL:::/Kernel/KernelA.HH,328"$ -$LK,"DriveDel",A="FL:::/Kernel/BlkDev/DiskDrive.HC,69",BI=77$ -$LK,"CtrlAltN",A="FL:::/Kernel/KeyDev.HC,158",BI=78$ +$LK,"DriveDel",A="FL:::/Kernel/BlkDev/DiskDrive.HC,69",BI=75$ +$LK,"CtrlAltN",A="FL:::/Kernel/KeyDev.HC,158",BI=76$ $LK,"CDirEntry",A="FL:::/Kernel/KernelA.HH,2520"$ $LK,"TK_STR",A="FL:::/Kernel/KernelA.HH,2084"$ $LK,"ACD_DEF_END",A="FL:::/Kernel/KernelA.HH,1516"$ @@ -360,7 +359,7 @@ $LK,"PROGRESS_DESC_LEN",A="FL:::/Kernel/KernelA.HH,3860"$ $LK,"CCF_ASM_EXPRESSIONS",A="FL:::/Kernel/KernelA.HH,2157"$ $LK,"D3Sub",A="FL:::/Kernel/KernelB.HH,160"$ $LK,"SC_CURSOR_RIGHT",A="FL:::/Kernel/KernelA.HH,3510"$ -$LK,"KeyDevAdd",A="FL:::/Kernel/KeyDev.HC,70",BI=79$ +$LK,"KeyDevAdd",A="FL:::/Kernel/KeyDev.HC,70",BI=77$ $LK,"CTRLF_BORDER",A="FL:::/Kernel/KernelA.HH,3044"$ $LK,"_D3_EQU",A="FL:::/Kernel/KMathA.HC,226"$ $LK,"VGAP_ATTR_DATA_READ",A="FL:::/Kernel/KernelA.HH,3669"$ @@ -369,26 +368,26 @@ $LK,"WIF_FOCUS_TASK_MS_R_D",A="FL:::/Kernel/KernelA.HH,1438"$ $LK,"HTF_LOCAL",A="FL:::/Kernel/KernelA.HH,714"$ $LK,"HTT_ASM_KEYWORD",A="FL:::/Kernel/KernelA.HH,697"$ $LK,"HTf_LOCAL",A="FL:::/Kernel/KernelA.HH,684"$ -$LK,"CtrlAltT",A="FL:::/Kernel/KeyDev.HC,163",BI=80$ -$LK,"IsSilent",A="FL:::/Kernel/KMisc.HC,275",BI=81$ +$LK,"CtrlAltT",A="FL:::/Kernel/KeyDev.HC,163",BI=78$ +$LK,"IsSilent",A="FL:::/Kernel/KMisc.HC,275",BI=79$ $LK,"CBpt",A="FL:::/Kernel/KernelA.HH,3109"$ $LK,"HTt_ASM_KEYWORD",A="FL:::/Kernel/KernelA.HH,667"$ -$LK,"PCIWriteU32",A="FL:::/Kernel/PCIBIOS.HC,250",BI=82$ -$LK,"PCIWriteU16",A="FL:::/Kernel/PCIBIOS.HC,235",BI=83$ -$LK,"CtrlAltV",A="FL:::/Kernel/KeyDev.HC,168",BI=84$ +$LK,"PCIWriteU32",A="FL:::/Kernel/PCIBIOS.HC,250",BI=80$ +$LK,"PCIWriteU16",A="FL:::/Kernel/PCIBIOS.HC,235",BI=81$ +$LK,"CtrlAltV",A="FL:::/Kernel/KeyDev.HC,168",BI=82$ $LK,"VM_VMWARE",A="FL:::/Kernel/KernelA.HH,3891"$ $LK,"_LXCHG_U8",A="FL:::/Kernel/KUtils.HC,244"$ -$LK,"CtrlAltX",A="FL:::/Kernel/KeyDev.HC,173",BI=85$ -$LK,"UserTaskCont",A="FL:::/Kernel/KTask.HC,384",BI=86$ +$LK,"CtrlAltX",A="FL:::/Kernel/KeyDev.HC,173",BI=83$ +$LK,"UserTaskCont",A="FL:::/Kernel/KTask.HC,384",BI=84$ $LK,"RFLAGf_NESTED_TASK",A="FL:::/Kernel/KernelA.HH,332"$ $LK,"BEqu",A="FL:::/Kernel/KernelB.HH,28"$ -$LK,"FAT32MkDir",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,919",BI=87$ -$LK,"ClusBlkRead",A="FL:::/Kernel/BlkDev/DiskClus.HC,44",BI=88$ +$LK,"FAT32MkDir",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,919",BI=85$ +$LK,"ClusBlkRead",A="FL:::/Kernel/BlkDev/DiskClus.HC,44",BI=86$ $LK,"DCS_SIGNATURE_VAL",A="FL:::/Kernel/KernelA.HH,3590"$ $LK,"ICF_USE_INT",A="FL:::/Kernel/KernelA.HH,1610"$ $LK,"DOCT_NEW_LINE",A="FL:::/Kernel/KernelA.HH,906"$ $LK,"BIN_SIGNATURE_VAL",A="FL:::/Kernel/KernelA.HH,384"$ -$LK,"ATAIDDrives",A="FL:::/Kernel/BlkDev/DiskATAId.HC,207",BI=89$ +$LK,"ATAIDDrives",A="FL:::/Kernel/BlkDev/DiskATAId.HC,207",BI=87$ $LK,"char_bmp_non_eol_white_space",A="FL:::/Kernel/StrA.HC,359"$ $LK,"ARGT_IMM8",A="FL:::/Kernel/KernelA.HH,1894"$ $LK,"SYS_HASH_SINGLE_TABLE_FIND1",A="FL:::/Kernel/KHashA.HC,30"$ @@ -400,10 +399,10 @@ $LK,"CHashFun",A="FL:::/Kernel/KernelA.HH,861"$ $LK,"JOBf_ADD_TO_QUE",A="FL:::/Kernel/KernelA.HH,3138"$ $LK,"SV_I_REG",A="FL:::/Kernel/KernelA.HH,1751"$ $LK,"DOCEf_INVERT",A="FL:::/Kernel/KernelA.HH,1053"$ -$LK,"DayOfWeek",A="FL:::/Kernel/KDate.HC,30",BI=90$ +$LK,"DayOfWeek",A="FL:::/Kernel/KDate.HC,30",BI=88$ $LK,"TK_MINUS_MINUS",A="FL:::/Kernel/KernelA.HH,2089"$ $LK,"DOCT_LST",A="FL:::/Kernel/KernelA.HH,937"$ -$LK,"JobResGet",A="FL:::/Kernel/Job.HC,199",BI=91$ +$LK,"JobResGet",A="FL:::/Kernel/Job.HC,199",BI=89$ $LK,"sys_heap_init_flag",A="FL:::/Kernel/KernelB.HH,181"$ $LK,"FUF_CANCEL",A="FL:::/Kernel/KernelA.HH,2570"$ $LK,"FUf_CANCEL",A="FL:::/Kernel/KernelA.HH,2542"$ @@ -411,7 +410,7 @@ $LK,"FALSE",A="FL:::/Kernel/KernelA.HH,21"$ $LK,"VGAP_REG_READ",A="FL:::/Kernel/KernelA.HH,3674"$ $LK,"TK_ADD_EQU",A="FL:::/Kernel/KernelA.HH,2108"$ $LK,"TK_XOR_EQU",A="FL:::/Kernel/KernelA.HH,2107"$ -$LK,"StrPrintHex",A="FL:::/Kernel/StrA.HC,1",BI=92$ +$LK,"StrPrintHex",A="FL:::/Kernel/StrA.HC,1",BI=90$ $LK,"_D3_ADD_EQU",A="FL:::/Kernel/KMathA.HC,239"$ $LK,"DRV_SIGNATURE_VAL",A="FL:::/Kernel/KernelA.HH,2687"$ $LK,"DOCT_PMT",A="FL:::/Kernel/KernelA.HH,912"$ @@ -419,15 +418,15 @@ $LK,"F64_MAX",A="FL:::/Kernel/KernelA.HH,47"$ $LK,"Cf_EXTERN",A="FL:::/Kernel/KernelA.HH,835"$ $LK,"HPET_GCAP_ID",A="FL:::/Kernel/KernelA.HH,554"$ $LK,"ATan",A="FL:::/Kernel/KernelB.HH,95"$ -$LK,"SysBadFree",A="FL:::/Kernel/Mem/MemPag.HC,1",BI=93$ +$LK,"SysBadFree",A="FL:::/Kernel/Mem/MemPag.HC,1",BI=91$ $LK,"ATA_ID_DEV",A="FL:::/Kernel/KernelA.HH,2280"$ $LK,"CHashReg",A="FL:::/Kernel/KernelA.HH,753"$ $LK,"MEM_512GIG_NUM",A="FL:::/Kernel/KStart32.HC,12"$ $LK,"SCf_INS",A="FL:::/Kernel/KernelA.HH,3475"$ $LK,"LAPIC_LVT_ERR",A="FL:::/Kernel/KernelA.HH,524"$ -$LK,"Scale2Mem",A="FL:::/Kernel/Mem/MemPhysical.HC,169",BI=94$ -$LK,"RandU32",A="FL:::/Kernel/KMathB.HC,107",BI=95$ -$LK,"RandU16",A="FL:::/Kernel/KMathB.HC,87",BI=96$ +$LK,"Scale2Mem",A="FL:::/Kernel/Mem/MemPhysical.HC,169",BI=92$ +$LK,"RandU32",A="FL:::/Kernel/KMathB.HC,107",BI=93$ +$LK,"RandU16",A="FL:::/Kernel/KMathB.HC,87",BI=94$ $LK,"F64_MIN",A="FL:::/Kernel/KernelA.HH,48"$ $LK,"_FLDCW",A="FL:::/Kernel/KMathA.HC,625"$ $LK,"__DIR__",A="FL:::/Kernel/KernelA.HH,2043"$ @@ -435,24 +434,24 @@ $LK,"ARGT_RM32",A="FL:::/Kernel/KernelA.HH,1911"$ $LK,"ARGT_RM16",A="FL:::/Kernel/KernelA.HH,1910"$ $LK,"RFLAGf_INT",A="FL:::/Kernel/KernelA.HH,327"$ $LK,"NONE",A="FL:::/Kernel/KernelA.HH,24"$ -$LK,"DriveMap",A="FL:::/Kernel/BlkDev/DiskDrive.HC,252",BI=97$ +$LK,"DriveMap",A="FL:::/Kernel/BlkDev/DiskDrive.HC,252",BI=95$ $LK,"WIf_SELF_DOC",A="FL:::/Kernel/KernelA.HH,1457"$ $LK,"WIF_SELF_DOC",A="FL:::/Kernel/KernelA.HH,1429"$ $LK,"MLF_STATIC",A="FL:::/Kernel/KernelA.HH,785"$ -$LK,"JobsHandler",A="FL:::/Kernel/Job.HC,349",BI=98$ +$LK,"JobsHandler",A="FL:::/Kernel/Job.HC,349",BI=96$ $LK,"str2color_lst",A="FL:::/Kernel/KDefine.HC,156"$ $LK,"local_time_offset",A="FL:::/Kernel/KGlobals.HC,14"$ -$LK,"RedSeaFilesFind",A="FL:::/Kernel/BlkDev/FileSysRedSea.HC,537",BI=99$ +$LK,"RedSeaFilesFind",A="FL:::/Kernel/BlkDev/FileSysRedSea.HC,537",BI=97$ $LK,"TK_INS_BIN",A="FL:::/Kernel/KernelA.HH,2120"$ -$LK,"ClusWrite",A="FL:::/Kernel/BlkDev/DiskClus.HC,123",BI=100$ +$LK,"ClusWrite",A="FL:::/Kernel/BlkDev/DiskClus.HC,123",BI=98$ $LK,"_D3_MUL",A="FL:::/Kernel/KMathA.HC,167"$ $LK,"TK_ELSE",A="FL:::/Kernel/KernelA.HH,2116"$ -$LK,"RandU64",A="FL:::/Kernel/KMathB.HC,127",BI=101$ -$LK,"UndefinedDefine",A="FL:::/Kernel/KDefine.HC,43",BI=102$ +$LK,"RandU64",A="FL:::/Kernel/KMathB.HC,127",BI=99$ +$LK,"UndefinedDefine",A="FL:::/Kernel/KDefine.HC,43",BI=100$ $LK,"ARGT_RM64",A="FL:::/Kernel/KernelA.HH,1912"$ -$LK,"ATAGetRes",A="FL:::/Kernel/BlkDev/DiskATA.HC,67",BI=103$ -$LK,"ATAWaitDRQ",A="FL:::/Kernel/BlkDev/DiskATA.HC,36",BI=104$ -$LK,"TaskInit",A="FL:::/Kernel/KTask.HC,182",BI=105$ +$LK,"ATAGetRes",A="FL:::/Kernel/BlkDev/DiskATA.HC,67",BI=101$ +$LK,"ATAWaitDRQ",A="FL:::/Kernel/BlkDev/DiskATA.HC,36",BI=102$ +$LK,"TaskInit",A="FL:::/Kernel/KTask.HC,182",BI=103$ $LK,"DOCEf_RIGHT_CB",A="FL:::/Kernel/KernelA.HH,1078"$ $LK,"DOCEF_RIGHT_CB",A="FL:::/Kernel/KernelA.HH,990"$ $LK,"HTT_DICT_WORD",A="FL:::/Kernel/KernelA.HH,695"$ @@ -464,28 +463,26 @@ $LK,"CDebugGlobals",A="FL:::/Kernel/KernelA.HH,3820"$ $LK,"CBGR24",A="FL:::/Kernel/KernelA.HH,2946"$ $LK,"FONT_WIDTH",A="FL:::/Kernel/KernelA.HH,3551"$ $LK,"CHeapCtrl",A="FL:::/Kernel/KernelA.HH,2863"$ -$LK,"JobQueue",A="FL:::/Kernel/MultiProc.HC,213",BI=106$ -$LK,"LastDayOfYear",A="FL:::/Kernel/KDate.HC,110",BI=107$ +$LK,"JobQueue",A="FL:::/Kernel/MultiProc.HC,213",BI=104$ +$LK,"LastDayOfYear",A="FL:::/Kernel/KDate.HC,110",BI=105$ $LK,"SYS_IDLE_PT",A="FL:::/Kernel/Sched.HC,204"$ -$LK,"mp_cnt_initial",A="FL:::/Kernel/KernelB.HH,240"$ $LK,"STD_DISTRO_DVD_CFG",A="FL:::/Kernel/KernelA.HH,3846"$ $LK,"CWinMgrTimingGlobals",A="FL:::/Kernel/KernelA.HH,1470"$ $LK,"OS_WINDOWS",A="FL:::/Kernel/KernelA.HH,3887"$ -$LK,"CAbsCntsI64",A="FL:::/Kernel/KernelA.HH,1816"$ -$LK,"Core0StartMP",A="FL:::/Kernel/MultiProc.HC,283",BI=108$ +$LK,"Core0StartMP",A="FL:::/Kernel/MultiProc.HC,283",BI=106$ $LK,"MESSAGE_MS_L_DOWN",A="FL:::/Kernel/KernelA.HH,3179"$ $LK,"_D3_SUB",A="FL:::/Kernel/KMathA.HC,149"$ $LK,"CBGR48",A="FL:::/Kernel/KernelA.HH,2950"$ $LK,"DOCEF_BORDER_PLOT",A="FL:::/Kernel/KernelA.HH,1009"$ -$LK,"IntCore0TimerHandler",A="FL:::/Kernel/KMisc.HC,47",BI=109$ +$LK,"IntCore0TimerHandler",A="FL:::/Kernel/KMisc.HC,47",BI=107$ $LK,"__DATE__",A="FL:::/Kernel/KernelA.HH,2035"$ $LK,"sys_focus_task",A="FL:::/Kernel/KernelB.HH,200"$ $LK,"DOCEf_BORDER_PLOT",A="FL:::/Kernel/KernelA.HH,1097"$ $LK,"HTT_MODULE",A="FL:::/Kernel/KernelA.HH,701"$ $LK,"HTt_MODULE",A="FL:::/Kernel/KernelA.HH,671"$ $LK,"ARGT_REL8",A="FL:::/Kernel/KernelA.HH,1890"$ -$LK,"GridInit",A="FL:::/Kernel/SerialDev/Mouse.HC,1",BI=110$ -$LK,"FirstDayOfYear",A="FL:::/Kernel/KDate.HC,98",BI=111$ +$LK,"GridInit",A="FL:::/Kernel/SerialDev/Mouse.HC,1",BI=108$ +$LK,"FirstDayOfYear",A="FL:::/Kernel/KDate.HC,98",BI=109$ $LK,"CCf_PMT",A="FL:::/Kernel/KernelA.HH,2139"$ $LK,"ACD_EXTRA",A="FL:::/Kernel/KernelA.HH,1521"$ $LK,"WIf_SELF_ODE",A="FL:::/Kernel/KernelA.HH,1458"$ @@ -494,13 +491,13 @@ $LK,"MLF_DFT_AVAILABLE",A="FL:::/Kernel/KernelA.HH,779"$ $LK,"COREAP_16BIT_INIT",A="FL:::/Kernel/MultiProc.HC,9"$ $LK,"SCf_NUM",A="FL:::/Kernel/KernelA.HH,3469"$ $LK,"RS_ATTR_RESIDENT",A="FL:::/Kernel/KernelA.HH,2507"$ -$LK,"HashSrcFileSet",A="FL:::/Kernel/KHashB.HC,154",BI=112$ +$LK,"HashSrcFileSet",A="FL:::/Kernel/KHashB.HC,154",BI=110$ $LK,"ROP_XOR",A="FL:::/Kernel/KernelA.HH,2899"$ $LK,"NULL",A="FL:::/Kernel/KernelA.HH,19"$ -$LK,"BlkPoolInit",A="FL:::/Kernel/Mem/BlkPool.HC,18",BI=113$ +$LK,"BlkPoolInit",A="FL:::/Kernel/Mem/BlkPool.HC,18",BI=111$ $LK,"BDF_EXT_SIZE",A="FL:::/Kernel/KernelA.HH,2617"$ -$LK,"DriveRep",A="FL:::/Kernel/BlkDev/DiskDrive.HC,331",BI=114$ -$LK,"ProgressBarsRst",A="FL:::/Kernel/KMisc.HC,322",BI=115$ +$LK,"DriveRep",A="FL:::/Kernel/BlkDev/DiskDrive.HC,331",BI=112$ +$LK,"ProgressBarsRst",A="FL:::/Kernel/KMisc.HC,322",BI=113$ $LK,"sys_boot_blk",A="FL:::/Kernel/KernelB.HH,38"$ $LK,"TASKf_PENDING_BREAK",A="FL:::/Kernel/KernelA.HH,3240"$ $LK,"BDf_EXT_SIZE",A="FL:::/Kernel/KernelA.HH,2627"$ @@ -516,16 +513,16 @@ $LK,"EXT_DBG_RESUME",A="FL:::/Kernel/KernelA.HH,600"$ $LK,"WINMGR_PERIOD",A="FL:::/Kernel/KernelA.HH,1480"$ $LK,"FSt_FAT32",A="FL:::/Kernel/KernelA.HH,2660"$ $LK,"OPTf_WARN_PAREN",A="FL:::/Kernel/KernelA.HH,1549"$ -$LK,"TaskStkNew",A="FL:::/Kernel/KTask.HC,100",BI=116$ +$LK,"TaskStkNew",A="FL:::/Kernel/KTask.HC,100",BI=114$ $LK,"RT_PTR",A="FL:::/Kernel/KernelA.HH,1573"$ -$LK,"HashTableDel",A="FL:::/Kernel/KHashB.HC,90",BI=117$ +$LK,"HashTableDel",A="FL:::/Kernel/KHashB.HC,90",BI=115$ $LK,"LBtc",A="FL:::/Kernel/KernelB.HH,22"$ $LK,"FUF_Z_OR_NOT_Z",A="FL:::/Kernel/KernelA.HH,2585"$ -$LK,"Debug2",A="FL:::/Kernel/KDebug.HC,533",BI=118$ +$LK,"Debug2",A="FL:::/Kernel/KDebug.HC,533",BI=116$ $LK,"char_bmp_zero_tab_cr_nl_cursor",A="FL:::/Kernel/StrA.HC,365"$ $LK,"ClampI64",A="FL:::/Kernel/KernelB.HH,125"$ $LK,"FUf_Z_OR_NOT_Z",A="FL:::/Kernel/KernelA.HH,2557"$ -$LK,"B2",A="FL:::/Kernel/KDebug.HC,422",BI=119$ +$LK,"B2",A="FL:::/Kernel/KDebug.HC,422",BI=117$ $LK,"SLOP",A="FL:::/Kernel/StrPrint.HC,206"$ $LK,"FF_BUF_DIRTY",A="FL:::/Kernel/KernelA.HH,2758"$ $LK,"ICF_SWAP",A="FL:::/Kernel/KernelA.HH,1622"$ @@ -535,7 +532,7 @@ $LK,"MSF_FIXED",A="FL:::/Kernel/KernelA.HH,209"$ $LK,"MEM_HEAP_BASE",A="FL:::/Kernel/KStart32.HC,6"$ $LK,"_CPUID",A="FL:::/Kernel/KUtils.HC,319"$ $LK,"_LBEQU",A="FL:::/Kernel/KUtils.HC,104"$ -$LK,"Caller",A="FL:::/Kernel/KDebug.HC,60",BI=120$ +$LK,"Caller",A="FL:::/Kernel/KDebug.HC,60",BI=118$ $LK,"SUF_S2T",A="FL:::/Kernel/KernelA.HH,3737"$ $LK,"ATA_DEV_RST",A="FL:::/Kernel/KernelA.HH,2270"$ $LK,"INT_MP_CRASH_ADDR",A="FL:::/Kernel/KInts.HC,2"$ @@ -548,9 +545,9 @@ $LK,"SUF_T2S",A="FL:::/Kernel/KernelA.HH,3738"$ $LK,"MEM_MIN_MEG",A="FL:::/Kernel/KernelA.HH,3411"$ $LK,"exp_1",A="FL:::/Kernel/KernelA.HH,53"$ $LK,"CTRL_KEY_SCAN_DECODE_TABLE",A="FL:::/Kernel/SerialDev/Keyboard.HC,15"$ -$LK,"G2",A="FL:::/Kernel/KDebug.HC,469",BI=121$ +$LK,"G2",A="FL:::/Kernel/KDebug.HC,469",BI=119$ $LK,"DOCEG_HAS_ARG",A="FL:::/Kernel/KernelA.HH,1036"$ -$LK,"TSSNew",A="FL:::/Kernel/MultiProc.HC,76",BI=122$ +$LK,"TSSNew",A="FL:::/Kernel/MultiProc.HC,76",BI=120$ $LK,"SYS_PROGRESS1_DESC",A="FL:::/Kernel/KStart32.HC,45"$ $LK,"LBtr",A="FL:::/Kernel/KernelB.HH,24"$ $LK,"FStf_DISABLE",A="FL:::/Kernel/KernelA.HH,2667"$ @@ -558,7 +555,7 @@ $LK,"HTT_OPCODE",A="FL:::/Kernel/KernelA.HH,698"$ $LK,"HTt_OPCODE",A="FL:::/Kernel/KernelA.HH,668"$ $LK,"CDATE_YEAR_DAYS_INT",A="FL:::/Kernel/KernelA.HH,185"$ $LK,"LBts",A="FL:::/Kernel/KernelB.HH,26"$ -$LK,"FSetClus",A="FL:::/Kernel/BlkDev/DiskCFile.HC,99",BI=123$ +$LK,"FSetClus",A="FL:::/Kernel/BlkDev/DiskCFile.HC,99",BI=121$ $LK,"ArcEntryGet",A="FL:::/Kernel/Compress.HC,100"$ $LK,"_LOG10",A="FL:::/Kernel/KMathA.HC,592"$ $LK,"DOC_COLOR_GLBL_VAR",A="FL:::/Kernel/KernelA.HH,1152"$ @@ -570,13 +567,13 @@ $LK,"set_bits_table",A="FL:::/Kernel/KGlobals.HC,13"$ $LK,"rev_bits_table",A="FL:::/Kernel/KGlobals.HC,12"$ $LK,"KBD_CTRL",A="FL:::/Kernel/KernelA.HH,2957"$ $LK,"HTt_FUN",A="FL:::/Kernel/KernelA.HH,663"$ -$LK,"JobCtrlInit",A="FL:::/Kernel/Job.HC,18",BI=124$ +$LK,"JobCtrlInit",A="FL:::/Kernel/Job.HC,18",BI=122$ $LK,"RS_ATTR_LONG_NAME",A="FL:::/Kernel/KernelA.HH,2503"$ $LK,"TK_XOR_XOR",A="FL:::/Kernel/KernelA.HH,2100"$ $LK,"DOCEf_HOLD",A="FL:::/Kernel/KernelA.HH,1106"$ $LK,"DOCEF_HOLD",A="FL:::/Kernel/KernelA.HH,1020"$ -$LK,"KDInputFilterPutKey",A="FL:::/Kernel/KeyDev.HC,108",BI=125$ -$LK,"GetOutOfDollar",A="FL:::/Kernel/StrB.HC,75",BI=126$ +$LK,"KDInputFilterPutKey",A="FL:::/Kernel/KeyDev.HC,108",BI=123$ +$LK,"GetOutOfDollar",A="FL:::/Kernel/StrB.HC,75",BI=124$ $LK,"MEM_PAG_SIZE",A="FL:::/Kernel/KernelA.HH,2833"$ $LK,"DOC_COLOR_ALT_TEXT",A="FL:::/Kernel/KernelA.HH,1140"$ $LK,"MBR_PT_FAT32a",A="FL:::/Kernel/KernelA.HH,2670"$ @@ -594,11 +591,11 @@ $LK,"FSt_NTFS",A="FL:::/Kernel/KernelA.HH,2662"$ $LK,"char_bmp_alpha_numeric",A="FL:::/Kernel/StrA.HC,330"$ $LK,"MBR_PT_FAT32f",A="FL:::/Kernel/KernelA.HH,2675"$ $LK,"DOCEF_TAG_CB",A="FL:::/Kernel/KernelA.HH,999"$ -$LK,"Str2Date",A="FL:::/Kernel/StrScan.HC,138",BI=127$ +$LK,"Str2Date",A="FL:::/Kernel/StrScan.HC,138",BI=125$ $LK,"ICF_PASS_TRACE",A="FL:::/Kernel/KernelA.HH,1616"$ $LK,"DOCEf_TAG_CB",A="FL:::/Kernel/KernelA.HH,1087"$ $LK,"HTt_REG",A="FL:::/Kernel/KernelA.HH,669"$ -$LK,"TaskWait",A="FL:::/Kernel/Job.HC,221",BI=128$ +$LK,"TaskWait",A="FL:::/Kernel/Job.HC,221",BI=126$ $LK,"SCF_MS_R_DOWN",A="FL:::/Kernel/KernelA.HH,3488"$ $LK,"SCf_MS_R_DOWN",A="FL:::/Kernel/KernelA.HH,3473"$ $LK,"_R10",A="FL:::/Kernel/KernelA.HH,3380"$ @@ -607,7 +604,7 @@ $LK,"_R11",A="FL:::/Kernel/KernelA.HH,3381"$ $LK,"BOOT_RAM_LIMIT",A="FL:::/Kernel/KernelA.HH,3836"$ $LK,"_R12",A="FL:::/Kernel/KernelA.HH,3382"$ $LK,"MESSAGE_CMD",A="FL:::/Kernel/KernelA.HH,3175"$ -$LK,"SysGetI64",A="FL:::/Kernel/BlkDev/DiskAddDev.HC,179",BI=129$ +$LK,"SysGetI64",A="FL:::/Kernel/BlkDev/DiskAddDev.HC,179",BI=127$ $LK,"MemSetI64",A="FL:::/Kernel/KernelB.HH,173"$ $LK,"_R13",A="FL:::/Kernel/KernelA.HH,3383"$ $LK,"SYS_BOOT_PATCH_TABLE_BASE",A="FL:::/Kernel/KStart16.HC,25"$ @@ -624,7 +621,7 @@ $LK,"JOBf_EXIT_ON_COMPLETE",A="FL:::/Kernel/KernelA.HH,3131"$ $LK,"FSt_NULL",A="FL:::/Kernel/KernelA.HH,2658"$ $LK,"RT_RTS_NUM",A="FL:::/Kernel/KernelA.HH,1579"$ $LK,"CEdFindText",A="FL:::/Kernel/KernelA.HH,1235"$ -$LK,"ClusNumNext",A="FL:::/Kernel/BlkDev/DiskClus.HC,1",BI=130$ +$LK,"ClusNumNext",A="FL:::/Kernel/BlkDev/DiskClus.HC,1",BI=128$ $LK,"WIf_FOCUS_TASK_MS_L_D",A="FL:::/Kernel/KernelA.HH,1463"$ $LK,"LDF_NO_ABSS",A="FL:::/Kernel/KernelA.HH,380"$ $LK,"CKbdStateGlobals",A="FL:::/Kernel/KernelA.HH,2958"$ @@ -632,7 +629,7 @@ $LK,"DOCEf_LINK",A="FL:::/Kernel/KernelA.HH,1091"$ $LK,"DOCEF_LINK",A="FL:::/Kernel/KernelA.HH,1003"$ $LK,"D3Copy",A="FL:::/Kernel/KernelB.HH,147"$ $LK,"MESSAGE_MS_L_D_UP",A="FL:::/Kernel/KernelA.HH,3182"$ -$LK,"Beep",A="FL:::/Kernel/KMisc.HC,237",BI=131$ +$LK,"Beep",A="FL:::/Kernel/KMisc.HC,237",BI=129$ $LK,"_STRNICMP",A="FL:::/Kernel/StrA.HC,183"$ $LK,"_MEMSET_I64",A="FL:::/Kernel/KUtils.HC,42"$ $LK,"CH_SPACE",A="FL:::/Kernel/KernelA.HH,3457"$ @@ -645,38 +642,38 @@ $LK,"SYS_FIXED_AREA",A="FL:::/Kernel/KernelA.HH,3413"$ $LK,"ICF_CODE_FINAL",A="FL:::/Kernel/KernelA.HH,1612"$ $LK,"SYS_PROGRESS2_DESC",A="FL:::/Kernel/KStart32.HC,50"$ $LK,"SYS_STAFF_MODE_FLAG",A="FL::/Tmp.DD,1"$ -$LK,"BlkDevLockFwdingSet",A="FL:::/Kernel/BlkDev/DiskAddDev.HC,1",BI=132$ +$LK,"BlkDevLockFwdingSet",A="FL:::/Kernel/BlkDev/DiskAddDev.HC,1",BI=130$ $LK,"InU8",A="FL:::/Kernel/KernelB.HH,77"$ $LK,"ARGT_SREG",A="FL:::/Kernel/KernelA.HH,1936"$ $LK,"QueueInsRev",A="FL:::/Kernel/KernelB.HH,70"$ $LK,"CMemUnused",A="FL:::/Kernel/KernelA.HH,2792"$ $LK,"IEF_48_REX",A="FL:::/Kernel/KernelA.HH,1743"$ $LK,"",A="FL:::/Kernel/KernelA.HH,52"$ -$LK,"Suspend",A="FL:::/Kernel/KTask.HC,77",BI=133$ +$LK,"Suspend",A="FL:::/Kernel/KTask.HC,77",BI=131$ $LK,"ClampU64",A="FL:::/Kernel/KernelB.HH,127"$ $LK,"TK_MOD_EQU",A="FL:::/Kernel/KernelA.HH,2117"$ -$LK,"FunSegFind",A="FL:::/Kernel/FunSeg.HC,54",BI=134$ -$LK,"Define",A="FL:::/Kernel/KDefine.HC,49",BI=135$ -$LK,"FAT32Fmt",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,48",BI=136$ -$LK,"SrvCmdLine",A="FL:::/Kernel/KTask.HC,406",BI=137$ -$LK,"HashTableNew",A="FL:::/Kernel/KHashB.HC,50",BI=138$ +$LK,"FunSegFind",A="FL:::/Kernel/FunSeg.HC,54",BI=132$ +$LK,"Define",A="FL:::/Kernel/KDefine.HC,49",BI=133$ +$LK,"FAT32Fmt",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,48",BI=134$ +$LK,"SrvCmdLine",A="FL:::/Kernel/KTask.HC,406",BI=135$ +$LK,"HashTableNew",A="FL:::/Kernel/KHashB.HC,50",BI=136$ $LK,"DOCT_INDENT",A="FL:::/Kernel/KernelA.HH,919"$ $LK,"_ARG",A="FL:::/Kernel/KMathA.HC,366"$ $LK,"COLORROP_NO_ROP0_MASK",A="FL:::/Kernel/KernelA.HH,2944"$ $LK,"CDualBuf",A="FL:::/Kernel/BlkDev/DiskCDDVD.HC,105"$ -$LK,"TaskText",A="FL:::/Kernel/Job.HC,75",BI=139$ +$LK,"TaskText",A="FL:::/Kernel/Job.HC,75",BI=137$ $LK,"COLORROP_BITS",A="FL:::/Kernel/KernelA.HH,2945"$ $LK,"BROWN",A="FL:::/Kernel/KernelA.HH,2920"$ -$LK,"Da",A="FL:::/Kernel/KDebug.HC,209",BI=140$ +$LK,"Da",A="FL:::/Kernel/KDebug.HC,209",BI=138$ $LK,"SUF_REM_TRAILING",A="FL:::/Kernel/KernelA.HH,3732"$ -$LK,"Cd",A="FL:::/Kernel/BlkDev/DiskDirB.HC,9",BI=141$ +$LK,"Cd",A="FL:::/Kernel/BlkDev/DiskDirB.HC,9",BI=139$ $LK,"Ceil",A="FL:::/Kernel/KernelB.HH,123"$ $LK,"DOCEF_SKIP_IN_FORM",A="FL:::/Kernel/KernelA.HH,1025"$ $LK,"CCF_DONT_FREE_BUF",A="FL:::/Kernel/KernelA.HH,2141"$ $LK,"ICF_RES_WAS_STK",A="FL:::/Kernel/KernelA.HH,1617"$ $LK,"CAutoCompleteDictGlobals",A="FL:::/Kernel/KernelA.HH,1533"$ $LK,"IET_ZEROED_CODE_HEAP",A="FL:::/Kernel/KernelA.HH,425"$ -$LK,"SrcEdLink",A="FL:::/Kernel/FunSeg.HC,300",BI=142$ +$LK,"SrcEdLink",A="FL:::/Kernel/FunSeg.HC,300",BI=140$ $LK,"GetRBP",A="FL:::/Kernel/KernelB.HH,253"$ $LK,"GREEN",A="FL:::/Kernel/KernelA.HH,2916"$ $LK,"RECALCF_TO_HTML",A="FL:::/Kernel/KernelA.HH,1366"$ @@ -686,6 +683,7 @@ $LK,"_LXCHG_I64",A="FL:::/Kernel/KUtils.HC,217"$ $LK,"MDG_DISP_SIB_RIP",A="FL:::/Kernel/KernelA.HH,1599"$ $LK,"DOCEt_BLINK",A="FL:::/Kernel/KernelA.HH,958"$ $LK,"DOCET_BLINK",A="FL:::/Kernel/KernelA.HH,952"$ +$LK,"mp_count_initial",A="FL:::/Kernel/KernelB.HH,240"$ $LK,"C:/Doc/MultiCore.DD",A="FL:::/Kernel/KernelB.HH,238"$ $LK,"JOBf_DONE",A="FL:::/Kernel/KernelA.HH,3135"$ $LK,"CCF_NO_DEFINES",A="FL:::/Kernel/KernelA.HH,2142"$ @@ -708,38 +706,38 @@ $LK,"RECALCG_MASK",A="FL:::/Kernel/KernelA.HH,1362"$ $LK,"progress1_t0",A="FL:::/Kernel/KernelB.HH,213"$ $LK,"WIf_FOCUS_TASK_MS_R_D",A="FL:::/Kernel/KernelA.HH,1465"$ $LK,"HTF_PRIVATE",A="FL:::/Kernel/KernelA.HH,706"$ -$LK,"Pow10I64",A="FL:::/Kernel/KMathB.HC,26",BI=143$ +$LK,"Pow10I64",A="FL:::/Kernel/KMathB.HC,26",BI=141$ $LK,"char_bmp_alpha_numeric_no_at",A="FL:::/Kernel/StrA.HC,335"$ $LK,"IEF_STI_LIKE",A="FL:::/Kernel/KernelA.HH,1746"$ $LK,"HTf_PRIVATE",A="FL:::/Kernel/KernelA.HH,676"$ -$LK,"Dm",A="FL:::/Kernel/KDebug.HC,204",BI=144$ +$LK,"Dm",A="FL:::/Kernel/KDebug.HC,204",BI=142$ $LK,"CCF_EXE_BLK",A="FL:::/Kernel/KernelA.HH,2154"$ $LK,"BDf_REMOVABLE",A="FL:::/Kernel/KernelA.HH,2619"$ $LK,"BDF_REMOVABLE",A="FL:::/Kernel/KernelA.HH,2609"$ $LK,"COLOR_INVALID",A="FL:::/Kernel/KernelA.HH,2932"$ -$LK,"DiskCacheQueueIns",A="FL:::/Kernel/BlkDev/DiskCache.HC,53",BI=145$ +$LK,"DiskCacheQueueIns",A="FL:::/Kernel/BlkDev/DiskCache.HC,53",BI=143$ $LK,"Bt",A="FL:::/Kernel/KernelB.HH,14"$ $LK,"OPTf_EXTERNS_TO_IMPORTS",A="FL:::/Kernel/KernelA.HH,1552"$ -$LK,"HashFunSegFind",A="FL:::/Kernel/FunSeg.HC,10",BI=146$ -$LK,"Dr",A="FL:::/Kernel/KDebug.HC,328",BI=147$ -$LK,"FBlkRead",A="FL:::/Kernel/BlkDev/DiskCFile.HC,129",BI=148$ +$LK,"HashFunSegFind",A="FL:::/Kernel/FunSeg.HC,10",BI=144$ +$LK,"Dr",A="FL:::/Kernel/KDebug.HC,328",BI=145$ +$LK,"FBlkRead",A="FL:::/Kernel/BlkDev/DiskCFile.HC,129",BI=146$ $LK,"CPUId",A="FL:::/Kernel/KernelB.HH,263"$ $LK,"ARC_BITS_MAX",A="FL:::/Kernel/KernelA.HH,3685"$ -$LK,"FilesFind2",A="FL:::/Kernel/BlkDev/DiskFind.HC,1",BI=149$ -$LK,"TaskKillDying",A="FL:::/Kernel/KTask.HC,528",BI=150$ +$LK,"FilesFind2",A="FL:::/Kernel/BlkDev/DiskFind.HC,1",BI=147$ +$LK,"TaskKillDying",A="FL:::/Kernel/KTask.HC,528",BI=148$ $LK,"scan_code_map",A="FL:::/Kernel/SerialDev/Keyboard.HC,157"$ $LK,"progress2_t0",A="FL:::/Kernel/KernelB.HH,219"$ -$LK,"UncachedAliasAlloc",A="FL:::/Kernel/Mem/MemPhysical.HC,138",BI=151$ +$LK,"UncachedAliasAlloc",A="FL:::/Kernel/Mem/MemPhysical.HC,138",BI=149$ $LK,"MSize2",A="FL:::/Kernel/Mem/MAllocFree.HC,385"$ $LK,"SYS_16MEG_AREA_LIMIT",A="FL:::/Kernel/KernelA.HH,3414"$ $LK,"MemSetU32",A="FL:::/Kernel/KernelB.HH,177"$ $LK,"MemSetU16",A="FL:::/Kernel/KernelB.HH,175"$ -$LK,"DirTreeDel",A="FL:::/Kernel/BlkDev/DiskDirA.HC,33",BI=152$ -$LK,"Letter2BlkDevType",A="FL:::/Kernel/BlkDev/DiskDrive.HC,172",BI=153$ +$LK,"DirTreeDel",A="FL:::/Kernel/BlkDev/DiskDirA.HC,33",BI=150$ +$LK,"Letter2BlkDevType",A="FL:::/Kernel/BlkDev/DiskDrive.HC,172",BI=151$ $LK,"Fs",A="FL:::/Kernel/KernelB.HH,288"$ $LK,"SCF_CAPS",A="FL:::/Kernel/KernelA.HH,3483"$ $LK,"SCf_CAPS",A="FL:::/Kernel/KernelA.HH,3468"$ -$LK,"In",A="FL:::/Kernel/Job.HC,482",BI=154$ +$LK,"In",A="FL:::/Kernel/Job.HC,482",BI=152$ $LK,"ACD_DEF_CHAR",A="FL:::/Kernel/KernelA.HH,1527"$ $LK,"Gs",A="FL:::/Kernel/KernelB.HH,245"$ $LK,"SYS_PROGRESS3_DESC",A="FL:::/Kernel/KStart32.HC,55"$ @@ -750,66 +748,66 @@ $LK,"progress3_t0",A="FL:::/Kernel/KernelB.HH,225"$ $LK,"JOBT_MESSAGE",A="FL:::/Kernel/KernelA.HH,3141"$ $LK,"_TEST_EXCEPT",A="FL:::/Kernel/KExcept.HC,4"$ $LK,"_FSTCW",A="FL:::/Kernel/KMathA.HC,632"$ -$LK,"ScanFlags",A="FL:::/Kernel/StrB.HC,123",BI=155$ +$LK,"ScanFlags",A="FL:::/Kernel/StrB.HC,123",BI=153$ $LK,"Ln",A="FL:::/Kernel/KernelB.HH,134"$ $LK,"INT_WAKE",A="FL:::/Kernel/KInts.HC,6"$ -$LK,"Letter2Letter",A="FL:::/Kernel/BlkDev/DiskDrive.HC,161",BI=156$ -$LK,"GetS",A="FL:::/Kernel/SerialDev/Message.HC,209",BI=157$ +$LK,"Letter2Letter",A="FL:::/Kernel/BlkDev/DiskDrive.HC,161",BI=154$ +$LK,"GetS",A="FL:::/Kernel/SerialDev/Message.HC,209",BI=155$ $LK,"_MEMSET_U32",A="FL:::/Kernel/KUtils.HC,29"$ $LK,"_MEMSET_U16",A="FL:::/Kernel/KUtils.HC,16"$ $LK,"DOCT_BTTN",A="FL:::/Kernel/KernelA.HH,934"$ -$LK,"DirCur",A="FL:::/Kernel/BlkDev/DiskStrA.HC,281",BI=158$ +$LK,"DirCur",A="FL:::/Kernel/BlkDev/DiskStrA.HC,281",BI=156$ $LK,"SYS_MP_CNT_LOCK",A="FL:::/Kernel/KStart32.HC,67"$ $LK,"SYS_COMPILE_TIME",A="FL::/Tmp.DD,1"$ $LK,"GetTSC",A="FL:::/Kernel/KernelB.HH,292"$ -$LK,"BptR",A="FL:::/Kernel/KDebug.HC,389",BI=159$ +$LK,"BptR",A="FL:::/Kernel/KDebug.HC,389",BI=157$ $LK,"DOCT_MARKER",A="FL:::/Kernel/KernelA.HH,911"$ -$LK,"KeyDevRemove",A="FL:::/Kernel/KeyDev.HC,64",BI=160$ -$LK,"BptS",A="FL:::/Kernel/KDebug.HC,368",BI=161$ +$LK,"KeyDevRemove",A="FL:::/Kernel/KeyDev.HC,64",BI=158$ +$LK,"BptS",A="FL:::/Kernel/KDebug.HC,368",BI=159$ $LK,"_HASH_BUCKET_FIND",A="FL:::/Kernel/KHashA.HC,158"$ $LK,"_MHEAP_CTRL",A="FL:::/Kernel/Mem/MAllocFree.HC,368"$ $LK,"progress4_t0",A="FL:::/Kernel/KernelB.HH,231"$ -$LK,"ATAMount",A="FL:::/Kernel/BlkDev/DiskATAId.HC,248",BI=162$ -$LK,"FifoI64Peek",A="FL:::/Kernel/KDataTypes.HC,290",BI=163$ +$LK,"ATAMount",A="FL:::/Kernel/BlkDev/DiskATAId.HC,248",BI=160$ +$LK,"FifoI64Peek",A="FL:::/Kernel/KDataTypes.HC,290",BI=161$ $LK,"_EXP",A="FL:::/Kernel/KMathA.HC,558"$ $LK,"IET_END",A="FL:::/Kernel/KernelA.HH,405"$ -$LK,"KbdHandler",A="FL:::/Kernel/SerialDev/Keyboard.HC,441",BI=164$ +$LK,"KbdHandler",A="FL:::/Kernel/SerialDev/Keyboard.HC,441",BI=162$ $LK,"GSF_WITH_NEW_LINE",A="FL:::/Kernel/KernelA.HH,3726"$ $LK,"SYS_HASH_FIND1",A="FL:::/Kernel/KHashA.HC,81"$ $LK,"GetRSP",A="FL:::/Kernel/KernelB.HH,255"$ $LK,"_D3_DIST",A="FL:::/Kernel/KMathA.HC,39"$ -$LK,"ScanKey",A="FL:::/Kernel/SerialDev/Message.HC,123",BI=165$ +$LK,"ScanKey",A="FL:::/Kernel/SerialDev/Message.HC,123",BI=163$ $LK,"CHashGlobalVar",A="FL:::/Kernel/KernelA.HH,878"$ -$LK,"DriveUnlock",A="FL:::/Kernel/BlkDev/DiskDrive.HC,14",BI=166$ -$LK,"InFile",A="FL:::/Kernel/Job.HC,474",BI=167$ +$LK,"DriveUnlock",A="FL:::/Kernel/BlkDev/DiskDrive.HC,14",BI=164$ +$LK,"InFile",A="FL:::/Kernel/Job.HC,474",BI=165$ $LK,"D3DistSqr",A="FL:::/Kernel/KernelB.HH,150"$ $LK,"_RDI",A="FL:::/Kernel/KernelA.HH,3374"$ $LK,"SV_R_REG",A="FL:::/Kernel/KernelA.HH,1750"$ $LK,"PRTF_TRUNCATE",A="FL:::/Kernel/KernelA.HH,3871"$ -$LK,"ATARepExitAllApplications",A="FL:::/Kernel/BlkDev/DiskATAId.HC,123",BI=168$ -$LK,"CeilI64",A="FL:::/Kernel/KMathB.HC,62",BI=169$ +$LK,"ATARepExitAllApplications",A="FL:::/Kernel/BlkDev/DiskATAId.HC,123",BI=166$ +$LK,"CeilI64",A="FL:::/Kernel/KMathB.HC,62",BI=167$ $LK,"_RBP",A="FL:::/Kernel/KernelA.HH,3375"$ $LK,"CCacheBlk",A="FL:::/Kernel/KernelA.HH,2717"$ $LK,"OPTf_WARN_DUP_TYPES",A="FL:::/Kernel/KernelA.HH,1550"$ -$LK,"ATAProbe",A="FL:::/Kernel/BlkDev/DiskATA.HC,376",BI=170$ +$LK,"ATAProbe",A="FL:::/Kernel/BlkDev/DiskATA.HC,376",BI=168$ $LK,"_LXCHG_U16",A="FL:::/Kernel/KUtils.HC,235"$ $LK,"_LXCHG_U32",A="FL:::/Kernel/KUtils.HC,226"$ $LK,"SYS_PROGRESS1",A="FL:::/Kernel/KStart32.HC,41"$ $LK,"DOCT_FOOTER",A="FL:::/Kernel/KernelA.HH,918"$ -$LK,"MPAPICInit",A="FL:::/Kernel/MultiProc.HC,171",BI=171$ -$LK,"MsHardHandler",A="FL:::/Kernel/SerialDev/Mouse.HC,235",BI=172$ +$LK,"MPAPICInit",A="FL:::/Kernel/MultiProc.HC,171",BI=169$ +$LK,"MsHardHandler",A="FL:::/Kernel/SerialDev/Mouse.HC,235",BI=170$ $LK,"SYS_PROGRESS2",A="FL:::/Kernel/KStart32.HC,46"$ $LK,"DOCEf_SKIP",A="FL:::/Kernel/KernelA.HH,1109"$ $LK,"DOCEF_SKIP",A="FL:::/Kernel/KernelA.HH,1023"$ $LK,"SYS_PROGRESS3",A="FL:::/Kernel/KStart32.HC,51"$ $LK,"CCF_DONT_MAKE_RES",A="FL:::/Kernel/KernelA.HH,2177"$ -$LK,"DirNew",A="FL:::/Kernel/BlkDev/DiskDirA.HC,1",BI=173$ +$LK,"DirNew",A="FL:::/Kernel/BlkDev/DiskDirA.HC,1",BI=171$ $LK,"SYS_PROGRESS4",A="FL:::/Kernel/KStart32.HC,56"$ $LK,"_RAX",A="FL:::/Kernel/KernelA.HH,3369"$ -$LK,"FAT32DirNew",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,562",BI=174$ +$LK,"FAT32DirNew",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,562",BI=172$ $LK,"HTf_RESOLVED",A="FL:::/Kernel/KernelA.HH,682"$ -$LK,"LinkedLstDel",A="FL:::/Kernel/KDataTypes.HC,1",BI=175$ -$LK,"Help",A="FL:::/Kernel/StrB.HC,115",BI=176$ +$LK,"LinkedLstDel",A="FL:::/Kernel/KDataTypes.HC,1",BI=173$ +$LK,"Help",A="FL:::/Kernel/StrB.HC,115",BI=174$ $LK,"Log2",A="FL:::/Kernel/KernelB.HH,136"$ $LK,"_RBX",A="FL:::/Kernel/KernelA.HH,3370"$ $LK,"DOCT_HEX_ED",A="FL:::/Kernel/KernelA.HH,940"$ @@ -818,7 +816,7 @@ $LK,"_D3_COPY",A="FL:::/Kernel/KMathA.HC,212"$ $LK,"PUT_STR",A="FL:::/Kernel/StrA.HC,58"$ $LK,"_RET",A="FL:::/Kernel/KUtils.HC,456"$ $LK,"_RCX",A="FL:::/Kernel/KernelA.HH,3371"$ -$LK,"BIOSTotalMem",A="FL:::/Kernel/Mem/MemPhysical.HC,151",BI=177$ +$LK,"BIOSTotalMem",A="FL:::/Kernel/Mem/MemPhysical.HC,151",BI=175$ $LK,"_RDX",A="FL:::/Kernel/KernelA.HH,3372"$ $LK,"SYS_PROGRESS4_DESC",A="FL:::/Kernel/KStart32.HC,60"$ $LK,"__FILE__",A="FL:::/Kernel/KernelA.HH,2041"$ @@ -835,21 +833,21 @@ $LK,"ac",A="FL:::/Kernel/KGlobals.HC,19"$ $LK,"_FSTSW",A="FL:::/Kernel/KMathA.HC,641"$ $LK,"ARGT_IMM32",A="FL:::/Kernel/KernelA.HH,1896"$ $LK,"ARGT_IMM16",A="FL:::/Kernel/KernelA.HH,1895"$ -$LK,"CheckCodePtr",A="FL:::/Kernel/KDebug.HC,16",BI=178$ +$LK,"CheckCodePtr",A="FL:::/Kernel/KDebug.HC,16",BI=176$ $LK,"Free",A="FL:::/Kernel/Mem/MAllocFree.HC,383"$ $LK,"DOCEf_AUX_STR",A="FL:::/Kernel/KernelA.HH,1060"$ $LK,"DOCEF_AUX_STR",A="FL:::/Kernel/KernelA.HH,972"$ -$LK,"Char2KeyName",A="FL:::/Kernel/SerialDev/Keyboard.HC,201",BI=179$ +$LK,"Char2KeyName",A="FL:::/Kernel/SerialDev/Keyboard.HC,201",BI=177$ $LK,"blkdev",A="FL:::/Kernel/KGlobals.HC,20"$ $LK,"DOCEf_TREE",A="FL:::/Kernel/KernelA.HH,1107"$ $LK,"DOCEF_TREE",A="FL:::/Kernel/KernelA.HH,1021"$ $LK,"progress1_tf",A="FL:::/Kernel/KernelB.HH,214"$ $LK,"mem_mapped_space",A="FL:::/Kernel/KernelB.HH,196"$ $LK,"TASK_SIGNATURE_VAL",A="FL:::/Kernel/KernelA.HH,3254"$ -$LK,"SysDefinesLoad",A="FL:::/Kernel/KDefine.HC,97",BI=180$ +$LK,"SysDefinesLoad",A="FL:::/Kernel/KDefine.HC,97",BI=178$ $LK,"MEM_MAPPED_SPACE",A="FL:::/Kernel/KStart32.HC,9"$ $LK,"SEMA_SYS_DATE",A="FL:::/Kernel/KernelA.HH,614"$ -$LK,"DebugHelp",A="FL:::/Kernel/KDebug.HC,498",BI=181$ +$LK,"DebugHelp",A="FL:::/Kernel/KDebug.HC,498",BI=179$ $LK,"D3Norm",A="FL:::/Kernel/KernelB.HH,158"$ $LK,"_POW",A="FL:::/Kernel/KMathA.HC,515"$ $LK,"ARGT_IMM64",A="FL:::/Kernel/KernelA.HH,1897"$ @@ -859,34 +857,33 @@ $LK,"TASK_HASH_TABLE_SIZE",A="FL:::/Kernel/KernelA.HH,2845"$ $LK,"drv_text_attr",A="FL:::/Kernel/BlkDev/DiskDrive.HC,319"$ $LK,"PUT_HEX_U8",A="FL:::/Kernel/StrA.HC,44"$ $LK,"_RSI",A="FL:::/Kernel/KernelA.HH,3373"$ -$LK,"CPUStructInit",A="FL:::/Kernel/MultiProc.HC,116",BI=182$ +$LK,"CPUStructInit",A="FL:::/Kernel/MultiProc.HC,116",BI=180$ $LK,"WIf_FOCUS_TASK_GRAB_SCROLL",A="FL:::/Kernel/KernelA.HH,1468"$ $LK,"WIF_FOCUS_TASK_GRAB_SCROLL",A="FL:::/Kernel/KernelA.HH,1441"$ $LK,"CIntermediateCode",A="FL:::/Kernel/KernelA.HH,1666"$ $LK,"progress2_tf",A="FL:::/Kernel/KernelB.HH,220"$ $LK,"MDF_REG",A="FL:::/Kernel/KernelA.HH,1593"$ $LK,"DOC_COLOR_ANCHOR",A="FL:::/Kernel/KernelA.HH,1143"$ -$LK,"Str2ColorU32",A="FL:::/Kernel/KDefine.HC,202",BI=183$ -$LK,"Str2ColorU16",A="FL:::/Kernel/KDefine.HC,158",BI=184$ -$LK,"LinkedLstCnt",A="FL:::/Kernel/KDataTypes.HC,21",BI=185$ +$LK,"Str2ColorU32",A="FL:::/Kernel/KDefine.HC,202",BI=181$ +$LK,"Str2ColorU16",A="FL:::/Kernel/KDefine.HC,158",BI=182$ $LK,"CTRLT_VIEWING_ANGLES",A="FL:::/Kernel/KernelA.HH,3041"$ $LK,"DOCEf_QUIT",A="FL:::/Kernel/KernelA.HH,1093"$ $LK,"DOCEF_QUIT",A="FL:::/Kernel/KernelA.HH,1005"$ -$LK,"Tabs2Spaces",A="FL:::/Kernel/StrB.HC,1",BI=186$ +$LK,"Tabs2Spaces",A="FL:::/Kernel/StrB.HC,1",BI=183$ $LK,"MaxI64",A="FL:::/Kernel/KernelB.HH,99"$ -$LK,"DriveSerialNum",A="FL:::/Kernel/BlkDev/DiskDrive.HC,288",BI=187$ +$LK,"DriveSerialNum",A="FL:::/Kernel/BlkDev/DiskDrive.HC,288",BI=184$ $LK,"SYS_GDT_PTR",A="FL:::/Kernel/KStart16.HC,34"$ $LK,"_RSP",A="FL:::/Kernel/KernelA.HH,3376"$ $LK,"DOCT_INS_BIN_SIZE",A="FL:::/Kernel/KernelA.HH,944"$ -$LK,"WinDerivedValsUpdate",A="FL:::/Kernel/Display.HC,93",BI=188$ +$LK,"WinDerivedValsUpdate",A="FL:::/Kernel/Display.HC,93",BI=185$ $LK,"fp_update_ctrls",A="FL:::/Kernel/KGlobals.HC,33"$ $LK,"DSK_CACHE_HASH_SIZE",A="FL:::/Kernel/KernelA.HH,2715"$ $LK,"RS_ATTR_VOL_ID",A="FL:::/Kernel/KernelA.HH,2500"$ $LK,"DOCf_UNDERLINE",A="FL:::/Kernel/KernelA.HH,1337"$ $LK,"DOCF_UNDERLINE",A="FL:::/Kernel/KernelA.HH,1299"$ $LK,"DOCT_UNDERLINE",A="FL:::/Kernel/KernelA.HH,928"$ -$LK,"IntDivZero",A="FL:::/Kernel/KInts.HC,150",BI=189$ -$LK,"MemPagFree",A="FL:::/Kernel/Mem/MemPag.HC,83",BI=190$ +$LK,"IntDivZero",A="FL:::/Kernel/KInts.HC,150",BI=186$ +$LK,"MemPagFree",A="FL:::/Kernel/Mem/MemPag.HC,83",BI=187$ $LK,"_SQR",A="FL:::/Kernel/KMathA.HC,337"$ $LK,"DISPLAYf_SILENT",A="FL:::/Kernel/KernelA.HH,3249"$ $LK,"MDF_SIB",A="FL:::/Kernel/KernelA.HH,1595"$ @@ -895,53 +892,53 @@ $LK,"REGT_R16",A="FL:::/Kernel/KernelA.HH,745"$ $LK,"CJobCtrl",A="FL:::/Kernel/KernelA.HH,3165"$ $LK,"progress3_tf",A="FL:::/Kernel/KernelB.HH,226"$ $LK,"IEF_NOT_IN_64_BIT",A="FL:::/Kernel/KernelA.HH,1742"$ -$LK,"RedSeaFileFind",A="FL:::/Kernel/BlkDev/FileSysRedSea.HC,155",BI=191$ +$LK,"RedSeaFileFind",A="FL:::/Kernel/BlkDev/FileSysRedSea.HC,155",BI=188$ $LK,"CTRLF_CAPTURE_RIGHT_MS",A="FL:::/Kernel/KernelA.HH,3046"$ $LK,"SYS_PCIBIOS_SERVICE_DIR",A="FL:::/Kernel/PCIBIOS.HC,4"$ -$LK,"tS",A="FL:::/Kernel/KMisc.HC,122",BI=192$ +$LK,"tS",A="FL:::/Kernel/KMisc.HC,122",BI=189$ $LK,"LBEqu",A="FL:::/Kernel/KernelB.HH,34"$ $LK,"ICF_RES_NOT_USED",A="FL:::/Kernel/KernelA.HH,1611"$ $LK,"DOCEt_SEL",A="FL:::/Kernel/KernelA.HH,960"$ -$LK,"ArcDetermineCompressionType",A="FL:::/Kernel/Compress.HC,102",BI=193$ -$LK,"FlushMessages",A="FL:::/Kernel/SerialDev/Message.HC,87",BI=194$ -$LK,"IntInit1",A="FL:::/Kernel/KInts.HC,180",BI=195$ +$LK,"ArcDetermineCompressionType",A="FL:::/Kernel/Compress.HC,102",BI=190$ +$LK,"FlushMessages",A="FL:::/Kernel/SerialDev/Message.HC,87",BI=191$ +$LK,"IntInit1",A="FL:::/Kernel/KInts.HC,180",BI=192$ $LK,"CH_CURSOR",A="FL:::/Kernel/KernelA.HH,3452"$ -$LK,"IntInit2",A="FL:::/Kernel/KInts.HC,195",BI=196$ +$LK,"IntInit2",A="FL:::/Kernel/KInts.HC,195",BI=193$ $LK,"DOCT_CURSOR",A="FL:::/Kernel/KernelA.HH,910"$ -$LK,"GetKey",A="FL:::/Kernel/SerialDev/Message.HC,142",BI=197$ +$LK,"GetKey",A="FL:::/Kernel/SerialDev/Message.HC,142",BI=194$ $LK,"ROP_MONO",A="FL:::/Kernel/KernelA.HH,2901"$ $LK,"CFAT32DirEntryLong",A="FL:::/Kernel/KernelA.HH,2408"$ -$LK,"Kill",A="FL:::/Kernel/KTask.HC,48",BI=198$ +$LK,"Kill",A="FL:::/Kernel/KTask.HC,48",BI=195$ $LK,"RS_ATTR_FIXED",A="FL:::/Kernel/KernelA.HH,2510"$ $LK,"TK_IFDEF",A="FL:::/Kernel/KernelA.HH,2111"$ $LK,"REGT_R64",A="FL:::/Kernel/KernelA.HH,747"$ -$LK,"SingleUser",A="FL:::/Kernel/KMisc.HC,302",BI=199$ -$LK,"Date2Struct",A="FL:::/Kernel/KDate.HC,39",BI=200$ +$LK,"SingleUser",A="FL:::/Kernel/KMisc.HC,302",BI=196$ +$LK,"Date2Struct",A="FL:::/Kernel/KDate.HC,39",BI=197$ $LK,"progress4_tf",A="FL:::/Kernel/KernelB.HH,232"$ $LK,"CFile",A="FL:::/Kernel/KernelA.HH,2763"$ -$LK,"Fault2",A="FL:::/Kernel/KDebug.HC,596",BI=201$ -$LK,"Load",A="FL:::/Kernel/KLoad.HC,181",BI=202$ +$LK,"Fault2",A="FL:::/Kernel/KDebug.HC,596",BI=198$ +$LK,"Load",A="FL:::/Kernel/KLoad.HC,181",BI=199$ $LK,"CFreeLst",A="FL:::/Kernel/KernelA.HH,2679"$ $LK,"DOCEF_CHECKED_COLLAPSED",A="FL:::/Kernel/KernelA.HH,1010"$ $LK,"CHash",A="FL:::/Kernel/KernelA.HH,640"$ -$LK,"DeathWait",A="FL:::/Kernel/KTask.HC,38",BI=203$ -$LK,"Fault3",A="FL:::/Kernel/KDebug.HC,564",BI=204$ -$LK,"Busy",A="FL:::/Kernel/KMisc.HC,136",BI=205$ -$LK,"CompressBuf",A="FL:::/Kernel/Compress.HC,281",BI=206$ +$LK,"DeathWait",A="FL:::/Kernel/KTask.HC,38",BI=200$ +$LK,"Fault3",A="FL:::/Kernel/KDebug.HC,564",BI=201$ +$LK,"Busy",A="FL:::/Kernel/KMisc.HC,136",BI=202$ +$LK,"CompressBuf",A="FL:::/Kernel/Compress.HC,281",BI=203$ $LK,"CCF_NOT_CONST",A="FL:::/Kernel/KernelA.HH,2151"$ $LK,"SEMA_JUST_PUMP_MESSAGES",A="FL:::/Kernel/KernelA.HH,629"$ -$LK,"CeilU64",A="FL:::/Kernel/KMathB.HC,41",BI=207$ +$LK,"CeilU64",A="FL:::/Kernel/KMathB.HC,41",BI=204$ $LK,"BPlf_LOCKED",A="FL:::/Kernel/KernelA.HH,2848"$ $LK,"BDlf_LOCKED",A="FL:::/Kernel/KernelA.HH,2630"$ $LK,"TK_ELLIPSIS",A="FL:::/Kernel/KernelA.HH,2119"$ $LK,"TK_OR_EQU",A="FL:::/Kernel/KernelA.HH,2106"$ $LK,"sys_neg_pows_lst",A="FL:::/Kernel/StrPrint.HC,203"$ $LK,"sys_pos_pows_lst",A="FL:::/Kernel/StrPrint.HC,202"$ -$LK,"MStrPrint",A="FL:::/Kernel/StrPrint.HC,898",BI=208$ +$LK,"MStrPrint",A="FL:::/Kernel/StrPrint.HC,898",BI=205$ $LK,"DVlf_LOCKED",A="FL:::/Kernel/KernelA.HH,2655"$ -$LK,"SrcFileName",A="FL:::/Kernel/FunSeg.HC,261",BI=209$ -$LK,"RawD",A="FL:::/Kernel/KDebug.HC,234",BI=210$ -$LK,"IsSingleUser",A="FL:::/Kernel/KMisc.HC,307",BI=211$ +$LK,"SrcFileName",A="FL:::/Kernel/FunSeg.HC,261",BI=206$ +$LK,"RawD",A="FL:::/Kernel/KDebug.HC,234",BI=207$ +$LK,"IsSingleUser",A="FL:::/Kernel/KMisc.HC,307",BI=208$ $LK,"_POW10",A="FL:::/Kernel/KMathA.HC,524"$ $LK,"I64_MAX",A="FL:::/Kernel/KernelA.HH,38"$ $LK,"QueueInsert",A="FL:::/Kernel/KernelB.HH,68"$ @@ -965,33 +962,33 @@ $LK,"SEMA_FLUSH_VGA_IMAGE",A="FL:::/Kernel/KernelA.HH,620"$ $LK,"DOCF_BWD_MOVEMENT",A="FL:::/Kernel/KernelA.HH,1288"$ $LK,"I64_MIN",A="FL:::/Kernel/KernelA.HH,37"$ $LK,"ms",A="FL:::/Kernel/KGlobals.HC,25"$ -$LK,"Exit",A="FL:::/Kernel/KTask.HC,1",BI=212$ +$LK,"Exit",A="FL:::/Kernel/KTask.HC,1",BI=209$ $LK,"TASKf_BREAK_TO_SHIFT_ESC",A="FL:::/Kernel/KernelA.HH,3241"$ $LK,"HTT_KEYWORD",A="FL:::/Kernel/KernelA.HH,696"$ -$LK,"CopySingleZ",A="FL:::/Kernel/BlkDev/DiskCopy.HC,1",BI=213$ +$LK,"CopySingleZ",A="FL:::/Kernel/BlkDev/DiskCopy.HC,1",BI=210$ $LK,"DCF_NO_TRANSPARENTS",A="FL:::/Kernel/KernelA.HH,3567"$ $LK,"HTt_KEYWORD",A="FL:::/Kernel/KernelA.HH,666"$ $LK,"RT_UF64",A="FL:::/Kernel/KernelA.HH,1578"$ $LK,"DOCf_BWD_MOVEMENT",A="FL:::/Kernel/KernelA.HH,1325"$ -$LK,"BlkWrite",A="FL:::/Kernel/BlkDev/DiskBlk.HC,71",BI=214$ +$LK,"BlkWrite",A="FL:::/Kernel/BlkDev/DiskBlk.HC,71",BI=211$ $LK,"CMPCrash",A="FL:::/Kernel/KernelA.HH,3811"$ $LK,"ROPBF_HALF_RANGE_COLOR",A="FL:::/Kernel/KernelA.HH,2893"$ $LK,"JOBT_EXE_STR",A="FL:::/Kernel/KernelA.HH,3142"$ $LK,"ICF_SHORT_JMP",A="FL:::/Kernel/KernelA.HH,1614"$ $LK,"IA32_FS_BASE",A="FL:::/Kernel/KernelA.HH,543"$ -$LK,"Rand",A="FL:::/Kernel/KMathB.HC,137",BI=215$ +$LK,"Rand",A="FL:::/Kernel/KMathB.HC,137",BI=212$ $LK,"FAT32_ENTRIES_BITS",A="FL:::/Kernel/KernelA.HH,2421"$ $LK,"TK_IDENT",A="FL:::/Kernel/KernelA.HH,2083"$ $LK,"ODEf_BUSY",A="FL:::/Kernel/KernelA.HH,250"$ $LK,"ODEF_BUSY",A="FL:::/Kernel/KernelA.HH,245"$ -$LK,"ArcCompressBuf",A="FL:::/Kernel/Compress.HC,110",BI=216$ +$LK,"ArcCompressBuf",A="FL:::/Kernel/Compress.HC,110",BI=213$ $LK,"MDG_REG_DISP_SIB_RIP",A="FL:::/Kernel/KernelA.HH,1600"$ -$LK,"ToFileLine",A="FL:::/Kernel/EdLite.HC,303",BI=217$ +$LK,"ToFileLine",A="FL:::/Kernel/EdLite.HC,303",BI=214$ $LK,"scrncast",A="FL:::/Kernel/KGlobals.HC,29"$ $LK,"D3Unit",A="FL:::/Kernel/KernelB.HH,162"$ $LK,"CTRLT_WIN_HSCROLL",A="FL:::/Kernel/KernelA.HH,3039"$ $LK,"TK_IFAOT",A="FL:::/Kernel/KernelA.HH,2113"$ -$LK,"IsDotC",A="FL:::/Kernel/BlkDev/DiskStrA.HC,31",BI=218$ +$LK,"IsDotC",A="FL:::/Kernel/BlkDev/DiskStrA.HC,31",BI=215$ $LK,"BDf_LAST_WAS_WRITE",A="FL:::/Kernel/KernelA.HH,2623"$ $LK,"TK_GREATER_EQU",A="FL:::/Kernel/KernelA.HH,2097"$ $LK,"CICArg",A="FL:::/Kernel/KernelA.HH,1643"$ @@ -999,12 +996,12 @@ $LK,"MDF_STK",A="FL:::/Kernel/KernelA.HH,1591"$ $LK,"DOCEf_CENTER_X",A="FL:::/Kernel/KernelA.HH,1081"$ $LK,"DOCEF_CENTER_X",A="FL:::/Kernel/KernelA.HH,993"$ $LK,"SYS_TIMER_FREQ",A="FL:::/Kernel/KernelA.HH,573"$ -$LK,"HashTablePurge",A="FL:::/Kernel/KHashB.HC,107",BI=219$ +$LK,"HashTablePurge",A="FL:::/Kernel/KHashB.HC,107",BI=216$ $LK,"GR_HEIGHT",A="FL:::/Kernel/KernelA.HH,3556"$ $LK,"DOCEf_CENTER_Y",A="FL:::/Kernel/KernelA.HH,1084"$ $LK,"DOCEF_CENTER_Y",A="FL:::/Kernel/KernelA.HH,996"$ -$LK,"Seed",A="FL:::/Kernel/KMathB.HC,147",BI=220$ -$LK,"BlkDevNextFreeSlot",A="FL:::/Kernel/BlkDev/DiskBlkDev.HC,125",BI=221$ +$LK,"Seed",A="FL:::/Kernel/KMathB.HC,147",BI=217$ +$LK,"BlkDevNextFreeSlot",A="FL:::/Kernel/BlkDev/DiskBlkDev.HC,125",BI=218$ $LK,"TASKf_FILTER_INPUT",A="FL:::/Kernel/KernelA.HH,3235"$ $LK,"DOCEF_REFRESH_DATA",A="FL:::/Kernel/KernelA.HH,1012"$ $LK,"DOCf_DONT_HIGHLIGHT_CURSOR",A="FL:::/Kernel/KernelA.HH,1319"$ @@ -1015,27 +1012,27 @@ $LK,"FUF_DEL",A="FL:::/Kernel/KernelA.HH,2567"$ $LK,"DOCEf_REFRESH_DATA",A="FL:::/Kernel/KernelA.HH,1100"$ $LK,"DOCEf_LEFT_EXP",A="FL:::/Kernel/KernelA.HH,1063"$ $LK,"DOCEF_LEFT_EXP",A="FL:::/Kernel/KernelA.HH,975"$ -$LK,"ATAPIWaitReady",A="FL:::/Kernel/BlkDev/DiskATA.HC,337",BI=222$ -$LK,"Message",A="FL:::/Kernel/Job.HC,259",BI=223$ +$LK,"ATAPIWaitReady",A="FL:::/Kernel/BlkDev/DiskATA.HC,337",BI=219$ +$LK,"Message",A="FL:::/Kernel/Job.HC,259",BI=220$ $LK,"MESSAGE_MS_R_DOWN",A="FL:::/Kernel/KernelA.HH,3183"$ $LK,"SC_PRTSCRN1",A="FL:::/Kernel/KernelA.HH,3531"$ $LK,"FUF_ALL",A="FL:::/Kernel/KernelA.HH,2569"$ $LK,"STR_LEN",A="FL:::/Kernel/KernelA.HH,42"$ $LK,"SC_PRTSCRN2",A="FL:::/Kernel/KernelA.HH,3532"$ -$LK,"DebugMode",A="FL:::/Kernel/KMisc.HC,312",BI=224$ -$LK,"IsSysDebug",A="FL:::/Kernel/KMisc.HC,285",BI=225$ -$LK,"RedSeaAllocClus",A="FL:::/Kernel/BlkDev/FileSysRedSea.HC,300",BI=226$ +$LK,"DebugMode",A="FL:::/Kernel/KMisc.HC,312",BI=221$ +$LK,"IsSysDebug",A="FL:::/Kernel/KMisc.HC,285",BI=222$ +$LK,"RedSeaAllocClus",A="FL:::/Kernel/BlkDev/FileSysRedSea.HC,300",BI=223$ $LK,"sys_semas",A="FL:::/Kernel/KernelB.HH,242"$ $LK,"OS_LINUX",A="FL:::/Kernel/KernelA.HH,3886"$ -$LK,"InputFilterTask",A="FL:::/Kernel/SerialDev/Message.HC,1",BI=227$ +$LK,"InputFilterTask",A="FL:::/Kernel/SerialDev/Message.HC,1",BI=224$ $LK,"SYS_HASH_STR",A="FL:::/Kernel/KHashA.HC,4"$ $LK,"ATAR0_CMD",A="FL:::/Kernel/KernelA.HH,2296"$ $LK,"I_DBG",A="FL:::/Kernel/KernelA.HH,310"$ -$LK,"FATNameTo",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,118",BI=228$ +$LK,"FATNameTo",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,118",BI=225$ $LK,"MinI64",A="FL:::/Kernel/KernelB.HH,101"$ $LK,"MaxU64",A="FL:::/Kernel/KernelB.HH,100"$ $LK,"CallInd",A="FL:::/Kernel/KernelB.HH,49"$ -$LK,"EndianI64",A="FL:::/Kernel/KMisc.HC,25",BI=229$ +$LK,"EndianI64",A="FL:::/Kernel/KMisc.HC,25",BI=226$ $LK,"_MSIZE",A="FL:::/Kernel/Mem/MAllocFree.HC,337"$ $LK,"GVF_IMPORT",A="FL:::/Kernel/KernelA.HH,872"$ $LK,"HTF_IMPORT",A="FL:::/Kernel/KernelA.HH,709"$ @@ -1053,11 +1050,11 @@ $LK,"progress1_desc",A="FL:::/Kernel/KernelB.HH,211"$ $LK,"BDS_ED_FILENAME_DRV",A="FL:::/Kernel/KernelA.HH,3219"$ $LK,"DOCT_TEXT",A="FL:::/Kernel/KernelA.HH,905"$ $LK,"CMathODE",A="FL:::/Kernel/KernelA.HH,252"$ -$LK,"WinInside",A="FL:::/Kernel/Display.HC,110",BI=230$ +$LK,"WinInside",A="FL:::/Kernel/Display.HC,110",BI=227$ $LK,"WIG_NO_FOCUS_TASK_DFT",A="FL:::/Kernel/KernelA.HH,1446"$ $LK,"SEMA_FIX",A="FL:::/Kernel/KernelA.HH,631"$ $LK,"RFLAGf_ALIGN_CHECK",A="FL:::/Kernel/KernelA.HH,335"$ -$LK,"MsHardSet",A="FL:::/Kernel/SerialDev/Mouse.HC,272",BI=231$ +$LK,"MsHardSet",A="FL:::/Kernel/SerialDev/Mouse.HC,272",BI=228$ $LK,"FUf_SCAN_PARENTS",A="FL:::/Kernel/KernelA.HH,2559"$ $LK,"DOCF_ALLOW_UNDO",A="FL:::/Kernel/KernelA.HH,1284"$ $LK,"CMemberLst",A="FL:::/Kernel/KernelA.HH,802"$ @@ -1066,12 +1063,12 @@ $LK,"_D3_NORM",A="FL:::/Kernel/KMathA.HC,4"$ $LK,"CAutoCompleteGlobals",A="FL:::/Kernel/KernelA.HH,1497"$ $LK,"DOCEf_BLINK",A="FL:::/Kernel/KernelA.HH,1052"$ $LK,"DOCEF_BLINK",A="FL:::/Kernel/KernelA.HH,1046"$ -$LK,"IsDotZ",A="FL:::/Kernel/BlkDev/DiskStrA.HC,22",BI=232$ -$LK,"HashGenericAdd",A="FL:::/Kernel/KHashB.HC,140",BI=233$ +$LK,"IsDotZ",A="FL:::/Kernel/BlkDev/DiskStrA.HC,22",BI=229$ +$LK,"HashGenericAdd",A="FL:::/Kernel/KHashB.HC,140",BI=230$ $LK,"_TASK_CONTEXT_RESTORE",A="FL:::/Kernel/Sched.HC,100"$ $LK,"BFieldOrU32",A="FL:::/Kernel/KernelB.HH,32"$ $LK,"TK_IFJIT",A="FL:::/Kernel/KernelA.HH,2114"$ -$LK,"RedSeaFileRead",A="FL:::/Kernel/BlkDev/FileSysRedSea.HC,207",BI=234$ +$LK,"RedSeaFileRead",A="FL:::/Kernel/BlkDev/FileSysRedSea.HC,207",BI=231$ $LK,"VGAP_CRTC_DATA",A="FL:::/Kernel/KernelA.HH,3678"$ $LK,"MESSAGE_MS_R_DOWN_UP",A="FL:::/Kernel/KernelA.HH,3192"$ $LK,"ARGT_REL32",A="FL:::/Kernel/KernelA.HH,1892"$ @@ -1079,31 +1076,31 @@ $LK,"ARGT_REL16",A="FL:::/Kernel/KernelA.HH,1891"$ $LK,"mem_page_size",A="FL:::/Kernel/KernelB.HH,285"$ $LK,"cpu_structs",A="FL:::/Kernel/KernelB.HH,238"$ $LK,"SC_DELETE",A="FL:::/Kernel/KernelA.HH,3516"$ -$LK,"MsHardGetType",A="FL:::/Kernel/SerialDev/Mouse.HC,103",BI=235$ +$LK,"MsHardGetType",A="FL:::/Kernel/SerialDev/Mouse.HC,103",BI=232$ $LK,"MESSAGE_KEY_DOWN",A="FL:::/Kernel/KernelA.HH,3176"$ $LK,"CAOTHeapGlobalRef",A="FL:::/Kernel/KernelA.HH,1994"$ $LK,"CLine",A="FL:::/Kernel/EdLite.HC,1"$ $LK,"REGT_SEG",A="FL:::/Kernel/KernelA.HH,748"$ $LK,"CMass",A="FL:::/Kernel/KernelA.HH,210"$ -$LK,"GetStr",A="FL:::/Kernel/SerialDev/Message.HC,193",BI=236$ +$LK,"GetStr",A="FL:::/Kernel/SerialDev/Message.HC,193",BI=233$ $LK,"LTRED",A="FL:::/Kernel/KernelA.HH,2926"$ $LK,"FSG_TYPE_MASK",A="FL:::/Kernel/KernelA.HH,2665"$ $LK,"StrIMatch",A="FL:::/Kernel/StrA.HC,319"$ $LK,"HTG_TYPE_MASK",A="FL:::/Kernel/KernelA.HH,704"$ $LK,"Sign",A="FL:::/Kernel/KernelB.HH,140"$ -$LK,"ExpandBuf",A="FL:::/Kernel/Compress.HC,250",BI=237$ +$LK,"ExpandBuf",A="FL:::/Kernel/Compress.HC,250",BI=234$ $LK,"ICF_ALT_TEMPLATE",A="FL:::/Kernel/KernelA.HH,1625"$ $LK,"DOCT_PAGE_LEN",A="FL:::/Kernel/KernelA.HH,914"$ $LK,"RLf_RAW",A="FL:::/Kernel/KernelA.HH,461"$ -$LK,"BootDVDProbe",A="FL:::/Kernel/BlkDev/DiskATAId.HC,1",BI=238$ -$LK,"ToggleZorNotZ",A="FL:::/Kernel/BlkDev/DiskStrA.HC,265",BI=239$ +$LK,"BootDVDProbe",A="FL:::/Kernel/BlkDev/DiskATAId.HC,1",BI=235$ +$LK,"ToggleZorNotZ",A="FL:::/Kernel/BlkDev/DiskStrA.HC,265",BI=236$ $LK,"VGAP_ATTR_INDEX",A="FL:::/Kernel/KernelA.HH,3667"$ $LK,"D3MulEqu",A="FL:::/Kernel/KernelB.HH,157"$ $LK,"BDS_CONST",A="FL:::/Kernel/KernelA.HH,3217"$ -$LK,"PutSrcLink",A="FL:::/Kernel/FunSeg.HC,317",BI=240$ +$LK,"PutSrcLink",A="FL:::/Kernel/FunSeg.HC,317",BI=237$ $LK,"RLF_ONCE_ZENITH",A="FL:::/Kernel/KernelA.HH,494"$ $LK,"CMenu",A="FL:::/Kernel/KernelA.HH,3099"$ -$LK,"JobRunOne",A="FL:::/Kernel/Job.HC,269",BI=241$ +$LK,"JobRunOne",A="FL:::/Kernel/Job.HC,269",BI=238$ $LK,"BDT_ATAPI",A="FL:::/Kernel/KernelA.HH,2606"$ $LK,"FUF_MAP",A="FL:::/Kernel/KernelA.HH,2574"$ $LK,"CFAT32DirEntry",A="FL:::/Kernel/KernelA.HH,2392"$ @@ -1117,11 +1114,11 @@ $LK,"LAPIC_LVT_PERF",A="FL:::/Kernel/KernelA.HH,521"$ $LK,"SC_F1",A="FL:::/Kernel/KernelA.HH,3517"$ $LK,"FSt_TYPES_NUM",A="FL:::/Kernel/KernelA.HH,2664"$ $LK,"HTt_TYPES_NUM",A="FL:::/Kernel/KernelA.HH,674"$ -$LK,"Drive2Letter",A="FL:::/Kernel/BlkDev/DiskDrive.HC,153",BI=242$ +$LK,"Drive2Letter",A="FL:::/Kernel/BlkDev/DiskDrive.HC,153",BI=239$ $LK,"SYS_SEMAS",A="FL:::/Kernel/KStart32.HC,72"$ $LK,"SC_F2",A="FL:::/Kernel/KernelA.HH,3518"$ -$LK,"BirthWait",A="FL:::/Kernel/KTask.HC,31",BI=243$ -$LK,"MsHardRst",A="FL:::/Kernel/SerialDev/Mouse.HC,114",BI=244$ +$LK,"BirthWait",A="FL:::/Kernel/KTask.HC,31",BI=240$ +$LK,"MsHardRst",A="FL:::/Kernel/SerialDev/Mouse.HC,114",BI=241$ $LK,"SYS_VAR_INIT_FLAG",A="FL::/Tmp.DD,1"$ $LK,"SYS_MEM_INIT_FLAG",A="FL::/Tmp.DD,1"$ $LK,"SC_F3",A="FL:::/Kernel/KernelA.HH,3519"$ @@ -1131,39 +1128,38 @@ $LK,"WSSf_SET_TO_POS",A="FL:::/Kernel/KernelA.HH,3049"$ $LK,"RS_ATTR_SYSTEM",A="FL:::/Kernel/KernelA.HH,2499"$ $LK,"I_BPT",A="FL:::/Kernel/KernelA.HH,303"$ $LK,"_TAKE_EXCEPT",A="FL:::/Kernel/KExcept.HC,20"$ -$LK,"DefineCnt",A="FL:::/Kernel/KDefine.HC,74",BI=245$ $LK,"SC_F5",A="FL:::/Kernel/KernelA.HH,3521"$ $LK,"WIF_FOCUS_TASK_MENU",A="FL:::/Kernel/KernelA.HH,1433"$ -$LK,"RedSeaCd",A="FL:::/Kernel/BlkDev/FileSysRedSea.HC,236",BI=246$ -$LK,"JobDel",A="FL:::/Kernel/Job.HC,1",BI=247$ +$LK,"RedSeaCd",A="FL:::/Kernel/BlkDev/FileSysRedSea.HC,236",BI=242$ +$LK,"JobDel",A="FL:::/Kernel/Job.HC,1",BI=243$ $LK,"SC_F6",A="FL:::/Kernel/KernelA.HH,3522"$ $LK,"DFT_ISO_C_FILENAME",A="FL:::/Kernel/KernelA.HH,2728"$ -$LK,"SysGrInit",A="FL:::/Kernel/KMain.HC,65",BI=248$ -$LK,"ArcCtrlDel",A="FL:::/Kernel/Compress.HC,244",BI=249$ -$LK,"SysBadMAlloc",A="FL:::/Kernel/Mem/MemPag.HC,6",BI=250$ +$LK,"SysGrInit",A="FL:::/Kernel/KMain.HC,65",BI=244$ +$LK,"ArcCtrlDel",A="FL:::/Kernel/Compress.HC,244",BI=245$ +$LK,"SysBadMAlloc",A="FL:::/Kernel/Mem/MemPag.HC,6",BI=246$ $LK,"SC_F7",A="FL:::/Kernel/KernelA.HH,3523"$ $LK,"DOCSS_NORMAL",A="FL:::/Kernel/KernelA.HH,1133"$ $LK,"GVF_EXTERN",A="FL:::/Kernel/KernelA.HH,873"$ $LK,"blkdev_text_attr",A="FL:::/Kernel/BlkDev/DiskDrive.HC,318"$ $LK,"SC_F8",A="FL:::/Kernel/KernelA.HH,3524"$ -$LK,"Mute",A="FL:::/Kernel/KMisc.HC,251",BI=251$ +$LK,"Mute",A="FL:::/Kernel/KMisc.HC,251",BI=247$ $LK,"INT_FAULT",A="FL:::/Kernel/KInts.HC,62"$ $LK,"progress2_desc",A="FL:::/Kernel/KernelB.HH,217"$ $LK,"DCSF_PALETTE_GET",A="FL:::/Kernel/KernelA.HH,3588"$ $LK,"SC_F9",A="FL:::/Kernel/KernelA.HH,3525"$ $LK,"DOCEF_SOLID_BORDER",A="FL:::/Kernel/KernelA.HH,1008"$ $LK,"DOCT_TYPES_NUM",A="FL:::/Kernel/KernelA.HH,949"$ -$LK,"KbdMsRst",A="FL:::/Kernel/SerialDev/Mouse.HC,284",BI=252$ -$LK,"KbdBuildSC",A="FL:::/Kernel/SerialDev/Keyboard.HC,301",BI=253$ +$LK,"KbdMsRst",A="FL:::/Kernel/SerialDev/Mouse.HC,284",BI=248$ +$LK,"KbdBuildSC",A="FL:::/Kernel/SerialDev/Keyboard.HC,301",BI=249$ $LK,"CInst",A="FL:::/Kernel/KernelA.HH,1754"$ $LK,"IOAPICID",A="FL:::/Kernel/KernelA.HH,533"$ $LK,"RFLAGf_SIGN",A="FL:::/Kernel/KernelA.HH,325"$ $LK,"DKGRAY",A="FL:::/Kernel/KernelA.HH,2922"$ $LK,"DOCEF_MARGIN_REL_X",A="FL:::/Kernel/KernelA.HH,1001"$ -$LK,"PutDirLink",A="FL:::/Kernel/BlkDev/DiskDirA.HC,197",BI=254$ -$LK,"EndianU32",A="FL:::/Kernel/KMisc.HC,15",BI=255$ -$LK,"EndianU16",A="FL:::/Kernel/KMisc.HC,7",BI=256$ -$LK,"MemPagTaskFree",A="FL:::/Kernel/Mem/MemPag.HC,153",BI=257$ +$LK,"PutDirLink",A="FL:::/Kernel/BlkDev/DiskDirA.HC,197",BI=250$ +$LK,"EndianU32",A="FL:::/Kernel/KMisc.HC,15",BI=251$ +$LK,"EndianU16",A="FL:::/Kernel/KMisc.HC,7",BI=252$ +$LK,"MemPagTaskFree",A="FL:::/Kernel/Mem/MemPag.HC,153",BI=253$ $LK,"DOCEf_SOLID_BORDER",A="FL:::/Kernel/KernelA.HH,1096"$ $LK,"DOCEF_LEFT_IN_STR",A="FL:::/Kernel/KernelA.HH,989"$ $LK,"sys_pci_busses",A="FL:::/Kernel/KernelB.HH,248"$ @@ -1172,14 +1168,14 @@ $LK,"TTS_LOCKED_CONST",A="FL:::/Kernel/KernelA.HH,3223"$ $LK,"CCf_FUN_EXP",A="FL:::/Kernel/KernelA.HH,2161"$ $LK,"CCF_FUN_EXP",A="FL:::/Kernel/KernelA.HH,2160"$ $LK,"LAPIC_APIC_VERSION",A="FL:::/Kernel/KernelA.HH,501"$ -$LK,"PutS",A="FL:::/Kernel/KeyDev.HC,29",BI=258$ +$LK,"PutS",A="FL:::/Kernel/KeyDev.HC,29",BI=254$ $LK,"DOCEf_MARGIN_REL_X",A="FL:::/Kernel/KernelA.HH,1089"$ $LK,"DOCEf_LEFT_IN_STR",A="FL:::/Kernel/KernelA.HH,1077"$ $LK,"SEMA_VGA",A="FL:::/Kernel/KernelA.HH,625"$ $LK,"CDocBin",A="FL:::/Kernel/KernelA.HH,1119"$ $LK,"LAPIC_BASE",A="FL:::/Kernel/KernelA.HH,498"$ -$LK,"KbdMsHandler",A="FL:::/Kernel/SerialDev/Mouse.HC,313",BI=259$ -$LK,"StrPrintJoin",A="FL:::/Kernel/StrPrint.HC,208",BI=260$ +$LK,"KbdMsHandler",A="FL:::/Kernel/SerialDev/Mouse.HC,313",BI=255$ +$LK,"StrPrintJoin",A="FL:::/Kernel/StrPrint.HC,208",BI=256$ $LK,"IA32_GS_BASE",A="FL:::/Kernel/KernelA.HH,544"$ $LK,"log2_e",A="FL:::/Kernel/KernelA.HH,55"$ $LK,"MinU64",A="FL:::/Kernel/KernelB.HH,102"$ @@ -1187,10 +1183,9 @@ $LK,"_SYS_HLT",A="FL:::/Kernel/KUtils.HC,468"$ $LK,"CCF_AOT_COMPILE",A="FL:::/Kernel/KernelA.HH,2171"$ $LK,"OPTf_KEEP_PRIVATE",A="FL:::/Kernel/KernelA.HH,1553"$ $LK,"SEMA_SND",A="FL:::/Kernel/KernelA.HH,616"$ -$LK,"CCntsGlobals",A="FL:::/Kernel/KernelA.HH,558"$ $LK,"HTF_EXPORT",A="FL:::/Kernel/KernelA.HH,708"$ $LK,"HTf_EXPORT",A="FL:::/Kernel/KernelA.HH,678"$ -$LK,"ATAPIReadBlks2",A="FL:::/Kernel/BlkDev/DiskATA.HC,388",BI=261$ +$LK,"ATAPIReadBlks2",A="FL:::/Kernel/BlkDev/DiskATA.HC,388",BI=257$ $LK,"_D3_UNIT",A="FL:::/Kernel/KMathA.HC,305"$ $LK,"CCf_AOT_COMPILE",A="FL:::/Kernel/KernelA.HH,2172"$ $LK,"POP_C_REGS",A="FL:::/Kernel/KernelA.HH,1777"$ @@ -1199,40 +1194,40 @@ $LK,"CSema",A="FL:::/Kernel/KernelA.HH,607"$ $LK,"EXT_HEAPLOG_MALLOC",A="FL:::/Kernel/KernelA.HH,598"$ $LK,"GR_WIDTH",A="FL:::/Kernel/KernelA.HH,3555"$ $LK,"DOCT_SOFT_NEW_LINE",A="FL:::/Kernel/KernelA.HH,907"$ -$LK,"GetBaseUnit",A="FL:::/Kernel/BlkDev/DiskAddDev.HC,186",BI=262$ -$LK,"FixSet",A="FL:::/Kernel/EdLite.HC,327",BI=263$ +$LK,"GetBaseUnit",A="FL:::/Kernel/BlkDev/DiskAddDev.HC,186",BI=258$ +$LK,"FixSet",A="FL:::/Kernel/EdLite.HC,327",BI=259$ $LK,"DOCf_SEL",A="FL:::/Kernel/KernelA.HH,1336"$ $LK,"sqrt2",A="FL:::/Kernel/KernelA.HH,58"$ $LK,"VM_QEMU",A="FL:::/Kernel/KernelA.HH,3892"$ $LK,"ATAR0_SEL",A="FL:::/Kernel/KernelA.HH,2294"$ $LK,"DOCEf_FLAGS_NUM",A="FL:::/Kernel/KernelA.HH,1117"$ -$LK,"IntFaultHandlersNew",A="FL:::/Kernel/KInts.HC,166",BI=264$ +$LK,"IntFaultHandlersNew",A="FL:::/Kernel/KInts.HC,166",BI=260$ $LK,"ms_hard",A="FL:::/Kernel/KGlobals.HC,28"$ -$LK,"SpawnQueue",A="FL:::/Kernel/MultiProc.HC,247",BI=265$ -$LK,"DriveBlkDevDel",A="FL:::/Kernel/BlkDev/DiskDrive.HC,78",BI=266$ +$LK,"SpawnQueue",A="FL:::/Kernel/MultiProc.HC,247",BI=261$ +$LK,"DriveBlkDevDel",A="FL:::/Kernel/BlkDev/DiskDrive.HC,78",BI=262$ $LK,"mem_boot_base",A="FL:::/Kernel/KernelB.HH,37"$ $LK,"TASKf_INPUT_FILTER_TASK",A="FL:::/Kernel/KernelA.HH,3234"$ $LK,"OM_CB",A="FL:::/Kernel/KernelA.HH,1881"$ -$LK,"StrFirstRemove",A="FL:::/Kernel/StrA.HC,577",BI=267$ -$LK,"throw",A="FL:::/Kernel/KExcept.HC,84",BI=268$ +$LK,"StrFirstRemove",A="FL:::/Kernel/StrA.HC,577",BI=263$ +$LK,"throw",A="FL:::/Kernel/KExcept.HC,84",BI=264$ $LK,"MESSAGE_MS_R_D_UP",A="FL:::/Kernel/KernelA.HH,3186"$ $LK,"BDF_READ_ONLY_OVERRIDE",A="FL:::/Kernel/KernelA.HH,2612"$ $LK,"TK_AND_AND",A="FL:::/Kernel/KernelA.HH,2098"$ $LK,"REG_NONE",A="FL:::/Kernel/KernelA.HH,1797"$ $LK,"OC_LOCK_PREFIX",A="FL:::/Kernel/KernelA.HH,1769"$ $LK,"Ff_INTERRUPT",A="FL:::/Kernel/KernelA.HH,852"$ -$LK,"DriveLock",A="FL:::/Kernel/BlkDev/DiskDrive.HC,1",BI=269$ +$LK,"DriveLock",A="FL:::/Kernel/BlkDev/DiskDrive.HC,1",BI=265$ $LK,"CFunSegCache",A="FL:::/Kernel/KernelA.HH,3801"$ $LK,"OM_CD",A="FL:::/Kernel/KernelA.HH,1883"$ $LK,"AAT_ADD_U8",A="FL:::/Kernel/KernelA.HH,1979"$ $LK,"REGT_XMM",A="FL:::/Kernel/KernelA.HH,751"$ $LK,"CQueueVectU8",A="FL:::/Kernel/KernelA.HH,164"$ -$LK,"CheckOnStk",A="FL:::/Kernel/KDebug.HC,31",BI=270$ +$LK,"CheckOnStk",A="FL:::/Kernel/KDebug.HC,31",BI=266$ $LK,"CM_CONSTS_NUM",A="FL:::/Kernel/KernelA.HH,1713"$ $LK,"DOCSS_CPP_Z_COMMENT",A="FL:::/Kernel/KernelA.HH,1137"$ $LK,"DOCT_SHIFTED_X",A="FL:::/Kernel/KernelA.HH,929"$ $LK,"RLF_16MEG_SYS_CODE_BP",A="FL:::/Kernel/KernelA.HH,479"$ -$LK,"PutExcept",A="FL:::/Kernel/KExcept.HC,45",BI=271$ +$LK,"PutExcept",A="FL:::/Kernel/KExcept.HC,45",BI=267$ $LK,"TestExcept",A="FL:::/Kernel/KExcept.HC,41"$ $LK,"char_bmp_printable",A="FL:::/Kernel/StrA.HC,376"$ $LK,"CColorROPU32",A="FL:::/Kernel/KernelA.HH,2939"$ @@ -1246,10 +1241,11 @@ $LK,"MESSAGE_MS_R_D_DOWN_UP",A="FL:::/Kernel/KernelA.HH,3193"$ $LK,"MESSAGE_MS_L_D_DOWN_UP",A="FL:::/Kernel/KernelA.HH,3191"$ $LK,"HTt_DEFINE_STR",A="FL:::/Kernel/KernelA.HH,659"$ $LK,"STK_REP_LEN",A="FL:::/Kernel/KDebug.HC,102"$ +$LK,"CCountsGlobals",A="FL:::/Kernel/KernelA.HH,558"$ $LK,"I_NMI",A="FL:::/Kernel/KernelA.HH,302"$ $LK,"ModU64",A="FL:::/Kernel/KernelB.HH,103"$ $LK,"DOCG_DBL_BUF_FLAGS",A="FL:::/Kernel/KernelA.HH,963"$ -$LK,"JobResScan",A="FL:::/Kernel/Job.HC,164",BI=272$ +$LK,"JobResScan",A="FL:::/Kernel/Job.HC,164",BI=268$ $LK,"WIf_FOCUS_TASK_MENU",A="FL:::/Kernel/KernelA.HH,1460"$ $LK,"CTask",A="FL:::/Kernel/KernelA.HH,3271"$ $LK,"OC_JMP_REL8",A="FL:::/Kernel/KernelA.HH,1773"$ @@ -1257,7 +1253,7 @@ $LK,"I8_MAX",A="FL:::/Kernel/KernelA.HH,26"$ $LK,"_HASH_SINGLE_TABLE_FIND",A="FL:::/Kernel/KHashA.HC,143"$ $LK,"_D3_ZERO",A="FL:::/Kernel/KMathA.HC,201"$ $LK,"REGG_STK_TMP",A="FL:::/Kernel/KernelA.HH,1803"$ -$LK,"Str2F64",A="FL:::/Kernel/StrScan.HC,55",BI=273$ +$LK,"Str2F64",A="FL:::/Kernel/StrScan.HC,55",BI=269$ $LK,"_YIELD",A="FL:::/Kernel/Sched.HC,157"$ $LK,"OM_IB",A="FL:::/Kernel/KernelA.HH,1885"$ $LK,"progress3_desc",A="FL:::/Kernel/KernelB.HH,223"$ @@ -1274,15 +1270,15 @@ $LK,"FUF_RECURSE",A="FL:::/Kernel/KernelA.HH,2565"$ $LK,"FUf_RECURSE",A="FL:::/Kernel/KernelA.HH,2537"$ $LK,"MemCmp",A="FL:::/Kernel/KernelB.HH,167"$ $LK,"SC_PAGE_UP",A="FL:::/Kernel/KernelA.HH,3511"$ -$LK,"User",A="FL:::/Kernel/KTask.HC,424",BI=274$ +$LK,"User",A="FL:::/Kernel/KTask.HC,424",BI=270$ $LK,"DOCEf_RIGHT_EXP",A="FL:::/Kernel/KernelA.HH,1065"$ $LK,"DOCEF_RIGHT_EXP",A="FL:::/Kernel/KernelA.HH,977"$ -$LK,"DirEntryDel",A="FL:::/Kernel/BlkDev/DiskDirA.HC,14",BI=275$ +$LK,"DirEntryDel",A="FL:::/Kernel/BlkDev/DiskDirA.HC,14",BI=271$ $LK,"CLexFile",A="FL:::/Kernel/KernelA.HH,2047"$ $LK,"OM_CW",A="FL:::/Kernel/KernelA.HH,1882"$ $LK,"DOCF_DONT_SWAP_OUT",A="FL:::/Kernel/KernelA.HH,1290"$ $LK,"IA32_LAPIC_BASE",A="FL:::/Kernel/KernelA.HH,541"$ -$LK,"ATACmd",A="FL:::/Kernel/BlkDev/DiskATA.HC,59",BI=276$ +$LK,"ATACmd",A="FL:::/Kernel/BlkDev/DiskATA.HC,59",BI=272$ $LK,"FILEMASK_DD",A="FL:::/Kernel/KernelA.HH,2303"$ $LK,"DOCEf_SHIFTED_X",A="FL:::/Kernel/KernelA.HH,1070"$ $LK,"DOCEG_DONT_EDIT",A="FL:::/Kernel/KernelA.HH,1040"$ @@ -1290,10 +1286,10 @@ $LK,"DOCEF_SHIFTED_X",A="FL:::/Kernel/KernelA.HH,982"$ $LK,"SEMA_HEAPLOG_ACTIVE",A="FL:::/Kernel/KernelA.HH,617"$ $LK,"DOCEf_SHIFTED_Y",A="FL:::/Kernel/KernelA.HH,1071"$ $LK,"DOCEF_SHIFTED_Y",A="FL:::/Kernel/KernelA.HH,983"$ -$LK,"Str2I64",A="FL:::/Kernel/StrScan.HC,1",BI=277$ +$LK,"Str2I64",A="FL:::/Kernel/StrScan.HC,1",BI=273$ $LK,"Sqrt",A="FL:::/Kernel/KernelB.HH,109"$ -$LK,"NowDateTimeStruct",A="FL:::/Kernel/KDate.HC,133",BI=278$ -$LK,"YorN",A="FL:::/Kernel/StrB.HC,87",BI=279$ +$LK,"NowDateTimeStruct",A="FL:::/Kernel/KDate.HC,133",BI=274$ +$LK,"YorN",A="FL:::/Kernel/StrB.HC,87",BI=275$ $LK,"MT_CD",A="FL:::/Kernel/KernelA.HH,2514"$ $LK,"RFLAGf_VINT",A="FL:::/Kernel/KernelA.HH,336"$ $LK,"DCF_ON_TOP",A="FL:::/Kernel/KernelA.HH,3584"$ @@ -1303,7 +1299,7 @@ $LK,"SYS_CPU_STRUCTS",A="FL:::/Kernel/KStart32.HC,64"$ $LK,"DOCf_DONT_SWAP_OUT",A="FL:::/Kernel/KernelA.HH,1327"$ $LK,"CDocEntryBase",A="FL:::/Kernel/KernelA.HH,1170"$ $LK,"MLF_STR_DFT_AVAILABLE",A="FL:::/Kernel/KernelA.HH,781"$ -$LK,"ArcCtrlNew",A="FL:::/Kernel/Compress.HC,221",BI=280$ +$LK,"ArcCtrlNew",A="FL:::/Kernel/Compress.HC,221",BI=276$ $LK,"DCF_DONT_DRAW",A="FL:::/Kernel/KernelA.HH,3579"$ $LK,"DOC_SCROLL_SPEED",A="FL:::/Kernel/KernelA.HH,1131"$ $LK,"ATTRf_SEL",A="FL:::/Kernel/KernelA.HH,901"$ @@ -1318,23 +1314,23 @@ $LK,"VGAP_DATA",A="FL:::/Kernel/KernelA.HH,3672"$ $LK,"OM_NO",A="FL:::/Kernel/KernelA.HH,1880"$ $LK,"IET_DATA_HEAP",A="FL:::/Kernel/KernelA.HH,426"$ $LK,"GVF_DATA_HEAP",A="FL:::/Kernel/KernelA.HH,874"$ -$LK,"DefineSub",A="FL:::/Kernel/KDefine.HC,60",BI=281$ +$LK,"DefineSub",A="FL:::/Kernel/KDefine.HC,60",BI=277$ $LK,"WHITE",A="FL:::/Kernel/KernelA.HH,2929"$ $LK,"ATA_READ_MULTI_EXT",A="FL:::/Kernel/KernelA.HH,2277"$ $LK,"DOCEF_SCROLLING_X",A="FL:::/Kernel/KernelA.HH,984"$ $LK,"DOCEf_CHECKED_COLLAPSED",A="FL:::/Kernel/KernelA.HH,1098"$ -$LK,"Name2ParentDirClus",A="FL:::/Kernel/BlkDev/DiskStrB.HC,50",BI=282$ +$LK,"Name2ParentDirClus",A="FL:::/Kernel/BlkDev/DiskStrB.HC,50",BI=278$ $LK,"DOCEf_SCROLLING_X",A="FL:::/Kernel/KernelA.HH,1072"$ -$LK,"MPInt",A="FL:::/Kernel/MultiProc.HC,132",BI=283$ +$LK,"MPInt",A="FL:::/Kernel/MultiProc.HC,132",BI=279$ $LK,"BOOT_SRC_RAM",A="FL:::/Kernel/KernelA.HH,3841"$ $LK,"TK_AND_EQU",A="FL:::/Kernel/KernelA.HH,2105"$ $LK,"I64",A="FL:::/Kernel/KernelA.HH,106"$ -$LK,"PopUpPrint",A="FL:::/Kernel/Job.HC,397",BI=284$ -$LK,"IntEntryGet",A="FL:::/Kernel/KInts.HC,97",BI=285$ +$LK,"PopUpPrint",A="FL:::/Kernel/Job.HC,397",BI=280$ +$LK,"IntEntryGet",A="FL:::/Kernel/KInts.HC,97",BI=281$ $LK,"ms_grid",A="FL:::/Kernel/KGlobals.HC,24"$ $LK,"FILEMASK_GR",A="FL:::/Kernel/KernelA.HH,2305"$ $LK,"CD2",A="FL:::/Kernel/KernelA.HH,151"$ -$LK,"KeyDevInit",A="FL:::/Kernel/KeyDev.HC,201",BI=286$ +$LK,"KeyDevInit",A="FL:::/Kernel/KeyDev.HC,201",BI=282$ $LK,"CCF_HAS_RETURN",A="FL:::/Kernel/KernelA.HH,2156"$ $LK,"CAsmArg",A="FL:::/Kernel/KernelA.HH,1856"$ $LK,"CD3",A="FL:::/Kernel/KernelA.HH,157"$ @@ -1342,42 +1338,43 @@ $LK,"QueueRemove",A="FL:::/Kernel/KernelB.HH,72"$ $LK,"SYS_BOOT_BLK",A="FL:::/Kernel/KStart16.HC,24"$ $LK,"progress4_desc",A="FL:::/Kernel/KernelB.HH,229"$ $LK,"RFLAGf_ZERO",A="FL:::/Kernel/KernelA.HH,324"$ -$LK,"PCIReadU8",A="FL:::/Kernel/PCIBIOS.HC,163",BI=287$ +$LK,"mp_count_lock",A="FL:::/Kernel/KernelB.HH,241"$ +$LK,"PCIReadU8",A="FL:::/Kernel/PCIBIOS.HC,163",BI=283$ $LK,"EXT_WIN_FOCUS",A="FL:::/Kernel/KernelA.HH,597"$ $LK,"CHashAC",A="FL:::/Kernel/KernelA.HH,758"$ $LK,"ms_last",A="FL:::/Kernel/KGlobals.HC,25"$ $LK,"DOCf_NO_CURSOR",A="FL:::/Kernel/KernelA.HH,1310"$ $LK,"DOCF_NO_CURSOR",A="FL:::/Kernel/KernelA.HH,1273"$ -$LK,"PrintWarn",A="FL:::/Kernel/StrPrint.HC,914",BI=288$ -$LK,"LoadOneImport",A="FL:::/Kernel/KLoad.HC,1",BI=289$ -$LK,"FOpen",A="FL:::/Kernel/BlkDev/DiskCFile.HC,9",BI=290$ +$LK,"PrintWarn",A="FL:::/Kernel/StrPrint.HC,914",BI=284$ +$LK,"LoadOneImport",A="FL:::/Kernel/KLoad.HC,1",BI=285$ +$LK,"FOpen",A="FL:::/Kernel/BlkDev/DiskCFile.HC,9",BI=286$ $LK,"CCF_LAST_WAS_DOT",A="FL:::/Kernel/KernelA.HH,2170"$ $LK,"CMF_DEFINED",A="FL:::/Kernel/KernelA.HH,1707"$ $LK,"HTG_ALL",A="FL:::/Kernel/KernelA.HH,719"$ $LK,"sys_var_init_val",A="FL:::/Kernel/KernelB.HH,187"$ $LK,"FUF_REPLACE",A="FL:::/Kernel/KernelA.HH,2571"$ $LK,"FUf_REPLACE",A="FL:::/Kernel/KernelA.HH,2543"$ -$LK,"BlkDevUnlock",A="FL:::/Kernel/BlkDev/DiskBlkDev.HC,15",BI=291$ +$LK,"BlkDevUnlock",A="FL:::/Kernel/BlkDev/DiskBlkDev.HC,15",BI=287$ $LK,"CMemUsed",A="FL:::/Kernel/KernelA.HH,2799"$ -$LK,"IntMPCrash",A="FL:::/Kernel/MultiProc.HC,379",BI=292$ -$LK,"TSSBusy",A="FL:::/Kernel/MultiProc.HC,71",BI=293$ +$LK,"IntMPCrash",A="FL:::/Kernel/MultiProc.HC,379",BI=288$ +$LK,"TSSBusy",A="FL:::/Kernel/MultiProc.HC,71",BI=289$ $LK,"FUF_JUST_AOT",A="FL:::/Kernel/KernelA.HH,2582"$ $LK,"FUf_JUST_AOT",A="FL:::/Kernel/KernelA.HH,2554"$ -$LK,"DirNameAbs",A="FL:::/Kernel/BlkDev/DiskStrA.HC,108",BI=294$ +$LK,"DirNameAbs",A="FL:::/Kernel/BlkDev/DiskStrA.HC,108",BI=290$ $LK,"DOF_DONT_HOME",A="FL:::/Kernel/KernelA.HH,1228"$ $LK,"RLF_ZENITH_SERVER",A="FL:::/Kernel/KernelA.HH,493"$ $LK,"CH_ESC",A="FL:::/Kernel/KernelA.HH,3454"$ $LK,"DOCEf_DONT_DRAW",A="FL:::/Kernel/KernelA.HH,1114"$ $LK,"DOCEF_DONT_DRAW",A="FL:::/Kernel/KernelA.HH,1028"$ $LK,"WIF_FOCUS_TASK_MS_L",A="FL:::/Kernel/KernelA.HH,1435"$ -$LK,"WildMatch",A="FL:::/Kernel/StrA.HC,651",BI=295$ +$LK,"WildMatch",A="FL:::/Kernel/StrA.HC,651",BI=291$ $LK,"MEM_EXTRA_HASH2_PAGS",A="FL:::/Kernel/KernelA.HH,2838"$ $LK,"CDC",A="FL:::/Kernel/KernelA.HH,3599"$ $LK,"SC_CURSOR_LEFT",A="FL:::/Kernel/KernelA.HH,3509"$ -$LK,"IsMute",A="FL:::/Kernel/KMisc.HC,265",BI=296$ +$LK,"IsMute",A="FL:::/Kernel/KMisc.HC,265",BI=292$ $LK,"DOCT_CLEAR",A="FL:::/Kernel/KernelA.HH,913"$ -$LK,"DVDImageWrite",A="FL:::/Kernel/BlkDev/DiskCDDVD.HC,143",BI=297$ -$LK,"HashTypeNum",A="FL:::/Kernel/KHashB.HC,1",BI=298$ +$LK,"DVDImageWrite",A="FL:::/Kernel/BlkDev/DiskCDDVD.HC,143",BI=293$ +$LK,"HashTypeNum",A="FL:::/Kernel/KHashB.HC,1",BI=294$ $LK,"CPUf_DYING_TASK_QUE",A="FL:::/Kernel/KernelA.HH,3389"$ $LK,"BDf_READ_ONLY",A="FL:::/Kernel/KernelA.HH,2621"$ $LK,"BDF_READ_ONLY",A="FL:::/Kernel/KernelA.HH,2611"$ @@ -1385,7 +1382,7 @@ $LK,"ISOT_BOOT_RECORD",A="FL:::/Kernel/KernelA.HH,2462"$ $LK,"DCF_JUST_MIRROR",A="FL:::/Kernel/KernelA.HH,3576"$ $LK,"FSt_UNKNOWN",A="FL:::/Kernel/KernelA.HH,2663"$ $LK,"WIG_USER_TASK_DFT",A="FL:::/Kernel/KernelA.HH,1448"$ -$LK,"KMain",A="FL:::/Kernel/KMain.HC,135",BI=299$ +$LK,"KMain",A="FL:::/Kernel/KMain.HC,135",BI=295$ $LK,"sys_cache_line_width",A="FL:::/Kernel/KernelB.HH,280"$ $LK,"XchgI64",A="FL:::/Kernel/KernelB.HH,271"$ $LK,"SC_CURSOR_DOWN",A="FL:::/Kernel/KernelA.HH,3508"$ @@ -1395,11 +1392,11 @@ $LK,"RLf_ZENITH_SERVER",A="FL:::/Kernel/KernelA.HH,471"$ $LK,"I_SINGLE_STEP",A="FL:::/Kernel/KernelA.HH,301"$ $LK,"ATA_WRITE_MULTI",A="FL:::/Kernel/KernelA.HH,2278"$ $LK,"DOC_COLOR_KEYWORD",A="FL:::/Kernel/KernelA.HH,1155"$ -$LK,"XTalkStr",A="FL:::/Kernel/Job.HC,489",BI=300$ +$LK,"XTalkStr",A="FL:::/Kernel/Job.HC,489",BI=296$ $LK,"CCF_IN_QUOTES",A="FL:::/Kernel/KernelA.HH,2153"$ $LK,"CFifoU8",A="FL:::/Kernel/KernelA.HH,172"$ -$LK,"ATAReadNativeMax",A="FL:::/Kernel/BlkDev/DiskATA.HC,194",BI=301$ -$LK,"MsHardSetPre",A="FL:::/Kernel/SerialDev/Mouse.HC,196",BI=302$ +$LK,"ATAReadNativeMax",A="FL:::/Kernel/BlkDev/DiskATA.HC,194",BI=297$ +$LK,"MsHardSetPre",A="FL:::/Kernel/SerialDev/Mouse.HC,196",BI=298$ $LK,"BOOT_SRC_ROM",A="FL:::/Kernel/KernelA.HH,3840"$ $LK,"MEM_FREE_PAG_HASH_SIZE",A="FL:::/Kernel/KernelA.HH,2835"$ $LK,"RLF_AUTO_COMPLETE",A="FL:::/Kernel/KernelA.HH,492"$ @@ -1415,15 +1412,15 @@ $LK,"FUF_IGNORE",A="FL:::/Kernel/KernelA.HH,2568"$ $LK,"FUf_IGNORE",A="FL:::/Kernel/KernelA.HH,2540"$ $LK,"AAT_SUB_U32",A="FL:::/Kernel/KernelA.HH,1984"$ $LK,"AAT_SUB_U16",A="FL:::/Kernel/KernelA.HH,1982"$ -$LK,"UserCmdLine",A="FL:::/Kernel/KTask.HC,414",BI=303$ +$LK,"UserCmdLine",A="FL:::/Kernel/KTask.HC,414",BI=299$ $LK,"GVF_FUN",A="FL:::/Kernel/KernelA.HH,871"$ $LK,"IA32F_LME",A="FL:::/Kernel/KernelA.HH,540"$ $LK,"LAPICF_APIC_ENABLED",A="FL:::/Kernel/KernelA.HH,510"$ $LK,"RLf_AUTO_COMPLETE",A="FL:::/Kernel/KernelA.HH,470"$ -$LK,"PCIClassFind",A="FL:::/Kernel/PCIBIOS.HC,265",BI=304$ +$LK,"PCIClassFind",A="FL:::/Kernel/PCIBIOS.HC,265",BI=300$ $LK,"RECALCF_HAS_CURSOR",A="FL:::/Kernel/KernelA.HH,1364"$ -$LK,"ATARep",A="FL:::/Kernel/BlkDev/DiskATAId.HC,134",BI=305$ -$LK,"KDInputFilterPutS",A="FL:::/Kernel/KeyDev.HC,117",BI=306$ +$LK,"ATARep",A="FL:::/Kernel/BlkDev/DiskATAId.HC,134",BI=301$ +$LK,"KDInputFilterPutS",A="FL:::/Kernel/KeyDev.HC,117",BI=302$ $LK,"D3SubEqu",A="FL:::/Kernel/KernelB.HH,161"$ $LK,"FUF_JUST_JIT",A="FL:::/Kernel/KernelA.HH,2583"$ $LK,"FUf_JUST_JIT",A="FL:::/Kernel/KernelA.HH,2555"$ @@ -1435,33 +1432,33 @@ $LK,"DOCT_BLINK",A="FL:::/Kernel/KernelA.HH,926"$ $LK,"U32",A="FL:::/Kernel/KernelA.HH,80"$ $LK,"U16",A="FL:::/Kernel/KernelA.HH,68"$ $LK,"_XCHG_I64",A="FL:::/Kernel/KUtils.HC,184"$ -$LK,"ATANop",A="FL:::/Kernel/BlkDev/DiskATA.HC,48",BI=307$ -$LK,"TaskDel",A="FL:::/Kernel/KTask.HC,437",BI=308$ +$LK,"ATANop",A="FL:::/Kernel/BlkDev/DiskATA.HC,48",BI=303$ +$LK,"TaskDel",A="FL:::/Kernel/KTask.HC,437",BI=304$ $LK,"LXchgU8",A="FL:::/Kernel/KernelB.HH,267"$ $LK,"AAT_SUB_U64",A="FL:::/Kernel/KernelA.HH,1986"$ -$LK,"HasLower",A="FL:::/Kernel/FunSeg.HC,1",BI=309$ +$LK,"HasLower",A="FL:::/Kernel/FunSeg.HC,1",BI=305$ $LK,"_CALL",A="FL:::/Kernel/KUtils.HC,145"$ $LK,"IA32F_SCE",A="FL:::/Kernel/KernelA.HH,539"$ $LK,"__LINE__",A="FL:::/Kernel/KernelA.HH,2037"$ $LK,"FUF_FLATTEN_TREE",A="FL:::/Kernel/KernelA.HH,2588"$ -$LK,"KeyDescSet",A="FL:::/Kernel/KeyDev.HC,56",BI=310$ -$LK,"TaskQueueRemove",A="FL:::/Kernel/Sched.HC,301",BI=311$ +$LK,"KeyDescSet",A="FL:::/Kernel/KeyDev.HC,56",BI=306$ +$LK,"TaskQueueRemove",A="FL:::/Kernel/Sched.HC,301",BI=307$ $LK,"U64",A="FL:::/Kernel/KernelA.HH,96"$ -$LK,"FSize",A="FL:::/Kernel/BlkDev/DiskCFile.HC,1",BI=312$ -$LK,"IntEntrySet",A="FL:::/Kernel/KInts.HC,109",BI=313$ -$LK,"Mem32DevIns",A="FL:::/Kernel/Mem/MemPhysical.HC,1",BI=314$ +$LK,"FSize",A="FL:::/Kernel/BlkDev/DiskCFile.HC,1",BI=308$ +$LK,"IntEntrySet",A="FL:::/Kernel/KInts.HC,109",BI=309$ +$LK,"Mem32DevIns",A="FL:::/Kernel/Mem/MemPhysical.HC,1",BI=310$ $LK,"SYS_MP_CNT_INITIAL",A="FL:::/Kernel/KStart32.HC,66"$ $LK,"FUf_FLATTEN_TREE",A="FL:::/Kernel/KernelA.HH,2560"$ $LK,"WIf_FOCUS_TASK_MS_L",A="FL:::/Kernel/KernelA.HH,1462"$ $LK,"WIF_SELF_MS_L",A="FL:::/Kernel/KernelA.HH,1422"$ $LK,"char_bmp_word",A="FL:::/Kernel/StrA.HC,340"$ $LK,"WIf_SELF_MS_L",A="FL:::/Kernel/KernelA.HH,1452"$ -$LK,"BlkRead",A="FL:::/Kernel/BlkDev/DiskBlk.HC,31",BI=315$ +$LK,"BlkRead",A="FL:::/Kernel/BlkDev/DiskBlk.HC,31",BI=311$ $LK,"_CEIL",A="FL:::/Kernel/KMathA.HC,441"$ -$LK,"TaskEnd",A="FL:::/Kernel/KTask.HC,445",BI=316$ +$LK,"TaskEnd",A="FL:::/Kernel/KTask.HC,445",BI=312$ $LK,"MEM_1GIG_NUM",A="FL:::/Kernel/KStart32.HC,11"$ $LK,"WIf_FOCUS_TASK_MS_R",A="FL:::/Kernel/KernelA.HH,1464"$ -$LK,"TaskCaller",A="FL:::/Kernel/KDebug.HC,75",BI=317$ +$LK,"TaskCaller",A="FL:::/Kernel/KDebug.HC,75",BI=313$ $LK,"SV_NONE",A="FL:::/Kernel/KernelA.HH,1753"$ $LK,"QUE_VECT_U8_CNT",A="FL:::/Kernel/KernelA.HH,163"$ $LK,"RT_I0",A="FL:::/Kernel/KernelA.HH,1564"$ @@ -1474,99 +1471,101 @@ $LK,"DOCF_NULL_GRAB_SCROLL",A="FL:::/Kernel/KernelA.HH,1289"$ $LK,"DOCEf_LEFT_MACRO",A="FL:::/Kernel/KernelA.HH,1064"$ $LK,"SYS_GDT",A="FL:::/Kernel/KStart16.HC,39"$ $LK,"JOBf_WAKE_MASTER",A="FL:::/Kernel/KernelA.HH,3129"$ -$LK,"CDate2Dos",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,1",BI=318$ +$LK,"CDate2Dos",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,1",BI=314$ $LK,"SEMA_DEBUG",A="FL:::/Kernel/KernelA.HH,611"$ -$LK,"ExtChg",A="FL:::/Kernel/BlkDev/DiskStrA.HC,203",BI=319$ +$LK,"ExtChg",A="FL:::/Kernel/BlkDev/DiskStrA.HC,203",BI=315$ $LK,"TMP_BUF_LEN",A="FL:::/Kernel/StrPrint.HC,205"$ $LK,"MRT_UNUSED",A="FL:::/Kernel/KernelA.HH,2820"$ $LK,"MDG_REG_DISP_SIB",A="FL:::/Kernel/KernelA.HH,1598"$ $LK,"RLF_16MEG_ZENITH_HEAP_CTRL",A="FL:::/Kernel/KernelA.HH,481"$ $LK,"RLf_16MEG_ZENITH_HEAP_CTRL",A="FL:::/Kernel/KernelA.HH,459"$ -$LK,"RedSeaFilesDel",A="FL:::/Kernel/BlkDev/FileSysRedSea.HC,456",BI=320$ +$LK,"RedSeaFilesDel",A="FL:::/Kernel/BlkDev/FileSysRedSea.HC,456",BI=316$ $LK,"XchgU32",A="FL:::/Kernel/KernelB.HH,273"$ $LK,"XchgU16",A="FL:::/Kernel/KernelB.HH,272"$ $LK,"TK_SHL_EQU",A="FL:::/Kernel/KernelA.HH,2101"$ -$LK,"LastDayOfMon",A="FL:::/Kernel/KDate.HC,82",BI=321$ +$LK,"LastDayOfMon",A="FL:::/Kernel/KDate.HC,82",BI=317$ $LK,"RT_I8",A="FL:::/Kernel/KernelA.HH,1566"$ $LK,"CAsmNum",A="FL:::/Kernel/KernelA.HH,1829"$ $LK,"_REP_OUT_U16",A="FL:::/Kernel/KUtils.HC,297"$ $LK,"_REP_OUT_U32",A="FL:::/Kernel/KUtils.HC,286"$ $LK,"VGAM_TEXT",A="FL:::/Kernel/KernelA.HH,3664"$ $LK,"ACD_POS",A="FL:::/Kernel/KernelA.HH,1519"$ -$LK,"FirstDayOfMon",A="FL:::/Kernel/KDate.HC,71",BI=322$ -$LK,"PutChars",A="FL:::/Kernel/KeyDev.HC,20",BI=323$ -$LK,"ZenithErr",A="FL:::/Kernel/Job.HC,433",BI=324$ +$LK,"FirstDayOfMon",A="FL:::/Kernel/KDate.HC,71",BI=318$ +$LK,"counts",A="FL:::/Kernel/KGlobals.HC,21"$ +$LK,"PutChars",A="FL:::/Kernel/KeyDev.HC,20",BI=319$ +$LK,"ZenithErr",A="FL:::/Kernel/Job.HC,433",BI=320$ $LK,"_BEQU",A="FL:::/Kernel/KUtils.HC,89"$ $LK,"DOCEf_RAW_TYPE",A="FL:::/Kernel/KernelA.HH,1069"$ $LK,"DOCEF_RAW_TYPE",A="FL:::/Kernel/KernelA.HH,981"$ -$LK,"DriveFATBlkClean",A="FL:::/Kernel/BlkDev/DiskDrive.HC,99",BI=325$ +$LK,"DriveFATBlkClean",A="FL:::/Kernel/BlkDev/DiskDrive.HC,99",BI=321$ $LK,"ansf",A="FL:::/Kernel/KernelA.HH,3367"$ -$LK,"BlkDevsInitAll",A="FL:::/Kernel/BlkDev/DiskAddDev.HC,225",BI=326$ -$LK,"SysUntry",A="FL:::/Kernel/KExcept.HC,77",BI=327$ +$LK,"BlkDevsInitAll",A="FL:::/Kernel/BlkDev/DiskAddDev.HC,225",BI=322$ +$LK,"SysUntry",A="FL:::/Kernel/KExcept.HC,77",BI=323$ $LK,"WIF_FOCUS_TASK_BORDER",A="FL:::/Kernel/KernelA.HH,1440"$ $LK,"_MEMCMP",A="FL:::/Kernel/KUtils.HC,70"$ $LK,"DISPLAYf_NO_BORDER",A="FL:::/Kernel/KernelA.HH,3250"$ $LK,"OFF",A="FL:::/Kernel/KernelA.HH,23"$ $LK,"DOCF_DO_FULL_REFRESH",A="FL:::/Kernel/KernelA.HH,1291"$ -$LK,"FifoI64Remove",A="FL:::/Kernel/KDataTypes.HC,275",BI=328$ -$LK,"ExtDft",A="FL:::/Kernel/BlkDev/DiskStrA.HC,212",BI=329$ +$LK,"FifoI64Remove",A="FL:::/Kernel/KDataTypes.HC,275",BI=324$ +$LK,"ExtDft",A="FL:::/Kernel/BlkDev/DiskStrA.HC,212",BI=325$ $LK,"SYS_BOOT_SRC",A="FL:::/Kernel/KStart16.HC,23"$ $LK,"FUF_JUST_SRC",A="FL:::/Kernel/KernelA.HH,2581"$ $LK,"FUf_JUST_SRC",A="FL:::/Kernel/KernelA.HH,2553"$ $LK,"OC_CALL",A="FL:::/Kernel/KernelA.HH,1772"$ -$LK,"TaskExe",A="FL:::/Kernel/Job.HC,39",BI=330$ -$LK,"KbdMessagesQueue",A="FL:::/Kernel/SerialDev/Keyboard.HC,467",BI=331$ -$LK,"FileWrite",A="FL:::/Kernel/BlkDev/DiskFile.HC,79",BI=332$ +$LK,"TaskExe",A="FL:::/Kernel/Job.HC,39",BI=326$ +$LK,"KbdMessagesQueue",A="FL:::/Kernel/SerialDev/Keyboard.HC,467",BI=327$ +$LK,"FileWrite",A="FL:::/Kernel/BlkDev/DiskFile.HC,79",BI=328$ $LK,"ARf_CSPRITE_PTS_RECTANGLES",A="FL:::/Kernel/KernelA.HH,3855"$ $LK,"MESSAGE_KEY_DOWN_UP",A="FL:::/Kernel/KernelA.HH,3189"$ $LK,"RFLAGf_ID",A="FL:::/Kernel/KernelA.HH,338"$ $LK,"SCF_E0_PREFIX",A="FL:::/Kernel/KernelA.HH,3478"$ $LK,"SCf_E0_PREFIX",A="FL:::/Kernel/KernelA.HH,3463"$ -$LK,"ATAWaitNotBUSY",A="FL:::/Kernel/BlkDev/DiskATA.HC,24",BI=333$ +$LK,"ATAWaitNotBUSY",A="FL:::/Kernel/BlkDev/DiskATA.HC,24",BI=329$ $LK,"_XCHG_U16",A="FL:::/Kernel/KUtils.HC,200"$ $LK,"_XCHG_U32",A="FL:::/Kernel/KUtils.HC,192"$ $LK,"SUF_TO_LOWER",A="FL:::/Kernel/KernelA.HH,3736"$ $LK,"ARGT_XMM32",A="FL:::/Kernel/KernelA.HH,1953"$ $LK,"WIF_SELF_GRAB_SCROLL",A="FL:::/Kernel/KernelA.HH,1428"$ $LK,"LDF_SILENT",A="FL:::/Kernel/KernelA.HH,382"$ -$LK,"MsInit",A="FL:::/Kernel/SerialDev/Mouse.HC,63",BI=334$ -$LK,"ZenithLog",A="FL:::/Kernel/Job.HC,423",BI=335$ +$LK,"MsInit",A="FL:::/Kernel/SerialDev/Mouse.HC,63",BI=330$ +$LK,"ZenithLog",A="FL:::/Kernel/Job.HC,423",BI=331$ $LK,"RED",A="FL:::/Kernel/KernelA.HH,2918"$ $LK,"RT_U0",A="FL:::/Kernel/KernelA.HH,1565"$ $LK,"VGAR_MAP_MASK",A="FL:::/Kernel/KernelA.HH,3682"$ $LK,"PRTF_COMMA",A="FL:::/Kernel/KernelA.HH,3872"$ $LK,"CAOTCtrl",A="FL:::/Kernel/KernelA.HH,2061"$ $LK,"DOC_COLOR_DEFINE_STR",A="FL:::/Kernel/KernelA.HH,1151"$ -$LK,"DriveFATBlkAlloc",A="FL:::/Kernel/BlkDev/DiskDrive.HC,89",BI=336$ +$LK,"DriveFATBlkAlloc",A="FL:::/Kernel/BlkDev/DiskDrive.HC,89",BI=332$ $LK,"VM_VIRTUALBOX",A="FL:::/Kernel/KernelA.HH,3893"$ $LK,"SCF_NEW_KEY",A="FL:::/Kernel/KernelA.HH,3486"$ $LK,"CCompCtrl",A="FL:::/Kernel/KernelA.HH,2179"$ $LK,"TASK_CONTEXT_SAVE",A="FL:::/Kernel/Sched.HC,56"$ $LK,"SCf_NEW_KEY",A="FL:::/Kernel/KernelA.HH,3471"$ $LK,"CDirContext",A="FL:::/Kernel/KernelA.HH,2747"$ -$LK,"BootDVDProbeAll",A="FL:::/Kernel/BlkDev/DiskATAId.HC,29",BI=337$ +$LK,"BootDVDProbeAll",A="FL:::/Kernel/BlkDev/DiskATAId.HC,29",BI=333$ $LK,"_MEMCPY",A="FL:::/Kernel/KUtils.HC,55"$ $LK,"_D3_DIST_SQR",A="FL:::/Kernel/KMathA.HC,61"$ $LK,"ARGT_XMM64",A="FL:::/Kernel/KernelA.HH,1954"$ -$LK,"ATAWriteBlks",A="FL:::/Kernel/BlkDev/DiskATA.HC,464",BI=338$ +$LK,"ATAWriteBlks",A="FL:::/Kernel/BlkDev/DiskATA.HC,464",BI=334$ $LK,"RT_U8",A="FL:::/Kernel/KernelA.HH,1567"$ $LK,"RLf_16MEG_SYS_CODE_BP",A="FL:::/Kernel/KernelA.HH,457"$ $LK,"DOCEf_USER_DATA",A="FL:::/Kernel/KernelA.HH,1073"$ $LK,"DOCEF_USER_DATA",A="FL:::/Kernel/KernelA.HH,985"$ $LK,"COPY_BUF_BLKS",A="FL:::/Kernel/BlkDev/DiskCopy.HC,22"$ -$LK,"FAT32FileWrite",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,799",BI=339$ +$LK,"FAT32FileWrite",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,799",BI=335$ $LK,"EDf_BAIL",A="FL:::/Kernel/KernelA.HH,1264"$ $LK,"EDF_BAIL",A="FL:::/Kernel/KernelA.HH,1258"$ +$LK,"LinkedLstCount",A="FL:::/Kernel/KDataTypes.HC,21",BI=336$ $LK,"SYS_RAM_REBOOT",A="FL:::/Kernel/KStart64.HC,74"$ $LK,"CWinMgrGlobals",A="FL:::/Kernel/KernelA.HH,1482"$ -$LK,"FileFind",A="FL:::/Kernel/BlkDev/DiskFind.HC,54",BI=340$ +$LK,"FileFind",A="FL:::/Kernel/BlkDev/DiskFind.HC,54",BI=337$ $LK,"SYS_FIND_PCI_SERVICES",A="FL:::/Kernel/PCIBIOS.HC,38"$ $LK,"VGAP_ATTR_DATA_WRITE",A="FL:::/Kernel/KernelA.HH,3668"$ $LK,"FUF_WHOLE_LABELS_BEFORE",A="FL:::/Kernel/KernelA.HH,2590"$ $LK,"TK_MUL_EQU",A="FL:::/Kernel/KernelA.HH,2103"$ $LK,"TK_NOT_EQU",A="FL:::/Kernel/KernelA.HH,2095"$ -$LK,"CFileNameTo",A="FL:::/Kernel/BlkDev/DiskStrB.HC,1",BI=341$ -$LK,"IntNop",A="FL:::/Kernel/KInts.HC,143",BI=342$ +$LK,"CFileNameTo",A="FL:::/Kernel/BlkDev/DiskStrB.HC,1",BI=338$ +$LK,"IntNop",A="FL:::/Kernel/KInts.HC,143",BI=339$ $LK,"_D3_MUL_EQU",A="FL:::/Kernel/KMathA.HC,273"$ $LK,"DISPLAYf_SHOW",A="FL:::/Kernel/KernelA.HH,3247"$ $LK,"DOF_DONT_SHOW",A="FL:::/Kernel/KernelA.HH,1232"$ @@ -1578,20 +1577,20 @@ $LK,"CCF_UNRESOLVED",A="FL:::/Kernel/KernelA.HH,2158"$ $LK,"MLF_FUN",A="FL:::/Kernel/KernelA.HH,782"$ $LK,"DOCEF_ZERO_BASED",A="FL:::/Kernel/KernelA.HH,1019"$ $LK,"HTF_UNRESOLVED",A="FL:::/Kernel/KernelA.HH,713"$ -$LK,"FAT32Cd",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,387",BI=343$ +$LK,"FAT32Cd",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,387",BI=340$ $LK,"DOCEf_ZERO_BASED",A="FL:::/Kernel/KernelA.HH,1105"$ $LK,"HTf_UNRESOLVED",A="FL:::/Kernel/KernelA.HH,683"$ $LK,"CAP16BitInit",A="FL:::/Kernel/KernelA.HH,546"$ -$LK,"Clus2Blk",A="FL:::/Kernel/BlkDev/DiskClus.HC,31",BI=344$ -$LK,"ATAPIWriteBlks",A="FL:::/Kernel/BlkDev/DiskATA.HC,538",BI=345$ -$LK,"cnts",A="FL:::/Kernel/KGlobals.HC,21"$ +$LK,"Clus2Blk",A="FL:::/Kernel/BlkDev/DiskClus.HC,31",BI=341$ +$LK,"ATAPIWriteBlks",A="FL:::/Kernel/BlkDev/DiskATA.HC,538",BI=342$ $LK,"SYS_HEAP_INIT_FLAG",A="FL::/Tmp.DD,1"$ $LK,"FUF_WHOLE_LABELS",A="FL:::/Kernel/KernelA.HH,2589"$ -$LK,"ScanChar",A="FL:::/Kernel/SerialDev/Message.HC,110",BI=346$ +$LK,"ScanChar",A="FL:::/Kernel/SerialDev/Message.HC,110",BI=343$ $LK,"RepInU32",A="FL:::/Kernel/KernelB.HH,84"$ $LK,"RepInU16",A="FL:::/Kernel/KernelB.HH,82"$ $LK,"loge_2",A="FL:::/Kernel/KernelA.HH,57"$ -$LK,"FAT32FileFind",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,286",BI=347$ +$LK,"QueueCount",A="FL:::/Kernel/KDataTypes.HC,65",BI=344$ +$LK,"FAT32FileFind",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,286",BI=345$ $LK,"GSF_SHIFT_ESC_EXIT",A="FL:::/Kernel/KernelA.HH,3725"$ $LK,"SFG_WHOLE_LABELS",A="FL:::/Kernel/KernelA.HH,3746"$ $LK,"SEMA_SINGLE_USER",A="FL:::/Kernel/KernelA.HH,621"$ @@ -1599,8 +1598,8 @@ $LK,"FUf_WHOLE_LABELS",A="FL:::/Kernel/KernelA.HH,2561"$ $LK,"DOCf_DO_FULL_REFRESH",A="FL:::/Kernel/KernelA.HH,1328"$ $LK,"DOCf_DONT_SHOW",A="FL:::/Kernel/KernelA.HH,1322"$ $LK,"DOCF_DONT_SHOW",A="FL:::/Kernel/KernelA.HH,1285"$ -$LK,"MsHardSpeedSet",A="FL:::/Kernel/SerialDev/Mouse.HC,186",BI=348$ -$LK,"DirTreeDel2",A="FL:::/Kernel/BlkDev/DiskDirA.HC,46",BI=349$ +$LK,"MsHardSpeedSet",A="FL:::/Kernel/SerialDev/Mouse.HC,186",BI=346$ +$LK,"DirTreeDel2",A="FL:::/Kernel/BlkDev/DiskDirA.HC,46",BI=347$ $LK,"FUF_JUST_TXT",A="FL:::/Kernel/KernelA.HH,2579"$ $LK,"FUf_JUST_TXT",A="FL:::/Kernel/KernelA.HH,2551"$ $LK,"DOCT_DFT_BACKGROUND",A="FL:::/Kernel/KernelA.HH,923"$ @@ -1611,8 +1610,8 @@ $LK,"HashFind",A="FL:::/Kernel/KHashA.HC,255"$ $LK,"D3Cross",A="FL:::/Kernel/KernelB.HH,148"$ $LK,"DOCEF_ESC",A="FL:::/Kernel/KernelA.HH,1004"$ $LK,"_FREE",A="FL:::/Kernel/Mem/MAllocFree.HC,224"$ -$LK,"SrcLineNum",A="FL:::/Kernel/FunSeg.HC,206",BI=350$ -$LK,"ATAPIClose",A="FL:::/Kernel/BlkDev/DiskATA.HC,524",BI=351$ +$LK,"SrcLineNum",A="FL:::/Kernel/FunSeg.HC,206",BI=348$ +$LK,"ATAPIClose",A="FL:::/Kernel/BlkDev/DiskATA.HC,524",BI=349$ $LK,"DOCT_MACRO",A="FL:::/Kernel/KernelA.HH,938"$ $LK,"CH_SHIFT_ESC",A="FL:::/Kernel/KernelA.HH,3455"$ $LK,"Abs",A="FL:::/Kernel/KernelB.HH,96"$ @@ -1626,10 +1625,10 @@ $LK,"DOCEf_RIGHT_X",A="FL:::/Kernel/KernelA.HH,1082"$ $LK,"DOCEF_RIGHT_X",A="FL:::/Kernel/KernelA.HH,994"$ $LK,"DCF_FILL_NOT_COLOR",A="FL:::/Kernel/KernelA.HH,3582"$ $LK,"WIF_FOCUS_TASK_MS_WHEEL",A="FL:::/Kernel/KernelA.HH,1439"$ -$LK,"Debug",A="FL:::/Kernel/KDebug.HC,649",BI=352$ +$LK,"Debug",A="FL:::/Kernel/KDebug.HC,649",BI=350$ $LK,"MESSAGE_KEY_UP",A="FL:::/Kernel/KernelA.HH,3177"$ $LK,"DOCEF_LEN",A="FL:::/Kernel/KernelA.HH,971"$ -$LK,"FileAttr",A="FL:::/Kernel/BlkDev/DiskStrA.HC,238",BI=353$ +$LK,"FileAttr",A="FL:::/Kernel/BlkDev/DiskStrA.HC,238",BI=351$ $LK,"_MEMSET",A="FL:::/Kernel/KUtils.HC,3"$ $LK,"ROP_COLLISION",A="FL:::/Kernel/KernelA.HH,2900"$ $LK,"TK_PLUS_PLUS",A="FL:::/Kernel/KernelA.HH,2088"$ @@ -1640,14 +1639,14 @@ $LK,"VGAP_REG_WRITE",A="FL:::/Kernel/KernelA.HH,3675"$ $LK,"FUF_EXPAND",A="FL:::/Kernel/KernelA.HH,2575"$ $LK,"FUf_EXPAND",A="FL:::/Kernel/KernelA.HH,2547"$ $LK,"DOCEf_DEREF_DATA",A="FL:::/Kernel/KernelA.HH,1102"$ -$LK,"Del",A="FL:::/Kernel/BlkDev/DiskCopy.HC,82",BI=354$ +$LK,"Del",A="FL:::/Kernel/BlkDev/DiskCopy.HC,82",BI=352$ $LK,"IDTET_TASK",A="FL:::/Kernel/KernelA.HH,294"$ -$LK,"TaskValidate",A="FL:::/Kernel/KTask.HC,22",BI=355$ -$LK,"FAT32Init",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,22",BI=356$ +$LK,"TaskValidate",A="FL:::/Kernel/KTask.HC,22",BI=353$ +$LK,"FAT32Init",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,22",BI=354$ $LK,"LAPIC_ARIBITRATION_PRIORITY",A="FL:::/Kernel/KernelA.HH,503"$ $LK,"fp_set_std_palette",A="FL:::/Kernel/KGlobals.HC,35"$ $LK,"keydev",A="FL:::/Kernel/KGlobals.HC,27"$ -$LK,"MountIDEAuto",A="FL:::/Kernel/BlkDev/DiskATAId.HC,263",BI=357$ +$LK,"MountIDEAuto",A="FL:::/Kernel/BlkDev/DiskATAId.HC,263",BI=355$ $LK,"HashBucketFind",A="FL:::/Kernel/KHashA.HC,260"$ $LK,"OCF_ALIAS",A="FL:::/Kernel/KernelA.HH,1959"$ $LK,"IC_BODY_SIZE",A="FL:::/Kernel/KernelA.HH,1634"$ @@ -1658,70 +1657,71 @@ $LK,"HTt_WORD",A="FL:::/Kernel/KernelA.HH,664"$ $LK,"SEMA_DSK_CACHE",A="FL:::/Kernel/KernelA.HH,622"$ $LK,"FUG_FILE_FIND",A="FL:::/Kernel/KernelA.HH,2596"$ $LK,"I_PAGE_FAULT",A="FL:::/Kernel/KernelA.HH,304"$ -$LK,"SysGlobalsInit",A="FL:::/Kernel/KMain.HC,1",BI=358$ +$LK,"SysGlobalsInit",A="FL:::/Kernel/KMain.HC,1",BI=356$ $LK,"CProgress",A="FL:::/Kernel/KernelA.HH,3861"$ $LK,"Arg",A="FL:::/Kernel/KernelB.HH,122"$ $LK,"FSt_ISO9660",A="FL:::/Kernel/KernelA.HH,2661"$ $LK,"CISOPriDesc",A="FL:::/Kernel/KernelA.HH,2475"$ $LK,"CallExtNum",A="FL:::/Kernel/KernelB.HH,55"$ -$LK,"DirFile",A="FL:::/Kernel/BlkDev/DiskStrA.HC,294",BI=359$ -$LK,"TimeCal",A="FL:::/Kernel/KMisc.HC,85",BI=360$ +$LK,"DirFile",A="FL:::/Kernel/BlkDev/DiskStrA.HC,294",BI=357$ +$LK,"FifoI64Count",A="FL:::/Kernel/KDataTypes.HC,312",BI=358$ +$LK,"TimeCal",A="FL:::/Kernel/KMisc.HC,85",BI=359$ $LK,"DOCEF_TAG",A="FL:::/Kernel/KernelA.HH,970"$ $LK,"Btc",A="FL:::/Kernel/KernelB.HH,16"$ $LK,"CCF_KEEP_NEW_LINES",A="FL:::/Kernel/KernelA.HH,2145"$ $LK,"MDF_RIP_DISP32",A="FL:::/Kernel/KernelA.HH,1596"$ -$LK,"Dir",A="FL:::/Kernel/BlkDev/DiskDirB.HC,102",BI=361$ +$LK,"Dir",A="FL:::/Kernel/BlkDev/DiskDirB.HC,102",BI=360$ $LK,"Bsf",A="FL:::/Kernel/KernelB.HH,10"$ $LK,"MDf_RIP_DISP32",A="FL:::/Kernel/KernelA.HH,1588"$ -$LK,"DirMk",A="FL:::/Kernel/BlkDev/DiskDirB.HC,162",BI=362$ +$LK,"DirMk",A="FL:::/Kernel/BlkDev/DiskDirB.HC,162",BI=361$ $LK,"ECF_HAS_PUSH_CMP",A="FL:::/Kernel/KernelA.HH,1636"$ $LK,"WIf_SELF_GRAB_SCROLL",A="FL:::/Kernel/KernelA.HH,1456"$ $LK,"DOCT_PAGE_BREAK",A="FL:::/Kernel/KernelA.HH,909"$ -$LK,"ClusBlkWrite",A="FL:::/Kernel/BlkDev/DiskClus.HC,86",BI=363$ +$LK,"ClusBlkWrite",A="FL:::/Kernel/BlkDev/DiskClus.HC,86",BI=362$ $LK,"MLF_LASTCLASS",A="FL:::/Kernel/KernelA.HH,780"$ $LK,"_R8",A="FL:::/Kernel/KernelA.HH,3378"$ $LK,"_R9",A="FL:::/Kernel/KernelA.HH,3379"$ -$LK,"FileRead",A="FL:::/Kernel/BlkDev/DiskFile.HC,1",BI=364$ +$LK,"FileRead",A="FL:::/Kernel/BlkDev/DiskFile.HC,1",BI=363$ $LK,"DOCf_HIGHLIGHT",A="FL:::/Kernel/KernelA.HH,1332"$ $LK,"DOCF_HIGHLIGHT",A="FL:::/Kernel/KernelA.HH,1294"$ $LK,"DOCT_HIGHLIGHT",A="FL:::/Kernel/KernelA.HH,925"$ $LK,"_FAR_CALL32",A="FL:::/Kernel/PCIBIOS.HC,69"$ $LK,"DOCEF_SEL",A="FL:::/Kernel/KernelA.HH,1048"$ $LK,"IEF_IMM_NOT_REL",A="FL:::/Kernel/KernelA.HH,417"$ -$LK,"FAT32DirFill",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,229",BI=365$ +$LK,"FAT32DirFill",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,229",BI=364$ $LK,"Carry",A="FL:::/Kernel/KernelB.HH,251"$ $LK,"Cos",A="FL:::/Kernel/KernelB.HH,98"$ -$LK,"Clamp",A="FL:::/Kernel/KMathB.HC,1",BI=366$ +$LK,"Clamp",A="FL:::/Kernel/KMathB.HC,1",BI=365$ $LK,"BDF_FMT",A="FL:::/Kernel/KernelA.HH,2615"$ -$LK,"MsHardDriverInstall",A="FL:::/Kernel/SerialDev/Mouse.HC,294",BI=367$ -$LK,"GetMessage",A="FL:::/Kernel/SerialDev/Message.HC,95",BI=368$ +$LK,"MsHardDriverInstall",A="FL:::/Kernel/SerialDev/Mouse.HC,294",BI=366$ +$LK,"GetMessage",A="FL:::/Kernel/SerialDev/Message.HC,95",BI=367$ $LK,"Bsr",A="FL:::/Kernel/KernelB.HH,12"$ $LK,"SYS_PROGRESS1_MAX",A="FL:::/Kernel/KStart32.HC,42"$ $LK,"GR_Z_ALL",A="FL:::/Kernel/KernelA.HH,3561"$ $LK,"CMasterBoot",A="FL:::/Kernel/KernelA.HH,2326"$ -$LK,"Fix",A="FL:::/Kernel/EdLite.HC,337",BI=369$ +$LK,"Fix",A="FL:::/Kernel/EdLite.HC,337",BI=368$ $LK,"Btr",A="FL:::/Kernel/KernelB.HH,18"$ $LK,"_LN",A="FL:::/Kernel/KMathA.HC,614"$ $LK,"OPTf_WARN_UNUSED_VAR",A="FL:::/Kernel/KernelA.HH,1548"$ $LK,"DOCF_SUPERSCRIPT_MODE",A="FL:::/Kernel/KernelA.HH,1303"$ $LK,"RFLAGf_CARRY",A="FL:::/Kernel/KernelA.HH,321"$ -$LK,"FAT32FileRead",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,355",BI=370$ -$LK,"DirFilesFlatten",A="FL:::/Kernel/BlkDev/DiskDirA.HC,133",BI=371$ -$LK,"FileExtDot",A="FL:::/Kernel/BlkDev/DiskStrA.HC,1",BI=372$ +$LK,"FAT32FileRead",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,355",BI=369$ +$LK,"DirFilesFlatten",A="FL:::/Kernel/BlkDev/DiskDirA.HC,133",BI=370$ +$LK,"FileExtDot",A="FL:::/Kernel/BlkDev/DiskStrA.HC,1",BI=371$ $LK,"Bts",A="FL:::/Kernel/KernelB.HH,20"$ $LK,"CMemBlk",A="FL:::/Kernel/KernelA.HH,2814"$ $LK,"DOCEF_LST",A="FL:::/Kernel/KernelA.HH,1022"$ -$LK,"Man",A="FL:::/Kernel/FunSeg.HC,346",BI=373$ +$LK,"Man",A="FL:::/Kernel/FunSeg.HC,346",BI=372$ $LK,"TK_SHR_EQU",A="FL:::/Kernel/KernelA.HH,2102"$ $LK,"CDATE_FREQ",A="FL:::/Kernel/KernelA.HH,572"$ -$LK,"FilesFind",A="FL:::/Kernel/BlkDev/DiskFind.HC,27",BI=374$ +$LK,"FilesFind",A="FL:::/Kernel/BlkDev/DiskFind.HC,27",BI=373$ $LK,"_HASH_FIND",A="FL:::/Kernel/KHashA.HC,129"$ $LK,"MSize",A="FL:::/Kernel/Mem/MAllocFree.HC,384"$ $LK,"CSysFixedArea",A="FL:::/Kernel/KernelA.HH,3415"$ -$LK,"Fmt",A="FL:::/Kernel/BlkDev/DiskFmt.HC,55",BI=375$ -$LK,"ExeCmdLine",A="FL:::/Kernel/KTask.HC,302",BI=376$ +$LK,"Fmt",A="FL:::/Kernel/BlkDev/DiskFmt.HC,55",BI=374$ +$LK,"ExeCmdLine",A="FL:::/Kernel/KTask.HC,302",BI=375$ $LK,"Log10",A="FL:::/Kernel/KernelB.HH,135"$ -$LK,"FifoI64Flush",A="FL:::/Kernel/KDataTypes.HC,304",BI=377$ +$LK,"FifoI64Flush",A="FL:::/Kernel/KDataTypes.HC,304",BI=376$ $LK,"InvlPg",A="FL:::/Kernel/KernelB.HH,284"$ $LK,"CallExtStr",A="FL:::/Kernel/KernelB.HH,46"$ $LK,"VGAM_GRAPHICS",A="FL:::/Kernel/KernelA.HH,3663"$ @@ -1732,11 +1732,11 @@ $LK,"CViewAngles",A="FL:::/Kernel/KernelA.HH,3058"$ $LK,"CArrayDim",A="FL:::/Kernel/KernelA.HH,787"$ $LK,"AC_FILLINS_NUM",A="FL:::/Kernel/KernelA.HH,1496"$ $LK,"Ff_INTERNAL",A="FL:::/Kernel/KernelA.HH,856"$ -$LK,"Name2DirClus",A="FL:::/Kernel/BlkDev/DiskStrB.HC,10",BI=378$ +$LK,"Name2DirClus",A="FL:::/Kernel/BlkDev/DiskStrB.HC,10",BI=377$ $LK,"Fclex",A="FL:::/Kernel/KernelB.HH,129"$ $LK,"MDF_DISP",A="FL:::/Kernel/KernelA.HH,1594"$ $LK,"MDf_DISP",A="FL:::/Kernel/KernelA.HH,1586"$ -$LK,"Blink",A="FL:::/Kernel/KMisc.HC,130",BI=379$ +$LK,"Blink",A="FL:::/Kernel/KMisc.HC,130",BI=378$ $LK,"IET_ZEROED_DATA_HEAP",A="FL:::/Kernel/KernelA.HH,427"$ $LK,"RFLAGf_V8086",A="FL:::/Kernel/KernelA.HH,334"$ $LK,"IDTET_TRAP",A="FL:::/Kernel/KernelA.HH,296"$ @@ -1746,17 +1746,17 @@ $LK,"DOCf_BLINK",A="FL:::/Kernel/KernelA.HH,1334"$ $LK,"DOCF_BLINK",A="FL:::/Kernel/KernelA.HH,1296"$ $LK,"DOCEf_HIGHLIGHT",A="FL:::/Kernel/KernelA.HH,1050"$ $LK,"DOCEF_HIGHLIGHT",A="FL:::/Kernel/KernelA.HH,1044"$ -$LK,"SysSymImportsResolve",A="FL:::/Kernel/KLoad.HC,55",BI=380$ +$LK,"SysSymImportsResolve",A="FL:::/Kernel/KLoad.HC,55",BI=379$ $LK,"RS_ATTR_HIDDEN",A="FL:::/Kernel/KernelA.HH,2498"$ $LK,"TaskEndNow",A="FL:::/Kernel/Sched.HC,285"$ -$LK,"Max",A="FL:::/Kernel/KMathB.HC,18",BI=381$ +$LK,"Max",A="FL:::/Kernel/KMathB.HC,18",BI=380$ $LK,"SYS_HASH_FIND",A="FL:::/Kernel/KHashA.HC,89"$ $LK,"ROPF_DITHER",A="FL:::/Kernel/KernelA.HH,2909"$ $LK,"ICF_PREV_DELETED",A="FL:::/Kernel/KernelA.HH,1630"$ $LK,"WIG_DBL_CLICK",A="FL:::/Kernel/KernelA.HH,1443"$ $LK,"ToF64",A="FL:::/Kernel/KernelB.HH,120"$ $LK,"SYS_PROGRESS2_MAX",A="FL:::/Kernel/KStart32.HC,47"$ -$LK,"Break",A="FL:::/Kernel/KExcept.HC,117",BI=382$ +$LK,"Break",A="FL:::/Kernel/KExcept.HC,117",BI=381$ $LK,"CH_SHIFT_SPACE",A="FL:::/Kernel/KernelA.HH,3456"$ $LK,"JOBT_CALL",A="FL:::/Kernel/KernelA.HH,3144"$ $LK,"ROPBF_DITHER",A="FL:::/Kernel/KernelA.HH,2895"$ @@ -1765,30 +1765,29 @@ $LK,"SetRAX",A="FL:::/Kernel/KernelB.HH,258"$ $LK,"CISODirEntry",A="FL:::/Kernel/KernelA.HH,2468"$ $LK,"ICF_RES_TO_F64",A="FL:::/Kernel/KernelA.HH,1602"$ $LK,"DOC_COLOR_EXPORT_SYS_SYM",A="FL:::/Kernel/KernelA.HH,1150"$ -$LK,"Min",A="FL:::/Kernel/KMathB.HC,10",BI=383$ -$LK,"mp_cnt",A="FL:::/Kernel/KernelB.HH,239"$ +$LK,"Min",A="FL:::/Kernel/KMathB.HC,10",BI=382$ $LK,"Exp",A="FL:::/Kernel/KernelB.HH,128"$ $LK,"DCF_RECORD_EXTENTS",A="FL:::/Kernel/KernelA.HH,3583"$ -$LK,"FAT32FilesFind",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,832",BI=384$ +$LK,"FAT32FilesFind",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,832",BI=383$ $LK,"_HASH_ADD_AFTER",A="FL:::/Kernel/KHashA.HC,191"$ -$LK,"SrvTaskCont",A="FL:::/Kernel/KTask.HC,368",BI=385$ +$LK,"SrvTaskCont",A="FL:::/Kernel/KTask.HC,368",BI=384$ $LK,"RS_ATTR_READ_ONLY",A="FL:::/Kernel/KernelA.HH,2497"$ $LK,"ICF_USE_UNSIGNED",A="FL:::/Kernel/KernelA.HH,1609"$ -$LK,"DriveFATBlkSet",A="FL:::/Kernel/BlkDev/DiskDrive.HC,117",BI=386$ -$LK,"ATAGetDevId",A="FL:::/Kernel/BlkDev/DiskATA.HC,163",BI=387$ +$LK,"DriveFATBlkSet",A="FL:::/Kernel/BlkDev/DiskDrive.HC,117",BI=385$ +$LK,"ATAGetDevId",A="FL:::/Kernel/BlkDev/DiskATA.HC,163",BI=386$ $LK,"ACD_FILLINS_NUM",A="FL:::/Kernel/KernelA.HH,1532"$ $LK,"DOCT_ERROR",A="FL:::/Kernel/KernelA.HH,947"$ -$LK,"CopySingle",A="FL:::/Kernel/BlkDev/DiskCopy.HC,23",BI=388$ +$LK,"CopySingle",A="FL:::/Kernel/BlkDev/DiskCopy.HC,23",BI=387$ $LK,"EXT_WIN_TO_TOP",A="FL:::/Kernel/KernelA.HH,596"$ -$LK,"ATAPIReadCapacity",A="FL:::/Kernel/BlkDev/DiskATA.HC,257",BI=389$ -$LK,"IsDir",A="FL:::/Kernel/BlkDev/DiskDirB.HC,87",BI=390$ +$LK,"ATAPIReadCapacity",A="FL:::/Kernel/BlkDev/DiskATA.HC,257",BI=388$ +$LK,"IsDir",A="FL:::/Kernel/BlkDev/DiskDirB.HC,87",BI=389$ $LK,"SetMSR",A="FL:::/Kernel/KernelB.HH,269"$ $LK,"mem_heap_limit",A="FL:::/Kernel/KernelB.HH,195"$ $LK,"ToI64",A="FL:::/Kernel/KernelB.HH,121"$ $LK,"REG_REGS_NUM",A="FL:::/Kernel/KernelA.HH,1793"$ $LK,"IET_MAIN",A="FL:::/Kernel/KernelA.HH,428"$ $LK,"MESSAGE_NULL",A="FL:::/Kernel/KernelA.HH,3174"$ -$LK,"ScanCode2KeyName",A="FL:::/Kernel/SerialDev/Keyboard.HC,248",BI=391$ +$LK,"ScanCode2KeyName",A="FL:::/Kernel/SerialDev/Keyboard.HC,248",BI=390$ $LK,"DOCf_INVERT",A="FL:::/Kernel/KernelA.HH,1335"$ $LK,"DOCF_INVERT",A="FL:::/Kernel/KernelA.HH,1297"$ $LK,"SEMA_FAR_CALL32",A="FL:::/Kernel/KernelA.HH,623"$ @@ -1796,35 +1795,35 @@ $LK,"Tan",A="FL:::/Kernel/KernelB.HH,118"$ $LK,"SYS_PROGRESS3_MAX",A="FL:::/Kernel/KStart32.HC,52"$ $LK,"SUF_REM_LEADING",A="FL:::/Kernel/KernelA.HH,3731"$ $LK,"OPTf_USE_IMM64",A="FL:::/Kernel/KernelA.HH,1558"$ -$LK,"Raw",A="FL:::/Kernel/KMisc.HC,290",BI=392$ -$LK,"MemPagAlloc",A="FL:::/Kernel/Mem/MemPag.HC,11",BI=393$ +$LK,"Raw",A="FL:::/Kernel/KMisc.HC,290",BI=391$ +$LK,"MemPagAlloc",A="FL:::/Kernel/Mem/MemPag.HC,11",BI=392$ $LK,"OPTf_GLBLS_ON_DATA_HEAP",A="FL:::/Kernel/KernelA.HH,1555"$ -$LK,"KbdInit",A="FL:::/Kernel/SerialDev/Keyboard.HC,424",BI=394$ +$LK,"KbdInit",A="FL:::/Kernel/SerialDev/Keyboard.HC,424",BI=393$ $LK,"ToBool",A="FL:::/Kernel/KernelB.HH,119"$ $LK,"TASKf_KILL_AFTER_DBG",A="FL:::/Kernel/KernelA.HH,3242"$ $LK,"PUT_HEX_U16",A="FL:::/Kernel/StrA.HC,37"$ $LK,"PUT_HEX_U32",A="FL:::/Kernel/StrA.HC,30"$ -$LK,"ATAPIStartStop",A="FL:::/Kernel/BlkDev/DiskATA.HC,144",BI=395$ +$LK,"ATAPIStartStop",A="FL:::/Kernel/BlkDev/DiskATA.HC,144",BI=394$ $LK,"_SIGN",A="FL:::/Kernel/KMathA.HC,347"$ $LK,"PRTF_NEG_E",A="FL:::/Kernel/KernelA.HH,3879"$ $LK,"REGT_R8",A="FL:::/Kernel/KernelA.HH,744"$ $LK,"SEMA_DEV_MEM",A="FL:::/Kernel/KernelA.HH,624"$ $LK,"log10_2",A="FL:::/Kernel/KernelA.HH,56"$ -$LK,"PrintErr",A="FL:::/Kernel/StrPrint.HC,906",BI=396$ -$LK,"FifoU8Remove",A="FL:::/Kernel/KDataTypes.HC,190",BI=397$ +$LK,"PrintErr",A="FL:::/Kernel/StrPrint.HC,906",BI=395$ +$LK,"FifoU8Remove",A="FL:::/Kernel/KDataTypes.HC,190",BI=396$ $LK,"ROPF_TWO_SIDED",A="FL:::/Kernel/KernelA.HH,2906"$ $LK,"MEM_ZENITH_STK",A="FL:::/Kernel/KernelA.HH,2840"$ $LK,"BDF_READ_CACHE",A="FL:::/Kernel/KernelA.HH,2614"$ $LK,"SCF_INS",A="FL:::/Kernel/KernelA.HH,3490"$ $LK,"CPUf_RAN_A_TASK",A="FL:::/Kernel/KernelA.HH,3388"$ $LK,"BDf_READ_CACHE",A="FL:::/Kernel/KernelA.HH,2624"$ -$LK,"Snd",A="FL:::/Kernel/KMisc.HC,179",BI=398$ -$LK,"GetChar",A="FL:::/Kernel/SerialDev/Message.HC,182",BI=399$ +$LK,"Snd",A="FL:::/Kernel/KMisc.HC,179",BI=397$ +$LK,"GetChar",A="FL:::/Kernel/SerialDev/Message.HC,182",BI=398$ $LK,"Sin",A="FL:::/Kernel/KernelB.HH,105"$ $LK,"TK_OR_OR",A="FL:::/Kernel/KernelA.HH,2099"$ $LK,"SEMA_TMBEAT",A="FL:::/Kernel/KernelA.HH,630"$ $LK,"SYS_PCIBIOS_SERVICE_CALL",A="FL:::/Kernel/PCIBIOS.HC,46"$ -$LK,"Now",A="FL:::/Kernel/KDate.HC,191",BI=400$ +$LK,"Now",A="FL:::/Kernel/KDate.HC,191",BI=399$ $LK,"Fldcw",A="FL:::/Kernel/KernelB.HH,130"$ $LK,"TTS_ED_FILENAME",A="FL:::/Kernel/KernelA.HH,3225"$ $LK,"WIf_FOCUS_TASK_BORDER",A="FL:::/Kernel/KernelA.HH,1467"$ @@ -1835,6 +1834,7 @@ $LK,"sys_progresses",A="FL:::/Kernel/KernelB.HH,234"$ $LK,"CMenuEntry",A="FL:::/Kernel/KernelA.HH,3090"$ $LK,"OC_NOP2",A="FL:::/Kernel/KernelA.HH,1774"$ $LK,"DOCT_RIGHT_MARGIN",A="FL:::/Kernel/KernelA.HH,916"$ +$LK,"FifoU8Count",A="FL:::/Kernel/KDataTypes.HC,227",BI=400$ $LK,"PUT_HEX_U64",A="FL:::/Kernel/StrA.HC,23"$ $LK,"SYS_KERNEL",A="FL:::/Kernel/KStart16.HC,17"$ $LK,"RFLAGf_PARITY",A="FL:::/Kernel/KernelA.HH,322"$ @@ -1967,7 +1967,6 @@ $LK,"SFF_IGNORE_CASE",A="FL:::/Kernel/KernelA.HH,3743"$ $LK,"HashRemDel",A="FL:::/Kernel/KHashA.HC,264"$ $LK,"REG_RSI",A="FL:::/Kernel/KernelA.HH,1790"$ $LK,"HashAdd",A="FL:::/Kernel/KHashA.HC,262"$ -$LK,"mp_cnt_lock",A="FL:::/Kernel/KernelB.HH,241"$ $LK,"MLF_DOT_DOT_DOT",A="FL:::/Kernel/KernelA.HH,783"$ $LK,"IsSuspended",A="FL:::/Kernel/KTask.HC,91",BI=426$ $LK,"CAlloc",A="FL:::/Kernel/Mem/MAllocFree.HC,395",BI=427$ @@ -2178,6 +2177,7 @@ $LK,"CGrSym",A="FL:::/Kernel/KernelA.HH,3592"$ $LK,"ATAR0_FEAT",A="FL:::/Kernel/KernelA.HH,2289"$ $LK,"RLF_HOME",A="FL:::/Kernel/KernelA.HH,491"$ $LK,"RLf_HOME",A="FL:::/Kernel/KernelA.HH,469"$ +$LK,"BCount",A="FL:::/Kernel/KMisc.HC,39",BI=466$ $LK,"SC_ENTER",A="FL:::/Kernel/KernelA.HH,3500"$ $LK,"MESSAGE_MS_L_UP",A="FL:::/Kernel/KernelA.HH,3180"$ $LK,"LTCYAN",A="FL:::/Kernel/KernelA.HH,2925"$ @@ -2187,16 +2187,16 @@ $LK,"RECALCt_TO_SCRN",A="FL:::/Kernel/KernelA.HH,1361"$ $LK,"HTT_IMPORT_SYS_SYM",A="FL:::/Kernel/KernelA.HH,688"$ $LK,"HTT_EXPORT_SYS_SYM",A="FL:::/Kernel/KernelA.HH,687"$ $LK,"char_bmp_filename",A="FL:::/Kernel/StrA.HC,345"$ -$LK,"FunSegCacheAdd",A="FL:::/Kernel/FunSeg.HC,92",BI=466$ +$LK,"FunSegCacheAdd",A="FL:::/Kernel/FunSeg.HC,92",BI=467$ $LK,"CTRLT_GENERIC",A="FL:::/Kernel/KernelA.HH,3038"$ $LK,"CCF_KEEP_AT_SIGN",A="FL:::/Kernel/KernelA.HH,2148"$ $LK,"RS_ATTR_DIR",A="FL:::/Kernel/KernelA.HH,2501"$ $LK,"CCF_POSTDEC",A="FL:::/Kernel/KernelA.HH,2163"$ $LK,"ICF_ARG1_WAS_STK",A="FL:::/Kernel/KernelA.HH,1618"$ -$LK,"FileExtRemove",A="FL:::/Kernel/BlkDev/DiskStrA.HC,10",BI=467$ +$LK,"FileExtRemove",A="FL:::/Kernel/BlkDev/DiskStrA.HC,10",BI=468$ $LK,"MEM_PHYSICAL_SPACE",A="FL:::/Kernel/KStart16.HC,33"$ -$LK,"DirContextDel",A="FL:::/Kernel/BlkDev/DiskDirContext.HC,1",BI=468$ -$LK,"StrPrintFlags",A="FL:::/Kernel/StrB.HC,177",BI=469$ +$LK,"DirContextDel",A="FL:::/Kernel/BlkDev/DiskDirContext.HC,1",BI=469$ +$LK,"StrPrintFlags",A="FL:::/Kernel/StrB.HC,177",BI=470$ $LK,"SYS_PROGRESS3_T0",A="FL:::/Kernel/KStart32.HC,53"$ $LK,"TK_IFNDEF",A="FL:::/Kernel/KernelA.HH,2112"$ $LK,"CMT_FLOAT_CONSTS",A="FL:::/Kernel/KernelA.HH,1702"$ @@ -2204,12 +2204,12 @@ $LK,"CBinFile",A="FL:::/Kernel/KernelA.HH,385"$ $LK,"LAPIC_SVR",A="FL:::/Kernel/KernelA.HH,511"$ $LK,"CGridGlobals",A="FL:::/Kernel/KernelA.HH,3020"$ $LK,"CCompGlobals",A="FL:::/Kernel/KernelA.HH,2226"$ -$LK,"StrPrintFunSeg",A="FL:::/Kernel/FunSeg.HC,134",BI=470$ -$LK,"HashVal",A="FL:::/Kernel/KHashB.HC,9",BI=471$ +$LK,"StrPrintFunSeg",A="FL:::/Kernel/FunSeg.HC,134",BI=471$ +$LK,"HashVal",A="FL:::/Kernel/KHashB.HC,9",BI=472$ $LK,"DOCEF_DFT_RAW_TYPE",A="FL:::/Kernel/KernelA.HH,1030"$ $LK,"IET_IMM_U32",A="FL:::/Kernel/KernelA.HH,414"$ $LK,"IET_IMM_U16",A="FL:::/Kernel/KernelA.HH,412"$ -$LK,"KbdMsInit",A="FL:::/Kernel/SerialDev/Mouse.HC,348",BI=472$ +$LK,"KbdMsInit",A="FL:::/Kernel/SerialDev/Mouse.HC,348",BI=473$ $LK,"SYS_PROGRESS1_TF",A="FL:::/Kernel/KStart32.HC,44"$ $LK,"TASKf_DISABLE_BPTS",A="FL:::/Kernel/KernelA.HH,3237"$ $LK,"BDT_NULL",A="FL:::/Kernel/KernelA.HH,2601"$ @@ -2224,10 +2224,10 @@ $LK,"PRTF_LEFT_JUSTIFY",A="FL:::/Kernel/KernelA.HH,3870"$ $LK,"FUF_SINGLE",A="FL:::/Kernel/KernelA.HH,2576"$ $LK,"FUf_SINGLE",A="FL:::/Kernel/KernelA.HH,2548"$ $LK,"DOCEf_DFT_RAW_TYPE",A="FL:::/Kernel/KernelA.HH,1116"$ -$LK,"DVDImageWriteTask",A="FL:::/Kernel/BlkDev/DiskCDDVD.HC,113",BI=473$ +$LK,"DVDImageWriteTask",A="FL:::/Kernel/BlkDev/DiskCDDVD.HC,113",BI=474$ $LK,"LTGRAY",A="FL:::/Kernel/KernelA.HH,2921"$ -$LK,"CoreAPSethInit",A="FL:::/Kernel/MultiProc.HC,275",BI=474$ -$LK,"IRQKbd",A="FL:::/Kernel/SerialDev/Keyboard.HC,411",BI=475$ +$LK,"CoreAPSethInit",A="FL:::/Kernel/MultiProc.HC,275",BI=475$ +$LK,"IRQKbd",A="FL:::/Kernel/SerialDev/Keyboard.HC,411",BI=476$ $LK,"SwapU32",A="FL:::/Kernel/KernelB.HH,115"$ $LK,"SwapU16",A="FL:::/Kernel/KernelB.HH,113"$ $LK,"ARf_MESH_ED",A="FL:::/Kernel/KernelA.HH,3854"$ @@ -2239,8 +2239,8 @@ $LK,"pow10_I64",A="FL:::/Kernel/KGlobals.HC,15"$ $LK,"sys_num_spawned_tasks",A="FL:::/Kernel/KGlobals.HC,9"$ $LK,"CAUData",A="FL:::/Kernel/KernelA.HH,3775"$ $LK,"LAPIC_LVT_LINT0",A="FL:::/Kernel/KernelA.HH,522"$ -$LK,"ArcFinishCompression",A="FL:::/Kernel/Compress.HC,155",BI=476$ -$LK,"QueueDel",A="FL:::/Kernel/KDataTypes.HC,41",BI=477$ +$LK,"ArcFinishCompression",A="FL:::/Kernel/Compress.HC,155",BI=477$ +$LK,"QueueDel",A="FL:::/Kernel/KDataTypes.HC,41",BI=478$ $LK,"LAPIC_LVT_LINT1",A="FL:::/Kernel/KernelA.HH,523"$ $LK,"sys_winmgr_task",A="FL:::/Kernel/KGlobals.HC,11"$ $LK,"SYS_PROGRESS2_TF",A="FL:::/Kernel/KStart32.HC,49"$ @@ -2250,14 +2250,14 @@ $LK,"REG_R8",A="FL:::/Kernel/KernelA.HH,1792"$ $LK,"CMT_ARRAY_DIM",A="FL:::/Kernel/KernelA.HH,1703"$ $LK,"ACD_POS_CHAR",A="FL:::/Kernel/KernelA.HH,1529"$ $LK,"REGT_FSTK",A="FL:::/Kernel/KernelA.HH,749"$ -$LK,"JobQueueDel",A="FL:::/Kernel/Job.HC,7",BI=478$ +$LK,"JobQueueDel",A="FL:::/Kernel/Job.HC,7",BI=479$ $LK,"ARGT_MOFFS64",A="FL:::/Kernel/KernelA.HH,1927"$ $LK,"DOCF_COLOR_NAMES",A="FL:::/Kernel/KernelA.HH,1276"$ $LK,"CRAXRBCRCXRDX",A="FL:::/Kernel/KernelA.HH,589"$ $LK,"_SAVE_EXCEPT_REGS",A="FL:::/Kernel/KExcept.HC,26"$ $LK,"MDf_IMM",A="FL:::/Kernel/KernelA.HH,1584"$ $LK,"DOCf_COLOR_NAMES",A="FL:::/Kernel/KernelA.HH,1313"$ -$LK,"RoundI64",A="FL:::/Kernel/KMathB.HC,47",BI=479$ +$LK,"RoundI64",A="FL:::/Kernel/KMathB.HC,47",BI=480$ $LK,"EXT_HEAPLOG_FREE",A="FL:::/Kernel/KernelA.HH,599"$ $LK,"Fstsw",A="FL:::/Kernel/KernelB.HH,133"$ $LK,"TASKf_TASK_LOCK",A="FL:::/Kernel/KernelA.HH,3229"$ @@ -2265,7 +2265,7 @@ $LK,"CDrive",A="FL:::/Kernel/KernelA.HH,2688"$ $LK,"BDT_ATA",A="FL:::/Kernel/KernelA.HH,2603"$ $LK,"RFLAGf_RESUME",A="FL:::/Kernel/KernelA.HH,333"$ $LK,"C32_EAX",A="FL:::/Kernel/PCIBIOS.HC,58"$ -$LK,"PortNop",A="FL:::/Kernel/KMisc.HC,1",BI=480$ +$LK,"PortNop",A="FL:::/Kernel/KMisc.HC,1",BI=481$ $LK,"StrNCmp",A="FL:::/Kernel/StrA.HC,313"$ $LK,"FUF_PUBLIC",A="FL:::/Kernel/KernelA.HH,2573"$ $LK,"FUf_PUBLIC",A="FL:::/Kernel/KernelA.HH,2545"$ @@ -2280,33 +2280,33 @@ $LK,"LFSF_DOC",A="FL:::/Kernel/KernelA.HH,2045"$ $LK,"ACD_PRONUNCIATION_CHAR",A="FL:::/Kernel/KernelA.HH,1528"$ $LK,"ACD_PRONUNCIATION",A="FL:::/Kernel/KernelA.HH,1517"$ $LK,"C32_ECX",A="FL:::/Kernel/PCIBIOS.HC,60"$ -$LK,"FifoU8Peek",A="FL:::/Kernel/KDataTypes.HC,205",BI=481$ +$LK,"FifoU8Peek",A="FL:::/Kernel/KDataTypes.HC,205",BI=482$ $LK,"C32_EDX",A="FL:::/Kernel/PCIBIOS.HC,61"$ -$LK,"LoadPass1",A="FL:::/Kernel/KLoad.HC,67",BI=482$ +$LK,"LoadPass1",A="FL:::/Kernel/KLoad.HC,67",BI=483$ +$LK,"mp_count",A="FL:::/Kernel/KernelB.HH,239"$ $LK,"U8_MIN",A="FL:::/Kernel/KernelA.HH,27"$ -$LK,"DiskCacheQueueRemove",A="FL:::/Kernel/BlkDev/DiskCache.HC,46",BI=483$ +$LK,"DiskCacheQueueRemove",A="FL:::/Kernel/BlkDev/DiskCache.HC,46",BI=484$ $LK,"JOB_DONE",A="FL:::/Kernel/Job.HC,265"$ -$LK,"LoadPass2",A="FL:::/Kernel/KLoad.HC,154",BI=484$ -$LK,"MemPagTaskAlloc",A="FL:::/Kernel/Mem/MemPag.HC,114",BI=485$ +$LK,"LoadPass2",A="FL:::/Kernel/KLoad.HC,154",BI=485$ +$LK,"MemPagTaskAlloc",A="FL:::/Kernel/Mem/MemPag.HC,114",BI=486$ $LK,"ARf_MANAGE_SLIDER",A="FL:::/Kernel/KernelA.HH,3856"$ $LK,"CSndData",A="FL:::/Kernel/KernelA.HH,3781"$ $LK,"SC_PAGE_DOWN",A="FL:::/Kernel/KernelA.HH,3512"$ -$LK,"QueueVectU8Del",A="FL:::/Kernel/KDataTypes.HC,132",BI=486$ +$LK,"QueueVectU8Del",A="FL:::/Kernel/KDataTypes.HC,132",BI=487$ $LK,"OC_NOP",A="FL:::/Kernel/KernelA.HH,1770"$ $LK,"SYS_PROGRESS4_TF",A="FL:::/Kernel/KStart32.HC,59"$ $LK,"char_bmp_macro",A="FL:::/Kernel/StrA.HC,371"$ $LK,"C:/Doc/TimeCycles.DD",A="FL:::/Kernel/KernelB.HH,292"$ $LK,"DOCF_CARRIAGE_RETURN",A="FL:::/Kernel/KernelA.HH,1274"$ $LK,"MDf_REG",A="FL:::/Kernel/KernelA.HH,1585"$ -$LK,"ATAPISeek",A="FL:::/Kernel/BlkDev/DiskATA.HC,131",BI=487$ -$LK,"MPrintDate",A="FL:::/Kernel/StrPrint.HC,49",BI=488$ +$LK,"ATAPISeek",A="FL:::/Kernel/BlkDev/DiskATA.HC,131",BI=488$ +$LK,"MPrintDate",A="FL:::/Kernel/StrPrint.HC,49",BI=489$ $LK,"_BIT_FIELD_EXT_U32",A="FL:::/Kernel/KUtils.HC,167"$ $LK,"SC_F10",A="FL:::/Kernel/KernelA.HH,3526"$ -$LK,"Letter2BlkDev",A="FL:::/Kernel/BlkDev/DiskBlkDev.HC,180",BI=489$ +$LK,"Letter2BlkDev",A="FL:::/Kernel/BlkDev/DiskBlkDev.HC,180",BI=490$ $LK,"SC_F11",A="FL:::/Kernel/KernelA.HH,3527"$ $LK,"JOB_CONT",A="FL:::/Kernel/Job.HC,266"$ -$LK,"Silent",A="FL:::/Kernel/KMisc.HC,270",BI=490$ -$LK,"QueueCnt",A="FL:::/Kernel/KDataTypes.HC,65",BI=491$ +$LK,"Silent",A="FL:::/Kernel/KMisc.HC,270",BI=491$ $LK,"SC_F12",A="FL:::/Kernel/KernelA.HH,3528"$ $LK,"WIF_FOCUS_TASK_CTRLS",A="FL:::/Kernel/KernelA.HH,1434"$ $LK,"CCF_POSTINC",A="FL:::/Kernel/KernelA.HH,2162"$ @@ -2368,7 +2368,6 @@ $LK,"REGG_LOCAL_NON_PTR_VARS",A="FL:::/Kernel/KernelA.HH,1805"$ $LK,"DOCF_PLAIN_TEXT",A="FL:::/Kernel/KernelA.HH,1270"$ $LK,"CDebugInfo",A="FL:::/Kernel/KernelA.HH,723"$ $LK,"RawPutChar",A="FL:::/Kernel/Display.HC,1",BI=504$ -$LK,"FifoU8Cnt",A="FL:::/Kernel/KDataTypes.HC,227",BI=505$ $LK,"JOBf_FOCUS_MASTER",A="FL:::/Kernel/KernelA.HH,3130"$ $LK,"DOCf_PLAIN_TEXT",A="FL:::/Kernel/KernelA.HH,1307"$ $LK,"CArcEntry",A="FL:::/Kernel/KernelA.HH,3690"$ @@ -2385,9 +2384,9 @@ $LK,"DOCf_CARRIAGE_RETURN",A="FL:::/Kernel/KernelA.HH,1311"$ $LK,"MLMF_IS_STR",A="FL:::/Kernel/KernelA.HH,793"$ $LK,"SYS_TIMER0_PERIOD",A="FL:::/Kernel/KernelA.HH,574"$ $LK,"SET_FS_BASE",A="FL:::/Kernel/KUtils.HC,445"$ -$LK,"PutHex",A="FL:::/Kernel/StrA.HC,12",BI=506$ -$LK,"PopUp",A="FL:::/Kernel/Job.HC,376",BI=507$ -$LK,"FBlkWrite",A="FL:::/Kernel/BlkDev/DiskCFile.HC,181",BI=508$ +$LK,"PutHex",A="FL:::/Kernel/StrA.HC,12",BI=505$ +$LK,"PopUp",A="FL:::/Kernel/Job.HC,376",BI=506$ +$LK,"FBlkWrite",A="FL:::/Kernel/BlkDev/DiskCFile.HC,181",BI=507$ $LK,"DOCF_OVERSTRIKE",A="FL:::/Kernel/KernelA.HH,1301"$ $LK,"IOAPICARB",A="FL:::/Kernel/KernelA.HH,535"$ $LK,"DOCf_OVERSTRIKE",A="FL:::/Kernel/KernelA.HH,1339"$ @@ -2395,16 +2394,16 @@ $LK,"COREAP_16BIT_INIT_END",A="FL:::/Kernel/MultiProc.HC,27"$ $LK,"SCF_SHIFT",A="FL:::/Kernel/KernelA.HH,3480"$ $LK,"SCf_SHIFT",A="FL:::/Kernel/KernelA.HH,3465"$ $LK,"WIF_SELF_FOCUS",A="FL:::/Kernel/KernelA.HH,1419"$ -$LK,"StrLastOcc",A="FL:::/Kernel/StrA.HC,594",BI=509$ +$LK,"StrLastOcc",A="FL:::/Kernel/StrA.HC,594",BI=508$ $LK,"WIf_SELF_FOCUS",A="FL:::/Kernel/KernelA.HH,1450"$ -$LK,"FClose",A="FL:::/Kernel/BlkDev/DiskCFile.HC,73",BI=510$ +$LK,"FClose",A="FL:::/Kernel/BlkDev/DiskCFile.HC,73",BI=509$ $LK,"MDf_STK",A="FL:::/Kernel/KernelA.HH,1583"$ -$LK,"DriveTypeSet",A="FL:::/Kernel/BlkDev/DiskFmt.HC,1",BI=511$ +$LK,"DriveTypeSet",A="FL:::/Kernel/BlkDev/DiskFmt.HC,1",BI=510$ $LK,"PRTF_AUX_FMT_NUM",A="FL:::/Kernel/KernelA.HH,3876"$ $LK,"COLORS_NUM",A="FL:::/Kernel/KernelA.HH,2931"$ $LK,"IEF_GOTO_LABEL",A="FL:::/Kernel/KernelA.HH,1968"$ $LK,"CMT_GOTO_LABEL",A="FL:::/Kernel/KernelA.HH,1699"$ -$LK,"DriveIsWritable",A="FL:::/Kernel/BlkDev/DiskDrive.HC,206",BI=512$ +$LK,"DriveIsWritable",A="FL:::/Kernel/BlkDev/DiskDrive.HC,206",BI=511$ $LK,"mon_start_days1",A="FL:::/Kernel/KDate.HC,3"$ $LK,"BLKDEVS_NUM",A="FL:::/Kernel/KernelA.HH,2632"$ $LK,"HTF_GOTO_LABEL",A="FL:::/Kernel/KernelA.HH,711"$ @@ -2415,24 +2414,24 @@ $LK,"DFT_CACHE_LINE_WIDTH",A="FL:::/Kernel/KernelA.HH,604"$ $LK,"ATAR0_LCYL",A="FL:::/Kernel/KernelA.HH,2292"$ $LK,"ICf_DONT_PUSH_FLOAT0",A="FL:::/Kernel/KernelA.HH,1623"$ $LK,"JOB_EXIT",A="FL:::/Kernel/Job.HC,267"$ -$LK,"Sleep",A="FL:::/Kernel/KMisc.HC,155",BI=513$ +$LK,"Sleep",A="FL:::/Kernel/KMisc.HC,155",BI=512$ $LK,"FUf_DEL",A="FL:::/Kernel/KernelA.HH,2539"$ -$LK,"RedSeaMkDir",A="FL:::/Kernel/BlkDev/FileSysRedSea.HC,602",BI=514$ -$LK,"PutKey",A="FL:::/Kernel/KeyDev.HC,1",BI=515$ +$LK,"RedSeaMkDir",A="FL:::/Kernel/BlkDev/FileSysRedSea.HC,602",BI=513$ +$LK,"PutKey",A="FL:::/Kernel/KeyDev.HC,1",BI=514$ $LK,"_HASH_STR",A="FL:::/Kernel/KHashA.HC,120"$ $LK,"FUf_ALL",A="FL:::/Kernel/KernelA.HH,2541"$ $LK,"CAOTHeapGlobal",A="FL:::/Kernel/KernelA.HH,2000"$ -$LK,"QueueVectU8New",A="FL:::/Kernel/KDataTypes.HC,87",BI=516$ +$LK,"QueueVectU8New",A="FL:::/Kernel/KDataTypes.HC,87",BI=515$ $LK,"DOF_SIZE_MIN",A="FL:::/Kernel/KernelA.HH,1226"$ -$LK,"ScanMessage",A="FL:::/Kernel/SerialDev/Message.HC,37",BI=517$ +$LK,"ScanMessage",A="FL:::/Kernel/SerialDev/Message.HC,37",BI=516$ $LK,"sys_macro_task",A="FL:::/Kernel/KGlobals.HC,5"$ $LK,"CArcCompress",A="FL:::/Kernel/KernelA.HH,3716"$ -$LK,"FAT32AllocContiguousClus",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,500",BI=518$ +$LK,"FAT32AllocContiguousClus",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,500",BI=517$ $LK,"CHashOpcode",A="FL:::/Kernel/KernelA.HH,1960"$ $LK,"CTRL_ALT_DEL",A="FL:::/Kernel/KernelA.HH,634"$ -$LK,"FifoU8Ins",A="FL:::/Kernel/KDataTypes.HC,173",BI=519$ -$LK,"IsDebugMode",A="FL:::/Kernel/KMisc.HC,317",BI=520$ -$LK,"FATFromName",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,156",BI=521$ +$LK,"FifoU8Ins",A="FL:::/Kernel/KDataTypes.HC,173",BI=518$ +$LK,"IsDebugMode",A="FL:::/Kernel/KMisc.HC,317",BI=519$ +$LK,"FATFromName",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,156",BI=520$ $LK,"DOCf_SIZE_MIN",A="FL:::/Kernel/KernelA.HH,1317"$ $LK,"DOCF_SIZE_MIN",A="FL:::/Kernel/KernelA.HH,1280"$ $LK,"char_bmp_zero_tab_cr_nl_cursor_dollar",A="FL:::/Kernel/StrA.HC,368"$ @@ -2440,7 +2439,7 @@ $LK,"AAT_ADD_U32",A="FL:::/Kernel/KernelA.HH,1983"$ $LK,"AAT_ADD_U16",A="FL:::/Kernel/KernelA.HH,1981"$ $LK,"SC_PAUSE",A="FL:::/Kernel/KernelA.HH,3529"$ $LK,"TRANSPARENT",A="FL:::/Kernel/KernelA.HH,2913"$ -$LK,"XTalkStrWait",A="FL:::/Kernel/Job.HC,496",BI=522$ +$LK,"XTalkStrWait",A="FL:::/Kernel/Job.HC,496",BI=521$ $LK,"mem_physical_space",A="FL:::/Kernel/KernelB.HH,197"$ $LK,"CArcCtrl",A="FL:::/Kernel/KernelA.HH,3698"$ $LK,"SC_CTRL",A="FL:::/Kernel/KernelA.HH,3502"$ @@ -2449,17 +2448,18 @@ $LK,"ATAR1_CTRL",A="FL:::/Kernel/KernelA.HH,2297"$ $LK,"RECALCF_ADD_CURSOR",A="FL:::/Kernel/KernelA.HH,1365"$ $LK,"DOC_COLOR_BIN",A="FL:::/Kernel/KernelA.HH,1147"$ $LK,"Ff_NOARGPOP",A="FL:::/Kernel/KernelA.HH,855"$ -$LK,"EdLiteFileLine",A="FL:::/Kernel/EdLite.HC,316",BI=523$ -$LK,"FifoU8New",A="FL:::/Kernel/KDataTypes.HC,155",BI=524$ +$LK,"EdLiteFileLine",A="FL:::/Kernel/EdLite.HC,316",BI=522$ +$LK,"FifoU8New",A="FL:::/Kernel/KDataTypes.HC,155",BI=523$ $LK,"SC_HOME",A="FL:::/Kernel/KernelA.HH,3513"$ -$LK,"ATAPIWritePktWord",A="FL:::/Kernel/BlkDev/DiskATA.HC,106",BI=525$ -$LK,"FilesFindMatch",A="FL:::/Kernel/BlkDev/DiskStrA.HC,40",BI=526$ -$LK,"BlkDevsRelease",A="FL:::/Kernel/BlkDev/DiskBlkDev.HC,114",BI=527$ +$LK,"ATAPIWritePktWord",A="FL:::/Kernel/BlkDev/DiskATA.HC,106",BI=524$ +$LK,"FilesFindMatch",A="FL:::/Kernel/BlkDev/DiskStrA.HC,40",BI=525$ +$LK,"BlkDevsRelease",A="FL:::/Kernel/BlkDev/DiskBlkDev.HC,114",BI=526$ $LK,"DOC_COLOR_LINK",A="FL:::/Kernel/KernelA.HH,1141"$ $LK,"AAT_ADD_U64",A="FL:::/Kernel/KernelA.HH,1985"$ $LK,"HTT_CLASS",A="FL:::/Kernel/KernelA.HH,691"$ $LK,"HTt_CLASS",A="FL:::/Kernel/KernelA.HH,661"$ -$LK,"Cd2DirEntry",A="FL:::/Kernel/BlkDev/DiskStrA.HC,221",BI=528$ +$LK,"Cd2DirEntry",A="FL:::/Kernel/BlkDev/DiskStrA.HC,221",BI=527$ +$LK,"DefineCount",A="FL:::/Kernel/KDefine.HC,74",BI=528$ $LK,"IET_IMM_U0",A="FL:::/Kernel/KernelA.HH,408"$ $LK,"sys_clip_doc",A="FL:::/Kernel/KGlobals.HC,6"$ $LK,"BlkDevAdd",A="FL:::/Kernel/BlkDev/DiskAddDev.HC,27",BI=529$ @@ -2837,24 +2837,24 @@ $LK,"DriveNextFreeLet",A="FL:::/Kernel/BlkDev/DiskDrive.HC,51",BI=599$ $LK,"FILEMASK_SRC",A="FL:::/Kernel/KernelA.HH,2302"$ DVc              @4@;;CG^uH/=rrTzz<#  8Q^eggp~D3P2>MZglr05HJJT 699,929L9O9[9p9v9|999999999999:::::!:0:4:C:I:L:N:^:b:v:y:|:~:::: 6666666677 7 7H7K7N7P7c7f7i7q7w7|7|77777777777777 Fdҿҿ -!$00^kux{ h§§˧٧#3BQaq¨Ҩ dav"2=BOX\bhpx@Zf;;;;;;;;;;;4ۗۗ.00:44= I I.IJIJIMIgIgImI(-3 *,6H!y!yAyNySy_yyyyyyyy(Z`>>Xjrx$8dddd!d&d(d?d?dHdNdP[kbbcccc'c6cFX[ixȊ̊ъ!!(0=?QY[ellls{$:\aahpόҌތ(+DDII\cmȍލ?Zclp~ŎЎ  26Qjs|ɏϏҏ׏׏+P]awÐɐې.5AZgjqtvɑӑ )8Xa˒4[[o}@@Lcckr`K"K"Y"f"p"p""""""""""""|wڦ&6GWYYY_x@8D "DQQ[|SS -&6>N]` Ah{{{/{3{B{T{h{s{y{{{{{{{{{{{{{M|R|R|z|z||||||||!k?k?t????D@Q@S@k@k@@@@@@@AAA'ATA[A]AbAeA"  ] ]]]$]#H$H#%%*%4AJ %Cquuz&..OR[w #J' lp2@F(DLYƐӐِܐ)p*:IIPPPA*h#9vvvww#w%w.w0w0w3wOwwwwwwwww+$gl`y`ydytyyy,d!!!"!/!>Xjrx$8dddd!d&d(d?d?dHdNdP[kbbcccc'c6cFX[ixȊ̊ъ!!(0=?QY[ellls{$:\aahpόҌތ(+DDII\cmȍލ?Zclp~ŎЎ  26Qjs|ɏϏҏ׏׏+P]awÐɐې.5AZgjqtvɑӑ )8Xa˒4[[o}@@Lcckr`K"K"Y"f"p"p""""""""""""|wڦ&6GWYYY_x|SS +&6>N]`Ah{{{/{3{B{T{h{s{y{{{{{{{{{{{{{M|R|R|z|z|||||||| k?k?t????D@Q@S@k@k@@@@@@@AAA'ATA[A]AbAeA!  ] ]]]$]"H#H#%%*$4AJ %Cquuz%..OR[w #J& lp2@F'DLYƐӐِܐ(p*:IIPPPA)h#9vvvww#w%w.w0w0w3wOwwwwwwwww*$gl`y`ydytyyy+d!!!"!/!,XXXXYYYY?8CjCjcjnj|jtjjjjjj@8%$,@U]`bfA B\ .C4 """&D4u~LLLLULeLqLLLLE &&*MQF4G@:FQQQQQQQQQH,'.&&02:TY_IXl~YcYckcncyc~cccccccccccdJ:Z b b#b.b3bzT U Vd^^^^^^^^^^__ _'_K_T_[_g_i_WMMMMN.N9NHNUNnNNNNNNNNNNNNNNNO&O9OBOSOZOZOkOtOX,P!EEZbgg $&&88JQQchoY!.:AJ]w}$EJMSSVksvZ0&TT]]t[d;i;iIiNi^iciriwiyiiiiiiiii\8 ..........] sTsT|TTT^DIeIecezeeeeee_4ktxKxKKKKKKKLL`4W`XJXJ`JnJJJJJJJa8bx]wnnnnnno o?o?oBoDoDoIoIoKoKoKoMoMoMoVoYo\oiocY .;Nlu!4Q\d -.HS[fffkyd {++EWae4LLLLLLLMMMf$+0gCiʪʪ ""*S\ajmrr"h<$/ĩΩi3W3WGWVWeWoW~WWWWWWWW -XX&X4XBXbXXXnXXXXXXXXXXXXY Y7YMY^Y^YfYiYwYjbbɁсՁف݁ ,5JPTfk@nz\\iqtl(aZZmsăՃ6Mfq„̄+2@@JcڅmD/<ffon,;5;5?5l55555o<bm!),:>BPTYpLCC_fmy˕ڕq8SXSXiXvXXXXXXrKo{{AQ`rys$BGt0dlUUUUUUUUuPZjēɓԓړv3 +.499JNSS[2 $(HHHHH3ț؛)4@IƜԜۜ +04<R]33EUu5 JJNw6<ȈЈ؈ۈ74ajJJJJ=KMKZKnKrKtK84MVIIIIJ-J:JNJSJUJ9[[|',1K`b|?:$; PTVVZln< VV`sx=,XXXXYYYY>8CjCjcjnj|jtjjjjjj?8%$,@U]`bf@ A\ .B4 """&C4u~LLLLULeLqLLLLD &&*MQE4F@:FQQQQQQQQQGXl~YcYckcncyc~cccccccccccdH:Z b b#b.b3bzR S Td^^^^^^^^^^__ _'_K_T_[_g_i_UMMMMN.N9NHNUNnNNNNNNNNNNNNNNNO&O9OBOSOZOZOkOtOV,P!EEZbgg $&&88JQQchoW!.:AJ]w}$EJMSSVksvX0&TT]]tYd;i;iIiNi^iciriwiyiiiiiiiiiZ8 ..........[ sTsT|TTT\DIeIecezeeeeee]4ktxKxKKKKKKKLL^4W`XJXJ`JnJJJJJJJ_8`x]wnnnnnno o?o?oBoDoDoIoIoKoKoKoMoMoMoVoYo\oioaY .;Nlu!4Q\d +.HS[fffkyb {++EWac4LLLLLLLMMMd$+0eCiʪʪ ""*S\ajmrr"f<$/ĩΩg3W3WGWVWeWoW~WWWWWWWW +XX&X4XBXbXXXnXXXXXXXXXXXXY Y7YMY^Y^YfYiYwYhbbɁсՁف݁ ,5JPTfi@nz\\iqtj(aZZmsăՃ6Mfq„̄+2@@JcڅkD/<ffol,;5;5?5l55555m<bm!),:>BPTYnLCC_fmy˕ڕo8SXSXiXvXXXXXXpKo{{AQ`ryq$BGr0dlUUUUUUUUsPZjēɓԓړt3     -  1 F F O i p               wd/2@@ITY\lw}xH<Jvvy4FFTbjuzLsz|z|||||||| }}3}J}a}|}}}}}}}}}}}}}}~*~7~=~@~J~{cjjjjjjjk1k;k;kQk]kdkwk|kkkkkkkkkk|(dd dd!d)d.d}0lt,;FLNNT~<KV`x`xixsxxxxxxxx4nn#)@EKY]y !;BPbbuw"`iiiiiiiijj*j,j1j3j4j4j>j(##.BSUSS[fv.688JJ\ccuzDFFV\kw~t/8ITWY\^^^lDMZUUU&U&U.UDUHUHULUTU6[((BJNVbipuφ҆ۆ *81;+66AEEK$0u!!!!!!!""!"("3"?"T"b"j"""""""""# # #.#.#<#H#T#h#########$$)$;$M$_$q$$$$$% %%6%M%V%a%h%s%}%%%,k_k_o_____02:KK_j|Kv{e{eeeeeeeeef ff>fMfTf[flfnfvffffffffffffff,nn|D V Y Y:Y=YCYOYQY`YgYmYYYYYYYYZZZZ,ZeZqZ}ZZZZZZZZ[ -[Q[c[[[[[[[[[[[[\\\\\\+\D\P\Y\d\z\\\\\\\\\\]P,<HHh{ŏǏ4#XHXHaHvHvHHHHH NN\ek85?ʤ - -5!(5CLOU[bikuzƅ܅!0HPNN\jrkkll"l7l7lMlUleltltlyllllllllllll mmm$mBmLmOmRmWmem{mmmmmmmmmmmmmtRRRRRRSS%S'S'S7S9S9SISQSQSZSfSSSSSSSX"cc c!c2c=cYc\cjcpcscccc@Qd[dcd{d{ddddddd@!-33AFI[adflL)/>DSYhnpu(ststttttt{ z z>zGzjztzzzzzzzzzzzzzzz{{{{{"{.{@{M{S{`{k{p{v{{{{{{{{8+M+MJMLM]MbMpMMMMMMMMMMMMMMNNNNN(N.N.N.N5NFN@%ޠT..RUccw$@E#(`p)H #D"/̉щщt[3[3c3t33333333 444+4A4W4Y4o44444X{[J[JtJJJJJJJJJJJJJJ@ ,ttt4ttDtJtnt8{,8::8>HpIpI~IIIIIIII<x#*.15<`p`""&=oʀـހkAkAyA~AAAAAAAAAAB%B7B>B>BTBaBaBwBBBBBBBB@ KKfd299999999 ::.:F:^:q::::::;;7;L;l;;;;;"<;;A<R<Y<y<<<<<<<<1=?==p=n======= >>>>>Q>Y>D>>>>>??=?G?^?f?Q?????????@*@C@^@v@@@@@@@@@A0A4A2AAAAAAAABBBqBBB@BBBBBBBBCCCCbCbCkCtCCCCCCCCCCC4 -!#),szyyyyyyyzTdddddeee e.e2e4e>eFeH..7LUacett$$$$%%%%%/%4%4%F%K%K%]%b%b%t%y%y%y%y%%%%%%%%%%%% & &&%&,&5&D&&a~ ~66<:J -LtJ~J~^~k~n~r~~~~~~~~~~T&IWagqv..@FTTq{ -(2?HJPY_4rr"uuuv v v&v7v?vCvOv`vmvsvvvyv|vvvvvvvvvvvvvvvH . #+HW]`lP]m3B[wLĀπ-6;McSqVV1V6VBVBVNVVV^ViVrVzVVVVVVVVVVVkksw  + > K ^ |            +  1 F F O i p               ud/2@@ITY\lw}vH<Jvvw4FFTbjuxLsz|z|||||||| }}3}J}a}|}}}}}}}}}}}}}}~*~7~=~@~J~ycjjjjjjjk1k;k;kQk]kdkwk|kkkkkkkkkkz(dd dd!d)d.d{0lt,;FLNNT|<KV`x`xixsxxxxxxxx}4nn#)@EKY]y !;BPbbuw"~`iiiiiiiijj*j,j1j3j4j4j>j(##.BSUSS[fv.688JJ\ccuzDFFV\kw~t/8ITWY\^^^lDMZUUU&U&U.UDUHUHULUTU6[((BJNVbipuφ҆ۆ *81;+66AEEK$0u!!!!!!!""!"("3"?"T"b"j"""""""""# # #.#.#<#H#T#h#########$$)$;$M$_$q$$$$$% %%6%M%V%a%h%s%}%%%,k_k_o_____02:KK_j|Kv{e{eeeeeeeeef ff>fMfTf[flfnfvffffffffffffff,nn|D V Y Y:Y=YCYOYQY`YgYmYYYYYYYYZZZZ,ZeZqZ}ZZZZZZZZ[ +[Q[c[[[[[[[[[[[[\\\\\\+\D\P\Y\d\z\\\\\\\\\\]P,<HHh{ŏǏ4#XHXHaHvHvHHHHH NN\ek85?ʤ + +5!(5CLOU[bikuzƅ܅!0HPNN\jrkkll"l7l7lMlUleltltlyllllllllllll mmm$mBmLmOmRmWmem{mmmmmmmmmmmmmtRRRRRRSS%S'S'S7S9S9SISQSQSZSfSSSSSSSX"cc c!c2c=cYc\cjcpcscccc@Qd[dcd{d{ddddddd@!-33AFI[adflL)/>DSYhnpu(ststttttt{ z z>zGzjztzzzzzzzzzzzzzzz{{{{{"{.{@{M{S{`{k{p{v{{{{{{{{8+M+MJMLM]MbMpMMMMMMMMMMMMMMNNNNN(N.N.N.N5NFN@%ޠT..RUccw$@E#(`p)H #D"/̉щщt[3[3c3t33333333 444+4A4W4Y4o44444X{[J[JtJJJJJJJJJJJJJJ@ ,ttt4ttDtJtnt8{,8::8>HpIpI~IIIIIIII<x#*.15<`p`""&=oʀـހkAkAyA~AAAAAAAAAAB%B7B>B>BTBaBaBwBBBBBBBB@ KKfd299999999 ::.:F:^:q::::::;;7;L;l;;;;;"<;;A<R<Y<y<<<<<<<<1=?==p=n======= >>>>>Q>Y>D>>>>>??=?G?^?f?Q?????????@*@C@^@v@@@@@@@@@A0A4A2AAAAAAAABBBqBBB@BBBBBBBBCCCCbCbCkCtCCCCCCCCCCC4 +!#),szyyyyyyyzTdddddeee e.e2e4e>eFeH..7LUacett$$$$%%%%%/%4%4%F%K%K%]%b%b%t%y%y%y%y%%%%%%%%%%%% & &&%&,&5&D&&a~ ~66<:J +LtJ~J~^~k~n~r~~~~~~~~~~T&IWagqv..@FTTq{ +(2?HJPY_"uuuv v v&v7v?vCvOv`vmvsvvvyv|vvvvvvvvvvvvvvvH . #+HW]`lP]m3B[wLĀπ-6;McSqVV1V6VBVBVNVVV^ViVrVzVVVVVVVVVVVkksw  + > K ^ |            . 2 4 @@ -2867,8 +2867,8 @@ XX&X4XBXbXXXnX r x  -,z *,fm##17COSY,W^cIcIqIsIIIIIHҁҁہ%048;dBBKcn˂JJKK+K:KgKqKvKKKKKKKKKKKKKLLL/L;L?LIL0L;T;TWTfTkTqT{TTTTTTTTTTTTTTTTTTU .2#('FԢ$NRrt|ʣԣۣ (D`goT}         $.86Fd~t !277{{Ş̞̞ڞ+2AT`wyğП؟$;BHKa4&/SSSSTT!T+T-T:T4S   9 D U i             . . . A F G  85{{ʐސ'+.0BPT^bkq$).HHHHHH, +*-EP`rv̎ڎ (-//ELff 37..2?A`RRR;RJR\RaRkRRRRRRS*S:S?S?STS`ppppq q3qBqGqZqqqwqqqqqqGnFXc%,,>N4MMMMUMeMqMMMMn[[szˋҋ݋ $/38<GMPSX_iy@/;ҒҒ  -369K0'ەk-25@CH^p{<MMMMMMMMMNN} '>>CEEIKKOVV[k}LQ`ʵٵ$jjk1k 8<FFPch !~~,]  )BQ[gr&:l}&&+/$FFFFF G'G@G@GLG]GhGtGtGGGGGGGGGGGH&H@HEHJHxv%%%%%%%%%%%%& -&&B&J&S&S&Y&&&&&D&"&@nzOUUa<BBBBBC,CRCYC`CeCqC0(@sy{{D ),< +,z *,fm##17COSY,W^cIcIqIsIIIIIHҁҁہ%048;dBBKcn˂JJKK+K:KgKqKvKKKKKKKKKKKKKLLL/L;L?LIL0L;T;TWTfTkTqT{TTTTTTTTTTTTTTTTTTU .2#('FԢ$NRrt|ʣԣۣ (D`goT}         $.86Fd~t !277{{Ş̞̞ڞ+2AT`wyğП؟$;BHKa4&/SSSSTT!T+T-T:T4S   9 D U i             . . . A F G  85{{ʐސ'+.0BPT^bkq$).HHHHHH, +*-EP`rv̎ڎ (-//ELff 37..2?A`RRR;RJR\RaRkRRRRRRS*S:S?S?STS`ppppq q3qBqGqZqqqwqqqqqqGnFXc%,,>N4MMMMUMeMqMMMMn[[szˋҋ݋ $/38<GMPSX_iy@/;ҒҒ  -369K0'ەk-25@CH^p{<MMMMMMMMMNN} '>>CEEIKKOVV[k}LQ`ʵٵ$jjk1k 8<FFPch !~~,]  )BQ[gr&:l}&&+/$FFFFF G'G@G@GLG]GhGtGtGGGGGGGGGGGH&H@HEHJHxv%%%%%%%%%%%%& +&&B&J&S&S&Y&&&&&D&"&@nzOUUa<BBBBBC,CRCYC`CeCqC0(@sy{{D ),<    @@ -2877,40 +2877,40 @@ XX&X4XBXbXXXnX    -  / V l            8gq;;;;; < <<<<LLLLLLLLMMMM$Mʏ܏܏!!!2=DHPT\bhhky|"2[kx8 ڟڟ!7:CH=K &;AGGOQ}L \3k3k;kFkXk^kfkpkkkkkkkkllVl[l[lmlzllllllllllmmm$m3mgmnmmmmmmmmmmmmm nnn#n.n4n?n?nEnNnYninnnnnnnnnn,jjs(%SSSSSSS,r<<#<'<.<5<@<H<O<O<^<c<o<{<<<<<<<<<=== =C=H=Z=_============>$>/><><>C>e>v>|>>8JT<  % 1 G a l }   $cccccclAX/HQ\gƔϔ$ss|  -TTTTTD4%sCsCwC|CCCCCCCh-k-k-----------...4.=.?.^.g.g.g.l............/////(/*/*/3/5/5/:/$>/><><>C>e>v>|>><  % 1 G a l }   $cccccclAX/HQ\gƔϔ$ss|  +TTTTTD4%sCsCwC|CCCCCCCh-k-k-----------...4.=.?.^.g.g.g.l............/////(/*/*/3/5/5/:/`F`K`^`k`q`t``0,;BǪ6NNlor5?IQQQSSXw}0  $**17;?FLSY`fmszŦŦΦϦ "-8CNNXLWfxxxxxxyyy!y1y3y3y3yZyhȎ׎܎ #/>JU[fiqD<INNb~2Z -.9HTh!##55==I]eew~~P~~~ ###%7>o0CpCpYplp~pppp<al22@QY]inrx\+6J[} &A\XAwAwawnwswwwwwwwwww , -G!6Øɘݘ . <S_s|ƙ)1CFFFFR"  H`g`gggggggggghhhhh#hTajo°8@Scs±ܱ ,7FVfv.(+?+?4?;?[?b?e?/4_________0p !zzzzz{ {{,{b{k{t{{1#5>^c| .DFRh~119COe{28uVVds}380: +68T_z||˻ӻ$)JTToyʼҼܼܼ8CCCW`d{ѽ۽?PVmu )@JOe}}οҿ CWu &8DHHHHLQQ\`x%***59Qhrw:@`rz|)+GR\fm3Ge|'166Neo14FX]]u#(((DX[m *2;@@@ev|rr )L4f[[q +Y4GP̓דܓDjjvǁ́ҁ|jjłʂۂ߂$8NX'PAQ::;; ;);/;4;R;T;b;h;k;y;Tr;;T^nvIeju @ jjs{ +H- 0-5)` shshhhhhhhhhhhhhhhiiii i!i!i-i/i;i X766TZaqx")+8::J[^`ln)+24@@TXXn@```>`F`K`^`k`q`t``0,;BǪ6NNlor5?IQQQSSXw}0  $**17;?FLSY`fmszŦŦΦϦ "-8CNNXLWfxxxxxxyyy!y1y3y3y3yZyhȎ׎܎ #/>JU[fiqD<INNb~2Z +.9HTh!##55==I]eew~~P~~~ ###%7>o0CpCpYplp~pppp<al22@QY]inrx\+6J[} &A\XAwAwawnwswwwwwwwwww, +G6Øɘݘ . <S_s|ƙ)1CFFFFR  H`g`gggggggggghhhhh#hTajo°8@Scs±ܱ ,7FVfv*(+?+?4?;?[?b?e?+4_________,p !zzzzz{ {{,{b{k{t{{-#5>^c| .DFRh~119COe{.8uVVds}/80:  -;^jw4,```````50 ƄЄ6,8?7@-9eQeQuQ~QQQQQQ8,@g@gIgTgVgVg[g9\mzz :1`1`A`H`[`g``````````aaa'a-a3a6a=aEa;F 'Pbj (CCCU\\nt~<X`````````a aa!a,a4aMa_alauauazaaaaaaaaaaaaaaaaaab b bbb(b3bObObObWb^beblbsbzbbbbbbbbbbbbbc=|Kf &-49EISSZ]ccm{>,++CNt?022F@*4=N^q~-L__#.<<AMALRaɤѤԤ B8GQttC0D<qqqqqrr"r8r>rDrzrETct.4444:FP[[exGG(MS +46HH!bbp|I0֝":=IJ'Jsdsddddddddddee e'e+e+e1e7eOeXe^egelelelepezeKX44444444445555 5LOpeeeeeeef%f%fDfFfFfefgfgfwfwfffffffffg g8GQtt?0@<qqqqqrr"r8r>rDrzrATct.4444:BP[[exGC(MS +46DH!bbp|E0֝":=IF'Jsdsddddddddddee e'e+e+e1e7eOeXe^egelelelepezeGX44444444445555 5HOpeeeeeeef%f%fDfFfFfefgfgfwfwfffffffffg gH^^nz»»»ʻػ$S?HHHHHHHHHII&I3I8I.P.i.x............ //5/7/7/J/R/R/R/d/d/m///////\4>>>>>>?%?)?]@.:ss^PPjÌԌԌԌیJadf}Ѝލ _D 6Yfs~`  a8#,/5bhRhttttttttttutuuu*u*u2uauc0[S[SdSvSSSSSSdt/# # . = L Z u     !#!4!=!J!a!|!!!!!!!e&**46N\ox!$&-ORRU`gnf @Ñԑ %8JRsڒ46GS_t{g&X + (8DN}JH?M999:%:L:y:::::::::K4;q;qOqaqjqqqqqqL4Yb**3;GXck~MZ;G[_esw} )))),16<PTZeiozzzN -:>H^^nz»»»ʻػ$O?HHHHHHHHHII&I3I8I.P.i.x............ //5/7/7/J/R/R/R/d/d/m///////Z4>>>>>>?%?)?[@.:ss\PPjÌԌԌԌیJadf}Ѝލ ]D 6Yfs~^  _8#,/5`hRhttttttttttutuuu*u*u2uaua0[S[SdSvSSSSSSbt/# # . = L Z u     !#!4!=!J!a!|!!!!!!!c&**46N\ox!$&-ORRU`gnd @Ñԑ %8JRsڒ46GS_t{e&X  - /:Lcctáӡ!!!2^ent{ҢhUy-/E]ddees~if]]]]]]]]]]^^^4^4^7^<^F^F^P^S^i^^}^^^^^^^^^__!__M_M_a_u_|_______v`jx`x``````````aaa?a?aVaXaXaoaqaqaaaaaaakVz  "*//<Rdlt + /:Lcctáӡ!!!2^ent{Ңf@8D "DQQ[gUy-/E]ddees~hf]]]]]]]]]]^^^4^4^7^<^F^F^P^S^i^^}^^^^^^^^^__!__M_M_a_u_|_______v`ix`x``````````aaa?a?aVaXaXaoaqaqaaaaaaajVz  "*//<Rdlt  -!(lDNaabbb$b.bRbvb~bbbbbbbbbbccc>c_cacacqcqcyc|ccccccccdd0d2d2dSdXdXdhdhdudxd}dddddddddd ee$e+e.eem)))))))))**7*D*O*a*v********++++1+F+Z+b+++++++++,0,F,X,X,,,,,n0 GGGGG HHHoX&8CCCCC DD+D5DRDWD^DsDzDDDpH_mIIIIIIIIIIJq\Qd"$/4GPUZjww}rc//////0 0#070@0T0{0000000011)101;1@1U1sx %--88@BBILXt0 ǔuLZi 5CEZekvx5SSSSSTTTT4TBTJTPTST]Tw7]PPtЃЃރ  '-4<JPRRbx.o{[{[[[[[[[[\"\)\:\E\T\_\{\{\\\\\\\\\\\\\\\\\\] -]]$]8]`]q]|]|]]]]]]]]]]]]]] ^y,07 z -1;;FJny(**KMM__ggs{$..2?u|<7B˚Ӛ},8H8H>MZinu 1::H8KLKLgLtLyLLLL(\\dn0"H\j;;;;;<<<<<"<8&&&&&&&''P:Jwwwx xxx"x%x%x9xFxLxOx[x8pĩĩީ ;;AJSU^giirêȪȪȪѪڪߪߪ.00>B 8 8(8.888;8;8D8O8Y8c8o8q8w8~88888888888888888888888889L::HKWagtǟ˟ϟ՟8ak ,%&+4sssssssst )-t2ҳҳ0Sboz´ȴʴ״ڴ+          ! , : I i          &FTc haw""DJSS\kxζζζ߶$(-JJX`rx@z88<=LU[_cy~<@K(26;GLPT^<ccxg¸¸ )4JVlٹ޹޹8?a~~"3JJau8]]]]]]]]]47@:::::::::hqҫ77YYYbddmooxzz¬¬¬ŬȬѬ%'*,/:??HHMMVchhq ]]]]]`UiQQQQQQQQR R RR0[c[U[UdUrUxUUUUU()])]=]H]Q]T]\]p!-99KQQ^j Dq_q___________.49?BP\_bns|h%;_yyX=O,,CLPT\r  6=LS\\vՈ )55 656]66667\7^7l7z77777777 88.8C8\8c8j8888lXo/2@@LSX[adlqqvy{;YÒ̒Ւޒ %4=Fffhx~ @huhupu|uuuuuuuu9v9vevvvvvvvvvvvvw,wGwUwwwwwwwwwwwwwwwxx xxx)x0x>xMxxxxxx{8""1?VZZ__e4 **>MR`ciq<5@2AHMXmpu^33>_fu(5>>Wz(HQYbt#5:L^v(449IWp$NPPUpw'ҢҢ#.9DIWesԣ&57@Jh - fft ((@0{r{rrrrrrrsX<6<6J6S6_6e6h6m6s6v6{6{666666L- [ [[([([2[<[Y[d[m[s[t[z[H22COS_gsy`*>8888889999'9/9=9E9E9p9999998~D""&,28>DJPV\bdhCCCCDDD&D7DODgDwDDDDDDD EEE-E?EVEVEzEEEEEEEEE F)FiFHIHWH^HiHwHwH|HH4{ƥڥ<i^i^^^^^^^^^8]]^^2^I^S^V^f^L (1>RXd `L`bbƥ̥ݥ #GFF[blzz;Zdn|HY(**>>ADRVlry`{{ǖӖזߖ a]a]j]w]|]Xcc~<"+2;;BD\"_____` ` ````%`-`d\q00HQl{χ < +!(kDNaabbb$b.bRbvb~bbbbbbbbbbccc>c_cacacqcqcyc|ccccccccdd0d2d2dSdXdXdhdhdudxd}dddddddddd ee$e+e.eel)))))))))**7*D*O*a*v********++++1+F+Z+b+++++++++,0,F,X,X,,,,,m0 GGGGG HHHnX&8CCCCC DD+D5DRDWD^DsDzDDDoH_mIIIIIIIIIIJp\Qd"$/4GPUZjww}qc//////0 0#070@0T0{0000000011)101;1@1U1rx %--88@BBILXs0 ǔtLZi 5CEZekux5SSSSSTTTT4TBTJTPTST]Tv7]PPtЃЃރ  '-4<JPRRbw.o{[{[[[[[[[[\"\)\:\E\T\_\{\{\\\\\\\\\\\\\\\\\\] +]]$]8]`]q]|]|]]]]]]]]]]]]]] ^x,07 y +1;;FJny(**KMM__ggsz$..2?u{<7B˚Ӛ|,8H8H>MZinu 1::H8KLKLgLtLyLLLL(\\dn@22@Bdqqu{0"H\j;;;;;<<<<<"<8&&&&&&&''P:Jwwwx xxx"x%x%x9xFxLxOx[x8pĩĩީ ;;AJSU^giirêȪȪȪѪڪߪߪ.00>B 8 8(8.888;8;8D8O8Y8c8o8q8w8~88888888888888888888888889L::HKWagtǟ˟ϟ՟8ak ,%&+4sssssssst )-t2ҳҳ0Sboz´ȴʴ״ڴ+          ! , : I i          &FTc haw""DJSS\kxζζζ߶$(-JJX`rx@z88<=LU[_cy~<@K(26;GLPT^<ccxg¸¸ )4JVlٹ޹޹8?a~~"3JJau8]]]]]]]]]47@:::::::::hqҫ77YYYbddmooxzz¬¬¬ŬȬѬ%'*,/:??HHMMVchhq ]]]]]`UiQQQQQQQQR R RR0[c[U[UdUrUxUUUUU()])]=]H]Q]T]\]p!-99KQQ^j Dq_q___________.49?BP\_bns|h%;_yyX=O,,CLPT\r  6=LS\\vՈ )55 656]66667\7^7l7z77777777 88.8C8\8c8j8888lXo/2@@LSX[adlqqvy{;YÒ̒Ւޒ %4=Fffhx~ @huhupu|uuuuuuuu9v9vevvvvvvvvvvvvw,wGwUwwwwwwwwwwwwwwwxx xxx)x0x>xMxxxxxx{8""1?VZZ__e4 **>MR`ciq<5@2AHMXmpu^33>_fu(5>>Wz(HQYbt#5:L^v(449IWp$NPPUpw'ҢҢ#.9DIWesԣ&57@Jh + fft ((@0{r{rrrrrrrsX<6<6J6S6_6e6h6m6s6v6{6{666666L- [ [[([([2[<[Y[d[m[s[t[z[H22COS_gsy`*>8888889999'9/9=9E9E9p9999998~D""&,28>DJPV\bdhCCCCDDD&D7DODgDwDDDDDDD EEE-E?EVEVEzEEEEEEEEE F)FiFHIHWH^HiHwHwH|HH4{ƥڥ<i^i^^^^^^^^^8]]^^2^I^S^V^f^L (1>RXd `L`bbƥ̥ݥ #GFF[blzz;Zdn|HY(**>>ADRVlry`{{ǖӖזߖ a]a]j]w]|]Xcc~<"+2;;BD\"_____` ` ````%`-`,'.&&02:TY_d\q00HQl{χ < ʔʔޔ - dxOxOOOOOOOOOOOOPPPPP(P<{{{{{{{{|,؈؈ + dxOxOOOOOOOOOOOOPPPPP(P<{{{{{{{{|,؈؈ '1<>R_hllu܉;B[[`i}Ɋ -DZ}}ʋߋߋM 1đߑߑ ))))))////11I`\pkEkEoEEEEEEEEEFF0FQFrFFFFFq||||}}2}8}F}K}R}^}^}h}m}t}}}}}}}},**.3MRT@[2[2i2p2w22222224{{<)4ʃʃ -8ccccccccccc /3HHII I$ffjnpDڇڇ hC0<@\wwwwwÛ͛ққۛ &6888UWWttz͜ޜ ,37GJVgy{{{ĝ(.4zzx˝˝11;==GIIITVVVaaafxrVVVVW WWWWW$W/W3W8W>WKWQWTWVWYW\W\WaWpWsWW,**38@FFK@22@hҭڭ(17\\i~0**@K\^f +08AK$#+16<!!',(**>JXXXXXXXYYYY)YBYPYYYdYoYrYyY~YYYYYYYYYYYYYZZ4(ƃHRRfmX(P(PCPIPbPnPPPPPPPPP Q QQ"Q4QWKWQWTWVWYW\W\WaWpWsWW,**38@FFK@22@hҭڭ(17\\i~0**@K\^f +0$#+16<!!',(**>JXXXXXXXYYYY)YBYPYYYdYoYrYyY~YYYYYYYYYYYYYZZ4(ƃHRRfmX(P(PCPIPbPnPPPPPPPPP Q QQ"Q4Qfloat conversions) I64 cur_ic_float_op_num,last_ic_float_op_num; @@ -2735,9 +2735,9 @@ public class CBlkDevGlobals U8 *tmp_filename; U8 *home_dir; CCacheBlk *cache_base,*cache_ctrl,**cache_hash_table; - I64 cache_size,read_cnt,write_cnt; + I64 cache_size,read_count,write_count; CDrive *drvs,*let_to_drv[32]; - I64 mount_ide_auto_cnt, + I64 mount_ide_auto_count, ins_base0,ins_base1; //Install cd/dvd controller. U8 boot_drv_let,first_hd_drv_let,first_dvd_drv_let; Bool dvd_boot_is_good,ins_unit,pad[3]; @@ -2959,7 +2959,7 @@ public class CKbdStateGlobals { I64 scan_code, //See $LK,"scan codes",A="FI:::/Doc/CharOverview.DD"$ last_down_scan_code, - cnt, //Count of keys pressed since boot. + count, //Count of keys pressed since boot. timestamp, //Output: GetTSC when event. new_key_timestamp; //Output: GetTSC when new key event. CFifoU8 *fifo,*fifo2; //Private @@ -3303,7 +3303,7 @@ public class CTask //The Fs segment reg points to current CTask. r8,r9,r10,r11,r12,r13,r14,r15; CCPU *gs; CFPU *fpu_mmx; - I64 swap_cnter; + I64 swap_counter; U0 (*draw_it)(CTask *task,CDC *dc); @@ -3398,7 +3398,7 @@ public class CCPU //The Gs segment reg points to current CCPU. I64 total_jiffies; CTask *seth_task,*idle_task; I64 tr, //task reg - swap_cnter; + swap_counter; U0 (*profiler_timer_irq)(CTask *task); CTaskDying *next_dying,*last_dying; I64 kill_jiffy; @@ -3642,7 +3642,7 @@ public class CDC CGrSym sym; I32 cur_x,cur_y,cur_z,pad; - I64 collision_cnt; + I64 collision_count; I64 nearest_dist, min_x,max_x,min_y,max_y; //Set by $LK,"DCF_RECORD_EXTENTS",A="MN:DCF_RECORD_EXTENTS"$ (scrn coordinates) diff --git a/src/Kernel/KernelB.HH b/src/Kernel/KernelB.HH index 171167f0..223d8dd5 100755 --- a/src/Kernel/KernelB.HH +++ b/src/Kernel/KernelB.HH @@ -79,17 +79,17 @@ public _intern IC_OUT_U16 U0 OutU16(I64 port, I64 val); //Write U16 to I/O port. public _intern IC_OUT_U32 U0 OutU32(I64 port, I64 val); //Write U32 to I/O port. public _intern IC_OUT_U8 U0 OutU8(I64 port, I64 val); //Write U8 to I/O port. public _extern _REP_IN_U16 U0 RepInU16( - U8 *buf,I64 cnt,I64 port); //Repeated read U16 from I/O port. + U8 *buf,I64 count,I64 port); //Repeated read U16 from I/O port. public _extern _REP_IN_U32 U0 RepInU32( - U8 *buf,I64 cnt,I64 port); //Repeated read U32 from I/O port. + U8 *buf,I64 count,I64 port); //Repeated read U32 from I/O port. public _extern _REP_IN_U8 U0 RepInU8( - U8 *buf,I64 cnt,I64 port); //Repeated read U8 from I/O port. + U8 *buf,I64 count,I64 port); //Repeated read U8 from I/O port. public _extern _REP_OUT_U16 U0 RepOutU16( - U8 *buf,I64 cnt,I64 port); //Repeated write U16 to I/O port. + U8 *buf,I64 count,I64 port); //Repeated write U16 to I/O port. public _extern _REP_OUT_U32 U0 RepOutU32( - U8 *buf,I64 cnt,I64 port); //Repeated write U32 to I/O port. + U8 *buf,I64 count,I64 port); //Repeated write U32 to I/O port. public _extern _REP_OUT_U8 U0 RepOutU8( - U8 *buf,I64 cnt,I64 port); //Repeated write U8 to I/O port. + U8 *buf,I64 count,I64 port); //Repeated write U8 to I/O port. #help_index "Math" public _intern IC_ATAN F64 ATan(F64 d); //Arc Tan (Inverse Tan). @@ -164,19 +164,19 @@ public _extern _D3_ZERO CD3 *D3Zero(CD3 *dst); //To zero #help_index "Memory" public _extern _MEMCMP I64 MemCmp( - U8 *ptr1,U8 *ptr2,I64 cnt); //Compare chunk of memory. + U8 *ptr1,U8 *ptr2,I64 count); //Compare chunk of memory. public _extern _MEMCPY U8 *MemCpy( - U8 *dst,U8 *src,I64 cnt); //Copy chunk of memory. Only goes fwd. + U8 *dst,U8 *src,I64 count); //Copy chunk of memory. Only goes fwd. public _extern _MEMSET U8 *MemSet( - U8 *dst,I64 val,I64 cnt); //Set chunk of U8s to value. + U8 *dst,I64 val,I64 count); //Set chunk of U8s to value. public _extern _MEMSET_I64 I64 *MemSetI64( - I64 *dst,I64 val,I64 I64cnt); //Set chunk of I64s to value. + I64 *dst,I64 val,I64 I64count); //Set chunk of I64s to value. public _extern _MEMSET_U16 U16 *MemSetU16( - U16 *dst,I64 val,I64 U16cnt); //Set chunk of U16s to value. + U16 *dst,I64 val,I64 U16count); //Set chunk of U16s to value. public _extern _MEMSET_U32 U32 *MemSetU32( - U32 *dst,I64 val,I64 U32cnt); //Set chunk of U32s to value. + U32 *dst,I64 val,I64 U32count); //Set chunk of U32s to value. public _extern _MEMSET U8 *MemSetU8( - U8 *dst,I64 val,I64 U8cnt); //Set chunk of U8s to value. + U8 *dst,I64 val,I64 U8count); //Set chunk of U8s to value. _extern SYS_HEAP_DBG_FLAG U8 sys_heap_dbg; _extern SYS_HEAP_INIT_FLAG U8 sys_heap_init_flag; _extern SYS_HEAP_INIT_VAL U8 sys_heap_init_val; @@ -236,9 +236,9 @@ public _extern SYS_PROGRESSES #help_index "MultiCore" #help_file "::/Doc/MultiCore" public _extern SYS_CPU_STRUCTS CCPU *cpu_structs; //$LK,"Gs",A="MN:Gs"$ points to cur $LK,"CCPU",A="MN:CCPU"$. -public _extern SYS_MP_CNT I64 mp_cnt; //Count of cores -_extern SYS_MP_CNT_INITIAL I64 mp_cnt_initial; //only used during $LK,"Core0StartMP",A="MN:Core0StartMP"$ -_extern SYS_MP_CNT_LOCK I64 mp_cnt_lock; +public _extern SYS_MP_CNT I64 mp_count; //Count of cores +_extern SYS_MP_CNT_INITIAL I64 mp_count_initial; //only used during $LK,"Core0StartMP",A="MN:Core0StartMP"$ +_extern SYS_MP_CNT_LOCK I64 mp_count_lock; _extern SYS_SEMAS CSema sys_semas[SEMA_SEMAS_NUM]; #help_index "MultiCore;Processor" diff --git a/src/Kernel/KernelC.HH b/src/Kernel/KernelC.HH index 841d561b..9cbe5358 100755 --- a/src/Kernel/KernelC.HH +++ b/src/Kernel/KernelC.HH @@ -6,7 +6,7 @@ public extern CAutoCompleteGlobals ac; public extern CAutoCompleteDictGlobals acd; #help_index "Bit" -public extern I64 BCnt(I64 d); +public extern I64 BCount(I64 d); public extern U8 *rev_bits_table,*set_bits_table; #help_index "Boot" @@ -128,20 +128,20 @@ public extern U0 ArcExpandBuf(CArcCtrl *c); public extern Bool ArcFinishCompression(CArcCtrl *c); #help_index "Data Types/Circular Queue" -public extern I64 QueueCnt(CQueue *head); +public extern I64 QueueCount(CQueue *head); public extern CQueue *QueueCopy(CQueue *head,CTask *mem_task=NULL); public extern U0 QueueDel(CQueue *head,Bool querem=FALSE); public extern I64 QueueSize(CQueue *head); #help_index "Data Types/Fifo" -public extern I64 FifoI64Cnt(CFifoI64 *f); +public extern I64 FifoI64Count(CFifoI64 *f); public extern U0 FifoI64Del(CFifoI64 *f); public extern U0 FifoI64Flush(CFifoI64 *f); public extern Bool FifoI64Ins(CFifoI64 *f,I64 q); public extern CFifoI64 *FifoI64New(I64 size,CTask *mem_task=NULL); public extern Bool FifoI64Peek(CFifoI64 *f,I64 *_q); public extern Bool FifoI64Remove(CFifoI64 *f,I64 *_q); -public extern I64 FifoU8Cnt(CFifoU8 *f); +public extern I64 FifoU8Count(CFifoU8 *f); public extern U0 FifoU8Del(CFifoU8 *f); public extern U0 FifoU8Flush(CFifoU8 *f); public extern Bool FifoU8Ins(CFifoU8 *f,U8 b); @@ -150,7 +150,7 @@ public extern Bool FifoU8Peek(CFifoU8 *f,U8 *_b); public extern Bool FifoU8Remove(CFifoU8 *f,U8 *_b); #help_index "Data Types/Linked List" -public extern I64 LinkedLstCnt(U8 **_lst); +public extern I64 LinkedLstCount(U8 **_lst); public extern U8 *LinkedLstCopy(U8 **_lst,CTask *mem_task=NULL); public extern U0 LinkedLstDel(U8 **_lst); public extern I64 LinkedLstSize(U8 **_lst); @@ -182,7 +182,7 @@ extern CBpt *BptFind(U8 *needle_addr,CTask *haystack_task=NULL,Bool rem=FALSE); public extern Bool BptR(U8 *addr,CTask *task=NULL,Bool live=TRUE,Bool rem=TRUE); public extern Bool BptS(U8 *addr,CTask *task=NULL,Bool live=TRUE); public extern Bool DebugMode(Bool val); -public extern Bool E(U8 *addr,I64 cnt=512,I64 edf_dof_flags=0); +public extern Bool E(U8 *addr,I64 count=512,I64 edf_dof_flags=0); public extern Bool EdLite(U8 *filename,I64 num=1,I64 edf_dof_flags=0); extern Bool EdLiteFileLine(U8 *fl_file_line,I64 edf_dof_flags=0); public extern Bool Fix(I64 edf_dof_flags=0); @@ -198,19 +198,19 @@ public extern Bool Man(U8 *st,I64 edf_dof_flags=0); #help_index "Debugging/Dump" public extern U0 CallerRep(U8 **rbp=NULL,CTask *task=NULL); -public extern U0 D(U8 *addr,I64 cnt=0x80,Bool show_offset=TRUE); -public extern U0 Da(U8 **addr,I64 cnt=0x10); -public extern U0 Dm(U8 *addr,I64 cnt=0x80); +public extern U0 D(U8 *addr,I64 count=0x80,Bool show_offset=TRUE); +public extern U0 Da(U8 **addr,I64 count=0x10); +public extern U0 Dm(U8 *addr,I64 count=0x80); public extern U0 Dr(CTask *task=NULL); public extern U0 StkRep(CTask *task=NULL); extern I64 *TaskRegAddr(CTask *task,I64 reg_num); #help_index "Debugging/FunSeg" #help_file "::/Doc/DebugFunSeg" -public extern Bool PutSrcLink(U8 *addr,I64 cnt=1,U8 *buf=NULL); -public extern U8 *SrcEdLink(U8 *addr,I64 cnt=1,CTask *mem_task=NULL); -public extern U8 *SrcFileName(U8 *addr,I64 cnt=1,CTask *mem_task=NULL); -public extern I64 SrcLineNum(U8 *addr,I64 cnt=1); +public extern Bool PutSrcLink(U8 *addr,I64 count=1,U8 *buf=NULL); +public extern U8 *SrcEdLink(U8 *addr,I64 count=1,CTask *mem_task=NULL); +public extern U8 *SrcFileName(U8 *addr,I64 count=1,CTask *mem_task=NULL); +public extern I64 SrcLineNum(U8 *addr,I64 count=1); #help_index "Debugging/FunSeg;Hash/System" public extern CHash *FunSegFind(U8 *addr,I64 *_offset); @@ -218,8 +218,8 @@ public extern CHash *FunSegFind(U8 *addr,I64 *_offset); #help_index "Debugging/Raw Output" public extern Bool IsRaw(); public extern Bool Raw(Bool val); -public extern U0 RawD(I64 mS=100,U8 *addr,I64 cnt=0x80); -public extern U0 RawDm(I64 mS=100,U8 *addr,I64 cnt=0x80); +public extern U0 RawD(I64 mS=100,U8 *addr,I64 count=0x80); +public extern U0 RawDm(I64 mS=100,U8 *addr,I64 count=0x80); extern U0 RawDr(CTask *task=NULL); public extern U0 RawPrint(I64 mS=100,U8 *fmt,...); public extern U0 RawPutChar(I64 ch); @@ -236,7 +236,7 @@ public extern CHashDefineStr *DefineLoad(U8 *dname,U8 *st); public extern U0 DefinePrint(U8 *dname,U8 *src,...); #help_index "Define;Char/Define;Char/Lists" -public extern I64 DefineCnt(U8 *dname); +public extern I64 DefineCount(U8 *dname); public extern CHashDefineStr *DefineLstLoad(U8 *dname,U8 *lst); public extern I64 DefineMatch(U8 *needle,U8 *haystack_lst_dname,I64 flags=0); public extern U8 *DefineSub(I64 sub,U8 *dname); @@ -270,10 +270,10 @@ public extern U0 DVDImageWrite(U8 dvd_drv_let, U8 *in_name=NULL,I64 media_type=MT_DVD); #help_index "File/CFile" -public extern Bool FBlkRead(CFile *f,U8 *buf,I64 blk=FFB_NEXT_BLK,I64 cnt=1); -public extern Bool FBlkWrite(CFile *f,U8 *buf,I64 blk=FFB_NEXT_BLK,I64 cnt=1); +public extern Bool FBlkRead(CFile *f,U8 *buf,I64 blk=FFB_NEXT_BLK,I64 count=1); +public extern Bool FBlkWrite(CFile *f,U8 *buf,I64 blk=FFB_NEXT_BLK,I64 count=1); public extern U0 FClose(CFile *f); -public extern CFile *FOpen(U8 *filename,U8 *flags,I64 cnt=0); +public extern CFile *FOpen(U8 *filename,U8 *flags,I64 count=0); public extern I64 FSize(CFile *f); #help_index "File/Cmd Line (Typically);Cmd Line (Typically)" @@ -281,7 +281,7 @@ public extern Bool Cd(U8 *dirname=NULL,Bool make_dirs=FALSE); public extern I64 Del(U8 *files_find_mask,Bool make_mask=FALSE, Bool del_dir=FALSE,Bool print_message=TRUE); public extern I64 Dir(U8 *files_find_mask="*",Bool full=FALSE); -public extern Bool DirMk(U8 *filename,I64 entry_cnt=0); +public extern Bool DirMk(U8 *filename,I64 entry_count=0); public extern Bool Drive(U8 drv_let); public extern U0 DiskChg(U8 drv_let=0); public extern U0 HomeSet(U8 *dirname); @@ -331,17 +331,17 @@ public extern Bool BlkDevLock(CBlkDev *bd); public extern CBlkDev *BlkDevNextFreeSlot(U8 first_drv_let,I64 type); public extern Bool BlkDevUnlock(CBlkDev *bd,Bool rst=FALSE); public extern U0 BlkDevsRelease(); -public extern Bool BlkRead(CDrive *dv,U8 *buf, I64 blk, I64 cnt); -public extern Bool BlkWrite(CDrive *dv,U8 *buf, I64 blk, I64 cnt); -public extern U0 BlkWriteZero(CDrive *dv,I64 blk,I64 cnt); +public extern Bool BlkRead(CDrive *dv,U8 *buf, I64 blk, I64 count); +public extern Bool BlkWrite(CDrive *dv,U8 *buf, I64 blk, I64 count); +public extern U0 BlkWriteZero(CDrive *dv,I64 blk,I64 count); public extern I64 Clus2Blk(CDrive *dv,I64 c); public extern I64 ClusAlloc(CDrive *dv,I64 c=0, - I64 cnt=1,Bool contiguous=FALSE); + I64 count=1,Bool contiguous=FALSE); public extern I64 ClusBlkRead(CDrive *dv,U8 *buf,I64 c,I64 blks); public extern I64 ClusBlkWrite(CDrive *dv,U8 *buf,I64 c,I64 blks); -public extern I64 ClusNumNext(CDrive *dv,I64 c,I64 cnt=1); -public extern I64 ClusRead(CDrive *dv,U8 *buf,I64 c,I64 cnt); -public extern I64 ClusWrite(CDrive *dv,U8 *buf,I64 c,I64 cnt); +public extern I64 ClusNumNext(CDrive *dv,I64 c,I64 count=1); +public extern I64 ClusRead(CDrive *dv,U8 *buf,I64 c,I64 count); +public extern I64 ClusWrite(CDrive *dv,U8 *buf,I64 c,I64 count); extern Bool CopySingle(U8 *f1,U8 *f2); //Just one file public extern U8 Drive2Letter(CDrive *dv=NULL); public extern CDrive *DriveCheck(CDrive *dv,Bool except=TRUE); @@ -361,7 +361,7 @@ public extern CDrive *Letter2Drive(U8 drv_let=0,Bool except=TRUE); public extern U8 Letter2Letter(U8 drv_let=0); extern I64 Name2DirClus(CDrive *dv,U8 *dirname); extern I64 Name2ParentDirClus(CDrive *dv,U8 *dirname); -extern U0 RedSeaFreeClus(CDrive *dv,I64 c,I64 cnt); +extern U0 RedSeaFreeClus(CDrive *dv,I64 c,I64 count); #help_index "File/Program Routines" public extern U0 DirEntryDel(CDirEntry *tmpde); @@ -383,8 +383,8 @@ extern CBlkDev *ATAMount(U8 first_drv_let, I64 type,I64 base0,I64 base1,I64 unit); extern Bool ATAPIStartStop(CBlkDev *bd,F64 timeout,Bool start); extern I64 ATAProbe(I64 base0,I64 base1,I64 unit); -extern U0 ATAReadBlks(CBlkDev *bd,U8 *buf, I64 blk, I64 cnt); -extern U0 ATAWriteBlks(CBlkDev *bd,U8 *buf, I64 blk, I64 cnt); +extern U0 ATAReadBlks(CBlkDev *bd,U8 *buf, I64 blk, I64 count); +extern U0 ATAWriteBlks(CBlkDev *bd,U8 *buf, I64 blk, I64 count); extern I64 BlkDevAdd(CBlkDev *bd,I64 prt_num=I64_MIN, Bool whole_drv,Bool make_free); extern U0 DiskCacheInit(I64 size_in_U8s); @@ -728,7 +728,7 @@ public extern CTask *Spawn(U0 (*fp_addr)(U8 *data),U8 *data=NULL, I64 stk_size=0,I64 flags=1<bp)) { QueueInsert(res,hc->last_mem_blk); @@ -129,7 +129,7 @@ Return: NULL if out of memory. threshold=MEM_HEAP_HASH_SIZE>>4; #assert MEM_HEAP_HASH_SIZE>>4>=sizeof(U8 *) do { - cnt=0; + count=0; _uum=&hc->malloc_free_lst; while (uum=*_uum) { #assert !offset(CMemUnused.next) @@ -140,12 +140,12 @@ Return: NULL if out of memory. uum->next=*_ptr; *_ptr=uum; } else { - cnt++; + count++; _uum=uum; } } threshold<<=1; - } while (cnt>8 && threshold<=MEM_HEAP_HASH_SIZE); + } while (count>8 && threshold<=MEM_HEAP_HASH_SIZE); } return res; } diff --git a/src/Kernel/MultiProc.HC b/src/Kernel/MultiProc.HC index 8ca091be..3b0c07e8 100755 --- a/src/Kernel/MultiProc.HC +++ b/src/Kernel/MultiProc.HC @@ -131,7 +131,7 @@ CCPU *CPUStructInit(I64 num,CCPU *c,CTask *seth_task) U0 MPInt(U8 num,I64 cpu_num=1) {//Generate interrupt for specified core. - if (cpu_num>=mp_cnt) { + if (cpu_num>=mp_count) { if (!Bt(&sys_run_level,RLf_MP)) return; else @@ -163,7 +163,7 @@ U0 MPNMInt() U0 MPHalt() {//Halt all other cores. - mp_cnt=1; + mp_count=1; MPNMInt; Busy(10000); } @@ -219,7 +219,7 @@ CJob *JobQueue(I64 (*fp_addr)(U8 *data),U8 *data=NULL, CJobCtrl *ctrl; CJob *tmpc; CTask *seth; - if (!(0<=target_cpu1) { - my_mp_cnt=mp_cnt; - MPHalt; //sets mp_cnt to 1 - for (i=1;i1) { + my_mp_count=mp_count; + MPHalt; //sets mp_count to 1 + for (i=1;iseth_task->srv_ctrl.next_waiting); JobQueueDel(&c->seth_task->srv_ctrl.next_done); @@ -311,8 +311,8 @@ U0 Core0StartMP() //to a location 4096*vect number, $LK,"MP_VECT_ADDR",A="MN:MP_VECT_ADDR"$$WW,0$. MemCpy(mp,COREAP_16BIT_INIT,COREAP_16BIT_INIT_END-COREAP_16BIT_INIT); MemCpy(&mp->ap_gdt_ptr,SYS_GDT_PTR,sizeof(CSysLimitBase)); - mp_cnt_initial=mp_cnt=1; - mp_cnt_lock=0; + mp_count_initial=mp_count=1; + mp_count_lock=0; *(dev.uncached_alias+LAPIC_LVT_ERR)(U32 *)= *(dev.uncached_alias+LAPIC_LVT_ERR)(U32 *)&0xFFFFFF00+MPN_VECT; @@ -327,13 +327,13 @@ U0 Core0StartMP() Busy(100000); for (i=0;i<10000;i++) - LBts(&mp_cnt_lock,0); //Don't let more through - my_mp_cnt=mp_cnt_initial; + LBts(&mp_count_lock,0); //Don't let more through + my_mp_count=mp_count_initial; - if (my_mp_cnt>MP_PROCESSORS_NUM) - my_mp_cnt=MP_PROCESSORS_NUM; + if (my_mp_count>MP_PROCESSORS_NUM) + my_mp_count=MP_PROCESSORS_NUM; - for (i=1;irflags=RFLAGG_START; @@ -343,12 +343,12 @@ U0 Core0StartMP() } //Make sure they're all up-and-running - for (i=1;itask_flags,TASKf_AWAITING_MESSAGE)) PAUSE; POPFD - mp_cnt=my_mp_cnt; //Finalize cnt + mp_count=my_mp_count; //Finalize count } U0 Core0Init() @@ -356,8 +356,8 @@ U0 Core0Init() CRAXRBCRCXRDX ee; CPUId(0x1,&ee); - mp_cnt_initial=mp_cnt=1; - mp_cnt_lock=0; + mp_count_initial=mp_count=1; + mp_count_lock=0; dbg.mp_crash=ACAlloc(sizeof(CMPCrash)); @@ -380,7 +380,7 @@ interrupt U0 IntMPCrash() {//Entering the debugger from another core causes an interrupt on Core0 //Which calls this routine. *(dev.uncached_alias+LAPIC_EOI)(U32 *)=0; - mp_cnt=1; + mp_count=1; Raw(ON); text.raw_flags|=RWF_SHOW_DOLLAR; "MP Crash CPU%02X Task:%08X\n" diff --git a/src/Kernel/Sched.HC b/src/Kernel/Sched.HC index 82a6a5ca..3b975422 100755 --- a/src/Kernel/Sched.HC +++ b/src/Kernel/Sched.HC @@ -98,7 +98,7 @@ It's a little faster. //************************************ _TASK_CONTEXT_RESTORE:: XOR RAX,RAX - INC U64 GS:CCPU.swap_cnter[RAX] + INC U64 GS:CCPU.swap_counter[RAX] MOV RSI,FS:CTask.addr[RAX] BT U32 CTask.rflags[RSI],RFLAGf_INT JNC @@05 @@ -113,7 +113,7 @@ _TASK_CONTEXT_RESTORE:: MOV RDX,U64 CBpt.next[RDX] JMP @@10 -@@15: INC U64 CTask.swap_cnter[RSI] +@@15: INC U64 CTask.swap_counter[RSI] MOV RAX,U64 CTask.fpu_mmx[RSI] FXRSTOR U64 [RAX] @@ -180,7 +180,7 @@ RESTORE_RSI_TASK2: 1<kbd.timestamp+cnts.time_stamp_freq>>3) + if (GetTSC>kbd.timestamp+counts.time_stamp_freq>>3) FifoU8Flush(kbd.fifo); kbd.timestamp=GetTSC; raw_byte=InU8(KBD_PORT); KbdBuildSC(raw_byte,TRUE,&last_raw_byte,&last_sc); - if (!FifoU8Cnt(kbd.fifo)) { + if (!FifoU8Count(kbd.fifo)) { FifoU8Ins(kbd.fifo,raw_byte); if (raw_byte!=0xE0) { while (FifoU8Remove(kbd.fifo,&raw_byte)) @@ -452,7 +452,7 @@ U0 KbdHandler() kbd.new_key_timestamp=kbd.timestamp; Btr(&kbd.scan_code,32+SCf_NEW_KEY); FifoI64Ins(kbd.scan_code_fifo,kbd.scan_code); - kbd.cnt++; + kbd.count++; if (!(kbd.scan_code&SCF_KEY_UP)) { kbd.last_down_scan_code=kbd.scan_code; Bts(kbd.down_bitmap,kbd.scan_code.u8[0]); diff --git a/src/Kernel/SerialDev/Message.HC b/src/Kernel/SerialDev/Message.HC index 5d323bee..65ceaa1e 100755 --- a/src/Kernel/SerialDev/Message.HC +++ b/src/Kernel/SerialDev/Message.HC @@ -147,10 +147,10 @@ I64 GetKey(I64 *_scan_code=NULL,Bool echo=FALSE,Bool raw_cursor=FALSE) Bool cursor_on=FALSE; while (!ScanKey(&ch,&sc,FALSE)) { if (IsRaw && raw_cursor) { - if (!cursor_on && ToI64(GetTSC*5/cnts.time_stamp_freq)&1) { + if (!cursor_on && ToI64(GetTSC*5/counts.time_stamp_freq)&1) { ''; cursor_on=TRUE; - } else if (cursor_on && !(ToI64(GetTSC*5/cnts.time_stamp_freq)&1)) { + } else if (cursor_on && !(ToI64(GetTSC*5/counts.time_stamp_freq)&1)) { '' CH_BACKSPACE; cursor_on=FALSE; } diff --git a/src/Kernel/SerialDev/Mouse.HC b/src/Kernel/SerialDev/Mouse.HC index 7eedfae7..74ad5bd5 100755 --- a/src/Kernel/SerialDev/Mouse.HC +++ b/src/Kernel/SerialDev/Mouse.HC @@ -78,11 +78,11 @@ U0 MsInit() U0 MsHardPktRead() { U8 j; - if (GetTSC>ms_hard.timestamp+cnts.time_stamp_freq>>3) + if (GetTSC>ms_hard.timestamp+counts.time_stamp_freq>>3) FifoU8Flush(ms_hard.fifo); ms_hard.timestamp=GetTSC; FifoU8Ins(ms_hard.fifo,InU8(KBD_PORT)); - if (FifoU8Cnt(ms_hard.fifo)==ms_hard.pkt_size) + if (FifoU8Count(ms_hard.fifo)==ms_hard.pkt_size) while (FifoU8Remove(ms_hard.fifo,&j)) FifoU8Ins(ms_hard.fifo2,j); } @@ -189,7 +189,7 @@ U0 MsHardSpeedSet() if ((dd=SqrI64(ms_hard_last.pos.x-ms_hard.pos.x) +SqrI64(ms_hard_last.pos.y-ms_hard.pos.y)) && (tmp=ms_hard.timestamp-ms_hard_last.timestamp)) - ms_hard.speed=Sqrt(dd)*cnts.time_stamp_freq/tmp; + ms_hard.speed=Sqrt(dd)*counts.time_stamp_freq/tmp; ms_hard_last.timestamp=ms_hard.timestamp; } @@ -334,9 +334,9 @@ U0 KbdMsHandler(Bool poll_kbd,Bool poll_ms) if (kbd.rst) KbdMsRst; else { - while (FifoU8Cnt(kbd.fifo2)) + while (FifoU8Count(kbd.fifo2)) KbdHandler; - while (FifoU8Cnt(ms_hard.fifo2)) + while (FifoU8Count(ms_hard.fifo2)) if (ms_hard.installed) MsHardHandler; else diff --git a/src/Kernel/StrA.HC b/src/Kernel/StrA.HC index 0f6bc53e..de20117b 100755 --- a/src/Kernel/StrA.HC +++ b/src/Kernel/StrA.HC @@ -472,33 +472,33 @@ I64 StrOcc(U8 *src, I64 ch) I64 Spaces2Tabs(U8 *dst,U8 *src) {//Src buf with spaces to dst buf without. U8 *src2; - I64 chged=0,space_cnt,space_cnt2,col=0; + I64 chged=0,space_count,space_count2,col=0; if (*src) while (TRUE) { src2=src; while (*src2==CH_SPACE) src2++; - space_cnt=src2-src; - while (col+space_cnt>=8) { - space_cnt2=8-col; - if (space_cnt2==1) + space_count=src2-src; + while (col+space_count>=8) { + space_count2=8-col; + if (space_count2==1) *dst++=CH_SPACE; else { *dst++='\t'; - chged+=space_cnt2-1; + chged+=space_count2-1; } - space_cnt-=space_cnt2; + space_count-=space_count2; col=0; } if (*src2=='\t') { - if (space_cnt==1 && col==7) + if (space_count==1 && col==7) *dst++=CH_SPACE; else - chged+=space_cnt; + chged+=space_count; *dst++='\t'; col=0; } else { - while (space_cnt--) { + while (space_count--) { *dst++=CH_SPACE; if (++col==8) col=0; diff --git a/src/Kernel/StrPrint.HC b/src/Kernel/StrPrint.HC index 66f649f6..d37eb89b 100755 --- a/src/Kernel/StrPrint.HC +++ b/src/Kernel/StrPrint.HC @@ -215,7 +215,7 @@ in 64-bits.Use exponentiated forms to avoid this. */ I64 i,j,l,ch,k,k0,n,n0,len,dec_len,flags,old_flags, - aux_fmt_num,comma_cnt,comma_fmt_cnt,cur_arg=0; + aux_fmt_num,comma_count,comma_fmt_count,cur_arg=0; U64 m; F64 d,d1; CDoc *doc; @@ -444,13 +444,13 @@ sp_out_dec: goto sp_out_eng; } if (flags&PRTF_COMMA) { - comma_fmt_cnt=comma_cnt=3; + comma_fmt_count=comma_count=3; do { tmp_buf[k++]=ModU64(&m,10)+'0'; if (!m) break; - if (!--comma_cnt) { + if (!--comma_count) { tmp_buf[k++]=','; - comma_cnt=3; + comma_count=3; } } while (k=len-k) break; } @@ -574,11 +574,11 @@ sp_out_inf: m=Round(d); if (flags&PRTF_COMMA) { - comma_cnt=i&3; + comma_count=i&3; while (i-- && k2 && !comma_cnt--) { + if (i>2 && !comma_count--) { tmp_buf[k++]=','; - comma_cnt=2; + comma_count=2; if (!--i) break; } if (n) { @@ -600,7 +600,7 @@ sp_out_inf: if (dec_len) tmp_buf[k++]='.'; if (flags&PRTF_COMMA) { - comma_cnt=3; + comma_count=3; do { if (n) { n--; @@ -608,9 +608,9 @@ sp_out_inf: } else tmp_buf[k++]=ModU64(&m,10)+'0'; if (!m) break; - if (!--comma_cnt) { + if (!--comma_count) { tmp_buf[k++]=','; - comma_cnt=3; + comma_count=3; } } while (k'9') tmp_buf[k]+='A'-0x3A; k++; m>>=4; if (!m) break; - if (!--comma_cnt) { + if (!--comma_count) { tmp_buf[k++]=','; - comma_cnt=4; + comma_count=4; } } while (k'9') tmp_buf[k]+='a'-0x3A; k++; m>>=4; if (!m) break; - if (!--comma_cnt) { + if (!--comma_count) { tmp_buf[k++]=','; - comma_cnt=4; + comma_count=4; } } while (k>=1; if (!m) break; - if (!--comma_cnt) { + if (!--comma_count) { tmp_buf[k++]=','; - comma_cnt=4; + comma_count=4; } } while (k1) TSFile("::/Demo/MultiCore/MPRadix"); - TS("LoadTest"); if (mp_cnt>1 && DriveIsWritable(':')) + TS("MPRadix"); if (mp_count>1) TSFile("::/Demo/MultiCore/MPRadix"); + TS("LoadTest"); if (mp_count>1 && DriveIsWritable(':')) TSFileChar("::/Demo/MultiCore/LoadTest"); - TS("MPPrint"); if (mp_cnt>1) TSFile("::/Demo/MultiCore/MPPrint"); - TS("Lock"); if (mp_cnt>1) TSFile("::/Demo/MultiCore/Lock"); - TS("Interrupts"); if (mp_cnt>1) TSFile("::/Demo/MultiCore/Interrupts"); + TS("MPPrint"); if (mp_count>1) TSFile("::/Demo/MultiCore/MPPrint"); + TS("Lock"); if (mp_count>1) TSFile("::/Demo/MultiCore/Lock"); + TS("Interrupts"); if (mp_count>1) TSFile("::/Demo/MultiCore/Interrupts"); TS("SpritePlot"); TSFileChar("::/Demo/Graphics/SpritePlot"); TS("Elephants"); TSFileChar("::/Demo/Graphics/Elephant",,CH_SHIFT_ESC); TS("SpritePlot3D"); TSFileChar("::/Demo/Graphics/SpritePlot3D"); @@ -1694,7 +1694,7 @@ U0 OSTestSuite() TS("ZipRep"); XTalkWait(task,"ZipRep;Sleep(750);\n"); TS("ProfRep"); XTalkWait(task,"ProfRep;Sleep(750);\n"); TS("HeapLogSizeRep"); XTalkWait(task,"HeapLogSizeRep;Sleep(750);\n"); - TS("CPURep"); if (mp_cnt>1) + TS("CPURep"); if (mp_count>1) XTalkWait(task,"CPURep(TRUE);Sleep(750);\n"); TS("DiskCheck"); if (DriveIsWritable(':')) XTalkWait(task,"DiskCheck;Sleep(750);\n"); diff --git a/src/Misc/PCIDevices.DD b/src/Misc/PCIDevices.DD index 3a7c24a9..ae8a5c7c 100755 --- a/src/Misc/PCIDevices.DD +++ b/src/Misc/PCIDevices.DD @@ -1278,7 +1278,7 @@ 1113 CL-PD6833 PCI-to-CardBus Host Adapter 1200 CL-GD7542 Nordic GUI Accelerator 1202 GD7543 Viking GUI Accelerator - 1204 CL-GD7541 Nordic-lite VGA Cntrlr + 1204 CL-GD7541 Nordic-lite VGA Countrlr 4000 1085 Ambient CLM Data Fax Voice 4400 CL-CD4400 Communications Controller 6001 CS4610/4611 CrystalClear SoundFusion PCI Audio Accelerator @@ -1373,7 +1373,7 @@ 9010 MegaRAID 428 Ultra Wide SCSI RAID Controller2 9030 EIDE Controller 9031 EIDE Controller - 9032 IDE and SCSI Cntrlr + 9032 IDE and SCSI Countrlr 9033 I960 SCSI Controller 9040 amd sempron(tm)2200+ Multimedia card 9060 MegaRAID 434 Ultra GT RAID Controller @@ -1501,7 +1501,7 @@ 8820 Ai1 TRIDENT DISPLAY CONTROLER /CyberALADDiN-T Driver 9320 TGUI9320 32-bit GUI Accelerator 9350 TGUI9350 32-bit GUI Accelerator - 9360 7tskbc Flat panel Cntrlr + 9360 7tskbc Flat panel Countrlr 9382 Cyber9382 9383 Cyber9383 9385 Cyber9385 @@ -1662,7 +1662,7 @@ 102C Asiliant (Chips And Technologies) 00B8 64310 Wingine DGX - DRAM Graphics Accelerator 00C0 69000 AGP/PCI Flat Panel/CRT VGA Accelerator - 00D0 65545 Flat panel/crt VGA Cntrlr + 00D0 65545 Flat panel/crt VGA Countrlr 00D8 65540 Flat Panel/CRT VGA Controller 00DC 65548 GUI Accelerator 00E0 65550 LCD/CRT controller @@ -1708,7 +1708,7 @@ 0006 GUI Accelerator 0007 unknown from Creative.com PCI to ux-bus Bridge 0008 GUI Accelerator (vga equivalent) - 0009 graphic Cntrlr for 98 + 0009 graphic Countrlr for 98 001A Nile II 001D uPD98405 NEASCOT-S20 ATM Integrated SAR Ctrlr 0021 Vrc4373 Nile I @@ -2185,7 +2185,7 @@ 1054 Hitachi Ltd 0003 06A2 0003 0001 PCI Bridge - 0002 pci bus PCI bus Cntrlr + 0002 pci bus PCI bus Countrlr 0003 06A2 hts547575a9e384 3505 SH7751 SuperH (SH) 32-Bit RISC MCU/MPU Series 1055 Standard Microsystems Corp. @@ -2303,10 +2303,10 @@ 0881 UM8881 HB4 486 PCI Chipset 0886 UM8886F ISA Bridge 0891 UM82C891 Pentium CPU to PCI bridge - 1001 UM886A IDE Cntrlr (dual function) + 1001 UM886A IDE Countrlr (dual function) 673A UM8886BF EIDE Controller 673B EIDE Master/DMA - 8710 UM8710 VGA Cntrlr + 8710 UM8710 VGA Countrlr 8821 21611a3b CPU/PCI Bridge 8822 PCI/ISA Bridge 8851 Pentium CPU/PCI Bridge @@ -2388,7 +2388,7 @@ 1071 Mitac 1072 GIT Co. Ltd. 1073 Yamaha Corporation - 0001 3D graphics Cntrlr + 0001 3D graphics Countrlr 0002 YGV615 RPA3 3D-Graphics Controller 0003 00011179 0004 YMF754B DS-1S Audio PCI Audio Controller @@ -2458,7 +2458,7 @@ 0000 P86C850 Graphic GLU-Logic 107E Testernec 0001 FLIPPER FRED Local Bus I/F to PCI Peripheral - 0002 100 vg anylan Cntrlr + 0002 100 vg anylan Countrlr 0004 5526 Fibre Channel Host Adapter 0005 x526 Fibre Channel Host Adapter 0008 4575/5525/5575/6575 (i)chipSAR+ 155 MBit ATM controller @@ -2641,7 +2641,7 @@ 0244 SIL3132 eSATA/Raid controller 0640 PCI0640A/B EIDE Ctrlr 0641 pci0640 pci eide adapter with raid 1 - 0642 PCI0642 IDE Cntrlr w/RAID 1 + 0642 PCI0642 IDE Countrlr w/RAID 1 0643 PCI0643 PCI EIDE controller 0646 CMD646 EIDE/UDMA Controller 0647 PCI0647 9738 @@ -2741,7 +2741,7 @@ 10AC Honeywell IASD 10AD Winbond Systems Labs 0001 W83769F EIDE Ctrlr - 0103 sl82c103 PCI-ide mode 4.5 Cntrlr + 0103 sl82c103 PCI-ide mode 4.5 Countrlr 0105 W83789F Sonata bus master PCI-IDE controller 0565 W83C553F PCI/ISA bridge 10AE Cornerstone Technology @@ -2962,11 +2962,11 @@ 10BD Surecom Technology 0803 MYSON Technology Inc SURECOM EP-320X-S 100/10M Et Ethernet PCI Adapter 0E34 NE34 Ethernet Adapter (NE2000 PCI clone) - 5240 0055 IDE Cntrlr + 5240 0055 IDE Countrlr 5241 8086 PCMCIA Bridge - 5242 General Purpose Cntrlr - 5243 00000000 Bus Cntrlr - 5244 FCD Cntrlr + 5242 General Purpose Countrlr + 5243 00000000 Bus Countrlr + 5244 FCD Countrlr 8136 Unkown Unkown 8139 surecom EP-320X-R adapter with realtek 8139c chip realtek 8139c 10BE Tsenglabs International Corp. @@ -2984,7 +2984,7 @@ 10C6 Rambus Inc. 10C8 Neomagic Corporation 0004 831610F7 MagicGraph 128XD - 0000 NM2097 Graphics Cntrlr + 0000 NM2097 Graphics Countrlr 0003 NM2093 MagicGraph 128ZV Video Controller 0004 NM2160 MagicGraph 128XD 0005 NM2200 MagicMedia 256AV @@ -4540,7 +4540,7 @@ 0002 DPRB Dual PCI to RapidIO Bridge 9876 3059 audio driver 1135 Fuji Xerox Co Ltd - 0001 Printer Cntrlr + 0001 Printer Countrlr 1136 Momentum Data Systems 1137 Cisco Systems Inc 1138 Ziatech Corporation @@ -4582,7 +4582,7 @@ 3210 9809 139K76B 1143 Netpower Inc 1144 Cincinnati Milacron - 0001 Noservo Cntrlr + 0001 Noservo Countrlr 1145 Workbit Corp F)21 ???? HDCClassName F020 CardBus ATAPI Host Adapter F021 NPATA32 CardBus CompactFlash Adapter @@ -4907,7 +4907,7 @@ 1191 Acard Technology Corp. 0001 IDE Ctrlr 0002 ATP850UF UltraDMA33 EIDE Controller (AEC6210UF) - 0003 SCSI-2 cache Cntrlr + 0003 SCSI-2 cache Countrlr 0004 4111111111111111 UltraDMA33 EIDE Controller 0005 ATP850UF UltraDMA33 EIDE Controller (AEC6210UF) 0006 ATP860A UltraDMA66 EDIE Controller (AEC6260) diff --git a/src/Tmp/MyDistro.iso b/src/Tmp/MyDistro.iso index 2b3497c4..af795be0 100755 Binary files a/src/Tmp/MyDistro.iso and b/src/Tmp/MyDistro.iso differ diff --git a/src/Zenith/AutoComplete/ACDictGen.HC b/src/Zenith/AutoComplete/ACDictGen.HC index 4c7ebb65..48666f61 100755 --- a/src/Zenith/AutoComplete/ACDictGen.HC +++ b/src/Zenith/AutoComplete/ACDictGen.HC @@ -119,9 +119,9 @@ I64 ACDCompareWords(U8 *e1,U8 *e2) return StrICmp(e1,e2); } -U8 *ACDSortWords(U8 *start,I64 size,I64 word_cnt) +U8 *ACDSortWords(U8 *start,I64 size,I64 word_count) { - U8 **ptr_array=MAlloc(sizeof(U8 *)*word_cnt), + U8 **ptr_array=MAlloc(sizeof(U8 *)*word_count), *out_start=MAlloc(size), *ptr=start,*ptr2; I64 i=0; @@ -130,11 +130,11 @@ U8 *ACDSortWords(U8 *start,I64 size,I64 word_cnt) ptr+=StrLen(ptr)+3; } "Sorting...\n"; Sleep(100); - QSortI64(ptr_array,word_cnt,&ACDCompareWords); + QSortI64(ptr_array,word_count,&ACDCompareWords); "Done...\n"; Sleep(100); ptr=out_start; - for (i=0;istr=tmph+1; - tmph->use_cnt=1; + tmph->use_count=1; tmph->type=HTT_DICT_WORD; d=in_ptr; tmph->user_data0=*d; @@ -51,7 +51,7 @@ CHashAC *ACHashAdd(U8 *w) tmpw=ACAlloc(sizeof(CHashAC)); tmpw->str=AStrNew(w); tmpw->type=HTT_WORD; - tmpw->use_cnt=1; + tmpw->use_count=1; tmpw->hits=1; HashAdd(tmpw,ac.hash_table); ac.num_words++; diff --git a/src/Zenith/AutoComplete/ACTask.HC b/src/Zenith/AutoComplete/ACTask.HC index d8159bde..77892cb5 100755 --- a/src/Zenith/AutoComplete/ACTask.HC +++ b/src/Zenith/AutoComplete/ACTask.HC @@ -227,7 +227,7 @@ U0 ACTask(I64) ac.cur_word=NULL; while (TRUE) { if (scan_code&(SCF_CTRL|SCF_ALT) || - GetTSC>KbdMsEvtTime+cnts.time_stamp_freq>>1) { + GetTSC>KbdMsEvtTime+counts.time_stamp_freq>>1) { last_scan_code=scan_code; scan_code=kbd.scan_code; } diff --git a/src/Zenith/Boot/BootDVD.HC b/src/Zenith/Boot/BootDVD.HC index 94b67437..536a4480 100755 --- a/src/Zenith/Boot/BootDVD.HC +++ b/src/Zenith/Boot/BootDVD.HC @@ -112,7 +112,7 @@ BDVD_MAIN:: MOV AX,U16 [BDVD_BLK_LO-BDVD_START] MOV DX,U16 [BDVD_BLK_HI-BDVD_START] -@@20: PUSH CX //Blk cnt +@@20: PUSH CX //Blk count //READ BLK PUSH AX //Blk lo diff --git a/src/Zenith/Boot/BootHD.HC b/src/Zenith/Boot/BootHD.HC index e9ce6832..973dec3e 100755 --- a/src/Zenith/Boot/BootHD.HC +++ b/src/Zenith/Boot/BootHD.HC @@ -61,7 +61,7 @@ BHD_HISTART: XOR ECX,ECX MOV CX,U16 [BHD_BLK_CNT-BHD_START] -@@05: PUSH CX //Blk cnt +@@05: PUSH CX //Blk count //READ BLK PUSH ES //Buf seg diff --git a/src/Zenith/Boot/BootMHD.HC b/src/Zenith/Boot/BootMHD.HC index 527e4ed8..c08e5f6e 100755 --- a/src/Zenith/Boot/BootMHD.HC +++ b/src/Zenith/Boot/BootMHD.HC @@ -75,7 +75,7 @@ BMHD_HISTART: XOR ECX,ECX MOV CX,U16 [BMHD_BLK_CNT-BMHD_START] -@@05: PUSH CX //Blk cnt +@@05: PUSH CX //Blk count //READ BLK PUSH ES //Buf seg diff --git a/src/Zenith/Boot/BootRAM.HC b/src/Zenith/Boot/BootRAM.HC index 723d005d..58450d78 100755 --- a/src/Zenith/Boot/BootRAM.HC +++ b/src/Zenith/Boot/BootRAM.HC @@ -27,7 +27,7 @@ _HI_MEMCPY:: RET1 24 } _extern _HI_CALL I64 HiCall(U8 *machine_code); -_extern _HI_MEMCPY U8 *HiMemCpy(U8 *dst,U8 *src,I64 cnt); +_extern _HI_MEMCPY U8 *HiMemCpy(U8 *dst,U8 *src,I64 count); #help_index "Boot" public U0 BootRAM(U8 *filename=NULL) @@ -51,7 +51,7 @@ public U0 BootRAM(U8 *filename=NULL) sizeof(CKernel)-offset(CKernel.start)); CLI - if (mp_cnt>1) + if (mp_count>1) MPHalt; HiMemCpy(sys_ram_reboot,SYS_RAM_REBOOT,SYS_RAM_REBOOT_END-SYS_RAM_REBOOT); diff --git a/src/Zenith/Boot/DiskISORedSea.HC b/src/Zenith/Boot/DiskISORedSea.HC index f2044c8f..e3825851 100755 --- a/src/Zenith/Boot/DiskISORedSea.HC +++ b/src/Zenith/Boot/DiskISORedSea.HC @@ -20,7 +20,7 @@ class CElTorito U16 load_seg; //0000->07C0 U8 sys_type; U8 zero; - U16 sect_cnt; + U16 sect_count; U32 load_rba; //start addr of virtual disk U8 zero2[20]; }; @@ -103,7 +103,7 @@ U0 RedSeaISO9660(U8 *iso_filename,U8 drv_let) et->w[14]=-j; et->bootable=0x88; et->media_type=0;//0=no emu 2=1.44meg 4=hard drive - et->sect_cnt=4; //5 seems like the limit, 4 is safer + et->sect_count=4; //5 seems like the limit, 4 is safer et->load_rba=20<<2>>2+1; FBlkWrite(out_file,et,20<<2,4); FClose(out_file); @@ -118,7 +118,7 @@ U0 RedSeaISO9660(U8 *iso_filename,U8 drv_let) I64 RedSeaISOPass1(CDirEntry *tmpde) { - I64 dir_entry_cnt=3+LinkedLstCnt(tmpde),res=0; + I64 dir_entry_count=3+LinkedLstCount(tmpde),res=0; while (tmpde) { if (tmpde->attr & RS_ATTR_DIR) { if (tmpde->sub) @@ -129,14 +129,14 @@ I64 RedSeaISOPass1(CDirEntry *tmpde) res+=CeilU64(tmpde->size,BLK_SIZE); tmpde=tmpde->next; } - res+=CeilU64(dir_entry_cnt<<6,BLK_SIZE); //Size in bytes + res+=CeilU64(dir_entry_count<<6,BLK_SIZE); //Size in bytes #assert CDIR_SIZE==64 return res; } public I64 RedSeaISO(U8 *_iso_filename=NULL,U8 *_src_dir, U8 *_stage2_filename=NULL) {//See $LK,"::/Misc/DoDistro.HC"$. Must be ISO.C - I64 i,res,root_cnt,root_dir_blks,bitmap_blks,bitmap_blks1; + I64 i,res,root_count,root_dir_blks,bitmap_blks,bitmap_blks1; CDirEntry *tmpde; U8 buf[STR_LEN],*iso_filename,*src_dir,*stage2_filename; CDrive *dv=DriveMakeFreeSlot(DriveNextFreeLet('Q')); //First $LK,"BDT_ISO_FILE_WRITE",A="MN:BDT_ISO_FILE_WRITE"$ @@ -159,8 +159,8 @@ public I64 RedSeaISO(U8 *_iso_filename=NULL,U8 *_src_dir, } else stage2_filename=NULL; tmpde=FilesFind(src_dir,FUF_RECURSE); - root_cnt=LinkedLstCnt(tmpde)+3; - root_dir_blks=CeilU64(root_cnt<<6,BLK_SIZE)>>BLK_SIZE_BITS; + root_count=LinkedLstCount(tmpde)+3; + root_dir_blks=CeilU64(root_count<<6,BLK_SIZE)>>BLK_SIZE_BITS; if (res=RedSeaISOPass1(tmpde)>>BLK_SIZE_BITS) { bd->drv_offset=19<<2+(DVD_BLK_SIZE*2+DVD_BOOT_LOADER_SIZE)/BLK_SIZE; bitmap_blks=1; diff --git a/src/Zenith/DolDoc/DocBin.HC b/src/Zenith/DolDoc/DocBin.HC index e3b41b0a..93efb438 100755 --- a/src/Zenith/DolDoc/DocBin.HC +++ b/src/Zenith/DolDoc/DocBin.HC @@ -33,8 +33,8 @@ U0 DocBinsValidate(CDoc *doc) I64 renum_num=0; b=doc->bin_head.next; while (b!=&doc->bin_head) { - b->use_cnt=0; - b->tmp_use_cnt=0; + b->use_count=0; + b->tmp_use_count=0; b->renum_num=-1; Free(b->tag); b->tag=NULL; @@ -46,8 +46,8 @@ U0 DocBinsValidate(CDoc *doc) if (doc_e->de_flags & DOCEF_HAS_BIN) { if (b=doc_e->bin_data=DocBinFindNum(doc,doc_e->bin_num)) { if (doc_e->de_flags & DOCEF_BIN_PTR_LINK) - b->tmp_use_cnt=I32_MAX; - if (!b->use_cnt++) + b->tmp_use_count=I32_MAX; + if (!b->use_count++) b->renum_num=++renum_num; doc_e->bin_num=b->renum_num; if (!b->tag && doc_e->de_flags&DOCEF_TAG && doc_e->tag && *doc_e->tag) @@ -65,7 +65,7 @@ U0 DocBinsValidate(CDoc *doc) doc->cur_bin_num=1; while (b!=&doc->bin_head) { b1=b->next; - if (!b->use_cnt) { + if (!b->use_count) { QueueRemove(b); Free(b->data); Free(b); @@ -82,9 +82,9 @@ U0 DocBinsValidate(CDoc *doc) U0 DocBinDel(CDoc *doc,CDocBin *b) { - if (doc && b && b->use_cnt) { - b->use_cnt--; - if (!b->use_cnt) { + if (doc && b && b->use_count) { + b->use_count--; + if (!b->use_count) { QueueRemove(b); Free(b->tag); Free(b->data); @@ -114,13 +114,13 @@ I64 DocBinPtrRst(CDoc *doc,CDocEntry *doc_e) i=1; if (bin_num>0) { if (tmpb=DocBinFindNum(doc,bin_num)) { - i=tmpb->use_cnt; + i=tmpb->use_count; DocBinDel(doc,tmpb); } } else bin_num=doc->cur_bin_num++; tmpb=MAllocIdent(tmpb2,doc->mem_task); - tmpb->use_cnt=i; + tmpb->use_count=i; tmpb->data=MAllocIdent(tmpb2->data,doc->mem_task); tmpb->num=bin_num; doc_e->bin_data=tmpb; diff --git a/src/Zenith/DolDoc/DocCodeTools.HC b/src/Zenith/DolDoc/DocCodeTools.HC index 7efbc317..19c57145 100755 --- a/src/Zenith/DolDoc/DocCodeTools.HC +++ b/src/Zenith/DolDoc/DocCodeTools.HC @@ -518,7 +518,7 @@ U0 EdCodeTools2(CDoc *doc,I64 tool_action,Bool beep=TRUE) EdRemFunLeadingSpace(doc); DocGoToLine(doc,start_y+1); doc_e=doc->cur_entry; - end_y=start_y+indent->total_cnt; + end_y=start_y+indent->total_count; while (start_y<=doc_e->ycur_entry && !(doc_e->de_flags&(DOCEG_DONT_EDIT-DOCEF_SCROLLING_X))) { diff --git a/src/Zenith/DolDoc/DocEd.HC b/src/Zenith/DolDoc/DocEd.HC index ca1abbeb..867336a5 100755 --- a/src/Zenith/DolDoc/DocEd.HC +++ b/src/Zenith/DolDoc/DocEd.HC @@ -117,7 +117,7 @@ public Bool DocEd(CDoc *doc,I64 dof_flags=0) if (doc->flags & DOCF_ALLOW_UNDO) { DocPrint(bdoc,"$$CM+BY+LX+NC,1,1$$"); doc_e=DocPrint(bdoc,"$$DA+BD+RD-TRM,RT=U32,A=\"Undo:%%03d\"$$\n"); - doc_e->data=&doc->undo_cnt; + doc_e->data=&doc->undo_count; DocDataFmt(bdoc,doc_e); } diff --git a/src/Zenith/DolDoc/DocFile.HC b/src/Zenith/DolDoc/DocFile.HC index 608f1dac..9fa738be 100755 --- a/src/Zenith/DolDoc/DocFile.HC +++ b/src/Zenith/DolDoc/DocFile.HC @@ -58,7 +58,7 @@ public U8 *DocSave(CDoc *doc,I64 *_size=NULL) CDocEntry *doc_e,*doc_e1; CDocBin *b; Bool unlock=DocLock(doc); - I64 ch,cnt=1;//terminator + I64 ch,count=1;//terminator U8 *st,*res,*dst,*src; if (!(doc->flags & (DOCF_PLAIN_TEXT|DOCF_PLAIN_TEXT_TABS))) @@ -76,13 +76,13 @@ public U8 *DocSave(CDoc *doc,I64 *_size=NULL) case DOCT_TAB: case DOCT_PAGE_BREAK: case DOCT_CURSOR: - cnt++; + count++; break; case DOCT_NEW_LINE: if (doc->flags&DOCF_CARRIAGE_RETURN) - cnt+=2; + count+=2; else - cnt++; + count++; break; case DOCT_SOFT_NEW_LINE: break; @@ -90,23 +90,23 @@ public U8 *DocSave(CDoc *doc,I64 *_size=NULL) if (!(doc_e->de_flags & ~(DOCEF_TAG|DOCG_BL_IV_UL|DOCEF_WORD_WRAP| DOCEF_HIGHLIGHT|DOCEF_SKIP|DOCEF_FILTER_SKIP))&& !(doc_e->type&DOCG_BL_IV_UL)) { - cnt+=StrLen(doc_e->tag); + count+=StrLen(doc_e->tag); if (!(doc->flags & (DOCF_PLAIN_TEXT|DOCF_PLAIN_TEXT_TABS)) || doc->flags&DOCF_DBL_DOLLARS) - cnt+=StrOcc(doc_e->tag,'$$'); + count+=StrOcc(doc_e->tag,'$$'); break; } default: st=Doc2PlainText(doc,doc_e); - cnt+=StrLen(st)+2; + count+=StrLen(st)+2; Free(st); } } } for (b=doc->bin_head.next;b!=&doc->bin_head;b=b->next) - if (b->use_cnt>b->tmp_use_cnt) - cnt+=offset(CDocBin.end)-offset(CDocBin.start)+b->size; - res=MAlloc(cnt); + if (b->use_count>b->tmp_use_count) + count+=offset(CDocBin.end)-offset(CDocBin.start)+b->size; + res=MAlloc(count); dst=res; doc_e=doc->head.next; while (doc_e!=doc) { @@ -154,7 +154,7 @@ public U8 *DocSave(CDoc *doc,I64 *_size=NULL) b=doc->bin_head.next; if (b!=&doc->bin_head) { do { - if (b->use_cnt>b->tmp_use_cnt) { + if (b->use_count>b->tmp_use_count) { MemCpy(dst,&b->start,offset(CDocBin.end)-offset(CDocBin.start)); dst+=offset(CDocBin.end)-offset(CDocBin.start); MemCpy(dst,b->data,b->size); @@ -163,8 +163,8 @@ public U8 *DocSave(CDoc *doc,I64 *_size=NULL) b=b->next; } while (b!=&doc->bin_head); } else - cnt--; //No terminator - if (_size) *_size=cnt; + count--; //No terminator + if (_size) *_size=count; if (unlock) DocUnlock(doc); return res; @@ -251,7 +251,7 @@ Bool DocCaptureUndo(CDoc *doc,Bool force=FALSE) unlock=DocLock(doc); time_stamp=GetTSC; if (doc->flags&DOCF_UNDO_DIRTY && - time_stamp>doc->undo_head.last->time_stamp+cnts.time_stamp_freq<<4 || + time_stamp>doc->undo_head.last->time_stamp+counts.time_stamp_freq<<4 || force) { u=CAlloc(sizeof(CDocUndo),doc->mem_task); u->time_stamp=time_stamp; @@ -261,7 +261,7 @@ Bool DocCaptureUndo(CDoc *doc,Bool force=FALSE) doc->flags=flags; QueueInsert(u,doc->undo_head.last); doc->flags&=~DOCF_UNDO_DIRTY; - doc->undo_cnt++; + doc->undo_count++; u->doc_flags=doc->flags; res=TRUE; if (doc->flags&DOCF_AUTO_SAVE) @@ -290,7 +290,7 @@ U0 DocUndoRestore(CDoc *doc) doc->undo_head.next=u_next; doc->undo_head.last=u_last; } - DocUndoCntSet(doc); + DocUndoCountSet(doc); doc->flags&=~DOCF_UNDO_DIRTY; if (unlock) DocUnlock(doc); diff --git a/src/Zenith/DolDoc/DocForm.HC b/src/Zenith/DolDoc/DocForm.HC index 4828faff..f56e9b4e 100755 --- a/src/Zenith/DolDoc/DocForm.HC +++ b/src/Zenith/DolDoc/DocForm.HC @@ -110,7 +110,7 @@ U0 DocDataFmt(CDoc *doc,CDocEntry *doc_e,I64 d=DOCM_CANCEL) doc_e->max_col=i; } else if (doc_e->de_flags & DOCEF_LST) { if (doc_e->de_flags & DOCEF_DEFINE && (tmph=HashFind(doc_e->define_str, - doc->win_task->hash_table,HTT_DEFINE_STR)) && 0<=dcnt) { + doc->win_task->hash_table,HTT_DEFINE_STR)) && 0<=dcount) { ptr=MStrPrint("[%s]",tmph->sub_idx[d]); Free(doc_e->tag); doc_e->tag=StrNew(ptr,doc->mem_task); @@ -231,14 +231,14 @@ public Bool DocForm(U8 *_d,U8 *class_name=lastclass, (doc_e=DocPrint(doc,"%s",format))) { tmpc2=ml->member_class; if ((doc_e->type_u8==DOCT_DATA || doc_e->type_u8==DOCT_LST || - doc_e->type_u8==DOCT_CHECK_BOX) && !tmpc2->ptr_stars_cnt) { + doc_e->type_u8==DOCT_CHECK_BOX) && !tmpc2->ptr_stars_count) { tmpc2=OptClassFwd(tmpc2); - tmpc2-=tmpc2->ptr_stars_cnt; + tmpc2-=tmpc2->ptr_stars_count; if (tmpc2->type & HTT_INTERNAL_TYPE) { if (ml->dim.next) { //Array if (tmpc2->raw_type==RT_U8 && LBtr(&doc_e->de_flags,&DOCEf_DFT_LEN)) { - doc_e->len=ml->dim.total_cnt; + doc_e->len=ml->dim.total_count; if (doc_e->de_flags&DOCEF_HAS_TERMINATOR) doc_e->len--; Free(doc_e->tag); //See $LK,"DataTagWidth",A="FA:::/Zenith/DolDoc/DocPlain.HC,DataTagWidth"$ diff --git a/src/Zenith/DolDoc/DocMacro.HC b/src/Zenith/DolDoc/DocMacro.HC index 551a3b1b..b8b73ce2 100755 --- a/src/Zenith/DolDoc/DocMacro.HC +++ b/src/Zenith/DolDoc/DocMacro.HC @@ -53,7 +53,7 @@ CMacroTmp *Cmd2MT(CJob *tmpc) U8 *SysMacro2Str(CJob *macro_head) { CJob *tmpc; - I64 cnt=1; //terminating zero + I64 count=1; //terminating zero U8 *ptr,*m; CMacroTmp *tmpmt,*tmpmt1,head; LBtr(&sys_semas[SEMA_RECORD_MACRO],0); @@ -64,17 +64,17 @@ U8 *SysMacro2Str(CJob *macro_head) while (tmpc!=macro_head) { tmpmt=Cmd2MT(tmpc); QueueInsert(tmpmt,head.last); - cnt+=StrLen(tmpmt->buf); + count+=StrLen(tmpmt->buf); if (tmpmt->type==MT_CHAR) { if (tmpmt->last->type!=MT_CHAR) - cnt+=StrLen("\""); + count+=StrLen("\""); if (tmpmt->next->type!=MT_CHAR) - cnt+=StrLen("\";"); + count+=StrLen("\";"); } tmpc=tmpc->next; } - m=MAlloc(cnt); + m=MAlloc(count); ptr=m; tmpmt=head.next; diff --git a/src/Zenith/DolDoc/DocNew.HC b/src/Zenith/DolDoc/DocNew.HC index 3ce5f770..14bd0210 100755 --- a/src/Zenith/DolDoc/DocNew.HC +++ b/src/Zenith/DolDoc/DocNew.HC @@ -120,13 +120,13 @@ U0 DocUndoDel(CDoc *,CDocUndo *u) Free(u); } -U0 DocUndoCntSet(CDoc *doc) +U0 DocUndoCountSet(CDoc *doc) { Bool unlock=DocLock(doc); CDocUndo *u=doc->undo_head.next; - doc->undo_cnt=0; + doc->undo_count=0; while (u!=&doc->undo_head) { - doc->undo_cnt++; + doc->undo_count++; u=u->next; } if (unlock) @@ -271,7 +271,7 @@ public U0 DocRst(CDoc *doc,Bool is_old) QueueInit(&doc->bin_head); QueueInit(&doc->undo_head); doc->undo_head.time_stamp=0; - doc->undo_cnt=0; + doc->undo_count=0; doc->cur_bin_num=1; doc->dollar_buf_ptr=0; doc->cmd_U8=CH_SPACE; diff --git a/src/Zenith/DolDoc/DocPlain.HC b/src/Zenith/DolDoc/DocPlain.HC index 55114e19..3e33cc4c 100755 --- a/src/Zenith/DolDoc/DocPlain.HC +++ b/src/Zenith/DolDoc/DocPlain.HC @@ -600,7 +600,7 @@ U0 DocFlagsToggle(CDoc *doc,I64 tog_flags) DocRst(doc,TRUE); doc->undo_head.next=u_next; doc->undo_head.last=u_last; - DocUndoCntSet(doc); + DocUndoCountSet(doc); doc->flags=flags&~(DOCF_NO_CURSOR|DOCG_BL_IV_UL|DOCF_WORD_WRAP); DocLoad(doc,st,size); doc->flags|=flags&DOCF_NO_CURSOR; diff --git a/src/Zenith/DolDoc/DocPutS.HC b/src/Zenith/DolDoc/DocPutS.HC index 1e5fbed3..1c1ba18d 100755 --- a/src/Zenith/DolDoc/DocPutS.HC +++ b/src/Zenith/DolDoc/DocPutS.HC @@ -309,12 +309,12 @@ public CDocEntry *DocPutLine(CDoc *doc=NULL,CDocEntry *doc_e) #help_index "Debugging/Dump;DolDoc/Cmd Line (Typically);"\ "Cmd Line (Typically);DolDoc/Output;StdOut/DolDoc" -public U0 DocDm(U8 *buf,I64 cnt=0x80) +public U0 DocDm(U8 *buf,I64 count=0x80) {//Dump live chunk of mem showing addresses. Can be edited. CDocEntry *doc_e; CDoc *doc=DocPut; Bool unlock=DocLock(doc); - doc_e=DocPrint(doc,"$$HX-Z,%d,16$$",cnt); + doc_e=DocPrint(doc,"$$HX-Z,%d,16$$",count); doc_e->data=buf; doc->cur_entry=doc_e->next; DocRecalc(doc); @@ -322,12 +322,12 @@ public U0 DocDm(U8 *buf,I64 cnt=0x80) DocUnlock(doc); } -public U0 DocD(U8 *buf,I64 cnt=0x80) +public U0 DocD(U8 *buf,I64 count=0x80) {//Dump live chunk of mem showing offsets. Can be edited. CDocEntry *doc_e; CDoc *doc=DocPut; Bool unlock=DocLock(doc); - doc_e=DocPrint(doc,"$$HX,%d,16$$",cnt); + doc_e=DocPrint(doc,"$$HX,%d,16$$",count); doc_e->data=buf; doc->cur_entry=doc_e->next; DocRecalc(doc); diff --git a/src/Zenith/DolDoc/DocRecalc.HC b/src/Zenith/DolDoc/DocRecalc.HC index e986088c..d03bc9c2 100755 --- a/src/Zenith/DolDoc/DocRecalc.HC +++ b/src/Zenith/DolDoc/DocRecalc.HC @@ -278,9 +278,9 @@ public Bool DocRecalc(CDoc *doc,I64 recalc_flags=RECALCt_NORMAL) //WinMgr updates all wins $TX,"30",D="WINMGR_FPS"$, 33.33333mS if (recalc_flags&RECALCG_MASK==RECALCt_TO_SCRN && doc->owning_task!=Fs) { - i_jif=cnts.jiffies+JIFFY_FREQ/250; //4 ms + i_jif=counts.jiffies+JIFFY_FREQ/250; //4 ms while (Bt(&doc->locked_flags,DOClf_LOCKED)) { - if (cnts.jiffies>=i_jif) + if (counts.jiffies>=i_jif) return FALSE; //Bail-out if doc locked. Yield; } @@ -303,7 +303,7 @@ public Bool DocRecalc(CDoc *doc,I64 recalc_flags=RECALCt_NORMAL) dc=DCAlias(gr.dc2,win_task); //Necessary for sprites break; case RECALCt_TO_SCRN: - if (doc->updates_cnt++%(ToI64(winmgr.fps/10)+1) && + if (doc->updates_count++%(ToI64(winmgr.fps/10)+1) && !Bt(&doc->flags,DOCf_DO_FULL_REFRESH) && !(doc->flags&DOCF_BWD_MOVEMENT)) full_refresh=FALSE; diff --git a/src/Zenith/DolDoc/DocWidgetWiz.HC b/src/Zenith/DolDoc/DocWidgetWiz.HC index d36110d0..c1dcde4f 100755 --- a/src/Zenith/DolDoc/DocWidgetWiz.HC +++ b/src/Zenith/DolDoc/DocWidgetWiz.HC @@ -897,7 +897,7 @@ U0 EdInsLst() class CEdHexEd { - I64 cnt format "$$DA,A=\"Count:%d\"$$\n", + I64 count format "$$DA,A=\"Count:%d\"$$\n", cols format "$$DA,A=\"Columns:%d\"$$\n"; Bool zero format "$$CB,\"Zero Based\"$$\n", refresh format "$$CB,\"Refresh Data\"$$\n"; @@ -907,14 +907,14 @@ U0 EdInsHexEd() { U8 buf[512]; CEdHexEd *e=CAlloc(sizeof(CEdHexEd)); - e->cnt=128; + e->count=128; e->cols=4; e->zero=TRUE; if (DocForm(e,,,,ctrl_L_footer)) { *buf=0; if (!e->zero) CatPrint(buf,"-Z"); if (e->refresh) CatPrint(buf,"+RD"); - "$$$$HX%s,%d,%d$$$$",buf,e->cnt,e->cols; + "$$$$HX%s,%d,%d$$$$",buf,e->count,e->cols; } Free(e); } diff --git a/src/Zenith/God/GodBible.HC b/src/Zenith/God/GodBible.HC index de3f7bd9..a6840801 100755 --- a/src/Zenith/God/GodBible.HC +++ b/src/Zenith/God/GodBible.HC @@ -137,7 +137,7 @@ U0 BibleInit() "98684\0" "100111\0"); DefinePrint("ST_BIBLE_LINES","%d", - Str2I64(DefineSub(DefineCnt("ST_BIBLE_BOOK_LINES")-1, + Str2I64(DefineSub(DefineCount("ST_BIBLE_BOOK_LINES")-1, "ST_BIBLE_BOOK_LINES"))-1); } BibleInit; @@ -146,9 +146,9 @@ public U8 *BibleLine2Verse(I64 line,I64 separate_ch=CH_SPACE) //Separate with or ','. If you pass '%', it uses "%20". CDoc *doc; CDocEntry *doc_e; - I64 i=0,cnt=DefineCnt("ST_BIBLE_BOOKS"),start=0,last_start=0; + I64 i=0,count=DefineCount("ST_BIBLE_BOOKS"),start=0,last_start=0; U8 *ptr=DefineSub(0,"ST_BIBLE_BOOK_LINES"),*ptr2; - while (i<=cnt) { + while (i<=count) { last_start=start; start=Str2I64(ptr); if (linecur_entry; @@ -283,11 +283,11 @@ public CDoc *BibleDoc() CDocEntry *doc_e=res->head.next,*doc_e1; Bool open_chapter=FALSE; U8 *ptr=Define("ST_BIBLE_BOOK_LINES"); - I64 book,book_cnt=DefineCnt("ST_BIBLE_BOOK_LINES")-1, + I64 book,book_count=DefineCount("ST_BIBLE_BOOK_LINES")-1, chapter, line=Str2I64(ptr,,&ptr); ptr++; - for (book=0;booky+1next; DocEntryDel(res,doc_e); diff --git a/src/Zenith/God/GodDoodle.HC b/src/Zenith/God/GodDoodle.HC index c8573de5..5120a8e2 100755 --- a/src/Zenith/God/GodDoodle.HC +++ b/src/Zenith/God/GodDoodle.HC @@ -25,7 +25,7 @@ U0 GodDoodleSmooth(I64 num) { CDC *dc=DCExt(god.doodle_dc,0,0, god.doodle_dc->width-1,god.doodle_dc->height-1); - I64 i,x,y,x1,y1,c,histogram[16],best,best_cnt,c_old=god.doodle_dc->color; + I64 i,x,y,x1,y1,c,histogram[16],best,best_count,c_old=god.doodle_dc->color; for (y=0;yheight;y++) for (x=0;xwidth;x++) { MemSet(histogram,0,sizeof(histogram)); @@ -36,11 +36,11 @@ U0 GodDoodleSmooth(I64 num) histogram[c]++; } best=BLACK; - best_cnt=-1; + best_count=-1; for (i=0;i<16;i++) - if (histogram[i]>best_cnt) { + if (histogram[i]>best_count) { best=i; - best_cnt=histogram[i]; + best_count=histogram[i]; } god.doodle_dc->color=best; GrPlot(god.doodle_dc,x,y); diff --git a/src/Zenith/Gr/Gr.HH b/src/Zenith/Gr/Gr.HH index f35a8bea..1dcca76d 100755 --- a/src/Zenith/Gr/Gr.HH +++ b/src/Zenith/Gr/Gr.HH @@ -99,8 +99,8 @@ public class CSpritePtStr : CSpritePt public class CSpriteMeshU8s : CSpriteBase { - I32 vertex_cnt; - I32 tri_cnt; + I32 vertex_count; + I32 tri_count; U8 u[0]; }; @@ -109,8 +109,8 @@ public class CSpritePtMeshU8s : CSpriteBase I32 x; I32 y; I32 z; - I32 vertex_cnt; - I32 tri_cnt; + I32 vertex_count; + I32 tri_count; U8 u[0]; }; diff --git a/src/Zenith/Gr/GrAsm.HC b/src/Zenith/Gr/GrAsm.HC index 308d6f1b..4cfb1059 100755 --- a/src/Zenith/Gr/GrAsm.HC +++ b/src/Zenith/Gr/GrAsm.HC @@ -407,4 +407,4 @@ _extern _GR_UPDATE_LINE64 U0 GrUpdateLine64( _extern _GR_UPDATE_LINE64_FLUSH_CACHE U0 GrUpdateLine64FlushCache( U64 **_vga,U64 **_src,I64 d,U8 **_dst); _extern _DC_BLOT_COLOR4 U0 DCBlotColor4( - U8 *dst,I64 *img,I64 *img_cache,I64 cnt); + U8 *dst,I64 *img,I64 *img_cache,I64 count); diff --git a/src/Zenith/Gr/GrBitMap.HC b/src/Zenith/Gr/GrBitMap.HC index b43bc5dc..9ed89e21 100755 --- a/src/Zenith/Gr/GrBitMap.HC +++ b/src/Zenith/Gr/GrBitMap.HC @@ -51,7 +51,7 @@ public Bool GrPlot0(CDC *dc=gr.dc,I64 x,I64 y) case ROPB_COLLISION: c=*dst; if (c!=TRANSPARENT && c!=bkcolor.c0.color) - dc->collision_cnt++; + dc->collision_count++; break; case ROPB_XOR: *dst^=color.c0.color; @@ -152,7 +152,7 @@ public I64 GrBlot(CDC *dc=gr.dc,I64 x,I64 y,CDC *img) for (i=w1;ibody[k1+i]; if (c!=TRANSPARENT&&c!=color&&img->body[k+i]!=TRANSPARENT) - dc->collision_cnt++; + dc->collision_count++; } k+=img->width_internal; k1+=dc->width_internal; @@ -768,7 +768,7 @@ public I64 GrPutChar(CDC *dc=gr.dc,I64 x,I64 y,U8 ch) for (j=h2-h1;j;j--) { c=dc->body[k1+i]; if (c!=TRANSPARENT && c!=color && Bt(src,m)) - dc->collision_cnt++; + dc->collision_count++; k1+=dc->width_internal; src++; } @@ -1007,7 +1007,7 @@ public I64 GrVPrint(CDC *dc=gr.dc,I64 x,I64 y,U8 *fmt,...) #help_index "Graphics" public I64 GrRect(CDC *dc=gr.dc,I64 x,I64 y,I64 w,I64 h) {//2D. Width Height. Clipping but not transformation. -//Returns cnt of pixs changed. +//Returns count of pixs changed. I64 i,res=0,j,k1,kk1,w1,h1,w2,h2,dist, leading_pixels,original_leading_pixels,whole_I64s, trailing_pixels,leading_pixel_mask,trailing_pixel_mask, @@ -1096,16 +1096,16 @@ public I64 GrRect(CDC *dc=gr.dc,I64 x,I64 y,I64 w,I64 h) if (color.c0.rop==ROPB_COLLISION) {//TODO: Might want to check win_z_buf color =dc->bkcolor.c0.color; k1=(h1+y)*dc->width_internal+x; - res=-dc->collision_cnt; + res=-dc->collision_count; for (j=h2-h1;j;j--) { for (i=w1;ibody[k1+i]; if (c!=TRANSPARENT && c!=color) - dc->collision_cnt++; + dc->collision_count++; } k1+=dc->width_internal; } - res+=dc->collision_cnt; + res+=dc->collision_count; } else { if (!(dc->flags & DCF_SCRN_BITMAP) || dc->flags&DCF_ON_TOP) win_z_buf_ptr=NULL; @@ -1453,7 +1453,7 @@ public I64 GrRect(CDC *dc=gr.dc,I64 x,I64 y,I64 w,I64 h) I64 GrRayLenMinus(CDC *dc,I64 x,I64 y) { -//Returns cnt of pixs changed +//Returns count of pixs changed I64 res=0,c,x3,y3,d; U8 *dst,*dst2; Bool not_color=ToBool(dc->flags&DCF_FILL_NOT_COLOR); @@ -1517,7 +1517,7 @@ gr_done: I64 GrRayLen(CDC *dc,I64 *x1,I64 y,I64 z=0,I32 *db=NULL) { -//Returns cnt of pixs changed +//Returns count of pixs changed I64 res=0,d,x=*x1,x2,x3,y3,dist; Bool plot,dither,probability_dither, not_color=ToBool(dc->flags&DCF_FILL_NOT_COLOR); @@ -1624,7 +1624,7 @@ I64 GrRayLen(CDC *dc,I64 *x1,I64 y,I64 z=0,I32 *db=NULL) case ROPB_COLLISION: c2=*dst; if (c2!=TRANSPARENT && c2!=bkcolor.c0.color) - dc->collision_cnt++; + dc->collision_count++; break; case ROPB_XOR: *dst^=c; @@ -1699,7 +1699,7 @@ I64 GrRayLen(CDC *dc,I64 *x1,I64 y,I64 z=0,I32 *db=NULL) case ROPB_COLLISION: c2=*dst; if (c2!=TRANSPARENT && c2!=bkcolor.c0.color) - dc->collision_cnt++; + dc->collision_count++; break; case ROPB_XOR: *dst^=c; @@ -1717,7 +1717,7 @@ gr_done: public I64 GrHLine(CDC *dc=gr.dc,I64 x1,I64 x2,I64 y,I64 z1=0,I64 z2=0) {//3D. No transformation or thick. -//Returns cnt of pixs changed +//Returns count of pixs changed //Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.HC"$. I64 dist,dx,dz,z,res=0,i,j,d; U8 *dst; @@ -1848,7 +1848,7 @@ public I64 GrHLine(CDC *dc=gr.dc,I64 x1,I64 x2,I64 y,I64 z1=0,I64 z2=0) case ROPB_COLLISION: c2=*dst; if (c2!=TRANSPARENT && c2!=bkcolor.c0.color) - dc->collision_cnt++; + dc->collision_count++; break; case ROPB_XOR: *dst^=c; @@ -1886,7 +1886,7 @@ gr_done: public I64 GrVLine(CDC *dc=gr.dc,I64 x,I64 y1,I64 y2,I64 z1=0,I64 z2=0) {//3D. No transformation or thick. -//Returns cnt of pixs changed +//Returns count of pixs changed //Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.HC"$. I64 dist,dy,dz,z,res=0,i,j,d; U8 *dst; @@ -2017,7 +2017,7 @@ public I64 GrVLine(CDC *dc=gr.dc,I64 x,I64 y1,I64 y2,I64 z1=0,I64 z2=0) case ROPB_COLLISION: c2=*dst; if (c2!=TRANSPARENT && c2!=bkcolor.c0.color) - dc->collision_cnt++; + dc->collision_count++; break; case ROPB_XOR: *dst^=c; diff --git a/src/Zenith/Gr/GrComposites.HC b/src/Zenith/Gr/GrComposites.HC index c02f3fbb..f6971a5e 100755 --- a/src/Zenith/Gr/GrComposites.HC +++ b/src/Zenith/Gr/GrComposites.HC @@ -1,7 +1,7 @@ #help_index "Graphics" public I64 GrFillPoly3(CDC *dc=gr.dc,I64 n,CD3I32 *poly) {//3D. Must be convex. -//Returns cnt of pixs changed +//Returns count of pixs changed CD3I32 tri[3]; I64 i,j,x,y,z,res=0; if (n<3) return 0; @@ -246,16 +246,16 @@ public Bool GrTextDiamond3(CDC *dc=gr.dc, } #help_index "Graphics/Mesh" -public I64 Gr3Mesh(CDC *dc=gr.dc,I64 vertex_cnt,CD3I32 *p, - I64 tri_cnt,CMeshTri *tri) -{//Returns cnt of pixs changed. +public I64 Gr3Mesh(CDC *dc=gr.dc,I64 vertex_count,CD3I32 *p, + I64 tri_count,CMeshTri *tri) +{//Returns count of pixs changed. CColorROPU32 old_color=dc->color; I64 i,x,y,z,res=0; CD3I32 *pt,*pt_sym,*p_sym,*dst; CMeshTri *tri_sym=tri; if (dc->flags&DCF_TRANSFORMATION) { - dst=pt=MAlloc(sizeof(CD3I32)*vertex_cnt); - for (i=0;ix; y=p->y; z=p->z; (*dc->transform)(dc,&x,&y,&z); dst->x=x; dst->y=y; dst->z=z; @@ -265,15 +265,15 @@ public I64 Gr3Mesh(CDC *dc=gr.dc,I64 vertex_cnt,CD3I32 *p, pt=NULL; if (dc->flags & DCF_SYMMETRY) { - dst=pt_sym=MAlloc(sizeof(CD3I32)*vertex_cnt); + dst=pt_sym=MAlloc(sizeof(CD3I32)*vertex_count); p_sym=p; - for (i=0;ix; y=p_sym->y; z=p_sym->z; DCReflect(dc,&x,&y,&z); dst->x=x; dst->y=y; dst->z=z; } p_sym=pt_sym; - for (i=0;ilighting)(dc,&p_sym[tri_sym->nums[0]],&p_sym[tri_sym->nums[2]], &p_sym[tri_sym->nums[1]],tri_sym->color); res+=GrFillTri0(dc,&p_sym[tri_sym->nums[0]],&p_sym[tri_sym->nums[2]], @@ -283,7 +283,7 @@ public I64 Gr3Mesh(CDC *dc=gr.dc,I64 vertex_cnt,CD3I32 *p, if (dc->flags&DCF_JUST_MIRROR) goto mesh_done; } - for (i=0;ilighting)(dc,&p[tri->nums[0]],&p[tri->nums[1]], &p[tri->nums[2]],tri->color); res+=GrFillTri0(dc,&p[tri->nums[0]],&p[tri->nums[1]],&p[tri->nums[2]]); diff --git a/src/Zenith/Gr/GrDC.HC b/src/Zenith/Gr/GrDC.HC index 3a7a7434..55c6e67c 100755 --- a/src/Zenith/Gr/GrDC.HC +++ b/src/Zenith/Gr/GrDC.HC @@ -136,7 +136,7 @@ public U0 DCRst(CDC *dc) dc->color=BLACK; dc->color2=BLACK; dc->bkcolor=BLACK; - dc->collision_cnt=0; + dc->collision_count=0; dc->thick=1; dc->ls.x=37837; //1<<16/Sqrt(3) dc->ls.y=37837; diff --git a/src/Zenith/Gr/GrMath.HC b/src/Zenith/Gr/GrMath.HC index 2423b10a..99095bae 100755 --- a/src/Zenith/Gr/GrMath.HC +++ b/src/Zenith/Gr/GrMath.HC @@ -560,33 +560,33 @@ public Bool Bezier3(U8 *aux_data,CD3I32 *ctrl, return TRUE; } -public Bool BSpline2(U8 *aux_data,CD3I32 *ctrl,I64 cnt, +public Bool BSpline2(U8 *aux_data,CD3I32 *ctrl,I64 count, Bool (*fp_plot)(U8 *aux,I64 x,I64 y,I64 z),Bool closed=FALSE) {//Go in 2nd order spline calling callback. I64 i,j; CD3I32 *c; Bool first; - if (cnt<3) return FALSE; + if (count<3) return FALSE; first=TRUE; if (closed) { - cnt++; - c=MAlloc(sizeof(CD3I32)*(cnt*2-1)); + count++; + c=MAlloc(sizeof(CD3I32)*(count*2-1)); j=1; - for (i=0;iflags; CColorROPU32 old_color2=dc->color2; CDC *old_brush; @@ -635,14 +635,14 @@ public Bool Gr3Bezier(CDC *dc=gr.dc,CD3I32 *ctrl) return Bezier3(dc,ctrl,&GrLinePlot); } -public Bool Gr2BSpline(CDC *dc=gr.dc,CD3I32 *ctrl,I64 cnt,Bool closed=FALSE) +public Bool Gr2BSpline(CDC *dc=gr.dc,CD3I32 *ctrl,I64 count,Bool closed=FALSE) {//2nd order. Clipping but no transform or thick. - return BSpline2(dc,ctrl,cnt,&GrLinePlot,closed); + return BSpline2(dc,ctrl,count,&GrLinePlot,closed); } -public Bool Gr3BSpline(CDC *dc=gr.dc,CD3I32 *ctrl,I64 cnt,Bool closed=FALSE) +public Bool Gr3BSpline(CDC *dc=gr.dc,CD3I32 *ctrl,I64 count,Bool closed=FALSE) {//3rd order. Clipping but no transform or thick. - return BSpline3(dc,ctrl,cnt,&GrLinePlot,closed); + return BSpline3(dc,ctrl,count,&GrLinePlot,closed); } I64 GrLineFat3(CDC *dc=gr.dc,I64 x1,I64 y1,I64 z1,I64 x2,I64 y2,I64 z2, @@ -973,7 +973,7 @@ public I64 GrFloodFill3(CDC *dc=gr.dc,I64 x1,I64 y1,I64 z1,Bool not_color=FALSE) {//3D. Transformation. //not_color=TRUE means fill up to everything which is not the current color. //not_color=FALSE means fill all parts equ to the color under the point. - //Returns cnt of pixs changed + //Returns count of pixs changed I64 res,old_flags=dc->flags, _x,_y,_z; if (dc->flags & DCF_TRANSFORMATION) { @@ -1304,15 +1304,15 @@ gr_done: return res; } -public I64 Gr2BSpline3(CDC *dc=gr.dc,CD3I32 *ctrl,I64 cnt,Bool closed=FALSE) +public I64 Gr2BSpline3(CDC *dc=gr.dc,CD3I32 *ctrl,I64 count,Bool closed=FALSE) {//2nd order. Clipping and transform and thick. Bool res=FALSE; I64 i,x,y,z, old_flags=dc->flags; CD3I32 *ctrl2=NULL,*ctrl3=NULL; if (dc->flags & DCF_TRANSFORMATION) { - ctrl2=MAlloc(sizeof(CD3I32)*cnt); - for (i=0;iflags & DCF_SYMMETRY) { - ctrl3=MAlloc(sizeof(CD3I32)*cnt); - for (i=0;iflags&=~DCF_SYMMETRY; - res=BSpline2(dc,ctrl3,cnt,&GrPlot3,closed); + res=BSpline2(dc,ctrl3,count,&GrPlot3,closed); if (dc->flags & DCF_JUST_MIRROR) goto gr_done; } - res|=BSpline2(dc,ctrl,cnt,&GrPlot3,closed); + res|=BSpline2(dc,ctrl,count,&GrPlot3,closed); gr_done: Free(ctrl2); Free(ctrl3); @@ -1349,15 +1349,15 @@ gr_done: return res; } -public Bool Gr3BSpline3(CDC *dc=gr.dc,CD3I32 *ctrl,I64 cnt,Bool closed=FALSE) +public Bool Gr3BSpline3(CDC *dc=gr.dc,CD3I32 *ctrl,I64 count,Bool closed=FALSE) {//3rd order. Clipping and transform and thick. Bool res=FALSE; I64 i,x,y,z, old_flags=dc->flags; CD3I32 *ctrl2=NULL,*ctrl3=NULL; if (dc->flags & DCF_TRANSFORMATION) { - ctrl2=MAlloc(sizeof(CD3I32)*cnt); - for (i=0;iflags & DCF_SYMMETRY) { - ctrl3=MAlloc(sizeof(CD3I32)*cnt); - for (i=0;iflags&=~DCF_SYMMETRY; - res=BSpline3(dc,ctrl3,cnt,&GrPlot3,closed); + res=BSpline3(dc,ctrl3,count,&GrPlot3,closed); if (dc->flags & DCF_JUST_MIRROR) goto gr_done; } - res|=BSpline3(dc,ctrl,cnt,&GrPlot3,closed); + res|=BSpline3(dc,ctrl,count,&GrPlot3,closed); gr_done: Free(ctrl2); Free(ctrl3); @@ -1395,7 +1395,7 @@ gr_done: } public I64 GrFillTri0(CDC *dc=gr.dc,CD3I32 *p1,CD3I32 *p2,CD3I32 *p4) -{//3D. Returns cnt of pixs changed +{//3D. Returns count of pixs changed I64 x1,x2,y1,y2,z1,z2,dx1,dy1,dz1,dx2,dy2,dz2,res=0,i,min,max; CTask *win_task; diff --git a/src/Zenith/Gr/GrScreen.HC b/src/Zenith/Gr/GrScreen.HC index 24e52e7a..d5c90dc8 100755 --- a/src/Zenith/Gr/GrScreen.HC +++ b/src/Zenith/Gr/GrScreen.HC @@ -73,7 +73,7 @@ U0 GrUpdateTasks() task=task->next_task; } while (task!=task1); - for (i=0;imu.vertex_cnt*sizeof(CD3I32)); - MemCpy(p,&tmpg->mu.u,tmpg->mu.vertex_cnt*sizeof(CD3I32)); - for (i=0;imu.vertex_cnt;i++,p2++) { + p2=p=MAlloc(tmpg->mu.vertex_count*sizeof(CD3I32)); + MemCpy(p,&tmpg->mu.u,tmpg->mu.vertex_count*sizeof(CD3I32)); + for (i=0;imu.vertex_count;i++,p2++) { p2->x+=x; p2->y+=y; p2->z+=z; } - Gr3Mesh(dc,tmpg->mu.vertex_cnt,p,tmpg->mu.tri_cnt, - (&tmpg->mu.u)(U8 *)+sizeof(CD3I32)*tmpg->mu.vertex_cnt); + Gr3Mesh(dc,tmpg->mu.vertex_count,p,tmpg->mu.tri_count, + (&tmpg->mu.u)(U8 *)+sizeof(CD3I32)*tmpg->mu.vertex_count); Free(p); break; case SPT_SHIFTABLE_MESH: @@ -215,15 +215,15 @@ public U0 Sprite3(CDC *dc=gr.dc,I64 x,I64 y,I64 z,U8 *elems, y1=tmpg->pmu.y+y; z1=tmpg->pmu.z+z; } - p2=p=MAlloc(tmpg->pmu.vertex_cnt*sizeof(CD3I32)); - MemCpy(p,&tmpg->pmu.u,tmpg->pmu.vertex_cnt*sizeof(CD3I32)); - for (i=0;ipmu.vertex_cnt;i++,p2++) { + p2=p=MAlloc(tmpg->pmu.vertex_count*sizeof(CD3I32)); + MemCpy(p,&tmpg->pmu.u,tmpg->pmu.vertex_count*sizeof(CD3I32)); + for (i=0;ipmu.vertex_count;i++,p2++) { p2->x+=x1; p2->y+=y1; p2->z+=z1; } - Gr3Mesh(dc,tmpg->pmu.vertex_cnt,p,tmpg->pmu.tri_cnt, - (&tmpg->pmu.u)(U8 *)+sizeof(CD3I32)*tmpg->pmu.vertex_cnt); + Gr3Mesh(dc,tmpg->pmu.vertex_count,p,tmpg->pmu.tri_count, + (&tmpg->pmu.u)(U8 *)+sizeof(CD3I32)*tmpg->pmu.vertex_count); Free(p); if (dc->flags&DCF_TRANSFORMATION) { dc->x-=tmpg->pmu.x; @@ -408,7 +408,7 @@ public U8 *SpriteInterpolate(F64 t,U8 *elems0,U8 *elems1) p0=&tmpg0->mu.u; p1=&tmpg1->mu.u; pr=&tmpgr->mu.u; - for (i=0;imu.vertex_cnt;i++) { + for (i=0;imu.vertex_count;i++) { pr[i].x=(p0[i].x*t0+p1[i].x*t1)>>32; pr[i].y=(p0[i].y*t0+p1[i].y*t1)>>32; pr[i].z=(p0[i].z*t0+p1[i].z*t1)>>32; @@ -418,7 +418,7 @@ public U8 *SpriteInterpolate(F64 t,U8 *elems0,U8 *elems1) p0=&tmpg0->pmu.u; p1=&tmpg1->pmu.u; pr=&tmpgr->pmu.u; - for (i=0;ipmu.vertex_cnt;i++) { + for (i=0;ipmu.vertex_count;i++) { pr[i].x=(p0[i].x*t0+p1[i].x*t1)>>32; pr[i].y=(p0[i].y*t0+p1[i].y*t1)>>32; pr[i].z=(p0[i].z*t0+p1[i].z*t1)>>32; @@ -449,7 +449,7 @@ public CDocEntry *DocSprite(CDoc *doc=NULL,U8 *elems,U8 *fmt=NULL) tmpb->data=MAlloc(size,doc->mem_task); MemCpy(tmpb->data,elems,size); tmpb->num=doc->cur_bin_num; - tmpb->use_cnt=1; + tmpb->use_count=1; QueueInsert(tmpb,doc->bin_head.last); if (fmt) st=MStrPrint(fmt,doc->cur_bin_num++); diff --git a/src/Zenith/Gr/ScreenCast.HC b/src/Zenith/Gr/ScreenCast.HC index 8a7ec870..35a334bf 100755 --- a/src/Zenith/Gr/ScreenCast.HC +++ b/src/Zenith/Gr/ScreenCast.HC @@ -16,7 +16,7 @@ public I64 GR2MV(U8 *print_fmt="VID%03d.MV", ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),"+f+F"); ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),fu_flags); tmpde=tmpde1=FilesFind(files_find_mask,fuf_flags&FUG_FILES_FIND); - if (progress1_max=LinkedLstCnt(tmpde1)) { + if (progress1_max=LinkedLstCount(tmpde1)) { dst=base=MAlloc(MV_FILE_MAX); while (tmpde) { dc=GRRead(tmpde->full_name); @@ -79,7 +79,7 @@ public I64 AUWrite(U8 *filename,CSndData *head,CDate *t0_now,F64 t0_tS) {//Write AU file. CSndData *tmpsd; CAUData *base,*dst; - I64 size=(1+QueueCnt(head))*sizeof(CAUData); + I64 size=(1+QueueCount(head))*sizeof(CAUData); U8 *st=ExtDft(filename,"AU"); base=dst=MAlloc(size); tmpsd=head; diff --git a/src/Zenith/Gr/SpriteCode.HC b/src/Zenith/Gr/SpriteCode.HC index 46ab3def..44c409a1 100755 --- a/src/Zenith/Gr/SpriteCode.HC +++ b/src/Zenith/Gr/SpriteCode.HC @@ -140,9 +140,9 @@ U0 SpriteElem2Code(CDoc *doc,CSprite *tmpg) DocPrint(doc,"{FALSE,"); p=&tmpg->mu.u; col=0; - for (i=0;imu.vertex_cnt;i++,p++) { + for (i=0;imu.vertex_count;i++,p++) { DocPrint(doc,"(%d,%d,%d)",p->x,p->y,p->z); - if (i+1mu.vertex_cnt) DocPrint(doc,","); + if (i+1mu.vertex_count) DocPrint(doc,","); if (++col==4) { DocPrint(doc,"\t//%d\n",i); col=0; @@ -150,11 +150,11 @@ U0 SpriteElem2Code(CDoc *doc,CSprite *tmpg) } DocPrint(doc,":"); tri=p; - for (i=0;imu.tri_cnt;i++,tri++) { + for (i=0;imu.tri_count;i++,tri++) { DocPrint(doc,"(%s,%d,%d,%d)",Color2Str(buf1,tri->color), tri->nums[0],tri->nums[1],tri->nums[2]); - if (i+1mu.tri_cnt) DocPrint(doc,","); - if (++col>=3 && i+1mu.tri_cnt) { + if (i+1mu.tri_count) DocPrint(doc,","); + if (++col>=3 && i+1mu.tri_count) { DocPrint(doc,"\n"); col=0; } @@ -165,9 +165,9 @@ U0 SpriteElem2Code(CDoc *doc,CSprite *tmpg) DocPrint(doc,"{TRUE,(%d,%d,%d):",tmpg->pmu.x,tmpg->pmu.y,tmpg->pmu.z); p=&tmpg->pmu.u; col=1; - for (i=0;ipmu.vertex_cnt;i++,p++) { + for (i=0;ipmu.vertex_count;i++,p++) { DocPrint(doc,"(%d,%d,%d)",p->x,p->y,p->z); - if (i+1pmu.vertex_cnt) DocPrint(doc,","); + if (i+1pmu.vertex_count) DocPrint(doc,","); if (++col==4) { DocPrint(doc,"\t//%d\n",i); col=0; @@ -175,11 +175,11 @@ U0 SpriteElem2Code(CDoc *doc,CSprite *tmpg) } DocPrint(doc,":"); tri=p; - for (i=0;ipmu.tri_cnt;i++,tri++) { + for (i=0;ipmu.tri_count;i++,tri++) { DocPrint(doc,"(%s,%d,%d,%d)",Color2Str(buf1,tri->color), tri->nums[0],tri->nums[1],tri->nums[2]); - if (i+1pmu.tri_cnt) DocPrint(doc,","); - if (++col>=3 && i+1pmu.tri_cnt) { + if (i+1pmu.tri_count) DocPrint(doc,","); + if (++col>=3 && i+1pmu.tri_count) { DocPrint(doc,"\n"); col=0; } @@ -524,12 +524,12 @@ CSprite *Code2SpriteElem(CCompCtrl *cc,I64 type) Lex(cc); //Skip , } if (g.type==SPT_MESH) { - g.mu.vertex_cnt=num1; - g.mu.tri_cnt=num2; + g.mu.vertex_count=num1; + g.mu.tri_count=num2; size=SpriteElemQueuedBaseSize(SPT_MESH); } else { - g.pmu.vertex_cnt=num1; - g.pmu.tri_cnt=num2; + g.pmu.vertex_count=num1; + g.pmu.tri_count=num2; } size=SpriteElemQueuedBaseSize(g.type); res=MAlloc(size+num1*sizeof(CD3I32)+num2*sizeof(CMeshTri)); diff --git a/src/Zenith/Gr/SpriteEd.HC b/src/Zenith/Gr/SpriteEd.HC index 38c91362..4fea7316 100755 --- a/src/Zenith/Gr/SpriteEd.HC +++ b/src/Zenith/Gr/SpriteEd.HC @@ -162,7 +162,7 @@ U0 SpriteSetOrigin(CSprite *head,I64 dx,I64 dy,I64 dz) break; case SPT_MESH: p=&tmpg->mu.u; - for (i=0;imu.vertex_cnt;i++,p++) { + for (i=0;imu.vertex_count;i++,p++) { p->x+=dx; p->y+=dy; p->z+=dz; @@ -522,7 +522,7 @@ U0 SpriteTransformQueue(CSprite *head,I64 *r) tmpg->pmu.y=y; tmpg->pmu.z=z; p=&tmpg->pmu.u; - for (i=0;ipmu.vertex_cnt;i++,p++) { + for (i=0;ipmu.vertex_count;i++,p++) { x=p->x; y=p->y; z=p->z; Mat4x4MulXYZ(r,&x,&y,&z); p->x=x; @@ -532,7 +532,7 @@ U0 SpriteTransformQueue(CSprite *head,I64 *r) break; case SPT_MESH: p=&tmpg->mu.u; - for (i=0;imu.vertex_cnt;i++,p++) { + for (i=0;imu.vertex_count;i++,p++) { x=p->x; y=p->y; z=p->z; Mat4x4MulXYZ(r,&x,&y,&z); p->x=x; @@ -545,7 +545,7 @@ U0 SpriteTransformQueue(CSprite *head,I64 *r) } } -I64 SpriteQueueSelCnt(CSprite *head,Bool val=TRUE) +I64 SpriteQueueSelCount(CSprite *head,Bool val=TRUE) { I64 res=0; CSprite *tmpg=head->next; @@ -593,7 +593,7 @@ Bool SpriteEdText(CSprite **_head,I64 *_cur_elem_num) Free(head); head=Sprite2SpriteQueue(elems); Free(elems); - *_cur_elem_num=QueueCnt(head); //TODO: Might want to improve this. + *_cur_elem_num=QueueCount(head); //TODO: Might want to improve this. break; } else { PopUpPrint("DocEd(0x%X,0x%X);",doc2,0); @@ -1037,7 +1037,7 @@ I64 SpriteEd(CDoc *doc,CDocEntry *doc_ce,I64 x,I64 y, StrCpy(Fs->task_title,DefineSub(i,"ST_SPRITE_ED_MENU")); switch (i) { case SPED_SEL_UNSEL_ALL: - if (!SpriteQueueSelCnt(*_head)) + if (!SpriteQueueSelCount(*_head)) SpriteQueueSelAll(*_head); else SpriteQueueSelAll(*_head,FALSE); @@ -1051,7 +1051,7 @@ I64 SpriteEd(CDoc *doc,CDocEntry *doc_ce,I64 x,I64 y, SpriteQueueSelAll(*_head,FALSE); break; case SPED_SHIFT_SEL: - if (!SpriteQueueSelCnt(*_head)) + if (!SpriteQueueSelCount(*_head)) SpriteQueueSelAll(*_head); doc_ce->de_flags=old_de_flags; GetMessage(&arg1,&arg2,1<type&SPG_TYPE_MASK==SPT_MESH) - old_mesh=&tmpg1->mu.vertex_cnt; + old_mesh=&tmpg1->mu.vertex_count; else if (tmpg1!=head && tmpg1->type&SPG_TYPE_MASK==SPT_SHIFTABLE_MESH) { x1=tmpg1->pmu.x; y1=tmpg1->pmu.y; z1=tmpg1->pmu.z; p=&tmpg1->pmu.u; - for (i=0;ipmu.vertex_cnt;i++,p++) { + for (i=0;ipmu.vertex_count;i++,p++) { p->x+=x1; p->y+=y1; p->z+=z1; } - old_mesh=&tmpg1->pmu.vertex_cnt; + old_mesh=&tmpg1->pmu.vertex_count; } else old_mesh=NULL; if (mesh=SpriteMeshEd(old_mesh,&size,TRUE)) { tmpg=CAlloc(SpriteElemQueuedBaseSize(SPT_MESH)-sizeof(I32)*2+size); tmpg->type=SPT_MESH; - MemCpy(&tmpg->mu.vertex_cnt,mesh,size); + MemCpy(&tmpg->mu.vertex_count,mesh,size); Free(mesh); QueueInsert(tmpg,insert_pt->last); SpriteEdUpdate(doc,doc_ce,head); @@ -708,7 +708,7 @@ U0 SMMesh(CDoc *doc,CDocEntry *doc_ce,CSprite *head,I64 *_cur_elem_num) y1=tmpg1->pmu.y; z1=tmpg1->pmu.z; p=&tmpg1->pmu.u; - for (i=0;ipmu.vertex_cnt;i++,p++) { + for (i=0;ipmu.vertex_count;i++,p++) { p->x-=x1; p->y-=y1; p->z-=z1; @@ -730,24 +730,24 @@ U0 SMShiftableMesh(CDoc *doc,CDocEntry *doc_ce,CSprite *head, y1=-(arg2-y); z1=z; p=&tmpg1->mu.u; - for (i=0;imu.vertex_cnt;i++,p++) { + for (i=0;imu.vertex_count;i++,p++) { p->x+=x1; p->y+=y1; p->z+=z1; } - old_mesh=&tmpg1->mu.vertex_cnt; + old_mesh=&tmpg1->mu.vertex_count; } else if (tmpg1!=head && tmpg1->type&SPG_TYPE_MASK==SPT_SHIFTABLE_MESH) { z=-tmpg1->pmu.z; x1=tmpg1->pmu.x-(arg1-x); y1=tmpg1->pmu.y-(arg2-y); z1=tmpg1->pmu.z+z; p=&tmpg1->pmu.u; - for (i=0;ipmu.vertex_cnt;i++,p++) { + for (i=0;ipmu.vertex_count;i++,p++) { p->x+=x1; p->y+=y1; p->z+=z1; } - old_mesh=&tmpg1->pmu.vertex_cnt; + old_mesh=&tmpg1->pmu.vertex_count; } else { z=0; old_mesh=NULL; @@ -755,7 +755,7 @@ U0 SMShiftableMesh(CDoc *doc,CDocEntry *doc_ce,CSprite *head, if (mesh=SpriteMeshEd(old_mesh,&size,TRUE)) { tmpg=CAlloc(SpriteElemQueuedBaseSize(SPT_SHIFTABLE_MESH)-sizeof(I32)*2+size); tmpg->type=SPT_SHIFTABLE_MESH; - MemCpy(&tmpg->pmu.vertex_cnt,mesh,size); + MemCpy(&tmpg->pmu.vertex_count,mesh,size); Free(mesh); tmpg->pmu.x=arg1-x; tmpg->pmu.y=arg2-y; @@ -774,7 +774,7 @@ U0 SMShiftableMesh(CDoc *doc,CDocEntry *doc_ce,CSprite *head, y1=tmpg1->pmu.y-(arg2-y); z1=tmpg1->pmu.z+z; p=&tmpg1->pmu.u; - for (i=0;ipmu.vertex_cnt;i++,p++) { + for (i=0;ipmu.vertex_count;i++,p++) { p->x-=x1; p->y-=y1; p->z-=z1; @@ -784,7 +784,7 @@ U0 SMShiftableMesh(CDoc *doc,CDocEntry *doc_ce,CSprite *head, y1=-(arg2-y); z1= z; p=&tmpg1->mu.u; - for (i=0;imu.vertex_cnt;i++,p++) { + for (i=0;imu.vertex_count;i++,p++) { p->x-=x1; p->y-=y1; p->z-=z1; @@ -825,7 +825,7 @@ I64 SpriteMainEd(CDoc *doc) Refresh(2,TRUE); dc2->flags|=DCF_ON_TOP; head=Sprite2SpriteQueue(doc_ce->bin_data->data); - cur_elem_num=QueueCnt(head); + cur_elem_num=QueueCount(head); xx=(doc_ce->x+doc_ce->max_col-doc->line_start_col)*FONT_WIDTH; yy=(doc_ce->y-doc->top_line_num)*FONT_HEIGHT; @@ -1185,7 +1185,7 @@ U0 EdSpriteIns(CDoc *doc) tmpb->size=sprite_elem_base_sizes[SPT_END]; tmpb->data=CAlloc(tmpb->size,doc->mem_task); tmpb->num=doc->cur_bin_num++; - tmpb->use_cnt=1; + tmpb->use_count=1; QueueInsert(tmpb,doc->bin_head.last); doc_e=DocPrint(doc,"%s",st); doc_e->bin_data=tmpb; diff --git a/src/Zenith/Gr/SpriteMesh.HC b/src/Zenith/Gr/SpriteMesh.HC index 33dcb25b..66325f6d 100755 --- a/src/Zenith/Gr/SpriteMesh.HC +++ b/src/Zenith/Gr/SpriteMesh.HC @@ -43,7 +43,7 @@ class CMeshFrame CDC *dc; I32 *depth_buf; I64 *w2s,*s2w; //Screen-to-world and world-to-scrn transform matrices. - I64 vertex_cnt,tri_cnt; //Set by MeshSize + I64 vertex_count,tri_count; //Set by MeshSize CMeshEdVertex vertex_head,*cur_vertex,*chain_pred; CMeshEdTri tri_head,*cur_tri; I64 x1,y1,x2,y2,cur_snap; @@ -64,7 +64,7 @@ CMeshEdTri *MeshTriNew(CMeshFrame *e,CColorROPU32 color, { static I64 cpu_num=0; CMeshEdTri *tmpt=CAlloc(sizeof(CMeshEdTri)); - tmpt->cpu_num=cpu_num++%mp_cnt; + tmpt->cpu_num=cpu_num++%mp_count; tmpt->mt.color=color; tmpt->t[0]=v1; tmpt->t[1]=v2; @@ -297,7 +297,7 @@ U0 MeshTriSelRect(CMeshFrame *e,I64 sel_mode,I64 x1,I64 x2,I64 y1,I64 y2) } } -I64 MeshSelCnt(CMeshFrame *e) +I64 MeshSelCount(CMeshFrame *e) { I64 res=0; CMeshEdVertex *tmpv=e->vertex_head.next; @@ -319,7 +319,7 @@ U0 MeshSwapAxes(CMeshFrame *e,I64 o1,I64 o2) { Bool unsel; CMeshEdVertex *tmpv=e->vertex_head.next; - if (!MeshSelCnt(e)) { + if (!MeshSelCount(e)) { MeshVertexSelAll(e,TRUE); unsel=TRUE; } else @@ -337,7 +337,7 @@ U0 MeshInvertAxis(CMeshFrame *e,I64 o) { Bool unsel; CMeshEdVertex *tmpv=e->vertex_head.next; - if (!MeshSelCnt(e)) { + if (!MeshSelCount(e)) { MeshVertexSelAll(e,TRUE); unsel=TRUE; } else @@ -357,7 +357,7 @@ U0 MeshTransformSel(CMeshFrame *e) I64 r[16],x,y,z; CMeshEdVertex *tmpv=e->vertex_head.next; if (PopUpTransform(r)) { - if (!MeshSelCnt(e)) { + if (!MeshSelCount(e)) { MeshVertexSelAll(e,TRUE); unsel=TRUE; } else @@ -379,7 +379,7 @@ U0 MeshColorTris(CMeshFrame *e) { Bool unsel; CMeshEdTri *tmpt=e->tri_head.next; - if (!MeshSelCnt(e)) { + if (!MeshSelCount(e)) { MeshTriSelAll(e,TRUE); unsel=TRUE; } else @@ -397,7 +397,7 @@ U0 MeshRevTris(CMeshFrame *e) { Bool unsel; CMeshEdTri *tmpt=e->tri_head.next; - if (!MeshSelCnt(e)) { + if (!MeshSelCount(e)) { MeshTriSelAll(e,TRUE); unsel=TRUE; } else @@ -468,7 +468,7 @@ U0 MPDrawIt(CMeshFrame *e) if (e->grid_on) //Draw grid with different cores. - for (i=-500+25*Gs->num;i<=500;i+=25*mp_cnt) { + for (i=-500+25*Gs->num;i<=500;i+=25*mp_count) { if (i) { dc->color=DKGRAY; GrLine3(dc,i,-500,0,i,500,0); @@ -749,10 +749,10 @@ U0 DrawIt(CTask *task,CDC *dc) tmpv=tmpv->next; } - e->mp_not_done_flags=1<mp_not_done_flags=1<dc=dc; e->depth_buf=dc->depth_buf; - for (i=0;ivertex_head.next; @@ -852,16 +852,16 @@ U0 MeshLoad(CMeshFrame *e,U8 *src) QueueInit(&e->vertex_head); QueueInit(&e->tri_head); - e->vertex_cnt =*src(I32 *)++; - e->tri_cnt=*src(I32 *)++; - for (i=0;ivertex_cnt;i++) { + e->vertex_count =*src(I32 *)++; + e->tri_count=*src(I32 *)++; + for (i=0;ivertex_count;i++) { x=*src(I32 *)++; y=*src(I32 *)++; z=*src(I32 *)++; tmpv=MeshVertexNew(e,x,y,z); tmpv->num=i; } - for (i=0;itri_cnt;i++) { + for (i=0;itri_count;i++) { color=*src(I32 *)++; for (j=0;j<3;j++) va[j]=MeshVertexFindNum(e,*src(I32 *)++); @@ -875,22 +875,22 @@ I64 MeshSize(CMeshFrame *e) CMeshEdVertex *tmpv=e->vertex_head.next; CMeshEdTri *tmpt=e->tri_head.next; - e->vertex_cnt=0; + e->vertex_count=0; while (tmpv!=&e->vertex_head) { - tmpv->num=e->vertex_cnt++; + tmpv->num=e->vertex_count++; tmpv=tmpv->next; } - e->tri_cnt=0; + e->tri_count=0; while (tmpt!=&e->tri_head) { - e->tri_cnt++; + e->tri_count++; for (i=0;i<3;i++) tmpt->mt.nums[i]=tmpt->t[i]->num; tmpt=tmpt->next; } return sizeof(I32)*2+ - (offset(CMeshEdVertex.end)-offset(CMeshEdVertex.start))*e->vertex_cnt+ - (offset(CMeshEdTri.end)-offset(CMeshEdTri.start))*e->tri_cnt; + (offset(CMeshEdVertex.end)-offset(CMeshEdVertex.start))*e->vertex_count+ + (offset(CMeshEdTri.end)-offset(CMeshEdTri.start))*e->tri_count; } I32 *MeshSave(CMeshFrame *e,I64 *_size=NULL) @@ -900,10 +900,10 @@ I32 *MeshSave(CMeshFrame *e,I64 *_size=NULL) CMeshEdVertex *tmpv=e->vertex_head.next; CMeshEdTri *tmpt=e->tri_head.next; - *dst(I32 *)++=e->vertex_cnt; - *dst(I32 *)++=e->tri_cnt; + *dst(I32 *)++=e->vertex_count; + *dst(I32 *)++=e->tri_count; - e->vertex_cnt=0; + e->vertex_count=0; while (tmpv!=&e->vertex_head) { MemCpy(dst,&tmpv->start,offset(CMeshEdVertex.end) -offset(CMeshEdVertex.start)); @@ -911,7 +911,7 @@ I32 *MeshSave(CMeshFrame *e,I64 *_size=NULL) tmpv=tmpv->next; } - e->tri_cnt=0; + e->tri_count=0; while (tmpt!=&e->tri_head) { MemCpy(dst,&tmpt->start,offset(CMeshEdTri.end)-offset(CMeshEdTri.start)); dst+=offset(CMeshEdTri.end)-offset(CMeshEdTri.start); @@ -957,8 +957,8 @@ U0 MeshUpdateMenu(CMeshFrame *e) I32 *SpriteMeshEd(I32 *head=NULL,I64 *_size=NULL,Bool flip_y=FALSE) {/*Fmt for mesh: { -I32 vertex_cnt; -I32 tri_cnt; +I32 vertex_count; +I32 tri_count; CD3I32 vertices[]; CMeshTri tris[]; } @@ -1090,7 +1090,7 @@ me_restart: if (arg2&SCF_SHIFT) goto me_clip_cut; else { - if (MeshSelCnt(&e)) + if (MeshSelCount(&e)) MeshClipDel(&e); else if (e.ed_mode!='t') MeshVertexDel(&e,MeshVertexFindScrPt(&e, @@ -1324,12 +1324,12 @@ me_clip_cut: switch (e.ed_mode) { case 'm': if (!moving) { - if (!MeshSelCnt(&e) && + if (!MeshSelCount(&e) && (tmpv=MeshVertexFindScrPt(&e,arg1,arg2))) { tmpv->flags|=VF_SEL; e.ms_z=RoundI64(tmpv->p.z,e.cur_snap); } - if (MeshSelCnt(&e)) { + if (MeshSelCount(&e)) { MeshCursorW(&e,Fs,&x,&y,&z); p0a.x=x; p0a.y=y; @@ -1341,12 +1341,12 @@ me_clip_cut: break; case 'M': if (!adjusting_z && !moving) { - if (!MeshSelCnt(&e) && + if (!MeshSelCount(&e) && (tmpv=MeshVertexFindScrPt(&e,arg1,arg2))) { tmpv->flags|=VF_SEL; e.ms_z=RoundI64(tmpv->p.z,e.cur_snap); } - if (MeshSelCnt(&e)) { + if (MeshSelCount(&e)) { MeshCursorW(&e,Fs,&x,&y,&z); p0a.x=x; p0a.y=y; diff --git a/src/Zenith/Gr/SpriteNew.HC b/src/Zenith/Gr/SpriteNew.HC index df4c770a..dac55630 100755 --- a/src/Zenith/Gr/SpriteNew.HC +++ b/src/Zenith/Gr/SpriteNew.HC @@ -66,12 +66,12 @@ I64 SpriteElemSize(CSprite *tmpg) i+=tmpg->nu.num*sizeof(CD3I32); break; case SPT_MESH: - i+=tmpg->mu.vertex_cnt*sizeof(CD3I32)+ - tmpg->mu.tri_cnt*sizeof(CMeshTri); + i+=tmpg->mu.vertex_count*sizeof(CD3I32)+ + tmpg->mu.tri_count*sizeof(CMeshTri); break; case SPT_SHIFTABLE_MESH: - i+=tmpg->pmu.vertex_cnt*sizeof(CD3I32)+ - tmpg->pmu.tri_cnt*sizeof(CMeshTri); + i+=tmpg->pmu.vertex_count*sizeof(CD3I32)+ + tmpg->pmu.tri_count*sizeof(CMeshTri); break; } return i; @@ -179,10 +179,10 @@ public U8 *SpriteElem2Summary(CSprite *tmpg) CatPrint(buf,"%d",tmpg->nu.num); break; case SPT_MESH: - CatPrint(buf,"%dV,%dT",tmpg->mu.vertex_cnt,tmpg->mu.tri_cnt); + CatPrint(buf,"%dV,%dT",tmpg->mu.vertex_count,tmpg->mu.tri_count); break; case SPT_SHIFTABLE_MESH: - CatPrint(buf,"%dV,%dT",tmpg->pmu.vertex_cnt,tmpg->pmu.tri_cnt); + CatPrint(buf,"%dV,%dT",tmpg->pmu.vertex_count,tmpg->pmu.tri_count); break; } return StrNew(buf); diff --git a/src/Zenith/TaskRep.HC b/src/Zenith/TaskRep.HC index f7883f11..2d53a847 100755 --- a/src/Zenith/TaskRep.HC +++ b/src/Zenith/TaskRep.HC @@ -21,7 +21,7 @@ public U0 TaskRep() CCPU *c; PUSHFD CLI - for (i=0;iseth_task,2); diff --git a/src/Zenith/Training.HC b/src/Zenith/Training.HC index 8871bf51..144b9b48 100755 --- a/src/Zenith/Training.HC +++ b/src/Zenith/Training.HC @@ -119,7 +119,7 @@ U0 KeyMapFamily2(U8 **entries,CTask *task,I64 scf) U0 KeyMapFamily(CTask *task,I64 scf,Bool no_shift,Bool shift) { - I64 i,cnt=0; + I64 i,count=0; U8 **entries=CAlloc(2*256*sizeof(U8 *)),**ptr=entries; if (no_shift) { if (shift) @@ -127,15 +127,15 @@ U0 KeyMapFamily(CTask *task,I64 scf,Bool no_shift,Bool shift) else KeyMapFamily2(ptr,task,scf); ptr+=256; - cnt+=256; + count+=256; } if (shift) { KeyMapFamily2(ptr,task,scf+SCF_SHIFT); ptr+=256; - cnt+=256; + count+=256; } - QSortI64(entries,cnt,&KMCompare); - for (i=0;iy+1; - else if (0<=j1_hi-1y+1; else "***,"; - if (0<=j2_loy+1; - else if (0<=j2_hi-1y+1; else "***"; @@ -141,7 +141,7 @@ U0 DiffSel(CDoc *doc,I64 *_df_flags,I64 j1_lo,I64 j1_hi, } Bool DiffSub(CDoc *doc,I64 *_df_flags,I64 j1_lo,I64 j1_hi,I64 j2_lo,I64 j2_hi, - I64 cnt1,I64 cnt2,CDocEntry **doc_sorted1,CDocEntry **doc_sorted2, + I64 count1,I64 count2,CDocEntry **doc_sorted1,CDocEntry **doc_sorted2, CDocEntry **doc_unsorted1,CDocEntry **doc_unsorted2) { I64 i,i1=0,i2=0,i2b,j1,j2,n, @@ -150,7 +150,7 @@ Bool DiffSub(CDoc *doc,I64 *_df_flags,I64 j1_lo,I64 j1_hi,I64 j2_lo,I64 j2_hi, if (j1_lo>=j1_hi || j2_lo>=j2_hi) { if (j1_louser_datauser_data=cnt2) + if (i2>=count2) break; } i2=i2b; @@ -202,15 +202,15 @@ Bool DiffSub(CDoc *doc,I64 *_df_flags,I64 j1_lo,I64 j1_hi,I64 j2_lo,I64 j2_hi, } } if (!best_score) { - DiffSel(doc,_df_flags,j1_lo,j1_hi,j2_lo,j2_hi,cnt1,cnt2, + DiffSel(doc,_df_flags,j1_lo,j1_hi,j2_lo,j2_hi,count1,count2, doc_unsorted1,doc_unsorted2); return TRUE; } else { - if (DiffSub(doc,_df_flags,j1_lo,best_j1,j2_lo,best_j2,cnt1,cnt2, + if (DiffSub(doc,_df_flags,j1_lo,best_j1,j2_lo,best_j2,count1,count2, doc_sorted1,doc_sorted2,doc_unsorted1,doc_unsorted2)) res=TRUE; if (DiffSub(doc,_df_flags,best_j1+best_score,j1_hi,best_j2+best_score, - j2_hi,cnt1,cnt2, + j2_hi,count1,count2, doc_sorted1,doc_sorted2,doc_unsorted1,doc_unsorted2)) res=TRUE; return res; @@ -240,7 +240,7 @@ public Bool Diff(U8 *dst_file,U8 *src_file,I64 *_df_flags=NULL) CDoc *doc1=DocRead(dst_file,DOCF_PLAIN_TEXT_TABS|DOCF_NO_CURSOR), *doc2=DocRead(src_file,DOCF_PLAIN_TEXT_TABS|DOCF_NO_CURSOR); CDocEntry *doc_e,**doc_sorted1,**doc_sorted2,**doc_unsorted1,**doc_unsorted2; - I64 i,cnt1=0,cnt2=0,df_flags; + I64 i,count1=0,count2=0,df_flags; Bool res=FALSE; if (_df_flags) @@ -252,19 +252,19 @@ public Bool Diff(U8 *dst_file,U8 *src_file,I64 *_df_flags=NULL) doc_e=doc1->head.next; while (doc_e!=doc1) { if (doc_e->type_u8==DOCT_TEXT) - doc_e->user_data=cnt1++; //user_data is the new y + doc_e->user_data=count1++; //user_data is the new y doc_e=doc_e->next; } doc_e=doc2->head.next; while (doc_e!=doc2) { if (doc_e->type_u8==DOCT_TEXT) - doc_e->user_data=cnt2++; //user_data is the new y + doc_e->user_data=count2++; //user_data is the new y doc_e=doc_e->next; } - doc_sorted1=MAlloc(cnt1*sizeof(CDocEntry *)); - doc_unsorted1=MAlloc((cnt1+1)*sizeof(CDocEntry *)); + doc_sorted1=MAlloc(count1*sizeof(CDocEntry *)); + doc_unsorted1=MAlloc((count1+1)*sizeof(CDocEntry *)); i=0; doc_e=doc1->head.next; while (doc_e!=doc1) { @@ -275,10 +275,10 @@ public Bool Diff(U8 *dst_file,U8 *src_file,I64 *_df_flags=NULL) doc_e=doc_e->next; } doc_unsorted1[i]=doc1; - QSortI64(doc_sorted1,cnt1,&DiffEntriesCompare); + QSortI64(doc_sorted1,count1,&DiffEntriesCompare); - doc_sorted2=MAlloc(cnt2*sizeof(CDocEntry *)); - doc_unsorted2=MAlloc((cnt2+1)*sizeof(CDocEntry *)); + doc_sorted2=MAlloc(count2*sizeof(CDocEntry *)); + doc_unsorted2=MAlloc((count2+1)*sizeof(CDocEntry *)); i=0; doc_e=doc2->head.next; while (doc_e!=doc2) { @@ -289,9 +289,9 @@ public Bool Diff(U8 *dst_file,U8 *src_file,I64 *_df_flags=NULL) doc_e=doc_e->next; } doc_unsorted2[i]=doc2; - QSortI64(doc_sorted2,cnt2,&DiffEntriesCompare); + QSortI64(doc_sorted2,count2,&DiffEntriesCompare); - res=DiffSub(doc1,&df_flags,0,cnt1,0,cnt2,cnt1,cnt2, + res=DiffSub(doc1,&df_flags,0,count1,0,count2,count1,count2, doc_sorted1,doc_sorted2,doc_unsorted1,doc_unsorted2); if (df_flags&DF_MODIFIED && !(df_flags&DF_DONT_MODIFIED)) DocWrite(doc1); @@ -322,15 +322,15 @@ public U0 ZipRep(U8 *files_find_mask="/*",U8 *fu_flags=NULL, {//Report file compressibility. //Dft is just src files. (Used to spot //src files with redundancy in them.) - I64 i=0,cnt,size,fuf_flags=0; + I64 i=0,count,size,fuf_flags=0; CDirEntry *tmpde,*tmpde1,**sort_buf; U8 *buf; CArcCompress *arc; ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),"+r+F+S"); ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),fu_flags); tmpde=tmpde1=FilesFind(files_find_mask,fuf_flags); - cnt=FileCnt(tmpde); - sort_buf=MAlloc(sizeof(CDirEntry *)*cnt); + count=FileCount(tmpde); + sort_buf=MAlloc(sizeof(CDirEntry *)*count); while (tmpde) { sort_buf[i++]=tmpde; buf=FileRead(tmpde->full_name,&size); @@ -342,8 +342,8 @@ public U0 ZipRep(U8 *files_find_mask="/*",U8 *fu_flags=NULL, Free(arc); tmpde=tmpde->next; } - QSortI64(sort_buf,cnt,&ZRepCompare); - for (i=0;iuser_data,sort_buf[i]->size; PutFileLink(sort_buf[i]->full_name); '\n'; diff --git a/src/Zenith/Utils/Find.HC b/src/Zenith/Utils/Find.HC index e09f95e3..66ea060b 100755 --- a/src/Zenith/Utils/Find.HC +++ b/src/Zenith/Utils/Find.HC @@ -28,7 +28,7 @@ I64 FindFile(U8 *needle_str,U8 *haystack_filename, {//Have you confused with $LK,"FileFind",A="MN:FileFind"$()? Bool first_on_line,write_this_file=FALSE,cont=!Bt(_fuf_flags,FUf_CANCEL); U8 *src,*dst,*dst2,*name_buf=NULL; - I64 i,j,plen,rlen,dlen,cnt=0,old_flags,ss_flags; + I64 i,j,plen,rlen,dlen,count=0,old_flags,ss_flags; CDoc *cur_l,*doc=DocRead(haystack_filename, DOCF_PLAIN_TEXT_TABS|DOCF_NO_CURSOR); CDocEntry *doc_e; @@ -54,7 +54,7 @@ I64 FindFile(U8 *needle_str,U8 *haystack_filename, first_on_line=TRUE; while (src && cont) { if (src=StrFind(needle_str,src,ss_flags)) { - cnt++; + count++; if (first_on_line || Bt(_fuf_flags,FUf_REPLACE)) { first_on_line=FALSE; PutFileLink(haystack_filename,,doc_e->y+1,TRUE); @@ -139,7 +139,7 @@ I64 FindFile(U8 *needle_str,U8 *haystack_filename, "Wrote:%s\n",doc->filename.name; } DocDel(doc); - return cnt; + return count; } public I64 Find(U8 *needle_str,U8 *files_find_mask="*", @@ -160,7 +160,7 @@ before or after "dd" are label characters. "+lb"=only checks for label chars before. "+la"=only checks for label chars after. */ - I64 cnt=0,fuf_flags=0; + I64 count=0,fuf_flags=0; CDirEntry *tmpde,*tmpde1; ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),"+r+i+f+F+T"); ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),fu_flags); @@ -172,11 +172,11 @@ before or after "dd" are label characters. fuf_flags&=FUF_ALL|FUF_REPLACE|FUF_IGNORE|FUF_WHOLE_LABELS| FUF_WHOLE_LABELS_BEFORE|FUF_WHOLE_LABELS_AFTER; while (tmpde && !Bt(&fuf_flags,FUf_CANCEL)) { - cnt+=FindFile(needle_str,tmpde->full_name,&fuf_flags,replace_text); + count+=FindFile(needle_str,tmpde->full_name,&fuf_flags,replace_text); tmpde=tmpde->next; } DirTreeDel(tmpde1); - return cnt; + return count; } public I64 FileOcc(U8 *needle_str, @@ -188,11 +188,11 @@ public I64 FileOcc(U8 *needle_str, "+lb"=only checks for label chars before. "+la"=only checks for label chars after. */ - I64 cnt=0; + I64 count=0; Bool old_silent=Silent(TRUE); - cnt=Find(needle_str,files_find_mask,fu_flags); + count=Find(needle_str,files_find_mask,fu_flags); Silent(old_silent); - return cnt; + return count; } class CFind diff --git a/src/Zenith/Utils/HeapLog.HC b/src/Zenith/Utils/HeapLog.HC index 5a677f21..fa3a4be1 100755 --- a/src/Zenith/Utils/HeapLog.HC +++ b/src/Zenith/Utils/HeapLog.HC @@ -11,7 +11,7 @@ class CHeapLog U8 *addr; I64 size; } - I64 cnt; + I64 count; U8 *caller[HL_CALLER_DEPTH]; }; @@ -172,7 +172,7 @@ public U0 HeapLogSizeRep(Bool leave_it=OFF) for (j=0;jcaller[j]) goto hl_next; - tmphls->cnt++; + tmphls->count++; goto hl_found; } hl_next: @@ -180,7 +180,7 @@ hl_next: } tmphls=MAlloc(sizeof(CHeapLog),heaplog_hc); MemCpy(tmphls,&hla,sizeof(CHeapLog)); - tmphls->cnt=1; + tmphls->count=1; tmphls->size=MSize(hla.addr); QueueInsert(tmphls,size_head[k].last); hl_found: @@ -193,11 +193,11 @@ hl_found: tmphls=size_head[i].next; while (tmphls!=&size_head[i]) { tmphls1=tmphls->next; - "%08X*%08X=%08X",tmphls->size,tmphls->cnt,tmphls->size*tmphls->cnt; + "%08X*%08X=%08X",tmphls->size,tmphls->count,tmphls->size*tmphls->count; for (j=0;jcaller[j]; '\n'; - total+=tmphls->size*tmphls->cnt; + total+=tmphls->size*tmphls->count; Free(tmphls); tmphls=tmphls1; } diff --git a/src/Zenith/Utils/MemRep.HC b/src/Zenith/Utils/MemRep.HC index d66ea710..539c0129 100755 --- a/src/Zenith/Utils/MemRep.HC +++ b/src/Zenith/Utils/MemRep.HC @@ -140,7 +140,7 @@ Bool MemRepTask(CTask *task,Bool override_validate=FALSE) "scrncast.dc2_alias\t:%010X\n",DCSize(scrncast.dc2_alias); } else if (task==zenith_task) { j=0;k=0;m=0;n=0; - for (i=0;itss); task1=c->seth_task; @@ -216,7 +216,7 @@ public U0 MemRep() "$$BLACK$$Code/Data Heap\t:%010X/%010X$$FG$$\n", sys_code_bp->used_u8s,sys_code_bp->alloced_u8s; - for (i=0;iseth_task; diff --git a/src/Zenith/Utils/Profiler.HC b/src/Zenith/Utils/Profiler.HC index f1176bfc..4db4e2ea 100755 --- a/src/Zenith/Utils/Profiler.HC +++ b/src/Zenith/Utils/Profiler.HC @@ -19,7 +19,7 @@ U0 ProfTimerInt(CTask *task) i=TaskCaller(task,k,TRUE); if (pf_buf_in_ptr=filter_cnt) + if (*last_buf && routine_total>=filter_count) "$$GREEN$$%6.2f%08X:%s\n$$FG$$",100*routine_total/total_time, routine_total,last_buf; StrCpy(last_buf,buf2); routine_total=0; } routine_total+=hits; - if (hits>=filter_cnt) { + if (hits>=filter_count) { "%6.2f%08X:%P\n",100*hits/total_time,hits,rip; last_rip=rip; } } - if (*last_buf && routine_total>=filter_cnt) + if (*last_buf && routine_total>=filter_count) "$$GREEN$$%6.2f%08X:%s\n$$FG$$",100*routine_total/total_time, routine_total,last_buf; "Total Time:%0.6fs\n",total_time/JIFFY_FREQ; diff --git a/src/Zenith/Utils/StrUtils.HC b/src/Zenith/Utils/StrUtils.HC index f1d94fbb..575b4a84 100755 --- a/src/Zenith/Utils/StrUtils.HC +++ b/src/Zenith/Utils/StrUtils.HC @@ -11,7 +11,7 @@ public I64 Sort(U8 *_in_name,U8 *_out_name=NULL, U8 *in_name,*out_name,*st; CDoc *doc; CDocEntry *doc_e,*doc_e1,**a; - I64 i,j,cnt=0,res; + I64 i,j,count=0,res; if (!_in_name) return 0; in_name=ExtDft(_in_name,".DD"); @@ -24,10 +24,10 @@ public I64 Sort(U8 *_in_name,U8 *_out_name=NULL, doc_e=doc->head.next; while (doc_e!=doc) { if (doc_e->type_u8==DOCT_TEXT) - cnt++; + count++; doc_e=doc_e->next; } - a=MAlloc(cnt*sizeof(CDocEntry *)); + a=MAlloc(count*sizeof(CDocEntry *)); doc_e=doc->head.next; i=0; while (doc_e!=doc) { @@ -39,14 +39,14 @@ public I64 Sort(U8 *_in_name,U8 *_out_name=NULL, DocEntryDel(doc,doc_e); doc_e=doc_e1; } - QSort(a,cnt/entry_lines,entry_lines*sizeof(CDocEntry *),&DEPtrCompare); + QSort(a,count/entry_lines,entry_lines*sizeof(CDocEntry *),&DEPtrCompare); res=0; st=NULL; - for (i=0;itag,st)) { st=a[i]->tag; - for (j=0;jhead.last); doc->cur_entry=&doc->head; doc->cur_col=0; @@ -54,7 +54,7 @@ public I64 Sort(U8 *_in_name,U8 *_out_name=NULL, } res++; } else - for (j=0;jhead.last); DocEntryDel(doc,a[i]); } diff --git a/src/Zenith/WallPaper.HC b/src/Zenith/WallPaper.HC index 09a5e8ef..93731370 100755 Binary files a/src/Zenith/WallPaper.HC and b/src/Zenith/WallPaper.HC differ diff --git a/src/Zenith/Win.HC b/src/Zenith/Win.HC index d5b691fc..f655ba87 100755 --- a/src/Zenith/Win.HC +++ b/src/Zenith/Win.HC @@ -425,15 +425,15 @@ public Bool WinVert(I64 top,I64 bottom,CTask *task=NULL) public U0 WinTileHorz() {//Tile windows horizontally top-to-bottom. CTask *task,*last_task=Fs; - I64 cnt,c,i,vert_size,no_border; + I64 count,c,i,vert_size,no_border; PUSHFD CLI //TODO Multiprocessor safe task=sys_winmgr_task; - cnt=0; + count=0; do { if (!Bt(&task->win_inhibit,WIf_SELF_FOCUS)) - cnt++; + count++; task=task->last_task; } while (task!=sys_winmgr_task); @@ -442,7 +442,7 @@ public U0 WinTileHorz() do { if (!Bt(&task->win_inhibit,WIf_SELF_FOCUS)) { no_border=Bt(&task->display_flags,DISPLAYf_NO_BORDER); - c=cnt- i&~3; + c=count- i&~3; if (!c) c=1; else if (c>4) @@ -465,14 +465,14 @@ public U0 WinTileHorz() public U0 WinTileVert() {//Tile windows vertically side-by-side. CTask *task,*last_task=Fs; - I64 cnt,c,i,horz_size,no_border; + I64 count,c,i,horz_size,no_border; PUSHFD CLI //TODO Multiprocessor safe task=sys_winmgr_task; - cnt=0; + count=0; do { if (!Bt(&task->win_inhibit,WIf_SELF_FOCUS)) - cnt++; + count++; task=task->last_task; } while (task!=sys_winmgr_task); @@ -481,7 +481,7 @@ public U0 WinTileVert() do { if (!Bt(&task->win_inhibit,WIf_SELF_FOCUS)) { no_border=Bt(&task->display_flags,DISPLAYf_NO_BORDER); - c=cnt- i&~3; + c=count- i&~3; if (!c) c=1; else if (c>4) diff --git a/src/Zenith/WinMgr.HC b/src/Zenith/WinMgr.HC index 5145fe97..69a154e8 100755 --- a/src/Zenith/WinMgr.HC +++ b/src/Zenith/WinMgr.HC @@ -1,29 +1,29 @@ #help_index "Windows;Task/Delay" -public U0 Refresh(I64 cnt=1,Bool force=FALSE) +public U0 Refresh(I64 count=1,Bool force=FALSE) {//Wait for 30fps WinMgr to start & finish scrn refresh. - //0,FALSE Cnt Sync to WinMgr. + //0,FALSE Count Sync to WinMgr. //0,TRUE Pump Messages. - //1 Cnt Wait and Pump Messages. - //2 Cnt Make Sure to do a Full Refresh + //1 Count Wait and Pump Messages. + //2 Count Make Sure to do a Full Refresh //and Set Cur Pos. Bool old_full_refresh, old_idle=LBts(&Fs->task_flags,TASKf_IDLE); CDoc *old_doc=DocPut; - I64 update_cnt; - if (!cnt&&force) + I64 update_count; + if (!count&&force) LBts(&sys_semas[SEMA_JUST_PUMP_MESSAGES],0); while (Bt(&sys_semas[SEMA_REFRESH_IN_PROGRESS],0)) { if (force && sys_winmgr_task) - sys_winmgr_task->wake_jiffy=cnts.jiffies; + sys_winmgr_task->wake_jiffy=counts.jiffies; Yield; } - if (cnt>1 && old_doc) + if (count>1 && old_doc) old_full_refresh=LBts(&old_doc->flags,DOCf_DO_FULL_REFRESH); - update_cnt=winmgr.updates+cnt; - while (winmgr.updateswake_jiffy=cnts.jiffies; + sys_winmgr_task->wake_jiffy=counts.jiffies; Sleep(1); } if (old_doc) @@ -198,12 +198,12 @@ U0 WinCalcIdles() PUSHFD CLI total_jiffies=cpu_structs[0].total_jiffies; - for (i=0;ilast_total_jiffies; - for (i=0;ilast_idle_pt_hits[i])>=0) c->idle_factor=Clamp(ToF64(k)/total_jiffies_delta,0.01,0.99); @@ -213,7 +213,7 @@ U0 WinCalcIdles() } t->last_total_jiffies=total_jiffies; t->last_calc_idle_time=calc_idle_time; - t->calc_idle_cnt++; + t->calc_idle_count++; } } @@ -266,7 +266,7 @@ I64 WinMgrSleep(Bool flush_messages=FALSE) t=tS+WINMGR_PERIOD/8; while (winmgr.ideal_refresh_tSsub; @@ -390,11 +390,11 @@ Bool WinKeyNavMenu() } new_pos.y=0; } else if (Bt(kbd.down_bitmap,SC_CURSOR_UP)) { - while (Bt(kbd.down_bitmap,SC_CURSOR_UP) && kbd.cnt==old_key_cnt) + while (Bt(kbd.down_bitmap,SC_CURSOR_UP) && kbd.count==old_key_count) WinMgrSleep(TRUE); new_pos.y-=FONT_HEIGHT; } else if (Bt(kbd.down_bitmap,SC_CURSOR_DOWN)) { - while (Bt(kbd.down_bitmap,SC_CURSOR_DOWN) && kbd.cnt==old_key_cnt) + while (Bt(kbd.down_bitmap,SC_CURSOR_DOWN) && kbd.count==old_key_count) WinMgrSleep(TRUE); new_pos.y+=FONT_HEIGHT; } diff --git a/src/Zenith/ZBlkDev/DiskPrt.HC b/src/Zenith/ZBlkDev/DiskPrt.HC index 3327393b..1602c6ae 100755 --- a/src/Zenith/ZBlkDev/DiskPrt.HC +++ b/src/Zenith/ZBlkDev/DiskPrt.HC @@ -22,7 +22,7 @@ drv_let=0 means add new drive that is not already mounted. CPlannedDrive head,*tmppp; CMasterBoot mbr; Bool pri=TRUE; - I64 ext_base,drv_let2,pri_cnt=0,i,start_offset,offset, + I64 ext_base,drv_let2,pri_count=0,i,start_offset,offset, total,remaining,cur_arg=0; "This command does not play well\n" "with other operating systems.\n" @@ -56,9 +56,9 @@ drv_let=0 means add new drive that is not already mounted. if (pri) { "Primary Partition"; if (argc>cur_arg || YorN) { - pri_cnt++; + pri_count++; tmppp->pri=TRUE; - if (pri_cnt==3) + if (pri_count==3) pri=FALSE; } else pri=FALSE; @@ -97,7 +97,7 @@ drv_let=0 means add new drive that is not already mounted. MemSet(&mbr,0,BLK_SIZE); mbr.signature=0xAA55; offset=0; - for (i=0;ifull_name+src_dir_len); if (tmpde->attr & RS_ATTR_DIR) { - DirMk(st,LinkedLstCnt(tmpde->sub)); + DirMk(st,LinkedLstCount(tmpde->sub)); res+=CopyTree2(tmpde->sub,src_dir_len,dst_dir_len,dst_dir); } else if (CopySingle(tmpde->full_name,st)) diff --git a/src/Zenith/ZBlkDev/ZDiskB.HC b/src/Zenith/ZBlkDev/ZDiskB.HC index 1423cc08..846c7969 100755 --- a/src/Zenith/ZBlkDev/ZDiskB.HC +++ b/src/Zenith/ZBlkDev/ZDiskB.HC @@ -116,23 +116,23 @@ public I64 Size(U8 *files_find_mask="/*",U8 *fu_flags=NULL,I64 round_to=0) return res; } -public I64 FileCnt(CDirEntry *tmpde) -{//Cnt of files in $LK,"CDirEntry",A="MN:CDirEntry"$ tree. - I64 cnt=0; +public I64 FileCount(CDirEntry *tmpde) +{//Count of files in $LK,"CDirEntry",A="MN:CDirEntry"$ tree. + I64 count=0; while (tmpde) { if (tmpde->attr&RS_ATTR_DIR) - cnt+=FileCnt(tmpde->sub); + count+=FileCount(tmpde->sub); else - cnt++; + count++; tmpde=tmpde->next; } - return cnt; + return count; } #help_index "File/Cmd Line (Typically);Cmd Line (Typically)" public I64 FF(U8 *files_find_mask,U8 *fu_flags=NULL) {//Files find. List files matching mask. - I64 cnt=0,fuf_flags=0; + I64 count=0,fuf_flags=0; CDirEntry *tmpde,*tmpde1; ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),"+r+f+F"); ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),fu_flags); @@ -140,11 +140,11 @@ public I64 FF(U8 *files_find_mask,U8 *fu_flags=NULL) while (tmpde) { PutFileLink(tmpde->full_name); '\n'; - cnt++; + count++; tmpde=tmpde->next; } DirTreeDel(tmpde1); - return cnt; + return count; } public I64 Zip(U8 *files_find_mask="*",U8 *fu_flags=NULL) diff --git a/src/Zenith/ZDebug.HC b/src/Zenith/ZDebug.HC index e8d4a05b..2352bdd6 100755 --- a/src/Zenith/ZDebug.HC +++ b/src/Zenith/ZDebug.HC @@ -26,9 +26,9 @@ Bool ClassRep2(CDoc *doc,U8 *_d,U8 *class_name=lastclass, tmpc2=ml->member_class; ptr=_d(U8 *)+ml->offset; DocPrint(doc,"%08X ",ptr(U8 *)+offset); - stars=tmpc2->ptr_stars_cnt; + stars=tmpc2->ptr_stars_count; tmpc2=OptClassFwd(tmpc2); - tmpc2-=tmpc2->ptr_stars_cnt; + tmpc2-=tmpc2->ptr_stars_count; if (tmpc2->type & HTT_INTERNAL_TYPE) { DocPrint(doc,"$$GREEN$$%-20ts:$$FG$$",ml->str); if (stars==1 && (tmpc2->raw_type==RT_I8 || tmpc2->raw_type==RT_U8)) { @@ -42,7 +42,7 @@ Bool ClassRep2(CDoc *doc,U8 *_d,U8 *class_name=lastclass, DocPrint(doc,"%40ts\n",ptr); } } else if (!stars) { - j=MinI64(ml->dim.total_cnt,32); + j=MinI64(ml->dim.total_count,32); if (tmpc2->raw_type==RT_I8 || tmpc2->raw_type==RT_U8) { if (j==1) { if (dynamic) { @@ -130,7 +130,7 @@ Bool ClassRep2(CDoc *doc,U8 *_d,U8 *class_name=lastclass, if (dynamic) DocDataFmt(doc,doc_e); } - if (jdim.total_cnt) + if (jdim.total_count) DocPrint(doc,"..."); } else DocPrint(doc,"%016X",*ptr); @@ -227,7 +227,7 @@ public U0 FunRep(U8 *st,U8 *rbp=NULL,I64 max_depth=2,CTask *task=NULL) if (task) { //tmpf->size is negative.It's the bottom //of the fun local var space relative to RBP . - size=tmpf->arg_cnt*8-tmpf->size+16; + size=tmpf->arg_count*8-tmpf->size+16; img=MAlloc(size); MemCpy(img,rbp+tmpf->size,size); diff --git a/src/Zenith/ZExterns.HC b/src/Zenith/ZExterns.HC index f946b28c..34cf30f1 100755 --- a/src/Zenith/ZExterns.HC +++ b/src/Zenith/ZExterns.HC @@ -15,7 +15,7 @@ extern U0 DocBottom(CDoc *doc=NULL); extern U0 DocCenter(CDoc *doc=NULL,I64 recalc_flags=RECALCt_NORMAL); extern U0 DocClear(CDoc *doc=NULL,Bool clear_holds=FALSE); extern Bool DocCursor(Bool show=OFF,CDoc *doc=NULL); -extern U0 DocD(U8 *buf,I64 cnt=0x80); +extern U0 DocD(U8 *buf,I64 count=0x80); extern U0 DocDataFmt(CDoc *doc,CDocEntry *doc_e,I64 d=DOCM_CANCEL); extern U0 DocDel(CDoc *doc); extern CDoc *DocDisplay(CTask *task=NULL); @@ -74,7 +74,7 @@ extern I64 PopUpRangeI64( extern Bool PopUpTransform(I64 *r); extern I64 RedSeaISO(U8 *_iso_filename=NULL,U8 *_src_dir, U8 *_stage2_filename=NULL); -extern U0 Refresh(I64 cnt=1,Bool force=FALSE); +extern U0 Refresh(I64 count=1,Bool force=FALSE); extern U0 RegOneTimePopUp(I64 flag_num,U8 *message); extern Bool RegWrite(U8 *path,U8 *fmt,...); extern U0 SettingsPop(CTask *task=NULL,I64 flags=0); diff --git a/src/Zenith/ZHash.HC b/src/Zenith/ZHash.HC index 7ebe9067..5f84c7dc 100755 --- a/src/Zenith/ZHash.HC +++ b/src/Zenith/ZHash.HC @@ -28,19 +28,19 @@ I64 HashEntriesCompare2(CWho *h1,CWho *h2) return i1-i2; } -I64 HelpIndexCnt(U8 *ptr,U8 *idx) +I64 HelpIndexCount(U8 *ptr,U8 *idx) { - I64 cnt=0,ch,idx_len=StrLen(idx); + I64 count=0,ch,idx_len=StrLen(idx); while (*ptr) { if (!StrNCmp(ptr,idx,idx_len)) - cnt++; + count++; while (ch=*ptr++) if (ch==';') break; if (!ch) ptr--; } - return cnt; + return count; } U8 *HelpIndexStr(U8 **_ptr,U8 *idx) @@ -156,7 +156,7 @@ U8 *idx=NULL,CDoc *doc=NULL) CHashSrcSym *tmph; CHashGeneric *ptr; CWho *lst; - I64 cnt,i,j,k,f=0; + I64 count,i,j,k,f=0; U8 buf[512],*last_idx=StrNew(""),*cur_idx,*comment; Bool recurse,publics,map; CTask *task; @@ -178,7 +178,7 @@ U8 *idx=NULL,CDoc *doc=NULL) } else task=NULL; - cnt=0; + count=0; table=h; while (table) { for (i=0;i<=table->mask;i++) { @@ -187,9 +187,9 @@ U8 *idx=NULL,CDoc *doc=NULL) if (!(tmph->type & (HTF_IMPORT | HTF_PRIVATE)) && (tmph->type & HTF_PUBLIC || !publics)) { if (!idx) - cnt++; + count++; else if (tmph->type&HTG_SRC_SYM && (cur_idx=tmph->idx)) - cnt+=HelpIndexCnt(cur_idx,idx); + count+=HelpIndexCount(cur_idx,idx); } tmph=tmph->next; } @@ -199,9 +199,9 @@ U8 *idx=NULL,CDoc *doc=NULL) else break; } - if (!cnt) goto wh_done; + if (!count) goto wh_done; - lst=CAlloc(cnt*sizeof(CWho)); + lst=CAlloc(count*sizeof(CWho)); j=0; table=h; while (table) { @@ -213,7 +213,7 @@ U8 *idx=NULL,CDoc *doc=NULL) if (!idx) lst[j++].h=tmph; else if (tmph->type&HTG_SRC_SYM && (cur_idx=tmph->idx) && - (k=HelpIndexCnt(cur_idx,idx))) + (k=HelpIndexCount(cur_idx,idx))) while (k--) { lst[j].idx=HelpIndexStr(&cur_idx,idx); lst[j++].h=tmph; @@ -228,17 +228,17 @@ U8 *idx=NULL,CDoc *doc=NULL) } if (map) - QSort(lst,cnt,sizeof(CWho),&HashEntriesCompare2); + QSort(lst,count,sizeof(CWho),&HashEntriesCompare2); else if (idx) - QSort(lst,cnt,sizeof(CWho),&HashEntriesCompare3); + QSort(lst,count,sizeof(CWho),&HashEntriesCompare3); else - QSort(lst,cnt,sizeof(CWho),&HashEntriesCompare); + QSort(lst,count,sizeof(CWho),&HashEntriesCompare); if (idx) { - progress1_max=cnt; + progress1_max=count; progress1=0; } - for (i=0;itype & HTT_DEFINE_STR) { - j=ptr(CHashDefineStr *)->cnt; + j=ptr(CHashDefineStr *)->count; if (j==-1) StrPrint(buf,"%-10t$$Q",ptr(CHashDefineStr *)->data); else @@ -278,9 +278,9 @@ U8 *idx=NULL,CDoc *doc=NULL) StrPrint(buf,"%010X",HashVal(ptr)); j=HashEntrySize(ptr); if (j==-1) - CatPrint(buf," %04X  ",ptr->use_cnt); + CatPrint(buf," %04X  ",ptr->use_count); else - CatPrint(buf," %04X %010X ",ptr->use_cnt,j); + CatPrint(buf," %04X %010X ",ptr->use_count,j); } else *buf=0; @@ -328,17 +328,17 @@ wh_done: public I64 HashDepthRep(CHashTable *table=NULL) {//Hash table linked-list chain depth report. //Histogram of collision count. - I64 i,j,longest=0,cnt=0,a[HDR_NUM]; + I64 i,j,longest=0,count=0,a[HDR_NUM]; CHash *tmph; if (!table) table=Fs->hash_table; MemSet(a,0,sizeof(a)); for (i=0;i<=table->mask;i++) { tmph=table->body[i]; if (tmph) { - j=LinkedLstCnt(tmph); + j=LinkedLstCount(tmph); if (jlongest) longest=j; } @@ -348,7 +348,7 @@ public I64 HashDepthRep(CHashTable *table=NULL) if (a[i]) "%02d:%d\n",i,a[i]; "Size:%dCount:%dLongest:%d\n", - table->mask+1,cnt,longest; + table->mask+1,count,longest; return longest; } diff --git a/src/Zenith/ZMathODE.HC b/src/Zenith/ZMathODE.HC index f6bfaefd..be67809c 100755 --- a/src/Zenith/ZMathODE.HC +++ b/src/Zenith/ZMathODE.HC @@ -71,7 +71,7 @@ public U0 ODEDel(CMathODE *ode) Free(ode->state); Free(ode->array_base); if (ode->slave_tasks) { - for (i=0;islave_tasks[i]); Free(ode->slave_tasks); } @@ -102,17 +102,17 @@ U0 ODEState2Internal(CMathODE *ode) { CMass *tmpm; F64 *old_array_base; - I64 mass_cnt; + I64 mass_count; if (ode->flags&ODEF_HAS_MASSES) { - mass_cnt=0; + mass_count=0; tmpm=ode->next_mass; while (tmpm!=&ode->next_mass) { - mass_cnt++; + mass_count++; tmpm=tmpm->next; } old_array_base=ode->array_base; - ode->n_internal=ode->n+6*mass_cnt; + ode->n_internal=ode->n+6*mass_count; ode->array_base=MAlloc(12*ode->n_internal*sizeof(F64),ode->mem_task); Free(old_array_base); ODERstPtrs(ode); @@ -346,11 +346,11 @@ U0 ODEMPWake(CMathODE *ode) { I64 i; if (!ode->slave_tasks) { - ode->slave_tasks=CAlloc(mp_cnt*sizeof(CTask *)); - for (i=0;islave_tasks=CAlloc(mp_count*sizeof(CTask *)); + for (i=0;islave_tasks[i]=Spawn(&ODEMPTask,ode,"ODE Slave",i); } - for (i=0;islave_tasks[i],FALSE); MPInt(I_WAKE,i); } @@ -362,7 +362,7 @@ U0 ODEMPSleep(CMathODE *ode) if (ode->slave_tasks) { while (ode->mp_not_done_flags) Yield; - for (i=0;islave_tasks[i]); } } @@ -372,7 +372,7 @@ U0 ODECallMPDerivative(CMathODE *ode,F64 t,F64 *state,F64 *DstateDt) ode->mp_t=t; ode->mp_state=state; ode->mp_DstateDt=DstateDt; - ode->mp_not_done_flags=1<mp_not_done_flags=1<mp_not_done_flags); } diff --git a/src/Zenith/ZMemory.HC b/src/Zenith/ZMemory.HC index 5a354031..357d6949 100755 --- a/src/Zenith/ZMemory.HC +++ b/src/Zenith/ZMemory.HC @@ -28,7 +28,7 @@ public I64 TaskMemUsed(CTask *task=NULL,Bool override_validate=FALSE) #help_index "Memory/Task;Debugging/Heap;Memory/Debugging" public Bool HeapRep(CTask *task) {//Report status of task's heap. - I64 i,cnt; + I64 i,count; CMemUnused *uum; if (!task || task==Fs) { @@ -46,21 +46,21 @@ public Bool HeapRep(CTask *task) PAUSE for (i=0;i>3;i++) { - cnt=0; + count=0; uum=task->code_heap->heap_hash[i]; while (uum) { - cnt+=uum->size; + count+=uum->size; uum=uum->next; } if (task->data_heap!=task->code_heap) { uum=task->data_heap->heap_hash[i]; while (uum) { - cnt+=uum->size; + count+=uum->size; uum=uum->next; } } - if (cnt) - "%03X:%08X\n",i<<3,cnt; + if (count) + "%03X:%08X\n",i<<3,count; } '\n'; diff --git a/src/Zenith/ZRegistry.HC b/src/Zenith/ZRegistry.HC index 9c8cce6a..053ead4a 100755 --- a/src/Zenith/ZRegistry.HC +++ b/src/Zenith/ZRegistry.HC @@ -54,8 +54,8 @@ public Bool RegWrite(U8 *path,U8 *fmt,...) return res; } -public I64 RegCnt(U8 *path) -{//Tree branch cnt in registry. +public I64 RegCount(U8 *path) +{//Tree branch count in registry. I64 res=0; CDocEntry *tree_branch,*start_indent,*end_indent; Bool unlock_doc=DocLock(sys_registry_doc); @@ -181,14 +181,14 @@ public U0 OnceExe() try { RegDft("Once/Zenith",""); - if (RegCnt("Once/Zenith")>2) { + if (RegCount("Once/Zenith")>2) { Zenith("RegExe(\"Once/Zenith\");"); AOnceFlush; } LBts(&sys_run_level,RLf_ONCE_ZENITH); RegDft("Once/User",""); - if (RegCnt("Once/User")>2) { + if (RegCount("Once/User")>2) { RegExe("Once/User"); OnceFlush; } diff --git a/src/Zenith/ZSound.HC b/src/Zenith/ZSound.HC index 4c4db069..b9082c1d 100755 --- a/src/Zenith/ZSound.HC +++ b/src/Zenith/ZSound.HC @@ -106,7 +106,7 @@ public class CMusicGlobals #help_index "Snd/Music;Time/Seconds" public F64 tM() {//Time in seconds synced to music subsystem. - return (cnts.jiffies+music.tM_correction)/JIFFY_FREQ; + return (counts.jiffies+music.tM_correction)/JIFFY_FREQ; } public F64 Beat() @@ -114,7 +114,7 @@ public F64 Beat() F64 res,cur_tM; PUSHFD CLI - if (mp_cnt>1) + if (mp_count>1) while (LBts(&sys_semas[SEMA_TMBEAT],0)) PAUSE cur_tM=tM; @@ -239,7 +239,7 @@ per second.It defaults to F64 d,on_jiffies,off_jiffies; music.play_note_num=0; while (*st) { - timeout_val=cnts.jiffies; + timeout_val=counts.jiffies; tie=FALSE; do { @@ -309,7 +309,7 @@ U0 MusicSettingsRst() SndRst; PUSHFD CLI - if (mp_cnt>1) + if (mp_count>1) while (LBts(&sys_semas[SEMA_TMBEAT],0)) PAUSE music.last_tM=tM;