--- np2/bios/bios.c 2004/01/25 05:41:28 1.33 +++ np2/bios/bios.c 2004/02/29 00:57:05 1.48 @@ -1,4 +1,5 @@ #include "compiler.h" +#include "strres.h" #include "dosio.h" #include "cpucore.h" #include "pccore.h" @@ -20,8 +21,6 @@ BOOL biosrom = FALSE; -static const char file_biosrom[] = "bios.rom"; - static const char neccheck[] = "Copyright (C) 1983 by NEC Corporation"; // 00/05/18 MS-DOS6.2 on PC-9801VX calling proc @@ -59,8 +58,11 @@ static void bios_reinitbyswitch(void) { } mem[MEMB_BIOS_FLAG0] = 0x01; - prxcrt = 0x48; // ver0.74 - if (gdc.display & 2) { + prxcrt = 0x08; + if (!(np2cfg.dipsw[0] & 0x01)) { // dipsw1-1 on + prxcrt |= 0x40; + } + if (gdc.display & (1 << GDCDISP_ANALOG)) { prxcrt |= 0x04; // color16 } if (!(np2cfg.dipsw[0] & 0x80)) { // dipsw1-8 on @@ -81,7 +83,7 @@ static void bios_reinitbyswitch(void) { mem[MEMB_PRXDUPD] = prxdupd; biosflag = 0x20; - if (pccore.cpumode & CPUMODE_8MHz) { + if (pccore.cpumode & CPUMODE_8MHZ) { biosflag |= 0x80; } biosflag |= mem[0xa3fea] & 7; @@ -92,22 +94,16 @@ static void bios_reinitbyswitch(void) { mem[MEMB_EXPMMSZ] = (BYTE)(pccore.extmem << 3); mem[MEMB_CRT_RASTER] = 0x0f; - gdc.display &= ~4; - if (!(np2cfg.dipsw[0] & 0x04)) { // dipsw1-3 on - gdc.display |= 4; - } - gdcs.textdisp |= GDCSCRN_EXT; - // FDD initialize SETBIOSMEM32(MEMD_F2DD_POINTER, 0xfd801ad7); SETBIOSMEM32(MEMD_F2HD_POINTER, 0xfd801aaf); boot = mem[MEMB_MSW5] & 0xf0; if (boot != 0x20) { // 1MB - fddbios_equip(DISKTYPE_2HD, TRUE); + fddbios_equip(3, TRUE); mem[MEMB_BIOS_FLAG0] |= 0x02; } else { // 640KB - fddbios_equip(DISKTYPE_2DD, TRUE); + fddbios_equip(0, TRUE); mem[MEMB_BIOS_FLAG0] &= ~0x02; } mem[MEMB_F2DD_MODE] = 0xff; @@ -120,7 +116,14 @@ static void bios_reinitbyswitch(void) { } } -static void bios_vectorset(void) { // ver0.30 +static void bios_memclear(void) { + + ZeroMemory(mem, 0xa0000); + ZeroMemory(mem + VRAM1_B, 0x18000); + ZeroMemory(mem + VRAM1_E, 0x08000); +} + +static void bios_vectorset(void) { UINT i; @@ -136,13 +139,12 @@ static void bios_vectorset(void) { static void bios_screeninit(void) { - UINT ax; + REG8 al; - ax = 0x0a04; - ax += (np2cfg.dipsw[1] & 0x04) >> 1; - ax += (np2cfg.dipsw[1] & 0x08) >> 3; - CPU_AX = ax; - bios0x18(); + al = 4; + al += (np2cfg.dipsw[1] & 0x04) >> 1; + al += (np2cfg.dipsw[1] & 0x08) >> 3; + bios0x18_0a(al); } @@ -158,10 +160,10 @@ static const UINT16 biosoffset[0x20] = { BIOSOFST_EOIS, BIOSOFST_EOIS, BIOSOFST_EOIS, BIOSOFST_EOIS, BIOSOFST_18, BIOSOFST_19, BIOSOFST_1a, BIOSOFST_1b, - BIOSOFST_1c, BIOSOFST_IRET, BIOSOFST_1e, BIOSOFST_IRET}; + BIOSOFST_1c, BIOSOFST_IRET, BIOSOFST_1e, BIOSOFST_1f}; -void bios_init(void) { +void bios_initialize(void) { char path[MAX_PATH]; FILEH fh; @@ -172,7 +174,7 @@ void bios_init(void) { // まぁDISK BASIC動くようになるからいいんじゃないですか？ // BASIC BIOSは 8086コードのように見えるけど… - getbiospath(path, file_biosrom, sizeof(path)); + getbiospath(path, str_biosrom, sizeof(path)); fh = file_open_rb(path); if (fh != FILEH_INVALID) { if (file_read(fh, mem + 0x0e8000, 0x18000) == 0x18000) { @@ -192,14 +194,14 @@ void bios_init(void) { } SETBIOSMEM16(BIOS_BASE + BIOSOFST_IRET, 0x50cf); SETBIOSMEM16(BIOS_BASE + BIOSOFST_WAIT, 0xcf90); - for (i=(BIOS_BASE+BIOSOFST_EOIM); i<=(BIOS_BASE+BIOSOFST_1c); i+=2) { + for (i=(BIOS_BASE+BIOSOFST_EOIM); i<=(BIOS_BASE+BIOSOFST_1f); i+=2) { SETBIOSMEM16(i, 0xcf90); } CopyMemory(mem + BIOS_BASE + BIOSOFST_PRT, printmain, sizeof(printmain)); - bios_vectorset(); // ver0.29 +// bios_vectorset(); if (!biosrom) { - lio_init(); + lio_initialize(); } SETBIOSMEM16(0xfd800, 0xcb90); @@ -224,15 +226,15 @@ void bios_init(void) { CopyMemory(mem + 0xf538e, itfrom + pos, 0x27); } - bios_reinitbyswitch(); - mem[MEMB_CRT_STS_FLAG] = 0x84; +// bios_reinitbyswitch(); +// mem[MEMB_CRT_STS_FLAG] = 0x84; // -> bios_screeninit() // mem[MEMB_BIOS_FLAG0] = 0x03; -// mem[MEMB_F2DD_MODE] = 0xff; // ver0.29 -// SETBIOSMEM16(MEMW_DISK_EQUIP, 0x0003); // ver0.29 +// mem[MEMB_F2DD_MODE] = 0xff; +// SETBIOSMEM16(MEMW_DISK_EQUIP, 0x0003); mem[0x005ae] |= 0x03; // ver0.31 CopyMemory(mem + 0x0fde00, keytable[0], 0x300); - bios0x09_init(); +// bios0x09_init(); CopyMemory(mem + ITF_ADRS, itfrom, sizeof(itfrom)); mem[ITF_ADRS + 0x7ff0] = 0xea; @@ -260,43 +262,81 @@ void bios_init(void) { static void bios_boot(void) { - if (sysport.c & 0x80) { - if (!(sysport.c & 0x20)) { - bios_reinitbyswitch(); - } - CPU_CS = 0x0000; - CPU_IP = 0x04f8; - CPU_DS = 0x0000; - CPU_DX = 0x43d; - CPU_AL = 0x10; - mem[0x004f8] = 0xee; // out dx, al - mem[0x004f9] = 0xea; // call far - SETBIOSMEM16(0x004fa, 0x0000); - SETBIOSMEM16(0x004fc, 0xffff); - } - else { + if (!(sysport.c & 0x80)) { CPU_SP = GETBIOSMEM16(0x00404); CPU_SS = GETBIOSMEM16(0x00406); // TRACEOUT(("CPU Reset... SS:SP = %.4x:%.4x", CPU_SS, CPU_SP)); } + else { + bios_memclear(); + bios_vectorset(); + bios0x09_init(); + bios_reinitbyswitch(); + + if (sysport.c & 0x20) { + CPU_CS = 0x0000; + CPU_IP = 0x04f8; + CPU_DS = 0x0000; + CPU_DX = 0x43d; + CPU_AL = 0x10; + mem[0x004f8] = 0xee; // out dx, al + mem[0x004f9] = 0xea; // call far + SETBIOSMEM16(0x004fa, 0x0000); + SETBIOSMEM16(0x004fc, 0xffff); + } + else { + CPU_IP = 0x0002; + } + } } +// テスト(こんなんじゃだめぽ +static void bios0x1f(void) { + + BYTE work[256]; + UINT32 src; + UINT32 dst; + UINT leng; + UINT l; + + if (CPU_AH == 0x90) { + i286_memstr_read(CPU_ES, CPU_BX + 0x10, work, 0x10); + src = work[2] + (work[3] << 8) + (work[4] << 16) + CPU_SI; + dst = work[10] + (work[11] << 8) + (work[12] << 16) + CPU_DI; + leng = LOW16(CPU_CX - 1) + 1; + TRACEOUT(("protect bios: memmove")); + TRACEOUT(("%.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x", + work[0], work[1], work[2], work[3], + work[4], work[5], work[6], work[7])); + TRACEOUT(("%.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x", + work[8], work[9], work[10], work[11], + work[12], work[13], work[14], work[15])); + TRACEOUT(("SI=%.4x DI=%.4x CX=%.4x", CPU_SI, CPU_DI, CPU_CX)); + TRACEOUT(("src:%08x dst:%08x leng:%08x", src, dst, leng)); + do { + l = min(leng, 256); + i286_memx_read(src, work, l); + i286_memx_write(dst, work, l); + src += l; + dst += l; + leng -= l; + } while(leng); + } + else { + TRACEOUT(("unsupport protect bios AH=%.2x", CPU_AH)); + } +} UINT MEMCALL biosfunc(UINT32 adrs) { UINT16 bootseg; if ((CPU_ITFBANK) && (adrs >= 0xf8000) && (adrs < 0x100000)) { -#if 1 // for epson ITF + // for epson ITF return(0); -#else - CPU_IP--; - CPU_REMCLOCK = -1; - return(1); -#endif } - switch(adrs) { // ver0.30 + switch(adrs) { case BIOS_BASE + BIOSOFST_EOIM: CPU_REMCLOCK -= 300; iocore_out8(0x00, 0x20); @@ -365,26 +405,29 @@ UINT MEMCALL biosfunc(UINT32 adrs) { bios0x1c(); return(1); + case BIOS_BASE + BIOSOFST_1f: + CPU_REMCLOCK -= 200; + bios0x1f(); + return(1); + case BIOS_BASE + BIOSOFST_WAIT: CPU_STI; - if (fddmtr_biosbusy) { // ver0.26 + if (fddmtr.busy) { CPU_IP--; CPU_REMCLOCK = -1; } else { - switch(CTRL_FDMEDIA) { - case DISKTYPE_2HD: - if (pic.pi[1].isr & PIC_INT42) { - CPU_IP--; - CPU_REMCLOCK -= 1000; - } - break; - case DISKTYPE_2DD: - if (pic.pi[1].isr & PIC_INT41) { - CPU_IP--; - CPU_REMCLOCK -= 1000; - } - break; + if (fdc.chgreg & 1) { + if (!(mem[0x0055e] & (0x01 << fdc.us))) { + CPU_IP--; + CPU_REMCLOCK -= 1000; + } + } + else { + if (!(mem[0x0055f] & (0x10 << fdc.us))) { + CPU_IP--; + CPU_REMCLOCK -= 1000; + } } } return(1); @@ -438,9 +481,17 @@ UINT MEMCALL biosfunc(UINT32 adrs) { return(0); } - if ((adrs >= 0xf9a00) && (adrs < 0x0f9a24)) { - if (!(adrs & 1)) { - bios_lio((BYTE)((adrs - 0xf9a00) >> 1)); + if ((adrs >= 0xf9a00) && (adrs < 0x0f9a44)) { + if (!(adrs & 3)) { + CPU_REMCLOCK -= 500; + bios_lio((REG8)((adrs - 0xf9a00) >> 2)); + } + else { + if (nevent_iswork(NEVENT_GDCSLAVE)) { + CPU_IP--; + CPU_REMCLOCK = -1; + return(1); + } } return(0); }