--- xmil/vram/makescrn.c 2004/08/07 07:19:56 1.1 +++ xmil/vram/makescrn.c 2004/08/12 17:57:36 1.8 @@ -10,43 +10,92 @@ MAKESCRN makescrn; - BYTE updatetmp[0x800+0x101]; BYTE scrnallflash; - BYTE blinktest = 0; - -extern BYTE dispmode; - static BYTE lastdisp = 0; - BYTE dispflg = UPDATE_VRAM0; - BYTE *dispp = &GRP_RAM[GRAM_BANK0]; - BYTE *dispp2 = &GRP_RAM[GRAM_BANK1]; static BYTE blinktime = 1; + UINT drawtime = 0; - DWORD drawtime = 0; +static void fillupdatetmp(void) { -void init_draw(void) { + UINT32 *p; + UINT i; - makesub_initialize(); - reflesh_palette(); - lastdisp = 0; - dispflg = UPDATE_VRAM0; - dispp = &GRP_RAM[GRAM_BANK0]; + p = (UINT32 *)updatetmp; + for (i=0; i<0x200; i++) { + p[i] |= (UPDATE_TVRAM << 24) | (UPDATE_TVRAM << 16) | + (UPDATE_TVRAM << 8) | UPDATE_TVRAM; + } } +#if 1 +static void flashupdatetmp(void) { -void fillupdatetmp(void) { + UINT posl; + UINT y; + UINT x; + UINT r; + UINT posr; + BRESULT y2; + REG16 atr; + REG16 udtbase; + REG16 udt; - __asm { - mov ebx, offset updatetmp - mov ecx, 0x200 -filludt_lp: or dword ptr [ebx], (UPDATE_TVRAM * 01010101h) - add ebx, 4 - loop filludt_lp + if (!makescrn.vramsize) { + return; + } + posl = crtc.s.TXT_TOP; + y = crtc.s.TXT_YL; + do { + for (x=0; x> 1; + do { + posr = LOW11(posl + 1); + atr = (tram[TRAM_ATR + posl] << 8) | tram[TRAM_ATR + posr]; + udt = udtbase; + if (!y2) { + if (atr & (TRAMATR_Yx2 << 8)) { + udt |= (UPDATE_TRAM | 1) << 8; // º¸ÄÙ¤ì½ÄÇÜ³Ñ + } + else { + y2 = TRUE; + } + } + if (!y2) { + if (atr & (TRAMATR_Yx2 << 0)) { + udt |= (UPDATE_TRAM | 1) << 0; // ±¦ÄÙ¤ì½ÄÇÜ³Ñ + } + else { + y2 = TRUE; + } + } + if (atr & (TRAMATR_Xx2 << 8)) { // º¸Â¦ÇܳÑ? + udt |= 0x0812; + } + if (atr & (TRAMATR_Xx2 << 0)) { // ±¦Â¦ÇܳÑ? + udt |= 0x0008; + } + if ((updatetmp[posl] ^ (udt >> 8)) & 0x1f) { + updatetmp[posl] = (UINT8)((udt >> 8) | UPDATE_TVRAM); + } + if ((updatetmp[posr] ^ (udt >> 0)) & 0x1f) { + updatetmp[posr] = (UINT8)((udt >> 0) | UPDATE_TVRAM); + } + posl = LOW11(posl + 2); + } while(--r); + if (crtc.s.TXT_XL & 1) { + posl = LOW11(posl - 1); + } + } while(--y); } - +#else static LABEL void flashupdatetmp(void) { __asm { @@ -145,50 +194,84 @@ nextlinecheck: inc dl ret } } +#endif -void updateblink(void) { +static BRESULT updateblink(void) { - __asm { - dec blinktime - jns blinkupflg_ed - mov blinktime, 30-1 - push edi - movzx edi, crtc.s.TXT_TOP - mov ax, 010h - xor blinktest, al - mov cx, word ptr (makescrn.vramsize) - or cx, cx - je blinkupflg - -blinkup_lp: test tram[TRAM_ATR + edi], al - je short blinknup_ed - mov ah, UPDATE_TVRAM - or updatetmp[edi], ah -blinknup_ed: inc edi - dec cx - jne blinkup_lp - or makescrn.scrnflash, ah - shr ah, 5 -blinkupflg: pop edi - mov makescrn.existblink, ah -blinkupflg_ed: + UINT pos; + REG8 update; + UINT r; + + if (blinktime) { + blinktime--; + return(FALSE); + } + else { + blinktime = 30 - 1; + pos = makescrn.vramtop; + makescrn.blinktest ^= 0x10; + update = 0; + r = makescrn.vramsize; + while(r) { + r--; + if (tram[TRAM_ATR + pos] & 0x10) { + updatetmp[pos] |= UPDATE_TRAM; + update = UPDATE_TRAM; + } + pos = LOW11(pos + 1); + } + if (update) { + makescrn.existblink = 1; + return(TRUE); + } + else { + return(FALSE); } + } } -// --------------------------------------------------------------------------- +// ---- + +static void changemodes(void) { + + lastdisp = crtc.e.dispmode; + if (!(lastdisp & SCRN_BANK1)) { + makescrn.disp1 = gram + GRAM_BANK0; + makescrn.disp2 = gram + GRAM_BANK1; + makescrn.dispflag = UPDATE_TRAM | UPDATE_VRAM0; + } + else { + makescrn.disp1 = gram + GRAM_BANK1; + makescrn.disp2 = gram + GRAM_BANK0; + makescrn.dispflag = UPDATE_TRAM | UPDATE_VRAM1; + } + scrnallflash = 1; + makescrn.palandply = 1; +} -static void x1vram_adjust(void) { +static void changecrtc(void) { + UINT scrnxmax; + UINT scrnymax; + UINT textxl; + UINT surfcx; REG8 widthmode; UINT fontcy; UINT underlines; REG8 y2; UINT charcy; UINT surfcy; + UINT x; + UINT y; + UINT8 *p; + makescrn.vramtop = LOW11(crtc.s.TXT_TOP); + + scrnxmax = (crtc.s.TXT_XL <= 40)?40:80; + scrnymax = 200; if (crtc.s.TXT_XL <= 40) { - if (dispmode & SCRN_DRAW4096) { + if (lastdisp & SCRN_DRAW4096) { widthmode = SCRNWIDTHMODE_4096; } else { @@ -200,13 +283,10 @@ static void x1vram_adjust(void) { } scrndraw_changewidth(widthmode); - makescrn.surfcx = min(80, crtc.s.TXT_XL); - makescrn.surfrx = crtc.s.TXT_XL - makescrn.surfcx; + textxl = crtc.s.TXT_XL; + surfcx = min(scrnxmax, textxl); - fontcy = crtc.s.FNT_YL; - if (crtc.s.SCRN_BITS & SCRN_24KHZ) { - fontcy >>= 1; - } + fontcy = crtc.e.fonty; underlines = (crtc.s.SCRN_BITS & SCRN_UNDERLINE)?2:0; if (fontcy > underlines) { fontcy -= underlines; @@ -230,16 +310,33 @@ static void x1vram_adjust(void) { charcy = fontcy + underlines; makescrn.fontcy = fontcy; makescrn.charcy = charcy; - charcy <<= y2; - surfcy = 200 / charcy; + surfcy = scrnymax / charcy; if (surfcy > crtc.s.TXT_YL) { surfcy = crtc.s.TXT_YL; } + + x = min(scrnxmax, makescrn.surfcx); + if (surfcx < x) { // ¾®¤µ¤¯¤Ê¤Ã¤¿ + x = (x - surfcx) * 8; + p = screenmap + (surfcx * 8); + y = surfcy * 2; + while(y) { + y--; + ZeroMemory(p, x); + p += SURFACE_WIDTH; + } + } + if (surfcy < makescrn.surfcy) { + ZeroMemory(screenmap + (SURFACE_WIDTH * surfcy * 2), + SURFACE_WIDTH * (makescrn.surfcy - surfcy) * 2); + } + makescrn.surfcx = surfcx; + makescrn.surfrx = textxl - surfcx; makescrn.surfcy = surfcy; - makescrn.surfstep = (SURFACE_WIDTH * charcy * 2) - (makescrn.surfcx * 8); - makescrn.vramsize = min(0x800, charcy * crtc.s.TXT_XL); - scrnmng_setheight(0, charcy * surfcy * 2); + makescrn.surfstep = (SURFACE_WIDTH * charcy * 2) - (surfcx * 8); + makescrn.vramsize = min(0x800, surfcy * textxl); +// scrnmng_setheight(0, charcy * surfcy * 2); } @@ -263,6 +360,7 @@ static const DRAWFN screendraw2[8] = { void scrnupdate(void) { BRESULT ddrawflash; + BRESULT allflash; if (!corestat.drawframe) { return; @@ -270,25 +368,15 @@ void scrnupdate(void) { corestat.drawframe = 0; ddrawflash = FALSE; - if (lastdisp != dispmode) { - lastdisp = dispmode; - scrnallflash = 1; - makescrn.palandply = 1; - if (!(dispmode & SCRN_BANK1)) { - dispp = GRP_RAM + GRAM_BANK0; - dispp2 = GRP_RAM + GRAM_BANK1; - dispflg = UPDATE_VRAM0; - } - else { - dispp = GRP_RAM + GRAM_BANK1; - dispp2 = GRP_RAM + GRAM_BANK0; - dispflg = UPDATE_VRAM1; - } + allflash = FALSE; + if (lastdisp != crtc.e.dispmode) { + changemodes(); } if (scrnallflash) { scrnallflash = 0; fillupdatetmp(); - x1vram_adjust(); + changecrtc(); + allflash = TRUE; makescrn.scrnflash = 1; } if (makescrn.remakeattr) { @@ -297,74 +385,89 @@ void scrnupdate(void) { } if (makescrn.palandply) { makescrn.palandply = 0; - palettes(); + pal_update(); ddrawflash = 1; } if (makescrn.existblink) { - updateblink(); + makescrn.scrnflash |= updateblink(); } if (makescrn.scrnflash) { makescrn.scrnflash = 0; - makescrn.fontycnt = 0; - switch(lastdisp & SCRN64_MASK) { - case SCRN64_320x200: -// width40x25_64s(); - break; - - case SCRN64_L320x200x2: -// width40x25_64x2(); - break; - - case SCRN64_L640x200: -// width80x25_64s(); - break; - - case SCRN64_H320x400: -// width40x25_64h(); - break; - - case SCRN64_320x200x4096: -// width40x25_4096(); - break; - - case SCRN64_320x100: -// width40x12_64l(); - break; - - case SCRN64_320x100x2: -// width40x12_64x2(); - break; - - case SCRN64_L640x100: -// width80x12_64s(); - break; - - case SCRN64_H320x200: -// width40x12_64h(); - break; - - case SCRN64_320x100x4096: -// width40x12_4096(); - break; - -// case SCRN64_INVALID: - default: - if (!(crtc.s.SCRN_BITS & SCRN_UNDERLINE)) { - screendraw[crtc.s.SCRN_BITS & 7](); - } - else { - screendraw2[crtc.s.SCRN_BITS & 7](); - } - break; + if (makescrn.vramsize) { + makescrn.fontycnt = 0; + switch(lastdisp & SCRN64_MASK) { + case SCRN64_320x200: +// width40x25_64s(); + break; + + case SCRN64_L320x200x2: +// width40x25_64x2(); + break; + + case SCRN64_L640x200: +// width80x25_64s(); + break; + + case SCRN64_H320x400: +// width40x25_64h(); + break; + + case SCRN64_320x200x4096: +// width40x25_4096(); + break; + + case SCRN64_320x100: +// width40x12_64l(); + break; + + case SCRN64_320x100x2: +// width40x12_64x2(); + break; + + case SCRN64_L640x100: +// width80x12_64s(); + break; + + case SCRN64_H320x200: +// width40x12_64h(); + break; + + case SCRN64_320x100x4096: +// width40x12_4096(); + break; + +// case SCRN64_INVALID: + default: + if (!(crtc.s.SCRN_BITS & SCRN_UNDERLINE)) { + screendraw[crtc.s.SCRN_BITS & 7](); + } + else { + screendraw2[crtc.s.SCRN_BITS & 7](); + } + break; + } + ddrawflash = 1; } - ddrawflash = 1; } if (ddrawflash) { ddrawflash = 0; - scrndraw_draw(FALSE); + scrndraw_draw(allflash); drawtime++; } } + +void makescrn_initialize(void) { + + makesub_initialize(); +} + +void makescrn_reset(void) { + + changemodes(); + changecrtc(); + flashupdatetmp(); +} +